From: Junio C Hamano Date: Mon, 19 Dec 2016 22:45:29 +0000 (-0800) Subject: Merge branch 'jt/use-trailer-api-in-commands' X-Git-Tag: v2.12.0-rc0~145 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8b0db484e11aa86e6b8bf4d7243d0c81bf4b3c33?hp=967dfd4d568c2b102281de8cc22ee35f7558358b Merge branch 'jt/use-trailer-api-in-commands' Commands that operate on a log message and add lines to the trailer blocks, such as "format-patch -s", "cherry-pick (-x|-s)", and "commit -s", have been taught to use the logic of and share the code with "git interpret-trailer". * jt/use-trailer-api-in-commands: sequencer: use trailer's trailer layout trailer: have function to describe trailer layout trailer: avoid unnecessary splitting on lines commit: make ignore_non_trailer take buf/len trailer: be stricter in parsing separators --- diff --git a/.travis.yml b/.travis.yml index 9a65514d82..0b2ea5c3e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,6 @@ env: - DEFAULT_TEST_TARGET=prove - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save" - GIT_TEST_OPTS="--verbose-log" - - GIT_TEST_HTTPD=true - GIT_TEST_CLONE_2GB=YesPlease # t9810 occasionally fails on Travis CI OS X # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X @@ -57,6 +56,8 @@ before_install: - > case "${TRAVIS_OS_NAME:-linux}" in linux) + export GIT_TEST_HTTPD=YesPlease + mkdir --parents custom/p4 pushd custom/p4 wget --quiet http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION/bin.linux26x86_64/p4d diff --git a/Documentation/RelNotes/2.10.3.txt b/Documentation/RelNotes/2.10.3.txt new file mode 100644 index 0000000000..277a2a18a7 --- /dev/null +++ b/Documentation/RelNotes/2.10.3.txt @@ -0,0 +1,48 @@ +Git v2.10.3 Release Notes +========================= + +Fixes since v2.10.2 +------------------- + + * Extract a small helper out of the function that reads the authors + script file "git am" internally uses. + This by itself is not useful until a second caller appears in the + future for "rebase -i" helper. + + * The command-line completion script (in contrib/) learned to + complete "git cmd ^mas" to complete the negative end of + reference to "git cmd ^master". + + * "git send-email" attempts to pick up valid e-mails from the + trailers, but people in real world write non-addresses there, like + "Cc: Stable # 4.8+", which broke the output depending + on the availability and vintage of Mail::Address perl module. + + * The code that we have used for the past 10+ years to cycle + 4-element ring buffers turns out to be not quite portable in + theoretical world. + + * "git daemon" used fixed-length buffers to turn URL to the + repository the client asked for into the server side directory + path, using snprintf() to avoid overflowing these buffers, but + allowed possibly truncated paths to the directory. This has been + tightened to reject such a request that causes overlong path to be + required to serve. + + * Recent update to git-sh-setup (a library of shell functions that + are used by our in-tree scripted Porcelain commands) included + another shell library git-sh-i18n without specifying where it is, + relying on the $PATH. This has been fixed to be more explicit by + prefixing $(git --exec-path) output in front. + + * Fix for a racy false-positive test failure. + + * Portability update and workaround for builds on recent Mac OS X. + + * Update to the test framework made in 2.9 timeframe broke running + the tests under valgrind, which has been fixed. + + * Improve the rule to convert "unsigned char [20]" into "struct + object_id *" in contrib/coccinelle/ + +Also contains minor documentation updates and code clean-ups. diff --git a/Documentation/RelNotes/2.11.0.txt b/Documentation/RelNotes/2.11.0.txt index 01056d9e7a..b7b7dd361e 100644 --- a/Documentation/RelNotes/2.11.0.txt +++ b/Documentation/RelNotes/2.11.0.txt @@ -57,39 +57,40 @@ UI, Workflows & Features * Even though "git hash-objects", which is a tool to take an on-filesystem data stream and put it into the Git object store, - allowed to perform the "outside-world-to-Git" conversions (e.g. + can perform "outside-world-to-Git" conversions (e.g. end-of-line conversions and application of the clean-filter), and - it had the feature on by default from very early days, its reverse + it has had this feature on by default from very early days, its reverse operation "git cat-file", which takes an object from the Git object - store and externalize for the consumption by the outside world, + store and externalizes it for consumption by the outside world, lacked an equivalent mechanism to run the "Git-to-outside-world" conversion. The command learned the "--filters" option to do so. - * Output from "git diff" can be made easier to read by selecting + * Output from "git diff" can be made easier to read by intelligently selecting which lines are common and which lines are added/deleted - intelligently when the lines before and after the changed section - are the same. A command line option is added to help with the - experiment to find a good heuristics. + when the lines before and after the changed section + are the same. A command line option (--indent-heuristic) and a + configuration variable (diff.indentHeuristic) are added to help with the + experiment to find good heuristics. * In some projects, it is common to use "[RFC PATCH]" as the subject prefix for a patch meant for discussion rather than application. A - new option "--rfc" is a short-hand for "--subject-prefix=RFC PATCH" + new format-patch option "--rfc" is a short-hand for "--subject-prefix=RFC PATCH" to help the participants of such projects. - * "git add --chmod=+x " added recently only toggled the + * "git add --chmod={+,-}x " only changed the executable bit for paths that are either new or modified. This has - been corrected to flip the executable bit for all paths that match + been corrected to change the executable bit for all paths that match the given pathspec. * When "git format-patch --stdout" output is placed as an in-body - header and it uses the RFC2822 header folding, "git am" failed to + header and it uses RFC2822 header folding, "git am" fails to put the header line back into a single logical line. The underlying "git mailinfo" was taught to handle this properly. * "gitweb" can spawn "highlight" to show blob contents with (programming) language-specific syntax highlighting, but only when the language is known. "highlight" can however be told - to make the guess itself by giving it "--force" option, which + to guess the language itself by giving it "--force" option, which has been enabled. * "git gui" l10n to Portuguese. @@ -109,19 +110,19 @@ UI, Workflows & Features history leading to nth parent was looking the other way. * In recent versions of cURL, GSSAPI credential delegation is - disabled by default due to CVE-2011-2192; introduce a configuration - to selectively allow enabling this. + disabled by default due to CVE-2011-2192; introduce a http.delegation + configuration variable to selectively allow enabling this. (merge 26a7b23429 ps/http-gssapi-cred-delegation later to maint). * "git mergetool" learned to honor "-O" to control the order of paths to present to the end user. * "git diff/log --ws-error-highlight=" lacked the corresponding - configuration variable to set it by default. + configuration variable (diff.wsErrorHighlight) to set it by default. - * "git ls-files" learned "--recurse-submodules" option that can be - used to get a listing of tracked files across submodules (i.e. this - only works with "--cached" option, not for listing untracked or + * "git ls-files" learned the "--recurse-submodules" option + to get a listing of tracked files across submodules (i.e. this + only works with the "--cached" option, not for listing untracked or ignored files). This would be a useful tool to sit on the upstream side of a pipe that is read with xargs to work on all working tree files from the top-level superproject. @@ -130,7 +131,7 @@ UI, Workflows & Features implementations of XDG Secret Service API has been added to contrib/credential/. - * The GPG verification status shown in "%G?" pretty format specifier + * The GPG verification status shown by the "%G?" pretty format specifier was not rich enough to differentiate a signature made by an expired key, a signature made by a revoked key, etc. New output letters have been assigned to express them. @@ -139,17 +140,17 @@ UI, Workflows & Features learned to turn "git describe" output (e.g. v2.9.3-599-g2376d31787) into clickable links in its output. - * When new paths were added by "git add -N" to the index, it was - enough to circumvent the check by "git commit" to refrain from - making an empty commit without "--allow-empty". The same logic - prevented "git status" to show such a path as "new file" in the + * "git commit" created an empty commit when invoked with an index + consisting solely of intend-to-add paths (added with "git add -N"). + It now requires the "--allow-empty" option to create such a commit. + The same logic prevented "git status" from showing such paths as "new files" in the "Changes not staged for commit" section. - * The smudge/clean filter API expect an external process is spawned - to filter the contents for each path that has a filter defined. A + * The smudge/clean filter API spawns an external process + to filter the contents of each path that has a filter defined. A new type of "process" filter API has been added to allow the first request to run the filter for a path to spawn a single process, and - all filtering need is served by this single process for multiple + all filtering is served by this single process for multiple paths, reducing the process creation overhead. * The user always has to say "stash@{$N}" when naming a single @@ -173,7 +174,7 @@ Performance, Internal Implementation, Development Support etc. script file "git am" internally uses. (merge a77598e jc/am-read-author-file later to maint). - * Lifts calls to exit(2) and die() higher in the callchain in + * Lift calls to exit(2) and die() higher in the callchain in sequencer.c files so that more helper functions in it can be used by callers that want to handle error conditions themselves. @@ -192,13 +193,13 @@ Performance, Internal Implementation, Development Support etc. does not advertise any refs, but "git fetch" was not prepared to see such an advertisement. When the other side disconnects without giving any ref advertisement, we used to say "there may not be a - repository at that URL", but we may have seen other advertisement + repository at that URL", but we may have seen other advertisements like "shallow" and ".have" in which case we definitely know that a repository is there. The code to detect this case has also been updated. * Some codepaths in "git pack-objects" were not ready to use an - existing pack bitmap; now they are and as the result they have + existing pack bitmap; now they are and as a result they have become faster. * The codepath in "git fsck" to detect malformed tree objects has @@ -214,7 +215,7 @@ Performance, Internal Implementation, Development Support etc. packfile first. (merge c9af708b1a jk/pack-objects-optim-mru later to maint). - * Codepaths involved in interacting alternate object store have + * Codepaths involved in interacting alternate object stores have been cleaned up. * In order for the receiving end of "git push" to inspect the @@ -222,7 +223,7 @@ Performance, Internal Implementation, Development Support etc. from the sending end need to be made available to the hook and the mechanism for the connectivity check, and this was done traditionally by storing the objects in the receiving repository - and letting "git gc" to expire it. Instead, store the newly + and letting "git gc" expire them. Instead, store the newly received objects in a temporary area, and make them available by reusing the alternate object store mechanism to them only while we decide if we accept the check, and once we decide, either migrate @@ -237,7 +238,7 @@ Performance, Internal Implementation, Development Support etc. replaced with a priority queue. * "git diff --no-index" codepath has been updated not to try to peek - into .git/ directory that happens to be under the current + into a .git/ directory that happens to be under the current directory, when we know we are operating outside any repository. * Update of the sequencer codebase to make it reusable to reimplement @@ -251,8 +252,8 @@ Performance, Internal Implementation, Development Support etc. holding onto them. Use O_CLOEXEC flag to open files in various codepaths. - * Update "interpret-trailers" machinery and teaches it that people in - real world write all sorts of crufts in the "trailer" that was + * Update "interpret-trailers" machinery and teach it that people in + the real world write all sorts of cruft in the "trailer" that was originally designed to have the neat-o "Mail-Header: like thing" and nothing else. @@ -280,7 +281,7 @@ notes for details). has been removed. * Having a submodule whose ".git" repository is somehow corrupt - caused a few commands that recurse into submodules loop forever. + caused a few commands that recurse into submodules to loop forever. * "git symbolic-ref -d HEAD" happily removes the symbolic ref, but the resulting repository becomes an invalid one. Teach the command @@ -308,12 +309,12 @@ notes for details). forgot to update "git gui" to look at the configuration to match this change. - * "git add --chmod=+x" added recently lacked documentation, which has + * "git add --chmod={+,-}x" added recently lacked documentation, which has been corrected. * "git log --cherry-pick" used to include merge commits as candidates to be matched up with other commits, resulting a lot of wasted time. - The patch-id generation logic has been updated to ignore merges to + The patch-id generation logic has been updated to ignore merges and avoid the wastage. * The http transport (with curl-multi option, which is the default @@ -333,20 +334,20 @@ notes for details). line of the next one. This process may have to merge two adjacent hunks, but the code forgot to do so in some cases. - * Performance tests done via "t/perf" did not use the same set of + * Performance tests done via "t/perf" did not use the right build configuration if the user relied on autoconf generated configuration. * "git format-patch --base=..." feature that was recently added - showed the base commit information after "-- " e-mail signature + showed the base commit information after the "-- " e-mail signature line, which turned out to be inconvenient. The base information has been moved above the signature line. * More i18n. * Even when "git pull --rebase=preserve" (and the underlying "git - rebase --preserve") can complete without creating any new commit - (i.e. fast-forwards), it still insisted on having a usable ident + rebase --preserve") can complete without creating any new commits + (i.e. fast-forwards), it still insisted on having usable ident information (read: user.email is set correctly), which was less than nice. As the underlying commands used inside "git rebase" would fail with a more meaningful error message and advice text @@ -396,7 +397,7 @@ notes for details). * Documentation around tools to import from CVS was fairly outdated. * "git clone --recurse-submodules" lost the progress eye-candy in - recent update, which has been corrected. + a recent update, which has been corrected. * A low-level function verify_packfile() was meant to show errors that were detected without dying itself, but under some conditions @@ -409,23 +410,23 @@ notes for details). to a design bug, which has been fixed. * In the codepath that comes up with the hostname to be used in an - e-mail when the user didn't tell us, we looked at ai_canonname + e-mail when the user didn't tell us, we looked at the ai_canonname field in struct addrinfo without making sure it is not NULL first. * "git worktree", even though it used the default_abbrev setting that - ought to be affected by core.abbrev configuration variable, ignored + ought to be affected by the core.abbrev configuration variable, ignored the variable setting. The command has been taught to read the default set of configuration variables to correct this. * "git init" tried to record core.worktree in the repository's - 'config' file when GIT_WORK_TREE environment variable was set and + 'config' file when the GIT_WORK_TREE environment variable was set and it was different from where GIT_DIR appears as ".git" at its top, but the logic was faulty when .git is a "gitdir:" file that points at the real place, causing trouble in working trees that are managed by "git worktree". This has been corrected. * Codepaths that read from an on-disk loose object were too loose in - validating what they are reading is a proper object file and + validating that they are reading a proper object file and sometimes read past the data they read from the disk, which has been corrected. H/t to Gustavo Grieco for reporting. @@ -434,8 +435,8 @@ notes for details). time, and "git gui" was the last in-tree user of the syntax. This is finally fixed, so that we can move forward with the deprecation. - * An author name, that spelled a backslash-quoted double quote in the - human readable part "My \"double quoted\" name", was not unquoted + * An author name that has a backslash-quoted double quote in the + human readable part ("My \"double quoted\" name"), was not unquoted correctly while applying a patch from a piece of e-mail. * Doc update to clarify what "log -3 --reverse" does. @@ -449,11 +450,10 @@ notes for details). has been fixed; this did not affect any existing code as nobody tried to write anything after the padding on such a line, though. - * The code that parses the format parameter of for-each-ref command + * The code that parses the format parameter of the for-each-ref command has seen a micro-optimization. - * When we started cURL to talk to imap server when a new enough - version of cURL library is available, we forgot to explicitly add + * When we started to use cURL to talk to an imap server, we forgot to explicitly add imap(s):// before the destination. To some folks, that didn't work and the library tried to make HTTP(s) requests instead. @@ -474,13 +474,12 @@ notes for details). "Give me only the history since that version". (merge cccf74e2da nd/shallow-deepen later to maint). - * It is a common mistake to say "git blame --reverse OLD path", - expecting that the command line is dwimmed as if asking how lines + * "git blame --reverse OLD path" is now DWIMmed to show how lines in path in an old revision OLD have survived up to the current commit. (merge e1d09701a4 jc/blame-reverse later to maint). - * http.emptyauth configuration is a way to allow an empty username to + * The http.emptyauth configuration variable is a way to allow an empty username to pass when attempting to authenticate using mechanisms like Kerberos. We took an unspecified (NULL) username and sent ":" (i.e. no username, no password) to CURLOPT_USERPWD, but did not do @@ -494,20 +493,20 @@ notes for details). -p " adds to the current contents of the index to come up with what to commit. - * A stray symbolic link in $GIT_DIR/refs/ directory could make name + * A stray symbolic link in the $GIT_DIR/refs/ directory could make name resolution loop forever, which has been corrected. * The "submodule..path" stored in .gitmodules is never copied to .git/config and such a key in .git/config has no meaning, but - the documentation described it and submodule..url next to - each other as if both belong to .git/config. This has been fixed. + the documentation described it next to submodule..url + as if both belong to .git/config. This has been fixed. - * In a worktree connected to a repository elsewhere, created via "git + * In a worktree created via "git worktree", "git checkout" attempts to protect users from confusion by refusing to check out a branch that is already checked out in another worktree. However, this also prevented checking out a - branch, which is designated as the primary branch of a bare - reopsitory, in a worktree that is connected to the bare + branch which is designated as the primary branch of a bare + repository, in a worktree that is connected to the bare repository. The check has been corrected to allow it. * "git rebase" immediately after "git clone" failed to find the fork @@ -515,7 +514,7 @@ notes for details). * When fetching from a remote that has many tags that are irrelevant to branches we are following, we used to waste way too many cycles - when checking if the object pointed at by a tag (that we are not + checking if the object pointed at by a tag (that we are not going to fetch!) exists in our repository too carefully. * Protect our code from over-eager compilers. @@ -524,27 +523,24 @@ notes for details). "." instead of the branch name; the documentation has been updated to describe it. - * A hot-fix for a test added by a recent topic that went to both - 'master' and 'maint' already. - * "git send-email" attempts to pick up valid e-mails from the - trailers, but people in real world write non-addresses there, like + trailers, but people in the real world write non-addresses there, like "Cc: Stable # 4.8+", which broke the output depending - on the availability and vintage of Mail::Address perl module. + on the availability and vintage of the Mail::Address perl module. (merge dcfafc5214 mm/send-email-cc-cruft-after-address later to maint). - * The Travis CI configuration we ship ran the tests with --verbose + * The Travis CI configuration we ship ran the tests with the --verbose option but this risks non-TAP output that happens to be "ok" to be misinterpreted as TAP signalling a test that passed. This resulted - in unnecessary failure. This has been corrected by introducing a + in unnecessary failures. This has been corrected by introducing a new mode to run our tests in the test harness to send the verbose output separately to the log file. - * Some AsciiDoc formatter mishandles a displayed illustration with + * Some AsciiDoc formatters mishandle a displayed illustration with tabs in it. Adjust a few of them in merge-base documentation to work around them. - * A minor regression fix for "git submodule" that was introduced + * Fixed a minor regression in "git submodule" that was introduced when more helper functions were reimplemented in C. (merge 77b63ac31e sb/submodule-ignore-trailing-slash later to maint). @@ -553,21 +549,36 @@ notes for details). theoretical world. (merge bb84735c80 rs/ring-buffer-wraparound later to maint). - * "git daemon" used fixed-length buffers to turn URL to the + * "git daemon" used fixed-length buffers to turn URLs to the repository the client asked for into the server side directory - path, using snprintf() to avoid overflowing these buffers, but + paths, using snprintf() to avoid overflowing these buffers, but allowed possibly truncated paths to the directory. This has been - tightened to reject such a request that causes overlong path to be - required to serve. + tightened to reject such a request that causes an overlong path to be + served. (merge 6bdb0083be jk/daemon-path-ok-check-truncation later to maint). * Recent update to git-sh-setup (a library of shell functions that are used by our in-tree scripted Porcelain commands) included another shell library git-sh-i18n without specifying where it is, relying on the $PATH. This has been fixed to be more explicit by - prefixing $(git --exec-path) output in front. + prefixing with $(git --exec-path) output. (merge 1073094f30 ak/sh-setup-dot-source-i18n-fix later to maint). + * Fix for a racy false-positive test failure. + (merge fdf4f6c79b as/merge-attr-sleep later to maint). + + * Portability update and workaround for builds on recent Mac OS X. + (merge a296bc0132 ls/macos-update later to maint). + + * Using a %(HEAD) placeholder in "for-each-ref --format=" option + caused the command to segfault when on an unborn branch. + (merge 84679d470d jc/for-each-ref-head-segfault-fix later to maint). + + * "git rebase -i" did not work well with the core.commentchar + configuration variable for two reasons, both of which have been + fixed. + (merge 882cd23777 js/rebase-i-commentchar-fix later to maint). + * Other minor doc, test and build updates and code cleanups. (merge 5c238e29a8 jk/common-main later to maint). (merge 5a5749e45b ak/pre-receive-hook-template-modefix later to maint). @@ -576,3 +587,7 @@ notes for details). (merge 4259d693fc sc/fmt-merge-msg-doc-markup-fix later to maint). (merge 28fab7b23d nd/test-helpers later to maint). (merge c2bb0c1d1e rs/cocci later to maint). + (merge 3285b7badb ps/common-info-doc later to maint). + (merge 2b090822e8 nd/worktree-lock later to maint). + (merge 4bd488ea7c jk/create-branch-remove-unused-param later to maint). + (merge 974e0044d6 tk/diffcore-delta-remove-unused later to maint). diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt new file mode 100644 index 0000000000..01db423a92 --- /dev/null +++ b/Documentation/RelNotes/2.12.0.txt @@ -0,0 +1,86 @@ +Git 2.12 Release Notes +====================== + +Backward compatibility notes. + + * Use of an empty string that is used for 'everything matches' is + still warned and Git asks users to use a more explicit '.' for that + instead. The hope is that existing users will not mind this + change, and eventually the warning can be turned into a hard error, + upgrading the deprecation into removal of this (mis)feature. That + is not scheduled to happen in the upcoming release (yet). + + * The historical argument order "git merge HEAD ..." + has been deprecated for quite some time, and will be removed in the + upcoming release. + + +Updates since v2.11 +------------------- + +UI, Workflows & Features + + * Various updates to "git p4". + + +Performance, Internal Implementation, Development Support etc. + + * + + +Also contains various documentation updates and code clean-ups. + + * + + +Fixes since v2.10 +----------------- + +Unless otherwise noted, all the fixes since v2.9 in the maintenance +track are contained in this release (see the maintenance releases' +notes for details). + + * We often decide if a session is interactive by checking if the + standard I/O streams are connected to a TTY, but isatty() that + comes with Windows incorrectly returned true if it is used on NUL + (i.e. an equivalent to /dev/null). This has been fixed. + (merge cbb3f3c9b1 js/mingw-isatty later to maint). + + * "git svn" did not work well with path components that are "0", and + some configuration variable it uses were not documented. + (merge ea9a93dcc2 ew/svn-fixes later to maint). + + * "git rev-parse --symbolic" failed with a more recent notation like + "HEAD^-1" and "HEAD^!". + (merge a2e7b04c44 jk/rev-parse-symbolic-parents-fix later to maint). + + * An empty directory in a working tree that can simply be nuked used + to interfere while merging or cherry-picking a change to create a + submodule directory there, which has been fixed.. + (merge 5423d2e700 dt/empty-submodule-in-merge later to maint). + + * The code in "git push" to compute if any commit being pushed in the + superproject binds a commit in a submodule that hasn't been pushed + out was overly inefficient, making it unusable even for a small + project that does not have any submodule but have a reasonable + number of refs. + (merge 250ab24ab3 hv/submodule-not-yet-pushed-fix later to maint). + + * "git push --dry-run --recurse-submodule=on-demand" wasn't + "--dry-run" in the submodules. + (merge 0301c821c5 bw/push-dry-run later to maint). + + * The output from "git worktree list" was made in readdir() order, + and was unstable. + (merge 4df1d4d466 nd/worktree-list-fixup later to maint). + + * mergetool..trustExitCode configuration variable did not apply + to built-in tools, but now it does. + (merge 2967284456 da/mergetool-trust-exit-code later to maint). + + * "git p4" LFS support was broken when LFS stores an empty blob. + (merge d5eb3cf5e7 ls/p4-empty-file-on-lfs later to maint). + + * Other minor doc, test and build updates and code cleanups. + (merge fa6ca11105 nd/qsort-in-merge-recursive later to maint). + (merge fa3142c919 ak/lazy-prereq-mktemp later to maint). diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt index e99bda6add..09074c75a4 100644 --- a/Documentation/git-interpret-trailers.txt +++ b/Documentation/git-interpret-trailers.txt @@ -49,7 +49,8 @@ will be added before the new trailer. Existing trailers are extracted from the input message by looking for a group of one or more lines that (i) are all trailers, or (ii) contains at -least one Git-generated trailer and consists of at least 25% trailers. +least one Git-generated or user-configured trailer and consists of at +least 25% trailers. The group must be preceded by one or more empty (or whitespace-only) lines. The group must either be at the end of the message or be the last non-whitespace lines before a line that starts with '---'. Such three diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index c83aaf39c3..bae862ddcb 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -303,6 +303,15 @@ These options can be used to modify 'git p4 submit' behavior. submit manually or revert. This option always stops after the first (oldest) commit. Git tags are not exported to p4. +--shelve:: + Instead of submitting create a series of shelved changelists. + After creating each shelve, the relevant files are reverted/deleted. + If you have multiple commits pending multiple shelves will be created. + +--update-shelve CHANGELIST:: + Update an existing shelved changelist with this commit. Implies + --shelve. + --conflict=(ask|skip|quit):: Conflicts can occur when applying a commit to p4. When this happens, the default behavior ("ask") is to prompt whether to @@ -467,6 +476,10 @@ git-p4.client:: Client specified as an option to all p4 commands, with '-c ', including the client spec. +git-p4.retries:: + Specifies the number of times to retry a p4 command (notably, + 'p4 sync') if the network times out. The default value is 3. + Clone and sync variables ~~~~~~~~~~~~~~~~~~~~~~~~ git-p4.syncFromOrigin:: diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 5f9e65b0c4..9bee9b0c4c 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -664,13 +664,19 @@ creating the branch or tag. When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string. ++ +[verse] +config key: svn.useLogAuthor + --add-author-from:: When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits. - ++ +[verse] +config key: svn.addAuthorFrom ADVANCED OPTIONS ---------------- diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt index 0aeb020d02..e257c19ebe 100644 --- a/Documentation/git-worktree.txt +++ b/Documentation/git-worktree.txt @@ -133,7 +133,7 @@ OPTIONS + If the last path components in the working tree's path is unique among working trees, it can be used to identify worktrees. For example if -you only have to working trees at "/abc/def/ghi" and "/abc/def/ggg", +you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg", then "ghi" or "def/ghi" is enough to point to the former working tree. DETAILS diff --git a/Documentation/git.txt b/Documentation/git.txt index ab7215eee2..af191c51b1 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,6 +44,11 @@ unreleased) version of Git, that is available from the 'master' branch of the `git.git` repository. Documentation for older releases are available here: +* link:v2.11.0/git.html[documentation for release 2.11] + +* release notes for + link:RelNotes/2.11.0.txt[2.11]. + * link:v2.10.2/git.html[documentation for release 2.10.2] * release notes for diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 577ee844e0..a5f99cbb11 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -177,7 +177,7 @@ sharedindex.:: info:: Additional information about the repository is recorded in this directory. This directory is ignored if $GIT_COMMON_DIR - is set and "$GIT_COMMON_DIR/index" will be used instead. + is set and "$GIT_COMMON_DIR/info" will be used instead. info/refs:: This file helps dumb transports discover what refs are diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index feddf2326b..556fbfc104 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v2.11.0-rc0 +DEF_VER=v2.11.GIT LF=' ' diff --git a/Makefile b/Makefile index 9d6c245031..f53fcc90d7 100644 --- a/Makefile +++ b/Makefile @@ -1047,6 +1047,7 @@ ifeq ($(uname_S),Darwin) endif endif ifndef NO_APPLE_COMMON_CRYPTO + NO_OPENSSL = YesPlease APPLE_COMMON_CRYPTO = YesPlease COMPAT_CFLAGS += -DAPPLE_COMMON_CRYPTO endif diff --git a/RelNotes b/RelNotes index b54330f7cd..d09c3d5109 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes/2.11.0.txt \ No newline at end of file +Documentation/RelNotes/2.12.0.txt \ No newline at end of file diff --git a/archive.c b/archive.c index dde1ab4c79..01751e574b 100644 --- a/archive.c +++ b/archive.c @@ -504,15 +504,11 @@ static int parse_archive_args(int argc, const char **argv, } int write_archive(int argc, const char **argv, const char *prefix, - int setup_prefix, const char *name_hint, int remote) + const char *name_hint, int remote) { - int nongit = 0; const struct archiver *ar = NULL; struct archiver_args args; - if (setup_prefix && prefix == NULL) - prefix = setup_git_directory_gently(&nongit); - git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable); git_config(git_default_config, NULL); @@ -520,7 +516,7 @@ int write_archive(int argc, const char **argv, const char *prefix, init_zip_archiver(); argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote); - if (nongit) { + if (!startup_info->have_repository) { /* * We know this will die() with an error, so we could just * die ourselves; but its error message will be more specific diff --git a/archive.h b/archive.h index 4a791e1fed..415e0152e2 100644 --- a/archive.h +++ b/archive.h @@ -36,7 +36,7 @@ typedef int (*write_archive_entry_fn_t)(struct archiver_args *args, unsigned int mode); extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry); -extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix, const char *name_hint, int remote); +extern int write_archive(int argc, const char **argv, const char *prefix, const char *name_hint, int remote); const char *archive_format_from_filename(const char *filename); extern void *sha1_file_to_archive(const struct archiver_args *args, diff --git a/branch.c b/branch.c index a5a8dcbd0e..c431cbf6a9 100644 --- a/branch.c +++ b/branch.c @@ -228,8 +228,7 @@ N_("\n" "will track its remote counterpart, you may want to use\n" "\"git push -u\" to set the upstream config as you push."); -void create_branch(const char *head, - const char *name, const char *start_name, +void create_branch(const char *name, const char *start_name, int force, int reflog, int clobber_head, int quiet, enum branch_track track) { @@ -349,7 +348,7 @@ void die_if_checked_out(const char *branch, int ignore_current_worktree) int replace_each_worktree_head_symref(const char *oldref, const char *newref) { int ret = 0; - struct worktree **worktrees = get_worktrees(); + struct worktree **worktrees = get_worktrees(0); int i; for (i = 0; worktrees[i]; i++) { diff --git a/branch.h b/branch.h index b2f9649332..3103eb9add 100644 --- a/branch.h +++ b/branch.h @@ -4,15 +4,21 @@ /* Functions for acting on the information about branches. */ /* - * Creates a new branch, where head is the branch currently checked - * out, name is the new branch name, start_name is the name of the - * existing branch that the new branch should start from, force - * enables overwriting an existing (non-head) branch, reflog creates a - * reflog for the branch, and track causes the new branch to be - * configured to merge the remote branch that start_name is a tracking - * branch for (if any). + * Creates a new branch, where: + * + * - name is the new branch name + * + * - start_name is the name of the existing branch that the new branch should + * start from + * + * - force enables overwriting an existing (non-head) branch + * + * - reflog creates a reflog for the branch + * + * - track causes the new branch to be configured to merge the remote branch + * that start_name is a tracking branch for (if any). */ -void create_branch(const char *head, const char *name, const char *start_name, +void create_branch(const char *name, const char *start_name, int force, int reflog, int clobber_head, int quiet, enum branch_track track); diff --git a/builtin/archive.c b/builtin/archive.c index 49f491413a..f863465a0f 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -85,8 +85,8 @@ int cmd_archive(int argc, const char **argv, const char *prefix) const char *output = NULL; const char *remote = NULL; struct option local_opts[] = { - OPT_STRING('o', "output", &output, N_("file"), - N_("write the archive to this file")), + OPT_FILENAME('o', "output", &output, + N_("write the archive to this file")), OPT_STRING(0, "remote", &remote, N_("repo"), N_("retrieve the archive from remote repository ")), OPT_STRING(0, "exec", &exec, N_("command"), @@ -105,5 +105,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix) setvbuf(stderr, NULL, _IOLBF, BUFSIZ); - return write_archive(argc, argv, prefix, 1, output, 0); + return write_archive(argc, argv, prefix, output, 0); } diff --git a/builtin/branch.c b/builtin/branch.c index d5d93a8c03..475707528a 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -531,7 +531,7 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin static void reject_rebase_or_bisect_branch(const char *target) { - struct worktree **worktrees = get_worktrees(); + struct worktree **worktrees = get_worktrees(0); int i; for (i = 0; worktrees[i]; i++) { @@ -807,7 +807,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) * create_branch takes care of setting up the tracking * info and making sure new_upstream is correct */ - create_branch(head, branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); + create_branch(branch->name, new_upstream, 0, 0, 0, quiet, BRANCH_TRACK_OVERRIDE); } else if (unset_upstream) { struct branch *branch = branch_get(argv[0]); struct strbuf buf = STRBUF_INIT; @@ -853,7 +853,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix) strbuf_release(&buf); branch_existed = ref_exists(branch->refname); - create_branch(head, argv[0], (argc == 2) ? argv[1] : head, + create_branch(argv[0], (argc == 2) ? argv[1] : head, force, reflog, 0, quiet, track); /* diff --git a/builtin/checkout.c b/builtin/checkout.c index 9b2a5b31d4..512492aad9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -630,7 +630,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts, } } else - create_branch(old->name, opts->new_branch, new->name, + create_branch(opts->new_branch, new->name, opts->new_branch_force ? 1 : 0, opts->new_branch_log, opts->new_branch_force ? 1 : 0, diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c index f6df274111..e3b62f2fc7 100644 --- a/builtin/mailinfo.c +++ b/builtin/mailinfo.c @@ -11,15 +11,20 @@ static const char mailinfo_usage[] = "git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding= | -n] [--scissors | --no-scissors] < mail >info"; +static char *prefix_copy(const char *prefix, const char *filename) +{ + if (!prefix || is_absolute_path(filename)) + return xstrdup(filename); + return xstrdup(prefix_filename(prefix, strlen(prefix), filename)); +} + int cmd_mailinfo(int argc, const char **argv, const char *prefix) { const char *def_charset; struct mailinfo mi; int status; + char *msgfile, *patchfile; - /* NEEDSWORK: might want to do the optional .git/ directory - * discovery - */ setup_mailinfo(&mi); def_charset = get_commit_output_encoding(); @@ -54,8 +59,14 @@ int cmd_mailinfo(int argc, const char **argv, const char *prefix) mi.input = stdin; mi.output = stdout; - status = !!mailinfo(&mi, argv[1], argv[2]); + + msgfile = prefix_copy(prefix, argv[1]); + patchfile = prefix_copy(prefix, argv[2]); + + status = !!mailinfo(&mi, msgfile, patchfile); clear_mailinfo(&mi); + free(msgfile); + free(patchfile); return status; } diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c index cfb0f1510c..ff13e59e1d 100644 --- a/builtin/rev-parse.c +++ b/builtin/rev-parse.c @@ -342,11 +342,16 @@ static int try_parent_shorthands(const char *arg) for (parents = commit->parents, parent_number = 1; parents; parents = parents->next, parent_number++) { + char *name = NULL; + if (exclude_parent && parent_number != exclude_parent) continue; + if (symbolic) + name = xstrfmt("%s^%d", arg, parent_number); show_rev(include_parents ? NORMAL : REVERSED, - parents->item->object.oid.hash, arg); + parents->item->object.oid.hash, name); + free(name); } *dotdot = '^'; diff --git a/builtin/stripspace.c b/builtin/stripspace.c index 15e716ef43..1e62a008cb 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -44,8 +44,10 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix) if (argc) usage_with_options(stripspace_usage, options); - if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) + if (mode == STRIP_COMMENTS || mode == COMMENT_LINES) { + setup_git_directory_gently(NULL); git_config(git_default_config, NULL); + } if (strbuf_read(&buf, 0, 1024) < 0) die_errno("could not read the input"); diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index dc872f6a94..cde06977b7 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -43,7 +43,7 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix) } /* parse all options sent by the client */ - return write_archive(sent_argv.argc, sent_argv.argv, prefix, 0, NULL, 1); + return write_archive(sent_argv.argc, sent_argv.argv, prefix, NULL, 1); } __attribute__((format (printf, 1, 2))) diff --git a/builtin/worktree.c b/builtin/worktree.c index 5c4854d3e4..9a97e37a3f 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -388,7 +388,7 @@ static void show_worktree_porcelain(struct worktree *wt) printf("HEAD %s\n", sha1_to_hex(wt->head_sha1)); if (wt->is_detached) printf("detached\n"); - else + else if (wt->head_ref) printf("branch %s\n", wt->head_ref); } printf("\n"); @@ -406,10 +406,12 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len) else { strbuf_addf(&sb, "%-*s ", abbrev_len, find_unique_abbrev(wt->head_sha1, DEFAULT_ABBREV)); - if (!wt->is_detached) + if (wt->is_detached) + strbuf_addstr(&sb, "(detached HEAD)"); + else if (wt->head_ref) strbuf_addf(&sb, "[%s]", shorten_unambiguous_ref(wt->head_ref, 0)); else - strbuf_addstr(&sb, "(detached HEAD)"); + strbuf_addstr(&sb, "(error)"); } printf("%s\n", sb.buf); @@ -445,7 +447,7 @@ static int list(int ac, const char **av, const char *prefix) if (ac) usage_with_options(worktree_usage, options); else { - struct worktree **worktrees = get_worktrees(); + struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED); int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i; if (!porcelain) @@ -476,7 +478,7 @@ static int lock_worktree(int ac, const char **av, const char *prefix) if (ac != 1) usage_with_options(worktree_usage, options); - worktrees = get_worktrees(); + worktrees = get_worktrees(0); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); @@ -509,7 +511,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix) if (ac != 1) usage_with_options(worktree_usage, options); - worktrees = get_worktrees(); + worktrees = get_worktrees(0); wt = find_worktree(worktrees, prefix, av[0]); if (!wt) die(_("'%s' is not a working tree"), av[0]); diff --git a/common-main.c b/common-main.c index 44a29e8b13..c654f95551 100644 --- a/common-main.c +++ b/common-main.c @@ -33,7 +33,7 @@ int main(int argc, const char **argv) git_setup_gettext(); - argv[0] = git_extract_argv0_path(argv[0]); + git_extract_argv0_path(argv[0]); restore_sigpipe_to_default(); diff --git a/compat/mingw.h b/compat/mingw.h index 034fff9479..3350169555 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -384,6 +384,9 @@ int mingw_raise(int sig); * ANSI emulation wrappers */ +int winansi_isatty(int fd); +#define isatty winansi_isatty + void winansi_init(void); HANDLE winansi_get_osfhandle(int fd); diff --git a/compat/winansi.c b/compat/winansi.c index db4a5b0a37..cb725fb02f 100644 --- a/compat/winansi.c +++ b/compat/winansi.c @@ -7,6 +7,9 @@ #include #include +/* In this file, we actually want to use Windows' own isatty(). */ +#undef isatty + /* ANSI codes used by git: m, K @@ -570,6 +573,36 @@ static void detect_msys_tty(int fd) #endif +int winansi_isatty(int fd) +{ + int res = isatty(fd); + + if (res) { + /* + * Make sure that /dev/null is not fooling Git into believing + * that we are connected to a terminal, as "_isatty() returns a + * nonzero value if the descriptor is associated with a + * character device."; for more information, see + * + * https://msdn.microsoft.com/en-us/library/f4s0ddew.aspx + */ + HANDLE handle = (HANDLE)_get_osfhandle(fd); + if (fd == STDIN_FILENO) { + DWORD dummy; + + if (!GetConsoleMode(handle, &dummy)) + res = 0; + } else if (fd == STDOUT_FILENO || fd == STDERR_FILENO) { + CONSOLE_SCREEN_BUFFER_INFO dummy; + + if (!GetConsoleScreenBufferInfo(handle, &dummy)) + res = 0; + } + } + + return res; +} + void winansi_init(void) { int con1, con2; diff --git a/diff.c b/diff.c index 8981477c43..ec8728362d 100644 --- a/diff.c +++ b/diff.c @@ -2023,7 +2023,7 @@ static void show_dirstat(struct diff_options *options) if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) { diff_populate_filespec(p->one, 0); diff_populate_filespec(p->two, 0); - diffcore_count_changes(p->one, p->two, NULL, NULL, 0, + diffcore_count_changes(p->one, p->two, NULL, NULL, &copied, &added); diff_free_filespec_data(p->one); diff_free_filespec_data(p->two); diff --git a/diffcore-break.c b/diffcore-break.c index 881a74f29e..c64359f489 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -73,7 +73,6 @@ static int should_break(struct diff_filespec *src, if (diffcore_count_changes(src, dst, &src->cnt_data, &dst->cnt_data, - 0, &src_copied, &literal_added)) return 0; diff --git a/diffcore-delta.c b/diffcore-delta.c index 2ebedb32d1..ebe70fb068 100644 --- a/diffcore-delta.c +++ b/diffcore-delta.c @@ -166,7 +166,6 @@ int diffcore_count_changes(struct diff_filespec *src, struct diff_filespec *dst, void **src_count_p, void **dst_count_p, - unsigned long delta_limit, unsigned long *src_copied, unsigned long *literal_added) { diff --git a/diffcore-rename.c b/diffcore-rename.c index 54a2396653..f7444c86bd 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -145,7 +145,6 @@ static int estimate_similarity(struct diff_filespec *src, * call into this function in that case. */ unsigned long max_size, delta_size, base_size, src_copied, literal_added; - unsigned long delta_limit; int score; /* We deal only with regular files. Symlink renames are handled @@ -191,11 +190,8 @@ static int estimate_similarity(struct diff_filespec *src, if (!dst->cnt_data && diff_populate_filespec(dst, 0)) return 0; - delta_limit = (unsigned long) - (base_size * (MAX_SCORE-minimum_score) / MAX_SCORE); if (diffcore_count_changes(src, dst, &src->cnt_data, &dst->cnt_data, - delta_limit, &src_copied, &literal_added)) return 0; diff --git a/diffcore.h b/diffcore.h index c11b8465fc..6230241354 100644 --- a/diffcore.h +++ b/diffcore.h @@ -142,7 +142,6 @@ extern int diffcore_count_changes(struct diff_filespec *src, struct diff_filespec *dst, void **src_count_p, void **dst_count_p, - unsigned long delta_limit, unsigned long *src_copied, unsigned long *literal_added); diff --git a/exec_cmd.c b/exec_cmd.c index 9d5703a157..19ac2146d0 100644 --- a/exec_cmd.c +++ b/exec_cmd.c @@ -38,21 +38,17 @@ char *system_path(const char *path) return strbuf_detach(&d, NULL); } -const char *git_extract_argv0_path(const char *argv0) +void git_extract_argv0_path(const char *argv0) { const char *slash; if (!argv0 || !*argv0) - return NULL; + return; slash = find_last_dir_sep(argv0); - if (slash) { + if (slash) argv0_path = xstrndup(argv0, slash - argv0); - return slash + 1; - } - - return argv0; } void git_set_argv_exec_path(const char *exec_path) diff --git a/exec_cmd.h b/exec_cmd.h index 1f6b43378b..ff0b48048a 100644 --- a/exec_cmd.h +++ b/exec_cmd.h @@ -4,7 +4,7 @@ struct argv_array; extern void git_set_argv_exec_path(const char *exec_path); -extern const char *git_extract_argv0_path(const char *path); +extern void git_extract_argv0_path(const char *path); extern const char *git_exec_path(void); extern void setup_path(void); extern const char **prepare_git_cmd(struct argv_array *out, const char **argv); diff --git a/fetch-pack.c b/fetch-pack.c index cb45c346ea..601f0779a1 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -240,7 +240,7 @@ static enum ack_type get_ack(int fd, unsigned char *result_sha1) return ACK; } } - die(_("git fetch_pack: expected ACK/NAK, got '%s'"), line); + die(_("git fetch-pack: expected ACK/NAK, got '%s'"), line); } static void send_request(struct fetch_pack_args *args, diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index 9abd00be21..9a8b97a2ab 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -125,16 +125,7 @@ setup_user_tool () { } merge_cmd () { - trust_exit_code=$(git config --bool \ - "mergetool.$1.trustExitCode" || echo false) - if test "$trust_exit_code" = "false" - then - touch "$BACKUP" - ( eval $merge_tool_cmd ) - check_unchanged - else - ( eval $merge_tool_cmd ) - fi + ( eval $merge_tool_cmd ) } } @@ -162,6 +153,28 @@ setup_tool () { echo "$1" } + # Most tools' exit codes cannot be trusted, so By default we ignore + # their exit code and check the merged file's modification time in + # check_unchanged() to determine whether or not the merge was + # successful. The return value from run_merge_cmd, by default, is + # determined by check_unchanged(). + # + # When a tool's exit code can be trusted then the return value from + # run_merge_cmd is simply the tool's exit code, and check_unchanged() + # is not called. + # + # The return value of exit_code_trustable() tells us whether or not we + # can trust the tool's exit code. + # + # User-defined and built-in tools default to false. + # Built-in tools advertise that their exit code is trustable by + # redefining exit_code_trustable() to true. + + exit_code_trustable () { + false + } + + if ! test -f "$MERGE_TOOLS_DIR/$tool" then setup_user_tool @@ -197,6 +210,19 @@ get_merge_tool_cmd () { fi } +trust_exit_code () { + if git config --bool "mergetool.$1.trustExitCode" + then + :; # OK + elif exit_code_trustable + then + echo true + else + echo false + fi +} + + # Entry point for running tools run_merge_tool () { # If GIT_PREFIX is empty then we cannot use it in tools @@ -225,7 +251,15 @@ run_diff_cmd () { # Run a either a configured or built-in merge tool run_merge_cmd () { - merge_cmd "$1" + mergetool_trust_exit_code=$(trust_exit_code "$1") + if test "$mergetool_trust_exit_code" = "true" + then + merge_cmd "$1" + else + touch "$BACKUP" + merge_cmd "$1" + check_unchanged + fi } list_merge_tool_candidates () { diff --git a/git-p4.py b/git-p4.py index fd5ca52462..13bf44768b 100755 --- a/git-p4.py +++ b/git-p4.py @@ -78,6 +78,11 @@ def p4_build_cmd(cmd): if len(client) > 0: real_cmd += ["-c", client] + retries = gitConfigInt("git-p4.retries") + if retries is None: + # Perform 3 retries by default + retries = 3 + real_cmd += ["-r", str(retries)] if isinstance(cmd,basestring): real_cmd = ' '.join(real_cmd) + ' ' + cmd @@ -262,6 +267,10 @@ def p4_revert(f): def p4_reopen(type, f): p4_system(["reopen", "-t", type, wildcard_encode(f)]) +def p4_reopen_in_change(changelist, files): + cmd = ["reopen", "-c", str(changelist)] + files + p4_system(cmd) + def p4_move(src, dest): p4_system(["move", "-k", wildcard_encode(src), wildcard_encode(dest)]) @@ -1005,18 +1014,20 @@ def processContent(self, git_mode, relPath, contents): steps.""" if self.exceedsLargeFileThreshold(relPath, contents) or self.hasLargeFileExtension(relPath): contentTempFile = self.generateTempFile(contents) - (git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile) - - # Move temp file to final location in large file system - largeFileDir = os.path.dirname(localLargeFile) - if not os.path.isdir(largeFileDir): - os.makedirs(largeFileDir) - shutil.move(contentTempFile, localLargeFile) - self.addLargeFile(relPath) - if gitConfigBool('git-p4.largeFilePush'): - self.pushFile(localLargeFile) - if verbose: - sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile)) + (pointer_git_mode, contents, localLargeFile) = self.generatePointer(contentTempFile) + if pointer_git_mode: + git_mode = pointer_git_mode + if localLargeFile: + # Move temp file to final location in large file system + largeFileDir = os.path.dirname(localLargeFile) + if not os.path.isdir(largeFileDir): + os.makedirs(largeFileDir) + shutil.move(contentTempFile, localLargeFile) + self.addLargeFile(relPath) + if gitConfigBool('git-p4.largeFilePush'): + self.pushFile(localLargeFile) + if verbose: + sys.stderr.write("%s moved to large file system (%s)\n" % (relPath, localLargeFile)) return (git_mode, contents) class MockLFS(LargeFileSystem): @@ -1056,6 +1067,9 @@ def generatePointer(self, contentFile): the actual content. Return also the new location of the actual content. """ + if os.path.getsize(contentFile) == 0: + return (None, '', None) + pointerProcess = subprocess.Popen( ['git', 'lfs', 'pointer', '--file=' + contentFile], stdout=subprocess.PIPE @@ -1289,6 +1303,12 @@ def __init__(self): optparse.make_option("--conflict", dest="conflict_behavior", choices=self.conflict_behavior_choices), optparse.make_option("--branch", dest="branch"), + optparse.make_option("--shelve", dest="shelve", action="store_true", + help="Shelve instead of submit. Shelved files are reverted, " + "restoring the workspace to the state before the shelve"), + optparse.make_option("--update-shelve", dest="update_shelve", action="store", type="int", + metavar="CHANGELIST", + help="update an existing shelved changelist, implies --shelve") ] self.description = "Submit changes from git to the perforce depot." self.usage += " [name of git branch to submit into perforce depot]" @@ -1296,6 +1316,8 @@ def __init__(self): self.detectRenames = False self.preserveUser = gitConfigBool("git-p4.preserveUser") self.dry_run = False + self.shelve = False + self.update_shelve = None self.prepare_p4_only = False self.conflict_behavior = None self.isWindows = (platform.system() == "Windows") @@ -1464,7 +1486,7 @@ def canChangeChangelists(self): return 1 return 0 - def prepareSubmitTemplate(self): + def prepareSubmitTemplate(self, changelist=None): """Run "p4 change -o" to grab a change specification template. This does not use "p4 -G", as it is nice to keep the submission template in original order, since a human might edit it. @@ -1476,7 +1498,11 @@ def prepareSubmitTemplate(self): template = "" inFilesSection = False - for line in p4_read_pipe_lines(['change', '-o']): + args = ['change', '-o'] + if changelist: + args.append(str(changelist)) + + for line in p4_read_pipe_lines(args): if line.endswith("\r\n"): line = line[:-2] + "\n" if inFilesSection: @@ -1575,11 +1601,14 @@ def applyCommit(self, id): editedFiles = set() pureRenameCopy = set() filesToChangeExecBit = {} + all_files = list() for line in diff: diff = parseDiffTreeEntry(line) modifier = diff['status'] path = diff['src'] + all_files.append(path) + if modifier == "M": p4_edit(path) if isModeExecChanged(diff['src_mode'], diff['dst_mode']): @@ -1705,6 +1734,10 @@ def applyCommit(self, id): mode = filesToChangeExecBit[f] setP4ExecBit(f, mode) + if self.update_shelve: + print("all_files = %s" % str(all_files)) + p4_reopen_in_change(self.update_shelve, all_files) + # # Build p4 change description, starting with the contents # of the git commit message. @@ -1713,7 +1746,7 @@ def applyCommit(self, id): logMessage = logMessage.strip() (logMessage, jobs) = self.separate_jobs_from_description(logMessage) - template = self.prepareSubmitTemplate() + template = self.prepareSubmitTemplate(self.update_shelve) submitTemplate = self.prepareLogMessage(template, logMessage, jobs) if self.preserveUser: @@ -1785,7 +1818,17 @@ def applyCommit(self, id): if self.isWindows: message = message.replace("\r\n", "\n") submitTemplate = message[:message.index(separatorLine)] - p4_write_pipe(['submit', '-i'], submitTemplate) + + if self.update_shelve: + p4_write_pipe(['shelve', '-r', '-i'], submitTemplate) + elif self.shelve: + p4_write_pipe(['shelve', '-i'], submitTemplate) + else: + p4_write_pipe(['submit', '-i'], submitTemplate) + # The rename/copy happened by applying a patch that created a + # new file. This leaves it writable, which confuses p4. + for f in pureRenameCopy: + p4_sync(f, "-f") if self.preserveUser: if p4User: @@ -1795,23 +1838,20 @@ def applyCommit(self, id): changelist = self.lastP4Changelist() self.modifyChangelistUser(changelist, p4User) - # The rename/copy happened by applying a patch that created a - # new file. This leaves it writable, which confuses p4. - for f in pureRenameCopy: - p4_sync(f, "-f") submitted = True finally: # skip this patch - if not submitted: - print "Submission cancelled, undoing p4 changes." - for f in editedFiles: + if not submitted or self.shelve: + if self.shelve: + print ("Reverting shelved files.") + else: + print ("Submission cancelled, undoing p4 changes.") + for f in editedFiles | filesToDelete: p4_revert(f) for f in filesToAdd: p4_revert(f) os.remove(f) - for f in filesToDelete: - p4_revert(f) os.remove(fileName) return submitted @@ -1907,6 +1947,9 @@ def run(self, args): if len(self.origin) == 0: self.origin = upstream + if self.update_shelve: + self.shelve = True + if self.preserveUser: if not self.canChangeChangelists(): die("Cannot preserve user names without p4 super-user or admin permissions") @@ -2067,13 +2110,13 @@ def run(self, args): break chdir(self.oldWorkingDirectory) - + shelved_applied = "shelved" if self.shelve else "applied" if self.dry_run: pass elif self.prepare_p4_only: pass elif len(commits) == len(applied): - print "All commits applied!" + print ("All commits {0}!".format(shelved_applied)) sync = P4Sync() if self.branch: @@ -2085,9 +2128,9 @@ def run(self, args): else: if len(applied) == 0: - print "No commits applied." + print ("No commits {0}.".format(shelved_applied)) else: - print "Applied only the commits marked with '*':" + print ("{0} only the commits marked with '*':".format(shelved_applied.capitalize())) for c in commits: if c in applied: star = "*" diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index ca994c5c54..41fd374c72 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -93,8 +93,17 @@ eval ' GIT_CHERRY_PICK_HELP="$resolvemsg" export GIT_CHERRY_PICK_HELP -comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) -: ${comment_char:=#} +comment_char=$(git config --get core.commentchar 2>/dev/null) +case "$comment_char" in +'' | auto) + comment_char="#" + ;; +?) + ;; +*) + comment_char=$(echo "$comment_char" | cut -c1) + ;; +esac warn () { printf '%s\n' "$*" >&2 diff --git a/git.c b/git.c index efa1059fe0..dce529fcbf 100644 --- a/git.c +++ b/git.c @@ -396,7 +396,7 @@ static struct cmd_struct commands[] = { { "am", cmd_am, RUN_SETUP | NEED_WORK_TREE }, { "annotate", cmd_annotate, RUN_SETUP }, { "apply", cmd_apply, RUN_SETUP_GENTLY }, - { "archive", cmd_archive }, + { "archive", cmd_archive, RUN_SETUP_GENTLY }, { "bisect--helper", cmd_bisect__helper, RUN_SETUP }, { "blame", cmd_blame, RUN_SETUP }, { "branch", cmd_branch, RUN_SETUP }, @@ -445,7 +445,7 @@ static struct cmd_struct commands[] = { { "ls-files", cmd_ls_files, RUN_SETUP | SUPPORT_SUPER_PREFIX }, { "ls-remote", cmd_ls_remote, RUN_SETUP_GENTLY }, { "ls-tree", cmd_ls_tree, RUN_SETUP }, - { "mailinfo", cmd_mailinfo }, + { "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY }, { "mailsplit", cmd_mailsplit }, { "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE }, { "merge-base", cmd_merge_base, RUN_SETUP }, @@ -654,6 +654,11 @@ int cmd_main(int argc, const char **argv) cmd = argv[0]; if (!cmd) cmd = "git-help"; + else { + const char *slash = find_last_dir_sep(cmd); + if (slash) + cmd = slash + 1; + } trace_command_performance(argv); diff --git a/merge-recursive.c b/merge-recursive.c index 9041c2f149..c07ba0df9d 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -388,12 +388,10 @@ static struct string_list *get_unmerged(void) return unmerged; } -static int string_list_df_name_compare(const void *a, const void *b) +static int string_list_df_name_compare(const char *one, const char *two) { - const struct string_list_item *one = a; - const struct string_list_item *two = b; - int onelen = strlen(one->string); - int twolen = strlen(two->string); + int onelen = strlen(one); + int twolen = strlen(two); /* * Here we only care that entries for D/F conflicts are * adjacent, in particular with the file of the D/F conflict @@ -406,8 +404,8 @@ static int string_list_df_name_compare(const void *a, const void *b) * since in other cases any changes in their order due to * sorting cause no problems for us. */ - int cmp = df_name_compare(one->string, onelen, S_IFDIR, - two->string, twolen, S_IFDIR); + int cmp = df_name_compare(one, onelen, S_IFDIR, + two, twolen, S_IFDIR); /* * Now that 'foo' and 'foo/bar' compare equal, we have to make sure * that 'foo' comes before 'foo/bar'. @@ -451,8 +449,8 @@ static void record_df_conflict_files(struct merge_options *o, string_list_append(&df_sorted_entries, next->string)->util = next->util; } - qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items), - string_list_df_name_compare); + df_sorted_entries.cmp = string_list_df_name_compare; + string_list_sort(&df_sorted_entries); string_list_clear(&o->df_conflict_file_set, 1); for (i = 0; i < df_sorted_entries.nr; i++) { @@ -664,7 +662,13 @@ static char *unique_path(struct merge_options *o, const char *path, const char * return strbuf_detach(&newpath, NULL); } -static int dir_in_way(const char *path, int check_working_copy) +/** + * Check whether a directory in the index is in the way of an incoming + * file. Return 1 if so. If check_working_copy is non-zero, also + * check the working directory. If empty_ok is non-zero, also return + * 0 in the case where the working-tree dir exists but is empty. + */ +static int dir_in_way(const char *path, int check_working_copy, int empty_ok) { int pos; struct strbuf dirpath = STRBUF_INIT; @@ -684,7 +688,8 @@ static int dir_in_way(const char *path, int check_working_copy) } strbuf_release(&dirpath); - return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode); + return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) && + !(empty_ok && is_empty_dir(path)); } static int was_tracked(const char *path) @@ -1062,7 +1067,7 @@ static int handle_change_delete(struct merge_options *o, { char *renamed = NULL; int ret = 0; - if (dir_in_way(path, !o->call_depth)) { + if (dir_in_way(path, !o->call_depth, 0)) { renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2); } @@ -1195,7 +1200,7 @@ static int handle_file(struct merge_options *o, remove_file(o, 0, rename->path, 0); dst_name = unique_path(o, rename->path, cur_branch); } else { - if (dir_in_way(rename->path, !o->call_depth)) { + if (dir_in_way(rename->path, !o->call_depth, 0)) { dst_name = unique_path(o, rename->path, cur_branch); output(o, 1, _("%s is a directory in %s adding as %s instead"), rename->path, other_branch, dst_name); @@ -1704,7 +1709,8 @@ static int merge_content(struct merge_options *o, o->branch2 == rename_conflict_info->branch1) ? pair1->two->path : pair1->one->path; - if (dir_in_way(path, !o->call_depth)) + if (dir_in_way(path, !o->call_depth, + S_ISGITLINK(pair1->two->mode))) df_conflict_remains = 1; } if (merge_file_special_markers(o, &one, &a, &b, @@ -1862,7 +1868,8 @@ static int process_entry(struct merge_options *o, oid = b_oid; conf = _("directory/file"); } - if (dir_in_way(path, !o->call_depth)) { + if (dir_in_way(path, !o->call_depth, + S_ISGITLINK(a_mode))) { char *new_path = unique_path(o, path, add_branch); clean_merge = 0; output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " diff --git a/mergetools/araxis b/mergetools/araxis index 64f97c5e97..e2407b65b7 100644 --- a/mergetools/araxis +++ b/mergetools/araxis @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -wait -merge -3 -a1 \ @@ -12,7 +11,6 @@ merge_cmd () { "$merge_tool_path" -wait -2 \ "$LOCAL" "$REMOTE" "$MERGED" >/dev/null 2>&1 fi - check_unchanged } translate_merge_tool_path() { diff --git a/mergetools/bc b/mergetools/bc index b6319d206e..3a69e60faa 100644 --- a/mergetools/bc +++ b/mergetools/bc @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" "$BASE" \ @@ -12,7 +11,6 @@ merge_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" \ -mergeoutput="$MERGED" fi - check_unchanged } translate_merge_tool_path() { diff --git a/mergetools/codecompare b/mergetools/codecompare index 3f0486bc80..9f60e8da65 100644 --- a/mergetools/codecompare +++ b/mergetools/codecompare @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" -BF="$BASE" \ @@ -12,7 +11,6 @@ merge_cmd () { "$merge_tool_path" -MF="$LOCAL" -TF="$REMOTE" \ -RF="$MERGED" fi - check_unchanged } translate_merge_tool_path() { diff --git a/mergetools/deltawalker b/mergetools/deltawalker index b3c71b6236..ee6f374bce 100644 --- a/mergetools/deltawalker +++ b/mergetools/deltawalker @@ -16,6 +16,10 @@ merge_cmd () { fi >/dev/null 2>&1 } -translate_merge_tool_path() { +translate_merge_tool_path () { echo DeltaWalker } + +exit_code_trustable () { + true +} diff --git a/mergetools/diffmerge b/mergetools/diffmerge index f138cb4e73..9b6355b98a 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -12,3 +12,7 @@ merge_cmd () { --result="$MERGED" "$LOCAL" "$REMOTE" fi } + +exit_code_trustable () { + true +} diff --git a/mergetools/diffuse b/mergetools/diffuse index 02e0843f47..5a3ae8b569 100644 --- a/mergetools/diffuse +++ b/mergetools/diffuse @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" \ @@ -13,5 +12,4 @@ merge_cmd () { "$merge_tool_path" \ "$LOCAL" "$MERGED" "$REMOTE" | cat fi - check_unchanged } diff --git a/mergetools/ecmerge b/mergetools/ecmerge index 13c2e439de..6c5101c4f7 100644 --- a/mergetools/ecmerge +++ b/mergetools/ecmerge @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" \ @@ -12,5 +11,4 @@ merge_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" \ --default --mode=merge2 --to="$MERGED" fi - check_unchanged } diff --git a/mergetools/emerge b/mergetools/emerge index 7b895fdb1f..d1ce513ff5 100644 --- a/mergetools/emerge +++ b/mergetools/emerge @@ -20,3 +20,7 @@ merge_cmd () { translate_merge_tool_path() { echo emacs } + +exit_code_trustable () { + true +} diff --git a/mergetools/examdiff b/mergetools/examdiff index 7b524d4088..e72b06fc4d 100644 --- a/mergetools/examdiff +++ b/mergetools/examdiff @@ -3,14 +3,12 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -merge "$LOCAL" "$BASE" "$REMOTE" -o:"$MERGED" -nh else "$merge_tool_path" -merge "$LOCAL" "$REMOTE" -o:"$MERGED" -nh fi - check_unchanged } translate_merge_tool_path() { diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index 793d1293b1..0264ed5b20 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -21,3 +21,7 @@ merge_cmd () { >/dev/null 2>&1 fi } + +exit_code_trustable () { + true +} diff --git a/mergetools/kompare b/mergetools/kompare index 433686c12a..e8c0bfa678 100644 --- a/mergetools/kompare +++ b/mergetools/kompare @@ -5,3 +5,7 @@ can_merge () { diff_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" } + +exit_code_trustable () { + true +} diff --git a/mergetools/meld b/mergetools/meld index 83ebdfb4c3..bc178e8882 100644 --- a/mergetools/meld +++ b/mergetools/meld @@ -7,7 +7,7 @@ merge_cmd () { then check_meld_for_output_version fi - touch "$BACKUP" + if test "$meld_has_output_option" = true then "$merge_tool_path" --output "$MERGED" \ @@ -15,7 +15,6 @@ merge_cmd () { else "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE" fi - check_unchanged } # Check whether we should use 'meld --output ' diff --git a/mergetools/opendiff b/mergetools/opendiff index 0942b2a733..b608dd6de3 100644 --- a/mergetools/opendiff +++ b/mergetools/opendiff @@ -3,7 +3,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" "$LOCAL" "$REMOTE" \ @@ -12,5 +11,4 @@ merge_cmd () { "$merge_tool_path" "$LOCAL" "$REMOTE" \ -merge "$MERGED" | cat fi - check_unchanged } diff --git a/mergetools/p4merge b/mergetools/p4merge index 5a608abf9c..7a5b291dd2 100644 --- a/mergetools/p4merge +++ b/mergetools/p4merge @@ -20,14 +20,12 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if ! $base_present then cp -- "$LOCAL" "$BASE" create_virtual_base "$BASE" "$REMOTE" fi "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED" - check_unchanged } create_empty_file () { diff --git a/mergetools/tkdiff b/mergetools/tkdiff index 618c438e87..eee5cb57e3 100644 --- a/mergetools/tkdiff +++ b/mergetools/tkdiff @@ -10,3 +10,7 @@ merge_cmd () { "$merge_tool_path" -o "$MERGED" "$LOCAL" "$REMOTE" fi } + +exit_code_trustable () { + true +} diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index 3b89f1c82d..d7ab666a59 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -5,7 +5,6 @@ can_diff () { merge_cmd () { if $base_present then - touch "$BACKUP" basename="$(basename "$merge_tool_path" .exe)" if test "$basename" = "tortoisegitmerge" then @@ -17,7 +16,6 @@ merge_cmd () { -base:"$BASE" -mine:"$LOCAL" \ -theirs:"$REMOTE" -merged:"$MERGED" fi - check_unchanged else echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 diff --git a/mergetools/vimdiff b/mergetools/vimdiff index 74ea6d5479..10d86f3e19 100644 --- a/mergetools/vimdiff +++ b/mergetools/vimdiff @@ -4,7 +4,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" case "$1" in gvimdiff|vimdiff) if $base_present @@ -31,7 +30,6 @@ merge_cmd () { fi ;; esac - check_unchanged } translate_merge_tool_path() { @@ -44,3 +42,7 @@ translate_merge_tool_path() { ;; esac } + +exit_code_trustable () { + true +} diff --git a/mergetools/winmerge b/mergetools/winmerge index f3819d316a..74d03259fd 100644 --- a/mergetools/winmerge +++ b/mergetools/winmerge @@ -6,10 +6,8 @@ diff_cmd () { merge_cmd () { # mergetool.winmerge.trustExitCode is implicitly false. # touch $BACKUP so that we can check_unchanged. - touch "$BACKUP" "$merge_tool_path" -u -e -dl Local -dr Remote \ "$LOCAL" "$REMOTE" "$MERGED" - check_unchanged } translate_merge_tool_path() { diff --git a/mergetools/xxdiff b/mergetools/xxdiff index 05b443394b..e284811ff2 100644 --- a/mergetools/xxdiff +++ b/mergetools/xxdiff @@ -6,7 +6,6 @@ diff_cmd () { } merge_cmd () { - touch "$BACKUP" if $base_present then "$merge_tool_path" -X --show-merged-pane \ @@ -21,5 +20,4 @@ merge_cmd () { -R 'Accel.SearchForward: "Ctrl-G"' \ --merged-file "$MERGED" "$LOCAL" "$REMOTE" fi - check_unchanged } diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm index e764696801..56ad9870bc 100644 --- a/perl/Git/SVN/Ra.pm +++ b/perl/Git/SVN/Ra.pm @@ -606,7 +606,7 @@ sub minimize_url { my $latest = $ra->get_latest_revnum; $ra->get_log("", $latest, 0, 1, 0, 1, sub {}); }; - } while ($@ && ($c = shift @components)); + } while ($@ && defined($c = shift @components)); return canonicalize_url($url); } diff --git a/po/ca.po b/po/ca.po index 30e00e2b58..57d0e2faa8 100644 --- a/po/ca.po +++ b/po/ca.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2016-08-27 23:21+0800\n" -"PO-Revision-Date: 2016-08-28 10:32-0600\n" +"POT-Creation-Date: 2016-11-25 22:50+0800\n" +"PO-Revision-Date: 2016-11-28 20:03-0700\n" "Last-Translator: Alex Henrie \n" "Language-Team: Catalan\n" "Language: ca\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.8\n" +"X-Generator: Poedit 1.8.11\n" #: advice.c:55 #, c-format @@ -100,3957 +100,4458 @@ msgstr "" "\n" " git checkout -b \n" -#: archive.c:12 -msgid "git archive [] [...]" -msgstr "git archive [] [...]" +#: apply.c:57 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "opció d'espai en blanc '%s' no reconeguda" -#: archive.c:13 -msgid "git archive --list" -msgstr "git archive --list" +#: apply.c:73 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" -#: archive.c:14 -msgid "" -"git archive --remote [--exec ] [] [...]" -msgstr "" -"git archive --remote [--exec ] [] " -"[...]" +#: apply.c:125 +msgid "--reject and --3way cannot be used together." +msgstr "--reject i --3way no es poden usar junts." -#: archive.c:15 -msgid "git archive --remote [--exec ] --list" -msgstr "git archive --remote [--exec ] --list" +#: apply.c:127 +msgid "--cached and --3way cannot be used together." +msgstr "--cached i --3way no es poden usar junts." -#: archive.c:344 builtin/add.c:139 builtin/add.c:435 builtin/rm.c:327 -#, c-format -msgid "pathspec '%s' did not match any files" -msgstr "L'especificació de camí '%s' no ha coincidit amb cap fitxer" +#: apply.c:130 +msgid "--3way outside a repository" +msgstr "--3way fora d'un dipòsit" -#: archive.c:429 -msgid "fmt" -msgstr "format" +#: apply.c:141 +msgid "--index outside a repository" +msgstr "--index fora d'un dipòsit" -#: archive.c:429 -msgid "archive format" -msgstr "format d'arxiu" +#: apply.c:144 +msgid "--cached outside a repository" +msgstr "--cached fora d'un dipòsit" -#: archive.c:430 builtin/log.c:1422 -msgid "prefix" -msgstr "prefix" +#: apply.c:845 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "No es pot preparar l'expressió regular de marca de temps %s" -#: archive.c:431 -msgid "prepend prefix to each pathname in the archive" -msgstr "anteposa el prefix a cada nom de camí en l'arxiu" +#: apply.c:854 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec ha retornat %d per l'entrada: %s" -#: archive.c:432 builtin/archive.c:88 builtin/blame.c:2553 builtin/blame.c:2554 -#: builtin/config.c:59 builtin/fast-export.c:987 builtin/fast-export.c:989 -#: builtin/grep.c:722 builtin/hash-object.c:100 builtin/ls-files.c:460 -#: builtin/ls-files.c:463 builtin/notes.c:399 builtin/notes.c:562 -#: builtin/read-tree.c:109 parse-options.h:153 -msgid "file" -msgstr "fitxer" +#: apply.c:938 +#, 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" -#: archive.c:433 builtin/archive.c:89 -msgid "write the archive to this file" -msgstr "escriu l'arxiu a aquest fitxer" +#: apply.c:977 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "" +"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d" -#: archive.c:435 -msgid "read .gitattributes in working directory" -msgstr "llegeix .gitattributes en el directori de treball" +#: apply.c:983 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "" +"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d" -#: archive.c:436 -msgid "report archived files on stderr" -msgstr "informa de fitxers arxivats en stderr" +#: apply.c:984 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "" +"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d" -#: archive.c:437 -msgid "store only" -msgstr "només emmagatzema" +#: apply.c:990 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d" -#: archive.c:438 -msgid "compress faster" -msgstr "comprimeix més ràpidament" +#: apply.c:1488 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recompte: línia inesperada: %.*s" -#: archive.c:446 -msgid "compress better" -msgstr "comprimeix millor" +#: apply.c:1557 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" -#: archive.c:449 -msgid "list supported archive formats" -msgstr "allista els formats d'arxiu admesos" +#: apply.c:1577 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +"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)" -#: archive.c:451 builtin/archive.c:90 builtin/clone.c:82 -#: builtin/submodule--helper.c:832 -msgid "repo" -msgstr "dipòsit" +#: apply.c:1589 +#, 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)" -#: archive.c:452 builtin/archive.c:91 -msgid "retrieve the archive from remote repository " -msgstr "recupera l'arxiu del dipòsit remot " +#: apply.c:1759 +msgid "new file depends on old contents" +msgstr "el fitxer nou depèn dels continguts antics" -#: archive.c:453 builtin/archive.c:92 builtin/notes.c:483 -msgid "command" -msgstr "ordre" +#: apply.c:1761 +msgid "deleted file still has contents" +msgstr "el fitxer suprimit encara té continguts" -#: archive.c:454 builtin/archive.c:93 -msgid "path to the remote git-upload-archive command" -msgstr "camí a l'ordre git-upload-archive remota" +#: apply.c:1795 +#, c-format +msgid "corrupt patch at line %d" +msgstr "pedaç malmès a la línia %d" -#: archive.c:461 -msgid "Unexpected option --remote" -msgstr "Opció inesperada --remote" +#: apply.c:1832 +#, c-format +msgid "new file %s depends on old contents" +msgstr "el fitxer nou %s depèn dels continguts antics" -#: archive.c:463 -msgid "Option --exec can only be used together with --remote" -msgstr "L'opció --exec només es pot usar junt amb --remote" +#: apply.c:1834 +#, c-format +msgid "deleted file %s still has contents" +msgstr "el fitxer suprimit %s encara té continguts" -#: archive.c:465 -msgid "Unexpected option --output" -msgstr "Opció inesperada --output" +#: apply.c:1837 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" -#: archive.c:487 +#: apply.c:1984 #, c-format -msgid "Unknown archive format '%s'" -msgstr "Format d'arxiu desconegut '%s'" +msgid "corrupt binary patch at line %d: %.*s" +msgstr "pedaç binari malmès a la línia %d: %.*s" -#: archive.c:494 +#: apply.c:2021 #, c-format -msgid "Argument not supported for format '%s': -%d" -msgstr "Paràmetre no admet per al format '%s': -%d" +msgid "unrecognized binary patch at line %d" +msgstr "pedaç binari no reconegut a la línia %d" -#: attr.c:263 -msgid "" -"Negative patterns are ignored in git attributes\n" -"Use '\\!' for literal leading exclamation." -msgstr "" -"Els patrons negatius s'ignoren en els atributs de git\n" -"Useu '\\!' per exclamació capdavantera literal." +#: apply.c:2182 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "pedaç amb només escombraries a la línia %d" -#: bisect.c:441 +#: apply.c:2274 #, c-format -msgid "Could not open file '%s'" -msgstr "No s'ha pogut obrir el fitxer '%s'" +msgid "unable to read symlink %s" +msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" -#: bisect.c:446 +#: apply.c:2278 #, c-format -msgid "Badly quoted content in file '%s': %s" -msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s" +msgid "unable to open or read %s" +msgstr "no s'ha pogut obrir o llegir %s" -#: bisect.c:655 +#: apply.c:2931 #, c-format -msgid "We cannot bisect more!\n" -msgstr "No podem bisecar més!\n" +msgid "invalid start of line: '%c'" +msgstr "inici de línia no vàlid: '%c'" -#: bisect.c:708 +#: apply.c:3050 #, c-format -msgid "Not a valid commit name %s" -msgstr "No és un nom de comissió vàlid %s" +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)." -#: bisect.c:732 +#: apply.c:3062 #, c-format -msgid "" -"The merge base %s is bad.\n" -"This means the bug has been fixed between %s and [%s].\n" -msgstr "" -"La base de fusió %s és dolenta.\n" -"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" +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" -#: bisect.c:737 +#: apply.c:3068 #, c-format msgid "" -"The merge base %s is new.\n" -"The property has changed between %s and [%s].\n" +"while searching for:\n" +"%.*s" msgstr "" -"La base de fusió %s és nova.\n" -"La propietat s'ha canviat entre %s i [%s].\n" +"tot cercant:\n" +"%.*s" -#: bisect.c:742 +#: apply.c:3090 #, c-format -msgid "" -"The merge base %s is %s.\n" -"This means the first '%s' commit is between %s and [%s].\n" -msgstr "" -"La base de fusió %s és %s.\n" -"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n" +msgid "missing binary patch data for '%s'" +msgstr "manquen les dades de pedaç binari de '%s'" -#: bisect.c:750 +#: apply.c:3098 #, c-format -msgid "" -"Some %s revs are not ancestor of the %s rev.\n" -"git bisect cannot work properly in this case.\n" -"Maybe you mistook %s and %s revs?\n" +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:3144 +#, c-format +msgid "cannot apply binary patch to '%s' without full index line" msgstr "" -"Unes %s revisions no són els avantpassats de la revisió %s.\n" -"git bisect no pot funcionar correctament en aquest cas.\n" -"Potser heu confós les revisions %s i %s?\n" +"no es pot aplicar un pedaç binari a '%s' sense la línia d'índex completa" -#: bisect.c:763 +#: apply.c:3154 #, c-format msgid "" -"the merge base between %s and [%s] must be skipped.\n" -"So we cannot be sure the first %s commit is between %s and %s.\n" -"We continue anyway." +"the patch applies to '%s' (%s), which does not match the current contents." msgstr "" -"s'ha de saltar 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" -"Continuem de totes maneres." +"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts " +"actuals." -#: bisect.c:798 +#: apply.c:3162 #, c-format -msgid "Bisecting: a merge base must be tested\n" -msgstr "Bisecant: s'ha de provar una base de fusió\n" +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" -#: bisect.c:849 +#: apply.c:3180 #, c-format -msgid "a %s revision is needed" -msgstr "es necessita una revisió %s" +msgid "the necessary postimage %s for '%s' cannot be read" +msgstr "no es pot llegir la postimatge necessari %s per a '%s'" -#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 +#: apply.c:3193 #, c-format -msgid "could not create file '%s'" -msgstr "no s'ha pogut crear el fitxer '%s'" +msgid "binary patch does not apply to '%s'" +msgstr "el pedaç binari no s'aplica a '%s'" -#: bisect.c:917 +#: apply.c:3199 #, c-format -msgid "could not read file '%s'" -msgstr "no s'ha pogut llegir el fitxer '%s'" +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "" +"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" -#: bisect.c:947 -msgid "reading bisect refs failed" -msgstr "la lectura de les referències de bisecció ha fallat" +#: apply.c:3220 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "el pedaç ha fallat: %s:%ld" -#: bisect.c:967 +#: apply.c:3342 #, c-format -msgid "%s was both %s and %s\n" -msgstr "%s era ambdós %s i %s\n" +msgid "cannot checkout %s" +msgstr "no es pot agafar %s" -#: bisect.c:975 +#: apply.c:3390 apply.c:3401 apply.c:3447 setup.c:248 #, c-format -msgid "" -"No testable commit found.\n" -"Maybe you started with bad path parameters?\n" -msgstr "" -"No s'ha trobat cap comissió provable.\n" -"Potser heu començat amb paràmetres de camí dolents?\n" +msgid "failed to read %s" +msgstr "s'ha fallat en llegir %s" -#: bisect.c:994 +#: apply.c:3398 #, c-format -msgid "(roughly %d step)" -msgid_plural "(roughly %d steps)" -msgstr[0] "(aproximadament %d pas)" -msgstr[1] "(aproximadament %d passos)" +msgid "reading from '%s' beyond a symbolic link" +msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic" -#. TRANSLATORS: the last %s will be replaced with -#. "(roughly %d steps)" translation -#: bisect.c:998 +#: apply.c:3427 apply.c:3667 #, 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" +msgid "path %s has been renamed/deleted" +msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" -#: branch.c:53 +#: apply.c:3510 apply.c:3681 #, c-format -msgid "" -"\n" -"After fixing the error cause you may try to fix up\n" -"the remote tracking information by invoking\n" -"\"git branch --set-upstream-to=%s%s%s\"." -msgstr "" -"\n" -"Després de corregir la causa de l'error, podeu\n" -"intentar corregir la informació de seguiment remot\n" -"invocant \"git branch --set-upstream-to=%s%s%s\"." +msgid "%s: does not exist in index" +msgstr "%s: no existeix en l'índex" -#: branch.c:67 +#: apply.c:3519 apply.c:3689 #, 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." +msgid "%s: does not match index" +msgstr "%s: no coincideix amb l'índex" -#: branch.c:93 -#, c-format -msgid "Branch %s set up to track remote branch %s from %s by rebasing." +#: apply.c:3554 +msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" -"La branca %s està configurada per a seguir la branca remota %s de %s per " -"rebasar." +"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies." -#: branch.c:94 +#: apply.c:3557 #, 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." +msgid "Falling back to three-way merge...\n" +msgstr "S'està retrocedint a una fusió de 3 vies...\n" -#: branch.c:98 +#: apply.c:3573 apply.c:3577 #, c-format -msgid "Branch %s set up to track local branch %s by rebasing." -msgstr "" -"La branca %s està configurada per a seguir la branca local %s per rebasar." +msgid "cannot read the current contents of '%s'" +msgstr "no es poden llegir els continguts actuals de '%s'" -#: branch.c:99 +#: apply.c:3589 #, 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." +msgid "Failed to fall back on three-way merge...\n" +msgstr "S'ha fallat en retrocedir a una fusió de 3 vies...\n" -#: branch.c:104 +#: apply.c:3603 #, c-format -msgid "Branch %s set up to track remote ref %s by rebasing." -msgstr "" -"La branca %s està configurada per a seguir la referència remota %s per " -"rebasar." +msgid "Applied patch to '%s' with conflicts.\n" +msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n" -#: branch.c:105 +#: apply.c:3608 #, 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." +msgid "Applied patch to '%s' cleanly.\n" +msgstr "S'ha aplicat el pedaç a '%s' netament.\n" -#: branch.c:109 -#, c-format -msgid "Branch %s set up to track local ref %s by rebasing." -msgstr "" -"La branca %s està configurada per a seguir la referència local %s per " -"rebasar." +#: apply.c:3634 +msgid "removal patch leaves file contents" +msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" -#: branch.c:110 +#: apply.c:3706 #, 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:119 -msgid "Unable to write upstream branch configuration" -msgstr "No es pot escriure la configuració de la branca font" +msgid "%s: wrong type" +msgstr "%s: tipus erroni" -#: branch.c:156 +#: apply.c:3708 #, c-format -msgid "Not tracking: ambiguous information for ref %s" -msgstr "No seguint: informació ambigua per a la referència %s" +msgid "%s has type %o, expected %o" +msgstr "%s és del tipus %o, s'esperava %o" -#: branch.c:185 +#: apply.c:3859 apply.c:3861 #, c-format -msgid "'%s' is not a valid branch name." -msgstr "'%s' no és un nom de branca vàlid." +msgid "invalid path '%s'" +msgstr "camí no vàlid: %s" -#: branch.c:190 +#: apply.c:3917 #, c-format -msgid "A branch named '%s' already exists." -msgstr "Una branca amb nom '%s' ja existeix." - -#: branch.c:198 -msgid "Cannot force update the current branch." -msgstr "No es pot actualitzar la branca actual a la força." +msgid "%s: already exists in index" +msgstr "%s: ja existeix en l'índex" -#: branch.c:218 +#: apply.c:3920 #, 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." +msgid "%s: already exists in working directory" +msgstr "%s: ja existeix en el directori de treball" -#: branch.c:220 +#: apply.c:3940 #, c-format -msgid "the requested upstream branch '%s' does not exist" -msgstr "la branca font demanada '%s' no existeix" - -#: branch.c:222 -msgid "" -"\n" -"If you are planning on basing your work on an upstream\n" -"branch that already exists at the remote, you may need to\n" -"run \"git fetch\" to retrieve it.\n" -"\n" -"If you are planning to push out a new local branch that\n" -"will track its remote counterpart, you may want to use\n" -"\"git push -u\" to set the upstream config as you push." -msgstr "" -"\n" -"Si teniu pensat basar el vostre treball en una branca\n" -"font que ja existeix al remot, pot ser que necessiteu\n" -"executar \"git fetch\" per a obtenir-la.\n" -"\n" -"Si teniu pensat pujar una branca local nova que seguirà\n" -"la seva contrapart remota, pot ser que vulgueu usar\n" -"\"git push -u\" per a establir la configuració font\n" -"mentre pugeu." +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)" -#: branch.c:266 +#: apply.c:3945 #, c-format -msgid "Not a valid object name: '%s'." -msgstr "No és un nom d'objecte vàlid: '%s'." +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" -#: branch.c:286 +#: apply.c:3965 #, c-format -msgid "Ambiguous object name: '%s'." -msgstr "Nom d'objecte ambigu: '%s'." +msgid "affected file '%s' is beyond a symbolic link" +msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" -#: branch.c:291 +#: apply.c:3969 #, c-format -msgid "Not a valid branch point: '%s'." -msgstr "No és un punt de ramificació vàlid: '%s'." +msgid "%s: patch does not apply" +msgstr "%s: el pedaç no s'aplica" -#: branch.c:345 +#: apply.c:3984 #, c-format -msgid "'%s' is already checked out at '%s'" -msgstr "'%s' ja s'ha agafat a '%s'" +msgid "Checking patch %s..." +msgstr "S'està comprovant el pedaç %s..." -#: branch.c:364 +#: apply.c:4075 #, c-format -msgid "HEAD of working tree %s is not updated" -msgstr "La HEAD de l'arbre de treball %s no està actualitzat" +msgid "sha1 information is lacking or useless for submodule %s" +msgstr "falta la informació sha1 o és inútil per al submòdul %s" -#: bundle.c:34 +#: apply.c:4082 #, c-format -msgid "'%s' does not look like a v2 bundle file" -msgstr "'%s' no sembla un fitxer de farcell v2" +msgid "mode change for %s, which is not in current HEAD" +msgstr "canvi de mode per a %s, el qual no està en el HEAD actual" -#: bundle.c:61 +#: apply.c:4085 #, c-format -msgid "unrecognized header: %s%s (%d)" -msgstr "capçalera no reconeguda: %s%s (%d)" +msgid "sha1 information is lacking or useless (%s)." +msgstr "falta informació sha1 o és inútil (%s)." -#: bundle.c:87 builtin/commit.c:778 +#: apply.c:4090 builtin/checkout.c:233 builtin/reset.c:135 #, c-format -msgid "could not open '%s'" -msgstr "no s'ha pogut obrir '%s'" - -#: bundle.c:139 -msgid "Repository lacks these prerequisite commits:" -msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry ha fallat per al camí '%s'" -#: bundle.c:163 ref-filter.c:1462 sequencer.c:630 sequencer.c:1085 -#: builtin/blame.c:2763 builtin/commit.c:1057 builtin/log.c:348 -#: builtin/log.c:890 builtin/log.c:1336 builtin/log.c:1659 builtin/log.c:1901 -#: builtin/merge.c:356 builtin/shortlog.c:170 -msgid "revision walk setup failed" -msgstr "la configuració del passeig per revisions ha fallat" +#: apply.c:4094 +#, c-format +msgid "could not add %s to temporary index" +msgstr "no s'ha pogut afegir %s a l'index temporal" -#: bundle.c:185 +#: apply.c:4104 #, 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:" +msgid "could not write temporary index to %s" +msgstr "no s'ha pogut escriure l'índex temporal a %s" -#: bundle.c:192 -msgid "The bundle records a complete history." -msgstr "El farcell registra una història completa." +#: apply.c:4242 +#, c-format +msgid "unable to remove %s from index" +msgstr "no s'ha pogut eliminar %s de l'índex" -#: bundle.c:194 +#: apply.c:4277 #, 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:" +msgid "corrupt patch for submodule %s" +msgstr "pedaç malmès per al submòdul %s" -#: bundle.c:253 -msgid "Could not spawn pack-objects" -msgstr "No s'ha pogut executar el pack-objects" +#: apply.c:4283 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" -#: bundle.c:264 -msgid "pack-objects died" -msgstr "El pack-objects s'ha mort" +#: apply.c:4291 +#, 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" -#: bundle.c:304 -msgid "rev-list died" -msgstr "El rev-list s'ha mort" +#: apply.c:4297 apply.c:4441 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "no s'ha pogut afegir una entrada de cau per a %s" -#: bundle.c:353 +#: apply.c:4338 #, 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'" +msgid "failed to write to '%s'" +msgstr "s'ha fallat en escriure a '%s'" -#: bundle.c:443 builtin/log.c:165 builtin/log.c:1565 builtin/shortlog.c:273 +#: apply.c:4342 #, c-format -msgid "unrecognized argument: %s" -msgstr "paràmetre no reconegut: %s" +msgid "closing file '%s'" +msgstr "s'està tancant el fitxer '%s'" -#: bundle.c:451 -msgid "Refusing to create empty bundle." -msgstr "S'està refusant crear un farcell buit." +#: apply.c:4412 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" -#: bundle.c:463 +#: apply.c:4510 #, c-format -msgid "cannot create '%s'" -msgstr "no es pot crear '%s'" +msgid "Applied patch %s cleanly." +msgstr "El pedaç %s s'ha aplicat netament." -#: bundle.c:491 -msgid "index-pack died" -msgstr "L'index-pack s'ha mort" +#: apply.c:4518 +msgid "internal error" +msgstr "error intern" -#: color.c:290 +#: apply.c:4521 #, c-format -msgid "invalid color value: %.*s" -msgstr "valor de color no vàlid: %.*s" +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 rebuitjos..." -#: commit.c:40 builtin/am.c:433 builtin/am.c:469 builtin/am.c:1505 -#: builtin/am.c:2119 +#: apply.c:4532 #, c-format -msgid "could not parse %s" -msgstr "no s'ha pogut analitzar %s" +msgid "truncating .rej filename to %.*s.rej" +msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" -#: commit.c:42 +#: apply.c:4540 builtin/fetch.c:740 builtin/fetch.c:989 #, c-format -msgid "%s %s is not a commit!" -msgstr "%s %s no és una comissió!" +msgid "cannot open %s" +msgstr "no es pot obrir %s" -#: compat/obstack.c:406 compat/obstack.c:408 -msgid "memory exhausted" -msgstr "memòria esgotada" +#: apply.c:4554 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "El tros #%d s'ha aplicat netament." -#: config.c:516 +#: apply.c:4558 #, c-format -msgid "bad config line %d in blob %s" -msgstr "línia de configuració dolenta %d en el blob %s" +msgid "Rejected hunk #%d." +msgstr "S'ha rebutjat el tros #%d." -#: config.c:520 +#: apply.c:4668 #, c-format -msgid "bad config line %d in file %s" -msgstr "línia de configuració dolenta %d en el fitxer %s" +msgid "Skipped patch '%s'." +msgstr "S'ha saltat el pedaç '%s'." -#: config.c:524 +#: apply.c:4676 +msgid "unrecognized input" +msgstr "entrada no reconeguda" + +#: apply.c:4695 +msgid "unable to read index file" +msgstr "no es pot llegir el fitxer d'índex" + +#: apply.c:4833 #, c-format -msgid "bad config line %d in standard input" -msgstr "línia de configuració dolenta %d en l'entrada estàndard" +msgid "can't open patch '%s': %s" +msgstr "no es pot obrir el pedaç '%s': %s" -#: config.c:528 +#: apply.c:4858 #, c-format -msgid "bad config line %d in submodule-blob %s" -msgstr "línia de configuració dolenta %d en el blob de submòdul %s" +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "s'ha omès %d error d'espai en blanc" +msgstr[1] "s'han omès %d errors d'espai en blanc" -#: config.c:532 +#: apply.c:4864 apply.c:4879 #, c-format -msgid "bad config line %d in command line %s" -msgstr "línia de configuració dolenta %d en la línia d'ordres %s" +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." -#: config.c:536 +#: apply.c:4872 #, c-format -msgid "bad config line %d in %s" -msgstr "línia de configuració dolenta %d en %s" +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." -#: config.c:655 -msgid "out of range" -msgstr "fora de rang" +#: apply.c:4888 builtin/add.c:463 builtin/mv.c:286 builtin/rm.c:431 +msgid "Unable to write new index file" +msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: config.c:655 -msgid "invalid unit" -msgstr "unitat no vàlida" +#: apply.c:4919 apply.c:4922 builtin/am.c:2277 builtin/am.c:2280 +#: builtin/clone.c:95 builtin/fetch.c:98 builtin/pull.c:180 +#: builtin/submodule--helper.c:281 builtin/submodule--helper.c:407 +#: builtin/submodule--helper.c:589 builtin/submodule--helper.c:592 +#: builtin/submodule--helper.c:944 builtin/submodule--helper.c:947 +msgid "path" +msgstr "camí" -#: config.c:661 -#, c-format -msgid "bad numeric config value '%s' for '%s': %s" -msgstr "valor de configuració numèric dolent '%s' per '%s': %s" +#: apply.c:4920 +msgid "don't apply changes matching the given path" +msgstr "no apliquis els canvis que coincideixin amb el camí donat" -#: config.c:666 -#, c-format -msgid "bad numeric config value '%s' for '%s' in blob %s: %s" -msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s" +#: apply.c:4923 +msgid "apply changes matching the given path" +msgstr "aplica els canvis que coincideixin amb el camí donat" -#: config.c:669 -#, c-format -msgid "bad numeric config value '%s' for '%s' in file %s: %s" -msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s" +#: apply.c:4925 builtin/am.c:2286 +msgid "num" +msgstr "número" -#: config.c:672 -#, c-format -msgid "bad numeric config value '%s' for '%s' in standard input: %s" +#: apply.c:4926 +msgid "remove leading slashes from traditional diff paths" msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s" +"elimina barres obliqües inicials dels camins de diferència " +"tradicionals" -#: config.c:675 -#, c-format -msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" -msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul " -"%s: %s" +#: apply.c:4929 +msgid "ignore additions made by the patch" +msgstr "ignora afegiments fets pel pedaç" -#: config.c:678 -#, c-format -msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +#: apply.c:4931 +msgid "instead of applying the patch, output diffstat for the input" msgstr "" -"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: " -"%s" +"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" -#: config.c:681 -#, c-format -msgid "bad numeric config value '%s' for '%s' in %s: %s" -msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s" +#: apply.c:4935 +msgid "show number of added and deleted lines in decimal notation" +msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" -#: config.c:768 -#, c-format -msgid "failed to expand user dir in: '%s'" -msgstr "s'ha fallat en expandir el directori d'usuari en '%s'" +#: apply.c:4937 +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" -#: config.c:849 config.c:860 -#, c-format -msgid "bad zlib compression level %d" -msgstr "nivell de compressió de zlib dolent %d" +#: apply.c:4939 +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" -#: config.c:978 -#, c-format -msgid "invalid mode for object creation: %s" -msgstr "mode de creació d'objecte no vàlid: %s" +#: apply.c:4941 +msgid "make sure the patch is applicable to the current index" +msgstr "assegura que el pedaç sigui aplicable a l'índex actual" -#: config.c:1312 -msgid "unable to parse command-line config" -msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" +#: apply.c:4943 +msgid "apply a patch without touching the working tree" +msgstr "aplica un pedaç sense tocar l'arbre de treball" -#: config.c:1362 -msgid "unknown error occurred while reading the configuration files" -msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" +#: apply.c:4945 +msgid "accept a patch that touches outside the working area" +msgstr "accepta un pedaç que toqui fora de l'àrea de treball" -#: config.c:1716 -#, 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" +#: apply.c:4947 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" -#: config.c:1718 -#, c-format -msgid "bad config variable '%s' in file '%s' at line %d" -msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d" +#: apply.c:4949 +msgid "attempt three-way merge if a patch does not apply" +msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" -#: config.c:1777 -#, c-format -msgid "%s has multiple values" -msgstr "%s té múltiples valors" +#: apply.c:4951 +msgid "build a temporary index based on embedded index information" +msgstr "construeix un índex temporal basat en la informació d'índex incrustada" -#: config.c:2311 -#, c-format -msgid "could not set '%s' to '%s'" -msgstr "no s'ha pogut establir '%s' a '%s'" +#: apply.c:4954 builtin/checkout-index.c:169 builtin/ls-files.c:505 +msgid "paths are separated with NUL character" +msgstr "els camins se separen amb el caràcter NUL" -#: config.c:2313 -#, c-format -msgid "could not unset '%s'" -msgstr "no s'ha pogut desestablir '%s'" +#: apply.c:4956 +msgid "ensure at least lines of context match" +msgstr "assegura't que almenys línies de context coincideixin" -#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 -msgid "Checking connectivity" -msgstr "S'està comprovant la connectivitat" +#: apply.c:4957 builtin/am.c:2265 +msgid "action" +msgstr "acció" -#: connected.c:74 -msgid "Could not run 'git rev-list'" -msgstr "No s'ha pogut executar 'git rev-list'" +#: apply.c:4958 +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" -#: connected.c:94 -msgid "failed write to rev-list" -msgstr "escriptura fallada a rev-list" +#: apply.c:4961 apply.c:4964 +msgid "ignore changes in whitespace when finding context" +msgstr "ignora els canvis d'espai en blanc en cercar context" -#: connected.c:101 -msgid "failed to close rev-list's stdin" -msgstr "s'ha fallat en tancar l'stdin del rev-list" +#: apply.c:4967 +msgid "apply the patch in reverse" +msgstr "aplica el pedaç al revés" -#: date.c:97 -msgid "in the future" -msgstr "en el futur" +#: apply.c:4969 +msgid "don't expect at least one line of context" +msgstr "no esperis almenys una línia de context" -#: date.c:103 -#, c-format -msgid "%lu second ago" -msgid_plural "%lu seconds ago" -msgstr[0] "fa %lu segon" -msgstr[1] "fa %lu segons" +#: apply.c:4971 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "deixa els trossos rebutjats en fitxers *.reg corresponents" -#: date.c:110 -#, c-format -msgid "%lu minute ago" -msgid_plural "%lu minutes ago" -msgstr[0] "fa %lu minut" -msgstr[1] "fa %lu minuts" +#: apply.c:4973 +msgid "allow overlapping hunks" +msgstr "permet trossos encavalcants" -#: date.c:117 -#, c-format -msgid "%lu hour ago" -msgid_plural "%lu hours ago" -msgstr[0] "fa %lu hora" -msgstr[1] "fa %lu hores" +#: apply.c:4974 builtin/add.c:267 builtin/check-ignore.c:19 +#: builtin/commit.c:1339 builtin/count-objects.c:94 builtin/fsck.c:593 +#: builtin/log.c:1860 builtin/mv.c:110 builtin/read-tree.c:114 +msgid "be verbose" +msgstr "sigues detallat" -#: date.c:124 -#, c-format -msgid "%lu day ago" -msgid_plural "%lu days ago" -msgstr[0] "fa %lu dia" -msgstr[1] "fa %lu dies" +#: apply.c:4976 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "tolera una línia nova incorrectament detectada al final del fitxer" -#: date.c:130 -#, c-format -msgid "%lu week ago" -msgid_plural "%lu weeks ago" -msgstr[0] "fa %lu setmana" -msgstr[1] "fa %lu setmanes" +#: apply.c:4979 +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" -#: date.c:137 -#, c-format -msgid "%lu month ago" -msgid_plural "%lu months ago" -msgstr[0] "fa %lu mes" -msgstr[1] "fa %lu mesos" +#: apply.c:4981 builtin/am.c:2274 +msgid "root" +msgstr "arrel" -#: date.c:148 -#, c-format -msgid "%lu year" -msgid_plural "%lu years" -msgstr[0] "%lu any" -msgstr[1] "%lu anys" +#: apply.c:4982 +msgid "prepend to all filenames" +msgstr "anteposa a tots els noms de fitxer" -#. TRANSLATORS: "%s" is " years" -#: date.c:151 -#, c-format -msgid "%s, %lu month ago" -msgid_plural "%s, %lu months ago" -msgstr[0] "fa %s i %lu mes" -msgstr[1] "fa %s i %lu mesos" +#: archive.c:12 +msgid "git archive [] [...]" +msgstr "git archive [] [...]" -#: date.c:156 date.c:161 -#, c-format -msgid "%lu year ago" -msgid_plural "%lu years ago" -msgstr[0] "fa %lu any" -msgstr[1] "fa %lu anys" +#: archive.c:13 +msgid "git archive --list" +msgstr "git archive --list" -#: diffcore-order.c:24 -#, c-format -msgid "failed to read orderfile '%s'" -msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" +#: archive.c:14 +msgid "" +"git archive --remote [--exec ] [] [...]" +msgstr "" +"git archive --remote [--exec ] [] " +"[...]" -#: diffcore-rename.c:540 -msgid "Performing inexact rename detection" -msgstr "S'està realitzant una detecció inexacta de canvis de nom" +#: archive.c:15 +msgid "git archive --remote [--exec ] --list" +msgstr "git archive --remote [--exec ] --list" -#: diff.c:116 +#: archive.c:344 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:327 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%s'\n" -msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n" +msgid "pathspec '%s' did not match any files" +msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer" -#: diff.c:121 -#, c-format -msgid " Unknown dirstat parameter '%s'\n" -msgstr " Paràmetre de dirstat desconegut '%s'\n" +#: archive.c:429 +msgid "fmt" +msgstr "format" -#: diff.c:225 -#, c-format -msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "" -"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'" +#: archive.c:429 +msgid "archive format" +msgstr "format d'arxiu" -#: diff.c:277 -#, c-format -msgid "" -"Found errors in 'diff.dirstat' config variable:\n" -"%s" -msgstr "" -"S'han trobat errors en la variable de configuració 'diff.dirstat':\n" -"%s" +#: archive.c:430 builtin/log.c:1429 +msgid "prefix" +msgstr "prefix" -#: diff.c:3017 -#, c-format -msgid "external diff died, stopping at %s" -msgstr "El diff external s'ha mort, s'està aturant a %s" +#: archive.c:431 +msgid "prepend prefix to each pathname in the archive" +msgstr "anteposa el prefix a cada nom de camí en l'arxiu" -#: diff.c:3415 -msgid "--follow requires exactly one pathspec" -msgstr "--follow requereix exactament una especificació de camí" +#: archive.c:432 builtin/blame.c:2603 builtin/blame.c:2604 builtin/config.c:59 +#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:723 +#: builtin/hash-object.c:101 builtin/ls-files.c:539 builtin/ls-files.c:542 +#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:109 +#: parse-options.h:153 +msgid "file" +msgstr "fitxer" -#: diff.c:3578 -#, c-format -msgid "" -"Failed to parse --dirstat/-X option parameter:\n" -"%s" -msgstr "" -"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" -"%s" +#: archive.c:433 builtin/archive.c:89 +msgid "write the archive to this file" +msgstr "escriu l'arxiu a aquest fitxer" -#: diff.c:3592 -#, c-format -msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: %s" +#: archive.c:435 +msgid "read .gitattributes in working directory" +msgstr "llegeix .gitattributes en el directori de treball" -#: dir.c:1823 -msgid "failed to get kernel name and information" -msgstr "s'ha fallat en obtenir el nombre i la informació del nucli" +#: archive.c:436 +msgid "report archived files on stderr" +msgstr "informa de fitxers arxivats en stderr" -#: dir.c:1942 -msgid "Untracked cache is disabled on this system or location." -msgstr "" -"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." +#: archive.c:437 +msgid "store only" +msgstr "només emmagatzema" -#: gpg-interface.c:178 -msgid "gpg failed to sign the data" -msgstr "gpg ha fallat en signar les dades" +#: archive.c:438 +msgid "compress faster" +msgstr "comprimeix més ràpidament" -#: gpg-interface.c:208 -msgid "could not create temporary file" -msgstr "no s'ha pogut crear el fitxer temporal" +#: archive.c:446 +msgid "compress better" +msgstr "comprimeix millor" -#: gpg-interface.c:210 -#, c-format -msgid "failed writing detached signature to '%s'" -msgstr "s'ha fallat en escriure la signatura separada a '%s'" +#: archive.c:449 +msgid "list supported archive formats" +msgstr "allista els formats d'arxiu admesos" -#: grep.c:1792 -#, c-format -msgid "'%s': unable to read %s" -msgstr "'%s': no s'ha pogut llegir %s" +#: archive.c:451 builtin/archive.c:90 builtin/clone.c:85 builtin/clone.c:88 +#: builtin/submodule--helper.c:601 builtin/submodule--helper.c:953 +msgid "repo" +msgstr "dipòsit" -#: grep.c:1809 builtin/clone.c:382 builtin/diff.c:84 builtin/rm.c:155 -#, c-format -msgid "failed to stat '%s'" -msgstr "s'ha fallat en fer stat a '%s'" +#: archive.c:452 builtin/archive.c:91 +msgid "retrieve the archive from remote repository " +msgstr "recupera l'arxiu del dipòsit remot " -#: grep.c:1820 -#, c-format -msgid "'%s': short read" -msgstr "'%s': lectura curta" +#: archive.c:453 builtin/archive.c:92 builtin/notes.c:485 +msgid "command" +msgstr "ordre" -#: help.c:205 -#, c-format -msgid "available git commands in '%s'" -msgstr "ordres de git disponibles en '%s'" +#: archive.c:454 builtin/archive.c:93 +msgid "path to the remote git-upload-archive command" +msgstr "camí a l'ordre git-upload-archive remota" -#: help.c:212 -msgid "git commands available from elsewhere on your $PATH" -msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" +#: archive.c:461 +msgid "Unexpected option --remote" +msgstr "Opció inesperada --remote" -#: help.c:244 -msgid "These are common Git commands used in various situations:" -msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:" +#: archive.c:463 +msgid "Option --exec can only be used together with --remote" +msgstr "L'opció --exec només es pot usar junt amb --remote" -#: help.c:309 -#, 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" -"executar-la. Pot ser que git-%s estigui estropejat?" +#: archive.c:465 +msgid "Unexpected option --output" +msgstr "Opció inesperada --output" -#: help.c:366 -msgid "Uh oh. Your system reports no Git commands at all." -msgstr "Ai. El vostre sistema no informa de cap ordre de Git." +#: archive.c:487 +#, c-format +msgid "Unknown archive format '%s'" +msgstr "Format d'arxiu desconegut '%s'" -#: help.c:388 +#: archive.c:494 #, c-format +msgid "Argument not supported for format '%s': -%d" +msgstr "Paràmetre no admès per al format '%s': -%d" + +#: attr.c:263 msgid "" -"WARNING: You called a Git command named '%s', which does not exist.\n" -"Continuing under the assumption that you meant '%s'" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." msgstr "" -"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no " -"existeix.\n" -"S'està continuant sota l'assumpció que volíeu dir '%s'" +"Els patrons negatius s'ignoren en els atributs de git\n" +"Useu '\\!' per exclamació capdavantera literal." -#: help.c:393 +#: bisect.c:441 #, c-format -msgid "in %0.1f seconds automatically..." -msgstr "en %0.1f segons automàticament..." +msgid "Could not open file '%s'" +msgstr "No s'ha pogut obrir el fitxer '%s'" -#: help.c:400 +#: bisect.c:446 #, 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'." +msgid "Badly quoted content in file '%s': %s" +msgstr "Comentari amb cometes dolentes en el fitxer '%s': %s" -#: help.c:404 help.c:470 -msgid "" -"\n" -"Did you mean this?" -msgid_plural "" -"\n" -"Did you mean one of these?" -msgstr[0] "" -"\n" -"Volíeu dir això?" -msgstr[1] "" -"\n" -"Volíeu dir un d'aquests?" +#: bisect.c:655 +#, c-format +msgid "We cannot bisect more!\n" +msgstr "No podem bisecar més!\n" -#: help.c:466 +#: bisect.c:708 #, c-format -msgid "%s: %s - %s" -msgstr "%s: %s - %s" +msgid "Not a valid commit name %s" +msgstr "No és un nom de comissió vàlid %s" -#: lockfile.c:152 +#: bisect.c:732 #, 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." +"The merge base %s is bad.\n" +"This means the bug has been fixed between %s and [%s].\n" 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'. Si us\n" -"plau, assegureu-vos que tots els processos s'hagin terminat i\n" -"llavors trobeu de nou. Si encara falla, potser que un procés de\n" -"git ha tingut una pana:\n" -"elimineu el fitxer manualment per a continuar." +"La base de fusió %s és dolenta.\n" +"Això vol dir que el defecte s'ha arreglat entre %s i [%s].\n" -#: lockfile.c:160 +#: bisect.c:737 #, c-format -msgid "Unable to create '%s.lock': %s" -msgstr "No es pot crear '%s.lock': %s" +msgid "" +"The merge base %s is new.\n" +"The property has changed between %s and [%s].\n" +msgstr "" +"La base de fusió %s és nova.\n" +"La propietat s'ha canviat entre %s i [%s].\n" -#: merge.c:41 -msgid "failed to read the cache" -msgstr "s'ha fallat en llegir la memòria cau" +#: bisect.c:742 +#, c-format +msgid "" +"The merge base %s is %s.\n" +"This means the first '%s' commit is between %s and [%s].\n" +msgstr "" +"La base de fusió %s és %s.\n" +"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n" -#: merge.c:94 builtin/am.c:1992 builtin/am.c:2027 builtin/checkout.c:375 -#: builtin/checkout.c:589 builtin/clone.c:732 -msgid "unable to write new index file" -msgstr "no s'ha pogut escriure un fitxer d'índex nou" +#: bisect.c:750 +#, c-format +msgid "" +"Some %s revs are not ancestor of the %s rev.\n" +"git bisect cannot work properly in this case.\n" +"Maybe you mistook %s and %s revs?\n" +msgstr "" +"Unes revisions %s no són els avantpassats de la revisió %s.\n" +"git bisect no pot funcionar correctament en aquest cas.\n" +"Potser heu confós les revisions %s i %s?\n" -#: merge-recursive.c:209 -msgid "(bad commit)\n" -msgstr "(comissió dolenta)\n" +#: bisect.c:763 +#, c-format +msgid "" +"the merge base between %s and [%s] must be skipped.\n" +"So we cannot be sure the first %s commit is between %s and %s.\n" +"We continue anyway." +msgstr "" +"s'ha de saltar la base de fusió entre %s i [%s].\n" +"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s " +"i %s.\n" +"Continuem de totes maneres." -#: merge-recursive.c:231 +#: bisect.c:798 #, c-format -msgid "addinfo_cache failed for path '%s'" -msgstr "addinfo_cache ha fallat per al camí '%s'" +msgid "Bisecting: a merge base must be tested\n" +msgstr "Bisecant: s'ha de provar una base de fusió\n" -#: merge-recursive.c:301 -msgid "error building trees" -msgstr "error en construir arbres" +#: bisect.c:849 +#, c-format +msgid "a %s revision is needed" +msgstr "es necessita una revisió %s" -#: merge-recursive.c:720 +#: bisect.c:866 builtin/notes.c:174 builtin/tag.c:248 #, c-format -msgid "failed to create path '%s'%s" -msgstr "s'ha fallat en crear el camí '%s' %s" +msgid "could not create file '%s'" +msgstr "no s'ha pogut crear el fitxer '%s'" -#: merge-recursive.c:731 +#: bisect.c:917 #, c-format -msgid "Removing %s to make room for subdirectory\n" -msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" +msgid "could not read file '%s'" +msgstr "no s'ha pogut llegir el fitxer '%s'" -#: merge-recursive.c:745 merge-recursive.c:764 -msgid ": perhaps a D/F conflict?" -msgstr ": potser un conflicte D/F?" +#: bisect.c:947 +msgid "reading bisect refs failed" +msgstr "la lectura de les referències de bisecció ha fallat" -#: merge-recursive.c:754 +#: bisect.c:967 #, c-format -msgid "refusing to lose untracked file at '%s'" -msgstr "s'està refusant perdre el fitxer no seguit a '%s'" +msgid "%s was both %s and %s\n" +msgstr "%s era ambdós %s i %s\n" -#: merge-recursive.c:796 +#: bisect.c:975 #, c-format -msgid "cannot read object %s '%s'" -msgstr "no es pot llegir l'objecte %s '%s'" +msgid "" +"No testable commit found.\n" +"Maybe you started with bad path parameters?\n" +msgstr "" +"No s'ha trobat cap comissió provable.\n" +"Potser heu començat amb paràmetres de camí dolents?\n" -#: merge-recursive.c:798 +#: bisect.c:994 #, c-format -msgid "blob expected for %s '%s'" -msgstr "blob esperat per a %s '%s'" +msgid "(roughly %d step)" +msgid_plural "(roughly %d steps)" +msgstr[0] "(aproximadament %d pas)" +msgstr[1] "(aproximadament %d passos)" -#: merge-recursive.c:822 +#. TRANSLATORS: the last %s will be replaced with +#. "(roughly %d steps)" translation +#: bisect.c:998 #, c-format -msgid "failed to open '%s': %s" -msgstr "s'ha fallat en obrir '%s': %s" +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" -#: merge-recursive.c:833 +#: branch.c:53 #, c-format -msgid "failed to symlink '%s': %s" -msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s" +msgid "" +"\n" +"After fixing the error cause you may try to fix up\n" +"the remote tracking information by invoking\n" +"\"git branch --set-upstream-to=%s%s%s\"." +msgstr "" +"\n" +"Després de corregir la causa de l'error, podeu\n" +"intentar corregir la informació de seguiment remot\n" +"invocant \"git branch --set-upstream-to=%s%s%s\"." -#: merge-recursive.c:838 +#: branch.c:67 #, 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:978 -msgid "Failed to execute internal merge" -msgstr "S'ha fallat en executar la fusió interna" +msgid "Not setting branch %s as its own upstream." +msgstr "No s'està establint la branca %s com a la seva pròpia font." -#: merge-recursive.c:982 +#: branch.c:93 #, c-format -msgid "Unable to add %s to database" -msgstr "no s'ha pogut afegir %s a la base de dades" +msgid "Branch %s set up to track remote branch %s from %s by rebasing." +msgstr "" +"La branca %s està configurada per a seguir la branca remota %s de %s per " +"rebasar." -#: merge-recursive.c:1081 merge-recursive.c:1095 +#: branch.c:94 #, 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 "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." -#: merge-recursive.c:1087 merge-recursive.c:1100 +#: branch.c:98 #, c-format -msgid "" -"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " -"in tree at %s." +msgid "Branch %s set up to track local branch %s by rebasing." 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:1143 -msgid "rename" -msgstr "canvia de nom" - -#: merge-recursive.c:1143 -msgid "renamed" -msgstr "canviat de nom" +"La branca %s està configurada per a seguir la branca local %s per rebasar." -#: merge-recursive.c:1200 +#: branch.c:99 #, 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ò" +msgid "Branch %s set up to track local branch %s." +msgstr "La branca %s està configurada per a seguir la branca local %s." -#: merge-recursive.c:1225 +#: branch.c:104 #, c-format -msgid "" -"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" -"\"->\"%s\" in \"%s\"%s" +msgid "Branch %s set up to track remote ref %s by rebasing." 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" +"La branca %s està configurada per a seguir la referència remota %s per " +"rebasar." -#: merge-recursive.c:1230 -msgid " (left unresolved)" -msgstr " (deixat sense resolució)" +#: 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." -#: merge-recursive.c:1292 +#: branch.c:109 #, c-format -msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" +msgid "Branch %s set up to track local ref %s by rebasing." msgstr "" -"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " -"nom %s->%s en %s" +"La branca %s està configurada per a seguir la referència local %s per " +"rebasar." -#: merge-recursive.c:1325 +#: branch.c:110 #, c-format -msgid "Renaming %s to %s and %s to %s instead" -msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" +msgid "Branch %s set up to track local ref %s." +msgstr "La branca %s està configurada per a seguir la referència local %s." -#: merge-recursive.c:1531 +#: branch.c:119 +msgid "Unable to write upstream branch configuration" +msgstr "No es pot escriure la configuració de la branca font" + +#: branch.c:156 #, c-format -msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" -msgstr "" -"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " -"%s" +msgid "Not tracking: ambiguous information for ref %s" +msgstr "No seguint: informació ambigua per a la referència %s" -#: merge-recursive.c:1546 +#: branch.c:185 #, c-format -msgid "Adding merged %s" -msgstr "S'està afegint %s fusionat" +msgid "'%s' is not a valid branch name." +msgstr "'%s' no és un nom de branca vàlid." -#: merge-recursive.c:1553 merge-recursive.c:1766 +#: branch.c:190 #, c-format -msgid "Adding as %s instead" -msgstr "S'està afegint com a %s en lloc d'això" +msgid "A branch named '%s' already exists." +msgstr "Una branca amb nom '%s' ja existeix." -#: merge-recursive.c:1610 +#: branch.c:198 +msgid "Cannot force update the current branch." +msgstr "No es pot actualitzar la branca actual a la força." + +#: branch.c:218 #, c-format -msgid "cannot read object %s" -msgstr "no es pot llegir l'objecte %s" +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." -#: merge-recursive.c:1613 +#: branch.c:220 #, c-format -msgid "object %s is not a blob" -msgstr "L'objecte %s no és un blob" +msgid "the requested upstream branch '%s' does not exist" +msgstr "la branca font demanada '%s' no existeix" -#: merge-recursive.c:1666 -msgid "modify" -msgstr "modifica" +#: branch.c:222 +msgid "" +"\n" +"If you are planning on basing your work on an upstream\n" +"branch that already exists at the remote, you may need to\n" +"run \"git fetch\" to retrieve it.\n" +"\n" +"If you are planning to push out a new local branch that\n" +"will track its remote counterpart, you may want to use\n" +"\"git push -u\" to set the upstream config as you push." +msgstr "" +"\n" +"Si teniu pensat basar el vostre treball en una branca\n" +"font que ja existeix al remot, pot ser que necessiteu\n" +"executar \"git fetch\" per a obtenir-la.\n" +"\n" +"Si teniu pensat pujar una branca local nova que seguirà\n" +"la seva contrapart remota, pot ser que vulgueu usar\n" +"\"git push -u\" per a establir la configuració font\n" +"mentre pugeu." -#: merge-recursive.c:1666 -msgid "modified" -msgstr "modificat" +#: branch.c:265 +#, c-format +msgid "Not a valid object name: '%s'." +msgstr "No és un nom d'objecte vàlid: '%s'." -#: merge-recursive.c:1676 -msgid "content" -msgstr "contingut" +#: branch.c:285 +#, c-format +msgid "Ambiguous object name: '%s'." +msgstr "Nom d'objecte ambigu: '%s'." -#: merge-recursive.c:1683 -msgid "add/add" -msgstr "afegiment/afegiment" +#: branch.c:290 +#, c-format +msgid "Not a valid branch point: '%s'." +msgstr "No és un punt de ramificació vàlid: '%s'." -#: merge-recursive.c:1718 +#: branch.c:344 #, c-format -msgid "Skipped %s (merged same as existing)" -msgstr "S'ha saltat %s (el fusionat és igual a l'existent)" +msgid "'%s' is already checked out at '%s'" +msgstr "'%s' ja s'ha agafat a '%s'" -#: merge-recursive.c:1732 +#: branch.c:363 #, c-format -msgid "Auto-merging %s" -msgstr "S'està autofusionant %s" +msgid "HEAD of working tree %s is not updated" +msgstr "La HEAD de l'arbre de treball %s no està actualitzat" -#: merge-recursive.c:1736 git-submodule.sh:919 -msgid "submodule" -msgstr "submòdul" +#: bundle.c:34 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' no sembla un fitxer de farcell v2" -#: merge-recursive.c:1737 +#: bundle.c:61 #, c-format -msgid "CONFLICT (%s): Merge conflict in %s" -msgstr "CONFLICTE (%s): Conflicte de fusió en %s" +msgid "unrecognized header: %s%s (%d)" +msgstr "capçalera no reconeguda: %s%s (%d)" -#: merge-recursive.c:1831 +#: bundle.c:87 sequencer.c:963 builtin/commit.c:777 #, c-format -msgid "Removing %s" -msgstr "S'està eliminant %s" +msgid "could not open '%s'" +msgstr "no s'ha pogut obrir '%s'" -#: merge-recursive.c:1857 -msgid "file/directory" -msgstr "fitxer/directori" +#: bundle.c:139 +msgid "Repository lacks these prerequisite commits:" +msgstr "Al dipòsit li manquen aquestes comissions prerequisits:" -#: merge-recursive.c:1863 -msgid "directory/file" -msgstr "directori/fitxer" +#: bundle.c:163 ref-filter.c:1462 sequencer.c:830 sequencer.c:1374 +#: builtin/blame.c:2814 builtin/commit.c:1061 builtin/log.c:348 +#: builtin/log.c:890 builtin/log.c:1340 builtin/log.c:1666 builtin/log.c:1909 +#: builtin/merge.c:356 builtin/shortlog.c:170 +msgid "revision walk setup failed" +msgstr "la configuració del passeig per revisions ha fallat" -#: merge-recursive.c:1868 +#: bundle.c:185 #, 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" - -#: merge-recursive.c:1877 -#, c-format -msgid "Adding %s" -msgstr "S'està afegint %s" +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:" -#: merge-recursive.c:1914 -msgid "Already up-to-date!" -msgstr "Ja està al dia!" +#: bundle.c:192 +msgid "The bundle records a complete history." +msgstr "El farcell registra una història completa." -#: merge-recursive.c:1923 +#: bundle.c:194 #, c-format -msgid "merging of trees %s and %s failed" -msgstr "la fusió dels arbres %s i %s ha fallat" +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:" -#: merge-recursive.c:2006 -msgid "Merging:" -msgstr "Fusionant:" +#: bundle.c:253 +msgid "Could not spawn pack-objects" +msgstr "No s'ha pogut executar el pack-objects" -#: merge-recursive.c:2019 -#, c-format -msgid "found %u common ancestor:" -msgid_plural "found %u common ancestors:" -msgstr[0] "s'ha trobat %u avantpassat:" -msgstr[1] "s'han trobat %u avantpassats:" +#: bundle.c:264 +msgid "pack-objects died" +msgstr "El pack-objects s'ha mort" -#: merge-recursive.c:2058 -msgid "merge returned no commit" -msgstr "la fusió no ha retornat cap comissió" +#: bundle.c:304 +msgid "rev-list died" +msgstr "El rev-list s'ha mort" -#: merge-recursive.c:2121 +#: bundle.c:353 #, c-format -msgid "Could not parse object '%s'" -msgstr "No s'ha pogut analitzar l'objecte '%s'" +msgid "ref '%s' is excluded by the rev-list options" +msgstr "les opcions de la llista de revisions exclouen la referència '%s'" -#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 -msgid "Unable to write index." -msgstr "No s'ha pogut escriure l'índex." +#: bundle.c:443 builtin/log.c:165 builtin/log.c:1572 builtin/shortlog.c:273 +#, c-format +msgid "unrecognized argument: %s" +msgstr "paràmetre no reconegut: %s" -#: notes-utils.c:41 -msgid "Cannot commit uninitialized/unreferenced notes tree" -msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" +#: bundle.c:451 +msgid "Refusing to create empty bundle." +msgstr "S'està refusant crear un farcell buit." -#: notes-utils.c:100 +#: bundle.c:463 #, c-format -msgid "Bad notes.rewriteMode value: '%s'" -msgstr "Valor de notes.rewriteMode dolent: '%s'" +msgid "cannot create '%s'" +msgstr "no es pot crear '%s'" -#: notes-utils.c:110 +#: bundle.c:491 +msgid "index-pack died" +msgstr "L'index-pack s'ha mort" + +#: color.c:290 #, c-format -msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" -msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" +msgid "invalid color value: %.*s" +msgstr "valor de color no vàlid: %.*s" -#. TRANSLATORS: The first %s is the name of the -#. environment variable, the second %s is its value -#: notes-utils.c:137 +#: commit.c:40 builtin/am.c:421 builtin/am.c:457 builtin/am.c:1493 +#: builtin/am.c:2127 #, c-format -msgid "Bad %s value: '%s'" -msgstr "Valor dolent de %s: '%s'" +msgid "could not parse %s" +msgstr "no s'ha pogut analitzar %s" -#: object.c:242 +#: commit.c:42 #, c-format -msgid "unable to parse object: %s" -msgstr "no s'ha pogut analitzar l'objecte: %s" +msgid "%s %s is not a commit!" +msgstr "%s %s no és una comissió!" -#: parse-options.c:572 -msgid "..." -msgstr "..." +#: commit.c:1514 +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 "" +"Advertència: el missatge de comissió no conformava a UTF-8.\n" +"Potser voleu esemenar-lo després de corregir el missatge, o establir\n" +"la variable de configuració i18n.commitencoding a la codificació que\n" +"usi el vostre projecte.\n" -#: parse-options.c:590 +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "memòria esgotada" + +#: config.c:516 #, c-format -msgid "usage: %s" -msgstr "ús: %s" +msgid "bad config line %d in blob %s" +msgstr "línia de configuració dolenta %d en el blob %s" -#. TRANSLATORS: the colon here should align with the -#. one in "usage: %s" translation -#: parse-options.c:594 +#: config.c:520 #, c-format -msgid " or: %s" -msgstr " o: %s" +msgid "bad config line %d in file %s" +msgstr "línia de configuració dolenta %d en el fitxer %s" -#: parse-options.c:597 +#: config.c:524 #, c-format -msgid " %s" -msgstr " %s" +msgid "bad config line %d in standard input" +msgstr "línia de configuració dolenta %d en l'entrada estàndard" -#: parse-options.c:631 -msgid "-NUM" -msgstr "-NUM" +#: config.c:528 +#, c-format +msgid "bad config line %d in submodule-blob %s" +msgstr "línia de configuració dolenta %d en el blob de submòdul %s" -#: parse-options-cb.c:108 +#: config.c:532 #, c-format -msgid "malformed object name '%s'" -msgstr "nom de camp mal format '%s'" +msgid "bad config line %d in command line %s" +msgstr "línia de configuració dolenta %d en la línia d'ordres %s" -#: path.c:798 +#: config.c:536 #, c-format -msgid "Could not make %s writable by group" -msgstr "No s'ha pogut fer %s escrivible pel grup" +msgid "bad config line %d in %s" +msgstr "línia de configuració dolenta %d en %s" -#: pathspec.c:133 -msgid "global 'glob' and 'noglob' pathspec settings are incompatible" -msgstr "" -"els ajusts d'especificació de camí 'glob' i 'noglob' globals són " -"incompatibles" +#: config.c:655 +msgid "out of range" +msgstr "fora de rang" -#: pathspec.c:143 -msgid "" -"global 'literal' pathspec setting is incompatible with all other global " -"pathspec settings" -msgstr "" -"l'ajust d'especificació de camí 'literal' global és incompatible amb tots " -"els altres ajusts d'especificació de camí globals" +#: config.c:655 +msgid "invalid unit" +msgstr "unitat no vàlida" -#: pathspec.c:177 -msgid "invalid parameter for pathspec magic 'prefix'" -msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'" +#: config.c:661 +#, c-format +msgid "bad numeric config value '%s' for '%s': %s" +msgstr "valor de configuració numèric dolent '%s' per '%s': %s" -#: pathspec.c:183 +#: config.c:666 #, c-format -msgid "Invalid pathspec magic '%.*s' in '%s'" -msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'" +msgid "bad numeric config value '%s' for '%s' in blob %s: %s" +msgstr "valor de configuració numèric dolent '%s' per '%s' en el blob %s: %s" -#: pathspec.c:187 +#: config.c:669 #, 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'" +msgid "bad numeric config value '%s' for '%s' in file %s: %s" +msgstr "valor de configuració numèric dolent '%s' per '%s' en el fitxer %s: %s" -#: pathspec.c:205 +#: config.c:672 #, c-format -msgid "Unimplemented pathspec magic '%c' in '%s'" -msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'" +msgid "bad numeric config value '%s' for '%s' in standard input: %s" +msgstr "" +"valor de configuració numèric dolent '%s' per '%s' en l'entrada estàndard: %s" -#: pathspec.c:230 +#: config.c:675 #, c-format -msgid "%s: 'literal' and 'glob' are incompatible" -msgstr "%s: 'literal' i 'glob' són incompatibles" +msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s" +msgstr "" +"valor de configuració numèric dolent '%s' per '%s' en el blob de submòdul " +"%s: %s" -#: pathspec.c:241 +#: config.c:678 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' és fora del dipòsit" +msgid "bad numeric config value '%s' for '%s' in command line %s: %s" +msgstr "" +"valor de configuració numèric dolent '%s' per '%s' en la línia d'ordres %s: " +"%s" -#: pathspec.c:291 +#: config.c:681 #, c-format -msgid "Pathspec '%s' is in submodule '%.*s'" -msgstr "L'especificació '%s' és en el submòdul '%.*s'" +msgid "bad numeric config value '%s' for '%s' in %s: %s" +msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s" -#: pathspec.c:353 +#: config.c:768 #, c-format -msgid "%s: pathspec magic not supported by this command: %s" -msgstr "" -"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s" +msgid "failed to expand user dir in: '%s'" +msgstr "s'ha fallat en expandir el directori d'usuari en: '%s'" -#: pathspec.c:433 +#: config.c:852 config.c:863 #, 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" +msgid "bad zlib compression level %d" +msgstr "nivell de compressió de zlib dolent %d" -#: pathspec.c:442 -msgid "" -"There is nothing to exclude from by :(exclude) patterns.\n" -"Perhaps you forgot to add either ':/' or '.' ?" -msgstr "" -"No hi ha res a excloure per patrons :(exclusió).\n" -"Potser heu oblidat afegir o ':/' o '.' ?" +#: config.c:978 +#, c-format +msgid "invalid mode for object creation: %s" +msgstr "mode de creació d'objecte no vàlid: %s" -#: pretty.c:973 -msgid "unable to parse --pretty format" -msgstr "no s'ha pogut analitzar el format --pretty" +#: config.c:1312 +msgid "unable to parse command-line config" +msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres" -#: progress.c:235 -msgid "done" -msgstr "fet" +#: config.c:1362 +msgid "unknown error occurred while reading the configuration files" +msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració" -#: read-cache.c:1281 +#: config.c:1716 #, c-format -msgid "" -"index.version set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"index.version establert, però el valor no és vàlid.\n" -"S'està usant la versió %i" +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" -#: read-cache.c:1291 +#: config.c:1718 #, c-format -msgid "" -"GIT_INDEX_VERSION set, but the value is invalid.\n" -"Using version %i" -msgstr "" -"GIT_INDEX_VERSION establert, però el valor no és vàlid.\n" -"S'està usant la versió %i" +msgid "bad config variable '%s' in file '%s' at line %d" +msgstr "variable de configuració dolenta '%s' en el fitxer '%s' a la línia %d" -#: refs.c:551 builtin/merge.c:840 +#: config.c:1777 #, c-format -msgid "Could not open '%s' for writing" -msgstr "No s'ha pogut obrir '%s' per a escriptura" +msgid "%s has multiple values" +msgstr "%s té múltiples valors" -#: refs/files-backend.c:2534 +#: config.c:2311 #, c-format -msgid "could not delete reference %s: %s" -msgstr "no s'ha pogut suprimir la referència %s: %s" +msgid "could not set '%s' to '%s'" +msgstr "no s'ha pogut establir '%s' a '%s'" -#: refs/files-backend.c:2537 +#: config.c:2313 #, c-format -msgid "could not delete references: %s" -msgstr "no s'ha pogut suprimir les referències: %s" +msgid "could not unset '%s'" +msgstr "no s'ha pogut desestablir '%s'" + +#: connect.c:49 +msgid "The remote end hung up upon initial contact" +msgstr "El costat remot ha penjat en el moment de contacte inicial" + +#: connect.c:51 +msgid "" +"Could not read from remote repository.\n" +"\n" +"Please make sure you have the correct access rights\n" +"and the repository exists." +msgstr "" +"No s'ha pogut llegir del dipòsit remot.\n" +"\n" +"Si us plau, assegureu-vos que tingueu els drets\n" +"d'accés correctes i que el dipòsit existeixi." + +#: connected.c:63 builtin/fsck.c:173 builtin/prune.c:140 +msgid "Checking connectivity" +msgstr "S'està comprovant la connectivitat" + +#: connected.c:75 +msgid "Could not run 'git rev-list'" +msgstr "No s'ha pogut executar 'git rev-list'" + +#: connected.c:95 +msgid "failed write to rev-list" +msgstr "escriptura fallada al rev-list" -#: refs/files-backend.c:2546 +#: connected.c:102 +msgid "failed to close rev-list's stdin" +msgstr "s'ha fallat en tancar l'stdin del rev-list" + +#: convert.c:201 #, c-format -msgid "could not remove reference %s" -msgstr "no s'ha pogut eliminar la referència %s" +msgid "" +"CRLF will be replaced by LF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"LF reemplaçarà CRLF en %s.\n" +"El fitxer tindrà els seus terminadors de línia originals en el vostre " +"directori de treball." -#: ref-filter.c:55 +#: convert.c:205 #, c-format -msgid "expected format: %%(color:)" -msgstr "format esperat: %%(color:)" +msgid "CRLF would be replaced by LF in %s." +msgstr "LF reemplaçaria CRLF en %s." -#: ref-filter.c:57 +#: convert.c:211 #, c-format -msgid "unrecognized color: %%(color:%s)" -msgstr "color no reconegut: %%(color:%s)" +msgid "" +"LF will be replaced by CRLF in %s.\n" +"The file will have its original line endings in your working directory." +msgstr "" +"CRLF reemplaçarà LF en %s.\n" +"El fitxer tindrà els seus terminadors de línia originals en el vostre " +"directori de treball." -#: ref-filter.c:71 +#: convert.c:215 #, c-format -msgid "unrecognized format: %%(%s)" -msgstr "format no reconegut: %%(%s)" +msgid "LF would be replaced by CRLF in %s" +msgstr "CRLF reemplaçaria LF en %s" -#: ref-filter.c:77 +#: date.c:97 +msgid "in the future" +msgstr "en el futur" + +#: date.c:103 #, c-format -msgid "%%(body) does not take arguments" -msgstr "%%(body) no accepta paràmetres" +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "fa %lu segon" +msgstr[1] "fa %lu segons" -#: ref-filter.c:84 +#: date.c:110 #, c-format -msgid "%%(subject) does not take arguments" -msgstr "%%(subject) no accepta paràmetres" +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "fa %lu minut" +msgstr[1] "fa %lu minuts" -#: ref-filter.c:101 +#: date.c:117 #, c-format -msgid "positive value expected contents:lines=%s" -msgstr "valor positiu esperat contents:lines=%s" +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "fa %lu hora" +msgstr[1] "fa %lu hores" -#: ref-filter.c:103 +#: date.c:124 #, c-format -msgid "unrecognized %%(contents) argument: %s" -msgstr "paràmetre %%(contents) no reconegut: %s" +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "fa %lu dia" +msgstr[1] "fa %lu dies" -#: ref-filter.c:113 +#: date.c:130 #, c-format -msgid "unrecognized %%(objectname) argument: %s" -msgstr "paràmetre %%(objectname) no reconegut: %s" +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "fa %lu setmana" +msgstr[1] "fa %lu setmanes" -#: ref-filter.c:135 +#: date.c:137 #, c-format -msgid "expected format: %%(align:,)" -msgstr "format esperat: %%(align:,)" +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "fa %lu mes" +msgstr[1] "fa %lu mesos" -#: ref-filter.c:147 +#: date.c:148 #, c-format -msgid "unrecognized position:%s" -msgstr "posició no reconeguda:%s" +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu any" +msgstr[1] "%lu anys" -#: ref-filter.c:151 +#. TRANSLATORS: "%s" is " years" +#: date.c:151 #, c-format -msgid "unrecognized width:%s" -msgstr "amplada no reconeguda:%s" +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "fa %s i %lu mes" +msgstr[1] "fa %s i %lu mesos" -#: ref-filter.c:157 +#: date.c:156 date.c:161 #, c-format -msgid "unrecognized %%(align) argument: %s" -msgstr "paràmetre %%(align) no reconegut: %s" +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "fa %lu any" +msgstr[1] "fa %lu anys" -#: ref-filter.c:161 +#: diffcore-order.c:24 #, c-format -msgid "positive width expected with the %%(align) atom" -msgstr "amplada positiva esperada amb l'àtom %%(align)" +msgid "failed to read orderfile '%s'" +msgstr "s'ha fallat en llegir el fitxer d'ordres '%s'" -#: ref-filter.c:244 +#: diffcore-rename.c:536 +msgid "Performing inexact rename detection" +msgstr "S'està realitzant una detecció inexacta de canvis de nom" + +#: diff.c:62 #, c-format -msgid "malformed field name: %.*s" -msgstr "nom d'objecte mal format: %.*s" +msgid "option '%s' requires a value" +msgstr "l'opció '%s' requereix un valor" -#: ref-filter.c:270 +#: diff.c:124 #, c-format -msgid "unknown field name: %.*s" -msgstr "nom de camp desconegut: %.*s" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " S'ha fallat en analitzar el percentatge limitant de dirstat '%s'\n" -#: ref-filter.c:372 +#: diff.c:129 #, c-format -msgid "format: %%(end) atom used without corresponding atom" -msgstr "format: s'ha usat l'àtom %%(end) sense l'àtom corresponent" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " Paràmetre de dirstat desconegut '%s'\n" -#: ref-filter.c:424 +#: diff.c:283 #, c-format -msgid "malformed format string %s" -msgstr "cadena de format mal format %s" +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "" +"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'" -#: ref-filter.c:878 -msgid ":strip= requires a positive integer argument" -msgstr ":strip= requereix un paràmetre enter positiu" +#: diff.c:346 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"S'han trobat errors en la variable de configuració 'diff.dirstat':\n" +"%s" -#: ref-filter.c:883 +#: diff.c:3087 #, c-format -msgid "ref '%s' does not have %ld components to :strip" -msgstr "la referència '%s' no té %ld components per a :strip" +msgid "external diff died, stopping at %s" +msgstr "el diff external s'ha mort, s'està aturant a %s" -#: ref-filter.c:1046 +#: diff.c:3412 +msgid "--name-only, --name-status, --check and -s are mutually exclusive" +msgstr "--name-only, --name-status, --check i -s són mutualment exclusius" + +#: diff.c:3502 +msgid "--follow requires exactly one pathspec" +msgstr "--follow requereix exactament una especificació de camí" + +#: diff.c:3665 #, c-format -msgid "unknown %.*s format %s" -msgstr "format de %.*s desconegut %s" +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"S'ha fallat en analitzar el paràmetre d'opció de --dirstat/-X:\n" +"%s" -#: ref-filter.c:1066 ref-filter.c:1097 +#: diff.c:3679 #, c-format -msgid "missing object %s for %s" -msgstr "manca l'objecte %s per a %s" +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "S'ha fallat en analitzar el paràmetre d'opció de --submodule: '%s'" -#: ref-filter.c:1069 ref-filter.c:1100 +#: diff.c:4700 +msgid "inexact rename detection was skipped due to too many files." +msgstr "s'ha saltat la detecció de canvi de nom a causa de massa fitxers." + +#: diff.c:4703 +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:4706 #, c-format -msgid "parse_object_buffer failed on %s for %s" -msgstr "parse_object_buffer ha fallat en %s per a %s" +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." -#: ref-filter.c:1311 +#: dir.c:1866 +msgid "failed to get kernel name and information" +msgstr "s'ha fallat en obtenir el nombre i la informació del nucli" + +#: dir.c:1985 +msgid "Untracked cache is disabled on this system or location." +msgstr "" +"La memòria cau no seguida està inhabilitada en aquest sistema o ubicació." + +#: fetch-pack.c:213 +msgid "git fetch-pack: expected shallow list" +msgstr "git fetch-pack: llista superficial esperada" + +#: fetch-pack.c:225 +msgid "git fetch-pack: expected ACK/NAK, got EOF" +msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut" + +#: fetch-pack.c:243 #, c-format -msgid "malformed object at '%s'" -msgstr "objecte mal format a '%s'" +msgid "git fetch-pack: expected ACK/NAK, got '%s'" +msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut" -#: ref-filter.c:1373 +#: fetch-pack.c:295 +msgid "--stateless-rpc requires multi_ack_detailed" +msgstr "--stateless-rpc requereix multi_ack_detailed" + +#: fetch-pack.c:381 #, c-format -msgid "ignoring ref with broken name %s" -msgstr "s'està ignorant la referència amb nom trencat %s" +msgid "invalid shallow line: %s" +msgstr "línia de shallow no vàlida: %s" -#: ref-filter.c:1378 +#: fetch-pack.c:387 #, c-format -msgid "ignoring broken ref %s" -msgstr "s'està ignorant la referència trencada %s" +msgid "invalid unshallow line: %s" +msgstr "línia d'unshallow no vàlida: %s" -#: ref-filter.c:1651 +#: fetch-pack.c:389 #, c-format -msgid "format: %%(end) atom missing" -msgstr "format: manca l'àtom %%(end)" +msgid "object not found: %s" +msgstr "objecte no trobat: %s" -#: ref-filter.c:1705 +#: fetch-pack.c:392 #, c-format -msgid "malformed object name %s" -msgstr "nom d'objecte %s mal format" +msgid "error in object: %s" +msgstr "error en objecte: %s" -#: remote.c:746 +#: fetch-pack.c:394 #, c-format -msgid "Cannot fetch both %s and %s to %s" -msgstr "No es pot obtenir ambdós %s i %s a %s" +msgid "no shallow found: %s" +msgstr "no s'ha trobat cap superficial: %s" -#: remote.c:750 +#: fetch-pack.c:397 #, c-format -msgid "%s usually tracks %s, not %s" -msgstr "%s generalment segueix %s, no %s" +msgid "expected shallow/unshallow, got %s" +msgstr "s'esperava shallow/unshallow, s'ha rebut %s" -#: remote.c:754 +#: fetch-pack.c:436 #, c-format -msgid "%s tracks both %s and %s" -msgstr "%s segueix ambdós %s i %s" +msgid "got %s %d %s" +msgstr "%s %d %s rebut" -#: remote.c:762 -msgid "Internal error" -msgstr "Error intern" +#: fetch-pack.c:450 +#, c-format +msgid "invalid commit %s" +msgstr "comissió no vàlida %s" -#: remote.c:1677 remote.c:1720 -msgid "HEAD does not point to a branch" -msgstr "HEAD no assenyala cap branca" +#: fetch-pack.c:483 +msgid "giving up" +msgstr "s'està rendint" -#: remote.c:1686 -#, c-format -msgid "no such branch: '%s'" -msgstr "no hi ha tal branca: '%s'" +#: fetch-pack.c:493 progress.c:235 +msgid "done" +msgstr "fet" -#: remote.c:1689 +#: fetch-pack.c:505 #, c-format -msgid "no upstream configured for branch '%s'" -msgstr "cap font configurada per a la branca '%s'" +msgid "got %s (%d) %s" +msgstr "s'ha rebut %s (%d) %s" -#: remote.c:1695 +#: fetch-pack.c:551 #, c-format -msgid "upstream branch '%s' not stored as a remote-tracking branch" -msgstr "La branca font '%s' no s'emmagatzema com a branca amb seguiment remot" +msgid "Marking %s as complete" +msgstr "S'està marcant %s com a complet" -#: remote.c:1710 +#: fetch-pack.c:697 #, 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 seguidora local" +msgid "already have %s (%s)" +msgstr "ja es té %s (%s)" -#: remote.c:1725 +#: fetch-pack.c:735 +msgid "fetch-pack: unable to fork off sideband demultiplexer" +msgstr "fetch-pack: no s'ha pogut bifurcar del demultiplexor de banda lateral" + +#: fetch-pack.c:743 +msgid "protocol error: bad pack header" +msgstr "error de protocol: capçalera de paquet dolent" + +#: fetch-pack.c:799 #, c-format -msgid "branch '%s' has no remote for pushing" -msgstr "la branca '%s' no té cap remot al qual pujar" +msgid "fetch-pack: unable to fork off %s" +msgstr "fetch-pack: no es pot bifurcar de %s" -#: remote.c:1736 +#: fetch-pack.c:815 #, c-format -msgid "push refspecs for '%s' do not include '%s'" -msgstr "les especificacions de referència de '%s' no inclouen '%s'" +msgid "%s failed" +msgstr "%s ha fallat" -#: remote.c:1749 -msgid "push has no destination (push.default is 'nothing')" -msgstr "push no té destí (push.default és 'nothing')" +#: fetch-pack.c:817 +msgid "error in sideband demultiplexer" +msgstr "error en demultiplexor de banda lateral" -#: remote.c:1771 -msgid "cannot resolve 'simple' push to a single destination" -msgstr "no es pot resoldre una pujada 'simple' a un sol destí" +#: fetch-pack.c:844 +msgid "Server does not support shallow clients" +msgstr "El servidor no permet clients superficials" -#: remote.c:2073 -#, 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:2077 -msgid " (use \"git branch --unset-upstream\" to fixup)\n" -msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" - -#: remote.c:2080 -#, c-format -msgid "Your branch is up-to-date with '%s'.\n" -msgstr "La vostra branca està al dia amb '%s'.\n" +#: fetch-pack.c:848 +msgid "Server supports multi_ack_detailed" +msgstr "El servidor accepta multi_ack_detailed" -#: remote.c:2084 -#, 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" +#: fetch-pack.c:851 +msgid "Server supports no-done" +msgstr "El servidor accepta no-done" -#: remote.c:2090 -msgid " (use \"git push\" to publish your local commits)\n" -msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" +#: fetch-pack.c:857 +msgid "Server supports multi_ack" +msgstr "El servidor accepta multi_ack" -#: remote.c:2093 -#, c-format -msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" -msgid_plural "" -"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" -msgstr[0] "" -"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se " -"ràpidament.\n" -msgstr[1] "" -"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " -"ràpidament.\n" +#: fetch-pack.c:861 +msgid "Server supports side-band-64k" +msgstr "El servidor accepta side-band-64k" -#: remote.c:2101 -msgid " (use \"git pull\" to update your local branch)\n" -msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" +#: fetch-pack.c:865 +msgid "Server supports side-band" +msgstr "El servidor accepta banda lateral" -#: remote.c:2104 -#, 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] "" -"La vostra branca i '%s' s'han divergit,\n" -"i tenen %d i %d comissió distinta cada una, respectivament.\n" -msgstr[1] "" -"La vostra branca i '%s' s'han divergit,\n" -"i tenen %d i %d comissions distintes cada una, respectivament.\n" +#: fetch-pack.c:869 +msgid "Server supports allow-tip-sha1-in-want" +msgstr "El servidor accepta allow-tip-sha1-in-want" -#: remote.c:2114 -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" +#: fetch-pack.c:873 +msgid "Server supports allow-reachable-sha1-in-want" +msgstr "El servidor accepta allow-reachable-sha1-in-want" -#: revision.c:2132 -msgid "your current branch appears to be broken" -msgstr "la vostra branca actual sembla trencada" +#: fetch-pack.c:883 +msgid "Server supports ofs-delta" +msgstr "El servidor accepta ofs-delta" -#: revision.c:2135 +#: fetch-pack.c:890 #, c-format -msgid "your current branch '%s' does not have any commits yet" -msgstr "la vostra branca actual '%s' encara no té cap comissió" - -#: revision.c:2329 -msgid "--first-parent is incompatible with --bisect" -msgstr "--first-parent és incompatible amb --bisect" - -#: run-command.c:92 -msgid "open /dev/null failed" -msgstr "s'ha fallat en obrir /dev/null" +msgid "Server version is %.*s" +msgstr "La versió del servidor és %.*s" -#: run-command.c:94 -#, c-format -msgid "dup2(%d,%d) failed" -msgstr "dup2(%d,%d) ha fallat" +#: fetch-pack.c:896 +msgid "Server does not support --shallow-since" +msgstr "El servidor no admet --shallow-since" -#: send-pack.c:298 -msgid "failed to sign the push certificate" -msgstr "s'ha fallat en signar el certificat de pujada" +#: fetch-pack.c:900 +msgid "Server does not support --shallow-exclude" +msgstr "El servidor no admet --shallow-exclude" -#: send-pack.c:411 -msgid "the receiving end does not support --signed push" -msgstr "el destí receptor no admet pujar --signed" +#: fetch-pack.c:902 +msgid "Server does not support --deepen" +msgstr "El servidor no admet --deepen" -#: send-pack.c:413 -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" +#: fetch-pack.c:913 +msgid "no common commits" +msgstr "cap comissió en comú" -#: send-pack.c:425 -msgid "the receiving end does not support --atomic push" -msgstr "el destí receptor no admet pujar --atomic" +#: fetch-pack.c:925 +msgid "git fetch-pack: fetch failed." +msgstr "git fetch-pack: l'obtenció ha fallat." -#: send-pack.c:430 -msgid "the receiving end does not support push options" -msgstr "el destí receptor no admet opcions de pujada" +#: fetch-pack.c:1087 +msgid "no matching remote head" +msgstr "no hi ha cap cap remot coincident" -#: sequencer.c:174 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add ' or 'git rm '" -msgstr "" -"després de resoldre els conflictes, marqueu els camins\n" -"corregits amb 'git add ' o 'git rm '" +#: gpg-interface.c:185 +msgid "gpg failed to sign the data" +msgstr "gpg ha fallat en signar les dades" -#: sequencer.c:177 -msgid "" -"after resolving the conflicts, mark the corrected paths\n" -"with 'git add ' or 'git rm '\n" -"and commit the result with 'git commit'" -msgstr "" -"després de resoldre els conflictes, marqueu els camins\n" -"corregits amb 'git add ' o 'git rm '\n" -"i cometeu el resultat amb 'git commit'" +#: gpg-interface.c:215 +msgid "could not create temporary file" +msgstr "no s'ha pogut crear el fitxer temporal" -#: sequencer.c:190 sequencer.c:841 sequencer.c:924 +#: gpg-interface.c:217 #, c-format -msgid "Could not write to %s" -msgstr "No s'ha pogut escriure a %s" +msgid "failed writing detached signature to '%s'" +msgstr "s'ha fallat en escriure la signatura separada a '%s'" -#: sequencer.c:193 sequencer.c:843 sequencer.c:928 +#: grep.c:1782 #, c-format -msgid "Error wrapping up %s." -msgstr "Ha hagut un error en finalitzar %s." - -#: sequencer.c:208 -msgid "Your local changes would be overwritten by cherry-pick." -msgstr "Els vostres canvis locals se sobreescriurien pel recull de cireres." - -#: sequencer.c:210 -msgid "Your local changes would be overwritten by revert." -msgstr "Els vostres canvis locals se sobreescriurien per la reversió." - -#: sequencer.c:213 -msgid "Commit your changes or stash them to proceed." -msgstr "Cometeu els vostres canvis o emmagatzemeu-los per a procedir." +msgid "'%s': unable to read %s" +msgstr "'%s': no s'ha pogut llegir %s" -#: sequencer.c:228 +#: grep.c:1799 builtin/clone.c:381 builtin/diff.c:84 builtin/rm.c:155 #, c-format -msgid "%s: fast-forward" -msgstr "%s: avanç ràpid" +msgid "failed to stat '%s'" +msgstr "s'ha fallat en fer stat a '%s'" -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:303 +#: grep.c:1810 #, c-format -msgid "%s: Unable to write new index file" -msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" - -#: sequencer.c:321 -msgid "Could not resolve HEAD commit\n" -msgstr "No s'ha pogut resoldre la comissió HEAD\n" - -#: sequencer.c:341 -msgid "Unable to update cache tree\n" -msgstr "No s'ha pogut actualitzar l'arbre cau\n" +msgid "'%s': short read" +msgstr "'%s': lectura curta" -#: sequencer.c:393 +#: help.c:203 #, c-format -msgid "Could not parse commit %s\n" -msgstr "No s'ha pogut analitzar la comissió %s\n" +msgid "available git commands in '%s'" +msgstr "ordres de git disponibles en '%s'" -#: sequencer.c:398 -#, c-format -msgid "Could not parse parent commit %s\n" -msgstr "No s'ha pogut analitzar la comissió mare %s\n" +#: help.c:210 +msgid "git commands available from elsewhere on your $PATH" +msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH" -#: sequencer.c:463 -msgid "Your index file is unmerged." -msgstr "El vostre fitxer d'índex està sense fusionar." +#: help.c:241 +msgid "These are common Git commands used in various situations:" +msgstr "Aquestes són ordres del Git comunament usades en diverses situacions:" -#: sequencer.c:482 +#: help.c:306 #, 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." +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" +"executar-la. Pot ser que git-%s estigui estropejat?" -#: sequencer.c:490 -#, c-format -msgid "Commit %s does not have parent %d" -msgstr "La comissió %s no té mare %d" +#: help.c:361 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Ai. El vostre sistema no informa de cap ordre de Git." -#: sequencer.c:494 +#: help.c:383 #, c-format -msgid "Mainline was specified but commit %s is not a merge." +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" msgstr "" -"S'ha especificat la línia principal però la comissió %s no és una fusió." +"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom '%s', la qual no " +"existeix.\n" +"S'està continuant sota l'assumpció que volíeu dir '%s'" -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: sequencer.c:507 +#: help.c:388 #, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "%s: no es pot analitzar la comissió mare %s" +msgid "in %0.1f seconds automatically..." +msgstr "en %0.1f segons automàticament..." -#: sequencer.c:511 +#: help.c:395 #, c-format -msgid "Cannot get commit message for %s" -msgstr "No es pot obtenir el missatge de comissió de %s" +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' no és una ordre de git. Vegeu 'git --help'." -#: sequencer.c:597 -#, c-format -msgid "could not revert %s... %s" -msgstr "no s'ha pogut revertir %s...%s" +#: help.c:399 help.c:465 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Volíeu dir això?" +msgstr[1] "" +"\n" +"Volíeu dir un d'aquests?" -#: sequencer.c:598 +#: help.c:461 #, c-format -msgid "could not apply %s... %s" -msgstr "no s'ha pogut aplicar %s...%s" +msgid "%s: %s - %s" +msgstr "%s: %s - %s" -#: sequencer.c:633 -msgid "empty commit set passed" -msgstr "conjunt de comissions buit passat" +#: ident.c:334 +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" +"*** Si us plau, digueu-me qui sou.\n" +"\n" +"Executeu\n" +"\n" +" git config --global user.email \"vós@example.com\"\n" +" git config --global user.name \"El Vostre Nom\"\n" +"\n" +"per a establir la identitat predeterminat del vostre compte.\n" +"Ometeu --global per a establir la identitat només en aquest dipòsit.\n" -#: sequencer.c:641 +#: lockfile.c:152 #, c-format -msgid "git %s: failed to read the index" -msgstr "git %s: s'ha fallat en llegir l'índex" +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 "" +"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'. Si us\n" +"plau, assegureu-vos que tots els processos s'hagin terminat i\n" +"llavors trobeu de nou. Si encara falla, potser que un procés de\n" +"git ha tingut una pana:\n" +"elimineu el fitxer manualment per a continuar." -#: sequencer.c:645 +#: lockfile.c:160 #, c-format -msgid "git %s: failed to refresh the index" -msgstr "git %s: s'ha fallat en actualitzar l'índex" - -#: sequencer.c:705 -msgid "Cannot revert during another revert." -msgstr "No es pot revertir durant una altra reversió." +msgid "Unable to create '%s.lock': %s" +msgstr "No s'ha pogut crear '%s.lock': %s" -#: sequencer.c:706 -msgid "Cannot revert during a cherry-pick." -msgstr "No es pot revertir durant un recull de cireres." +#: merge.c:41 +msgid "failed to read the cache" +msgstr "s'ha fallat en llegir la memòria cau" -#: sequencer.c:709 -msgid "Cannot cherry-pick during a revert." -msgstr "No es pot recollir cireres durant una reversió." +#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:374 +#: builtin/checkout.c:588 builtin/clone.c:731 +msgid "unable to write new index file" +msgstr "no s'ha pogut escriure un fitxer d'índex nou" -#: sequencer.c:710 -msgid "Cannot cherry-pick during another cherry-pick." -msgstr "No es pot recollir cireres durant altre recull de cireres." +#: merge-recursive.c:209 +msgid "(bad commit)\n" +msgstr "(comissió dolenta)\n" -#: sequencer.c:732 +#: merge-recursive.c:231 #, c-format -msgid "Could not parse line %d." -msgstr "No s'ha pogut analitzar la línia %d." +msgid "addinfo_cache failed for path '%s'" +msgstr "addinfo_cache ha fallat per al camí '%s'" -#: sequencer.c:737 -msgid "No commits parsed." -msgstr "No s'ha analitzat cap comissió." +#: merge-recursive.c:301 +msgid "error building trees" +msgstr "error en construir arbres" -#: sequencer.c:749 +#: merge-recursive.c:720 #, c-format -msgid "Could not open %s" -msgstr "No s'ha pogut obrir %s" +msgid "failed to create path '%s'%s" +msgstr "s'ha fallat en crear el camí '%s'%s" -#: sequencer.c:753 +#: merge-recursive.c:731 #, c-format -msgid "Could not read %s." -msgstr "No s'ha pogut llegir %s." +msgid "Removing %s to make room for subdirectory\n" +msgstr "S'està eliminant %s per a fer espai per al subdirectori\n" -#: sequencer.c:760 -#, c-format -msgid "Unusable instruction sheet: %s" -msgstr "Full d'instruccions inusable: %s" +#: merge-recursive.c:745 merge-recursive.c:764 +msgid ": perhaps a D/F conflict?" +msgstr ": potser un conflicte D/F?" -#: sequencer.c:790 +#: merge-recursive.c:754 #, c-format -msgid "Invalid key: %s" -msgstr "Clau no vàlida: %s" +msgid "refusing to lose untracked file at '%s'" +msgstr "s'està refusant perdre el fitxer no seguit a '%s'" -#: sequencer.c:793 builtin/pull.c:50 builtin/pull.c:52 +#: merge-recursive.c:796 builtin/cat-file.c:34 #, c-format -msgid "Invalid value for %s: %s" -msgstr "Valor no vàlid per a %s: %s" +msgid "cannot read object %s '%s'" +msgstr "no es pot llegir l'objecte %s '%s'" -#: sequencer.c:803 +#: merge-recursive.c:798 #, c-format -msgid "Malformed options sheet: %s" -msgstr "Full d'opcions mal format: %s" - -#: sequencer.c:822 -msgid "a cherry-pick or revert is already in progress" -msgstr "un recull de cireres o una reversió ja està en curs" - -#: sequencer.c:823 -msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" -msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" +msgid "blob expected for %s '%s'" +msgstr "blob esperat per a %s '%s'" -#: sequencer.c:827 +#: merge-recursive.c:822 #, c-format -msgid "Could not create sequencer directory %s" -msgstr "No s'ha pogut crear el directori de seqüenciador %s" - -#: sequencer.c:862 sequencer.c:998 -msgid "no cherry-pick or revert in progress" -msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" - -#: sequencer.c:864 -msgid "cannot resolve HEAD" -msgstr "no es pot resoldre HEAD" - -#: sequencer.c:866 sequencer.c:900 -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" +msgid "failed to open '%s': %s" +msgstr "s'ha fallat en obrir '%s': %s" -#: sequencer.c:886 builtin/fetch.c:724 builtin/fetch.c:970 +#: merge-recursive.c:833 #, c-format -msgid "cannot open %s" -msgstr "no es pot obrir %s" +msgid "failed to symlink '%s': %s" +msgstr "s'ha fallat en fer l'enllaç simbòlic '%s': %s" -#: sequencer.c:888 +#: merge-recursive.c:838 #, c-format -msgid "cannot read %s: %s" -msgstr "no es pot llegir %s: %s" - -#: sequencer.c:889 -msgid "unexpected end of file" -msgstr "final de fitxer inesperat" - -#: sequencer.c:895 -#, c-format -msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" -msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès" - -#: sequencer.c:921 -#, c-format -msgid "Could not format %s." -msgstr "No s'ha pogut formatar %s." - -#: sequencer.c:1066 -#, c-format -msgid "%s: can't cherry-pick a %s" -msgstr "%s: no es pot recollir com a cirera un %s" - -#: sequencer.c:1069 -#, c-format -msgid "%s: bad revision" -msgstr "%s: revisió dolenta" +msgid "do not know what to do with %06o %s '%s'" +msgstr "no se sap què fer amb %06o %s '%s'" -#: sequencer.c:1102 -msgid "Can't revert as initial commit" -msgstr "No es pot revertir com a comissió inicial" +#: merge-recursive.c:978 +msgid "Failed to execute internal merge" +msgstr "S'ha fallat en executar la fusió interna" -#: setup.c:160 +#: merge-recursive.c:982 #, c-format -msgid "" -"%s: no such path in the working tree.\n" -"Use 'git -- ...' to specify paths that do not exist locally." -msgstr "" -"%s: no hi ha tal camí en l'arbre de treball.\n" -"Useu 'git -- ...' per a especificar camins que no existeixin " -"localment." +msgid "Unable to add %s to database" +msgstr "no s'ha pogut afegir %s a la base de dades" -#: setup.c:173 +#: merge-recursive.c:1081 merge-recursive.c:1095 #, 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 [...] -- [...]'" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree." msgstr "" -"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n" -"Useu '--' per a separar els camins de les revisions, com això:\n" -"'git [...] -- [...]'" +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre." -#: setup.c:223 +#: merge-recursive.c:1087 merge-recursive.c:1100 #, c-format msgid "" -"ambiguous argument '%s': both revision and filename\n" -"Use '--' to separate paths from revisions, like this:\n" -"'git [...] -- [...]'" +"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " +"in tree at %s." 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" -"'git [...] -- [...]'" - -#: setup.c:248 builtin/apply.c:3362 builtin/apply.c:3373 builtin/apply.c:3419 -#, c-format -msgid "failed to read %s" -msgstr "s'ha fallat en llegir %s" +"CONFLICTE: (%s/supressió): %s suprimit en %s i %s en %s. La versió %s de %s " +"s'ha deixat en l'arbre a %s." -#: setup.c:468 -#, 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" +#: merge-recursive.c:1143 +msgid "rename" +msgstr "canvi de nom" -#: setup.c:476 -msgid "unknown repository extensions found:" -msgstr "s'han trobat extensions de dipòsit desconegudes:" +#: merge-recursive.c:1143 +msgid "renamed" +msgstr "canviat de nom" -#: setup.c:762 +#: merge-recursive.c:1200 #, c-format -msgid "Not a git repository (or any of the parent directories): %s" -msgstr "No un dipòsit de git (ni cap dels directoris pares): %s" - -#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 -msgid "Cannot come back to cwd" -msgstr "No es pot tornar al directori de treball actual" - -#: setup.c:845 -msgid "Unable to read current working directory" -msgstr "No s'ha pogut llegir el directori de treball actual" +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ò" -#: setup.c:920 +#: merge-recursive.c:1225 #, 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)." +"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" +"\"->\"%s\" in \"%s\"%s" msgstr "" -"No un dipòsit de git (ni cap pare fins el punt de muntatge %s)\n" -"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " -"no està establert)." +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom \"%s\"->\"%s\" en la " +"branca \"%s\" canvi de nom \"%s\"->\"%s\" en \"%s\"%s" -#: setup.c:927 -#, c-format -msgid "Cannot change to '%s/..'" -msgstr "No es pot canviar a '%s/..'" +#: merge-recursive.c:1230 +msgid " (left unresolved)" +msgstr " (deixat sense resolució)" -#: setup.c:989 +#: merge-recursive.c:1292 #, c-format -msgid "" -"Problem with core.sharedRepository filemode value (0%.3o).\n" -"The owner of files must always have read and write permissions." +msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" -"Problema amb el valor de mode de fitxer core.sharedRepository (0%.3o).\n" -"El propietari dels fitxers sempre ha de tenir permissions de lectura i " -"escriptura." - -#: sha1_file.c:1046 -msgid "offset before end of packfile (broken .idx?)" -msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" +"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom %s->%s en %s. Canvi de " +"nom %s->%s en %s" -#: sha1_file.c:2434 +#: merge-recursive.c:1325 #, 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?)" +msgid "Renaming %s to %s and %s to %s instead" +msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això" -#: sha1_file.c:2438 +#: merge-recursive.c:1531 #, 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?)" - -#: sha1_name.c:462 -msgid "" -"Git normally never creates a ref that ends with 40 hex characters\n" -"because it will be ignored when you just specify 40-hex. These refs\n" -"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\"" +msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s" msgstr "" -"Git normalment mai crea una referència que acabi amb 40 caràcters\n" -"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n" -"hexadecimals. Aquestes referències es poden crear per error. Per\n" -"exemple,\n" -"\n" -" git checkout -b $br $(git rev-parse ...)\n" -"\n" -"on \"$br\" és d'alguna manera buit i una referència de 40 caràcters\n" -"hexadecimals. Si us plau, examineu aquestes referències i potser\n" -"suprimiu-les. Desactiveu aquest missatge executant\n" -"\"git config advice.objectNameWarning false\"" +"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en " +"%s" -#: submodule.c:64 submodule.c:98 -msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" -msgstr "" -"No es pot canviar un .gitmodules no fusionat, primer resoldreu els " -"conflictes de fusió" +#: merge-recursive.c:1546 +#, c-format +msgid "Adding merged %s" +msgstr "S'està afegint %s fusionat" -#: submodule.c:68 submodule.c:102 +#: merge-recursive.c:1553 merge-recursive.c:1766 #, c-format -msgid "Could not find section in .gitmodules where path=%s" -msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s" +msgid "Adding as %s instead" +msgstr "S'està afegint com a %s en lloc d'això" -#: submodule.c:76 +#: merge-recursive.c:1610 #, c-format -msgid "Could not update .gitmodules entry %s" -msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" +msgid "cannot read object %s" +msgstr "no es pot llegir l'objecte %s" -#: submodule.c:109 +#: merge-recursive.c:1613 #, c-format -msgid "Could not remove .gitmodules entry for %s" -msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" +msgid "object %s is not a blob" +msgstr "l'objecte %s no és un blob" -#: submodule.c:120 -msgid "staging updated .gitmodules failed" -msgstr "L'allistament del .gitmodules actualitzat ha fallat" +#: merge-recursive.c:1666 +msgid "modify" +msgstr "modificació" -#: submodule.c:177 -msgid "negative values not allowed for submodule.fetchJobs" -msgstr "no es permeten els valors negatius a submodule.fetchJobs" +#: merge-recursive.c:1666 +msgid "modified" +msgstr "modificat" -#: submodule-config.c:358 -#, c-format -msgid "invalid value for %s" -msgstr "valor no vàlid per a %s" +#: merge-recursive.c:1676 +msgid "content" +msgstr "contingut" -#: trailer.c:237 -#, c-format -msgid "running trailer command '%s' failed" -msgstr "l'execució de l'ordre de remolc '%s' ha fallat" +#: merge-recursive.c:1683 +msgid "add/add" +msgstr "afegiment/afegiment" -#: trailer.c:492 trailer.c:496 trailer.c:500 trailer.c:554 trailer.c:558 -#: trailer.c:562 +#: merge-recursive.c:1718 #, c-format -msgid "unknown value '%s' for key '%s'" -msgstr "valor desconegut '%s' per a la clau '%s'" +msgid "Skipped %s (merged same as existing)" +msgstr "S'ha saltat %s (el fusionat és igual a l'existent)" -#: trailer.c:544 trailer.c:549 builtin/remote.c:289 +#: merge-recursive.c:1732 #, c-format -msgid "more than one %s" -msgstr "més d'un %s" +msgid "Auto-merging %s" +msgstr "S'està autofusionant %s" + +#: merge-recursive.c:1736 git-submodule.sh:924 +msgid "submodule" +msgstr "submòdul" -#: trailer.c:582 +#: merge-recursive.c:1737 #, c-format -msgid "empty trailer token in trailer '%.*s'" -msgstr "fitxa de remolc buida en el remolc '%.*s'" +msgid "CONFLICT (%s): Merge conflict in %s" +msgstr "CONFLICTE (%s): Conflicte de fusió en %s" -#: trailer.c:702 +#: merge-recursive.c:1831 #, c-format -msgid "could not read input file '%s'" -msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" +msgid "Removing %s" +msgstr "S'està eliminant %s" -#: trailer.c:705 -msgid "could not read from stdin" -msgstr "No s'ha pogut llegir des d'stdin" +#: merge-recursive.c:1857 +msgid "file/directory" +msgstr "fitxer/directori" -#: trailer.c:857 builtin/am.c:42 -#, c-format -msgid "could not stat %s" -msgstr "no s'ha pogut fer stat a %s" +#: merge-recursive.c:1863 +msgid "directory/file" +msgstr "directori/fitxer" -#: trailer.c:859 +#: merge-recursive.c:1868 #, c-format -msgid "file %s is not a regular file" -msgstr "el fitxer %s no és un fitxer regular" +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" -#: trailer.c:861 +#: merge-recursive.c:1877 #, c-format -msgid "file %s is not writable by user" -msgstr "el fitxer %s no és gravable per l'usuari" +msgid "Adding %s" +msgstr "S'està afegint %s" -#: trailer.c:873 -msgid "could not open temporary file" -msgstr "no s'ha pogut obrir el fitxer temporal" +#: merge-recursive.c:1914 +msgid "Already up-to-date!" +msgstr "Ja està al dia!" -#: trailer.c:912 +#: merge-recursive.c:1923 #, c-format -msgid "could not rename temporary file to %s" -msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" +msgid "merging of trees %s and %s failed" +msgstr "la fusió dels arbres %s i %s ha fallat" -#: transport.c:62 +#: merge-recursive.c:2006 +msgid "Merging:" +msgstr "Fusionant:" + +#: merge-recursive.c:2019 #, c-format -msgid "Would set upstream of '%s' to '%s' of '%s'\n" -msgstr "Canviaria la font de '%s' a '%s' de '%s'\n" +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ú:" -#: transport.c:151 +#: merge-recursive.c:2058 +msgid "merge returned no commit" +msgstr "la fusió no ha retornat cap comissió" + +#: merge-recursive.c:2121 #, c-format -msgid "transport: invalid depth option '%s'" -msgstr "transport: opció de profunditat no vàlida '%s'" +msgid "Could not parse object '%s'" +msgstr "No s'ha pogut analitzar l'objecte '%s'" + +#: merge-recursive.c:2135 builtin/merge.c:641 builtin/merge.c:788 +msgid "Unable to write index." +msgstr "No s'ha pogut escriure l'índex." -#: transport.c:771 +#: notes-merge.c:273 #, c-format msgid "" -"The following submodule paths contain changes that can\n" -"not be found on any remote:\n" +"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 "" -"Els camins de submòdul següents contenen canvis que no\n" -"es poden trobar en cap remot:\n" +"No heu conclòs la vostra fusió de notes prèvia (%s existeix).\n" +"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per " +"a cometre/avortar la fusió prèvia abans de començar una fusió de notes nova." -#: transport.c:775 +#: notes-merge.c:280 #, 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" -"Si us plau, intenteu\n" -"\n" -"\tgit push --recurse-submodules=on-demand\n" -"\n" -"o canviar de directori al camí i useu\n" -"\n" -"\tgit push\n" -"\n" -"per a pujar-los a un remot.\n" +msgid "You have not concluded your notes merge (%s exists)." +msgstr "No heu conclòs la vostra fusió de notes (%s existeix)." -#: transport.c:783 -msgid "Aborting." -msgstr "S'està avortant." +#: notes-utils.c:41 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "No es pot cometre un arbre de notes no inicialitzat / no referenciat" -#: transport-helper.c:1041 +#: notes-utils.c:100 #, c-format -msgid "Could not read ref %s" -msgstr "No s'ha pogut llegir la referència %s" +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Valor de notes.rewriteMode dolent: '%s'" -#: unpack-trees.c:64 +#: notes-utils.c:110 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%sPlease commit your changes or stash them before you switch branches." -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"agafar:\n" -"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " -"canviar de branca." +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)" -#: unpack-trees.c:66 +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: notes-utils.c:137 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by checkout:\n" -"%%s" -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"agafar:\n" -"%%s" +msgid "Bad %s value: '%s'" +msgstr "Valor dolent de %s: '%s'" -#: unpack-trees.c:69 +#: object.c:242 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%sPlease commit your changes or stash them before you merge." -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"fusionar:\n" -"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " -"fusionar." +msgid "unable to parse object: %s" +msgstr "no s'ha pogut analitzar l'objecte: %s" -#: unpack-trees.c:71 +#: parse-options.c:572 +msgid "..." +msgstr "..." + +#: parse-options.c:590 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -"%%s" -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per " -"fusionar:\n" -"%%s" +msgid "usage: %s" +msgstr "ús: %s" -#: unpack-trees.c:74 +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:594 #, 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 "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" -"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s." +msgid " or: %s" +msgstr " o: %s" -#: unpack-trees.c:76 +#: parse-options.c:597 #, c-format -msgid "" -"Your local changes to the following files would be overwritten by %s:\n" -"%%s" -msgstr "" -"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" -"%%s" +msgid " %s" +msgstr " %s" -#: unpack-trees.c:81 +#: parse-options.c:631 +msgid "-NUM" +msgstr "-NUM" + +#: parse-options-cb.c:108 #, c-format -msgid "" -"Updating the following directories would lose untracked files in it:\n" -"%s" -msgstr "" -"Actualitzar els directoris següents perdria fitxers no seguits en el:\n" -"%s" +msgid "malformed object name '%s'" +msgstr "nom d'objecte mal format '%s'" -#: unpack-trees.c:85 +#: path.c:826 #, c-format -msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%sPlease move or remove them before you switch branches." +msgid "Could not make %s writable by group" +msgstr "No s'ha pogut fer %s escrivible pel grup" + +#: pathspec.c:133 +msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"agafar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." +"els ajusts d'especificació de camí 'glob' i 'noglob' globals són " +"incompatibles" -#: unpack-trees.c:87 -#, c-format +#: pathspec.c:143 msgid "" -"The following untracked working tree files would be removed by checkout:\n" -"%%s" +"global 'literal' pathspec setting is incompatible with all other global " +"pathspec settings" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"agafar:\n" -"%%s" +"l'ajust d'especificació de camí 'literal' global és incompatible amb tots " +"els altres ajusts d'especificació de camí globals" -#: unpack-trees.c:90 +#: pathspec.c:177 +msgid "invalid parameter for pathspec magic 'prefix'" +msgstr "paràmetre no vàlid per a la màgia d'especificació de camí 'prefix'" + +#: pathspec.c:183 #, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"fusionar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." +msgid "Invalid pathspec magic '%.*s' in '%s'" +msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'" -#: unpack-trees.c:92 +#: pathspec.c:187 #, c-format -msgid "" -"The following untracked working tree files would be removed by merge:\n" -"%%s" -msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " -"fusionar:\n" -"%%s" +msgid "Missing ')' at the end of pathspec magic in '%s'" +msgstr "')' mancant al final de la màgia d'especificació de camí en '%s'" -#: unpack-trees.c:95 +#: pathspec.c:205 +#, c-format +msgid "Unimplemented pathspec magic '%c' in '%s'" +msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'" + +#: pathspec.c:230 +#, c-format +msgid "%s: 'literal' and 'glob' are incompatible" +msgstr "%s: 'literal' i 'glob' són incompatibles" + +#: pathspec.c:241 +#, c-format +msgid "%s: '%s' is outside repository" +msgstr "%s: '%s' és fora del dipòsit" + +#: pathspec.c:291 #, c-format +msgid "Pathspec '%s' is in submodule '%.*s'" +msgstr "L'especificació '%s' és en el submòdul '%.*s'" + +#: pathspec.c:353 +#, c-format +msgid "%s: pathspec magic not supported by this command: %s" +msgstr "" +"%s: aquesta ordre no és compatible amb la màgia d'especificació de camí: %s" + +#: pathspec.c:408 msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%sPlease move or remove them before you %s." +"empty strings as pathspecs will be made invalid in upcoming releases. please " +"use . instead if you meant to match all paths" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de %s." +"es faran no vàlides les cadenes buides com especificacions de camí en " +"versions futures. si us plau, useu . en lloc d'això si volíeu coincidir amb " +"tots els camins" -#: unpack-trees.c:97 +#: pathspec.c:440 #, 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" + +#: pathspec.c:449 msgid "" -"The following untracked working tree files would be removed by %s:\n" -"%%s" +"There is nothing to exclude from by :(exclude) patterns.\n" +"Perhaps you forgot to add either ':/' or '.' ?" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" -"%%s" +"No hi ha res a excloure per patrons :(exclusió).\n" +"Potser heu oblidat afegir o ':/' o '.' ?" -#: unpack-trees.c:102 +#: pretty.c:971 +msgid "unable to parse --pretty format" +msgstr "no s'ha pogut analitzar el format --pretty" + +#: read-cache.c:1315 #, c-format msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%sPlease move or remove them before you switch branches." +"index.version set, but the value is invalid.\n" +"Using version %i" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"agafar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." +"index.version està establerta, però el valor no és vàlid.\n" +"S'està usant la versió %i" -#: unpack-trees.c:104 +#: read-cache.c:1325 #, c-format msgid "" -"The following untracked working tree files would be overwritten by " -"checkout:\n" -"%%s" +"GIT_INDEX_VERSION set, but the value is invalid.\n" +"Using version %i" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"agafar:\n" -"%%s" +"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n" +"S'està usant la versió %i" -#: unpack-trees.c:107 +#: refs.c:576 builtin/merge.c:840 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%sPlease move or remove them before you merge." -msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"fusionar:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." +msgid "Could not open '%s' for writing" +msgstr "No s'ha pogut obrir '%s' per a escriptura" -#: unpack-trees.c:109 +#: refs/files-backend.c:2481 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by merge:\n" -"%%s" -msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"fusionar:\n" -"%%s" +msgid "could not delete reference %s: %s" +msgstr "no s'ha pogut suprimir la referència %s: %s" -#: unpack-trees.c:112 +#: refs/files-backend.c:2484 #, c-format -msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%sPlease move or remove them before you %s." +msgid "could not delete references: %s" +msgstr "no s'ha pogut suprimir les referències: %s" + +#: refs/files-backend.c:2493 +#, c-format +msgid "could not remove reference %s" +msgstr "no s'ha pogut eliminar la referència %s" + +#: ref-filter.c:55 +#, c-format +msgid "expected format: %%(color:)" +msgstr "format esperat: %%(color:)" + +#: ref-filter.c:57 +#, c-format +msgid "unrecognized color: %%(color:%s)" +msgstr "color no reconegut: %%(color:%s)" + +#: ref-filter.c:71 +#, c-format +msgid "unrecognized format: %%(%s)" +msgstr "format no reconegut: %%(%s)" + +#: ref-filter.c:77 +#, c-format +msgid "%%(body) does not take arguments" +msgstr "%%(body) no accepta paràmetres" + +#: ref-filter.c:84 +#, c-format +msgid "%%(subject) does not take arguments" +msgstr "%%(subject) no accepta paràmetres" + +#: ref-filter.c:101 +#, c-format +msgid "positive value expected contents:lines=%s" +msgstr "valor positiu esperat contents:lines=%s" + +#: ref-filter.c:103 +#, c-format +msgid "unrecognized %%(contents) argument: %s" +msgstr "paràmetre %%(contents) no reconegut: %s" + +#: ref-filter.c:113 +#, c-format +msgid "unrecognized %%(objectname) argument: %s" +msgstr "paràmetre %%(objectname) no reconegut: %s" + +#: ref-filter.c:135 +#, c-format +msgid "expected format: %%(align:,)" +msgstr "format esperat: %%(align:,)" + +#: ref-filter.c:147 +#, c-format +msgid "unrecognized position:%s" +msgstr "posició no reconeguda:%s" + +#: ref-filter.c:151 +#, c-format +msgid "unrecognized width:%s" +msgstr "amplada no reconeguda:%s" + +#: ref-filter.c:157 +#, c-format +msgid "unrecognized %%(align) argument: %s" +msgstr "paràmetre %%(align) no reconegut: %s" + +#: ref-filter.c:161 +#, c-format +msgid "positive width expected with the %%(align) atom" +msgstr "amplada positiva esperada amb l'àtom %%(align)" + +#: ref-filter.c:244 +#, c-format +msgid "malformed field name: %.*s" +msgstr "nom de camp mal format: %.*s" + +#: ref-filter.c:270 +#, c-format +msgid "unknown field name: %.*s" +msgstr "nom de camp desconegut: %.*s" + +#: ref-filter.c:372 +#, 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:424 +#, c-format +msgid "malformed format string %s" +msgstr "cadena de format mal format %s" + +#: ref-filter.c:878 +msgid ":strip= requires a positive integer argument" +msgstr ":strip= requereix un paràmetre enter positiu" + +#: ref-filter.c:883 +#, c-format +msgid "ref '%s' does not have %ld components to :strip" +msgstr "la referència '%s' no té %ld components per a :strip" + +#: ref-filter.c:1046 +#, c-format +msgid "unknown %.*s format %s" +msgstr "format de %.*s desconegut %s" + +#: ref-filter.c:1066 ref-filter.c:1097 +#, c-format +msgid "missing object %s for %s" +msgstr "manca l'objecte %s per a %s" + +#: ref-filter.c:1069 ref-filter.c:1100 +#, 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:1311 +#, c-format +msgid "malformed object at '%s'" +msgstr "objecte mal format a '%s'" + +#: ref-filter.c:1373 +#, c-format +msgid "ignoring ref with broken name %s" +msgstr "s'està ignorant la referència amb nom trencat %s" + +#: ref-filter.c:1378 +#, c-format +msgid "ignoring broken ref %s" +msgstr "s'està ignorant la referència trencada %s" + +#: ref-filter.c:1633 +#, c-format +msgid "format: %%(end) atom missing" +msgstr "format: manca l'àtom %%(end)" + +#: ref-filter.c:1687 +#, c-format +msgid "malformed object name %s" +msgstr "nom d'objecte %s mal format" + +#: remote.c:746 +#, c-format +msgid "Cannot fetch both %s and %s to %s" +msgstr "No es pot obtenir ambdós %s i %s a %s" + +#: remote.c:750 +#, c-format +msgid "%s usually tracks %s, not %s" +msgstr "%s generalment segueix %s, no %s" + +#: remote.c:754 +#, c-format +msgid "%s tracks both %s and %s" +msgstr "%s segueix ambdós %s i %s" + +#: remote.c:762 +msgid "Internal error" +msgstr "Error intern" + +#: remote.c:1677 remote.c:1720 +msgid "HEAD does not point to a branch" +msgstr "HEAD no assenyala cap branca" + +#: remote.c:1686 +#, c-format +msgid "no such branch: '%s'" +msgstr "no hi ha tal branca: '%s'" + +#: remote.c:1689 +#, c-format +msgid "no upstream configured for branch '%s'" +msgstr "cap font configurada per a la branca '%s'" + +#: remote.c:1695 +#, c-format +msgid "upstream branch '%s' not stored as a remote-tracking branch" +msgstr "la branca font '%s' no s'emmagatzema com a branca amb seguiment remot" + +#: remote.c:1710 +#, c-format +msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"%s:\n" -"%%sSi us plau, moveu-los o elimineu-los abans de %s." +"el destí de pujada '%s' en el remot '%s' no té cap branca seguidora local" -#: unpack-trees.c:114 +#: remote.c:1725 +#, c-format +msgid "branch '%s' has no remote for pushing" +msgstr "la branca '%s' no té cap remot al qual pujar" + +#: remote.c:1736 +#, c-format +msgid "push refspecs for '%s' do not include '%s'" +msgstr "les especificacions de referència de '%s' no inclouen '%s'" + +#: remote.c:1749 +msgid "push has no destination (push.default is 'nothing')" +msgstr "push no té destí (push.default és 'nothing')" + +#: remote.c:1771 +msgid "cannot resolve 'simple' push to a single destination" +msgstr "no es pot resoldre una pujada 'simple' a un sol destí" + +#: remote.c:2073 +#, 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:2077 +msgid " (use \"git branch --unset-upstream\" to fixup)\n" +msgstr " (useu \"git branch --unset-upstream\" per a arreglar)\n" + +#: remote.c:2080 +#, c-format +msgid "Your branch is up-to-date with '%s'.\n" +msgstr "La vostra branca està al dia amb '%s'.\n" + +#: remote.c:2084 +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "La vostra branca està davant de '%s' per %d comissió.\n" +msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n" + +#: remote.c:2090 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " (useu \"git push\" per a publicar les vostres comissions locals)\n" + +#: remote.c:2093 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se " +"ràpidament.\n" +msgstr[1] "" +"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se " +"ràpidament.\n" + +#: remote.c:2101 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " (useu \"git pull\" per a actualitzar la vostra branca local)\n" + +#: remote.c:2104 #, c-format msgid "" -"The following untracked working tree files would be overwritten by %s:\n" -"%%s" -msgstr "" -"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " -"%s:\n" -"%%s" +"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] "" +"La vostra branca i '%s' s'han divergit,\n" +"i tenen %d i %d comissió distinta cada una, respectivament.\n" +msgstr[1] "" +"La vostra branca i '%s' s'han divergit,\n" +"i tenen %d i %d comissions distintes cada una, respectivament.\n" -#: unpack-trees.c:121 +#: remote.c:2114 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n" + +#: revision.c:2158 +msgid "your current branch appears to be broken" +msgstr "la vostra branca actual sembla trencada" + +#: revision.c:2161 #, c-format -msgid "Entry '%s' overlaps with '%s'. Cannot bind." -msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular." +msgid "your current branch '%s' does not have any commits yet" +msgstr "la vostra branca actual '%s' encara no té cap comissió" -#: unpack-trees.c:124 +#: revision.c:2355 +msgid "--first-parent is incompatible with --bisect" +msgstr "--first-parent és incompatible amb --bisect" + +#: run-command.c:106 +msgid "open /dev/null failed" +msgstr "s'ha fallat en obrir /dev/null" + +#: run-command.c:108 #, c-format +msgid "dup2(%d,%d) failed" +msgstr "dup2(%d,%d) ha fallat" + +#: send-pack.c:297 +msgid "failed to sign the push certificate" +msgstr "s'ha fallat en signar el certificat de pujada" + +#: send-pack.c:410 +msgid "the receiving end does not support --signed push" +msgstr "el destí receptor no admet pujar --signed" + +#: send-pack.c:412 msgid "" -"Cannot update sparse checkout: the following entries are not up-to-date:\n" -"%s" +"not sending a push certificate since the receiving end does not support --" +"signed push" msgstr "" -"No es pot actualitzar l'agafament parcial: les entrades següents no estan al " -"dia:\n" -"%s" +"no s'està enviant una certificació de pujada perquè el destí receptor no " +"admet pujar --signed" -#: unpack-trees.c:126 -#, c-format +#: send-pack.c:424 +msgid "the receiving end does not support --atomic push" +msgstr "el destí receptor no admet pujar --atomic" + +#: send-pack.c:429 +msgid "the receiving end does not support push options" +msgstr "el destí receptor no admet opcions de pujada" + +#: sequencer.c:171 +msgid "revert" +msgstr "revertir" + +#: sequencer.c:171 +msgid "cherry-pick" +msgstr "recollir cireres" + +#: sequencer.c:228 msgid "" -"The following Working tree files would be overwritten by sparse checkout " -"update:\n" -"%s" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '" msgstr "" -"Els fitxers següents en l'arbre de treball se sobreescriurien per " -"actualitzar l'agafament parcial:\n" -"%s" +"després de resoldre els conflictes, marqueu els camins\n" +"corregits amb 'git add ' o 'git rm '" -#: unpack-trees.c:128 -#, c-format +#: sequencer.c:231 msgid "" -"The following Working tree files would be removed by sparse checkout " -"update:\n" -"%s" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '\n" +"and commit the result with 'git commit'" msgstr "" -"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar " -"l'agafament parcial:\n" -"%s" +"després de resoldre els conflictes, marqueu els camins\n" +"corregits amb 'git add ' o 'git rm '\n" +"i cometeu el resultat amb 'git commit'" -#: unpack-trees.c:205 +#: sequencer.c:244 sequencer.c:1209 #, c-format -msgid "Aborting\n" -msgstr "S'està avortant\n" +msgid "could not lock '%s'" +msgstr "no s'ha pogut bloquejar '%s'" -#: unpack-trees.c:237 -msgid "Checking out files" -msgstr "S'està agafant fitxers" +#: sequencer.c:247 sequencer.c:1125 sequencer.c:1214 +#, c-format +msgid "could not write to '%s'" +msgstr "no s'ha pogut escriure a '%s'" -#: urlmatch.c:120 -msgid "invalid URL scheme name or missing '://' suffix" -msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'" +#: sequencer.c:251 +#, c-format +msgid "could not write eol to '%s'" +msgstr "no s'ha pogut escriure el terminador de línia a '%s'" -#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#: sequencer.c:255 sequencer.c:1130 sequencer.c:1216 #, c-format -msgid "invalid %XX escape sequence" -msgstr "seqüència d'escapament %XX no vàlida" +msgid "failed to finalize '%s'." +msgstr "s'ha fallat en finalitzar '%s'." -#: urlmatch.c:172 -msgid "missing host and scheme is not 'file:'" -msgstr "manca la màquina i l'esquema no és 'file:'" +#: sequencer.c:279 builtin/am.c:259 builtin/commit.c:749 builtin/merge.c:1032 +#, c-format +msgid "could not read '%s'" +msgstr "no s'ha pogut llegir '%s'" -#: urlmatch.c:189 -msgid "a 'file:' URL may not have a port number" -msgstr "un URL 'file:' no pot tenir número de port" +#: sequencer.c:305 +#, c-format +msgid "your local changes would be overwritten by %s." +msgstr "els vostres canvis locals se sobreescriurien per %s." -#: urlmatch.c:199 -msgid "invalid characters in host name" -msgstr "hi ha caràcters no vàlids en el nom de màquina" +#: sequencer.c:309 +msgid "commit your changes or stash them to proceed." +msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir." -#: urlmatch.c:244 urlmatch.c:255 -msgid "invalid port number" -msgstr "número de port no vàlid" +#: sequencer.c:324 +#, c-format +msgid "%s: fast-forward" +msgstr "%s: avanç ràpid" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:399 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou" -#: urlmatch.c:322 -msgid "invalid '..' path segment" -msgstr "segment de camí '..' no vàlid" +#: sequencer.c:418 +msgid "could not resolve HEAD commit\n" +msgstr "no s'ha pogut resoldre la comissió HEAD\n" -#: worktree.c:282 -#, c-format -msgid "failed to read '%s'" -msgstr "s'ha fallat en llegir '%s'" +#: sequencer.c:438 +msgid "unable to update cache tree\n" +msgstr "no s'ha pogut actualitzar l'arbre cau\n" -#: wrapper.c:222 wrapper.c:392 +#: sequencer.c:483 #, c-format -msgid "could not open '%s' for reading and writing" -msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura" +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 "" +"teniu canvis allistats en el vostre arbre de treball\n" +"Si aquests canvis són per a aixafar-se a la comissió prèvia, executeu:\n" +"\n" +" git commit --amend %s\n" +"\n" +"Si són per a formar una comissió nova, executeu:\n" +"\n" +" git commit %s\n" +"\n" +"En ambdós cassos, quan hàgiu terminat, continueu amb:\n" +"\n" +" git rebase --continue\n" -#: wrapper.c:224 wrapper.c:394 builtin/am.c:778 +#: sequencer.c:567 #, c-format -msgid "could not open '%s' for writing" -msgstr "no s'ha pogut obrir '%s' per a escriptura" +msgid "could not parse commit %s\n" +msgstr "no s'ha pogut analitzar la comissió %s\n" -#: wrapper.c:226 wrapper.c:396 builtin/am.c:324 builtin/am.c:771 -#: builtin/am.c:859 builtin/commit.c:1712 builtin/merge.c:1029 -#: builtin/pull.c:407 +#: sequencer.c:572 #, c-format -msgid "could not open '%s' for reading" -msgstr "no s'ha pogut obrir '%s' per a lectura" +msgid "could not parse parent commit %s\n" +msgstr "no s'ha pogut analitzar la comissió mare %s\n" -#: wrapper.c:605 wrapper.c:626 +#: sequencer.c:656 +msgid "your index file is unmerged." +msgstr "el vostre fitxer d'índex està sense fusionar." + +#: sequencer.c:675 #, c-format -msgid "unable to access '%s'" -msgstr "no s'ha pogut accedir a '%s'" +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." -#: wrapper.c:634 -msgid "unable to get current working directory" -msgstr "no s'ha pogut obtenir el directori de treball actual" +#: sequencer.c:683 +#, c-format +msgid "commit %s does not have parent %d" +msgstr "la comissió %s no té mare %d" -#: wrapper.c:658 +#: sequencer.c:687 #, c-format -msgid "could not write to %s" -msgstr "no s'ha pogut escriure a %s" +msgid "mainline was specified but commit %s is not a merge." +msgstr "" +"s'ha especificat la línia principal però la comissió %s no és una fusió." -#: wrapper.c:660 +#. TRANSLATORS: The first %s will be a "todo" command like +#. "revert" or "pick", the second %s a SHA1. +#: sequencer.c:700 #, c-format -msgid "could not close %s" -msgstr "no s'ha pogut tancar %s" +msgid "%s: cannot parse parent commit %s" +msgstr "%s: no es pot analitzar la comissió mare %s" -#: wt-status.c:150 -msgid "Unmerged paths:" -msgstr "Camins sense fusionar:" +#: sequencer.c:705 +#, c-format +msgid "cannot get commit message for %s" +msgstr "no es pot obtenir el missatge de comissió de %s" -#: wt-status.c:177 wt-status.c:204 +#: sequencer.c:797 #, c-format -msgid " (use \"git reset %s ...\" to unstage)" -msgstr " (useu \"git reset %s ...\" per a desallistar)" +msgid "could not revert %s... %s" +msgstr "no s'ha pogut revertir %s... %s" -#: wt-status.c:179 wt-status.c:206 -msgid " (use \"git rm --cached ...\" to unstage)" -msgstr " (useu \"git rm --cached ...\" per a desallistar)" +#: sequencer.c:798 +#, c-format +msgid "could not apply %s... %s" +msgstr "no s'ha pogut aplicar %s... %s" -#: wt-status.c:183 -msgid " (use \"git add ...\" to mark resolution)" -msgstr " (useu \"git add ...\" per a senyalar resolució)" +#: sequencer.c:833 +msgid "empty commit set passed" +msgstr "conjunt de comissions buit passat" -#: wt-status.c:185 wt-status.c:189 -msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" -msgstr "" -" (useu \"git add/rm ...\" segons sigui apropiat per a senyalar " -"resolució)" +#: sequencer.c:843 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: s'ha fallat en llegir l'índex" -#: wt-status.c:187 -msgid " (use \"git rm ...\" to mark resolution)" -msgstr " (useu \"git rm ...\" per a senyalar resolució)" +#: sequencer.c:850 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: s'ha fallat en actualitzar l'índex" -#: wt-status.c:198 wt-status.c:882 -msgid "Changes to be committed:" -msgstr "Canvis a cometre:" +#: sequencer.c:944 +#, c-format +msgid "invalid line %d: %.*s" +msgstr "línia no vàlida %d: %.*s" -#: wt-status.c:216 wt-status.c:891 -msgid "Changes not staged for commit:" -msgstr "Canvis no allistats per a cometre:" +#: sequencer.c:950 +msgid "no commits parsed." +msgstr "no s'ha analitzat cap comissió." -#: wt-status.c:220 -msgid " (use \"git add ...\" to update what will be committed)" -msgstr " (useu \"git add ...\" per a actualitzar què es cometrà)" +#: sequencer.c:966 +#, c-format +msgid "could not read '%s'." +msgstr "no s'ha pogut llegir '%s'." -#: wt-status.c:222 -msgid " (use \"git add/rm ...\" to update what will be committed)" -msgstr " (useu \"git add/rm ...\" per a actualitzar què es cometrà)" +#: sequencer.c:972 +#, c-format +msgid "unusable instruction sheet: '%s'" +msgstr "full d'instruccions inusable: '%s'" -#: wt-status.c:223 -msgid "" -" (use \"git checkout -- ...\" to discard changes in working directory)" -msgstr "" -" (useu \"git checkout -- ...\" per a descartar els canvis en el " -"directori de treball)" +#: sequencer.c:983 +msgid "cannot cherry-pick during a revert." +msgstr "no es pot recollir cireres durant una reversió." -#: wt-status.c:225 -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)" +#: sequencer.c:985 +msgid "cannot revert during a cherry-pick." +msgstr "no es pot revertir durant un recull de cireres." -#: wt-status.c:237 +#: sequencer.c:1028 #, c-format -msgid " (use \"git %s ...\" to include in what will be committed)" -msgstr " (useu \"git %s ...\" per a incloure-ho en què es cometrà)" - -#: wt-status.c:252 -msgid "both deleted:" -msgstr "suprimit per ambdós:" +msgid "invalid key: %s" +msgstr "clau no vàlida: %s" -#: wt-status.c:254 -msgid "added by us:" -msgstr "afegit per nosaltres:" - -#: wt-status.c:256 -msgid "deleted by them:" -msgstr "suprimit per ells:" +#: sequencer.c:1031 +#, c-format +msgid "invalid value for %s: %s" +msgstr "valor no vàlid per a %s: %s" -#: wt-status.c:258 -msgid "added by them:" -msgstr "afegit per ells:" +#: sequencer.c:1063 +#, c-format +msgid "malformed options sheet: '%s'" +msgstr "full d'opcions mal format: '%s'" -#: wt-status.c:260 -msgid "deleted by us:" -msgstr "suprimit per nosaltres:" +#: sequencer.c:1101 +msgid "a cherry-pick or revert is already in progress" +msgstr "un recull de cireres o una reversió ja està en curs" -#: wt-status.c:262 -msgid "both added:" -msgstr "afegit per ambdós:" +#: sequencer.c:1102 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\"" -#: wt-status.c:264 -msgid "both modified:" -msgstr "modificat per ambdós:" +#: sequencer.c:1106 +#, c-format +msgid "could not create sequencer directory '%s'" +msgstr "no s'ha pogut crear el directori de seqüenciador '%s'" -#: wt-status.c:274 -msgid "new file:" -msgstr "fitxer nou:" +#: sequencer.c:1120 +msgid "could not lock HEAD" +msgstr "no s'ha pogut bloquejar HEAD" -#: wt-status.c:276 -msgid "copied:" -msgstr "copiat:" +#: sequencer.c:1151 sequencer.c:1289 +msgid "no cherry-pick or revert in progress" +msgstr "ni hi ha cap recull de cireres ni cap reversió en curs" -#: wt-status.c:278 -msgid "deleted:" -msgstr "suprimit:" +#: sequencer.c:1153 +msgid "cannot resolve HEAD" +msgstr "no es pot resoldre HEAD" -#: wt-status.c:280 -msgid "modified:" -msgstr "modificat:" +#: sequencer.c:1155 sequencer.c:1189 +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" -#: wt-status.c:282 -msgid "renamed:" -msgstr "canviat de nom:" +#: sequencer.c:1175 builtin/grep.c:578 +#, c-format +msgid "cannot open '%s'" +msgstr "no es pot obrir '%s'" -#: wt-status.c:284 -msgid "typechange:" -msgstr "canviat de tipus:" +#: sequencer.c:1177 +#, c-format +msgid "cannot read '%s': %s" +msgstr "no es pot llegir '%s': %s" -#: wt-status.c:286 -msgid "unknown:" -msgstr "desconegut:" +#: sequencer.c:1178 +msgid "unexpected end of file" +msgstr "final de fitxer inesperat" -#: wt-status.c:288 -msgid "unmerged:" -msgstr "sense fusionar:" +#: sequencer.c:1184 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "el fitxer HEAD emmagatzemat abans del recull de cireres '%s' és malmès" -#: wt-status.c:370 -msgid "new commits, " -msgstr "comissions noves, " +#: sequencer.c:1354 +#, c-format +msgid "%s: can't cherry-pick a %s" +msgstr "%s: no es pot recollir com a cirera un %s" -#: wt-status.c:372 -msgid "modified content, " -msgstr "contingut modificat, " +#: sequencer.c:1358 +#, c-format +msgid "%s: bad revision" +msgstr "%s: revisió dolenta" -#: wt-status.c:374 -msgid "untracked content, " -msgstr "contingut no seguit, " +#: sequencer.c:1391 +msgid "can't revert as initial commit" +msgstr "no es pot revertir com a comissió inicial" -#: wt-status.c:756 -msgid "Submodules changed but not updated:" -msgstr "Submòduls canviats però no actualitzats:" +#: setup.c:160 +#, c-format +msgid "" +"%s: no such path in the working tree.\n" +"Use 'git -- ...' to specify paths that do not exist locally." +msgstr "" +"%s: no hi ha tal camí en l'arbre de treball.\n" +"Useu 'git -- ...' per a especificar camins que no existeixin " +"localment." -#: wt-status.c:758 -msgid "Submodule changes to be committed:" -msgstr "Canvis de submòdul a cometre:" +#: setup.c:173 +#, 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 [...] -- [...]'" +msgstr "" +"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n" +"Useu '--' per a separar els camins de les revisions, com això:\n" +"'git [...] -- [...]'" -#: wt-status.c:839 +#: setup.c:223 +#, c-format msgid "" -"Do not touch the line above.\n" -"Everything below will be removed." +"ambiguous argument '%s': both revision and filename\n" +"Use '--' to separate paths from revisions, like this:\n" +"'git [...] -- [...]'" msgstr "" -"No toqueu la línia de sobre.\n" -"Tot el que hi ha a sota s'eliminarà." +"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" +"'git [...] -- [...]'" -#: wt-status.c:950 -msgid "You have unmerged paths." -msgstr "Teniu camins sense fusionar." +#: setup.c:468 +#, 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" -#: wt-status.c:953 -msgid " (fix conflicts and run \"git commit\")" -msgstr " (arregleu els conflictes i executeu \"git commit\")" +#: setup.c:476 +msgid "unknown repository extensions found:" +msgstr "s'han trobat extensions de dipòsit desconegudes:" -#: wt-status.c:955 -msgid " (use \"git merge --abort\" to abort the merge)" -msgstr " (useu \"git merge --abort\" per a avortar la fusió)" +#: setup.c:762 +#, 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" -#: wt-status.c:960 -msgid "All conflicts fixed but you are still merging." -msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." +#: setup.c:764 setup.c:915 builtin/index-pack.c:1641 +msgid "Cannot come back to cwd" +msgstr "No es pot tornar al directori de treball actual" -#: wt-status.c:963 -msgid " (use \"git commit\" to conclude merge)" -msgstr " (useu \"git commit\" per a concloure la fusió)" +#: setup.c:845 +msgid "Unable to read current working directory" +msgstr "No s'ha pogut llegir el directori de treball actual" -#: wt-status.c:973 -msgid "You are in the middle of an am session." -msgstr "Esteu enmig d'una sessió am." +#: setup.c:920 +#, 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 el punt de muntatge %s)\n" +"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM " +"no està establert)." -#: wt-status.c:976 -msgid "The current patch is empty." -msgstr "El pedaç actual està buit." +#: setup.c:927 +#, c-format +msgid "Cannot change to '%s/..'" +msgstr "No es pot canviar a '%s/..'" -#: wt-status.c:980 -msgid " (fix conflicts and then run \"git am --continue\")" -msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" +#: setup.c:989 +#, 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 permissions de lectura i " +"escriptura." -#: wt-status.c:982 -msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" +#: sha1_file.c:473 +#, c-format +msgid "path '%s' does not exist" +msgstr "el camí '%s' no existeix" -#: wt-status.c:984 -msgid " (use \"git am --abort\" to restore the original branch)" -msgstr " (useu \"git am --abort\" per a restaurar la branca original)" +#: sha1_file.c:499 +#, 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." -#: wt-status.c:1109 -msgid "No commands done." -msgstr "No s'ha fet cap ordre." +#: sha1_file.c:505 +#, 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." -#: wt-status.c:1112 +#: sha1_file.c:511 #, 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):" +msgid "reference repository '%s' is shallow" +msgstr "el dipòsit de referència '%s' és superficial" -#: wt-status.c:1123 +#: sha1_file.c:519 #, c-format -msgid " (see more in file %s)" -msgstr " (vegeu més en el fitxer %s)" +msgid "reference repository '%s' is grafted" +msgstr "el dipòsit de referència '%s' és empeltat" -#: wt-status.c:1128 -msgid "No commands remaining." -msgstr "No manca cap ordre." +#: sha1_file.c:1159 +msgid "offset before end of packfile (broken .idx?)" +msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)" -#: wt-status.c:1131 +#: sha1_file.c:2592 #, 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):" +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?)" -#: wt-status.c:1139 -msgid " (use \"git rebase --edit-todo\" to view and edit)" -msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" +#: sha1_file.c:2596 +#, 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?)" -#: wt-status.c:1152 +#: sha1_name.c:407 #, c-format -msgid "You are currently rebasing branch '%s' on '%s'." -msgstr "Actualment esteu rebasant la branca '%s' en '%s'." +msgid "short SHA1 %s is ambiguous" +msgstr "l'SHA1 %s curt és ambigu" -#: wt-status.c:1157 -msgid "You are currently rebasing." -msgstr "Actualment esteu rebasant." +#: sha1_name.c:418 +msgid "The candidates are:" +msgstr "Els candidats són:" -#: wt-status.c:1171 -msgid " (fix conflicts and then run \"git rebase --continue\")" +#: sha1_name.c:578 +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 "" -" (arregleu els conflictes i després executeu \"git rebase --continue\")" +"Git normalment mai crea una referència que acabi amb 40 caràcters\n" +"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n" +"hexadecimals. Aquestes referències es poden crear per error. Per\n" +"exemple,\n" +"\n" +" git checkout -b $br $(git rev-parse ...)\n" +"\n" +"on \"$br\" és d'alguna manera buida i una referència de 40 caràcters\n" +"hexadecimals. Si us plau, examineu aquestes referències i potser\n" +"suprimiu-les. Desactiveu aquest missatge executant\n" +"\"git config advice.objectNameWarning false\"" -#: wt-status.c:1173 -msgid " (use \"git rebase --skip\" to skip this patch)" -msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" +#: submodule.c:64 submodule.c:98 +msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" +msgstr "" +"No es pot canviar un .gitmodules no fusionat, primer resoldreu els " +"conflictes de fusió" -#: wt-status.c:1175 -msgid " (use \"git rebase --abort\" to check out the original branch)" -msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" +#: submodule.c:68 submodule.c:102 +#, c-format +msgid "Could not find section in .gitmodules where path=%s" +msgstr "No s'ha pogut trobar la secció en .gitmodules on path=%s" -#: wt-status.c:1181 -msgid " (all conflicts fixed: run \"git rebase --continue\")" -msgstr " (tots els conflictes arreglats: executeu \"git rebase --continue\")" +#: submodule.c:76 +#, c-format +msgid "Could not update .gitmodules entry %s" +msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s" -#: wt-status.c:1185 +#: submodule.c:109 #, c-format -msgid "" -"You are currently splitting a commit while rebasing branch '%s' on '%s'." -msgstr "" -"Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." +msgid "Could not remove .gitmodules entry for %s" +msgstr "No s'ha pogut eliminar l'entrada de .gitmodules per a %s" -#: wt-status.c:1190 -msgid "You are currently splitting a commit during a rebase." -msgstr "Actualment esteu dividint una comissió durant un rebasament." +#: submodule.c:120 +msgid "staging updated .gitmodules failed" +msgstr "l'allistament del .gitmodules actualitzat ha fallat" -#: wt-status.c:1193 -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\")" +#: submodule.c:158 +msgid "negative values not allowed for submodule.fetchJobs" +msgstr "no es permeten els valors negatius a submodule.fetchJobs" -#: wt-status.c:1197 +#: submodule-config.c:358 #, c-format -msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." -msgstr "" -"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." +msgid "invalid value for %s" +msgstr "valor no vàlid per a %s" -#: wt-status.c:1202 -msgid "You are currently editing a commit during a rebase." -msgstr "Actualment esteu editant una comissió durant un rebasament." +#: trailer.c:238 +#, c-format +msgid "running trailer command '%s' failed" +msgstr "l'execució de l'ordre de remolc '%s' ha fallat" -#: wt-status.c:1205 -msgid " (use \"git commit --amend\" to amend the current commit)" -msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" +#: trailer.c:471 trailer.c:475 trailer.c:479 trailer.c:533 trailer.c:537 +#: trailer.c:541 +#, c-format +msgid "unknown value '%s' for key '%s'" +msgstr "valor desconegut '%s' per a la clau '%s'" -#: wt-status.c:1207 -msgid "" -" (use \"git rebase --continue\" once you are satisfied with your changes)" -msgstr "" -" (useu \"git rebase --continue\" una vegada que esteu satisfet amb els " -"vostres canvis)" +#: trailer.c:523 trailer.c:528 builtin/remote.c:289 +#, c-format +msgid "more than one %s" +msgstr "més d'un %s" -#: wt-status.c:1217 +#: trailer.c:672 #, c-format -msgid "You are currently cherry-picking commit %s." -msgstr "Actualment esteu recollint com a cirera la comissió %s." +msgid "empty trailer token in trailer '%.*s'" +msgstr "fitxa de remolc buida en el remolc '%.*s'" -#: wt-status.c:1222 -msgid " (fix conflicts and run \"git cherry-pick --continue\")" -msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" +#: trailer.c:695 +#, c-format +msgid "could not read input file '%s'" +msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'" -#: wt-status.c:1225 -msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" -msgstr "" -" (tots els conflictes arreglats: executeu \"git cherry-pick --continue\")" +#: trailer.c:698 +msgid "could not read from stdin" +msgstr "no s'ha pogut llegir des d'stdin" -#: wt-status.c:1227 -msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" -msgstr "" -" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " -"cireres)" +#: trailer.c:929 builtin/am.c:44 +#, c-format +msgid "could not stat %s" +msgstr "no s'ha pogut fer stat a %s" -#: wt-status.c:1236 +#: trailer.c:931 #, c-format -msgid "You are currently reverting commit %s." -msgstr "Actualment esteu revertint la comissió %s." +msgid "file %s is not a regular file" +msgstr "el fitxer %s no és un fitxer regular" -#: wt-status.c:1241 -msgid " (fix conflicts and run \"git revert --continue\")" -msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" +#: trailer.c:933 +#, c-format +msgid "file %s is not writable by user" +msgstr "el fitxer %s no és gravable per l'usuari" -#: wt-status.c:1244 -msgid " (all conflicts fixed: run \"git revert --continue\")" -msgstr "" -" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" +#: trailer.c:945 +msgid "could not open temporary file" +msgstr "no s'ha pogut obrir el fitxer temporal" -#: wt-status.c:1246 -msgid " (use \"git revert --abort\" to cancel the revert operation)" -msgstr "" -" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" +#: trailer.c:983 +#, c-format +msgid "could not rename temporary file to %s" +msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s" -#: wt-status.c:1257 +#: transport.c:62 #, c-format -msgid "You are currently bisecting, started from branch '%s'." -msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." +msgid "Would set upstream of '%s' to '%s' of '%s'\n" +msgstr "Canviaria la font de '%s' a '%s' de '%s'\n" -#: wt-status.c:1261 -msgid "You are currently bisecting." -msgstr "Actualment esteu bisecant." +#: transport.c:151 +#, c-format +msgid "transport: invalid depth option '%s'" +msgstr "transport: opció de profunditat no vàlida '%s'" -#: wt-status.c:1264 -msgid " (use \"git bisect reset\" to get back to the original branch)" -msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" +#: transport.c:817 +#, c-format +msgid "" +"The following submodule paths contain changes that can\n" +"not be found on any remote:\n" +msgstr "" +"Els camins de submòdul següents contenen canvis que no\n" +"es poden trobar en cap remot:\n" -#: wt-status.c:1464 -msgid "On branch " -msgstr "En la branca " +#: transport.c:821 +#, 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" +"Si us plau, intenteu\n" +"\n" +"\tgit push --recurse-submodules=on-demand\n" +"\n" +"o canviar de directori al camí i useu\n" +"\n" +"\tgit push\n" +"\n" +"per a pujar-los a un remot.\n" -#: wt-status.c:1470 -msgid "interactive rebase in progress; onto " -msgstr "rebasament interactiu en progrés; sobre " +#: transport.c:829 +msgid "Aborting." +msgstr "S'està avortant." -#: wt-status.c:1472 -msgid "rebase in progress; onto " -msgstr "rebasament en progrés; sobre " +#: transport-helper.c:1075 +#, c-format +msgid "Could not read ref %s" +msgstr "No s'ha pogut llegir la referència %s" -#: wt-status.c:1477 -msgid "HEAD detached at " -msgstr "HEAD separat a " +#: tree-walk.c:31 +msgid "too-short tree object" +msgstr "objecte d'arbre massa curt" -#: wt-status.c:1479 -msgid "HEAD detached from " -msgstr "HEAD separat de " +#: tree-walk.c:37 +msgid "malformed mode in tree entry" +msgstr "mode mal format en entrada d'arbre" -#: wt-status.c:1482 -msgid "Not currently on any branch." -msgstr "Actualment no s'és en cap branca." +#: tree-walk.c:41 +msgid "empty filename in tree entry" +msgstr "nom de fitxer buit en entrada de arbre" -#: wt-status.c:1500 -msgid "Initial commit" -msgstr "Comissió inicial" +#: tree-walk.c:113 +msgid "too-short tree file" +msgstr "fitxer d'arbre massa curt" -#: wt-status.c:1514 -msgid "Untracked files" -msgstr "Fitxers no seguits" +#: unpack-trees.c:64 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%sPlease commit your changes or stash them before you switch branches." +msgstr "" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" +"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " +"canviar de branca." -#: wt-status.c:1516 -msgid "Ignored files" -msgstr "Fitxers ignorats" +#: unpack-trees.c:66 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by checkout:\n" +"%%s" +msgstr "" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"agafar:\n" +"%%s" + +#: unpack-trees.c:69 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +"%%sPlease commit your changes or stash them before you merge." +msgstr "" +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" +"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de " +"fusionar." -#: wt-status.c:1520 +#: unpack-trees.c:71 #, c-format msgid "" -"It took %.2f seconds to enumerate untracked files. 'status -uno'\n" -"may speed it up, but you have to be careful not to forget to add\n" -"new files yourself (see 'git help status')." +"Your local changes to the following files would be overwritten by merge:\n" +"%%s" msgstr "" -"S'ha trigat %.2f segons a enumerar fitxers no seguits.\n" -"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n" -"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" -"'git help status')." +"Els vostres canvis locals als fitxers següents se sobreescriurien per " +"fusionar:\n" +"%%s" -#: wt-status.c:1526 +#: unpack-trees.c:74 #, c-format -msgid "Untracked files not listed%s" -msgstr "Els fitxers no seguits no estan llistats%s" - -#: wt-status.c:1528 -msgid " (use -u option to show untracked files)" -msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" - -#: wt-status.c:1534 -msgid "No changes" -msgstr "Sense canvis" +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 "" +"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" +"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s." -#: wt-status.c:1539 +#: unpack-trees.c:76 #, c-format -msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" +msgid "" +"Your local changes to the following files would be overwritten by %s:\n" +"%%s" msgstr "" -"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n" +"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n" +"%%s" -#: wt-status.c:1542 +#: unpack-trees.c:81 #, c-format -msgid "no changes added to commit\n" -msgstr "no hi ha canvis afegits a cometre\n" +msgid "" +"Updating the following directories would lose untracked files in it:\n" +"%s" +msgstr "" +"Actualitzar els directoris següents perdria fitxers no seguits en el:\n" +"%s" -#: wt-status.c:1545 +#: unpack-trees.c:85 #, c-format msgid "" -"nothing added to commit but untracked files present (use \"git add\" to " -"track)\n" +"The following untracked working tree files would be removed by checkout:\n" +"%%sPlease move or remove them before you switch branches." msgstr "" -"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " -"\"git add\" per a seguir-los)\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" +"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: wt-status.c:1548 +#: unpack-trees.c:87 #, c-format -msgid "nothing added to commit but untracked files present\n" -msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" +msgid "" +"The following untracked working tree files would be removed by checkout:\n" +"%%s" +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"agafar:\n" +"%%s" -#: wt-status.c:1551 +#: unpack-trees.c:90 #, c-format -msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%sPlease move or remove them before you merge." msgstr "" -"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" -"los)\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" +"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: wt-status.c:1554 wt-status.c:1559 +#: unpack-trees.c:92 #, c-format -msgid "nothing to commit\n" -msgstr "no hi ha res a cometre\n" +msgid "" +"The following untracked working tree files would be removed by merge:\n" +"%%s" +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per " +"fusionar:\n" +"%%s" -#: wt-status.c:1557 +#: unpack-trees.c:95 #, c-format -msgid "nothing to commit (use -u to show untracked files)\n" +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%sPlease move or remove them before you %s." msgstr "" -"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" +"%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: wt-status.c:1561 +#: unpack-trees.c:97 #, 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:1668 -msgid "Initial commit on " -msgstr "Comissió inicial en " - -#: wt-status.c:1672 -msgid "HEAD (no branch)" -msgstr "HEAD (sense branca)" - -#: wt-status.c:1701 -msgid "gone" -msgstr "no hi és" - -#: wt-status.c:1703 wt-status.c:1711 -msgid "behind " -msgstr "darrere " - -#: wt-status.c:1706 wt-status.c:1709 -msgid "ahead " -msgstr "davant per " +msgid "" +"The following untracked working tree files would be removed by %s:\n" +"%%s" +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n" +"%%s" -#: compat/precompose_utf8.c:57 builtin/clone.c:415 +#: unpack-trees.c:102 #, c-format -msgid "failed to unlink '%s'" -msgstr "s'ha fallat en desenllaçar '%s'" - -#: builtin/add.c:22 -msgid "git add [] [--] ..." -msgstr "git add [] [--] ..." +msgid "" +"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" +"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca." -#: builtin/add.c:65 +#: unpack-trees.c:104 #, c-format -msgid "unexpected diff status %c" -msgstr "estat de diff inesperat %c" - -#: builtin/add.c:71 builtin/commit.c:281 -msgid "updating files failed" -msgstr "s'ha fallat en actualitzar els fitxers" +msgid "" +"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" +"%%s" -#: builtin/add.c:81 +#: unpack-trees.c:107 #, c-format -msgid "remove '%s'\n" -msgstr "elimina '%s'\n" +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%sPlease move or remove them before you merge." +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" +"%%sSi us plau, moveu-los o elimineu-los abans de fusionar." -#: builtin/add.c:136 -msgid "Unstaged changes after refreshing the index:" -msgstr "Canvis no allistats després d'actualitzar l'índex:" +#: unpack-trees.c:109 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by merge:\n" +"%%s" +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"fusionar:\n" +"%%s" -#: builtin/add.c:196 builtin/rev-parse.c:811 -msgid "Could not read the index" -msgstr "No s'ha pogut llegir l'índex" +#: unpack-trees.c:112 +#, c-format +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%sPlease move or remove them before you %s." +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" +"%%sSi us plau, moveu-los o elimineu-los abans de %s." -#: builtin/add.c:207 +#: unpack-trees.c:114 #, c-format -msgid "Could not open '%s' for writing." -msgstr "No s'ha pogut obrir '%s' per a escriptura." +msgid "" +"The following untracked working tree files would be overwritten by %s:\n" +"%%s" +msgstr "" +"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per " +"%s:\n" +"%%s" -#: builtin/add.c:211 -msgid "Could not write patch" -msgstr "No s'ha pogut escriure el pedaç" +#: unpack-trees.c:121 +#, c-format +msgid "Entry '%s' overlaps with '%s'. Cannot bind." +msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular." -#: builtin/add.c:214 -msgid "editing patch failed" -msgstr "l'edició del pedaç ha fallat" +#: unpack-trees.c:124 +#, c-format +msgid "" +"Cannot update sparse checkout: the following entries are not up-to-date:\n" +"%s" +msgstr "" +"No es pot actualitzar l'agafament parcial: les entrades següents no estan al " +"dia:\n" +"%s" -#: builtin/add.c:217 +#: unpack-trees.c:126 #, c-format -msgid "Could not stat '%s'" -msgstr "No s'ha pogut fer stat a '%s'" +msgid "" +"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" +"%s" -#: builtin/add.c:219 -msgid "Empty patch. Aborted." -msgstr "El pedaç és buit. S'ha avortat." +#: unpack-trees.c:128 +#, c-format +msgid "" +"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" +"%s" -#: builtin/add.c:224 +#: unpack-trees.c:205 #, c-format -msgid "Could not apply '%s'" -msgstr "No s'ha pogut aplicar '%s'" +msgid "Aborting\n" +msgstr "S'està avortant\n" -#: builtin/add.c:234 -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" +#: unpack-trees.c:237 +msgid "Checking out files" +msgstr "S'està agafant fitxers" -#: builtin/add.c:253 builtin/clean.c:870 builtin/fetch.c:113 builtin/mv.c:111 -#: builtin/prune-packed.c:55 builtin/pull.c:197 builtin/push.c:521 -#: builtin/remote.c:1327 builtin/rm.c:268 builtin/send-pack.c:162 -msgid "dry run" -msgstr "marxa en sec" +#: urlmatch.c:120 +msgid "invalid URL scheme name or missing '://' suffix" +msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'" -#: builtin/add.c:254 builtin/apply.c:4854 builtin/check-ignore.c:19 -#: builtin/commit.c:1334 builtin/count-objects.c:85 builtin/fsck.c:593 -#: builtin/log.c:1852 builtin/mv.c:110 builtin/read-tree.c:114 -msgid "be verbose" -msgstr "sigues detallat" +#: urlmatch.c:144 urlmatch.c:297 urlmatch.c:356 +#, c-format +msgid "invalid %XX escape sequence" +msgstr "seqüència d'escapament %XX no vàlida" + +#: urlmatch.c:172 +msgid "missing host and scheme is not 'file:'" +msgstr "manca la màquina i l'esquema no és 'file:'" -#: builtin/add.c:256 -msgid "interactive picking" -msgstr "recull interactiu" +#: urlmatch.c:189 +msgid "a 'file:' URL may not have a port number" +msgstr "un URL 'file:' no pot tenir número de port" -#: builtin/add.c:257 builtin/checkout.c:1157 builtin/reset.c:286 -msgid "select hunks interactively" -msgstr "selecciona els trossos interactivament" +#: urlmatch.c:199 +msgid "invalid characters in host name" +msgstr "hi ha caràcters no vàlids en el nom de màquina" -#: builtin/add.c:258 -msgid "edit current diff and apply" -msgstr "edita la diferència actual i aplica-la" +#: urlmatch.c:244 urlmatch.c:255 +msgid "invalid port number" +msgstr "número de port no vàlid" -#: builtin/add.c:259 -msgid "allow adding otherwise ignored files" -msgstr "permet afegir fitxers que d'altra manera s'ignoren" +#: urlmatch.c:322 +msgid "invalid '..' path segment" +msgstr "segment de camí '..' no vàlid" -#: builtin/add.c:260 -msgid "update tracked files" -msgstr "actualitza els fitxers seguits" +#: worktree.c:282 +#, c-format +msgid "failed to read '%s'" +msgstr "s'ha fallat en llegir '%s'" -#: builtin/add.c:261 -msgid "record only the fact that the path will be added later" -msgstr "registra només el fet que el camí s'afegirà més tard" +#: wrapper.c:222 wrapper.c:392 +#, c-format +msgid "could not open '%s' for reading and writing" +msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura" -#: builtin/add.c:262 -msgid "add changes from all tracked and untracked files" -msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" +#: wrapper.c:224 wrapper.c:394 builtin/am.c:766 +#, c-format +msgid "could not open '%s' for writing" +msgstr "no s'ha pogut obrir '%s' per a escriptura" -#: builtin/add.c:265 -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)" +#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759 +#: builtin/am.c:847 builtin/commit.c:1705 builtin/merge.c:1029 +#: builtin/pull.c:341 +#, c-format +msgid "could not open '%s' for reading" +msgstr "no s'ha pogut obrir '%s' per a lectura" -#: builtin/add.c:267 -msgid "don't add, only refresh the index" -msgstr "no afegeixis, només actualitza l'índex" +#: wrapper.c:605 wrapper.c:626 +#, c-format +msgid "unable to access '%s'" +msgstr "no s'ha pogut accedir a '%s'" -#: builtin/add.c:268 -msgid "just skip files which cannot be added because of errors" -msgstr "només omet els fitxers que no es poden afegir a causa d'errors" +#: wrapper.c:634 +msgid "unable to get current working directory" +msgstr "no s'ha pogut obtenir el directori de treball actual" -#: builtin/add.c:269 -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" +#: wrapper.c:658 +#, c-format +msgid "could not write to %s" +msgstr "no s'ha pogut escriure a %s" -#: builtin/add.c:270 builtin/update-index.c:958 -msgid "(+/-)x" -msgstr "(+/-)x" +#: wrapper.c:660 +#, c-format +msgid "could not close %s" +msgstr "no s'ha pogut tancar %s" -#: builtin/add.c:270 builtin/update-index.c:959 -msgid "override the executable bit of the listed files" -msgstr "passa per alt el bit executable dels fitxers llistats" +#: wt-status.c:151 +msgid "Unmerged paths:" +msgstr "Camins sense fusionar:" -#: builtin/add.c:292 +#: wt-status.c:178 wt-status.c:205 #, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Useu -f si realment els voleu afegir.\n" +msgid " (use \"git reset %s ...\" to unstage)" +msgstr " (useu \"git reset %s ...\" per a desallistar)" -#: builtin/add.c:300 -msgid "adding files failed" -msgstr "l'afegiment de fitxers ha fallat" +#: wt-status.c:180 wt-status.c:207 +msgid " (use \"git rm --cached ...\" to unstage)" +msgstr " (useu \"git rm --cached ...\" per a desallistar)" -#: builtin/add.c:336 -msgid "-A and -u are mutually incompatible" -msgstr "-A i -u són mutualment incompatibles" +#: wt-status.c:184 +msgid " (use \"git add ...\" to mark resolution)" +msgstr " (useu \"git add ...\" per a senyalar resolució)" -#: builtin/add.c:343 -msgid "Option --ignore-missing can only be used together with --dry-run" -msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" +#: wt-status.c:186 wt-status.c:190 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "" +" (useu \"git add/rm ...\" segons sigui apropiat per a senyalar " +"resolució)" -#: builtin/add.c:352 -#, 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" +#: wt-status.c:188 +msgid " (use \"git rm ...\" to mark resolution)" +msgstr " (useu \"git rm ...\" per a senyalar resolució)" -#: builtin/add.c:367 -#, c-format -msgid "Nothing specified, nothing added.\n" -msgstr "No s'ha especificat res, no s'ha afegit res.\n" +#: wt-status.c:199 wt-status.c:945 +msgid "Changes to be committed:" +msgstr "Canvis a cometre:" -#: builtin/add.c:368 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Potser volíeu dir 'git add .'?\n" +#: wt-status.c:217 wt-status.c:954 +msgid "Changes not staged for commit:" +msgstr "Canvis no allistats per a cometre:" -#: builtin/add.c:373 builtin/check-ignore.c:172 builtin/checkout.c:279 -#: builtin/checkout.c:473 builtin/clean.c:914 builtin/commit.c:340 -#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 -#: builtin/submodule--helper.c:240 -msgid "index file corrupt" -msgstr "fitxer d'índex malmès" +#: wt-status.c:221 +msgid " (use \"git add ...\" to update what will be committed)" +msgstr " (useu \"git add ...\" per a actualitzar què es cometrà)" -#: builtin/add.c:454 builtin/apply.c:4784 builtin/mv.c:286 builtin/rm.c:431 -msgid "Unable to write new index file" -msgstr "no s'ha pogut escriure un fitxer d'índex nou" +#: wt-status.c:223 +msgid " (use \"git add/rm ...\" to update what will be committed)" +msgstr " (useu \"git add/rm ...\" per a actualitzar què es cometrà)" -#: builtin/am.c:257 builtin/commit.c:750 builtin/merge.c:1032 -#, c-format -msgid "could not read '%s'" -msgstr "no s'ha pogut llegir '%s'" +#: wt-status.c:224 +msgid "" +" (use \"git checkout -- ...\" to discard changes in working directory)" +msgstr "" +" (useu \"git checkout -- ...\" per a descartar els canvis en el " +"directori de treball)" -#: builtin/am.c:426 -msgid "could not parse author script" -msgstr "no s'ha pogut analitzar l'script d'autor" +#: wt-status.c:226 +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)" -#: builtin/am.c:503 +#: wt-status.c:238 #, c-format -msgid "'%s' was deleted by the applypatch-msg hook" -msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg" +msgid " (use \"git %s ...\" to include in what will be committed)" +msgstr " (useu \"git %s ...\" per a incloure-ho en què es cometrà)" -#: builtin/am.c:544 builtin/notes.c:301 -#, c-format -msgid "Malformed input line: '%s'." -msgstr "Línia d'entrada mal formada: '%s'." +#: wt-status.c:253 +msgid "both deleted:" +msgstr "suprimit per ambdós:" -#: builtin/am.c:581 builtin/notes.c:316 -#, c-format -msgid "Failed to copy notes from '%s' to '%s'" -msgstr "S'ha fallat en copiar les notes de '%s' a '%s'" +#: wt-status.c:255 +msgid "added by us:" +msgstr "afegit per nosaltres:" -#: builtin/am.c:607 -msgid "fseek failed" -msgstr "fseek ha fallat" +#: wt-status.c:257 +msgid "deleted by them:" +msgstr "suprimit per ells:" -#: builtin/am.c:787 -#, c-format -msgid "could not parse patch '%s'" -msgstr "no s'ha pogut analitzar el pedaç '%s'" +#: wt-status.c:259 +msgid "added by them:" +msgstr "afegit per ells:" -#: builtin/am.c:852 -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" +#: wt-status.c:261 +msgid "deleted by us:" +msgstr "suprimit per nosaltres:" -#: builtin/am.c:899 -msgid "invalid timestamp" -msgstr "marca de temps no vàlida" +#: wt-status.c:263 +msgid "both added:" +msgstr "afegit per ambdós:" -#: builtin/am.c:902 builtin/am.c:910 -msgid "invalid Date line" -msgstr "línia Date no vàlida" +#: wt-status.c:265 +msgid "both modified:" +msgstr "modificat per ambdós:" -#: builtin/am.c:907 -msgid "invalid timezone offset" -msgstr "desplaçament de zona de temps no vàlid" +#: wt-status.c:275 +msgid "new file:" +msgstr "fitxer nou:" -#: builtin/am.c:996 -msgid "Patch format detection failed." -msgstr "La detecció de format de pedaç ha fallat." +#: wt-status.c:277 +msgid "copied:" +msgstr "copiat:" -#: builtin/am.c:1001 builtin/clone.c:380 -#, c-format -msgid "failed to create directory '%s'" -msgstr "s'ha fallat en crear el directori '%s'" +#: wt-status.c:279 +msgid "deleted:" +msgstr "suprimit:" -#: builtin/am.c:1005 -msgid "Failed to split patches." -msgstr "S'ha fallat en dividir els pedaços." +#: wt-status.c:281 +msgid "modified:" +msgstr "modificat:" -#: builtin/am.c:1137 builtin/commit.c:366 -msgid "unable to write index file" -msgstr "no s'ha pogut escriure el fitxer d'índex" +#: wt-status.c:283 +msgid "renamed:" +msgstr "canviat de nom:" -#: builtin/am.c:1188 -#, c-format -msgid "When you have resolved this problem, run \"%s --continue\"." -msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." +#: wt-status.c:285 +msgid "typechange:" +msgstr "canviat de tipus:" -#: builtin/am.c:1189 -#, c-format -msgid "If you prefer to skip this patch, run \"%s --skip\" instead." -msgstr "" -"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això." +#: wt-status.c:287 +msgid "unknown:" +msgstr "desconegut:" -#: builtin/am.c:1190 -#, 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" -"\"." +#: wt-status.c:289 +msgid "unmerged:" +msgstr "sense fusionar:" -#: builtin/am.c:1328 -msgid "Patch is empty. Was it split wrong?" -msgstr "El pedaç és buit. S'ha dividit malament?" +#: wt-status.c:371 +msgid "new commits, " +msgstr "comissions noves, " -#: builtin/am.c:1402 builtin/log.c:1543 -#, c-format -msgid "invalid ident line: %s" -msgstr "línia d'identitat no vàlida: %s" +#: wt-status.c:373 +msgid "modified content, " +msgstr "contingut modificat, " -#: builtin/am.c:1429 -#, c-format -msgid "unable to parse commit %s" -msgstr "no s'ha pogut analitzar la comissió %s" +#: wt-status.c:375 +msgid "untracked content, " +msgstr "contingut no seguit, " -#: builtin/am.c:1602 -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." +#: wt-status.c:818 +msgid "Submodules changed but not updated:" +msgstr "Submòduls canviats però no actualitzats:" -#: builtin/am.c:1604 -msgid "Using index info to reconstruct a base tree..." -msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." +#: wt-status.c:820 +msgid "Submodule changes to be committed:" +msgstr "Canvis de submòdul a cometre:" -#: builtin/am.c:1623 +#: wt-status.c:901 msgid "" -"Did you hand edit your patch?\n" -"It does not apply to blobs recorded in its index." +"Do not touch the line above.\n" +"Everything below will be removed." msgstr "" -"Heu editat el vostre pedaç a mà?\n" -"No s'aplica als blobs recordats en el seu índex." +"No toqueu la línia a dalt.\n" +"Tot el que hi ha a sota s'eliminarà." -#: builtin/am.c:1629 -msgid "Falling back to patching base and 3-way merge..." -msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..." +#: wt-status.c:1013 +msgid "You have unmerged paths." +msgstr "Teniu camins sense fusionar." -#: builtin/am.c:1654 -msgid "Failed to merge in the changes." -msgstr "S'ha fallat en fusionar els canvis." +#: wt-status.c:1016 +msgid " (fix conflicts and run \"git commit\")" +msgstr " (arregleu els conflictes i executeu \"git commit\")" -#: builtin/am.c:1679 builtin/merge.c:628 -msgid "git write-tree failed to write a tree" -msgstr "git write-tree ha fallat en escriure un arbre" +#: wt-status.c:1018 +msgid " (use \"git merge --abort\" to abort the merge)" +msgstr " (useu \"git merge --abort\" per a avortar la fusió)" -#: builtin/am.c:1686 -msgid "applying to an empty history" -msgstr "s'està aplicant a una història buida" +#: wt-status.c:1023 +msgid "All conflicts fixed but you are still merging." +msgstr "Tots els conflictes estan arreglats però encara esteu fusionant." + +#: wt-status.c:1026 +msgid " (use \"git commit\" to conclude merge)" +msgstr " (useu \"git commit\" per a concloure la fusió)" + +#: wt-status.c:1036 +msgid "You are in the middle of an am session." +msgstr "Esteu enmig d'una sessió am." -#: builtin/am.c:1699 builtin/commit.c:1776 builtin/merge.c:798 -#: builtin/merge.c:823 -msgid "failed to write commit object" -msgstr "s'ha fallat en escriure l'objecte de comissió" +#: wt-status.c:1039 +msgid "The current patch is empty." +msgstr "El pedaç actual està buit." -#: builtin/am.c:1731 builtin/am.c:1735 -#, c-format -msgid "cannot resume: %s does not exist." -msgstr "no es pot reprendre: %s no existeix." +#: wt-status.c:1043 +msgid " (fix conflicts and then run \"git am --continue\")" +msgstr " (arregleu els conflictes i després executeu \"git am --continue\")" -#: builtin/am.c:1751 -msgid "cannot be interactive without stdin connected to a terminal." -msgstr "" -"no es pot ser interactiu sense que stdin sigui connectat a un terminal." +#: wt-status.c:1045 +msgid " (use \"git am --skip\" to skip this patch)" +msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)" -#: builtin/am.c:1756 -msgid "Commit Body is:" -msgstr "El cos de la comissió és:" +#: wt-status.c:1047 +msgid " (use \"git am --abort\" to restore the original branch)" +msgstr " (useu \"git am --abort\" per a restaurar la branca original)" -#. 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:1766 -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: " +#: wt-status.c:1172 +msgid "No commands done." +msgstr "No s'ha fet cap ordre." -#: builtin/am.c:1816 +#: wt-status.c:1175 #, c-format -msgid "Dirty index: cannot apply patches (dirty: %s)" -msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)" +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):" -#: builtin/am.c:1853 builtin/am.c:1925 +#: wt-status.c:1186 #, c-format -msgid "Applying: %.*s" -msgstr "S'està aplicant: %.*s" +msgid " (see more in file %s)" +msgstr " (vegeu més en el fitxer %s)" -#: builtin/am.c:1869 -msgid "No changes -- Patch already applied." -msgstr "Sense canvis -- El pedaç ja s'ha aplicat." +#: wt-status.c:1191 +msgid "No commands remaining." +msgstr "No manca cap ordre." -#: builtin/am.c:1877 +#: wt-status.c:1194 #, c-format -msgid "Patch failed at %s %.*s" -msgstr "El pedaç ha fallat a %s %.*s" +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:1202 +msgid " (use \"git rebase --edit-todo\" to view and edit)" +msgstr " (useu \"git rebase --edit-todo\" per a veure i editar)" -#: builtin/am.c:1883 +#: wt-status.c:1215 #, c-format -msgid "The copy of the patch that failed is found in: %s" -msgstr "La còpia del pedaç que ha fallat es troba en: %s" +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Actualment esteu rebasant la branca '%s' en '%s'." -#: builtin/am.c:1928 -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 "" -"Cap canvi - heu oblidat d'usar 'git add'?\n" -"Si no hi ha res a allistar, probablement alguna altra cosa\n" -"ja ha introduït els mateixos canvis; potser voleu ometre aquest pedaç." +#: wt-status.c:1220 +msgid "You are currently rebasing." +msgstr "Actualment esteu rebasant." -#: builtin/am.c:1935 -msgid "" -"You still have unmerged paths in your index.\n" -"Did you forget to use 'git add'?" +#: wt-status.c:1234 +msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -"Encara teniu camins sense fusionar en el vostre índex.\n" -"Heu oblidat d'usar 'git add'?" +" (arregleu els conflictes i després executeu \"git rebase --continue\")" -#: builtin/am.c:2043 builtin/am.c:2047 builtin/am.c:2059 builtin/reset.c:308 -#: builtin/reset.c:316 -#, c-format -msgid "Could not parse object '%s'." -msgstr "No s'ha pogut analitzar l'objecte '%s'." +#: wt-status.c:1236 +msgid " (use \"git rebase --skip\" to skip this patch)" +msgstr " (useu \"git rebase --skip\" per a saltar aquest pedaç)" -#: builtin/am.c:2095 -msgid "failed to clean index" -msgstr "s'ha fallat en netejar l'índex" +#: wt-status.c:1238 +msgid " (use \"git rebase --abort\" to check out the original branch)" +msgstr " (useu \"git rebase --abort\" per a agafar la branca original)" -#: builtin/am.c:2129 -msgid "" -"You seem to have moved HEAD since the last 'am' failure.\n" -"Not rewinding to ORIG_HEAD" +#: wt-status.c:1244 +msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" -"No rebobinant a ORIG_HEAD" +" (tots els conflictes estan arreglats: executeu \"git rebase --continue\")" -#: builtin/am.c:2192 +#: wt-status.c:1248 #, c-format -msgid "Invalid value for --patch-format: %s" -msgstr "Valor no vàlid per a --patch-format: %s" - -#: builtin/am.c:2225 -msgid "git am [] [(|)...]" -msgstr "git am [] [(|)...]" - -#: builtin/am.c:2226 -msgid "git am [] (--continue | --skip | --abort)" -msgstr "git am [] (--continue | --skip | --abort)" - -#: builtin/am.c:2232 -msgid "run interactively" -msgstr "executa interactivament" - -#: builtin/am.c:2234 -msgid "historical option -- no-op" -msgstr "opció històrica -- no-op" - -#: builtin/am.c:2236 -msgid "allow fall back on 3way merging if needed" -msgstr "permet retrocedir a una fusió de 3 vies si és necessari" - -#: builtin/am.c:2237 builtin/init-db.c:481 builtin/prune-packed.c:57 -#: builtin/repack.c:172 -msgid "be quiet" -msgstr "calla" - -#: builtin/am.c:2239 -msgid "add a Signed-off-by line to the commit message" -msgstr "afegeix una línia Signed-off-by al missatge de comissió" +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Actualment esteu dividint una comissió mentre rebaseu la branca '%s' en '%s'." -#: builtin/am.c:2242 -msgid "recode into utf8 (default)" -msgstr "recodifica en utf8 (per defecte)" +#: wt-status.c:1253 +msgid "You are currently splitting a commit during a rebase." +msgstr "Actualment esteu dividint una comissió durant un rebasament." -#: builtin/am.c:2244 -msgid "pass -k flag to git-mailinfo" -msgstr "passa la bandera -k al git-mailinfo" +#: wt-status.c:1256 +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\")" -#: builtin/am.c:2246 -msgid "pass -b flag to git-mailinfo" -msgstr "passa la bandera -b al git-mailinfo" +#: wt-status.c:1260 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Actualment esteu editant una comissió mentre rebaseu la branca '%s' en '%s'." -#: builtin/am.c:2248 -msgid "pass -m flag to git-mailinfo" -msgstr "passa la bandera -m al git-mailinfo" +#: wt-status.c:1265 +msgid "You are currently editing a commit during a rebase." +msgstr "Actualment esteu editant una comissió durant un rebasament." -#: builtin/am.c:2250 -msgid "pass --keep-cr flag to git-mailsplit for mbox format" -msgstr "passa la bandera --keep-cr al git-mailsplit pel format mbox" +#: wt-status.c:1268 +msgid " (use \"git commit --amend\" to amend the current commit)" +msgstr " (useu \"git commit --amend\" per a esmenar la comissió actual)" -#: builtin/am.c:2253 -msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" +#: wt-status.c:1270 +msgid "" +" (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" - -#: builtin/am.c:2256 -msgid "strip everything before a scissors line" -msgstr "despulla tot abans d'una línia de tissores" - -#: builtin/am.c:2257 builtin/apply.c:4837 -msgid "action" -msgstr "acció" +" (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els " +"vostres canvis)" -#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267 -#: builtin/am.c:2270 builtin/am.c:2273 builtin/am.c:2276 builtin/am.c:2279 -#: builtin/am.c:2285 -msgid "pass it through git-apply" -msgstr "passa-ho a través del git-apply" +#: wt-status.c:1280 +#, c-format +msgid "You are currently cherry-picking commit %s." +msgstr "Actualment esteu recollint com a cirera la comissió %s." -#: builtin/am.c:2266 builtin/apply.c:4861 -msgid "root" -msgstr "arrel" +#: wt-status.c:1285 +msgid " (fix conflicts and run \"git cherry-pick --continue\")" +msgstr " (arregleu els conflictes i executeu \"git cherry-pick --continue\")" -#: builtin/am.c:2269 builtin/am.c:2272 builtin/apply.c:4799 -#: builtin/apply.c:4802 builtin/clone.c:90 builtin/fetch.c:96 -#: builtin/pull.c:179 builtin/submodule--helper.c:277 -#: builtin/submodule--helper.c:402 builtin/submodule--helper.c:482 -#: builtin/submodule--helper.c:485 builtin/submodule--helper.c:823 -#: builtin/submodule--helper.c:826 -msgid "path" -msgstr "camí" +#: wt-status.c:1288 +msgid " (all conflicts fixed: run \"git cherry-pick --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git cherry-pick --continue" +"\")" -#: builtin/am.c:2275 builtin/fmt-merge-msg.c:666 builtin/fmt-merge-msg.c:669 -#: builtin/grep.c:706 builtin/merge.c:200 builtin/pull.c:134 builtin/pull.c:193 -#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:645 -#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 -#: parse-options.h:134 parse-options.h:244 -msgid "n" -msgstr "n" +#: wt-status.c:1290 +msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" +msgstr "" +" (useu \"git cherry-pick --abort\" per a cancel·lar l'operació de recull de " +"cireres)" -#: builtin/am.c:2278 builtin/apply.c:4805 -msgid "num" -msgstr "número" +#: wt-status.c:1299 +#, c-format +msgid "You are currently reverting commit %s." +msgstr "Actualment esteu revertint la comissió %s." -#: builtin/am.c:2281 builtin/for-each-ref.c:37 builtin/replace.c:438 -#: builtin/tag.c:372 -msgid "format" -msgstr "format" +#: wt-status.c:1304 +msgid " (fix conflicts and run \"git revert --continue\")" +msgstr " (arregleu els conflictes i executeu \"git revert --continue\")" -#: builtin/am.c:2282 -msgid "format the patch(es) are in" -msgstr "el format en el qual estan els pedaços" +#: wt-status.c:1307 +msgid " (all conflicts fixed: run \"git revert --continue\")" +msgstr "" +" (tots els conflictes estan arreglats: executeu \"git revert --continue\")" -#: builtin/am.c:2288 -msgid "override error message when patch failure occurs" +#: wt-status.c:1309 +msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr "" -"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" +" (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)" -#: builtin/am.c:2290 -msgid "continue applying patches after resolving a conflict" -msgstr "segueix aplicant pedaços després de resoldre un conflicte" +#: wt-status.c:1320 +#, c-format +msgid "You are currently bisecting, started from branch '%s'." +msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'." -#: builtin/am.c:2293 -msgid "synonyms for --continue" -msgstr "sinònims de --continue" +#: wt-status.c:1324 +msgid "You are currently bisecting." +msgstr "Actualment esteu bisecant." -#: builtin/am.c:2296 -msgid "skip the current patch" -msgstr "salta el pedaç actual" +#: wt-status.c:1327 +msgid " (use \"git bisect reset\" to get back to the original branch)" +msgstr " (useu \"git bisect reset\" per a tornar a la branca original)" -#: builtin/am.c:2299 -msgid "restore the original branch and abort the patching operation." -msgstr "restaura la branca original i avorta l'operació d'apedaçament." +#: wt-status.c:1524 +msgid "On branch " +msgstr "En la branca " -#: builtin/am.c:2303 -msgid "lie about committer date" -msgstr "menteix sobre la data del comitent" +#: wt-status.c:1530 +msgid "interactive rebase in progress; onto " +msgstr "rebasament interactiu en progrés; sobre " -#: builtin/am.c:2305 -msgid "use current timestamp for author date" -msgstr "usa el marc de temps actual per la data d'autor" +#: wt-status.c:1532 +msgid "rebase in progress; onto " +msgstr "rebasament en progrés; sobre " -#: builtin/am.c:2307 builtin/commit.c:1610 builtin/merge.c:229 -#: builtin/pull.c:164 builtin/revert.c:92 builtin/tag.c:355 -msgid "key-id" -msgstr "ID de clau" +#: wt-status.c:1537 +msgid "HEAD detached at " +msgstr "HEAD separat a " -#: builtin/am.c:2308 -msgid "GPG-sign commits" -msgstr "signa les comissions amb GPG" +#: wt-status.c:1539 +msgid "HEAD detached from " +msgstr "HEAD separat de " -#: builtin/am.c:2311 -msgid "(internal use for git-rebase)" -msgstr "(ús intern per al git-rebase)" +#: wt-status.c:1542 +msgid "Not currently on any branch." +msgstr "Actualment no s'és en cap branca." -#: builtin/am.c:2326 -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 "" -"Fa molt que l'opció -b/--binary no ha fet res, i\n" -"s'eliminarà. Si us plau, no l'useu més." +#: wt-status.c:1560 +msgid "Initial commit" +msgstr "Comissió inicial" -#: builtin/am.c:2333 -msgid "failed to read the index" -msgstr "s'ha fallat en llegir l'índex" +#: wt-status.c:1574 +msgid "Untracked files" +msgstr "Fitxers no seguits" -#: builtin/am.c:2348 -#, c-format -msgid "previous rebase directory %s still exists but mbox given." -msgstr "" -"un directori de rebasament anterior %s encara existeix però s'ha donat una " -"bústia." +#: wt-status.c:1576 +msgid "Ignored files" +msgstr "Fitxers ignorats" -#: builtin/am.c:2372 +#: wt-status.c:1580 #, c-format msgid "" -"Stray %s directory found.\n" -"Use \"git am --abort\" to remove it." +"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 "" -"Directori %s extraviat trobat.\n" -"Useu \"git am --abort\" per a eliminar-lo." +"Ha trigat %.2f segons enumerar els fitxers no seguits.\n" +"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n" +"oblidar-vos d'afegir fitxers nous per vós mateix (vegeu\n" +"'git help status')." -#: builtin/am.c:2378 -msgid "Resolve operation not in progress, we are not resuming." -msgstr "Operació de resolució no en curs; no reprenem." +#: wt-status.c:1586 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Els fitxers no seguits no estan llistats%s" -#: builtin/apply.c:122 -msgid "git apply [] [...]" -msgstr "git apply [] [...]" +#: wt-status.c:1588 +msgid " (use -u option to show untracked files)" +msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)" -#: builtin/apply.c:153 -#, c-format -msgid "unrecognized whitespace option '%s'" -msgstr "opció d'espai en blanc '%s' no reconeguda" +#: wt-status.c:1594 +msgid "No changes" +msgstr "Sense canvis" -#: builtin/apply.c:169 +#: wt-status.c:1599 #, c-format -msgid "unrecognized whitespace ignore option '%s'" -msgstr "opció d'ignoral d'espai en blanc '%s' no reconeguda" +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" -#: builtin/apply.c:854 +#: wt-status.c:1602 #, c-format -msgid "Cannot prepare timestamp regexp %s" -msgstr "No es pot preparar l'expressió regular de marca de temps %s" +msgid "no changes added to commit\n" +msgstr "no hi ha canvis afegits a cometre\n" -#: builtin/apply.c:863 +#: wt-status.c:1605 #, c-format -msgid "regexec returned %d for input: %s" -msgstr "regexec ha retornat %d per l'entrada: %s" +msgid "" +"nothing added to commit but untracked files present (use \"git add\" to " +"track)\n" +msgstr "" +"no hi ha res afegit a cometre però fitxers no seguits estan presents (useu " +"\"git add\" per a seguir-los)\n" -#: builtin/apply.c:947 +#: wt-status.c:1608 #, 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" +msgid "nothing added to commit but untracked files present\n" +msgstr "no hi ha res afegit a cometre però fitxers no seguits estan presents\n" -#: builtin/apply.c:984 +#: wt-status.c:1611 #, c-format -msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d" +"no hi ha res a cometre (creeu/copieu fitxers i useu \"git add\" per a seguir-" +"los)\n" -#: builtin/apply.c:989 +#: wt-status.c:1614 wt-status.c:1619 #, c-format -msgid "git apply: bad git-diff - inconsistent new filename on line %d" -msgstr "" -"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d" +msgid "nothing to commit\n" +msgstr "no hi ha res a cometre\n" -#: builtin/apply.c:990 +#: wt-status.c:1617 #, c-format -msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d" +"no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n" -#: builtin/apply.c:995 +#: wt-status.c:1621 #, c-format -msgid "git apply: bad git-diff - expected /dev/null on line %d" -msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d" +msgid "nothing to commit, working tree clean\n" +msgstr "no hi ha res a cometre, l'arbre de treball està net\n" -#: builtin/apply.c:1489 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recompte: línia inesperada: %.*s" +#: wt-status.c:1728 +msgid "Initial commit on " +msgstr "Comissió inicial en " -#: builtin/apply.c:1550 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s" +#: wt-status.c:1732 +msgid "HEAD (no branch)" +msgstr "HEAD (sense branca)" -#: builtin/apply.c:1567 -#, c-format -msgid "" -"git diff header lacks filename information when removing %d leading pathname " -"component (line %d)" -msgid_plural "" -"git diff header lacks filename information when removing %d leading pathname " -"components (line %d)" -msgstr[0] "" -"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)" +#: wt-status.c:1761 +msgid "gone" +msgstr "no hi és" -#: builtin/apply.c:1743 -msgid "new file depends on old contents" -msgstr "el fitxer nou depèn dels continguts antics" +#: wt-status.c:1763 wt-status.c:1771 +msgid "behind " +msgstr "darrere " -#: builtin/apply.c:1745 -msgid "deleted file still has contents" -msgstr "el fitxer suprimit encara té continguts" +#: wt-status.c:1766 wt-status.c:1769 +msgid "ahead " +msgstr "davant per " -#: builtin/apply.c:1774 +#. TRANSLATORS: the action is e.g. "pull with rebase" +#: wt-status.c:2270 #, c-format -msgid "corrupt patch at line %d" -msgstr "el pedaç és malmès a la línia %d" +msgid "cannot %s: You have unstaged changes." +msgstr "no es pot %s: Teniu canvis no allistats." -#: builtin/apply.c:1810 -#, c-format -msgid "new file %s depends on old contents" -msgstr "el fitxer nou %s depèn dels continguts antics" +#: wt-status.c:2276 +msgid "additionally, your index contains uncommitted changes." +msgstr "addicionalment, el vostre índex conté canvis sense cometre." -#: builtin/apply.c:1812 +#: wt-status.c:2278 #, c-format -msgid "deleted file %s still has contents" -msgstr "el fitxer suprimit %s encara té continguts" +msgid "cannot %s: Your index contains uncommitted changes." +msgstr "no es pot %s: El vostre índex conté canvis sense cometre." -#: builtin/apply.c:1815 +#: compat/precompose_utf8.c:57 builtin/clone.c:414 #, c-format -msgid "** warning: file %s becomes empty but is not deleted" -msgstr "** advertència: el fitxer %s queda buit però no se suprimeix" +msgid "failed to unlink '%s'" +msgstr "s'ha fallat en desenllaçar '%s'" -#: builtin/apply.c:1962 -#, c-format -msgid "corrupt binary patch at line %d: %.*s" -msgstr "pedaç binari malmès a la línia %d: %.*s" +#: builtin/add.c:22 +msgid "git add [] [--] ..." +msgstr "git add [] [--] ..." -#: builtin/apply.c:1999 +#: builtin/add.c:80 #, c-format -msgid "unrecognized binary patch at line %d" -msgstr "pedaç binari no reconegut a la línia %d" +msgid "unexpected diff status %c" +msgstr "estat de diff inesperat %c" + +#: builtin/add.c:85 builtin/commit.c:291 +msgid "updating files failed" +msgstr "s'ha fallat en actualitzar els fitxers" -#: builtin/apply.c:2154 +#: builtin/add.c:95 #, c-format -msgid "patch with only garbage at line %d" -msgstr "pedaç amb només escombraries a la línia %d" +msgid "remove '%s'\n" +msgstr "elimina '%s'\n" + +#: builtin/add.c:149 +msgid "Unstaged changes after refreshing the index:" +msgstr "Canvis no allistats després d'actualitzar l'índex:" -#: builtin/apply.c:2244 +#: builtin/add.c:209 builtin/rev-parse.c:840 +msgid "Could not read the index" +msgstr "No s'ha pogut llegir l'índex" + +#: builtin/add.c:220 #, c-format -msgid "unable to read symlink %s" -msgstr "no s'ha pogut llegir l'enllaç simbòlic %s" +msgid "Could not open '%s' for writing." +msgstr "No s'ha pogut obrir '%s' per a escriptura." + +#: builtin/add.c:224 +msgid "Could not write patch" +msgstr "No s'ha pogut escriure el pedaç" + +#: builtin/add.c:227 +msgid "editing patch failed" +msgstr "l'edició del pedaç ha fallat" -#: builtin/apply.c:2248 +#: builtin/add.c:230 #, c-format -msgid "unable to open or read %s" -msgstr "no s'ha pogut obrir o llegir %s" +msgid "Could not stat '%s'" +msgstr "No s'ha pogut fer stat a '%s'" + +#: builtin/add.c:232 +msgid "Empty patch. Aborted." +msgstr "El pedaç és buit. S'ha avortat." -#: builtin/apply.c:2901 +#: builtin/add.c:237 #, c-format -msgid "invalid start of line: '%c'" -msgstr "inici de línia no vàlid: '%c'" +msgid "Could not apply '%s'" +msgstr "No s'ha pogut aplicar '%s'" + +#: builtin/add.c:247 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "" +"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n" + +#: builtin/add.c:266 builtin/clean.c:870 builtin/fetch.c:115 builtin/mv.c:111 +#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:521 +#: builtin/remote.c:1326 builtin/rm.c:268 builtin/send-pack.c:162 +msgid "dry run" +msgstr "marxa en sec" + +#: builtin/add.c:269 +msgid "interactive picking" +msgstr "recull interactiu" + +#: builtin/add.c:270 builtin/checkout.c:1156 builtin/reset.c:286 +msgid "select hunks interactively" +msgstr "selecciona els trossos interactivament" + +#: builtin/add.c:271 +msgid "edit current diff and apply" +msgstr "edita la diferència actual i aplica-la" + +#: builtin/add.c:272 +msgid "allow adding otherwise ignored files" +msgstr "permet afegir fitxers que d'altra manera s'ignoren" + +#: builtin/add.c:273 +msgid "update tracked files" +msgstr "actualitza els fitxers seguits" + +#: builtin/add.c:274 +msgid "record only the fact that the path will be added later" +msgstr "registra només el fet de que el camí s'afegirà més tard" + +#: builtin/add.c:275 +msgid "add changes from all tracked and untracked files" +msgstr "afegeix els canvis de tots els fitxers seguits i no seguits" + +#: builtin/add.c:278 +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)" + +#: builtin/add.c:280 +msgid "don't add, only refresh the index" +msgstr "no afegeixis, només actualitza l'índex" + +#: builtin/add.c:281 +msgid "just skip files which cannot be added because of errors" +msgstr "només omet els fitxers que no es poden afegir a causa d'errors" + +#: builtin/add.c:282 +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" + +#: builtin/add.c:283 builtin/update-index.c:947 +msgid "(+/-)x" +msgstr "(+/-)x" + +#: builtin/add.c:283 builtin/update-index.c:948 +msgid "override the executable bit of the listed files" +msgstr "passa per alt el bit executable dels fitxers llistats" -#: builtin/apply.c:3020 +#: builtin/add.c:305 #, c-format -msgid "Hunk #%d succeeded at %d (offset %d line)." -msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." -msgstr[0] "El tros #%d ha tingut èxit a %d (desplaçament %d línia)." -msgstr[1] "El tros #%d ha tingut èxit a %d (desplaçament %d línies)." +msgid "Use -f if you really want to add them.\n" +msgstr "Useu -f si realment els voleu afegir.\n" + +#: builtin/add.c:312 +msgid "adding files failed" +msgstr "l'afegiment de fitxers ha fallat" + +#: builtin/add.c:348 +msgid "-A and -u are mutually incompatible" +msgstr "-A i -u són mutualment incompatibles" + +#: builtin/add.c:355 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run" -#: builtin/apply.c:3032 +#: builtin/add.c:359 #, 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" +msgid "--chmod param '%s' must be either -x or +x" +msgstr "el paràmetre --chmod '%s' ha de ser o -x o +x" -#: builtin/apply.c:3038 +#: builtin/add.c:374 #, c-format -msgid "" -"while searching for:\n" -"%.*s" -msgstr "" -"tot cercant:\n" -"%.*s" +msgid "Nothing specified, nothing added.\n" +msgstr "No s'ha especificat res, no s'ha afegit res.\n" -#: builtin/apply.c:3060 +#: builtin/add.c:375 #, c-format -msgid "missing binary patch data for '%s'" -msgstr "manquen les dades de pedaç binari de '%s'" +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Potser volíeu dir 'git add .'?\n" + +#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:279 +#: builtin/checkout.c:472 builtin/clean.c:914 builtin/commit.c:350 +#: builtin/mv.c:131 builtin/reset.c:235 builtin/rm.c:298 +#: builtin/submodule--helper.c:244 +msgid "index file corrupt" +msgstr "fitxer d'índex malmès" + +#: builtin/am.c:414 +msgid "could not parse author script" +msgstr "no s'ha pogut analitzar l'script d'autor" -#: builtin/apply.c:3163 +#: builtin/am.c:491 #, c-format -msgid "binary patch does not apply to '%s'" -msgstr "el pedaç binari no s'aplica a '%s'" +msgid "'%s' was deleted by the applypatch-msg hook" +msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg" -#: builtin/apply.c:3169 +#: builtin/am.c:532 #, c-format -msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" -msgstr "" -"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)" +msgid "Malformed input line: '%s'." +msgstr "Línia d'entrada mal formada: '%s'." -#: builtin/apply.c:3190 +#: builtin/am.c:569 #, c-format -msgid "patch failed: %s:%ld" -msgstr "el pedaç ha fallat: %s:%ld" +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "S'ha fallat en copiar les notes de '%s' a '%s'" + +#: builtin/am.c:595 +msgid "fseek failed" +msgstr "fseek ha fallat" -#: builtin/apply.c:3314 +#: builtin/am.c:775 #, c-format -msgid "cannot checkout %s" -msgstr "no es pot agafar %s" +msgid "could not parse patch '%s'" +msgstr "no s'ha pogut analitzar el pedaç '%s'" + +#: builtin/am.c:840 +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/apply.c:3370 -#, c-format -msgid "reading from '%s' beyond a symbolic link" -msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic" +#: builtin/am.c:887 +msgid "invalid timestamp" +msgstr "marca de temps no vàlida" -#: builtin/apply.c:3399 builtin/apply.c:3630 -#, c-format -msgid "path %s has been renamed/deleted" -msgstr "el camí %s s'ha canviat de nom / s'ha suprimit" +#: builtin/am.c:890 builtin/am.c:898 +msgid "invalid Date line" +msgstr "línia Date no vàlida" -#: builtin/apply.c:3482 builtin/apply.c:3644 -#, c-format -msgid "%s: does not exist in index" -msgstr "%s: no existeix en l'índex" +#: builtin/am.c:895 +msgid "invalid timezone offset" +msgstr "desplaçament de zona de temps no vàlid" -#: builtin/apply.c:3486 builtin/apply.c:3636 builtin/apply.c:3658 -#, c-format -msgid "%s: %s" -msgstr "%s: %s" +#: builtin/am.c:984 +msgid "Patch format detection failed." +msgstr "La detecció de format de pedaç ha fallat." -#: builtin/apply.c:3491 builtin/apply.c:3652 +#: builtin/am.c:989 builtin/clone.c:379 #, c-format -msgid "%s: does not match index" -msgstr "%s: no coincideix amb l'índex" +msgid "failed to create directory '%s'" +msgstr "s'ha fallat en crear el directori '%s'" -#: builtin/apply.c:3597 -msgid "removal patch leaves file contents" -msgstr "el pedaç d'eliminació deixa els continguts dels fitxers" +#: builtin/am.c:993 +msgid "Failed to split patches." +msgstr "S'ha fallat en dividir els pedaços." -#: builtin/apply.c:3669 -#, c-format -msgid "%s: wrong type" -msgstr "%s: tipus erroni" +#: builtin/am.c:1125 builtin/commit.c:376 +msgid "unable to write index file" +msgstr "no s'ha pogut escriure el fitxer d'índex" -#: builtin/apply.c:3671 +#: builtin/am.c:1176 #, c-format -msgid "%s has type %o, expected %o" -msgstr "%s és del tipus %o, s'esperava %o" +msgid "When you have resolved this problem, run \"%s --continue\"." +msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"." -#: builtin/apply.c:3822 builtin/apply.c:3824 +#: builtin/am.c:1177 #, c-format -msgid "invalid path '%s'" -msgstr "camí no vàlid: %s" +msgid "If you prefer to skip this patch, run \"%s --skip\" instead." +msgstr "" +"Si preferiu saltar aquest pedaç, executeu \"%s --skip\" en lloc d'això." -#: builtin/apply.c:3879 +#: builtin/am.c:1178 #, c-format -msgid "%s: already exists in index" -msgstr "%s: ja existeix en l'índex" +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" +"\"." -#: builtin/apply.c:3882 -#, c-format -msgid "%s: already exists in working directory" -msgstr "%s: ja existeix en el directori de treball" +#: builtin/am.c:1316 +msgid "Patch is empty. Was it split wrong?" +msgstr "El pedaç és buit. S'ha dividit malament?" -#: builtin/apply.c:3902 +#: builtin/am.c:1390 builtin/log.c:1550 #, 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)" +msgid "invalid ident line: %s" +msgstr "línia d'identitat no vàlida: %s" -#: builtin/apply.c:3907 +#: builtin/am.c:1417 #, 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" +msgid "unable to parse commit %s" +msgstr "no s'ha pogut analitzar la comissió %s" -#: builtin/apply.c:3927 -#, c-format -msgid "affected file '%s' is beyond a symbolic link" -msgstr "el fitxer afectat '%s' és més enllà d'un enllaç simbòlic" +#: builtin/am.c:1610 +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." -#: builtin/apply.c:3931 -#, c-format -msgid "%s: patch does not apply" -msgstr "%s: el pedaç no s'aplica" +#: builtin/am.c:1612 +msgid "Using index info to reconstruct a base tree..." +msgstr "S'està usant la informació d'índex per a reconstruir un arbre base..." -#: builtin/apply.c:3945 -#, c-format -msgid "Checking patch %s..." -msgstr "S'està comprovant el pedaç %s..." +#: builtin/am.c:1631 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Heu editat el vostre pedaç a mà?\n" +"No s'aplica als blobs recordats en el seu índex." -#: builtin/apply.c:4038 builtin/checkout.c:233 builtin/reset.c:135 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry ha fallat per al camí '%s'" +#: builtin/am.c:1637 +msgid "Falling back to patching base and 3-way merge..." +msgstr "S'està retrocedint a apedaçar la base i fusionar de 3 vies..." -#: builtin/apply.c:4182 -#, c-format -msgid "unable to remove %s from index" -msgstr "no s'ha pogut eliminar %s de l'índex" +#: builtin/am.c:1662 +msgid "Failed to merge in the changes." +msgstr "S'ha fallat en fusionar els canvis." -#: builtin/apply.c:4215 -#, c-format -msgid "corrupt patch for submodule %s" -msgstr "pedaç malmès per al submòdul %s" +#: builtin/am.c:1686 builtin/merge.c:628 +msgid "git write-tree failed to write a tree" +msgstr "git write-tree ha fallat en escriure un arbre" -#: builtin/apply.c:4219 -#, c-format -msgid "unable to stat newly created file '%s'" -msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'" +#: builtin/am.c:1693 +msgid "applying to an empty history" +msgstr "s'està aplicant a una història buida" + +#: builtin/am.c:1706 builtin/commit.c:1769 builtin/merge.c:798 +#: builtin/merge.c:823 +msgid "failed to write commit object" +msgstr "s'ha fallat en escriure l'objecte de comissió" -#: builtin/apply.c:4224 +#: builtin/am.c:1739 builtin/am.c:1743 #, c-format -msgid "unable to create backing store for newly created file %s" +msgid "cannot resume: %s does not exist." +msgstr "no es pot reprendre: %s no existeix." + +#: builtin/am.c:1759 +msgid "cannot be interactive without stdin connected to a terminal." msgstr "" -"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat " -"%s" +"no es pot ser interactiu sense que stdin estigui connectada a un terminal." -#: builtin/apply.c:4227 builtin/apply.c:4340 -#, c-format -msgid "unable to add cache entry for %s" -msgstr "no s'ha pogut afegir una entrada de cau per a %s" +#: builtin/am.c:1764 +msgid "Commit Body is:" +msgstr "El cos de la comissió és:" -#: builtin/apply.c:4260 -#, c-format -msgid "closing file '%s'" -msgstr "s'està tancant el fitxer '%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:1774 +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: " -#: builtin/apply.c:4313 +#: builtin/am.c:1824 #, c-format -msgid "unable to write file '%s' mode %o" -msgstr "no s'ha pogut escriure el fitxer '%s' mode %o" +msgid "Dirty index: cannot apply patches (dirty: %s)" +msgstr "Índex brut: no es pot aplicar pedaços (bruts: %s)" -#: builtin/apply.c:4403 +#: builtin/am.c:1861 builtin/am.c:1933 #, c-format -msgid "Applied patch %s cleanly." -msgstr "El pedaç %s s'ha aplicat netament." +msgid "Applying: %.*s" +msgstr "S'està aplicant: %.*s" -#: builtin/apply.c:4411 -msgid "internal error" -msgstr "error intern" +#: builtin/am.c:1877 +msgid "No changes -- Patch already applied." +msgstr "Sense canvis -- El pedaç ja s'ha aplicat." -#: builtin/apply.c:4414 +#: builtin/am.c:1885 #, 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 rebuitjos..." +msgid "Patch failed at %s %.*s" +msgstr "El pedaç ha fallat a %s %.*s" -#: builtin/apply.c:4424 +#: builtin/am.c:1891 #, c-format -msgid "truncating .rej filename to %.*s.rej" -msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej" +msgid "The copy of the patch that failed is found in: %s" +msgstr "La còpia del pedaç que ha fallat es troba en: %s" -#: builtin/apply.c:4432 -#, c-format -msgid "cannot open %s: %s" -msgstr "no es pot obrir %s: %s" +#: builtin/am.c:1936 +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 "" +"Cap canvi - heu oblidat d'usar 'git add'?\n" +"Si no hi ha res a allistar, probablement alguna altra cosa ja ha\n" +"introduït els mateixos canvis; potser voleu ometre aquest pedaç." -#: builtin/apply.c:4445 -#, c-format -msgid "Hunk #%d applied cleanly." -msgstr "El tros #%d s'ha aplicat netament." +#: builtin/am.c:1943 +msgid "" +"You still have unmerged paths in your index.\n" +"Did you forget to use 'git add'?" +msgstr "" +"Encara teniu camins sense fusionar en el vostre índex.\n" +"Heu oblidat d'usar 'git add'?" -#: builtin/apply.c:4448 +#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308 +#: builtin/reset.c:316 #, c-format -msgid "Rejected hunk #%d." -msgstr "S'ha rebutjat el tros #%d." +msgid "Could not parse object '%s'." +msgstr "No s'ha pogut analitzar l'objecte '%s'." + +#: builtin/am.c:2103 +msgid "failed to clean index" +msgstr "s'ha fallat en netejar l'índex" + +#: builtin/am.c:2137 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n" +"No s'està rebobinant a ORIG_HEAD" -#: builtin/apply.c:4537 +#: builtin/am.c:2200 #, c-format -msgid "Skipped patch '%s'." -msgstr "S'ha saltat el pedaç '%s'." +msgid "Invalid value for --patch-format: %s" +msgstr "Valor no vàlid per a --patch-format: %s" -#: builtin/apply.c:4545 -msgid "unrecognized input" -msgstr "entrada no reconeguda" +#: builtin/am.c:2233 +msgid "git am [] [( | )...]" +msgstr "git am [] [( | )...]" -#: builtin/apply.c:4556 -msgid "unable to read index file" -msgstr "no es pot llegir el fitxer d'índex" +#: builtin/am.c:2234 +msgid "git am [] (--continue | --skip | --abort)" +msgstr "git am [] (--continue | --skip | --abort)" -#: builtin/apply.c:4701 -msgid "--3way outside a repository" -msgstr "--3way fora d'un dipòsit" +#: builtin/am.c:2240 +msgid "run interactively" +msgstr "executa interactivament" -#: builtin/apply.c:4709 -msgid "--index outside a repository" -msgstr "--index fora d'un dipòsit" +#: builtin/am.c:2242 +msgid "historical option -- no-op" +msgstr "opció històrica -- no-op" -#: builtin/apply.c:4712 -msgid "--cached outside a repository" -msgstr "--cached fora d'un dipòsit" +#: builtin/am.c:2244 +msgid "allow fall back on 3way merging if needed" +msgstr "permet retrocedir a una fusió de 3 vies si és necessari" -#: builtin/apply.c:4745 -#, c-format -msgid "can't open patch '%s'" -msgstr "no es pot obrir el pedaç '%s'" +#: builtin/am.c:2245 builtin/init-db.c:483 builtin/prune-packed.c:57 +#: builtin/repack.c:172 +msgid "be quiet" +msgstr "calla" -#: builtin/apply.c:4760 -#, c-format -msgid "squelched %d whitespace error" -msgid_plural "squelched %d whitespace errors" -msgstr[0] "s'ha omès %d error d'espai en blanc" -msgstr[1] "s'han omès %d errors d'espai en blanc" +#: builtin/am.c:2247 +msgid "add a Signed-off-by line to the commit message" +msgstr "afegeix una línia Signed-off-by al missatge de comissió" -#: builtin/apply.c:4766 builtin/apply.c:4776 -#, 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." +#: builtin/am.c:2250 +msgid "recode into utf8 (default)" +msgstr "recodifica en utf8 (per defecte)" -#: builtin/apply.c:4800 -msgid "don't apply changes matching the given path" -msgstr "no apliquis els canvis que coincideixin amb el camí donat" +#: builtin/am.c:2252 +msgid "pass -k flag to git-mailinfo" +msgstr "passa la bandera -k al git-mailinfo" -#: builtin/apply.c:4803 -msgid "apply changes matching the given path" -msgstr "aplica els canvis que coincideixin amb el camí donat" +#: builtin/am.c:2254 +msgid "pass -b flag to git-mailinfo" +msgstr "passa la bandera -b al git-mailinfo" -#: builtin/apply.c:4806 -msgid "remove leading slashes from traditional diff paths" -msgstr "" -"elimina barres obliqües inicials dels camins de diferència " -"tradicionals" +#: builtin/am.c:2256 +msgid "pass -m flag to git-mailinfo" +msgstr "passa la bandera -m al git-mailinfo" -#: builtin/apply.c:4809 -msgid "ignore additions made by the patch" -msgstr "ignora afegiments fets pel pedaç" +#: builtin/am.c:2258 +msgid "pass --keep-cr flag to git-mailsplit for mbox format" +msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox" -#: builtin/apply.c:4811 -msgid "instead of applying the patch, output diffstat for the input" +#: builtin/am.c:2261 +msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" -"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada" +"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr" -#: builtin/apply.c:4815 -msgid "show number of added and deleted lines in decimal notation" -msgstr "mostra el nombre de línies afegides i suprimides en notació decimal" +#: builtin/am.c:2264 +msgid "strip everything before a scissors line" +msgstr "despulla tot abans d'una línia de tissores" -#: builtin/apply.c:4817 -msgid "instead of applying the patch, output a summary for the input" -msgstr "en lloc d'aplicar el pedaç, emet un resum de l'entrada" +#: builtin/am.c:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275 +#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287 +#: builtin/am.c:2293 +msgid "pass it through git-apply" +msgstr "passa-ho a través del git-apply" + +#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665 +#: builtin/grep.c:707 builtin/merge.c:200 builtin/pull.c:135 builtin/pull.c:194 +#: builtin/repack.c:181 builtin/repack.c:185 builtin/show-branch.c:644 +#: builtin/show-ref.c:175 builtin/tag.c:340 parse-options.h:132 +#: parse-options.h:134 parse-options.h:245 +msgid "n" +msgstr "n" -#: builtin/apply.c:4819 -msgid "instead of applying the patch, see if the patch is applicable" -msgstr "en lloc d'aplicar el pedaç, veges si el pedaç és aplicable" +#: builtin/am.c:2289 builtin/for-each-ref.c:37 builtin/replace.c:438 +#: builtin/tag.c:372 +msgid "format" +msgstr "format" -#: builtin/apply.c:4821 -msgid "make sure the patch is applicable to the current index" -msgstr "assegura que el pedaç sigui aplicable a l'índex actual" +#: builtin/am.c:2290 +msgid "format the patch(es) are in" +msgstr "el format en el qual estan els pedaços" -#: builtin/apply.c:4823 -msgid "apply a patch without touching the working tree" -msgstr "aplica un pedaç sense tocar l'arbre de treball" +#: builtin/am.c:2296 +msgid "override error message when patch failure occurs" +msgstr "" +"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar" -#: builtin/apply.c:4825 -msgid "accept a patch that touches outside the working area" -msgstr "accepta un pedaç que toqui fora de l'àrea de treball" +#: builtin/am.c:2298 +msgid "continue applying patches after resolving a conflict" +msgstr "segueix aplicant pedaços després de resoldre un conflicte" -#: builtin/apply.c:4827 -msgid "also apply the patch (use with --stat/--summary/--check)" -msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)" +#: builtin/am.c:2301 +msgid "synonyms for --continue" +msgstr "sinònims de --continue" -#: builtin/apply.c:4829 -msgid "attempt three-way merge if a patch does not apply" -msgstr "intenta una fusió de tres vies si el pedaç no s'aplica" +#: builtin/am.c:2304 +msgid "skip the current patch" +msgstr "salta el pedaç actual" -#: builtin/apply.c:4831 -msgid "build a temporary index based on embedded index information" -msgstr "construeix un índex temporal basat en la informació d'índex incrustada" +#: builtin/am.c:2307 +msgid "restore the original branch and abort the patching operation." +msgstr "restaura la branca original i avorta l'operació d'apedaçament." -#: builtin/apply.c:4834 builtin/checkout-index.c:169 builtin/ls-files.c:426 -msgid "paths are separated with NUL character" -msgstr "els camins se separen amb el caràcter NUL" +#: builtin/am.c:2311 +msgid "lie about committer date" +msgstr "menteix sobre la data del comitent" -#: builtin/apply.c:4836 -msgid "ensure at least lines of context match" -msgstr "assegura't que almenys línies de context coincideixin" +#: builtin/am.c:2313 +msgid "use current timestamp for author date" +msgstr "usa el marc de temps actual per la data d'autor" -#: builtin/apply.c:4838 -msgid "detect new or modified lines that have whitespace errors" -msgstr "" -"detecta les línies noves o modificades que tinguin errors d'espai en blanc" +#: builtin/am.c:2315 builtin/commit.c:1605 builtin/merge.c:229 +#: builtin/pull.c:165 builtin/revert.c:92 builtin/tag.c:355 +msgid "key-id" +msgstr "ID de clau" -#: builtin/apply.c:4841 builtin/apply.c:4844 -msgid "ignore changes in whitespace when finding context" -msgstr "ignora els canvis d'espai en blanc en cercar context" +#: builtin/am.c:2316 +msgid "GPG-sign commits" +msgstr "signa les comissions amb GPG" -#: builtin/apply.c:4847 -msgid "apply the patch in reverse" -msgstr "aplica el pedaç al revés" +#: builtin/am.c:2319 +msgid "(internal use for git-rebase)" +msgstr "(ús intern per al git-rebase)" -#: builtin/apply.c:4849 -msgid "don't expect at least one line of context" -msgstr "no esperis almenys una línia de context" +#: builtin/am.c:2334 +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 "" +"Fa molt que l'opció -b/--binary no ha fet res, i\n" +"s'eliminarà. Si us plau, no l'useu més." -#: builtin/apply.c:4851 -msgid "leave the rejected hunks in corresponding *.rej files" -msgstr "deixa els trossos rebutjats en fitxers *.reg coresspondents" +#: builtin/am.c:2341 +msgid "failed to read the index" +msgstr "s'ha fallat en llegir l'índex" -#: builtin/apply.c:4853 -msgid "allow overlapping hunks" -msgstr "permet trossos encavalcants" +#: builtin/am.c:2356 +#, c-format +msgid "previous rebase directory %s still exists but mbox given." +msgstr "" +"un directori de rebasament anterior %s encara existeix però s'ha donat una " +"bústia." -#: builtin/apply.c:4856 -msgid "tolerate incorrectly detected missing new-line at the end of file" -msgstr "tolera una línia nova incorrectament detectada al final del fitxer" +#: builtin/am.c:2380 +#, c-format +msgid "" +"Stray %s directory found.\n" +"Use \"git am --abort\" to remove it." +msgstr "" +"S'ha trobat un directori %s extraviat.\n" +"Useu \"git am --abort\" per a eliminar-lo." -#: builtin/apply.c:4859 -msgid "do not trust the line counts in the hunk headers" -msgstr "no confiïs en els recomptes de línia en les capçaleres dels trossos" +#: builtin/am.c:2386 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Una operació de resolució no està en curs; no reprenem." -#: builtin/apply.c:4862 -msgid "prepend to all filenames" -msgstr "anteposa a tots els noms de fitxer" +#: builtin/apply.c:8 +msgid "git apply [] [...]" +msgstr "git apply [] [...]" #: builtin/archive.c:17 #, c-format @@ -4111,118 +4612,172 @@ msgstr "es documenten les en git-rev-list(1)" msgid "Blaming lines" msgstr "S'estan culpant les línies" -#: builtin/blame.c:2536 +#: builtin/blame.c:2577 msgid "Show blame entries as we find them, incrementally" msgstr "Mostra les entrades de culpa mentre les trobem, incrementalment" -#: builtin/blame.c:2537 +#: builtin/blame.c:2578 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: " "desactivat)" -#: builtin/blame.c:2538 +#: builtin/blame.c:2579 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)" -#: builtin/blame.c:2539 +#: builtin/blame.c:2580 msgid "Show work cost statistics" msgstr "Mostra les estadístiques de preu de treball" -#: builtin/blame.c:2540 +#: builtin/blame.c:2581 msgid "Force progress reporting" msgstr "Força l'informe de progrés" -#: builtin/blame.c:2541 +#: builtin/blame.c:2582 msgid "Show output score for blame entries" msgstr "Mostra la puntuació de sortida de les entrades de culpa" -#: builtin/blame.c:2542 +#: builtin/blame.c:2583 msgid "Show original filename (Default: auto)" msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)" -#: builtin/blame.c:2543 +#: builtin/blame.c:2584 msgid "Show original linenumber (Default: off)" msgstr "Mostra el número de línia original (Per defecte: desactivat)" -#: builtin/blame.c:2544 +#: builtin/blame.c:2585 msgid "Show in a format designed for machine consumption" msgstr "Presenta en un format dissenyat per consumpció per màquina" -#: builtin/blame.c:2545 +#: builtin/blame.c:2586 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:2546 +#: builtin/blame.c:2587 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)" -#: builtin/blame.c:2547 +#: builtin/blame.c:2588 msgid "Show raw timestamp (Default: off)" msgstr "Mostra la marca de temps crua (Per defecte: desactivat)" -#: builtin/blame.c:2548 +#: builtin/blame.c:2589 msgid "Show long commit SHA1 (Default: off)" msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)" -#: builtin/blame.c:2549 +#: builtin/blame.c:2590 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:2550 +#: builtin/blame.c:2591 msgid "Show author email instead of name (Default: off)" msgstr "" "Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per " "defecte: desactivat)" -#: builtin/blame.c:2551 +#: builtin/blame.c:2592 msgid "Ignore whitespace differences" msgstr "Ignora les diferències d'espai en blanc" -#: builtin/blame.c:2552 +#: builtin/blame.c:2599 +msgid "Use an experimental indent-based heuristic to improve diffs" +msgstr "" +"Usa un heurístic experimental basat en sagnat per a millorar les diferències" + +#: builtin/blame.c:2600 +msgid "Use an experimental blank-line-based heuristic to improve diffs" +msgstr "" +"Usa un heurístic experimental basat en línies en blanc per a millorar les " +"diferències" + +#: builtin/blame.c:2602 msgid "Spend extra cycles to find better match" msgstr "Gasta cicles extres per a trobar una coincidència millor" -#: builtin/blame.c:2553 +#: builtin/blame.c:2603 msgid "Use revisions from instead of calling git-rev-list" msgstr "Usa les revisions de en lloc d'invocar git-rev-list" -#: builtin/blame.c:2554 +#: builtin/blame.c:2604 msgid "Use 's contents as the final image" msgstr "Usa els continguts de com a la imatge final" -#: builtin/blame.c:2555 builtin/blame.c:2556 +#: builtin/blame.c:2605 builtin/blame.c:2606 msgid "score" msgstr "puntuació" -#: builtin/blame.c:2555 +#: builtin/blame.c:2605 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:2556 +#: builtin/blame.c:2606 msgid "Find line movements within and across files" msgstr "Troba moviments de línia dins i a través dels fitxers" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2557 +#: builtin/blame.c:2607 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:2654 +msgid "--progress can't be used with --incremental or porcelain formats" +msgstr "" +"no es pot usar --progress amb els formats --incremental o de porcellana" + #. TRANSLATORS: This string is used to tell us the maximum #. display width for a relative timestamp in "git blame" #. output. For C locale, "4 years, 11 months ago", which #. takes 22 places, is the longest among various forms of #. relative timestamps, but your language may need more or #. fewer display columns. -#: builtin/blame.c:2649 +#: builtin/blame.c:2700 msgid "4 years, 11 months ago" msgstr "fa 4 anys i 11 mesos" +#: builtin/blame.c:2780 +msgid "--contents and --reverse do not blend well." +msgstr "--contents i --reverse no es jutgen bé." + +#: builtin/blame.c:2800 +msgid "cannot use --contents with final commit object name" +msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final" + +#: builtin/blame.c:2805 +msgid "--reverse and --first-parent together require specified latest commit" +msgstr "" +"--reverse i --first-parent-together requereixen una última comissió " +"especificada" + +#: builtin/blame.c:2832 +msgid "" +"--reverse --first-parent together require range along first-parent chain" +msgstr "" +"--reverse --first-parent junts requereixen un rang de la cadena de mares " +"primeres" + +#: builtin/blame.c:2843 +#, c-format +msgid "no such path %s in %s" +msgstr "no hi ha tal camí %s en %s" + +#: builtin/blame.c:2854 +#, c-format +msgid "cannot read blob %s for path %s" +msgstr "no es pot llegir el blob %s per al camí %s" + +#: builtin/blame.c:2873 +#, c-format +msgid "file %s has only %lu line" +msgid_plural "file %s has only %lu lines" +msgstr[0] "el fitxer %s té només %lu línia" +msgstr[1] "el fitxer %s té només %lu línies" + #: builtin/branch.c:26 msgid "git branch [] [-r | -a] [--merged | --no-merged]" msgstr "git branch [] [-r | -a] [--merged | --no-merged]" @@ -4474,6 +5029,10 @@ msgstr "font" msgid "change the upstream info" msgstr "canvia la informació de font" +#: builtin/branch.c:660 +msgid "Unset the upstream info" +msgstr "Desestableix la informació de font" + #: builtin/branch.c:661 msgid "use colored output" msgstr "usa sortida colorada" @@ -4546,8 +5105,8 @@ msgstr "clau" msgid "field name to sort on" msgstr "nom del camp en el qual ordenar" -#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:402 -#: builtin/notes.c:405 builtin/notes.c:565 builtin/notes.c:568 +#: builtin/branch.c:686 builtin/for-each-ref.c:41 builtin/notes.c:404 +#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570 #: builtin/tag.c:369 msgid "object" msgstr "objecte" @@ -4560,7 +5119,7 @@ msgstr "imprimeix només les branques de l'objecte" msgid "Failed to resolve HEAD as a valid ref." msgstr "S'ha fallat en resoldre HEAD com a referència vàlida." -#: builtin/branch.c:709 builtin/clone.c:707 +#: builtin/branch.c:709 builtin/clone.c:706 msgid "HEAD not found below refs/heads!" msgstr "HEAD no trobat sota refs/heads!" @@ -4671,65 +5230,82 @@ msgstr "Cal un dipòsit per a fer un farcell." msgid "Need a repository to unbundle." msgstr "Cal un dipòsit per a desfer un farcell." -#: builtin/cat-file.c:443 +#: builtin/cat-file.c:513 msgid "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"|--textconv) " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | | --textconv | --filters) [--path=] " msgstr "" -"git cat-file (-t [--allow-unknown-type]|-s [--allow-unknown-type]|-e|-p|" -"|--textconv) " +"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" +"p | | --textconv | --filters [--path=]) " -#: builtin/cat-file.c:444 -msgid "git cat-file (--batch | --batch-check) [--follow-symlinks]" -msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks]" +#: builtin/cat-file.c:514 +msgid "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" +msgstr "" +"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" +"filters]" -#: builtin/cat-file.c:481 +#: builtin/cat-file.c:551 msgid " can be one of: blob, tree, commit, tag" msgstr " pot ser un de: blob, tree, commit, tag" -#: builtin/cat-file.c:482 +#: builtin/cat-file.c:552 msgid "show object type" msgstr "mostra el tipus de l'objecte" -#: builtin/cat-file.c:483 +#: builtin/cat-file.c:553 msgid "show object size" msgstr "mostra la mida de l'objecte" -#: builtin/cat-file.c:485 +#: builtin/cat-file.c:555 msgid "exit with zero when there's no error" msgstr "surt amb zero quan no hi ha error" -#: builtin/cat-file.c:486 +#: builtin/cat-file.c:556 msgid "pretty-print object's content" msgstr "imprimeix bellament el contingut de l'objecte" -#: builtin/cat-file.c:488 +#: builtin/cat-file.c:558 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:490 +#: builtin/cat-file.c:560 +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" + +#: builtin/cat-file.c:561 git-submodule.sh:923 +msgid "blob" +msgstr "blob" + +#: builtin/cat-file.c:562 +msgid "use a specific path for --textconv/--filters" +msgstr "usa un camí especìfic per a --textconv/--filters" + +#: builtin/cat-file.c:564 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:491 +#: builtin/cat-file.c:565 msgid "buffer --batch output" msgstr "posa la sortida de --batch en memòria intermèdia" -#: builtin/cat-file.c:493 +#: builtin/cat-file.c:567 msgid "show info and content of objects fed from the standard input" msgstr "" "mostra la informació i contingut dels objectes rebuts de l'entrada estàndard" -#: builtin/cat-file.c:496 +#: builtin/cat-file.c:570 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:499 +#: builtin/cat-file.c:573 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)" -#: builtin/cat-file.c:501 +#: builtin/cat-file.c:575 msgid "show all objects with --batch or --batch-check" msgstr "mostra tots els objectes amb --batch o --batch-check" @@ -4749,7 +5325,7 @@ msgstr "informa de tots els atributs establerts en el fitxer" msgid "use .gitattributes only from the index" msgstr "usa .gitattributes només des de l'índex" -#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:97 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98 msgid "read file names from stdin" msgstr "llegeix els noms de fitxer d'stdin" @@ -4757,7 +5333,7 @@ msgstr "llegeix els noms de fitxer d'stdin" msgid "terminate input and output records by a NUL character" msgstr "acaba els registres d'entrada i de sortida amb un caràcter NUL" -#: builtin/check-ignore.c:18 builtin/checkout.c:1138 builtin/gc.c:325 +#: builtin/check-ignore.c:18 builtin/checkout.c:1137 builtin/gc.c:325 msgid "suppress progress reporting" msgstr "omet el reportatge de progrés" @@ -4847,9 +5423,9 @@ msgid "write the content to temporary files" msgstr "escriu el contingut a fitxers temporals" #: builtin/checkout-index.c:174 builtin/column.c:30 -#: builtin/submodule--helper.c:488 builtin/submodule--helper.c:491 -#: builtin/submodule--helper.c:494 builtin/submodule--helper.c:497 -#: builtin/submodule--helper.c:830 builtin/worktree.c:469 +#: builtin/submodule--helper.c:595 builtin/submodule--helper.c:598 +#: builtin/submodule--helper.c:604 builtin/submodule--helper.c:951 +#: builtin/worktree.c:469 msgid "string" msgstr "cadena" @@ -4897,7 +5473,7 @@ msgstr "camí '%s': no es pot fusionar" #: builtin/checkout.c:230 #, c-format msgid "Unable to add merge result for '%s'" -msgstr "no s'ha pogut afegir el resultat de fusió per a '%s'" +msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'" #: builtin/checkout.c:250 builtin/checkout.c:253 builtin/checkout.c:256 #: builtin/checkout.c:259 @@ -4921,54 +5497,54 @@ msgstr "" msgid "path '%s' is unmerged" msgstr "el camí '%s' està sense fusionar" -#: builtin/checkout.c:495 +#: builtin/checkout.c:494 msgid "you need to resolve your current index first" msgstr "heu de primer resoldre el vostre índex actual" -#: builtin/checkout.c:625 +#: builtin/checkout.c:624 #, 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:664 +#: builtin/checkout.c:663 msgid "HEAD is now at" msgstr "HEAD ara és a" -#: builtin/checkout.c:668 builtin/clone.c:661 +#: builtin/checkout.c:667 builtin/clone.c:660 msgid "unable to update HEAD" msgstr "no s'ha pogut actualitzar HEAD" -#: builtin/checkout.c:672 +#: builtin/checkout.c:671 #, c-format msgid "Reset branch '%s'\n" msgstr "Restableix la branca '%s'\n" -#: builtin/checkout.c:675 +#: builtin/checkout.c:674 #, c-format msgid "Already on '%s'\n" msgstr "Ja en '%s'\n" -#: builtin/checkout.c:679 +#: builtin/checkout.c:678 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "S'ha agafat i restablert la branca '%s'\n" -#: builtin/checkout.c:681 builtin/checkout.c:1070 +#: builtin/checkout.c:680 builtin/checkout.c:1069 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "S'ha agafat la branca nova '%s'\n" -#: builtin/checkout.c:683 +#: builtin/checkout.c:682 #, c-format msgid "Switched to branch '%s'\n" msgstr "S'ha agafat la branca '%s'\n" -#: builtin/checkout.c:734 +#: builtin/checkout.c:733 #, c-format msgid " ... and %d more.\n" msgstr " ... i %d més.\n" -#: builtin/checkout.c:740 +#: builtin/checkout.c:739 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -4991,7 +5567,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:759 +#: builtin/checkout.c:758 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -5018,150 +5594,150 @@ msgstr[1] "" " git branch %s\n" "\n" -#: builtin/checkout.c:795 +#: builtin/checkout.c:794 msgid "internal error in revision walk" msgstr "error intern en el passeig per revisions" -#: builtin/checkout.c:799 +#: builtin/checkout.c:798 msgid "Previous HEAD position was" msgstr "La posició de HEAD anterior era" -#: builtin/checkout.c:826 builtin/checkout.c:1065 +#: builtin/checkout.c:825 builtin/checkout.c:1064 msgid "You are on a branch yet to be born" msgstr "Sou en una branca que encara ha de nàixer" -#: builtin/checkout.c:971 +#: builtin/checkout.c:970 #, c-format msgid "only one reference expected, %d given." msgstr "s'esperava només una referència, s'han donat %d." -#: builtin/checkout.c:1011 builtin/worktree.c:214 +#: builtin/checkout.c:1010 builtin/worktree.c:214 #, c-format msgid "invalid reference: %s" msgstr "referència no vàlida: %s" -#: builtin/checkout.c:1040 +#: builtin/checkout.c:1039 #, c-format msgid "reference is not a tree: %s" msgstr "la referència no és un arbre: %s" -#: builtin/checkout.c:1079 +#: builtin/checkout.c:1078 msgid "paths cannot be used with switching branches" msgstr "els camins no es poden usar amb canvi de branca" -#: builtin/checkout.c:1082 builtin/checkout.c:1086 +#: builtin/checkout.c:1081 builtin/checkout.c:1085 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' no es pot usar amb canvi de branca" -#: builtin/checkout.c:1090 builtin/checkout.c:1093 builtin/checkout.c:1098 -#: builtin/checkout.c:1101 +#: builtin/checkout.c:1089 builtin/checkout.c:1092 builtin/checkout.c:1097 +#: builtin/checkout.c:1100 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' no es pot usar amb '%s'" -#: builtin/checkout.c:1106 +#: builtin/checkout.c:1105 #, 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:1139 builtin/checkout.c:1141 builtin/clone.c:88 +#: builtin/checkout.c:1138 builtin/checkout.c:1140 builtin/clone.c:93 #: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:324 #: builtin/worktree.c:326 msgid "branch" msgstr "branca" -#: builtin/checkout.c:1140 +#: builtin/checkout.c:1139 msgid "create and checkout a new branch" msgstr "crea i agafa una branca nova" -#: builtin/checkout.c:1142 +#: builtin/checkout.c:1141 msgid "create/reset and checkout a branch" msgstr "crea/restableix i agafa una branca" -#: builtin/checkout.c:1143 +#: builtin/checkout.c:1142 msgid "create reflog for new branch" msgstr "crea un registre de referència per a la branca nova" -#: builtin/checkout.c:1144 builtin/worktree.c:328 +#: builtin/checkout.c:1143 builtin/worktree.c:328 msgid "detach HEAD at named commit" msgstr "separa HEAD a la comissió anomenada" -#: builtin/checkout.c:1145 +#: builtin/checkout.c:1144 msgid "set upstream info for new branch" msgstr "estableix la informació de font de la branca nova" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new-branch" msgstr "branca-nova" -#: builtin/checkout.c:1147 +#: builtin/checkout.c:1146 msgid "new unparented branch" msgstr "branca òrfena nova" -#: builtin/checkout.c:1148 +#: builtin/checkout.c:1147 msgid "checkout our version for unmerged files" msgstr "agafa la versió nostra dels fitxers sense fusionar" -#: builtin/checkout.c:1150 +#: builtin/checkout.c:1149 msgid "checkout their version for unmerged files" msgstr "agafa la versió seva dels fitxers sense fusionar" -#: builtin/checkout.c:1152 +#: builtin/checkout.c:1151 msgid "force checkout (throw away local modifications)" msgstr "agafa a la força (descarta qualsevulla modificació local)" -#: builtin/checkout.c:1153 +#: builtin/checkout.c:1152 msgid "perform a 3-way merge with the new branch" msgstr "realitza una fusió de 3 vies amb la branca nova" -#: builtin/checkout.c:1154 builtin/merge.c:231 +#: builtin/checkout.c:1153 builtin/merge.c:231 msgid "update ignored files (default)" msgstr "actualitza els fitxers ignorats (per defecte)" -#: builtin/checkout.c:1155 builtin/log.c:1459 parse-options.h:250 +#: builtin/checkout.c:1154 builtin/log.c:1466 parse-options.h:251 msgid "style" msgstr "estil" -#: builtin/checkout.c:1156 +#: builtin/checkout.c:1155 msgid "conflict style (merge or diff3)" msgstr "estil de conflicte (fusió o diff3)" -#: builtin/checkout.c:1159 +#: builtin/checkout.c:1158 msgid "do not limit pathspecs to sparse entries only" msgstr "no limitis les especificacions de camí només a entrades disperses" -#: builtin/checkout.c:1161 +#: builtin/checkout.c:1160 msgid "second guess 'git checkout '" msgstr "dubta 'git checkout '" -#: builtin/checkout.c:1163 +#: builtin/checkout.c:1162 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:1164 builtin/clone.c:60 builtin/fetch.c:117 -#: builtin/merge.c:228 builtin/pull.c:116 builtin/push.c:536 +#: builtin/checkout.c:1163 builtin/clone.c:63 builtin/fetch.c:119 +#: builtin/merge.c:228 builtin/pull.c:117 builtin/push.c:536 #: builtin/send-pack.c:168 msgid "force progress reporting" msgstr "força l'informe de progrés" -#: builtin/checkout.c:1195 +#: builtin/checkout.c:1194 msgid "-b, -B and --orphan are mutually exclusive" msgstr "-b, -B i --orphan són mutualment exclusius" -#: builtin/checkout.c:1212 +#: builtin/checkout.c:1211 msgid "--track needs a branch name" msgstr "--track necessita un nom de branca" -#: builtin/checkout.c:1217 +#: builtin/checkout.c:1216 msgid "Missing branch name; try -b" msgstr "Manca el nom de branca; proveu -b" -#: builtin/checkout.c:1253 +#: builtin/checkout.c:1252 msgid "invalid path specification" msgstr "especificació de camí no vàlida" -#: builtin/checkout.c:1260 +#: builtin/checkout.c:1259 #, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" @@ -5170,12 +5746,12 @@ msgstr "" "No es poden actualitzar els camins i canviar a la branca '%s' a la vegada.\n" "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?" -#: builtin/checkout.c:1265 +#: builtin/checkout.c:1264 #, 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:1269 +#: builtin/checkout.c:1268 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -5327,8 +5903,8 @@ msgstr "neteja interactiva" msgid "remove whole directories" msgstr "elimina directoris sencers" -#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:724 -#: builtin/ls-files.c:457 builtin/name-rev.c:314 builtin/show-ref.c:182 +#: builtin/clean.c:875 builtin/describe.c:407 builtin/grep.c:725 +#: builtin/ls-files.c:536 builtin/name-rev.c:313 builtin/show-ref.c:182 msgid "pattern" msgstr "patró" @@ -5368,112 +5944,129 @@ msgstr "" msgid "git clone [] [--] []" msgstr "git clone [] [--] []" -#: builtin/clone.c:62 +#: builtin/clone.c:65 msgid "don't create a checkout" msgstr "no facis cap agafament" -#: builtin/clone.c:63 builtin/clone.c:65 builtin/init-db.c:476 +#: builtin/clone.c:66 builtin/clone.c:68 builtin/init-db.c:478 msgid "create a bare repository" msgstr "crea un dipòsit nu" -#: builtin/clone.c:67 +#: builtin/clone.c:70 msgid "create a mirror repository (implies bare)" msgstr "crea un dipòsit reflectit (implica bare)" -#: builtin/clone.c:69 +#: builtin/clone.c:72 msgid "to clone from a local repository" msgstr "per a clonar des d'un dipòsit local" -#: builtin/clone.c:71 +#: builtin/clone.c:74 msgid "don't use local hardlinks, always copy" msgstr "no usis enllaços durs locals, sempre copia" -#: builtin/clone.c:73 +#: builtin/clone.c:76 msgid "setup as shared repository" msgstr "configura com a dipòsit compartit" -#: builtin/clone.c:75 builtin/clone.c:77 +#: builtin/clone.c:78 builtin/clone.c:80 msgid "initialize submodules in the clone" msgstr "inicialitza els submòduls en el clon" -#: builtin/clone.c:79 +#: builtin/clone.c:82 msgid "number of submodules cloned in parallel" msgstr "nombre de submòduls clonats en paral·lel" -#: builtin/clone.c:80 builtin/init-db.c:473 +#: builtin/clone.c:83 builtin/init-db.c:475 msgid "template-directory" msgstr "directori-de-plantilla" -#: builtin/clone.c:81 builtin/init-db.c:474 +#: builtin/clone.c:84 builtin/init-db.c:476 msgid "directory from which templates will be used" msgstr "directori del qual les plantilles s'usaran" -#: builtin/clone.c:83 builtin/submodule--helper.c:495 -#: builtin/submodule--helper.c:833 +#: builtin/clone.c:86 builtin/clone.c:88 builtin/submodule--helper.c:602 +#: builtin/submodule--helper.c:954 msgid "reference repository" msgstr "dipòsit de referència" -#: builtin/clone.c:85 +#: builtin/clone.c:90 msgid "use --reference only while cloning" msgstr "usa --reference només en clonar" -#: builtin/clone.c:86 builtin/column.c:26 builtin/merge-file.c:44 +#: builtin/clone.c:91 builtin/column.c:26 builtin/merge-file.c:44 msgid "name" msgstr "nom" -#: builtin/clone.c:87 +#: builtin/clone.c:92 msgid "use instead of 'origin' to track upstream" msgstr "usa en lloc de 'origin' per a seguir la font" -#: builtin/clone.c:89 +#: builtin/clone.c:94 msgid "checkout instead of the remote's HEAD" msgstr "agafa en lloc del HEAD del remot" -#: builtin/clone.c:91 +#: builtin/clone.c:96 msgid "path to git-upload-pack on the remote" msgstr "camí a git-upload-pack en el remot" -#: builtin/clone.c:92 builtin/fetch.c:118 builtin/grep.c:667 builtin/pull.c:201 +#: builtin/clone.c:97 builtin/fetch.c:120 builtin/grep.c:668 builtin/pull.c:202 msgid "depth" msgstr "profunditat" -#: builtin/clone.c:93 +#: builtin/clone.c:98 msgid "create a shallow clone of that depth" msgstr "crea un clon superficial de tal profunditat" -#: builtin/clone.c:95 +#: builtin/clone.c:99 builtin/fetch.c:122 builtin/pack-objects.c:2848 +#: parse-options.h:142 +msgid "time" +msgstr "hora" + +#: builtin/clone.c:100 +msgid "create a shallow clone since a specific time" +msgstr "crea un clon superficial des d'una hora específica" + +#: builtin/clone.c:101 builtin/fetch.c:124 +msgid "revision" +msgstr "revisió" + +#: builtin/clone.c:102 builtin/fetch.c:125 +msgid "deepen history of shallow clone by excluding rev" +msgstr "aprofundeix la història d'un clon superficial excloent una revisió" + +#: builtin/clone.c:104 msgid "clone only one branch, HEAD or --branch" msgstr "clona només una branca, HEAD o --branch" -#: builtin/clone.c:97 +#: builtin/clone.c:106 msgid "any cloned submodules will be shallow" msgstr "qualsevol submòdul clonat serà superficial" -#: builtin/clone.c:98 builtin/init-db.c:482 +#: builtin/clone.c:107 builtin/init-db.c:484 msgid "gitdir" msgstr "directori de git" -#: builtin/clone.c:99 builtin/init-db.c:483 +#: builtin/clone.c:108 builtin/init-db.c:485 msgid "separate git dir from working tree" msgstr "separa el directori de git de l'arbre de treball" -#: builtin/clone.c:100 +#: builtin/clone.c:109 msgid "key=value" msgstr "clau=valor" -#: builtin/clone.c:101 +#: builtin/clone.c:110 msgid "set config inside the new repository" msgstr "estableix la configuració dins del dipòsit nou" -#: builtin/clone.c:102 builtin/fetch.c:132 builtin/push.c:547 +#: builtin/clone.c:111 builtin/fetch.c:140 builtin/push.c:547 msgid "use IPv4 addresses only" msgstr "usa només les adreces IPv4" -#: builtin/clone.c:104 builtin/fetch.c:134 builtin/push.c:549 +#: builtin/clone.c:113 builtin/fetch.c:142 builtin/push.c:549 msgid "use IPv6 addresses only" msgstr "usa només les adreces IPv6" -#: builtin/clone.c:241 +#: builtin/clone.c:250 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -5481,58 +6074,42 @@ msgstr "" "No s'ha pogut endevinar cap nom de directori.\n" "Si us plau, especifiqueu un directori en la línia d'ordres" -#: builtin/clone.c:307 -#, 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." - -#: builtin/clone.c:309 -#, 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." - -#: builtin/clone.c:314 -#, c-format -msgid "reference repository '%s' is shallow" -msgstr "el dipòsit de referència '%s' és superficial" - -#: builtin/clone.c:317 +#: builtin/clone.c:303 #, c-format -msgid "reference repository '%s' is grafted" -msgstr "el dipòsit de referència '%s' és empeltat" +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:376 +#: builtin/clone.c:375 #, c-format msgid "failed to open '%s'" msgstr "s'ha fallat en obrir '%s'" -#: builtin/clone.c:384 +#: builtin/clone.c:383 #, c-format msgid "%s exists and is not a directory" msgstr "%s existeix i no és directori" -#: builtin/clone.c:398 +#: builtin/clone.c:397 #, c-format msgid "failed to stat %s\n" msgstr "s'ha fallat en fer stat a '%s'\n" -#: builtin/clone.c:420 +#: builtin/clone.c:419 #, c-format msgid "failed to create link '%s'" msgstr "s'ha fallat en crear l'enllaç '%s'" -#: builtin/clone.c:424 +#: builtin/clone.c:423 #, c-format msgid "failed to copy file to '%s'" msgstr "s'ha fallat en copiar el fitxer a '%s'" -#: builtin/clone.c:449 +#: builtin/clone.c:448 #, c-format msgid "done.\n" msgstr "fet.\n" -#: builtin/clone.c:461 +#: builtin/clone.c:460 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -5543,123 +6120,141 @@ msgstr "" "'git status' i tornar a intentar l'agafament amb\n" "'git checkout -f HEAD'\n" -#: builtin/clone.c:538 +#: builtin/clone.c:537 #, 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:633 +#: builtin/clone.c:632 msgid "remote did not send all necessary objects" msgstr "el remot no ha enviat tots els objectes necessaris" -#: builtin/clone.c:649 +#: builtin/clone.c:648 #, c-format msgid "unable to update %s" msgstr "no s'ha pogut actualitzar %s" -#: builtin/clone.c:698 +#: builtin/clone.c:697 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "el HEAD remot es refereix a una referència que no existeix; no s'ha pogut " "agafar.\n" -#: builtin/clone.c:729 +#: builtin/clone.c:728 msgid "unable to checkout working tree" msgstr "no s'ha pogut agafar l'arbre de treball" -#: builtin/clone.c:766 +#: builtin/clone.c:768 msgid "unable to write parameters to config file" msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració" -#: builtin/clone.c:829 +#: builtin/clone.c:831 msgid "cannot repack to clean up" msgstr "no es pot reempaquetar per a netejar" -#: builtin/clone.c:831 +#: builtin/clone.c:833 msgid "cannot unlink temporary alternates file" msgstr "no es pot desenllaçar el fitxer d'alternatives temporal" -#: builtin/clone.c:863 builtin/receive-pack.c:1855 +#: builtin/clone.c:866 builtin/receive-pack.c:1895 msgid "Too many arguments." msgstr "Hi ha massa paràmetres." -#: builtin/clone.c:867 +#: builtin/clone.c:870 msgid "You must specify a repository to clone." msgstr "Heu d'especificar un dipòsit per a clonar." -#: builtin/clone.c:878 +#: builtin/clone.c:883 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "les opcions --bare i --origin %s són incompatibles." -#: builtin/clone.c:881 +#: builtin/clone.c:886 msgid "--bare and --separate-git-dir are incompatible." msgstr "--bare i --separate-git-dir són incompatibles." -#: builtin/clone.c:894 +#: builtin/clone.c:899 #, c-format msgid "repository '%s' does not exist" msgstr "el dipòsit '%s' no existeix" -#: builtin/clone.c:900 builtin/fetch.c:1293 +#: builtin/clone.c:905 builtin/fetch.c:1338 #, c-format msgid "depth %s is not a positive number" msgstr "la profunditat %s no és nombre positiu" -#: builtin/clone.c:910 +#: builtin/clone.c:915 #, 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:920 +#: builtin/clone.c:925 #, c-format msgid "working tree '%s' already exists." msgstr "l'arbre de treball '%s' ja existeix." -#: builtin/clone.c:935 builtin/clone.c:946 builtin/submodule--helper.c:544 +#: builtin/clone.c:940 builtin/clone.c:951 builtin/submodule--helper.c:657 #: builtin/worktree.c:222 builtin/worktree.c:249 #, c-format msgid "could not create leading directories of '%s'" msgstr "no s'ha pogut crear els directoris inicials de '%s'" -#: builtin/clone.c:938 +#: builtin/clone.c:943 #, 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:956 +#: builtin/clone.c:955 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "S'està clonant al dipòsit nu '%s'...\n" -#: builtin/clone.c:958 +#: builtin/clone.c:957 #, c-format msgid "Cloning into '%s'...\n" msgstr "S'està clonant a '%s'...\n" -#: builtin/clone.c:997 +#: builtin/clone.c:963 +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:1019 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:1000 +#: builtin/clone.c:1021 +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ò." + +#: builtin/clone.c:1023 +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ò." + +#: builtin/clone.c:1026 msgid "source repository is shallow, ignoring --local" msgstr "el dipòsit font és superficial, s'està ignorant --local" -#: builtin/clone.c:1005 +#: builtin/clone.c:1031 msgid "--local is ignored" msgstr "--local s'ignora" -#: builtin/clone.c:1009 +#: builtin/clone.c:1035 #, c-format msgid "Don't know how to clone %s" msgstr "No se sap com clonar %s" -#: builtin/clone.c:1058 builtin/clone.c:1066 +#: builtin/clone.c:1090 builtin/clone.c:1098 #, 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:1069 +#: builtin/clone.c:1101 msgid "You appear to have cloned an empty repository." msgstr "Sembla que heu clonat un dipòsit buit." @@ -5801,66 +6396,66 @@ msgstr "" "Llavors \"git cherry-pick --continue\" reprendrà recollint\n" "com a cireres les comissions restants.\n" -#: builtin/commit.c:308 +#: builtin/commit.c:318 msgid "failed to unpack HEAD tree object" msgstr "s'ha fallat en desempaquetar l'objecte d'arbre HEAD" -#: builtin/commit.c:349 +#: builtin/commit.c:359 msgid "unable to create temporary index" msgstr "no s'ha pogut crear un índex temporal" -#: builtin/commit.c:355 +#: builtin/commit.c:365 msgid "interactive add failed" msgstr "l'afegiment interactiu ha fallat" -#: builtin/commit.c:368 +#: builtin/commit.c:378 msgid "unable to update temporary index" msgstr "no s'ha pogut actualitzar l'índex temporal" -#: builtin/commit.c:370 +#: builtin/commit.c:380 msgid "Failed to update main cache tree" msgstr "S'ha fallat en actualitzar l'arbre principal de memòria cau" -#: builtin/commit.c:394 builtin/commit.c:417 builtin/commit.c:466 +#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476 msgid "unable to write new_index file" msgstr "no s'ha pogut escriure el fitxer new_index" -#: builtin/commit.c:448 +#: builtin/commit.c:458 msgid "cannot do a partial commit during a merge." msgstr "no es pot fer una comissió parcial durant una fusió." -#: builtin/commit.c:450 +#: builtin/commit.c:460 msgid "cannot do a partial commit during a cherry-pick." msgstr "no es pot fer una comissió parcial durant un recull de cireres." -#: builtin/commit.c:459 +#: builtin/commit.c:469 msgid "cannot read the index" msgstr "no es pot llegir l'índex" -#: builtin/commit.c:478 +#: builtin/commit.c:488 msgid "unable to write temporary index file" msgstr "no s'ha pogut escriure un fitxer d'índex temporal" -#: builtin/commit.c:583 +#: 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:585 +#: 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:604 +#: builtin/commit.c:603 msgid "malformed --author parameter" msgstr "paràmetre --author mal format" -#: builtin/commit.c:612 +#: builtin/commit.c:611 #, c-format msgid "invalid date format: %s" msgstr "format de data no vàlid: %s" -#: builtin/commit.c:656 +#: builtin/commit.c:655 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -5868,38 +6463,38 @@ msgstr "" "no es pot seleccionar un caràcter de comentari que\n" "no sigui usat en el missatge de comissió actual" -#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1092 +#: builtin/commit.c:692 builtin/commit.c:725 builtin/commit.c:1096 #, c-format msgid "could not lookup commit %s" msgstr "no s'ha pogut trobar la comissió %s" -#: builtin/commit.c:705 builtin/shortlog.c:286 +#: builtin/commit.c:704 builtin/shortlog.c:286 #, 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:707 +#: builtin/commit.c:706 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:711 +#: builtin/commit.c:710 #, c-format msgid "could not read log file '%s'" msgstr "no s'ha pogut llegir el fitxer de registre '%s'" -#: builtin/commit.c:738 builtin/commit.c:746 +#: builtin/commit.c:737 builtin/commit.c:745 msgid "could not read SQUASH_MSG" msgstr "no s'ha pogut llegir SQUASH_MSG" -#: builtin/commit.c:743 +#: builtin/commit.c:742 msgid "could not read MERGE_MSG" msgstr "no s'ha pogut llegir MERGE_MSG" -#: builtin/commit.c:797 +#: builtin/commit.c:796 msgid "could not write commit template" msgstr "no s'ha pogut escriure la plantilla de comissió" -#: builtin/commit.c:815 +#: builtin/commit.c:814 #, c-format msgid "" "\n" @@ -5914,7 +6509,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:819 #, c-format msgid "" "\n" @@ -5929,7 +6524,7 @@ msgstr "" "\t%s\n" "i intenteu-ho de nou.\n" -#: builtin/commit.c:833 +#: builtin/commit.c:832 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5939,7 +6534,7 @@ msgstr "" "S'ignoraran les línies començant amb '%c', i un missatge de\n" "comissió buit avorta la comissió.\n" -#: builtin/commit.c:840 +#: builtin/commit.c:839 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -5950,150 +6545,154 @@ msgstr "" "Es retindran les línies començants amb '%c'; podeu eliminar-les per vós\n" "mateix si voleu. Un missatge buit avorta la comissió.\n" -#: builtin/commit.c:860 +#: builtin/commit.c:859 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutor: %.*s <%.*s>" -#: builtin/commit.c:868 +#: builtin/commit.c:867 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:875 +#: builtin/commit.c:874 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sComitent: %.*s <%.*s>" -#: builtin/commit.c:893 +#: builtin/commit.c:892 msgid "Cannot read index" msgstr "No es pot llegir l'índex" -#: builtin/commit.c:950 +#: builtin/commit.c:954 msgid "Error building trees" msgstr "Error en construir arbres" -#: builtin/commit.c:965 builtin/tag.c:266 +#: builtin/commit.c:969 builtin/tag.c:266 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Si us plau, proveïu el missatge per usar o l'opció -m o l'opció -F.\n" -#: builtin/commit.c:1067 +#: builtin/commit.c:1071 #, c-format msgid "--author '%s' is not 'Name ' and matches no existing author" msgstr "" "--author '%s' no és 'Nom ' i no coincideix amb\n" "cap autor existent" -#: builtin/commit.c:1082 builtin/commit.c:1322 +#: builtin/commit.c:1086 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Mode de fitxers no seguits no vàlid '%s'" -#: builtin/commit.c:1119 +#: builtin/commit.c:1124 msgid "--long and -z are incompatible" msgstr "--long i -z són incompatibles" -#: builtin/commit.c:1149 +#: builtin/commit.c:1154 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:1158 +#: builtin/commit.c:1163 msgid "You have nothing to amend." msgstr "No teniu res a esmenar." -#: builtin/commit.c:1161 +#: builtin/commit.c:1166 msgid "You are in the middle of a merge -- cannot amend." msgstr "Esteu enmig d'una fusió -- no es pot esmenar." -#: builtin/commit.c:1163 +#: builtin/commit.c:1168 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Esteu enmig d'un recull de cireres -- no es pot esmenar." -#: builtin/commit.c:1166 +#: builtin/commit.c:1171 msgid "Options --squash and --fixup cannot be used together" msgstr "Les opcions --squash i --fixup no es poden usar juntes" -#: builtin/commit.c:1176 +#: builtin/commit.c:1181 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:1178 +#: builtin/commit.c:1183 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup." -#: builtin/commit.c:1186 +#: builtin/commit.c:1191 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:1203 +#: builtin/commit.c:1208 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:1205 +#: builtin/commit.c:1210 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only no té sentit sense camí." -#: builtin/commit.c:1207 +#: builtin/commit.c:1212 msgid "Clever... amending the last one with dirty index." msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut." -#: builtin/commit.c:1209 +#: builtin/commit.c:1214 msgid "Explicit paths specified without -i or -o; assuming --only paths..." msgstr "" "S'han especificat camins explícits sense -i o -o; s'està presumint camins --" "only..." -#: builtin/commit.c:1221 builtin/tag.c:474 +#: builtin/commit.c:1226 builtin/tag.c:474 #, c-format msgid "Invalid cleanup mode %s" msgstr "Mode de neteja no vàlid %s" -#: builtin/commit.c:1226 +#: builtin/commit.c:1231 msgid "Paths with -a does not make sense." msgstr "-a no té sentit amb camins." -#: builtin/commit.c:1336 builtin/commit.c:1622 +#: builtin/commit.c:1341 builtin/commit.c:1617 msgid "show status concisely" msgstr "mostra l'estat concisament" -#: builtin/commit.c:1338 builtin/commit.c:1624 +#: builtin/commit.c:1343 builtin/commit.c:1619 msgid "show branch information" msgstr "mostra la informació de branca" -#: builtin/commit.c:1340 builtin/commit.c:1626 builtin/push.c:522 +#: builtin/commit.c:1345 +msgid "version" +msgstr "versió" + +#: builtin/commit.c:1345 builtin/commit.c:1621 builtin/push.c:522 #: builtin/worktree.c:440 msgid "machine-readable output" msgstr "sortida llegible per màquina" -#: builtin/commit.c:1343 builtin/commit.c:1628 +#: builtin/commit.c:1348 builtin/commit.c:1623 msgid "show status in long format (default)" msgstr "mostra l'estat en format llarg (per defecte)" -#: builtin/commit.c:1346 builtin/commit.c:1631 +#: builtin/commit.c:1351 builtin/commit.c:1626 msgid "terminate entries with NUL" msgstr "acaba les entrades amb NUL" -#: builtin/commit.c:1348 builtin/commit.c:1634 builtin/fast-export.c:981 +#: builtin/commit.c:1353 builtin/commit.c:1629 builtin/fast-export.c:981 #: builtin/fast-export.c:984 builtin/tag.c:353 msgid "mode" msgstr "mode" -#: builtin/commit.c:1349 builtin/commit.c:1634 +#: builtin/commit.c:1354 builtin/commit.c:1629 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per " "defecte: all)" -#: builtin/commit.c:1352 +#: builtin/commit.c:1357 msgid "show ignored files" msgstr "mostra els fitxers ignorats" -#: builtin/commit.c:1353 parse-options.h:155 +#: builtin/commit.c:1358 parse-options.h:155 msgid "when" msgstr "quan" -#: builtin/commit.c:1354 +#: builtin/commit.c:1359 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -6101,202 +6700,202 @@ msgstr "" "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per " "defecte: all)" -#: builtin/commit.c:1356 +#: builtin/commit.c:1361 msgid "list untracked files in columns" msgstr "mostra els fitxers no seguits en columnes" -#: builtin/commit.c:1442 +#: builtin/commit.c:1437 msgid "couldn't look up newly created commit" msgstr "no s'ha pogut trobar la comissió novament creada" -#: builtin/commit.c:1444 +#: builtin/commit.c:1439 msgid "could not parse newly created commit" msgstr "no s'ha pogut analitzar la comissió novament creada" -#: builtin/commit.c:1489 +#: builtin/commit.c:1484 msgid "detached HEAD" msgstr "HEAD separat" -#: builtin/commit.c:1492 +#: builtin/commit.c:1487 msgid " (root-commit)" msgstr " (comissió d'arrel)" -#: builtin/commit.c:1592 +#: builtin/commit.c:1587 msgid "suppress summary after successful commit" msgstr "omet el resum després d'una comissió reeixida" -#: builtin/commit.c:1593 +#: builtin/commit.c:1588 msgid "show diff in commit message template" msgstr "mostra la diferència en la plantilla de missatge de comissió" -#: builtin/commit.c:1595 +#: builtin/commit.c:1590 msgid "Commit message options" msgstr "Opcions de missatge de comissió" -#: builtin/commit.c:1596 builtin/tag.c:351 +#: builtin/commit.c:1591 builtin/tag.c:351 msgid "read message from file" msgstr "llegiu el missatge des d'un fitxer" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "author" msgstr "autor" -#: builtin/commit.c:1597 +#: builtin/commit.c:1592 msgid "override author for commit" msgstr "autor corregit de la comissió" -#: builtin/commit.c:1598 builtin/gc.c:326 +#: builtin/commit.c:1593 builtin/gc.c:326 msgid "date" msgstr "data" -#: builtin/commit.c:1598 +#: builtin/commit.c:1593 msgid "override date for commit" msgstr "data corregida de la comissió" -#: builtin/commit.c:1599 builtin/merge.c:220 builtin/notes.c:396 -#: builtin/notes.c:559 builtin/tag.c:349 +#: builtin/commit.c:1594 builtin/merge.c:220 builtin/notes.c:398 +#: builtin/notes.c:561 builtin/tag.c:349 msgid "message" msgstr "missatge" -#: builtin/commit.c:1599 +#: builtin/commit.c:1594 msgid "commit message" msgstr "missatge de comissió" -#: builtin/commit.c:1600 builtin/commit.c:1601 builtin/commit.c:1602 -#: builtin/commit.c:1603 parse-options.h:256 ref-filter.h:79 +#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597 +#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:79 msgid "commit" msgstr "comissió" -#: builtin/commit.c:1600 +#: builtin/commit.c:1595 msgid "reuse and edit message from specified commit" msgstr "reusa i edita el missatge de la comissió especificada" -#: builtin/commit.c:1601 +#: builtin/commit.c:1596 msgid "reuse message from specified commit" msgstr "reusa el missatge de la comissió especificada" -#: builtin/commit.c:1602 +#: builtin/commit.c:1597 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a arreglar la comissió " "especificada" -#: builtin/commit.c:1603 +#: builtin/commit.c:1598 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa el missatge formatat d'aixafada automàtica per a aixafar la comissió " "especificada" -#: builtin/commit.c:1604 +#: builtin/commit.c:1599 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)" -#: builtin/commit.c:1605 builtin/log.c:1409 builtin/revert.c:86 +#: builtin/commit.c:1600 builtin/log.c:1413 builtin/revert.c:86 msgid "add Signed-off-by:" msgstr "afegeix Signed-off-by:" -#: builtin/commit.c:1606 +#: builtin/commit.c:1601 msgid "use specified template file" msgstr "usa el fitxer de plantilla especificat" -#: builtin/commit.c:1607 +#: builtin/commit.c:1602 msgid "force edit of commit" msgstr "força l'edició de la comissió" -#: builtin/commit.c:1608 +#: builtin/commit.c:1603 msgid "default" msgstr "per defecte" -#: builtin/commit.c:1608 builtin/tag.c:354 +#: builtin/commit.c:1603 builtin/tag.c:354 msgid "how to strip spaces and #comments from message" msgstr "com despullar els espais i #comentaris del missatge" -#: builtin/commit.c:1609 +#: builtin/commit.c:1604 msgid "include status in commit message template" msgstr "inclou l'estat en la plantilla de missatge de comissió" -#: builtin/commit.c:1611 builtin/merge.c:230 builtin/pull.c:165 +#: builtin/commit.c:1606 builtin/merge.c:230 builtin/pull.c:166 #: builtin/revert.c:93 msgid "GPG sign commit" msgstr "signa la comissió amb GPG" -#: builtin/commit.c:1614 +#: builtin/commit.c:1609 msgid "Commit contents options" msgstr "Opcions dels continguts de les comissions" -#: builtin/commit.c:1615 +#: builtin/commit.c:1610 msgid "commit all changed files" msgstr "comet tots els fitxers canviats" -#: builtin/commit.c:1616 +#: builtin/commit.c:1611 msgid "add specified files to index for commit" msgstr "afegeix els fitxers especificats a l'índex per a cometre" -#: builtin/commit.c:1617 +#: builtin/commit.c:1612 msgid "interactively add files" msgstr "afegeix els fitxers interactivament" -#: builtin/commit.c:1618 +#: builtin/commit.c:1613 msgid "interactively add changes" msgstr "afegeix els canvis interactivament" -#: builtin/commit.c:1619 +#: builtin/commit.c:1614 msgid "commit only specified files" msgstr "comet només els fitxers especificats" -#: builtin/commit.c:1620 +#: builtin/commit.c:1615 msgid "bypass pre-commit and commit-msg hooks" msgstr "evita els ganxos de precomissió i missatge de comissió" -#: builtin/commit.c:1621 +#: builtin/commit.c:1616 msgid "show what would be committed" msgstr "mostra què es cometria" -#: builtin/commit.c:1632 +#: builtin/commit.c:1627 msgid "amend previous commit" msgstr "esmena la comissió anterior" -#: builtin/commit.c:1633 +#: builtin/commit.c:1628 msgid "bypass post-rewrite hook" msgstr "evita el ganxo de postreescriure" -#: builtin/commit.c:1638 +#: builtin/commit.c:1633 msgid "ok to record an empty change" msgstr "està bé registrar un canvi buit" -#: builtin/commit.c:1640 +#: builtin/commit.c:1635 msgid "ok to record a change with an empty message" msgstr "està bé registrar un canvi amb missatge buit" -#: builtin/commit.c:1669 +#: builtin/commit.c:1664 msgid "could not parse HEAD commit" msgstr "no s'ha pogut analitzar la comissió HEAD" -#: builtin/commit.c:1719 +#: builtin/commit.c:1712 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Fitxer MERGE_HEAD malmès (%s)" -#: builtin/commit.c:1726 +#: builtin/commit.c:1719 msgid "could not read MERGE_MODE" msgstr "no s'ha pogut llegir MERGE_MODE" -#: builtin/commit.c:1745 +#: builtin/commit.c:1738 #, c-format msgid "could not read commit message: %s" msgstr "no s'ha pogut llegir el missatge de comissió: %s" -#: builtin/commit.c:1756 +#: builtin/commit.c:1749 #, 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:1761 +#: builtin/commit.c:1754 #, 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:1809 +#: builtin/commit.c:1802 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -6466,17 +7065,26 @@ msgstr "" msgid "cannot create configuration file %s" msgstr "no es pot crear el fitxer de configuració '%s'" -#: builtin/count-objects.c:77 +#: builtin/config.c:625 +#, c-format +msgid "" +"cannot overwrite multiple values with a single value\n" +" Use a regexp, --add or --replace-all to change %s." +msgstr "" +"no es pot sobreescriure múltiples valors amb un sol valor\n" +" Useu una expresió regular, --add o --replace-all per a canviar %s." + +#: builtin/count-objects.c:86 msgid "git count-objects [-v] [-H | --human-readable]" msgstr "git count-objects [-v] [-H | --human-readable]" -#: builtin/count-objects.c:87 +#: builtin/count-objects.c:96 msgid "print sizes in human readable format" msgstr "imprimeix les mides en un format llegible pels humans" #: builtin/describe.c:17 msgid "git describe [] [...]" -msgstr "git describe [opcions] [...]" +msgstr "git describe [] [...]" #: builtin/describe.c:18 msgid "git describe [] --dirty" @@ -6590,7 +7198,7 @@ msgstr "considera les etiquetes més recents (per defecte: 10)" msgid "only consider tags matching " msgstr "només considera les etiquetes que coincideixen amb " -#: builtin/describe.c:410 builtin/name-rev.c:321 +#: builtin/describe.c:410 builtin/name-rev.c:320 msgid "show abbreviated commit object as fallback" msgstr "mostra l'objecte de comissió abreviat com a retrocediment" @@ -6624,21 +7232,21 @@ msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic" msgid "invalid option: %s" msgstr "opció no vàlida: %s" -#: builtin/diff.c:360 +#: builtin/diff.c:361 msgid "Not a git repository" msgstr "No és un dipòsit de git" -#: builtin/diff.c:403 +#: builtin/diff.c:404 #, c-format msgid "invalid object '%s' given." msgstr "s'ha donat un objecte no vàlid '%s'." -#: builtin/diff.c:412 +#: builtin/diff.c:413 #, c-format msgid "more than two blobs given: '%s'" msgstr "s'ha donat més de dos blobs: '%s" -#: builtin/diff.c:419 +#: builtin/diff.c:420 #, c-format msgid "unhandled object '%s' given." msgstr "s'ha donat l'objecte no gestionat '%s'." @@ -6711,162 +7319,166 @@ msgstr "git fetch --multiple [] [( | )...]" msgid "git fetch --all []" msgstr "git fetch --all []" -#: builtin/fetch.c:93 builtin/pull.c:174 +#: builtin/fetch.c:95 builtin/pull.c:175 msgid "fetch from all remotes" msgstr "obtén de tots els remots" -#: builtin/fetch.c:95 builtin/pull.c:177 +#: builtin/fetch.c:97 builtin/pull.c:178 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure" -#: builtin/fetch.c:97 builtin/pull.c:180 +#: builtin/fetch.c:99 builtin/pull.c:181 msgid "path to upload pack on remote end" msgstr "camí al qual pujar el paquet al costat remot" -#: builtin/fetch.c:98 builtin/pull.c:182 +#: builtin/fetch.c:100 builtin/pull.c:183 msgid "force overwrite of local branch" msgstr "força la sobreescriptura de la branca local" -#: builtin/fetch.c:100 +#: builtin/fetch.c:102 msgid "fetch from multiple remotes" msgstr "obtén de múltiples remots" -#: builtin/fetch.c:102 builtin/pull.c:184 +#: builtin/fetch.c:104 builtin/pull.c:185 msgid "fetch all tags and associated objects" msgstr "obtén totes les etiquetes i tots els objectes associats" -#: builtin/fetch.c:104 +#: builtin/fetch.c:106 msgid "do not fetch all tags (--no-tags)" msgstr "no obtinguis les etiquetes (--no-tags)" -#: builtin/fetch.c:106 +#: builtin/fetch.c:108 msgid "number of submodules fetched in parallel" msgstr "nombre de submòduls obtinguts en paral·lel" -#: builtin/fetch.c:108 builtin/pull.c:187 +#: builtin/fetch.c:110 builtin/pull.c:188 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:109 builtin/pull.c:190 +#: builtin/fetch.c:111 builtin/pull.c:191 msgid "on-demand" msgstr "sota demanda" -#: builtin/fetch.c:110 builtin/pull.c:191 +#: builtin/fetch.c:112 builtin/pull.c:192 msgid "control recursive fetching of submodules" msgstr "controla l'obtenció recursiva de submòduls" -#: builtin/fetch.c:114 builtin/pull.c:199 +#: builtin/fetch.c:116 builtin/pull.c:200 msgid "keep downloaded pack" msgstr "retén el paquet baixat" -#: builtin/fetch.c:116 +#: builtin/fetch.c:118 msgid "allow updating of HEAD ref" msgstr "permet l'actualització de la referència HEAD" -#: builtin/fetch.c:119 builtin/pull.c:202 +#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203 msgid "deepen history of shallow clone" msgstr "aprofundeix la història d'un clon superficial" -#: builtin/fetch.c:121 builtin/pull.c:205 +#: builtin/fetch.c:123 +msgid "deepen history of shallow repository based on time" +msgstr "aprofundeix la història d'un clon superficial basat en temps" + +#: builtin/fetch.c:129 builtin/pull.c:206 msgid "convert to a complete repository" msgstr "converteix en un dipòsit complet" -#: builtin/fetch.c:123 builtin/log.c:1426 +#: builtin/fetch.c:131 builtin/log.c:1433 msgid "dir" msgstr "directori" -#: builtin/fetch.c:124 +#: builtin/fetch.c:132 msgid "prepend this to submodule path output" msgstr "anteposa això a la sortida de camí del submòdul" -#: builtin/fetch.c:127 +#: builtin/fetch.c:135 msgid "default mode for recursion" msgstr "mode de recursivitat per defecte" -#: builtin/fetch.c:129 builtin/pull.c:208 +#: builtin/fetch.c:137 builtin/pull.c:209 msgid "accept refs that update .git/shallow" msgstr "accepta les referències que actualitzin .git/shallow" -#: builtin/fetch.c:130 builtin/pull.c:210 +#: builtin/fetch.c:138 builtin/pull.c:211 msgid "refmap" msgstr "mapa de referències" -#: builtin/fetch.c:131 builtin/pull.c:211 +#: builtin/fetch.c:139 builtin/pull.c:212 msgid "specify fetch refmap" msgstr "mostra el mapa de referències d'obtenció" -#: builtin/fetch.c:387 +#: builtin/fetch.c:398 msgid "Couldn't find remote ref HEAD" msgstr "No s'ha pogut trobar la referència HEAD remota" -#: builtin/fetch.c:503 +#: builtin/fetch.c:514 #, 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:592 +#: builtin/fetch.c:607 #, c-format msgid "object %s not found" msgstr "objecte %s no trobat" -#: builtin/fetch.c:596 +#: builtin/fetch.c:611 msgid "[up to date]" msgstr "[al dia]" -#: builtin/fetch.c:609 builtin/fetch.c:689 +#: builtin/fetch.c:624 builtin/fetch.c:704 msgid "[rejected]" msgstr "[rebutjat]" -#: builtin/fetch.c:610 +#: builtin/fetch.c:625 msgid "can't fetch in current branch" msgstr "no es pot obtenir en la branca actual" -#: builtin/fetch.c:619 +#: builtin/fetch.c:634 msgid "[tag update]" msgstr "[actualització d'etiqueta]" -#: builtin/fetch.c:620 builtin/fetch.c:653 builtin/fetch.c:669 -#: builtin/fetch.c:684 +#: builtin/fetch.c:635 builtin/fetch.c:668 builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "unable to update local ref" msgstr "no s'ha pogut actualitzar la referència local" -#: builtin/fetch.c:639 +#: builtin/fetch.c:654 msgid "[new tag]" msgstr "[etiqueta nova]" -#: builtin/fetch.c:642 +#: builtin/fetch.c:657 msgid "[new branch]" msgstr "[branca nova]" -#: builtin/fetch.c:645 +#: builtin/fetch.c:660 msgid "[new ref]" msgstr "[referència nova]" -#: builtin/fetch.c:684 +#: builtin/fetch.c:699 msgid "forced update" msgstr "actualització forçada" -#: builtin/fetch.c:689 +#: builtin/fetch.c:704 msgid "non-fast-forward" msgstr "sense avanç ràpid" -#: builtin/fetch.c:733 +#: builtin/fetch.c:749 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s no ha enviat tots els objectes necessaris\n" -#: builtin/fetch.c:753 +#: builtin/fetch.c:769 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "" "rebutja %s perquè no es permet que les arrels superficials s'actualitzin" -#: builtin/fetch.c:839 builtin/fetch.c:934 +#: builtin/fetch.c:856 builtin/fetch.c:952 #, c-format msgid "From %.*s\n" msgstr "De %.*s\n" -#: builtin/fetch.c:850 +#: builtin/fetch.c:867 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -6876,55 +7488,55 @@ msgstr "" " intenteu executar 'git remote prune %s' per a eliminar\n" " qualsevulla branca antiga o conflictiva" -#: builtin/fetch.c:904 +#: builtin/fetch.c:922 #, c-format msgid " (%s will become dangling)" msgstr " (%s es tornarà penjant)" -#: builtin/fetch.c:905 +#: builtin/fetch.c:923 #, c-format msgid " (%s has become dangling)" msgstr " (%s s'ha tornat penjant)" -#: builtin/fetch.c:937 +#: builtin/fetch.c:955 msgid "[deleted]" msgstr "[suprimit]" -#: builtin/fetch.c:938 builtin/remote.c:1020 +#: builtin/fetch.c:956 builtin/remote.c:1020 msgid "(none)" msgstr "(cap)" -#: builtin/fetch.c:960 +#: builtin/fetch.c:979 #, 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:979 +#: builtin/fetch.c:998 #, 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:982 +#: builtin/fetch.c:1001 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "S'ignora l'opció \"%s\" per a %s\n" -#: builtin/fetch.c:1039 +#: builtin/fetch.c:1077 #, c-format msgid "Don't know how to fetch from %s" msgstr "No se sap com obtenir de %s" -#: builtin/fetch.c:1199 +#: builtin/fetch.c:1237 #, c-format msgid "Fetching %s\n" msgstr "S'està obtenint %s\n" -#: builtin/fetch.c:1201 builtin/remote.c:96 +#: builtin/fetch.c:1239 builtin/remote.c:96 #, c-format msgid "Could not fetch %s" msgstr "No s'ha pogut obtenir %s" -#: builtin/fetch.c:1219 +#: builtin/fetch.c:1257 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -6932,32 +7544,40 @@ msgstr "" "Cap dipòsit remot especificat. Si us plau, especifiqueu o un URL o\n" "un nom remot del qual es deuen obtenir les revisions noves." -#: builtin/fetch.c:1242 +#: builtin/fetch.c:1280 msgid "You need to specify a tag name." msgstr "Necessiteu especificar un nom d'etiqueta." -#: builtin/fetch.c:1284 +#: builtin/fetch.c:1322 +msgid "Negative depth in --deepen is not supported" +msgstr "No s'admet una profunditat negativa en --deepen" + +#: builtin/fetch.c:1324 +msgid "--deepen and --depth are mutually exclusive" +msgstr "--deepen i --depth són mutualment exclusius" + +#: builtin/fetch.c:1329 msgid "--depth and --unshallow cannot be used together" msgstr "--depth i --unshallow no es poden usar junts" -#: builtin/fetch.c:1286 +#: builtin/fetch.c:1331 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow en un dipòsit complet no té sentit" -#: builtin/fetch.c:1306 +#: builtin/fetch.c:1353 msgid "fetch --all does not take a repository argument" msgstr "fetch --all no accepta un paràmetre de dipòsit" -#: builtin/fetch.c:1308 +#: builtin/fetch.c:1355 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all no té sentit amb especificacions de referència" -#: builtin/fetch.c:1319 +#: builtin/fetch.c:1366 #, c-format msgid "No such remote or remote group: %s" msgstr "No hi ha tal remot ni tal grup remot: %s" -#: builtin/fetch.c:1327 +#: builtin/fetch.c:1374 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Obtenir un grup i especificar referències no té sentit" @@ -6967,23 +7587,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m ] [--log[=] | --no-log] [--file ]" -#: builtin/fmt-merge-msg.c:667 +#: builtin/fmt-merge-msg.c:663 msgid "populate log with at most entries from shortlog" msgstr "emplena el registre amb entrades del registre curt com a màxim" -#: builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:666 msgid "alias for --log (deprecated)" msgstr "àlies per --log (desaprovat)" -#: builtin/fmt-merge-msg.c:673 +#: builtin/fmt-merge-msg.c:669 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:674 +#: builtin/fmt-merge-msg.c:670 msgid "use as start of message" msgstr "usa com a inici de missatge" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:671 msgid "file to read from" msgstr "fitxer del qual llegir" @@ -7101,7 +7721,7 @@ msgstr "mostra el progrés" msgid "show verbose names for reachable objects" msgstr "mostra els noms detallats dels objectes abastables" -#: builtin/fsck.c:671 +#: builtin/fsck.c:665 msgid "Checking objects" msgstr "S'estan comprovant els objectes" @@ -7195,228 +7815,223 @@ msgstr "grep: s'ha fallat en crear fil: %s" msgid "invalid number of threads specified (%d) for %s" msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s" -#: builtin/grep.c:452 builtin/grep.c:487 +#: builtin/grep.c:453 builtin/grep.c:488 #, c-format msgid "unable to read tree (%s)" msgstr "no s'ha pogut llegir l'arbre (%s)" -#: builtin/grep.c:502 +#: builtin/grep.c:503 #, 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:560 +#: builtin/grep.c:561 #, c-format msgid "switch `%c' expects a numerical value" msgstr "l'opció `%c' espera un valor numèric" -#: builtin/grep.c:577 -#, c-format -msgid "cannot open '%s'" -msgstr "no es pot obrir '%s'" - -#: builtin/grep.c:646 +#: builtin/grep.c:647 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:648 +#: builtin/grep.c:649 msgid "find in contents not managed by git" msgstr "cerca en continguts no gestionats per git" -#: builtin/grep.c:650 +#: builtin/grep.c:651 msgid "search in both tracked and untracked files" msgstr "cerca tant en fitxers seguits com en no seguits" -#: builtin/grep.c:652 +#: builtin/grep.c:653 msgid "ignore files specified via '.gitignore'" msgstr "ignora els fitxers especificats mitjançant '.gitignore'" -#: builtin/grep.c:655 +#: builtin/grep.c:656 msgid "show non-matching lines" msgstr "mostra les línies no coincidents" -#: builtin/grep.c:657 +#: builtin/grep.c:658 msgid "case insensitive matching" msgstr "coincidència insensible a majúscula i minúscula" -#: builtin/grep.c:659 +#: builtin/grep.c:660 msgid "match patterns only at word boundaries" msgstr "coincideix amb els patrons només als límits de paraula" -#: builtin/grep.c:661 +#: builtin/grep.c:662 msgid "process binary files as text" msgstr "processa els fitxers binaris com a text" -#: builtin/grep.c:663 +#: builtin/grep.c:664 msgid "don't match patterns in binary files" msgstr "no coincideixis amb els patrons en els fitxers binaris" -#: builtin/grep.c:666 +#: builtin/grep.c:667 msgid "process binary files with textconv filters" msgstr "processa els fitxers binaris amb filtres de textconv" -#: builtin/grep.c:668 +#: builtin/grep.c:669 msgid "descend at most levels" msgstr "descendeix com a màxim nivells" -#: builtin/grep.c:672 +#: builtin/grep.c:673 msgid "use extended POSIX regular expressions" msgstr "usa les expressions regulars POSIX esteses" -#: builtin/grep.c:675 +#: builtin/grep.c:676 msgid "use basic POSIX regular expressions (default)" msgstr "usa les expressions regulars POSIX bàsiques (per defecte)" -#: builtin/grep.c:678 +#: builtin/grep.c:679 msgid "interpret patterns as fixed strings" msgstr "interpreta els patrons com a cadenes fixes" -#: builtin/grep.c:681 +#: builtin/grep.c:682 msgid "use Perl-compatible regular expressions" msgstr "usa les expressions regulars compatibles amb Perl" -#: builtin/grep.c:684 +#: builtin/grep.c:685 msgid "show line numbers" msgstr "mostra els números de línia" -#: builtin/grep.c:685 +#: builtin/grep.c:686 msgid "don't show filenames" msgstr "no mostris els noms de fitxer" -#: builtin/grep.c:686 +#: builtin/grep.c:687 msgid "show filenames" msgstr "mostra els noms de fitxer" -#: builtin/grep.c:688 +#: builtin/grep.c:689 msgid "show filenames relative to top directory" msgstr "mostra els noms de fitxer relatius al directori superior" -#: builtin/grep.c:690 +#: builtin/grep.c:691 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:692 +#: builtin/grep.c:693 msgid "synonym for --files-with-matches" msgstr "sinònim de --files-with-matches" -#: builtin/grep.c:695 +#: builtin/grep.c:696 msgid "show only the names of files without match" msgstr "mostra només els noms dels fitxers sense coincidència" -#: builtin/grep.c:697 +#: builtin/grep.c:698 msgid "print NUL after filenames" msgstr "imprimeix NUL després dels noms de fitxer" -#: builtin/grep.c:699 +#: builtin/grep.c:700 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:700 +#: builtin/grep.c:701 msgid "highlight matches" msgstr "ressalta les coincidències" -#: builtin/grep.c:702 +#: builtin/grep.c:703 msgid "print empty line between matches from different files" msgstr "imprimeix una línia buida entre coincidències de fitxers distints" -#: builtin/grep.c:704 +#: builtin/grep.c:705 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" -#: builtin/grep.c:707 +#: builtin/grep.c:708 msgid "show context lines before and after matches" msgstr "mostra línies de context abans i després d'una coincidència" -#: builtin/grep.c:710 +#: builtin/grep.c:711 msgid "show context lines before matches" msgstr "mostra línies de context abans d'una coincidència" -#: builtin/grep.c:712 +#: builtin/grep.c:713 msgid "show context lines after matches" msgstr "mostra línies de context després d'una coincidència" -#: builtin/grep.c:714 +#: builtin/grep.c:715 msgid "use worker threads" msgstr "usa fils obrers" -#: builtin/grep.c:715 +#: builtin/grep.c:716 msgid "shortcut for -C NUM" msgstr "drecera per -C NUM" -#: builtin/grep.c:718 +#: builtin/grep.c:719 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:720 +#: builtin/grep.c:721 msgid "show the surrounding function" msgstr "mostra la funció circumdant" -#: builtin/grep.c:723 +#: builtin/grep.c:724 msgid "read patterns from file" msgstr "llegeix els patrons des d'un fitxer" -#: builtin/grep.c:725 +#: builtin/grep.c:726 msgid "match " msgstr "coincideix amb " -#: builtin/grep.c:727 +#: builtin/grep.c:728 msgid "combine patterns specified with -e" msgstr "combina els patrons especificats amb -e" -#: builtin/grep.c:739 +#: builtin/grep.c:740 msgid "indicate hit with exit status without output" msgstr "indica coincidència amb estat de sortida sense sortida textual" -#: builtin/grep.c:741 +#: builtin/grep.c:742 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" -#: builtin/grep.c:743 +#: builtin/grep.c:744 msgid "show parse tree for grep expression" msgstr "mostra l'arbre d'anàlisis de l'expressió de grep" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "pager" msgstr "paginador" -#: builtin/grep.c:747 +#: builtin/grep.c:748 msgid "show matching files in the pager" msgstr "mostra els fitxers coincidents en el paginador" -#: builtin/grep.c:750 +#: builtin/grep.c:751 msgid "allow calling of grep(1) (ignored by this build)" msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)" -#: builtin/grep.c:813 +#: builtin/grep.c:814 msgid "no pattern given." msgstr "cap patró donat." -#: builtin/grep.c:845 builtin/index-pack.c:1479 +#: builtin/grep.c:846 builtin/index-pack.c:1480 #, c-format msgid "invalid number of threads specified (%d)" msgstr "s'ha especificat un nombre de fils no vàlid (%d)" -#: builtin/grep.c:875 +#: builtin/grep.c:876 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:901 +#: builtin/grep.c:902 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached o --untracked no es pot usar amb --no-index." -#: builtin/grep.c:906 +#: builtin/grep.c:907 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index o --untracked no es pot usar amb revisions." -#: builtin/grep.c:909 +#: builtin/grep.c:910 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:917 +#: builtin/grep.c:918 msgid "both --cached and trees are given." msgstr "s'han donat ambdós --caches i arbres." @@ -7432,85 +8047,89 @@ msgstr "" msgid "git hash-object --stdin-paths" msgstr "git hash-object --stdin-paths" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "type" msgstr "tipus" -#: builtin/hash-object.c:93 +#: builtin/hash-object.c:94 msgid "object type" msgstr "tipus d'objecte" -#: builtin/hash-object.c:94 +#: builtin/hash-object.c:95 msgid "write the object into the object database" msgstr "escriu l'objecte a la base de dades d'objectes" -#: builtin/hash-object.c:96 +#: builtin/hash-object.c:97 msgid "read the object from stdin" msgstr "llegeix l'objecte des d'stdin" -#: builtin/hash-object.c:98 +#: builtin/hash-object.c:99 msgid "store file as is without filters" msgstr "emmagatzema el fitxer tal com és sense filtres" -#: builtin/hash-object.c:99 +#: builtin/hash-object.c:100 msgid "" "just hash any random garbage to create corrupt objects for debugging Git" msgstr "" "només suma qualsevulla brossa aleatòria per a crear objectes malmesos per a " "depurar al Git" -#: builtin/hash-object.c:100 +#: builtin/hash-object.c:101 msgid "process file as it were from this path" msgstr "processa el fitxer com si fos d'aquest camí" -#: builtin/help.c:41 +#: builtin/help.c:42 msgid "print all available commands" msgstr "imprimeix totes les ordres disponibles" -#: builtin/help.c:42 +#: builtin/help.c:43 +msgid "exclude guides" +msgstr "exclou guíes" + +#: builtin/help.c:44 msgid "print list of useful guides" msgstr "imprimeix la llista de guies útils" -#: builtin/help.c:43 +#: builtin/help.c:45 msgid "show man page" msgstr "mostra la pàgina de manual" -#: builtin/help.c:44 +#: builtin/help.c:46 msgid "show manual in web browser" msgstr "mostra la pàgina de manual en el navegador web" -#: builtin/help.c:46 +#: builtin/help.c:48 msgid "show info page" msgstr "mostra la pàgina d'informació" -#: builtin/help.c:52 +#: builtin/help.c:54 msgid "git help [--all] [--guides] [--man | --web | --info] []" msgstr "git help [--all] [--guides] [--man | --web | --info] []" -#: builtin/help.c:64 +#: builtin/help.c:66 #, c-format msgid "unrecognized help format '%s'" msgstr "format d'ajuda no reconegut '%s'" -#: builtin/help.c:91 +#: builtin/help.c:93 msgid "Failed to start emacsclient." msgstr "S'ha fallat en iniciar emacsclient." -#: builtin/help.c:104 +#: builtin/help.c:106 msgid "Failed to parse emacsclient version." msgstr "S'ha fallat en analitzar la versió d'emacsclient." -#: builtin/help.c:112 +#: builtin/help.c:114 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "la versió d'emacsclient '%d' és massa vella (< 22)." -#: builtin/help.c:130 builtin/help.c:151 builtin/help.c:160 builtin/help.c:168 +#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170 #, c-format msgid "failed to exec '%s'" msgstr "s'ha fallat en executar '%s'" -#: builtin/help.c:205 +#: builtin/help.c:207 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -7519,7 +8138,7 @@ msgstr "" "'%s': camí a un visualitzador de manuals no compatible.\n" "Si us plau, considereu usar 'man..cmd' en lloc d'això." -#: builtin/help.c:217 +#: builtin/help.c:219 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -7528,155 +8147,159 @@ msgstr "" "'%s': ordre per a un visualitzador de manuals compatible.\n" "Si us plau, considereu usar 'man..path' en lloc d'això." -#: builtin/help.c:334 +#: builtin/help.c:336 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': visualitzador de manuals desconegut." -#: builtin/help.c:351 +#: builtin/help.c:353 msgid "no man viewer handled the request" msgstr "cap visualitzador de manuals ha gestionat la sol·licitud" -#: builtin/help.c:359 +#: builtin/help.c:361 msgid "no info viewer handled the request" msgstr "cap visualitzador d'informació ha gestionat la sol·licitud" -#: builtin/help.c:401 +#: builtin/help.c:403 msgid "Defining attributes per path" msgstr "La definició d'atributs per camí" -#: builtin/help.c:402 +#: builtin/help.c:404 msgid "Everyday Git With 20 Commands Or So" msgstr "Git quotidià amb més o menys 20 ordres" -#: builtin/help.c:403 +#: builtin/help.c:405 msgid "A Git glossary" msgstr "Un glossari de Git" -#: builtin/help.c:404 +#: builtin/help.c:406 msgid "Specifies intentionally untracked files to ignore" msgstr "Especifica els fitxers intencionalment no seguits a ignorar" -#: builtin/help.c:405 +#: builtin/help.c:407 msgid "Defining submodule properties" msgstr "La definició de les propietats de submòduls" -#: builtin/help.c:406 +#: builtin/help.c:408 msgid "Specifying revisions and ranges for Git" msgstr "L'especificació de revisions i rangs per al Git" -#: builtin/help.c:407 +#: builtin/help.c:409 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)" msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nou)" -#: builtin/help.c:408 +#: builtin/help.c:410 msgid "An overview of recommended workflows with Git" msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git" -#: builtin/help.c:420 +#: builtin/help.c:422 msgid "The common Git guides are:\n" msgstr "Les guies de Git comunes són:\n" -#: builtin/help.c:441 builtin/help.c:458 -#, c-format -msgid "usage: %s%s" -msgstr "ús: %s%s" - -#: builtin/help.c:474 +#: builtin/help.c:440 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' és un àlies de `%s'" -#: builtin/index-pack.c:153 +#: builtin/help.c:462 builtin/help.c:479 +#, c-format +msgid "usage: %s%s" +msgstr "ús: %s%s" + +#: builtin/index-pack.c:154 #, c-format msgid "unable to open %s" msgstr "no s'ha pogut obrir %s" -#: builtin/index-pack.c:203 +#: builtin/index-pack.c:204 #, c-format msgid "object type mismatch at %s" msgstr "hi ha una discordança de tipus d'objecte a %s" -#: builtin/index-pack.c:223 +#: builtin/index-pack.c:224 #, c-format msgid "did not receive expected object %s" msgstr "no s'ha rebut l'objecte esperat %s" -#: builtin/index-pack.c:226 +#: builtin/index-pack.c:227 #, c-format msgid "object %s: expected type %s, found %s" msgstr "objecte %s: tipus %s esperat, %s trobat" -#: builtin/index-pack.c:268 +#: builtin/index-pack.c:269 #, 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:278 +#: builtin/index-pack.c:279 msgid "early EOF" msgstr "EOF prematur" -#: builtin/index-pack.c:279 +#: builtin/index-pack.c:280 msgid "read error on input" msgstr "error de lectura d'entrada" -#: builtin/index-pack.c:291 +#: builtin/index-pack.c:292 msgid "used more bytes than were available" msgstr "s'han usat més octets que hi havia disponibles" -#: builtin/index-pack.c:298 +#: builtin/index-pack.c:299 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:314 +#: builtin/index-pack.c:302 builtin/unpack-objects.c:92 +msgid "pack exceeds maximum allowed size" +msgstr "el paquet supera la mida màxima permesa" + +#: builtin/index-pack.c:317 #, c-format msgid "unable to create '%s'" -msgstr "no es pot crear '%s'" +msgstr "no s'ha pogut crear '%s'" -#: builtin/index-pack.c:319 +#: builtin/index-pack.c:322 #, c-format msgid "cannot open packfile '%s'" msgstr "no es pot obrir el fitxer de paquet '%s'" -#: builtin/index-pack.c:333 +#: builtin/index-pack.c:336 msgid "pack signature mismatch" msgstr "hi ha una discordança de signatura de paquet" -#: builtin/index-pack.c:335 +#: builtin/index-pack.c:338 #, c-format msgid "pack version % unsupported" msgstr "la versió de paquet % no és compatible" -#: builtin/index-pack.c:353 +#: builtin/index-pack.c:356 #, c-format msgid "pack has bad object at offset %: %s" msgstr "el paquet té un objecte dolent a la posició %: %s" -#: builtin/index-pack.c:475 +#: builtin/index-pack.c:478 #, c-format msgid "inflate returned %d" msgstr "la inflació ha retornat %d" -#: builtin/index-pack.c:524 +#: builtin/index-pack.c:527 msgid "offset value overflow for delta base object" msgstr "desbordament de valor de desplaçament per a l'objecte base de delta" -#: builtin/index-pack.c:532 +#: builtin/index-pack.c:535 msgid "delta base offset is out of bound" msgstr "el desplaçament de base de delta està fora de límits" -#: builtin/index-pack.c:540 +#: builtin/index-pack.c:543 #, c-format msgid "unknown object type %d" msgstr "tipus d'objecte desconegut %d" -#: builtin/index-pack.c:571 +#: builtin/index-pack.c:574 msgid "cannot pread pack file" msgstr "no es pot fer pread en el fitxer de paquet" -#: builtin/index-pack.c:573 +#: builtin/index-pack.c:576 #, c-format msgid "premature end of pack file, % byte missing" msgid_plural "premature end of pack file, % bytes missing" @@ -7684,144 +8307,144 @@ msgstr[0] "el final del fitxer de paquet és prematur, manca % octet" msgstr[1] "" "el final del fitxer de paquet és prematur, manquen % octets" -#: builtin/index-pack.c:599 +#: builtin/index-pack.c:602 msgid "serious inflate inconsistency" msgstr "hi ha una inconsistència seriosa d'inflació" -#: builtin/index-pack.c:745 builtin/index-pack.c:751 builtin/index-pack.c:774 -#: builtin/index-pack.c:808 builtin/index-pack.c:817 +#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777 +#: builtin/index-pack.c:811 builtin/index-pack.c:820 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !" -#: builtin/index-pack.c:748 builtin/pack-objects.c:164 -#: builtin/pack-objects.c:256 +#: builtin/index-pack.c:751 builtin/pack-objects.c:166 +#: builtin/pack-objects.c:258 #, c-format msgid "unable to read %s" msgstr "no s'ha pogut llegir %s" -#: builtin/index-pack.c:814 +#: builtin/index-pack.c:817 #, c-format msgid "cannot read existing object %s" msgstr "no es pot llegir l'objecte existent %s" -#: builtin/index-pack.c:828 +#: builtin/index-pack.c:831 #, c-format msgid "invalid blob object %s" msgstr "objecte de blob no vàlid %s" -#: builtin/index-pack.c:842 +#: builtin/index-pack.c:845 #, c-format msgid "invalid %s" msgstr "%s no vàlid" -#: builtin/index-pack.c:845 +#: builtin/index-pack.c:848 msgid "Error in object" msgstr "Error en objecte" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:850 #, 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:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:922 builtin/index-pack.c:953 msgid "failed to apply delta" msgstr "s'ha fallat en aplicar la delta" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Receiving objects" msgstr "S'estan rebent objectes" -#: builtin/index-pack.c:1120 +#: builtin/index-pack.c:1123 msgid "Indexing objects" msgstr "S'estan indexant objectes" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "el paquet és malmès (discordança SHA1)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "no es pot fer fstat en el fitxer de paquet" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "el paquet té brossa al seu final" -#: builtin/index-pack.c:1171 +#: builtin/index-pack.c:1174 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusió més enllà de la bogeria en parse_pack_objects()" -#: builtin/index-pack.c:1196 +#: builtin/index-pack.c:1197 msgid "Resolving deltas" msgstr "S'estan resolent les deltes" -#: builtin/index-pack.c:1207 +#: builtin/index-pack.c:1208 #, c-format msgid "unable to create thread: %s" msgstr "no s'ha pogut crear fil: %s" -#: builtin/index-pack.c:1249 +#: builtin/index-pack.c:1250 msgid "confusion beyond insanity" msgstr "confusió més enllà de la bogeria" -#: builtin/index-pack.c:1255 +#: builtin/index-pack.c:1256 #, 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:1267 +#: builtin/index-pack.c:1268 #, 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:1271 +#: builtin/index-pack.c:1272 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "El paquet té %d delta no resolta" msgstr[1] "El paquet té %d deltes no resoltes" -#: builtin/index-pack.c:1295 +#: builtin/index-pack.c:1296 #, c-format msgid "unable to deflate appended object (%d)" msgstr "no s'ha pogut desinflar l'objecte annexat (%d)" -#: builtin/index-pack.c:1371 +#: builtin/index-pack.c:1372 #, c-format msgid "local object %s is corrupt" msgstr "l'objecte local %s és malmès" -#: builtin/index-pack.c:1395 +#: builtin/index-pack.c:1396 msgid "error while closing pack file" msgstr "error en tancar el fitxer de paquet" -#: builtin/index-pack.c:1408 +#: builtin/index-pack.c:1409 #, c-format msgid "cannot write keep file '%s'" msgstr "no es pot escriure el fitxer a retenir '%s'" -#: builtin/index-pack.c:1416 +#: builtin/index-pack.c:1417 #, c-format msgid "cannot close written keep file '%s'" msgstr "no es pot tancar el fitxer escrit a retenir '%s'" -#: builtin/index-pack.c:1429 +#: builtin/index-pack.c:1430 msgid "cannot store pack file" msgstr "no es pot emmagatzemar el fitxer de paquet" -#: builtin/index-pack.c:1440 +#: builtin/index-pack.c:1441 msgid "cannot store index file" msgstr "no es pot emmagatzemar el fitxer d'índex" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1474 #, c-format msgid "bad pack.indexversion=%" msgstr "pack.indexversion=% dolent" -#: builtin/index-pack.c:1483 builtin/index-pack.c:1681 +#: builtin/index-pack.c:1484 builtin/index-pack.c:1681 #, c-format msgid "no threads support, ignoring %s" msgstr "no hi ha suport de fils, s'està ignorant %s" @@ -7861,95 +8484,95 @@ msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'" msgid "bad %s" msgstr "%s dolent" -#: builtin/index-pack.c:1730 +#: builtin/index-pack.c:1732 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin no es pot usar sense --stdin" -#: builtin/index-pack.c:1738 +#: builtin/index-pack.c:1740 msgid "--verify with no packfile name given" msgstr "s'ha donat --verify sense nom de fitxer de paquet" -#: builtin/init-db.c:55 +#: builtin/init-db.c:54 #, c-format msgid "cannot stat '%s'" msgstr "no es pot fer stat en '%s'" -#: builtin/init-db.c:61 +#: builtin/init-db.c:60 #, c-format msgid "cannot stat template '%s'" msgstr "no es pot fer stat en la plantilla '%s'" -#: builtin/init-db.c:66 +#: builtin/init-db.c:65 #, c-format msgid "cannot opendir '%s'" msgstr "no es pot fer opendir en el directori '%s'" -#: builtin/init-db.c:77 +#: builtin/init-db.c:76 #, c-format msgid "cannot readlink '%s'" msgstr "no es pot fer readlink en '%s'" -#: builtin/init-db.c:79 +#: builtin/init-db.c:78 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "no es pot fer symlink en '%s' '%s'" -#: builtin/init-db.c:85 +#: builtin/init-db.c:84 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "no es pot copiar '%s' a '%s'" -#: builtin/init-db.c:89 +#: builtin/init-db.c:88 #, c-format msgid "ignoring template %s" msgstr "s'està ignorant la plantilla %s" -#: builtin/init-db.c:120 +#: builtin/init-db.c:119 #, c-format msgid "templates not found %s" msgstr "no s'han trobat les plantilles %s" -#: builtin/init-db.c:135 +#: builtin/init-db.c:134 #, c-format msgid "not copying templates from '%s': %s" msgstr "no s'està copiant plantilles de '%s': %s" -#: builtin/init-db.c:312 builtin/init-db.c:315 -#, c-format -msgid "%s already exists" -msgstr "%s ja existeix" - -#: builtin/init-db.c:344 +#: builtin/init-db.c:327 #, c-format msgid "unable to handle file type %d" msgstr "no s'ha pogut gestionar el tipus de fitxer %d" -#: builtin/init-db.c:347 +#: builtin/init-db.c:330 #, c-format msgid "unable to move %s to %s" msgstr "no s'ha pogut moure %s a %s" -#: builtin/init-db.c:402 +#: builtin/init-db.c:347 builtin/init-db.c:350 +#, c-format +msgid "%s already exists" +msgstr "%s ja existeix" + +#: builtin/init-db.c:403 #, 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:403 +#: builtin/init-db.c:404 #, 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:407 +#: builtin/init-db.c:408 #, 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:408 +#: builtin/init-db.c:409 #, 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:455 +#: builtin/init-db.c:457 msgid "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" @@ -7957,25 +8580,25 @@ msgstr "" "git init [-q | --quiet] [--bare] [--template=] [--" "shared[=]] []" -#: builtin/init-db.c:478 +#: builtin/init-db.c:480 msgid "permissions" msgstr "permisos" -#: builtin/init-db.c:479 +#: builtin/init-db.c:481 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:513 builtin/init-db.c:518 +#: builtin/init-db.c:515 builtin/init-db.c:520 #, c-format msgid "cannot mkdir %s" msgstr "no es pot mkdir %s" -#: builtin/init-db.c:522 +#: builtin/init-db.c:524 #, c-format msgid "cannot chdir to %s" msgstr "no es pot canviar de directori a %s" -#: builtin/init-db.c:543 +#: builtin/init-db.c:545 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -7984,7 +8607,7 @@ msgstr "" "no es permet %s (o --work-tree=) sense especificar %s (o --git-" "dir=)" -#: builtin/init-db.c:571 +#: builtin/init-db.c:573 #, c-format msgid "Cannot access work tree '%s'" msgstr "No es pot accedir a l'arbre de treball '%s'" @@ -8095,37 +8718,34 @@ msgstr "No és un rang." msgid "Cover letter needs email format" msgstr "La carta de presentació necessita el format de correu electrònic" -#: builtin/log.c:1064 +#: builtin/log.c:1063 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to boig: %s" -#: builtin/log.c:1092 +#: builtin/log.c:1091 msgid "git format-patch [] [ | ]" msgstr "git format-patch [] [ | ]" -#: builtin/log.c:1137 +#: builtin/log.c:1141 msgid "Two output directories?" msgstr "Hi ha dos directoris de sortida?" -#: builtin/log.c:1244 builtin/log.c:1883 builtin/log.c:1885 builtin/log.c:1897 +#: builtin/log.c:1248 builtin/log.c:1891 builtin/log.c:1893 builtin/log.c:1905 #, c-format msgid "Unknown commit %s" msgstr "Comissió desconeguda %s" -#: builtin/log.c:1254 builtin/notes.c:254 builtin/notes.c:305 -#: builtin/notes.c:307 builtin/notes.c:370 builtin/notes.c:425 -#: builtin/notes.c:511 builtin/notes.c:516 builtin/notes.c:594 -#: builtin/notes.c:657 builtin/notes.c:882 builtin/tag.c:455 +#: builtin/log.c:1258 builtin/notes.c:884 builtin/tag.c:455 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "S'ha fallat en resoldre '%s' com a referència vàlida." -#: builtin/log.c:1259 +#: builtin/log.c:1263 msgid "Could not find exact merge base." msgstr "No s'ha pogut trobar la base exacta de fusió." -#: builtin/log.c:1263 +#: builtin/log.c:1267 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" @@ -8136,211 +8756,215 @@ msgstr "" "seguir una branca remot. O podeu especificar la comissió base manualment\n" "amb --base=." -#: builtin/log.c:1283 +#: builtin/log.c:1287 msgid "Failed to find exact merge base" msgstr "S'ha fallat en trobar la base exacta de fusió." -#: builtin/log.c:1294 +#: builtin/log.c:1298 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:1298 +#: builtin/log.c:1302 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:1347 +#: builtin/log.c:1351 msgid "cannot get patch id" msgstr "no es pot obtenir l'id del pedaç" -#: builtin/log.c:1404 +#: builtin/log.c:1408 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:1407 +#: builtin/log.c:1411 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] fins i tot amb múltiples pedaços" -#: builtin/log.c:1411 +#: builtin/log.c:1415 msgid "print patches to standard out" msgstr "imprimeix els pedaços a la sortida estàndard" -#: builtin/log.c:1413 +#: builtin/log.c:1417 msgid "generate a cover letter" msgstr "genera una carta de presentació" -#: builtin/log.c:1415 +#: builtin/log.c:1419 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:1416 +#: builtin/log.c:1420 msgid "sfx" msgstr "sufix" -#: builtin/log.c:1417 +#: builtin/log.c:1421 msgid "use instead of '.patch'" msgstr "usa en lloc de '.patch'" -#: builtin/log.c:1419 +#: builtin/log.c:1423 msgid "start numbering patches at instead of 1" msgstr "comença numerant els pedaços a en lloc d'1" -#: builtin/log.c:1421 +#: builtin/log.c:1425 msgid "mark the series as Nth re-roll" msgstr "marca la sèrie com a l'enèsima llançada" -#: builtin/log.c:1423 +#: builtin/log.c:1427 +msgid "Use [RFC PATCH] instead of [PATCH]" +msgstr "Usa [RFC PATCH] en lloc de [PATCH]" + +#: builtin/log.c:1430 msgid "Use [] instead of [PATCH]" msgstr "Usa [] en lloc de [PATCH]" -#: builtin/log.c:1426 +#: builtin/log.c:1433 msgid "store resulting files in " msgstr "emmagatzema els fitxers resultants a " -#: builtin/log.c:1429 +#: builtin/log.c:1436 msgid "don't strip/add [PATCH]" msgstr "no despullis/afegeixis [PATCH]" -#: builtin/log.c:1432 +#: builtin/log.c:1439 msgid "don't output binary diffs" msgstr "no emetis diferències binàries" -#: builtin/log.c:1434 +#: builtin/log.c:1441 msgid "output all-zero hash in From header" msgstr "emet un hash de tots zeros en la capçalera From" -#: builtin/log.c:1436 +#: builtin/log.c:1443 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:1438 +#: builtin/log.c:1445 msgid "show patch format instead of default (patch + stat)" msgstr "" "mostra el format de pedaç en lloc del per defecte (pedaç + estadístiques)" -#: builtin/log.c:1440 +#: builtin/log.c:1447 msgid "Messaging" msgstr "Missatgeria" -#: builtin/log.c:1441 +#: builtin/log.c:1448 msgid "header" msgstr "capçalera" -#: builtin/log.c:1442 +#: builtin/log.c:1449 msgid "add email header" msgstr "afegeix una capçalera de correu electrònic" -#: builtin/log.c:1443 builtin/log.c:1445 +#: builtin/log.c:1450 builtin/log.c:1452 msgid "email" msgstr "correu electrònic" -#: builtin/log.c:1443 +#: builtin/log.c:1450 msgid "add To: header" msgstr "afegeix la capçalera To:" -#: builtin/log.c:1445 +#: builtin/log.c:1452 msgid "add Cc: header" msgstr "afegeix la capçalera Cc:" -#: builtin/log.c:1447 +#: builtin/log.c:1454 msgid "ident" msgstr "identitat" -#: builtin/log.c:1448 +#: builtin/log.c:1455 msgid "set From address to (or committer ident if absent)" msgstr "" "estableix l'adreça From a (o la identitat del comitent si manca)" -#: builtin/log.c:1450 +#: builtin/log.c:1457 msgid "message-id" msgstr "ID de missatge" -#: builtin/log.c:1451 +#: builtin/log.c:1458 msgid "make first mail a reply to " msgstr "fes que el primer missatge sigui una resposta a " -#: builtin/log.c:1452 builtin/log.c:1455 +#: builtin/log.c:1459 builtin/log.c:1462 msgid "boundary" msgstr "límit" -#: builtin/log.c:1453 +#: builtin/log.c:1460 msgid "attach the patch" msgstr "ajunta el pedaç" -#: builtin/log.c:1456 +#: builtin/log.c:1463 msgid "inline the patch" msgstr "posa el pedaç en el cos" -#: builtin/log.c:1460 +#: builtin/log.c:1467 msgid "enable message threading, styles: shallow, deep" msgstr "habilita l'enfilada de missatges, estils: shallow, deep" -#: builtin/log.c:1462 +#: builtin/log.c:1469 msgid "signature" msgstr "signatura" -#: builtin/log.c:1463 +#: builtin/log.c:1470 msgid "add a signature" msgstr "afegeix una signatura" -#: builtin/log.c:1464 +#: builtin/log.c:1471 msgid "base-commit" msgstr "comissió base" -#: builtin/log.c:1465 +#: builtin/log.c:1472 msgid "add prerequisite tree info to the patch series" msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços" -#: builtin/log.c:1467 +#: builtin/log.c:1474 msgid "add a signature from a file" msgstr "afegeix una signatura des d'un fitxer" -#: builtin/log.c:1468 +#: builtin/log.c:1475 msgid "don't print the patch filenames" msgstr "no imprimeixis els noms de fitxer del pedaç" -#: builtin/log.c:1558 +#: builtin/log.c:1565 msgid "-n and -k are mutually exclusive." msgstr "-n i -k són mutualment exclusius." -#: builtin/log.c:1560 -msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix i -k són mutualment exclusius." +#: builtin/log.c:1567 +msgid "--subject-prefix/--rfc and -k are mutually exclusive." +msgstr "--subject-prefix/--rfc i -k són mutualment exclusius." -#: builtin/log.c:1568 +#: builtin/log.c:1575 msgid "--name-only does not make sense" msgstr "--name-only no té sentit" -#: builtin/log.c:1570 +#: builtin/log.c:1577 msgid "--name-status does not make sense" msgstr "--name-status no té sentit" -#: builtin/log.c:1572 +#: builtin/log.c:1579 msgid "--check does not make sense" msgstr "--check no té sentit" -#: builtin/log.c:1602 +#: builtin/log.c:1609 msgid "standard output, or directory, which one?" msgstr "sortida estàndard o directori, quin dels dos?" -#: builtin/log.c:1604 +#: builtin/log.c:1611 #, c-format msgid "Could not create directory '%s'" msgstr "No s'ha pogut crear el directori '%s'" -#: builtin/log.c:1698 +#: builtin/log.c:1705 #, c-format msgid "unable to read signature file '%s'" msgstr "no s'ha pogut llegir el fitxer de signatura '%s'" -#: builtin/log.c:1769 +#: builtin/log.c:1777 msgid "Failed to create output files" msgstr "S'ha fallat en crear els fitxers de sortida" -#: builtin/log.c:1818 +#: builtin/log.c:1826 msgid "git cherry [-v] [ [ []]]" msgstr "git cherry [-v] [ [ []]]" -#: builtin/log.c:1872 +#: builtin/log.c:1880 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" @@ -8348,101 +8972,105 @@ msgstr "" "No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu " " manualment.\n" -#: builtin/ls-files.c:379 +#: builtin/ls-files.c:458 msgid "git ls-files [] [...]" msgstr "git ls-files [] [...]" -#: builtin/ls-files.c:428 +#: builtin/ls-files.c:507 msgid "identify the file status with tags" msgstr "identifica l'estat de fitxer amb etiquetes" -#: builtin/ls-files.c:430 +#: builtin/ls-files.c:509 msgid "use lowercase letters for 'assume unchanged' files" msgstr "usa lletres minúscules per als fitxers 'assume unchanged'" -#: builtin/ls-files.c:432 +#: builtin/ls-files.c:511 msgid "show cached files in the output (default)" msgstr "" "mostra en la sortida els fitxers desats en la memòria cau (per defecte)" -#: builtin/ls-files.c:434 +#: builtin/ls-files.c:513 msgid "show deleted files in the output" msgstr "mostra en la sortida els fitxers suprimits" -#: builtin/ls-files.c:436 +#: builtin/ls-files.c:515 msgid "show modified files in the output" msgstr "mostra en la sortida els fitxers modificats" -#: builtin/ls-files.c:438 +#: builtin/ls-files.c:517 msgid "show other files in the output" msgstr "mostra en la sortida els altres fitxers" -#: builtin/ls-files.c:440 +#: builtin/ls-files.c:519 msgid "show ignored files in the output" msgstr "mostra en la sortida els fitxers ignorats" -#: builtin/ls-files.c:443 +#: builtin/ls-files.c:522 msgid "show staged contents' object name in the output" msgstr "mostra en la sortida el nom d'objecte dels continguts allistats" -#: builtin/ls-files.c:445 +#: builtin/ls-files.c:524 msgid "show files on the filesystem that need to be removed" msgstr "mostra els fitxers en el sistema de fitxers que s'han d'eliminar" -#: builtin/ls-files.c:447 +#: builtin/ls-files.c:526 msgid "show 'other' directories' names only" msgstr "mostra només els noms dels directoris 'other'" -#: builtin/ls-files.c:449 +#: builtin/ls-files.c:528 msgid "show line endings of files" -msgstr "mostra els terminis de línia dels fitxers" +msgstr "mostra els terminadors de línia dels fitxers" -#: builtin/ls-files.c:451 +#: builtin/ls-files.c:530 msgid "don't show empty directories" msgstr "no mostris els directoris buits" -#: builtin/ls-files.c:454 +#: builtin/ls-files.c:533 msgid "show unmerged files in the output" msgstr "mostra en la sortida els fitxers sense fusionar" -#: builtin/ls-files.c:456 +#: builtin/ls-files.c:535 msgid "show resolve-undo information" msgstr "mostra la informació de resolució de desfet" -#: builtin/ls-files.c:458 +#: builtin/ls-files.c:537 msgid "skip files matching pattern" msgstr "salta els fitxers coincidents amb el patró" -#: builtin/ls-files.c:461 +#: builtin/ls-files.c:540 msgid "exclude patterns are read from " msgstr "els patrons d'exclusió es llegeixen de " -#: builtin/ls-files.c:464 +#: builtin/ls-files.c:543 msgid "read additional per-directory exclude patterns in " msgstr "llegeix els patrons addicionals d'exclusió per directori en " -#: builtin/ls-files.c:466 +#: builtin/ls-files.c:545 msgid "add the standard git exclusions" msgstr "afegeix les exclusions estàndards de git" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:548 msgid "make the output relative to the project top directory" msgstr "fes que la sortida sigui relativa al directori superior del projecte" -#: builtin/ls-files.c:472 +#: builtin/ls-files.c:551 +msgid "recurse through submodules" +msgstr "recursa als submòduls" + +#: builtin/ls-files.c:553 msgid "if any is not in the index, treat this as an error" msgstr "si qualsevol no és en l'índex, tracta això com a error" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:554 msgid "tree-ish" msgstr "arbre" -#: builtin/ls-files.c:474 +#: builtin/ls-files.c:555 msgid "pretend that paths removed since are still present" msgstr "" "pretén que els camins eliminats després de encara siguin presents" -#: builtin/ls-files.c:476 +#: builtin/ls-files.c:557 msgid "show debugging data" msgstr "mostra les dades de depuració" @@ -8561,33 +9189,33 @@ msgstr "Les estratègies disponibles són:" msgid "Available custom strategies are:" msgstr "Les estratègies personalitzades disponibles són:" -#: builtin/merge.c:195 builtin/pull.c:126 +#: builtin/merge.c:195 builtin/pull.c:127 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:198 builtin/pull.c:129 +#: builtin/merge.c:198 builtin/pull.c:130 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:199 builtin/pull.c:132 +#: builtin/merge.c:199 builtin/pull.c:133 msgid "(synonym to --stat)" msgstr "(sinònim de --stat)" -#: builtin/merge.c:201 builtin/pull.c:135 +#: builtin/merge.c:201 builtin/pull.c:136 msgid "add (at most ) entries from shortlog to merge commit message" msgstr "" "afegeix (com a màxim ) entrades del registre curt al missatge de comissió " "de fusió" -#: builtin/merge.c:204 builtin/pull.c:138 +#: builtin/merge.c:204 builtin/pull.c:139 msgid "create a single commit instead of doing a merge" msgstr "crea una única comissió en lloc de fusionar" -#: builtin/merge.c:206 builtin/pull.c:141 +#: builtin/merge.c:206 builtin/pull.c:142 msgid "perform a commit if the merge succeeds (default)" msgstr "realitza una comissió si la fusió té èxit (per defecte)" -#: builtin/merge.c:208 builtin/pull.c:144 +#: builtin/merge.c:208 builtin/pull.c:145 msgid "edit message before committing" msgstr "edita el missatge abans de cometre" @@ -8595,28 +9223,28 @@ msgstr "edita el missatge abans de cometre" msgid "allow fast-forward (default)" msgstr "permet l'avanç ràpid (per defecte)" -#: builtin/merge.c:211 builtin/pull.c:150 +#: builtin/merge.c:211 builtin/pull.c:151 msgid "abort if fast-forward is not possible" msgstr "avorta si l'avanç ràpid no és possible" -#: builtin/merge.c:215 builtin/pull.c:153 +#: builtin/merge.c:215 builtin/pull.c:154 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:216 builtin/notes.c:772 builtin/pull.c:157 +#: builtin/merge.c:216 builtin/notes.c:774 builtin/pull.c:158 #: builtin/revert.c:89 msgid "strategy" msgstr "estratègia" -#: builtin/merge.c:217 builtin/pull.c:158 +#: builtin/merge.c:217 builtin/pull.c:159 msgid "merge strategy to use" msgstr "estratègia de fusió a usar" -#: builtin/merge.c:218 builtin/pull.c:161 +#: builtin/merge.c:218 builtin/pull.c:162 msgid "option=value" msgstr "opció=valor" -#: builtin/merge.c:219 builtin/pull.c:162 +#: builtin/merge.c:219 builtin/pull.c:163 msgid "option for selected merge strategy" msgstr "opció per a l'estratègia de fusió seleccionada" @@ -8628,7 +9256,7 @@ msgstr "missatge de comissió de fusió (per a una fusió no d'avanç ràpid)" msgid "abort the current in-progress merge" msgstr "avorta la fusió en curs actual" -#: builtin/merge.c:227 builtin/pull.c:169 +#: builtin/merge.c:227 builtin/pull.c:170 msgid "allow merging unrelated histories" msgstr "permet fusionar històries no relacionades" @@ -8851,55 +9479,55 @@ msgstr "s'està refusant fusionar històries no relacionades" msgid "Already up-to-date." msgstr "Ja està al dia." -#: builtin/merge.c:1382 +#: builtin/merge.c:1377 #, c-format msgid "Updating %s..%s\n" msgstr "S'estan actualitzant %s..%s\n" -#: builtin/merge.c:1419 +#: builtin/merge.c:1418 #, 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:1426 +#: builtin/merge.c:1425 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1451 +#: builtin/merge.c:1450 msgid "Already up-to-date. Yeeah!" msgstr "Ja està al dia. Estupend!" -#: builtin/merge.c:1457 +#: builtin/merge.c:1456 msgid "Not possible to fast-forward, aborting." msgstr "No és possible avançar ràpidament, s'està avortant." -#: builtin/merge.c:1480 builtin/merge.c:1559 +#: builtin/merge.c:1479 builtin/merge.c:1558 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "S'està rebobinant l'arbre a la pristina...\n" -#: builtin/merge.c:1484 +#: builtin/merge.c:1483 #, c-format msgid "Trying merge strategy %s...\n" msgstr "S'està intentant l'estratègia de fusió %s...\n" -#: builtin/merge.c:1550 +#: builtin/merge.c:1549 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Cap estratègia de fusió ha gestionat la fusió.\n" -#: builtin/merge.c:1552 +#: builtin/merge.c:1551 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "L'estratègia de fusió %s ha fallat.\n" -#: builtin/merge.c:1561 +#: builtin/merge.c:1560 #, 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:1573 +#: builtin/merge.c:1572 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -8926,23 +9554,23 @@ msgstr "git merge-base --is-ancestor " msgid "git merge-base --fork-point []" msgstr "git merge-base --fork-point []" -#: builtin/merge-base.c:214 +#: builtin/merge-base.c:217 msgid "output all common ancestors" msgstr "emet tots els avantpassats comuns" -#: builtin/merge-base.c:216 +#: builtin/merge-base.c:219 msgid "find ancestors for a single n-way merge" msgstr "troba els avantpassats per a una sola fusió d'n vies" -#: builtin/merge-base.c:218 +#: builtin/merge-base.c:221 msgid "list revs not reachable from others" msgstr "llista les revisions no abastables d'altres" -#: builtin/merge-base.c:220 +#: builtin/merge-base.c:223 msgid "is the first one ancestor of the other?" msgstr "és la primera un avantpassat de l'altre?" -#: builtin/merge-base.c:222 +#: builtin/merge-base.c:225 msgid "find where forked from reflog of " msgstr "" "troba on s'ha bifurcat del registre de referències de " @@ -8987,6 +9615,37 @@ msgstr "no avisis de conflictes" msgid "set labels for file1/orig-file/file2" msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2" +#: builtin/merge-recursive.c:45 +#, c-format +msgid "unknown option %s" +msgstr "opció desconeguda %s" + +#: builtin/merge-recursive.c:51 +#, c-format +msgid "could not parse object '%s'" +msgstr "no s'ha pogut analitzar l'objecte '%s'" + +#: builtin/merge-recursive.c:55 +#, c-format +msgid "cannot handle more than %d base. Ignoring %s." +msgid_plural "cannot handle more than %d bases. Ignoring %s." +msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s." +msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s." + +#: builtin/merge-recursive.c:63 +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-recursive.c:69 builtin/merge-recursive.c:71 +#, c-format +msgid "could not resolve ref '%s'" +msgstr "no s'ha pogut resoldre la referència '%s'" + +#: builtin/merge-recursive.c:77 +#, c-format +msgid "Merging %s with %s\n" +msgstr "S'està fusionant %s amb %s\n" + #: builtin/mktree.c:65 msgid "git mktree [-z] [--missing] [--batch]" msgstr "git mktree [-z] [--missing] [--batch]" @@ -9097,43 +9756,43 @@ msgstr "S'està canviant el nom de %s a %s\n" msgid "renaming '%s' failed" msgstr "el canvi del nom de '%s' ha fallat" -#: builtin/name-rev.c:258 +#: builtin/name-rev.c:257 msgid "git name-rev [] ..." msgstr "git name-rev [] ..." -#: builtin/name-rev.c:259 +#: builtin/name-rev.c:258 msgid "git name-rev [] --all" msgstr "git name-rev [] --all" -#: builtin/name-rev.c:260 +#: builtin/name-rev.c:259 msgid "git name-rev [] --stdin" msgstr "git name-rev [] --stdin" -#: builtin/name-rev.c:312 +#: builtin/name-rev.c:311 msgid "print only names (no SHA-1)" msgstr "imprimeix només els noms (sense SHA-1)" -#: builtin/name-rev.c:313 +#: builtin/name-rev.c:312 msgid "only use tags to name the commits" msgstr "només usa les etiquetes per a anomenar les comissions" -#: builtin/name-rev.c:315 +#: builtin/name-rev.c:314 msgid "only use refs matching " msgstr "només usa les referències que coincideixin amb " -#: builtin/name-rev.c:317 +#: builtin/name-rev.c:316 msgid "list all commits reachable from all refs" msgstr "llista totes les comissions abastables de totes les referències" -#: builtin/name-rev.c:318 +#: builtin/name-rev.c:317 msgid "read from stdin" msgstr "llegeix d'stdin" -#: builtin/name-rev.c:319 +#: builtin/name-rev.c:318 msgid "allow to print `undefined` names (default)" msgstr "permet imprimir els noms `undefined` (per defecte)" -#: builtin/name-rev.c:325 +#: builtin/name-rev.c:324 msgid "dereference tags in the input (internal use)" msgstr "dereferencia les etiquetes en l'entrada (ús intern)" @@ -9269,9 +9928,9 @@ msgid "failed to finish 'show' for object '%s'" msgstr "s'ha fallat en finalitzar 'show' per a l'objecte '%s'" #: builtin/notes.c:194 -msgid "Please supply the note contents using either -m or -F option" +msgid "please supply the note contents using either -m or -F option" msgstr "" -"Si us plau, proveïu els continguts de la nota fent servir l'opció -m o " +"si us plau, proveïu els continguts de la nota fent servir l'opció -m o " "l'opció -F" #: builtin/notes.c:203 @@ -9280,8 +9939,8 @@ msgstr "no s'ha pogut escriure l'objecte de nota" #: builtin/notes.c:205 #, c-format -msgid "The note contents have been left in %s" -msgstr "Els continguts de la nota s'han deixat en %s" +msgid "the note contents have been left in %s" +msgstr "s'han deixat els continguts de la nota en %s" #: builtin/notes.c:233 builtin/tag.c:439 #, c-format @@ -9293,52 +9952,76 @@ msgstr "no es pot llegir '%s'" msgid "could not open or read '%s'" msgstr "no s'ha pogut obrir o llegir '%s'" +#: builtin/notes.c:254 builtin/notes.c:305 builtin/notes.c:307 +#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513 +#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:659 +#, c-format +msgid "failed to resolve '%s' as a valid ref." +msgstr "s'ha fallat en resoldre '%s' com a referència vàlida." + #: builtin/notes.c:257 #, c-format -msgid "Failed to read object '%s'." -msgstr "S'ha fallat en llegir l'objecte '%s'." +msgid "failed to read object '%s'." +msgstr "s'ha fallat en llegir l'objecte '%s'." #: builtin/notes.c:261 #, c-format -msgid "Cannot read note data from non-blob object '%s'." -msgstr "No es pot llegir les dades de node de l'objecte no de blob '%s'." +msgid "cannot read note data from non-blob object '%s'." +msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'." + +#: builtin/notes.c:301 +#, c-format +msgid "malformed input line: '%s'." +msgstr "línia d'entrada mal formada: '%s'." + +#: builtin/notes.c:316 +#, c-format +msgid "failed to copy notes from '%s' to '%s'" +msgstr "s'ha fallat en copiar les notes de '%s' a '%s'" + +#. TRANSLATORS: the first %s will be replaced by a +#. git notes command: 'add', 'merge', 'remove', etc. +#: builtin/notes.c:345 +#, c-format +msgid "refusing to %s notes in %s (outside of refs/notes/)" +msgstr "s'està refusant %s les notes en %s (fora de refs/notes/)" -#: builtin/notes.c:363 builtin/notes.c:418 builtin/notes.c:494 -#: builtin/notes.c:506 builtin/notes.c:582 builtin/notes.c:650 -#: builtin/notes.c:800 builtin/notes.c:947 builtin/notes.c:968 +#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496 +#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:652 +#: builtin/notes.c:802 builtin/notes.c:949 builtin/notes.c:970 msgid "too many parameters" msgstr "massa paràmetres" -#: builtin/notes.c:376 builtin/notes.c:663 +#: builtin/notes.c:378 builtin/notes.c:665 #, c-format -msgid "No note found for object %s." -msgstr "No s'ha trobat cap nota per a l'objecte %s." +msgid "no note found for object %s." +msgstr "no s'ha trobat cap nota per a l'objecte %s." -#: builtin/notes.c:397 builtin/notes.c:560 +#: builtin/notes.c:399 builtin/notes.c:562 msgid "note contents as a string" msgstr "anota els continguts com a cadena" -#: builtin/notes.c:400 builtin/notes.c:563 +#: builtin/notes.c:402 builtin/notes.c:565 msgid "note contents in a file" msgstr "anota els continguts en un fitxer" -#: builtin/notes.c:403 builtin/notes.c:566 +#: builtin/notes.c:405 builtin/notes.c:568 msgid "reuse and edit specified note object" msgstr "reusa i edita l'objecte de nota especificat" -#: builtin/notes.c:406 builtin/notes.c:569 +#: builtin/notes.c:408 builtin/notes.c:571 msgid "reuse specified note object" msgstr "reusa l'objecte de nota especificat" -#: builtin/notes.c:409 builtin/notes.c:572 +#: builtin/notes.c:411 builtin/notes.c:574 msgid "allow storing empty note" msgstr "permet l'emmagatzematge d'una nota buida" -#: builtin/notes.c:410 builtin/notes.c:481 +#: builtin/notes.c:412 builtin/notes.c:483 msgid "replace existing notes" msgstr "reemplaça les notes existents" -#: builtin/notes.c:435 +#: builtin/notes.c:437 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9347,30 +10030,30 @@ msgstr "" "No es pot afegir les notes. S'han trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:450 builtin/notes.c:529 +#: builtin/notes.c:452 builtin/notes.c:531 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "S'estan sobreescrivint les notes existents de l'objecte %s\n" -#: builtin/notes.c:461 builtin/notes.c:622 builtin/notes.c:887 +#: builtin/notes.c:463 builtin/notes.c:624 builtin/notes.c:889 #, c-format msgid "Removing note for object %s\n" msgstr "S'està eliminant la nota de l'objecte %s\n" -#: builtin/notes.c:482 +#: builtin/notes.c:484 msgid "read objects from stdin" msgstr "llegeix els objectes des d'stdin" -#: builtin/notes.c:484 +#: builtin/notes.c:486 msgid "load rewriting config for (implies --stdin)" msgstr "" "carrega la configuració de reescriptura per a (implica --stdin)" -#: builtin/notes.c:502 +#: builtin/notes.c:504 msgid "too few parameters" msgstr "hi ha massa pocs paràmetres" -#: builtin/notes.c:523 +#: builtin/notes.c:525 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -9379,12 +10062,12 @@ msgstr "" "No es pot copiar les notes. S'han trobat notes existents de l'objecte %s. " "Useu '-f' per a sobreescriure les notes existents." -#: builtin/notes.c:535 +#: builtin/notes.c:537 #, c-format -msgid "Missing notes on source object %s. Cannot copy." -msgstr "Manquen notes a l'objecte font %s. No es pot copiar." +msgid "missing notes on source object %s. Cannot copy." +msgstr "manquen notes a l'objecte font %s. No es pot copiar." -#: builtin/notes.c:587 +#: builtin/notes.c:589 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -9393,20 +10076,52 @@ msgstr "" "S'han desaprovat les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n" "Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n" -#: builtin/notes.c:753 +#: builtin/notes.c:685 +msgid "failed to delete ref NOTES_MERGE_PARTIAL" +msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:687 +msgid "failed to delete ref NOTES_MERGE_REF" +msgstr "s'ha fallat en suprimir la referència NOTES_MERGE_REF" + +#: builtin/notes.c:689 +msgid "failed to remove 'git notes merge' worktree" +msgstr "s'ha fallat en eliminar l'arbre de treball de 'git notes merge'" + +#: builtin/notes.c:709 +msgid "failed to read ref NOTES_MERGE_PARTIAL" +msgstr "s'ha fallat en llegir la referència NOTES_MERGE_PARTIAL" + +#: builtin/notes.c:711 +msgid "could not find commit from NOTES_MERGE_PARTIAL." +msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:713 +msgid "could not parse commit from NOTES_MERGE_PARTIAL." +msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL." + +#: builtin/notes.c:726 +msgid "failed to resolve NOTES_MERGE_REF" +msgstr "s'ha fallat en resoldre NOTES_MERGE_REF" + +#: builtin/notes.c:729 +msgid "failed to finalize notes merge" +msgstr "s'ha fallat en finalitzar la fusió de notes" + +#: builtin/notes.c:755 #, c-format msgid "unknown notes merge strategy %s" msgstr "estratègia de fusió de notes desconeguda %s" -#: builtin/notes.c:769 +#: builtin/notes.c:771 msgid "General options" msgstr "Opcions generals" -#: builtin/notes.c:771 +#: builtin/notes.c:773 msgid "Merge options" msgstr "Opcions de fusió" -#: builtin/notes.c:773 +#: builtin/notes.c:775 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -9414,47 +10129,47 @@ msgstr "" "resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/" "union/cat_sort_uniq)" -#: builtin/notes.c:775 +#: builtin/notes.c:777 msgid "Committing unmerged notes" msgstr "S'estan cometent les notes sense fusionar" -#: builtin/notes.c:777 +#: builtin/notes.c:779 msgid "finalize notes merge by committing unmerged notes" msgstr "finalitza la fusió de notes cometent les notes sense fusionar" -#: builtin/notes.c:779 +#: builtin/notes.c:781 msgid "Aborting notes merge resolution" msgstr "S'està avortant la resolució de fusió de notes" -#: builtin/notes.c:781 +#: builtin/notes.c:783 msgid "abort notes merge" msgstr "avorta la fusió de notes" -#: builtin/notes.c:792 +#: builtin/notes.c:794 msgid "cannot mix --commit, --abort or -s/--strategy" msgstr "no es pot combinar --commit, --abort i -s/--strategy" -#: builtin/notes.c:797 -msgid "Must specify a notes ref to merge" -msgstr "Cal especificar una referència de notes a fusionar" +#: builtin/notes.c:799 +msgid "must specify a notes ref to merge" +msgstr "cal especificar una referència de notes a fusionar" -#: builtin/notes.c:821 +#: builtin/notes.c:823 #, c-format -msgid "Unknown -s/--strategy: %s" +msgid "unknown -s/--strategy: %s" msgstr "-s/--strategy desconeguda: %s" -#: builtin/notes.c:858 +#: builtin/notes.c:860 #, c-format -msgid "A notes merge into %s is already in-progress at %s" -msgstr "Una fusió de notes a %s ja està en curs a %s" +msgid "a notes merge into %s is already in-progress at %s" +msgstr "una fusió de notes a %s ja està en curs a %s" -#: builtin/notes.c:861 +#: builtin/notes.c:863 #, c-format -msgid "Failed to store link to current notes ref (%s)" +msgid "failed to store link to current notes ref (%s)" msgstr "" -"S'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)" +"s'ha fallat en emmagatzemar l'enllaç a la referència de notes actual (%s)" -#: builtin/notes.c:863 +#: builtin/notes.c:865 #, c-format msgid "" "Automatic notes merge failed. Fix conflicts in %s and commit the result with " @@ -9465,239 +10180,235 @@ msgstr "" "cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb " "'git notes merge --abort'.\n" -#: builtin/notes.c:885 +#: builtin/notes.c:887 #, c-format msgid "Object %s has no note\n" msgstr "L'objecte %s no té cap nota\n" -#: builtin/notes.c:897 +#: builtin/notes.c:899 msgid "attempt to remove non-existent note is not an error" msgstr "l'intent d'eliminar una nota no existent no és un error" -#: builtin/notes.c:900 +#: builtin/notes.c:902 msgid "read object names from the standard input" msgstr "llegeix els noms d'objecte des de l'entrada estàndard" -#: builtin/notes.c:938 builtin/prune.c:105 builtin/worktree.c:127 +#: builtin/notes.c:940 builtin/prune.c:105 builtin/worktree.c:127 msgid "do not remove, show only" msgstr "no eliminis, només mostra" -#: builtin/notes.c:939 +#: builtin/notes.c:941 msgid "report pruned notes" msgstr "informa de notes podades" -#: builtin/notes.c:981 +#: builtin/notes.c:983 msgid "notes-ref" msgstr "referència de notes" -#: builtin/notes.c:982 +#: builtin/notes.c:984 msgid "use notes from " msgstr "usa les notes de " -#: builtin/notes.c:1017 builtin/remote.c:1623 +#: builtin/notes.c:1019 #, c-format -msgid "Unknown subcommand: %s" -msgstr "Subordre desconeguda: %s" +msgid "unknown subcommand: %s" +msgstr "subordre desconeguda: %s" -#: builtin/pack-objects.c:28 +#: builtin/pack-objects.c:29 msgid "" "git pack-objects --stdout [...] [< | < ]" msgstr "" "git pack-objects --stdout [...] [< | < " "]" -#: builtin/pack-objects.c:29 +#: builtin/pack-objects.c:30 msgid "" "git pack-objects [...] [< | < ]" msgstr "" "git pack-objects [...] [< | < " "]" -#: builtin/pack-objects.c:177 builtin/pack-objects.c:180 +#: builtin/pack-objects.c:179 builtin/pack-objects.c:182 #, c-format msgid "deflate error (%d)" msgstr "error de deflació (%d)" -#: builtin/pack-objects.c:766 +#: builtin/pack-objects.c:768 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" -#: builtin/pack-objects.c:779 +#: builtin/pack-objects.c:781 msgid "Writing objects" msgstr "S'estan escrivint els objectes" -#: builtin/pack-objects.c:1037 +#: builtin/pack-objects.c:1070 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" -#: builtin/pack-objects.c:2197 +#: builtin/pack-objects.c:2346 msgid "Compressing objects" msgstr "S'estan comprimint objectes" -#: builtin/pack-objects.c:2611 +#: builtin/pack-objects.c:2759 #, c-format msgid "unsupported index version %s" msgstr "versió d'índex no compatible %s" -#: builtin/pack-objects.c:2615 +#: builtin/pack-objects.c:2763 #, c-format msgid "bad index version '%s'" msgstr "versió d'índex dolenta '%s'" -#: builtin/pack-objects.c:2645 +#: builtin/pack-objects.c:2793 msgid "do not show progress meter" msgstr "no mostris l'indicador de progrés" -#: builtin/pack-objects.c:2647 +#: builtin/pack-objects.c:2795 msgid "show progress meter" msgstr "mostra l'indicador de progrés" -#: builtin/pack-objects.c:2649 +#: builtin/pack-objects.c:2797 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:2652 +#: builtin/pack-objects.c:2800 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:2653 +#: builtin/pack-objects.c:2801 msgid "version[,offset]" msgstr "versió[,desplaçament]" -#: builtin/pack-objects.c:2654 +#: builtin/pack-objects.c:2802 msgid "write the pack index file in the specified idx format version" msgstr "" "escriu el fitxer d'índex de paquet en la versió de format d'índex " "especificada" -#: builtin/pack-objects.c:2657 +#: builtin/pack-objects.c:2805 msgid "maximum size of each output pack file" msgstr "mida màxima de cada fitxer de paquet de sortida" -#: builtin/pack-objects.c:2659 +#: builtin/pack-objects.c:2807 msgid "ignore borrowed objects from alternate object store" msgstr "" "ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu" -#: builtin/pack-objects.c:2661 +#: builtin/pack-objects.c:2809 msgid "ignore packed objects" msgstr "ignora els objectes empaquetats" -#: builtin/pack-objects.c:2663 +#: builtin/pack-objects.c:2811 msgid "limit pack window by objects" msgstr "limita la finestra d'empaquetament per objectes" -#: builtin/pack-objects.c:2665 +#: builtin/pack-objects.c:2813 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra d'empaquetament per memòria a més del límit d'objectes" -#: builtin/pack-objects.c:2667 +#: builtin/pack-objects.c:2815 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "longitud màxima de la cadena de deltes permesa en el paquet resultant" -#: builtin/pack-objects.c:2669 +#: builtin/pack-objects.c:2817 msgid "reuse existing deltas" msgstr "reusa les deltes existents" -#: builtin/pack-objects.c:2671 +#: builtin/pack-objects.c:2819 msgid "reuse existing objects" msgstr "reusa els objectes existents" -#: builtin/pack-objects.c:2673 +#: builtin/pack-objects.c:2821 msgid "use OFS_DELTA objects" msgstr "usa objectes OFS_DELTA" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2823 msgid "use threads when searching for best delta matches" msgstr "usa fils en cercar les millores coincidències de delta" -#: builtin/pack-objects.c:2677 +#: builtin/pack-objects.c:2825 msgid "do not create an empty pack output" msgstr "no creïs una emissió de paquet buida" -#: builtin/pack-objects.c:2679 +#: builtin/pack-objects.c:2827 msgid "read revision arguments from standard input" msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2829 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:2684 +#: builtin/pack-objects.c:2832 msgid "include objects reachable from any reference" msgstr "inclou els objectes abastables de qualsevulla referència" -#: builtin/pack-objects.c:2687 +#: builtin/pack-objects.c:2835 msgid "include objects referred by reflog entries" msgstr "" "inclou els objectes als quals facin referència les entrades del registre de " "referències" -#: builtin/pack-objects.c:2690 +#: builtin/pack-objects.c:2838 msgid "include objects referred to by the index" msgstr "inclou els objectes als quals faci referència l'índex" -#: builtin/pack-objects.c:2693 +#: builtin/pack-objects.c:2841 msgid "output pack to stdout" msgstr "emet el paquet a stdout" -#: builtin/pack-objects.c:2695 +#: builtin/pack-objects.c:2843 msgid "include tag objects that refer to objects to be packed" msgstr "" "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar" -#: builtin/pack-objects.c:2697 +#: builtin/pack-objects.c:2845 msgid "keep unreachable objects" msgstr "retén els objectes inabastables" -#: builtin/pack-objects.c:2699 +#: builtin/pack-objects.c:2847 msgid "pack loose unreachable objects" msgstr "empaqueta els objectes inabastables solts" -#: builtin/pack-objects.c:2700 parse-options.h:142 -msgid "time" -msgstr "hora" - -#: builtin/pack-objects.c:2701 +#: builtin/pack-objects.c:2849 msgid "unpack unreachable objects newer than