diff options
author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
---|---|---|
committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
commit | 8518a7a51faaf50f830646d4c3585f51236b9349 (patch) | |
tree | 4c7b9b1b1c22e457fbfa28ec64f33a0a469ebc02 /po/it.po | |
parent | 1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5 (diff) |
Squashed 'third_party/git/' changes from 5fa0f5238b..ef7aa56f96
af6b65d45e Git 2.26.2 7397ca3373 Git 2.25.4 b86a4be245 Git 2.24.3 f2771efd07 Git 2.23.3 c9808fa014 Git 2.22.4 9206d27eb5 Git 2.21.3 041bc65923 Git 2.20.4 76b54ee9b9 Git 2.19.5 ba6f0905fd Git 2.18.4 df5be6dc3f Git 2.17.5 1a3609e402 fsck: reject URL with empty host in .gitmodules e7fab62b73 credential: treat URL with empty scheme as invalid c44088ecc4 credential: treat URL without scheme as invalid fe29a9b7b0 credential: die() when parsing invalid urls a2b26ffb1a fsck: convert gitmodules url to URL passed to curl 8ba8ed568e credential: refuse to operate when missing host or protocol 24036686c4 credential: parse URL without host as empty host, not unset 73aafe9bc2 t0300: use more realistic inputs a88dbd2f8c t0300: make "quit" helper more realistic de49261b05 Git 2.26.1 274b9cc253 Git 2.26 55a7568606 Merge branch 'en/rebase-backend' c452dfa3f8 Merge tag 'l10n-2.26.0-rnd2.1' of git://github.com/git-l10n/git-po.git 1557364fb4 l10n: tr.po: change file mode to 644 2da1b05674 t3419: prevent failure when run with EXPENSIVE 1ae3a389c7 l10n: de.po: Update German translation for Git 2.26.0 5804c6ec40 l10n: de.po: add missing space 98cedd0233 Merge https://github.com/prati0100/git-gui 4914ba4bcf l10n: tr: Fix a couple of ambiguities a5728022e0 Merge branch 'py/remove-tcloo' 7fcb965970 RelNotes/2.26.0: fix various typos f0c03bcf95 l10n: Update Catalan translation 67b0a24910 Git 2.25.3 be8661a328 Sync with Git 2.25.2 0822e66b5d Git 2.25.2 65588b0b2e unicode: update the width tables to Unicode 13.0 7be274b0ff Merge branch 'js/ci-windows-update' into maint 9a75ecda1b Merge branch 'jk/run-command-formatfix' into maint 221887a492 Merge branch 'jk/doc-credential-helper' into maint 32fc2c6dd6 Merge branch 'js/mingw-open-in-gdb' into maint fe0d2c8ddb Merge branch 'js/test-unc-fetch' into maint 618db3621a Merge branch 'js/test-write-junit-xml-fix' into maint 50e1b4166f Merge branch 'en/simplify-check-updates-in-unpack-trees' into maint fda2baffd2 Merge branch 'jc/doc-single-h-is-for-help' into maint 41d910ea6c Merge branch 'hd/show-one-mergetag-fix' into maint 2d7247af6f Merge branch 'am/mingw-poll-fix' into maint 4e730fcd18 Merge branch 'hi/gpg-use-check-signature' into maint 76ccbdaf97 Merge branch 'ds/partial-clone-fixes' into maint 569b89842d Merge branch 'en/t3433-rebase-stat-dirty-failure' into maint 16a4bf1035 Merge branch 'en/check-ignore' into maint 3246495a5c Merge branch 'jk/push-option-doc-markup-fix' into maint 56f97d5896 Merge branch 'jk/doc-diff-parallel' into maint 1a4abcbb3b Merge branch 'jh/notes-fanout-fix' into maint 7e84f4608f Merge branch 'jk/index-pack-dupfix' into maint fa24bbe864 Merge branch 'js/rebase-i-with-colliding-hash' into maint a7a2e12b6e Merge branch 'jk/clang-sanitizer-fixes' into maint 93d0892891 Merge branch 'dt/submodule-rm-with-stale-cache' into maint dae477777e Merge branch 'pb/recurse-submodule-in-worktree-fix' into maint 758d0773ba Merge branch 'es/outside-repo-errmsg-hints' into maint f0c344ce57 Merge branch 'js/builtin-add-i-cmds' into maint 506223f9c5 Git 2.24.2 17a02783d8 Git 2.23.2 69fab82147 Git 2.22.3 fe22686494 Git 2.21.2 d1259ce117 Git 2.20.3 a5979d7009 Git 2.19.4 21a3e5016b Git 2.18.3 c42c0f1297 Git 2.17.4 d7d8b208da l10n: sv.po: Update Swedish translation (4839t0f0u) 3891a84ccd git-gui: create a new namespace for chord script evaluation 8a8efbe414 git-gui: reduce Tcl version requirement from 8.6 to 8.5 440e7442d1 l10n: zh_CN: Revise v2.26.0 translation 2b472aae5c l10n: zh_CN: for git v2.26.0 l10n round 1 and 2 6c85aac65f Git 2.26-rc2 74f172e39e Merge branch 'en/test-cleanup' e96327c947 Merge branch 'es/outside-repo-errmsg-hints' ee94b979b2 l10n: vi(4839t): Updated Vietnamese translation for v2.26.0 15fa8d9667 l10n: vi: fix translation + grammar 5c20398699 prefix_path: show gitdir if worktree unavailable 1fae9a4b1b l10n: zh_TW.po: v2.26.0 round 2 (0 untranslated) c73cfd5c79 l10n: zh_TW.po: v2.26.0 round 1 (11 untranslated) a4a2f64642 Merge branch 'js/askpass-coerce-utf8' 850cf9ae96 git-gui--askpass: coerce answers to UTF-8 on Windows d769dcc5cd Merge branch 'py/blame-status-error' 70e24186c0 t6022, t6046: fix flaky files-are-updated checks 30e9940356 Hopefully the final batch before -rc2 b4f0038525 Merge branch 'en/rebase-backend' 25f7d68ba9 Merge branch of github.com:ChrisADR/git-po into master 07259e74ec fsck: detect gitmodules URLs with embedded newlines c716fe4bd9 credential: detect unrepresentable values when parsing urls 17f1c0b8c7 t/lib-credential: use test_i18ncmp to check stderr 9a6bbee800 credential: avoid writing values with newlines 17ed936e96 l10n: it.po: update the Italian translation for Git 2.26.0 round 2 1afe18a3bb l10n: es: 2.26.0 round#2 5ab9217a3c Merge branch of github.com:alshopov/git-po into master c6713676d6 Merge branch of github.com:bitigchi/git-po into master b22e556314 l10n: bg.po: Updated Bulgarian translation (4839t) 2713dec02d l10n: tr: v2.26.0 round 2 c9ef57cc3a l10n: fr : v2.26.0 rnd 2 120b1eb731 git-rebase.txt: highlight backend differences with commit rewording 9a1b7474d6 sequencer: clear state upon dropping a become-empty commit 937d143630 i18n: unmark a message in rebase.c a56d361f66 Merge branch 'ds/sparse-add' 5fa9169ced Merge branch 'dr/push-remote-ref-update' cdef998b46 Merge branch 'jc/doc-single-h-is-for-help' 051fae4d51 l10n: git.pot: v2.26.0 round 2 (7 new, 2 removed) 52b2742df8 Merge branch 'master' of github.com:git/git into git-po-master 9643441983 l10n: tr: Add glossary for Turkish translations 438393202c Merge branch 'master' of github.com:nafmo/git-l10n-sv fa89e04fe1 Merge branch 'fr_2.26.0' of github.com:jnavila/git 2591c4cf6d l10n: sv.po: Update Swedish translation (4835t0f0u) dd2c269652 l10n: tr: Add Turkish translations 8f4f099f8b l10n: tr: Add Turkish translation team info b4374e96c8 Git 2.26-rc1 4a5c3e10f2 Merge branch 'rs/show-progress-in-dumb-http-fetch' 3658d77f8e Merge branch 'hd/show-one-mergetag-fix' 6125104b88 Merge branch 'rt/format-zero-length-fix' 1ac37deba2 Merge branch 'am/mingw-poll-fix' cf372dc815 Merge branch 'en/test-cleanup' d1075adfdf Merge branch 'en/merge-path-collision' a4fd114ffc Merge branch 'kk/complete-diff-color-moved' a0d752c1a3 Merge branch 'rj/t1050-use-test-path-is-file' 0e0d717537 Merge branch 'pb/am-show-current-patch' 9b7f726dfc Merge branch 'am/pathspec-f-f-more' 4605a73073 t1091: don't grep for `strerror()` string 4d9c2902a1 l10n: fr v2.26.0 rnd1 ad182bee3f Merge branch of github.com:alshopov/git-po into master 23fa46712a l10n: it.po: update the Italian translation for Git 2.26.0 round 1 98f24073a5 l10n: bg.po: Updated Bulgarian translation (4835t) f7c6172e97 l10n: git.pot: v2.26.0 round 1 (73 new, 38 removed) 76b1dcd1b2 Merge branch 'master' of github.com:git-l10n/git-po 076cbdcd73 Git 2.26-rc0 0d65f3fb1a t5537: adjust test_oid label e63cefb024 Merge branch 'hi/gpg-use-check-signature' 5da7329e29 Merge branch 'rs/commit-graph-code-simplification' 0108fc1b46 Merge branch 'js/ci-windows-update' f3ccd9f0d9 Merge branch 'be/describe-multiroot' a6b4709302 Merge branch 'ag/rebase-remove-redundant-code' b22db265d6 Merge branch 'es/recursive-single-branch-clone' e8e71848ea Merge branch 'jk/nth-packed-object-id' a0ab37de61 Merge branch 'es/do-not-let-rebase-switch-to-protected-branch' 4a2e91db65 Merge branch 'hv/receive-denycurrent-everywhere' 49e5043b09 Merge branch 'es/worktree-avoid-duplication-fix' 2cbb058669 Merge branch 'bc/wildcard-credential' 25063e2530 Merge branch 'mr/bisect-in-c-1' f4d7dfce4d Merge branch 'ds/sparse-add' 4d864895a2 t2402: test worktree path when called in .git directory af8ccd8ade remote: drop "explicit" parameter from remote_ref_for_branch() 7655b4119d remote-curl: show progress for fetches over dumb HTTP 2f268890c2 The eighth batch for 2.26 aa5a7e02ad Merge branch 'ma/test-cleanup' 58595e713c Merge branch 'rs/blame-typefix-for-fingerprint' ff41848e99 Merge branch 'rs/micro-cleanups' 4cbf1a0e22 Merge branch 'es/worktree-cleanup' 46703057c1 Merge branch 'ak/test-log-graph' 777815f5f9 Merge branch 'jk/run-command-formatfix' 444cff61b4 Merge branch 'ds/partial-clone-fixes' 48d5f25ddd Merge branch 'en/t3433-rebase-stat-dirty-failure' 8c22bd9ff9 Merge branch 'en/rebase-backend' cb2f5a8e97 Merge branch 'en/check-ignore' 0df82d99da Merge branch 'jk/object-filter-with-bitmap' 80648bb3f2 Merge branch 'jk/push-option-doc-markup-fix' 29b09c518c Merge branch 'jk/doc-diff-parallel' 237a28173f show_one_mergetag: print non-parent in hex form. 5eb9397e88 git-gui: fix error popup when doing blame -> "Show History Context" 6d1210e133 l10n: Update Catalan translation 0106b1d4be Revert "gpg-interface: prefer check_signature() for GPG verification" 7329d94be7 config.mak.dev: re-enable -Wformat-zero-length 7daf4f2ac7 rebase-interactive.c: silence format-zero-length warnings 94f4d01932 mingw: workaround for hangs when sending STDIN 1ff466c018 Documentation: clarify that `-h` alone stands for `help` 65bf820d0e t6020: new test with interleaved lexicographic ordering of directories 9f697ded88 t6022, t6046: test expected behavior instead of testing a proxy for it d5bb92eced t3035: prefer test_must_fail to bash negation for git commands b821ca788b t6020, t6022, t6035: update merge tests to use test helper functions 42d180dd01 t602[1236], t6034: modernize test formatting 802050400a merge-recursive: apply collision handling unification to recursive case 7f487ce062 Azure Pipeline: switch to the latest agent pools 5ed9fc3fc8 ci: prevent `perforce` from being quarantined eafff6e41e t/lib-httpd: avoid using macOS' sed d68ce906c7 commit-graph: use progress title directly 30b1c7ad9d describe: don't abort too early when searching tags 240fc04f81 builtin/rebase: remove a call to get_oid() on `options.switch_to' 2d2118b814 The seventh batch for 2.26 325eb66830 Merge branch 'es/doc-mentoring' 87f17d790d Merge branch 'es/bright-colors' d0038f4b31 Merge branch 'bw/remote-rename-update-config' 132f600b06 clone: pass --single-branch during --recurse-submodules 47319576f1 submodule--helper: use C99 named initializer ffe005576a lib-log-graph: consolidate colored graph cmp logic 989eea958b lib-log-graph: consolidate test_cmp_graph logic bb69b3b009 worktree: don't allow "add" validation to be fooled by suffix matching bb4995fc3f worktree: add utility to find worktree by pathname a80c4c2214 worktree: improve find_worktree() documentation 2fecc48cad packfile: drop nth_packed_object_sha1() 6ac9760a30 packed_object_info(): use object_id internally for delta base b99b6bcc57 packed_object_info(): use object_id for returning delta base 63f4a7fc01 pack-check: push oid lookup into loop e31c71083a pack-check: convert "internal error" die to a BUG() 500e4f2366 pack-bitmap: use object_id when loading on-disk bitmaps f66d4e0250 pack-objects: use object_id struct in pack-reuse code a93c141dde pack-objects: convert oe_set_delta_ext() to use object_id 3f83fd5e44 pack-objects: read delta base oid into object_id struct 0763671b8e nth_packed_object_oid(): use customary integer return 02bbbe9df9 worktree: drop unused code from get_main_worktree() 27f182b3fc blame: provide type of fingerprints pointer b5cabb4a96 rebase: refuse to switch to branch already checked out elsewhere df126ca142 t3400: make test clean up after itself 3c29e21eb0 t: drop debug `cat` calls cac439b56d t9810: drop debug `cat` call 91de82adc9 t4117: check for files using `test_path_is_file` 4ef346482d receive.denyCurrentBranch: respect all worktrees f8692114db t5509: use a bare repository for test push target 45f274fbb1 get_main_worktree(): allow it to be called in the Git directory fd0bc17557 completion: add diff --color-moved[-ws] 2ce6d075fa use strpbrk(3) to search for characters from a given set 2b3c430bce quote: use isalnum() to check for alphanumeric characters a51d9e8f07 t1050: replace test -f with test_path_is_file 3e96c66805 partial-clone: avoid fetching when looking for objects d0badf8797 partial-clone: demonstrate bugs in partial fetch 539052f42f run-command.h: fix mis-indented struct member 6c11c6a124 sparse-checkout: allow one-character directories in cone mode aa416b22ea am: support --show-current-patch=diff to retrieve .git/rebase-apply/patch f3b4822899 am: support --show-current-patch=raw as a synonym for--show-current-patch e8ef1e8d6e am: convert "resume" variable to a struct bc8620b440 parse-options: convert "command mode" to a flag 62e7a6f7a1 parse-options: add testcases for OPT_CMDMODE() 46fd7b3900 credential: allow wildcard patterns when matching config 82eb249853 credential: use the last matching username in the config 588c70e10f t0300: add tests for some additional cases 732f934408 t1300: add test for urlmatch with multiple wildcards 3fa0e04667 mailmap: add an additional email address for brian m. carlson 8a98758a8d stash push: support the --pathspec-from-file option 8c3713cede stash: eliminate crude option parsing 3f3d8068f5 doc: stash: synchronize <pathspec> description b22909144c doc: stash: document more options 0093abc286 doc: stash: split options from description (2) 2b7460d167 doc: stash: split options from description (1) 5f393dc3aa rm: support the --pathspec-from-file option fb1c18fc46 merge-recursive: fix the refresh logic in update_file_flags 73113c5922 t3433: new rebase testcase documenting a stat-dirty-like failure 6c69f22233 bisect: libify `bisect_next_all` 9ec598e0d5 bisect: libify `handle_bad_merge_base` and its dependents 45b6370812 bisect: libify `check_good_are_ancestors_of_bad` and its dependents cdd4dc2d6a bisect: libify `check_merge_bases` and its dependents e8e3ce6718 bisect: libify `bisect_checkout` ce58b5d8b1 bisect: libify `exit_if_skipped_commits` to `error_if_skipped*` and its dependents 7613ec594a bisect--helper: return error codes from `cmd_bisect__helper()` 680e8a01e5 bisect: add enum to represent bisect returning codes bfacfce7d9 bisect--helper: introduce new `decide_next()` function b8e3b2f339 bisect: use the standard 'if (!var)' way to check for 0 292731c4c2 bisect--helper: change `retval` to `res` 16538bfd2c bisect--helper: convert `vocab_*` char pointers to char arrays 7ec8125fba check-ignore: fix documentation and implementation to match 2607d39da3 doc-diff: use single-colon rule in rendering Makefile 0aa6ce3094 doc/config/push: use longer "--" line for preformatted example 20a5fd881a rev-list --count: comment on the use of count_right++ 63a58457e0 Merge branch 'py/missing-bracket' 51ebf55b93 The sixth batch for 2.26 f97741f6e9 Merge branch 'es/outside-repo-errmsg-hints' 123538444f Merge branch 'jk/doc-credential-helper' e154451a2f Merge branch 'js/mingw-open-in-gdb' fc25a19265 Merge branch 'js/test-unc-fetch' 6365058605 Merge branch 'js/test-avoid-pipe' 966b69f02f Merge branch 'js/test-write-junit-xml-fix' d880c3de23 Merge branch 'jk/mailinfo-cleanup' 5d55554b1d Merge branch 'mr/show-config-scope' 9f3f38769d Merge branch 'rs/strbuf-insertstr' cbecc168d4 Merge branch 'rs/parse-options-concat-dup' 5af345a438 Merge branch 'bc/hash-independent-tests-part-8' 0460c109c3 Merge branch 'rs/name-rev-memsave' 6b9919c0a2 git-gui: add missing close bracket 5897e5ac96 Merge branch 'cs/german-translation' cf85a32eb6 git-gui: update German translation 5096e51c54 git-gui: extend translation glossary template with more terms 8b85bb1b70 git-gui: update pot template and German translation to current source code e68e29171c Sync with 2.25.1 c522f061d5 Git 2.25.1 10cdb9f38a rebase: rename the two primary rebase backends 2ac0d6273f rebase: change the default backend from "am" to "merge" 8295ed690b rebase: make the backend configurable via config setting 76340c8107 rebase tests: repeat some tests using the merge backend instead of am 980b482d28 rebase tests: mark tests specific to the am-backend with --am c2417d3af7 rebase: drop '-i' from the reflog for interactive-based rebases 6d04ce75c4 git-prompt: change the prompt for interactive-based rebases 52eb738d6b rebase: add an --am option 8af14f0859 rebase: move incompatibility checks between backend options a bit earlier be50c938df git-rebase.txt: add more details about behavioral differences of backends befb89ce7c rebase: allow more types of rebases to fast-forward 9a70f3d4ae t3432: make these tests work with either am or merge backends 93122c985a rebase: fix handling of restrict_revision 55d2b6d785 rebase: make sure to pass along the quiet flag to the sequencer 8a997ed132 rebase, sequencer: remove the broken GIT_QUIET handling 7db00f0b3b t3406: simplify an already simple test e98c4269c8 rebase (interactive-backend): fix handling of commits that become empty d48e5e21da rebase (interactive-backend): make --keep-empty the default e0020b2f82 prefix_path: show gitdir when arg is outside repo cc4f2eb828 doc: move credential helper info into gitcredentials(7) bfdd66e72f Sync with maint 7ae7e234c7 The fifth batch for 2.26 53c3be2c29 Merge branch 'tb/commit-graph-object-dir' 7b029ebaef Merge branch 'jk/index-pack-dupfix' aa21cc97bd Merge branch 'jk/alloc-cleanups' 883326077a Merge branch 'jh/notes-fanout-fix' f2dcfcc21d Merge branch 'pk/status-of-uncloned-submodule' 78e67cda42 Merge branch 'mt/use-passed-repo-more-in-funcs' df04a31617 Merge branch 'jk/diff-honor-wserrhighlight-in-plumbing' 433b8aac2e Merge branch 'ds/sparse-checkout-harden' 4a77434bc8 Merge branch 'ld/p4-cleanup-processes' 8fb3945037 Merge branch 'jt/connectivity-check-optim-in-partial-clone' 09e48400a3 Merge branch 'jk/get-oid-error-message-i18n' 4dbeecba27 Merge branch 'ag/edit-todo-drop-check' f7f43afb19 Merge branch 'dl/test-must-fail-fixes-2' d8b8d59054 Merge branch 'ag/rebase-avoid-unneeded-checkout' 251187084d Merge branch 'js/rebase-i-with-colliding-hash' c9a33e5e5d Merge branch 'kw/fsmonitor-watchman-racefix' 56ceb64eb0 Merge branch 'mt/threaded-grep-in-object-store' 0da63da794 Merge branch 'jn/promote-proto2-to-default' a14aebeac3 Merge branch 'jk/packfile-reuse-cleanup' daef1b300b Merge branch 'hw/advice-add-nothing' 6141e0cc00 Merge branch 'js/convert-typofix' into maint 4e52c1ae27 Merge branch 'js/ci-squelch-doc-warning' into maint 5cee4ffff8 Merge branch 'jb/multi-pack-index-docfix' into maint b907ca76f0 Merge branch 'ma/diff-doc-clarify-regexp-example' into maint 7137d6089b Merge branch 'ms/doc-bundle-format' into maint 52d620fdc6 Merge branch 'es/submodule-fetch-message-fix' into maint 0ecc7d62f4 Merge branch 'jb/parse-options-message-fix' into maint 1ea6edfd55 Merge branch 'ma/filter-branch-doc-caret' into maint cfa25e197d Merge branch 'km/submodule-doc-use-sm-path' into maint 153a1b46f1 Merge branch 'pb/do-not-recurse-grep-no-index' into maint 8857657cc9 Merge branch 'jt/t5616-robustify' into maint 1f7609b520 Merge branch 'en/fill-directory-fixes-more' into maint f468972671 Merge branch 'bc/misconception-doc' into maint 6e69042e26 Merge branch 'bc/author-committer-doc' into maint 650ed395be Merge branch 'ds/refmap-doc' into maint 80b806f1a8 Merge branch 'bc/actualmente' into maint eceff4ba12 Merge branch 'rt/submodule-i18n' into maint 8a17eb7972 Merge branch 'jk/test-fixes' into maint 54bbadaeca Merge branch 'jk/asan-build-fix' into maint 8dbeba198e Merge branch 'ds/sparse-cone' into maint e361f36f61 Merge branch 'nd/switch-and-restore' into maint 4a60c63a75 Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' into maint ad9c895463 Merge branch 'hw/tutorial-favor-switch-over-checkout' into maint 5ae057d9a8 Merge branch 'es/unpack-trees-oob-fix' into maint c17cf77e4e Merge branch 'bc/run-command-nullness-after-free-fix' into maint d0ebd645b1 Merge branch 'en/string-list-can-be-custom-sorted' into maint 9eddeaece1 Merge branch 'jt/sha1-file-remove-oi-skip-cached' into maint 3bba763373 Merge branch 'hw/commit-advise-while-rejecting' into maint 3ab3185f99 pack-objects: support filters with bitmaps 84243da129 pack-bitmap: implement BLOB_LIMIT filtering 4f3bd5606a pack-bitmap: implement BLOB_NONE filtering cc4aa28506 bitmap: add bitmap_unset() function 2aaeb9ac41 rev-list: use bitmap filters for traversal 6663ae0a08 pack-bitmap: basic noop bitmap filter infrastructure 4eb707ebd6 rev-list: allow commit-only bitmap traversals ea047a8eb4 t5310: factor out bitmap traversal comparison 608d9c9365 rev-list: allow bitmaps when counting objects 55cb10f9b5 rev-list: make --count work with --objects 792f811998 rev-list: factor out bitmap-optimized routines d90fe06ea7 pack-bitmap: refuse to do a bitmap traversal with pathspecs 08809c09aa mingw: add a helper function to attach GDB to the current process bfe2bbb47f t5580: test cloning without file://, test fetching via UNC paths de26f02db1 t9001, t9116: avoid pipes a2dc43414c MyFirstContribution: rephrase contact info e03f928e2a rev-list: fallback to non-bitmap traversal when filtering acac50dd8c pack-bitmap: fix leak of haves/wants object lists 551cf8b655 pack-bitmap: factor out type iterator initialization d8437c57fa The fourth batch for 2.26 a3dcf84df0 Merge branch 'js/convert-typofix' 0de2d1409b Merge branch 'js/ci-squelch-doc-warning' 0410c2ba31 Merge branch 'jb/multi-pack-index-docfix' 0d114107f5 Merge branch 'ma/diff-doc-clarify-regexp-example' e99c325bb4 Merge branch 'ms/doc-bundle-format' afa34c5cf3 Merge branch 'es/submodule-fetch-message-fix' db72f8c940 Merge branch 'jb/parse-options-message-fix' 3d2471ba85 Merge branch 'ma/filter-branch-doc-caret' b2099ebb12 Merge branch 'km/submodule-doc-use-sm-path' 44cba9c4b3 Merge branch 'jc/skip-prefix' 556ccd4dd2 Merge branch 'pb/do-not-recurse-grep-no-index' 17e4a1b141 Merge branch 'hw/doc-git-dir' 4cf7f48891 Merge branch 'jk/push-default-doc' b783391018 Merge branch 'jk/clang-sanitizer-fixes' a74c387495 Merge branch 'dt/submodule-rm-with-stale-cache' 3f7553acf5 Merge branch 'jt/t5616-robustify' 341f8a6476 Merge branch 'jk/escaped-wildcard-dwim' b486d2ee81 Merge branch 'jn/pretend-object-doc' 076ee3e8a2 tests: fix --write-junit-xml with subshells 2b0f19fa7a convert: fix typo c444f032e4 color.c: alias RGB colors 8-15 to aixterm colors 1751b09a92 color.c: support bright aixterm colors 4a28eb0ae4 color.c: refactor color_output arguments f696a2b1c8 mailinfo: factor out some repeated header handling ffbea1816d mailinfo: be more liberal with header whitespace f447d0293e mailinfo: simplify parsing of header values b6537d83ee mailinfo: treat header values as C strings ef07659926 sparse-checkout: work with Windows paths 2631dc879d sparse-checkout: create 'add' subcommand 4bf0c06c71 sparse-checkout: extract pattern update from 'set' subcommand 6fb705abcb sparse-checkout: extract add_patterns_from_input() b3fd6cbf29 remote rename/remove: gently handle remote.pushDefault config f2a2327a4a config: provide access to the current line number 923d4a5ca4 remote rename/remove: handle branch.<name>.pushRemote config values ceff1a1308 remote: clean-up config callback 1a83068c26 remote: clean-up by returning early to avoid one indentation 88f8576eda pull --rebase/remote rename: document and honor single-letter abbreviations rebase types 145d59f482 config: add '--show-scope' to print the scope of a config value 9a83d088ee submodule-config: add subomdule config scope e37efa40e1 config: teach git_config_source to remember its scope 5c105a842e config: preserve scope in do_git_config_sequence 6766e41b8a config: clarify meaning of command line scoping 6dc905d974 config: split repo scope to local and worktree a5cb4204b6 config: make scope_name non-static and rename it 30183894ea ci: ignore rubygems warning in the "Documentation" job 7a9f8ca805 parse-options: simplify parse_options_dup() c84078573e parse-options: const parse_options_concat() parameters f904f9025f parse-options: factor out parse_options_count() a277d0a67f parse-options: use COPY_ARRAY in parse_options_concat() 517b60564e mailinfo: don't insert header prefix for handle_content_type() a91cc7fad0 strbuf: add and use strbuf_insertstr() eb31044ff7 pack-format: correct multi-pack-index description 9299f84921 diff-options.txt: avoid "regex" overload in example 7378ec90e1 doc: describe Git bundle format f3037657e8 t6024: update for SHA-256 edf04243b2 t6006: make hash size independent 5db24dcffd t6000: abstract away SHA-1-specific constants d341e0805d t5703: make test work with SHA-256 88ed241a7e t5607: make hash size independent 48c10cc0e6 t5318: update for SHA-256 f7ae8e69b6 t5515: make test hash independent e70649bb66 t5321: make test hash independent a30f93b143 t5313: make test hash independent a79eec220b t5309: make test hash independent 796d1383a3 t5302: make hash size independent 417e45e5e3 t4060: make test work with SHA-256 dfa5f53e78 t4211: add test cases for SHA-256 f743e8f5b3 t4211: move SHA-1-specific test cases into a directory 72f936b120 t4013: make test hash independent 5df0f11f07 t3311: make test work with SHA-256 07877f393c t3310: make test work with SHA-256 6025e898d6 t3309: make test work with SHA-256 7b1a1822fe t3308: make test work with SHA-256 94db7e3e93 t3206: make hash size independent db12505c2c t/lib-pack: support SHA-256 303b3c1c46 submodule: add newline on invalid submodule error 887a0fd573 add: change advice config variables used by the add API de93cc14ab The third batch for 2.26 ea46d9097b Merge branch 'mt/sparse-checkout-doc-update' ff5134b2ff Merge branch 'pb/recurse-submodule-in-worktree-fix' b5c71cc33d Merge branch 'es/fetch-show-failed-submodules-atend' 7ab963e122 Merge branch 'en/fill-directory-fixes-more' f52ab33616 Merge branch 'bc/hash-independent-tests-part-7' 25794d6ce9 Merge branch 'km/submodule-add-errmsg' d0e70cd32e Merge branch 'am/checkout-file-and-ref-ref-ambiguity' 76c57fedfa Merge branch 'js/add-p-leftover-bits' 9a5315edfd Merge branch 'js/patch-mode-in-others-in-c' 381e8e9de1 Merge branch 'dl/test-must-fail-fixes' 395518cf7a parse-options: lose an unnecessary space in an error message 079f970971 name-rev: sort tip names before applying 2d53975488 name-rev: release unused name strings 977dc1912b name-rev: generate name strings only if they are better 1c56fc2084 name-rev: pre-size buffer in get_parent_name() ddc42ec786 name-rev: factor out get_parent_name() f13ca7cef5 name-rev: put struct rev_name into commit slab d689d6d82f name-rev: don't _peek() in create_or_update_name() 15a4205d96 name-rev: don't leak path copy in name_ref() 36d2419c9a name-rev: respect const qualifier 71620ca86c name-rev: remove unused typedef 3e2feb0d64 name-rev: rewrite create_or_update_name() a21781011f index-pack: downgrade twice-resolved REF_DELTA to die() dbc27477ff notes.c: fix off-by-one error when decreasing notes fanout e1c5253951 t3305: check notes fanout more carefully and robustly e469afe158 git-filter-branch.txt: wrap "maths" notation in backticks a7df60cac8 commit-graph.h: use odb in 'load_commit_graph_one_fd_st' ad2dd5bb63 commit-graph.c: remove path normalization, comparison 13c2499249 commit-graph.h: store object directory in 'struct commit_graph' 0bd52e27e3 commit-graph.h: store an odb in 'struct write_commit_graph_context' f38c92452d t7400: testcase for submodule status on unregistered inner git repos 5290d45134 tree-walk.c: break circular dependency with unpack-trees f998a3f1e5 sparse-checkout: fix cone mode behavior mismatch d2e65f4c90 sparse-checkout: improve docs around 'set' in cone mode e53ffe2704 sparse-checkout: escape all glob characters on write e55682ea26 sparse-checkout: use C-style quotes in 'list' subcommand bd64de42de sparse-checkout: unquote C-style strings over --stdin d585f0e799 sparse-checkout: write escaped patterns in cone mode 4f52c2ce6c sparse-checkout: properly match escaped characters 9abc60f801 sparse-checkout: warn on globs in cone patterns 145136a95a C: use skip_prefix() to avoid hardcoded string length 04e5b3f0b4 submodule foreach: replace $path with $sm_path in example 1793280e91 t5318: don't pass non-object directory to '--object-dir' da8063522f diff: move diff.wsErrorHighlight to "basic" config b98d188581 sha1-file: allow check_object_signature() to handle any repo 2dcde20e1c sha1-file: pass git_hash_algo to hash_object_file() 7ad5c44d9c sha1-file: pass git_hash_algo to write_object_file_prepare() c8123e72f6 streaming: allow open_istream() to handle any repo 5ec9b8accd pack-check: use given repo's hash_algo at verify_packfile() a651946730 cache-tree: use given repo's hash_algo at verify_one() eb999b3295 diff: make diff_populate_filespec() honor its repo argument 5b0ca878e0 Sync with maint 344ee18728 The second batch 53a83299c7 Merge branch 'bc/misconception-doc' c9ccf9d09b Merge branch 'bc/author-committer-doc' 0d0fa20c40 Merge branch 'ss/t6025-modernize' 7050624abc Merge branch 'lh/bool-to-type-bool' 4b69f29271 Merge branch 'ds/refmap-doc' aff812ce3c Merge branch 'bc/actualmente' 38fb56e92a Merge branch 'rt/submodule-i18n' f0940743fa Merge branch 'js/builtin-add-i-cmds' 0afeb3fdf4 Merge branch 'jk/test-fixes' 808dab2b58 Merge branch 'jk/asan-build-fix' fec1ff97c2 Merge branch 'sg/completion-worktree' c7372c9e2c Merge branch 'jn/test-lint-one-shot-export-to-shell-function' 11ad30b887 Merge branch 'hi/gpg-mintrustlevel' 96aef8f684 Merge branch 'am/test-pathspec-f-f-error-cases' d52adee779 Merge branch 'ds/graph-horizontal-edges' 6909474491 Merge branch 'am/update-pathspec-f-f-tests' 043426c8fd Merge branch 'ds/sparse-cone' 34246a1a3c Merge branch 'hi/indent-text-with-tabs-in-editorconfig' 8dd40c0472 traverse_trees(): use stack array for name entries 667b76ec58 walker_fetch(): avoid raw array length computation 9734b74a8f normalize_path_copy(): document "dst" size expectations 43f33e492a git-p4: avoid leak of file handle when cloning 19fa5ac333 git-p4: check for access to remote host earlier 6026aff5bb git-p4: cleanup better on error exit ca5b5cce62 git-p4: create helper function importRevisions() 4c1d58675d git-p4: disable some pylint warnings, to get pylint output to something manageable 5c3d5020e6 git-p4: add P4CommandException to report errors talking to Perforce 837b3a6376 git-p4: make closeStreams() idempotent b0418303b1 sha1-name: mark get_oid() error messages for translation 2df1aa239c fetch: forgo full connectivity check if --filter 50033772d5 connected: verify promisor-ness of partial clone d82ad54945 git: update documentation for --git-dir 0ad7144999 .mailmap: map Yi-Jyun Pan's email c56c48dd07 grep: ignore --recurse-submodules if --no-index is given 8b2a1928f0 doc: drop "explicitly given" from push.default description cf82bff73f obstack: avoid computing offsets from NULL pointer 3cd309c16f xdiff: avoid computing non-zero offset from NULL pointer d20bc01a51 avoid computing zero offsets from NULL pointer 7edee32985 git rm submodule: succeed if .gitmodules index stat info is zero bc3f657f71 t1506: drop space after redirection operator e5d7b2f65c t1400: avoid "test" string comparisons 5a5445d878 rebase-interactive: warn if commit is dropped with `rebase --edit-todo' 1da5874c1b sequencer: move check_todo_list_from_file() to rebase-interactive.c c7a6207591 Sync with maint 7210ca4ee5 .mailmap: fix GGG authoship screwup 37a63faae5 t4124: only mark git command with test_must_fail a8c663cf65 t3507: use test_path_is_missing() 2def7f017c t3507: fix indentation e8a1c686ae t3504: do check for conflict marker after failed cherry-pick 1c9fd32fd2 t3419: stop losing return code of git command c232ffa83c t3415: increase granularity of test_auto_{fixup,squash}() a781cd6fef t3415: stop losing return codes of git commands 86ce6e0dd1 t3310: extract common notes_merge_files_gone() 245b9ba0ba t3030: use test_path_is_missing() 4a6f11fd7b t2018: replace "sha" with "oid" 62e80fcb48 t2018: don't lose return code of git commands 30c0367668 t2018: teach do_checkout() to accept `!` arg 40caa5366a t2018: be more discerning when checking for expected exit codes b54128bb0b t5616: make robust to delta base change 4c616c2ba1 merge-recursive: use subtraction to flip stage ee798742bd merge-recursive: silence -Wxor-used-as-pow warning 39e21c6ef5 verify_filename(): handle backslashes in "wildcards are pathspecs" rule a0ba80001a .mailmap: fix erroneous authorship for Johannes Schindelin 3b2885ec9b submodule: fix status of initialized but not cloned submodules ace912bfb8 t7400: add a testcase for submodule status on empty dirs 4bb4fd4290 MyFirstContribution: add avenues for getting help 9e6d3e6417 sparse-checkout: detect short patterns 41de0c6fbc sparse-checkout: cone mode does not recognize "**" 7aa9ef2fca sparse-checkout: fix documentation typo for core.sparseCheckoutCone 47dbf10d8a clone: fix --sparse option with URLs 3c754067a1 sparse-checkout: create leading directories d622c34396 t1091: improve here-docs 522e641748 t1091: use check_files to reduce boilerplate 417be08d02 t1300: create custom config file without special characters 3de7ee369b t1300: fix over-indented HERE-DOCs 329e6ec397 config: fix typo in variable name 767a9c417e rebase -i: stop checking out the tip of the branch to rebase dfaed02862 fsmonitor: update documentation for hook version and watchman hooks e4e1e8342a fsmonitor: add fsmonitor hook scripts for version 2 d031049da3 completion: add support for sparse-checkout a402723e48 doc: sparse-checkout: mention --cone option 26027625dd rebase -i: also avoid SHA-1 collisions with missingCommitsCheck b6992261de rebase -i: re-fix short SHA-1 collision d859dcad94 parse_insn_line(): improve error message when parsing failed d2ea031046 pack-bitmap: don't rely on bitmap_git->reuse_objects 92fb0db94c pack-objects: add checks for duplicate objects bb514de356 pack-objects: improve partial packfile reuse ff483026a9 builtin/pack-objects: introduce obj_is_packed() e704fc7978 pack-objects: introduce pack.allowPackReuse 2f4af77699 csum-file: introduce hashfile_total() 8ebf529661 pack-bitmap: simplify bitmap_has_oid_in_uninteresting() 59b2829ec5 pack-bitmap: uninteresting oid can be outside bitmapped packfile 40d18ff8c6 pack-bitmap: introduce bitmap_walk_contains() 14fbd26044 ewah/bitmap: introduce bitmap_word_alloc() bc7a3d4dc0 The first batch post 2.25 cycle 09e393d913 Merge branch 'nd/switch-and-restore' 45f47ff01d Merge branch 'jk/no-flush-upon-disconnecting-slrpc-transport' 0f501545a3 Merge branch 'hw/tutorial-favor-switch-over-checkout' 36da2a8635 Merge branch 'es/unpack-trees-oob-fix' 42096c778d Merge branch 'bc/run-command-nullness-after-free-fix' 1f10b84e43 Merge branch 'en/string-list-can-be-custom-sorted' a3648c02a2 Merge branch 'en/simplify-check-updates-in-unpack-trees' e26bd14c8d Merge branch 'jt/sha1-file-remove-oi-skip-cached' 9403e5dcdd Merge branch 'hw/commit-advise-while-rejecting' 237a83a943 Merge branch 'dl/credential-netrc' a9472afb63 submodule.c: use get_git_dir() instead of get_git_common_dir() 129510a067 t2405: clarify test descriptions and simplify test 4eaadc8493 t2405: use git -C and test_commit -C instead of subshells 773c60a45e t7410: rename to t2405-worktree-submodule.sh 7a2dc95cbc docs: mention when increasing http.postBuffer is valuable 1b13e9032f doc: dissuade users from trying to ignore tracked files 69e104d70e doc: provide guidance on user.name format 813f6025a5 docs: expand on possible and recommended user config options bc94e5862a doc: move author and committer information to git-commit(1) 7979dfe1d4 l10n: Update Catalan translation 81e3db42f3 templates: fix deprecated type option `--bool` c513a958b6 t6025: use helpers to replace test -f <path> 70789843bd t6025: modernize style 6a7aca6f01 doc: rm: synchronize <pathspec> description 856249c62a docs: use "currently" for the present time b40a50264a fetch: document and test --refmap="" a9ae8fde2e t3404: directly test the behavior of interest 22a69fda19 git-rebase.txt: update description of --allow-empty-message f1928f04b2 grep: use no. of cores as the default no. of threads 70a9fef240 grep: move driver pre-load out of critical section 1184a95ea2 grep: re-enable threads in non-worktree case 6c307626f1 grep: protect packed_git [re-]initialization c441ea4edc grep: allow submodule functions to run in parallel d7992421e1 submodule-config: add skip_if_read option to repo_read_gitmodules() 1d1729caeb grep: replace grep_read_mutex by internal obj read lock 31877c9aec object-store: allow threaded access to object reading b1fc9da1c8 replace-object: make replace operations thread-safe d5b0bac528 grep: fix racy calls in grep_objects() faf123c730 grep: fix race conditions at grep_submodule() c3a5bb31c1 grep: fix race conditions on userdiff calls 0222540827 fetch: emphasize failure during submodule fetch 232378479e Sync with maint e4837b4406 t7800: don't rely on reuse_worktree_file() fbce03d329 t4018: drop "debugging" cat from hunk-header tests f65d07fffa Makefile: use compat regex with SANITIZE=address 849e43cc18 built-in add -i: accept open-ended ranges again d660a30ceb built-in add -i: do not try to `patch`/`diff` an empty list of files a4ffbbbb99 submodule.c: mark more strings for translation 0cbb60574e dir: point treat_leading_path() warning to the right place ad6f2157f9 dir: restructure in a way to avoid passing around a struct dirent 22705334b9 dir: treat_leading_path() and read_directory_recursive(), round 2 f365bf40a0 clean: demonstrate a bug with pathspecs b6d4d82bd5 msvc: accommodate for vcpkg's upgrade to OpenSSL v1.1.x 277eb5af7c t5604: make hash independent 44b6c05b43 t5601: switch into repository to hash object 7a868c51c2 t5562: use $ZERO_OID 1b8f39fb0d t5540: make hash size independent a8c17e3bd6 t5537: make hash size independent 832072219c t5530: compute results based on object length 74ad99b1d8 t5512: abstract away SHA-1-specific constants ba1be1ab45 t5510: make hash size independent cba472d3ad t5504: make hash algorithm independent 82d5aeb1e6 t5324: make hash size independent 3c5e65cac1 t5319: make test work with SHA-256 235d3cddb8 t5319: change invalid offset for SHA-256 compatibility 1d86c8f0ce t5318: update for SHA-256 525a7f1769 t4300: abstract away SHA-1-specific constants 7a1bcb251b t4204: make hash size independent cb78f4f0fe t4202: abstract away SHA-1-specific constants 717c939d8f t4200: make hash size independent 08a9dd891c t4134: compute appropriate length constant 215b60bf07 t4066: compute index line in diffs 194264c185 t4054: make hash-size independent 7d5ecd775d completion: list paths and refs for 'git worktree add' 3027e4f9a8 completion: list existing working trees for 'git worktree' subcommands 3c86f6cde8 completion: simplify completing 'git worktree' subcommands and options 367efd54b3 completion: return the index of found word from __git_find_on_cmdline() d447fe2bfe completion: clean up the __git_find_on_cmdline() helper function 2712e91564 t9902-completion: add tests for the __git_find_on_cmdline() helper 54887b4689 gpg-interface: add minTrustLevel as a configuration option 684ceae32d fetch: default to protocol version 2 33166f3a1f protocol test: let protocol.version override GIT_TEST_PROTOCOL_VERSION 8a1b0978ab test: request GIT_TEST_PROTOCOL_VERSION=0 when appropriate b9ab170752 config doc: protocol.version is not experimental 07ef3c6604 fetch test: use more robust test for filtered objects d6509da620 fetch test: mark test of "skipping" haves as v0-only a7fbf12f2f t/check-non-portable-shell: detect "FOO= shell_func", too c7973f249e fetch test: avoid use of "VAR= cmd" with a shell function bf66db37f1 add: use advise function to display hints c958d3bd0a graph: fix collapse of multiple edges 8588932e20 graph: add test to demonstrate horizontal line bug d0d0a357a1 t: directly test parse_pathspec_file() 568cabb2fe t: fix quotes tests for --pathspec-from-file f94f7bd00d t: add tests for error conditions with --pathspec-from-file b2627cc3d4 ci: include the built-in `git add -i` in the `linux-gcc` job 12acdf573a built-in add -p: handle Escape sequences more efficiently e118f06396 built-in add -p: handle Escape sequences in interactive.singlekey mode 04f816b125 built-in add -p: respect the `interactive.singlekey` config setting a5e46e6b01 terminal: add a new function to read a single keystroke 9ea416cb51 terminal: accommodate Git for Windows' default terminal 94ac3c31f7 terminal: make the code of disable_echo() reusable 08b1ea4c39 built-in add -p: handle diff.algorithm 180f48df69 built-in add -p: support interactive.diffFilter 1e4ffc765d t3701: adjust difffilter test c81638541c submodule add: show 'add --dry-run' stderr when aborting 8da2c57629 fsmonitor: handle version 2 of the hooks that will use opaque token 56c6910028 fsmonitor: change last update timestamp on the index_state to opaque token d0654dc308 Git 2.25 b4615e40a8 Merge tag 'l10n-2.25.0-rnd1' of git://github.com/git-l10n/git-po 4d924528d8 Revert "Merge branch 'ra/rebase-i-more-options'" ddc12c429b l10n: zh_CN: for git v2.25.0 l10n round 1 e23b95e75b Merge branch 'master' of github.com:Softcatala/git-po into git-po-master 1cf4836865 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' d78a1968c5 Merge branch 'ma/config-advice-markup-fix' a20ae3ee29 l10n: Update Catalan translation 49e268e23e mingw: safeguard better against backslashes in file names 4c6c7971e0 unpack-trees: correctly compute result count 63a5650a49 l10n: de.po: Update German translation v2.25.0 round 1 75449c1b39 l10n: de.po: Reword generation numbers 6b6a9803fb l10n: bg.po: Updated Bulgarian translation (4800t) 3901d2c6bd config/advice.txt: fix description list separator 7a6a90c6ec Git 2.25-rc2 1f5f3ffe5c Merge branch 'ds/graph-assert-fix' a4e4140ac9 Merge branch 'tm/doc-submodule-absorb-fix' 202f68b252 Merge branch 'pm/am-in-body-header-doc-update' 7e65f8638e Merge branch 'jb/doc-multi-pack-idx-fix' c5dc20638b Merge branch 'do/gitweb-typofix-in-comments' fe47c9cb5f Merge https://github.com/prati0100/git-gui a1087c9367 graph: fix lack of color in horizontal lines 0d251c3291 graph: drop assert() for merge with two collapsing parents 4d8cab95cc transport: don't flush when disconnecting stateless-rpc helper 573117dfa5 unpack-trees: watch for out-of-range index position e701bab3e9 restore: invalidate cache-tree when removing entries with --staged 1a7e454dd6 doc/gitcore-tutorial: fix prose to match example command fa74180d08 checkout: don't revert file on ambiguous tracking branches 2957709bd4 parse_branchname_arg(): extract part as new function 5020f6806a t2018: improve style of if-statement 7ffb54618b t2018: add space between function name and () 63ab08fb99 run-command: avoid undefined behavior in exists_in_PATH 065027ee1a string-list: note in docs that callers can specify sorting function 26f924d50e unpack-trees: exit check_updates() early if updates are not wanted 042ed3e048 The final batch before -rc2 0f1930cd1b Merge branch 'ds/sparse-cone' 037f067587 Merge branch 'ds/commit-graph-set-size-mult' f25f04edca Merge branch 'en/merge-recursive-oid-eq-simplify' c20d4fd44a Merge branch 'ds/sparse-list-in-cone-mode' a578ef9e63 Merge branch 'js/mingw-loosen-overstrict-tree-entry-checks' c4117fcb97 Merge branch 'pb/clarify-line-log-doc' 556f0258df Merge branch 'ew/packfile-syscall-optim' 5814d44d9b doc: submodule: fix typo for command absorbgitdirs 7047f75f22 editorconfig: indent text files with tabs 60440d72db sha1-file: document how to use pretend_object_file 7fdc5f296f l10n: es: 2.25.0 round #1 f8740c586b am: document that Date: can appear as an in-body header 4e2c4c0d4f gitweb: fix a couple spelling errors in comments 421c0ffb02 multi-pack-index: correct configuration in documentation 757ff352bd Documentation/git-sparse-checkout.txt: fix a typo 0d2116c644 Merge branch 'zs/open-current-file' 9d48668cd5 l10n: sv.po: Update Swedish translation (4800t0f0u) 3a05aacddd Merge branch 'fr_v2.25.0_rnd1' of github.com:jnavila/git into master 4c5081614c l10n: fr.po v2.25.0 rnd 1 5bb457409c l10n: vi(4800t): Updated Vietnamese translation v2.25.0 63020f175f commit-graph: prefer default size_mult when given zero 224c7d70fa mingw: only test index entries for backslashes, not tree entries 9c8a294a1a sha1-file: remove OBJECT_INFO_SKIP_CACHED 8679ef24ed Git 2.25-rc1 a82027e9e6 Merge branch 'js/use-test-tool-on-path' 13432fc6dd Merge branch 'js/mingw-reserved-filenames' e0e1ac5db0 Merge branch 'en/rebase-signoff-fix' b76a244c9d Merge branch 'em/freebsd-cirrus-ci' bc855232bc Merge branch 'bk/p4-misc-usability' 763a59e71c merge-recursive: remove unnecessary oid_eq function 44143583b7 sparse-checkout: use extern for global variables d6a6263f5f Merge branch 'translation_191231' of github.com:l10n-tw/git-po into git-po-master 13185fd241 l10n: zh_TW.po: update translation for v2.25.0 round 1 786f4d2405 git-gui: allow opening currently selected file in default app 4fd683b6a3 sparse-checkout: document interactions with submodules de11951b03 sparse-checkout: list directories in cone mode 0d3ce942b0 l10n: it.po: update the Italian translation for Git 2.25.0 578c793731 l10n: git.pot: v2.25.0 round 1 (119 new, 13 removed) 173fff68da Merge tag 'v2.25.0-rc0' into git-po-master f1842ff531 t2018: remove trailing space from test description 20a67e8ce9 t3008: find test-tool through path lookup 9e341f62ca l10n: Update Catalan translation 4e61b2214d packfile: replace lseek+read with pread ace0f86c7f doc: log, gitk: line-log arguments must exist in starting revision 2be45868a8 doc: log, gitk: document accepted line-log diff formats 280738c36e packfile: remove redundant fcntl F_GETFD/F_SETFD 0a76bd7381 mailmap: mask accentless variant for Công Danh 99c33bed56 Git 2.25-rc0 d2189a721c Merge branch 'en/fill-directory-fixes' 8be0a428d6 Merge branch 'rs/test-cleanup' 65099bd775 Merge branch 'mr/bisect-save-pointer-to-const-string' c0c6a74594 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 45b96a6fa1 Merge branch 'js/add-p-in-c' ccc292e862 Merge branch 'jc/drop-gen-hdrs' dfee504bee Merge branch 'ja/doc-markup-cleanup' 87cbb1ca66 Merge branch 'rs/ref-read-cleanup' 20aa6d88b7 Merge branch 'rb/p4-lfs' fcd5b55f56 Merge branch 'pb/submodule-doc-xref' 4bfc9ccfb6 Merge branch 'mr/bisect-use-after-free' ba6b66281e Merge branch 'ln/userdiff-elixir' bd72a08d6c Merge branch 'ds/sparse-cone' f3c520e17f Merge branch 'sg/name-rev-wo-recursion' 6514ad40a1 Merge branch 'ra/t5150-depends-on-perl' 17066bea38 Merge branch 'dl/format-patch-notes-config-fixup' 135365dd99 Merge branch 'am/pathspec-f-f-checkout' ff0cb70d45 Merge branch 'am/pathspec-from-file' 4dc42c6c18 mingw: refuse paths containing reserved names 98d9b23e90 mingw: short-circuit the conversion of `/dev/null` to UTF-16 c480eeb574 commit --interactive: make it work with the built-in `add -i` cee6cb7300 built-in add -p: implement the "worktree" patch modes 52628f94fc built-in add -p: implement the "checkout" patch modes 6610e4628a built-in stash: use the built-in `git add -p` if so configured 90a6bb98d1 legacy stash -p: respect the add.interactive.usebuiltin setting 36bae1dc0e built-in add -p: implement the "stash" and "reset" patch modes d2a233cb8b built-in add -p: prepare for patch modes other than "stage" 761e3d26bb sparse-checkout: improve OS ls compatibility 6579d93a97 contrib/credential/netrc: work outside a repo 1c78c78d25 contrib/credential/netrc: make PERL_PATH configurable b5a9d7afcd CI: add FreeBSD CI support via Cirrus-CI b441717256 t1507: inline full_name() 9291e6329e t1507: run commands within test_expect_success 5236fce6b4 t1507: stop losing return codes of git commands 10812c2337 t1501: remove use of `test_might_fail cp` 62d58cda69 t1409: use test_path_is_missing() b87b02cfe6 t1409: let sed open its own input file 9b92070e52 t1307: reorder `nongit test_must_fail` 3595d10c26 t1306: convert `test_might_fail rm` to `rm -f` f511bc02ed t0020: use ! check_packed_refs_marked f6041abdcd t0020: don't use `test_must_fail has_cr` f46c243e66 t0003: don't use `test_must_fail attr_check` 99c049bc4c t0003: use test_must_be_empty() 3738439c77 t0003: use named parameters in attr_check() 7717242014 t0000: replace test_must_fail with run_sub_test_lib_test_err() b8afb908c2 t/lib-git-p4: use test_path_is_missing() 4fe7e43c53 rebase: fix saving of --signoff state for am-based rebases 6836d2fe06 dir.c: use st_add3() for allocation size c847dfafee dir: consolidate similar code in treat_directory() 777b420347 dir: synchronize treat_leading_path() and read_directory_recursive() b9670c1f5e dir: fix checks on common prefix directory 5c4f55f1f6 commit: honor advice.statusHints when rejecting an empty commit 23cbe427c4 Merge branch 'py/console-close-esc' 124a895811 t4015: improve coverage of function context test 509efef789 commit: forbid --pathspec-from-file --all 12029dc57d t3434: mark successful test as such e0f9095aaa notes.h: fix typos in comment 675ef6bab8 t6030: don't create unused file 01ed17dc8c t5580: don't create unused file f670adb49b t3501: don't create unused file 1e1ccbfdd3 git-gui: allow closing console window with Escape 7c5cea7242 bisect--helper: convert `*_warning` char pointers to char arrays. b02fd2acca The sixth batch 59d0b3be45 Merge branch 'rs/patch-id-use-oid-to-hex' e3b72391d1 Merge branch 'rs/commit-export-env-simplify' 43bf44e23a Merge branch 'rs/archive-zip-code-cleanup' 4438a1a59f Merge branch 'js/t3404-indent-fix' 3a44db2ed2 Merge branch 'dr/branch-usage-casefix' 8bc481f4f6 Merge branch 'sg/t9300-robustify' 011fc2e88e Merge branch 'js/add-i-a-bit-more-tests' d1c0fe8d9b Merge branch 'dl/range-diff-with-notes' 26c816a67d Merge branch 'hw/doc-in-header' f0070a7df9 Merge branch 'rs/xdiff-ignore-ws-w-func-context' 71a7de7a99 Merge branch 'dl/rebase-with-autobase' c9f5fc9114 Merge branch 'dl/test-cleanup' 6d831b8a3e Merge branch 'cs/store-packfiles-in-hashmap' 3beff388b2 Merge branch 'js/builtin-add-i-cmds' 4755a34c47 Merge branch 'dd/time-reentrancy' 37c2619d91 Merge branch 'ag/sequencer-todo-updates' 608e380502 git-p4: show detailed help when parsing options fail e2aed5fd5b git-p4: yes/no prompts should sanitize user text 571fb96573 fix-typo: consecutive-word duplications f371984613 Makefile: drop GEN_HDRS 2e4083198d built-in add -p: show helpful hint when nothing can be staged 54d9d9b2ee built-in add -p: only show the applicable parts of the help text ade246efed built-in add -p: implement the 'q' ("quit") command d6cf873340 built-in add -p: implement the '/' ("search regex") command 9254bdfb4f built-in add -p: implement the 'g' ("goto") command bcdd297b78 built-in add -p: implement hunk editing b38dd9e715 strbuf: add a helper function to call the editor "on an strbuf" 11f2c0dae8 built-in add -p: coalesce hunks after splitting them 510aeca199 built-in add -p: implement the hunk splitting feature 0ecd9d27fc built-in add -p: show different prompts for mode changes and deletions 5906d5de77 built-in app -p: allow selecting a mode change as a "hunk" 47dc4fd5eb built-in add -p: handle deleted empty files 80399aec5a built-in add -p: support multi-file diffs 7584dd3c66 built-in add -p: offer a helpful error message when hunk navigation failed 12c24cf850 built-in add -p: color the prompt and the help text 25ea47af49 built-in add -p: adjust hunk headers as needed e3bd11b4eb built-in add -p: show colored hunks by default 1942ee44e8 built-in add -i: wire up the new C code for the `patch` command f6aa7ecc34 built-in add -i: start implementing the `patch` functionality in C d1b1384d61 userdiff: remove empty subexpression from elixir regex df5be01669 doc: indent multi-line items in list fd5041e127 doc: remove non pure ASCII characters 190a65f9db sparse-checkout: respect core.ignoreCase in cone mode 1d7297513d notes: break set_display_notes() into smaller functions 66f79ee23d config/format.txt: clarify behavior of multiple format.notes cc2bd5c45d gitmodules: link to gitsubmodules guide 99f86bde83 remote: pass NULL to read_ref_full() because object ID is not needed e0ae2447d6 refs: pass NULL to refs_read_ref_full() because object ID is not needed 8c02fe6060 t7004: don't create unused file cb05d6a5ed t4256: don't create unused file c5c4eddd56 dir: break part of read_directory_recursive() out for reuse 072a231016 dir: exit before wildcard fall-through if there is no wildcard 2f5d3847d4 dir: remove stray quote character in comment a2b13367fe Revert "dir.c: make 'git-status --ignored' work within leading directories" 452efd11fb t3011: demonstrate directory traversal failures ea94b16fb8 git-p4: honor lfs.storage configuration variable 51a0a4ed95 bisect--helper: avoid use-after-free d32e065a91 Merge branch 'kk/branch-name-encoding' ad05a3d8e5 The fifth batch 7cc5f89088 Merge branch 'ag/sequencer-continue-leakfix' b089e5e6cb Merge branch 'em/test-skip-regex-illseq' 930078ba39 Merge branch 'hi/gpg-use-check-signature' 08d2f46d0c Merge branch 'bc/t9001-zsh-in-posix-emulation-mode' 7aba2b7fd6 Merge branch 'sg/test-squelch-noise-in-commit-bulk' 55c37d12d3 Merge branch 'jk/perf-wo-git-dot-pm' 41dac79c2f Merge branch 'ds/commit-graph-delay-gen-progress' 5dd1d59d35 Merge branch 'jt/clone-recursesub-ref-advise' dac30e7b5d Merge branch 'as/t7812-missing-redirects-fix' d37cfe3b5c Merge branch 'dl/pretty-reference' 99c4ff1bda Merge branch 'dl/submodule-set-url' 55d607d85b Merge branch 'js/mingw-inherit-only-std-handles' c58ae96fc4 Merge branch 'am/pathspec-from-file' 7c88714262 Merge branch 'po/bundle-doc-clonable' 5d9324e0f4 Merge branch 'ra/rebase-i-more-options' 7034cd094b Sync with Git 2.24.1 09ac67a183 format-patch: move git_config() before repo_init_revisions() 8164c961e1 format-patch: use --notes behavior for format.notes 452538c358 notes: extract logic into set_display_notes() e6e230eeae notes: create init_display_notes() helper 1e6ed5441a notes: rename to load_display_notes() 2866fd284c name-rev: cleanup name_ref() 49f7a2fde9 name-rev: eliminate recursion in name_rev() fee984bcab name-rev: use 'name->tip_name' instead of 'tip_name' e05e8cf074 archive-zip: use enum for compression method 39acfa3d22 git gui: fix branch name encoding error 11de8dd7ef l10n: minor case fix in 'git branch' '--unset-upstream' description 8cf8f9b4aa t3404: fix indentation 4507ecc771 patch-id: use oid_to_hex() to print multiple object IDs 147ee35558 commit: use strbuf_add() to add a length-limited string 559c6fc317 The fourth batch 56e6c16394 Merge branch 'dl/lore-is-the-archive' 3b3d9ea6a8 Merge branch 'jk/lore-is-the-archive' 7cb0d37f6d Merge branch 'tg/perf-remove-stale-result' 403ac1381c Merge branch 'jk/send-pack-check-negative-with-quick' f0cf2fee5d Merge branch 'hi/grep-do-not-return-void' 391fb22ac7 Merge branch 'rs/use-skip-prefix-more' 92b52e1bd6 Merge branch 'rs/simplify-prepare-cmd' 4ba74ca901 Merge branch 'rs/test-cleanup' f233c9f455 Merge branch 'sg/assume-no-todo-update-in-cherry-pick' ef3ce7c4b9 Merge branch 'sg/osx-force-gcc-9' 8c5724c585 name-rev: drop name_rev()'s 'generation' and 'distance' parameters 3a52150301 name-rev: restructure creating/updating 'struct rev_name' instances dd432a6ecf name-rev: restructure parsing commits and applying date cutoff dd090a8a37 name-rev: pull out deref handling from the recursion 766f9e39c0 name-rev: extract creating/updating a 'struct name_rev' into a helper d59fc83697 t6120: add a test to cover inner conditions in 'git name-rev's name_rev() bf43abc6e6 name-rev: use sizeof(*ptr) instead of sizeof(type) in allocation e0c4da6f2a name-rev: avoid unnecessary cast in name_ref() c3794d4ccb name-rev: use strbuf_strip_suffix() in get_rev_name() c593a26348 t6120-describe: modernize the 'check_describe' helper abcf857300 range-diff: clear `other_arg` at end of function f8675343d7 range-diff: mark pointers as const 828765dfe0 t3206: fix incorrect test name 0d9b0d7885 t9300-fast-import: don't hang if background fast-import exits too early 21f57620b2 t9300-fast-import: store the PID in a variable instead of pidfile b4bbbbd5a2 apply --allow-overlap: fix a corner case 89c8559367 git add -p: use non-zero exit code when the diff generation failed e91162be9c t3701: verify that the diff.algorithm config setting is handled 0c3222c4f3 t3701: verify the shown messages when nothing can be added 24be352d52 t3701: add a test for the different `add -p` prompts 8539b46534 t3701: avoid depending on the TTY prerequisite 0f0fba2cc8 t3701: add a test for advanced split-hunk editing 53a06cf39b Git 2.24.1 67af91c47a Sync with 2.23.1 a7312d1a28 Git 2.23.1 7fd9fd94fb Sync with 2.22.2 d9589d4051 Git 2.22.2 5421ddd8d0 Sync with 2.21.1 367f12b7e9 Git 2.21.1 20c71bcf67 Merge branch 'fix-msys2-quoting-bugs' 7d8b676992 mingw: sh arguments need quoting in more circumstances d9061ed9da t7415: drop v2.20.x-specific work-around 04522edbd4 mingw: fix quoting of empty arguments for `sh` 49f7a76d57 mingw: use MSYS2 quoting even when spawning shell scripts e2ba3d6f6d mingw: detect when MSYS2's sh is to be spawned more robustly fc346cb292 Sync with 2.20.2 4cd1cf31ef Git 2.20.2 c154745074 submodule: defend against submodule.update = !command in .gitmodules 4cfc47de25 t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.x d851d94151 Sync with 2.19.3 caccc527ca Git 2.19.3 7c9fbda6e2 Sync with 2.18.2 9877106b01 Git 2.18.2 14af7ed5a9 Sync with 2.17.3 a5ab8d0317 Git 2.17.3 bb92255ebe fsck: reject submodule.update = !command in .gitmodules bdfef0492c Sync with 2.16.6 eb288bc455 Git 2.16.6 68440496c7 test-drop-caches: use `has_dos_drive_prefix()` 9ac92fed5b Sync with 2.15.4 7cdafcaacf Git 2.15.4 e904deb89d submodule: reject submodule.update = !command in .gitmodules d3ac8c3f27 Sync with 2.14.6 66d2a6159f Git 2.14.6 083378cc35 The third batch 88bd37a2d0 Merge branch 'js/pkt-line-h-typofix' 473b431410 Merge branch 'us/unpack-trees-fsmonitor' e0f9ec9027 Merge branch 'sg/test-bool-env' fd952307ec Merge branch 'mh/clear-topo-walk-upon-reset' e547e5a89e Merge branch 'hv/assume-priumax-is-available-anywhere' 88cf80949e Merge branch 'mg/submodule-status-from-a-subdirectory' 8feb47e882 Merge branch 'dl/t5520-cleanup' 6b3cb32f43 Merge branch 'nl/reset-patch-takes-a-tree' 57d46bc602 Merge branch 'mg/doc-submodule-status-cached' 75bd003c7b Merge branch 'js/git-svn-use-rebase-merges' f06dff7b7c Merge branch 'hi/gpg-optional-pkfp-fix' c9208597a9 Merge branch 'pw/sequencer-compare-with-right-parent-to-check-empty-commits' 36fd304d81 Merge branch 'jk/fail-show-toplevel-outside-working-tree' cf91c31688 Merge branch 'sg/unpack-progress-throughput' ef6104581d Merge branch 'pb/submodule-update-fetches' 7fd7a8ab29 Merge branch 'jc/azure-ci-osx-fix-fix' f3c7bfdde2 Merge branch 'dl/range-diff-with-notes' 9502b616f1 Merge branch 'jh/userdiff-python-async' 76c68246c6 Merge branch 'ec/fetch-mark-common-refs-trace2' 995b1b1411 Merge branch 'dd/rebase-merge-reserves-onto-label' f7998d9793 Merge branch 'js/builtin-add-i' 917d0d6234 Merge branch 'js/rebase-r-safer-label' 56d3ce82b0 Merge branch 'ep/guard-kset-tar-headers' 2763530048 Merge branch 'jg/revert-untracked' fa38ab68b0 git-gui: revert untracked files by deleting them d9c6469f38 git-gui: update status bar to track operations 29a9366052 git-gui: consolidate naming conventions 0bb313a552 xdiff: unignore changes in function context 2ddcccf97a Merge branch 'win32-accommodate-funny-drive-names' 65d30a19de Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods' 5532ebdeb7 Merge branch 'fix-mingw-quoting-bug' 76a681ce9c Merge branch 'dubiously-nested-submodules' dd53ea7220 Merge branch 'turn-on-protectntfs-by-default' f82a97eb91 mingw: handle `subst`-ed "DOS drives" 7f3551dd68 Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams' d2c84dad1c mingw: refuse to access paths with trailing spaces or periods 379e51d1ae quote-stress-test: offer to test quoting arguments for MSYS2 sh 817ddd64c2 mingw: refuse to access paths with illegal characters cc756edda6 unpack-trees: let merged_entry() pass through do_add_entry()'s errors 7530a6287e quote-stress-test: allow skipping some trials 35edce2056 t6130/t9350: prepare for stringent Win32 path validation 55953c77c0 quote-stress-test: accept arguments to test via the command-line ad15592529 tests: add a helper to stress test argument quoting a8dee3ca61 Disallow dubiously-nested submodule git directories 9102f958ee protect_ntfs: turn on NTFS protection by default 91bd46588e path: also guard `.gitmodules` against NTFS Alternate Data Streams 6d8684161e mingw: fix quoting of arguments 3a85dc7d53 is_ntfs_dotgit(): speed it up 7c3745fc61 path: safeguard `.git` against NTFS Alternate Streams Accesses 288a74bcd2 is_ntfs_dotgit(): only verify the leading segment a62f9d1ace test-path-utils: offer to run a protectNTFS/protectHFS benchmark cae0bc09ab rebase: fix format.useAutoBase breakage 945dc55dda format-patch: teach --no-base 700e006c5d t4014: use test_config() a749d01e1d format-patch: fix indentation 0c47e06176 t3400: demonstrate failure with format.useAutoBase d9b31db2c4 t7700: stop losing return codes of git commands 3699d69df0 t7700: make references to SHA-1 generic dcf9a748ca t7700: replace egrep with grep cfe5eda02a t7700: consolidate code into test_has_duplicate_object() ae475afc0f t7700: consolidate code into test_no_missing_in_packs() 14b7664df8 doc: replace LKML link with lore.kernel.org d23f9c8e04 RelNotes: replace Gmane with real Message-IDs dcee037228 doc: replace MARC links with lore.kernel.org a9aecc7abb checkout, restore: support the --pathspec-from-file option cfd9376c1d doc: restore: synchronize <pathspec> description 8ea1189eac doc: checkout: synchronize <pathspec> description 6fdc9ad259 doc: checkout: fix broken text reference 1d022bb43f doc: checkout: remove duplicate synopsis bebb5d6d6b add: support the --pathspec-from-file option 21bb3083c3 cmd_add: prepare for next patch 4778452597 Merge branch 'prevent-name-squatting-on-windows' a7b1ad3b05 Merge branch 'jk/fast-import-unsafe' 525e7fba78 path.c: document the purpose of `is_ntfs_dotgit()` e1d911dd4c mingw: disallow backslash characters in tree objects' file names 0060fd1511 clone --recurse-submodules: prevent name squatting on Windows a52ed76142 fast-import: disallow "feature import-marks" by default 68061e3470 fast-import: disallow "feature export-marks" by default 019683025f fast-import: delay creating leading directories for export-marks e075dba372 fast-import: stop creating leading directories for import-marks 11e934d56e fast-import: tighten parsing of boolean command line options 816f806786 t9300: create marks files for double-import-marks test f94804c1f2 t9300: drop some useless uses of cat 4f3e57ef13 submodule--helper: advise on fatal alternate error 10c64a0b3c Doc: explain submodule.alternateErrorStrategy ec48540fe8 packfile.c: speed up loading lots of packfiles 3ba3720b3f mingw: forbid translating ERROR_SUCCESS to an errno value a4fb016ba1 pkt-line: fix a typo 0109d676f9 mingw: use {gm,local}time_s as backend for {gm,local}time_r e714b898c6 t7812: expect failure for grep -i with invalid UTF-8 data 228f53135a The second batch 6c630f237e Merge branch 'jk/gitweb-anti-xss' 3288d99c92 Merge branch 'ar/install-doc-update-cmds-needing-the-shell' 4775e02a5c Merge branch 'ma/t7004' a6c6f8d02a Merge branch 'js/complete-svn-recursive' 3ae8defaf9 Merge branch 'jk/send-pack-remote-failure' aec3b2e24f Merge branch 'jc/fsmonitor-sanity-fix' 4ab9616c76 Merge branch 'sg/skip-skipped-prereq' 723a8adba5 Merge branch 'ds/test-read-graph' 9da3948781 Merge branch 'rs/use-copy-array-in-mingw-shell-command-preparation' 406ca29e0d Merge branch 'rs/parse-options-dup-null-fix' fce9e836d3 Merge branch 'jt/fetch-remove-lazy-fetch-plugging' 8faff3899e Merge branch 'jk/optim-in-pack-idx-conversion' ef8f621045 Merge branch 'dl/complete-rebase-onto' 3c3e5d0ea2 Merge branch 'tg/stash-refresh-index' 43c5fe1c1d Merge branch 'nn/doc-rebase-merges' 6511cb33c9 Merge branch 'dd/sequencer-utf8' f165457618 Merge branch 'jk/remove-sha1-to-hex' a774064fb0 Merge branch 'dj/typofix-merge-strat' ca5c8aa8e1 Merge branch 'rj/bundle-ui-updates' d2489ce92c Merge branch 'rs/skip-iprefix' 376e7309e1 Merge branch 'ln/userdiff-elixir' 9a5d34c6dc Merge branch 'py/shortlog-list-options-for-log' d3096d2ba6 Merge branch 'en/doc-typofix' 26f20fa3fc Merge branch 'ns/test-desc-typofix' ffd130a363 Merge branch 'en/t6024-style' 5149902ff9 Merge branch 'en/misc-doc-fixes' bcb06e204c Merge branch 'js/fetch-multi-lockfix' d08daec001 Merge branch 'rs/trace2-dots' fc7b26c907 Merge branch 'kw/fsmonitor-watchman-fix' bad5ed39cd Merge branch 'cb/curl-use-xmalloc' 7ab2088255 Merge branch 'rt/fetch-message-fix' f089ddd56a Merge branch 'es/myfirstcontrib-updates' 3c90710c0c Merge branch 'hw/config-doc-in-header' d4924ea7c3 Merge branch 'dl/doc-diff-no-index-implies-exit-code' 5444d52866 Merge branch 'js/vreportf-wo-buffering' 05fc6471e3 Merge branch 'pb/no-recursive-reset-hard-in-worktree-add' ecbddd16bb Merge branch 'pb/help-list-gitsubmodules-among-guides' 532d983823 Merge branch 'sg/blame-indent-heuristics-is-now-the-default' dfc03e48ec Merge branch 'mr/clone-dir-exists-to-path-exists' fac9ab1419 Merge branch 'ma/bisect-doc-sample-update' a2b0451434 Merge branch 'js/git-path-head-dot-lock-fix' 0be5caf97c Merge branch 'jc/log-graph-simplify' 0e07c1cd83 Merge branch 'jk/cleanup-object-parsing-and-fsck' 2e697ced9d built-in add -i: offer the `quit` command d7633578b5 built-in add -i: re-implement the `diff` command 8746e07277 built-in add -i: implement the `patch` command ab1e1cccaf built-in add -i: re-implement `add-untracked` in C c54ef5e424 built-in add -i: re-implement `revert` in C a8c45be939 built-in add -i: implement the `update` command f37c226454 built-in add -i: prepare for multi-selection commands c08171d156 built-in add -i: allow filtering the modified files list 0c3944a628 add-interactive: make sure to release `rev.prune_data` 4d0375ca24 mingw: do set `errno` correctly when trying to restrict handle inheritance 867fc7f310 grep: don't return an expression from pcre2_free() c64368e3a2 t9001: avoid including non-trailing NUL bytes in variables 72b006f4bf gpg-interface: prefer check_signature() for GPG verification 7187c7bbb8 t4210: skip i18n tests that don't work on FreeBSD b5ab03bcb6 archive-zip.c: switch to reentrant localtime_r ccd469450a date.c: switch to reentrant {gm,local}time_r 271c351b2f t7811: don't create unused file 65efb42862 t9300: don't create unused file f6b9413baf sequencer: fix a memory leak in sequencer_continue() 3eae30e464 doc: replace public-inbox links with lore.kernel.org 46c67492aa doc: recommend lore.kernel.org over public-inbox.org 5cf7a17dfb send-pack: use OBJECT_INFO_QUICK to check negative objects 17a4ae92ea t7700: s/test -f/test_path_is_file/ d2eee32a89 t7700: move keywords onto their own line 7a1c8c2346 t7700: remove spaces after redirect operators 09279086e8 t7700: drop redirections to /dev/null 756ee7fc9f t7501: stop losing return codes of git commands 38c1aa01de t7501: remove spaces after redirect operators 763b47bafa t5703: stop losing return codes of git commands eacaa1c180 t5703: simplify one-time-sed generation logic a29b2429e5 t5317: use ! grep to check for no matching lines 6c37f3ec1b t5317: stop losing return codes of git commands b66e0a1773 t4138: stop losing return codes of git commands afd43c9905 t4015: use test_write_lines() 946d2353a3 t4015: stop losing return codes of git commands 50cd31c652 t3600: comment on inducing SIGPIPE in `git rm` 3b737381d8 t3600: stop losing return codes of git commands 0d913dfa7e t3600: use test_line_count() where possible 29a40b5a67 t3301: stop losing return codes of git commands 9b5a9fa60a t0090: stop losing return codes of git commands 17aa9d9c1a t0014: remove git command upstream of pipe 77a946be98 apply-one-time-sed.sh: modernize style 176441bfb5 ci: build Git with GCC 9 in the 'osx-gcc' build job ed254710ee test: use test_must_be_empty F instead of test_cmp empty F c74b3cbb83 t7812: add missing redirects 213dabf49d test: use test_must_be_empty F instead of test -z $(cat F) c93a5aaec8 t1400: use test_must_be_empty 6e4826ea75 t1410: use test_line_count a5d04a3ef9 t1512: use test_line_count 54a7a64613 run-command: use prepare_git_cmd() in prepare_cmd() 2059e79c0d name-rev: use skip_prefix() instead of starts_with() 1768aaf01d push: use skip_prefix() instead of starts_with() ec6ee0c07a shell: use skip_prefix() instead of starts_with() 7e412e8a34 fmt-merge-msg: use skip_prefix() instead of starts_with() a6293f5d28 fetch: use skip_prefix() instead of starts_with() 13ca8fb79e t5150: skip request-pull test if Perl is disabled ecc0869080 commit-graph: use start_delayed_progress() 44a4693bfc progress: create GIT_PROGRESS_DELAY 528d9e6d01 t/perf: don't depend on Git.pm b8dcc45387 perf-lib: use a single filename for all measurement types fc42f20e24 test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' d82dfa7f5b rebase -i: finishing touches to --reset-author-date 1f3aea22c7 submodule: fix 'submodule status' when called from a subdirectory 393adf7a6f sequencer: directly call pick_commits() from complete_action() a2dd67f105 rebase: fill `squash_onto' in get_replay_opts() 3f34f2d8a4 sequencer: move the code writing total_nr on the disk to a new function 34065541e3 sequencer: update `done_nr' when skipping commands in a todo list 8638114e06 sequencer: update `total_nr' when adding an item to a todo list 0aa0c2b2ec revision: free topo_walk_info before creating a new one in init_topo_walk ffa1f28fea revision: clear the topo-walk flags in reset_revision_walk ebc3278665 git-compat-util.h: drop the `PRIuMAX` and other fallback definitions 9917eca794 l10n: zh_TW: add translation for v2.24.0 0a8e3036a3 reset: parse rev as tree-ish in patch mode f0e58b3fe8 doc: mention that 'git submodule update' fetches missing commits 8d483c8408 doc: document 'git submodule status --cached' befd4f6a81 sequencer: don't re-read todo for revert and cherry-pick ac33519ddf mingw: restrict file handle inheritance only on Windows 7 and later 9a780a384d mingw: spawned processes need to inherit only standard handles c5a03b1e29 mingw: work around incorrect standard handles eea4a7f4b3 mingw: demonstrate that all file handles are inherited by child processes a85efb5985 t5608-clone-2gb.sh: turn GIT_TEST_CLONE_2GB into a bool 43a2afee82 tests: add 'test_bool_env' to catch non-bool GIT_TEST_* values 2d05ef2778 sequencer: fix empty commit check when amending ea8b7be147 git svn: stop using `rebase --preserve-merges` 67a6ea6300 gpg-interface: limit search for primary key fingerprint 392b862e9a gpg-interface: refactor the free-and-xmemdupz pattern cff4e9138d sparse-checkout: check for dirty status 416adc8711 sparse-checkout: update working directory in-process for 'init' f75a69f880 sparse-checkout: cone mode should not interact with .gitignore fb10ca5b54 sparse-checkout: write using lockfile 99dfa6f970 sparse-checkout: use in-process update for disable subcommand e091228e17 sparse-checkout: update working directory in-process e9de487aa3 sparse-checkout: sanitize for nested folders 4dcd4def3c unpack-trees: add progress to clear_ce_flags() eb42feca97 unpack-trees: hash less in cone mode af09ce24a9 sparse-checkout: init and set in cone mode 96cc8ab531 sparse-checkout: use hashmaps for cone patterns 879321eb0b sparse-checkout: add 'cone' mode e6152e35ff trace2: add region in clear_ce_flags 72918c1ad9 sparse-checkout: create 'disable' subcommand 7bffca95ea sparse-checkout: add '--stdin' option to set subcommand f6039a9423 sparse-checkout: 'set' subcommand d89f09c828 clone: add --sparse mode bab3c35908 sparse-checkout: create 'init' subcommand 94c0956b60 sparse-checkout: create builtin with 'list' subcommand 679f2f9fdd unpack-trees: skip stat on fsmonitor-valid files df6d3d6802 lib-bash.sh: move `then` onto its own line 2a02262078 t5520: replace `! git` with `test_must_fail git` c245e58bb6 t5520: remove redundant lines in test cases a1a64fdd0a t5520: replace $(cat ...) comparison with test_cmp e959a18ee7 t5520: don't put git in upstream of pipe 5540ed27bc t5520: test single-line files by git with test_cmp dd0f1e767b t5520: use test_cmp_rev where possible 979f8891cc t5520: replace test -{n,z} with test-lib functions 3037d3db90 t5520: use test_line_count where possible 93a9bf876b t5520: remove spaces after redirect operator ceeef863de t5520: replace test -f with test-lib functions 4c8b046f82 t5520: let sed open its own input 53c62b9810 t5520: use sq for test case names e8d1eaf9b4 t5520: improve test style 2c9e125b27 t: teach test_cmp_rev to accept ! for not-equals 8cb7980382 t0000: test multiple local assignment 5b583e6a09 format-patch: pass notes configuration to range-diff bd36191886 range-diff: pass through --notes to `git log` 9f726e1b87 range-diff: output `## Notes ##` header 3bdbdfb7a5 t3206: range-diff compares logs with commit notes 75c5aa0701 t3206: s/expected/expect/ 79f3950d02 t3206: disable parameter substitution in heredoc 3a6e48e9f7 t3206: remove spaces after redirect operators 26d94853f0 pretty-options.txt: --notes accepts a ref instead of treeish 077a1fda82 userdiff: support Python async functions 3798149a74 SubmittingPatches: use `--pretty=reference` 1f0fc1db85 pretty: implement 'reference' format 618a855083 pretty: add struct cmt_fmt_map::default_date_mode_type 0df621172d pretty: provide short date format ac52d9410e t4205: cover `git log --reflog -z` blindspot 3e8ed3b93e pretty.c: inline initalize format_context 4982516451 revision: make get_revision_mark() return const pointer f0f9de2bd7 completion: complete `tformat:` pretty format fb2ffa77a6 SubmittingPatches: remove dq from commit reference bae74c9dfb pretty-formats.txt: use generic terms for hash bd00717eab SubmittingPatches: use generic terms for hash 9d45ac4cbf rev-list-options.txt: remove reference to --show-notes 828e829b9e argv-array: add space after `while` e440fc5888 commit: support the --pathspec-from-file option 66a25a7242 doc: commit: synchronize <pathspec> description 64bac8df97 reset: support the `--pathspec-from-file` option d137b50756 doc: reset: synchronize <pathspec> description 24e4750c96 pathspec: add new function to parse file 0dbc4a0edf ci(osx): update homebrew-cask repository with less noise e02058a729 sequencer: handle rebase-merges for "onto" message bae60ba7e9 builtin/unpack-objects.c: show throughput progress 2d92ab32fd rev-parse: make --show-toplevel without a worktree an error 9e5afdf997 fetch: add trace2 instrumentation 4c4066d95d run-command: move doc to run-command.h 6c51cb525d trace2: move doc to trace2.h 7db0305438 parse-options: add link to doc file in parse-options.h d95a77d059 submodule-config: move doc to submodule-config.h f3b9055624 credential: move doc to credential.h bbcfa3002a tree-walk: move doc to tree-walk.h 971b1f24a2 argv-array: move doc to argv-array.h f1ecbe0f53 trace: move doc to trace.h 13aa9c8b70 cache: move doc to cache.h c0be43f898 sigchain: move doc to sigchain.h 19ef3ddd36 pathspec: move doc to pathspec.h 301d595e72 revision: move doc to revision.h 3a1b3415d9 attr: move doc to attr.h 126c1ccefb refs: move doc to refs.h d27eb356bf remote: move doc to remote.h and refspec.h 405c6b1fbc sha1-array: move doc to sha1-array.h d3d7172e40 merge: move doc to ll-merge.h 3f1480b745 graph: move doc to graph.h and graph.c 266f03eccd dir: move doc to dir.h 13c4d7eb22 diff: move doc to diff.h and diffcore.h cd5522271f rebase -r: let `label` generate safer labels 867bc1d236 rebase-merges: move labels' whitespace mangling into `label_oid()` 8c15904462 built-in add -i: implement the `help` command 3d965c7674 built-in add -i: use color in the main loop 68db1cbf8e built-in add -i: support `?` (prompt help) 76b743234c built-in add -i: show unique prefixes of the commands 6348bfba58 built-in add -i: implement the main loop a376e37b2c gitweb: escape URLs generated by href() b178c207d7 t/gitweb-lib.sh: set $REQUEST_URI f28bceca75 t/gitweb-lib.sh: drop confusing quotes 0eba60c9b7 t9502: pass along all arguments in xss helper 932757b0cc INSTALL: use existing shell scripts as example b018719927 t7004: check existence of correct tag 1daaebcaa5 built-in add -i: color the header in the `status` command 5e82b9e4d2 built-in add -i: implement the `status` command e4cb659ebd diff: export diffstat interface f83dff60a7 Start to implement a built-in version of `git add --interactive` df53c80822 stash: make sure we have a valid index before writing it ad7a403268 send-pack: check remote ref status on pack-objects failure d91ce887c9 t6120-describe: correct test repo history graph in comment 1f9247a3bd completion: tab-complete "git svn --recursive" 603960b50e promisor-remote: remove fetch_if_missing=0 e362fadcd0 clone: remove fetch_if_missing=0 169bed7421 parse-options: avoid arithmetic on pointer that's potentially NULL 51bd6be32d mingw: use COPY_ARRAY for copying array 4bd0593e0f test-tool: use 'read-graph' helper e0316695ec test-lib: don't check prereqs of test cases that won't be run anyway d784d978f6 t4215: use helper function to check output 61eea521fe fsmonitor: do not compare bitmap size with size of split index b19f3fe9dd hex: drop sha1_to_hex() c1ce9c06d0 completion: learn to complete `git rebase --onto=` f66e0401ab pack-objects: avoid pointless oe_map_new_pack() calls d3a8caebf3 doc: improve readability of --rebase-merges in git-rebase aa6d7f93ed hex: drop sha1_to_hex_r() 52f52e5ae4 sequencer: reencode commit message for am/rebase --show-current-patch 5772b0c745 sequencer: reencode old merge-commit message e0eba649e8 bundle-verify: add --quiet 79862b6b77 bundle-create: progress output control 73c3253d75 bundle: framework for options before bundle file 68d40f30c4 merge-strategies: fix typo "reflected to" to "reflected in" b375744274 sequencer: reencode squashing commit's message 019a9d8362 sequencer: reencode revert/cherry-pick's todo list 0798d16fe3 sequencer: reencode to utf-8 before arrange rebase's todo list e4b95b3b5f t3900: demonstrate git-rebase problem with multi encoding 1ba6e7aecd configure.ac: define ICONV_OMITS_BOM if necessary d9f6f3b619 The first batch post 2.24 cycle 28014c1084 Merge branch 'bc/hash-independent-tests-part-6' 57b530125e Merge branch 'js/update-index-ignore-removal-for-skip-worktree' c22f63c40f Merge branch 'pb/pretty-email-without-domain-part' 5731ca3657 Merge branch 'hw/remove-api-docs-placeholder' 14b58c62bc Merge branch 'sg/commit-graph-usage-fix' eff313f8a7 Merge branch 'dl/apply-3way-diff3' db806d7064 Merge branch 'sg/dir-trie-fixes' f1e2666b33 Merge branch 'jc/am-show-current-patch-docfix' 8f1119b988 Merge branch 'wb/midx-progress' d9800351d3 Merge branch 'en/merge-recursive-directory-rename-fixes' 0c51181ffb Merge branch 'js/rebase-deprecate-preserve-merges' 8f40d89783 Merge branch 'hv/bitshift-constants-in-blame' d4a98e701f Merge branch 'dd/notes-copy-default-dst-to-head' 5c8c0a0d78 Merge branch 'pw/post-commit-from-sequencer' b75ba9bbd1 Merge branch 'dl/format-patch-cover-from-desc' 15d9f3dc66 Merge branch 'es/walken-tutorial' 026587c793 Merge branch 'jt/fetch-pack-record-refs-in-the-dot-promisor' ed28358833 convert: use skip_iprefix() in validate_encoding() 89f8cabaf3 utf8: use skip_iprefix() in same_utf_encoding() 03670c8b23 Fix spelling errors in no-longer-updated-from-upstream modules ae821ffe83 multimail: fix a few simple spelling errors 557c5895c2 sha1dc: fix trivial comment spelling error aa74be316a Fix spelling errors in test commands 96c0caf5e3 Fix spelling errors in messages shown to users 4dc8b1c114 Fix spelling errors in names of tests 7a40cf1553 Fix spelling errors in comments of testcases 15beaaa3d1 Fix spelling errors in code comments a807200f67 userdiff: add Elixir to supported userdiff languages 461caf3e8a git-shortlog.txt: include commit limiting options 6462d5eb9a fetch: remove fetch_if_missing=0 46efd28be1 kset.h, tar.h: add missing header guard to prevent multiple inclusion 99b2ba35f5 t0028: eliminate non-standard usage of printf add97702ed parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` 14c4776d75 t: fix typo in test descriptions 270de6acbe t6024: modernize style 77363a51fb name-hash.c: remove duplicate word in comment c92faa4d22 hashmap: fix documentation misuses of -> versus . a6d39f2efb git-filter-branch.txt: correct argument name typo 4d17fd253f remote-curl: unbreak http.extraHeader with custom allocators 8915297925 Fix spelling errors in documentation outside of Documentation/ 031fd4b93b Documentation: fix a bunch of typos, both old and new dd0b61f577 fsmonitor: fix watchman integration 5c34d2f03e trace2: add dots directly to strbuf in perf_fmt_prepare() 7d8e72b970 fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph c14e6e7903 fetch: add the command-line option `--write-commit-graph` da72936f54 Git 2.24 1d34d425d4 Merge branch 'bc/doc-use-docbook-5' dac1d83c91 Merge branch 'ds/commit-graph-on-fetch' c32ca691c2 Merge branch 'jt/delay-fetch-if-missing' ab6b50e4c8 Merge https://github.com/prati0100/git-gui 93bf7423dd Merge tag 'l10n-2.24.0-rnd2' of https://github.com/git-l10n/git-po a5cd71ca4a l10n: zh_CN: for git v2.24.0 l10n round 1~2 fe28ad8520 rebase: add --reset-author-date 08187b4cba rebase -i: support --ignore-date 0185c683c9 sequencer: rename amend_author to author_to_rename cbd8db17ac rebase -i: support --committer-date-is-author-date c068bcc59b sequencer: allow callers of read_author_script() to ignore fields ba51d2fb24 rebase -i: add --ignore-whitespace flag 3c8d754c4b myfirstcontrib: hint to find gitgitgadget allower 3ada78de3f myfirstcontrib: add dependency installation step 4ed5562925 myfirstcontrib: add 'psuh' to command-list.txt 4a58c3d7f7 stash: handle staged changes in skip-worktree files correctly 8dfb04ae96 update-index: optionally leave skip-worktree entries alone 116d1fa6c6 vreportf(): avoid relying on stdio buffering efd5444238 RelNotes/2.24.0: fix self-contradictory note 391c7e40b5 fetch.c: fix typo in a warning message 55aca515eb manpage-bold-literal.xsl: match for namespaced "d:literal" in template 849e43680d RelNotes/2.24.0: typofix 0115e5d929 git-diff.txt: document return code of `--no-index` 798d66e35d l10n: de.po: Update German translation c1d0038746 l10n: sv.po: Update Swedish translation (4695t0f0u) f21f8f5d35 Git 2.24-rc2 8dc28ee438 Merge branch 'wb/fsmonitor-bitmap-fix' 0d6799e563 Merge branch 'rl/gitweb-blame-prev-fix' f2db52c46b Merge branch 'js/mingw-needs-hiding-fix' 5b7594abdc Merge branch 'master' of github.com:vnwildman/git 034d33653a Merge branch 'next' of github.com:ChrisADR/git-po 26b061007c submodule: teach set-url subcommand 460782b7be t7519-status-fsmonitor: improve comments d8b8217c8a pretty: add "%aL" etc. to show local-part of email addresses 4782cf2ab6 worktree: teach "add" to ignore submodule.recurse config 1294a85b7c l10n: bg.po: Updated Bulgarian translation (4694) f126a1fb0f l10n: vi(4694t): Updated translation for v2.24.0 762d5b4f46 help: add gitsubmodules to the list of guides 76a53d640f git_path(): handle `.lock` files correctly 3ce47211a6 t1400: wrap setup code in test case 44ae131e38 builtin/blame.c: remove '--indent-heuristic' from usage string 6c02042139 clone: rename static function `dir_exists()`. 8dd327b246 Documentation/git-bisect.txt: add --no-ff to merge command 77200e9332 l10n: es: 2.24.0 round 2 e42df36b42 Merge branch 'l10n/it/update-italian-translation' 5e196e8ae0 l10n: it.po: update the Italian translation for Git 2.24.0 round #2 51728480fe l10n: fr v2.24.0 rnd2 045a548698 l10n: git.pot: v2.24.0 round 2 (1 new) 468d356a81 Merge tag 'v2.24.0-rc1' of github.com:git/git into master b2f2039c2b fsck: accept an oid instead of a "struct tree" for fsck_tree() c5b4269b57 fsck: accept an oid instead of a "struct commit" for fsck_commit() 103fb6d43b fsck: accept an oid instead of a "struct tag" for fsck_tag() f648ee7088 fsck: rename vague "oid" local variables cc579000bf fsck: don't require an object struct in verify_headers() 7854399366 fsck: don't require an object struct for fsck_ident() b8b00f1693 fsck: drop blob struct from fsck_finish() 6da40b22ca fsck: accept an oid instead of a "struct blob" for fsck_blob() 38370253fd fsck: don't require an object struct for report() f59793763d fsck: only require an oid for skiplist functions 5afc4b1dc6 fsck: only provide oid/type in fsck_error callback 82ef89b318 fsck: don't require object structs for display functions 733902905d fsck: use oids rather than objects for object_name API d40bbc109b fsck_describe_object(): build on our get_object_name() primitive a59cfb3230 fsck: unify object-name code 23a173a761 fsck: require an actual buffer for non-blobs 2175a0c601 fsck: stop checking tag->tagged ec65231571 fsck: stop checking commit->parent counts 1de6007d85 fsck: stop checking commit->tree value 228c78fbd4 commit, tag: don't set parsed bit for parse failures 60e6569a12 mingw: avoid a buffer overrun in `needs_hiding()` 8b656572ca builtin/commit-graph.c: remove subcommand-less usage string fa26d5ede6 t4048: abstract away SHA-1-specific constants cf02be8486 t4045: make hash-size independent 38ee26b2a3 t4044: update test to work with SHA-256 37ab8ebef1 t4039: abstract away SHA-1-specific constants 0370b35414 t4038: abstract away SHA-1 specific constants 0253e126a2 t4034: abstract away SHA-1-specific constants 45e2ef2b1d t4027: make hash-size independent 79b0edc1a0 t4015: abstract away SHA-1-specific constants 840624ff55 t4011: abstract away SHA-1-specific constants 32a6707267 t4010: abstract away SHA-1-specific constants 440bf91dfa t3429: remove SHA1 annotation 0b408ca2bd t1305: avoid comparing extensions 2eabd38313 rev-parse: add a --show-object-format option 52bd3e4657 gitweb: correctly store previous rev in javascript-actions mode 45e206f0d8 t4203: use test-lib.sh definitions 2ae4944aac t6006: use test-lib.sh definitions cb99a34e23 commit-graph: fix writing first commit-graph during fetch e88aab917e t5510-fetch.sh: demonstrate fetch.writeCommitGraph bug 7b4fb434b4 documentation: remove empty doc files 566a1439f6 Git 2.24-rc1 04b1f4f768 Merge branch 'sg/ci-osx-gcc8-fix' 4d6fb2beeb Merge branch 'ds/feature-macros' 5f0b6ed907 Merge branch 'js/azure-ci-osx-fix' c555caab7a Merge branch 'bw/format-patch-o-create-leading-dirs' 1b4f85285f Merge branch 'dl/submodule-set-branch' c7aadccba0 fetch: delay fetch_if_missing=0 until after config c11e9966cb repo-settings: read an int for index.version 091489d068 apply: respect merge.conflictStyle in --3way aa76ae4905 t4108: demonstrate bug in apply 95806205cd t4108: use `test_config` instead of `git config` b0069684d4 t4108: remove git command upstream of pipe fa87b81385 t4108: replace create_file with test_write_lines 7d4733c501 ci: fix GCC install in the Travis CI GCC OSX job 6c96630cb0 config: move documentation to config.h d81542e6f3 Eleventh batch e0ff2d4c7e Merge branch 'cb/pcre2-chartables-leakfix' d45d771978 Merge branch 'bc/smart-http-atomic-push' 22dd22dce0 Merge branch 'wb/fsmonitor-bitmap-fix' 2e215b7959 Merge branch 'sb/userdiff-dts' e3cf08361a Merge branch 'sg/progress-fix' b895e8dea6 Merge branch 'nr/diff-highlight-indent-fix' c1ec35dd48 Merge branch 'mb/clarify-zsh-completion-doc' f45f88b2e4 path.c: don't call the match function without value in trie_find() c72fc40d09 path.c: clarify two field names in 'struct common_dir' 8a64881b44 path.c: mark 'logs/HEAD' in 'common_list' as file 7cb8c929d7 path.c: clarify trie_find()'s in-code comment e536b1fedf Documentation: mention more worktree-specific exceptions 680cba2c2b multi-pack-index: add [--[no-]progress] option. 64d80e7d52 midx: honor the MIDX_PROGRESS flag in midx_repack ad60096d1c midx: honor the MIDX_PROGRESS flag in verify_midx_file 8dc18f8937 midx: add progress to expire_midx_packs 840cef0c70 midx: add progress to write_midx_file efbc3aee08 midx: add MIDX_PROGRESS flag 0eb3671ed9 ci(osx): use new location of the `perforce` cask da1e295e00 t604[236]: do not run setup in separate tests 49b8133a9e merge-recursive: fix merging a subdirectory into the root directory d3eebaad5e merge-recursive: clean up get_renamed_dir_portion() 80736d7c5e doc: am --show-current-patch gives an entire e-mail message a8e2c0eadc t7419: change test_must_fail to ! for grep 19c29e538e t4014: make output-directory tests self-contained 12a4aeaad8 Merge branch 'js/azure-pipelines-msvc' 399c23c046 ci(visual-studio): actually run the tests in parallel 711cd6d15c ci(visual-studio): use strict compile flags, and optimization 370784e0e6 l10n: it.po: update the Italian translation for Git 2.24.0 cc73c68603 Merge branch 'master' of github.com:jnavila/git into git-po-master 907843be3b Merge branch 'master' of github.com:alshopov/git-po into git-po-master 13bcea8c7f l10n: fr 2.24.0 rnd 1 135480a616 Merge remote-tracking branch 'git-po/master' into git-po-master 3d0a05b464 l10n: git.pot: v2.24.0 round 1 (35 new, 16 removed) 8da56a4848 userdiff: fix some corner cases in dts regex 86795774bb builtin/blame.c: constants into bit shift format feebd2d256 rebase: hide --preserve-merges option 0e40a73a4c Doc: Bundle file usage 78d50148b9 parse_tag_buffer(): treat NULL tag pointer as parse error 12736d2f02 parse_commit_buffer(): treat lookup_tree() failure as parse error c78fe00459 parse_commit_buffer(): treat lookup_commit() failure as parse error 2b6f6ea1bd test-progress: fix test failures on big-endian systems f757409e36 l10n: bg.po: Updated Bulgarian translation (4693) 176f5adfdb completion: clarify installation instruction for zsh d966095db0 Git 2.24-rc0 90e0d167c6 Merge branch 'rs/remote-curl-use-argv-array' 3def8ae9a4 Merge branch 'rs/column-use-utf8-strnwidth' d0258d0944 Merge branch 'rs/http-push-simplify' bb52def6da Merge branch 'jj/stash-reset-only-toplevel' f1afbb063f Merge branch 'bw/format-patch-o-create-leading-dirs' e5fca6b573 Merge branch 'bb/compat-util-comment-fix' 43400b4222 Merge branch 'bb/utf8-wcwidth-cleanup' 07ff6dd0ea Merge branch 'dl/allow-running-cocci-verbosely' 2d74d28ee0 Merge branch 'dl/compat-cleanup' 9b83a94829 Merge branch 'ta/t1308-typofix' 376012c919 Merge branch 'js/doc-stash-save' 10da030ab7 grep: avoid leak of chartables in PCRE2 513f2b0bbd grep: make PCRE2 aware of custom allocator 57d4660468 grep: make PCRE1 aware of custom allocator d58deb9c4e notes: fix minimum number of parameters to "copy" subcommand 8af69cf3e2 t3301: test diagnose messages for too few/many paramters 6f1194246a remote-curl: pass on atomic capability to remote side bbb13e8188 graph: fix coloring of octopus dashes 92beecc136 graph: flatten edges that fuse with their right neighbor 479db18bc0 graph: smooth appearance of collapsing edges on commit lines 0195285b95 graph: rename `new_mapping` to `old_mapping` d62893ecc1 graph: commit and post-merge lines for left-skewed merges 0f0f389f12 graph: tidy up display of left-skewed merges 458152cce1 graph: example of graph output that can be simplified ee7abb5ffa graph: extract logic for moving to GRAPH_PRE_COMMIT state 46ba2abdfa graph: remove `mapping_idx` and `graph_update_width()` a551fd5efd graph: reduce duplication in `graph_insert_into_new_columns()` 9157a2a032 graph: reuse `find_new_column_by_commit()` 210179a20d graph: handle line padding in `graph_next_line()` fbccf255f9 graph: automatically track display width of graph lines 5374a290aa fetch-pack: write fetched refs to .promisor 4627bc777e sequencer: run post-commit hook 49697cb721 move run_commit_hook() to libgit and use it there 12bb7a540a sequencer.h fix placement of #endif 6a619ca03c t3404: remove uneeded calls to set_fake_editor b2dbacbddf t3404: set $EDITOR in subshell 88a92b6c73 t3404: remove unnecessary subshell bf8e65b30b format-patch: teach --cover-from-description option a92331df18 format-patch: use enum variables 46273df7bf format-patch: replace erroneous and condition 3b3c79f6c9 diff-highlight: fix a whitespace nit 108b97dc37 Ninth batch cbe8cdd3a0 Merge branch 'jk/coc' 3b9ec27919 Merge branch 'js/trace2-fetch-push' c7d2cedec2 Merge branch 'jt/push-avoid-lazy-fetch' 1ef3bd362a Merge branch 'dl/format-patch-doc-test-cleanup' eb3de5b823 Merge branch 'js/xdiffi-comment-updates' 4e8371ec26 Merge branch 'dl/t0000-skip-test-test' b6d712fa4e Merge branch 'tg/range-diff-output-update' 77458870a5 Merge branch 'gs/sq-quote-buf-pretty' 5efabc7ed9 Merge branch 'ew/hashmap' d0ce4d9024 Merge branch 'js/trace2-cap-max-output-files' 6ed610b968 Merge branch 'am/t0028-utf16-tests' 5b900fb812 Merge branch 'dl/octopus-graph-bug' 16d9d7184b Merge branch 'en/fast-imexport-nested-tags' 6d5291be45 Merge branch 'js/azure-pipelines-msvc' ccc289915a Merge branch 'gs/commit-graph-trace-with-cmd' d96e31e390 Merge branch 'js/fetch-jobs' 280bd44551 Merge branch 'en/merge-recursive-cleanup' 062a309d36 remote-curl: use argv_array in parse_push() a81e42d235 column: use utf8_strnwidth() to strip out ANSI color escapes 5cc6a4be11 http-push: simplify deleting a list item 556895d0c8 stash: avoid recursive hard reset on submodules b524f6b399 Merge branch 'ka/japanese-translation' f6f3824b4e git-gui: improve Japanese translation 61f4b407d3 Merge branch 'py/readme' 1e6880fd06 git-gui: add a readme edefc31873 format-patch: create leading components of output directory 68b69211b2 git-compat-util: fix documentation syntax fa364ad790 utf8: use ARRAY_SIZE() in git_wcwidth() e0479fa073 documentation: add tutorial for object walking 3444ec2eb2 fsmonitor: don't fill bitmap with entries to be removed 4f3c1dc5d6 Makefile: respect $(V) in %.cocci.patch target 9cad1c4488 pthread.h: manually align parameter lists 8c1cfd58e3 t1308-config-set: fix a test that has a typo 57d8f4b4c7 doc(stash): clarify the description of `save` 08da6496b6 Eighth batch 07f25ad8b2 Merge branch 'dl/rev-list-doc-cleanup' f0d407e6ae Merge branch 'kt/add-i-progress' 66102cfad8 Merge branch 'js/stash-apply-in-secondary-worktree' a4c5d9f66e Merge branch 'rs/dedup-includes' 159cdabd87 Merge branch 'js/range-diff-noprefix' 93424f1f7d Merge branch 'cb/pcre1-cleanup' a73f91774c Merge branch 'ab/pcre-jit-fixes' 4608a029b4 Merge branch 'pw/rebase-i-show-HEAD-to-reword' 020011f2cb Merge branch 'tk/git-svn-trim-author-name' 676278f8ea Merge branch 'bc/object-id-part17' aafb75452b Merge branch 'en/clean-nested-with-ignored' 3f9ef874a7 CODE_OF_CONDUCT: mention individual project-leader emails 5cdf2301d4 add a Code of Conduct document 70bf0b755a Seventh batch 9b3995cee0 Merge branch 'rs/test-remove-useless-debugging-cat' 2e956f7fb3 Merge branch 'pm/p4-auto-delete-named-temporary' d17f54947d Merge branch 'rs/convert-fix-utf-without-dash' 82c80f98e6 Merge branch 'py/git-gui-has-maintainer' 6e12570822 Merge branch 'ah/cleanups' 772cad0afb Merge branch 'js/diff-rename-force-stable-sort' 424663d9c8 Merge branch 'js/mingw-spawn-with-spaces-in-path' 678a9ca629 Merge branch 'as/shallow-slab-use-fix' 0b4fae553c Merge branch 'sg/name-rev-cutoff-underflow-fix' 042a54d251 Merge branch 'am/visual-studio-config-fix' 03d3b1297c xdiffi: fix typos and touch up comments b05b40930e t0000: cover GIT_SKIP_TESTS blindspots d8bc1a518a send-pack: never fetch when checking exclusions 756fb0dedb t4014: treat rev-list output as the expected value 2b6a9b13ca range-diff: don't segfault with mode-only changes 360c7ba330 transport: push codepath can take arbitrary repository ce2d7ed2fd sq_quote_buf_pretty: don't drop empty arguments b657047719 merge-recursive: fix the fix to the diff3 common ancestor label b744c3af07 Sixth batch 417056578a Merge branch 'bw/submodule-helper-usage-fix' 9728ab488a Merge branch 'dl/honor-cflags-in-hdr-check' 1f314d5223 Merge branch 'cb/do-not-use-test-cmp-with-a' 59b19bcd9f Merge branch 'cc/multi-promisor' 1f4485b219 Merge branch 'jt/merge-recursive-symlink-is-not-a-dir-in-way' 5ecdbfafd6 Merge branch 'ps/my-first-contribution-alphasort' eb35c18e42 Merge branch 'sg/travis-help-debug' cabb145fe3 Merge branch 'rs/alias-use-copy-array' 56c7ab0f4e Merge branch 'sg/t-helper-gitignore' e5ce62b1ac Merge branch 'cc/svn-fe-py-shebang' 583cf6232a Merge branch 'ah/doc-submodule-ignore-submodules' 337e3f2b49 Merge branch 'rs/nth-switch-code-simplification' 8f53fe1733 Merge branch 'hb/hg-to-git-py3' ef93bfbd45 Merge branch 'sg/progress-fix' 980351d1ac Merge branch 'js/doc-patch-text' 80693e3f09 Merge branch 'tb/commit-graph-harden' ae203ba414 Merge branch 'jt/cache-tree-avoid-lazy-fetch-during-merge' 3f84633563 Merge branch 'dl/cocci-everywhere' caf150ce7d Merge branch 'gs/commit-graph-progress' 1d8b0dfa8a Merge branch 'ms/fetch-follow-tag-optim' 1398171378 Merge branch 'rs/commit-graph-use-list-count' 773521df26 Merge branch 'rs/nth-parent-parse' 7f17913161 Merge branch 'dl/submodule-set-branch' cb3ec6f4ef Merge branch 'cs/pretty-formats-doc-typofix' bbfe5f2241 Merge branch 'jk/list-objects-optim-wo-trees' 098e8c6716 Merge branch 'jk/disable-commit-graph-during-upload-pack' 37ab7cb0a8 Merge branch 'mr/complete-more-for-log-etc' e392382f95 Merge branch 'dl/complete-rebase-and-archive' cda8faa37e Merge branch 'jk/commit-graph-cleanup' 36d2fca82b Merge branch 'ss/get-time-cleanup' ed6822896b Merge branch 'rs/simplify-by-deco-with-deco-refs-exclude' ad8f0368b4 Merge branch 'jk/partial-clone-sparse-blob' ba2d451122 Merge branch 'tg/stash-refresh-index' e2b5038d87 hashmap_entry: remove first member requirement from docs 404ab78e39 hashmap: remove type arg from hashmap_{get,put,remove}_entry 23dee69f53 OFFSETOF_VAR macro to simplify hashmap iterators c8e424c9c9 hashmap: introduce hashmap_free_entries 8a973d0bb3 hashmap: hashmap_{put,remove} return hashmap_entry * 87571c3f71 hashmap: use *_entry APIs for iteration 939af16eac hashmap_cmp_fn takes hashmap_entry params f23a465132 hashmap_get{,_from_hash} return "struct hashmap_entry *" f0e63c4113 hashmap: use *_entry APIs to wrap container_of 6bcbdfb277 hashmap_get_next returns "struct hashmap_entry *" 973d5eea74 introduce container_of macro 26b455f21e hashmap_put takes "struct hashmap_entry *" 28ee794128 hashmap_remove takes "const struct hashmap_entry *" b6c5241606 hashmap_get takes "const struct hashmap_entry *" b94e5c1df6 hashmap_add takes "struct hashmap_entry *" f6eb6bdcf2 hashmap_get_next takes "const struct hashmap_entry *" d22245a2e3 hashmap_entry_init takes "struct hashmap_entry *" d0a48a0a1d packfile: use hashmap_entry in delta_base_cache_entry 12878c8351 coccicheck: detect hashmap_entry.hash assignment e010a41216 diff: use hashmap_entry_init on moved_entry.ent f537485fa5 tests: remove "cat foo" before "test_i18ngrep bar foo" de5abb5f7a git-p4: auto-delete named temporary file c90b652afd Fifth batch f00b57e5bc Merge branch 'cb/skip-utf8-check-with-pcre1' b0f8aed48f Merge branch 'ma/user-manual-markup-update' faf5576a8d Merge branch 'bc/doc-use-docbook-5' 314fcd32d7 Merge branch 'ma/asciidoctor-more-fixes' 70c1cbf515 Merge branch 'ma/asciidoctor-refmiscinfo' 847650798b Merge branch 'am/mailmap-andrey-mazo' 1a155f2e66 Merge branch 'jc/git-gui-has-maintainer' 1bcef51204 t/oid-info: add empty tree and empty blob values ecde49bb8a t/oid-info: allow looking up hash algorithm name 11a3d3aadd git-rev-list.txt: prune options in synopsis 7d2f003ee4 Documentation: update the location of the git-gui repo b181676ce9 convert: fix handling of dashless UTF prefix in validate_encoding() 46689317ac ci: also build and test with MS Visual Studio on Azure Pipelines b35304bf95 ci: really use shallow clones on Azure Pipelines ab7d854aba tests: let --immediate and --write-junit-xml play well together be5d88e112 test-tool run-command: learn to run (parts of) the testsuite 5d65ad17a9 vcxproj: include more generated files 030a628b81 vcxproj: only copy `git-remote-http.exe` once it was built 61d1d92aa4 msvc: work around a bug in GetEnvironmentVariable() e4347c9434 msvc: handle DEVELOPER=1 ed712ef8d5 msvc: ignore some libraries when linking 5b8f9e2417 compat/win32/path-utils.h: add #include guards 41616ef618 winansi: use FLEX_ARRAY to avoid compiler warning c097b95a26 msvc: avoid using minus operator on unsigned types dfd557c978 stash apply: report status correctly even in a worktree's subdirectory d54dea77db fetch: let --jobs=<n> parallelize --multiple, too 87db61a436 trace2: write discard message to sentinel files 83e57b04e6 trace2: discard new traces if target directory has too many files 11c21f22de t4214: demonstrate octopus graph coloring failure 25eb905e14 t4214: explicitly list tags in log 63be8c8dd7 t4214: generate expect in their own test cases a7a5590c6e t4214: use test_merge 94ba151300 test-lib: let test_merge() perform octopus merges 22541013d0 docs: clarify trace2 version invariants 3d4548e7e2 docs: mention trace2 target-dir mode in git-config 2fe44394c8 treewide: remove duplicate #include directives dbcd970c27 push: do not pretend to return `int` from `die_push_simple()` 941790d7de fast-export: handle nested tags 8d7d33c1ce t9350: add tests for tags of things other than a commit a1638cfe12 fast-export: allow user to request tags be marked with --mark-tags 208d69246e fast-export: add support for --import-marks-if-exists b8f50e5b60 fast-import: add support for new 'alias' command f73b2aba05 fast-import: allow tags to be identified by mark labels 3164e6bd24 fast-import: fix handling of deleted tags 8085050ab4 add -i: show progress counter in the prompt 69fdb922ad Merge branch 'bw/diff3-conflict-style' b436825b9b git-gui: support for diff3 conflict style 937b76ed49 range-diff: internally force `diff.noprefix=true` 411e4f4735 ci: run `hdr-check` as part of the `Static Analysis` job 25e4b8099c push: add trace2 instrumentation 5fc31180d8 fetch: add trace2 instrumentation 53d687bf5f git_mkstemps_mode(): replace magic numbers with computed value c3b57dc2a0 git-gui: use existing interface to query a path's attribute 45ab460d4a Merge branch 'js/git-bash-if-available' 0bd7f578b2 commit-graph: emit trace2 cmd_mode for each sub-command 71f4960b91 t0061: fix test for argv[0] with spaces (MINGW only) 54a80a9ad8 wrapper: use a loop instead of repetitive statements baed6bbb5b diffcore-break: use a goto instead of a redundant if statement 8da02ce62a commit-graph: remove a duplicate assignment ddb3c856f3 shallow.c: don't free unallocated slabs 8e4ec3376e merge-recursive: fix the diff3 common ancestor label for virtual commits 65904b8b2b promisor-remote: skip move_to_tail when no-op 2049b8dc65 diffcore_rename(): use a stable sort 97fff61012 Move git_sort(), a stable sort, into into libgit.a 69f272b922 dir: special case check for the possibility that pathspec is NULL 6a72d44fc2 git-gui (Windows): use git-bash.exe if it is available bc12974a89 Fourth batch 5a5350940b Merge branch 'ds/commit-graph-on-fetch' 974bdb0205 Merge branch 'bw/rebase-autostash-keep-current-branch' 9755f70fe6 Merge branch 'ds/include-exclude' 93fc8760e7 Merge branch 'jh/trace2-pretty-output' 640f9cd599 Merge branch 'dl/rebase-i-keep-base' 026428c35e Merge branch 'sg/clean-nested-repo-with-ignored' 21db12c9ea Merge branch 'dl/complete-cherry-pick-revert-skip' d693345518 Merge branch 'dl/use-sq-from-test-lib' d8ce144e11 Merge branch 'jk/misc-uninitialized-fixes' 2be6ccc01a Merge branch 'sg/git-test-boolean' cf861cd7a0 Merge branch 'rs/get-tagged-oid' 91243b019d Merge branch 'en/filter-branch-deprecation' 9bc67b6658 Merge branch 'en/merge-options-ff-and-friends' fe048e4fd9 Merge branch 'tg/push-all-in-mirror-forbidden' cab037cd4b Merge branch 'dt/remote-helper-doc-re-lock-option' 8e111e487b Merge branch 'rs/help-unknown-ref-does-not-return' 3ff6af7753 Merge branch 'nd/switch-and-restore' aadac067aa Merge branch 'tb/file-url-to-unc-path' b57a88a5f1 Merge branch 'js/gitdir-at-unc-root' 6f21347f11 Merge branch 'ar/mingw-run-external-with-non-ascii-path' 430439536b Merge branch 'rs/parse-tree-indirect' 991fd97b9a Merge branch 'jk/fast-import-history-bugfix' 74a39b9bcc Merge branch 'mh/notes-duplicate-entries' 37801f0665 Merge branch 'tb/banned-vsprintf-namefix' 21ce0b48f3 Merge branch 'mh/release-commit-memory-fix' f0fcab6deb Merge branch 'mh/http-urlmatch-cleanup' bf6136cab8 Merge branch 'rs/strbuf-detach' a2e22bb3ad Merge branch 'rs/trace2-dst-warning' 1c6fc941c7 Merge branch 'dl/format-patch-doc-test-cleanup' 0281733483 Merge branch 'bc/hash-independent-tests-part-5' f06fb376ed Merge branch 'jc/test-cleanup' 00bb74453d Merge branch 'dl/compat-cleanup' 59438be06c Merge branch 'js/visual-studio' cda0d497e3 builtin/submodule--helper: fix usage string for 'update-clone' af2abd870b fast-export: fix exporting a tag and nothing else c4d2f6143a user-manual.txt: render ASCII art correctly under Asciidoctor dba3734103 asciidoctor-extensions.rb: handle "book" doctype in linkgit fd5b820d9c user-manual.txt: change header notation e79b34533a user-manual.txt: add missing section label b503a2d515 Makefile: emulate compile in $(HCO) target better af26e2a9d2 pack-bitmap.h: remove magic number b06fdead04 promisor-remote.h: include missing header 97b989ee3a apply.h: include missing header 4ddd4bddb1 git-svn: trim leading and trailing whitespaces in author name d928a8388a t0028: add more tests 0b63fd6965 t0028: fix test for UTF-16-LE-BOM fe0ed5d5e9 contrib/buildsystems: fix Visual Studio Debug configuration 2e09c01232 name-rev: avoid cutoff timestamp underflow 8464f94aeb promisor-remote.h: drop extern from function declaration 75b2c15435 t4038: Remove non-portable '-a' option passed to test_cmp 24c681794f doc: MyFirstContribution: fix cmd placement instructions c46ebc2496 travis-ci: do not skip successfully tested trees in debug mode 60c60b627e Merge branch 'py/git-git-extra-stuff' faf420e05a treewide: correct several "up-to-date" to "up to date" b71c6c3b64 Fix build with core.autocrlf=true 16d7601e17 Merge branches 'js/msgfmt-on-windows', 'tz/fsf-address-update', 'jn/reproducible-build', 'ls/no-double-utf8-author-name', 'js/misc-git-gui-stuff', 'bb/ssh-key-files', 'bp/bind-kp-enter', 'cb/ttk-style' and 'py/call-do-quit-before-exit' of ../git into py/git-git-extra-stuff 26e3d1cbea .mailmap: update email address of Andrey Mazo 27ea41c0b4 t/helper: ignore only executable files 7bd97d6dff git: use COPY_ARRAY and MOVE_ARRAY in handle_alias() 83e3ad3b12 merge-recursive: symlink's descendants not in way 34933d0eff stash: make sure to write refreshed cache e080b34540 merge: use refresh_and_write_cache 22184497a3 factor out refresh_and_write_cache function 7371612255 commit-graph: add --[no-]progress to write and verify 47b27c96fa test_date.c: remove reference to GIT_TEST_DATE_NOW 253bfe49bd SubmittingPatches: git-gui has a new maintainer d17ae00c97 hg-to-git: make it compatible with both python3 and python2 4c86140027 Third batch f67bf53300 Merge branch 'jt/avoid-ls-refs-with-http' 627b826834 Merge branch 'md/list-objects-filter-combo' b9ac6c59b8 Merge branch 'cc/multi-promisor' de67293e74 Merge branch 'sg/line-log-tree-diff-optim' 95486229e3 Merge branch 'sg/complete-configuration-variables' f76bd8c6b1 Merge branch 'js/pre-merge-commit-hook' a2e524ecf3 Merge branch 'cb/curl-use-xmalloc' 128666753b Merge branch 'jk/drop-release-pack-memory' 917a319ea5 Merge branch 'js/rebase-r-strategy' 7e1976e210 Merge branch 'master' of https://github.com/prati0100/git-gui 4b3aa170d1 sha1_name: simplify strbuf handling in interpret_nth_prior_checkout() 0d4304c124 doc: fix reference to --ignore-submodules af78249463 contrib/svn-fe: fix shebang for svnrdump_sim.py 8a3a6817e2 Merge gitk to pick up emergency build fix 2a4ac71ffb gitk: rename zh_CN.po to zh_cn.po 9027af58e2 Makefile: run coccicheck on more source files 43f8c890fd Makefile: strip leading ./ in $(FIND_SOURCE_FILES) 5dedf7de53 Makefile: define THIRD_PARTY_SOURCES 902b90cf42 clean: fix theoretical path corruption ca8b5390db clean: rewrap overly long line 09487f2cba clean: avoid removing untracked files in a nested git repository e86bbcf987 clean: disambiguate the definition of -d 3aca58045f git-clean.txt: do not claim we will delete files with -n/--dry-run 29b577b960 dir: add commentary explaining match_pathspec_item's return value 89a1f4aaf7 dir: if our pathspec might match files under a dir, recurse into it a3d89d8f76 dir: make the DO_MATCH_SUBMODULE code reusable for a non-submodule case 404ebceda0 dir: also check directories for matching pathspecs a5e916c745 dir: fix off-by-one error in match_pathspec_item bbbb6b0b89 dir: fix typo in comment 7541cc5302 t7300: add testcases showing failure to clean specified pathspecs 0eb7c37a8a diff, log doc: small grammer, format, and language fixes 6fae6bd518 diff, log doc: say "patch text" instead of "patches" 2bb74b53a4 Test the progress display bbf47568ad Revert "progress: use term_clear_line()" cf6a2d2557 Makefile: strip leading ./ in $(LIB_H) b7e2d8bca5 fetch: use oidset to keep the want OIDs for faster lookup 689a146c91 commit-graph: use commit_list_count() 59fa5f5a25 sha1-name: check for overflow of N in "foo^N" and "foo~N" a678df1bf9 rev-parse: demonstrate overflow of N for "foo^N" and "foo~N" a4cafc7379 list-objects-filter: use empty string instead of NULL for sparse "base" cf34337f98 list-objects-filter: give a more specific error sparse parsing error 4c96a77594 list-objects-filter: delay parsing of sparse oid 72de5895ed t5616: test cloning/fetching with sparse:oid=<oid> filter 83b0b8953e doc-diff: replace --cut-header-footer with --cut-footer 7a30134358 asciidoctor-extensions: provide `<refmiscinfo/>` 226daba280 Doc/Makefile: give mansource/-version/-manual attributes 40e747e89d git-submodule.txt: fix AsciiDoc formatting error f6461b82b9 Documentation: fix build with Asciidoctor 2 3cb8921f74 Merge branch 'master' of git://ozlabs.org/~paulus/gitk f7a8834ba4 Merge branch 'bp/amend-toggle-bind' ec7424e1a6 git-gui: add hotkey to toggle "Amend Last Commit" 9ea831a2a6 gitk: Do not mistake unchanged lines for submodule changes d7cc4fb001 gitk: Use right colour for remote refs in the "Tags and heads" dialog beffae768a gitk: Add Chinese (zh_CN) translation 56d9cbe68b packfile: expose get_delta_base() bab28d9f97 builtin/pack-objects: report reused packfile objects 6c8ec8c30a Merge branch 'bw/commit-scrollbuffer' acfa495519 Merge branch 'bw/amend-checkbutton' da08d559b7 git-gui: add horizontal scrollbar to commit buffer ba41b5b335 git-gui: convert new/amend commit radiobutton to checkbutton aeeb978ba6 completion: teach archive to use __gitcomp_builtin 2b9bd488ae completion: teach rebase to use __gitcomp_builtin d49dffde9a completion: add missing completions for log, diff, show 6abada1880 upload-pack: disable commit graph more gently for shallow traversal fbab552a53 commit-graph: bump DIE_ON_LOAD check to actual load-time 72ed80c784 list-objects: don't queue root trees unless revs->tree_objects is set 4fd39c76e6 doc: minor formatting fix 29f4332e66 Quit passing 'now' to date code c77abf0460 Merge branch 'py/revert-hunks-lines' 5a2bb62180 Merge branch 'bp/widget-focus-hotkeys' e07446ed5f git-gui: add hotkeys to set widget focus f981ec18cf cache-tree: do not lazy-fetch tentative tree f1d4a28250 Second batch c8ada15456 Merge branch 'bc/reread-attributes-during-rebase' 8f3ba423e7 Merge branch 'tg/t0021-racefix' a477abe9e4 Merge branch 'mp/for-each-ref-missing-name-or-email' d49c2c3466 Merge branch 'sb/userdiff-dts' 2743b61bc6 Merge branch 'rs/sort-oid-array-thread-safe' 4c49dd042d Merge branch 'nd/diff-parseopt' d8b1ce7972 Merge branch 'jt/diff-lazy-fetch-submodule-fix' 8ce8a63b46 Merge branch 'ds/midx-expire-repack' 9437394661 Merge branch 'cb/fetch-set-upstream' af2b8faf49 Merge branch 'rs/pax-extended-header-length-fix' fa9e7934c7 Merge branch 'bm/repository-layout-typofix' d1a251a1fa Merge branch 'en/checkout-mismerge-fix' e1151704f2 Merge branch 'sg/diff-indent-heuristic-non-experimental' f4f8dfe127 Merge branch 'ds/feature-macros' 4a12f89865 Merge branch 'jk/eoo' b4a1eec332 Merge branch 'jk/repo-init-cleanup' 70336bd50a Merge branch 'py/git-gui-do-quit' ad7c543e3b grep: skip UTF8 checks explicitly 0cc7380d88 log-tree: call load_ref_decorations() in get_name_decoration() b4ecbcf6a2 log: test --decorate-refs-exclude with --simplify-by-decoration 4414e837fc gitweb.conf.txt: switch pluses to backticks to help Asciidoctor b7e1ba5649 git-merge-index.txt: wrap shell listing in "----" 38cadf9e47 git-receive-pack.txt: wrap shell [script] listing in "----" 5371813768 git-ls-remote.txt: wrap shell listing in "----" 1925fe0c8a Documentation: wrap config listings in "----" 922a2c93f5 git-merge-base.txt: render indentations correctly under Asciidoctor 2017956a19 Documentation: wrap blocks with "--" dd2e50a84e commit-graph: turn off save_commit_buffer 67fa6aac5a commit-graph: don't show progress percentages while expanding reachable commits 806278dead commit-graph.c: handle corrupt/missing trees 16749b8dd2 commit-graph.c: handle commit parsing errors 23424ea759 t/t5318: introduce failing 'git commit-graph write' tests bf1e28e0ad builtin/rebase.c: Remove pointless message d2172ef02d builtin/rebase.c: make sure the active branch isn't moved when autostashing bd482d6e33 t: use common $SQ variable 3a37876b5d pack-objects: drop packlist index_pos optimization 7e6b96c73b test-read-cache: drop namelen variable e4b369069e diff-delta: set size out-parameter to 0 for NULL delta 7140414d8b bulk-checkin: zero-initialize hashfile_checkpoint f1cbd033e2 pack-objects: use object_id in packlist_alloc() 0dfed92dfd git-am: handle missing "author" when parsing commit 3960290675 ci: restore running httpd tests 6a20b62d7e t/lib-git-svn.sh: check GIT_TEST_SVN_HTTPD when running SVN HTTP tests c77722b3ea use get_tagged_oid() dad3f0607b tag: factor out get_tagged_oid() 468ce99b77 unpack-trees: rename 'is_excluded_from_list()' 65edd96aec treewide: rename 'exclude' methods to 'pattern' 4ff89ee52c treewide: rename 'EXCL_FLAG_' to 'PATTERN_FLAG_' caa3d55444 treewide: rename 'struct exclude_list' to 'struct pattern_list' ab8db61390 treewide: rename 'struct exclude' to 'struct path_pattern' 483e861111 t9902: use a non-deprecated command for testing 9df53c5de6 Recommend git-filter-repo instead of git-filter-branch 7b6ad97939 t6006: simplify, fix, and optimize empty message test 50094ca45f config/format.txt: specify default value of format.coverLetter c1a6f21cd4 Doc: add more detail for git-format-patch 854b5cb46a t4014: stop losing return codes of git commands dd2b6b6860 t4014: remove confusing pipe in check_threading() 6bd26f58ea t4014: use test_line_count() where possible c6ec6dadba t4014: let sed open its own files f2e2fa8f60 t4014: drop redirections to /dev/null 460609cbd5 t4014: use indentable here-docs 92014b69bb t4014: remove spaces after redirect operators 0ab74e979c t4014: use sq for test case names cb46c40662 t4014: move closing sq onto its own line b562a54c01 t4014: s/expected/expect/ e770fbfeff t3005: remove unused variable da280f5f1a t: use LF variable defined in the test harness 7027f508c7 compat/*.[ch]: remove extern from function declarations using spatch 552fc5016f mingw: apply array.cocci rule 476998d05b t3427: accelerate this test by using fast-export and fast-import aac6ff7b5b .gitignore: stop ignoring `.manifest` files 2c65d90f75 am: reload .gitattributes after patching it 1577dc0f7c tree: simplify parse_tree_indirect() 50f26bd035 fetch: add fetch.writeCommitGraph config setting 8e4c8af058 push: disallow --all and refspecs when remote.<name>.mirror is set 27fd1e4ea7 merge-options.txt: clarify meaning of various ff-related options 0a8bc7068f clarify documentation for remote helpers 80e3658647 help: make help_unknown_ref() NORETURN 313677627a checkout: add simple check for 'git checkout -b' 3441de5b9c gitk: Make web links clickable a4fa2f0a4c git-gui: allow undoing last revert 414d924beb rebase: teach rebase --keep-base 6330209d7d rebase tests: test linear branch topology 4effc5bc96 rebase: fast-forward --fork-point in more cases c0efb4c1dd rebase: fast-forward --onto in more cases 2b318aa6c3 rebase: refactor can_fast_forward into goto tower c9efc21683 t3432: test for --no-ff's interaction with fast-forward 1ebec8dfc1 fast-import: duplicate into history rather than passing ownership 9756082b3c fast-import: duplicate parsed encoding string 86ae43da6a status: mention --skip for revert and cherry-pick b1b16bba96 completion: add --skip for cherry-pick and revert deaa65a754 completion: merge options for cherry-pick and revert 4336d36512 t3432: distinguish "noop-same" v.s. "work-same" in "same head" tests 793ac7e309 t3432: test rebase fast-forward behavior 359ecebc34 t3431: add rebase --fork-point tests 502c386ff9 t7300-clean: demonstrate deleting nested repo with an ignored file breakage ff61681b46 grep: refactor and simplify PCRE1 support 8991da6a38 grep: make sure NO_LIBPCRE1_JIT disable JIT in PCRE1 1fd881d404 trace2: use warning() directly in tr2_dst_malformed_warning() fd99c2dd9b grep: use return value of strbuf_detach() 82f51af345 log-tree: always use return value of strbuf_detach() 7e92756751 http: don't leak urlmatch_config.vars 9784f97321 commit: free the right buffer in release_commit_memory ce17feb1b3 path: add a function to check for path suffix 60d198d022 banned.h: fix vsprintf()'s ban message 60fe477a0b notes: avoid potential use-after-free during insertion 779ad6641b notes: avoid leaking duplicate entries 4e1a641ee3 mingw: fix launching of externals from Unicode paths 5cf7b3b1ac setup_git_directory(): handle UNC root paths correctly e2683d51d9 Fix .git/ discovery at the root of UNC shares d17f2124a7 setup_git_directory(): handle UNC paths correctly ebb8d2c90f mingw: support UNC in git clone file://server/share/repo 0c37c41d13 t4009: make hash size independent c1f3dfcc23 t4002: make hash independent 8cc5ff83c3 t4000: make hash size independent c784815073 t3903: abstract away SHA-1-specific constants 2ccdfb1c78 git-gui: return early when patch fails to apply 62bd99934b git-gui: allow reverting selected hunk 5f0a516de9 git-gui: allow reverting selected lines fddf2ebe38 transport: teach all vtables to allow fetch first ac3fda82bf transport-helper: skip ls-refs if unnecessary 745f681289 First batch after Git 2.23 d4b12b9e07 Merge branch 'sg/worktree-remove-errormsg' 22e86e85cb Merge branch 'en/fast-import-merge-doc' 9c7573581c Merge branch 'jk/perf-no-dups' 4336fdb2ef Merge branch 'rs/nedalloc-fixlets' 8ae7a46c4d Merge branch 'sg/show-failed-test-names' 6ba06b582b Merge branch 'sg/commit-graph-validate' 072735ea58 Merge branch 'vn/restore-empty-ita-corner-case-fix' 207ad3cb20 Merge branch 'sc/pack-refs-deletion-racefix' 77067b6ce8 Merge branch 'sg/do-not-skip-non-httpd-tests' 1b01cdbf2e Merge branch 'jk/tree-walk-overflow' 8aa76abba5 Merge branch 'sg/t5510-test-i18ngrep-fix' 307179732d Merge branch 'mt/grep-submodules-working-tree' 58166c2e9d t0021: make sure clean filter runs 8b3f33ef11 ref-filter: initialize empty name or email fields 3c81760bc6 userdiff: add a builtin pattern for dts files fe49814409 t4014: drop unnecessary blank lines from test cases a2bb801f6a line-log: avoid unnecessary full tree diffs eef5204190 line-log: extract pathspec parsing from line ranges into a helper function a63694f523 diff: skip GITLINK when lazy fetching missing objs 7cfcb16b0e sha1-name: make sort_ambiguous_oid_array() thread-safe 19800bdc3f parseopt: move definition of enum parse_opt_result up 415b770b88 packfile.h: drop extern from function declaration acb49d1cc8 t3800: make hash-size independent ca6ba94200 t3600: make hash size independent 19ce5496c2 t3506: make hash independent 9a6738c061 t3430: avoid hard-coded object IDs 4dd1b5f90f t3404: abstract away SHA-1-specific constants b99bfc7a6c t3306: abstract away SHA-1-specific constants e3e9d02e35 t3305: make hash size independent b408cf8cf6 t3301: abstract away SHA-1-specific constants b561edd213 t3206: abstract away hash size constants a5f61c7d13 t3201: abstract away SHA-1-specific constants 1c24a54ea4 repository-layout.txt: correct pluralization of 'object' b0a3186140 sequencer: simplify root commit creation a47ba3c777 rebase -i: check for updated todo after squash and reword 450efe2d53 rebase -i: always update HEAD before rewording c581e4a749 grep: under --debug, show whether PCRE JIT is enabled aaa95dfa05 midx: switch to using the_hash_algo be8e172e9f builtin/show-index: replace sha1_to_hex 3f34d70d40 rerere: replace sha1_to_hex fc06be3b7f builtin/receive-pack: replace sha1_to_hex 69fa337060 builtin/index-pack: replace sha1_to_hex 3a4d7aa5ae packfile: replace sha1_to_hex e0cb7cdb89 wt-status: convert struct wt_status to object_id 8d4d86b0f0 cache: remove null_sha1 f6ca67d673 builtin/worktree: switch null_sha1 to null_oid dd336a5511 builtin/repack: write object IDs of the proper length 894c0f66bb pack-write: use hash_to_hex when writing checksums 4439c7a360 sequencer: convert to use the_hash_algo 95518faac1 bisect: switch to using the_hash_algo e84f3572bd sha1-lookup: switch hard-coded constants to the_hash_algo fe9fec45f6 config: use the_hash_algo in abbrev comparison 976ff7e49d combine-diff: replace GIT_SHA1_HEXSZ with the_hash_algo 703d2d4193 bundle: switch to use the_hash_algo 9d958cc041 connected: switch GIT_SHA1_HEXSZ to the_hash_algo 7962e046ff show-index: switch hard-coded constants to the_hash_algo fee49308a1 blame: remove needless comparison with GIT_SHA1_HEXSZ 7e0d029f18 builtin/rev-parse: switch to use the_hash_algo 319009642c builtin/blame: switch uses of GIT_SHA1_HEXSZ to the_hash_algo fabec2c5c3 builtin/receive-pack: switch to use the_hash_algo f6af19a9ad fetch-pack: use parse_oid_hex 36261e42ec patch-id: convert to use the_hash_algo 28ba1830d0 builtin/replace: make hash size independent 24bc1a1292 pull, fetch: add --set-upstream option 71d41ff651 archive-tar: turn length miscalculation warning into BUG 17e9ef00d2 archive-tar: use size_t in strbuf_append_ext_header() 82a46af13e archive-tar: fix pax extended header length calculation 4060c1990a archive-tar: report wrong pax extended header length 4615a8cb5b merge-recursive: alphabetize include list 45ef16f77a merge-recursive: add sanity checks for relevant merge_options f3081dae01 merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* 5bf7e5779e merge-recursive: split internal fields into a separate struct e95e481f9e merge-recursive: avoid losing output and leaking memory holding that output a779fb829b merge-recursive: comment and reorder the merge_options fields 8599ab4574 merge-recursive: consolidate unnecessary fields in merge_options 7c0a6c8e47 merge-recursive: move some definitions around to clean up the header c749ab1da8 merge-recursive: rename merge_options argument to opt in header bab56877e0 merge-recursive: rename 'mrtree' to 'result_tree', for clarity ff1bfa2cd5 merge-recursive: use common name for ancestors/common/base_list 4d7101e25c merge-recursive: fix some overly long lines 724dd767b2 cache-tree: share code between functions writing an index as a tree 345480d1ed merge-recursive: don't force external callers to do our logging b4db8a2b76 merge-recursive: remove useless parameter in merge_trees() 98a1d3d888 merge-recursive: exit early if index != head 9822175d2b Ensure index matches head before invoking merge machinery, round N 10f751c06b merge-recursive: remove another implicit dependency on the_repository f836bf3937 merge-recursive: future-proof update_file_flags() against memory leaks 8e01251694 merge-recursive: introduce an enum for detect_directory_renames values 743474cbfa merge-recursive: provide a better label for diff3 common ancestor 51eeaf4aa7 l10n: sv.po: Update Swedish translation (4674t0f0u) 5bace62582 l10n: Update Catalan translation 139ef37a2f merge-recursive: enforce opt->ancestor != NULL when calling merge_trees() 65c01c6442 checkout: provide better conflict hunk description with detached HEAD d8523ca1b9 merge-recursive: be consistent with assert acb7da05ac checkout: remove duplicate code 93b980e58f http: use xmalloc with cURL 64e5e1fba1 diff: 'diff.indentHeuristic' is no longer experimental aaf633c2ad repo-settings: create feature.experimental setting c6cc4c5afd repo-settings: create feature.manyFiles setting ad0fb65999 repo-settings: parse core.untrackedCache 31b1de6a09 commit-graph: turn on commit-graph by default b068d9a250 t6501: use 'git gc' in quiet mode 7211b9e753 repo-settings: consolidate some config settings 507e5470a0 worktree remove: clarify error message on dirty worktree 5af9d5f6c8 completion: complete config variables and values for 'git clone --config=' 88cd790d6a completion: complete config variables names and values for 'git clone -c' dd33472831 completion: complete values of configuration variables after 'git -c var=' e1e00089da completion: complete configuration sections and variable names for 'git -c' 42d0efec59 completion: split _git_config() d9ee1e0617 completion: simplify inner 'case' pattern in __gitcomp() 2675ea1cc0 completion: use 'sort -u' to deduplicate config variable names d9438873c4 completion: deduplicate configuration sections 7a09a8f093 completion: add tests for 'git config' completion 840d7e5b3c completion: complete more values of more 'color.*' configuration variables 08a12175d8 completion: fix a typo in a comment 9827d4c185 packfile: drop release_pack_memory() d1387d3895 git-fast-import.txt: clarify that multiple merge commits are allowed 362f8b280c t/perf: rename duplicate-numbered test script 742ed63345 trace2: cleanup whitespace in perf format e34430556c trace2: cleanup whitespace in normal format c2b890aca5 quote: add sq_append_quote_argv_pretty() ad43e37839 trace2: trim trailing whitespace in normal format error message 04f10d332f trace2: remove dead code in maybe_add_string_va() da4589ce7e trace2: trim whitespace in region messages in perf target format 0d88f3d2c5 Merge branch 'py/call-do-quit-before-exit' of github.com:gitster/git-gui into py/git-gui-do-quit 5440eb0ea2 git-gui: call do_quit before destroying the main window bc40ce4de6 merge: --no-verify to bypass pre-merge-commit hook 6098817fd7 git-merge: honor pre-merge-commit hook a1f3dd7eb3 merge: do no-verify like commit f78f6c7e0c t7503: verify proper hook execution 70597e8386 nedmalloc: avoid compiler warning about unused value c9b9c09dae nedmalloc: do assignments only after the declaration section 22932d9169 config: stop checking whether the_repository is NULL 5732f2b1ef common-main: delay trace2 initialization 58ebccb478 t1309: use short branch name in includeIf.onbranch test 67feca3b1c gitcli: document --end-of-options 51b4594b40 parse-options: allow --end-of-options as a synonym for "--" 19e8789b23 revision: allow --end-of-options to end option parsing ffe1afe67c tests: show the test name and number at the start of verbose output 96f3ccc2ab t0000-basic: use realistic test script names in the verbose tests 7c5c9b9c57 commit-graph: error out on invalid commit oids in 'write --stdin-commits' 39d8831856 commit-graph: turn a group of write-related macro flags into an enum 9916073be5 t5318-commit-graph: use 'test_expect_code' 620c09e1b6 restore: add test for deleted ita files ecd72042de checkout.c: unstage empty deleted ita files a613d4f817 pack-refs: always refresh after taking the lock file decfe05bb6 t: warn against adding non-httpd-specific tests after sourcing 'lib-httpd' 371df1bea9 trace2: cleanup column alignment in perf target format 5aa02f9868 tree-walk: harden make_traverse_path() length computations c43ab06259 tree-walk: add a strbuf wrapper for make_traverse_path() b3b3cbcbf2 tree-walk: accept a raw length for traverse_path_len() 37806080d7 tree-walk: use size_t consistently 7f005b0f48 t5703: run all non-httpd-specific tests before sourcing 'lib-httpd.sh' 12b1826609 t5510-fetch: run non-httpd-specific test before sourcing 'lib-httpd.sh' 9055384710 tree-walk: drop oid from traverse_info 947208b725 setup_traverse_info(): stop copying oid e1fac531ea rebase -r: do not (re-)generate root commits with `--root` *and* `--onto` a63f990d92 t3418: test `rebase -r` with merge strategies 5dcdd7409a t/lib-rebase: prepare for testing `git rebase --rebase-merges` e145d99347 rebase -r: support merge strategies other than `recursive` 4e6023b13a t3427: fix another incorrect assumption f67336dabf t3427: accommodate for the `rebase --merge` backend having been replaced a9c71073da t3427: fix erroneous assumption b8c6f24255 t3427: condense the unnecessarily repetitive test cases into three d51b771dc0 t3427: move the `filter-branch` invocation into the `setup` case c248d32cdb t3427: simplify the `setup` test case significantly 8c1e24048a t3427: add a clarifying comment 5efed0ecf9 rebase: fold git-rebase--common into the -p backend 68b54f669d sequencer: the `am` and `rebase--interactive` scripts are gone 2e7bbac6be .gitignore: there is no longer a built-in `git-rebase--interactive` 6180b20239 t3400: stop referring to the scripted rebase d5b581f228 Drop unused git-rebase--am.sh 814291cf3f t5510-fetch: fix negated 'test_i18ngrep' invocation 6a289d45c0 grep: fix worktree case in submodules 870eea8166 grep: do not enter PCRE2_UTF mode on fixed matching 8a5999838e grep: stess test PCRE v2 on invalid UTF-8 data 09872f6418 grep: create a "is_fixed" member in "grep_pat" 8a35b540a9 grep: consistently use "p->fixed" in compile_regexp() 685668faaa grep: stop using a custom JIT stack with PCRE v1 34489239d0 grep: stop "using" a custom JIT stack with PCRE v2 04bef50c01 grep: remove overly paranoid BUG(...) code b65abcafc7 grep: use PCRE v2 for optimized fixed-string search 48de2a768c grep: remove the kwset optimization 45d1f37ccc grep: drop support for \0 in --fixed-strings <pattern> 25754125ce grep: make the behavior for NUL-byte in patterns sane d316af059d grep tests: move binary pattern tests into their own file 471dac5d2c grep tests: move "grep binary" alongside the rest f463beb805 grep: inline the return value of a function call used only once b14cf112e2 t4210: skip more command-line encoding tests on MinGW 44570188a0 grep: don't use PCRE2?_UTF8 with "log --encoding=<non-utf8>" 4e2443b181 log tests: test regex backends in "--encode=<enc>" tests 90d21f9ebf list-objects-filter-options: make parser void 5a133e8a7f list-objects-filter-options: clean up use of ALLOC_GROW 489fc9ee71 list-objects-filter-options: allow mult. --filter c2694952e3 strbuf: give URL-encoding API a char predicate fn cf9ceb5a12 list-objects-filter-options: make filter_spec a string_list f56f764279 list-objects-filter-options: move error check up e987df5fe6 list-objects-filter: implement composite filters 842b00516a list-objects-filter-options: always supply *errbuf 7a7c7f4a6d list-objects-filter: put omits set in filter struct 9430147ca0 list-objects-filter: encapsulate filter components 4ca9474efa Move core_partial_clone_filter_default to promisor-remote.c 60b7a92d84 Move repository_format_partial_clone to promisor-remote.c db27dca5cf Remove fetch-object.{c,h} in favor of promisor-remote.{c,h} 75de085211 remote: add promisor and partial clone config to the doc 7e154badc0 partial-clone: add multiple remotes in the doc 9a4c507886 t0410: test fetching from many promisor remotes 5e46139376 builtin/fetch: remove unique promisor remote limitation fa3d1b63e8 promisor-remote: parse remote.*.partialclonefilter b14ed5adaf Use promisor_remote_get_direct() and has_promisor_remote() faf2abf496 promisor-remote: use repository_format_partial_clone 9cfebc1f3b promisor-remote: add promisor_remote_reinit() 9e27beaa23 promisor-remote: implement promisor_remote_get_direct() 48de315817 Add initial support for many promisor remotes 2e860675b6 fetch-object: make functions return an error code c59c7c879e t0410: remove pipes after git commands git-subtree-dir: third_party/git git-subtree-split: ef7aa56f965a794d96fb0b1385f94634e7cea06f
Diffstat (limited to 'po/it.po')
-rw-r--r-- | po/it.po | 8960 |
1 files changed, 5059 insertions, 3901 deletions
diff --git a/po/it.po b/po/it.po index 30ec99c74462..e9f596b8fdc7 100644 --- a/po/it.po +++ b/po/it.po @@ -6,13 +6,13 @@ # Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com> # and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their # contributions. -# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019. +# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019, 2020. msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2019-08-10 20:12+0800\n" -"PO-Revision-Date: 2019-08-11 11:48+0200\n" +"POT-Creation-Date: 2020-03-11 15:26+0800\n" +"PO-Revision-Date: 2020-03-12 07:52+0100\n" "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n" "Language-Team: Italian <>\n" "Language: it\n" @@ -20,51 +20,758 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 19.04.3\n" +"X-Generator: Lokalize 19.12.3\n" -#: advice.c:109 +#: add-interactive.c:368 +#, c-format +msgid "Huh (%s)?" +msgstr "Eh (%s)?" + +#: add-interactive.c:521 add-interactive.c:822 sequencer.c:3124 +#: sequencer.c:3562 builtin/rebase.c:875 builtin/rebase.c:1687 +#: builtin/rebase.c:2086 builtin/rebase.c:2130 +msgid "could not read index" +msgstr "impossibile leggere l'indice" + +#: add-interactive.c:576 git-add--interactive.perl:269 +#: git-add--interactive.perl:294 +msgid "binary" +msgstr "binario" + +#: add-interactive.c:634 git-add--interactive.perl:278 +#: git-add--interactive.perl:332 +msgid "nothing" +msgstr "non fare nulla" + +#: add-interactive.c:635 git-add--interactive.perl:314 +#: git-add--interactive.perl:329 +msgid "unchanged" +msgstr "non modificato" + +#: add-interactive.c:672 git-add--interactive.perl:643 +msgid "Update" +msgstr "Aggiorna" + +#: add-interactive.c:689 add-interactive.c:877 +#, c-format +msgid "could not stage '%s'" +msgstr "impossibile aggiungere '%s' all'area di staging" + +#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317 +#: builtin/rebase.c:899 +msgid "could not write index" +msgstr "impossibile scrivere l'indice" + +#: add-interactive.c:698 git-add--interactive.perl:628 +#, c-format, perl-format +msgid "updated %d path\n" +msgid_plural "updated %d paths\n" +msgstr[0] "aggiornato %d percorso\n" +msgstr[1] "aggiornati %d percorsi\n" + +#: add-interactive.c:716 git-add--interactive.perl:678 +#, c-format, perl-format +msgid "note: %s is untracked now.\n" +msgstr "nota: %s ora non è tracciato.\n" + +#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:281 +#: builtin/reset.c:144 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry non riuscito per il percorso '%s'" + +#: add-interactive.c:751 git-add--interactive.perl:655 +msgid "Revert" +msgstr "Esegui il revert" + +#: add-interactive.c:767 +msgid "Could not parse HEAD^{tree}" +msgstr "Impossibile analizzare HEAD^{tree}" + +#: add-interactive.c:805 git-add--interactive.perl:631 +#, c-format, perl-format +msgid "reverted %d path\n" +msgid_plural "reverted %d paths\n" +msgstr[0] "ripristinato %d percorso\n" +msgstr[1] "ripristinati %d percorsi\n" + +#: add-interactive.c:856 git-add--interactive.perl:695 +#, c-format +msgid "No untracked files.\n" +msgstr "Nessun file non tracciato.\n" + +#: add-interactive.c:860 git-add--interactive.perl:689 +msgid "Add untracked" +msgstr "Aggiungi file non tracciati" + +#: add-interactive.c:887 git-add--interactive.perl:625 +#, c-format, perl-format +msgid "added %d path\n" +msgid_plural "added %d paths\n" +msgstr[0] "aggiunto %d percorso\n" +msgstr[1] "aggiunti %d percorsi\n" + +#: add-interactive.c:917 +#, c-format +msgid "ignoring unmerged: %s" +msgstr "ignoro ciò che non è stato sottoposto a merge: %s" + +#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366 +#, c-format +msgid "Only binary files changed.\n" +msgstr "Sono stati modificati solo file binari.\n" + +#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368 +#, c-format +msgid "No changes.\n" +msgstr "Nessuna modifica.\n" + +#: add-interactive.c:935 git-add--interactive.perl:1376 +msgid "Patch update" +msgstr "Aggiornamento patch" + +#: add-interactive.c:974 git-add--interactive.perl:1754 +msgid "Review diff" +msgstr "Rivedi diff" + +#: add-interactive.c:1002 +msgid "show paths with changes" +msgstr "visualizza i percorsi modificati" + +#: add-interactive.c:1004 +msgid "add working tree state to the staged set of changes" +msgstr "" +"aggiungi lo stato dall'albero di lavoro all'insieme delle modifiche " +"nell'area di staging" + +#: add-interactive.c:1006 +msgid "revert staged set of changes back to the HEAD version" +msgstr "" +"ripristina l'insieme delle modifiche nell'area di staging alla versione HEAD" + +#: add-interactive.c:1008 +msgid "pick hunks and update selectively" +msgstr "" +"seleziona gli hunk in modalità interattiva ed esegui l'aggiornamento in modo " +"selettivo" + +#: add-interactive.c:1010 +msgid "view diff between HEAD and index" +msgstr "visualizza il diff fra HEAD e l'indice" + +#: add-interactive.c:1012 +msgid "add contents of untracked files to the staged set of changes" +msgstr "" +"aggiungi i contenuti dei file non tracciati all'insieme delle modifiche " +"nell'area di staging" + +#: add-interactive.c:1020 add-interactive.c:1069 +msgid "Prompt help:" +msgstr "Guida prompt:" + +#: add-interactive.c:1022 +msgid "select a single item" +msgstr "seleziona un singolo elemento" + +#: add-interactive.c:1024 +msgid "select a range of items" +msgstr "seleziona un intervallo di elementi" + +#: add-interactive.c:1026 +msgid "select multiple ranges" +msgstr "seleziona più intervalli" + +#: add-interactive.c:1028 add-interactive.c:1073 +msgid "select item based on unique prefix" +msgstr "seleziona un elemento basandoti su un prefisso univoco" + +#: add-interactive.c:1030 +msgid "unselect specified items" +msgstr "deseleziona gli elementi specificati" + +#: add-interactive.c:1032 +msgid "choose all items" +msgstr "seleziona tutti gli elementi" + +#: add-interactive.c:1034 +msgid "(empty) finish selecting" +msgstr "(vuoto) termina la selezione" + +#: add-interactive.c:1071 +msgid "select a numbered item" +msgstr "seleziona un elemento numerato" + +#: add-interactive.c:1075 +msgid "(empty) select nothing" +msgstr "(vuoto) non selezionare nulla" + +#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851 +msgid "*** Commands ***" +msgstr "*** Comandi ***" + +#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848 +msgid "What now" +msgstr "Cosa faccio ora" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "staged" +msgstr "nell'area di staging" + +#: add-interactive.c:1136 git-add--interactive.perl:213 +msgid "unstaged" +msgstr "rimosso dall'area di staging" + +#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2251 +#: builtin/am.c:2254 builtin/clone.c:123 builtin/fetch.c:144 +#: builtin/merge.c:274 builtin/pull.c:189 builtin/submodule--helper.c:409 +#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397 +#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905 +#: builtin/submodule--helper.c:2148 git-add--interactive.perl:213 +msgid "path" +msgstr "percorso" + +#: add-interactive.c:1143 +msgid "could not refresh index" +msgstr "impossibile aggiornare l'indice" + +#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765 +#, c-format +msgid "Bye.\n" +msgstr "Ciao.\n" + +#: add-patch.c:33 git-add--interactive.perl:1428 +#, c-format, perl-format +msgid "Stage mode change [y,n,q,a,d%s,?]? " +msgstr "Modifica modo stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:34 git-add--interactive.perl:1429 +#, c-format, perl-format +msgid "Stage deletion [y,n,q,a,d%s,?]? " +msgstr "Eliminazione stage [y,n,q,a,d%s,?]? " + +#: add-patch.c:35 git-add--interactive.perl:1430 +#, c-format, perl-format +msgid "Stage this hunk [y,n,q,a,d%s,?]? " +msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:37 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"staging." +msgstr "" +"Se la patch viene applicata senza problemi, l'hunk modificato sarà " +"contrassegnato immediatamente per l'aggiunta all'area di staging." + +#: add-patch.c:40 +msgid "" +"y - stage this hunk\n" +"n - do not stage this hunk\n" +"q - quit; do not stage this hunk or any of the remaining ones\n" +"a - stage this hunk and all later hunks in the file\n" +"d - do not stage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - aggiungi quest'hunk all'area di staging\n" +"n - non aggiungere quest'hunk all'area di staging\n" +"q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di " +"staging\n" +"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di " +"staging\n" +"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di " +"staging\n" + +#: add-patch.c:54 git-add--interactive.perl:1433 +#, c-format, perl-format +msgid "Stash mode change [y,n,q,a,d%s,?]? " +msgstr "Modifica modo stash [y,n,q,a,d%s,?]? " + +#: add-patch.c:55 git-add--interactive.perl:1434 +#, c-format, perl-format +msgid "Stash deletion [y,n,q,a,d%s,?]? " +msgstr "Eliminazione stash [y,n,q,a,d%s,?]? " + +#: add-patch.c:56 git-add--interactive.perl:1435 +#, c-format, perl-format +msgid "Stash this hunk [y,n,q,a,d%s,?]? " +msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? " + +#: add-patch.c:58 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"stashing." +msgstr "" +"Se la patch viene applicata senza problemi, l'hunk modificato sarà " +"contrassegnato immediatamente per lo stash." + +#: add-patch.c:61 +msgid "" +"y - stash this hunk\n" +"n - do not stash this hunk\n" +"q - quit; do not stash this hunk or any of the remaining ones\n" +"a - stash this hunk and all later hunks in the file\n" +"d - do not stash this hunk or any of the later hunks in the file\n" +msgstr "" +"y - esegui lo stash di quest'hunk\n" +"n - non eseguire lo stash di quest'hunk\n" +"q - esci; non eseguire lo stash di quest'hunk né di quelli rimanenti\n" +"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n" +"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file\n" + +#: add-patch.c:77 git-add--interactive.perl:1438 +#, c-format, perl-format +msgid "Unstage mode change [y,n,q,a,d%s,?]? " +msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? " + +#: add-patch.c:78 git-add--interactive.perl:1439 +#, c-format, perl-format +msgid "Unstage deletion [y,n,q,a,d%s,?]? " +msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? " + +#: add-patch.c:79 git-add--interactive.perl:1440 +#, c-format, perl-format +msgid "Unstage this hunk [y,n,q,a,d%s,?]? " +msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? " + +#: add-patch.c:81 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"unstaging." +msgstr "" +"Se la patch viene applicata senza problemi, l'hunk modificato sarà " +"contrassegnato immediatamente per la rimozione dall'area di staging." + +#: add-patch.c:84 +msgid "" +"y - unstage this hunk\n" +"n - do not unstage this hunk\n" +"q - quit; do not unstage this hunk or any of the remaining ones\n" +"a - unstage this hunk and all later hunks in the file\n" +"d - do not unstage this hunk or any of the later hunks in the file\n" +msgstr "" +"y - rimuovi quest'hunk dall'area di staging\n" +"n - non rimuovere quest'hunk dall'area di staging\n" +"q - esci; non rimuovere né quest'hunk né quelli rimanenti dall'area di " +"staging\n" +"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di " +"staging\n" +"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di " +"staging\n" + +#: add-patch.c:99 git-add--interactive.perl:1443 +#, c-format, perl-format +msgid "Apply mode change to index [y,n,q,a,d%s,?]? " +msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? " + +#: add-patch.c:100 git-add--interactive.perl:1444 +#, c-format, perl-format +msgid "Apply deletion to index [y,n,q,a,d%s,?]? " +msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? " + +#: add-patch.c:101 git-add--interactive.perl:1445 +#, c-format, perl-format +msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " +msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? " + +#: add-patch.c:103 add-patch.c:168 add-patch.c:211 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"applying." +msgstr "" +"Se la patch viene applicata senza problemi, l'hunk modificato sarà " +"contrassegnato immediatamente per l'applicazione." + +#: add-patch.c:106 +msgid "" +"y - apply this hunk to index\n" +"n - do not apply this hunk to index\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applica quest'hunk all'indice\n" +"n - non applicare quest'hunk all'indice\n" +"q - esci; non applicare né quest'hunk né quelli rimanenti\n" +"a - applica quest'hunk e tutti quelli successivi nel file\n" +"d - non applicare né quest'hunk né quelli successivi nel file\n" + +#: add-patch.c:121 git-add--interactive.perl:1448 +#: git-add--interactive.perl:1463 +#, c-format, perl-format +msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:122 git-add--interactive.perl:1449 +#: git-add--interactive.perl:1464 +#, c-format, perl-format +msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:123 git-add--interactive.perl:1450 +#: git-add--interactive.perl:1465 +#, c-format, perl-format +msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " +msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:125 add-patch.c:147 add-patch.c:190 +msgid "" +"If the patch applies cleanly, the edited hunk will immediately be marked for " +"discarding." +msgstr "" +"Se la patch viene applicata senza problemi, l'hunk modificato sarà " +"contrassegnato immediatamente per la rimozione." + +#: add-patch.c:128 add-patch.c:193 +msgid "" +"y - discard this hunk from worktree\n" +"n - do not discard this hunk from worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - rimuovi quest'hunk dall'albero di lavoro\n" +"n - non rimuovere quest'hunk dall'albero di lavoro\n" +"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n" +"a - rimuovi quest'hunk e tutti quelli successivi nel file\n" +"d - non rimuovere né quest'hunk né quelli successivi nel file\n" + +#: add-patch.c:143 add-patch.c:186 git-add--interactive.perl:1453 +#, c-format, perl-format +msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1454 +#, c-format, perl-format +msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1455 +#, c-format, perl-format +msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:150 +msgid "" +"y - discard this hunk from index and worktree\n" +"n - do not discard this hunk from index and worktree\n" +"q - quit; do not discard this hunk or any of the remaining ones\n" +"a - discard this hunk and all later hunks in the file\n" +"d - do not discard this hunk or any of the later hunks in the file\n" +msgstr "" +"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n" +"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n" +"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n" +"a - rimuovi quest'hunk e tutti quelli successivi nel file\n" +"d - non rimuovere né quest'hunk né quelli successivi nel file\n" + +#: add-patch.c:164 add-patch.c:207 git-add--interactive.perl:1458 +#, c-format, perl-format +msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d" +"%s,?]? " + +#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1459 +#, c-format, perl-format +msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1460 +#, c-format, perl-format +msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " +msgstr "" +"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " + +#: add-patch.c:171 +msgid "" +"y - apply this hunk to index and worktree\n" +"n - do not apply this hunk to index and worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applica quest'hunk all'indice e all'albero di lavoro\n" +"n - non applicare quest'hunk all'indice e all'albero di lavoro\n" +"q - esci; non applicare né quest'hunk né quelli rimanenti\n" +"a - applica quest'hunk e tutti quelli successivi nel file\n" +"d - non applicare né quest'hunk né quelli successivi nel file\n" + +#: add-patch.c:214 +msgid "" +"y - apply this hunk to worktree\n" +"n - do not apply this hunk to worktree\n" +"q - quit; do not apply this hunk or any of the remaining ones\n" +"a - apply this hunk and all later hunks in the file\n" +"d - do not apply this hunk or any of the later hunks in the file\n" +msgstr "" +"y - applica quest'hunk all'albero di lavoro\n" +"n - non applicare quest'hunk all'albero di lavoro\n" +"q - esci; non applicare né quest'hunk né quelli rimanenti\n" +"a - applica quest'hunk e tutti quelli successivi nel file\n" +"d - non applicare né quest'hunk né quelli successivi nel file\n" + +#: add-patch.c:318 +#, c-format +msgid "could not parse hunk header '%.*s'" +msgstr "impossibile analizzare l'header hunk '%.*s'" + +#: add-patch.c:337 add-patch.c:341 +#, c-format +msgid "could not parse colored hunk header '%.*s'" +msgstr "impossibile analizzare l'header hunk colorato '%.*s'" + +#: add-patch.c:395 +msgid "could not parse diff" +msgstr "impossibile analizzare il diff" + +#: add-patch.c:414 +msgid "could not parse colored diff" +msgstr "impossibile analizzare il diff colorato" + +#: add-patch.c:428 +#, c-format +msgid "failed to run '%s'" +msgstr "esecuzione di '%s' non riuscita" + +#: add-patch.c:587 +msgid "mismatched output from interactive.diffFilter" +msgstr "output di interactive.diffFilter non corrispondente" + +#: add-patch.c:588 +msgid "" +"Your filter must maintain a one-to-one correspondence\n" +"between its input and output lines." +msgstr "" +"Il filtro deve mantenere una corrispondenza uno a uno\n" +"fra le righe di input e di output." + +#: add-patch.c:761 +#, c-format +msgid "" +"expected context line #%d in\n" +"%.*s" +msgstr "" +"attesa riga contesto %d in\n" +"%.*s" + +#: add-patch.c:776 +#, c-format +msgid "" +"hunks do not overlap:\n" +"%.*s\n" +"\tdoes not end with:\n" +"%.*s" +msgstr "" +"gli hunk non si sovrappongono:\n" +"%.*s\n" +"\tnon termina con:\n" +"%.*s" + +#: add-patch.c:1052 git-add--interactive.perl:1112 +msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" +msgstr "" +"Modalità manuale modifica hunt - vedi la fine del file per una guida " +"veloce.\n" + +#: add-patch.c:1056 +#, c-format +msgid "" +"---\n" +"To remove '%c' lines, make them ' ' lines (context).\n" +"To remove '%c' lines, delete them.\n" +"Lines starting with %c will be removed.\n" +msgstr "" +"---\n" +"Per rimuovere '%c' righe, rendile righe ' ' (contesto).\n" +"Per rimuovere '%c' righe, eliminale.\n" +"Le righe che iniziano con %c saranno rimosse.\n" + +#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. +#: add-patch.c:1070 git-add--interactive.perl:1126 +msgid "" +"If it does not apply cleanly, you will be given an opportunity to\n" +"edit again. If all lines of the hunk are removed, then the edit is\n" +"aborted and the hunk is left unchanged.\n" +msgstr "" +"Se non può essere applicata senza problemi, ti sarà data la possibilità\n" +"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n" +"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n" + +#: add-patch.c:1103 +msgid "could not parse hunk header" +msgstr "impossibile analizzare l'header hunk" + +#: add-patch.c:1148 +msgid "'git apply --cached' failed" +msgstr "'git apply --cached' non riuscito" + +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#. +#. TRANSLATORS: do not translate [y/n] +#. The program will only accept that input +#. at this point. +#. Consider translating (saying "no" discards!) as +#. (saying "n" for "no" discards!) if the translation +#. of the word "no" does not start with n. +#: add-patch.c:1218 git-add--interactive.perl:1239 +msgid "" +"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " +msgstr "" +"L'hunk modificato non può essere applicato senza problemi. Modificarlo di " +"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? " + +#: add-patch.c:1261 +msgid "The selected hunks do not apply to the index!" +msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!" + +#: add-patch.c:1262 git-add--interactive.perl:1343 +msgid "Apply them to the worktree anyway? " +msgstr "Vuoi comunque applicarli all'albero di lavoro? " + +#: add-patch.c:1269 git-add--interactive.perl:1346 +msgid "Nothing was applied.\n" +msgstr "Non è stato applicato nulla.\n" + +#: add-patch.c:1326 +msgid "" +"j - leave this hunk undecided, see next undecided hunk\n" +"J - leave this hunk undecided, see next hunk\n" +"k - leave this hunk undecided, see previous undecided hunk\n" +"K - leave this hunk undecided, see previous hunk\n" +"g - select a hunk to go to\n" +"/ - search for a hunk matching the given regex\n" +"s - split the current hunk into smaller hunks\n" +"e - manually edit the current hunk\n" +"? - print help\n" +msgstr "" +"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non " +"è stata presa una decisione\n" +"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n" +"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non " +"è stata presa una decisione\n" +"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n" +"g - seleziona un hunk a cui andare\n" +"/ - cerca un hunk corrispondente all'espressione regolare data\n" +"s - suddividi l'hunk corrente in hunk più piccoli\n" +"e - modifica manualmente l'hunk corrente\n" +"? - stampa una guida\n" + +#: add-patch.c:1447 add-patch.c:1457 +msgid "No previous hunk" +msgstr "Nessun hunk precedente" + +#: add-patch.c:1452 add-patch.c:1462 +msgid "No next hunk" +msgstr "Nessun hunk successivo" + +#: add-patch.c:1468 +msgid "No other hunks to goto" +msgstr "Nessun altro hunk a cui andare" + +#: add-patch.c:1479 git-add--interactive.perl:1577 +msgid "go to which hunk (<ret> to see more)? " +msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? " + +#: add-patch.c:1480 git-add--interactive.perl:1579 +msgid "go to which hunk? " +msgstr "a quale hunk desideri andare? " + +#: add-patch.c:1491 +#, c-format +msgid "Invalid number: '%s'" +msgstr "Numero non valido: '%s'" + +#: add-patch.c:1496 +#, c-format +msgid "Sorry, only %d hunk available." +msgid_plural "Sorry, only %d hunks available." +msgstr[0] "Mi dispiace, è disponibile solo %d hunk." +msgstr[1] "Mi dispiace, sono disponibili solo %d hunk." + +#: add-patch.c:1505 +msgid "No other hunks to search" +msgstr "Nessun altro hunk in cui eseguire la ricerca" + +#: add-patch.c:1511 git-add--interactive.perl:1623 +msgid "search for regex? " +msgstr "cercare un'espressione regolare? " + +#: add-patch.c:1526 +#, c-format +msgid "Malformed search regexp %s: %s" +msgstr "Espressione regolare di ricerca %s malformata: %s" + +#: add-patch.c:1543 +msgid "No hunk matches the given pattern" +msgstr "Nessun hunk corrisponde al pattern fornito" + +#: add-patch.c:1550 +msgid "Sorry, cannot split this hunk" +msgstr "Mi dispiace, non posso suddividere quest'hunk" + +#: add-patch.c:1554 +#, c-format +msgid "Split into %d hunks." +msgstr "Suddiviso in %d hunk." + +#: add-patch.c:1558 +msgid "Sorry, cannot edit this hunk" +msgstr "Mi dispiace, non posso modificare quest'hunk" + +#: add-patch.c:1609 +msgid "'git apply' failed" +msgstr "'git apply' non riuscito" + +#: advice.c:115 #, c-format msgid "%shint: %.*s%s\n" msgstr "%ssuggerimento: %.*s%s\n" -#: advice.c:162 +#: advice.c:168 msgid "Cherry-picking is not possible because you have unmerged files." msgstr "" "Il cherry picking non è possibile perché ci sono file di cui non è stato " "eseguito il merge." -#: advice.c:164 +#: advice.c:170 msgid "Committing is not possible because you have unmerged files." msgstr "" "Il commit non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:166 +#: advice.c:172 msgid "Merging is not possible because you have unmerged files." msgstr "" "Il merge non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:168 +#: advice.c:174 msgid "Pulling is not possible because you have unmerged files." msgstr "" "Il pull non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:170 +#: advice.c:176 msgid "Reverting is not possible because you have unmerged files." msgstr "" "Il revert non è possibile perché ci sono file di cui non è stato eseguito il " "merge." -#: advice.c:172 +#: advice.c:178 #, c-format msgid "It is not possible to %s because you have unmerged files." msgstr "" "Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito " "il merge." -#: advice.c:180 +#: advice.c:186 msgid "" "Fix them up in the work tree, and then use 'git add/rm <file>'\n" "as appropriate to mark resolution and make a commit." @@ -72,23 +779,23 @@ msgstr "" "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come " "appropriato per risolverli ed esegui un commit." -#: advice.c:188 +#: advice.c:194 msgid "Exiting because of an unresolved conflict." msgstr "Esco a causa di un conflitto non risolto." -#: advice.c:193 builtin/merge.c:1327 +#: advice.c:199 builtin/merge.c:1335 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." -#: advice.c:195 +#: advice.c:201 msgid "Please, commit your changes before merging." msgstr "Esegui il commit delle modifiche prima di eseguire il merge." -#: advice.c:196 +#: advice.c:202 msgid "Exiting because of unfinished merge." msgstr "Esco a causa di un merge non terminato." -#: advice.c:202 +#: advice.c:208 #, c-format msgid "" "Note: switching to '%s'.\n" @@ -219,17 +926,7 @@ msgstr "modo non valido alla riga %d: %s" msgid "inconsistent header lines %d and %d" msgstr "righe di intestazione %d e %d inconsistenti" -#: apply.c:1460 -#, c-format -msgid "recount: unexpected line: %.*s" -msgstr "recount: riga inattesa: %.*s" - -#: apply.c:1529 -#, c-format -msgid "patch fragment without header at line %d: %.*s" -msgstr "frammento di patch senza intestazione alla riga %d: %.*s" - -#: apply.c:1551 +#: apply.c:1372 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -244,82 +941,92 @@ msgstr[1] "" "l'intestazione git diff non riporta le informazioni sul file una volta " "rimossi %d componenti iniziali del percorso (riga %d)" -#: apply.c:1564 +#: apply.c:1385 #, c-format msgid "git diff header lacks filename information (line %d)" msgstr "l'intestazione git diff non riporta le informazioni sul file (riga %d)" -#: apply.c:1752 +#: apply.c:1481 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: riga inattesa: %.*s" + +#: apply.c:1550 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "frammento di patch senza intestazione alla riga %d: %.*s" + +#: apply.c:1753 msgid "new file depends on old contents" msgstr "il nuovo file dipende da vecchi contenuti" -#: apply.c:1754 +#: apply.c:1755 msgid "deleted file still has contents" msgstr "il file eliminato ha ancora dei contenuti" -#: apply.c:1788 +#: apply.c:1789 #, c-format msgid "corrupt patch at line %d" msgstr "patch corrotta alla riga %d" -#: apply.c:1825 +#: apply.c:1826 #, c-format msgid "new file %s depends on old contents" msgstr "il nuovo file %s dipende da vecchi contenuti" -#: apply.c:1827 +#: apply.c:1828 #, c-format msgid "deleted file %s still has contents" msgstr "il file eliminato %s ha ancora dei contenuti" -#: apply.c:1830 +#: apply.c:1831 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" -#: apply.c:1977 +#: apply.c:1978 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "patch binaria corrotta alla riga %d: %.*s" -#: apply.c:2014 +#: apply.c:2015 #, c-format msgid "unrecognized binary patch at line %d" msgstr "patch binaria non riconosciuta alla riga %d" -#: apply.c:2176 +#: apply.c:2177 #, c-format msgid "patch with only garbage at line %d" msgstr "patch con soli contenuti garbage alla riga %d" -#: apply.c:2262 +#: apply.c:2263 #, c-format msgid "unable to read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: apply.c:2266 +#: apply.c:2267 #, c-format msgid "unable to open or read %s" msgstr "impossibile aprire o leggere %s" -#: apply.c:2925 +#: apply.c:2936 #, c-format msgid "invalid start of line: '%c'" msgstr "inizio della riga non valido: '%c'" -#: apply.c:3046 +#: apply.c:3057 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)." msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)." -#: apply.c:3058 +#: apply.c:3069 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d" -#: apply.c:3064 +#: apply.c:3075 #, c-format msgid "" "while searching for:\n" @@ -328,26 +1035,26 @@ msgstr "" "durante la ricerca di:\n" "%.*s" -#: apply.c:3086 +#: apply.c:3097 #, c-format msgid "missing binary patch data for '%s'" msgstr "dati della patch binaria mancanti per '%s'" -#: apply.c:3094 +#: apply.c:3105 #, c-format msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'" msgstr "" "impossibile applicare una patch binaria al contrario senza l'hunk contrario " "per '%s'" -#: apply.c:3141 +#: apply.c:3152 #, c-format msgid "cannot apply binary patch to '%s' without full index line" msgstr "" "impossibile applicare una patch binaria a '%s' senza la riga d'indice " "completa" -#: apply.c:3151 +#: apply.c:3163 #, c-format msgid "" "the patch applies to '%s' (%s), which does not match the current contents." @@ -355,432 +1062,418 @@ msgstr "" "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti " "del file." -#: apply.c:3159 +#: apply.c:3171 #, c-format msgid "the patch applies to an empty '%s' but it is not empty" msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto" -#: apply.c:3177 +#: apply.c:3189 #, c-format msgid "the necessary postimage %s for '%s' cannot be read" msgstr "impossibile leggere la postimmagine %s necessaria per '%s'" -#: apply.c:3190 +#: apply.c:3202 #, c-format msgid "binary patch does not apply to '%s'" msgstr "la patch binaria non si applica correttamente a '%s'" -#: apply.c:3196 +#: apply.c:3209 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" -#: apply.c:3217 +#: apply.c:3230 #, c-format msgid "patch failed: %s:%ld" msgstr "patch non riuscita: %s:%ld" -#: apply.c:3340 +#: apply.c:3353 #, c-format msgid "cannot checkout %s" msgstr "impossibile eseguire il checkout di '%s'" -#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279 +#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298 #, c-format msgid "failed to read %s" msgstr "lettura di %s non riuscita" -#: apply.c:3400 +#: apply.c:3413 #, c-format msgid "reading from '%s' beyond a symbolic link" msgstr "lettura di '%s' oltre un collegamento simbolico" -#: apply.c:3429 apply.c:3672 +#: apply.c:3442 apply.c:3685 #, c-format msgid "path %s has been renamed/deleted" msgstr "il percorso %s è stato rinominato/eliminato" -#: apply.c:3515 apply.c:3687 +#: apply.c:3528 apply.c:3700 #, c-format msgid "%s: does not exist in index" msgstr "%s: non esiste nell'indice" -#: apply.c:3524 apply.c:3695 +#: apply.c:3537 apply.c:3708 #, c-format msgid "%s: does not match index" msgstr "%s: non corrisponde all'indice" -#: apply.c:3559 +#: apply.c:3572 msgid "repository lacks the necessary blob to fall back on 3-way merge." msgstr "" "dal repository manca il blob necessario per ripiegare sul merge a tre vie." -#: apply.c:3562 +#: apply.c:3575 #, c-format msgid "Falling back to three-way merge...\n" msgstr "Ripiego sul merge a tre vie...\n" -#: apply.c:3578 apply.c:3582 +#: apply.c:3591 apply.c:3595 #, c-format msgid "cannot read the current contents of '%s'" msgstr "impossibile leggere i contenuti correnti di '%s'" -#: apply.c:3594 +#: apply.c:3607 #, c-format msgid "Failed to fall back on three-way merge...\n" msgstr "Ripiego sul merge a tre vie non riuscito...\n" -#: apply.c:3608 +#: apply.c:3621 #, c-format msgid "Applied patch to '%s' with conflicts.\n" msgstr "Patch applicata a '%s' con conflitti.\n" -#: apply.c:3613 +#: apply.c:3626 #, c-format msgid "Applied patch to '%s' cleanly.\n" msgstr "Patch '%s' applicata correttamente.\n" -#: apply.c:3639 +#: apply.c:3652 msgid "removal patch leaves file contents" msgstr "la rimozione della patch lascia contenuti del file" -#: apply.c:3712 +#: apply.c:3725 #, c-format msgid "%s: wrong type" msgstr "%s: tipo errato" -#: apply.c:3714 +#: apply.c:3727 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ha il tipo %o, atteso %o" -#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856 -#: read-cache.c:1309 +#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856 +#: read-cache.c:1325 #, c-format msgid "invalid path '%s'" msgstr "percorso '%s' non valido" -#: apply.c:3923 +#: apply.c:3936 #, c-format msgid "%s: already exists in index" msgstr "%s: esiste già nell'indice" -#: apply.c:3926 +#: apply.c:3939 #, c-format msgid "%s: already exists in working directory" msgstr "%s: esiste già nella directory di lavoro" -#: apply.c:3946 +#: apply.c:3959 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)" -#: apply.c:3951 +#: apply.c:3964 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s" -#: apply.c:3971 +#: apply.c:3984 #, c-format msgid "affected file '%s' is beyond a symbolic link" msgstr "il file interessato '%s' si trova oltre un collegamento simbolico" -#: apply.c:3975 +#: apply.c:3988 #, c-format msgid "%s: patch does not apply" msgstr "%s: la patch non si applica correttamente" -#: apply.c:3990 +#: apply.c:4003 #, c-format msgid "Checking patch %s..." msgstr "Controllo della patch %s in corso..." -#: apply.c:4082 +#: apply.c:4095 #, c-format msgid "sha1 information is lacking or useless for submodule %s" msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili" -#: apply.c:4089 +#: apply.c:4102 #, c-format msgid "mode change for %s, which is not in current HEAD" msgstr "modifica modo per %s che non è nell'HEAD corrente" -#: apply.c:4092 +#: apply.c:4105 #, c-format msgid "sha1 information is lacking or useless (%s)." msgstr "le informazioni SHA1 sono mancanti o inutili (%s)." -#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry non riuscito per il percorso '%s'" - -#: apply.c:4101 +#: apply.c:4114 #, c-format msgid "could not add %s to temporary index" msgstr "impossibile aggiungere %s all'indice temporaneo" -#: apply.c:4111 +#: apply.c:4124 #, c-format msgid "could not write temporary index to %s" msgstr "impossibile scrivere l'indice temporaneo in %s" -#: apply.c:4249 +#: apply.c:4262 #, c-format msgid "unable to remove %s from index" msgstr "impossibile rimuovere %s dall'indice" -#: apply.c:4283 +#: apply.c:4296 #, c-format msgid "corrupt patch for submodule %s" msgstr "patch corrotta per il sottomodulo %s" -#: apply.c:4289 +#: apply.c:4302 #, c-format msgid "unable to stat newly created file '%s'" msgstr "impossibile eseguire lo stat del file appena creato '%s'" -#: apply.c:4297 +#: apply.c:4310 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "impossibile creare l'archivio di backup per il file appena creato %s" -#: apply.c:4303 apply.c:4448 +#: apply.c:4316 apply.c:4461 #, c-format msgid "unable to add cache entry for %s" msgstr "impossibile aggiungere la voce della cache per %s" -#: apply.c:4346 +#: apply.c:4359 #, c-format msgid "failed to write to '%s'" msgstr "scrittura in '%s' non riuscita" -#: apply.c:4350 +#: apply.c:4363 #, c-format msgid "closing file '%s'" msgstr "chiusura del file '%s' in corso" -#: apply.c:4420 +#: apply.c:4433 #, c-format msgid "unable to write file '%s' mode %o" msgstr "impossibile scrivere il file '%s' con modo %o" -#: apply.c:4518 +#: apply.c:4531 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s applicata correttamente." -#: apply.c:4526 +#: apply.c:4539 msgid "internal error" msgstr "errore interno" -#: apply.c:4529 +#: apply.c:4542 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Applicazione della patch %%s con %d frammento respinto..." msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..." -#: apply.c:4540 +#: apply.c:4553 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "nome file .rej troncato a %.*s.rej" -#: apply.c:4548 builtin/fetch.c:878 builtin/fetch.c:1168 +#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201 #, c-format msgid "cannot open %s" msgstr "impossibile aprire %s" -#: apply.c:4562 +#: apply.c:4575 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Frammento %d applicato correttamente." -#: apply.c:4566 +#: apply.c:4579 #, c-format msgid "Rejected hunk #%d." msgstr "Frammento %d respinto." -#: apply.c:4676 +#: apply.c:4698 #, c-format msgid "Skipped patch '%s'." msgstr "Patch '%s' ignorata." -#: apply.c:4684 +#: apply.c:4706 msgid "unrecognized input" msgstr "input non riconosciuto" -#: apply.c:4704 +#: apply.c:4726 msgid "unable to read index file" msgstr "impossibile leggere il file index" -#: apply.c:4859 +#: apply.c:4883 #, c-format msgid "can't open patch '%s': %s" msgstr "impossibile aprire la patch '%s': %s" -#: apply.c:4886 +#: apply.c:4910 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "%d errore di spazi bianchi soppresso" msgstr[1] "%d errori di spazi bianchi soppressi" -#: apply.c:4892 apply.c:4907 +#: apply.c:4916 apply.c:4931 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." msgstr[0] "%d riga aggiunge errori di spazi bianchi." msgstr[1] "%d righe aggiungono errori di spazi bianchi." -#: apply.c:4900 +#: apply.c:4924 #, c-format msgid "%d line applied after fixing whitespace errors." msgid_plural "%d lines applied after fixing whitespace errors." msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi." msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi." -#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390 +#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406 msgid "Unable to write new index file" msgstr "Impossibile scrivere il nuovo file index" -#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211 -#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273 -#: builtin/pull.c:208 builtin/submodule--helper.c:407 -#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370 -#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853 -#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211 -msgid "path" -msgstr "percorso" - -#: apply.c:4944 +#: apply.c:4968 msgid "don't apply changes matching the given path" msgstr "non applicare le modifiche corrispondenti al percorso specificato" -#: apply.c:4947 +#: apply.c:4971 msgid "apply changes matching the given path" msgstr "applica le modifiche corrispondenti al percorso specificato" -#: apply.c:4949 builtin/am.c:2217 +#: apply.c:4973 builtin/am.c:2260 msgid "num" msgstr "num" -#: apply.c:4950 +#: apply.c:4974 msgid "remove <num> leading slashes from traditional diff paths" msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali" -#: apply.c:4953 +#: apply.c:4977 msgid "ignore additions made by the patch" msgstr "ignora le aggiunte create dalla patch" -#: apply.c:4955 +#: apply.c:4979 msgid "instead of applying the patch, output diffstat for the input" msgstr "" "invece di applicare la patch, visualizza l'output di diffstat per l'input" -#: apply.c:4959 +#: apply.c:4983 msgid "show number of added and deleted lines in decimal notation" msgstr "" "visualizza il numero di righe aggiunte ed eliminate in notazione decimale" -#: apply.c:4961 +#: apply.c:4985 msgid "instead of applying the patch, output a summary for the input" msgstr "invece di applicare la patch, visualizza un riassunto per l'input" -#: apply.c:4963 +#: apply.c:4987 msgid "instead of applying the patch, see if the patch is applicable" msgstr "invece di applicare la patch, verifica se può essere applicata" -#: apply.c:4965 +#: apply.c:4989 msgid "make sure the patch is applicable to the current index" msgstr "assicura che la patch sia applicabile all'indice corrente" -#: apply.c:4967 +#: apply.c:4991 msgid "mark new files with `git add --intent-to-add`" msgstr "contrassegna i nuovi file con `git add --intent-to-add`" -#: apply.c:4969 +#: apply.c:4993 msgid "apply a patch without touching the working tree" msgstr "applica una patch senza modificare l'albero di lavoro" -#: apply.c:4971 +#: apply.c:4995 msgid "accept a patch that touches outside the working area" msgstr "" "accetta una patch che apporta modifiche al di fuori dell'area di lavoro" -#: apply.c:4974 +#: apply.c:4998 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "applica anche la patch (da usare con --stat/--summary/--check)" -#: apply.c:4976 +#: apply.c:5000 msgid "attempt three-way merge if a patch does not apply" msgstr "prova un merge a tre vie se la patch non si applica correttamente" -#: apply.c:4978 +#: apply.c:5002 msgid "build a temporary index based on embedded index information" msgstr "compila un index temporaneo basato sulle informazioni indice incluse" -#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524 +#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524 msgid "paths are separated with NUL character" msgstr "i percorsi sono separati con un carattere NUL" -#: apply.c:4983 +#: apply.c:5007 msgid "ensure at least <n> lines of context match" msgstr "assicura che almeno <n> righe di contesto corrispondano" -#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98 +#: apply.c:5008 builtin/am.c:2239 builtin/interpret-trailers.c:98 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102 -#: builtin/pack-objects.c:3330 builtin/rebase.c:1421 +#: builtin/pack-objects.c:3457 builtin/rebase.c:1508 msgid "action" msgstr "azione" -#: apply.c:4985 +#: apply.c:5009 msgid "detect new or modified lines that have whitespace errors" msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" -#: apply.c:4988 apply.c:4991 +#: apply.c:5012 apply.c:5015 msgid "ignore changes in whitespace when finding context" msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti" -#: apply.c:4994 +#: apply.c:5018 msgid "apply the patch in reverse" msgstr "applica la patch in maniera inversa" -#: apply.c:4996 +#: apply.c:5020 msgid "don't expect at least one line of context" msgstr "non aspettare almeno una riga di contesto" -#: apply.c:4998 +#: apply.c:5022 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lascia i frammenti respinti nei file *.rej corrispondenti" -#: apply.c:5000 +#: apply.c:5024 msgid "allow overlapping hunks" msgstr "consenti la sovrapposizione dei frammenti" -#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22 -#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786 -#: builtin/log.c:2068 builtin/mv.c:123 builtin/read-tree.c:128 +#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22 +#: builtin/commit.c:1360 builtin/count-objects.c:98 builtin/fsck.c:774 +#: builtin/log.c:2166 builtin/mv.c:123 builtin/read-tree.c:128 msgid "be verbose" msgstr "visualizza ulteriori dettagli" -#: apply.c:5003 +#: apply.c:5027 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "tollera carattere fine riga rilevato erroneamente come mancante alla fine " "del file" -#: apply.c:5006 +#: apply.c:5030 msgid "do not trust the line counts in the hunk headers" msgstr "" "non fare affidamento sul numero di righe nelle intestazioni dei frammenti" -#: apply.c:5008 builtin/am.c:2205 +#: apply.c:5032 builtin/am.c:2248 msgid "root" msgstr "radice" -#: apply.c:5009 +#: apply.c:5033 msgid "prepend <root> to all filenames" msgstr "anteponi <radice> a tutti i nomi file" @@ -803,7 +1496,7 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <repository> [--exec <comando>] --list" -#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299 +#: archive.c:372 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315 #, c-format msgid "pathspec '%s' did not match any files" msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file" @@ -835,7 +1528,7 @@ msgstr "fmt" msgid "archive format" msgstr "formato archivio" -#: archive.c:458 builtin/log.c:1580 +#: archive.c:458 builtin/log.c:1653 msgid "prefix" msgstr "prefisso" @@ -843,11 +1536,12 @@ msgstr "prefisso" msgid "prepend prefix to each pathname in the archive" msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio" -#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875 -#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134 -#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105 -#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412 -#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177 +#: archive.c:460 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866 +#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162 +#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:887 +#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563 +#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123 +#: parse-options.h:190 msgid "file" msgstr "file" @@ -880,7 +1574,7 @@ msgid "list supported archive formats" msgstr "elenca i formati archivio supportati" #: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116 -#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859 +#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911 msgid "repo" msgstr "repository" @@ -888,7 +1582,7 @@ msgstr "repository" msgid "retrieve the archive from remote repository <repo>" msgstr "recupera l'archivio dal repository remoto <repository>" -#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:707 +#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715 #: builtin/notes.c:498 msgid "command" msgstr "comando" @@ -919,66 +1613,66 @@ msgstr "Formato archivio '%s' sconosciuto" msgid "Argument not supported for format '%s': -%d" msgstr "Argomento non supportato per il formato '%s': -%d" -#: archive-tar.c:125 archive-zip.c:345 +#: archive-tar.c:125 archive-zip.c:351 #, c-format msgid "cannot stream blob %s" msgstr "impossibile eseguire lo streaming del blob %s" -#: archive-tar.c:260 archive-zip.c:363 +#: archive-tar.c:266 archive-zip.c:369 #, c-format msgid "unsupported file mode: 0%o (SHA1: %s)" msgstr "modo file non supportato: 0%o (SHA1: %s)" -#: archive-tar.c:287 archive-zip.c:353 +#: archive-tar.c:293 archive-zip.c:359 #, c-format msgid "cannot read %s" msgstr "impossibile leggere %s" -#: archive-tar.c:459 +#: archive-tar.c:465 #, c-format msgid "unable to start '%s' filter" msgstr "impossibile avviare il filtro '%s'" -#: archive-tar.c:462 +#: archive-tar.c:468 msgid "unable to redirect descriptor" msgstr "impossibile ridirezionare il descrittore" -#: archive-tar.c:469 +#: archive-tar.c:475 #, c-format msgid "'%s' filter reported error" msgstr "il filtro '%s' ha segnalato un errore" -#: archive-zip.c:314 +#: archive-zip.c:319 #, c-format msgid "path is not valid UTF-8: %s" msgstr "il percorso non è codificato validamente in UTF-8: %s" -#: archive-zip.c:318 +#: archive-zip.c:323 #, c-format msgid "path too long (%d chars, SHA1: %s): %s" msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s" -#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233 +#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234 #, c-format msgid "deflate error (%d)" msgstr "errore deflate (%d)" -#: archive-zip.c:609 +#: archive-zip.c:615 #, c-format msgid "timestamp too large for this system: %<PRIuMAX>" msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>" -#: attr.c:211 +#: attr.c:212 #, c-format msgid "%.*s is not a valid attribute name" msgstr "%.*s non è un nome attributo valido" -#: attr.c:368 +#: attr.c:369 #, c-format msgid "%s not allowed: %s:%d" msgstr "%s non consentito: %s:%d" -#: attr.c:408 +#: attr.c:409 msgid "" "Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." @@ -996,12 +1690,12 @@ msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s" msgid "We cannot bisect more!\n" msgstr "Impossibile eseguire un'ulteriore bisezione!\n" -#: bisect.c:733 +#: bisect.c:745 #, c-format msgid "Not a valid commit name %s" msgstr "%s non è un nome commit valido" -#: bisect.c:758 +#: bisect.c:770 #, c-format msgid "" "The merge base %s is bad.\n" @@ -1010,7 +1704,7 @@ msgstr "" "La base del merge %s non funziona.\n" "Ciò significa che il bug è stato corretto fra %s e [%s].\n" -#: bisect.c:763 +#: bisect.c:775 #, c-format msgid "" "The merge base %s is new.\n" @@ -1019,7 +1713,7 @@ msgstr "" "La base del merge %s è nuova.\n" "La proprietà è stata modificata fra %s e [%s].\n" -#: bisect.c:768 +#: bisect.c:780 #, c-format msgid "" "The merge base %s is %s.\n" @@ -1028,7 +1722,7 @@ msgstr "" "La base del merge %s è %s.\n" "Ciò significa che il primo commit '%s' è fra %s e [%s].\n" -#: bisect.c:776 +#: bisect.c:788 #, c-format msgid "" "Some %s revs are not ancestors of the %s rev.\n" @@ -1039,7 +1733,7 @@ msgstr "" "git bisect non può funzionare correttamente in questo caso.\n" "Forse hai confuso le revisioni %s con quelle %s?\n" -#: bisect.c:789 +#: bisect.c:801 #, c-format msgid "" "the merge base between %s and [%s] must be skipped.\n" @@ -1050,36 +1744,36 @@ msgstr "" "Non è possibile essere sicuri che il primo commit %s sia fra %s e %s.\n" "Continuo comunque." -#: bisect.c:822 +#: bisect.c:840 #, c-format msgid "Bisecting: a merge base must be tested\n" msgstr "Bisezione: dev'essere testata una base del merge\n" -#: bisect.c:865 +#: bisect.c:890 #, c-format msgid "a %s revision is needed" msgstr "è richiesta una revisione %s" -#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254 +#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254 #, c-format msgid "could not create file '%s'" msgstr "impossibile creare il file '%s'" -#: bisect.c:928 builtin/merge.c:148 +#: bisect.c:966 builtin/merge.c:149 #, c-format msgid "could not read file '%s'" msgstr "impossibile leggere il file '%s'" -#: bisect.c:958 +#: bisect.c:997 msgid "reading bisect refs failed" msgstr "lettura riferimenti della bisezione non riuscita" -#: bisect.c:977 +#: bisect.c:1019 #, c-format msgid "%s was both %s and %s\n" msgstr "%s era sia %s sia %s\n" -#: bisect.c:985 +#: bisect.c:1028 #, c-format msgid "" "No testable commit found.\n" @@ -1088,7 +1782,7 @@ msgstr "" "Nessun commit testabile trovato.\n" "Forse hai iniziato il procedimento specificando parametri percorso errati?\n" -#: bisect.c:1004 +#: bisect.c:1057 #, c-format msgid "(roughly %d step)" msgid_plural "(roughly %d steps)" @@ -1098,7 +1792,7 @@ msgstr[1] "(circa %d passi)" #. TRANSLATORS: the last %s will be replaced with "(roughly %d #. steps)" translation. #. -#: bisect.c:1010 +#: bisect.c:1063 #, 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" @@ -1107,41 +1801,41 @@ msgstr[0] "" msgstr[1] "" "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n" -#: blame.c:2697 +#: blame.c:2700 msgid "--contents and --reverse do not blend well." msgstr "--contents e --reverse non sono compatibili." -#: blame.c:2711 +#: blame.c:2714 msgid "cannot use --contents with final commit object name" msgstr "impossibile usare --contents con il nome oggetto del commit finale" -#: blame.c:2732 +#: blame.c:2735 msgid "--reverse and --first-parent together require specified latest commit" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato l'ultimo commit" -#: blame.c:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033 -#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:963 -#: builtin/log.c:1451 builtin/log.c:1827 builtin/log.c:2117 builtin/merge.c:411 -#: builtin/pack-objects.c:3148 builtin/pack-objects.c:3163 +#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1942 sequencer.c:2006 +#: sequencer.c:4358 submodule.c:847 builtin/commit.c:1045 builtin/log.c:388 +#: builtin/log.c:991 builtin/log.c:1520 builtin/log.c:1925 builtin/log.c:2215 +#: builtin/merge.c:412 builtin/pack-objects.c:3275 builtin/pack-objects.c:3290 #: builtin/shortlog.c:192 msgid "revision walk setup failed" msgstr "impostazione percorso revisioni non riuscita" -#: blame.c:2759 +#: blame.c:2762 msgid "" "--reverse --first-parent together require range along first-parent chain" msgstr "" "le opzioni --reverse e --first-parent se usate insieme richiedono che sia " "specificato un intervallo nella catena del primo commit genitore" -#: blame.c:2770 +#: blame.c:2773 #, c-format msgid "no such path %s in %s" msgstr "il percorso %s in %s non esiste" -#: blame.c:2781 +#: blame.c:2784 #, c-format msgid "cannot read blob %s for path %s" msgstr "impossibile leggere il blob %s per il percorso %s" @@ -1303,8 +1997,8 @@ msgstr "'%s' non sembra essere un file bundle v2" msgid "unrecognized header: %s%s (%d)" msgstr "intestazione non riconosciuta: %s%s (%d)" -#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024 -#: builtin/commit.c:791 +#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2258 sequencer.c:3016 +#: builtin/commit.c:815 #, c-format msgid "could not open '%s'" msgstr "impossibile aprire '%s'" @@ -1335,62 +2029,62 @@ msgid_plural "The bundle requires these %d refs:" msgstr[0] "Il bundle richiede questo riferimento:" msgstr[1] "Il bundle richiede questi %d riferimenti:" -#: bundle.c:272 +#: bundle.c:273 msgid "unable to dup bundle descriptor" msgstr "impossibile duplicare il descrittore bundle" -#: bundle.c:279 +#: bundle.c:280 msgid "Could not spawn pack-objects" msgstr "Impossibile avviare pack-objects" -#: bundle.c:290 +#: bundle.c:291 msgid "pack-objects died" msgstr "comando pack-objects morto" -#: bundle.c:332 +#: bundle.c:333 msgid "rev-list died" msgstr "comando rev-list morto" -#: bundle.c:381 +#: bundle.c:382 #, c-format msgid "ref '%s' is excluded by the rev-list options" msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list" -#: bundle.c:460 builtin/log.c:202 builtin/log.c:1732 builtin/shortlog.c:306 +#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306 #, c-format msgid "unrecognized argument: %s" msgstr "argomento non riconosciuto: %s" -#: bundle.c:468 +#: bundle.c:469 msgid "Refusing to create empty bundle." msgstr "Mi rifiuto di creare un bundle vuoto." -#: bundle.c:478 +#: bundle.c:479 #, c-format msgid "cannot create '%s'" msgstr "impossibile creare '%s'" -#: bundle.c:503 +#: bundle.c:504 msgid "index-pack died" msgstr "comando index-pack morto" -#: color.c:296 +#: color.c:329 #, c-format msgid "invalid color value: %.*s" msgstr "valore colore non valido: %.*s" -#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399 -#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455 +#: commit.c:51 sequencer.c:2719 builtin/am.c:359 builtin/am.c:403 +#: builtin/am.c:1371 builtin/am.c:2014 builtin/replace.c:457 #, c-format msgid "could not parse %s" msgstr "impossibile analizzare %s" -#: commit.c:52 +#: commit.c:53 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s non è un commit!" -#: commit.c:192 +#: commit.c:193 msgid "" "Support for <GIT_DIR>/info/grafts is deprecated\n" "and will be removed in a future Git version.\n" @@ -1410,27 +2104,27 @@ msgstr "" "Per disabilitare questo messaggio, esegui\n" "\"git config advice.graftFileDeprecated false\"" -#: commit.c:1127 +#: commit.c:1153 #, c-format msgid "Commit %s has an untrusted GPG signature, allegedly by %s." msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s." -#: commit.c:1130 +#: commit.c:1157 #, c-format msgid "Commit %s has a bad GPG signature allegedly by %s." msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s." -#: commit.c:1133 +#: commit.c:1160 #, c-format msgid "Commit %s does not have a GPG signature." msgstr "Il commit %s non ha una firma GPG." -#: commit.c:1136 +#: commit.c:1163 #, c-format msgid "Commit %s has a good GPG signature by %s\n" msgstr "Il commit %s ha una firma GPG valida di %s\n" -#: commit.c:1390 +#: commit.c:1417 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" @@ -1441,108 +2135,113 @@ msgstr "" "la variabile di configurazione i18n.commitencoding alla codifica usata\n" "dal tuo progetto.\n" -#: commit-graph.c:127 +#: commit-graph.c:122 msgid "commit-graph file is too small" msgstr "il file grafo dei commit %s è troppo piccolo" -#: commit-graph.c:192 +#: commit-graph.c:189 #, c-format msgid "commit-graph signature %X does not match signature %X" msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X" -#: commit-graph.c:199 +#: commit-graph.c:196 #, c-format msgid "commit-graph version %X does not match version %X" msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:206 +#: commit-graph.c:203 #, c-format msgid "commit-graph hash version %X does not match version %X" msgstr "" "la versione hash del grafo dei commit %X non corrisponde alla versione %X" -#: commit-graph.c:229 +#: commit-graph.c:226 msgid "commit-graph chunk lookup table entry missing; file may be incomplete" msgstr "" "voce blocco grafo dei commit mancante nella tabella di ricerca; il file " "potrebbe non essere completo" -#: commit-graph.c:240 +#: commit-graph.c:237 #, c-format msgid "commit-graph improper chunk offset %08x%08x" msgstr "offset blocco grafo dei commit improprio %08x%08x" -#: commit-graph.c:283 +#: commit-graph.c:280 #, c-format msgid "commit-graph chunk id %08x appears multiple times" msgstr "l'ID del blocco grafo dei commit %08x compare più volte" -#: commit-graph.c:347 +#: commit-graph.c:343 msgid "commit-graph has no base graphs chunk" msgstr "il grafo dei commit non ha un blocco grafi di base" -#: commit-graph.c:357 +#: commit-graph.c:353 msgid "commit-graph chain does not match" msgstr "la catena del grafo dei commit non corrisponde" -#: commit-graph.c:404 +#: commit-graph.c:401 #, c-format msgid "invalid commit-graph chain: line '%s' not a hash" msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash" -#: commit-graph.c:430 +#: commit-graph.c:425 msgid "unable to find all commit-graph files" msgstr "impossibile trovare tutti i file grafo dei commit" -#: commit-graph.c:554 commit-graph.c:614 +#: commit-graph.c:558 commit-graph.c:618 msgid "invalid commit position. commit-graph is likely corrupt" msgstr "" "posizione commit non valida. Il grafo dei commit è probabilmente corrotto" -#: commit-graph.c:575 +#: commit-graph.c:579 #, c-format msgid "could not find commit %s" msgstr "impossibile trovare il commit %s" -#: commit-graph.c:1002 builtin/pack-objects.c:2657 +#: commit-graph.c:852 builtin/am.c:1292 +#, c-format +msgid "unable to parse commit %s" +msgstr "impossibile analizzare il commit %s" + +#: commit-graph.c:1011 builtin/pack-objects.c:2782 #, c-format msgid "unable to get type of object %s" msgstr "impossibile recuperare il tipo dell'oggetto %s" -#: commit-graph.c:1034 +#: commit-graph.c:1043 msgid "Loading known commits in commit graph" msgstr "Caricamento commit noti nel grafo dei commit in corso" -#: commit-graph.c:1051 +#: commit-graph.c:1060 msgid "Expanding reachable commits in commit graph" msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso" -#: commit-graph.c:1070 +#: commit-graph.c:1079 msgid "Clearing commit marks in commit graph" msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso" -#: commit-graph.c:1089 +#: commit-graph.c:1098 msgid "Computing commit graph generation numbers" msgstr "Calcolo numeri generazione del grafo dei commit in corso" -#: commit-graph.c:1163 +#: commit-graph.c:1173 #, c-format msgid "Finding commits for commit graph in %d pack" msgid_plural "Finding commits for commit graph in %d packs" msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso" msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso" -#: commit-graph.c:1176 +#: commit-graph.c:1186 #, c-format msgid "error adding pack %s" msgstr "errore durante l'aggiunta del pack %s" -#: commit-graph.c:1180 +#: commit-graph.c:1190 #, c-format msgid "error opening index for %s" msgstr "errore durante l'apertura dell'indice per %s" -#: commit-graph.c:1204 +#: commit-graph.c:1214 #, c-format msgid "Finding commits for commit graph from %d ref" msgid_plural "Finding commits for commit graph from %d refs" @@ -1551,62 +2250,67 @@ msgstr[0] "" msgstr[1] "" "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso" -#: commit-graph.c:1238 +#: commit-graph.c:1234 +#, c-format +msgid "invalid commit object id: %s" +msgstr "ID oggetto commit non valido: %s" + +#: commit-graph.c:1249 msgid "Finding commits for commit graph among packed objects" msgstr "" "Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso" -#: commit-graph.c:1253 +#: commit-graph.c:1264 msgid "Counting distinct commits in commit graph" msgstr "Conteggio commit distinti nel grafo dei commit in corso" -#: commit-graph.c:1284 +#: commit-graph.c:1294 msgid "Finding extra edges in commit graph" msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso" -#: commit-graph.c:1332 +#: commit-graph.c:1340 msgid "failed to write correct number of base graph ids" msgstr "impossibile scrivere il numero esatto degli ID grafo di base" -#: commit-graph.c:1365 midx.c:811 +#: commit-graph.c:1373 midx.c:814 #, c-format msgid "unable to create leading directories of %s" msgstr "impossibile creare le prime directory di %s" -#: commit-graph.c:1377 builtin/index-pack.c:306 builtin/repack.c:240 +#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248 #, c-format msgid "unable to create '%s'" msgstr "impossibile creare '%s'" -#: commit-graph.c:1437 +#: commit-graph.c:1445 #, c-format msgid "Writing out commit graph in %d pass" msgid_plural "Writing out commit graph in %d passes" msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso" msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso" -#: commit-graph.c:1478 +#: commit-graph.c:1486 msgid "unable to open commit-graph chain file" msgstr "impossibile aprire il file catena grafo dei commit" -#: commit-graph.c:1490 +#: commit-graph.c:1498 msgid "failed to rename base commit-graph file" msgstr "impossibile ridenominare il file di base grafo dei commit" -#: commit-graph.c:1510 +#: commit-graph.c:1518 msgid "failed to rename temporary commit-graph file" msgstr "impossibile ridenominare il file temporaneo grafo dei commit" -#: commit-graph.c:1621 +#: commit-graph.c:1631 msgid "Scanning merged commits" msgstr "Scansione dei commit sottoposti a merge in corso" -#: commit-graph.c:1632 +#: commit-graph.c:1642 #, c-format msgid "unexpected duplicate commit id %s" msgstr "ID commit duplicato inatteso: %s" -#: commit-graph.c:1657 +#: commit-graph.c:1665 msgid "Merging commit-graph" msgstr "Merge del grafo dei commit in corso" @@ -1620,24 +2324,24 @@ msgstr "" msgid "too many commits to write graph" msgstr "troppi commit da scrivere nel grafo" -#: commit-graph.c:1945 +#: commit-graph.c:1944 msgid "the commit-graph file has incorrect checksum and is likely corrupt" msgstr "" "il file del grafo dei commit ha un checksum non corretto e probabilmente è " "corrotto" -#: commit-graph.c:1955 +#: commit-graph.c:1954 #, c-format msgid "commit-graph has incorrect OID order: %s then %s" msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s" -#: commit-graph.c:1965 commit-graph.c:1980 +#: commit-graph.c:1964 commit-graph.c:1979 #, c-format msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u" msgstr "" "il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u" -#: commit-graph.c:1972 +#: commit-graph.c:1971 #, c-format msgid "failed to parse commit %s from commit-graph" msgstr "impossibile analizzare il commit %s nel grafo dei commit" @@ -1646,37 +2350,37 @@ msgstr "impossibile analizzare il commit %s nel grafo dei commit" msgid "Verifying commits in commit graph" msgstr "Verifica dei commit nel grafo dei commit in corso" -#: commit-graph.c:2002 +#: commit-graph.c:2003 #, c-format msgid "failed to parse commit %s from object database for commit-graph" msgstr "" "impossibile analizzare il commit %s dal database oggetti per il grafo dei " "commit" -#: commit-graph.c:2009 +#: commit-graph.c:2010 #, c-format msgid "root tree OID for commit %s in commit-graph is %s != %s" msgstr "" "l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s" -#: commit-graph.c:2019 +#: commit-graph.c:2020 #, c-format msgid "commit-graph parent list for commit %s is too long" msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo" -#: commit-graph.c:2028 +#: commit-graph.c:2029 #, c-format msgid "commit-graph parent for %s is %s != %s" msgstr "il genitore nel grafo dei commit per %s è %s != %s" -#: commit-graph.c:2041 +#: commit-graph.c:2042 #, c-format msgid "commit-graph parent list for commit %s terminates early" msgstr "" "l'elenco genitori nel grafo dei commit per il commit %s è finito prima del " "previsto" -#: commit-graph.c:2046 +#: commit-graph.c:2047 #, c-format msgid "" "commit-graph has generation number zero for commit %s, but non-zero elsewhere" @@ -1684,7 +2388,7 @@ msgstr "" "il grafo dei commit ha un numero generazione zero per il commit %s ma non " "pari a zero per gli altri" -#: commit-graph.c:2050 +#: commit-graph.c:2051 #, c-format msgid "" "commit-graph has non-zero generation number for commit %s, but zero elsewhere" @@ -1692,12 +2396,12 @@ msgstr "" "il grafo dei commit ha un numero generazione non pari a zero per il commit " "%s ma pari a zero per gli altri" -#: commit-graph.c:2065 +#: commit-graph.c:2066 #, c-format msgid "commit-graph generation for commit %s is %u != %u" msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u" -#: commit-graph.c:2071 +#: commit-graph.c:2072 #, c-format msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>" msgstr "" @@ -1746,7 +2450,7 @@ msgstr "la chiave non contiene una sezione: %s" msgid "key does not contain variable name: %s" msgstr "la chiave non contiene un nome variabile: %s" -#: config.c:406 sequencer.c:2463 +#: config.c:406 sequencer.c:2444 #, c-format msgid "invalid key: %s" msgstr "chiave non valida: %s" @@ -1887,7 +2591,7 @@ msgstr "valore malformato per %s: %s" msgid "must be one of nothing, matching, simple, upstream or current" msgstr "dev'essere nothing, matching, simple, upstream o current" -#: config.c:1518 builtin/pack-objects.c:3410 +#: config.c:1518 builtin/pack-objects.c:3541 #, c-format msgid "bad pack compression level %d" msgstr "livello compressione pack %d non valido" @@ -1912,116 +2616,109 @@ msgstr "impossibile risolvere il blob configurazione '%s'" msgid "failed to parse %s" msgstr "analisi di %s non riuscita" -#: config.c:1745 +#: config.c:1743 msgid "unable to parse command-line config" msgstr "impossibile analizzare la configurazione a riga di comando" -#: config.c:2094 +#: config.c:2097 msgid "unknown error occurred while reading the configuration files" msgstr "" "si è verificato un errore imprevisto durante la lettura dei file di " "configurazione" -#: config.c:2264 +#: config.c:2267 #, c-format msgid "Invalid %s: '%s'" msgstr "%s non valido: '%s'" -#: config.c:2307 -#, c-format -msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" -msgstr "" -"valore core.untrackedCache '%s' non valido; utilizzerò il valore predefinito " -"'keep'" - -#: config.c:2333 +#: config.c:2312 #, c-format msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100" msgstr "" "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e " "100" -#: config.c:2379 +#: config.c:2358 #, c-format msgid "unable to parse '%s' from command-line config" msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando" -#: config.c:2381 +#: config.c:2360 #, c-format msgid "bad config variable '%s' in file '%s' at line %d" msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d" -#: config.c:2462 +#: config.c:2441 #, c-format msgid "invalid section name '%s'" msgstr "nome sezione '%s' non valido" -#: config.c:2494 +#: config.c:2473 #, c-format msgid "%s has multiple values" msgstr "%s ha più valori" -#: config.c:2523 +#: config.c:2502 #, c-format msgid "failed to write new configuration file %s" msgstr "scrittura del nuovo file di configurazione %s non riuscita" -#: config.c:2775 config.c:3099 +#: config.c:2754 config.c:3078 #, c-format msgid "could not lock config file %s" msgstr "impossibile bloccare il file di configurazione %s" -#: config.c:2786 +#: config.c:2765 #, c-format msgid "opening %s" msgstr "apertura di %s in corso" -#: config.c:2821 builtin/config.c:328 +#: config.c:2800 builtin/config.c:344 #, c-format msgid "invalid pattern: %s" msgstr "pattern non valido: %s" -#: config.c:2846 +#: config.c:2825 #, c-format msgid "invalid config file %s" msgstr "file di configurazione %s non valido" -#: config.c:2859 config.c:3112 +#: config.c:2838 config.c:3091 #, c-format msgid "fstat on %s failed" msgstr "fstat di %s non riuscita" -#: config.c:2870 +#: config.c:2849 #, c-format msgid "unable to mmap '%s'" msgstr "impossibile eseguire mmap su '%s'" -#: config.c:2879 config.c:3117 +#: config.c:2858 config.c:3096 #, c-format msgid "chmod on %s failed" msgstr "esecuzione chmod su %s non riuscita" -#: config.c:2964 config.c:3214 +#: config.c:2943 config.c:3193 #, c-format msgid "could not write config file %s" msgstr "impossibile scrivere il file di configurazione %s" -#: config.c:2998 +#: config.c:2977 #, c-format msgid "could not set '%s' to '%s'" msgstr "impossibile impostare '%s' a '%s'" -#: config.c:3000 builtin/remote.c:782 +#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857 #, c-format msgid "could not unset '%s'" msgstr "impossibile eliminare l'impostazione di '%s'" -#: config.c:3090 +#: config.c:3069 #, c-format msgid "invalid section name: %s" msgstr "nome sezione non valido: %s" -#: config.c:3257 +#: config.c:3236 #, c-format msgid "missing value for '%s'" msgstr "valore mancante per '%s'" @@ -2146,7 +2843,7 @@ msgstr "impossibile risolvere %s (%s)" msgid "unknown port %s" msgstr "porta %s sconosciuta" -#: connect.c:845 connect.c:1171 +#: connect.c:845 connect.c:1175 #, c-format msgid "strange hostname '%s' blocked" msgstr "nome host strano '%s' bloccato" @@ -2161,60 +2858,60 @@ msgstr "porta strana '%s' bloccata" msgid "cannot start proxy %s" msgstr "impossibile avviare il proxy %s" -#: connect.c:924 +#: connect.c:928 msgid "no path specified; see 'git help pull' for valid url syntax" msgstr "" "nessun percorso specificato; vedere 'git help pull' per le sintassi URL " "valide" -#: connect.c:1119 +#: connect.c:1123 msgid "ssh variant 'simple' does not support -4" msgstr "la variante SSH 'simple' non supporta -4" -#: connect.c:1131 +#: connect.c:1135 msgid "ssh variant 'simple' does not support -6" msgstr "la variante SSH 'simple' non supporta -6" -#: connect.c:1148 +#: connect.c:1152 msgid "ssh variant 'simple' does not support setting port" msgstr "la variante SSH 'simple' non supporta l'impostazione della porta" -#: connect.c:1260 +#: connect.c:1264 #, c-format msgid "strange pathname '%s' blocked" msgstr "percorso strano '%s' bloccato" -#: connect.c:1307 +#: connect.c:1311 msgid "unable to fork" msgstr "impossibile eseguire fork" -#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43 +#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43 msgid "Checking connectivity" msgstr "Controllo connessione in corso" -#: connected.c:98 +#: connected.c:110 msgid "Could not run 'git rev-list'" msgstr "Impossibile eseguire 'git-rev-list'" -#: connected.c:118 +#: connected.c:130 msgid "failed write to rev-list" msgstr "scrittura nella rev-list non riuscita" -#: connected.c:125 +#: connected.c:137 msgid "failed to close rev-list's stdin" msgstr "chiusura standard input della rev-list non riuscita" -#: convert.c:193 +#: convert.c:194 #, c-format msgid "illegal crlf_action %d" msgstr "crlf_action %d illecita" -#: convert.c:206 +#: convert.c:207 #, c-format msgid "CRLF would be replaced by LF in %s" msgstr "CRLF sarebbe sostituito da LF in %s" -#: convert.c:208 +#: convert.c:209 #, c-format msgid "" "CRLF will be replaced by LF in %s.\n" @@ -2223,12 +2920,12 @@ msgstr "" "CRLF sarà sostituito da LF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:216 +#: convert.c:217 #, c-format msgid "LF would be replaced by CRLF in %s" msgstr "LF sarebbe sostituito da CRLF in %s" -#: convert.c:218 +#: convert.c:219 #, c-format msgid "" "LF will be replaced by CRLF in %s.\n" @@ -2237,19 +2934,19 @@ msgstr "" "LF sarà sostituito da CRLF in %s.\n" "Il file avrà i suoi fine riga originari nella propria directory di lavoro" -#: convert.c:279 +#: convert.c:284 #, c-format msgid "BOM is prohibited in '%s' if encoded as %s" msgstr "Il BOM è vietato in '%s' se il file è codificato come %s" -#: convert.c:286 +#: convert.c:291 #, c-format msgid "" -"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-" -"tree-encoding." +"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as " +"working-tree-encoding." msgstr "" -"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s " -"come codifica dell'albero di lavoro." +"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-" +"%.*s come codifica dell'albero di lavoro." #: convert.c:304 #, c-format @@ -2266,51 +2963,51 @@ msgstr "" "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di " "lavoro." -#: convert.c:424 convert.c:495 +#: convert.c:419 convert.c:490 #, c-format msgid "failed to encode '%s' from %s to %s" msgstr "conversione della codifica '%s' da %s a %s non riuscita" -#: convert.c:467 +#: convert.c:462 #, c-format msgid "encoding '%s' from %s to %s and back is not the same" msgstr "" "il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso" -#: convert.c:673 +#: convert.c:668 #, c-format msgid "cannot fork to run external filter '%s'" msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'" -#: convert.c:693 +#: convert.c:688 #, c-format msgid "cannot feed the input to external filter '%s'" msgstr "impossibile fornire l'input al filtro esterno '%s'" -#: convert.c:700 +#: convert.c:695 #, c-format msgid "external filter '%s' failed %d" msgstr "esecuzione del filtro esterno '%s' non riuscita: %d" -#: convert.c:735 convert.c:738 +#: convert.c:730 convert.c:733 #, c-format msgid "read from external filter '%s' failed" msgstr "lettura dal filtro esterno '%s' non riuscita" -#: convert.c:741 convert.c:796 +#: convert.c:736 convert.c:791 #, c-format msgid "external filter '%s' failed" msgstr "esecuzione del filtro esterno '%s' non riuscita" -#: convert.c:844 +#: convert.c:839 msgid "unexpected filter type" msgstr "tipo filtro inatteso" -#: convert.c:855 +#: convert.c:850 msgid "path name too long for external filter" msgstr "nome percorso troppo lungo per il filtro esterno" -#: convert.c:929 +#: convert.c:924 #, c-format msgid "" "external filter '%s' is not available anymore although not all paths have " @@ -2319,67 +3016,67 @@ msgstr "" "il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi " "siano stati filtrati" -#: convert.c:1228 +#: convert.c:1223 msgid "true/false are no valid working-tree-encodings" msgstr "true/false non sono codifiche dell'albero di lavoro valide" -#: convert.c:1398 convert.c:1432 +#: convert.c:1411 convert.c:1445 #, c-format msgid "%s: clean filter '%s' failed" msgstr "%s: esecuzione del filtro clean '%s' non riuscita" -#: convert.c:1476 +#: convert.c:1489 #, c-format msgid "%s: smudge filter %s failed" msgstr "%s: esecuzione del filtro smudge '%s' non riuscita" -#: date.c:137 +#: date.c:138 msgid "in the future" msgstr "in futuro" -#: date.c:143 +#: date.c:144 #, c-format msgid "%<PRIuMAX> second ago" msgid_plural "%<PRIuMAX> seconds ago" msgstr[0] "%<PRIuMAX> secondo fa" msgstr[1] "%<PRIuMAX> secondi fa" -#: date.c:150 +#: date.c:151 #, c-format msgid "%<PRIuMAX> minute ago" msgid_plural "%<PRIuMAX> minutes ago" msgstr[0] "%<PRIuMAX> minuto fa" msgstr[1] "%<PRIuMAX> minuti fa" -#: date.c:157 +#: date.c:158 #, c-format msgid "%<PRIuMAX> hour ago" msgid_plural "%<PRIuMAX> hours ago" msgstr[0] "%<PRIuMAX> ora fa" msgstr[1] "%<PRIuMAX> ore fa" -#: date.c:164 +#: date.c:165 #, c-format msgid "%<PRIuMAX> day ago" msgid_plural "%<PRIuMAX> days ago" msgstr[0] "%<PRIuMAX> giorno fa" msgstr[1] "%<PRIuMAX> giorni fa" -#: date.c:170 +#: date.c:171 #, c-format msgid "%<PRIuMAX> week ago" msgid_plural "%<PRIuMAX> weeks ago" msgstr[0] "%<PRIuMAX> settimana fa" msgstr[1] "%<PRIuMAX> settimane fa" -#: date.c:177 +#: date.c:178 #, c-format msgid "%<PRIuMAX> month ago" msgid_plural "%<PRIuMAX> months ago" msgstr[0] "%<PRIuMAX> mese fa" msgstr[1] "%<PRIuMAX> mesi fa" -#: date.c:188 +#: date.c:189 #, c-format msgid "%<PRIuMAX> year" msgid_plural "%<PRIuMAX> years" @@ -2387,14 +3084,14 @@ msgstr[0] "%<PRIuMAX> anno" msgstr[1] "%<PRIuMAX> anni" #. TRANSLATORS: "%s" is "<n> years" -#: date.c:191 +#: date.c:192 #, c-format msgid "%s, %<PRIuMAX> month ago" msgid_plural "%s, %<PRIuMAX> months ago" msgstr[0] "%s, %<PRIuMAX> mese fa" msgstr[1] "%s, %<PRIuMAX> mesi fa" -#: date.c:196 date.c:201 +#: date.c:197 date.c:202 #, c-format msgid "%<PRIuMAX> year ago" msgid_plural "%<PRIuMAX> years ago" @@ -2433,7 +3130,7 @@ msgstr "Contrassegnate %d isole, fatto.\n" msgid "failed to read orderfile '%s'" msgstr "lettura dell'orderfile '%s' non riuscita" -#: diffcore-rename.c:544 +#: diffcore-rename.c:543 msgid "Performing inexact rename detection" msgstr "Rilevamento ridenominazione non esatta in corso" @@ -2502,36 +3199,36 @@ msgstr "" "Trovati errori nella variabile di configurazione 'diff.dirstat':\n" "%s" -#: diff.c:4215 +#: diff.c:4202 #, c-format msgid "external diff died, stopping at %s" msgstr "processo esterno diff morto, mi fermo a %s" -#: diff.c:4560 +#: diff.c:4547 msgid "--name-only, --name-status, --check and -s are mutually exclusive" msgstr "" "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive" -#: diff.c:4563 +#: diff.c:4550 msgid "-G, -S and --find-object are mutually exclusive" msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive" -#: diff.c:4641 +#: diff.c:4628 msgid "--follow requires exactly one pathspec" msgstr "--follow richiede esattamente uno specificatore percorso" -#: diff.c:4689 +#: diff.c:4676 #, c-format msgid "invalid --stat value: %s" msgstr "valore non valido per --stat: %s" -#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222 -#: parse-options.c:199 parse-options.c:203 +#: diff.c:4681 diff.c:4686 diff.c:4691 diff.c:4696 diff.c:5209 +#: parse-options.c:197 parse-options.c:201 #, c-format msgid "%s expects a numerical value" msgstr "%s richiede un valore numerico" -#: diff.c:4726 +#: diff.c:4713 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -2540,42 +3237,42 @@ msgstr "" "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" "%s" -#: diff.c:4811 +#: diff.c:4798 #, c-format msgid "unknown change class '%c' in --diff-filter=%s" msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s" -#: diff.c:4835 +#: diff.c:4822 #, c-format msgid "unknown value after ws-error-highlight=%.*s" msgstr "valore sconosciuto dopo ws-error-highlight=%.*s" -#: diff.c:4849 +#: diff.c:4836 #, c-format msgid "unable to resolve '%s'" msgstr "impossibile risolvere '%s'" -#: diff.c:4899 diff.c:4905 +#: diff.c:4886 diff.c:4892 #, c-format msgid "%s expects <n>/<m> form" msgstr "%s richiede il formato <n>/<m>" -#: diff.c:4917 +#: diff.c:4904 #, c-format msgid "%s expects a character, got '%s'" msgstr "%s richiede un carattere, ricevuto '%s'" -#: diff.c:4938 +#: diff.c:4925 #, c-format msgid "bad --color-moved argument: %s" msgstr "argomento --color-moved errato: %s" -#: diff.c:4957 +#: diff.c:4944 #, c-format msgid "invalid mode '%s' in --color-moved-ws" msgstr "modo non valido '%s' in --color-moved-ws" -#: diff.c:4997 +#: diff.c:4984 msgid "" "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and " "\"histogram\"" @@ -2583,151 +3280,151 @@ msgstr "" "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience" "\" e \"histogram\"" -#: diff.c:5033 diff.c:5053 +#: diff.c:5020 diff.c:5040 #, c-format msgid "invalid argument to %s" msgstr "argomento non valido per %s" -#: diff.c:5191 +#: diff.c:5178 #, c-format msgid "failed to parse --submodule option parameter: '%s'" msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'" -#: diff.c:5247 +#: diff.c:5234 #, c-format msgid "bad --word-diff argument: %s" msgstr "argomento --word-diff errato: %s" -#: diff.c:5270 +#: diff.c:5257 msgid "Diff output format options" msgstr "Opzioni formato output diff" -#: diff.c:5272 diff.c:5278 +#: diff.c:5259 diff.c:5265 msgid "generate patch" msgstr "genera patch" -#: diff.c:5275 builtin/log.c:172 +#: diff.c:5262 builtin/log.c:173 msgid "suppress diff output" msgstr "non visualizzare l'output del diff" -#: diff.c:5280 diff.c:5394 diff.c:5401 +#: diff.c:5267 diff.c:5381 diff.c:5388 msgid "<n>" msgstr "<n>" -#: diff.c:5281 diff.c:5284 +#: diff.c:5268 diff.c:5271 msgid "generate diffs with <n> lines context" msgstr "genera diff con <n> righe di contesto" -#: diff.c:5286 +#: diff.c:5273 msgid "generate the diff in raw format" msgstr "genera il diff in formato grezzo" -#: diff.c:5289 +#: diff.c:5276 msgid "synonym for '-p --raw'" msgstr "sinonimo di '-p --raw'" -#: diff.c:5293 +#: diff.c:5280 msgid "synonym for '-p --stat'" msgstr "sinonimo di '-p --stat'" -#: diff.c:5297 +#: diff.c:5284 msgid "machine friendly --stat" msgstr "--stat leggibile da una macchina" -#: diff.c:5300 +#: diff.c:5287 msgid "output only the last line of --stat" msgstr "emetti in output solo l'ultima riga di --stat" -#: diff.c:5302 diff.c:5310 +#: diff.c:5289 diff.c:5297 msgid "<param1,param2>..." msgstr "<parametro1,parametro2>..." -#: diff.c:5303 +#: diff.c:5290 msgid "" "output the distribution of relative amount of changes for each sub-directory" msgstr "" "emetti in output la distribuzione del numero di modifiche relativo a ogni " "sottodirectory" -#: diff.c:5307 +#: diff.c:5294 msgid "synonym for --dirstat=cumulative" msgstr "sinonimo di --dirstat=cumulative" -#: diff.c:5311 +#: diff.c:5298 msgid "synonym for --dirstat=files,param1,param2..." msgstr "sinonimo di --dirstat=files,parametro1,parametro2..." -#: diff.c:5315 +#: diff.c:5302 msgid "warn if changes introduce conflict markers or whitespace errors" msgstr "" "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi" -#: diff.c:5318 +#: diff.c:5305 msgid "condensed summary such as creations, renames and mode changes" msgstr "" "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)" -#: diff.c:5321 +#: diff.c:5308 msgid "show only names of changed files" msgstr "visualizza solo i nomi dei file modificati" -#: diff.c:5324 +#: diff.c:5311 msgid "show only names and status of changed files" msgstr "visualizza solo i nomi e lo stato dei file modificati" -#: diff.c:5326 +#: diff.c:5313 msgid "<width>[,<name-width>[,<count>]]" msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]" -#: diff.c:5327 +#: diff.c:5314 msgid "generate diffstat" msgstr "genera diffstat" -#: diff.c:5329 diff.c:5332 diff.c:5335 +#: diff.c:5316 diff.c:5319 diff.c:5322 msgid "<width>" msgstr "<ampiezza>" -#: diff.c:5330 +#: diff.c:5317 msgid "generate diffstat with a given width" msgstr "genera il diffstat con un'ampiezza specificata" -#: diff.c:5333 +#: diff.c:5320 msgid "generate diffstat with a given name width" msgstr "genera il diffstat con un'ampiezza nomi specificata" -#: diff.c:5336 +#: diff.c:5323 msgid "generate diffstat with a given graph width" msgstr "genera il diffstat con un'ampiezza grafo specificata" -#: diff.c:5338 +#: diff.c:5325 msgid "<count>" msgstr "<numero>" -#: diff.c:5339 +#: diff.c:5326 msgid "generate diffstat with limited lines" msgstr "genera il diffstat con righe limitate" -#: diff.c:5342 +#: diff.c:5329 msgid "generate compact summary in diffstat" msgstr "genera riassunto conciso nel diffstat" -#: diff.c:5345 +#: diff.c:5332 msgid "output a binary diff that can be applied" msgstr "stampa in output un diff binario che può essere applicato" -#: diff.c:5348 +#: diff.c:5335 msgid "show full pre- and post-image object names on the \"index\" lines" msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\"" -#: diff.c:5350 +#: diff.c:5337 msgid "show colored diff" msgstr "visualizza diff colorato" -#: diff.c:5351 +#: diff.c:5338 msgid "<kind>" msgstr "<tipo>" -#: diff.c:5352 +#: diff.c:5339 msgid "" "highlight whitespace errors in the 'context', 'old' or 'new' lines in the " "diff" @@ -2735,7 +3432,7 @@ msgstr "" "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o " "'nuove' nel diff" -#: diff.c:5355 +#: diff.c:5342 msgid "" "do not munge pathnames and use NULs as output field terminators in --raw or " "--numstat" @@ -2743,91 +3440,91 @@ msgstr "" "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo " "in --raw o --numstat" -#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470 +#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457 msgid "<prefix>" msgstr "<prefisso>" -#: diff.c:5359 +#: diff.c:5346 msgid "show the given source prefix instead of \"a/\"" msgstr "visualizza il prefisso sorgente specificato invece di \"a/\"" -#: diff.c:5362 +#: diff.c:5349 msgid "show the given destination prefix instead of \"b/\"" msgstr "visualizza il prefisso destinazione specificato invece di \"b/\"" -#: diff.c:5365 +#: diff.c:5352 msgid "prepend an additional prefix to every line of output" msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output" -#: diff.c:5368 +#: diff.c:5355 msgid "do not show any source or destination prefix" msgstr "non visualizzare alcun prefisso sorgente o destinazione" -#: diff.c:5371 +#: diff.c:5358 msgid "show context between diff hunks up to the specified number of lines" msgstr "" "visualizza il contesto tra gli hunk del diff fino al numero di righe " "specificato" -#: diff.c:5375 diff.c:5380 diff.c:5385 +#: diff.c:5362 diff.c:5367 diff.c:5372 msgid "<char>" msgstr "<carattere>" -#: diff.c:5376 +#: diff.c:5363 msgid "specify the character to indicate a new line instead of '+'" msgstr "specifica il carattere che indica una nuova riga al posto di '+'" -#: diff.c:5381 +#: diff.c:5368 msgid "specify the character to indicate an old line instead of '-'" msgstr "specifica il carattere che indica una vecchia riga al posto di '-'" -#: diff.c:5386 +#: diff.c:5373 msgid "specify the character to indicate a context instead of ' '" msgstr "specifica il carattere che indica un contesto al posto di ' '" -#: diff.c:5389 +#: diff.c:5376 msgid "Diff rename options" msgstr "Opzioni rinominazione diff" -#: diff.c:5390 +#: diff.c:5377 msgid "<n>[/<m>]" msgstr "<n>[/<m>]" -#: diff.c:5391 +#: diff.c:5378 msgid "break complete rewrite changes into pairs of delete and create" msgstr "" "spezza modifiche di riscrittura completa in coppie eliminazione/creazione" -#: diff.c:5395 +#: diff.c:5382 msgid "detect renames" msgstr "rileva le ridenominazioni" -#: diff.c:5399 +#: diff.c:5386 msgid "omit the preimage for deletes" msgstr "ometti la preimmagine per le eliminazioni" -#: diff.c:5402 +#: diff.c:5389 msgid "detect copies" msgstr "rileva le copie" -#: diff.c:5406 +#: diff.c:5393 msgid "use unmodified files as source to find copies" msgstr "usa file non modificati come sorgente per trovare copie" -#: diff.c:5408 +#: diff.c:5395 msgid "disable rename detection" msgstr "disabilita rilevamento ridenominazione" -#: diff.c:5411 +#: diff.c:5398 msgid "use empty blobs as rename source" msgstr "usa blob vuoti come sorgente ridenominazione" -#: diff.c:5413 +#: diff.c:5400 msgid "continue listing the history of a file beyond renames" msgstr "" "continua a elencare la cronologia di un file al di là delle ridenominazioni" -#: diff.c:5416 +#: diff.c:5403 msgid "" "prevent rename/copy detection if the number of rename/copy targets exceeds " "given limit" @@ -2835,159 +3532,159 @@ msgstr "" "impedisci il rilevamento ridenominazione/copia se il numero delle " "destinazioni ridenominazione/copia eccede il limite specificato" -#: diff.c:5418 +#: diff.c:5405 msgid "Diff algorithm options" msgstr "Opzioni algoritmo diff" -#: diff.c:5420 +#: diff.c:5407 msgid "produce the smallest possible diff" msgstr "produci il diff più piccolo possibile" -#: diff.c:5423 +#: diff.c:5410 msgid "ignore whitespace when comparing lines" msgstr "ignora gli spazi bianchi durante il confronto delle righe" -#: diff.c:5426 +#: diff.c:5413 msgid "ignore changes in amount of whitespace" msgstr "ignora le modifiche al numero degli spazi bianchi" -#: diff.c:5429 +#: diff.c:5416 msgid "ignore changes in whitespace at EOL" msgstr "ignora modifiche agli spazi bianchi a fine riga" -#: diff.c:5432 +#: diff.c:5419 msgid "ignore carrier-return at the end of line" msgstr "ignora carattere ritorno a capo a fine riga" -#: diff.c:5435 +#: diff.c:5422 msgid "ignore changes whose lines are all blank" msgstr "ignora modifiche che riguardano solo righe vuote" -#: diff.c:5438 +#: diff.c:5425 msgid "heuristic to shift diff hunk boundaries for easy reading" msgstr "" "euristica per spostare i limiti degli hunk nel diff per una lettura agevole" -#: diff.c:5441 +#: diff.c:5428 msgid "generate diff using the \"patience diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"patience diff\"" -#: diff.c:5445 +#: diff.c:5432 msgid "generate diff using the \"histogram diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"histogram diff\"" -#: diff.c:5447 +#: diff.c:5434 msgid "<algorithm>" msgstr "<algoritmo>" -#: diff.c:5448 +#: diff.c:5435 msgid "choose a diff algorithm" msgstr "seleziona un algoritmo diff" -#: diff.c:5450 +#: diff.c:5437 msgid "<text>" msgstr "<testo>" -#: diff.c:5451 +#: diff.c:5438 msgid "generate diff using the \"anchored diff\" algorithm" msgstr "genera il diff usando l'algoritmo \"anchored diff\"" -#: diff.c:5453 diff.c:5462 diff.c:5465 +#: diff.c:5440 diff.c:5449 diff.c:5452 msgid "<mode>" msgstr "<modalità>" -#: diff.c:5454 +#: diff.c:5441 msgid "show word diff, using <mode> to delimit changed words" msgstr "" "visualizza il diff parola per parola usando <modalità> per delimitare le " "parole modificate" -#: diff.c:5456 diff.c:5459 diff.c:5504 +#: diff.c:5443 diff.c:5446 diff.c:5491 msgid "<regex>" msgstr "<espressione regolare>" -#: diff.c:5457 +#: diff.c:5444 msgid "use <regex> to decide what a word is" msgstr "usa <espressione regolare> per decidere cosa costituisce una parola" -#: diff.c:5460 +#: diff.c:5447 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>" msgstr "" "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>" -#: diff.c:5463 +#: diff.c:5450 msgid "moved lines of code are colored differently" msgstr "le righe di codice spostate sono colorate in modo diverso" -#: diff.c:5466 +#: diff.c:5453 msgid "how white spaces are ignored in --color-moved" msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved" -#: diff.c:5469 +#: diff.c:5456 msgid "Other diff options" msgstr "Altre opzioni diff" -#: diff.c:5471 +#: diff.c:5458 msgid "when run from subdir, exclude changes outside and show relative paths" msgstr "" "se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e " "visualizza i percorsi relativi" -#: diff.c:5475 +#: diff.c:5462 msgid "treat all files as text" msgstr "tratta tutti i file come se fossero di testo" -#: diff.c:5477 +#: diff.c:5464 msgid "swap two inputs, reverse the diff" msgstr "scambia i due input, genera un diff al contrario" -#: diff.c:5479 +#: diff.c:5466 msgid "exit with 1 if there were differences, 0 otherwise" msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti" -#: diff.c:5481 +#: diff.c:5468 msgid "disable all output of the program" msgstr "disabilita l'intero output del programma" -#: diff.c:5483 +#: diff.c:5470 msgid "allow an external diff helper to be executed" msgstr "consenti l'esecuzione di un helper diff esterno" -#: diff.c:5485 +#: diff.c:5472 msgid "run external text conversion filters when comparing binary files" msgstr "" "esegui filtri di conversione in testo esterni quando si confrontano file " "binari" -#: diff.c:5487 +#: diff.c:5474 msgid "<when>" msgstr "<quando>" -#: diff.c:5488 +#: diff.c:5475 msgid "ignore changes to submodules in the diff generation" msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff" -#: diff.c:5491 +#: diff.c:5478 msgid "<format>" msgstr "<formato>" -#: diff.c:5492 +#: diff.c:5479 msgid "specify how differences in submodules are shown" msgstr "specifica come verranno visualizzate le differenze nei sottomoduli" -#: diff.c:5496 +#: diff.c:5483 msgid "hide 'git add -N' entries from the index" msgstr "nascondi le voci 'git add -N' nell'indice" -#: diff.c:5499 +#: diff.c:5486 msgid "treat 'git add -N' entries as real in the index" msgstr "tratta le voci 'git add -N' come reali nell'indice" -#: diff.c:5501 +#: diff.c:5488 msgid "<string>" msgstr "<stringa>" -#: diff.c:5502 +#: diff.c:5489 msgid "" "look for differences that change the number of occurrences of the specified " "string" @@ -2995,7 +3692,7 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze della stringa " "specificata" -#: diff.c:5505 +#: diff.c:5492 msgid "" "look for differences that change the number of occurrences of the specified " "regex" @@ -3003,24 +3700,24 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'espressione " "regolare specificata" -#: diff.c:5508 +#: diff.c:5495 msgid "show all changes in the changeset with -S or -G" msgstr "visualizza tutte le modifiche nel changeset con -S o -G" -#: diff.c:5511 +#: diff.c:5498 msgid "treat <string> in -S as extended POSIX regular expression" msgstr "" "tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa" -#: diff.c:5514 +#: diff.c:5501 msgid "control the order in which files appear in the output" msgstr "controlla l'ordine con cui i file appariranno nell'output" -#: diff.c:5515 +#: diff.c:5502 msgid "<object-id>" msgstr "<ID oggetto>" -#: diff.c:5516 +#: diff.c:5503 msgid "" "look for differences that change the number of occurrences of the specified " "object" @@ -3028,34 +3725,34 @@ msgstr "" "cerca differenze che modificano il numero di occorrenze dell'oggetto " "specificato" -#: diff.c:5518 +#: diff.c:5505 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]" msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]" -#: diff.c:5519 +#: diff.c:5506 msgid "select files by diff type" msgstr "seleziona file in base al tipo diff" -#: diff.c:5521 +#: diff.c:5508 msgid "<file>" msgstr "<file>" -#: diff.c:5522 +#: diff.c:5509 msgid "Output to a specific file" msgstr "Salva l'output in un file specifico" -#: diff.c:6177 +#: diff.c:6164 msgid "inexact rename detection was skipped due to too many files." msgstr "" "il rilevamento ridenominazione non esatta è stato omesso per la presenza di " "troppi file." -#: diff.c:6180 +#: diff.c:6167 msgid "only found copies from modified paths due to too many files." msgstr "" "trovate solo copie dai percorsi modificati per la presenza di troppi file." -#: diff.c:6183 +#: diff.c:6170 #, c-format msgid "" "you may want to set your %s variable to at least %d and retry the command." @@ -3063,41 +3760,62 @@ msgstr "" "potresti voler impostare la variabile %s ad almeno %d e riprovare ad " "eseguire il comando." -#: dir.c:537 +#: dir.c:555 #, c-format msgid "pathspec '%s' did not match any file(s) known to git" msgstr "" "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git" -#: dir.c:926 +#: dir.c:695 dir.c:724 dir.c:737 +#, c-format +msgid "unrecognized pattern: '%s'" +msgstr "pattern non riconosciuto: '%s'" + +#: dir.c:754 dir.c:768 +#, c-format +msgid "unrecognized negative pattern: '%s'" +msgstr "pattern negativo non riconosciuto: '%s'" + +#: dir.c:786 +#, c-format +msgid "your sparse-checkout file may have issues: pattern '%s' is repeated" +msgstr "" +"il file sparse-checkout potrebbe avere dei problemi: il pattern '%s' è " +"ripetuto" + +#: dir.c:796 +msgid "disabling cone pattern matching" +msgstr "disabilito il pattern matching di tipo cone" + +#: dir.c:1173 #, c-format msgid "cannot use %s as an exclude file" msgstr "impossibile usare %s come file di esclusione" -#: dir.c:1843 +#: dir.c:2144 #, c-format msgid "could not open directory '%s'" msgstr "impossibile aprire la directory '%s'" -#: dir.c:2085 +#: dir.c:2479 msgid "failed to get kernel name and information" msgstr "impossibile ottenere il nome e le informazioni sul kernel" -#: dir.c:2209 +#: dir.c:2603 msgid "untracked cache is disabled on this system or location" msgstr "la cache non tracciata è disabilitata su questo sistema o percorso" -#: dir.c:3013 +#: dir.c:3407 #, c-format msgid "index file corrupt in repo %s" msgstr "file index corrotto nel repository %s" -#: dir.c:3058 dir.c:3063 +#: dir.c:3452 dir.c:3457 #, c-format msgid "could not create directories for %s" msgstr "impossibile creare le directory per %s" -#: dir.c:3092 +#: dir.c:3486 #, c-format msgid "could not migrate git directory from '%s' to '%s'" msgstr "impossibile migrare la directory git da '%s' a '%s'" @@ -3117,12 +3835,12 @@ msgstr "Filtraggio contenuto in corso" msgid "could not stat file '%s'" msgstr "impossibile eseguire stat sul file '%s'" -#: environment.c:150 +#: environment.c:149 #, c-format msgid "bad git namespace path \"%s\"" msgstr "percorso spazio dei nomi git \"%s\" non valido" -#: environment.c:332 +#: environment.c:331 #, c-format msgid "could not set GIT_DIR to '%s'" msgstr "impossibile impostare GIT_DIR a '%s'" @@ -3132,268 +3850,272 @@ msgstr "impossibile impostare GIT_DIR a '%s'" msgid "too many args to run %s" msgstr "troppi argomenti per eseguire %s" -#: fetch-object.c:17 -msgid "Remote with no URL" -msgstr "Remoto senza URL" - -#: fetch-pack.c:151 +#: fetch-pack.c:150 msgid "git fetch-pack: expected shallow list" msgstr "git fetch-pack: attesa lista shallow" -#: fetch-pack.c:154 +#: fetch-pack.c:153 msgid "git fetch-pack: expected a flush packet after shallow list" msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow" -#: fetch-pack.c:165 +#: fetch-pack.c:164 msgid "git fetch-pack: expected ACK/NAK, got a flush packet" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush" -#: fetch-pack.c:185 +#: fetch-pack.c:184 #, c-format msgid "git fetch-pack: expected ACK/NAK, got '%s'" msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'" -#: fetch-pack.c:196 +#: fetch-pack.c:195 msgid "unable to write to remote" msgstr "impossibile scrivere sul remoto" -#: fetch-pack.c:258 +#: fetch-pack.c:257 msgid "--stateless-rpc requires multi_ack_detailed" msgstr "--stateless-rpc richiede multi_ack_detailed" -#: fetch-pack.c:360 fetch-pack.c:1284 +#: fetch-pack.c:356 fetch-pack.c:1340 #, c-format msgid "invalid shallow line: %s" msgstr "riga shallow non valida: '%s'" -#: fetch-pack.c:366 fetch-pack.c:1290 +#: fetch-pack.c:362 fetch-pack.c:1346 #, c-format msgid "invalid unshallow line: %s" msgstr "riga unshallow non valida: '%s'" -#: fetch-pack.c:368 fetch-pack.c:1292 +#: fetch-pack.c:364 fetch-pack.c:1348 #, c-format msgid "object not found: %s" msgstr "oggetto non trovato: %s" -#: fetch-pack.c:371 fetch-pack.c:1295 +#: fetch-pack.c:367 fetch-pack.c:1351 #, c-format msgid "error in object: %s" msgstr "errore nell'oggetto: %s" -#: fetch-pack.c:373 fetch-pack.c:1297 +#: fetch-pack.c:369 fetch-pack.c:1353 #, c-format msgid "no shallow found: %s" msgstr "nessuno shallow trovato: %s" -#: fetch-pack.c:376 fetch-pack.c:1301 +#: fetch-pack.c:372 fetch-pack.c:1357 #, c-format msgid "expected shallow/unshallow, got %s" msgstr "attesi shallow/unshallow, ricevuto %s" -#: fetch-pack.c:417 +#: fetch-pack.c:414 #, c-format msgid "got %s %d %s" msgstr "ricevuto %s %d %s" -#: fetch-pack.c:434 +#: fetch-pack.c:431 #, c-format msgid "invalid commit %s" msgstr "commit non valido: %s" -#: fetch-pack.c:465 +#: fetch-pack.c:462 msgid "giving up" msgstr "smetto di provare" -#: fetch-pack.c:477 progress.c:277 +#: fetch-pack.c:475 progress.c:323 msgid "done" msgstr "fatto" -#: fetch-pack.c:489 +#: fetch-pack.c:487 #, c-format msgid "got %s (%d) %s" msgstr "ricevuto %s (%d) %s" -#: fetch-pack.c:535 +#: fetch-pack.c:533 #, c-format msgid "Marking %s as complete" msgstr "Contrassegno %s come completo" -#: fetch-pack.c:744 +#: fetch-pack.c:754 #, c-format msgid "already have %s (%s)" msgstr "ho già %s (%s)" -#: fetch-pack.c:783 +#: fetch-pack.c:818 msgid "fetch-pack: unable to fork off sideband demultiplexer" msgstr "" "fetch-pack: impossibile eseguire il fork del demultiplexer della banda " "laterlae" -#: fetch-pack.c:791 +#: fetch-pack.c:826 msgid "protocol error: bad pack header" msgstr "errore protocollo: intestazione pack non valida" -#: fetch-pack.c:859 +#: fetch-pack.c:900 #, c-format msgid "fetch-pack: unable to fork off %s" msgstr "fetch-pack: impossibile eseguire il fork di %s" -#: fetch-pack.c:875 +#: fetch-pack.c:916 #, c-format msgid "%s failed" msgstr "%s non riuscito" -#: fetch-pack.c:877 +#: fetch-pack.c:918 msgid "error in sideband demultiplexer" msgstr "errore nel demultiplexer della banda laterale" -#: fetch-pack.c:908 +#: fetch-pack.c:965 #, c-format msgid "Server version is %.*s" msgstr "La versione del server è %.*s" -#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928 -#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944 -#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960 -#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982 +#: fetch-pack.c:970 fetch-pack.c:976 fetch-pack.c:979 fetch-pack.c:985 +#: fetch-pack.c:989 fetch-pack.c:993 fetch-pack.c:997 fetch-pack.c:1001 +#: fetch-pack.c:1005 fetch-pack.c:1009 fetch-pack.c:1013 fetch-pack.c:1017 +#: fetch-pack.c:1023 fetch-pack.c:1029 fetch-pack.c:1034 fetch-pack.c:1039 #, c-format msgid "Server supports %s" msgstr "Il server supporta %s" -#: fetch-pack.c:915 +#: fetch-pack.c:972 msgid "Server does not support shallow clients" msgstr "Il server non supporta client shallow" -#: fetch-pack.c:975 +#: fetch-pack.c:1032 msgid "Server does not support --shallow-since" msgstr "Il server non supporta --shallow-since" -#: fetch-pack.c:980 +#: fetch-pack.c:1037 msgid "Server does not support --shallow-exclude" msgstr "Il server non supporta --shallow-exclude" -#: fetch-pack.c:984 +#: fetch-pack.c:1041 msgid "Server does not support --deepen" msgstr "Il server non supporta --deepen" -#: fetch-pack.c:1001 +#: fetch-pack.c:1058 msgid "no common commits" msgstr "nessun commit in comune" -#: fetch-pack.c:1013 fetch-pack.c:1462 +#: fetch-pack.c:1070 fetch-pack.c:1536 msgid "git fetch-pack: fetch failed." msgstr "git fetch-pack: recupero non riuscito." -#: fetch-pack.c:1151 +#: fetch-pack.c:1209 msgid "Server does not support shallow requests" msgstr "Il server non supporta le richieste shallow" -#: fetch-pack.c:1157 +#: fetch-pack.c:1216 msgid "Server supports filter" msgstr "Il server supporta filter" -#: fetch-pack.c:1184 +#: fetch-pack.c:1239 msgid "unable to write request to remote" msgstr "impossibile scrivere la richiesta sul remoto" -#: fetch-pack.c:1202 +#: fetch-pack.c:1257 #, c-format msgid "error reading section header '%s'" msgstr "errore durante la lettura dell'intestazione di sezione '%s'" -#: fetch-pack.c:1208 +#: fetch-pack.c:1263 #, c-format msgid "expected '%s', received '%s'" msgstr "atteso '%s', ricevuto '%s'" -#: fetch-pack.c:1247 +#: fetch-pack.c:1303 #, c-format msgid "unexpected acknowledgment line: '%s'" msgstr "riga di conferma inattesa: '%s'" -#: fetch-pack.c:1252 +#: fetch-pack.c:1308 #, c-format msgid "error processing acks: %d" msgstr "errore durante l'elaborazione degli ack: %d" -#: fetch-pack.c:1262 +#: fetch-pack.c:1318 msgid "expected packfile to be sent after 'ready'" msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'" -#: fetch-pack.c:1264 +#: fetch-pack.c:1320 msgid "expected no other sections to be sent after no 'ready'" msgstr "" "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'" -#: fetch-pack.c:1306 +#: fetch-pack.c:1362 #, c-format msgid "error processing shallow info: %d" msgstr "errore durante l'elaborazione delle informazioni shallow: %d" -#: fetch-pack.c:1353 +#: fetch-pack.c:1409 #, c-format msgid "expected wanted-ref, got '%s'" msgstr "atteso wanted-ref, ricevuto '%s'" -#: fetch-pack.c:1358 +#: fetch-pack.c:1414 #, c-format msgid "unexpected wanted-ref: '%s'" msgstr "wanted-ref inatteso: '%s'" -#: fetch-pack.c:1363 +#: fetch-pack.c:1419 #, c-format msgid "error processing wanted refs: %d" msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d" -#: fetch-pack.c:1689 +#: fetch-pack.c:1762 msgid "no matching remote head" msgstr "nessun head remoto corrispondente" -#: fetch-pack.c:1712 builtin/clone.c:686 +#: fetch-pack.c:1785 builtin/clone.c:689 msgid "remote did not send all necessary objects" msgstr "il remoto non ha inviato tutti gli oggetti necessari" -#: fetch-pack.c:1739 +#: fetch-pack.c:1812 #, c-format msgid "no such remote ref %s" msgstr "riferimento remoto non esistente: %s" -#: fetch-pack.c:1742 +#: fetch-pack.c:1815 #, c-format msgid "Server does not allow request for unadvertised object %s" msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s" -#: gpg-interface.c:321 +#: gpg-interface.c:408 msgid "gpg failed to sign the data" msgstr "gpg non è riuscito a firmare i dati" -#: gpg-interface.c:347 +#: gpg-interface.c:434 msgid "could not create temporary file" msgstr "impossibile creare il file temporaneo" -#: gpg-interface.c:350 +#: gpg-interface.c:437 #, c-format msgid "failed writing detached signature to '%s'" msgstr "scrittura della firma separata in '%s' non riuscita" -#: graph.c:97 +#: graph.c:98 #, c-format msgid "ignore invalid color '%.*s' in log.graphColors" msgstr "ignoro il colore non valido '%.*s' in log.graphColors" -#: grep.c:2117 +#: grep.c:668 +msgid "" +"given pattern contains NULL byte (via -f <file>). This is only supported " +"with -P under PCRE v2" +msgstr "" +"il pattern fornito (con -f <file>) contiene un byte NULL. Ciò è supportato " +"solo con -P usando PCRE v2" + +#: grep.c:2128 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': impossibile leggere %s" -#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82 +#: grep.c:2145 setup.c:166 builtin/clone.c:411 builtin/diff.c:82 #: builtin/rm.c:135 #, c-format msgid "failed to stat '%s'" msgstr "stat di '%s' non riuscito" -#: grep.c:2145 +#: grep.c:2156 #, c-format msgid "'%s': short read" msgstr "'%s': lettura troppo breve" @@ -3443,7 +4165,7 @@ msgid "Low-level Commands / Interrogators" msgstr "Comandi / operazioni di interrogazione di basso livello" #: help.c:37 -msgid "Low-level Commands / Synching Repositories" +msgid "Low-level Commands / Syncing Repositories" msgstr "Comandi di basso livello / Sincronizzazione repository" #: help.c:38 @@ -3536,12 +4258,12 @@ msgstr[1] "" msgid "git version [<options>]" msgstr "git version [<opzioni>]" -#: help.c:782 +#: help.c:783 #, c-format msgid "%s: %s - %s" msgstr "%s: %s - %s" -#: help.c:786 +#: help.c:787 msgid "" "\n" "Did you mean this?" @@ -3611,46 +4333,63 @@ msgstr "nome ident vuoto (per <%s>) non consentito" msgid "name consists only of disallowed characters: %s" msgstr "il nome è composto solo da caratteri non consentiti: %s" -#: ident.c:436 builtin/commit.c:611 +#: ident.c:436 builtin/commit.c:635 #, c-format msgid "invalid date format: %s" msgstr "formato data non valido: %s" -#: list-objects.c:129 +#: list-objects.c:127 #, c-format msgid "entry '%s' in tree %s has tree mode, but is not a tree" msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero" -#: list-objects.c:142 +#: list-objects.c:140 #, c-format msgid "entry '%s' in tree %s has blob mode, but is not a blob" msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob" -#: list-objects.c:378 +#: list-objects.c:375 #, c-format msgid "unable to load root tree for commit %s" msgstr "impossibile caricare l'albero radice per il commit %s" -#: list-objects-filter-options.c:36 -msgid "multiple filter-specs cannot be combined" -msgstr "non è possibile combinare più specificatori filtro" +#: list-objects-filter.c:492 +#, c-format +msgid "unable to access sparse blob in '%s'" +msgstr "impossibile accedere al blob sparse in '%s'" + +#: list-objects-filter.c:495 +#, c-format +msgid "unable to parse sparse filter data in %s" +msgstr "impossibile analizzare i dati filtro sparse in %s" #: list-objects-filter-options.c:58 msgid "expected 'tree:<depth>'" msgstr "atteso 'tree:<profondità>'" -#: list-objects-filter-options.c:84 +#: list-objects-filter-options.c:73 msgid "sparse:path filters support has been dropped" msgstr "il supporto per i filtri sparse:percorso è stato rimosso" -#: list-objects-filter-options.c:94 +#: list-objects-filter-options.c:86 #, c-format msgid "invalid filter-spec '%s'" msgstr "specificatore filtro '%s' non valido" -#: list-objects-filter-options.c:158 -msgid "cannot change partial clone promisor remote" -msgstr "impossibile modificare il remoto promettente del clone parziale" +#: list-objects-filter-options.c:102 +#, c-format +msgid "must escape char in sub-filter-spec: '%c'" +msgstr "" +"è necessario eseguire l'escape del carattere nello specificatore del " +"sottofiltro: '%c'" + +#: list-objects-filter-options.c:144 +msgid "expected something after combine:" +msgstr "atteso qualcosa dopo la ricombinazione:" + +#: list-objects-filter-options.c:226 +msgid "multiple filter-specs cannot be combined" +msgstr "non è possibile combinare più specificatori filtro" #: lockfile.c:151 #, c-format @@ -3681,119 +4420,115 @@ msgstr "Impossibile creare '%s.lock': %s" msgid "failed to read the cache" msgstr "lettura della cache non riuscita" -#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919 -#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786 -#: builtin/stash.c:264 +#: merge.c:107 rerere.c:720 builtin/am.c:1879 builtin/am.c:1913 +#: builtin/checkout.c:541 builtin/checkout.c:800 builtin/clone.c:810 +#: builtin/stash.c:265 msgid "unable to write new index file" msgstr "impossibile scrivere il nuovo file index" -#: merge-recursive.c:322 +#: merge-recursive.c:356 msgid "(bad commit)\n" msgstr "(commit non valido)\n" -#: merge-recursive.c:345 +#: merge-recursive.c:379 #, c-format msgid "add_cacheinfo failed for path '%s'; merge aborting." msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge." -#: merge-recursive.c:354 +#: merge-recursive.c:388 #, c-format msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting." msgstr "" "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il " "merge." -#: merge-recursive.c:437 -msgid "error building trees" -msgstr "errore durante la costruzione degli alberi" - -#: merge-recursive.c:863 +#: merge-recursive.c:874 #, c-format msgid "failed to create path '%s'%s" msgstr "creazione del percorso '%s' non riuscita%s" -#: merge-recursive.c:874 +#: merge-recursive.c:885 #, c-format msgid "Removing %s to make room for subdirectory\n" msgstr "Rimuovo %s per fare spazio alla sottodirectory\n" -#: merge-recursive.c:888 merge-recursive.c:907 +#: merge-recursive.c:899 merge-recursive.c:918 msgid ": perhaps a D/F conflict?" msgstr ": forse si tratta di un conflitto D/F?" -#: merge-recursive.c:897 +#: merge-recursive.c:908 #, c-format msgid "refusing to lose untracked file at '%s'" msgstr "mi rifiuto di perdere un file non tracciato in '%s'" -#: merge-recursive.c:938 builtin/cat-file.c:40 +#: merge-recursive.c:949 builtin/cat-file.c:41 #, c-format msgid "cannot read object %s '%s'" msgstr "impossibile leggere l'oggetto %s '%s'" -#: merge-recursive.c:941 +#: merge-recursive.c:954 #, c-format msgid "blob expected for %s '%s'" msgstr "atteso blob per %s '%s'" -#: merge-recursive.c:965 +#: merge-recursive.c:979 #, c-format msgid "failed to open '%s': %s" msgstr "apertura di '%s' non riuscita: %s" -#: merge-recursive.c:976 +#: merge-recursive.c:990 #, c-format msgid "failed to symlink '%s': %s" msgstr "creazione del collegamento simbolico '%s' non riuscita: %s" -#: merge-recursive.c:981 +#: merge-recursive.c:995 #, c-format msgid "do not know what to do with %06o %s '%s'" msgstr "non so che fare con %06o %s '%s'" -#: merge-recursive.c:1177 +#: merge-recursive.c:1191 #, c-format msgid "Failed to merge submodule %s (not checked out)" msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)" -#: merge-recursive.c:1184 +#: merge-recursive.c:1198 #, c-format msgid "Failed to merge submodule %s (commits not present)" msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)" -#: merge-recursive.c:1191 +#: merge-recursive.c:1205 #, c-format msgid "Failed to merge submodule %s (commits don't follow merge-base)" msgstr "" "Merge del sottomodulo %s non riuscito (i commit non seguono la base del " "merge)" -#: merge-recursive.c:1199 merge-recursive.c:1211 +#: merge-recursive.c:1213 merge-recursive.c:1225 #, c-format msgid "Fast-forwarding submodule %s to the following commit:" msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:" -#: merge-recursive.c:1202 merge-recursive.c:1214 +#: merge-recursive.c:1216 merge-recursive.c:1228 #, c-format msgid "Fast-forwarding submodule %s" msgstr "Eseguo il fast forward del sottomodulo %s" -#: merge-recursive.c:1237 +#: merge-recursive.c:1251 #, c-format msgid "Failed to merge submodule %s (merge following commits not found)" msgstr "" "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)" -#: merge-recursive.c:1241 +#: merge-recursive.c:1255 #, c-format msgid "Failed to merge submodule %s (not fast-forward)" msgstr "Merge del sottomodulo %s non riuscito (non fast forward)" -#: merge-recursive.c:1242 +#: merge-recursive.c:1256 msgid "Found a possible merge resolution for the submodule:\n" msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n" -#: merge-recursive.c:1245 +#: merge-recursive.c:1259 #, c-format msgid "" "If this is correct simply add it to the index for example\n" @@ -3810,32 +4545,32 @@ msgstr "" "\n" "per accettare questo suggerimento.\n" -#: merge-recursive.c:1254 +#: merge-recursive.c:1268 #, c-format msgid "Failed to merge submodule %s (multiple merges found)" msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)" -#: merge-recursive.c:1327 +#: merge-recursive.c:1341 msgid "Failed to execute internal merge" msgstr "Esecuzione del merge interno non riuscita" -#: merge-recursive.c:1332 +#: merge-recursive.c:1346 #, c-format msgid "Unable to add %s to database" msgstr "Impossibile aggiungere %s al database" -#: merge-recursive.c:1364 +#: merge-recursive.c:1378 #, c-format msgid "Auto-merging %s" msgstr "Merge automatico di %s in corso" -#: merge-recursive.c:1387 +#: merge-recursive.c:1402 #, c-format msgid "Error: Refusing to lose untracked file at %s; writing to %s instead." msgstr "" "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s." -#: merge-recursive.c:1459 +#: merge-recursive.c:1474 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3844,7 +4579,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero." -#: merge-recursive.c:1464 +#: merge-recursive.c:1479 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3853,7 +4588,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero." -#: merge-recursive.c:1471 +#: merge-recursive.c:1486 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left " @@ -3862,7 +4597,7 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di " "%s lasciata nell'albero in %s." -#: merge-recursive.c:1476 +#: merge-recursive.c:1491 #, c-format msgid "" "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s " @@ -3871,43 +4606,43 @@ msgstr "" "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione " "%s di %s lasciata nell'albero in %s." -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "rename" msgstr "ridenominazione" -#: merge-recursive.c:1511 +#: merge-recursive.c:1526 msgid "renamed" msgstr "rinominato" -#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3094 +#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117 #, c-format msgid "Refusing to lose dirty file at %s" msgstr "Mi rifiuto di perdere un file sporco in %s" -#: merge-recursive.c:1601 +#: merge-recursive.c:1587 #, c-format msgid "Refusing to lose untracked file at %s, even though it's in the way." msgstr "" "Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo." -#: merge-recursive.c:1659 +#: merge-recursive.c:1645 #, c-format msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s" msgstr "" "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s " "aggiunto in %s" -#: merge-recursive.c:1690 +#: merge-recursive.c:1676 #, c-format msgid "%s is a directory in %s adding as %s instead" msgstr "%s è una directory in %s; la aggiungo come %s" -#: merge-recursive.c:1695 +#: merge-recursive.c:1681 #, c-format msgid "Refusing to lose untracked file at %s; adding as %s instead" msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s" -#: merge-recursive.c:1714 +#: merge-recursive.c:1708 #, c-format msgid "" "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s" @@ -3916,18 +4651,18 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s" "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s" -#: merge-recursive.c:1719 +#: merge-recursive.c:1713 msgid " (left unresolved)" msgstr " (lasciato irrisolto)" -#: merge-recursive.c:1828 +#: merge-recursive.c:1793 #, c-format msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s" msgstr "" "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. " "Ridenominato %s->%s in %s" -#: merge-recursive.c:2035 +#: merge-recursive.c:2056 #, c-format msgid "" "CONFLICT (directory rename split): Unclear where to place %s because " @@ -3938,7 +4673,7 @@ msgstr "" "perché la directory %s è stata ridenominata in più directory diverse e " "nessuna directory di destinazione contiene la maggior parte dei file." -#: merge-recursive.c:2067 +#: merge-recursive.c:2088 #, c-format msgid "" "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of " @@ -3948,7 +4683,7 @@ msgstr "" "%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale " "posizione i seguenti percorsi: %s." -#: merge-recursive.c:2077 +#: merge-recursive.c:2098 #, c-format msgid "" "CONFLICT (implicit dir rename): Cannot map more than one path to %s; " @@ -3958,7 +4693,7 @@ msgstr "" "un percorso in %s; delle ridenominazioni directory implicite hanno tentato " "di spostare in tale posizione i seguenti percorsi: %s" -#: merge-recursive.c:2169 +#: merge-recursive.c:2190 #, c-format msgid "" "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-" @@ -3967,7 +4702,7 @@ msgstr "" "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s " "in %s. Directory ridenominata %s->%s in %s" -#: merge-recursive.c:2413 +#: merge-recursive.c:2435 #, c-format msgid "" "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was " @@ -3976,52 +4711,52 @@ msgstr "" "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s " "stesso è stato ridenominato." -#: merge-recursive.c:2938 +#: merge-recursive.c:2961 #, c-format msgid "cannot read object %s" msgstr "impossibile leggere l'oggetto %s" -#: merge-recursive.c:2941 +#: merge-recursive.c:2964 #, c-format msgid "object %s is not a blob" msgstr "l'oggetto %s non è un blob" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modify" msgstr "modifica" -#: merge-recursive.c:3005 +#: merge-recursive.c:3028 msgid "modified" msgstr "modificato" -#: merge-recursive.c:3017 +#: merge-recursive.c:3040 msgid "content" msgstr "contenuto" -#: merge-recursive.c:3021 +#: merge-recursive.c:3044 msgid "add/add" msgstr "aggiunta/aggiunta" -#: merge-recursive.c:3044 +#: merge-recursive.c:3067 #, c-format msgid "Skipped %s (merged same as existing)" msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)" -#: merge-recursive.c:3066 git-submodule.sh:937 +#: merge-recursive.c:3089 git-submodule.sh:1003 msgid "submodule" msgstr "sottomodulo" -#: merge-recursive.c:3067 +#: merge-recursive.c:3090 #, c-format msgid "CONFLICT (%s): Merge conflict in %s" msgstr "CONFLITTO (%s): conflitto di merge in %s" -#: merge-recursive.c:3097 +#: merge-recursive.c:3120 #, c-format msgid "Adding as %s instead" msgstr "Lo aggiungo come %s" -#: merge-recursive.c:3179 +#: merge-recursive.c:3203 #, c-format msgid "" "Path updated: %s added in %s inside a directory that was renamed in %s; " @@ -4030,7 +4765,7 @@ msgstr "" "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; " "lo sposto in %s." -#: merge-recursive.c:3182 +#: merge-recursive.c:3206 #, c-format msgid "" "CONFLICT (file location): %s added in %s inside a directory that was renamed " @@ -4039,7 +4774,7 @@ msgstr "" "CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata " "in %s, il che suggerisce che forse dovrebbe essere spostato in %s." -#: merge-recursive.c:3186 +#: merge-recursive.c:3210 #, c-format msgid "" "Path updated: %s renamed to %s in %s, inside a directory that was renamed in " @@ -4048,7 +4783,7 @@ msgstr "" "Percorso aggiornato: %s ridenominato in %s in %s in una directory " "ridenominata in %s; lo sposto in %s." -#: merge-recursive.c:3189 +#: merge-recursive.c:3213 #, c-format msgid "" "CONFLICT (file location): %s renamed to %s in %s, inside a directory that " @@ -4058,228 +4793,244 @@ msgstr "" "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in " "%s." -#: merge-recursive.c:3303 +#: merge-recursive.c:3327 #, c-format msgid "Removing %s" msgstr "Rimozione di %s" -#: merge-recursive.c:3326 +#: merge-recursive.c:3350 msgid "file/directory" msgstr "file/directory" -#: merge-recursive.c:3331 +#: merge-recursive.c:3355 msgid "directory/file" msgstr "directory/file" -#: merge-recursive.c:3338 +#: merge-recursive.c:3362 #, c-format msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s" msgstr "" "CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s " "come %s" -#: merge-recursive.c:3347 +#: merge-recursive.c:3371 #, c-format msgid "Adding %s" msgstr "Aggiunta %s" -#: merge-recursive.c:3356 +#: merge-recursive.c:3380 #, c-format msgid "CONFLICT (add/add): Merge conflict in %s" msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s" -#: merge-recursive.c:3394 -#, c-format -msgid "" -"Your local changes to the following files would be overwritten by merge:\n" -" %s" -msgstr "" -"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" -" %s" - -#: merge-recursive.c:3405 +#: merge-recursive.c:3424 msgid "Already up to date!" msgstr "Già aggiornato!" -#: merge-recursive.c:3414 +#: merge-recursive.c:3433 #, c-format msgid "merging of trees %s and %s failed" msgstr "merge degli alberi %s e %s non riuscito" -#: merge-recursive.c:3513 +#: merge-recursive.c:3537 msgid "Merging:" msgstr "Merge in corso:" -#: merge-recursive.c:3526 +#: merge-recursive.c:3550 #, c-format msgid "found %u common ancestor:" msgid_plural "found %u common ancestors:" msgstr[0] "trovato %u antenato comune:" msgstr[1] "trovati %u antenati comuni:" -#: merge-recursive.c:3565 +#: merge-recursive.c:3600 msgid "merge returned no commit" msgstr "il merge non ha restituito alcun commit" -#: merge-recursive.c:3631 +#: merge-recursive.c:3659 +#, c-format +msgid "" +"Your local changes to the following files would be overwritten by merge:\n" +" %s" +msgstr "" +"Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n" +" %s" + +#: merge-recursive.c:3756 #, c-format msgid "Could not parse object '%s'" msgstr "Impossibile analizzare l'oggetto '%s'" -#: merge-recursive.c:3647 builtin/merge.c:698 builtin/merge.c:869 +#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877 msgid "Unable to write index." msgstr "Impossibile scrivere l'indice." -#: midx.c:69 +#: midx.c:68 #, c-format msgid "multi-pack-index file %s is too small" msgstr "il file multi-pack-index %s è troppo piccolo" -#: midx.c:85 +#: midx.c:84 #, c-format msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x" msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x" -#: midx.c:90 +#: midx.c:89 #, c-format msgid "multi-pack-index version %d not recognized" msgstr "versione %d multi-pack-index non riconosciuta" -#: midx.c:95 +#: midx.c:94 #, c-format msgid "hash version %u does not match" msgstr "la versione dell'hash %u non corrisponde" -#: midx.c:109 +#: midx.c:108 msgid "invalid chunk offset (too large)" msgstr "offset blocco non valido (troppo grande)" -#: midx.c:133 +#: midx.c:132 msgid "terminating multi-pack-index chunk id appears earlier than expected" msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto" -#: midx.c:146 +#: midx.c:145 msgid "multi-pack-index missing required pack-name chunk" msgstr "dal multi-pack-index manca il blocco richiesto pack-name" -#: midx.c:148 +#: midx.c:147 msgid "multi-pack-index missing required OID fanout chunk" msgstr "dal multi-pack-index manca il blocco richiesto fanout OID" -#: midx.c:150 +#: midx.c:149 msgid "multi-pack-index missing required OID lookup chunk" msgstr "dal multi-pack-index manca il blocco richiesto lookup OID" -#: midx.c:152 +#: midx.c:151 msgid "multi-pack-index missing required object offsets chunk" msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti" -#: midx.c:166 +#: midx.c:165 #, c-format msgid "multi-pack-index pack names out of order: '%s' before '%s'" msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'" -#: midx.c:211 +#: midx.c:210 #, c-format msgid "bad pack-int-id: %u (%u total packs)" msgstr "pack-int-id non valido: %u (%u pack totali)" -#: midx.c:261 +#: midx.c:260 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small" msgstr "" "nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo" -#: midx.c:289 +#: midx.c:288 msgid "error preparing packfile from multi-pack-index" msgstr "errore durante la preparazione del packfile dal multi-pack-index" -#: midx.c:470 +#: midx.c:472 #, c-format msgid "failed to add packfile '%s'" msgstr "aggiunta del packfile '%s' non riuscita" -#: midx.c:476 +#: midx.c:478 #, c-format msgid "failed to open pack-index '%s'" msgstr "apertura del pack-index '%s' non riuscita" -#: midx.c:536 +#: midx.c:538 #, c-format msgid "failed to locate object %d in packfile" msgstr "ricerca dell'oggetto %d nel packfile non riuscita" -#: midx.c:865 +#: midx.c:842 +msgid "Adding packfiles to multi-pack-index" +msgstr "Aggiunta dei file pack al multi-pack-index in corso" + +#: midx.c:875 #, c-format msgid "did not see pack-file %s to drop" msgstr "non ho visto il file pack %s da scartare" -#: midx.c:1036 +#: midx.c:973 +msgid "Writing chunks to multi-pack-index" +msgstr "Scrittura dei chunk nel multi-pack-index in corso" + +#: midx.c:1052 #, c-format msgid "failed to clear multi-pack-index at %s" msgstr "pulizia del multi-pack-index %s non riuscita" -#: midx.c:1091 +#: midx.c:1108 msgid "Looking for referenced packfiles" msgstr "Ricerca di file pack referenziati in corso" -#: midx.c:1106 +#: midx.c:1123 #, c-format msgid "" "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" msgstr "" "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]" -#: midx.c:1110 -msgid "Verifying OID order in MIDX" -msgstr "Verifica ordine OID in MIDX in corso" +#: midx.c:1128 +msgid "Verifying OID order in multi-pack-index" +msgstr "Verifica ordine OID nel multi-pack-index in corso" -#: midx.c:1119 +#: midx.c:1137 #, c-format msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]" msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]" -#: midx.c:1138 +#: midx.c:1157 msgid "Sorting objects by packfile" msgstr "Ordinamento degli oggetti nel packfile in corso" -#: midx.c:1144 +#: midx.c:1164 msgid "Verifying object offsets" msgstr "Verifica offset oggetti in corso" -#: midx.c:1160 +#: midx.c:1180 #, c-format msgid "failed to load pack entry for oid[%d] = %s" msgstr "caricamento voce pack per oid[%d] = %s non riuscito" -#: midx.c:1166 +#: midx.c:1186 #, c-format msgid "failed to load pack-index for packfile %s" msgstr "caricamento pack-index per il packfile %s non riuscito" -#: midx.c:1175 +#: midx.c:1195 #, c-format msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>" msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>" -#: midx.c:1350 +#: midx.c:1220 +msgid "Counting referenced objects" +msgstr "Conteggio degli oggetti referenziati in corso" + +#: midx.c:1230 +msgid "Finding and deleting unreferenced packfiles" +msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso" + +#: midx.c:1388 msgid "could not start pack-objects" msgstr "impossibile avviare pack-objects" -#: midx.c:1369 +#: midx.c:1407 msgid "could not finish pack-objects" msgstr "impossibile finire pack-objects" -#: name-hash.c:532 +#: name-hash.c:537 #, c-format msgid "unable to create lazy_dir thread: %s" msgstr "impossibile creare il thread lazy_dir: %s" -#: name-hash.c:554 +#: name-hash.c:559 #, c-format msgid "unable to create lazy_name thread: %s" msgstr "impossibile creare il thread lazy_name: %s" -#: name-hash.c:560 +#: name-hash.c:565 #, c-format msgid "unable to join lazy_name thread: %s" msgstr "impossibile bloccare il thread lazy_name: %s" @@ -4326,32 +5077,32 @@ msgstr "Mi rifiuto di riscrivere le note in %s (al di fuori di refs/notes/)" msgid "Bad %s value: '%s'" msgstr "Valore di %s errato: '%s'" -#: object.c:54 +#: object.c:53 #, c-format msgid "invalid object type \"%s\"" msgstr "tipo oggetto \"%s\" non valido" -#: object.c:174 +#: object.c:173 #, c-format msgid "object %s is a %s, not a %s" msgstr "l'oggetto %s è un %s, non un %s" -#: object.c:234 +#: object.c:233 #, c-format msgid "object %s has unknown type id %d" msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d" -#: object.c:247 +#: object.c:246 #, c-format msgid "unable to parse object: %s" msgstr "impossibile analizzare l'oggetto: %s" -#: object.c:267 object.c:278 +#: object.c:266 object.c:278 #, c-format msgid "hash mismatch %s" msgstr "hash non corrispondente: %s" -#: packfile.c:648 +#: packfile.c:629 msgid "offset before end of packfile (broken .idx?)" msgstr "offset collocato prima della fine del packfile (.idx corrotto?)" @@ -4367,6 +5118,11 @@ msgid "offset beyond end of pack index for %s (truncated index?)" msgstr "" "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)" +#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134 +#, c-format +msgid "unable to get size of %s" +msgstr "impossibile recuperare le dimensioni di %s" + #: parse-options.c:38 #, c-format msgid "%s requires a value" @@ -4382,7 +5138,7 @@ msgstr "%s non è compatibile con %s" msgid "%s : incompatible with something else" msgstr "%s non è compatibile con qualcos'altro" -#: parse-options.c:92 parse-options.c:96 parse-options.c:319 +#: parse-options.c:92 parse-options.c:96 parse-options.c:317 #, c-format msgid "%s takes no value" msgstr "%s non richiede un valore" @@ -4392,42 +5148,42 @@ msgstr "%s non richiede un valore" msgid "%s isn't available" msgstr "%s non è disponibile" -#: parse-options.c:219 +#: parse-options.c:217 #, c-format msgid "%s expects a non-negative integer value with an optional k/m/g suffix" msgstr "" "%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo" -#: parse-options.c:389 +#: parse-options.c:386 #, c-format msgid "ambiguous option: %s (could be --%s%s or --%s%s)" msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)" -#: parse-options.c:423 parse-options.c:431 +#: parse-options.c:420 parse-options.c:428 #, c-format -msgid "did you mean `--%s` (with two dashes ?)" +msgid "did you mean `--%s` (with two dashes)?" msgstr "forse intendevi `--%s` (con due trattini)?" -#: parse-options.c:859 +#: parse-options.c:857 #, c-format msgid "unknown option `%s'" msgstr "opzione sconosciuta `%s'" -#: parse-options.c:861 +#: parse-options.c:859 #, c-format msgid "unknown switch `%c'" msgstr "opzione `%c` sconosciuta" -#: parse-options.c:863 +#: parse-options.c:861 #, c-format msgid "unknown non-ascii option in string: `%s'" msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'" -#: parse-options.c:887 +#: parse-options.c:885 msgid "..." msgstr "..." -#: parse-options.c:906 +#: parse-options.c:904 #, c-format msgid "usage: %s" msgstr "uso: %s" @@ -4435,21 +5191,21 @@ msgstr "uso: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation. #. -#: parse-options.c:912 +#: parse-options.c:910 #, c-format msgid " or: %s" msgstr " oppure: %s" -#: parse-options.c:915 +#: parse-options.c:913 #, c-format msgid " %s" msgstr " %s" -#: parse-options.c:954 +#: parse-options.c:952 msgid "-NUM" msgstr "-NUM" -#: parse-options.c:968 +#: parse-options.c:966 #, c-format msgid "alias of --%s" msgstr "alias di --%s" @@ -4474,37 +5230,37 @@ msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\"" msgid "malformed object name '%s'" msgstr "nome oggetto '%s' malformato" -#: path.c:897 +#: path.c:915 #, c-format msgid "Could not make %s writable by group" msgstr "Impossibile rendere %s scrivibile dal gruppo" -#: pathspec.c:128 +#: pathspec.c:130 msgid "Escape character '\\' not allowed as last character in attr value" msgstr "" "Carattere di escape '\\' non consentito come ultimo carattere del valore " "attributo" -#: pathspec.c:146 +#: pathspec.c:148 msgid "Only one 'attr:' specification is allowed." msgstr "È consentita solo una specifica 'attr:'." -#: pathspec.c:149 +#: pathspec.c:151 msgid "attr spec must not be empty" msgstr "la specifica attr non deve essere vuota" -#: pathspec.c:192 +#: pathspec.c:194 #, c-format msgid "invalid attribute name %s" msgstr "nome attributo %s non valido" -#: pathspec.c:257 +#: pathspec.c:259 msgid "global 'glob' and 'noglob' pathspec settings are incompatible" msgstr "" "le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono " "compatibili" -#: pathspec.c:264 +#: pathspec.c:266 msgid "" "global 'literal' pathspec setting is incompatible with all other global " "pathspec settings" @@ -4512,51 +5268,56 @@ msgstr "" "l'impostazione globale specificatore percorso 'literal' è incompatibile con " "tutte le altre impostazioni globali specificatore percorso" -#: pathspec.c:304 +#: pathspec.c:306 msgid "invalid parameter for pathspec magic 'prefix'" msgstr "parametro per il magic specificatore percorso 'prefix' non valido" -#: pathspec.c:325 +#: pathspec.c:327 #, c-format msgid "Invalid pathspec magic '%.*s' in '%s'" msgstr "Magic specificatore percorso '%.*s' in '%s' non valido" -#: pathspec.c:330 +#: pathspec.c:332 #, c-format msgid "Missing ')' at the end of pathspec magic in '%s'" msgstr "')' mancante alla fine del magic specificatore percorso in '%s'" -#: pathspec.c:368 +#: pathspec.c:370 #, c-format msgid "Unimplemented pathspec magic '%c' in '%s'" msgstr "Magic specificatore percorso '%c' in '%s' non implementato" -#: pathspec.c:427 +#: pathspec.c:429 #, c-format msgid "%s: 'literal' and 'glob' are incompatible" msgstr "%s: 'literal' e 'glob' non sono compatibili" -#: pathspec.c:440 +#: pathspec.c:442 #, c-format -msgid "%s: '%s' is outside repository" -msgstr "%s: '%s' è al di fuori del repository" +msgid "%s: '%s' is outside repository at '%s'" +msgstr "%s: '%s' è al di fuori del repository in '%s'" -#: pathspec.c:514 +#: pathspec.c:517 #, c-format msgid "'%s' (mnemonic: '%c')" msgstr "'%s' (opzione mnemonica: '%c')" -#: pathspec.c:524 +#: pathspec.c:527 #, c-format msgid "%s: pathspec magic not supported by this command: %s" msgstr "%s: magic specificatore percorso non supportato da questo comando: %s" -#: pathspec.c:591 +#: pathspec.c:594 #, c-format msgid "pathspec '%s' is beyond a symbolic link" msgstr "" "lo specificatore percorso '%s' si trova oltre un collegamento simbolico" +#: pathspec.c:639 +#, c-format +msgid "line is badly quoted: %s" +msgstr "la riga non è ben racchiusa tra virgolette: %s" + #: pkt-line.c:92 msgid "unable to write flush packet" msgstr "impossibile scrivere il pacchetto flush" @@ -4619,33 +5380,42 @@ msgstr "Aggiornamento indice in corso" msgid "unable to create threaded lstat: %s" msgstr "impossibile creare lstat in versione threaded: %s" -#: pretty.c:966 +#: pretty.c:981 msgid "unable to parse --pretty format" msgstr "impossibile analizzare il formato --pretty" -#: range-diff.c:70 +#: promisor-remote.c:23 +msgid "Remote with no URL" +msgstr "Remoto senza URL" + +#: promisor-remote.c:58 +#, c-format +msgid "promisor remote name cannot begin with '/': %s" +msgstr "il nome del remoto promettente non può iniziare con '/': %s" + +#: range-diff.c:75 msgid "could not start `log`" msgstr "impossibile avviare `log`" -#: range-diff.c:72 +#: range-diff.c:77 msgid "could not read `log` output" msgstr "impossibile leggere l'output di `log`" -#: range-diff.c:91 sequencer.c:5021 +#: range-diff.c:96 sequencer.c:5020 #, c-format msgid "could not parse commit '%s'" msgstr "impossibile analizzare il commit '%s'" -#: range-diff.c:117 +#: range-diff.c:122 #, c-format msgid "could not parse git header '%.*s'" msgstr "impossibile analizzare l'header Git '%.*s'" -#: range-diff.c:274 +#: range-diff.c:285 msgid "failed to generate diff" msgstr "generazione del diff non riuscita" -#: range-diff.c:506 range-diff.c:508 +#: range-diff.c:518 range-diff.c:520 #, c-format msgid "could not parse log for '%s'" msgstr "impossibile analizzare il registro di '%s'" @@ -4686,16 +5456,16 @@ msgstr "impossibile aggiungere '%s' all'indice" msgid "unable to stat '%s'" msgstr "impossibile eseguire stat su '%s'" -#: read-cache.c:1314 +#: read-cache.c:1330 #, c-format msgid "'%s' appears as both a file and as a directory" msgstr "'%s' compare sia come file sia come directory" -#: read-cache.c:1499 +#: read-cache.c:1536 msgid "Refresh index" msgstr "Aggiornamento indice" -#: read-cache.c:1613 +#: read-cache.c:1651 #, c-format msgid "" "index.version set, but the value is invalid.\n" @@ -4704,7 +5474,7 @@ msgstr "" "index.version impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1623 +#: read-cache.c:1661 #, c-format msgid "" "GIT_INDEX_VERSION set, but the value is invalid.\n" @@ -4713,143 +5483,154 @@ msgstr "" "GIT_INDEX_VERSION impostato, ma il valore non è valido.\n" "Uso la versione %i" -#: read-cache.c:1679 +#: read-cache.c:1717 #, c-format msgid "bad signature 0x%08x" msgstr "firma non valida: 0x%08x" -#: read-cache.c:1682 +#: read-cache.c:1720 #, c-format msgid "bad index version %d" msgstr "versione indice non valida: %d" -#: read-cache.c:1691 +#: read-cache.c:1729 msgid "bad index file sha1 signature" msgstr "firma SHA1 file indice non valida" -#: read-cache.c:1721 +#: read-cache.c:1759 #, c-format msgid "index uses %.4s extension, which we do not understand" msgstr "l'indice usa l'estensione %.4s che non comprendiamo" -#: read-cache.c:1723 +#: read-cache.c:1761 #, c-format msgid "ignoring %.4s extension" msgstr "estensione %.4s ignorata" -#: read-cache.c:1760 +#: read-cache.c:1798 #, c-format msgid "unknown index entry format 0x%08x" msgstr "formato voce indice sconosciuto: 0x%08x" -#: read-cache.c:1776 +#: read-cache.c:1814 #, c-format msgid "malformed name field in the index, near path '%s'" msgstr "campo nome malformato nell'indice, vicino al percorso '%s'" -#: read-cache.c:1833 +#: read-cache.c:1871 msgid "unordered stage entries in index" msgstr "voci stage non ordinate nell'indice" -#: read-cache.c:1836 +#: read-cache.c:1874 #, c-format msgid "multiple stage entries for merged file '%s'" msgstr "voci stage multiple per il file sottoposto a merge '%s'" -#: read-cache.c:1839 +#: read-cache.c:1877 #, c-format msgid "unordered stage entries for '%s'" msgstr "voci stage non ordinate per '%s'" -#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111 -#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467 -#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347 -#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145 -#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330 +#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111 +#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181 +#: builtin/checkout.c:470 builtin/checkout.c:656 builtin/clean.c:967 +#: builtin/commit.c:367 builtin/diff-tree.c:120 builtin/grep.c:485 +#: builtin/mv.c:145 builtin/reset.c:246 builtin/rm.c:290 +#: builtin/submodule--helper.c:332 msgid "index file corrupt" msgstr "file indice corrotto" -#: read-cache.c:2087 +#: read-cache.c:2124 #, c-format msgid "unable to create load_cache_entries thread: %s" msgstr "impossibile creare il thread load_cache_entries: %s" -#: read-cache.c:2100 +#: read-cache.c:2137 #, c-format msgid "unable to join load_cache_entries thread: %s" msgstr "impossibile bloccare il thread load_cache_entries: %s" -#: read-cache.c:2133 +#: read-cache.c:2170 #, c-format msgid "%s: index file open failed" msgstr "%s: apertura del file indice non riuscita" -#: read-cache.c:2137 +#: read-cache.c:2174 #, c-format msgid "%s: cannot stat the open index" msgstr "%s: impossibile eseguire stat sull'indice aperto" -#: read-cache.c:2141 +#: read-cache.c:2178 #, c-format msgid "%s: index file smaller than expected" msgstr "%s: file indice più piccolo della dimensione attesa" -#: read-cache.c:2145 +#: read-cache.c:2182 #, c-format msgid "%s: unable to map index file" msgstr "%s: impossibile mappare il file indice" -#: read-cache.c:2187 +#: read-cache.c:2224 #, c-format msgid "unable to create load_index_extensions thread: %s" msgstr "impossibile creare il thread load_index_extensions: %s" -#: read-cache.c:2214 +#: read-cache.c:2251 #, c-format msgid "unable to join load_index_extensions thread: %s" msgstr "impossibile bloccare il thread load_index_extensions: %s" -#: read-cache.c:2246 +#: read-cache.c:2283 #, c-format msgid "could not freshen shared index '%s'" msgstr "impossibile aggiornare l'indice condiviso '%s'" -#: read-cache.c:2293 +#: read-cache.c:2330 #, c-format msgid "broken index, expect %s in %s, got %s" msgstr "indice corrotto, atteso %s in %s, presente %s" -#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1114 +#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122 #, c-format msgid "could not close '%s'" msgstr "impossibile chiudere '%s'" -#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928 +#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959 #, c-format msgid "could not stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: read-cache.c:3105 +#: read-cache.c:3142 #, c-format msgid "unable to open git dir: %s" msgstr "impossibile aprire la directory git: %s" -#: read-cache.c:3117 +#: read-cache.c:3154 #, c-format msgid "unable to unlink: %s" msgstr "impossibile eseguire unlink: %s" -#: read-cache.c:3142 +#: read-cache.c:3179 #, c-format msgid "cannot fix permission bits on '%s'" msgstr "impossibile correggere i permessi di '%s'" -#: read-cache.c:3291 +#: read-cache.c:3328 #, c-format msgid "%s: cannot drop to stage #0" msgstr "%s: impossibile ripiegare sullo stadio 0" -#: rebase-interactive.c:26 +#: rebase-interactive.c:11 +msgid "" +"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" +"continue'.\n" +"Or you can abort the rebase with 'git rebase --abort'.\n" +msgstr "" +"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi " +"eseguire 'git rebase --continue'.\n" +"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" + +#: rebase-interactive.c:33 #, c-format msgid "" "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring." @@ -4857,7 +5638,7 @@ msgstr "" "impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. " "La ignoro." -#: rebase-interactive.c:35 +#: rebase-interactive.c:42 msgid "" "\n" "Commands:\n" @@ -4902,14 +5683,14 @@ msgstr "" "Queste righe possono essere riordinate; saranno eseguite dalla prima " "all'ultima.\n" -#: rebase-interactive.c:56 +#: rebase-interactive.c:63 #, c-format msgid "Rebase %s onto %s (%d command)" msgid_plural "Rebase %s onto %s (%d commands)" msgstr[0] "Rebase di %s su %s (%d comando)" msgstr[1] "Rebase di %s su %s (%d comandi)" -#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228 +#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228 msgid "" "\n" "Do not remove any line. Use 'drop' explicitly to remove a commit.\n" @@ -4918,7 +5699,7 @@ msgstr "" "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un " "commit.\n" -#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232 +#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232 msgid "" "\n" "If you remove a line here THAT COMMIT WILL BE LOST.\n" @@ -4926,7 +5707,7 @@ msgstr "" "\n" "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n" -#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871 +#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871 msgid "" "\n" "You are editing the todo file of an ongoing interactive rebase.\n" @@ -4940,7 +5721,7 @@ msgstr "" " git rebase --continue\n" "\n" -#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948 +#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948 msgid "" "\n" "However, if you remove everything, the rebase will be aborted.\n" @@ -4950,22 +5731,19 @@ msgstr "" "Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n" "\n" -#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955 -msgid "Note that empty commits are commented out" -msgstr "Nota che i commit vuoti sono commentati" - -#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447 -#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235 +#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3444 +#: sequencer.c:3470 sequencer.c:5125 builtin/fsck.c:346 builtin/rebase.c:252 #, c-format msgid "could not write '%s'" msgstr "impossibile scrivere '%s'" -#: rebase-interactive.c:108 +#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210 +#: builtin/rebase.c:234 #, c-format -msgid "could not copy '%s' to '%s'." -msgstr "impossibile copiare '%s' in '%s'." +msgid "could not write '%s'." +msgstr "impossibile scrivere '%s'." -#: rebase-interactive.c:173 +#: rebase-interactive.c:193 #, c-format msgid "" "Warning: some commits may have been dropped accidentally.\n" @@ -4975,7 +5753,7 @@ msgstr "" "accidentalmente.\n" "Commit scartati (dal più al meno recente):\n" -#: rebase-interactive.c:180 +#: rebase-interactive.c:200 #, c-format msgid "" "To avoid this message, use \"drop\" to explicitly remove a commit.\n" @@ -4993,6 +5771,13 @@ msgstr "" "I comportamenti possibili sono ignore, warn, error.\n" "\n" +#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2262 +#: builtin/rebase.c:170 builtin/rebase.c:195 builtin/rebase.c:221 +#: builtin/rebase.c:246 +#, c-format +msgid "could not read '%s'." +msgstr "impossibile leggere '%s'." + #: refs.c:262 #, c-format msgid "%s does not point to a valid object!" @@ -5003,7 +5788,7 @@ msgstr "%s non punta a un oggetto valido!" msgid "ignoring dangling symref %s" msgstr "ignoro il riferimento simbolico pendente %s" -#: refs.c:669 ref-filter.c:2092 +#: refs.c:669 ref-filter.c:2098 #, c-format msgid "ignoring broken ref %s" msgstr "ignoro il riferimento rotto %s" @@ -5028,14 +5813,15 @@ msgstr "il riferimento '%s' esiste già" msgid "unexpected object ID when writing '%s'" msgstr "ID oggetto inatteso durante la scrittura di '%s'" -#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913 -#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656 +#: refs.c:833 sequencer.c:407 sequencer.c:2701 sequencer.c:2905 +#: sequencer.c:2919 sequencer.c:3177 sequencer.c:5036 strbuf.c:1157 +#: wrapper.c:620 #, c-format msgid "could not write to '%s'" msgstr "impossibile scrivere su '%s'" -#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715 -#: builtin/rebase.c:1003 +#: refs.c:860 strbuf.c:1155 wrapper.c:188 wrapper.c:358 builtin/am.c:719 +#: builtin/rebase.c:1029 #, c-format msgid "could not open '%s' for writing" msgstr "impossibile aprire '%s' in scrittura" @@ -5070,37 +5856,37 @@ msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'" msgid "update_ref failed for ref '%s': %s" msgstr "update_ref per il riferimento '%s' non riuscita: %s" -#: refs.c:2012 +#: refs.c:2023 #, c-format msgid "multiple updates for ref '%s' not allowed" msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti" -#: refs.c:2044 +#: refs.c:2055 msgid "ref updates forbidden inside quarantine environment" msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena" -#: refs.c:2140 refs.c:2170 +#: refs.c:2151 refs.c:2181 #, c-format msgid "'%s' exists; cannot create '%s'" msgstr "'%s' esiste già; impossibile creare '%s'" -#: refs.c:2146 refs.c:2181 +#: refs.c:2157 refs.c:2192 #, c-format msgid "cannot process '%s' and '%s' at the same time" msgstr "impossibile gestire '%s' e '%s' contemporaneamente" -#: refs/files-backend.c:1234 +#: refs/files-backend.c:1233 #, c-format msgid "could not remove reference %s" msgstr "impossibile rimuovere il riferimento %s" -#: refs/files-backend.c:1248 refs/packed-backend.c:1532 -#: refs/packed-backend.c:1542 +#: refs/files-backend.c:1247 refs/packed-backend.c:1541 +#: refs/packed-backend.c:1551 #, c-format msgid "could not delete reference %s: %s" msgstr "impossibile eliminare il riferimento %s: %s" -#: refs/files-backend.c:1251 refs/packed-backend.c:1545 +#: refs/files-backend.c:1250 refs/packed-backend.c:1554 #, c-format msgid "could not delete references: %s" msgstr "impossibile eliminare i riferimenti: %s" @@ -5110,7 +5896,7 @@ msgstr "impossibile eliminare i riferimenti: %s" msgid "invalid refspec '%s'" msgstr "specificatore riferimento '%s' non valido" -#: ref-filter.c:42 wt-status.c:1934 +#: ref-filter.c:42 wt-status.c:1938 msgid "gone" msgstr "sparito" @@ -5129,122 +5915,122 @@ msgstr "prima di %d" msgid "ahead %d, behind %d" msgstr "dopo %d, prima di %d" -#: ref-filter.c:162 +#: ref-filter.c:165 #, c-format msgid "expected format: %%(color:<color>)" msgstr "formato atteso: %%(color:<colore>)" -#: ref-filter.c:164 +#: ref-filter.c:167 #, c-format msgid "unrecognized color: %%(color:%s)" msgstr "colore non riconosciuto: %%(color:%s)" -#: ref-filter.c:186 +#: ref-filter.c:189 #, c-format msgid "Integer value expected refname:lstrip=%s" msgstr "Atteso valore intero: refname:lstrip=%s" -#: ref-filter.c:190 +#: ref-filter.c:193 #, c-format msgid "Integer value expected refname:rstrip=%s" msgstr "Atteso valore intero: refname:rstrip=%s" -#: ref-filter.c:192 +#: ref-filter.c:195 #, c-format msgid "unrecognized %%(%s) argument: %s" msgstr "argomento %%(%s) non riconosciuto: %s" -#: ref-filter.c:247 +#: ref-filter.c:250 #, c-format msgid "%%(objecttype) does not take arguments" msgstr "%%(objecttype) non accetta argomenti" -#: ref-filter.c:269 +#: ref-filter.c:272 #, c-format msgid "unrecognized %%(objectsize) argument: %s" msgstr "argomento %%(objectsize) non riconosciuto: %s" -#: ref-filter.c:277 +#: ref-filter.c:280 #, c-format msgid "%%(deltabase) does not take arguments" msgstr "%%(deltabase) non accetta argomenti" -#: ref-filter.c:289 +#: ref-filter.c:292 #, c-format msgid "%%(body) does not take arguments" msgstr "%%(body) non accetta argomenti" -#: ref-filter.c:298 +#: ref-filter.c:301 #, c-format msgid "%%(subject) does not take arguments" msgstr "%%(subject) non accetta argomenti" -#: ref-filter.c:320 +#: ref-filter.c:323 #, c-format msgid "unknown %%(trailers) argument: %s" msgstr "argomento %%(trailers) sconosciuto: %s" -#: ref-filter.c:349 +#: ref-filter.c:352 #, c-format msgid "positive value expected contents:lines=%s" msgstr "atteso valore positivo in contents:lines=%s" -#: ref-filter.c:351 +#: ref-filter.c:354 #, c-format msgid "unrecognized %%(contents) argument: %s" msgstr "argomento %%(contents) non riconosciuto: %s" -#: ref-filter.c:366 +#: ref-filter.c:369 #, c-format msgid "positive value expected objectname:short=%s" msgstr "atteso valore positivo in objectname:short=%s" -#: ref-filter.c:370 +#: ref-filter.c:373 #, c-format msgid "unrecognized %%(objectname) argument: %s" msgstr "argomento %%(objectname) non riconosciuto: %s" -#: ref-filter.c:400 +#: ref-filter.c:403 #, c-format msgid "expected format: %%(align:<width>,<position>)" msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)" -#: ref-filter.c:412 +#: ref-filter.c:415 #, c-format msgid "unrecognized position:%s" msgstr "valore non riconosciuto: position:%s" -#: ref-filter.c:419 +#: ref-filter.c:422 #, c-format msgid "unrecognized width:%s" msgstr "valore non riconosciuto: width:%s" -#: ref-filter.c:428 +#: ref-filter.c:431 #, c-format msgid "unrecognized %%(align) argument: %s" msgstr "argomento %%(align) non riconosciuto: %s" -#: ref-filter.c:436 +#: ref-filter.c:439 #, c-format msgid "positive width expected with the %%(align) atom" msgstr "attesa ampiezza positiva con l'atom %%(align)" -#: ref-filter.c:454 +#: ref-filter.c:457 #, c-format msgid "unrecognized %%(if) argument: %s" msgstr "argomento %%(if) non riconosciuto: %s" -#: ref-filter.c:556 +#: ref-filter.c:559 #, c-format msgid "malformed field name: %.*s" msgstr "nome campo malformato: %.*s" -#: ref-filter.c:583 +#: ref-filter.c:586 #, c-format msgid "unknown field name: %.*s" msgstr "nome campo sconosciuto: %.*s" -#: ref-filter.c:587 +#: ref-filter.c:590 #, c-format msgid "" "not a git repository, but the field '%.*s' requires access to object data" @@ -5252,160 +6038,160 @@ msgstr "" "non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati " "oggetto" -#: ref-filter.c:711 +#: ref-filter.c:714 #, c-format msgid "format: %%(if) atom used without a %%(then) atom" msgstr "formato: atomo %%(if) usato senza un atomo %%(then)" -#: ref-filter.c:774 +#: ref-filter.c:777 #, c-format msgid "format: %%(then) atom used without an %%(if) atom" msgstr "formato: atomo %%(then) usato senza un atomo %%(if)" -#: ref-filter.c:776 +#: ref-filter.c:779 #, c-format msgid "format: %%(then) atom used more than once" msgstr "formato: atomo %%(then) usato più di una volta" -#: ref-filter.c:778 +#: ref-filter.c:781 #, c-format msgid "format: %%(then) atom used after %%(else)" msgstr "formato: atomo %%(then) usato dopo %%(else)" -#: ref-filter.c:806 +#: ref-filter.c:809 #, c-format msgid "format: %%(else) atom used without an %%(if) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(if)" -#: ref-filter.c:808 +#: ref-filter.c:811 #, c-format msgid "format: %%(else) atom used without a %%(then) atom" msgstr "formato: atomo %%(else) usato senza un atomo %%(then)" -#: ref-filter.c:810 +#: ref-filter.c:813 #, c-format msgid "format: %%(else) atom used more than once" msgstr "formato: atomo %%(else) usato più di una volta" -#: ref-filter.c:825 +#: ref-filter.c:828 #, c-format msgid "format: %%(end) atom used without corresponding atom" msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente" -#: ref-filter.c:882 +#: ref-filter.c:885 #, c-format msgid "malformed format string %s" msgstr "stringa di formato %s malformata" -#: ref-filter.c:1485 +#: ref-filter.c:1488 #, c-format msgid "no branch, rebasing %s" msgstr "nessun branch, eseguo il rebase di %s" -#: ref-filter.c:1488 +#: ref-filter.c:1491 #, c-format msgid "no branch, rebasing detached HEAD %s" msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s" -#: ref-filter.c:1491 +#: ref-filter.c:1494 #, c-format msgid "no branch, bisect started on %s" msgstr "nessun branch, bisezione avviata su %s" -#: ref-filter.c:1501 +#: ref-filter.c:1504 msgid "no branch" msgstr "nessun branch" -#: ref-filter.c:1537 ref-filter.c:1743 +#: ref-filter.c:1540 ref-filter.c:1749 #, c-format msgid "missing object %s for %s" msgstr "oggetto %s mancante per %s" -#: ref-filter.c:1547 +#: ref-filter.c:1550 #, c-format msgid "parse_object_buffer failed on %s for %s" msgstr "parse_object_buffer non riuscito su %s per %s" -#: ref-filter.c:1998 +#: ref-filter.c:2004 #, c-format msgid "malformed object at '%s'" msgstr "oggetto malformato in '%s'" -#: ref-filter.c:2087 +#: ref-filter.c:2093 #, c-format msgid "ignoring ref with broken name %s" msgstr "ignoro il riferimento con il nome malformato %s" -#: ref-filter.c:2382 +#: ref-filter.c:2389 #, c-format msgid "format: %%(end) atom missing" msgstr "formato: atomo %%(end) mancante" -#: ref-filter.c:2482 +#: ref-filter.c:2489 #, c-format msgid "option `%s' is incompatible with --merged" msgstr "l'opzione `%s' non è compatibile con --merged" -#: ref-filter.c:2485 +#: ref-filter.c:2492 #, c-format msgid "option `%s' is incompatible with --no-merged" msgstr "l'opzione `%s' non è compatibile con --no-merged" -#: ref-filter.c:2495 +#: ref-filter.c:2502 #, c-format msgid "malformed object name %s" msgstr "nome dell'oggetto %s malformato" -#: ref-filter.c:2500 +#: ref-filter.c:2507 #, c-format msgid "option `%s' must point to a commit" msgstr "l'opzione `%s' deve puntare ad un commit" -#: remote.c:363 +#: remote.c:366 #, c-format msgid "config remote shorthand cannot begin with '/': %s" msgstr "" "la forma breve della configurazione del remoto non può iniziare con '/': %s" -#: remote.c:410 +#: remote.c:414 msgid "more than one receivepack given, using the first" msgstr "è stata specificata più di una direttiva receivepack, uso la prima" -#: remote.c:418 +#: remote.c:422 msgid "more than one uploadpack given, using the first" msgstr "è stata specificata più di una direttiva uploadpack, uso la prima" -#: remote.c:608 +#: remote.c:612 #, c-format msgid "Cannot fetch both %s and %s to %s" msgstr "Impossibile recuperare sia %s sia %s in %s" -#: remote.c:612 +#: remote.c:616 #, c-format msgid "%s usually tracks %s, not %s" msgstr "%s solitamente traccia %s, non %s" -#: remote.c:616 +#: remote.c:620 #, c-format msgid "%s tracks both %s and %s" msgstr "%s traccia sia %s sia %s" -#: remote.c:684 +#: remote.c:688 #, c-format msgid "key '%s' of pattern had no '*'" msgstr "la chiave '%s' del pattern non aveva un '*'" -#: remote.c:694 +#: remote.c:698 #, c-format msgid "value '%s' of pattern has no '*'" msgstr "il valore '%s' del pattern non ha un '*'" -#: remote.c:1000 +#: remote.c:1004 #, c-format msgid "src refspec %s does not match any" msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s" -#: remote.c:1005 +#: remote.c:1009 #, c-format msgid "src refspec %s matches more than one" msgstr "" @@ -5416,7 +6202,7 @@ msgstr "" #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is #. the <src>. #. -#: remote.c:1020 +#: remote.c:1024 #, c-format msgid "" "The destination you provided is not a full refname (i.e.,\n" @@ -5442,7 +6228,7 @@ msgstr "" "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n" "Devi specificare un riferimento completamente qualificato." -#: remote.c:1040 +#: remote.c:1044 #, c-format msgid "" "The <src> part of the refspec is a commit object.\n" @@ -5453,7 +6239,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/heads/%s'?" -#: remote.c:1045 +#: remote.c:1049 #, c-format msgid "" "The <src> part of the refspec is a tag object.\n" @@ -5464,7 +6250,7 @@ msgstr "" "è un oggetto tag. Forse intendevi creare un nuovo\n" "branch eseguendo il push a '%s:refs/tags/%s'?" -#: remote.c:1050 +#: remote.c:1054 #, c-format msgid "" "The <src> part of the refspec is a tree object.\n" @@ -5476,7 +6262,7 @@ msgstr "" "tag a un nuovo albero eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1055 +#: remote.c:1059 #, c-format msgid "" "The <src> part of the refspec is a blob object.\n" @@ -5488,121 +6274,121 @@ msgstr "" "tag a un nuovo blob eseguendo il push a\n" "'%s:refs/tags/%s'?" -#: remote.c:1091 +#: remote.c:1095 #, c-format msgid "%s cannot be resolved to branch" msgstr "%s non può essere risolto in un branch" -#: remote.c:1102 +#: remote.c:1106 #, c-format msgid "unable to delete '%s': remote ref does not exist" msgstr "impossibile eliminare '%s': il riferimento remoto non esiste" -#: remote.c:1114 +#: remote.c:1118 #, c-format msgid "dst refspec %s matches more than one" msgstr "" "sono state trovate più corrispondenze per lo specificatore riferimento " "destinazione %s" -#: remote.c:1121 +#: remote.c:1125 #, c-format msgid "dst ref %s receives from more than one src" msgstr "" "lo specificatore riferimento destinazione %s riceve dati da più di una " "sorgente" -#: remote.c:1624 remote.c:1725 +#: remote.c:1628 remote.c:1729 msgid "HEAD does not point to a branch" msgstr "HEAD non punta ad un branch" -#: remote.c:1633 +#: remote.c:1637 #, c-format msgid "no such branch: '%s'" msgstr "branch '%s' non esistente" -#: remote.c:1636 +#: remote.c:1640 #, c-format msgid "no upstream configured for branch '%s'" msgstr "nessun upstream configurato per il branch '%s'" -#: remote.c:1642 +#: remote.c:1646 #, c-format msgid "upstream branch '%s' not stored as a remote-tracking branch" msgstr "" "branch upstream '%s' non memorizzato come branch che ne traccia uno remoto" -#: remote.c:1657 +#: remote.c:1661 #, c-format msgid "push destination '%s' on remote '%s' has no local tracking branch" msgstr "" "la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la " "traccia" -#: remote.c:1669 +#: remote.c:1673 #, c-format msgid "branch '%s' has no remote for pushing" msgstr "il branch '%s' non ha un remoto per il push" -#: remote.c:1679 +#: remote.c:1683 #, c-format msgid "push refspecs for '%s' do not include '%s'" msgstr "gli specificatori riferimento per '%s' non includono '%s'" -#: remote.c:1692 +#: remote.c:1696 msgid "push has no destination (push.default is 'nothing')" msgstr "il push non ha una destinazione (push.default è 'nothing')" -#: remote.c:1714 +#: remote.c:1718 msgid "cannot resolve 'simple' push to a single destination" msgstr "impossibile risolvere il push 'simple' a una singola destinazione" -#: remote.c:1840 +#: remote.c:1844 #, c-format msgid "couldn't find remote ref %s" msgstr "impossibile trovare il riferimento remoto %s" -#: remote.c:1853 +#: remote.c:1857 #, c-format msgid "* Ignoring funny ref '%s' locally" msgstr "* Ignoro localmente il riferimento strano '%s'" -#: remote.c:2016 +#: remote.c:2020 #, c-format msgid "Your branch is based on '%s', but the upstream is gone.\n" msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n" -#: remote.c:2020 +#: remote.c:2024 msgid " (use \"git branch --unset-upstream\" to fixup)\n" msgstr " (usa \"git branch --unset-upstream\" per correggere la situazione)\n" -#: remote.c:2023 +#: remote.c:2027 #, c-format msgid "Your branch is up to date with '%s'.\n" msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n" -#: remote.c:2027 +#: remote.c:2031 #, c-format msgid "Your branch and '%s' refer to different commits.\n" msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n" -#: remote.c:2030 +#: remote.c:2034 #, c-format msgid " (use \"%s\" for details)\n" msgstr " (usa \"%s\" per visualizzare i dettagli)\n" -#: remote.c:2034 +#: remote.c:2038 #, 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] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" -#: remote.c:2040 +#: remote.c:2044 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (usa \"git push\" per pubblicare i tuoi commit locali)\n" -#: remote.c:2043 +#: remote.c:2047 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -5614,11 +6400,11 @@ msgstr[1] "" "Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire " "il fast forward.\n" -#: remote.c:2051 +#: remote.c:2055 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (usa \"git pull\" per aggiornare il tuo branch locale)\n" -#: remote.c:2054 +#: remote.c:2058 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -5633,11 +6419,11 @@ msgstr[1] "" "Il tuo branch e '%s' sono diventati divergenti\n" "e hanno rispettivamente %d e %d commit differenti.\n" -#: remote.c:2064 +#: remote.c:2068 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n" -#: remote.c:2247 +#: remote.c:2251 #, c-format msgid "cannot parse expected object name '%s'" msgstr "impossibile analizzare il nome oggetto atteso '%s'" @@ -5652,7 +6438,7 @@ msgstr "nome riferimento sostitutivo non valido: %s" msgid "duplicate replace ref: %s" msgstr "riferimento sostitutivo duplicato: %s" -#: replace-object.c:73 +#: replace-object.c:82 #, c-format msgid "replace depth too high for object %s" msgstr "profondità sostituzione troppo elevata per l'oggetto %s" @@ -5715,8 +6501,8 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'" msgid "Recorded preimage for '%s'" msgstr "Salvata preimmagine di '%s'" -#: rerere.c:881 submodule.c:2023 builtin/log.c:1773 -#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428 +#: rerere.c:881 submodule.c:2078 builtin/log.c:1871 +#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466 #, c-format msgid "could not create directory '%s'" msgstr "impossibile creare la directory '%s'" @@ -5750,20 +6536,20 @@ msgstr "Risoluzione per '%s' dimenticata\n" msgid "unable to open rr-cache directory" msgstr "impossibile aprire la directory cache rr" -#: revision.c:2507 +#: revision.c:2497 msgid "your current branch appears to be broken" msgstr "sembra che il tuo branch corrente sia rotto" -#: revision.c:2510 +#: revision.c:2500 #, c-format msgid "your current branch '%s' does not have any commits yet" msgstr "il tuo branch corrente '%s' non ha ancora commit" -#: revision.c:2710 +#: revision.c:2708 msgid "--first-parent is incompatible with --bisect" msgstr "--first-parent non è compatibile con --bisect" -#: revision.c:2714 +#: revision.c:2712 msgid "-L does not yet support diff formats besides -p and -s" msgstr "-L non supporta ancora formati diff oltre a -p e -s" @@ -5785,31 +6571,31 @@ msgstr "" "L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n" "Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`." -#: send-pack.c:141 +#: send-pack.c:144 msgid "unexpected flush packet while reading remote unpack status" msgstr "" "pacchetto flush inatteso durante la lettura dello stato decompressione del " "remoto" -#: send-pack.c:143 +#: send-pack.c:146 #, c-format msgid "unable to parse remote unpack status: %s" msgstr "impossibile analizzare lo stato decompressione del remoto: %s" -#: send-pack.c:145 +#: send-pack.c:148 #, c-format msgid "remote unpack failed: %s" msgstr "decompressione sul remoto non riuscita: %s" -#: send-pack.c:306 +#: send-pack.c:309 msgid "failed to sign the push certificate" msgstr "firma del certificato per il push non riuscita" -#: send-pack.c:420 +#: send-pack.c:423 msgid "the receiving end does not support --signed push" msgstr "il ricevente non supporta i push --signed" -#: send-pack.c:422 +#: send-pack.c:425 msgid "" "not sending a push certificate since the receiving end does not support --" "signed push" @@ -5817,47 +6603,47 @@ msgstr "" "non invio un certificato push perché il ricevente non supporta i push --" "signed" -#: send-pack.c:434 +#: send-pack.c:437 msgid "the receiving end does not support --atomic push" msgstr "il ricevente non supporta i push --atomic" -#: send-pack.c:439 +#: send-pack.c:442 msgid "the receiving end does not support push options" msgstr "il ricevente non supporta le opzioni push" -#: sequencer.c:187 +#: sequencer.c:191 #, c-format msgid "invalid commit message cleanup mode '%s'" msgstr "modalità pulizia messaggio commit non valida: '%s'" -#: sequencer.c:292 +#: sequencer.c:296 #, c-format msgid "could not delete '%s'" msgstr "impossibile eliminare '%s'" -#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369 +#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385 #, c-format msgid "could not remove '%s'" msgstr "impossibile rimuovere '%s'" -#: sequencer.c:321 +#: sequencer.c:325 msgid "revert" msgstr "revert" -#: sequencer.c:323 +#: sequencer.c:327 msgid "cherry-pick" msgstr "cherry-pick" -#: sequencer.c:325 -msgid "rebase -i" -msgstr "rebase -i" +#: sequencer.c:329 +msgid "rebase" +msgstr "rebase" -#: sequencer.c:327 +#: sequencer.c:331 #, c-format msgid "unknown action: %d" msgstr "azione sconosciuta: %d" -#: sequencer.c:385 +#: sequencer.c:389 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -5865,7 +6651,7 @@ msgstr "" "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n" "con 'git add <path>' o 'git rm <path>'" -#: sequencer.c:388 +#: sequencer.c:392 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -5875,115 +6661,110 @@ msgstr "" "con 'git add <path>' o 'git rm <path>' ed esegui\n" "il commit del risultato con 'git commit'" -#: sequencer.c:401 sequencer.c:2909 +#: sequencer.c:405 sequencer.c:2901 #, c-format msgid "could not lock '%s'" msgstr "impossibile bloccare '%s'" -#: sequencer.c:408 +#: sequencer.c:412 #, c-format msgid "could not write eol to '%s'" msgstr "impossibile scrivere il carattere di fine riga in '%s'" -#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929 -#: sequencer.c:3192 +#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921 +#: sequencer.c:3185 #, c-format msgid "failed to finalize '%s'" msgstr "finalizzazione di '%s' non riuscita" -#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734 -#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763 -#: builtin/merge.c:1112 builtin/rebase.c:567 +#: sequencer.c:440 sequencer.c:1613 sequencer.c:2726 sequencer.c:3167 +#: sequencer.c:3276 builtin/am.c:249 builtin/commit.c:787 builtin/merge.c:1120 +#: builtin/rebase.c:593 #, c-format msgid "could not read '%s'" msgstr "impossibile leggere '%s'" -#: sequencer.c:462 +#: sequencer.c:466 #, c-format msgid "your local changes would be overwritten by %s." msgstr "le tue modifiche locali sarebbero sovrascritte da %s." -#: sequencer.c:466 +#: sequencer.c:470 msgid "commit your changes or stash them to proceed." msgstr "esegui il commit delle modifiche o lo stash per procedere." -#: sequencer.c:498 +#: sequencer.c:502 #, c-format msgid "%s: fast-forward" msgstr "%s: fast forward" -#: sequencer.c:537 builtin/tag.c:565 +#: sequencer.c:541 builtin/tag.c:565 #, c-format msgid "Invalid cleanup mode %s" msgstr "Modalità pulizia non valida: %s" #. TRANSLATORS: %s will be "revert", "cherry-pick" or -#. "rebase -i". +#. "rebase". #. -#: sequencer.c:632 +#: sequencer.c:635 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: impossibile scrivere il nuovo file indice" -#: sequencer.c:649 +#: sequencer.c:652 msgid "unable to update cache tree" msgstr "impossibile aggiornare l'albero cache" -#: sequencer.c:663 +#: sequencer.c:666 msgid "could not resolve HEAD commit" msgstr "impossibile risolvere il commit HEAD" -#: sequencer.c:743 +#: sequencer.c:746 #, c-format msgid "no key present in '%.*s'" msgstr "nessuna chiave presente in '%.*s'" -#: sequencer.c:754 +#: sequencer.c:757 #, c-format msgid "unable to dequote value of '%s'" msgstr "impossibile rimuovere gli apici dal valore di '%s'" -#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706 -#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045 +#: sequencer.c:794 wrapper.c:190 wrapper.c:360 builtin/am.c:710 +#: builtin/am.c:802 builtin/merge.c:1117 builtin/rebase.c:1072 #, c-format msgid "could not open '%s' for reading" msgstr "impossibile aprire '%s' in lettura" -#: sequencer.c:801 +#: sequencer.c:804 msgid "'GIT_AUTHOR_NAME' already given" msgstr "'GIT_AUTHOR_NAME' già specificato" -#: sequencer.c:806 +#: sequencer.c:809 msgid "'GIT_AUTHOR_EMAIL' already given" msgstr "'GIT_AUTHOR_EMAIL' già specificato" -#: sequencer.c:811 +#: sequencer.c:814 msgid "'GIT_AUTHOR_DATE' already given" msgstr "'GIT_AUTHOR_DATE' già specificato" -#: sequencer.c:815 +#: sequencer.c:818 #, c-format msgid "unknown variable '%s'" msgstr "variabile '%s' sconosciuta" -#: sequencer.c:820 +#: sequencer.c:823 msgid "missing 'GIT_AUTHOR_NAME'" msgstr "'GIT_AUTHOR_NAME' mancante" -#: sequencer.c:822 +#: sequencer.c:825 msgid "missing 'GIT_AUTHOR_EMAIL'" msgstr "'GIT_AUTHOR_EMAIL' mancante" -#: sequencer.c:824 +#: sequencer.c:827 msgid "missing 'GIT_AUTHOR_DATE'" msgstr "'GIT_AUTHOR_DATE' mancante" -#: sequencer.c:884 -#, c-format -msgid "invalid date format '%s' in '%s'" -msgstr "formato data '%s' non valido in '%s'" - -#: sequencer.c:901 +#: sequencer.c:876 #, c-format msgid "" "you have staged changes in your working tree\n" @@ -6013,15 +6794,11 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:995 -msgid "writing root commit" -msgstr "scrittura commit radice in corso" - -#: sequencer.c:1216 +#: sequencer.c:1148 msgid "'prepare-commit-msg' hook failed" msgstr "hook 'prepare-commit-msg' non riuscito" -#: sequencer.c:1223 +#: sequencer.c:1154 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6048,7 +6825,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1236 +#: sequencer.c:1167 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -6074,329 +6851,328 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: sequencer.c:1278 +#: sequencer.c:1209 msgid "couldn't look up newly created commit" msgstr "impossibile trovare il commit appena creato" -#: sequencer.c:1280 +#: sequencer.c:1211 msgid "could not parse newly created commit" msgstr "impossibile analizzare il commit appena creato" -#: sequencer.c:1326 +#: sequencer.c:1257 msgid "unable to resolve HEAD after creating commit" msgstr "impossibile risolvere HEAD dopo la creazione del commit" -#: sequencer.c:1328 +#: sequencer.c:1259 msgid "detached HEAD" msgstr "HEAD scollegato" -#: sequencer.c:1332 +#: sequencer.c:1263 msgid " (root-commit)" msgstr " (commit radice)" -#: sequencer.c:1353 +#: sequencer.c:1284 msgid "could not parse HEAD" msgstr "impossibile analizzare HEAD" -#: sequencer.c:1355 +#: sequencer.c:1286 #, c-format msgid "HEAD %s is not a commit!" msgstr "L'HEAD %s non è un commit!" -#: sequencer.c:1359 builtin/commit.c:1571 +#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574 msgid "could not parse HEAD commit" msgstr "impossibile analizzare il commit HEAD" -#: sequencer.c:1411 sequencer.c:2004 +#: sequencer.c:1342 sequencer.c:1968 msgid "unable to parse commit author" msgstr "impossibile analizzare l'autore del commit" -#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684 +#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687 msgid "git write-tree failed to write a tree" msgstr "git write-tree non è riuscito a scrivere un albero" -#: sequencer.c:1438 sequencer.c:1499 +#: sequencer.c:1386 sequencer.c:1447 #, c-format msgid "unable to read commit message from '%s'" msgstr "impossibile leggere il messaggio di commit da '%s'" -#: sequencer.c:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878 -#: builtin/merge.c:903 +#: sequencer.c:1413 builtin/am.c:1588 builtin/commit.c:1673 builtin/merge.c:886 +#: builtin/merge.c:911 msgid "failed to write commit object" msgstr "scrittura dell'oggetto del commit non riuscita" -#: sequencer.c:1526 +#: sequencer.c:1474 #, c-format msgid "could not parse commit %s" msgstr "impossibile analizzare il commit %s" -#: sequencer.c:1531 +#: sequencer.c:1479 #, c-format msgid "could not parse parent commit %s" msgstr "impossibile analizzare il commit genitore %s" -#: sequencer.c:1605 sequencer.c:1715 +#: sequencer.c:1562 sequencer.c:1673 #, c-format msgid "unknown command: %d" msgstr "comando sconosciuto: %d" -#: sequencer.c:1662 sequencer.c:1687 +#: sequencer.c:1620 sequencer.c:1645 #, c-format msgid "This is a combination of %d commits." msgstr "Questa è una combinazione di %d commit." -#: sequencer.c:1672 +#: sequencer.c:1630 msgid "need a HEAD to fixup" msgstr "è necessaria un'HEAD per il fixup" -#: sequencer.c:1674 sequencer.c:3219 +#: sequencer.c:1632 sequencer.c:3212 msgid "could not read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:1676 +#: sequencer.c:1634 msgid "could not read HEAD's commit message" msgstr "impossibile leggere il messaggio di commit dell'HEAD" -#: sequencer.c:1682 +#: sequencer.c:1640 #, c-format msgid "cannot write '%s'" msgstr "impossibile scrivere '%s'" -#: sequencer.c:1689 git-rebase--preserve-merges.sh:496 +#: sequencer.c:1647 git-rebase--preserve-merges.sh:496 msgid "This is the 1st commit message:" msgstr "Questo è il primo messaggio di commit:" -#: sequencer.c:1697 +#: sequencer.c:1655 #, c-format msgid "could not read commit message of %s" msgstr "impossibile leggere il messaggio di commit di %s" -#: sequencer.c:1704 +#: sequencer.c:1662 #, c-format msgid "This is the commit message #%d:" msgstr "Questo è il messaggio di commit numero %d:" -#: sequencer.c:1710 +#: sequencer.c:1668 #, c-format msgid "The commit message #%d will be skipped:" msgstr "Il messaggio di commit numero %d sarà saltato:" -#: sequencer.c:1798 +#: sequencer.c:1756 msgid "your index file is unmerged." msgstr "il file indice non è stato sottoposto a merge." -#: sequencer.c:1805 +#: sequencer.c:1763 msgid "cannot fixup root commit" msgstr "impossibile eseguire il fixup sul commit radice" -#: sequencer.c:1824 +#: sequencer.c:1782 #, c-format msgid "commit %s is a merge but no -m option was given." msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m." -#: sequencer.c:1832 sequencer.c:1840 +#: sequencer.c:1790 sequencer.c:1798 #, c-format msgid "commit %s does not have parent %d" msgstr "il commit %s non ha il genitore %d" -#: sequencer.c:1846 +#: sequencer.c:1804 #, c-format msgid "cannot get commit message for %s" msgstr "impossibile ottenere il messaggio di commit per %s" #. TRANSLATORS: The first %s will be a "todo" command like #. "revert" or "pick", the second %s a SHA1. -#: sequencer.c:1865 +#: sequencer.c:1823 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: impossibile analizzare il commit genitore %s" -#: sequencer.c:1930 +#: sequencer.c:1888 #, c-format msgid "could not rename '%s' to '%s'" msgstr "impossibile ridenominare '%s' in '%s'" -#: sequencer.c:1985 +#: sequencer.c:1943 #, c-format msgid "could not revert %s... %s" msgstr "non è stato possibile eseguire il revert di %s... %s" -#: sequencer.c:1986 +#: sequencer.c:1944 #, c-format msgid "could not apply %s... %s" msgstr "non è stato possibile applicare %s... %s" -#: sequencer.c:2045 +#: sequencer.c:1961 +#, c-format +msgid "dropping %s %s -- patch contents already upstream\n" +msgstr "scarto %s %s - i contenuti della patch sono già upstream\n" + +#: sequencer.c:2018 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: lettura dell'indice non riuscita" -#: sequencer.c:2052 +#: sequencer.c:2025 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: aggiornamento dell'indice non riuscito" -#: sequencer.c:2128 +#: sequencer.c:2102 #, c-format msgid "%s does not accept arguments: '%s'" msgstr "%s non accetta argomenti: '%s'" -#: sequencer.c:2137 +#: sequencer.c:2111 #, c-format msgid "missing arguments for %s" msgstr "argomenti mancanti per %s" -#: sequencer.c:2174 +#: sequencer.c:2142 #, c-format -msgid "could not parse '%.*s'" -msgstr "impossibile analizzare '%.*s'" +msgid "could not parse '%s'" +msgstr "impossibile analizzare '%s'" -#: sequencer.c:2228 +#: sequencer.c:2203 #, c-format msgid "invalid line %d: %.*s" msgstr "riga %d non valida: %.*s" -#: sequencer.c:2239 +#: sequencer.c:2214 #, c-format msgid "cannot '%s' without a previous commit" msgstr "impossibile eseguire '%s' senza un commit precedente" -#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178 -#: builtin/rebase.c:204 builtin/rebase.c:229 -#, c-format -msgid "could not read '%s'." -msgstr "impossibile leggere '%s'." - -#: sequencer.c:2323 +#: sequencer.c:2298 msgid "cancelling a cherry picking in progress" msgstr "annullo un'operazione di cherry-pick in corso" -#: sequencer.c:2330 +#: sequencer.c:2305 msgid "cancelling a revert in progress" msgstr "annullo un'operazione di revert in corso" -#: sequencer.c:2364 +#: sequencer.c:2349 msgid "please fix this using 'git rebase --edit-todo'." msgstr "correggi la situazione usando 'git rebase --edit-todo'." -#: sequencer.c:2366 +#: sequencer.c:2351 #, c-format msgid "unusable instruction sheet: '%s'" msgstr "foglio istruzioni inutilizzabile: '%s'" -#: sequencer.c:2371 +#: sequencer.c:2356 msgid "no commits parsed." msgstr "nessun commit analizzato." -#: sequencer.c:2382 +#: sequencer.c:2367 msgid "cannot cherry-pick during a revert." msgstr "impossibile eseguire un cherry-pick durante un revert." -#: sequencer.c:2384 +#: sequencer.c:2369 msgid "cannot revert during a cherry-pick." msgstr "impossibile eseguire un revert durante un cherry-pick." -#: sequencer.c:2466 +#: sequencer.c:2447 #, c-format msgid "invalid value for %s: %s" msgstr "valore non valido per %s: %s" -#: sequencer.c:2553 +#: sequencer.c:2540 msgid "unusable squash-onto" msgstr "squash-onto inutilizzabile" -#: sequencer.c:2569 +#: sequencer.c:2556 #, c-format msgid "malformed options sheet: '%s'" msgstr "foglio opzioni malformati: '%s'" -#: sequencer.c:2652 sequencer.c:4351 +#: sequencer.c:2644 sequencer.c:4361 msgid "empty commit set passed" msgstr "è stato passato un insieme di commit vuoto" -#: sequencer.c:2668 +#: sequencer.c:2660 msgid "revert is already in progress" msgstr "un'operazione di revert è già in corso" -#: sequencer.c:2670 +#: sequencer.c:2662 #, c-format msgid "try \"git revert (--continue | %s--abort | --quit)\"" msgstr "prova \"git revert (--continue | %s--abort | --quit)\"" -#: sequencer.c:2673 +#: sequencer.c:2665 msgid "cherry-pick is already in progress" msgstr "un'operazione di cherry-pick è già in corso" -#: sequencer.c:2675 +#: sequencer.c:2667 #, c-format msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\"" msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\"" -#: sequencer.c:2689 +#: sequencer.c:2681 #, c-format msgid "could not create sequencer directory '%s'" msgstr "impossibile creare la directory sequencer '%s'" -#: sequencer.c:2704 +#: sequencer.c:2696 msgid "could not lock HEAD" msgstr "impossibile bloccare HEAD" -#: sequencer.c:2764 sequencer.c:4103 +#: sequencer.c:2756 sequencer.c:4099 msgid "no cherry-pick or revert in progress" msgstr "nessuna operazione di cherry-pick o revert in corso" -#: sequencer.c:2766 sequencer.c:2777 +#: sequencer.c:2758 sequencer.c:2769 msgid "cannot resolve HEAD" msgstr "impossibile risolvere HEAD" -#: sequencer.c:2768 sequencer.c:2812 +#: sequencer.c:2760 sequencer.c:2804 msgid "cannot abort from a branch yet to be born" msgstr "" "impossibile interrompere l'operazione da un branch che deve essere ancora " "creato" -#: sequencer.c:2798 builtin/grep.c:734 +#: sequencer.c:2790 builtin/grep.c:724 #, c-format msgid "cannot open '%s'" msgstr "impossibile aprire '%s'" -#: sequencer.c:2800 +#: sequencer.c:2792 #, c-format msgid "cannot read '%s': %s" msgstr "impossibile leggere '%s': %s" -#: sequencer.c:2801 +#: sequencer.c:2793 msgid "unexpected end of file" msgstr "fine del file inattesa" -#: sequencer.c:2807 +#: sequencer.c:2799 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto" -#: sequencer.c:2818 +#: sequencer.c:2810 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!" msgstr "" "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!" -#: sequencer.c:2859 +#: sequencer.c:2851 msgid "no revert in progress" msgstr "nessun revert in corso" -#: sequencer.c:2867 +#: sequencer.c:2859 msgid "no cherry-pick in progress" msgstr "nessun cherry-pick in corso" -#: sequencer.c:2877 +#: sequencer.c:2869 msgid "failed to skip the commit" msgstr "salto del commit non riuscito" -#: sequencer.c:2884 +#: sequencer.c:2876 msgid "there is nothing to skip" msgstr "non c'è nulla da saltare" -#: sequencer.c:2887 +#: sequencer.c:2879 #, c-format msgid "" "have you committed already?\n" @@ -6405,21 +7181,21 @@ msgstr "" "hai già eseguito il commit?\n" "prova \"git %s --continue\"" -#: sequencer.c:3011 sequencer.c:4015 +#: sequencer.c:3003 sequencer.c:4011 #, c-format msgid "could not update %s" msgstr "impossibile aggiornare %s" -#: sequencer.c:3049 sequencer.c:3995 +#: sequencer.c:3042 sequencer.c:3991 msgid "cannot read HEAD" msgstr "impossibile leggere l'HEAD" -#: sequencer.c:3066 +#: sequencer.c:3059 #, c-format msgid "unable to copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3074 +#: sequencer.c:3067 #, c-format msgid "" "You can amend the commit now, with\n" @@ -6438,27 +7214,22 @@ msgstr "" "\n" " git rebase --continue\n" -#: sequencer.c:3084 +#: sequencer.c:3077 #, c-format msgid "Could not apply %s... %.*s" msgstr "Impossibile applicare %s... %.*s" -#: sequencer.c:3091 +#: sequencer.c:3084 #, c-format msgid "Could not merge %.*s" msgstr "Impossibile eseguire il merge di %.*s" -#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633 +#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641 #, c-format msgid "could not copy '%s' to '%s'" msgstr "impossibile copiare '%s' in '%s'" -#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582 -#: builtin/rebase.c:1953 builtin/rebase.c:2008 -msgid "could not read index" -msgstr "impossibile leggere l'indice" - -#: sequencer.c:3136 +#: sequencer.c:3129 #, c-format msgid "" "execution failed: %s\n" @@ -6473,11 +7244,11 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3142 +#: sequencer.c:3135 msgid "and made changes to the index and/or the working tree\n" msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n" -#: sequencer.c:3148 +#: sequencer.c:3141 #, c-format msgid "" "execution succeeded: %s\n" @@ -6494,76 +7265,72 @@ msgstr "" " git rebase --continue\n" "\n" -#: sequencer.c:3209 +#: sequencer.c:3202 #, c-format msgid "illegal label name: '%.*s'" msgstr "nome etichetta illecito: '%.*s'" -#: sequencer.c:3263 +#: sequencer.c:3256 msgid "writing fake root commit" msgstr "scrittura commit radice falso in corso" -#: sequencer.c:3268 +#: sequencer.c:3261 msgid "writing squash-onto" msgstr "scrittura squash-onto in corso" -#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860 +#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886 #, c-format msgid "failed to find tree of %s" msgstr "impossibile trovare l'albero di %s" -#: sequencer.c:3324 builtin/rebase.c:873 -msgid "could not write index" -msgstr "impossibile scrivere l'indice" - -#: sequencer.c:3351 +#: sequencer.c:3344 #, c-format msgid "could not resolve '%s'" msgstr "impossibile risolvere '%s'" -#: sequencer.c:3379 +#: sequencer.c:3375 msgid "cannot merge without a current revision" msgstr "impossibile eseguire il merge senza una revisione corrente" -#: sequencer.c:3401 +#: sequencer.c:3397 #, c-format msgid "unable to parse '%.*s'" msgstr "impossibile analizzare '%.*s'" -#: sequencer.c:3410 +#: sequencer.c:3406 #, c-format msgid "nothing to merge: '%.*s'" msgstr "non c'è nulla di cui eseguire il merge: '%.*s'" -#: sequencer.c:3422 +#: sequencer.c:3418 msgid "octopus merge cannot be executed on top of a [new root]" msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]" -#: sequencer.c:3437 +#: sequencer.c:3434 #, c-format msgid "could not get commit message of '%s'" msgstr "impossibile ottenere il messaggio di commit per '%s'" -#: sequencer.c:3590 +#: sequencer.c:3594 #, c-format msgid "could not even attempt to merge '%.*s'" msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'" -#: sequencer.c:3606 +#: sequencer.c:3610 msgid "merge: Unable to write new index file" msgstr "merge: impossibile scrivere il nuovo file indice" -#: sequencer.c:3675 builtin/rebase.c:711 +#: sequencer.c:3679 builtin/rebase.c:737 #, c-format msgid "Applied autostash.\n" msgstr "Stash automatico applicato.\n" -#: sequencer.c:3687 +#: sequencer.c:3691 #, c-format msgid "cannot store %s" msgstr "impossibile memorizzare %s" -#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113 +#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113 #, c-format msgid "" "Applying autostash resulted in conflicts.\n" @@ -6574,31 +7341,26 @@ msgstr "" "Le tue modifiche sono al sicuro nello stash.\n" "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n" -#: sequencer.c:3751 -#, c-format -msgid "could not checkout %s" -msgstr "impossibile eseguire il checkout di %s" - -#: sequencer.c:3765 +#: sequencer.c:3755 #, c-format msgid "%s: not a valid OID" msgstr "%s: non è un OID valido" -#: sequencer.c:3770 git-rebase--preserve-merges.sh:779 +#: sequencer.c:3760 git-rebase--preserve-merges.sh:779 msgid "could not detach HEAD" msgstr "impossibile scollegare l'HEAD" -#: sequencer.c:3785 +#: sequencer.c:3775 #, c-format msgid "Stopped at HEAD\n" msgstr "Fermato a HEAD\n" -#: sequencer.c:3787 +#: sequencer.c:3777 #, c-format msgid "Stopped at %s\n" msgstr "Fermato a %s\n" -#: sequencer.c:3795 +#: sequencer.c:3785 #, c-format msgid "" "Could not execute the todo command\n" @@ -6620,49 +7382,49 @@ msgstr "" " git rebase --edit-todo\n" " git rebase --continue\n" -#: sequencer.c:3877 +#: sequencer.c:3869 #, c-format msgid "Stopped at %s... %.*s\n" msgstr "Fermato a %s... %.*s\n" -#: sequencer.c:3958 +#: sequencer.c:3940 #, c-format msgid "unknown command %d" msgstr "comando %d sconosciuto" -#: sequencer.c:4003 +#: sequencer.c:3999 msgid "could not read orig-head" msgstr "impossibile leggere orig-head" -#: sequencer.c:4008 +#: sequencer.c:4004 msgid "could not read 'onto'" msgstr "impossibile leggere 'onto'" -#: sequencer.c:4022 +#: sequencer.c:4018 #, c-format msgid "could not update HEAD to %s" msgstr "impossibile aggiornare l'HEAD a %s" -#: sequencer.c:4115 +#: sequencer.c:4111 msgid "cannot rebase: You have unstaged changes." msgstr "" "impossibile eseguire il rebase: ci sono delle modifiche non in staging." -#: sequencer.c:4124 +#: sequencer.c:4120 msgid "cannot amend non-existing commit" msgstr "impossibile modificare un commit inesistente" -#: sequencer.c:4126 +#: sequencer.c:4122 #, c-format msgid "invalid file: '%s'" msgstr "file non valido: '%s'" -#: sequencer.c:4128 +#: sequencer.c:4124 #, c-format msgid "invalid contents: '%s'" msgstr "contenuti non validi: '%s'" -#: sequencer.c:4131 +#: sequencer.c:4127 msgid "" "\n" "You have uncommitted changes in your working tree. Please, commit them\n" @@ -6673,69 +7435,59 @@ msgstr "" "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n" "--continue'." -#: sequencer.c:4167 sequencer.c:4205 +#: sequencer.c:4163 sequencer.c:4202 #, c-format msgid "could not write file: '%s'" msgstr "impossibile scrivere il file: '%s'" -#: sequencer.c:4220 +#: sequencer.c:4217 msgid "could not remove CHERRY_PICK_HEAD" msgstr "impossibile rimuovere CHERRY_PICK_HEAD" -#: sequencer.c:4227 +#: sequencer.c:4224 msgid "could not commit staged changes." msgstr "impossibile eseguire il commit delle modifiche in staging." -#: sequencer.c:4328 +#: sequencer.c:4338 #, c-format msgid "%s: can't cherry-pick a %s" msgstr "%s: impossibile eseguire il cherry pick di un %s" -#: sequencer.c:4332 +#: sequencer.c:4342 #, c-format msgid "%s: bad revision" msgstr "%s: revisione non valida" -#: sequencer.c:4367 +#: sequencer.c:4377 msgid "can't revert as initial commit" msgstr "impossibile eseguire il revert come commit iniziale" -#: sequencer.c:4810 +#: sequencer.c:4846 msgid "make_script: unhandled options" msgstr "make_script: opzioni non gestite" -#: sequencer.c:4813 +#: sequencer.c:4849 msgid "make_script: error preparing revisions" msgstr "make_script: errore durante la preparazione delle revisioni" -#: sequencer.c:4971 -msgid "" -"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --" -"continue'.\n" -"Or you can abort the rebase with 'git rebase --abort'.\n" -msgstr "" -"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi " -"eseguire 'git rebase --continue'.\n" -"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n" - #: sequencer.c:5083 sequencer.c:5100 msgid "nothing to do" msgstr "nulla da fare" -#: sequencer.c:5114 +#: sequencer.c:5119 msgid "could not skip unnecessary pick commands" msgstr "impossibile saltare i comandi pick non necessari" -#: sequencer.c:5197 +#: sequencer.c:5213 msgid "the script was already rearranged." msgstr "lo script è già stato riordinato." -#: setup.c:123 +#: setup.c:124 #, c-format -msgid "'%s' is outside repository" -msgstr "'%s' è al di fuori del repository" +msgid "'%s' is outside repository at '%s'" +msgstr "'%s' è al di fuori del repository in '%s'" -#: setup.c:173 +#: setup.c:175 #, c-format msgid "" "%s: no such path in the working tree.\n" @@ -6745,7 +7497,7 @@ msgstr "" "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti " "localmente." -#: setup.c:186 +#: setup.c:188 #, c-format msgid "" "ambiguous argument '%s': unknown revision or path not in the working tree.\n" @@ -6757,14 +7509,14 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:235 +#: setup.c:254 #, c-format msgid "option '%s' must come before non-option arguments" msgstr "" "l'opzione '%s' deve essere specificata prima degli argomenti che non " "costituiscono un'opzione" -#: setup.c:254 +#: setup.c:273 #, c-format msgid "" "ambiguous argument '%s': both revision and filename\n" @@ -6775,93 +7527,93 @@ msgstr "" "Usa '--' per separare i percorsi dalle revisioni, come segue:\n" "'git <comando> [<revisione>...] -- [<file>...]'" -#: setup.c:390 +#: setup.c:409 msgid "unable to set up work tree using invalid config" msgstr "" "impossibile preparare l'albero di lavoro usando una configurazione non valida" -#: setup.c:394 +#: setup.c:413 msgid "this operation must be run in a work tree" msgstr "quest'operazione deve essere eseguita in un albero di lavoro" -#: setup.c:540 +#: setup.c:559 #, c-format msgid "Expected git repo version <= %d, found %d" msgstr "Attesa versione repository Git <= %d, trovata %d" -#: setup.c:548 +#: setup.c:567 msgid "unknown repository extensions found:" msgstr "trovate estensioni repository sconosciute:" -#: setup.c:567 +#: setup.c:586 #, c-format msgid "error opening '%s'" msgstr "errore durante l'apertura di '%s'" -#: setup.c:569 +#: setup.c:588 #, c-format msgid "too large to be a .git file: '%s'" msgstr "'%s' troppo grande per essere un file .git" -#: setup.c:571 +#: setup.c:590 #, c-format msgid "error reading %s" msgstr "errore durante la lettura di %s" -#: setup.c:573 +#: setup.c:592 #, c-format msgid "invalid gitfile format: %s" msgstr "formato file Git non valido: %s" -#: setup.c:575 +#: setup.c:594 #, c-format msgid "no path in gitfile: %s" msgstr "nessun percorso presente nel file Git: %s" -#: setup.c:577 +#: setup.c:596 #, c-format msgid "not a git repository: %s" msgstr "%s non è un repository Git" -#: setup.c:676 +#: setup.c:695 #, c-format msgid "'$%s' too big" msgstr "'$%s' è troppo grande" -#: setup.c:690 +#: setup.c:709 #, c-format msgid "not a git repository: '%s'" msgstr "'%s' non è un repository Git" -#: setup.c:719 setup.c:721 setup.c:752 +#: setup.c:738 setup.c:740 setup.c:771 #, c-format msgid "cannot chdir to '%s'" msgstr "impossibile modificare la directory corrente in '%s'" -#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837 +#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856 msgid "cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: setup.c:851 +#: setup.c:870 #, c-format msgid "failed to stat '%*s%s%s'" msgstr "stat di '%*s%s%s' non riuscito" -#: setup.c:1083 +#: setup.c:1108 msgid "Unable to read current working directory" msgstr "Impossibile leggere la directory di lavoro corrente" -#: setup.c:1092 setup.c:1098 +#: setup.c:1117 setup.c:1123 #, c-format msgid "cannot change to '%s'" msgstr "impossibile entrare in '%s'" -#: setup.c:1103 +#: setup.c:1128 #, c-format msgid "not a git repository (or any of the parent directories): %s" msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)" -#: setup.c:1109 +#: setup.c:1134 #, c-format msgid "" "not a git repository (or any parent up to mount point %s)\n" @@ -6871,7 +7623,7 @@ msgstr "" "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM " "non è impostata)." -#: setup.c:1220 +#: setup.c:1245 #, c-format msgid "" "problem with core.sharedRepository filemode value (0%.3o).\n" @@ -6881,289 +7633,289 @@ msgstr "" "(0%.3o).\n" "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura." -#: setup.c:1264 +#: setup.c:1289 msgid "open /dev/null or dup failed" msgstr "apertura di /dev/null o dup non riuscita" -#: setup.c:1279 +#: setup.c:1304 msgid "fork failed" msgstr "fork non riuscita" -#: setup.c:1284 +#: setup.c:1309 msgid "setsid failed" msgstr "setsid non riuscita" -#: sha1-file.c:453 +#: sha1-file.c:452 #, c-format msgid "object directory %s does not exist; check .git/objects/info/alternates" msgstr "" "la directory oggetti %s non esiste; controlla .git/objects/info/alternates" -#: sha1-file.c:504 +#: sha1-file.c:503 #, c-format msgid "unable to normalize alternate object path: %s" msgstr "impossibile normalizzare il percorso alternativo oggetto: %s" -#: sha1-file.c:576 +#: sha1-file.c:575 #, c-format msgid "%s: ignoring alternate object stores, nesting too deep" msgstr "" "%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo " "profonda" -#: sha1-file.c:583 +#: sha1-file.c:582 #, c-format msgid "unable to normalize object directory: %s" msgstr "impossibile normalizzare la directory oggetti: %s" -#: sha1-file.c:626 +#: sha1-file.c:625 msgid "unable to fdopen alternates lockfile" msgstr "impossibile eseguire fdopen sul file di lock alternates" -#: sha1-file.c:644 +#: sha1-file.c:643 msgid "unable to read alternates file" msgstr "impossibile leggere il file alternates" -#: sha1-file.c:651 +#: sha1-file.c:650 msgid "unable to move new alternates file into place" msgstr "impossibile spostare il nuovo file alternates nella posizione corretta" -#: sha1-file.c:686 +#: sha1-file.c:685 #, c-format msgid "path '%s' does not exist" msgstr "il percorso '%s' non esiste" -#: sha1-file.c:712 +#: sha1-file.c:711 #, c-format msgid "reference repository '%s' as a linked checkout is not supported yet." msgstr "" "l'aggiunta del repository di riferimento '%s' come checkout collegato non è " "ancora supportata." -#: sha1-file.c:718 +#: sha1-file.c:717 #, c-format msgid "reference repository '%s' is not a local repository." msgstr "il repository di riferimento '%s' non è un repository locale." -#: sha1-file.c:724 +#: sha1-file.c:723 #, c-format msgid "reference repository '%s' is shallow" msgstr "il repository di riferimento '%s' è shallow" -#: sha1-file.c:732 +#: sha1-file.c:731 #, c-format msgid "reference repository '%s' is grafted" msgstr "il repository di riferimento '%s' è un graft" -#: sha1-file.c:792 +#: sha1-file.c:791 #, c-format msgid "invalid line while parsing alternate refs: %s" msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s" -#: sha1-file.c:944 +#: sha1-file.c:943 #, c-format msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>" msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>" -#: sha1-file.c:969 +#: sha1-file.c:964 msgid "mmap failed" msgstr "mmap non riuscita" -#: sha1-file.c:1133 +#: sha1-file.c:1128 #, c-format msgid "object file %s is empty" msgstr "l'oggetto %s è vuoto" -#: sha1-file.c:1257 sha1-file.c:2396 +#: sha1-file.c:1263 sha1-file.c:2443 #, c-format msgid "corrupt loose object '%s'" msgstr "oggetto sciolto '%s' corrotto" -#: sha1-file.c:1259 sha1-file.c:2400 +#: sha1-file.c:1265 sha1-file.c:2447 #, c-format msgid "garbage at end of loose object '%s'" msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'" -#: sha1-file.c:1301 +#: sha1-file.c:1307 msgid "invalid object type" msgstr "tipo oggetto non valido" -#: sha1-file.c:1385 +#: sha1-file.c:1391 #, c-format msgid "unable to unpack %s header with --allow-unknown-type" msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1388 +#: sha1-file.c:1394 #, c-format msgid "unable to unpack %s header" msgstr "impossibile decomprimere l'intestazione %s" -#: sha1-file.c:1394 +#: sha1-file.c:1400 #, c-format msgid "unable to parse %s header with --allow-unknown-type" msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type" -#: sha1-file.c:1397 +#: sha1-file.c:1403 #, c-format msgid "unable to parse %s header" msgstr "impossibile analizzare l'intestazione %s" -#: sha1-file.c:1588 +#: sha1-file.c:1629 #, c-format msgid "failed to read object %s" msgstr "lettura dell'oggetto %s non riuscita" -#: sha1-file.c:1592 +#: sha1-file.c:1633 #, c-format msgid "replacement %s not found for %s" msgstr "%s sostitutivo non trovato per %s" -#: sha1-file.c:1596 +#: sha1-file.c:1637 #, c-format msgid "loose object %s (stored in %s) is corrupt" msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto" -#: sha1-file.c:1600 +#: sha1-file.c:1641 #, c-format msgid "packed object %s (stored in %s) is corrupt" msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto" -#: sha1-file.c:1703 +#: sha1-file.c:1746 #, c-format msgid "unable to write file %s" msgstr "impossibile scrivere il file %s" -#: sha1-file.c:1710 +#: sha1-file.c:1753 #, c-format msgid "unable to set permission to '%s'" msgstr "impossibile impostare i permessi a '%s'" -#: sha1-file.c:1717 +#: sha1-file.c:1760 msgid "file write error" msgstr "errore di scrittura del file" -#: sha1-file.c:1736 +#: sha1-file.c:1780 msgid "error when closing loose object file" msgstr "errore durante la chiusura del file oggetto sciolto" -#: sha1-file.c:1801 +#: sha1-file.c:1845 #, c-format msgid "insufficient permission for adding an object to repository database %s" msgstr "" "permessi non sufficienti per l'aggiunta di un oggetto al database repository " "%s" -#: sha1-file.c:1803 +#: sha1-file.c:1847 msgid "unable to create temporary file" msgstr "impossibile creare il file temporaneo" -#: sha1-file.c:1827 +#: sha1-file.c:1871 msgid "unable to write loose object file" msgstr "impossibile scrivere il file oggetto sciolto" -#: sha1-file.c:1833 +#: sha1-file.c:1877 #, c-format msgid "unable to deflate new object %s (%d)" msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)" -#: sha1-file.c:1837 +#: sha1-file.c:1881 #, c-format msgid "deflateEnd on object %s failed (%d)" msgstr "deflateEnd non riuscita sull'oggetto %s (%d)" -#: sha1-file.c:1841 +#: sha1-file.c:1885 #, c-format msgid "confused by unstable object source data for %s" msgstr "sono confuso dall'origine dati oggetto non stabile per %s" -#: sha1-file.c:1851 builtin/pack-objects.c:925 +#: sha1-file.c:1895 builtin/pack-objects.c:1054 #, c-format msgid "failed utime() on %s" msgstr "utime() di %s non riuscita" -#: sha1-file.c:1926 +#: sha1-file.c:1972 #, c-format msgid "cannot read object for %s" msgstr "impossibile leggere l'oggetto per %s" -#: sha1-file.c:1966 +#: sha1-file.c:2011 msgid "corrupt commit" msgstr "commit corrotto" -#: sha1-file.c:1974 +#: sha1-file.c:2019 msgid "corrupt tag" msgstr "tag corrotto" -#: sha1-file.c:2073 +#: sha1-file.c:2119 #, c-format msgid "read error while indexing %s" msgstr "errore di lettura durante l'indicizzazione di %s" -#: sha1-file.c:2076 +#: sha1-file.c:2122 #, c-format msgid "short read while indexing %s" msgstr "lettura troppo breve durante l'indicizzazione di %s" -#: sha1-file.c:2149 sha1-file.c:2158 +#: sha1-file.c:2195 sha1-file.c:2205 #, c-format msgid "%s: failed to insert into database" msgstr "%s: inserimento del record nel database non riuscito" -#: sha1-file.c:2164 +#: sha1-file.c:2211 #, c-format msgid "%s: unsupported file type" msgstr "%s: tipo di file non supportato" -#: sha1-file.c:2188 +#: sha1-file.c:2235 #, c-format msgid "%s is not a valid object" msgstr "%s non è un oggetto valido" -#: sha1-file.c:2190 +#: sha1-file.c:2237 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s non è un oggetto '%s' valido" -#: sha1-file.c:2217 builtin/index-pack.c:155 +#: sha1-file.c:2264 builtin/index-pack.c:155 #, c-format msgid "unable to open %s" msgstr "impossibile aprire %s" -#: sha1-file.c:2407 sha1-file.c:2459 +#: sha1-file.c:2454 sha1-file.c:2507 #, c-format msgid "hash mismatch for %s (expected %s)" msgstr "mancata corrispondenza per %s (atteso %s)" -#: sha1-file.c:2431 +#: sha1-file.c:2478 #, c-format msgid "unable to mmap %s" msgstr "impossibile eseguire mmap su %s" -#: sha1-file.c:2436 +#: sha1-file.c:2483 #, c-format msgid "unable to unpack header of %s" msgstr "impossibile decomprimere l'intestazione di %s" -#: sha1-file.c:2442 +#: sha1-file.c:2489 #, c-format msgid "unable to parse header of %s" msgstr "impossibile analizzare l'intestazione di %s" -#: sha1-file.c:2453 +#: sha1-file.c:2500 #, c-format msgid "unable to unpack contents of %s" msgstr "impossibile decomprimere i contenuti di %s" -#: sha1-name.c:490 +#: sha1-name.c:486 #, c-format msgid "short SHA1 %s is ambiguous" msgstr "lo SHA1 breve %s è ambiguo" -#: sha1-name.c:501 +#: sha1-name.c:497 msgid "The candidates are:" msgstr "I candidati sono:" -#: sha1-name.c:800 +#: sha1-name.c:796 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" @@ -7187,44 +7939,112 @@ msgstr "" "riferimenti ed eliminali se necessario. Disabilita questo\n" "messaggio eseguendo \"git config advice.objectNameWarning false\"" +#: sha1-name.c:916 +#, c-format +msgid "log for '%.*s' only goes back to %s" +msgstr "il log per '%.*s' è disponibile solo fino al %s" + +#: sha1-name.c:924 +#, c-format +msgid "log for '%.*s' only has %d entries" +msgstr "il log per '%.*s' ha solo %d voci" + +#: sha1-name.c:1689 +#, c-format +msgid "path '%s' exists on disk, but not in '%.*s'" +msgstr "il percorso '%s' esiste su disco, ma non in '%.*s'" + +#: sha1-name.c:1695 +#, c-format +msgid "" +"path '%s' exists, but not '%s'\n" +"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?" +msgstr "" +"il percorso '%s' esiste, ma non '%s'\n" +"suggerimento: forse intendevi '%.*s:%s' ossia '%.*s:./%s'?" + +#: sha1-name.c:1704 +#, c-format +msgid "path '%s' does not exist in '%.*s'" +msgstr "il percorso '%s' non esiste in '%.*s'" + +#: sha1-name.c:1732 +#, c-format +msgid "" +"path '%s' is in the index, but not at stage %d\n" +"hint: Did you mean ':%d:%s'?" +msgstr "" +"il percorso '%s' è nell'indice, ma non nel passo %d\n" +"suggerimento: Forse intendevi ':%d:%s'?" + +#: sha1-name.c:1748 +#, c-format +msgid "" +"path '%s' is in the index, but not '%s'\n" +"hint: Did you mean ':%d:%s' aka ':%d:./%s'?" +msgstr "" +"il percorso '%s' è nell'indice, ma non '%s'\n" +"suggerimento: Forse intendevi ':%d:%s' ossia ':%d:./%s'?" + +#: sha1-name.c:1756 +#, c-format +msgid "path '%s' exists on disk, but not in the index" +msgstr "il percorso '%s' esiste su disco, ma non nell'indice" + +#: sha1-name.c:1758 +#, c-format +msgid "path '%s' does not exist (neither on disk nor in the index)" +msgstr "il percorso '%s' non esiste (né su disco né nell'indice)" + +#: sha1-name.c:1771 +msgid "relative path syntax can't be used outside working tree" +msgstr "" +"la sintassi per i percorsi relativi non può essere usata al di fuori " +"dell'albero di lavoro" + +#: sha1-name.c:1909 +#, c-format +msgid "invalid object name '%.*s'." +msgstr "nome oggetto non valido: '%.*s'." + #. TRANSLATORS: IEC 80000-13:2008 gibibyte -#: strbuf.c:821 +#: strbuf.c:837 #, c-format msgid "%u.%2.2u GiB" msgstr "%u.%2.2u GiB" #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second -#: strbuf.c:823 +#: strbuf.c:839 #, c-format msgid "%u.%2.2u GiB/s" msgstr "%u.%2.2u GiB/s" #. TRANSLATORS: IEC 80000-13:2008 mebibyte -#: strbuf.c:831 +#: strbuf.c:847 #, c-format msgid "%u.%2.2u MiB" msgstr "%u.%2.2u MiB" #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second -#: strbuf.c:833 +#: strbuf.c:849 #, c-format msgid "%u.%2.2u MiB/s" msgstr "%u.%2.2u MiB/s" #. TRANSLATORS: IEC 80000-13:2008 kibibyte -#: strbuf.c:840 +#: strbuf.c:856 #, c-format msgid "%u.%2.2u KiB" msgstr "%u.%2.2u KiB" #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second -#: strbuf.c:842 +#: strbuf.c:858 #, c-format msgid "%u.%2.2u KiB/s" msgstr "%u.%2.2u KiB/s" #. TRANSLATORS: IEC 80000-13:2008 byte -#: strbuf.c:848 +#: strbuf.c:864 #, c-format msgid "%u byte" msgid_plural "%u bytes" @@ -7232,13 +8052,18 @@ msgstr[0] "%u byte" msgstr[1] "%u byte" #. TRANSLATORS: IEC 80000-13:2008 byte/second -#: strbuf.c:850 +#: strbuf.c:866 #, c-format msgid "%u byte/s" msgid_plural "%u bytes/s" msgstr[0] "%u byte/s" msgstr[1] "%u byte/s" +#: strbuf.c:1164 +#, c-format +msgid "could not edit '%s'" +msgstr "impossibile modificare '%s'" + #: submodule.c:114 submodule.c:143 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first" msgstr "" @@ -7269,53 +8094,132 @@ msgstr "nel sottomodulo non popolato '%s'" msgid "Pathspec '%s' is in submodule '%.*s'" msgstr "Lo specificatore percorso '%s' è nel sottomodulo '%.*s'" +#: submodule.c:434 +#, c-format +msgid "bad --ignore-submodules argument: %s" +msgstr "argomento --ignore-submodules errato: %s" + +#: submodule.c:815 +#, c-format +msgid "" +"Submodule in commit %s at path: '%s' collides with a submodule named the " +"same. Skipping it." +msgstr "" +"Il sottomodulo nel commit %s e nel percorso '%s' collide con un sottomodulo " +"con lo stesso nome. Lo salto." + #: submodule.c:910 #, c-format msgid "submodule entry '%s' (%s) is a %s, not a commit" msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit" -#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989 +#: submodule.c:995 +#, c-format +msgid "" +"Could not run 'git rev-list <commits> --not --remotes -n 1' command in " +"submodule %s" +msgstr "" +"Impossibile eseguire il comando 'git rev-list <commit> --not --remotes -n 1' " +"nel sottomodulo %s" + +#: submodule.c:1118 +#, c-format +msgid "process for submodule '%s' failed" +msgstr "il processo per il sottomodulo '%s' non è uscito con successo" + +#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045 msgid "Failed to resolve HEAD as a valid ref." msgstr "Impossibile risolvere HEAD come riferimento valido." -#: submodule.c:1481 +#: submodule.c:1158 +#, c-format +msgid "Pushing submodule '%s'\n" +msgstr "Push del sottomodulo '%s' in corso\n" + +#: submodule.c:1161 #, c-format -msgid "Could not access submodule '%s'" -msgstr "Impossibile accedere al sottomodulo '%s'" +msgid "Unable to push submodule '%s'\n" +msgstr "Impossibile eseguire il push del sottomodulo '%s'\n" -#: submodule.c:1651 +#: submodule.c:1453 +#, c-format +msgid "Fetching submodule %s%s\n" +msgstr "Recupero del sottomodulo %s%s in corso\n" + +#: submodule.c:1483 +#, c-format +msgid "Could not access submodule '%s'\n" +msgstr "Impossibile accedere al sottomodulo '%s'\n" + +#: submodule.c:1637 +#, c-format +msgid "" +"Errors during submodule fetch:\n" +"%s" +msgstr "" +"Errore durante il recupero del sottomodulo:\n" +"%s" + +#: submodule.c:1662 #, c-format msgid "'%s' not recognized as a git repository" msgstr "'%s' non riconosciuto come repository Git" -#: submodule.c:1789 +#: submodule.c:1679 +#, c-format +msgid "Could not run 'git status --porcelain=2' in submodule %s" +msgstr "Impossibile eseguire 'git status --porcelain=2' nel sottomodulo %s" + +#: submodule.c:1720 +#, c-format +msgid "'git status --porcelain=2' failed in submodule %s" +msgstr "" +"Esecuzione di 'git status --porcelain=2' non riuscita nel sottomodulo %s" + +#: submodule.c:1800 #, c-format msgid "could not start 'git status' in submodule '%s'" msgstr "impossibile avviare 'git status' nel sottomodulo '%s'" -#: submodule.c:1802 +#: submodule.c:1813 #, c-format msgid "could not run 'git status' in submodule '%s'" msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'" -#: submodule.c:1817 +#: submodule.c:1828 #, c-format msgid "Could not unset core.worktree setting in submodule '%s'" msgstr "" "Impossibile annullare l'impostazione dell'opzione core.worktree nel " "sottomodulo '%s'" -#: submodule.c:1907 +#: submodule.c:1855 submodule.c:2165 +#, c-format +msgid "could not recurse into submodule '%s'" +msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" + +#: submodule.c:1876 +msgid "could not reset submodule index" +msgstr "impossibile ripristinare l'indice del sottomodulo" + +#: submodule.c:1918 #, c-format msgid "submodule '%s' has dirty index" msgstr "il sottomodulo '%s' ha l'indice sporco" -#: submodule.c:1959 +#: submodule.c:1970 #, c-format msgid "Submodule '%s' could not be updated." msgstr "Impossibile aggiornare il sottomodulo '%s'." -#: submodule.c:2007 +#: submodule.c:2038 +#, c-format +msgid "submodule git dir '%s' is inside git dir '%.*s'" +msgstr "" +"la directory Git del sottomodulo '%s' è all'interno della directory Git " +"'%.*s'" + +#: submodule.c:2059 #, c-format msgid "" "relocate_gitdir for submodule '%s' with more than one worktree not supported" @@ -7323,12 +8227,17 @@ msgstr "" "relocate_gitdir non è supportata per il sottomodulo '%s' con più di un " "albero di lavoro" -#: submodule.c:2019 submodule.c:2074 +#: submodule.c:2071 submodule.c:2130 #, c-format msgid "could not lookup name for submodule '%s'" msgstr "impossibile ricercare il nome per il sottomodulo '%s'" -#: submodule.c:2026 +#: submodule.c:2075 +#, c-format +msgid "refusing to move '%s' into an existing git dir" +msgstr "mi rifiuto di spostare '%s' in una directory Git esistente" + +#: submodule.c:2082 #, c-format msgid "" "Migrating git directory of '%s%s' from\n" @@ -7339,42 +8248,37 @@ msgstr "" "'%s' a\n" "'%s'\n" -#: submodule.c:2109 -#, c-format -msgid "could not recurse into submodule '%s'" -msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'" - -#: submodule.c:2153 +#: submodule.c:2209 msgid "could not start ls-files in .." msgstr "impossibile avviare ls-files in .." -#: submodule.c:2192 +#: submodule.c:2248 #, c-format msgid "ls-tree returned unexpected return code %d" msgstr "ls-tree ha restituito il valore di ritorno inatteso %d" -#: submodule-config.c:232 +#: submodule-config.c:236 #, c-format msgid "ignoring suspicious submodule name: %s" msgstr "ignoro un nome sottomodulo sospetto: %s" -#: submodule-config.c:299 +#: submodule-config.c:303 msgid "negative values not allowed for submodule.fetchjobs" msgstr "i valori negativi non sono consentiti per submodule.fetchjobs" -#: submodule-config.c:397 +#: submodule-config.c:401 #, c-format msgid "ignoring '%s' which may be interpreted as a command-line option: %s" msgstr "" "ignoro '%s' che potrebbe essere interpretato come argomento della riga di " "comando: %s" -#: submodule-config.c:486 +#: submodule-config.c:498 #, c-format msgid "invalid value for %s" msgstr "valore non valido per %s" -#: submodule-config.c:755 +#: submodule-config.c:765 #, c-format msgid "Could not update .gitmodules entry %s" msgstr "Impossibile aggiornare la voce .gitmodules %s" @@ -7390,7 +8294,7 @@ msgstr "esecuzione del comando finale '%s' non riuscita" msgid "unknown value '%s' for key '%s'" msgstr "valore '%s' sconosciuto per la chiave '%s'" -#: trailer.c:539 trailer.c:544 builtin/remote.c:295 +#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323 #, c-format msgid "more than one %s" msgstr "più di un %s" @@ -7409,7 +8313,7 @@ msgstr "impossibile leggere il file di input '%s'" msgid "could not read from stdin" msgstr "impossibile leggere dallo standard input" -#: trailer.c:1011 wrapper.c:701 +#: trailer.c:1011 wrapper.c:665 #, c-format msgid "could not stat %s" msgstr "impossibile eseguire lo stat di '%s'" @@ -7438,47 +8342,47 @@ msgstr "impossibile ridenominare il file temporaneo in %s" msgid "Would set upstream of '%s' to '%s' of '%s'\n" msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n" -#: transport.c:142 +#: transport.c:145 #, c-format msgid "could not read bundle '%s'" msgstr "impossibile leggere il bundle '%s'" -#: transport.c:208 +#: transport.c:214 #, c-format msgid "transport: invalid depth option '%s'" msgstr "trasporto: opzione profondità '%s' non valida" -#: transport.c:259 +#: transport.c:266 msgid "see protocol.version in 'git help config' for more details" msgstr "vedi protocol.version in 'git help config' per maggiori dettagli" -#: transport.c:260 +#: transport.c:267 msgid "server options require protocol version 2 or later" msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo" -#: transport.c:625 +#: transport.c:632 msgid "could not parse transport.color.* config" msgstr "impossibile analizzare la configurazione transport.color.*" -#: transport.c:698 +#: transport.c:705 msgid "support for protocol v2 not implemented yet" msgstr "supporto alla versione 2 del protocollo non ancora implementato" -#: transport.c:825 +#: transport.c:831 #, c-format msgid "unknown value for config '%s': %s" msgstr "valore sconosciuto per la configurazione '%s': %s" -#: transport.c:891 +#: transport.c:897 #, c-format msgid "transport '%s' not allowed" msgstr "trasporto '%s' non consentito" -#: transport.c:945 +#: transport.c:949 msgid "git-over-rsync is no longer supported" msgstr "git-over-rsync non è più supportato" -#: transport.c:1040 +#: transport.c:1044 #, c-format msgid "" "The following submodule paths contain changes that can\n" @@ -7487,7 +8391,7 @@ msgstr "" "I seguenti percorsi sottomodulo contengono modifiche\n" "non trovate su nessun remoto:\n" -#: transport.c:1044 +#: transport.c:1048 #, c-format msgid "" "\n" @@ -7514,32 +8418,32 @@ msgstr "" "per eseguirne il push a un remoto.\n" "\n" -#: transport.c:1052 +#: transport.c:1056 msgid "Aborting." msgstr "Interrompo l'operazione." -#: transport.c:1193 +#: transport.c:1201 msgid "failed to push all needed submodules" msgstr "push di tutti i sottomoduli richiesti non riuscito" -#: transport.c:1340 transport-helper.c:645 +#: transport.c:1345 transport-helper.c:657 msgid "operation not supported by protocol" msgstr "operazione non supportata dal protocollo" -#: transport-helper.c:51 transport-helper.c:80 +#: transport-helper.c:61 transport-helper.c:90 msgid "full write to remote helper failed" msgstr "scrittura completa verso l'helper remoto non riuscita" -#: transport-helper.c:134 +#: transport-helper.c:144 #, c-format msgid "unable to find remote helper for '%s'" msgstr "impossibile trovare l'helper remoto per '%s'" -#: transport-helper.c:150 transport-helper.c:559 +#: transport-helper.c:160 transport-helper.c:571 msgid "can't dup helper output fd" msgstr "impossibile duplicare il descrittore file dell'output helper" -#: transport-helper.c:201 +#: transport-helper.c:211 #, c-format msgid "" "unknown mandatory capability %s; this remote helper probably needs newer " @@ -7548,103 +8452,108 @@ msgstr "" "capability necessaria %s sconosciuta; quest'helper remoto probabilmente " "richiede una versione di Git più recente" -#: transport-helper.c:207 +#: transport-helper.c:217 msgid "this remote helper should implement refspec capability" msgstr "questo helper remoto dovrebbe implementare la capability refspec" -#: transport-helper.c:274 transport-helper.c:414 +#: transport-helper.c:284 transport-helper.c:425 #, c-format msgid "%s unexpectedly said: '%s'" msgstr "%s ha inviato un messaggio inatteso: '%s'" -#: transport-helper.c:403 +#: transport-helper.c:414 #, c-format msgid "%s also locked %s" msgstr "%s ha bloccato anche %s" -#: transport-helper.c:481 +#: transport-helper.c:493 msgid "couldn't run fast-import" msgstr "impossibile eseguire fast-import" -#: transport-helper.c:504 +#: transport-helper.c:516 msgid "error while running fast-import" msgstr "errore durante l'esecuzione di fast-import" -#: transport-helper.c:533 transport-helper.c:1105 +#: transport-helper.c:545 transport-helper.c:1134 #, c-format msgid "could not read ref %s" msgstr "impossibile leggere il riferimento %s" -#: transport-helper.c:578 +#: transport-helper.c:590 #, c-format msgid "unknown response to connect: %s" msgstr "risposta inattesa a connect: %s" -#: transport-helper.c:600 +#: transport-helper.c:612 msgid "setting remote service path not supported by protocol" msgstr "" "l'impostazione del percorso del servizio remoto non è supportata dal " "protocollo" -#: transport-helper.c:602 +#: transport-helper.c:614 msgid "invalid remote service path" msgstr "percorso servizio remoto non valido" -#: transport-helper.c:648 +#: transport-helper.c:660 #, c-format msgid "can't connect to subservice %s" msgstr "impossibile connettersi al sottoservizio %s" -#: transport-helper.c:720 +#: transport-helper.c:736 #, c-format msgid "expected ok/error, helper said '%s'" msgstr "attesi ok/error, l'helper ha inviato '%s'" -#: transport-helper.c:773 +#: transport-helper.c:789 #, c-format msgid "helper reported unexpected status of %s" msgstr "l'helper ha segnalato uno stato inatteso di %s" -#: transport-helper.c:834 +#: transport-helper.c:850 #, c-format msgid "helper %s does not support dry-run" msgstr "l'helper %s non supporta dry-run" -#: transport-helper.c:837 +#: transport-helper.c:853 #, c-format msgid "helper %s does not support --signed" msgstr "l'helper %s non supporta --signed" -#: transport-helper.c:840 +#: transport-helper.c:856 #, c-format msgid "helper %s does not support --signed=if-asked" msgstr "l'helper %s non supporta --signed=if-asked" -#: transport-helper.c:847 +#: transport-helper.c:861 +#, c-format +msgid "helper %s does not support --atomic" +msgstr "l'helper %s non supporta --atomic" + +#: transport-helper.c:867 #, c-format msgid "helper %s does not support 'push-option'" msgstr "l'helper %s non supporta 'push-option'" -#: transport-helper.c:945 +#: transport-helper.c:965 msgid "remote-helper doesn't support push; refspec needed" msgstr "" "l'helper remoto non supporta il push; è necessario uno specificatore " "riferimento" -#: transport-helper.c:950 +#: transport-helper.c:970 #, c-format msgid "helper %s does not support 'force'" msgstr "l'helper %s non supporta 'force'" -#: transport-helper.c:997 +#: transport-helper.c:1017 msgid "couldn't run fast-export" msgstr "impossibile eseguire fast-export" -#: transport-helper.c:1002 +#: transport-helper.c:1022 msgid "error while running fast-export" msgstr "errore durante l'esecuzione di fast-export" -#: transport-helper.c:1027 +#: transport-helper.c:1047 #, c-format msgid "" "No refs in common and none specified; doing nothing.\n" @@ -7653,67 +8562,67 @@ msgstr "" "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n" "Forse dovresti specificare un branch come 'master'.\n" -#: transport-helper.c:1091 +#: transport-helper.c:1120 #, c-format msgid "malformed response in ref list: %s" msgstr "risposta malformata nell'elenco riferimenti: %s" -#: transport-helper.c:1244 +#: transport-helper.c:1272 #, c-format msgid "read(%s) failed" msgstr "read(%s) non riuscita" -#: transport-helper.c:1271 +#: transport-helper.c:1299 #, c-format msgid "write(%s) failed" msgstr "write(%s) non riuscita" -#: transport-helper.c:1320 +#: transport-helper.c:1348 #, c-format msgid "%s thread failed" msgstr "thread %s non riuscito" -#: transport-helper.c:1324 +#: transport-helper.c:1352 #, c-format msgid "%s thread failed to join: %s" msgstr "join non riuscita per il thread %s: %s" -#: transport-helper.c:1343 transport-helper.c:1347 +#: transport-helper.c:1371 transport-helper.c:1375 #, c-format msgid "can't start thread for copying data: %s" msgstr "impossibile avviare il thread per la copia dei dati: %s" -#: transport-helper.c:1384 +#: transport-helper.c:1412 #, c-format msgid "%s process failed to wait" msgstr "wait non riuscita per il processo %s" -#: transport-helper.c:1388 +#: transport-helper.c:1416 #, c-format msgid "%s process failed" msgstr "processo %s non riuscito" -#: transport-helper.c:1406 transport-helper.c:1415 +#: transport-helper.c:1434 transport-helper.c:1443 msgid "can't start thread for copying data" msgstr "impossibile avviare il thread per la copia dei dati" -#: tree-walk.c:33 +#: tree-walk.c:32 msgid "too-short tree object" msgstr "oggetto albero troppo corto" -#: tree-walk.c:39 +#: tree-walk.c:38 msgid "malformed mode in tree entry" msgstr "modo malformato nella voce dell'albero" -#: tree-walk.c:43 +#: tree-walk.c:42 msgid "empty filename in tree entry" msgstr "nome file vuoto nella voce dell'albero" -#: tree-walk.c:118 +#: tree-walk.c:117 msgid "too-short tree file" msgstr "file alber troppo corto" -#: unpack-trees.c:111 +#: unpack-trees.c:110 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7723,7 +8632,7 @@ msgstr "" "checkout:\n" "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch." -#: unpack-trees.c:113 +#: unpack-trees.c:112 #, c-format msgid "" "Your local changes to the following files would be overwritten by checkout:\n" @@ -7733,7 +8642,7 @@ msgstr "" "checkout:\n" "%%s" -#: unpack-trees.c:116 +#: unpack-trees.c:115 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7743,7 +8652,7 @@ msgstr "" "merge:\n" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge." -#: unpack-trees.c:118 +#: unpack-trees.c:117 #, c-format msgid "" "Your local changes to the following files would be overwritten by merge:\n" @@ -7753,7 +8662,7 @@ msgstr "" "merge:\n" "%%s" -#: unpack-trees.c:121 +#: unpack-trees.c:120 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7764,7 +8673,7 @@ msgstr "" "%%sEsegui il commit o lo stash delle modifiche prima di eseguire " "l'operazione di %s." -#: unpack-trees.c:123 +#: unpack-trees.c:122 #, c-format msgid "" "Your local changes to the following files would be overwritten by %s:\n" @@ -7774,7 +8683,7 @@ msgstr "" "l'operazione di %s:\n" "%%s" -#: unpack-trees.c:128 +#: unpack-trees.c:127 #, c-format msgid "" "Updating the following directories would lose untracked files in them:\n" @@ -7784,7 +8693,7 @@ msgstr "" "tracciati in esse contenuti vengano persi:\n" "%s" -#: unpack-trees.c:132 +#: unpack-trees.c:131 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7794,7 +8703,7 @@ msgstr "" "eliminati con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:134 +#: unpack-trees.c:133 #, c-format msgid "" "The following untracked working tree files would be removed by checkout:\n" @@ -7804,7 +8713,7 @@ msgstr "" "eliminati con il checkout:\n" "%%s" -#: unpack-trees.c:137 +#: unpack-trees.c:136 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7814,7 +8723,7 @@ msgstr "" "eliminati dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:139 +#: unpack-trees.c:138 #, c-format msgid "" "The following untracked working tree files would be removed by merge:\n" @@ -7824,7 +8733,7 @@ msgstr "" "eliminati dal merge:\n" "%%s" -#: unpack-trees.c:142 +#: unpack-trees.c:141 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7834,7 +8743,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:144 +#: unpack-trees.c:143 #, c-format msgid "" "The following untracked working tree files would be removed by %s:\n" @@ -7844,7 +8753,7 @@ msgstr "" "eliminati con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:150 +#: unpack-trees.c:149 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7855,7 +8764,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%sSpostali o eliminali prima di cambiare branch." -#: unpack-trees.c:152 +#: unpack-trees.c:151 #, c-format msgid "" "The following untracked working tree files would be overwritten by " @@ -7866,7 +8775,7 @@ msgstr "" "sovrascritti con il checkout:\n" "%%s" -#: unpack-trees.c:155 +#: unpack-trees.c:154 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7876,7 +8785,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%sSpostali o eliminali prima di eseguire il merge." -#: unpack-trees.c:157 +#: unpack-trees.c:156 #, c-format msgid "" "The following untracked working tree files would be overwritten by merge:\n" @@ -7886,7 +8795,7 @@ msgstr "" "sovrascritti dal merge:\n" "%%s" -#: unpack-trees.c:160 +#: unpack-trees.c:159 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7896,7 +8805,7 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%sSpostali o eliminali prima di eseguire l'operazione di %s." -#: unpack-trees.c:162 +#: unpack-trees.c:161 #, c-format msgid "" "The following untracked working tree files would be overwritten by %s:\n" @@ -7906,13 +8815,13 @@ msgstr "" "sovrascritti con l'operazione di %s:\n" "%%s" -#: unpack-trees.c:170 +#: unpack-trees.c:169 #, c-format msgid "Entry '%s' overlaps with '%s'. Cannot bind." msgstr "" "La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento." -#: unpack-trees.c:173 +#: unpack-trees.c:172 #, c-format msgid "" "Cannot update sparse checkout: the following entries are not up to date:\n" @@ -7922,7 +8831,7 @@ msgstr "" "aggiornate:\n" "%s" -#: unpack-trees.c:175 +#: unpack-trees.c:174 #, c-format msgid "" "The following working tree files would be overwritten by sparse checkout " @@ -7933,7 +8842,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:177 +#: unpack-trees.c:176 #, c-format msgid "" "The following working tree files would be removed by sparse checkout " @@ -7944,7 +8853,7 @@ msgstr "" "l'aggiornamento del checkout sparse:\n" "%s" -#: unpack-trees.c:179 +#: unpack-trees.c:178 #, c-format msgid "" "Cannot update submodule:\n" @@ -7953,16 +8862,16 @@ msgstr "" "Impossibile aggiornare il sottomodulo:\n" "%s" -#: unpack-trees.c:256 +#: unpack-trees.c:255 #, c-format msgid "Aborting\n" msgstr "Interrompo l'operazione\n" -#: unpack-trees.c:318 +#: unpack-trees.c:317 msgid "Updating files" msgstr "Aggiornamento dei file in corso" -#: unpack-trees.c:350 +#: unpack-trees.c:349 msgid "" "the following paths have collided (e.g. case-sensitive paths\n" "on a case-insensitive filesystem) and only one from the same\n" @@ -7973,6 +8882,10 @@ msgstr "" "su un filesystem non sensibile a tale differenza) e solo uno\n" "per gruppo in conflitto è nell'albero di lavoro:\n" +#: unpack-trees.c:1445 +msgid "Updating index flags" +msgstr "Aggiornamento dei contrassegni indice in corso" + #: urlmatch.c:163 msgid "invalid URL scheme name or missing '://' suffix" msgstr "nome schema URL non valido o suffisso '://' mancante" @@ -8002,50 +8915,54 @@ msgstr "numero di porta non valido" msgid "invalid '..' path segment" msgstr "parte percorso '..' non valida" -#: worktree.c:258 builtin/am.c:2095 +#: walker.c:170 +msgid "Fetching objects" +msgstr "Recupero oggetti in corso" + +#: worktree.c:259 builtin/am.c:2099 #, c-format msgid "failed to read '%s'" msgstr "lettura di '%s' non riuscita" -#: worktree.c:304 +#: worktree.c:305 #, c-format msgid "'%s' at main working tree is not the repository directory" msgstr "" "'%s' nell'albero di lavoro principale non è la directory del repository" -#: worktree.c:315 +#: worktree.c:316 #, c-format msgid "'%s' file does not contain absolute path to the working tree location" msgstr "" "il file '%s' non contiene il percorso assoluto alla posizione dell'albero di " "lavoro" -#: worktree.c:327 +#: worktree.c:328 #, c-format msgid "'%s' does not exist" msgstr "'%s' non esiste" -#: worktree.c:333 +#: worktree.c:334 #, c-format msgid "'%s' is not a .git file, error code %d" msgstr "'%s' non è un file .git, codice d'errore %d" -#: worktree.c:341 +#: worktree.c:342 #, c-format msgid "'%s' does not point back to '%s'" msgstr "'%s' non punta a '%s'" -#: wrapper.c:223 wrapper.c:393 +#: wrapper.c:186 wrapper.c:356 #, c-format msgid "could not open '%s' for reading and writing" msgstr "impossibile aprire '%s' in lettura e scrittura" -#: wrapper.c:424 wrapper.c:624 +#: wrapper.c:387 wrapper.c:588 #, c-format msgid "unable to access '%s'" msgstr "impossibile accedere a '%s'" -#: wrapper.c:632 +#: wrapper.c:596 msgid "unable to get current working directory" msgstr "impossibile ottenere la directory di lavoro corrente" @@ -8402,82 +9319,90 @@ msgstr "" "\")" #: wt-status.c:1437 +msgid " (use \"git cherry-pick --skip\" to skip this patch)" +msgstr " (usa \"git cherry-pick --skip\" per saltare questa patch)" + +#: wt-status.c:1439 msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)" msgstr "" " (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)" -#: wt-status.c:1447 +#: wt-status.c:1449 msgid "Revert currently in progress." msgstr "Revert in corso." -#: wt-status.c:1450 +#: wt-status.c:1452 #, c-format msgid "You are currently reverting commit %s." msgstr "Attualmente stai eseguendo il revert del commit %s." -#: wt-status.c:1456 +#: wt-status.c:1458 msgid " (fix conflicts and run \"git revert --continue\")" msgstr " (risolvi i conflitti ed esegui \"git revert --continue\")" -#: wt-status.c:1459 +#: wt-status.c:1461 msgid " (run \"git revert --continue\" to continue)" msgstr " (esegui \"git revert --continue\" per continuare)" -#: wt-status.c:1462 +#: wt-status.c:1464 msgid " (all conflicts fixed: run \"git revert --continue\")" msgstr "" " (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")" -#: wt-status.c:1464 +#: wt-status.c:1466 +msgid " (use \"git revert --skip\" to skip this patch)" +msgstr " (usa \"git revert --skip\" per saltare questa patch)" + +#: wt-status.c:1468 msgid " (use \"git revert --abort\" to cancel the revert operation)" msgstr " (usa \"git revert --abort\" per annullare l'operazione di revert)" -#: wt-status.c:1474 +#: wt-status.c:1478 #, c-format msgid "You are currently bisecting, started from branch '%s'." msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'." -#: wt-status.c:1478 +#: wt-status.c:1482 msgid "You are currently bisecting." msgstr "Attualmente stai eseguendo una bisezione." -#: wt-status.c:1481 +#: wt-status.c:1485 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (usa \"git bisect reset\" per tornare al branch originario)" -#: wt-status.c:1690 +#: wt-status.c:1694 msgid "On branch " msgstr "Sul branch " -#: wt-status.c:1697 +#: wt-status.c:1701 msgid "interactive rebase in progress; onto " msgstr "rebase interattivo in corso su " -#: wt-status.c:1699 +#: wt-status.c:1703 msgid "rebase in progress; onto " msgstr "rebase in corso su " -#: wt-status.c:1709 +#: wt-status.c:1713 msgid "Not currently on any branch." msgstr "Attualmente non sei su alcun branch." -#: wt-status.c:1726 +#: wt-status.c:1730 msgid "Initial commit" msgstr "Commit iniziale" -#: wt-status.c:1727 +#: wt-status.c:1731 msgid "No commits yet" msgstr "Non ci sono ancora commit" -#: wt-status.c:1741 +#: wt-status.c:1745 msgid "Untracked files" msgstr "File non tracciati" -#: wt-status.c:1743 +#: wt-status.c:1747 msgid "Ignored files" msgstr "File ignorati" -#: wt-status.c:1747 +#: wt-status.c:1751 #, c-format msgid "" "It took %.2f seconds to enumerate untracked files. 'status -uno'\n" @@ -8489,31 +9414,31 @@ msgstr "" "ma devi stare attento a non dimenticarti di aggiungere\n" "autonomamente i file nuovi (vedi 'git help status')." -#: wt-status.c:1753 +#: wt-status.c:1757 #, c-format msgid "Untracked files not listed%s" msgstr "File non tracciati non elencati%s" -#: wt-status.c:1755 +#: wt-status.c:1759 msgid " (use -u option to show untracked files)" msgstr " (usa l'opzione -u per visualizzare i file non tracciati)" -#: wt-status.c:1761 +#: wt-status.c:1765 msgid "No changes" msgstr "Nessuna modifica" -#: wt-status.c:1766 +#: wt-status.c:1770 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n" -#: wt-status.c:1769 +#: wt-status.c:1773 #, c-format msgid "no changes added to commit\n" msgstr "nessuna modifica aggiunta al commit\n" -#: wt-status.c:1772 +#: wt-status.c:1776 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -8522,197 +9447,206 @@ msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati " "(usa \"git add\" per tracciarli)\n" -#: wt-status.c:1775 +#: wt-status.c:1779 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n" -#: wt-status.c:1778 +#: wt-status.c:1782 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" "non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add" "\" per tracciarli)\n" -#: wt-status.c:1781 wt-status.c:1786 +#: wt-status.c:1785 wt-status.c:1790 #, c-format msgid "nothing to commit\n" msgstr "non c'è nulla di cui eseguire il commit\n" -#: wt-status.c:1784 +#: wt-status.c:1788 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non " "tracciati)\n" -#: wt-status.c:1788 +#: wt-status.c:1792 #, c-format msgid "nothing to commit, working tree clean\n" msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n" -#: wt-status.c:1901 +#: wt-status.c:1905 msgid "No commits yet on " msgstr "Non ci sono ancora commit su" -#: wt-status.c:1905 +#: wt-status.c:1909 msgid "HEAD (no branch)" msgstr "HEAD (nessun branch)" -#: wt-status.c:1936 +#: wt-status.c:1940 msgid "different" msgstr "differente" -#: wt-status.c:1938 wt-status.c:1946 +#: wt-status.c:1942 wt-status.c:1950 msgid "behind " msgstr "indietro " -#: wt-status.c:1941 wt-status.c:1944 +#: wt-status.c:1945 wt-status.c:1948 msgid "ahead " msgstr "avanti " #. TRANSLATORS: the action is e.g. "pull with rebase" -#: wt-status.c:2466 +#: wt-status.c:2470 #, c-format msgid "cannot %s: You have unstaged changes." msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging." -#: wt-status.c:2472 +#: wt-status.c:2476 msgid "additionally, your index contains uncommitted changes." msgstr "" "inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit." -#: wt-status.c:2474 +#: wt-status.c:2478 #, c-format msgid "cannot %s: Your index contains uncommitted changes." msgstr "" "impossibile eseguire %s: l'indice contiene modifiche di cui non è stato " "eseguito il commit." -#: builtin/add.c:25 +#: compat/precompose_utf8.c:58 builtin/clone.c:455 +#, c-format +msgid "failed to unlink '%s'" +msgstr "unlink di '%s' non riuscito" + +#: builtin/add.c:26 msgid "git add [<options>] [--] <pathspec>..." msgstr "git add [<opzioni>] [--] <specificatore percorso>..." -#: builtin/add.c:84 +#: builtin/add.c:88 #, c-format msgid "unexpected diff status %c" msgstr "stato diff inatteso %c" -#: builtin/add.c:89 builtin/commit.c:288 +#: builtin/add.c:93 builtin/commit.c:288 msgid "updating files failed" msgstr "aggiornamento dei file non riuscito" -#: builtin/add.c:99 +#: builtin/add.c:103 #, c-format msgid "remove '%s'\n" msgstr "elimina '%s'\n" -#: builtin/add.c:174 +#: builtin/add.c:178 msgid "Unstaged changes after refreshing the index:" msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:" -#: builtin/add.c:234 builtin/rev-parse.c:896 +#: builtin/add.c:266 builtin/rev-parse.c:899 msgid "Could not read the index" msgstr "Impossibile leggere l'indice" -#: builtin/add.c:245 +#: builtin/add.c:277 #, c-format msgid "Could not open '%s' for writing." msgstr "Impossibile aprire '%s' in scrittura." -#: builtin/add.c:249 +#: builtin/add.c:281 msgid "Could not write patch" msgstr "Impossibile scrivere la patch" -#: builtin/add.c:252 +#: builtin/add.c:284 msgid "editing patch failed" msgstr "modifica della patch non riuscita" -#: builtin/add.c:255 +#: builtin/add.c:287 #, c-format msgid "Could not stat '%s'" msgstr "Impossibile eseguire lo stat di '%s'" -#: builtin/add.c:257 +#: builtin/add.c:289 msgid "Empty patch. Aborted." msgstr "Patch vuota. Operazione interrotta." -#: builtin/add.c:262 +#: builtin/add.c:294 #, c-format msgid "Could not apply '%s'" msgstr "Impossibile applicare '%s'" -#: builtin/add.c:270 +#: builtin/add.c:302 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n" -#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124 -#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560 -#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165 +#: builtin/add.c:322 builtin/clean.c:910 builtin/fetch.c:163 builtin/mv.c:124 +#: builtin/prune-packed.c:56 builtin/pull.c:203 builtin/push.c:548 +#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165 msgid "dry run" msgstr "test controllato" -#: builtin/add.c:293 +#: builtin/add.c:325 msgid "interactive picking" msgstr "scelta interattiva" -#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306 +#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307 msgid "select hunks interactively" msgstr "seleziona gli hunk in modalità interattiva" -#: builtin/add.c:295 +#: builtin/add.c:327 msgid "edit current diff and apply" msgstr "modifica il diff corrente e applicalo" -#: builtin/add.c:296 +#: builtin/add.c:328 msgid "allow adding otherwise ignored files" msgstr "consenti l'aggiunta di file altrimenti ignorati" -#: builtin/add.c:297 +#: builtin/add.c:329 msgid "update tracked files" msgstr "aggiorna i file tracciati" -#: builtin/add.c:298 +#: builtin/add.c:330 msgid "renormalize EOL of tracked files (implies -u)" msgstr "rinormalizza i fine riga dei file tracciati (implica -u)" -#: builtin/add.c:299 +#: builtin/add.c:331 msgid "record only the fact that the path will be added later" msgstr "salva solo il fatto che il percorso sarà aggiunto successivamente" -#: builtin/add.c:300 +#: builtin/add.c:332 msgid "add changes from all tracked and untracked files" msgstr "aggiungi le modifiche da tutti i file tracciati e non" -#: builtin/add.c:303 +#: builtin/add.c:335 msgid "ignore paths removed in the working tree (same as --no-all)" msgstr "ignora i percorsi eliminati nell'albero di lavoro (come --no-all)" -#: builtin/add.c:305 +#: builtin/add.c:337 msgid "don't add, only refresh the index" msgstr "non eseguire l'aggiunta, aggiorna solo l'indice" -#: builtin/add.c:306 +#: builtin/add.c:338 msgid "just skip files which cannot be added because of errors" msgstr "" "salta semplicemente i file che non possono essere aggiunti a causa di errori" -#: builtin/add.c:307 +#: builtin/add.c:339 msgid "check if - even missing - files are ignored in dry run" msgstr "" "controlla se i file - anche quelli mancanti - sono ignorati durante il test " "controllato" -#: builtin/add.c:309 builtin/update-index.c:1001 +#: builtin/add.c:341 builtin/update-index.c:1004 msgid "override the executable bit of the listed files" msgstr "esegui l'override del bit eseguibile dei file elencati" -#: builtin/add.c:311 +#: builtin/add.c:343 msgid "warn when adding an embedded repository" msgstr "emetti un avviso quando si aggiunge un repository incorporato" -#: builtin/add.c:326 +#: builtin/add.c:345 +msgid "backend for `git stash -p`" +msgstr "backend per `git stash -p`" + +#: builtin/add.c:363 #, c-format msgid "" "You've added another git repository inside your current repository.\n" @@ -8743,152 +9677,178 @@ msgstr "" "\n" "Vedi \"git help submodule\" per ulteriori informazioni." -#: builtin/add.c:354 +#: builtin/add.c:391 #, c-format msgid "adding embedded git repository: %s" msgstr "aggiunta repository Git incorporato in corso: %s" -#: builtin/add.c:372 -#, c-format -msgid "Use -f if you really want to add them.\n" -msgstr "Usa -f se vuoi davvero aggiungerli.\n" +#: builtin/add.c:410 +msgid "" +"Use -f if you really want to add them.\n" +"Turn this message off by running\n" +"\"git config advice.addIgnoredFile false\"" +msgstr "" +"Usa -f se vuoi veramente aggiungerli.\n" +"Per disabilitare questo messaggio, esegui\n" +"\"git config advice.addIgnoredFile false\"" -#: builtin/add.c:379 +#: builtin/add.c:419 msgid "adding files failed" msgstr "aggiunta dei file non riuscita" -#: builtin/add.c:419 +#: builtin/add.c:447 builtin/commit.c:348 +msgid "--pathspec-from-file is incompatible with --interactive/--patch" +msgstr "--pathspec-from-file non è compatibile con --interactive/--patch" + +#: builtin/add.c:464 +msgid "--pathspec-from-file is incompatible with --edit" +msgstr "--pathspec-from-file non è compatibile con --edit" + +#: builtin/add.c:476 msgid "-A and -u are mutually incompatible" msgstr "-A e -u non sono compatibili fra loro" -#: builtin/add.c:426 +#: builtin/add.c:479 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run" -#: builtin/add.c:430 +#: builtin/add.c:483 #, c-format msgid "--chmod param '%s' must be either -x or +x" msgstr "Il parametro --chmod '%s' deve essere -x o +x" -#: builtin/add.c:445 +#: builtin/add.c:501 builtin/checkout.c:1675 builtin/commit.c:354 +#: builtin/reset.c:327 builtin/rm.c:272 builtin/stash.c:1509 +msgid "--pathspec-from-file is incompatible with pathspec arguments" +msgstr "" +"--pathspec-from-file non è compatibile con gli argomenti specificatore " +"percorso" + +#: builtin/add.c:508 builtin/checkout.c:1687 builtin/commit.c:360 +#: builtin/reset.c:333 builtin/rm.c:278 builtin/stash.c:1515 +msgid "--pathspec-file-nul requires --pathspec-from-file" +msgstr "--pathspec-file-nul richiede --pathspec-from-file" + +#: builtin/add.c:512 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n" -#: builtin/add.c:446 -#, c-format -msgid "Maybe you wanted to say 'git add .'?\n" -msgstr "Forse intendevi dire 'git add .'?\n" +#: builtin/add.c:514 +msgid "" +"Maybe you wanted to say 'git add .'?\n" +"Turn this message off by running\n" +"\"git config advice.addEmptyPathspec false\"" +msgstr "" +"Forse volevi dire 'git add .'?\n" +"Per disabilitare questo messaggio, esegui\n" +"\"git config advice.addEmptyPathspec false\"" -#: builtin/am.c:348 +#: builtin/am.c:352 msgid "could not parse author script" msgstr "impossibile analizzare lo script author" -#: builtin/am.c:432 +#: builtin/am.c:436 #, c-format msgid "'%s' was deleted by the applypatch-msg hook" msgstr "'%s' è stato eliminato dall'hook applypatch-msg" -#: builtin/am.c:474 +#: builtin/am.c:478 #, c-format msgid "Malformed input line: '%s'." msgstr "Riga di input malformata: '%s'." -#: builtin/am.c:512 +#: builtin/am.c:516 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Copia delle note da '%s' a '%s' non riuscita" -#: builtin/am.c:538 +#: builtin/am.c:542 msgid "fseek failed" msgstr "fseek non riuscita" -#: builtin/am.c:726 +#: builtin/am.c:730 #, c-format msgid "could not parse patch '%s'" msgstr "impossibile analizzare la patch '%s'" -#: builtin/am.c:791 +#: builtin/am.c:795 msgid "Only one StGIT patch series can be applied at once" msgstr "Può essere applicata solo una serie di patch StGIT per volta" -#: builtin/am.c:839 +#: builtin/am.c:843 msgid "invalid timestamp" msgstr "timestamp non valido" -#: builtin/am.c:844 builtin/am.c:856 +#: builtin/am.c:848 builtin/am.c:860 msgid "invalid Date line" msgstr "riga Date non valida" -#: builtin/am.c:851 +#: builtin/am.c:855 msgid "invalid timezone offset" msgstr "offset fuso orario non valido" -#: builtin/am.c:944 +#: builtin/am.c:948 msgid "Patch format detection failed." msgstr "Rilevamento del formato della patch non riuscito." -#: builtin/am.c:949 builtin/clone.c:407 +#: builtin/am.c:953 builtin/clone.c:409 #, c-format msgid "failed to create directory '%s'" msgstr "creazione della directory '%s' non riuscita" -#: builtin/am.c:954 +#: builtin/am.c:958 msgid "Failed to split patches." msgstr "Divisione delle patch non riuscita." -#: builtin/am.c:1084 builtin/commit.c:374 -msgid "unable to write index file" -msgstr "impossibile scrivere il file indice" - -#: builtin/am.c:1098 +#: builtin/am.c:1089 #, c-format msgid "When you have resolved this problem, run \"%s --continue\"." msgstr "Una volta risolto questo problema, esegui \"%s --continue\"." -#: builtin/am.c:1099 +#: builtin/am.c:1090 #, c-format msgid "If you prefer to skip this patch, run \"%s --skip\" instead." msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"." -#: builtin/am.c:1100 +#: builtin/am.c:1091 #, c-format msgid "To restore the original branch and stop patching, run \"%s --abort\"." msgstr "" "Per ripristinare il branch originario e terminare il patching, esegui \"%s --" "abort\"." -#: builtin/am.c:1183 +#: builtin/am.c:1174 msgid "Patch sent with format=flowed; space at the end of lines might be lost." msgstr "" "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero " "essere andati perduti." -#: builtin/am.c:1211 +#: builtin/am.c:1202 msgid "Patch is empty." msgstr "La patch è vuota." -#: builtin/am.c:1277 +#: builtin/am.c:1267 #, c-format -msgid "invalid ident line: %.*s" -msgstr "riga ident non valida: %.*s" +msgid "missing author line in commit %s" +msgstr "riga autore mancante nel commit %s" -#: builtin/am.c:1299 +#: builtin/am.c:1270 #, c-format -msgid "unable to parse commit %s" -msgstr "impossibile analizzare il commit %s" +msgid "invalid ident line: %.*s" +msgstr "riga ident non valida: %.*s" -#: builtin/am.c:1496 +#: builtin/am.c:1489 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie." -#: builtin/am.c:1498 +#: builtin/am.c:1491 msgid "Using index info to reconstruct a base tree..." msgstr "" "Utilizzo le informazioni dell'indice per ricostruire un albero di base..." -#: builtin/am.c:1517 +#: builtin/am.c:1510 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -8896,24 +9856,24 @@ msgstr "" "Hai modificato manualmente la patch?\n" "Non può essere applicata ai blob registrati nel suo indice." -#: builtin/am.c:1523 +#: builtin/am.c:1516 msgid "Falling back to patching base and 3-way merge..." msgstr "Ripiego sul patching della base e sul merge a tre vie..." -#: builtin/am.c:1549 +#: builtin/am.c:1542 msgid "Failed to merge in the changes." msgstr "Merge delle modifiche non riuscito." -#: builtin/am.c:1581 +#: builtin/am.c:1574 msgid "applying to an empty history" msgstr "applicazione a una cronologia vuota" -#: builtin/am.c:1628 builtin/am.c:1632 +#: builtin/am.c:1621 builtin/am.c:1625 #, c-format msgid "cannot resume: %s does not exist." msgstr "impossibile riprendere l'attività: %s non esiste." -#: builtin/am.c:1650 +#: builtin/am.c:1643 msgid "Commit Body is:" msgstr "Il corpo del commit è:" @@ -8921,37 +9881,41 @@ msgstr "Il corpo del commit è:" #. in your translation. The program will only accept English #. input at this point. #. -#: builtin/am.c:1660 +#: builtin/am.c:1653 #, c-format msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: " msgstr "" "Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:" -#: builtin/am.c:1710 +#: builtin/am.c:1700 builtin/commit.c:398 +msgid "unable to write index file" +msgstr "impossibile scrivere il file indice" + +#: builtin/am.c:1704 #, c-format msgid "Dirty index: cannot apply patches (dirty: %s)" msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)" -#: builtin/am.c:1750 builtin/am.c:1818 +#: builtin/am.c:1744 builtin/am.c:1812 #, c-format msgid "Applying: %.*s" msgstr "Applicazione in corso: %.*s" -#: builtin/am.c:1767 +#: builtin/am.c:1761 msgid "No changes -- Patch already applied." msgstr "Nessuna modifica -- patch già applicata." -#: builtin/am.c:1773 +#: builtin/am.c:1767 #, c-format msgid "Patch failed at %s %.*s" msgstr "Patch non riuscita a %s %.*s" -#: builtin/am.c:1777 -msgid "Use 'git am --show-current-patch' to see the failed patch" +#: builtin/am.c:1771 +msgid "Use 'git am --show-current-patch=diff' to see the failed patch" msgstr "" -"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita" +"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita" -#: builtin/am.c:1821 +#: builtin/am.c:1815 msgid "" "No changes - did you forget to use 'git add'?\n" "If there is nothing left to stage, chances are that something else\n" @@ -8961,7 +9925,7 @@ msgstr "" "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n" "ha già introdotto le stesse modifiche; potresti voler saltare questa patch." -#: builtin/am.c:1828 +#: builtin/am.c:1822 msgid "" "You still have unmerged paths in your index.\n" "You should 'git add' each file with resolved conflicts to mark them as " @@ -8974,17 +9938,17 @@ msgstr "" "Potresti eseguire `git rm` su un file per accettarne la risoluzione " "\"eliminato da loro\"." -#: builtin/am.c:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329 -#: builtin/reset.c:337 +#: builtin/am.c:1929 builtin/am.c:1933 builtin/am.c:1945 builtin/reset.c:346 +#: builtin/reset.c:354 #, c-format msgid "Could not parse object '%s'." msgstr "Impossibile analizzare l'oggetto '%s'." -#: builtin/am.c:1987 +#: builtin/am.c:1981 msgid "failed to clean index" msgstr "pulizia dell'indice non riuscita" -#: builtin/am.c:2031 +#: builtin/am.c:2025 msgid "" "You seem to have moved HEAD since the last 'am' failure.\n" "Not rewinding to ORIG_HEAD" @@ -8993,148 +9957,158 @@ msgstr "" "'am'.\n" "Non ritorno indietro a ORIG_HEAD" -#: builtin/am.c:2128 +#: builtin/am.c:2132 #, c-format msgid "Invalid value for --patch-format: %s" msgstr "Valore non valido per --patch-format: %s" -#: builtin/am.c:2164 +#: builtin/am.c:2172 +#, c-format +msgid "Invalid value for --show-current-patch: %s" +msgstr "Valore non valido per --show-current-patch: %s" + +#: builtin/am.c:2176 +#, c-format +msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s" +msgstr "--show-current-patch=%s non è compatibile con --show-current-patch=%s" + +#: builtin/am.c:2207 msgid "git am [<options>] [(<mbox> | <Maildir>)...]" msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]" -#: builtin/am.c:2165 +#: builtin/am.c:2208 msgid "git am [<options>] (--continue | --skip | --abort)" msgstr "git am [<opzioni>] (--continue | --skip | --abort)" -#: builtin/am.c:2171 +#: builtin/am.c:2214 msgid "run interactively" msgstr "esegui in modalità interattiva" -#: builtin/am.c:2173 +#: builtin/am.c:2216 msgid "historical option -- no-op" msgstr "opzione storica -- non esegue nulla" -#: builtin/am.c:2175 +#: builtin/am.c:2218 msgid "allow fall back on 3way merging if needed" msgstr "consenti il ripiego sul merge a tre vie se necessario" -#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58 -#: builtin/repack.c:296 builtin/stash.c:806 +#: builtin/am.c:2219 builtin/init-db.c:494 builtin/prune-packed.c:58 +#: builtin/repack.c:304 builtin/stash.c:812 msgid "be quiet" msgstr "non visualizzare messaggi" -#: builtin/am.c:2178 +#: builtin/am.c:2221 msgid "add a Signed-off-by line to the commit message" msgstr "aggiungi una riga Signed-off-by al messaggio di commit" -#: builtin/am.c:2181 +#: builtin/am.c:2224 msgid "recode into utf8 (default)" msgstr "converti codifica in UTF-8 (impostazione predefinita)" -#: builtin/am.c:2183 +#: builtin/am.c:2226 msgid "pass -k flag to git-mailinfo" msgstr "fornisci l'argomento -k a git-mailinfo" -#: builtin/am.c:2185 +#: builtin/am.c:2228 msgid "pass -b flag to git-mailinfo" msgstr "fornisci l'argomento -b a git-mailinfo" -#: builtin/am.c:2187 +#: builtin/am.c:2230 msgid "pass -m flag to git-mailinfo" msgstr "fornisci l'argomento -m a git-mailinfo" -#: builtin/am.c:2189 +#: builtin/am.c:2232 msgid "pass --keep-cr flag to git-mailsplit for mbox format" msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox" -#: builtin/am.c:2192 +#: builtin/am.c:2235 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr" msgstr "" "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal " "valore di am.keepcr" -#: builtin/am.c:2195 +#: builtin/am.c:2238 msgid "strip everything before a scissors line" msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\"" -#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206 -#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218 -#: builtin/am.c:2224 +#: builtin/am.c:2240 builtin/am.c:2243 builtin/am.c:2246 builtin/am.c:2249 +#: builtin/am.c:2252 builtin/am.c:2255 builtin/am.c:2258 builtin/am.c:2261 +#: builtin/am.c:2267 msgid "pass it through git-apply" msgstr "passa l'argomento a git-apply" -#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671 -#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249 -#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418 -#: builtin/repack.c:307 builtin/repack.c:311 builtin/repack.c:313 +#: builtin/am.c:2257 builtin/commit.c:1391 builtin/fmt-merge-msg.c:670 +#: builtin/fmt-merge-msg.c:673 builtin/grep.c:871 builtin/merge.c:250 +#: builtin/pull.c:140 builtin/pull.c:199 builtin/rebase.c:1505 +#: builtin/repack.c:315 builtin/repack.c:319 builtin/repack.c:321 #: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403 -#: parse-options.h:141 parse-options.h:162 parse-options.h:312 +#: parse-options.h:154 parse-options.h:175 parse-options.h:316 msgid "n" msgstr "n" -#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38 -#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:38 +#: builtin/am.c:2263 builtin/branch.c:661 builtin/for-each-ref.c:38 +#: builtin/replace.c:556 builtin/tag.c:437 builtin/verify-tag.c:38 msgid "format" msgstr "formato" -#: builtin/am.c:2221 +#: builtin/am.c:2264 msgid "format the patch(es) are in" msgstr "il formato delle patch" -#: builtin/am.c:2227 +#: builtin/am.c:2270 msgid "override error message when patch failure occurs" msgstr "" "esegui l'override del messaggio d'errore quando si verifica un errore legato " "alle patch" -#: builtin/am.c:2229 +#: builtin/am.c:2272 msgid "continue applying patches after resolving a conflict" msgstr "" "continua l'applicazione delle patch dopo la risoluzione di un conflitto" -#: builtin/am.c:2232 +#: builtin/am.c:2275 msgid "synonyms for --continue" msgstr "sinonimi di --continue" -#: builtin/am.c:2235 +#: builtin/am.c:2278 msgid "skip the current patch" msgstr "salta la patch corrente" -#: builtin/am.c:2238 +#: builtin/am.c:2281 msgid "restore the original branch and abort the patching operation." msgstr "ripristina il branch originario e interrompi l'operazione di patching." -#: builtin/am.c:2241 +#: builtin/am.c:2284 msgid "abort the patching operation but keep HEAD where it is." msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è." -#: builtin/am.c:2244 -msgid "show the patch being applied." -msgstr "visualizza la patch in fase di applicazione." +#: builtin/am.c:2288 +msgid "show the patch being applied" +msgstr "visualizza la patch in fase di applicazione" -#: builtin/am.c:2248 +#: builtin/am.c:2293 msgid "lie about committer date" msgstr "menti sulla data del commit" -#: builtin/am.c:2250 +#: builtin/am.c:2295 msgid "use current timestamp for author date" msgstr "usa il timestamp corrente come data autore" -#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511 -#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489 -#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418 +#: builtin/am.c:2297 builtin/commit-tree.c:120 builtin/commit.c:1512 +#: builtin/merge.c:287 builtin/pull.c:174 builtin/rebase.c:517 +#: builtin/rebase.c:1556 builtin/revert.c:117 builtin/tag.c:418 msgid "key-id" msgstr "ID chiave" -#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460 +#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557 msgid "GPG-sign commits" msgstr "firma i commit con GPG" -#: builtin/am.c:2256 +#: builtin/am.c:2301 msgid "(internal use for git-rebase)" msgstr "(a uso interno per git-rebase)" -#: builtin/am.c:2274 +#: builtin/am.c:2319 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." @@ -9142,18 +10116,18 @@ msgstr "" "L'opzione -b/--binary non esegue nulla da molto tempo e\n" "sarà rimossa. Non usarla più." -#: builtin/am.c:2281 +#: builtin/am.c:2326 msgid "failed to read the index" msgstr "lettura dell'indice non riuscita" -#: builtin/am.c:2296 +#: builtin/am.c:2341 #, c-format msgid "previous rebase directory %s still exists but mbox given." msgstr "" "la directory di rebase precedente %s esiste ancora ma è stata specificata " "un'mbox." -#: builtin/am.c:2320 +#: builtin/am.c:2365 #, c-format msgid "" "Stray %s directory found.\n" @@ -9162,11 +10136,11 @@ msgstr "" "Trovata directory smarrita %s.\n" "Usa \"git am --abort\" per eliminarla." -#: builtin/am.c:2326 +#: builtin/am.c:2371 msgid "Resolve operation not in progress, we are not resuming." msgstr "Operazione di risoluzione non in corso, non riprendiamo." -#: builtin/am.c:2336 +#: builtin/am.c:2381 msgid "interactive mode requires patches on the command line" msgstr "" "la modalità interattiva richiede che le patch siano fornite sulla riga di " @@ -9296,7 +10270,7 @@ msgstr "Non stiamo eseguendo un bisect.\n" msgid "'%s' is not a valid commit" msgstr "'%s' non è un commit valido" -#: builtin/bisect--helper.c:174 +#: builtin/bisect--helper.c:172 #, c-format msgid "" "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'." @@ -9304,27 +10278,27 @@ msgstr "" "impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git " "bisect reset <commit>'." -#: builtin/bisect--helper.c:215 +#: builtin/bisect--helper.c:216 #, c-format msgid "Bad bisect_write argument: %s" msgstr "Argomento bisect_write errato: %s" -#: builtin/bisect--helper.c:220 +#: builtin/bisect--helper.c:221 #, c-format msgid "couldn't get the oid of the rev '%s'" msgstr "impossibile recuperare l'OID della revisione '%s'" -#: builtin/bisect--helper.c:232 +#: builtin/bisect--helper.c:233 #, c-format msgid "couldn't open the file '%s'" msgstr "impossibile aprire il file '%s'" -#: builtin/bisect--helper.c:258 +#: builtin/bisect--helper.c:259 #, c-format msgid "Invalid command: you're currently in a %s/%s bisect" msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s" -#: builtin/bisect--helper.c:285 +#: builtin/bisect--helper.c:286 #, c-format msgid "" "You need to give me at least one %s and %s revision.\n" @@ -9333,7 +10307,7 @@ msgstr "" "Devi specificare almeno una revisione %s ed una %s.\n" "Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo." -#: builtin/bisect--helper.c:289 +#: builtin/bisect--helper.c:290 #, c-format msgid "" "You need to start by \"git bisect start\".\n" @@ -9344,7 +10318,7 @@ msgstr "" "Quindi devi specificare almeno una revisione %s ed una %s.\n" "Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo." -#: builtin/bisect--helper.c:321 +#: builtin/bisect--helper.c:310 #, c-format msgid "bisecting only with a %s commit" msgstr "eseguo la bisezione solo con un commit %s" @@ -9353,15 +10327,15 @@ msgstr "eseguo la bisezione solo con un commit %s" #. translation. The program will only accept English input #. at this point. #. -#: builtin/bisect--helper.c:329 +#: builtin/bisect--helper.c:318 msgid "Are you sure [Y/n]? " msgstr "Sei sicuro? [Y/n] " -#: builtin/bisect--helper.c:376 +#: builtin/bisect--helper.c:379 msgid "no terms defined" msgstr "nessun termine definito" -#: builtin/bisect--helper.c:379 +#: builtin/bisect--helper.c:382 #, c-format msgid "" "Your current terms are %s for the old state\n" @@ -9370,7 +10344,7 @@ msgstr "" "I tuoi termini correnti sono %s per lo stato vecchio\n" "e %s per lo stato nuovo.\n" -#: builtin/bisect--helper.c:389 +#: builtin/bisect--helper.c:392 #, c-format msgid "" "invalid argument %s for 'git bisect terms'.\n" @@ -9379,286 +10353,282 @@ msgstr "" "argomento %s non valido per 'git bisect terms'.\n" "Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new." -#: builtin/bisect--helper.c:475 +#: builtin/bisect--helper.c:478 #, c-format msgid "unrecognized option: '%s'" msgstr "opzione non riconosciuta: '%s'" -#: builtin/bisect--helper.c:479 +#: builtin/bisect--helper.c:482 #, c-format msgid "'%s' does not appear to be a valid revision" msgstr "sembra che '%s' non sia una revisione valida" -#: builtin/bisect--helper.c:511 +#: builtin/bisect--helper.c:514 msgid "bad HEAD - I need a HEAD" msgstr "HEAD non valida - ho bisogno di un'HEAD" -#: builtin/bisect--helper.c:526 +#: builtin/bisect--helper.c:529 #, c-format msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'." msgstr "" "checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'." -#: builtin/bisect--helper.c:547 +#: builtin/bisect--helper.c:550 msgid "won't bisect on cg-seek'ed tree" msgstr "non eseguirò la bisezione su un albero sottoposto a cg-seek" -#: builtin/bisect--helper.c:550 +#: builtin/bisect--helper.c:553 msgid "bad HEAD - strange symbolic ref" msgstr "head non valida - riferimento simbolico strano" -#: builtin/bisect--helper.c:574 +#: builtin/bisect--helper.c:577 #, c-format msgid "invalid ref: '%s'" msgstr "riferimento non valido: '%s'" -#: builtin/bisect--helper.c:630 +#: builtin/bisect--helper.c:633 msgid "perform 'git bisect next'" msgstr "esegui 'git bisect next'" -#: builtin/bisect--helper.c:632 +#: builtin/bisect--helper.c:635 msgid "write the terms to .git/BISECT_TERMS" msgstr "scrivi i termini in .git/BISECT_TERMS" -#: builtin/bisect--helper.c:634 +#: builtin/bisect--helper.c:637 msgid "cleanup the bisection state" msgstr "pulisci lo stato bisezione" -#: builtin/bisect--helper.c:636 +#: builtin/bisect--helper.c:639 msgid "check for expected revs" msgstr "controlla se le revisioni attese sono presenti" -#: builtin/bisect--helper.c:638 +#: builtin/bisect--helper.c:641 msgid "reset the bisection state" msgstr "reimposta lo stato della bisezione" -#: builtin/bisect--helper.c:640 +#: builtin/bisect--helper.c:643 msgid "write out the bisection state in BISECT_LOG" msgstr "scrivi lo stato della bisezione in BISECT_LOG" -#: builtin/bisect--helper.c:642 +#: builtin/bisect--helper.c:645 msgid "check and set terms in a bisection state" msgstr "controlla e imposta i termini in uno stato bisezione" -#: builtin/bisect--helper.c:644 +#: builtin/bisect--helper.c:647 msgid "check whether bad or good terms exist" msgstr "" "controlla se esistono termini per revisioni non funzionanti o funzionanti" -#: builtin/bisect--helper.c:646 +#: builtin/bisect--helper.c:649 msgid "print out the bisect terms" msgstr "stampa i termini della bisezione" -#: builtin/bisect--helper.c:648 +#: builtin/bisect--helper.c:651 msgid "start the bisect session" msgstr "inizia la sessione di bisezione" -#: builtin/bisect--helper.c:650 +#: builtin/bisect--helper.c:653 msgid "update BISECT_HEAD instead of checking out the current commit" msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente" -#: builtin/bisect--helper.c:652 +#: builtin/bisect--helper.c:655 msgid "no log for BISECT_WRITE" msgstr "non registrare le operazioni eseguite per BISECT_WRITE" -#: builtin/bisect--helper.c:669 +#: builtin/bisect--helper.c:673 msgid "--write-terms requires two arguments" msgstr "--write-terms richiede due argomenti" -#: builtin/bisect--helper.c:673 +#: builtin/bisect--helper.c:677 msgid "--bisect-clean-state requires no arguments" msgstr "--bisect-clean-state non richiede argomenti" -#: builtin/bisect--helper.c:680 +#: builtin/bisect--helper.c:684 msgid "--bisect-reset requires either no argument or a commit" msgstr "--bisect-reset richiede o nessun argomento o un commit" -#: builtin/bisect--helper.c:684 +#: builtin/bisect--helper.c:688 msgid "--bisect-write requires either 4 or 5 arguments" msgstr "--bisect-write richiede o quattro o cinque argomenti" -#: builtin/bisect--helper.c:690 +#: builtin/bisect--helper.c:694 msgid "--check-and-set-terms requires 3 arguments" msgstr "--check-and-set-terms richiede tre argomenti" -#: builtin/bisect--helper.c:696 +#: builtin/bisect--helper.c:700 msgid "--bisect-next-check requires 2 or 3 arguments" msgstr "--bisect-next-check richiede due o tre argomenti" -#: builtin/bisect--helper.c:702 +#: builtin/bisect--helper.c:706 msgid "--bisect-terms requires 0 or 1 argument" msgstr "--bisect-terms richiede zero o un argomento" -#: builtin/blame.c:32 +#: builtin/blame.c:31 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>" msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>" -#: builtin/blame.c:37 +#: builtin/blame.c:36 msgid "<rev-opts> are documented in git-rev-list(1)" msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)" -#: builtin/blame.c:410 +#: builtin/blame.c:409 #, c-format msgid "expecting a color: %s" msgstr "atteso colore: %s" -#: builtin/blame.c:417 +#: builtin/blame.c:416 msgid "must end with a color" msgstr "deve terminare con un colore" -#: builtin/blame.c:730 +#: builtin/blame.c:729 #, c-format msgid "invalid color '%s' in color.blame.repeatedLines" msgstr "colore '%s' non valido in color.blame.repeatedLines" -#: builtin/blame.c:748 +#: builtin/blame.c:747 msgid "invalid value for blame.coloring" msgstr "valore non valido per blame.coloring" -#: builtin/blame.c:823 +#: builtin/blame.c:822 #, c-format msgid "cannot find revision %s to ignore" msgstr "impossibile trovare la revisione %s da ignorare" -#: builtin/blame.c:845 +#: builtin/blame.c:844 msgid "Show blame entries as we find them, incrementally" msgstr "" "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo" -#: builtin/blame.c:846 +#: builtin/blame.c:845 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Visualizza un hash SHA-1 vuoto per i commit limite (impostazione " "predefinita: off)" -#: builtin/blame.c:847 +#: builtin/blame.c:846 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" "Non gestire i commit radice come commit limite (impostazione predefinita: " "off)" -#: builtin/blame.c:848 +#: builtin/blame.c:847 msgid "Show work cost statistics" msgstr "Visualizza le statistiche sul costo dell'operazione" -#: builtin/blame.c:849 +#: builtin/blame.c:848 msgid "Force progress reporting" msgstr "Forza l'indicazione d'avanzamento dell'operazione" -#: builtin/blame.c:850 +#: builtin/blame.c:849 msgid "Show output score for blame entries" msgstr "Visualizza il punteggio di output per le voci blame" -#: builtin/blame.c:851 +#: builtin/blame.c:850 msgid "Show original filename (Default: auto)" msgstr "" "Visualizza il nome file originario (impostazione predefinita: automatico)" -#: builtin/blame.c:852 +#: builtin/blame.c:851 msgid "Show original linenumber (Default: off)" msgstr "" "Visualizza il numero di riga originario (impostazione predefinita: off)" -#: builtin/blame.c:853 +#: builtin/blame.c:852 msgid "Show in a format designed for machine consumption" msgstr "" "Visualizza l'output in un formato progettato per l'utilizzo da parte di una " "macchina" -#: builtin/blame.c:854 +#: builtin/blame.c:853 msgid "Show porcelain format with per-line commit information" msgstr "" "Visualizza il formato porcelain con le informazioni sul commit per ogni riga" -#: builtin/blame.c:855 +#: builtin/blame.c:854 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" "Usa la stessa modalità di output di git-annotate (impostazione predefinita: " "off)" -#: builtin/blame.c:856 +#: builtin/blame.c:855 msgid "Show raw timestamp (Default: off)" msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)" -#: builtin/blame.c:857 +#: builtin/blame.c:856 msgid "Show long commit SHA1 (Default: off)" msgstr "" "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: " "off)" -#: builtin/blame.c:858 +#: builtin/blame.c:857 msgid "Suppress author name and timestamp (Default: off)" msgstr "" "Non visualizzare il nome autore e il timestamp (impostazione predefinita: " "off)" -#: builtin/blame.c:859 +#: builtin/blame.c:858 msgid "Show author email instead of name (Default: off)" msgstr "" "Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione " "predefinita: off)" -#: builtin/blame.c:860 +#: builtin/blame.c:859 msgid "Ignore whitespace differences" msgstr "Ignora le differenze relative agli spazi bianchi" -#: builtin/blame.c:861 builtin/log.c:1629 +#: builtin/blame.c:860 builtin/log.c:1702 msgid "rev" msgstr "revisione" -#: builtin/blame.c:861 +#: builtin/blame.c:860 msgid "Ignore <rev> when blaming" msgstr "Ignora <revisione> durante l'esecuzione del blame" -#: builtin/blame.c:862 +#: builtin/blame.c:861 msgid "Ignore revisions from <file>" msgstr "Ignora le revisioni specificate in <file>" -#: builtin/blame.c:863 +#: builtin/blame.c:862 msgid "color redundant metadata from previous line differently" msgstr "colora in modo differente i metadati ridondanti della riga precedente" -#: builtin/blame.c:864 +#: builtin/blame.c:863 msgid "color lines by age" msgstr "colora le righe in base all'età" -#: builtin/blame.c:871 -msgid "Use an experimental heuristic to improve diffs" -msgstr "Usa un'euristica sperimentale per migliorare i diff" - -#: builtin/blame.c:873 +#: builtin/blame.c:864 msgid "Spend extra cycles to find better match" msgstr "Usa cicli extra per trovare una corrispondenza migliore" -#: builtin/blame.c:874 +#: builtin/blame.c:865 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list" -#: builtin/blame.c:875 +#: builtin/blame.c:866 msgid "Use <file>'s contents as the final image" msgstr "Usa i contenuti di <file> come immagine finale" -#: builtin/blame.c:876 builtin/blame.c:877 +#: builtin/blame.c:867 builtin/blame.c:868 msgid "score" msgstr "punteggio" -#: builtin/blame.c:876 +#: builtin/blame.c:867 msgid "Find line copies within and across files" msgstr "Trova copie delle righe all'interno e fra file" -#: builtin/blame.c:877 +#: builtin/blame.c:868 msgid "Find line movements within and across files" msgstr "Trova righe spostate all'interno e fra file" -#: builtin/blame.c:878 +#: builtin/blame.c:869 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:878 +#: builtin/blame.c:869 msgid "Process only line range n,m, counting from 1" msgstr "Elabora solo l'intervallo righe n,m, contandole da 1" -#: builtin/blame.c:929 +#: builtin/blame.c:921 msgid "--progress can't be used with --incremental or porcelain formats" msgstr "" "--progress non può essere usato con --incremental o con i formati porcelain" @@ -9671,18 +10641,18 @@ msgstr "" #. your language may need more or fewer display #. columns. #. -#: builtin/blame.c:980 +#: builtin/blame.c:972 msgid "4 years, 11 months ago" msgstr "4 anni, 11 giorni fa" -#: builtin/blame.c:1087 +#: builtin/blame.c:1079 #, c-format msgid "file %s has only %lu line" msgid_plural "file %s has only %lu lines" msgstr[0] "il file %s ha solo %lu riga" msgstr[1] "il file %s ha solo %lu righe" -#: builtin/blame.c:1133 +#: builtin/blame.c:1125 msgid "Blaming lines" msgstr "Eseguo il blame sulle righe" @@ -9900,7 +10870,7 @@ msgstr "imposta la modalità tracking (vedi git-pull(1))" msgid "do not use" msgstr "non usare" -#: builtin/branch.c:626 builtin/rebase.c:485 +#: builtin/branch.c:626 builtin/rebase.c:513 msgid "upstream" msgstr "upstream" @@ -9909,8 +10879,8 @@ msgid "change the upstream info" msgstr "modifica le informazioni sull'upstream" #: builtin/branch.c:627 -msgid "Unset the upstream info" -msgstr "Rimuovi le informazioni sull'upstream" +msgid "unset the upstream info" +msgstr "rimuovi le informazioni sull'upstream" #: builtin/branch.c:628 msgid "use colored output" @@ -10012,7 +10982,7 @@ msgstr "" msgid "format to use for the output" msgstr "formato da usare per l'output" -#: builtin/branch.c:684 builtin/clone.c:761 +#: builtin/branch.c:684 builtin/clone.c:785 msgid "HEAD not found below refs/heads!" msgstr "HEAD non trovato fra i riferimenti/head!" @@ -10108,20 +11078,67 @@ msgstr "" "l'opzione '--set-upstream' non è più supportata. Usa '--track' o '--set-" "upstream-to'." -#: builtin/bundle.c:45 -#, c-format -msgid "%s is okay\n" -msgstr "%s è corretto\n" +#: builtin/bundle.c:15 builtin/bundle.c:23 +msgid "git bundle create [<options>] <file> <git-rev-list args>" +msgstr "git bundle create [<opzioni>] <file> <argomenti git-rev-list>" + +#: builtin/bundle.c:16 builtin/bundle.c:28 +msgid "git bundle verify [<options>] <file>" +msgstr "git bundle verify [<opzioni>] <file>" -#: builtin/bundle.c:58 +#: builtin/bundle.c:17 builtin/bundle.c:33 +msgid "git bundle list-heads <file> [<refname>...]" +msgstr "git bundle list-heads <file> [<nome riferimento>...]" + +#: builtin/bundle.c:18 builtin/bundle.c:38 +msgid "git bundle unbundle <file> [<refname>...]" +msgstr "git bundle unbundle <file> [<nome riferimento>...]" + +#: builtin/bundle.c:66 builtin/pack-objects.c:3375 +msgid "do not show progress meter" +msgstr "non visualizzare la barra di avanzamento" + +#: builtin/bundle.c:68 builtin/pack-objects.c:3377 +msgid "show progress meter" +msgstr "visualizza la barra di avanzamento" + +#: builtin/bundle.c:70 builtin/pack-objects.c:3379 +msgid "show progress meter during object writing phase" +msgstr "" +"visualizza la barra di avanzamento durante la fase di scrittura oggetti" + +#: builtin/bundle.c:73 builtin/pack-objects.c:3382 +msgid "similar to --all-progress when progress meter is shown" +msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" + +#: builtin/bundle.c:93 msgid "Need a repository to create a bundle." msgstr "Per creare un bundle è necessario un repository." -#: builtin/bundle.c:62 +#: builtin/bundle.c:104 +msgid "do not show bundle details" +msgstr "non visualizzare i dettagli sul bundle" + +#: builtin/bundle.c:119 +#, c-format +msgid "%s is okay\n" +msgstr "%s è corretto\n" + +#: builtin/bundle.c:160 msgid "Need a repository to unbundle." msgstr "Per decomprimere un bundle è necessario un repository." -#: builtin/cat-file.c:594 +#: builtin/bundle.c:168 builtin/remote.c:1686 +msgid "be verbose; must be placed before a subcommand" +msgstr "" +"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" + +#: builtin/bundle.c:190 builtin/remote.c:1717 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sottocomando sconosciuto: %s" + +#: builtin/cat-file.c:595 msgid "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <type> | --textconv | --filters) [--path=<path>] <object>" @@ -10129,7 +11146,7 @@ msgstr "" "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -" "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>" -#: builtin/cat-file.c:595 +#: builtin/cat-file.c:596 msgid "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" @@ -10137,75 +11154,75 @@ msgstr "" "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --" "filters]" -#: builtin/cat-file.c:616 +#: builtin/cat-file.c:617 msgid "only one batch option may be specified" msgstr "può essere specificata solo un'opzione batch" -#: builtin/cat-file.c:634 +#: builtin/cat-file.c:635 msgid "<type> can be one of: blob, tree, commit, tag" msgstr "<tipo> può essere uno fra blob, tree, commit, tag" -#: builtin/cat-file.c:635 +#: builtin/cat-file.c:636 msgid "show object type" msgstr "visualizza tipo oggetto" -#: builtin/cat-file.c:636 +#: builtin/cat-file.c:637 msgid "show object size" msgstr "visualizza dimensioni oggetto" -#: builtin/cat-file.c:638 +#: builtin/cat-file.c:639 msgid "exit with zero when there's no error" msgstr "esci con codice d'uscita zero se non si sono verificati errori" -#: builtin/cat-file.c:639 +#: builtin/cat-file.c:640 msgid "pretty-print object's content" msgstr "stampa il contenuto dell'oggetto con un formato leggibile" -#: builtin/cat-file.c:641 +#: builtin/cat-file.c:642 msgid "for blob objects, run textconv on object's content" msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:643 +#: builtin/cat-file.c:644 msgid "for blob objects, run filters on object's content" msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)" -#: builtin/cat-file.c:644 git-submodule.sh:936 +#: builtin/cat-file.c:645 git-submodule.sh:1002 msgid "blob" msgstr "blob" -#: builtin/cat-file.c:645 +#: builtin/cat-file.c:646 msgid "use a specific path for --textconv/--filters" msgstr "usa un percorso specifico per --textconv/--filters" -#: builtin/cat-file.c:647 +#: builtin/cat-file.c:648 msgid "allow -s and -t to work with broken/corrupt objects" msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti" -#: builtin/cat-file.c:648 +#: builtin/cat-file.c:649 msgid "buffer --batch output" msgstr "esegui il buffering dell'output di --batch" -#: builtin/cat-file.c:650 +#: builtin/cat-file.c:651 msgid "show info and content of objects fed from the standard input" msgstr "" "visualizza le informazioni e il contenuto degli oggetti forniti nello " "standard input" -#: builtin/cat-file.c:654 +#: builtin/cat-file.c:655 msgid "show info about objects fed from the standard input" msgstr "visualizza le informazioni degli oggetti forniti nello standard input" -#: builtin/cat-file.c:658 +#: builtin/cat-file.c:659 msgid "follow in-tree symlinks (used with --batch or --batch-check)" msgstr "" "segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-" "check)" -#: builtin/cat-file.c:660 +#: builtin/cat-file.c:661 msgid "show all objects with --batch or --batch-check" msgstr "visualizza tutti gli oggetti con --batch o --batch-check" -#: builtin/cat-file.c:662 +#: builtin/cat-file.c:663 msgid "do not order --batch-all-objects output" msgstr "non ordinare l'output di --batch-all-objects" @@ -10233,8 +11250,8 @@ msgstr "leggi i nomi dei file dallo standard input" msgid "terminate input and output records by a NUL character" msgstr "termina i record di input e output con un carattere NUL" -#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:538 -#: builtin/worktree.c:507 +#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537 +#: builtin/worktree.c:499 msgid "suppress progress reporting" msgstr "non visualizzare l'avanzamento dell'operazione" @@ -10246,27 +11263,27 @@ msgstr "visualizza i percorsi di input non corrispondenti" msgid "ignore index when checking" msgstr "ignora l'indice durante il controllo" -#: builtin/check-ignore.c:160 +#: builtin/check-ignore.c:163 msgid "cannot specify pathnames with --stdin" msgstr "impossibile specificare i nomi percorso con --stdin" -#: builtin/check-ignore.c:163 +#: builtin/check-ignore.c:166 msgid "-z only makes sense with --stdin" msgstr "-z ha senso solo con --stdin" -#: builtin/check-ignore.c:165 +#: builtin/check-ignore.c:168 msgid "no path specified" msgstr "nessun percorso specificato" -#: builtin/check-ignore.c:169 +#: builtin/check-ignore.c:172 msgid "--quiet is only valid with a single pathname" msgstr "--quiet è valido solo con un nome percorso singolo" -#: builtin/check-ignore.c:171 +#: builtin/check-ignore.c:174 msgid "cannot have both --quiet and --verbose" msgstr "non è possibile usare sia --quiet sia --verbose" -#: builtin/check-ignore.c:174 +#: builtin/check-ignore.c:177 msgid "--non-matching is only valid with --verbose" msgstr "--non-matching è valido solo con --verbose" @@ -10324,9 +11341,9 @@ msgid "write the content to temporary files" msgstr "scrivi il contenuto in file temporanei" #: builtin/checkout-index.c:178 builtin/column.c:31 -#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376 -#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857 -#: builtin/worktree.c:680 +#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403 +#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909 +#: builtin/worktree.c:672 msgid "string" msgstr "stringa" @@ -10354,100 +11371,100 @@ msgstr "git switch [<opzioni>] <branch>" msgid "git restore [<options>] [--source=<branch>] <file>..." msgstr "git restore [<opzioni>] [--source=<branch>] <file>..." -#: builtin/checkout.c:172 builtin/checkout.c:211 +#: builtin/checkout.c:175 builtin/checkout.c:214 #, c-format msgid "path '%s' does not have our version" msgstr "il percorso '%s' non ha la nostra versione" -#: builtin/checkout.c:174 builtin/checkout.c:213 +#: builtin/checkout.c:177 builtin/checkout.c:216 #, c-format msgid "path '%s' does not have their version" msgstr "il percorso '%s' non ha la loro versione" -#: builtin/checkout.c:190 +#: builtin/checkout.c:193 #, c-format msgid "path '%s' does not have all necessary versions" msgstr "il percorso '%s' non ha tutte le versioni necessarie" -#: builtin/checkout.c:240 +#: builtin/checkout.c:243 #, c-format msgid "path '%s' does not have necessary versions" msgstr "il percorso '%s' non ha le versioni necessarie" -#: builtin/checkout.c:258 +#: builtin/checkout.c:261 #, c-format msgid "path '%s': cannot merge" msgstr "percorso '%s': impossibile eseguire il merge" -#: builtin/checkout.c:274 +#: builtin/checkout.c:277 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Impossibile aggiungere il risultato del merge per '%s'" -#: builtin/checkout.c:374 +#: builtin/checkout.c:377 #, c-format msgid "Recreated %d merge conflict" msgid_plural "Recreated %d merge conflicts" msgstr[0] "Ricreato %d conflitto di merge" msgstr[1] "Ricreati %d conflitti di merge" -#: builtin/checkout.c:379 +#: builtin/checkout.c:382 #, c-format msgid "Updated %d path from %s" msgid_plural "Updated %d paths from %s" msgstr[0] "Aggiornato %d percorso da %s" msgstr[1] "Aggiornati %d percorsi da %s" -#: builtin/checkout.c:386 +#: builtin/checkout.c:389 #, c-format msgid "Updated %d path from the index" msgid_plural "Updated %d paths from the index" msgstr[0] "Aggiornato %d percorso dall'indice" msgstr[1] "Aggiornati %d percorsi dall'indice" -#: builtin/checkout.c:409 builtin/checkout.c:412 builtin/checkout.c:415 -#: builtin/checkout.c:419 +#: builtin/checkout.c:412 builtin/checkout.c:415 builtin/checkout.c:418 +#: builtin/checkout.c:422 #, c-format msgid "'%s' cannot be used with updating paths" msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento" -#: builtin/checkout.c:422 builtin/checkout.c:425 +#: builtin/checkout.c:425 builtin/checkout.c:428 #, c-format msgid "'%s' cannot be used with %s" msgstr "'%s' non può essere usato con %s" -#: builtin/checkout.c:429 +#: builtin/checkout.c:432 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." msgstr "" "Impossibile aggiornare dei percorsi e passare al branch '%s' " "contemporaneamente." -#: builtin/checkout.c:433 +#: builtin/checkout.c:436 #, c-format msgid "neither '%s' or '%s' is specified" msgstr "né '%s' né '%s' sono stati specificati" -#: builtin/checkout.c:437 +#: builtin/checkout.c:440 #, c-format msgid "'%s' must be used when '%s' is not specified" msgstr "'%s' dev'essere usato quando '%s' non è specificato" -#: builtin/checkout.c:442 builtin/checkout.c:447 +#: builtin/checkout.c:445 builtin/checkout.c:450 #, c-format msgid "'%s' or '%s' cannot be used with %s" msgstr "'%s' o '%s' non possono essere usati con %s" -#: builtin/checkout.c:506 builtin/checkout.c:513 +#: builtin/checkout.c:509 builtin/checkout.c:516 #, c-format msgid "path '%s' is unmerged" msgstr "il percorso '%s' non è stato sottoposto a merge" -#: builtin/checkout.c:679 +#: builtin/checkout.c:684 builtin/sparse-checkout.c:106 msgid "you need to resolve your current index first" msgstr "prima devi risolvere l'indice corrente" -#: builtin/checkout.c:729 +#: builtin/checkout.c:734 #, c-format msgid "" "cannot continue with staged changes in the following files:\n" @@ -10456,55 +11473,50 @@ msgstr "" "impossibile continuare con modifiche in stage nei file seguenti:\n" "%s" -#: builtin/checkout.c:736 -#, c-format -msgid "staged changes in the following files may be lost: %s" -msgstr "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" - -#: builtin/checkout.c:833 +#: builtin/checkout.c:837 #, c-format msgid "Can not do reflog for '%s': %s\n" msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n" -#: builtin/checkout.c:875 +#: builtin/checkout.c:879 msgid "HEAD is now at" msgstr "HEAD si trova ora a" -#: builtin/checkout.c:879 builtin/clone.c:714 +#: builtin/checkout.c:883 builtin/clone.c:717 msgid "unable to update HEAD" msgstr "impossibile aggiornare HEAD" -#: builtin/checkout.c:883 +#: builtin/checkout.c:887 #, c-format msgid "Reset branch '%s'\n" msgstr "Ripristina il branch '%s'\n" -#: builtin/checkout.c:886 +#: builtin/checkout.c:890 #, c-format msgid "Already on '%s'\n" msgstr "Si è già su '%s'\n" -#: builtin/checkout.c:890 +#: builtin/checkout.c:894 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Si è passati al branch '%s' e lo si è reimpostato\n" -#: builtin/checkout.c:892 builtin/checkout.c:1289 +#: builtin/checkout.c:896 builtin/checkout.c:1320 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Si è passati a un nuovo branch '%s'\n" -#: builtin/checkout.c:894 +#: builtin/checkout.c:898 #, c-format msgid "Switched to branch '%s'\n" msgstr "Si è passati al branch '%s'\n" -#: builtin/checkout.c:945 +#: builtin/checkout.c:949 #, c-format msgid " ... and %d more.\n" msgstr " ...e altri %d.\n" -#: builtin/checkout.c:951 +#: builtin/checkout.c:955 #, c-format msgid "" "Warning: you are leaving %d commit behind, not connected to\n" @@ -10527,7 +11539,7 @@ msgstr[1] "" "\n" "%s\n" -#: builtin/checkout.c:970 +#: builtin/checkout.c:974 #, c-format msgid "" "If you want to keep it by creating a new branch, this may be a good time\n" @@ -10554,28 +11566,19 @@ msgstr[1] "" " git branch <nome del nuovo branch> %s\n" "\n" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1009 msgid "internal error in revision walk" msgstr "errore interno durante la visita delle revisioni" -#: builtin/checkout.c:1009 +#: builtin/checkout.c:1013 msgid "Previous HEAD position was" msgstr "La precedente posizione di HEAD era" -#: builtin/checkout.c:1049 builtin/checkout.c:1284 +#: builtin/checkout.c:1053 builtin/checkout.c:1315 msgid "You are on a branch yet to be born" msgstr "Sei su un branch che deve ancora essere creato" -#: builtin/checkout.c:1176 -msgid "only one reference expected" -msgstr "atteso solo un riferimento" - -#: builtin/checkout.c:1193 -#, c-format -msgid "only one reference expected, %d given." -msgstr "atteso solo un riferimento, %d specificati." - -#: builtin/checkout.c:1230 +#: builtin/checkout.c:1128 #, c-format msgid "" "'%s' could be both a local file and a tracking branch.\n" @@ -10584,37 +11587,72 @@ msgstr "" "'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n" "Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità" -#: builtin/checkout.c:1243 builtin/worktree.c:291 builtin/worktree.c:456 +#: builtin/checkout.c:1135 +msgid "" +"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" +"you can do so by fully qualifying the name with the --track option:\n" +"\n" +" git checkout --track origin/<name>\n" +"\n" +"If you'd like to always have checkouts of an ambiguous <name> prefer\n" +"one remote, e.g. the 'origin' remote, consider setting\n" +"checkout.defaultRemote=origin in your config." +msgstr "" +"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n" +"puoi farlo usando la versione completamente qualificata del nome\n" +"con l'opzione --track:\n" +"\n" +" git checkout --track origin/<nome>\n" +"\n" +"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n" +"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n" +"impostare checkout.defaultRemote=origin nel tuo file di configurazione." + +#: builtin/checkout.c:1145 +#, c-format +msgid "'%s' matched multiple (%d) remote tracking branches" +msgstr "'%s' corrisponde a più (%d) branch che ne tracciano uno remoto" + +#: builtin/checkout.c:1211 +msgid "only one reference expected" +msgstr "atteso solo un riferimento" + +#: builtin/checkout.c:1228 +#, c-format +msgid "only one reference expected, %d given." +msgstr "atteso solo un riferimento, %d specificati." + +#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448 #, c-format msgid "invalid reference: %s" msgstr "riferimento non valido: %s" -#: builtin/checkout.c:1256 builtin/checkout.c:1618 +#: builtin/checkout.c:1287 builtin/checkout.c:1649 #, c-format msgid "reference is not a tree: %s" msgstr "il riferimento non è un albero: %s" -#: builtin/checkout.c:1303 +#: builtin/checkout.c:1334 #, c-format msgid "a branch is expected, got tag '%s'" msgstr "atteso branch, ricevuto tag '%s'" -#: builtin/checkout.c:1305 +#: builtin/checkout.c:1336 #, c-format msgid "a branch is expected, got remote branch '%s'" msgstr "atteso branch, ricevuto branch remoto '%s'" -#: builtin/checkout.c:1306 builtin/checkout.c:1314 +#: builtin/checkout.c:1337 builtin/checkout.c:1345 #, c-format msgid "a branch is expected, got '%s'" msgstr "atteso branch, ricevuto '%s'" -#: builtin/checkout.c:1309 +#: builtin/checkout.c:1340 #, c-format msgid "a branch is expected, got commit '%s'" msgstr "atteso branch, ricevuto commit '%s'" -#: builtin/checkout.c:1325 +#: builtin/checkout.c:1356 msgid "" "cannot switch branch while merging\n" "Consider \"git merge --quit\" or \"git worktree add\"." @@ -10622,7 +11660,7 @@ msgstr "" "impossibile cambiare branch durante un merge\n" "Considera l'uso di \"git merge --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1329 +#: builtin/checkout.c:1360 msgid "" "cannot switch branch in the middle of an am session\n" "Consider \"git am --quit\" or \"git worktree add\"." @@ -10630,7 +11668,7 @@ msgstr "" "impossibile cambiare branch nel bel mezzo di una sessione am\n" "Considera l'uso di \"git am --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1333 +#: builtin/checkout.c:1364 msgid "" "cannot switch branch while rebasing\n" "Consider \"git rebase --quit\" or \"git worktree add\"." @@ -10638,7 +11676,7 @@ msgstr "" "impossibile cambiare branch durante un rebase\n" "Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1337 +#: builtin/checkout.c:1368 msgid "" "cannot switch branch while cherry-picking\n" "Consider \"git cherry-pick --quit\" or \"git worktree add\"." @@ -10646,7 +11684,7 @@ msgstr "" "impossibile cambiare branch durante un cherry-pick\n" "Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1341 +#: builtin/checkout.c:1372 msgid "" "cannot switch branch while reverting\n" "Consider \"git revert --quit\" or \"git worktree add\"." @@ -10654,142 +11692,147 @@ msgstr "" "impossibile cambiare branch durante un revert\n" "Considera l'uso di \"git revert --quit\" o di \"git worktree add\"." -#: builtin/checkout.c:1345 +#: builtin/checkout.c:1376 msgid "you are switching branch while bisecting" msgstr "stai cambiando branch durante una bisezione" -#: builtin/checkout.c:1352 +#: builtin/checkout.c:1383 msgid "paths cannot be used with switching branches" msgstr "i percorsi non possono essere usati passando da un branch a un altro" -#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363 +#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394 #, c-format msgid "'%s' cannot be used with switching branches" msgstr "'%s' non può essere usato passando da un branch a un altro" -#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373 -#: builtin/checkout.c:1378 builtin/checkout.c:1383 +#: builtin/checkout.c:1398 builtin/checkout.c:1401 builtin/checkout.c:1404 +#: builtin/checkout.c:1409 builtin/checkout.c:1414 #, c-format msgid "'%s' cannot be used with '%s'" msgstr "'%s' non può essere usato con '%s'" -#: builtin/checkout.c:1380 +#: builtin/checkout.c:1411 #, c-format msgid "'%s' cannot take <start-point>" msgstr "'%s' non accetta l'argomento <punto di partenza>" -#: builtin/checkout.c:1388 +#: builtin/checkout.c:1419 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit" -#: builtin/checkout.c:1395 +#: builtin/checkout.c:1426 msgid "missing branch or commit argument" msgstr "argomento branch o commit mancante" -#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151 -#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575 +#: builtin/checkout.c:1468 builtin/clone.c:91 builtin/commit-graph.c:72 +#: builtin/commit-graph.c:135 builtin/fetch.c:167 builtin/merge.c:286 +#: builtin/multi-pack-index.c:27 builtin/pull.c:118 builtin/push.c:563 #: builtin/send-pack.c:174 msgid "force progress reporting" msgstr "forza l'indicazione d'avanzamento dell'operazione" -#: builtin/checkout.c:1438 +#: builtin/checkout.c:1469 msgid "perform a 3-way merge with the new branch" msgstr "esegui un merge a tre vie con il nuovo branch" -#: builtin/checkout.c:1439 builtin/log.c:1617 parse-options.h:318 +#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322 msgid "style" msgstr "stile" -#: builtin/checkout.c:1440 +#: builtin/checkout.c:1471 msgid "conflict style (merge or diff3)" msgstr "stile conflitti (merge o diff3)" -#: builtin/checkout.c:1452 builtin/worktree.c:504 +#: builtin/checkout.c:1483 builtin/worktree.c:496 msgid "detach HEAD at named commit" msgstr "scollega l'HEAD al commit specificato" -#: builtin/checkout.c:1453 +#: builtin/checkout.c:1484 msgid "set upstream info for new branch" msgstr "imposta le informazioni sull'upstream per il nuovo branch" -#: builtin/checkout.c:1455 +#: builtin/checkout.c:1486 msgid "force checkout (throw away local modifications)" msgstr "esegui forzatamente il checkout (scarta le modifiche locali)" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1488 msgid "new-branch" msgstr "nuovo branch" -#: builtin/checkout.c:1457 +#: builtin/checkout.c:1488 msgid "new unparented branch" msgstr "nuovo branch senza genitore" -#: builtin/checkout.c:1459 builtin/merge.c:288 +#: builtin/checkout.c:1490 builtin/merge.c:289 msgid "update ignored files (default)" msgstr "aggiorna i file ignorati (impostazione predefinita)" -#: builtin/checkout.c:1462 +#: builtin/checkout.c:1493 msgid "do not check if another worktree is holding the given ref" msgstr "" "non controllare se un altro albero di lavoro contiene il riferimento " "specificato" -#: builtin/checkout.c:1475 +#: builtin/checkout.c:1506 msgid "checkout our version for unmerged files" msgstr "" "esegui il checkout della nostra versione per i file non sottoposti a merge" -#: builtin/checkout.c:1478 +#: builtin/checkout.c:1509 msgid "checkout their version for unmerged files" msgstr "" "esegui il checkout della loro versione per i file non sottoposti a merge" -#: builtin/checkout.c:1482 +#: builtin/checkout.c:1513 msgid "do not limit pathspecs to sparse entries only" msgstr "non limitare gli specificatori percorso solo alle voci sparse" -#: builtin/checkout.c:1533 +#: builtin/checkout.c:1565 msgid "-b, -B and --orphan are mutually exclusive" msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive" -#: builtin/checkout.c:1536 +#: builtin/checkout.c:1568 msgid "-p and --overlay are mutually exclusive" msgstr "le opzioni -p e --overlay sono mutualmente esclusive" -#: builtin/checkout.c:1573 +#: builtin/checkout.c:1605 msgid "--track needs a branch name" msgstr "--track richiede il nome di un branch" -#: builtin/checkout.c:1578 +#: builtin/checkout.c:1610 msgid "missing branch name; try -b" msgstr "nome del branch mancante; prova con -b" -#: builtin/checkout.c:1611 +#: builtin/checkout.c:1642 #, c-format msgid "could not resolve %s" msgstr "impossibile risolvere %s" -#: builtin/checkout.c:1623 -msgid "you must specify path(s) to restore" -msgstr "devi specificare il percorso/i percorsi da ripristinare" - -#: builtin/checkout.c:1631 +#: builtin/checkout.c:1658 msgid "invalid path specification" msgstr "specificatore percorso non valido" -#: builtin/checkout.c:1638 +#: builtin/checkout.c:1665 #, c-format msgid "'%s' is not a commit and a branch '%s' cannot be created from it" msgstr "" "'%s' non è un commit e non si può creare un branch '%s' che parta da esso" -#: builtin/checkout.c:1642 +#: builtin/checkout.c:1669 #, c-format msgid "git checkout: --detach does not take a path argument '%s'" msgstr "git checkout: --detach non accetta un percorso '%s' come argomento" -#: builtin/checkout.c:1646 +#: builtin/checkout.c:1678 +msgid "--pathspec-from-file is incompatible with --detach" +msgstr "--pathspec-from-file non è compatibile con --detach" + +#: builtin/checkout.c:1681 builtin/reset.c:324 builtin/stash.c:1506 +msgid "--pathspec-from-file is incompatible with --patch" +msgstr "--pathspec-from-file non è compatibile con --patch" + +#: builtin/checkout.c:1692 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -10797,96 +11840,69 @@ msgstr "" "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n" "si esegue il checkout dell'indice." -#: builtin/checkout.c:1666 -#, c-format -msgid "" -"'%s' matched more than one remote tracking branch.\n" -"We found %d remotes with a reference that matched. So we fell back\n" -"on trying to resolve the argument as a path, but failed there too!\n" -"\n" -"If you meant to check out a remote tracking branch on, e.g. 'origin',\n" -"you can do so by fully qualifying the name with the --track option:\n" -"\n" -" git checkout --track origin/<name>\n" -"\n" -"If you'd like to always have checkouts of an ambiguous <name> prefer\n" -"one remote, e.g. the 'origin' remote, consider setting\n" -"checkout.defaultRemote=origin in your config." -msgstr "" -"'%s' corrisponde a più di un branch remoto.\n" -"Abbiamo trovato %d remoti con un riferimento corrispondente, per cui\n" -"abbiamo ripiegato tentando di risolvere l'argomento come percorso, ma\n" -"non siamo riusciti nemmeno a portare a termine tale operazione!\n" -"\n" -"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n" -"puoi farlo usando la versione completamente qualificata del nome\n" -"con l'opzione --track:\n" -"\n" -" git checkout --track origin/<nome>\n" -"\n" -"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n" -"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n" -"impostare checkout.defaultRemote=origin nel tuo file di configurazione." +#: builtin/checkout.c:1697 +msgid "you must specify path(s) to restore" +msgstr "devi specificare il percorso/i percorsi da ripristinare" -#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733 -#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169 -#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502 +#: builtin/checkout.c:1723 builtin/checkout.c:1725 builtin/checkout.c:1774 +#: builtin/checkout.c:1776 builtin/clone.c:121 builtin/remote.c:170 +#: builtin/remote.c:172 builtin/worktree.c:492 builtin/worktree.c:494 msgid "branch" msgstr "branch" -#: builtin/checkout.c:1692 +#: builtin/checkout.c:1724 msgid "create and checkout a new branch" msgstr "crea un nuovo branch ed eseguine il checkout" -#: builtin/checkout.c:1694 +#: builtin/checkout.c:1726 msgid "create/reset and checkout a branch" msgstr "crea/reimposta un branch ed eseguine il checkout" -#: builtin/checkout.c:1695 +#: builtin/checkout.c:1727 msgid "create reflog for new branch" msgstr "crea il registro dei riferimenti per il nuovo branch" -#: builtin/checkout.c:1697 +#: builtin/checkout.c:1729 msgid "second guess 'git checkout <no-such-branch>' (default)" msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)" -#: builtin/checkout.c:1698 +#: builtin/checkout.c:1730 msgid "use overlay mode (default)" msgstr "usa modalità overlay (impostazione predefinita)" -#: builtin/checkout.c:1734 +#: builtin/checkout.c:1775 msgid "create and switch to a new branch" msgstr "crea un nuovo branch e passa a quest'ultimo" -#: builtin/checkout.c:1736 +#: builtin/checkout.c:1777 msgid "create/reset and switch to a branch" msgstr "crea/reimposta un branch e passa a quest'ultimo" -#: builtin/checkout.c:1738 +#: builtin/checkout.c:1779 msgid "second guess 'git switch <no-such-branch>'" msgstr "prevedi 'git switch <branch inesistente>'" -#: builtin/checkout.c:1740 +#: builtin/checkout.c:1781 msgid "throw away local modifications" msgstr "scarta le modifiche locali" -#: builtin/checkout.c:1772 +#: builtin/checkout.c:1813 msgid "which tree-ish to checkout from" msgstr "albero da cui eseguire il checkout" -#: builtin/checkout.c:1774 +#: builtin/checkout.c:1815 msgid "restore the index" msgstr "ripristina l'indice" -#: builtin/checkout.c:1776 +#: builtin/checkout.c:1817 msgid "restore the working tree (default)" msgstr "ripristina l'albero di lavoro (impostazione predefinita)" -#: builtin/checkout.c:1778 +#: builtin/checkout.c:1819 msgid "ignore unmerged entries" msgstr "ignora voci non sottoposte a merge" -#: builtin/checkout.c:1779 +#: builtin/checkout.c:1820 msgid "use overlay mode" msgstr "usa modalità overlay" @@ -10927,7 +11943,7 @@ msgstr "eliminazione di %s non riuscita" msgid "could not lstat %s\n" msgstr "impossibile eseguire l'lstat di %s\n" -#: builtin/clean.c:300 git-add--interactive.perl:593 +#: builtin/clean.c:301 git-add--interactive.perl:595 #, c-format msgid "" "Prompt help:\n" @@ -10940,7 +11956,7 @@ msgstr "" "pippo - seleziona un elemento basandoti su un prefisso univoco\n" " - (vuoto) non selezionare niente\n" -#: builtin/clean.c:304 git-add--interactive.perl:602 +#: builtin/clean.c:305 git-add--interactive.perl:604 #, c-format msgid "" "Prompt help:\n" @@ -10961,38 +11977,33 @@ msgstr "" "* - seleziona tutti gli elementi\n" " - (vuoto) termina il processo di selezione\n" -#: builtin/clean.c:520 git-add--interactive.perl:568 -#: git-add--interactive.perl:573 +#: builtin/clean.c:521 git-add--interactive.perl:570 +#: git-add--interactive.perl:575 #, c-format, perl-format msgid "Huh (%s)?\n" msgstr "Eh (%s)?\n" -#: builtin/clean.c:662 +#: builtin/clean.c:663 #, c-format msgid "Input ignore patterns>> " msgstr "Immetti i pattern da ignorare>> " -#: builtin/clean.c:699 +#: builtin/clean.c:700 #, c-format msgid "WARNING: Cannot find items matched by: %s" msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s" -#: builtin/clean.c:720 +#: builtin/clean.c:721 msgid "Select items to delete" msgstr "Seleziona gli elementi da eliminare" #. TRANSLATORS: Make sure to keep [y/N] as is -#: builtin/clean.c:761 +#: builtin/clean.c:762 #, c-format msgid "Remove %s [y/N]? " msgstr "Eliminare %s [y/N]? " -#: builtin/clean.c:786 git-add--interactive.perl:1763 -#, c-format -msgid "Bye.\n" -msgstr "Ciao.\n" - -#: builtin/clean.c:794 +#: builtin/clean.c:795 msgid "" "clean - start cleaning\n" "filter by pattern - exclude items from deletion\n" @@ -11011,64 +12022,56 @@ msgstr "" "help - visualizza questa schermata\n" "? - guida al prompt di selezione" -#: builtin/clean.c:821 git-add--interactive.perl:1849 -msgid "*** Commands ***" -msgstr "*** Comandi ***" - -#: builtin/clean.c:822 git-add--interactive.perl:1846 -msgid "What now" -msgstr "Cosa faccio ora" - -#: builtin/clean.c:830 +#: builtin/clean.c:831 msgid "Would remove the following item:" msgid_plural "Would remove the following items:" msgstr[0] "Eliminerei il seguente elemento:" msgstr[1] "Eliminerei i seguenti elementi:" -#: builtin/clean.c:846 +#: builtin/clean.c:847 msgid "No more files to clean, exiting." msgstr "Non ci sono più file da ripulire, esco." -#: builtin/clean.c:908 +#: builtin/clean.c:909 msgid "do not print names of files removed" msgstr "non stampare i nomi dei file eliminati" -#: builtin/clean.c:910 +#: builtin/clean.c:911 msgid "force" msgstr "forza l'operazione" -#: builtin/clean.c:911 +#: builtin/clean.c:912 msgid "interactive cleaning" msgstr "pulizia interattiva" -#: builtin/clean.c:913 +#: builtin/clean.c:914 msgid "remove whole directories" msgstr "rimuovi intere directory" -#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548 -#: builtin/grep.c:899 builtin/log.c:176 builtin/log.c:178 -#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415 +#: builtin/clean.c:915 builtin/describe.c:562 builtin/describe.c:564 +#: builtin/grep.c:889 builtin/log.c:177 builtin/log.c:179 +#: builtin/ls-files.c:557 builtin/name-rev.c:526 builtin/name-rev.c:528 #: builtin/show-ref.c:179 msgid "pattern" msgstr "pattern" -#: builtin/clean.c:915 +#: builtin/clean.c:916 msgid "add <pattern> to ignore rules" msgstr "aggiungi <pattern> alle regole usate per ignorare i file" -#: builtin/clean.c:916 +#: builtin/clean.c:917 msgid "remove ignored files, too" msgstr "elimina anche i file ignorati" -#: builtin/clean.c:918 +#: builtin/clean.c:919 msgid "remove only ignored files" msgstr "elimina solo i file ignorati" -#: builtin/clean.c:936 +#: builtin/clean.c:937 msgid "-x and -X cannot be used together" msgstr "-x e -X non possono essere usati insieme" -#: builtin/clean.c:940 +#: builtin/clean.c:941 msgid "" "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to " "clean" @@ -11076,7 +12079,7 @@ msgstr "" "clean.requireForce è impostato a true e né -i, né -n, né -f sono stati " "specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clean.c:943 +#: builtin/clean.c:944 msgid "" "clean.requireForce defaults to true and neither -i, -n, nor -f given; " "refusing to clean" @@ -11084,7 +12087,7 @@ msgstr "" "clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f " "sono stati specificati; mi rifiuto di eseguire la pulizia" -#: builtin/clone.c:46 +#: builtin/clone.c:45 msgid "git clone [<options>] [--] <repo> [<dir>]" msgstr "git clone [<opzioni>] [--] <repository> [<directory>]" @@ -11132,18 +12135,18 @@ msgstr "directory modelli" msgid "directory from which templates will be used" msgstr "directory da cui saranno recuperati i modelli" -#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380 -#: builtin/submodule--helper.c:1860 +#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407 +#: builtin/submodule--helper.c:1912 msgid "reference repository" msgstr "repository di riferimento" -#: builtin/clone.c:118 builtin/submodule--helper.c:1382 -#: builtin/submodule--helper.c:1862 +#: builtin/clone.c:118 builtin/submodule--helper.c:1409 +#: builtin/submodule--helper.c:1914 msgid "use --reference only while cloning" msgstr "usa --reference solo durante la clonazione" #: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46 -#: builtin/pack-objects.c:3314 builtin/repack.c:319 +#: builtin/pack-objects.c:3441 builtin/repack.c:327 msgid "name" msgstr "nome" @@ -11159,8 +12162,8 @@ msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto" msgid "path to git-upload-pack on the remote" msgstr "percorso al comando remoto git-upload-pack" -#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838 -#: builtin/pull.c:226 +#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828 +#: builtin/pull.c:207 msgid "depth" msgstr "profondità" @@ -11168,7 +12171,7 @@ msgstr "profondità" msgid "create a shallow clone of that depth" msgstr "crea un clone shallow con questa profondità" -#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3303 +#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430 msgid "time" msgstr "tempo" @@ -11176,18 +12179,19 @@ msgstr "tempo" msgid "create a shallow clone since a specific time" msgstr "crea un clone shallow a partire dall'istante specificato" -#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179 -#: builtin/rebase.c:1395 +#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195 +#: builtin/rebase.c:1480 msgid "revision" msgstr "revisione" -#: builtin/clone.c:130 builtin/fetch.c:157 +#: builtin/clone.c:130 builtin/fetch.c:173 msgid "deepen history of shallow clone, excluding rev" msgstr "" "aumenta la profondità della cronologia del clone shallow fino alla revisione " "specificata esclusa" -#: builtin/clone.c:132 +#: builtin/clone.c:132 builtin/submodule--helper.c:1419 +#: builtin/submodule--helper.c:1928 msgid "clone only one branch, HEAD or --branch" msgstr "clona solo un branch, HEAD o quello specificato con --branch" @@ -11215,23 +12219,23 @@ msgstr "chiave=valore" msgid "set config inside the new repository" msgstr "imposta la configurazione nel nuovo repository" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:172 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:172 msgid "server-specific" msgstr "specifica del server" -#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76 -#: builtin/push.c:585 builtin/send-pack.c:173 +#: builtin/clone.c:142 builtin/fetch.c:190 builtin/ls-remote.c:76 +#: builtin/push.c:573 builtin/send-pack.c:173 msgid "option to transmit" msgstr "opzione da trasmettere" -#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239 -#: builtin/push.c:586 +#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220 +#: builtin/push.c:574 msgid "use IPv4 addresses only" msgstr "usa solo indirizzi IPv4" -#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242 -#: builtin/push.c:588 +#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223 +#: builtin/push.c:576 msgid "use IPv6 addresses only" msgstr "usa solo indirizzi IPv6" @@ -11241,7 +12245,13 @@ msgstr "" "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto " "tracciato" -#: builtin/clone.c:285 +#: builtin/clone.c:151 +msgid "initialize sparse-checkout file to include only files at root" +msgstr "" +"inizializza il file sparse-checkout per includere solo i file nel percorso " +"radice" + +#: builtin/clone.c:287 msgid "" "No directory name could be guessed.\n" "Please specify a directory on the command line" @@ -11249,47 +12259,42 @@ msgstr "" "Non è stato possibile indovinare alcun nome directory.\n" "Specifica una directory tramite la riga di comando" -#: builtin/clone.c:338 +#: builtin/clone.c:340 #, c-format msgid "info: Could not add alternate for '%s': %s\n" msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n" -#: builtin/clone.c:411 +#: builtin/clone.c:413 #, c-format msgid "%s exists and is not a directory" msgstr "%s esiste e non è una directory" -#: builtin/clone.c:428 +#: builtin/clone.c:430 #, c-format msgid "failed to start iterator over '%s'" msgstr "impossibile avviare l'iteratore su '%s'" -#: builtin/clone.c:453 -#, c-format -msgid "failed to unlink '%s'" -msgstr "unlink di '%s' non riuscito" - -#: builtin/clone.c:458 +#: builtin/clone.c:460 #, c-format msgid "failed to create link '%s'" msgstr "creazione del collegamento '%s' non riuscita" -#: builtin/clone.c:462 +#: builtin/clone.c:464 #, c-format msgid "failed to copy file to '%s'" msgstr "copia del file in '%s' non riuscita" -#: builtin/clone.c:467 +#: builtin/clone.c:469 #, c-format msgid "failed to iterate over '%s'" msgstr "iterazione su '%s' non riuscita" -#: builtin/clone.c:492 +#: builtin/clone.c:494 #, c-format msgid "done.\n" msgstr "fatto.\n" -#: builtin/clone.c:506 +#: builtin/clone.c:508 msgid "" "Clone succeeded, but checkout failed.\n" "You can inspect what was checked out with 'git status'\n" @@ -11300,98 +12305,102 @@ msgstr "" "con 'git status' e riprovare ad eseguire il checkout con\n" "'git restore --source=HEAD :/'\n" -#: builtin/clone.c:583 +#: builtin/clone.c:585 #, c-format msgid "Could not find remote branch %s to clone." msgstr "Impossibile trovare il branch remoto %s da clonare." -#: builtin/clone.c:702 +#: builtin/clone.c:705 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: builtin/clone.c:752 +#: builtin/clone.c:753 +msgid "failed to initialize sparse-checkout" +msgstr "inizializzazione del file sparse-checkout non riuscita" + +#: builtin/clone.c:776 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "" "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile " "eseguire il checkout.\n" -#: builtin/clone.c:783 +#: builtin/clone.c:807 msgid "unable to checkout working tree" msgstr "impossibile eseguire il checkout dell'albero di lavoro" -#: builtin/clone.c:833 +#: builtin/clone.c:862 msgid "unable to write parameters to config file" msgstr "impossibile scrivere i parametri nel file di configurazione" -#: builtin/clone.c:896 +#: builtin/clone.c:925 msgid "cannot repack to clean up" msgstr "impossibile eseguire il repack per pulire l'area di lavoro" -#: builtin/clone.c:898 +#: builtin/clone.c:927 msgid "cannot unlink temporary alternates file" msgstr "impossibile eseguire l'unlink del file alternates temporaneo" -#: builtin/clone.c:938 builtin/receive-pack.c:1950 +#: builtin/clone.c:965 builtin/receive-pack.c:1950 msgid "Too many arguments." msgstr "Troppi argomenti." -#: builtin/clone.c:942 +#: builtin/clone.c:969 msgid "You must specify a repository to clone." msgstr "Devi specificare un repository da clonare." -#: builtin/clone.c:955 +#: builtin/clone.c:982 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "le opzioni --bare e --origin %s non sono compatibili." -#: builtin/clone.c:958 +#: builtin/clone.c:985 msgid "--bare and --separate-git-dir are incompatible." msgstr "le opzioni --bare e --separate-git-dir non sono compatibili." -#: builtin/clone.c:971 +#: builtin/clone.c:998 #, c-format msgid "repository '%s' does not exist" msgstr "il repository '%s' non esiste" -#: builtin/clone.c:977 builtin/fetch.c:1660 +#: builtin/clone.c:1004 builtin/fetch.c:1796 #, c-format msgid "depth %s is not a positive number" msgstr "la profondità %s non è un numero positivo" -#: builtin/clone.c:987 +#: builtin/clone.c:1014 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" "il percorso di destinazione '%s' esiste già e non è una directory vuota." -#: builtin/clone.c:997 +#: builtin/clone.c:1024 #, c-format msgid "working tree '%s' already exists." msgstr "l'albero di lavoro '%s' esiste già." -#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264 -#: builtin/worktree.c:303 builtin/worktree.c:335 +#: builtin/clone.c:1039 builtin/clone.c:1060 builtin/difftool.c:271 +#: builtin/log.c:1866 builtin/worktree.c:295 builtin/worktree.c:327 #, c-format msgid "could not create leading directories of '%s'" msgstr "impossibile creare le prime directory di '%s'" -#: builtin/clone.c:1017 +#: builtin/clone.c:1044 #, c-format msgid "could not create work tree dir '%s'" msgstr "impossibile creare la directory dell'albero di lavoro '%s'" -#: builtin/clone.c:1037 +#: builtin/clone.c:1064 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Clone nel repository spoglio '%s' in corso...\n" -#: builtin/clone.c:1039 +#: builtin/clone.c:1066 #, c-format msgid "Cloning into '%s'...\n" msgstr "Clone in '%s' in corso...\n" -#: builtin/clone.c:1063 +#: builtin/clone.c:1090 msgid "" "clone --recursive is not compatible with both --reference and --reference-if-" "able" @@ -11399,36 +12408,36 @@ msgstr "" "il clone --recursive non è compatibile né con --reference né con --reference-" "if-able" -#: builtin/clone.c:1124 +#: builtin/clone.c:1154 msgid "--depth is ignored in local clones; use file:// instead." msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1126 +#: builtin/clone.c:1156 msgid "--shallow-since is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1128 +#: builtin/clone.c:1158 msgid "--shallow-exclude is ignored in local clones; use file:// instead." msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1130 +#: builtin/clone.c:1160 msgid "--filter is ignored in local clones; use file:// instead." msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://." -#: builtin/clone.c:1133 +#: builtin/clone.c:1163 msgid "source repository is shallow, ignoring --local" msgstr "il repository sorgente è shallow, ignoro l'opzione --local" -#: builtin/clone.c:1138 +#: builtin/clone.c:1168 msgid "--local is ignored" msgstr "l'opzione --local è ignorata" -#: builtin/clone.c:1215 builtin/clone.c:1223 +#: builtin/clone.c:1243 builtin/clone.c:1251 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Il branch remoto %s non è stato trovato nell'upstream %s" -#: builtin/clone.c:1226 +#: builtin/clone.c:1254 msgid "You appear to have cloned an empty repository." msgstr "Sembra che tu abbia clonato un repository vuoto." @@ -11477,7 +12486,7 @@ msgstr "" msgid "duplicate parent %s ignored" msgstr "genitore duplicato %s ignorato" -#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525 +#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526 #, c-format msgid "not a valid object name %s" msgstr "%s non è un nome oggetto valido" @@ -11505,13 +12514,13 @@ msgstr "genitore" msgid "id of a parent commit object" msgstr "ID di un oggetto commit genitore" -#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270 -#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460 +#: builtin/commit-tree.c:114 builtin/commit.c:1501 builtin/merge.c:271 +#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1477 #: builtin/tag.c:412 msgid "message" msgstr "messaggio" -#: builtin/commit-tree.c:115 builtin/commit.c:1500 +#: builtin/commit-tree.c:115 builtin/commit.c:1501 msgid "commit message" msgstr "messaggio di commit" @@ -11519,8 +12528,8 @@ msgstr "messaggio di commit" msgid "read commit log message from file" msgstr "leggi il messaggio di log del commit da un file" -#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287 -#: builtin/pull.c:194 builtin/revert.c:118 +#: builtin/commit-tree.c:121 builtin/commit.c:1513 builtin/merge.c:288 +#: builtin/pull.c:175 builtin/revert.c:118 msgid "GPG sign commit" msgstr "firma il commit con GPG" @@ -11596,57 +12605,66 @@ msgstr "" msgid "failed to unpack HEAD tree object" msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita" -#: builtin/commit.c:356 +#: builtin/commit.c:351 +msgid "--pathspec-from-file with -a does not make sense" +msgstr "l'opzione --pathspec-from-file non ha senso con -a" + +#: builtin/commit.c:364 +msgid "No paths with --include/--only does not make sense." +msgstr "" +"Non specificare un percorso con le opzioni --include/--only non ha senso." + +#: builtin/commit.c:376 msgid "unable to create temporary index" msgstr "impossibile creare l'indice temporaneo" -#: builtin/commit.c:362 +#: builtin/commit.c:385 msgid "interactive add failed" msgstr "aggiunta interattiva non riuscita" -#: builtin/commit.c:376 +#: builtin/commit.c:400 msgid "unable to update temporary index" msgstr "impossibile aggiornare l'indice temporaneo" -#: builtin/commit.c:378 +#: builtin/commit.c:402 msgid "Failed to update main cache tree" msgstr "Impossibile aggiornare l'albero cache principale" -#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472 +#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496 msgid "unable to write new_index file" msgstr "impossibile scrivere il file new_index" -#: builtin/commit.c:455 +#: builtin/commit.c:479 msgid "cannot do a partial commit during a merge." msgstr "impossibile eseguire un commit parziale durante un merge." -#: builtin/commit.c:457 +#: builtin/commit.c:481 msgid "cannot do a partial commit during a cherry-pick." msgstr "impossibile eseguire un commit parziale durante un cherry-pick." -#: builtin/commit.c:465 +#: builtin/commit.c:489 msgid "cannot read the index" msgstr "impossibile leggere l'indice" -#: builtin/commit.c:484 +#: builtin/commit.c:508 msgid "unable to write temporary index file" msgstr "impossibile scrivere il file indice temporaneo" -#: builtin/commit.c:582 +#: builtin/commit.c:606 #, c-format msgid "commit '%s' lacks author header" msgstr "dal commit '%s' manca l'intestazione autore" -#: builtin/commit.c:584 +#: builtin/commit.c:608 #, c-format msgid "commit '%s' has malformed author line" msgstr "il commit '%s' ha una riga autore malformata" -#: builtin/commit.c:603 +#: builtin/commit.c:627 msgid "malformed --author parameter" msgstr "parametro --author malformato" -#: builtin/commit.c:656 +#: builtin/commit.c:680 msgid "" "unable to select a comment character that is not used\n" "in the current commit message" @@ -11654,38 +12672,38 @@ msgstr "" "impossibile selezionare un carattere commento non usato\n" "nel messaggio di commit corrente" -#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072 +#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097 #, c-format msgid "could not lookup commit %s" msgstr "impossibile trovare il commit %s" -#: builtin/commit.c:706 builtin/shortlog.c:319 +#: builtin/commit.c:730 builtin/shortlog.c:319 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lettura del messaggio di log dallo standard input)\n" -#: builtin/commit.c:708 +#: builtin/commit.c:732 msgid "could not read log from standard input" msgstr "impossibile leggere il log dallo standard input" -#: builtin/commit.c:712 +#: builtin/commit.c:736 #, c-format msgid "could not read log file '%s'" msgstr "impossibile leggere il file di log '%s'" -#: builtin/commit.c:743 builtin/commit.c:759 +#: builtin/commit.c:767 builtin/commit.c:783 msgid "could not read SQUASH_MSG" msgstr "impossibile leggere SQUASH_MSG" -#: builtin/commit.c:750 +#: builtin/commit.c:774 msgid "could not read MERGE_MSG" msgstr "impossibile leggere MERGE_MSG" -#: builtin/commit.c:810 +#: builtin/commit.c:834 msgid "could not write commit template" msgstr "impossibile scrivere il modello di commit" -#: builtin/commit.c:829 +#: builtin/commit.c:853 #, c-format msgid "" "\n" @@ -11700,7 +12718,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:834 +#: builtin/commit.c:858 #, c-format msgid "" "\n" @@ -11715,7 +12733,7 @@ msgstr "" "\t%s\n" "e riprova.\n" -#: builtin/commit.c:847 +#: builtin/commit.c:871 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11724,7 +12742,7 @@ msgstr "" "Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n" "con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:855 +#: builtin/commit.c:879 #, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" @@ -11735,149 +12753,144 @@ msgstr "" "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n" "Un messaggio vuoto interromperà il commit.\n" -#: builtin/commit.c:872 +#: builtin/commit.c:896 #, c-format msgid "%sAuthor: %.*s <%.*s>" msgstr "%sAutore: %.*s <%.*s>" -#: builtin/commit.c:880 +#: builtin/commit.c:904 #, c-format msgid "%sDate: %s" msgstr "%sData: %s" -#: builtin/commit.c:887 +#: builtin/commit.c:911 #, c-format msgid "%sCommitter: %.*s <%.*s>" msgstr "%sEsecutore commit: %.*s <%.*s>" -#: builtin/commit.c:905 +#: builtin/commit.c:929 msgid "Cannot read index" msgstr "Impossibile leggere l'indice" -#: builtin/commit.c:972 +#: builtin/commit.c:997 msgid "Error building trees" msgstr "Errore durante la costruzione degli alberi" -#: builtin/commit.c:986 builtin/tag.c:275 +#: builtin/commit.c:1011 builtin/tag.c:275 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n" -#: builtin/commit.c:1030 +#: builtin/commit.c:1055 #, c-format msgid "--author '%s' is not 'Name <email>' and matches no existing author" msgstr "" "--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun " "autore esistente" -#: builtin/commit.c:1044 +#: builtin/commit.c:1069 #, c-format msgid "Invalid ignored mode '%s'" msgstr "Modo non valido ignorato: '%s'" -#: builtin/commit.c:1062 builtin/commit.c:1304 +#: builtin/commit.c:1087 builtin/commit.c:1327 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Modo file non tracciati non valido: '%s'" -#: builtin/commit.c:1102 +#: builtin/commit.c:1127 msgid "--long and -z are incompatible" msgstr "--long e -z non sono compatibili" -#: builtin/commit.c:1146 +#: builtin/commit.c:1171 msgid "Using both --reset-author and --author does not make sense" msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso" -#: builtin/commit.c:1155 +#: builtin/commit.c:1180 msgid "You have nothing to amend." msgstr "Non c'è nulla da modificare." -#: builtin/commit.c:1158 +#: builtin/commit.c:1183 msgid "You are in the middle of a merge -- cannot amend." msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend." -#: builtin/commit.c:1160 +#: builtin/commit.c:1185 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend." -#: builtin/commit.c:1163 +#: builtin/commit.c:1188 msgid "Options --squash and --fixup cannot be used together" msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" -#: builtin/commit.c:1173 +#: builtin/commit.c:1198 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata." -#: builtin/commit.c:1175 +#: builtin/commit.c:1200 msgid "Option -m cannot be combined with -c/-C/-F." msgstr "L'opzione -m non può essere combinata con -c/-C/-F." -#: builtin/commit.c:1183 +#: builtin/commit.c:1208 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend." -#: builtin/commit.c:1200 +#: builtin/commit.c:1225 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Può essere usata solo una delle opzioni --include/--only/--all/--" "interactive/--patch." -#: builtin/commit.c:1202 -msgid "No paths with --include/--only does not make sense." -msgstr "" -"Non specificare un percorso con le opzioni --include/--only non ha senso." - -#: builtin/commit.c:1208 +#: builtin/commit.c:1231 #, c-format msgid "paths '%s ...' with -a does not make sense" msgstr "i percorsi '%s ...' non hanno senso con -a" -#: builtin/commit.c:1339 builtin/commit.c:1523 +#: builtin/commit.c:1362 builtin/commit.c:1524 msgid "show status concisely" msgstr "visualizza concisamente lo stato" -#: builtin/commit.c:1341 builtin/commit.c:1525 +#: builtin/commit.c:1364 builtin/commit.c:1526 msgid "show branch information" msgstr "visualizza le informazioni sul branch" -#: builtin/commit.c:1343 +#: builtin/commit.c:1366 msgid "show stash information" msgstr "visualizza le informazioni sullo stash" -#: builtin/commit.c:1345 builtin/commit.c:1527 +#: builtin/commit.c:1368 builtin/commit.c:1528 msgid "compute full ahead/behind values" msgstr "calcola tutti i valori dopo/prima di" -#: builtin/commit.c:1347 +#: builtin/commit.c:1370 msgid "version" msgstr "versione" -#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561 -#: builtin/worktree.c:651 +#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549 +#: builtin/worktree.c:643 msgid "machine-readable output" msgstr "output leggibile da una macchina" -#: builtin/commit.c:1350 builtin/commit.c:1531 +#: builtin/commit.c:1373 builtin/commit.c:1532 msgid "show status in long format (default)" msgstr "visualizza lo stato in forma lunga (impostazione predefinita)" -#: builtin/commit.c:1353 builtin/commit.c:1534 +#: builtin/commit.c:1376 builtin/commit.c:1535 msgid "terminate entries with NUL" msgstr "termina le voci con NUL" -#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537 -#: builtin/fast-export.c:1125 builtin/fast-export.c:1128 -#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332 +#: builtin/commit.c:1378 builtin/commit.c:1382 builtin/commit.c:1538 +#: builtin/fast-export.c:1153 builtin/fast-export.c:1156 +#: builtin/fast-export.c:1159 builtin/rebase.c:1569 parse-options.h:336 msgid "mode" msgstr "modo" -#: builtin/commit.c:1356 builtin/commit.c:1537 +#: builtin/commit.c:1379 builtin/commit.c:1538 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "visualizza file non tracciati, modalità facoltative: all, normal, no. " "(Impostazione predefinita: all)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1383 msgid "" "show ignored files, optional modes: traditional, matching, no. (Default: " "traditional)" @@ -11885,11 +12898,11 @@ msgstr "" "visualizza file ignorati, modalità facoltative: traditional, matching, no. " "(Impostazione predefinita: traditional)" -#: builtin/commit.c:1362 parse-options.h:179 +#: builtin/commit.c:1385 parse-options.h:192 msgid "when" msgstr "quando" -#: builtin/commit.c:1363 +#: builtin/commit.c:1386 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -11897,175 +12910,175 @@ msgstr "" "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, " "untracked. (Impostazione predefinita: all)" -#: builtin/commit.c:1365 +#: builtin/commit.c:1388 msgid "list untracked files in columns" msgstr "elenca i file non tracciati in colonne" -#: builtin/commit.c:1366 +#: builtin/commit.c:1389 msgid "do not detect renames" msgstr "non rilevare le ridenominazioni" -#: builtin/commit.c:1368 +#: builtin/commit.c:1391 msgid "detect renames, optionally set similarity index" msgstr "" "rileva le ridenominazioni, imposta facoltativamente l'indice di similarità" -#: builtin/commit.c:1388 +#: builtin/commit.c:1411 msgid "Unsupported combination of ignored and untracked-files arguments" msgstr "" "Combinazione di argomenti sui file ignorati e non tracciati non supportata" -#: builtin/commit.c:1493 +#: builtin/commit.c:1494 msgid "suppress summary after successful commit" msgstr "" "ometti di visualizzare il riepilogo dopo un commit completato con successo" -#: builtin/commit.c:1494 +#: builtin/commit.c:1495 msgid "show diff in commit message template" msgstr "visualizza il diff nel modello del messaggio di commit" -#: builtin/commit.c:1496 +#: builtin/commit.c:1497 msgid "Commit message options" msgstr "Opzioni messaggio di commit" -#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414 +#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414 msgid "read message from file" msgstr "leggi il messaggio da un file" -#: builtin/commit.c:1498 +#: builtin/commit.c:1499 msgid "author" msgstr "autore" -#: builtin/commit.c:1498 +#: builtin/commit.c:1499 msgid "override author for commit" msgstr "sovrascrivi l'autore per il commit" -#: builtin/commit.c:1499 builtin/gc.c:539 +#: builtin/commit.c:1500 builtin/gc.c:538 msgid "date" msgstr "data" -#: builtin/commit.c:1499 +#: builtin/commit.c:1500 msgid "override date for commit" msgstr "sovrascrivi la data per il commit" -#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503 -#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92 +#: builtin/commit.c:1502 builtin/commit.c:1503 builtin/commit.c:1504 +#: builtin/commit.c:1505 parse-options.h:328 ref-filter.h:92 msgid "commit" msgstr "commit" -#: builtin/commit.c:1501 +#: builtin/commit.c:1502 msgid "reuse and edit message from specified commit" msgstr "riusa il messaggio del commit specificato per poi modificarlo" -#: builtin/commit.c:1502 +#: builtin/commit.c:1503 msgid "reuse message from specified commit" msgstr "riusa il messaggio del commit specificato" -#: builtin/commit.c:1503 +#: builtin/commit.c:1504 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "usa il messaggio in formato autosquash per correggere il commit specificato" -#: builtin/commit.c:1504 +#: builtin/commit.c:1505 msgid "use autosquash formatted message to squash specified commit" msgstr "" "usa il messaggio in formato autosquash per eseguire lo squash del commit " "specificato" -#: builtin/commit.c:1505 +#: builtin/commit.c:1506 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)" -#: builtin/commit.c:1506 builtin/log.c:1564 builtin/merge.c:289 -#: builtin/pull.c:163 builtin/revert.c:110 +#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290 +#: builtin/pull.c:144 builtin/revert.c:110 msgid "add Signed-off-by:" msgstr "aggiungi Signed-off-by:" -#: builtin/commit.c:1507 +#: builtin/commit.c:1508 msgid "use specified template file" msgstr "usa il file modello specificato" -#: builtin/commit.c:1508 +#: builtin/commit.c:1509 msgid "force edit of commit" msgstr "forza la modifica del commit" -#: builtin/commit.c:1510 +#: builtin/commit.c:1511 msgid "include status in commit message template" msgstr "includi lo stato nel modello del messaggio di commit" -#: builtin/commit.c:1515 +#: builtin/commit.c:1516 msgid "Commit contents options" msgstr "Opzioni contenuto commit" -#: builtin/commit.c:1516 +#: builtin/commit.c:1517 msgid "commit all changed files" msgstr "esegui il commit di tutti i file modificati" -#: builtin/commit.c:1517 +#: builtin/commit.c:1518 msgid "add specified files to index for commit" msgstr "aggiungi i file specificati all'indice per il commit" -#: builtin/commit.c:1518 +#: builtin/commit.c:1519 msgid "interactively add files" msgstr "aggiungi i file in modalità interattiva" -#: builtin/commit.c:1519 +#: builtin/commit.c:1520 msgid "interactively add changes" msgstr "aggiungi le modifiche in modalità interattiva" -#: builtin/commit.c:1520 +#: builtin/commit.c:1521 msgid "commit only specified files" msgstr "esegui il commit solo dei file specificati" -#: builtin/commit.c:1521 +#: builtin/commit.c:1522 msgid "bypass pre-commit and commit-msg hooks" msgstr "ignora gli hook pre-commit e commit-msg" -#: builtin/commit.c:1522 +#: builtin/commit.c:1523 msgid "show what would be committed" msgstr "visualizza gli elementi di cui sarebbe eseguito il commit" -#: builtin/commit.c:1535 +#: builtin/commit.c:1536 msgid "amend previous commit" msgstr "modifica il commit precedente" -#: builtin/commit.c:1536 +#: builtin/commit.c:1537 msgid "bypass post-rewrite hook" msgstr "ignora l'hook post-rewrite" -#: builtin/commit.c:1541 +#: builtin/commit.c:1544 msgid "ok to record an empty change" msgstr "accetta di registrare una modifica vuota" -#: builtin/commit.c:1543 +#: builtin/commit.c:1546 msgid "ok to record a change with an empty message" msgstr "accetta di registrare una modifica con un messaggio vuoto" -#: builtin/commit.c:1616 +#: builtin/commit.c:1619 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "File MERGE_HEAD corrotto (%s)" -#: builtin/commit.c:1623 +#: builtin/commit.c:1626 msgid "could not read MERGE_MODE" msgstr "impossibile leggere MERGE_MODE" -#: builtin/commit.c:1642 +#: builtin/commit.c:1645 #, c-format msgid "could not read commit message: %s" msgstr "impossibile leggere il messaggio di commit: %s" -#: builtin/commit.c:1649 +#: builtin/commit.c:1652 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n" -#: builtin/commit.c:1654 +#: builtin/commit.c:1657 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Interrompo il commit; non hai modificato il messaggio.\n" -#: builtin/commit.c:1688 +#: builtin/commit.c:1691 msgid "" "repository has been updated, but unable to write\n" "new_index file. Check that disk is not full and quota is\n" @@ -12077,76 +13090,75 @@ msgstr "" "superata, quindi esegui \"git restore --staged :/\" per\n" "procedere al ripristino." -#: builtin/commit-graph.c:11 -msgid "git commit-graph [--object-dir <objdir>]" -msgstr "git commit-graph [--object-dir <directory oggetti>]" - -#: builtin/commit-graph.c:12 builtin/commit-graph.c:24 -msgid "git commit-graph read [--object-dir <objdir>]" -msgstr "git commit-graph read [--object-dir <directory oggetti>]" - -#: builtin/commit-graph.c:13 builtin/commit-graph.c:19 -msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]" -msgstr "git commit-graph verify [--object-dir <directory oggetti>] [--shallow]" +#: builtin/commit-graph.c:11 builtin/commit-graph.c:17 +msgid "" +"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]" +msgstr "" +"git commit-graph verify [--object-dir <directory oggetti>] [--shallow] [--" +"[no-]progress]" -#: builtin/commit-graph.c:14 builtin/commit-graph.c:29 +#: builtin/commit-graph.c:12 builtin/commit-graph.c:22 msgid "" "git commit-graph write [--object-dir <objdir>] [--append|--split] [--" -"reachable|--stdin-packs|--stdin-commits] <split options>" +"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>" msgstr "" "git commit-graph write [--object-dir <directory oggetti>] [--append|--split] " -"[--reachable|--stdin-packs|--stdin-commits] <opzioni split>" +"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>" + +#: builtin/commit-graph.c:52 +#, c-format +msgid "could not find object directory matching %s" +msgstr "impossibile trovare la directory oggetti corrispondente a %s" -#: builtin/commit-graph.c:54 builtin/commit-graph.c:100 -#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163 -#: builtin/log.c:1584 +#: builtin/commit-graph.c:68 builtin/commit-graph.c:125 +#: builtin/commit-graph.c:210 builtin/fetch.c:179 builtin/log.c:1657 msgid "dir" msgstr "directory" -#: builtin/commit-graph.c:55 builtin/commit-graph.c:101 -#: builtin/commit-graph.c:162 builtin/commit-graph.c:238 +#: builtin/commit-graph.c:69 builtin/commit-graph.c:126 +#: builtin/commit-graph.c:211 msgid "The object directory to store the graph" msgstr "La directory oggetti in cui memorizzare il grafo" -#: builtin/commit-graph.c:57 +#: builtin/commit-graph.c:71 msgid "if the commit-graph is split, only verify the tip file" msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file" -#: builtin/commit-graph.c:73 builtin/commit-graph.c:116 +#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23 #, c-format msgid "Could not open commit-graph '%s'" msgstr "Impossibile aprire il grafo dei commit '%s'" -#: builtin/commit-graph.c:164 +#: builtin/commit-graph.c:128 msgid "start walk at all refs" msgstr "inizia la visita da tutti i riferimenti" -#: builtin/commit-graph.c:166 +#: builtin/commit-graph.c:130 msgid "scan pack-indexes listed by stdin for commits" msgstr "" "esamina i pack-index elencati sullo standard input alla ricerca di commit" -#: builtin/commit-graph.c:168 +#: builtin/commit-graph.c:132 msgid "start walk at commits listed by stdin" msgstr "inizia la visita ai commit elencati sullo standard input" -#: builtin/commit-graph.c:170 +#: builtin/commit-graph.c:134 msgid "include all commits already in the commit-graph file" msgstr "includi tutti i commit già presenti nel file commit-graph" -#: builtin/commit-graph.c:172 +#: builtin/commit-graph.c:137 msgid "allow writing an incremental commit-graph file" msgstr "consenti la scrittura di un file grafo dei commit incrementale" -#: builtin/commit-graph.c:174 builtin/commit-graph.c:178 +#: builtin/commit-graph.c:139 builtin/commit-graph.c:143 msgid "maximum number of commits in a non-base split commit-graph" msgstr "numero massimo di commit in un grafo dei commit diviso non di base" -#: builtin/commit-graph.c:176 +#: builtin/commit-graph.c:141 msgid "maximum ratio between two levels of a split commit-graph" msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso" -#: builtin/commit-graph.c:191 +#: builtin/commit-graph.c:159 msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs" msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" @@ -12154,212 +13166,218 @@ msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs" msgid "git config [<options>]" msgstr "git config [<opzioni>]" -#: builtin/config.c:103 builtin/env--helper.c:23 +#: builtin/config.c:104 builtin/env--helper.c:23 #, c-format msgid "unrecognized --type argument, %s" msgstr "argomento --type non riconosciuto: %s" -#: builtin/config.c:115 +#: builtin/config.c:116 msgid "only one type at a time" msgstr "solo un tipo per volta" -#: builtin/config.c:124 +#: builtin/config.c:125 msgid "Config file location" msgstr "Percorso file di configurazione" -#: builtin/config.c:125 +#: builtin/config.c:126 msgid "use global config file" msgstr "usa il file di configurazione globale" -#: builtin/config.c:126 +#: builtin/config.c:127 msgid "use system config file" msgstr "usa il file di configurazione di sistema" -#: builtin/config.c:127 +#: builtin/config.c:128 msgid "use repository config file" msgstr "usa il file di configurazione del repository" -#: builtin/config.c:128 +#: builtin/config.c:129 msgid "use per-worktree config file" msgstr "usa il file di configurazione per albero di lavoro" -#: builtin/config.c:129 +#: builtin/config.c:130 msgid "use given config file" msgstr "usa il file di configurazione specificato" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "blob-id" msgstr "ID blob" -#: builtin/config.c:130 +#: builtin/config.c:131 msgid "read config from given blob object" msgstr "leggi la configurazione dall'oggetto blob specificato" -#: builtin/config.c:131 +#: builtin/config.c:132 msgid "Action" msgstr "Azione" -#: builtin/config.c:132 +#: builtin/config.c:133 msgid "get value: name [value-regex]" msgstr "ottieni valore: nome [espressione-regolare-valore]" -#: builtin/config.c:133 +#: builtin/config.c:134 msgid "get all values: key [value-regex]" msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]" -#: builtin/config.c:134 +#: builtin/config.c:135 msgid "get values for regexp: name-regex [value-regex]" msgstr "" "ottieni i valori in base a un'espressione regolare: espressione-regolare-" "nome [espressione-regolare-valore]" -#: builtin/config.c:135 +#: builtin/config.c:136 msgid "get value specific for the URL: section[.var] URL" msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL" -#: builtin/config.c:136 +#: builtin/config.c:137 msgid "replace all matching variables: name value [value_regex]" msgstr "" "sostituisci tutte le variabili corrispondenti: nome-valore [espressione-" "regolare-valore]" -#: builtin/config.c:137 +#: builtin/config.c:138 msgid "add a new variable: name value" msgstr "aggiungi una nuova variabile: nome valore" -#: builtin/config.c:138 +#: builtin/config.c:139 msgid "remove a variable: name [value-regex]" msgstr "rimuovi una variabile: nome [espressione-regolare-valore]" -#: builtin/config.c:139 +#: builtin/config.c:140 msgid "remove all matches: name [value-regex]" msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]" -#: builtin/config.c:140 +#: builtin/config.c:141 msgid "rename section: old-name new-name" msgstr "rinomina sezione: vecchio-nome nuovo-nome" -#: builtin/config.c:141 +#: builtin/config.c:142 msgid "remove a section: name" msgstr "rimuovi una sezione: nome" -#: builtin/config.c:142 +#: builtin/config.c:143 msgid "list all" msgstr "elenca tutti" -#: builtin/config.c:143 +#: builtin/config.c:144 msgid "open an editor" msgstr "apri un editor" -#: builtin/config.c:144 +#: builtin/config.c:145 msgid "find the color configured: slot [default]" msgstr "trova il colore configurato: slot [valore-predefinito]" -#: builtin/config.c:145 +#: builtin/config.c:146 msgid "find the color setting: slot [stdout-is-tty]" msgstr "trova l'impostazione colore: slot [standard-output-è-una-tty]" -#: builtin/config.c:146 +#: builtin/config.c:147 msgid "Type" msgstr "Tipo" -#: builtin/config.c:147 builtin/env--helper.c:38 +#: builtin/config.c:148 builtin/env--helper.c:38 msgid "value is given this type" msgstr "al valore è assegnato questo tipo" -#: builtin/config.c:148 +#: builtin/config.c:149 msgid "value is \"true\" or \"false\"" msgstr "il valore è \"true\" o \"false\"" -#: builtin/config.c:149 +#: builtin/config.c:150 msgid "value is decimal number" msgstr "il valore è un numero decimale" -#: builtin/config.c:150 +#: builtin/config.c:151 msgid "value is --bool or --int" msgstr "il valore è --bool o --int" -#: builtin/config.c:151 +#: builtin/config.c:152 msgid "value is a path (file or directory name)" msgstr "il valore è un percorso (nome file o directory)" -#: builtin/config.c:152 +#: builtin/config.c:153 msgid "value is an expiry date" msgstr "il valore è una data di scadenza" -#: builtin/config.c:153 +#: builtin/config.c:154 msgid "Other" msgstr "Altro" -#: builtin/config.c:154 +#: builtin/config.c:155 msgid "terminate values with NUL byte" msgstr "termina i valori con un byte NUL" -#: builtin/config.c:155 +#: builtin/config.c:156 msgid "show variable names only" msgstr "visualizza solo i nomi delle variabili" -#: builtin/config.c:156 +#: builtin/config.c:157 msgid "respect include directives on lookup" msgstr "" "rispetta le directory di inclusione durante il recupero delle variabili" -#: builtin/config.c:157 +#: builtin/config.c:158 msgid "show origin of config (file, standard input, blob, command line)" msgstr "" "visualizza l'origine del file di configurazione (file, standard input, blob, " "riga di comando)" -#: builtin/config.c:158 builtin/env--helper.c:40 +#: builtin/config.c:159 +msgid "show scope of config (worktree, local, global, system, command)" +msgstr "" +"visualizza l'ambito della configurazione (albero di lavoro, locale, globale, " +"sistema, comando)" + +#: builtin/config.c:160 builtin/env--helper.c:40 msgid "value" msgstr "valore" -#: builtin/config.c:158 +#: builtin/config.c:160 msgid "with --get, use default value when missing entry" msgstr "con --get, usa il valore predefinito se la voce è mancante" -#: builtin/config.c:172 +#: builtin/config.c:174 #, c-format msgid "wrong number of arguments, should be %d" msgstr "numero di argomenti errato, dovrebbero essere %d" -#: builtin/config.c:174 +#: builtin/config.c:176 #, c-format msgid "wrong number of arguments, should be from %d to %d" msgstr "numero di argomenti errato, dovrebbero essere da %d a %d" -#: builtin/config.c:308 +#: builtin/config.c:324 #, c-format msgid "invalid key pattern: %s" msgstr "pattern chiave non valido: %s" -#: builtin/config.c:344 +#: builtin/config.c:360 #, c-format msgid "failed to format default config value: %s" msgstr "formattazione del valore configurazione predefinito non riuscita: %s" -#: builtin/config.c:401 +#: builtin/config.c:417 #, c-format msgid "cannot parse color '%s'" msgstr "impossibile analizzare il colore '%s'" -#: builtin/config.c:443 +#: builtin/config.c:459 msgid "unable to parse default color value" msgstr "impossibile analizzare il valore colore predefinito" -#: builtin/config.c:496 builtin/config.c:742 +#: builtin/config.c:512 builtin/config.c:768 msgid "not in a git directory" msgstr "non si è in una directory git" -#: builtin/config.c:499 +#: builtin/config.c:515 msgid "writing to stdin is not supported" msgstr "la scrittura su standard input non è supportata" -#: builtin/config.c:502 +#: builtin/config.c:518 msgid "writing config blobs is not supported" msgstr "la scrittura di blob di configurazione non è supportata" -#: builtin/config.c:587 +#: builtin/config.c:603 #, c-format msgid "" "# This is Git's per-user configuration file.\n" @@ -12374,23 +13392,23 @@ msgstr "" "#\tname = %s\n" "#\temail = %s\n" -#: builtin/config.c:611 +#: builtin/config.c:627 msgid "only one config file at a time" msgstr "solo un file di configurazione per volta" -#: builtin/config.c:616 +#: builtin/config.c:632 msgid "--local can only be used inside a git repository" msgstr "--local può essere usato solo in un repository Git" -#: builtin/config.c:619 +#: builtin/config.c:635 msgid "--blob can only be used inside a git repository" msgstr "--blob può essere usato solo in un repository Git" -#: builtin/config.c:638 +#: builtin/config.c:655 msgid "$HOME not set" msgstr "$HOME non impostata" -#: builtin/config.c:658 +#: builtin/config.c:679 msgid "" "--worktree cannot be used with multiple working trees unless the config\n" "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n" @@ -12401,52 +13419,52 @@ msgstr "" "Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n" "i dettagli" -#: builtin/config.c:688 +#: builtin/config.c:714 msgid "--get-color and variable type are incoherent" msgstr "--get-color e il tipo della variabile non sono coerenti" -#: builtin/config.c:693 +#: builtin/config.c:719 msgid "only one action at a time" msgstr "solo un'azione per volta" -#: builtin/config.c:706 +#: builtin/config.c:732 msgid "--name-only is only applicable to --list or --get-regexp" msgstr "--name-only è applicabile solo a --list o --get-regexp" -#: builtin/config.c:712 +#: builtin/config.c:738 msgid "" "--show-origin is only applicable to --get, --get-all, --get-regexp, and --" "list" msgstr "" "--show-origin è applicabile solo a --get, --get-all, --get-regexp e --list" -#: builtin/config.c:718 +#: builtin/config.c:744 msgid "--default is only applicable to --get" msgstr "--default è applicabile solo a --get" -#: builtin/config.c:731 +#: builtin/config.c:757 #, c-format msgid "unable to read config file '%s'" msgstr "impossibile leggere il file di configurazione '%s'" -#: builtin/config.c:734 +#: builtin/config.c:760 msgid "error processing config file(s)" msgstr "errore durante l'elaborazione del/dei file di configurazione" -#: builtin/config.c:744 +#: builtin/config.c:770 msgid "editing stdin is not supported" msgstr "la modifica dello standard input non è supportata" -#: builtin/config.c:746 +#: builtin/config.c:772 msgid "editing blobs is not supported" msgstr "la modifica dei blob non è supportata" -#: builtin/config.c:760 +#: builtin/config.c:786 #, c-format msgid "cannot create configuration file %s" msgstr "impossibile creare il file di configurazione %s" -#: builtin/config.c:773 +#: builtin/config.c:799 #, c-format msgid "" "cannot overwrite multiple values with a single value\n" @@ -12455,7 +13473,7 @@ msgstr "" "impossibile sovrascrivere valori multipli con un singolo valore\n" " Usa un'espressione regolare, --add o --replace-all per modificare %s." -#: builtin/config.c:847 builtin/config.c:858 +#: builtin/config.c:873 builtin/config.c:884 #, c-format msgid "no such section: %s" msgstr "sezione %s non esistente" @@ -12468,59 +13486,59 @@ msgstr "git count-objects [-v] [-H | --human-readable]" msgid "print sizes in human readable format" msgstr "stampa le dimensioni in un formato leggibile" -#: builtin/describe.c:27 +#: builtin/describe.c:26 msgid "git describe [<options>] [<commit-ish>...]" msgstr "git describe [<opzioni>] [<espressione commit>...]" -#: builtin/describe.c:28 +#: builtin/describe.c:27 msgid "git describe [<options>] --dirty" msgstr "git describe [<opzioni>] --dirty" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "head" msgstr "head" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "lightweight" msgstr "leggero" -#: builtin/describe.c:63 +#: builtin/describe.c:62 msgid "annotated" msgstr "annotato" -#: builtin/describe.c:273 +#: builtin/describe.c:275 #, c-format msgid "annotated tag %s not available" msgstr "il tag annotato %s non è disponibile" -#: builtin/describe.c:277 +#: builtin/describe.c:279 #, c-format msgid "annotated tag %s has no embedded name" msgstr "il tag annotato %s non ha un nome incorporato" -#: builtin/describe.c:279 +#: builtin/describe.c:281 #, c-format msgid "tag '%s' is really '%s' here" msgstr "il tag '%s' in realtà qui è '%s'" -#: builtin/describe.c:323 +#: builtin/describe.c:325 #, c-format msgid "no tag exactly matches '%s'" msgstr "nessun tag corrisponde esattamente a '%s'" -#: builtin/describe.c:325 +#: builtin/describe.c:327 #, c-format msgid "No exact match on refs or tags, searching to describe\n" msgstr "" "Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una " "ricerca per descrivere il commit\n" -#: builtin/describe.c:379 +#: builtin/describe.c:394 #, c-format msgid "finished search at %s\n" msgstr "ricerca terminata in %s\n" -#: builtin/describe.c:405 +#: builtin/describe.c:421 #, c-format msgid "" "No annotated tags can describe '%s'.\n" @@ -12529,7 +13547,7 @@ msgstr "" "Nessun tag annotato può descrivere '%s'.\n" "Ciò nonostante, c'erano dei tag non annotati: prova con --tags." -#: builtin/describe.c:409 +#: builtin/describe.c:425 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -12538,12 +13556,12 @@ msgstr "" "Nessun tag può descrivere '%s'.\n" "Prova con --always o crea dei tag." -#: builtin/describe.c:439 +#: builtin/describe.c:455 #, c-format msgid "traversed %lu commits\n" msgstr "ho attraversato %lu commit\n" -#: builtin/describe.c:442 +#: builtin/describe.c:458 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -12552,94 +13570,94 @@ msgstr "" "trovati più di %i tag; ho elencato i %i più recenti\n" "ho terminato la ricerca in %s\n" -#: builtin/describe.c:510 +#: builtin/describe.c:526 #, c-format msgid "describe %s\n" msgstr "descrivi %s\n" -#: builtin/describe.c:513 +#: builtin/describe.c:529 #, c-format msgid "Not a valid object name %s" msgstr "%s non è un nome oggetto valido" -#: builtin/describe.c:521 +#: builtin/describe.c:537 #, c-format msgid "%s is neither a commit nor blob" msgstr "%s non è né un commit né un blob" -#: builtin/describe.c:535 +#: builtin/describe.c:551 msgid "find the tag that comes after the commit" msgstr "trova il tag successivo al commit" -#: builtin/describe.c:536 +#: builtin/describe.c:552 msgid "debug search strategy on stderr" msgstr "esegui il debug della strategia di ricerca sullo standard error" -#: builtin/describe.c:537 +#: builtin/describe.c:553 msgid "use any ref" msgstr "usa qualunque riferimento" -#: builtin/describe.c:538 +#: builtin/describe.c:554 msgid "use any tag, even unannotated" msgstr "usa qualunque tag, anche quelli non annotati" -#: builtin/describe.c:539 +#: builtin/describe.c:555 msgid "always use long format" msgstr "usa sempre il formato lungo" -#: builtin/describe.c:540 +#: builtin/describe.c:556 msgid "only follow first parent" msgstr "segui solo il primo genitore" -#: builtin/describe.c:543 +#: builtin/describe.c:559 msgid "only output exact matches" msgstr "visualizza solo le corrispondenze esatte" -#: builtin/describe.c:545 +#: builtin/describe.c:561 msgid "consider <n> most recent tags (default: 10)" msgstr "considera gli <n> tag più recenti (impostazione predefinita: 10)" -#: builtin/describe.c:547 +#: builtin/describe.c:563 msgid "only consider tags matching <pattern>" msgstr "considera solo i tag corrispondenti al <pattern>" -#: builtin/describe.c:549 +#: builtin/describe.c:565 msgid "do not consider tags matching <pattern>" msgstr "non considerare i tag corrispondenti al <pattern>" -#: builtin/describe.c:551 builtin/name-rev.c:422 +#: builtin/describe.c:567 builtin/name-rev.c:535 msgid "show abbreviated commit object as fallback" msgstr "visualizza l'oggetto commit abbreviato come fallback" -#: builtin/describe.c:552 builtin/describe.c:555 +#: builtin/describe.c:568 builtin/describe.c:571 msgid "mark" msgstr "contrassegno" -#: builtin/describe.c:553 +#: builtin/describe.c:569 msgid "append <mark> on dirty working tree (default: \"-dirty\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione " "predefinita: \"-dirty\")" -#: builtin/describe.c:556 +#: builtin/describe.c:572 msgid "append <mark> on broken working tree (default: \"-broken\")" msgstr "" "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione " "predefinita: \"-broken\")" -#: builtin/describe.c:574 +#: builtin/describe.c:590 msgid "--long is incompatible with --abbrev=0" msgstr "--long non è compatibile con --abbrev=0" -#: builtin/describe.c:603 +#: builtin/describe.c:619 msgid "No names found, cannot describe anything." msgstr "Nessun nome trovato, non è possibile descrivere nulla." -#: builtin/describe.c:654 +#: builtin/describe.c:670 msgid "--dirty is incompatible with commit-ishes" msgstr "--dirty non è compatibile con le espressioni commit" -#: builtin/describe.c:656 +#: builtin/describe.c:672 msgid "--broken is incompatible with commit-ishes" msgstr "--broken non è compatibile con le espressioni commit" @@ -12676,27 +13694,27 @@ msgstr "specificato oggetto non gestito '%s'." msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]" msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]" -#: builtin/difftool.c:253 +#: builtin/difftool.c:260 #, c-format msgid "failed: %d" msgstr "non riuscito: %d" -#: builtin/difftool.c:295 +#: builtin/difftool.c:302 #, c-format msgid "could not read symlink %s" msgstr "impossibile leggere il collegamento simbolico %s" -#: builtin/difftool.c:297 +#: builtin/difftool.c:304 #, c-format msgid "could not read symlink file %s" msgstr "impossibile leggere il file collegamento simbolico %s" -#: builtin/difftool.c:305 +#: builtin/difftool.c:312 #, c-format msgid "could not read object %s for symlink %s" msgstr "impossibile leggere l'oggetto %s per il collegamento simbolico %s" -#: builtin/difftool.c:406 +#: builtin/difftool.c:413 msgid "" "combined diff formats('-c' and '--cc') are not supported in\n" "directory diff mode('-d' and '--dir-diff')." @@ -12704,54 +13722,54 @@ msgstr "" "i formati diff combinati ('-c' e '--cc') non sono supportati in\n" "modalità diff directory ('-d' e '--dir-diff')." -#: builtin/difftool.c:626 +#: builtin/difftool.c:634 #, c-format msgid "both files modified: '%s' and '%s'." msgstr "entrambi i file risultano modificati: '%s' e '%s'." -#: builtin/difftool.c:628 +#: builtin/difftool.c:636 msgid "working tree file has been left." msgstr "il file nell'albero di lavoro è stato mantenuto." -#: builtin/difftool.c:639 +#: builtin/difftool.c:647 #, c-format msgid "temporary files exist in '%s'." msgstr "esistono file temporanei in '%s'." -#: builtin/difftool.c:640 +#: builtin/difftool.c:648 msgid "you may want to cleanup or recover these." msgstr "potresti voler ripulirli o ripristinarli." -#: builtin/difftool.c:689 +#: builtin/difftool.c:697 msgid "use `diff.guitool` instead of `diff.tool`" msgstr "usa `diff.guitool` anziché `diff.tool`" -#: builtin/difftool.c:691 +#: builtin/difftool.c:699 msgid "perform a full-directory diff" msgstr "esegui un diff directory completo" -#: builtin/difftool.c:693 +#: builtin/difftool.c:701 msgid "do not prompt before launching a diff tool" msgstr "non chiedere conferma prima di lanciare un tool diff" -#: builtin/difftool.c:698 +#: builtin/difftool.c:706 msgid "use symlinks in dir-diff mode" msgstr "usa collegamenti simbolici in modalità diff directory" -#: builtin/difftool.c:699 +#: builtin/difftool.c:707 msgid "tool" msgstr "strumento" -#: builtin/difftool.c:700 +#: builtin/difftool.c:708 msgid "use the specified diff tool" msgstr "usa lo strumento diff specificato" -#: builtin/difftool.c:702 +#: builtin/difftool.c:710 msgid "print a list of diff tools that may be used with `--tool`" msgstr "" "stampa un elenco di strumenti diff che possono essere usati con `--tool`" -#: builtin/difftool.c:705 +#: builtin/difftool.c:713 msgid "" "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit " "code" @@ -12759,31 +13777,31 @@ msgstr "" "fai sì che 'git-difftool' esca quando uno strumento diff invocato " "restituisce un codice d'uscita diverso da zero" -#: builtin/difftool.c:708 +#: builtin/difftool.c:716 msgid "specify a custom command for viewing diffs" msgstr "specifica un comando personalizzato per visualizzare i diff" -#: builtin/difftool.c:709 +#: builtin/difftool.c:717 msgid "passed to `diff`" msgstr "fornito a `diff`" -#: builtin/difftool.c:724 +#: builtin/difftool.c:732 msgid "difftool requires worktree or --no-index" msgstr "difftool richiede un albero di lavoro o --no-index" -#: builtin/difftool.c:731 +#: builtin/difftool.c:739 msgid "--dir-diff is incompatible with --no-index" msgstr "--dir-diff non è compatibile con --no-index" -#: builtin/difftool.c:734 +#: builtin/difftool.c:742 msgid "--gui, --tool and --extcmd are mutually exclusive" msgstr "le opzioni --gui, --tool ed --extcmd sono mutualmente esclusive" -#: builtin/difftool.c:742 +#: builtin/difftool.c:750 msgid "no <tool> given for --tool=<tool>" msgstr "nessuno <strumento> specificato per --tool=<strumento>" -#: builtin/difftool.c:749 +#: builtin/difftool.c:757 msgid "no <cmd> given for --extcmd=<cmd>" msgstr "nessun <comando> specificato per --extcmd=<comando>" @@ -12825,161 +13843,189 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [opzioni-elenco-rev]" -#: builtin/fast-export.c:1124 +#: builtin/fast-export.c:853 +msgid "Error: Cannot export nested tags unless --mark-tags is specified." +msgstr "" +"Errore: Impossibile esportare i tag nidificati a meno che non sia " +"specificata l'opzione --mark-tags." + +#: builtin/fast-export.c:1152 msgid "show progress after <n> objects" msgstr "visualizza l'avanzamento dopo <n> oggetti" -#: builtin/fast-export.c:1126 +#: builtin/fast-export.c:1154 msgid "select handling of signed tags" msgstr "seleziona la gestione dei tag firmati" -#: builtin/fast-export.c:1129 +#: builtin/fast-export.c:1157 msgid "select handling of tags that tag filtered objects" msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati" -#: builtin/fast-export.c:1132 +#: builtin/fast-export.c:1160 msgid "select handling of commit messages in an alternate encoding" msgstr "" "seleziona la gestione dei messaggi di commit in una codifica alternativa" -#: builtin/fast-export.c:1135 +#: builtin/fast-export.c:1163 msgid "Dump marks to this file" msgstr "Esegui il dump dei contrassegni in questo file" -#: builtin/fast-export.c:1137 +#: builtin/fast-export.c:1165 msgid "Import marks from this file" msgstr "Importa i contrassegni da questo file" -#: builtin/fast-export.c:1139 +#: builtin/fast-export.c:1169 +msgid "Import marks from this file if it exists" +msgstr "Importa i contrassegni da questo file se esiste" + +#: builtin/fast-export.c:1171 msgid "Fake a tagger when tags lack one" msgstr "Usa un tagger falso se i tag non ne hanno uno" -#: builtin/fast-export.c:1141 +#: builtin/fast-export.c:1173 msgid "Output full tree for each commit" msgstr "Visualizza in output l'albero completo per ogni commit" -#: builtin/fast-export.c:1143 +#: builtin/fast-export.c:1175 msgid "Use the done feature to terminate the stream" msgstr "Usa la funzionalità \"fatto\" per terminare il flusso" -#: builtin/fast-export.c:1144 +#: builtin/fast-export.c:1176 msgid "Skip output of blob data" msgstr "Ometti l'output dei dati dei blob" -#: builtin/fast-export.c:1145 builtin/log.c:1632 +#: builtin/fast-export.c:1177 builtin/log.c:1705 msgid "refspec" msgstr "specificatore riferimento" -#: builtin/fast-export.c:1146 +#: builtin/fast-export.c:1178 msgid "Apply refspec to exported refs" msgstr "Applica lo specificatore riferimento ai riferimenti esportati" -#: builtin/fast-export.c:1147 +#: builtin/fast-export.c:1179 msgid "anonymize output" msgstr "rendi anonimo l'output" -#: builtin/fast-export.c:1149 +#: builtin/fast-export.c:1181 msgid "Reference parents which are not in fast-export stream by object id" msgstr "" "Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto" -#: builtin/fast-export.c:1151 +#: builtin/fast-export.c:1183 msgid "Show original object ids of blobs/commits" msgstr "Visualizza gli ID oggetto originari dei blob/commit" -#: builtin/fetch.c:30 +#: builtin/fast-export.c:1185 +msgid "Label tags with mark ids" +msgstr "Etichetta i tag con ID contrassegno" + +#: builtin/fast-export.c:1220 +msgid "Cannot pass both --import-marks and --import-marks-if-exists" +msgstr "" +"Impossibile fornire entrambe le opzioni --import-marks e --import-marks-if-" +"exists" + +#: builtin/fetch.c:34 msgid "git fetch [<options>] [<repository> [<refspec>...]]" msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/fetch.c:31 +#: builtin/fetch.c:35 msgid "git fetch [<options>] <group>" msgstr "git fetch [<opzioni>] <gruppo>" -#: builtin/fetch.c:32 +#: builtin/fetch.c:36 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]" -#: builtin/fetch.c:33 +#: builtin/fetch.c:37 msgid "git fetch --all [<options>]" msgstr "git fetch --all [<opzioni>]" -#: builtin/fetch.c:125 builtin/pull.c:203 +#: builtin/fetch.c:116 +msgid "fetch.parallel cannot be negative" +msgstr "fetch.parallel non può essere negativo" + +#: builtin/fetch.c:139 builtin/pull.c:184 msgid "fetch from all remotes" msgstr "esegui il fetch da tutti i remoti" -#: builtin/fetch.c:127 builtin/pull.c:206 +#: builtin/fetch.c:141 builtin/pull.c:228 +msgid "set upstream for git pull/fetch" +msgstr "imposta l'upstream per git pull/fetch" + +#: builtin/fetch.c:143 builtin/pull.c:187 msgid "append to .git/FETCH_HEAD instead of overwriting" msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli" -#: builtin/fetch.c:129 builtin/pull.c:209 +#: builtin/fetch.c:145 builtin/pull.c:190 msgid "path to upload pack on remote end" msgstr "percorso in cui caricare il pack sul remoto" -#: builtin/fetch.c:130 +#: builtin/fetch.c:146 msgid "force overwrite of local reference" msgstr "forza la sovrascrittura del riferimento locale" -#: builtin/fetch.c:132 +#: builtin/fetch.c:148 msgid "fetch from multiple remotes" msgstr "esegui il fetch da più remoti" -#: builtin/fetch.c:134 builtin/pull.c:213 +#: builtin/fetch.c:150 builtin/pull.c:194 msgid "fetch all tags and associated objects" msgstr "esegui il fetch di tutti i tag e degli oggetti associati" -#: builtin/fetch.c:136 +#: builtin/fetch.c:152 msgid "do not fetch all tags (--no-tags)" msgstr "non eseguire il fetch di alcun tag (--no-tags)" -#: builtin/fetch.c:138 +#: builtin/fetch.c:154 msgid "number of submodules fetched in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/fetch.c:140 builtin/pull.c:216 +#: builtin/fetch.c:156 builtin/pull.c:197 msgid "prune remote-tracking branches no longer on remote" msgstr "" "elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto" -#: builtin/fetch.c:142 +#: builtin/fetch.c:158 msgid "prune local tags no longer on remote and clobber changed tags" msgstr "" "elimina i tag locali non più presenti sul remoto e sovrascrivi i tag " "modificati" -#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140 +#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121 msgid "on-demand" msgstr "a richiesta" -#: builtin/fetch.c:144 +#: builtin/fetch.c:160 msgid "control recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/fetch.c:148 builtin/pull.c:224 +#: builtin/fetch.c:164 builtin/pull.c:205 msgid "keep downloaded pack" msgstr "mantieni il pack scaricato" -#: builtin/fetch.c:150 +#: builtin/fetch.c:166 msgid "allow updating of HEAD ref" msgstr "consenti l'aggiornamento del riferimento HEAD" -#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227 +#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208 msgid "deepen history of shallow clone" msgstr "aumenta la profondità della cronologia di un clone shallow" -#: builtin/fetch.c:155 +#: builtin/fetch.c:171 msgid "deepen history of shallow repository based on time" msgstr "" "aumenta la profondità della cronologia di un clone shallow in base al tempo" -#: builtin/fetch.c:161 builtin/pull.c:230 +#: builtin/fetch.c:177 builtin/pull.c:211 msgid "convert to a complete repository" msgstr "converti in un repository completo" -#: builtin/fetch.c:164 +#: builtin/fetch.c:180 msgid "prepend this to submodule path output" msgstr "anteponi questo prefisso all'output del percorso del sottomodulo" -#: builtin/fetch.c:167 +#: builtin/fetch.c:183 msgid "" "default for recursive fetching of submodules (lower priority than config " "files)" @@ -12987,90 +14033,94 @@ msgstr "" "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a " "priorità minore rispetto ai file di configurazione)" -#: builtin/fetch.c:171 builtin/pull.c:233 +#: builtin/fetch.c:187 builtin/pull.c:214 msgid "accept refs that update .git/shallow" msgstr "accetta i riferimenti che aggiornano .git/shallow" -#: builtin/fetch.c:172 builtin/pull.c:235 +#: builtin/fetch.c:188 builtin/pull.c:216 msgid "refmap" msgstr "mappa riferimenti" -#: builtin/fetch.c:173 builtin/pull.c:236 +#: builtin/fetch.c:189 builtin/pull.c:217 msgid "specify fetch refmap" msgstr "specifica la mappa dei riferimenti per il fetch" -#: builtin/fetch.c:180 +#: builtin/fetch.c:196 msgid "report that we have only objects reachable from this object" msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto" -#: builtin/fetch.c:183 +#: builtin/fetch.c:199 msgid "run 'gc --auto' after fetching" msgstr "esegui 'gc --auto' dopo il fetch" -#: builtin/fetch.c:185 builtin/pull.c:245 +#: builtin/fetch.c:201 builtin/pull.c:226 msgid "check for forced-updates on all updated branches" msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati" -#: builtin/fetch.c:491 +#: builtin/fetch.c:203 +msgid "write the commit-graph after fetching" +msgstr "scrivi il grafo dei commit dopo il fetch" + +#: builtin/fetch.c:513 msgid "Couldn't find remote ref HEAD" msgstr "Impossibile trovare l'HEAD del riferimento remoto" -#: builtin/fetch.c:630 +#: builtin/fetch.c:653 #, c-format msgid "configuration fetch.output contains invalid value %s" msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s" -#: builtin/fetch.c:728 +#: builtin/fetch.c:751 #, c-format msgid "object %s not found" msgstr "oggetto %s non trovato" -#: builtin/fetch.c:732 +#: builtin/fetch.c:755 msgid "[up to date]" msgstr "[aggiornato]" -#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833 +#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856 msgid "[rejected]" msgstr "[rifiutato]" -#: builtin/fetch.c:746 +#: builtin/fetch.c:769 msgid "can't fetch in current branch" msgstr "impossibile eseguire il fetch nel branch corrente" -#: builtin/fetch.c:756 +#: builtin/fetch.c:779 msgid "[tag update]" msgstr "[tag aggiornato]" -#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816 -#: builtin/fetch.c:828 +#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839 +#: builtin/fetch.c:851 msgid "unable to update local ref" msgstr "impossibile aggiornare il riferimento locale" -#: builtin/fetch.c:761 +#: builtin/fetch.c:784 msgid "would clobber existing tag" msgstr "sovrascriverebbe il tag esistente" -#: builtin/fetch.c:783 +#: builtin/fetch.c:806 msgid "[new tag]" msgstr "[nuovo tag]" -#: builtin/fetch.c:786 +#: builtin/fetch.c:809 msgid "[new branch]" msgstr "[nuovo branch]" -#: builtin/fetch.c:789 +#: builtin/fetch.c:812 msgid "[new ref]" msgstr "[nuovo riferimento]" -#: builtin/fetch.c:828 +#: builtin/fetch.c:851 msgid "forced update" msgstr "aggiornamento forzato" -#: builtin/fetch.c:833 +#: builtin/fetch.c:856 msgid "non-fast-forward" msgstr "non fast forward" -#: builtin/fetch.c:854 +#: builtin/fetch.c:877 msgid "" "Fetch normally indicates which branches had a forced update,\n" "but that check has been disabled. To re-enable, use '--show-forced-updates'\n" @@ -13081,7 +14131,7 @@ msgstr "" "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n" "fetch.showForcedUpdates true'." -#: builtin/fetch.c:858 +#: builtin/fetch.c:881 #, c-format msgid "" "It took %.2f seconds to check forced updates. You can use\n" @@ -13093,22 +14143,22 @@ msgstr "" "aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n" "'git config fetch.showForcedUpdates false' per omettere questo controllo.\n" -#: builtin/fetch.c:888 +#: builtin/fetch.c:920 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s non ha inviato tutti gli oggetti necessari\n" -#: builtin/fetch.c:909 +#: builtin/fetch.c:941 #, c-format msgid "reject %s because shallow roots are not allowed to be updated" msgstr "%s rifiutato perché non è consentito aggiornare radici shallow" -#: builtin/fetch.c:1000 builtin/fetch.c:1131 +#: builtin/fetch.c:1026 builtin/fetch.c:1164 #, c-format msgid "From %.*s\n" msgstr "Da %.*s\n" -#: builtin/fetch.c:1011 +#: builtin/fetch.c:1037 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -13118,60 +14168,81 @@ msgstr "" "eseguire\n" " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto" -#: builtin/fetch.c:1101 +#: builtin/fetch.c:1134 #, c-format msgid " (%s will become dangling)" msgstr " (%s diventerà pendente)" -#: builtin/fetch.c:1102 +#: builtin/fetch.c:1135 #, c-format msgid " (%s has become dangling)" msgstr " (%s è diventato pendente)" -#: builtin/fetch.c:1134 +#: builtin/fetch.c:1167 msgid "[deleted]" msgstr "[eliminato]" -#: builtin/fetch.c:1135 builtin/remote.c:1036 +#: builtin/fetch.c:1168 builtin/remote.c:1112 msgid "(none)" msgstr "(nessuno)" -#: builtin/fetch.c:1158 +#: builtin/fetch.c:1191 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" "Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non " "bare" -#: builtin/fetch.c:1177 +#: builtin/fetch.c:1210 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s" -#: builtin/fetch.c:1180 +#: builtin/fetch.c:1213 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "L'opzione \"%s\" è ignorata per %s\n" -#: builtin/fetch.c:1484 +#: builtin/fetch.c:1421 +msgid "multiple branches detected, incompatible with --set-upstream" +msgstr "rilevati branch multipli, stato incompatibile con --set-upstream" + +#: builtin/fetch.c:1436 +msgid "not setting upstream for a remote remote-tracking branch" +msgstr "non imposto l'upstream per un branch remoto che ne traccia uno remoto" + +#: builtin/fetch.c:1438 +msgid "not setting upstream for a remote tag" +msgstr "non imposto l'upstream per un tag remoto" + +#: builtin/fetch.c:1440 +msgid "unknown branch type" +msgstr "tipo branch sconosciuto" + +#: builtin/fetch.c:1442 +msgid "" +"no source branch found.\n" +"you need to specify exactly one branch with the --set-upstream option." +msgstr "" +"nessun branch sorgente trovato.\n" +"devi specificare esattamente un branch con l'opzione --set-upstream." + +#: builtin/fetch.c:1568 builtin/fetch.c:1631 #, c-format msgid "Fetching %s\n" msgstr "Recupero di %s in corso\n" -#: builtin/fetch.c:1486 builtin/remote.c:100 +#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101 #, c-format msgid "Could not fetch %s" msgstr "Impossibile recuperare %s" -#: builtin/fetch.c:1532 -msgid "" -"--filter can only be used with the remote configured in extensions." -"partialClone" -msgstr "" -"--filter può essere usato solo con il remoto configurato nelle estensioni." -"partialClone" +#: builtin/fetch.c:1590 +#, c-format +msgid "could not fetch '%s' (exit code: %d)\n" +msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n" -#: builtin/fetch.c:1556 +#: builtin/fetch.c:1693 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -13179,45 +14250,45 @@ msgstr "" "Non è stato specificato alcun repository remoto. Specifica un URL o il\n" "nome di un remoto da cui dovranno essere recuperate le nuove revisioni." -#: builtin/fetch.c:1593 +#: builtin/fetch.c:1730 msgid "You need to specify a tag name." msgstr "Devi specificare il nome di un tag." -#: builtin/fetch.c:1644 +#: builtin/fetch.c:1780 msgid "Negative depth in --deepen is not supported" msgstr "Le profondità negative in --deepen non sono supportate" -#: builtin/fetch.c:1646 +#: builtin/fetch.c:1782 msgid "--deepen and --depth are mutually exclusive" msgstr "le opzioni --deepen e --depth sono mutualmente esclusive" -#: builtin/fetch.c:1651 +#: builtin/fetch.c:1787 msgid "--depth and --unshallow cannot be used together" msgstr "--depth e --unshallow non possono essere usati insieme." -#: builtin/fetch.c:1653 +#: builtin/fetch.c:1789 msgid "--unshallow on a complete repository does not make sense" msgstr "--unshallow su un repository completo non ha senso" -#: builtin/fetch.c:1669 +#: builtin/fetch.c:1805 msgid "fetch --all does not take a repository argument" msgstr "fetch --all non richiede un repository come argomento" -#: builtin/fetch.c:1671 +#: builtin/fetch.c:1807 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all non ha senso con degli specificatori riferimento" -#: builtin/fetch.c:1680 +#: builtin/fetch.c:1816 #, c-format msgid "No such remote or remote group: %s" msgstr "Remoto o gruppo remoti non esistente: %s" -#: builtin/fetch.c:1687 +#: builtin/fetch.c:1823 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" "Recuperare un gruppo e specificare gli specificatori riferimento non ha senso" -#: builtin/fetch.c:1703 +#: builtin/fetch.c:1841 msgid "" "--filter can only be used with the remote configured in extensions." "partialclone" @@ -13231,23 +14302,23 @@ msgid "" msgstr "" "git fmt-merge-msg [-m <messaggio>] [--log[=<n>] | --no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:672 +#: builtin/fmt-merge-msg.c:671 msgid "populate log with at most <n> entries from shortlog" msgstr "popola il registro con al più <n> voci del registro breve" -#: builtin/fmt-merge-msg.c:675 +#: builtin/fmt-merge-msg.c:674 msgid "alias for --log (deprecated)" msgstr "alias di --log (deprecato)" -#: builtin/fmt-merge-msg.c:678 +#: builtin/fmt-merge-msg.c:677 msgid "text" msgstr "testo" -#: builtin/fmt-merge-msg.c:679 +#: builtin/fmt-merge-msg.c:678 msgid "use <text> as start of message" msgstr "usa <testo> come stringa iniziale del messaggio" -#: builtin/fmt-merge-msg.c:680 +#: builtin/fmt-merge-msg.c:679 msgid "file to read from" msgstr "file da cui leggere" @@ -13314,32 +14385,32 @@ msgstr "stampa solo i riferimenti contenenti il commit" msgid "print only refs which don't contain the commit" msgstr "stampa solo i riferimenti che non contengono il commit" -#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161 +#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148 msgid "unknown" msgstr "sconosciuto" #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation> -#: builtin/fsck.c:120 builtin/fsck.c:136 +#: builtin/fsck.c:100 builtin/fsck.c:120 #, c-format msgid "error in %s %s: %s" msgstr "errore in %s %s: %s" #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> -#: builtin/fsck.c:131 +#: builtin/fsck.c:114 #, c-format msgid "warning in %s %s: %s" msgstr "avviso in %s %s: %s" -#: builtin/fsck.c:157 builtin/fsck.c:159 +#: builtin/fsck.c:143 builtin/fsck.c:146 #, c-format msgid "broken link from %7s %s" msgstr "collegamento rotto da %7s %s" -#: builtin/fsck.c:168 +#: builtin/fsck.c:155 msgid "wrong object type in link" msgstr "tipo oggetto errato nel collegamento" -#: builtin/fsck.c:184 +#: builtin/fsck.c:171 #, c-format msgid "" "broken link from %7s %s\n" @@ -13348,216 +14419,216 @@ msgstr "" "collegamento rotto da %7s %s\n" " a %7s %s" -#: builtin/fsck.c:295 +#: builtin/fsck.c:282 #, c-format msgid "missing %s %s" msgstr "%s mancante %s" -#: builtin/fsck.c:321 +#: builtin/fsck.c:309 #, c-format msgid "unreachable %s %s" msgstr "%s non raggiungibile %s" -#: builtin/fsck.c:340 +#: builtin/fsck.c:329 #, c-format msgid "dangling %s %s" msgstr "%s pendente %s" -#: builtin/fsck.c:349 +#: builtin/fsck.c:339 msgid "could not create lost-found" msgstr "impossibile creare lost-found" -#: builtin/fsck.c:360 +#: builtin/fsck.c:350 #, c-format msgid "could not finish '%s'" msgstr "impossibile terminare '%s'" -#: builtin/fsck.c:377 +#: builtin/fsck.c:367 #, c-format msgid "Checking %s" msgstr "Controllo di %s in corso" -#: builtin/fsck.c:415 +#: builtin/fsck.c:405 #, c-format msgid "Checking connectivity (%d objects)" msgstr "Controllo connessione in corso (%d oggetti)" -#: builtin/fsck.c:434 +#: builtin/fsck.c:424 #, c-format msgid "Checking %s %s" msgstr "Controllo di %s in corso %s" -#: builtin/fsck.c:438 +#: builtin/fsck.c:429 msgid "broken links" msgstr "collegamenti rotti" -#: builtin/fsck.c:447 +#: builtin/fsck.c:438 #, c-format msgid "root %s" msgstr "radice %s" -#: builtin/fsck.c:455 +#: builtin/fsck.c:446 #, c-format msgid "tagged %s %s (%s) in %s" msgstr "eseguito tag di %s %s (%s) in %s" -#: builtin/fsck.c:484 +#: builtin/fsck.c:475 #, c-format msgid "%s: object corrupt or missing" msgstr "%s: oggetto corrotto o mancante" -#: builtin/fsck.c:509 +#: builtin/fsck.c:500 #, c-format msgid "%s: invalid reflog entry %s" msgstr "%s: voce registro riferimenti non valida: %s" -#: builtin/fsck.c:523 +#: builtin/fsck.c:514 #, c-format msgid "Checking reflog %s->%s" msgstr "Controllo registro riferimenti %s->%s" -#: builtin/fsck.c:557 +#: builtin/fsck.c:548 #, c-format msgid "%s: invalid sha1 pointer %s" msgstr "%s: puntatore SHA1 non valido: %s" -#: builtin/fsck.c:564 +#: builtin/fsck.c:555 #, c-format msgid "%s: not a commit" msgstr "%s: non è un commit" -#: builtin/fsck.c:619 +#: builtin/fsck.c:609 msgid "notice: No default references" msgstr "avviso: nessun riferimento predefinito" -#: builtin/fsck.c:634 +#: builtin/fsck.c:624 #, c-format msgid "%s: object corrupt or missing: %s" msgstr "%s: oggetto corrotto o mancante: %s" -#: builtin/fsck.c:647 +#: builtin/fsck.c:637 #, c-format msgid "%s: object could not be parsed: %s" msgstr "%s: impossibile analizzare l'oggetto: %s" -#: builtin/fsck.c:667 +#: builtin/fsck.c:657 #, c-format msgid "bad sha1 file: %s" msgstr "file SHA1 non valido: %s" -#: builtin/fsck.c:682 +#: builtin/fsck.c:672 msgid "Checking object directory" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:685 +#: builtin/fsck.c:675 msgid "Checking object directories" msgstr "Controllo directory oggetti in corso" -#: builtin/fsck.c:700 +#: builtin/fsck.c:690 #, c-format msgid "Checking %s link" msgstr "Controllo collegamento %s" -#: builtin/fsck.c:705 builtin/index-pack.c:842 +#: builtin/fsck.c:695 builtin/index-pack.c:843 #, c-format msgid "invalid %s" msgstr "%s non valido" -#: builtin/fsck.c:712 +#: builtin/fsck.c:702 #, c-format msgid "%s points to something strange (%s)" msgstr "%s punta a qualcosa di strano (%s)" -#: builtin/fsck.c:718 +#: builtin/fsck.c:708 #, c-format msgid "%s: detached HEAD points at nothing" msgstr "%s: l'HEAD scollegato non punta a niente" -#: builtin/fsck.c:722 +#: builtin/fsck.c:712 #, c-format msgid "notice: %s points to an unborn branch (%s)" msgstr "avviso: %s punta a un branch non nato (%s)" -#: builtin/fsck.c:734 +#: builtin/fsck.c:724 msgid "Checking cache tree" msgstr "Controllo cache albero in corso" -#: builtin/fsck.c:739 +#: builtin/fsck.c:729 #, c-format msgid "%s: invalid sha1 pointer in cache-tree" msgstr "%s: puntatore SHA1 non valido nella cache alberi" -#: builtin/fsck.c:750 +#: builtin/fsck.c:738 msgid "non-tree in cache-tree" msgstr "oggetto non albero nella cache alberi" -#: builtin/fsck.c:781 +#: builtin/fsck.c:769 msgid "git fsck [<options>] [<object>...]" msgstr "git fsck [<opzioni>] [<oggetto>...]" -#: builtin/fsck.c:787 +#: builtin/fsck.c:775 msgid "show unreachable objects" msgstr "visualizza oggetti non raggiungibili" -#: builtin/fsck.c:788 +#: builtin/fsck.c:776 msgid "show dangling objects" msgstr "visualizza oggetti pendenti" -#: builtin/fsck.c:789 +#: builtin/fsck.c:777 msgid "report tags" msgstr "segnala i tag" -#: builtin/fsck.c:790 +#: builtin/fsck.c:778 msgid "report root nodes" msgstr "segnala i nodi radice" -#: builtin/fsck.c:791 +#: builtin/fsck.c:779 msgid "make index objects head nodes" msgstr "rendi gli oggetti indice nodi head" -#: builtin/fsck.c:792 +#: builtin/fsck.c:780 msgid "make reflogs head nodes (default)" msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)" -#: builtin/fsck.c:793 +#: builtin/fsck.c:781 msgid "also consider packs and alternate objects" msgstr "considera anche i pack e gli oggetti alternativi" -#: builtin/fsck.c:794 +#: builtin/fsck.c:782 msgid "check only connectivity" msgstr "controlla solo la connessione" -#: builtin/fsck.c:795 +#: builtin/fsck.c:783 msgid "enable more strict checking" msgstr "abilita controlli più restrittivi" -#: builtin/fsck.c:797 +#: builtin/fsck.c:785 msgid "write dangling objects in .git/lost-found" msgstr "scrivi oggetti pendenti in .git/lost-found" -#: builtin/fsck.c:798 builtin/prune.c:132 +#: builtin/fsck.c:786 builtin/prune.c:132 msgid "show progress" msgstr "visualizza l'avanzamento" -#: builtin/fsck.c:799 +#: builtin/fsck.c:787 msgid "show verbose names for reachable objects" msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili" -#: builtin/fsck.c:859 builtin/index-pack.c:225 +#: builtin/fsck.c:846 builtin/index-pack.c:225 msgid "Checking objects" msgstr "Controllo oggetti in corso" -#: builtin/fsck.c:887 +#: builtin/fsck.c:874 #, c-format msgid "%s: object missing" msgstr "%s: oggetto mancante" -#: builtin/fsck.c:899 +#: builtin/fsck.c:885 #, c-format msgid "invalid parameter: expected sha1, got '%s'" msgstr "parametro non valido: atteso SHA1, presente '%s'" -#: builtin/gc.c:34 +#: builtin/gc.c:35 msgid "git gc [<options>]" msgstr "git gc [<opzioni>]" @@ -13571,17 +14642,17 @@ msgstr "fstat di %s non riuscito: %s" msgid "failed to parse '%s' value '%s'" msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita" -#: builtin/gc.c:476 builtin/init-db.c:55 +#: builtin/gc.c:475 builtin/init-db.c:55 #, c-format msgid "cannot stat '%s'" msgstr "impossibile eseguire lo stat di '%s'" -#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529 +#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529 #, c-format msgid "cannot read '%s'" msgstr "impossibile leggere '%s'" -#: builtin/gc.c:492 +#: builtin/gc.c:491 #, c-format msgid "" "The last gc run reported the following. Please correct the root cause\n" @@ -13597,56 +14668,56 @@ msgstr "" "\n" "%s" -#: builtin/gc.c:540 +#: builtin/gc.c:539 msgid "prune unreferenced objects" msgstr "elimina oggetti non referenziati" -#: builtin/gc.c:542 +#: builtin/gc.c:541 msgid "be more thorough (increased runtime)" msgstr "sii più accurato (tempi di esecuzione maggiori)" -#: builtin/gc.c:543 +#: builtin/gc.c:542 msgid "enable auto-gc mode" msgstr "abilita modalità garbage collector automatica" -#: builtin/gc.c:546 +#: builtin/gc.c:545 msgid "force running gc even if there may be another gc running" msgstr "" "forza l'esecuzione del garbage collector anche nel caso in cui ve ne " "potrebbe essere un altro in esecuzione" -#: builtin/gc.c:549 +#: builtin/gc.c:548 msgid "repack all other packs except the largest pack" msgstr "" "esegui il repack di tutti gli altri pack ad eccezione di quello più grande" -#: builtin/gc.c:566 +#: builtin/gc.c:565 #, c-format msgid "failed to parse gc.logexpiry value %s" msgstr "analisi del valore %s di gc.logexpiry non riuscita" -#: builtin/gc.c:577 +#: builtin/gc.c:576 #, c-format msgid "failed to parse prune expiry value %s" msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita" -#: builtin/gc.c:597 +#: builtin/gc.c:596 #, c-format msgid "Auto packing the repository in background for optimum performance.\n" msgstr "" "Comprimo il repository in background per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:599 +#: builtin/gc.c:598 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n" -#: builtin/gc.c:600 +#: builtin/gc.c:599 #, c-format msgid "See \"git help gc\" for manual housekeeping.\n" msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n" -#: builtin/gc.c:640 +#: builtin/gc.c:639 #, c-format msgid "" "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)" @@ -13654,14 +14725,14 @@ msgstr "" "gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se " "non lo è)" -#: builtin/gc.c:695 +#: builtin/gc.c:694 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" "Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per " "eliminarli." -#: builtin/grep.c:29 +#: builtin/grep.c:30 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]" msgstr "" "git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]" @@ -13680,263 +14751,263 @@ msgstr "specificato numero non valido di thread (%d) per %s" #. variable for tweaking threads, currently #. grep.threads #. -#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727 -#: builtin/pack-objects.c:2728 +#: builtin/grep.c:287 builtin/index-pack.c:1538 builtin/index-pack.c:1731 +#: builtin/pack-objects.c:2854 #, c-format msgid "no threads support, ignoring %s" msgstr "non vi è supporto per i thread, ignoro %s" -#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633 +#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618 #, c-format msgid "unable to read tree (%s)" msgstr "impossibile leggere il tree (%s)" -#: builtin/grep.c:648 +#: builtin/grep.c:633 #, c-format msgid "unable to grep from object of type %s" msgstr "impossibile eseguire grep su un oggetto di tipo %s" -#: builtin/grep.c:714 +#: builtin/grep.c:704 #, c-format msgid "switch `%c' expects a numerical value" msgstr "switch '%c' richiede un valore numerico" -#: builtin/grep.c:813 +#: builtin/grep.c:803 msgid "search in index instead of in the work tree" msgstr "cerca nell'index anziché nell'albero di lavoro" -#: builtin/grep.c:815 +#: builtin/grep.c:805 msgid "find in contents not managed by git" msgstr "la ricerca nei contenuti non è gestita da Git" -#: builtin/grep.c:817 +#: builtin/grep.c:807 msgid "search in both tracked and untracked files" msgstr "cerca sia nei file tracciati sia in quelli non tracciati" -#: builtin/grep.c:819 +#: builtin/grep.c:809 msgid "ignore files specified via '.gitignore'" msgstr "ignora i file specificati in '.gitignore'" -#: builtin/grep.c:821 +#: builtin/grep.c:811 msgid "recursively search in each submodule" msgstr "cerca ricorsivamente in ogni sottomodulo" -#: builtin/grep.c:824 +#: builtin/grep.c:814 msgid "show non-matching lines" msgstr "visualizza le righe non corrispondenti" -#: builtin/grep.c:826 +#: builtin/grep.c:816 msgid "case insensitive matching" msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole" -#: builtin/grep.c:828 +#: builtin/grep.c:818 msgid "match patterns only at word boundaries" msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola" -#: builtin/grep.c:830 +#: builtin/grep.c:820 msgid "process binary files as text" msgstr "elabora i file binari come testuali" -#: builtin/grep.c:832 +#: builtin/grep.c:822 msgid "don't match patterns in binary files" msgstr "non cercare corrispondenze ai pattern nei file binari" -#: builtin/grep.c:835 +#: builtin/grep.c:825 msgid "process binary files with textconv filters" msgstr "elabora i file binari con filtri di conversione in testo" -#: builtin/grep.c:837 +#: builtin/grep.c:827 msgid "search in subdirectories (default)" msgstr "cerca nelle sottodirectory (impostazione predefinita)" -#: builtin/grep.c:839 +#: builtin/grep.c:829 msgid "descend at most <depth> levels" msgstr "scendi al più di <profondità> livelli" -#: builtin/grep.c:843 +#: builtin/grep.c:833 msgid "use extended POSIX regular expressions" msgstr "usa espressioni regolari POSIX estese" -#: builtin/grep.c:846 +#: builtin/grep.c:836 msgid "use basic POSIX regular expressions (default)" msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)" -#: builtin/grep.c:849 +#: builtin/grep.c:839 msgid "interpret patterns as fixed strings" msgstr "interpreta i pattern come stringhe fisse" -#: builtin/grep.c:852 +#: builtin/grep.c:842 msgid "use Perl-compatible regular expressions" msgstr "usa espressioni regolari compatibili con Perl" -#: builtin/grep.c:855 +#: builtin/grep.c:845 msgid "show line numbers" msgstr "visualizza numeri di riga" -#: builtin/grep.c:856 +#: builtin/grep.c:846 msgid "show column number of first match" msgstr "visualizza il numero di colonna della prima corrispondenza" -#: builtin/grep.c:857 +#: builtin/grep.c:847 msgid "don't show filenames" msgstr "non visualizzare i nomi file" -#: builtin/grep.c:858 +#: builtin/grep.c:848 msgid "show filenames" msgstr "visualizza i nomi file" -#: builtin/grep.c:860 +#: builtin/grep.c:850 msgid "show filenames relative to top directory" msgstr "visualizza i nomi file relativi alla directory di primo livello" -#: builtin/grep.c:862 +#: builtin/grep.c:852 msgid "show only filenames instead of matching lines" msgstr "visualizza solo i nomi file anziché le righe corrispondenti" -#: builtin/grep.c:864 +#: builtin/grep.c:854 msgid "synonym for --files-with-matches" msgstr "sinonimo di --files-with-matches" -#: builtin/grep.c:867 +#: builtin/grep.c:857 msgid "show only the names of files without match" msgstr "visualizza solo i nomi dei file non corrispondenti" -#: builtin/grep.c:869 +#: builtin/grep.c:859 msgid "print NUL after filenames" msgstr "stampa NUL dopo i nomi file" -#: builtin/grep.c:872 +#: builtin/grep.c:862 msgid "show only matching parts of a line" msgstr "visualizza solo le parti corrispondenti di una riga" -#: builtin/grep.c:874 +#: builtin/grep.c:864 msgid "show the number of matches instead of matching lines" msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti" -#: builtin/grep.c:875 +#: builtin/grep.c:865 msgid "highlight matches" msgstr "evidenzia corrispondenze" -#: builtin/grep.c:877 +#: builtin/grep.c:867 msgid "print empty line between matches from different files" msgstr "stampa una riga vuota fra le corrispondenze in file differenti" -#: builtin/grep.c:879 +#: builtin/grep.c:869 msgid "show filename only once above matches from same file" msgstr "" "visualizza il nome file solo una volta prima delle corrispondenze nello " "stesso file" -#: builtin/grep.c:882 +#: builtin/grep.c:872 msgid "show <n> context lines before and after matches" msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze" -#: builtin/grep.c:885 +#: builtin/grep.c:875 msgid "show <n> context lines before matches" msgstr "visualizza <n> righe di contesto prima delle corrispondenze" -#: builtin/grep.c:887 +#: builtin/grep.c:877 msgid "show <n> context lines after matches" msgstr "visualizza <n> righe di contesto dopo le corrispondenze" -#: builtin/grep.c:889 +#: builtin/grep.c:879 msgid "use <n> worker threads" msgstr "usa <n> thread di lavoro" -#: builtin/grep.c:890 +#: builtin/grep.c:880 msgid "shortcut for -C NUM" msgstr "scorciatoia per -C NUM" -#: builtin/grep.c:893 +#: builtin/grep.c:883 msgid "show a line with the function name before matches" msgstr "visualizza una riga con il nome funzione prima delle corrispondenze" -#: builtin/grep.c:895 +#: builtin/grep.c:885 msgid "show the surrounding function" msgstr "visualizza la funzione circostante" -#: builtin/grep.c:898 +#: builtin/grep.c:888 msgid "read patterns from file" msgstr "leggi le corrispondenze da un file" -#: builtin/grep.c:900 +#: builtin/grep.c:890 msgid "match <pattern>" msgstr "cerca corrispondenze con <pattern>" -#: builtin/grep.c:902 +#: builtin/grep.c:892 msgid "combine patterns specified with -e" msgstr "combina i pattern specificati con -e" -#: builtin/grep.c:914 +#: builtin/grep.c:904 msgid "indicate hit with exit status without output" msgstr "" "segnala una corrispondenza con il codice di uscita senza emettere output" -#: builtin/grep.c:916 +#: builtin/grep.c:906 msgid "show only matches from files that match all patterns" msgstr "" "visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per " "tutti i pattern" -#: builtin/grep.c:918 +#: builtin/grep.c:908 msgid "show parse tree for grep expression" msgstr "visualizza l'albero di analisi per l'espressione grep" -#: builtin/grep.c:922 +#: builtin/grep.c:912 msgid "pager" msgstr "pager" -#: builtin/grep.c:922 +#: builtin/grep.c:912 msgid "show matching files in the pager" msgstr "visualizza i file corrispondenti nel pager" -#: builtin/grep.c:926 +#: builtin/grep.c:916 msgid "allow calling of grep(1) (ignored by this build)" msgstr "consenti" -#: builtin/grep.c:990 +#: builtin/grep.c:983 msgid "no pattern given" msgstr "nessun pattern specificato" -#: builtin/grep.c:1026 +#: builtin/grep.c:1019 msgid "--no-index or --untracked cannot be used with revs" msgstr "--no-index o --untracked non possono essere usate con le revisioni" -#: builtin/grep.c:1034 +#: builtin/grep.c:1027 #, c-format msgid "unable to resolve revision: %s" msgstr "impossibile risolvere la revisione %s" -#: builtin/grep.c:1065 +#: builtin/grep.c:1057 +msgid "--untracked not supported with --recurse-submodules" +msgstr "l'opzione --untracked non è supportata con --recurse-submodules" + +#: builtin/grep.c:1061 msgid "invalid option combination, ignoring --threads" msgstr "combinazione di opzioni non valida, ignoro --threads" -#: builtin/grep.c:1068 builtin/pack-objects.c:3416 +#: builtin/grep.c:1064 builtin/pack-objects.c:3547 msgid "no threads support, ignoring --threads" msgstr "non vi è supporto per i thread, ignoro --threads" -#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2725 +#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851 #, c-format msgid "invalid number of threads specified (%d)" msgstr "specificato numero non valido di thread (%d)" -#: builtin/grep.c:1094 +#: builtin/grep.c:1101 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager funziona solo sull'albero di lavoro" -#: builtin/grep.c:1117 -msgid "option not supported with --recurse-submodules" -msgstr "opzione non supportata con --recurse-submodules" - -#: builtin/grep.c:1123 +#: builtin/grep.c:1127 msgid "--cached or --untracked cannot be used with --no-index" msgstr "--cached o --untracked non possono essere usate con --no-index" -#: builtin/grep.c:1129 +#: builtin/grep.c:1133 msgid "--[no-]exclude-standard cannot be used for tracked contents" msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati" -#: builtin/grep.c:1137 +#: builtin/grep.c:1141 msgid "both --cached and trees are given" msgstr "sono specificati sia --cached sia degli alberi" @@ -14122,11 +15193,11 @@ msgstr "errore di lettura in input" msgid "used more bytes than were available" msgstr "usati più byte di quelli disponibili" -#: builtin/index-pack.c:288 builtin/pack-objects.c:604 +#: builtin/index-pack.c:288 builtin/pack-objects.c:606 msgid "pack too large for current definition of off_t" msgstr "pack troppo largo per la definizione corrente di off_t" -#: builtin/index-pack.c:291 builtin/unpack-objects.c:94 +#: builtin/index-pack.c:291 builtin/unpack-objects.c:95 msgid "pack exceeds maximum allowed size" msgstr "il pack supera la dimensione massima consentita" @@ -14182,191 +15253,191 @@ msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti" msgid "serious inflate inconsistency" msgstr "inconsistenza grave di inflate" -#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764 -#: builtin/index-pack.c:803 builtin/index-pack.c:812 +#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765 +#: builtin/index-pack.c:804 builtin/index-pack.c:813 #, c-format msgid "SHA1 COLLISION FOUND WITH %s !" msgstr "TROVATA COLLISIONE SHA1 CON %s !" -#: builtin/index-pack.c:738 builtin/pack-objects.c:157 -#: builtin/pack-objects.c:217 builtin/pack-objects.c:311 +#: builtin/index-pack.c:738 builtin/pack-objects.c:158 +#: builtin/pack-objects.c:218 builtin/pack-objects.c:313 #, c-format msgid "unable to read %s" msgstr "impossibile leggere %s" -#: builtin/index-pack.c:801 +#: builtin/index-pack.c:802 #, c-format msgid "cannot read existing object info %s" msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s" -#: builtin/index-pack.c:809 +#: builtin/index-pack.c:810 #, c-format msgid "cannot read existing object %s" msgstr "non è possibile leggere l'oggetto %s esistente" -#: builtin/index-pack.c:823 +#: builtin/index-pack.c:824 #, c-format msgid "invalid blob object %s" msgstr "oggetto blob %s non valido" -#: builtin/index-pack.c:826 builtin/index-pack.c:845 +#: builtin/index-pack.c:827 builtin/index-pack.c:846 msgid "fsck error in packed object" msgstr "errore fsck nell'oggetto sottoposto a pack" -#: builtin/index-pack.c:847 +#: builtin/index-pack.c:848 #, c-format msgid "Not all child objects of %s are reachable" msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili" -#: builtin/index-pack.c:919 builtin/index-pack.c:950 +#: builtin/index-pack.c:920 builtin/index-pack.c:951 msgid "failed to apply delta" msgstr "applicazione del delta non riuscita" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Receiving objects" msgstr "Ricezione degli oggetti" -#: builtin/index-pack.c:1118 +#: builtin/index-pack.c:1121 msgid "Indexing objects" msgstr "Indicizzazione degli oggetti" -#: builtin/index-pack.c:1152 +#: builtin/index-pack.c:1155 msgid "pack is corrupted (SHA1 mismatch)" msgstr "il pack è corrotto (SHA1 non corrisponde)" -#: builtin/index-pack.c:1157 +#: builtin/index-pack.c:1160 msgid "cannot fstat packfile" msgstr "impossibile eseguire fstat sul file pack" -#: builtin/index-pack.c:1160 +#: builtin/index-pack.c:1163 msgid "pack has junk at the end" msgstr "il pack ha dati inutili alla fine" -#: builtin/index-pack.c:1172 +#: builtin/index-pack.c:1175 msgid "confusion beyond insanity in parse_pack_objects()" msgstr "confusione oltre ogni follia in parse_pack_objects()" -#: builtin/index-pack.c:1195 +#: builtin/index-pack.c:1198 msgid "Resolving deltas" msgstr "Risoluzione dei delta" -#: builtin/index-pack.c:1205 builtin/pack-objects.c:2497 +#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615 #, c-format msgid "unable to create thread: %s" msgstr "impossibile creare il thread: %s" -#: builtin/index-pack.c:1246 +#: builtin/index-pack.c:1249 msgid "confusion beyond insanity" msgstr "confusione oltre ogni follia" -#: builtin/index-pack.c:1252 +#: builtin/index-pack.c:1255 #, c-format msgid "completed with %d local object" msgid_plural "completed with %d local objects" msgstr[0] "completato con %d oggetto locale" msgstr[1] "completato con %d oggetti locali" -#: builtin/index-pack.c:1264 +#: builtin/index-pack.c:1267 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" msgstr "Checksum in coda inatteso per %s (disco corrotto?)" -#: builtin/index-pack.c:1268 +#: builtin/index-pack.c:1271 #, c-format msgid "pack has %d unresolved delta" msgid_plural "pack has %d unresolved deltas" msgstr[0] "pack ha %d delta irrisolto" msgstr[1] "pack ha %d delta irrisolti" -#: builtin/index-pack.c:1292 +#: builtin/index-pack.c:1295 #, c-format msgid "unable to deflate appended object (%d)" msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)" -#: builtin/index-pack.c:1388 +#: builtin/index-pack.c:1392 #, c-format msgid "local object %s is corrupt" msgstr "l'oggetto locale %s è corrotto" -#: builtin/index-pack.c:1402 +#: builtin/index-pack.c:1406 #, c-format msgid "packfile name '%s' does not end with '.pack'" msgstr "il nome del file pack '%s' non termina con '.pack'" -#: builtin/index-pack.c:1427 +#: builtin/index-pack.c:1431 #, c-format msgid "cannot write %s file '%s'" msgstr "impossibile scrivere il file %s '%s'" -#: builtin/index-pack.c:1435 +#: builtin/index-pack.c:1439 #, c-format msgid "cannot close written %s file '%s'" msgstr "impossibile chiudere il file %s scritto '%s'" -#: builtin/index-pack.c:1459 +#: builtin/index-pack.c:1463 msgid "error while closing pack file" msgstr "errore nella chiusura del file pack" -#: builtin/index-pack.c:1473 +#: builtin/index-pack.c:1477 msgid "cannot store pack file" msgstr "impossibile archiviare il file pack" -#: builtin/index-pack.c:1481 +#: builtin/index-pack.c:1485 msgid "cannot store index file" msgstr "impossibile archiviare index file" -#: builtin/index-pack.c:1525 builtin/pack-objects.c:2736 +#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862 #, c-format msgid "bad pack.indexversion=%<PRIu32>" msgstr "pack.indexversion=%<PRIu32> non valida" -#: builtin/index-pack.c:1593 +#: builtin/index-pack.c:1597 #, c-format msgid "Cannot open existing pack file '%s'" msgstr "Impossibile aprire il file pack '%s' esistente" -#: builtin/index-pack.c:1595 +#: builtin/index-pack.c:1599 #, c-format msgid "Cannot open existing pack idx file for '%s'" msgstr "Impossibile aprire il file pack idx esistente per '%s'" -#: builtin/index-pack.c:1643 +#: builtin/index-pack.c:1647 #, c-format msgid "non delta: %d object" msgid_plural "non delta: %d objects" msgstr[0] "non delta: %d oggetto" msgstr[1] "non delta: %d oggetti" -#: builtin/index-pack.c:1650 +#: builtin/index-pack.c:1654 #, c-format msgid "chain length = %d: %lu object" msgid_plural "chain length = %d: %lu objects" msgstr[0] "lunghezza della catena = %d: %lu oggetto" msgstr[1] "lunghezza della catena = %d: %lu oggetti" -#: builtin/index-pack.c:1689 +#: builtin/index-pack.c:1693 msgid "Cannot come back to cwd" msgstr "impossibile tornare alla directory di lavoro corrente" -#: builtin/index-pack.c:1738 builtin/index-pack.c:1741 -#: builtin/index-pack.c:1757 builtin/index-pack.c:1761 +#: builtin/index-pack.c:1742 builtin/index-pack.c:1745 +#: builtin/index-pack.c:1761 builtin/index-pack.c:1765 #, c-format msgid "bad %s" msgstr "%s errato" -#: builtin/index-pack.c:1777 +#: builtin/index-pack.c:1781 msgid "--fix-thin cannot be used without --stdin" msgstr "--fix-thin non può essere usato senza --stdin" -#: builtin/index-pack.c:1779 +#: builtin/index-pack.c:1783 msgid "--stdin requires a git repository" msgstr "--stdin richiede un repository Git" -#: builtin/index-pack.c:1785 +#: builtin/index-pack.c:1789 msgid "--verify with no packfile name given" msgstr "--verify senza un nome del file pack specificato" -#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580 +#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582 msgid "fsck error in pack objects" msgstr "errore fsck negli oggetti sottoposti a pack" @@ -14549,121 +15620,126 @@ msgstr "--trailer con --only-input non ha senso" msgid "no input file given for in-place editing" msgstr "nessun file di input specificato per la modifica sul posto" -#: builtin/log.c:55 +#: builtin/log.c:56 msgid "git log [<options>] [<revision-range>] [[--] <path>...]" msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]" -#: builtin/log.c:56 +#: builtin/log.c:57 msgid "git show [<options>] <object>..." msgstr "git show [<opzioni>] <oggetto>..." -#: builtin/log.c:109 +#: builtin/log.c:110 #, c-format msgid "invalid --decorate option: %s" msgstr "opzione --decorate non valida: %s" -#: builtin/log.c:173 +#: builtin/log.c:174 msgid "show source" msgstr "visualizza sorgente" -#: builtin/log.c:174 +#: builtin/log.c:175 msgid "Use mail map file" msgstr "Usa il file mappatura e-mail" -#: builtin/log.c:176 +#: builtin/log.c:177 msgid "only decorate refs that match <pattern>" msgstr "decora solo i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:178 +#: builtin/log.c:179 msgid "do not decorate refs that match <pattern>" msgstr "non decorare i riferimenti corrispondenti a <pattern>" -#: builtin/log.c:179 +#: builtin/log.c:180 msgid "decorate options" msgstr "opzioni decorazione" -#: builtin/log.c:182 +#: builtin/log.c:183 msgid "Process line range n,m in file, counting from 1" msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1" -#: builtin/log.c:280 +#: builtin/log.c:281 #, c-format msgid "Final output: %d %s\n" msgstr "Output finale: %d %s\n" -#: builtin/log.c:534 +#: builtin/log.c:535 #, c-format msgid "git show %s: bad file" msgstr "git show %s: file non valido" -#: builtin/log.c:549 builtin/log.c:643 +#: builtin/log.c:550 builtin/log.c:645 #, c-format msgid "could not read object %s" msgstr "impossibile leggere l'oggetto %s" -#: builtin/log.c:668 +#: builtin/log.c:670 #, c-format msgid "unknown type: %d" msgstr "tipo sconosciuto: %d" -#: builtin/log.c:791 +#: builtin/log.c:814 +#, c-format +msgid "%s: invalid cover from description mode" +msgstr "%s: modo lettera da descrizione non valido" + +#: builtin/log.c:821 msgid "format.headers without value" msgstr "format.headers non ha alcun valore" -#: builtin/log.c:908 +#: builtin/log.c:936 msgid "name of output directory is too long" msgstr "il nome della directory di output è troppo lungo" -#: builtin/log.c:924 +#: builtin/log.c:952 #, c-format msgid "cannot open patch file %s" msgstr "impossibile aprire il file patch %s" -#: builtin/log.c:941 +#: builtin/log.c:969 msgid "need exactly one range" msgstr "è necessario specificare esattamente un intervallo" -#: builtin/log.c:951 +#: builtin/log.c:979 msgid "not a range" msgstr "il valore non è un intervallo" -#: builtin/log.c:1074 +#: builtin/log.c:1143 msgid "cover letter needs email format" msgstr "la lettera di accompagnamento dev'essere in formato e-mail" -#: builtin/log.c:1080 +#: builtin/log.c:1149 msgid "failed to create cover-letter file" msgstr "creazione del file lettera di accompagnamento non riuscita" -#: builtin/log.c:1159 +#: builtin/log.c:1228 #, c-format msgid "insane in-reply-to: %s" msgstr "valore in-reply-to folle: %s" -#: builtin/log.c:1186 +#: builtin/log.c:1255 msgid "git format-patch [<options>] [<since> | <revision-range>]" msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]" -#: builtin/log.c:1244 +#: builtin/log.c:1313 msgid "two output directories?" msgstr "due directory di output?" -#: builtin/log.c:1355 builtin/log.c:2099 builtin/log.c:2101 builtin/log.c:2113 +#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211 #, c-format msgid "unknown commit %s" msgstr "commit %s sconosciuto" -#: builtin/log.c:1365 builtin/replace.c:58 builtin/replace.c:207 +#: builtin/log.c:1434 builtin/replace.c:58 builtin/replace.c:207 #: builtin/replace.c:210 #, c-format msgid "failed to resolve '%s' as a valid ref" msgstr "impossibile risolvere '%s' come riferimento valido" -#: builtin/log.c:1370 +#: builtin/log.c:1439 msgid "could not find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1374 +#: builtin/log.c:1443 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" @@ -14675,278 +15751,288 @@ msgstr "" "In alternativa puoi specificare manualmente il commit di base con\n" "--base=<ID commit di base>" -#: builtin/log.c:1394 +#: builtin/log.c:1463 msgid "failed to find exact merge base" msgstr "impossibile trovare esattamente la base del merge" -#: builtin/log.c:1405 +#: builtin/log.c:1474 msgid "base commit should be the ancestor of revision list" msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni" -#: builtin/log.c:1409 +#: builtin/log.c:1478 msgid "base commit shouldn't be in revision list" msgstr "il commit di base non dovrebbe essere nell'elenco revisioni" -#: builtin/log.c:1462 +#: builtin/log.c:1531 msgid "cannot get patch id" msgstr "impossibile ottenere l'ID della patch" -#: builtin/log.c:1514 +#: builtin/log.c:1583 msgid "failed to infer range-diff ranges" msgstr "inferenza degli intervalli range-diff non riuscita" -#: builtin/log.c:1559 +#: builtin/log.c:1629 msgid "use [PATCH n/m] even with a single patch" msgstr "usa [PATCH n/m] anche con una singola patch" -#: builtin/log.c:1562 +#: builtin/log.c:1632 msgid "use [PATCH] even with multiple patches" msgstr "usa [PATCH] anche con più patch" -#: builtin/log.c:1566 +#: builtin/log.c:1636 msgid "print patches to standard out" msgstr "stampa le patch sullo standard output" -#: builtin/log.c:1568 +#: builtin/log.c:1638 msgid "generate a cover letter" msgstr "genera una lettera di accompagnamento" -#: builtin/log.c:1570 +#: builtin/log.c:1640 msgid "use simple number sequence for output file names" msgstr "usa una sequenza numerica semplice per i nomi file di output" -#: builtin/log.c:1571 +#: builtin/log.c:1641 msgid "sfx" msgstr "suff" -#: builtin/log.c:1572 +#: builtin/log.c:1642 msgid "use <sfx> instead of '.patch'" msgstr "usa <suff> anziché '.patch'" -#: builtin/log.c:1574 +#: builtin/log.c:1644 msgid "start numbering patches at <n> instead of 1" msgstr "inizia a numerare le patch da <n> anziché da 1" -#: builtin/log.c:1576 +#: builtin/log.c:1646 msgid "mark the series as Nth re-roll" msgstr "contrassegna la serie come l'n-esima versione revisionata" -#: builtin/log.c:1578 +#: builtin/log.c:1648 msgid "Use [RFC PATCH] instead of [PATCH]" msgstr "Usa [RFC PATCH] anziché [PATCH]" -#: builtin/log.c:1581 +#: builtin/log.c:1651 +msgid "cover-from-description-mode" +msgstr "modo-lettera-da-descrizione" + +#: builtin/log.c:1652 +msgid "generate parts of a cover letter based on a branch's description" +msgstr "" +"genera parti di una lettera d'accompagnamento basandosi sulla descrizione di " +"un branch" + +#: builtin/log.c:1654 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Usa [<prefisso>] anziché [PATCH]" -#: builtin/log.c:1584 +#: builtin/log.c:1657 msgid "store resulting files in <dir>" msgstr "salva i file risultanti in <dir>" -#: builtin/log.c:1587 +#: builtin/log.c:1660 msgid "don't strip/add [PATCH]" msgstr "non eliminare/aggiungere [PATCH]" -#: builtin/log.c:1590 +#: builtin/log.c:1663 msgid "don't output binary diffs" msgstr "non mandare in output diff binari" -#: builtin/log.c:1592 +#: builtin/log.c:1665 msgid "output all-zero hash in From header" msgstr "manda in output un hash costituito da soli zeri nell'intestazione From" -#: builtin/log.c:1594 +#: builtin/log.c:1667 msgid "don't include a patch matching a commit upstream" msgstr "non includere una patch corrispondente a un commit upstream" -#: builtin/log.c:1596 +#: builtin/log.c:1669 msgid "show patch format instead of default (patch + stat)" msgstr "" "visualizza il formato della patch anziché l'impostazione predefinita (patch " "+ stat)" -#: builtin/log.c:1598 +#: builtin/log.c:1671 msgid "Messaging" msgstr "Messaggistica" -#: builtin/log.c:1599 +#: builtin/log.c:1672 msgid "header" msgstr "intestazione" -#: builtin/log.c:1600 +#: builtin/log.c:1673 msgid "add email header" msgstr "aggiungi intestazione e-mail" -#: builtin/log.c:1601 builtin/log.c:1603 +#: builtin/log.c:1674 builtin/log.c:1676 msgid "email" msgstr "e-mail" -#: builtin/log.c:1601 +#: builtin/log.c:1674 msgid "add To: header" msgstr "aggiungi intestazione A:" -#: builtin/log.c:1603 +#: builtin/log.c:1676 msgid "add Cc: header" msgstr "aggiungi intestazione Cc:" -#: builtin/log.c:1605 +#: builtin/log.c:1678 msgid "ident" msgstr "identità" -#: builtin/log.c:1606 +#: builtin/log.c:1679 msgid "set From address to <ident> (or committer ident if absent)" msgstr "" "imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il " "commit se assente)" -#: builtin/log.c:1608 +#: builtin/log.c:1681 msgid "message-id" msgstr "ID messaggio" -#: builtin/log.c:1609 +#: builtin/log.c:1682 msgid "make first mail a reply to <message-id>" msgstr "rendi la prima e-mail una risposta a <ID messaggio>" -#: builtin/log.c:1610 builtin/log.c:1613 +#: builtin/log.c:1683 builtin/log.c:1686 msgid "boundary" msgstr "delimitatore" -#: builtin/log.c:1611 +#: builtin/log.c:1684 msgid "attach the patch" msgstr "allega la patch" -#: builtin/log.c:1614 +#: builtin/log.c:1687 msgid "inline the patch" msgstr "includi la patch nel messaggio" -#: builtin/log.c:1618 +#: builtin/log.c:1691 msgid "enable message threading, styles: shallow, deep" msgstr "" "abilita il raggruppamento messaggi per conversazione, stili: superficiale, " "profondo" -#: builtin/log.c:1620 +#: builtin/log.c:1693 msgid "signature" msgstr "firma" -#: builtin/log.c:1621 +#: builtin/log.c:1694 msgid "add a signature" msgstr "aggiungi una firma" -#: builtin/log.c:1622 +#: builtin/log.c:1695 msgid "base-commit" msgstr "commit di base" -#: builtin/log.c:1623 +#: builtin/log.c:1696 msgid "add prerequisite tree info to the patch series" msgstr "" "aggiungi le informazioni prerequisito per l'albero alla serie delle patch" -#: builtin/log.c:1625 +#: builtin/log.c:1698 msgid "add a signature from a file" msgstr "aggiungi una firma da file" -#: builtin/log.c:1626 +#: builtin/log.c:1699 msgid "don't print the patch filenames" msgstr "non stampare i nomi file delle patch" -#: builtin/log.c:1628 +#: builtin/log.c:1701 msgid "show progress while generating patches" msgstr "visualizza l'avanzamento dell'operazione di generazione patch" -#: builtin/log.c:1630 +#: builtin/log.c:1703 msgid "show changes against <rev> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <revisione> nella lettera di " "accompagnamento o in una patch singola" -#: builtin/log.c:1633 +#: builtin/log.c:1706 msgid "show changes against <refspec> in cover letter or single patch" msgstr "" "visualizza le modifiche rispetto a <specificatore revisione> nella lettera " "di accompagnamento o in una patch singola" -#: builtin/log.c:1635 +#: builtin/log.c:1708 msgid "percentage by which creation is weighted" msgstr "percentuale in base a cui viene pesata la creazione" -#: builtin/log.c:1710 +#: builtin/log.c:1792 #, c-format msgid "invalid ident line: %s" msgstr "riga ident non valida: %s" -#: builtin/log.c:1725 +#: builtin/log.c:1807 msgid "-n and -k are mutually exclusive" msgstr "le opzioni -n e -k sono mutuamente esclusive" -#: builtin/log.c:1727 +#: builtin/log.c:1809 msgid "--subject-prefix/--rfc and -k are mutually exclusive" msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive" -#: builtin/log.c:1735 +#: builtin/log.c:1817 msgid "--name-only does not make sense" msgstr "--name-only non ha senso" -#: builtin/log.c:1737 +#: builtin/log.c:1819 msgid "--name-status does not make sense" msgstr "--name-status non ha senso" -#: builtin/log.c:1739 +#: builtin/log.c:1821 msgid "--check does not make sense" msgstr "--check non ha senso" -#: builtin/log.c:1771 +#: builtin/log.c:1854 msgid "standard output, or directory, which one?" msgstr "standard output, o directory, quale dei due?" -#: builtin/log.c:1860 +#: builtin/log.c:1958 msgid "--interdiff requires --cover-letter or single patch" msgstr "--interdiff richiede --cover-letter o una singola patch" -#: builtin/log.c:1864 +#: builtin/log.c:1962 msgid "Interdiff:" msgstr "Interdiff:" -#: builtin/log.c:1865 +#: builtin/log.c:1963 #, c-format msgid "Interdiff against v%d:" msgstr "Interdiff rispetto alla versione %d:" -#: builtin/log.c:1871 +#: builtin/log.c:1969 msgid "--creation-factor requires --range-diff" msgstr "--creation-factor richiede --range-diff" -#: builtin/log.c:1875 +#: builtin/log.c:1973 msgid "--range-diff requires --cover-letter or single patch" msgstr "--range-diff richiede --cover-letter o una singola patch" -#: builtin/log.c:1883 +#: builtin/log.c:1981 msgid "Range-diff:" msgstr "Range-diff:" -#: builtin/log.c:1884 +#: builtin/log.c:1982 #, c-format msgid "Range-diff against v%d:" msgstr "Range-diff rispetto alla versione %d:" -#: builtin/log.c:1895 +#: builtin/log.c:1993 #, c-format msgid "unable to read signature file '%s'" msgstr "impossibile leggere il file firma '%s'" -#: builtin/log.c:1931 +#: builtin/log.c:2029 msgid "Generating patches" msgstr "Generazione delle patch in corso" -#: builtin/log.c:1975 +#: builtin/log.c:2073 msgid "failed to create output files" msgstr "creazione dei file di output non riuscita" -#: builtin/log.c:2034 +#: builtin/log.c:2132 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]" -#: builtin/log.c:2088 +#: builtin/log.c:2186 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -15078,7 +16164,7 @@ msgstr "" msgid "do not print remote URL" msgstr "non stampare l'URL del remoto" -#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464 +#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561 msgid "exec" msgstr "eseguibile" @@ -15166,150 +16252,150 @@ msgstr "git merge --abort" msgid "git merge --continue" msgstr "git merge --continue" -#: builtin/merge.c:118 +#: builtin/merge.c:119 msgid "switch `m' requires a value" msgstr "lo switch 'm' richiede un valore" -#: builtin/merge.c:141 +#: builtin/merge.c:142 #, c-format msgid "option `%s' requires a value" msgstr "l'opzione `%s' richiede un valore" -#: builtin/merge.c:187 +#: builtin/merge.c:188 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" -#: builtin/merge.c:188 +#: builtin/merge.c:189 #, c-format msgid "Available strategies are:" msgstr "Le strategie disponibili sono:" -#: builtin/merge.c:193 +#: builtin/merge.c:194 #, c-format msgid "Available custom strategies are:" msgstr "Le strategie personalizzate disponibili sono:" -#: builtin/merge.c:244 builtin/pull.c:151 +#: builtin/merge.c:245 builtin/pull.c:132 msgid "do not show a diffstat at the end of the merge" msgstr "non visualizzare un diffstat al termine del merge" -#: builtin/merge.c:247 builtin/pull.c:154 +#: builtin/merge.c:248 builtin/pull.c:135 msgid "show a diffstat at the end of the merge" msgstr "visualizza un diffstat al termine del merge" -#: builtin/merge.c:248 builtin/pull.c:157 +#: builtin/merge.c:249 builtin/pull.c:138 msgid "(synonym to --stat)" msgstr "(sinonimo di --stat)" -#: builtin/merge.c:250 builtin/pull.c:160 +#: builtin/merge.c:251 builtin/pull.c:141 msgid "add (at most <n>) entries from shortlog to merge commit message" msgstr "" "aggiungi (al più <n>) voci dal registro breve al messaggio di commit del " "merge" -#: builtin/merge.c:253 builtin/pull.c:166 +#: builtin/merge.c:254 builtin/pull.c:147 msgid "create a single commit instead of doing a merge" msgstr "crea un singolo commit anziché eseguire un merge" -#: builtin/merge.c:255 builtin/pull.c:169 +#: builtin/merge.c:256 builtin/pull.c:150 msgid "perform a commit if the merge succeeds (default)" msgstr "esegui un commit se il merge ha successo (impostazione predefinita)" -#: builtin/merge.c:257 builtin/pull.c:172 +#: builtin/merge.c:258 builtin/pull.c:153 msgid "edit message before committing" msgstr "modifica il messaggio prima di eseguire il commit" -#: builtin/merge.c:259 +#: builtin/merge.c:260 msgid "allow fast-forward (default)" msgstr "consenti fast forward (impostazione predefinita)" -#: builtin/merge.c:261 builtin/pull.c:179 +#: builtin/merge.c:262 builtin/pull.c:160 msgid "abort if fast-forward is not possible" msgstr "interrompi se il fast forward non è possibile" -#: builtin/merge.c:265 builtin/pull.c:182 +#: builtin/merge.c:266 builtin/pull.c:163 msgid "verify that the named commit has a valid GPG signature" msgstr "verifica che il commit specificato abbia una firma GPG valida" -#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:186 -#: builtin/rebase.c:492 builtin/rebase.c:1477 builtin/revert.c:114 +#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167 +#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114 msgid "strategy" msgstr "strategia" -#: builtin/merge.c:267 builtin/pull.c:187 +#: builtin/merge.c:268 builtin/pull.c:168 msgid "merge strategy to use" msgstr "strategia di merge da usare" -#: builtin/merge.c:268 builtin/pull.c:190 +#: builtin/merge.c:269 builtin/pull.c:171 msgid "option=value" msgstr "opzione=valore" -#: builtin/merge.c:269 builtin/pull.c:191 +#: builtin/merge.c:270 builtin/pull.c:172 msgid "option for selected merge strategy" msgstr "opzione per la strategia di merge selezionata" -#: builtin/merge.c:271 +#: builtin/merge.c:272 msgid "merge commit message (for a non-fast-forward merge)" msgstr "messaggio di commit del merge (per un merge non fast forward)" -#: builtin/merge.c:278 +#: builtin/merge.c:279 msgid "abort the current in-progress merge" msgstr "interrompi il merge attualmente in corso" -#: builtin/merge.c:280 +#: builtin/merge.c:281 msgid "--abort but leave index and working tree alone" msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro" -#: builtin/merge.c:282 +#: builtin/merge.c:283 msgid "continue the current in-progress merge" msgstr "continua il merge attualmente in corso" -#: builtin/merge.c:284 builtin/pull.c:198 +#: builtin/merge.c:285 builtin/pull.c:179 msgid "allow merging unrelated histories" msgstr "consenti di unire cronologie non correlate" -#: builtin/merge.c:290 -msgid "verify commit-msg hook" -msgstr "verifica hook commit-msg" +#: builtin/merge.c:291 +msgid "bypass pre-merge-commit and commit-msg hooks" +msgstr "ignora gli hook pre-merge-commit e commit-msg" -#: builtin/merge.c:307 +#: builtin/merge.c:308 msgid "could not run stash." msgstr "non è stato possibile eseguire stash." -#: builtin/merge.c:312 +#: builtin/merge.c:313 msgid "stash failed" msgstr "esecuzione di stash non riuscita" -#: builtin/merge.c:317 +#: builtin/merge.c:318 #, c-format msgid "not a valid object: %s" msgstr "non è un oggetto valido: %s" -#: builtin/merge.c:339 builtin/merge.c:356 +#: builtin/merge.c:340 builtin/merge.c:357 msgid "read-tree failed" msgstr "read-tree non riuscito" -#: builtin/merge.c:386 +#: builtin/merge.c:387 msgid " (nothing to squash)" msgstr " (nulla di cui eseguire lo squash)" -#: builtin/merge.c:397 +#: builtin/merge.c:398 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Commit di squash -- non aggiorno HEAD\n" -#: builtin/merge.c:447 +#: builtin/merge.c:448 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" -#: builtin/merge.c:498 +#: builtin/merge.c:499 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' non punta ad un commit" -#: builtin/merge.c:585 +#: builtin/merge.c:586 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Stringa branch.%s.mergeoptions errata: %s" @@ -15363,74 +16449,74 @@ msgstr "" "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n" "interromperà il commit.\n" -#: builtin/merge.c:853 +#: builtin/merge.c:865 msgid "Empty commit message." msgstr "Messaggio di commit vuoto." -#: builtin/merge.c:872 +#: builtin/merge.c:880 #, c-format msgid "Wonderful.\n" msgstr "Splendido.\n" -#: builtin/merge.c:933 +#: builtin/merge.c:941 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" "Merge automatico fallito; risolvi i conflitti ed esegui il commit\n" "del risultato.\n" -#: builtin/merge.c:972 +#: builtin/merge.c:980 msgid "No current branch." msgstr "Nessun branch corrente." -#: builtin/merge.c:974 +#: builtin/merge.c:982 msgid "No remote for the current branch." msgstr "Nessun remote per il branch corrente." -#: builtin/merge.c:976 +#: builtin/merge.c:984 msgid "No default upstream defined for the current branch." msgstr "Nessun upstream di default definito per il branch corrente." -#: builtin/merge.c:981 +#: builtin/merge.c:989 #, c-format msgid "No remote-tracking branch for %s from %s" msgstr "Nessun branch che tracci un remoto per %s da %s" -#: builtin/merge.c:1038 +#: builtin/merge.c:1046 #, c-format msgid "Bad value '%s' in environment '%s'" msgstr "Valore errato '%s' nell'ambiente '%s'" -#: builtin/merge.c:1141 +#: builtin/merge.c:1149 #, c-format msgid "not something we can merge in %s: %s" msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s" -#: builtin/merge.c:1175 +#: builtin/merge.c:1183 msgid "not something we can merge" msgstr "non è qualcosa di cui possiamo eseguire il merge" -#: builtin/merge.c:1278 +#: builtin/merge.c:1286 msgid "--abort expects no arguments" msgstr "--abort non richiede argomenti" -#: builtin/merge.c:1282 +#: builtin/merge.c:1290 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)." -#: builtin/merge.c:1291 +#: builtin/merge.c:1299 msgid "--quit expects no arguments" msgstr "--quit non richiede argomenti" -#: builtin/merge.c:1304 +#: builtin/merge.c:1312 msgid "--continue expects no arguments" msgstr "--continue non richiede argomenti" -#: builtin/merge.c:1308 +#: builtin/merge.c:1316 msgid "There is no merge in progress (MERGE_HEAD missing)." msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)." -#: builtin/merge.c:1324 +#: builtin/merge.c:1332 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15438,7 +16524,7 @@ msgstr "" "Non hai concluso il merge (MERGE_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1331 +#: builtin/merge.c:1339 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you merge." @@ -15446,96 +16532,96 @@ msgstr "" "Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n" "Esegui il commit delle modifiche prima di eseguire il merge." -#: builtin/merge.c:1334 +#: builtin/merge.c:1342 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." -#: builtin/merge.c:1348 +#: builtin/merge.c:1356 msgid "You cannot combine --squash with --no-ff." msgstr "Non è possibile combinare --squash con --no-ff." -#: builtin/merge.c:1350 +#: builtin/merge.c:1358 msgid "You cannot combine --squash with --commit." msgstr "Non è possibile combinare --squash con --commit." -#: builtin/merge.c:1366 +#: builtin/merge.c:1374 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato." -#: builtin/merge.c:1383 +#: builtin/merge.c:1391 msgid "Squash commit into empty head not supported yet" msgstr "Lo squash di un commit in un'head vuota non è ancora supportato" -#: builtin/merge.c:1385 +#: builtin/merge.c:1393 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "Un commit non fast forward non ha senso in un'head vuota" -#: builtin/merge.c:1390 +#: builtin/merge.c:1398 #, c-format msgid "%s - not something we can merge" msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" -#: builtin/merge.c:1392 +#: builtin/merge.c:1400 msgid "Can merge only exactly one commit into empty head" msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota" -#: builtin/merge.c:1471 +#: builtin/merge.c:1481 msgid "refusing to merge unrelated histories" msgstr "mi rifiuto di eseguire il merge di cronologie non correlate" -#: builtin/merge.c:1480 +#: builtin/merge.c:1490 msgid "Already up to date." msgstr "Già aggiornato." -#: builtin/merge.c:1490 +#: builtin/merge.c:1500 #, c-format msgid "Updating %s..%s\n" msgstr "Aggiornamento di %s..%s\n" -#: builtin/merge.c:1532 +#: builtin/merge.c:1542 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Provo con un merge veramente banale dentro l'indice...\n" -#: builtin/merge.c:1539 +#: builtin/merge.c:1549 #, c-format msgid "Nope.\n" msgstr "No.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1574 msgid "Already up to date. Yeeah!" msgstr "Già aggiornato. Oh sì!" -#: builtin/merge.c:1570 +#: builtin/merge.c:1580 msgid "Not possible to fast-forward, aborting." msgstr "Fast forward non possibile, interrompo l'operazione." -#: builtin/merge.c:1593 builtin/merge.c:1658 +#: builtin/merge.c:1603 builtin/merge.c:1668 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Ripristino l'albero in uno stato pulito...\n" -#: builtin/merge.c:1597 +#: builtin/merge.c:1607 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Tentativo con la strategia di merge %s...\n" -#: builtin/merge.c:1649 +#: builtin/merge.c:1659 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Nessuna strategia di merge ha gestito il merge.\n" -#: builtin/merge.c:1651 +#: builtin/merge.c:1661 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Merge con la strategia %s fallito.\n" -#: builtin/merge.c:1660 +#: builtin/merge.c:1670 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Uso %s per preparare una risoluzione manuale.\n" -#: builtin/merge.c:1672 +#: builtin/merge.c:1682 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -15624,33 +16710,33 @@ msgstr "non emettere avvisi in caso di conflitti" msgid "set labels for file1/orig-file/file2" msgstr "imposta etichette per file1/file originale/file2" -#: builtin/merge-recursive.c:46 +#: builtin/merge-recursive.c:47 #, c-format msgid "unknown option %s" msgstr "opzione sconosciuta %s" -#: builtin/merge-recursive.c:52 +#: builtin/merge-recursive.c:53 #, c-format msgid "could not parse object '%s'" msgstr "impossibile analizzare l'oggetto '%s'" -#: builtin/merge-recursive.c:56 +#: builtin/merge-recursive.c:57 #, c-format msgid "cannot handle more than %d base. Ignoring %s." msgid_plural "cannot handle more than %d bases. Ignoring %s." msgstr[0] "impossibile gestire più di %d base. Ignoro %s." msgstr[1] "impossibile gestire più di %d basi. Ignoro %s." -#: builtin/merge-recursive.c:64 +#: builtin/merge-recursive.c:65 msgid "not handling anything other than two heads merge." msgstr "non gestisco nulla che non sia il merge di due head." -#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72 +#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76 #, c-format msgid "could not resolve ref '%s'" msgstr "impossibile risolvere il riferimento '%s'" -#: builtin/merge-recursive.c:78 +#: builtin/merge-recursive.c:82 #, c-format msgid "Merging %s with %s\n" msgstr "Merge di %s con %s in corso\n" @@ -15673,18 +16759,18 @@ msgstr "consenti la creazione di più di un albero" #: builtin/multi-pack-index.c:9 msgid "" -"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --" -"batch-size=<size>)" +"git multi-pack-index [<options>] (write|verify|expire|repack --batch-" +"size=<size>)" msgstr "" -"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack " -"--batch-size=<dimensione>)" +"git multi-pack-index [<opzioni>] (write|verify|expire|repack --batch-" +"size=<dimensione>)" -#: builtin/multi-pack-index.c:23 +#: builtin/multi-pack-index.c:26 msgid "object directory containing set of packfile and pack-index pairs" msgstr "" "directory oggetti contenente un insieme di coppie packfile e pack-index" -#: builtin/multi-pack-index.c:25 +#: builtin/multi-pack-index.c:29 msgid "" "during repack, collect pack-files of smaller size into a batch that is " "larger than this size" @@ -15692,15 +16778,15 @@ msgstr "" "durante il repack, raccogli i file pack di dimensioni più piccole in un " "gruppo più grande di queste dimensioni" -#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67 +#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67 msgid "too many arguments" msgstr "troppi argomenti" -#: builtin/multi-pack-index.c:52 +#: builtin/multi-pack-index.c:60 msgid "--batch-size option is only for 'repack' subcommand" msgstr "l'opzione --batch-size è consentita solo per il sottocomando 'repack'" -#: builtin/multi-pack-index.c:61 +#: builtin/multi-pack-index.c:69 #, c-format msgid "unrecognized subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -15794,52 +16880,52 @@ msgstr "%s, sorgente=%s, destinazione=%s" msgid "Renaming %s to %s\n" msgstr "Rinominazione di %s in %s in corso\n" -#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:510 +#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518 #, c-format msgid "renaming '%s' failed" msgstr "rinomina di '%s' non riuscita" -#: builtin/name-rev.c:352 +#: builtin/name-rev.c:465 msgid "git name-rev [<options>] <commit>..." msgstr "git name-rev [<opzioni>] <commit>..." -#: builtin/name-rev.c:353 +#: builtin/name-rev.c:466 msgid "git name-rev [<options>] --all" msgstr "git name-rev [<opzioni>] --all" -#: builtin/name-rev.c:354 +#: builtin/name-rev.c:467 msgid "git name-rev [<options>] --stdin" msgstr "git name-rev [<opzioni>] --stdin" -#: builtin/name-rev.c:411 +#: builtin/name-rev.c:524 msgid "print only names (no SHA-1)" msgstr "stampa solo i nomi (non lo SHA-1)" -#: builtin/name-rev.c:412 +#: builtin/name-rev.c:525 msgid "only use tags to name the commits" msgstr "usa solo tag per denominare i commit" -#: builtin/name-rev.c:414 +#: builtin/name-rev.c:527 msgid "only use refs matching <pattern>" msgstr "usa solo i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:416 +#: builtin/name-rev.c:529 msgid "ignore refs matching <pattern>" msgstr "ignora i riferimenti corrispondenti a <pattern>" -#: builtin/name-rev.c:418 +#: builtin/name-rev.c:531 msgid "list all commits reachable from all refs" msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti" -#: builtin/name-rev.c:419 +#: builtin/name-rev.c:532 msgid "read from stdin" msgstr "leggi dallo standard input" -#: builtin/name-rev.c:420 +#: builtin/name-rev.c:533 msgid "allow to print `undefined` names (default)" msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)" -#: builtin/name-rev.c:426 +#: builtin/name-rev.c:539 msgid "dereference tags in the input (internal use)" msgstr "dereferenzia tag nell'input (uso interno)" @@ -16243,7 +17329,7 @@ msgstr "il tentativo di rimuovere una nota inesistente non è un errore" msgid "read object names from the standard input" msgstr "leggi i nomi degli oggetti dallo standard input" -#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165 +#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164 msgid "do not remove, show only" msgstr "non rimuovere, limitati a visualizzare" @@ -16259,7 +17345,7 @@ msgstr "riferimento note" msgid "use notes from <notes-ref>" msgstr "usa le note in <riferimento note>" -#: builtin/notes.c:1034 builtin/stash.c:1598 +#: builtin/notes.c:1034 builtin/stash.c:1643 #, c-format msgid "unknown subcommand: %s" msgstr "sottocomando sconosciuto: %s" @@ -16278,129 +17364,106 @@ msgstr "" "git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < " "<elenco oggetti>]" -#: builtin/pack-objects.c:428 +#: builtin/pack-objects.c:430 #, c-format msgid "bad packed object CRC for %s" msgstr "CRC oggetto sottoposto a pack %s errato" -#: builtin/pack-objects.c:439 +#: builtin/pack-objects.c:441 #, c-format msgid "corrupt packed object for %s" msgstr "oggetto sottoposto a pack %s corrotto" -#: builtin/pack-objects.c:570 +#: builtin/pack-objects.c:572 #, c-format msgid "recursive delta detected for object %s" msgstr "rilevato delta ricorsivo per l'oggetto %s" -#: builtin/pack-objects.c:781 +#: builtin/pack-objects.c:783 #, c-format msgid "ordered %u objects, expected %<PRIu32>" msgstr "%u oggetti ordinati, attesi %<PRIu32>" -#: builtin/pack-objects.c:794 -#, c-format -msgid "packfile is invalid: %s" -msgstr "packfile non valido: %s" - -#: builtin/pack-objects.c:798 -#, c-format -msgid "unable to open packfile for reuse: %s" -msgstr "impossibile aprire il packfile per il suo riuso: %s" - -#: builtin/pack-objects.c:802 -msgid "unable to seek in reused packfile" -msgstr "impossibile eseguire seek nel packfile riusato" - -#: builtin/pack-objects.c:813 -msgid "unable to read from reused packfile" -msgstr "impossibile leggere dal packfile riusato" - -#: builtin/pack-objects.c:841 +#: builtin/pack-objects.c:972 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit" msgstr "" "disabilito la scrittura delle bitmap, i pack sono divisi a causa " "dell'impostazione pack.packSizeLimit" -#: builtin/pack-objects.c:854 +#: builtin/pack-objects.c:985 msgid "Writing objects" msgstr "Scrittura degli oggetti in corso" -#: builtin/pack-objects.c:917 builtin/update-index.c:89 +#: builtin/pack-objects.c:1046 builtin/update-index.c:90 #, c-format msgid "failed to stat %s" msgstr "stat di %s non riuscito" -#: builtin/pack-objects.c:970 +#: builtin/pack-objects.c:1099 #, c-format msgid "wrote %<PRIu32> objects while expecting %<PRIu32>" msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>" -#: builtin/pack-objects.c:1166 +#: builtin/pack-objects.c:1297 msgid "disabling bitmap writing, as some objects are not being packed" msgstr "" "disabilito la scrittura delle bitmap perché alcuni oggetti non saranno " "sottoposti a pack" -#: builtin/pack-objects.c:1597 +#: builtin/pack-objects.c:1724 #, c-format msgid "delta base offset overflow in pack for %s" msgstr "overflow dell'offset base del delta nel pack per %s" -#: builtin/pack-objects.c:1606 +#: builtin/pack-objects.c:1733 #, c-format msgid "delta base offset out of bound for %s" msgstr "offset base del delta fuori dall'intervallo consentito per %s" -#: builtin/pack-objects.c:1875 +#: builtin/pack-objects.c:2004 msgid "Counting objects" msgstr "Conteggio degli oggetti in corso" -#: builtin/pack-objects.c:2005 -#, c-format -msgid "unable to get size of %s" -msgstr "impossibile recuperare le dimensioni di %s" - -#: builtin/pack-objects.c:2020 +#: builtin/pack-objects.c:2149 #, c-format msgid "unable to parse object header of %s" msgstr "impossibile analizzare l'intestazione oggetto di %s" -#: builtin/pack-objects.c:2090 builtin/pack-objects.c:2106 -#: builtin/pack-objects.c:2116 +#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235 +#: builtin/pack-objects.c:2245 #, c-format msgid "object %s cannot be read" msgstr "impossibile leggere l'oggetto %s" -#: builtin/pack-objects.c:2093 builtin/pack-objects.c:2120 +#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249 #, c-format msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)" msgstr "" "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)" -#: builtin/pack-objects.c:2130 +#: builtin/pack-objects.c:2259 msgid "suboptimal pack - out of memory" msgstr "pack subottimo - memoria esaurita" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2574 #, c-format msgid "Delta compression using up to %d threads" msgstr "Compressione delta in corso, uso fino a %d thread" -#: builtin/pack-objects.c:2588 +#: builtin/pack-objects.c:2713 #, c-format msgid "unable to pack objects reachable from tag %s" msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s" -#: builtin/pack-objects.c:2675 +#: builtin/pack-objects.c:2801 msgid "Compressing objects" msgstr "Compressione oggetti in corso" -#: builtin/pack-objects.c:2681 +#: builtin/pack-objects.c:2807 msgid "inconsistency with delta count" msgstr "inconsistenza con il numero dei delta" -#: builtin/pack-objects.c:2762 +#: builtin/pack-objects.c:2888 #, c-format msgid "" "expected edge object ID, got garbage:\n" @@ -16409,7 +17472,7 @@ msgstr "" "atteso ID oggetto arco, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2768 +#: builtin/pack-objects.c:2894 #, c-format msgid "" "expected object ID, got garbage:\n" @@ -16418,256 +17481,241 @@ msgstr "" "atteso ID oggetto, ricevuti dati errati:\n" " %s" -#: builtin/pack-objects.c:2866 +#: builtin/pack-objects.c:2992 msgid "invalid value for --missing" msgstr "valore non valido per --missing" -#: builtin/pack-objects.c:2925 builtin/pack-objects.c:3033 +#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159 msgid "cannot open pack index" msgstr "impossibile aprire l'indice pack" -#: builtin/pack-objects.c:2956 +#: builtin/pack-objects.c:3082 #, c-format msgid "loose object at %s could not be examined" msgstr "impossibile esaminare l'oggetto sciolto %s" -#: builtin/pack-objects.c:3041 +#: builtin/pack-objects.c:3167 msgid "unable to force loose object" msgstr "impossibile forzare l'oggetto sciolto" -#: builtin/pack-objects.c:3133 +#: builtin/pack-objects.c:3260 #, c-format msgid "not a rev '%s'" msgstr "'%s' non è una revisione" -#: builtin/pack-objects.c:3136 +#: builtin/pack-objects.c:3263 #, c-format msgid "bad revision '%s'" msgstr "revisione '%s' errata" -#: builtin/pack-objects.c:3161 +#: builtin/pack-objects.c:3288 msgid "unable to add recent objects" msgstr "impossibile aggiungere gli oggetti recenti" -#: builtin/pack-objects.c:3214 +#: builtin/pack-objects.c:3341 #, c-format msgid "unsupported index version %s" msgstr "versione %s di index non supportata" -#: builtin/pack-objects.c:3218 +#: builtin/pack-objects.c:3345 #, c-format msgid "bad index version '%s'" msgstr "versione '%s' di index errata" -#: builtin/pack-objects.c:3248 -msgid "do not show progress meter" -msgstr "non visualizzare la barra di avanzamento" - -#: builtin/pack-objects.c:3250 -msgid "show progress meter" -msgstr "visualizza la barra di avanzamento" - -#: builtin/pack-objects.c:3252 -msgid "show progress meter during object writing phase" -msgstr "" -"visualizza la barra di avanzamento durante la fase di scrittura oggetti" - -#: builtin/pack-objects.c:3255 -msgid "similar to --all-progress when progress meter is shown" -msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento" - -#: builtin/pack-objects.c:3256 +#: builtin/pack-objects.c:3383 msgid "<version>[,<offset>]" msgstr "<versione>[,<offset>]" -#: builtin/pack-objects.c:3257 +#: builtin/pack-objects.c:3384 msgid "write the pack index file in the specified idx format version" msgstr "scrivi il file indice pack usando la versione formato idx specificata" -#: builtin/pack-objects.c:3260 +#: builtin/pack-objects.c:3387 msgid "maximum size of each output pack file" msgstr "dimensione massima di ogni file pack in output" -#: builtin/pack-objects.c:3262 +#: builtin/pack-objects.c:3389 msgid "ignore borrowed objects from alternate object store" msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo" -#: builtin/pack-objects.c:3264 +#: builtin/pack-objects.c:3391 msgid "ignore packed objects" msgstr "ignora gli oggetti sottoposti a pack" -#: builtin/pack-objects.c:3266 +#: builtin/pack-objects.c:3393 msgid "limit pack window by objects" msgstr "limita la finestra di pack al numero di oggetti specificato" -#: builtin/pack-objects.c:3268 +#: builtin/pack-objects.c:3395 msgid "limit pack window by memory in addition to object limit" msgstr "" "limita la finestra di pack alla memoria specificata in aggiunta al limite " "sugli oggetti" -#: builtin/pack-objects.c:3270 +#: builtin/pack-objects.c:3397 msgid "maximum length of delta chain allowed in the resulting pack" msgstr "lunghezza massima della catena di delta consentita nel pack risultante" -#: builtin/pack-objects.c:3272 +#: builtin/pack-objects.c:3399 msgid "reuse existing deltas" msgstr "riusa i delta esistenti" -#: builtin/pack-objects.c:3274 +#: builtin/pack-objects.c:3401 msgid "reuse existing objects" msgstr "riusa gli oggetti esistenti" -#: builtin/pack-objects.c:3276 +#: builtin/pack-objects.c:3403 msgid "use OFS_DELTA objects" msgstr "usa oggetti OFS_DELTA" -#: builtin/pack-objects.c:3278 +#: builtin/pack-objects.c:3405 msgid "use threads when searching for best delta matches" msgstr "" "usa più thread durante la ricerca delle migliori corrispondenze per i delta" -#: builtin/pack-objects.c:3280 +#: builtin/pack-objects.c:3407 msgid "do not create an empty pack output" msgstr "non creare un output pack vuoto" -#: builtin/pack-objects.c:3282 +#: builtin/pack-objects.c:3409 msgid "read revision arguments from standard input" msgstr "leggi gli argomenti revisione dallo standard input" -#: builtin/pack-objects.c:3284 +#: builtin/pack-objects.c:3411 msgid "limit the objects to those that are not yet packed" msgstr "limita gli oggetti a quelli non ancora sottoposti a pack" -#: builtin/pack-objects.c:3287 +#: builtin/pack-objects.c:3414 msgid "include objects reachable from any reference" msgstr "includi gli oggetti raggiungibili da qualunque riferimento" -#: builtin/pack-objects.c:3290 +#: builtin/pack-objects.c:3417 msgid "include objects referred by reflog entries" msgstr "includi gli oggetti referenziati da voci del log riferimenti" -#: builtin/pack-objects.c:3293 +#: builtin/pack-objects.c:3420 msgid "include objects referred to by the index" msgstr "includi gli oggetti referenziati dall'indice" -#: builtin/pack-objects.c:3296 +#: builtin/pack-objects.c:3423 msgid "output pack to stdout" msgstr "invia il pack in output sullo standard output" -#: builtin/pack-objects.c:3298 +#: builtin/pack-objects.c:3425 msgid "include tag objects that refer to objects to be packed" msgstr "" "includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a " "pack" -#: builtin/pack-objects.c:3300 +#: builtin/pack-objects.c:3427 msgid "keep unreachable objects" msgstr "mantieni gli oggetti non raggiungibili" -#: builtin/pack-objects.c:3302 +#: builtin/pack-objects.c:3429 msgid "pack loose unreachable objects" msgstr "esegui il pack degli oggetti non raggiungibili sciolti" -#: builtin/pack-objects.c:3304 +#: builtin/pack-objects.c:3431 msgid "unpack unreachable objects newer than <time>" msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>" -#: builtin/pack-objects.c:3307 +#: builtin/pack-objects.c:3434 msgid "use the sparse reachability algorithm" msgstr "usa l'algoritmo di raggiungibilità sparse" -#: builtin/pack-objects.c:3309 +#: builtin/pack-objects.c:3436 msgid "create thin packs" msgstr "crea pack thin" -#: builtin/pack-objects.c:3311 +#: builtin/pack-objects.c:3438 msgid "create packs suitable for shallow fetches" msgstr "crea pack adatti per fetch shallow" -#: builtin/pack-objects.c:3313 +#: builtin/pack-objects.c:3440 msgid "ignore packs that have companion .keep file" msgstr "ignora i pack che hanno un file .keep che li accompagna" -#: builtin/pack-objects.c:3315 +#: builtin/pack-objects.c:3442 msgid "ignore this pack" msgstr "ignora questo pack" -#: builtin/pack-objects.c:3317 +#: builtin/pack-objects.c:3444 msgid "pack compression level" msgstr "livello compressione pack" -#: builtin/pack-objects.c:3319 +#: builtin/pack-objects.c:3446 msgid "do not hide commits by grafts" msgstr "non nascondere i commit innestati" -#: builtin/pack-objects.c:3321 +#: builtin/pack-objects.c:3448 msgid "use a bitmap index if available to speed up counting objects" msgstr "" "usa un indice bitmap se disponibile per velocizzare il conteggio degli " "oggetti" -#: builtin/pack-objects.c:3323 +#: builtin/pack-objects.c:3450 msgid "write a bitmap index together with the pack index" msgstr "scrivi un indice bitmap insieme all'indice pack" -#: builtin/pack-objects.c:3327 +#: builtin/pack-objects.c:3454 msgid "write a bitmap index if possible" msgstr "scrivi un indice bitmap se possibile" -#: builtin/pack-objects.c:3331 +#: builtin/pack-objects.c:3458 msgid "handling for missing objects" msgstr "azione da eseguire sugli oggetti mancanti" -#: builtin/pack-objects.c:3334 +#: builtin/pack-objects.c:3461 msgid "do not pack objects in promisor packfiles" msgstr "non eseguire il pack degli oggetti nei file pack promettenti" -#: builtin/pack-objects.c:3336 +#: builtin/pack-objects.c:3463 msgid "respect islands during delta compression" msgstr "rispetta le isole durante la compressione delta" -#: builtin/pack-objects.c:3361 +#: builtin/pack-objects.c:3492 #, c-format msgid "delta chain depth %d is too deep, forcing %d" msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d" -#: builtin/pack-objects.c:3366 +#: builtin/pack-objects.c:3497 #, c-format msgid "pack.deltaCacheLimit is too high, forcing %d" msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d" -#: builtin/pack-objects.c:3420 +#: builtin/pack-objects.c:3551 msgid "--max-pack-size cannot be used to build a pack for transfer" msgstr "" "--max-pack-size non può essere usato per generare un pack da trasferire" -#: builtin/pack-objects.c:3422 +#: builtin/pack-objects.c:3553 msgid "minimum pack size limit is 1 MiB" msgstr "il limite minimo delle dimensioni dei pack è 1 MiB" -#: builtin/pack-objects.c:3427 +#: builtin/pack-objects.c:3558 msgid "--thin cannot be used to build an indexable pack" msgstr "--thin non può essere usato per generare un pack indicizzabile" -#: builtin/pack-objects.c:3430 +#: builtin/pack-objects.c:3561 msgid "--keep-unreachable and --unpack-unreachable are incompatible" msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili" -#: builtin/pack-objects.c:3436 +#: builtin/pack-objects.c:3567 msgid "cannot use --filter without --stdout" msgstr "impossibile usare --filter senza --stdout" -#: builtin/pack-objects.c:3497 +#: builtin/pack-objects.c:3627 msgid "Enumerating objects" msgstr "Enumerazione degli oggetti in corso" -#: builtin/pack-objects.c:3527 +#: builtin/pack-objects.c:3657 #, c-format -msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)" +msgid "" +"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-" +"reused %<PRIu32>" msgstr "" "%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati " -"(%<PRIu32> delta)" +"(%<PRIu32> delta), %<PRIu32> riutilizzati nel file pack" #: builtin/pack-refs.c:8 msgid "git pack-refs [<options>]" @@ -16710,53 +17758,53 @@ msgid "cannot prune in a precious-objects repo" msgstr "" "impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'" -#: builtin/pull.c:66 builtin/pull.c:68 +#: builtin/pull.c:45 builtin/pull.c:47 #, c-format msgid "Invalid value for %s: %s" msgstr "Valore non valido per %s: %s" -#: builtin/pull.c:88 +#: builtin/pull.c:67 msgid "git pull [<options>] [<repository> [<refspec>...]]" msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/pull.c:141 +#: builtin/pull.c:122 msgid "control for recursive fetching of submodules" msgstr "controlla il recupero ricorsivo dei sottomoduli" -#: builtin/pull.c:145 +#: builtin/pull.c:126 msgid "Options related to merging" msgstr "Opzioni relative al merge" -#: builtin/pull.c:148 +#: builtin/pull.c:129 msgid "incorporate changes by rebasing rather than merging" msgstr "incorpora le modifiche eseguendo un rebase anziché un merge" -#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126 +#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126 msgid "allow fast-forward" msgstr "consenti fast forward" -#: builtin/pull.c:185 +#: builtin/pull.c:166 msgid "automatically stash/stash pop before and after rebase" msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase" -#: builtin/pull.c:201 +#: builtin/pull.c:182 msgid "Options related to fetching" msgstr "Opzioni relative al fetch" -#: builtin/pull.c:211 +#: builtin/pull.c:192 msgid "force overwrite of local branch" msgstr "forza la sovrascrittura del branch locale" -#: builtin/pull.c:219 +#: builtin/pull.c:200 msgid "number of submodules pulled in parallel" msgstr "numero di sottomoduli recuperati in parallelo" -#: builtin/pull.c:316 +#: builtin/pull.c:300 #, c-format msgid "Invalid value for pull.ff: %s" msgstr "Valore non valido per pull.ff: %s" -#: builtin/pull.c:433 +#: builtin/pull.c:426 msgid "" "There is no candidate for rebasing against among the refs that you just " "fetched." @@ -16764,14 +17812,14 @@ msgstr "" "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti " "appena recuperati." -#: builtin/pull.c:435 +#: builtin/pull.c:428 msgid "" "There are no candidates for merging among the refs that you just fetched." msgstr "" "Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti " "appena recuperati." -#: builtin/pull.c:436 +#: builtin/pull.c:429 msgid "" "Generally this means that you provided a wildcard refspec which had no\n" "matches on the remote end." @@ -16779,7 +17827,7 @@ msgstr "" "In generale, questo significa che hai fornito uno specificatore\n" "riferimento che non aveva corrispondenze nel remoto." -#: builtin/pull.c:439 +#: builtin/pull.c:432 #, c-format msgid "" "You asked to pull from the remote '%s', but did not specify\n" @@ -16791,44 +17839,44 @@ msgstr "" "configurato come predefinito per il branch corrente, devi\n" "specificare un branch sulla riga di comando." -#: builtin/pull.c:444 builtin/rebase.c:1326 git-parse-remote.sh:73 +#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73 msgid "You are not currently on a branch." msgstr "Attualmente non sei su un branch." -#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79 +#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79 msgid "Please specify which branch you want to rebase against." msgstr "Specifica il branch in base a cui vuoi effettuare il rebase." -#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82 +#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82 msgid "Please specify which branch you want to merge with." msgstr "Specifica il branch in base a cui vuoi effettuare il merge." -#: builtin/pull.c:449 builtin/pull.c:464 +#: builtin/pull.c:442 builtin/pull.c:457 msgid "See git-pull(1) for details." msgstr "Vedi git-pull(1) per ulteriori dettagli." -#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466 -#: builtin/rebase.c:1332 git-parse-remote.sh:64 +#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459 +#: builtin/rebase.c:1415 git-parse-remote.sh:64 msgid "<remote>" msgstr "<remoto>" -#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471 +#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464 #: git-parse-remote.sh:65 msgid "<branch>" msgstr "<branch>" -#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75 +#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75 msgid "There is no tracking information for the current branch." msgstr "Non ci sono informazioni di tracciamento per il branch corrente." -#: builtin/pull.c:468 git-parse-remote.sh:95 +#: builtin/pull.c:461 git-parse-remote.sh:95 msgid "" "If you wish to set tracking information for this branch you can do so with:" msgstr "" "Se vuoi impostare le informazioni di tracciamento per questo branch puoi " "farlo con:" -#: builtin/pull.c:473 +#: builtin/pull.c:466 #, c-format msgid "" "Your configuration specifies to merge with the ref '%s'\n" @@ -16838,32 +17886,32 @@ msgstr "" "il merge con il riferimento '%s' del remoto, ma un tale\n" "riferimento non è stato recuperato." -#: builtin/pull.c:581 +#: builtin/pull.c:576 #, c-format msgid "unable to access commit %s" msgstr "impossibile accedere al commit %s" -#: builtin/pull.c:861 +#: builtin/pull.c:857 msgid "ignoring --verify-signatures for rebase" msgstr "ignoro --verify-signature per il rebase" -#: builtin/pull.c:916 +#: builtin/pull.c:912 msgid "--[no-]autostash option is only valid with --rebase." msgstr "l'opzione --[no-]autostash option è valida solo con --rebase." -#: builtin/pull.c:924 +#: builtin/pull.c:920 msgid "Updating an unborn branch with changes added to the index." msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice." -#: builtin/pull.c:928 +#: builtin/pull.c:924 msgid "pull with rebase" msgstr "pull con rebase" -#: builtin/pull.c:929 +#: builtin/pull.c:925 msgid "please commit or stash them." msgstr "eseguine il commit o lo stash." -#: builtin/pull.c:954 +#: builtin/pull.c:950 #, c-format msgid "" "fetch updated the current branch head.\n" @@ -16875,7 +17923,7 @@ msgstr "" "Eseguo il fast forward dell'albero\n" "di lavoro dal commit %s." -#: builtin/pull.c:960 +#: builtin/pull.c:956 #, c-format msgid "" "Cannot fast-forward your working tree.\n" @@ -16894,15 +17942,15 @@ msgstr "" "$ git reset --hard\n" "per eseguire il ripristino." -#: builtin/pull.c:975 +#: builtin/pull.c:971 msgid "Cannot merge multiple branches into empty head." msgstr "Impossibile eseguire il merge di più branch in un head vuoto." -#: builtin/pull.c:979 +#: builtin/pull.c:975 msgid "Cannot rebase onto multiple branches." msgstr "Impossibile eseguire il rebase su più branch." -#: builtin/pull.c:986 +#: builtin/pull.c:982 msgid "cannot rebase with locally recorded submodule modifications" msgstr "" "impossibile eseguire il rebase se ci sono delle modifiche registrate " @@ -16912,15 +17960,15 @@ msgstr "" msgid "git push [<options>] [<repository> [<refspec>...]]" msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]" -#: builtin/push.c:111 +#: builtin/push.c:112 msgid "tag shorthand without <tag>" msgstr "esegui il tag della forma breve senza <tag>" -#: builtin/push.c:121 +#: builtin/push.c:122 msgid "--delete only accepts plain target ref names" msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro" -#: builtin/push.c:167 +#: builtin/push.c:168 msgid "" "\n" "To choose either option permanently, see push.default in 'git help config'." @@ -16929,7 +17977,7 @@ msgstr "" "Per scegliere permanentemente una delle due opzioni, vedi push.default in " "'git help config'." -#: builtin/push.c:170 +#: builtin/push.c:171 #, c-format msgid "" "The upstream branch of your current branch does not match\n" @@ -16954,7 +18002,7 @@ msgstr "" " git push %s HEAD\n" "%s" -#: builtin/push.c:185 +#: builtin/push.c:186 #, c-format msgid "" "You are not currently on a branch.\n" @@ -16969,7 +18017,7 @@ msgstr "" "\n" " git push %s HEAD:<nome del branch remoto>\n" -#: builtin/push.c:199 +#: builtin/push.c:200 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -16983,13 +18031,13 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:207 +#: builtin/push.c:208 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "" "Il branch corrente %s ha più branch upstream, mi rifiuto di eseguire il push." -#: builtin/push.c:210 +#: builtin/push.c:211 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -17000,14 +18048,14 @@ msgstr "" "branch corrente '%s', senza dirmi di cosa devo eseguire il push\n" "per aggiornare quale branch remoto." -#: builtin/push.c:269 +#: builtin/push.c:270 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" "Non è stato specificato alcun refspec per il push, e push.default è \"nothing" "\"." -#: builtin/push.c:276 +#: builtin/push.c:277 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Integrate the remote changes (e.g.\n" @@ -17021,7 +18069,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:282 +#: builtin/push.c:283 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and integrate the remote changes\n" @@ -17036,7 +18084,7 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:288 +#: builtin/push.c:289 msgid "" "Updates were rejected because the remote contains work that you do\n" "not have locally. This is usually caused by another repository pushing\n" @@ -17052,12 +18100,12 @@ msgstr "" "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n" "dettagli." -#: builtin/push.c:295 +#: builtin/push.c:296 msgid "Updates were rejected because the tag already exists in the remote." msgstr "" "Gli aggiornamenti sono stati rifiutati perché il tag esiste già nel remoto." -#: builtin/push.c:298 +#: builtin/push.c:299 msgid "" "You cannot update a remote ref that points at a non-commit object,\n" "or update a remote ref to make it point at a non-commit object,\n" @@ -17068,142 +18116,142 @@ msgstr "" "puntare a un oggetto diverso da un commit senza usare l'opzione\n" "'--force'.\n" -#: builtin/push.c:359 +#: builtin/push.c:360 #, c-format msgid "Pushing to %s\n" msgstr "Push su %s in corso\n" -#: builtin/push.c:364 +#: builtin/push.c:367 #, c-format msgid "failed to push some refs to '%s'" msgstr "push di alcuni riferimenti su '%s' non riuscito" -#: builtin/push.c:398 -#, c-format -msgid "bad repository '%s'" -msgstr "repository '%s' errato" - -#: builtin/push.c:399 -msgid "" -"No configured push destination.\n" -"Either specify the URL from the command-line or configure a remote " -"repository using\n" -"\n" -" git remote add <name> <url>\n" -"\n" -"and then push using the remote name\n" -"\n" -" git push <name>\n" -msgstr "" -"Nessuna destinazione per il push configurata.\n" -"Specifica un URL dalla riga di comando oppure configurare un repository " -"remoto usando\n" -"\n" -" git remote add <nome> <url>\n" -"\n" -"e poi eseguire il push usando il nome del remote\n" -"\n" -" git push <nome>\n" - -#: builtin/push.c:554 +#: builtin/push.c:542 msgid "repository" msgstr "repository" -#: builtin/push.c:555 builtin/send-pack.c:164 +#: builtin/push.c:543 builtin/send-pack.c:164 msgid "push all refs" msgstr "esegui il push di tutti i riferimenti" -#: builtin/push.c:556 builtin/send-pack.c:166 +#: builtin/push.c:544 builtin/send-pack.c:166 msgid "mirror all refs" msgstr "esegui il mirror di tutti i riferimenti" -#: builtin/push.c:558 +#: builtin/push.c:546 msgid "delete refs" msgstr "elimina riferimenti" -#: builtin/push.c:559 +#: builtin/push.c:547 msgid "push tags (can't be used with --all or --mirror)" msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)" -#: builtin/push.c:562 builtin/send-pack.c:167 +#: builtin/push.c:550 builtin/send-pack.c:167 msgid "force updates" msgstr "forza gli aggiornamenti" -#: builtin/push.c:564 builtin/send-pack.c:181 +#: builtin/push.c:552 builtin/send-pack.c:181 msgid "<refname>:<expect>" msgstr "<nome riferimento>:<valore atteso>" -#: builtin/push.c:565 builtin/send-pack.c:182 +#: builtin/push.c:553 builtin/send-pack.c:182 msgid "require old value of ref to be at this value" msgstr "" "richiedi che il vecchio valore del riferimento corrisponda a questo valore" -#: builtin/push.c:568 +#: builtin/push.c:556 msgid "control recursive pushing of submodules" msgstr "controlla il push ricorsivo dei sottomoduli" -#: builtin/push.c:570 builtin/send-pack.c:175 +#: builtin/push.c:558 builtin/send-pack.c:175 msgid "use thin pack" msgstr "usa un thin pack" -#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161 +#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161 #: builtin/send-pack.c:162 msgid "receive pack program" msgstr "programma ricezione pack" -#: builtin/push.c:573 +#: builtin/push.c:561 msgid "set upstream for git pull/status" msgstr "imposta l'upstream per git pull/status" -#: builtin/push.c:576 +#: builtin/push.c:564 msgid "prune locally removed refs" msgstr "elimina i riferimenti rimossi localmente" -#: builtin/push.c:578 +#: builtin/push.c:566 msgid "bypass pre-push hook" msgstr "ignora l'hook pre-push" -#: builtin/push.c:579 +#: builtin/push.c:567 msgid "push missing but relevant tags" msgstr "esegui il push dei tag mancanti ma rilevanti" -#: builtin/push.c:582 builtin/send-pack.c:169 +#: builtin/push.c:570 builtin/send-pack.c:169 msgid "GPG sign the push" msgstr "firma il push con GPG" -#: builtin/push.c:584 builtin/send-pack.c:176 +#: builtin/push.c:572 builtin/send-pack.c:176 msgid "request atomic transaction on remote side" msgstr "richiedi l'atomicità della transazione al remoto" -#: builtin/push.c:602 +#: builtin/push.c:590 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete non è compatibile con --all, --mirror e --tags" -#: builtin/push.c:604 +#: builtin/push.c:592 msgid "--delete doesn't make sense without any refs" msgstr "--delete non ha senso senza alcun ref" -#: builtin/push.c:607 +#: builtin/push.c:612 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" + +#: builtin/push.c:613 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Nessuna destinazione per il push configurata.\n" +"Specifica un URL dalla riga di comando oppure configurare un repository " +"remoto usando\n" +"\n" +" git remote add <nome> <url>\n" +"\n" +"e poi eseguire il push usando il nome del remote\n" +"\n" +" git push <nome>\n" + +#: builtin/push.c:628 msgid "--all and --tags are incompatible" msgstr "--all e --tags non sono compatibili" -#: builtin/push.c:609 +#: builtin/push.c:630 msgid "--all can't be combined with refspecs" msgstr "--all non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:613 +#: builtin/push.c:634 msgid "--mirror and --tags are incompatible" msgstr "--mirror e --tags non sono compatibili" -#: builtin/push.c:615 +#: builtin/push.c:636 msgid "--mirror can't be combined with refspecs" msgstr "--mirror non può essere combinato con degli specificatori riferimento" -#: builtin/push.c:618 +#: builtin/push.c:639 msgid "--all and --mirror are incompatible" msgstr "--all e --mirror non sono compatibili" -#: builtin/push.c:637 +#: builtin/push.c:643 msgid "push options must not have new line characters" msgstr "le opzioni push non devono avere caratteri di fine riga" @@ -17224,24 +18272,32 @@ msgstr "" "git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo " "commit>" -#: builtin/range-diff.c:21 +#: builtin/range-diff.c:22 msgid "Percentage by which creation is weighted" msgstr "Percentuale in base a cui viene pesata la creazione" -#: builtin/range-diff.c:23 +#: builtin/range-diff.c:24 msgid "use simple diff colors" msgstr "usa colori semplici per il diff" -#: builtin/range-diff.c:46 builtin/range-diff.c:50 +#: builtin/range-diff.c:26 +msgid "notes" +msgstr "note" + +#: builtin/range-diff.c:26 +msgid "passed to 'git log'" +msgstr "passato a 'git log'" + +#: builtin/range-diff.c:50 builtin/range-diff.c:54 #, c-format msgid "no .. in range: '%s'" msgstr "nessun .. nell'intervallo: '%s'" -#: builtin/range-diff.c:60 +#: builtin/range-diff.c:64 msgid "single arg format must be symmetric range" msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico" -#: builtin/range-diff.c:75 +#: builtin/range-diff.c:79 msgid "need two commit ranges" msgstr "devono essere specificati due intervalli commit" @@ -17324,13 +18380,17 @@ msgstr "esegui il debug di unpack-trees" msgid "suppress feedback messages" msgstr "non visualizzare i messaggi di feedback" +#: builtin/read-tree.c:188 +msgid "You need to resolve your current index first" +msgstr "Prima devi risolvere l'indice corrente" + #: builtin/rebase.c:32 msgid "" -"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] " -"[<branch>]" +"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] " +"[<upstream> [<branch>]]" msgstr "" -"git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] " -"[<upstream>] [<branch>]" +"git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> | --keep-" +"base] [<upstream> [<branch>]]" #: builtin/rebase.c:34 msgid "" @@ -17343,217 +18403,208 @@ msgstr "" msgid "git rebase --continue | --abort | --skip | --edit-todo" msgstr "git rebase --continue | --abort | --skip | --edit-todo" -#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209 +#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226 #, c-format msgid "unusable todo list: '%s'" msgstr "elenco todo inutilizzabile: '%s'" -#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217 -#, c-format -msgid "could not write '%s'." -msgstr "impossibile scrivere '%s'." - -#: builtin/rebase.c:252 -msgid "no HEAD?" -msgstr "nessun'HEAD?" - -#: builtin/rebase.c:279 +#: builtin/rebase.c:292 #, c-format msgid "could not create temporary %s" msgstr "impossibile creare un %s temporaneo" -#: builtin/rebase.c:285 +#: builtin/rebase.c:298 msgid "could not mark as interactive" msgstr "impossibile contrassegnare come interattivo" -#: builtin/rebase.c:343 +#: builtin/rebase.c:352 msgid "could not generate todo list" msgstr "impossibile generare l'elenco todo" -#: builtin/rebase.c:382 +#: builtin/rebase.c:391 msgid "a base commit must be provided with --upstream or --onto" msgstr "" "le opzioni --upstream o --onto richiedono che sia fornito un commit di base" -#: builtin/rebase.c:437 +#: builtin/rebase.c:461 msgid "git rebase--interactive [<options>]" msgstr "git rebase --interactive [<opzioni>]" -#: builtin/rebase.c:449 -msgid "keep empty commits" -msgstr "mantieni i commit vuoti" +#: builtin/rebase.c:474 builtin/rebase.c:1550 +msgid "(DEPRECATED) keep empty commits" +msgstr "(DEPRECATO) mantieni i commit vuoti" -#: builtin/rebase.c:451 builtin/revert.c:128 +#: builtin/rebase.c:478 builtin/revert.c:128 msgid "allow commits with empty messages" msgstr "consenti commit con messaggi vuoti" -#: builtin/rebase.c:452 +#: builtin/rebase.c:480 msgid "rebase merge commits" msgstr "esegui il rebase dei commit di merge" -#: builtin/rebase.c:454 +#: builtin/rebase.c:482 msgid "keep original branch points of cousins" msgstr "mantieni i punti di branch originali dei cugini" -#: builtin/rebase.c:456 +#: builtin/rebase.c:484 msgid "move commits that begin with squash!/fixup!" msgstr "sposta i commit che iniziano con squash!/fixup!" -#: builtin/rebase.c:457 +#: builtin/rebase.c:485 msgid "sign commits" msgstr "firma i commit" -#: builtin/rebase.c:459 builtin/rebase.c:1403 +#: builtin/rebase.c:487 builtin/rebase.c:1490 msgid "display a diffstat of what changed upstream" msgstr "visualizza un diffstat delle modifiche upstream" -#: builtin/rebase.c:461 +#: builtin/rebase.c:489 msgid "continue rebase" msgstr "continua il rebase" -#: builtin/rebase.c:463 +#: builtin/rebase.c:491 msgid "skip commit" msgstr "salta il commit" -#: builtin/rebase.c:464 +#: builtin/rebase.c:492 msgid "edit the todo list" msgstr "modifica l'elenco todo" -#: builtin/rebase.c:466 +#: builtin/rebase.c:494 msgid "show the current patch" msgstr "visualizza la patch corrente" -#: builtin/rebase.c:469 +#: builtin/rebase.c:497 msgid "shorten commit ids in the todo list" msgstr "abbrevia gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:471 +#: builtin/rebase.c:499 msgid "expand commit ids in the todo list" msgstr "espandi gli ID dei commit nell'elenco todo" -#: builtin/rebase.c:473 +#: builtin/rebase.c:501 msgid "check the todo list" msgstr "controlla l'elenco todo" -#: builtin/rebase.c:475 +#: builtin/rebase.c:503 msgid "rearrange fixup/squash lines" msgstr "ridisponi le righe fixup/squash" -#: builtin/rebase.c:477 +#: builtin/rebase.c:505 msgid "insert exec commands in todo list" msgstr "inserisci i comandi exec nell'elenco todo" -#: builtin/rebase.c:478 +#: builtin/rebase.c:506 msgid "onto" msgstr "su" -#: builtin/rebase.c:481 +#: builtin/rebase.c:509 msgid "restrict-revision" msgstr "revisioni-limite" -#: builtin/rebase.c:481 +#: builtin/rebase.c:509 msgid "restrict revision" msgstr "limita la revisione" -#: builtin/rebase.c:483 +#: builtin/rebase.c:511 msgid "squash-onto" msgstr "squash-su" -#: builtin/rebase.c:484 +#: builtin/rebase.c:512 msgid "squash onto" msgstr "esegui lo squash su" -#: builtin/rebase.c:486 +#: builtin/rebase.c:514 msgid "the upstream commit" msgstr "il commit upstream" -#: builtin/rebase.c:488 +#: builtin/rebase.c:516 msgid "head-name" msgstr "nome head" -#: builtin/rebase.c:488 +#: builtin/rebase.c:516 msgid "head name" msgstr "nome head" -#: builtin/rebase.c:493 +#: builtin/rebase.c:521 msgid "rebase strategy" msgstr "strategia di rebase" -#: builtin/rebase.c:494 +#: builtin/rebase.c:522 msgid "strategy-opts" msgstr "opzioni strategia" -#: builtin/rebase.c:495 +#: builtin/rebase.c:523 msgid "strategy options" msgstr "opzioni strategia" -#: builtin/rebase.c:496 +#: builtin/rebase.c:524 msgid "switch-to" msgstr "passa a" -#: builtin/rebase.c:497 +#: builtin/rebase.c:525 msgid "the branch or commit to checkout" msgstr "il branch o il commit di cui eseguire il checkout" -#: builtin/rebase.c:498 +#: builtin/rebase.c:526 msgid "onto-name" msgstr "nome" -#: builtin/rebase.c:498 +#: builtin/rebase.c:526 msgid "onto name" msgstr "sul nome" -#: builtin/rebase.c:499 +#: builtin/rebase.c:527 msgid "cmd" msgstr "comando" -#: builtin/rebase.c:499 +#: builtin/rebase.c:527 msgid "the command to run" msgstr "il comando da eseguire" -#: builtin/rebase.c:502 builtin/rebase.c:1486 +#: builtin/rebase.c:530 builtin/rebase.c:1584 msgid "automatically re-schedule any `exec` that fails" msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente" -#: builtin/rebase.c:518 +#: builtin/rebase.c:546 msgid "--[no-]rebase-cousins has no effect without --rebase-merges" msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges" -#: builtin/rebase.c:534 +#: builtin/rebase.c:562 #, c-format msgid "%s requires an interactive rebase" msgstr "%s richiede un rebase interattivo" -#: builtin/rebase.c:586 +#: builtin/rebase.c:612 #, c-format msgid "could not get 'onto': '%s'" msgstr "impossibile ottenere 'onto': '%s'" -#: builtin/rebase.c:601 +#: builtin/rebase.c:627 #, c-format msgid "invalid orig-head: '%s'" msgstr "orig-head non valida: '%s'" -#: builtin/rebase.c:626 +#: builtin/rebase.c:652 #, c-format msgid "ignoring invalid allow_rerere_autoupdate: '%s'" msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'" -#: builtin/rebase.c:702 +#: builtin/rebase.c:728 #, c-format msgid "Could not read '%s'" msgstr "Impossibile leggere '%s'" -#: builtin/rebase.c:720 +#: builtin/rebase.c:746 #, c-format msgid "Cannot store %s" msgstr "Impossibile memorizzare %s" -#: builtin/rebase.c:827 +#: builtin/rebase.c:853 msgid "could not determine HEAD revision" msgstr "impossibile determinare la revisione HEAD" -#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81 +#: builtin/rebase.c:976 git-rebase--preserve-merges.sh:81 msgid "" "Resolve all conflicts manually, mark them as resolved with\n" "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n" @@ -17569,7 +18620,7 @@ msgstr "" "Per interrompere l'operazione e tornare allo stato precedente\n" "il \"git rebase\", esegui \"git rebase --abort\"." -#: builtin/rebase.c:1031 +#: builtin/rebase.c:1058 #, c-format msgid "" "\n" @@ -17588,7 +18639,16 @@ msgstr "" "\n" "Di conseguenza, Git non può eseguirne il rebase." -#: builtin/rebase.c:1318 +#: builtin/rebase.c:1383 +#, c-format +msgid "" +"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask" +"\"." +msgstr "" +"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e " +"\"ask\"." + +#: builtin/rebase.c:1401 #, c-format msgid "" "%s\n" @@ -17605,7 +18665,7 @@ msgstr "" " git rebase '<branch>'\n" "\n" -#: builtin/rebase.c:1334 +#: builtin/rebase.c:1417 #, c-format msgid "" "If you wish to set tracking information for this branch you can do so with:\n" @@ -17619,131 +18679,139 @@ msgstr "" " git branch --set-upstream-to=%s/<branch> %s\n" "\n" -#: builtin/rebase.c:1364 +#: builtin/rebase.c:1447 msgid "exec commands cannot contain newlines" msgstr "i comandi exec non possono contenere caratteri di fine riga" -#: builtin/rebase.c:1368 +#: builtin/rebase.c:1451 msgid "empty exec command" msgstr "comando exec vuoto" -#: builtin/rebase.c:1396 +#: builtin/rebase.c:1481 msgid "rebase onto given branch instead of upstream" msgstr "esegui il rebase sul branch specificato anziché su quello upstream" -#: builtin/rebase.c:1398 +#: builtin/rebase.c:1483 +msgid "use the merge-base of upstream and branch as the current base" +msgstr "usa la base del merge dell'upstream e del branch come base corrente" + +#: builtin/rebase.c:1485 msgid "allow pre-rebase hook to run" msgstr "consenti l'esecuzione dell'hook pre-rebase" -#: builtin/rebase.c:1400 +#: builtin/rebase.c:1487 msgid "be quiet. implies --no-stat" msgstr "sii silenzioso. implica --no-stat" -#: builtin/rebase.c:1406 +#: builtin/rebase.c:1493 msgid "do not show diffstat of what changed upstream" msgstr "non visualizzare un diffstat delle modifiche upstream" -#: builtin/rebase.c:1409 +#: builtin/rebase.c:1496 msgid "add a Signed-off-by: line to each commit" msgstr "aggiungi una riga Signed-off-by: a ogni commit" -#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417 +#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504 msgid "passed to 'git am'" msgstr "passato a 'git am'" -#: builtin/rebase.c:1419 builtin/rebase.c:1421 +#: builtin/rebase.c:1506 builtin/rebase.c:1508 msgid "passed to 'git apply'" msgstr "passato a 'git apply'" -#: builtin/rebase.c:1423 builtin/rebase.c:1426 +#: builtin/rebase.c:1510 builtin/rebase.c:1513 msgid "cherry-pick all commits, even if unchanged" msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati" -#: builtin/rebase.c:1428 +#: builtin/rebase.c:1515 msgid "continue" msgstr "continua" -#: builtin/rebase.c:1431 +#: builtin/rebase.c:1518 msgid "skip current patch and continue" msgstr "salta la patch corrente e continua" -#: builtin/rebase.c:1433 +#: builtin/rebase.c:1520 msgid "abort and check out the original branch" msgstr "interrompi ed esegui il checkout del branch originario" -#: builtin/rebase.c:1436 +#: builtin/rebase.c:1523 msgid "abort but keep HEAD where it is" msgstr "interrompi ma mantieni l'HEAD dov'è" -#: builtin/rebase.c:1437 +#: builtin/rebase.c:1524 msgid "edit the todo list during an interactive rebase" msgstr "modifica l'elenco todo durante un rebase interattivo" -#: builtin/rebase.c:1440 +#: builtin/rebase.c:1527 msgid "show the patch file being applied or merged" msgstr "" "visualizza il file patch che sta per essere applicato o sottoposto a merge" -#: builtin/rebase.c:1443 +#: builtin/rebase.c:1530 +msgid "use apply strategies to rebase" +msgstr "usa le strategie di apply per eseguire il rebase" + +#: builtin/rebase.c:1534 msgid "use merging strategies to rebase" msgstr "usa le strategie di merge per eseguire il rebase" -#: builtin/rebase.c:1447 +#: builtin/rebase.c:1538 msgid "let the user edit the list of commits to rebase" msgstr "" "consenti all'utente di modificare l'elenco dei commit di cui eseguire il " "rebase" -#: builtin/rebase.c:1451 +#: builtin/rebase.c:1542 msgid "(DEPRECATED) try to recreate merges instead of ignoring them" msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli" -#: builtin/rebase.c:1455 -msgid "preserve empty commits during rebase" -msgstr "mantieni i commit vuoti durante il rebase" +#: builtin/rebase.c:1547 +msgid "how to handle commits that become empty" +msgstr "come gestire i commit che diventano vuoti" -#: builtin/rebase.c:1457 +#: builtin/rebase.c:1554 msgid "move commits that begin with squash!/fixup! under -i" msgstr "sposta i commit che iniziano con squash!/fixup! in -i" -#: builtin/rebase.c:1463 +#: builtin/rebase.c:1560 msgid "automatically stash/stash pop before and after" msgstr "esegui stash/stash pop automaticamente prima e dopo" -#: builtin/rebase.c:1465 +#: builtin/rebase.c:1562 msgid "add exec lines after each commit of the editable list" msgstr "aggiungi righe exec dopo ogni commit della lista modificabile" -#: builtin/rebase.c:1469 +#: builtin/rebase.c:1566 msgid "allow rebasing commits with empty messages" msgstr "consenti il rebase di commit con messaggi vuoti" -#: builtin/rebase.c:1472 +#: builtin/rebase.c:1570 msgid "try to rebase merges instead of skipping them" msgstr "prova ad eseguire il rebase dei merge anziché saltarli" -#: builtin/rebase.c:1475 +#: builtin/rebase.c:1573 msgid "use 'merge-base --fork-point' to refine upstream" msgstr "" "usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream" -#: builtin/rebase.c:1477 +#: builtin/rebase.c:1575 msgid "use the given merge strategy" msgstr "usa la strategia di merge specificata" -#: builtin/rebase.c:1479 builtin/revert.c:115 +#: builtin/rebase.c:1577 builtin/revert.c:115 msgid "option" msgstr "opzione" -#: builtin/rebase.c:1480 +#: builtin/rebase.c:1578 msgid "pass the argument through to the merge strategy" msgstr "passa l'argomento alla strategia di merge" -#: builtin/rebase.c:1483 +#: builtin/rebase.c:1581 msgid "rebase all reachable commits up to the root(s)" msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice" -#: builtin/rebase.c:1500 +#: builtin/rebase.c:1598 msgid "" "the rebase.useBuiltin support has been removed!\n" "See its entry in 'git help config' for details." @@ -17751,29 +18819,37 @@ msgstr "" "il supporto per rebase.useBuiltin è stato rimosso!\n" "Vedi la voce relativa in 'git help config' per i dettagli." -#: builtin/rebase.c:1506 +#: builtin/rebase.c:1604 msgid "It looks like 'git am' is in progress. Cannot rebase." msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase." -#: builtin/rebase.c:1547 +#: builtin/rebase.c:1645 msgid "" "git rebase --preserve-merges is deprecated. Use --rebase-merges instead." msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges." -#: builtin/rebase.c:1551 +#: builtin/rebase.c:1650 +msgid "cannot combine '--keep-base' with '--onto'" +msgstr "impossibile combinare '--keep-base' con '--onto'" + +#: builtin/rebase.c:1652 +msgid "cannot combine '--keep-base' with '--root'" +msgstr "impossibile combinare '--keep-base' con '--root'" + +#: builtin/rebase.c:1656 msgid "No rebase in progress?" msgstr "Nessun rebase in corso?" -#: builtin/rebase.c:1555 +#: builtin/rebase.c:1660 msgid "The --edit-todo action can only be used during interactive rebase." msgstr "" "L'azione --edit-todo può essere usata solo durante un rebase interattivo." -#: builtin/rebase.c:1578 +#: builtin/rebase.c:1683 msgid "Cannot read HEAD" msgstr "Impossibile leggere l'HEAD" -#: builtin/rebase.c:1590 +#: builtin/rebase.c:1695 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -17782,16 +18858,16 @@ msgstr "" "quindi contrassegnarli come risolti usando\n" "git add" -#: builtin/rebase.c:1609 +#: builtin/rebase.c:1714 msgid "could not discard worktree changes" msgstr "impossibile scartare le modifiche all'albero di lavoro" -#: builtin/rebase.c:1628 +#: builtin/rebase.c:1733 #, c-format msgid "could not move back to %s" msgstr "impossibile ritornare a %s" -#: builtin/rebase.c:1673 +#: builtin/rebase.c:1778 #, c-format msgid "" "It seems that there is already a %s directory, and\n" @@ -17812,175 +18888,169 @@ msgstr "" "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n" "salvato qualcosa di importante lì.\n" -#: builtin/rebase.c:1694 +#: builtin/rebase.c:1806 msgid "switch `C' expects a numerical value" msgstr "l'opzione `C` richiede un valore numerico" -#: builtin/rebase.c:1735 +#: builtin/rebase.c:1847 #, c-format msgid "Unknown mode: %s" msgstr "Modo sconosciuto: %s" -#: builtin/rebase.c:1757 +#: builtin/rebase.c:1869 msgid "--strategy requires --merge or --interactive" msgstr "--strategy richiede --merge o --interactive" -#: builtin/rebase.c:1797 +#: builtin/rebase.c:1899 +msgid "cannot combine apply options with merge options" +msgstr "non è possibile combinare le opzioni apply con quelle merge" + +#: builtin/rebase.c:1912 +#, c-format +msgid "Unknown rebase backend: %s" +msgstr "Backend di rebase sconosciuto: %s" + +#: builtin/rebase.c:1937 msgid "--reschedule-failed-exec requires --exec or --interactive" msgstr "--reschedule-failed-exec richiede --exec o --interactive" -#: builtin/rebase.c:1809 -msgid "cannot combine am options with either interactive or merge options" -msgstr "non è possibile combinare le opzioni am con quelle interactive o merge" - -#: builtin/rebase.c:1828 +#: builtin/rebase.c:1957 msgid "cannot combine '--preserve-merges' with '--rebase-merges'" msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'" -#: builtin/rebase.c:1832 +#: builtin/rebase.c:1961 msgid "" "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'" msgstr "" "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-" "exec'" -#: builtin/rebase.c:1838 -msgid "cannot combine '--rebase-merges' with '--strategy-option'" -msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" - -#: builtin/rebase.c:1841 -msgid "cannot combine '--rebase-merges' with '--strategy'" -msgstr "impossibile combinare '--rebase-merges' con '--strategy'" - -#: builtin/rebase.c:1865 +#: builtin/rebase.c:1985 #, c-format msgid "invalid upstream '%s'" msgstr "upstream non valido: '%s'" -#: builtin/rebase.c:1871 +#: builtin/rebase.c:1991 msgid "Could not create new root commit" msgstr "Impossibile creare il nuovo commit radice" -#: builtin/rebase.c:1889 +#: builtin/rebase.c:2017 +#, c-format +msgid "'%s': need exactly one merge base with branch" +msgstr "" +"'%s': è necessario specificare esattamente una base per il merge con il " +"branch" + +#: builtin/rebase.c:2020 #, c-format msgid "'%s': need exactly one merge base" msgstr "'%s': è necessario specificare esattamente una base per il merge" -#: builtin/rebase.c:1896 +#: builtin/rebase.c:2028 #, c-format msgid "Does not point to a valid commit '%s'" msgstr "'%s' non punta a un commit valido" -#: builtin/rebase.c:1921 +#: builtin/rebase.c:2054 #, c-format msgid "fatal: no such branch/commit '%s'" msgstr "errore fatale: branch/commit '%s' inesistente" -#: builtin/rebase.c:1929 builtin/submodule--helper.c:38 -#: builtin/submodule--helper.c:1934 +#: builtin/rebase.c:2062 builtin/submodule--helper.c:40 +#: builtin/submodule--helper.c:1990 #, c-format msgid "No such ref: %s" msgstr "Riferimento non esistente: %s" -#: builtin/rebase.c:1940 +#: builtin/rebase.c:2073 msgid "Could not resolve HEAD to a revision" msgstr "Impossibile risolvere HEAD come revisione" -#: builtin/rebase.c:1981 +#: builtin/rebase.c:2111 msgid "Cannot autostash" msgstr "Impossibile eseguire lo stash automatico" -#: builtin/rebase.c:1984 +#: builtin/rebase.c:2114 #, c-format msgid "Unexpected stash response: '%s'" msgstr "Risposta stash non attesa: '%s'" -#: builtin/rebase.c:1990 +#: builtin/rebase.c:2120 #, c-format msgid "Could not create directory for '%s'" msgstr "Impossibile creare la directory '%s'" -#: builtin/rebase.c:1993 +#: builtin/rebase.c:2123 #, c-format msgid "Created autostash: %s\n" msgstr "Stash automatico creato: %s\n" -#: builtin/rebase.c:1996 +#: builtin/rebase.c:2126 msgid "could not reset --hard" msgstr "impossibile eseguire reset --hard" -#: builtin/rebase.c:1997 builtin/reset.c:114 -#, c-format -msgid "HEAD is now at %s" -msgstr "HEAD ora si trova a %s" - -#: builtin/rebase.c:2013 +#: builtin/rebase.c:2135 msgid "Please commit or stash them." msgstr "Eseguine il commit o lo stash." -#: builtin/rebase.c:2040 -#, c-format -msgid "could not parse '%s'" -msgstr "impossibile analizzare '%s'" - -#: builtin/rebase.c:2053 +#: builtin/rebase.c:2169 #, c-format msgid "could not switch to %s" msgstr "impossibile passare a %s" -#: builtin/rebase.c:2064 +#: builtin/rebase.c:2180 msgid "HEAD is up to date." msgstr "HEAD è aggiornato." -#: builtin/rebase.c:2066 +#: builtin/rebase.c:2182 #, c-format msgid "Current branch %s is up to date.\n" msgstr "Il branch corrente %s è aggiornato.\n" -#: builtin/rebase.c:2074 +#: builtin/rebase.c:2190 msgid "HEAD is up to date, rebase forced." msgstr "HEAD è aggiornato, forzo il rebase." -#: builtin/rebase.c:2076 +#: builtin/rebase.c:2192 #, c-format msgid "Current branch %s is up to date, rebase forced.\n" msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n" -#: builtin/rebase.c:2084 +#: builtin/rebase.c:2200 msgid "The pre-rebase hook refused to rebase." msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase." -#: builtin/rebase.c:2091 +#: builtin/rebase.c:2207 #, c-format msgid "Changes to %s:\n" msgstr "Modifiche a %s:\n" -#: builtin/rebase.c:2094 +#: builtin/rebase.c:2210 #, c-format msgid "Changes from %s to %s:\n" msgstr "Modifiche da %s a %s:\n" -#: builtin/rebase.c:2119 +#: builtin/rebase.c:2235 #, c-format msgid "First, rewinding head to replay your work on top of it...\n" msgstr "" "Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di " "esso...\n" -#: builtin/rebase.c:2128 +#: builtin/rebase.c:2244 msgid "Could not detach HEAD" msgstr "Impossibile scollegare l'HEAD" -#: builtin/rebase.c:2137 +#: builtin/rebase.c:2253 #, c-format msgid "Fast-forwarded %s to %s.\n" msgstr "Fast forward da %s a %s eseguito.\n" -#: builtin/receive-pack.c:32 +#: builtin/receive-pack.c:33 msgid "git receive-pack <git-dir>" msgstr "git receive-pack <directory Git>" -#: builtin/receive-pack.c:832 +#: builtin/receive-pack.c:821 msgid "" "By default, updating the current branch in a non-bare repository\n" "is denied, because it will make the index and work tree inconsistent\n" @@ -18013,7 +19083,7 @@ msgstr "" "il comportamento predefinito, imposta la variabile di\n" "configurazione 'receive.denyCurrentBranch' a 'refuse'." -#: builtin/receive-pack.c:852 +#: builtin/receive-pack.c:841 msgid "" "By default, deleting the current branch is denied, because the next\n" "'git clone' won't result in any file checked out, causing confusion.\n" @@ -18066,49 +19136,49 @@ msgstr "" msgid "git reflog exists <ref>" msgstr "git reflog exists <riferimento>" -#: builtin/reflog.c:567 builtin/reflog.c:572 +#: builtin/reflog.c:568 builtin/reflog.c:573 #, c-format msgid "'%s' is not a valid timestamp" msgstr "'%s' non è un timestamp valido" -#: builtin/reflog.c:605 +#: builtin/reflog.c:606 #, c-format msgid "Marking reachable objects..." msgstr "Contrassegno gli oggetti raggiungibili..." -#: builtin/reflog.c:643 +#: builtin/reflog.c:644 #, c-format msgid "%s points nowhere!" msgstr "%s non punta a niente!" -#: builtin/reflog.c:695 +#: builtin/reflog.c:696 msgid "no reflog specified to delete" msgstr "nessun registro riferimenti da eliminare specificato" -#: builtin/reflog.c:704 +#: builtin/reflog.c:705 #, c-format msgid "not a reflog: %s" msgstr "non è un registro riferimenti: %s" -#: builtin/reflog.c:709 +#: builtin/reflog.c:710 #, c-format msgid "no reflog for '%s'" msgstr "log riferimenti non esistente per '%s'" -#: builtin/reflog.c:755 +#: builtin/reflog.c:756 #, c-format msgid "invalid ref format: %s" msgstr "formato riferimento non valido: %s" -#: builtin/reflog.c:764 +#: builtin/reflog.c:765 msgid "git reflog [ show | expire | delete | exists ]" msgstr "git reflog [ show | expire | delete | exists ]" -#: builtin/remote.c:16 +#: builtin/remote.c:17 msgid "git remote [-v | --verbose]" msgstr "git remote [-v | --verbose]" -#: builtin/remote.c:17 +#: builtin/remote.c:18 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <name> <url>" @@ -18116,82 +19186,82 @@ msgstr "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--" "mirror=<fetch|push>] <nome> <URL>" -#: builtin/remote.c:18 builtin/remote.c:38 +#: builtin/remote.c:19 builtin/remote.c:39 msgid "git remote rename <old> <new>" msgstr "git remote rename <vecchio> <nuovo>" -#: builtin/remote.c:19 builtin/remote.c:43 +#: builtin/remote.c:20 builtin/remote.c:44 msgid "git remote remove <name>" msgstr "git remote remove <nome>" -#: builtin/remote.c:20 builtin/remote.c:48 +#: builtin/remote.c:21 builtin/remote.c:49 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)" msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)" -#: builtin/remote.c:21 +#: builtin/remote.c:22 msgid "git remote [-v | --verbose] show [-n] <name>" msgstr "git remote [-v | --verbose] show [-n] <nome>" -#: builtin/remote.c:22 +#: builtin/remote.c:23 msgid "git remote prune [-n | --dry-run] <name>" msgstr "git remote prune [-n | --dry-run] <nome>" -#: builtin/remote.c:23 +#: builtin/remote.c:24 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" msgstr "" "git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]" -#: builtin/remote.c:24 +#: builtin/remote.c:25 msgid "git remote set-branches [--add] <name> <branch>..." msgstr "git remote set-branches [--add] <nome> <branch>..." -#: builtin/remote.c:25 builtin/remote.c:74 +#: builtin/remote.c:26 builtin/remote.c:75 msgid "git remote get-url [--push] [--all] <name>" msgstr "git remote get-url [--push] [--all] <nome>" -#: builtin/remote.c:26 builtin/remote.c:79 +#: builtin/remote.c:27 builtin/remote.c:80 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]" -#: builtin/remote.c:27 builtin/remote.c:80 +#: builtin/remote.c:28 builtin/remote.c:81 msgid "git remote set-url --add <name> <newurl>" msgstr "git remote set-url --add <nome> <nuovo URL>" -#: builtin/remote.c:28 builtin/remote.c:81 +#: builtin/remote.c:29 builtin/remote.c:82 msgid "git remote set-url --delete <name> <url>" msgstr "git remote set-url --delete <nome> <URL>" -#: builtin/remote.c:33 +#: builtin/remote.c:34 msgid "git remote add [<options>] <name> <url>" msgstr "git remote add [<opzioni>] <nome> <URL>" -#: builtin/remote.c:53 +#: builtin/remote.c:54 msgid "git remote set-branches <name> <branch>..." msgstr "git remote set-branches <nome> <branch>..." -#: builtin/remote.c:54 +#: builtin/remote.c:55 msgid "git remote set-branches --add <name> <branch>..." msgstr "git remote set-branches --add <nome> <branch>..." -#: builtin/remote.c:59 +#: builtin/remote.c:60 msgid "git remote show [<options>] <name>" msgstr "git remote show [<opzioni>] <nome>" -#: builtin/remote.c:64 +#: builtin/remote.c:65 msgid "git remote prune [<options>] <name>" msgstr "git remote prune [<opzioni>] <nome>" -#: builtin/remote.c:69 +#: builtin/remote.c:70 msgid "git remote update [<options>] [<group> | <remote>]..." msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..." -#: builtin/remote.c:98 +#: builtin/remote.c:99 #, c-format msgid "Updating %s" msgstr "Aggiornamento di %s" -#: builtin/remote.c:130 +#: builtin/remote.c:131 msgid "" "--mirror is dangerous and deprecated; please\n" "\t use --mirror=fetch or --mirror=push instead" @@ -18199,88 +19269,104 @@ msgstr "" "--mirror è pericoloso e deprecato; per favore\n" "\t usa invece --mirror-fetch o --mirror-push" -#: builtin/remote.c:147 +#: builtin/remote.c:148 #, c-format msgid "unknown mirror argument: %s" msgstr "argomento di mirror sconosciuto: %s" -#: builtin/remote.c:163 +#: builtin/remote.c:164 msgid "fetch the remote branches" msgstr "recupera i branch remoti" -#: builtin/remote.c:165 +#: builtin/remote.c:166 msgid "import all tags and associated objects when fetching" msgstr "importa tutti i tag e gli oggetti associati durante il recupero" -#: builtin/remote.c:168 +#: builtin/remote.c:169 msgid "or do not fetch any tag at all (--no-tags)" msgstr "o non recuperare alcun tag (--no-tags)" -#: builtin/remote.c:170 +#: builtin/remote.c:171 msgid "branch(es) to track" msgstr "branch da tracciare" -#: builtin/remote.c:171 +#: builtin/remote.c:172 msgid "master branch" msgstr "branch master" -#: builtin/remote.c:173 +#: builtin/remote.c:174 msgid "set up remote as a mirror to push to or fetch from" msgstr "" "imposta il remoto come mirror su cui eseguire push o da cui recuperare dati" -#: builtin/remote.c:185 +#: builtin/remote.c:186 msgid "specifying a master branch makes no sense with --mirror" msgstr "specificare un branch master con --mirror non ha senso" -#: builtin/remote.c:187 +#: builtin/remote.c:188 msgid "specifying branches to track makes sense only with fetch mirrors" msgstr "" "specificare i branch da tracciare ha senso solo con i mirror da cui " "recuperare dati" -#: builtin/remote.c:194 builtin/remote.c:636 +#: builtin/remote.c:195 builtin/remote.c:696 #, c-format msgid "remote %s already exists." msgstr "il remoto %s esiste già." -#: builtin/remote.c:198 builtin/remote.c:640 +#: builtin/remote.c:199 builtin/remote.c:700 #, c-format msgid "'%s' is not a valid remote name" msgstr "'%s' non è un nome di remoto valido" -#: builtin/remote.c:238 +#: builtin/remote.c:239 #, c-format msgid "Could not setup master '%s'" msgstr "Impossibile configurare il master '%s'" -#: builtin/remote.c:344 +#: builtin/remote.c:354 #, c-format msgid "Could not get fetch map for refspec %s" msgstr "" "Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s" -#: builtin/remote.c:443 builtin/remote.c:451 +#: builtin/remote.c:453 builtin/remote.c:461 msgid "(matching)" msgstr "(corrispondente)" -#: builtin/remote.c:455 +#: builtin/remote.c:465 msgid "(delete)" msgstr "(elimina)" -#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864 +#: builtin/remote.c:653 +#, c-format +msgid "could not set '%s'" +msgstr "impossibile impostare '%s'" + +#: builtin/remote.c:658 +#, c-format +msgid "" +"The %s configuration remote.pushDefault in:\n" +"\t%s:%d\n" +"now names the non-existent remote '%s'" +msgstr "" +"La configurazione remote.pushDefault %s in:\n" +"\t%s:%d\n" +"ora dà il nome al remoto inesistente '%s'" + +#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940 #, c-format msgid "No such remote: '%s'" msgstr "Remoto non esistente: '%s'" -#: builtin/remote.c:646 +#: builtin/remote.c:706 #, c-format msgid "Could not rename config section '%s' to '%s'" msgstr "" "Non è stato possibile ridenominare la sezione di configurazione da '%s' in " "'%s'" -#: builtin/remote.c:666 +#: builtin/remote.c:726 #, c-format msgid "" "Not updating non-default fetch refspec\n" @@ -18291,17 +19377,17 @@ msgstr "" "\t%s\n" "\tAggiorna la configurazione manualmente se necessario." -#: builtin/remote.c:702 +#: builtin/remote.c:766 #, c-format msgid "deleting '%s' failed" msgstr "eliminazione di '%s' non riuscita" -#: builtin/remote.c:736 +#: builtin/remote.c:800 #, c-format msgid "creating '%s' failed" msgstr "creazione di '%s' non riuscita" -#: builtin/remote.c:802 +#: builtin/remote.c:876 msgid "" "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" "to delete it, use:" @@ -18317,120 +19403,120 @@ msgstr[1] "" "eliminati;\n" "per eliminarli, usa:" -#: builtin/remote.c:816 +#: builtin/remote.c:890 #, c-format msgid "Could not remove config section '%s'" msgstr "Impossibile rimuovere la sezione di configurazione '%s'" -#: builtin/remote.c:917 +#: builtin/remote.c:993 #, c-format msgid " new (next fetch will store in remotes/%s)" msgstr " nuovo (il prossimo fetch lo salverà in remotes/%s)" -#: builtin/remote.c:920 +#: builtin/remote.c:996 msgid " tracked" msgstr " tracciato" -#: builtin/remote.c:922 +#: builtin/remote.c:998 msgid " stale (use 'git remote prune' to remove)" msgstr " vecchio (usa 'git remote prune' per rimuoverlo)" -#: builtin/remote.c:924 +#: builtin/remote.c:1000 msgid " ???" msgstr " ???" -#: builtin/remote.c:965 +#: builtin/remote.c:1041 #, c-format msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" msgstr "" "valore branch.%s.merge non valido; impossibile eseguire il rebase su più di " "un branch" -#: builtin/remote.c:974 +#: builtin/remote.c:1050 #, c-format msgid "rebases interactively onto remote %s" msgstr "rebase interattivo sul remoto %s" -#: builtin/remote.c:976 +#: builtin/remote.c:1052 #, c-format msgid "rebases interactively (with merges) onto remote %s" msgstr "rebase interattivo (con merge) sul remoto %s" -#: builtin/remote.c:979 +#: builtin/remote.c:1055 #, c-format msgid "rebases onto remote %s" msgstr "rebase sul remoto %s" -#: builtin/remote.c:983 +#: builtin/remote.c:1059 #, c-format msgid " merges with remote %s" msgstr " merge con il remote %s" -#: builtin/remote.c:986 +#: builtin/remote.c:1062 #, c-format msgid "merges with remote %s" msgstr "merge con il remote %s" -#: builtin/remote.c:989 +#: builtin/remote.c:1065 #, c-format msgid "%-*s and with remote %s\n" msgstr "%-*s e con il remoto %s\n" -#: builtin/remote.c:1032 +#: builtin/remote.c:1108 msgid "create" msgstr "crea" -#: builtin/remote.c:1035 +#: builtin/remote.c:1111 msgid "delete" msgstr "elimina" -#: builtin/remote.c:1039 +#: builtin/remote.c:1115 msgid "up to date" msgstr "aggiornato" -#: builtin/remote.c:1042 +#: builtin/remote.c:1118 msgid "fast-forwardable" msgstr "fast forward possibile" -#: builtin/remote.c:1045 +#: builtin/remote.c:1121 msgid "local out of date" msgstr "locale non aggiornato" -#: builtin/remote.c:1052 +#: builtin/remote.c:1128 #, c-format msgid " %-*s forces to %-*s (%s)" msgstr " %-*s esegue un aggiornamento forzato su %-*s (%s)" -#: builtin/remote.c:1055 +#: builtin/remote.c:1131 #, c-format msgid " %-*s pushes to %-*s (%s)" msgstr " %-*s esegue il push su %-*s (%s)" -#: builtin/remote.c:1059 +#: builtin/remote.c:1135 #, c-format msgid " %-*s forces to %s" msgstr " %-*s esegue un aggiornamento forzato su %s" -#: builtin/remote.c:1062 +#: builtin/remote.c:1138 #, c-format msgid " %-*s pushes to %s" msgstr " %-*s esegue il push su %s" -#: builtin/remote.c:1130 +#: builtin/remote.c:1206 msgid "do not query remotes" msgstr "non interrogare i remoti" -#: builtin/remote.c:1157 +#: builtin/remote.c:1233 #, c-format msgid "* remote %s" msgstr "* remoto %s" -#: builtin/remote.c:1158 +#: builtin/remote.c:1234 #, c-format msgid " Fetch URL: %s" msgstr " URL recupero: %s" -#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314 +#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390 msgid "(no URL)" msgstr "(nessun URL)" @@ -18438,195 +19524,185 @@ msgstr "(nessun URL)" #. with the one in " Fetch URL: %s" #. translation. #. -#: builtin/remote.c:1173 builtin/remote.c:1175 +#: builtin/remote.c:1249 builtin/remote.c:1251 #, c-format msgid " Push URL: %s" msgstr " URL push: %s" -#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181 +#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257 #, c-format msgid " HEAD branch: %s" msgstr " branch HEAD: %s" -#: builtin/remote.c:1177 +#: builtin/remote.c:1253 msgid "(not queried)" msgstr "(non interrogato)" -#: builtin/remote.c:1179 +#: builtin/remote.c:1255 msgid "(unknown)" msgstr "(sconosciuto)" -#: builtin/remote.c:1183 +#: builtin/remote.c:1259 #, c-format msgid "" " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" msgstr "" " branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n" -#: builtin/remote.c:1195 +#: builtin/remote.c:1271 #, c-format msgid " Remote branch:%s" msgid_plural " Remote branches:%s" msgstr[0] " Branch remoto:%s" msgstr[1] " Branch remoti:%s" -#: builtin/remote.c:1198 builtin/remote.c:1224 +#: builtin/remote.c:1274 builtin/remote.c:1300 msgid " (status not queried)" msgstr " (stato non richiesto)" -#: builtin/remote.c:1207 +#: builtin/remote.c:1283 msgid " Local branch configured for 'git pull':" msgid_plural " Local branches configured for 'git pull':" msgstr[0] " Branch locale configurato per 'git pull':" msgstr[1] " Branch locali configurati per 'git pull':" -#: builtin/remote.c:1215 +#: builtin/remote.c:1291 msgid " Local refs will be mirrored by 'git push'" msgstr " I riferimenti locali saranno copiati da 'git push'" -#: builtin/remote.c:1221 +#: builtin/remote.c:1297 #, c-format msgid " Local ref configured for 'git push'%s:" msgid_plural " Local refs configured for 'git push'%s:" msgstr[0] " Ref locale configurato per 'git push'%s:" msgstr[1] " Ref locali configurati per 'git push'%s:" -#: builtin/remote.c:1242 +#: builtin/remote.c:1318 msgid "set refs/remotes/<name>/HEAD according to remote" msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto" -#: builtin/remote.c:1244 +#: builtin/remote.c:1320 msgid "delete refs/remotes/<name>/HEAD" msgstr "elimina refs/remotes/<nome>/HEAD" -#: builtin/remote.c:1259 +#: builtin/remote.c:1335 msgid "Cannot determine remote HEAD" msgstr "Impossibile determinare l'HEAD remoto" -#: builtin/remote.c:1261 +#: builtin/remote.c:1337 msgid "Multiple remote HEAD branches. Please choose one explicitly with:" msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:" -#: builtin/remote.c:1271 +#: builtin/remote.c:1347 #, c-format msgid "Could not delete %s" msgstr "Non è stato possibile eliminare %s" -#: builtin/remote.c:1279 +#: builtin/remote.c:1355 #, c-format msgid "Not a valid ref: %s" msgstr "Non è un ref valido: %s" -#: builtin/remote.c:1281 +#: builtin/remote.c:1357 #, c-format msgid "Could not setup %s" msgstr "Non è stato possibile configurare %s" -#: builtin/remote.c:1299 +#: builtin/remote.c:1375 #, c-format msgid " %s will become dangling!" msgstr " %s diventerà pendente!" -#: builtin/remote.c:1300 +#: builtin/remote.c:1376 #, c-format msgid " %s has become dangling!" msgstr " %s è diventato pendente!" -#: builtin/remote.c:1310 +#: builtin/remote.c:1386 #, c-format msgid "Pruning %s" msgstr "Eliminazione di %s in corso" -#: builtin/remote.c:1311 +#: builtin/remote.c:1387 #, c-format msgid "URL: %s" msgstr "URL: %s" -#: builtin/remote.c:1327 +#: builtin/remote.c:1403 #, c-format msgid " * [would prune] %s" msgstr " * [sarebbe eliminato] %s" -#: builtin/remote.c:1330 +#: builtin/remote.c:1406 #, c-format msgid " * [pruned] %s" msgstr " * [eliminato] %s" -#: builtin/remote.c:1375 +#: builtin/remote.c:1451 msgid "prune remotes after fetching" msgstr "elimina remoti dopo il fetch" -#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560 +#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636 #, c-format msgid "No such remote '%s'" msgstr "Remote '%s' non esistente" -#: builtin/remote.c:1454 +#: builtin/remote.c:1530 msgid "add branch" msgstr "aggiungi branch" -#: builtin/remote.c:1461 +#: builtin/remote.c:1537 msgid "no remote specified" msgstr "nessun remote specificato" -#: builtin/remote.c:1478 +#: builtin/remote.c:1554 msgid "query push URLs rather than fetch URLs" msgstr "interroga gli URL per il push anziché gli URL per il fetch" -#: builtin/remote.c:1480 +#: builtin/remote.c:1556 msgid "return all URLs" msgstr "restituisci tutti gli URL" -#: builtin/remote.c:1508 +#: builtin/remote.c:1584 #, c-format msgid "no URLs configured for remote '%s'" msgstr "nessun URL configurato per il remoto '%s'" -#: builtin/remote.c:1534 +#: builtin/remote.c:1610 msgid "manipulate push URLs" msgstr "manipola gli URL per il push" -#: builtin/remote.c:1536 +#: builtin/remote.c:1612 msgid "add URL" msgstr "aggiungi URL" -#: builtin/remote.c:1538 +#: builtin/remote.c:1614 msgid "delete URLs" msgstr "elimina URL" -#: builtin/remote.c:1545 +#: builtin/remote.c:1621 msgid "--add --delete doesn't make sense" msgstr "--add --delete non ha senso" -#: builtin/remote.c:1584 +#: builtin/remote.c:1660 #, c-format msgid "Invalid old URL pattern: %s" msgstr "Pattern URL vecchio non valido: %s" -#: builtin/remote.c:1592 +#: builtin/remote.c:1668 #, c-format msgid "No such URL found: %s" msgstr "Nessuna URL trovata: %s" -#: builtin/remote.c:1594 +#: builtin/remote.c:1670 msgid "Will not delete all non-push URLs" msgstr "Non eliminerò tutti gli URL non push" -#: builtin/remote.c:1610 -msgid "be verbose; must be placed before a subcommand" -msgstr "" -"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando" - -#: builtin/remote.c:1641 -#, c-format -msgid "Unknown subcommand: %s" -msgstr "Sottocomando sconosciuto: %s" - -#: builtin/repack.c:22 +#: builtin/repack.c:23 msgid "git repack [<options>]" msgstr "git repack [<opzioni>]" -#: builtin/repack.c:27 +#: builtin/repack.c:28 msgid "" "Incremental repacks are incompatible with bitmap indexes. Use\n" "--no-write-bitmap-index or disable the pack.writebitmaps configuration." @@ -18635,118 +19711,118 @@ msgstr "" "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n" "pack.writebitmaps." -#: builtin/repack.c:190 +#: builtin/repack.c:191 msgid "could not start pack-objects to repack promisor objects" msgstr "" "impossibile avviare pack-objects per eseguire il repack degli oggetti " "promettenti" -#: builtin/repack.c:229 builtin/repack.c:408 +#: builtin/repack.c:230 builtin/repack.c:416 msgid "repack: Expecting full hex object ID lines only from pack-objects." msgstr "" "repack: Da pack-objects mi attendevo solo righe con gli ID completi " "esadecimali degli oggetti." -#: builtin/repack.c:246 +#: builtin/repack.c:254 msgid "could not finish pack-objects to repack promisor objects" msgstr "" "impossibile portare a termine pack-objects per eseguire il repack degli " "oggetti promettenti" -#: builtin/repack.c:284 +#: builtin/repack.c:292 msgid "pack everything in a single pack" msgstr "esegui il pack di tutto in un singolo pack" -#: builtin/repack.c:286 +#: builtin/repack.c:294 msgid "same as -a, and turn unreachable objects loose" msgstr "come -a e rendi sciolti gli oggetti non raggiungibili" -#: builtin/repack.c:289 +#: builtin/repack.c:297 msgid "remove redundant packs, and run git-prune-packed" msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed" -#: builtin/repack.c:291 +#: builtin/repack.c:299 msgid "pass --no-reuse-delta to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects" -#: builtin/repack.c:293 +#: builtin/repack.c:301 msgid "pass --no-reuse-object to git-pack-objects" msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects" -#: builtin/repack.c:295 +#: builtin/repack.c:303 msgid "do not run git-update-server-info" msgstr "non eseguire git-update-server-info" -#: builtin/repack.c:298 +#: builtin/repack.c:306 msgid "pass --local to git-pack-objects" msgstr "fornisci l'opzione --local a git-pack-objects" -#: builtin/repack.c:300 +#: builtin/repack.c:308 msgid "write bitmap index" msgstr "scrivi l'indice bitmap" -#: builtin/repack.c:302 +#: builtin/repack.c:310 msgid "pass --delta-islands to git-pack-objects" msgstr "fornisci l'opzione --delta-islands a git-pack-objects" -#: builtin/repack.c:303 +#: builtin/repack.c:311 msgid "approxidate" msgstr "data approssimativa" -#: builtin/repack.c:304 +#: builtin/repack.c:312 msgid "with -A, do not loosen objects older than this" msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data" -#: builtin/repack.c:306 +#: builtin/repack.c:314 msgid "with -a, repack unreachable objects" msgstr "con -a, esegui il repack degli oggetti non raggiungibili" -#: builtin/repack.c:308 +#: builtin/repack.c:316 msgid "size of the window used for delta compression" msgstr "dimensione della finestra usata per la compressione delta" -#: builtin/repack.c:309 builtin/repack.c:315 +#: builtin/repack.c:317 builtin/repack.c:323 msgid "bytes" msgstr "byte" -#: builtin/repack.c:310 +#: builtin/repack.c:318 msgid "same as the above, but limit memory size instead of entries count" msgstr "" "come sopra, ma limita le dimensioni della memoria invece del numero di voci" -#: builtin/repack.c:312 +#: builtin/repack.c:320 msgid "limits the maximum delta depth" msgstr "limita la profondità massima dei delta" -#: builtin/repack.c:314 +#: builtin/repack.c:322 msgid "limits the maximum number of threads" msgstr "limita il numero massimo di thread" -#: builtin/repack.c:316 +#: builtin/repack.c:324 msgid "maximum size of each packfile" msgstr "dimensione massima di ogni file pack" -#: builtin/repack.c:318 +#: builtin/repack.c:326 msgid "repack objects in packs marked with .keep" msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep" -#: builtin/repack.c:320 +#: builtin/repack.c:328 msgid "do not repack this pack" msgstr "non eseguire il repack di questo pack" -#: builtin/repack.c:330 +#: builtin/repack.c:338 msgid "cannot delete packs in a precious-objects repo" msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'" -#: builtin/repack.c:334 +#: builtin/repack.c:342 msgid "--keep-unreachable and -A are incompatible" msgstr "--keep-unreachable e -A non sono compatibili" -#: builtin/repack.c:417 +#: builtin/repack.c:425 msgid "Nothing new to pack." msgstr "Non ci sono oggetti nuovi di cui eseguire il pack." -#: builtin/repack.c:478 +#: builtin/repack.c:486 #, c-format msgid "" "WARNING: Some packs in use have been renamed by\n" @@ -18766,7 +19842,7 @@ msgstr "" "AVVISO: non è riuscito. Ridenominali manualmente\n" "AVVISO: entro %s:\n" -#: builtin/repack.c:526 +#: builtin/repack.c:534 #, c-format msgid "failed to remove '%s'" msgstr "eliminazione di '%s' non riuscita" @@ -18874,8 +19950,8 @@ msgstr "impossibile eseguire fstat su %s" msgid "unable to write object to database" msgstr "impossibile scrivere l'oggetto nel database" -#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422 -#: builtin/replace.c:452 +#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:424 +#: builtin/replace.c:454 #, c-format msgid "not a valid object name: '%s'" msgstr "nome oggetto non valido: '%s'" @@ -18894,22 +19970,22 @@ msgstr "modifica del file oggetto non riuscita" msgid "new object is the same as the old one: '%s'" msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:383 +#: builtin/replace.c:384 #, c-format msgid "could not parse %s as a commit" msgstr "impossibile analizzare %s come commit" -#: builtin/replace.c:414 +#: builtin/replace.c:416 #, c-format msgid "bad mergetag in commit '%s'" msgstr "tag merge non valido nel commit '%s'" -#: builtin/replace.c:416 +#: builtin/replace.c:418 #, c-format msgid "malformed mergetag in commit '%s'" msgstr "tag merge malformato nel commit '%s'" -#: builtin/replace.c:428 +#: builtin/replace.c:430 #, c-format msgid "" "original commit '%s' contains mergetag '%s' that is discarded; use --edit " @@ -18918,31 +19994,31 @@ msgstr "" "il commit originario '%s' contiene il tag merge '%s' che è stato scartato; " "usa --edit anziché --graft" -#: builtin/replace.c:467 +#: builtin/replace.c:469 #, c-format msgid "the original commit '%s' has a gpg signature" msgstr "il commit originario '%s' ha una firma GPG" -#: builtin/replace.c:468 +#: builtin/replace.c:470 msgid "the signature will be removed in the replacement commit!" msgstr "la firma sarà rimossa nel commit sostitutivo!" -#: builtin/replace.c:478 +#: builtin/replace.c:480 #, c-format msgid "could not write replacement commit for: '%s'" msgstr "impossibile scrivere il commit sostitutivo per '%s'" -#: builtin/replace.c:486 +#: builtin/replace.c:488 #, c-format msgid "graft for '%s' unnecessary" msgstr "graft per '%s' non necessario" -#: builtin/replace.c:490 +#: builtin/replace.c:492 #, c-format msgid "new commit is the same as the old one: '%s'" msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'" -#: builtin/replace.c:525 +#: builtin/replace.c:527 #, c-format msgid "" "could not convert the following graft(s):\n" @@ -18951,71 +20027,71 @@ msgstr "" "impossibile convertire i seguenti graft:\n" "%s" -#: builtin/replace.c:546 +#: builtin/replace.c:548 msgid "list replace refs" msgstr "elenca i riferimenti sostitutivi" -#: builtin/replace.c:547 +#: builtin/replace.c:549 msgid "delete replace refs" msgstr "elimina i riferimenti sostitutivi" -#: builtin/replace.c:548 +#: builtin/replace.c:550 msgid "edit existing object" msgstr "modifica l'oggetto esistente" -#: builtin/replace.c:549 +#: builtin/replace.c:551 msgid "change a commit's parents" msgstr "cambia i genitori di un commit" -#: builtin/replace.c:550 +#: builtin/replace.c:552 msgid "convert existing graft file" msgstr "converti un file graft esistente" -#: builtin/replace.c:551 +#: builtin/replace.c:553 msgid "replace the ref if it exists" msgstr "sostituisci il riferimento se esiste" -#: builtin/replace.c:553 +#: builtin/replace.c:555 msgid "do not pretty-print contents for --edit" msgstr "non stampare i contenuti in un formato leggibile (per --edit)" -#: builtin/replace.c:554 +#: builtin/replace.c:556 msgid "use this format" msgstr "usa questo formato" -#: builtin/replace.c:567 +#: builtin/replace.c:569 msgid "--format cannot be used when not listing" msgstr "--format non può essere usato quando non si elencano voci" -#: builtin/replace.c:575 +#: builtin/replace.c:577 msgid "-f only makes sense when writing a replacement" msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo" -#: builtin/replace.c:579 +#: builtin/replace.c:581 msgid "--raw only makes sense with --edit" msgstr "--raw ha senso solo con --edit" -#: builtin/replace.c:585 +#: builtin/replace.c:587 msgid "-d needs at least one argument" msgstr "-d richiede almeno un argomento" -#: builtin/replace.c:591 +#: builtin/replace.c:593 msgid "bad number of arguments" msgstr "numero di argomenti errato" -#: builtin/replace.c:597 +#: builtin/replace.c:599 msgid "-e needs exactly one argument" msgstr "-e richiede esattamente un argomento" -#: builtin/replace.c:603 +#: builtin/replace.c:605 msgid "-g needs at least one argument" msgstr "-g richiede almeno un argomento" -#: builtin/replace.c:609 +#: builtin/replace.c:611 msgid "--convert-graft-file takes no argument" msgstr "--convert-graft-file non richiede argomenti" -#: builtin/replace.c:615 +#: builtin/replace.c:617 msgid "only one pattern can be given with -l" msgstr "con -l può essere specificato solo un pattern" @@ -19044,114 +20120,127 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:33 -msgid "git reset [-q] [<tree-ish>] [--] <paths>..." -msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..." +msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..." +msgstr "git reset [-q] [<espressione albero>] [--] <specificatore percorso>..." #: builtin/reset.c:34 -msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" -msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]" +msgid "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]" +msgstr "" +"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<espressione " +"albero>]" + +#: builtin/reset.c:35 +msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]" +msgstr "" +"git reset --patch [<espressione albero>] [--] [<specificatore percorso>...]" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "mixed" msgstr "misto" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "soft" msgstr "soft" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "hard" msgstr "hard" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "merge" msgstr "merge" -#: builtin/reset.c:40 +#: builtin/reset.c:41 msgid "keep" msgstr "keep" -#: builtin/reset.c:81 +#: builtin/reset.c:82 msgid "You do not have a valid HEAD." msgstr "Non hai un HEAD valido." -#: builtin/reset.c:83 +#: builtin/reset.c:84 msgid "Failed to find tree of HEAD." msgstr "Impossibile trovare l'albero di HEAD." -#: builtin/reset.c:89 +#: builtin/reset.c:90 #, c-format msgid "Failed to find tree of %s." msgstr "Impossibile trovare l'albero di %s." -#: builtin/reset.c:193 +#: builtin/reset.c:115 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + +#: builtin/reset.c:194 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Impossibile eseguire un %s reset nel corso di un merge." -#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589 -#: builtin/stash.c:613 +#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595 +#: builtin/stash.c:619 msgid "be quiet, only report errors" msgstr "non visualizzare messaggi, segnala solo gli errori" -#: builtin/reset.c:295 +#: builtin/reset.c:296 msgid "reset HEAD and index" msgstr "reimposta l'HEAD e l'indice" -#: builtin/reset.c:296 +#: builtin/reset.c:297 msgid "reset only HEAD" msgstr "reimposta solo l'HEAD" -#: builtin/reset.c:298 builtin/reset.c:300 +#: builtin/reset.c:299 builtin/reset.c:301 msgid "reset HEAD, index and working tree" msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro" -#: builtin/reset.c:302 +#: builtin/reset.c:303 msgid "reset HEAD but keep local changes" msgstr "reimposta l'HEAD ma mantieni le modifiche locali" -#: builtin/reset.c:308 +#: builtin/reset.c:309 msgid "record only the fact that removed paths will be added later" msgstr "" "salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente" -#: builtin/reset.c:326 +#: builtin/reset.c:343 #, c-format msgid "Failed to resolve '%s' as a valid revision." msgstr "Risoluzione di '%s' come revisione valida non riuscita." -#: builtin/reset.c:334 +#: builtin/reset.c:351 #, c-format msgid "Failed to resolve '%s' as a valid tree." msgstr "Risoluzione di '%s' come albero valido non riuscita." -#: builtin/reset.c:343 +#: builtin/reset.c:360 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch non è compatibile con --{hard,mixed,soft}" -#: builtin/reset.c:353 +#: builtin/reset.c:370 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'." -#: builtin/reset.c:355 +#: builtin/reset.c:372 #, c-format msgid "Cannot do %s reset with paths." msgstr "Impossibile eseguire un %s reset con dei percorsi." -#: builtin/reset.c:370 +#: builtin/reset.c:387 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s reset non è consentito in un repository spoglio" -#: builtin/reset.c:374 +#: builtin/reset.c:391 msgid "-N can only be used with --mixed" msgstr "-N può essere usato solo con --mixed" -#: builtin/reset.c:395 +#: builtin/reset.c:412 msgid "Unstaged changes after reset:" msgstr "Modifiche non nell'area di staging dopo il reset:" -#: builtin/reset.c:398 +#: builtin/reset.c:415 #, c-format msgid "" "\n" @@ -19165,35 +20254,30 @@ msgstr "" "messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n" "rendere tale comportamento quello predefinito.\n" -#: builtin/reset.c:408 +#: builtin/reset.c:425 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Impossibile ripristinare il file indice alla revisione '%s'." -#: builtin/reset.c:412 +#: builtin/reset.c:429 msgid "Could not write new index file." msgstr "Impossibile scrivere il nuovo file indice." -#: builtin/rev-list.c:412 +#: builtin/rev-list.c:499 msgid "cannot combine --exclude-promisor-objects and --missing" msgstr "impossibile combinare --exclude-promisor-objects e --missing" -#: builtin/rev-list.c:473 +#: builtin/rev-list.c:560 msgid "object filtering requires --objects" msgstr "il filtraggio oggetti richiede --objects" -#: builtin/rev-list.c:476 -#, c-format -msgid "invalid sparse value '%s'" -msgstr "valore sparse non valido: '%s'" - -#: builtin/rev-list.c:527 +#: builtin/rev-list.c:610 msgid "rev-list does not support display of notes" msgstr "rev-list non supporta la visualizzazione delle note" -#: builtin/rev-list.c:530 -msgid "cannot combine --use-bitmap-index with object filtering" -msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" +#: builtin/rev-list.c:615 +msgid "marked counting is incompatible with --objects" +msgstr "il conteggio contrassegnato non è compatibile con --objects" #: builtin/rev-parse.c:408 msgid "git rev-parse --parseopt [<options>] -- [<args>...]" @@ -19360,40 +20444,45 @@ msgid_plural "the following files have local modifications:" msgstr[0] "il seguente file ha delle modifiche locali:" msgstr[1] "i seguenti file hanno delle modifiche locali:" -#: builtin/rm.c:242 +#: builtin/rm.c:243 msgid "do not list removed files" msgstr "non elencare i file rimossi" -#: builtin/rm.c:243 +#: builtin/rm.c:244 msgid "only remove from the index" msgstr "rimuovi solo dall'indice" -#: builtin/rm.c:244 +#: builtin/rm.c:245 msgid "override the up-to-date check" msgstr "ignora il controllo sullo stato di aggiornamento" -#: builtin/rm.c:245 +#: builtin/rm.c:246 msgid "allow recursive removal" msgstr "consenti rimozioni ricorsive" -#: builtin/rm.c:247 +#: builtin/rm.c:248 msgid "exit with a zero status even if nothing matched" msgstr "" "esci con codice d'uscita zero anche nel caso in cui non vi siano " "corrispondenze" -#: builtin/rm.c:289 +#: builtin/rm.c:282 +msgid "No pathspec was given. Which files should I remove?" +msgstr "" +"Non è stato fornito uno specificatore percorso. Quali file devo rimuovere?" + +#: builtin/rm.c:305 msgid "please stage your changes to .gitmodules or stash them to proceed" msgstr "" "esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per " "procedere" -#: builtin/rm.c:307 +#: builtin/rm.c:323 #, c-format msgid "not removing '%s' recursively without -r" msgstr "non rimuovo '%s' ricorsivamente senza -r" -#: builtin/rm.c:346 +#: builtin/rm.c:362 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: non è possibile eliminare %s" @@ -19648,15 +20737,84 @@ msgstr "" "visualizza i riferimenti dati sullo standard input che non sono nel " "repository locale" -#: builtin/stash.c:22 builtin/stash.c:37 +#: builtin/sparse-checkout.c:21 +msgid "git sparse-checkout (init|list|set|add|disable) <options>" +msgstr "git sparse-checkout (init|list|set|add|disable) <opzioni>" + +#: builtin/sparse-checkout.c:64 +msgid "this worktree is not sparse (sparse-checkout file may not exist)" +msgstr "" +"questo albero di lavoro non è sparse (il file sparse-checkout potrebbe non " +"esistere)" + +#: builtin/sparse-checkout.c:225 +msgid "failed to create directory for sparse-checkout file" +msgstr "creazione della directory per il file sparse-checkout non riuscita" + +#: builtin/sparse-checkout.c:266 +msgid "failed to set extensions.worktreeConfig setting" +msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita" + +#: builtin/sparse-checkout.c:283 +msgid "git sparse-checkout init [--cone]" +msgstr "git sparse-checkout init [--cone]" + +#: builtin/sparse-checkout.c:302 +msgid "initialize the sparse-checkout in cone mode" +msgstr "inizializza il checkout sparse in modalità cone" + +#: builtin/sparse-checkout.c:308 +msgid "initialize sparse-checkout" +msgstr "inizializza sparse-checkout" + +#: builtin/sparse-checkout.c:341 +#, c-format +msgid "failed to open '%s'" +msgstr "apertura di '%s' non riuscita" + +#: builtin/sparse-checkout.c:398 +#, c-format +msgid "could not normalize path %s" +msgstr "impossibile normalizzare il percorso '%s'" + +#: builtin/sparse-checkout.c:410 +msgid "git sparse-checkout (set|add) (--stdin | <patterns>)" +msgstr "git sparse-checkout (set|add) (--stdin | <pattern>)" + +#: builtin/sparse-checkout.c:435 +#, c-format +msgid "unable to unquote C-style string '%s'" +msgstr "impossibile rimuovere le virgolette dalla stringa in stile C '%s'" + +#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513 +msgid "unable to load existing sparse-checkout patterns" +msgstr "impossibile caricare i pattern sparse-checkout esistenti" + +#: builtin/sparse-checkout.c:558 +msgid "read patterns from standard in" +msgstr "leggi i pattern dallo standard input" + +#: builtin/sparse-checkout.c:564 +msgid "set sparse-checkout patterns" +msgstr "imposta i pattern sparse-checkout" + +#: builtin/sparse-checkout.c:581 +msgid "disable sparse-checkout" +msgstr "disabilita sparse-checkout" + +#: builtin/sparse-checkout.c:593 +msgid "error while refreshing working directory" +msgstr "errore durante l'aggiornamento della directory di lavoro" + +#: builtin/stash.c:22 builtin/stash.c:38 msgid "git stash list [<options>]" msgstr "git stash list [<opzioni>]" -#: builtin/stash.c:23 builtin/stash.c:42 +#: builtin/stash.c:23 builtin/stash.c:43 msgid "git stash show [<options>] [<stash>]" msgstr "git stash show [<opzioni>] [<stash>]" -#: builtin/stash.c:24 builtin/stash.c:47 +#: builtin/stash.c:24 builtin/stash.c:48 msgid "git stash drop [-q|--quiet] [<stash>]" msgstr "git stash drop [-q|--quiet] [<stash>]" @@ -19664,25 +20822,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]" msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:26 builtin/stash.c:62 +#: builtin/stash.c:26 builtin/stash.c:63 msgid "git stash branch <branchname> [<stash>]" msgstr "git stash branch <nome branch> [<stash>]" -#: builtin/stash.c:27 builtin/stash.c:67 +#: builtin/stash.c:27 builtin/stash.c:68 msgid "git stash clear" msgstr "git stash clear" -#: builtin/stash.c:28 builtin/stash.c:77 +#: builtin/stash.c:28 msgid "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<pathspec>...]]" msgstr "" "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n" +" [--pathspec-from-file=<file> [--pathspec-file-nul]]\n" " [--] [<specificatore percorso>...]]" -#: builtin/stash.c:31 builtin/stash.c:84 +#: builtin/stash.c:32 builtin/stash.c:85 msgid "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<message>]" @@ -19690,188 +20850,198 @@ msgstr "" "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" " [-u|--include-untracked] [-a|--all] [<messaggio>]" -#: builtin/stash.c:52 +#: builtin/stash.c:53 msgid "git stash pop [--index] [-q|--quiet] [<stash>]" msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:57 +#: builtin/stash.c:58 msgid "git stash apply [--index] [-q|--quiet] [<stash>]" msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" -#: builtin/stash.c:72 +#: builtin/stash.c:73 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>" msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>" -#: builtin/stash.c:127 +#: builtin/stash.c:78 +msgid "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n" +" [--] [<pathspec>...]]" +msgstr "" +"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n" +" [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n" +" [--] [<specificatore percorso>...]]" + +#: builtin/stash.c:128 #, c-format msgid "'%s' is not a stash-like commit" msgstr "'%s' non è un commit simile a uno stash" -#: builtin/stash.c:147 +#: builtin/stash.c:148 #, c-format msgid "Too many revisions specified:%s" msgstr "Troppe revisioni specificate:%s" -#: builtin/stash.c:161 git-legacy-stash.sh:548 +#: builtin/stash.c:162 git-legacy-stash.sh:549 msgid "No stash entries found." msgstr "Nessuna voce di stash trovata." -#: builtin/stash.c:175 +#: builtin/stash.c:176 #, c-format msgid "%s is not a valid reference" msgstr "%s non è un riferimento valido" -#: builtin/stash.c:224 git-legacy-stash.sh:75 +#: builtin/stash.c:225 git-legacy-stash.sh:75 msgid "git stash clear with parameters is unimplemented" msgstr "git stash clear con parametri non è implementato" -#: builtin/stash.c:403 +#: builtin/stash.c:404 msgid "cannot apply a stash in the middle of a merge" msgstr "impossibile applicare uno stash nel mezzo di un merge" -#: builtin/stash.c:414 +#: builtin/stash.c:415 #, c-format msgid "could not generate diff %s^!." msgstr "impossibile generare il diff %s^!" -#: builtin/stash.c:421 +#: builtin/stash.c:422 msgid "conflicts in index.Try without --index." msgstr "ci sono conflitti nell'indice. Prova senza --index." -#: builtin/stash.c:427 +#: builtin/stash.c:428 msgid "could not save index tree" msgstr "impossibile salvare l'albero indice" -#: builtin/stash.c:434 +#: builtin/stash.c:437 msgid "could not restore untracked files from stash" msgstr "non è stato possibile ripristinare i file non tracciati dallo stash" -#: builtin/stash.c:448 +#: builtin/stash.c:451 #, c-format msgid "Merging %s with %s" msgstr "Merge di %s con %s in corso" -#: builtin/stash.c:458 git-legacy-stash.sh:680 +#: builtin/stash.c:461 git-legacy-stash.sh:681 msgid "Index was not unstashed." msgstr "L'indice non è stato rimosso dallo stash." -#: builtin/stash.c:516 builtin/stash.c:615 +#: builtin/stash.c:522 builtin/stash.c:621 msgid "attempt to recreate the index" msgstr "tenta di ricreare l'indice" -#: builtin/stash.c:549 +#: builtin/stash.c:555 #, c-format msgid "Dropped %s (%s)" msgstr "Ho scartato %s (%s)" -#: builtin/stash.c:552 +#: builtin/stash.c:558 #, c-format msgid "%s: Could not drop stash entry" msgstr "%s: Impossibile scartare la voce di stash" -#: builtin/stash.c:577 +#: builtin/stash.c:583 #, c-format msgid "'%s' is not a stash reference" msgstr "'%s' non è un riferimento stash" -#: builtin/stash.c:627 git-legacy-stash.sh:694 +#: builtin/stash.c:633 git-legacy-stash.sh:695 msgid "The stash entry is kept in case you need it again." msgstr "" "La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno." -#: builtin/stash.c:650 git-legacy-stash.sh:712 +#: builtin/stash.c:656 git-legacy-stash.sh:713 msgid "No branch name specified" msgstr "Nome del branch non specificato" -#: builtin/stash.c:790 builtin/stash.c:827 +#: builtin/stash.c:796 builtin/stash.c:833 #, c-format msgid "Cannot update %s with %s" msgstr "Impossibile aggiornare %s con %s" -#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497 +#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543 msgid "stash message" msgstr "messaggio di stash" -#: builtin/stash.c:818 +#: builtin/stash.c:824 msgid "\"git stash store\" requires one <commit> argument" msgstr "\"git stash store\" richiede un argomento <commit>" -#: builtin/stash.c:1040 git-legacy-stash.sh:217 +#: builtin/stash.c:1049 git-legacy-stash.sh:218 msgid "No changes selected" msgstr "Nessuna modifica selezionata" -#: builtin/stash.c:1136 git-legacy-stash.sh:150 +#: builtin/stash.c:1149 git-legacy-stash.sh:150 msgid "You do not have the initial commit yet" msgstr "Non hai ancora un commit iniziale" -#: builtin/stash.c:1163 git-legacy-stash.sh:165 +#: builtin/stash.c:1176 git-legacy-stash.sh:165 msgid "Cannot save the current index state" msgstr "Impossibile salvare lo stato corrente di index" -#: builtin/stash.c:1172 git-legacy-stash.sh:180 +#: builtin/stash.c:1185 git-legacy-stash.sh:180 msgid "Cannot save the untracked files" msgstr "Impossibile salvare i file non tracciati" -#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200 -#: git-legacy-stash.sh:213 +#: builtin/stash.c:1196 builtin/stash.c:1205 git-legacy-stash.sh:201 +#: git-legacy-stash.sh:214 msgid "Cannot save the current worktree state" msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro" -#: builtin/stash.c:1220 git-legacy-stash.sh:233 +#: builtin/stash.c:1233 git-legacy-stash.sh:234 msgid "Cannot record working tree state" msgstr "Impossibile registrare lo stato dell'albero di lavoro" -#: builtin/stash.c:1269 git-legacy-stash.sh:337 +#: builtin/stash.c:1282 git-legacy-stash.sh:338 msgid "Can't use --patch and --include-untracked or --all at the same time" msgstr "" "Impossibile usare --patch e --include-untracked o --all allo stesso tempo" -#: builtin/stash.c:1285 +#: builtin/stash.c:1298 msgid "Did you forget to 'git add'?" msgstr "Ti sei scordato di eseguire 'git add'?" -#: builtin/stash.c:1300 git-legacy-stash.sh:345 +#: builtin/stash.c:1313 git-legacy-stash.sh:346 msgid "No local changes to save" msgstr "Nessuna modifica locale da salvare" -#: builtin/stash.c:1307 git-legacy-stash.sh:350 +#: builtin/stash.c:1320 git-legacy-stash.sh:351 msgid "Cannot initialize stash" msgstr "Impossibile inizializzare stash" -#: builtin/stash.c:1322 git-legacy-stash.sh:354 +#: builtin/stash.c:1335 git-legacy-stash.sh:355 msgid "Cannot save the current status" msgstr "Impossibile salvare lo stato attuale" -#: builtin/stash.c:1327 +#: builtin/stash.c:1340 #, c-format msgid "Saved working directory and index state %s" msgstr "Directory di lavoro e stato indice salvati: %s" -#: builtin/stash.c:1417 git-legacy-stash.sh:384 +#: builtin/stash.c:1430 git-legacy-stash.sh:385 msgid "Cannot remove worktree changes" msgstr "Impossibile rimuovere le modifiche all'albero di lavoro" -#: builtin/stash.c:1452 builtin/stash.c:1488 +#: builtin/stash.c:1469 builtin/stash.c:1534 msgid "keep index" msgstr "mantieni l'indice" -#: builtin/stash.c:1454 builtin/stash.c:1490 +#: builtin/stash.c:1471 builtin/stash.c:1536 msgid "stash in patch mode" msgstr "esegui lo stash in modalità patch" -#: builtin/stash.c:1455 builtin/stash.c:1491 +#: builtin/stash.c:1472 builtin/stash.c:1537 msgid "quiet mode" msgstr "modalità silenziosa" -#: builtin/stash.c:1457 builtin/stash.c:1493 +#: builtin/stash.c:1474 builtin/stash.c:1539 msgid "include untracked files in stash" msgstr "includi i file non tracciati nello stash" -#: builtin/stash.c:1459 builtin/stash.c:1495 +#: builtin/stash.c:1476 builtin/stash.c:1541 msgid "include ignore files" msgstr "includi i file ignorati" -#: builtin/stash.c:1555 +#: builtin/stash.c:1600 #, c-format msgid "could not exec %s" msgstr "impossibile eseguire %s" @@ -19892,40 +21062,40 @@ msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento" msgid "prepend comment character and space to each line" msgstr "anteponi il carattere commento e uno spazio a ogni riga" -#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943 +#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999 #, c-format msgid "Expecting a full ref name, got %s" msgstr "Atteso nome riferimento completo, ricevuto %s" -#: builtin/submodule--helper.c:62 +#: builtin/submodule--helper.c:64 msgid "submodule--helper print-default-remote takes no arguments" msgstr "submodule--helper print-default-remote non richiede argomenti" -#: builtin/submodule--helper.c:100 +#: builtin/submodule--helper.c:102 #, c-format msgid "cannot strip one component off url '%s'" msgstr "impossibile rimuovere un componente dall'URL '%s'" -#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368 +#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395 msgid "alternative anchor for relative paths" msgstr "ancoraggio alternativo per i percorsi relativi" -#: builtin/submodule--helper.c:413 +#: builtin/submodule--helper.c:415 msgid "git submodule--helper list [--prefix=<path>] [<path>...]" msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]" -#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628 -#: builtin/submodule--helper.c:651 +#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630 +#: builtin/submodule--helper.c:653 #, c-format msgid "No url found for submodule path '%s' in .gitmodules" msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'" -#: builtin/submodule--helper.c:522 +#: builtin/submodule--helper.c:524 #, c-format msgid "Entering '%s'\n" msgstr "Entro in '%s'\n" -#: builtin/submodule--helper.c:525 +#: builtin/submodule--helper.c:527 #, c-format msgid "" "run_command returned non-zero status for %s\n" @@ -19934,7 +21104,7 @@ msgstr "" "run_command ha restituito un codice diverso da zero per %s\n" "." -#: builtin/submodule--helper.c:547 +#: builtin/submodule--helper.c:549 #, c-format msgid "" "run_command returned non-zero status while recursing in the nested " @@ -19945,19 +21115,19 @@ msgstr "" "nei sottomoduli innestati di %s\n" "." -#: builtin/submodule--helper.c:563 +#: builtin/submodule--helper.c:565 msgid "Suppress output of entering each submodule command" msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo" -#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050 +#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063 msgid "Recurse into nested submodules" msgstr "Esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:570 +#: builtin/submodule--helper.c:572 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>" msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>" -#: builtin/submodule--helper.c:597 +#: builtin/submodule--helper.c:599 #, c-format msgid "" "could not look up configuration '%s'. Assuming this repository is its own " @@ -19966,56 +21136,56 @@ msgstr "" "impossibile trovare la configurazione '%s'. Assumo che questo repository sia " "il proprio repository autoritativo upstream." -#: builtin/submodule--helper.c:665 +#: builtin/submodule--helper.c:667 #, c-format msgid "Failed to register url for submodule path '%s'" msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:669 +#: builtin/submodule--helper.c:671 #, c-format msgid "Submodule '%s' (%s) registered for path '%s'\n" msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n" -#: builtin/submodule--helper.c:679 +#: builtin/submodule--helper.c:681 #, c-format msgid "warning: command update mode suggested for submodule '%s'\n" msgstr "" "avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n" -#: builtin/submodule--helper.c:686 +#: builtin/submodule--helper.c:688 #, c-format msgid "Failed to register update mode for submodule path '%s'" msgstr "" "Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'" -#: builtin/submodule--helper.c:708 +#: builtin/submodule--helper.c:710 msgid "Suppress output for initializing a submodule" msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo" -#: builtin/submodule--helper.c:713 +#: builtin/submodule--helper.c:715 msgid "git submodule--helper init [<options>] [<path>]" msgstr "git submodule--helper init [<opzioni>] [<percorso>]" -#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911 +#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924 #, c-format msgid "no submodule mapping found in .gitmodules for path '%s'" msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules" -#: builtin/submodule--helper.c:824 +#: builtin/submodule--helper.c:837 #, c-format msgid "could not resolve HEAD ref inside the submodule '%s'" msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'" -#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020 +#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033 #, c-format msgid "failed to recurse into submodule '%s'" msgstr "ricorsione nel sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186 +#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199 msgid "Suppress submodule status output" msgstr "Non visualizzare l'output dello stato del sottomodulo" -#: builtin/submodule--helper.c:876 +#: builtin/submodule--helper.c:889 msgid "" "Use commit stored in the index instead of the one stored in the submodule " "HEAD" @@ -20023,49 +21193,49 @@ msgstr "" "Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del " "sottomodulo" -#: builtin/submodule--helper.c:877 +#: builtin/submodule--helper.c:890 msgid "recurse into nested submodules" msgstr "esegui ricorsivamente sui sottomoduli innestati" -#: builtin/submodule--helper.c:882 +#: builtin/submodule--helper.c:895 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]" msgstr "" "git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]" -#: builtin/submodule--helper.c:906 +#: builtin/submodule--helper.c:919 msgid "git submodule--helper name <path>" msgstr "git submodule--helper name <percorso>" -#: builtin/submodule--helper.c:970 +#: builtin/submodule--helper.c:983 #, c-format msgid "Synchronizing submodule url for '%s'\n" msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n" -#: builtin/submodule--helper.c:976 +#: builtin/submodule--helper.c:989 #, c-format msgid "failed to register url for submodule path '%s'" msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita" -#: builtin/submodule--helper.c:990 +#: builtin/submodule--helper.c:1003 #, c-format msgid "failed to get the default remote for submodule '%s'" msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito" -#: builtin/submodule--helper.c:1001 +#: builtin/submodule--helper.c:1014 #, c-format msgid "failed to update remote for submodule '%s'" msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito" -#: builtin/submodule--helper.c:1048 +#: builtin/submodule--helper.c:1061 msgid "Suppress output of synchronizing submodule url" msgstr "" "Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo" -#: builtin/submodule--helper.c:1055 +#: builtin/submodule--helper.c:1068 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]" msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]" -#: builtin/submodule--helper.c:1109 +#: builtin/submodule--helper.c:1122 #, c-format msgid "" "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you " @@ -20074,7 +21244,7 @@ msgstr "" "L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa " "'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)" -#: builtin/submodule--helper.c:1121 +#: builtin/submodule--helper.c:1134 #, c-format msgid "" "Submodule work tree '%s' contains local modifications; use '-f' to discard " @@ -20083,182 +21253,213 @@ msgstr "" "L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-" "f' per scartarle" -#: builtin/submodule--helper.c:1129 +#: builtin/submodule--helper.c:1142 #, c-format msgid "Cleared directory '%s'\n" msgstr "Directory '%s' ripulita\n" -#: builtin/submodule--helper.c:1131 +#: builtin/submodule--helper.c:1144 #, c-format msgid "Could not remove submodule work tree '%s'\n" msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n" -#: builtin/submodule--helper.c:1142 +#: builtin/submodule--helper.c:1155 #, c-format msgid "could not create empty submodule directory %s" msgstr "impossibile creare la directory vuota del sottomodulo %s" -#: builtin/submodule--helper.c:1158 +#: builtin/submodule--helper.c:1171 #, c-format msgid "Submodule '%s' (%s) unregistered for path '%s'\n" msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n" -#: builtin/submodule--helper.c:1187 +#: builtin/submodule--helper.c:1200 msgid "Remove submodule working trees even if they contain local changes" msgstr "" "Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche " "locali" -#: builtin/submodule--helper.c:1188 +#: builtin/submodule--helper.c:1201 msgid "Unregister all submodules" msgstr "Annulla la registrazione di tutti i sottomoduli" -#: builtin/submodule--helper.c:1193 +#: builtin/submodule--helper.c:1206 msgid "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]" msgstr "" "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]" -#: builtin/submodule--helper.c:1207 +#: builtin/submodule--helper.c:1220 msgid "Use '--all' if you really want to deinitialize all submodules" msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli" -#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305 +#: builtin/submodule--helper.c:1289 +msgid "" +"An alternate computed from a superproject's alternate is invalid.\n" +"To allow Git to clone without an alternate in such a case, set\n" +"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n" +"'--reference-if-able' instead of '--reference'." +msgstr "" +"Un alternato calcolato a partire dall'alternato di un progetto di livello\n" +"superiore non è valido.\n" +"Per consentire a Git di eseguire il clone senza alternati in tal caso, " +"imposta\n" +"submodule.alternateErrorStrategy a 'info' o, equivalentemente, esegui il " +"clone\n" +"con l'opzione '--reference-if-able' anziché '--reference'." + +#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331 #, c-format msgid "submodule '%s' cannot add alternate: %s" msgstr "non è possibile aggiungere un alternato per il sottomodulo '%s': %s" -#: builtin/submodule--helper.c:1341 +#: builtin/submodule--helper.c:1367 #, c-format msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized" msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto" -#: builtin/submodule--helper.c:1348 +#: builtin/submodule--helper.c:1374 #, c-format msgid "Value '%s' for submodule.alternateLocation is not recognized" msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto" -#: builtin/submodule--helper.c:1371 +#: builtin/submodule--helper.c:1398 msgid "where the new submodule will be cloned to" msgstr "percorso in cui sarà clonato il nuovo sottomodulo" -#: builtin/submodule--helper.c:1374 +#: builtin/submodule--helper.c:1401 msgid "name of the new submodule" msgstr "nome del nuovo sottomodulo" -#: builtin/submodule--helper.c:1377 +#: builtin/submodule--helper.c:1404 msgid "url where to clone the submodule from" msgstr "URL da cui clonare il sottomodulo" -#: builtin/submodule--helper.c:1385 +#: builtin/submodule--helper.c:1412 msgid "depth for shallow clones" msgstr "profondità per i cloni shallow" -#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872 +#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924 msgid "force cloning progress" msgstr "forza l'indicazione d'avanzamento della clonazione" -#: builtin/submodule--helper.c:1393 +#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926 +msgid "disallow cloning into non-empty directory" +msgstr "disabilita il clone in una directory non vuota" + +#: builtin/submodule--helper.c:1424 msgid "" "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference " -"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>" +"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url " +"<url> --path <path>" msgstr "" "git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference " -"<repository>] [--name <nome>] [--depth <profondità>] --url <URL> --path " -"<percorso>" +"<repository>] [--name <nome>] [--depth <profondità>] [--single-branch] --url " +"<URL> --path <percorso>" -#: builtin/submodule--helper.c:1424 +#: builtin/submodule--helper.c:1449 +#, c-format +msgid "refusing to create/use '%s' in another submodule's git dir" +msgstr "" +"mi rifiuto di creare/usare '%s' nella directory Git di un altro sottomodulo" + +#: builtin/submodule--helper.c:1460 #, c-format msgid "clone of '%s' into submodule path '%s' failed" msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito" -#: builtin/submodule--helper.c:1438 +#: builtin/submodule--helper.c:1464 +#, c-format +msgid "directory not empty: '%s'" +msgstr "directory non vuota: '%s'" + +#: builtin/submodule--helper.c:1476 #, c-format msgid "could not get submodule directory for '%s'" msgstr "impossibile recuperare la directory del sottomodulo per '%s'" -#: builtin/submodule--helper.c:1474 +#: builtin/submodule--helper.c:1512 #, c-format msgid "Invalid update mode '%s' for submodule path '%s'" msgstr "" "Modalità aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')" -#: builtin/submodule--helper.c:1478 +#: builtin/submodule--helper.c:1516 #, c-format msgid "Invalid update mode '%s' configured for submodule path '%s'" msgstr "" "È stata configurata una modalità aggiornamento '%s' non valida per il " "percorso del sottomodulo ('%s')" -#: builtin/submodule--helper.c:1571 +#: builtin/submodule--helper.c:1617 #, c-format msgid "Submodule path '%s' not initialized" msgstr "Percorso del sottomodulo ('%s') non inizializzato" -#: builtin/submodule--helper.c:1575 +#: builtin/submodule--helper.c:1621 msgid "Maybe you want to use 'update --init'?" msgstr "Potresti voler usare 'update --init'." -#: builtin/submodule--helper.c:1605 +#: builtin/submodule--helper.c:1651 #, c-format msgid "Skipping unmerged submodule %s" msgstr "Ignoro il sottomodulo %s non sottoposto a merge" -#: builtin/submodule--helper.c:1634 +#: builtin/submodule--helper.c:1680 #, c-format msgid "Skipping submodule '%s'" msgstr "Ignoro il sottomodulo '%s'" -#: builtin/submodule--helper.c:1778 +#: builtin/submodule--helper.c:1830 #, c-format msgid "Failed to clone '%s'. Retry scheduled" msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato" -#: builtin/submodule--helper.c:1789 +#: builtin/submodule--helper.c:1841 #, c-format msgid "Failed to clone '%s' a second time, aborting" msgstr "" "Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione" -#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093 +#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149 msgid "path into the working tree" msgstr "percorso nell'albero di lavoro" -#: builtin/submodule--helper.c:1854 +#: builtin/submodule--helper.c:1906 msgid "path into the working tree, across nested submodule boundaries" msgstr "" "percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati" -#: builtin/submodule--helper.c:1858 +#: builtin/submodule--helper.c:1910 msgid "rebase, merge, checkout or none" msgstr "rebase, merge, checkout o none" -#: builtin/submodule--helper.c:1864 +#: builtin/submodule--helper.c:1916 msgid "Create a shallow clone truncated to the specified number of revisions" msgstr "Crea un clone shallow limitato al numero di revisioni specificato" -#: builtin/submodule--helper.c:1867 +#: builtin/submodule--helper.c:1919 msgid "parallel jobs" msgstr "processi da eseguire in parallelo" -#: builtin/submodule--helper.c:1869 +#: builtin/submodule--helper.c:1921 msgid "whether the initial clone should follow the shallow recommendation" msgstr "determina se il clone iniziale sarà shallow come raccomandato" -#: builtin/submodule--helper.c:1870 +#: builtin/submodule--helper.c:1922 msgid "don't print cloning progress" msgstr "non stampare l'indicazione di avanzamento della clonazione" -#: builtin/submodule--helper.c:1877 -msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]" +#: builtin/submodule--helper.c:1933 +msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]" msgstr "" -"git submodule--helper update_clone [--prefix=<percorso>] [<percorso>...]" +"git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]" -#: builtin/submodule--helper.c:1890 +#: builtin/submodule--helper.c:1946 msgid "bad value for update parameter" msgstr "valore parametro aggiornamento errato" -#: builtin/submodule--helper.c:1938 +#: builtin/submodule--helper.c:1994 #, c-format msgid "" "Submodule (%s) branch configured to inherit branch from superproject, but " @@ -20267,50 +21468,50 @@ msgstr "" "Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch " "dal progetto al livello superiore, ma questo non è su alcun branch" -#: builtin/submodule--helper.c:2061 +#: builtin/submodule--helper.c:2117 #, c-format msgid "could not get a repository handle for submodule '%s'" msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'" -#: builtin/submodule--helper.c:2094 +#: builtin/submodule--helper.c:2150 msgid "recurse into submodules" msgstr "esegui ricorsivamente sui sottomoduli" -#: builtin/submodule--helper.c:2100 +#: builtin/submodule--helper.c:2156 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]" msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]" -#: builtin/submodule--helper.c:2156 +#: builtin/submodule--helper.c:2212 msgid "check if it is safe to write to the .gitmodules file" msgstr "controlla se è sicuro scrivere sul file .gitmodules" -#: builtin/submodule--helper.c:2159 +#: builtin/submodule--helper.c:2215 msgid "unset the config in the .gitmodules file" msgstr "rimuovi la configurazione nel file .gitmodules" -#: builtin/submodule--helper.c:2164 +#: builtin/submodule--helper.c:2220 msgid "git submodule--helper config <name> [<value>]" msgstr "git submodule--helper config <nome> [<valore>]" -#: builtin/submodule--helper.c:2165 +#: builtin/submodule--helper.c:2221 msgid "git submodule--helper config --unset <name>" msgstr "git submodule--helper config --unset <nome>" -#: builtin/submodule--helper.c:2166 +#: builtin/submodule--helper.c:2222 msgid "git submodule--helper config --check-writeable" msgstr "git submodule--helper config --check-writeable" -#: builtin/submodule--helper.c:2185 git-submodule.sh:171 +#: builtin/submodule--helper.c:2241 git-submodule.sh:174 #, sh-format msgid "please make sure that the .gitmodules file is in the working tree" msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro" -#: builtin/submodule--helper.c:2235 git.c:434 git.c:684 +#: builtin/submodule--helper.c:2291 git.c:433 git.c:684 #, c-format msgid "%s doesn't support --super-prefix" msgstr "%s non supporta --super-prefix" -#: builtin/submodule--helper.c:2241 +#: builtin/submodule--helper.c:2297 #, c-format msgid "'%s' is not a valid submodule--helper subcommand" msgstr "'%s' non è un sottocomando submodule--helper valido" @@ -20568,218 +21769,222 @@ msgstr "il tag '%s' esiste già" msgid "Updated tag '%s' (was %s)\n" msgstr "Tag '%s' aggiornato (era %s)\n" -#: builtin/unpack-objects.c:500 +#: builtin/unpack-objects.c:502 msgid "Unpacking objects" msgstr "Decompressione degli oggetti in corso" -#: builtin/update-index.c:83 +#: builtin/update-index.c:84 #, c-format msgid "failed to create directory %s" msgstr "creazione della directory %s non riuscita" -#: builtin/update-index.c:99 +#: builtin/update-index.c:100 #, c-format msgid "failed to create file %s" msgstr "creazione del file %s non riuscita" -#: builtin/update-index.c:107 +#: builtin/update-index.c:108 #, c-format msgid "failed to delete file %s" msgstr "eliminazione del file %s non riuscita" -#: builtin/update-index.c:114 builtin/update-index.c:220 +#: builtin/update-index.c:115 builtin/update-index.c:221 #, c-format msgid "failed to delete directory %s" msgstr "eliminazione della directory %s non riuscita" -#: builtin/update-index.c:139 +#: builtin/update-index.c:140 #, c-format msgid "Testing mtime in '%s' " msgstr "Test di mtime in '%s' in corso " -#: builtin/update-index.c:153 +#: builtin/update-index.c:154 msgid "directory stat info does not change after adding a new file" msgstr "" "le informazioni stat della directory non cambiano dopo l'aggiunta di un " "nuovo file" -#: builtin/update-index.c:166 +#: builtin/update-index.c:167 msgid "directory stat info does not change after adding a new directory" msgstr "" "le informazioni stat della directory non cambiano dopo l'aggiunta di una " "nuova directory" -#: builtin/update-index.c:179 +#: builtin/update-index.c:180 msgid "directory stat info changes after updating a file" msgstr "" "le informazioni stat della directory cambiano dopo l'aggiornamento di un file" -#: builtin/update-index.c:190 +#: builtin/update-index.c:191 msgid "directory stat info changes after adding a file inside subdirectory" msgstr "" "le informazioni stat della directory cambiano dopo l'aggiunta di un file in " "una sottodirectory" -#: builtin/update-index.c:201 +#: builtin/update-index.c:202 msgid "directory stat info does not change after deleting a file" msgstr "" "le informazioni stat della directory non cambiano dopo l'eliminazione di un " "file" -#: builtin/update-index.c:214 +#: builtin/update-index.c:215 msgid "directory stat info does not change after deleting a directory" msgstr "" "le informazioni stat della directory non cambiano dopo l'eliminazione di una " "directory" -#: builtin/update-index.c:221 +#: builtin/update-index.c:222 msgid " OK" msgstr " OK" -#: builtin/update-index.c:589 +#: builtin/update-index.c:591 msgid "git update-index [<options>] [--] [<file>...]" msgstr "git update-index [<opzioni>] [--] [<file>...]" -#: builtin/update-index.c:971 +#: builtin/update-index.c:974 msgid "continue refresh even when index needs update" msgstr "" "continua l'aggiornamento anche nel caso in cui l'indice richieda di essere " "aggiornato" -#: builtin/update-index.c:974 +#: builtin/update-index.c:977 msgid "refresh: ignore submodules" msgstr "aggiornamento: ignora i sottomoduli" -#: builtin/update-index.c:977 +#: builtin/update-index.c:980 msgid "do not ignore new files" msgstr "non ignorare i nuovi file" -#: builtin/update-index.c:979 +#: builtin/update-index.c:982 msgid "let files replace directories and vice-versa" msgstr "consenti che dei file sostituiscano delle directory e viceversa" -#: builtin/update-index.c:981 +#: builtin/update-index.c:984 msgid "notice files missing from worktree" msgstr "nota se dei file mancano dall'albero di lavoro" -#: builtin/update-index.c:983 +#: builtin/update-index.c:986 msgid "refresh even if index contains unmerged entries" msgstr "" "esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte " "a merge" -#: builtin/update-index.c:986 +#: builtin/update-index.c:989 msgid "refresh stat information" msgstr "aggiorna le informazioni stat" -#: builtin/update-index.c:990 +#: builtin/update-index.c:993 msgid "like --refresh, but ignore assume-unchanged setting" msgstr "come --refresh, ma ignora l'impostazione assume-unchanged" -#: builtin/update-index.c:994 +#: builtin/update-index.c:997 msgid "<mode>,<object>,<path>" msgstr "<modo>,<oggetto>,<percorso>" -#: builtin/update-index.c:995 +#: builtin/update-index.c:998 msgid "add the specified entry to the index" msgstr "aggiunge la voce specificata all'indice" -#: builtin/update-index.c:1005 +#: builtin/update-index.c:1008 msgid "mark files as \"not changing\"" msgstr "contrassegna i file come \"non saranno modificati\"" -#: builtin/update-index.c:1008 +#: builtin/update-index.c:1011 msgid "clear assumed-unchanged bit" msgstr "reimposta a zero il bit \"non saranno modificati\"" -#: builtin/update-index.c:1011 +#: builtin/update-index.c:1014 msgid "mark files as \"index-only\"" msgstr "contrassegna i file come \"solamente da indicizzare\"" -#: builtin/update-index.c:1014 +#: builtin/update-index.c:1017 msgid "clear skip-worktree bit" msgstr "reimposta a zero il bit \"solamente da indicizzare\"" -#: builtin/update-index.c:1017 +#: builtin/update-index.c:1020 +msgid "do not touch index-only entries" +msgstr "non eseguire il touch di voci presenti solo nell'indice" + +#: builtin/update-index.c:1022 msgid "add to index only; do not add content to object database" msgstr "" "aggiungi solo all'indice; non aggiungere il contenuto al database oggetti" -#: builtin/update-index.c:1019 +#: builtin/update-index.c:1024 msgid "remove named paths even if present in worktree" msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro" -#: builtin/update-index.c:1021 +#: builtin/update-index.c:1026 msgid "with --stdin: input lines are terminated by null bytes" msgstr "con --stdin: le righe di input sono terminate da byte NULL" -#: builtin/update-index.c:1023 +#: builtin/update-index.c:1028 msgid "read list of paths to be updated from standard input" msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input" -#: builtin/update-index.c:1027 +#: builtin/update-index.c:1032 msgid "add entries from standard input to the index" msgstr "aggiungi le voci specificate sullo standard input all'indice" -#: builtin/update-index.c:1031 +#: builtin/update-index.c:1036 msgid "repopulate stages #2 and #3 for the listed paths" msgstr "ripopola le fasi 2 e 3 per i percorsi elencati" -#: builtin/update-index.c:1035 +#: builtin/update-index.c:1040 msgid "only update entries that differ from HEAD" msgstr "aggiorna solo le voci differenti rispetto all'HEAD" -#: builtin/update-index.c:1039 +#: builtin/update-index.c:1044 msgid "ignore files missing from worktree" msgstr "ignora i file mancanti nell'albero di lavoro" -#: builtin/update-index.c:1042 +#: builtin/update-index.c:1047 msgid "report actions to standard output" msgstr "stampa le azioni sullo standard output" -#: builtin/update-index.c:1044 +#: builtin/update-index.c:1049 msgid "(for porcelains) forget saved unresolved conflicts" msgstr "" "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati" -#: builtin/update-index.c:1048 +#: builtin/update-index.c:1053 msgid "write index in this format" msgstr "scrivi l'indice in questo formato" -#: builtin/update-index.c:1050 +#: builtin/update-index.c:1055 msgid "enable or disable split index" msgstr "abilita o disabilita l'indice suddiviso" -#: builtin/update-index.c:1052 +#: builtin/update-index.c:1057 msgid "enable/disable untracked cache" msgstr "abilita/disabilita la cache non tracciata" -#: builtin/update-index.c:1054 +#: builtin/update-index.c:1059 msgid "test if the filesystem supports untracked cache" msgstr "verifica se il filesystem supporta la cache non tracciata" -#: builtin/update-index.c:1056 +#: builtin/update-index.c:1061 msgid "enable untracked cache without testing the filesystem" msgstr "abilita la cache non tracciata senza testare il filesystem" -#: builtin/update-index.c:1058 +#: builtin/update-index.c:1063 msgid "write out the index even if is not flagged as changed" msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato" -#: builtin/update-index.c:1060 +#: builtin/update-index.c:1065 msgid "enable or disable file system monitor" msgstr "abilita o disabilita il monitor del filesystem" -#: builtin/update-index.c:1062 +#: builtin/update-index.c:1067 msgid "mark files as fsmonitor valid" msgstr "contrassegna i file come validi rispetto al monitor del filesystem" -#: builtin/update-index.c:1065 +#: builtin/update-index.c:1070 msgid "clear fsmonitor valid bit" msgstr "" "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\"" -#: builtin/update-index.c:1168 +#: builtin/update-index.c:1173 msgid "" "core.splitIndex is set to false; remove or change it, if you really want to " "enable split index" @@ -20787,7 +21992,7 @@ msgstr "" "core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare l'indice suddiviso" -#: builtin/update-index.c:1177 +#: builtin/update-index.c:1182 msgid "" "core.splitIndex is set to true; remove or change it, if you really want to " "disable split index" @@ -20795,7 +22000,7 @@ msgstr "" "core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente " "disabilitare l'indice suddiviso" -#: builtin/update-index.c:1188 +#: builtin/update-index.c:1194 msgid "" "core.untrackedCache is set to true; remove or change it, if you really want " "to disable the untracked cache" @@ -20803,11 +22008,11 @@ msgstr "" "core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi " "veramente disabilitare la cache non tracciata" -#: builtin/update-index.c:1192 +#: builtin/update-index.c:1198 msgid "Untracked cache disabled" msgstr "Cache non tracciata disabilitata" -#: builtin/update-index.c:1200 +#: builtin/update-index.c:1206 msgid "" "core.untrackedCache is set to false; remove or change it, if you really want " "to enable the untracked cache" @@ -20815,29 +22020,29 @@ msgstr "" "core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi " "veramente abilitare la cache non tracciata" -#: builtin/update-index.c:1204 +#: builtin/update-index.c:1210 #, c-format msgid "Untracked cache enabled for '%s'" msgstr "Cache non tracciata abilitata per '%s'" -#: builtin/update-index.c:1212 +#: builtin/update-index.c:1218 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor" msgstr "" "core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il " "monitor del filesystem" -#: builtin/update-index.c:1216 +#: builtin/update-index.c:1222 msgid "fsmonitor enabled" msgstr "monitor filesystem abilitato" -#: builtin/update-index.c:1219 +#: builtin/update-index.c:1225 msgid "" "core.fsmonitor is set; remove it if you really want to disable fsmonitor" msgstr "" "core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente " "disabilitare il monitor del filesystem" -#: builtin/update-index.c:1223 +#: builtin/update-index.c:1229 msgid "fsmonitor disabled" msgstr "monitor filesystem disabilitato" @@ -20933,55 +22138,55 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..." msgid "print tag contents" msgstr "stampa i contenuti del tag" -#: builtin/worktree.c:18 +#: builtin/worktree.c:17 msgid "git worktree add [<options>] <path> [<commit-ish>]" msgstr "git worktree add [<opzioni>] <percorso> [<espressione commit>]" -#: builtin/worktree.c:19 +#: builtin/worktree.c:18 msgid "git worktree list [<options>]" msgstr "git worktree list [<opzioni>]" -#: builtin/worktree.c:20 +#: builtin/worktree.c:19 msgid "git worktree lock [<options>] <path>" msgstr "git worktree lock [<opzioni>] <percorso>" -#: builtin/worktree.c:21 +#: builtin/worktree.c:20 msgid "git worktree move <worktree> <new-path>" msgstr "git worktree move <albero di lavoro> <nuovo percorso>" -#: builtin/worktree.c:22 +#: builtin/worktree.c:21 msgid "git worktree prune [<options>]" msgstr "git worktree prune [<opzioni>]" -#: builtin/worktree.c:23 +#: builtin/worktree.c:22 msgid "git worktree remove [<options>] <worktree>" msgstr "git worktree remove [<opzioni>] <albero di lavoro>" -#: builtin/worktree.c:24 +#: builtin/worktree.c:23 msgid "git worktree unlock <path>" msgstr "git worktree unlock <percorso>" -#: builtin/worktree.c:61 builtin/worktree.c:899 +#: builtin/worktree.c:60 builtin/worktree.c:891 #, c-format msgid "failed to delete '%s'" msgstr "eliminazione di '%s' non riuscita" -#: builtin/worktree.c:80 +#: builtin/worktree.c:79 #, c-format msgid "Removing worktrees/%s: not a valid directory" msgstr "Rimuovo worktrees/%s: non è una directory valida" -#: builtin/worktree.c:86 +#: builtin/worktree.c:85 #, c-format msgid "Removing worktrees/%s: gitdir file does not exist" msgstr "Rimuovo worktrees/%s: il file gitdir non esiste" -#: builtin/worktree.c:91 builtin/worktree.c:100 +#: builtin/worktree.c:90 builtin/worktree.c:99 #, c-format msgid "Removing worktrees/%s: unable to read gitdir file (%s)" msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)" -#: builtin/worktree.c:110 +#: builtin/worktree.c:109 #, c-format msgid "" "Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read " @@ -20990,35 +22195,35 @@ msgstr "" "Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, " "%<PRIuMAX> letti)" -#: builtin/worktree.c:118 +#: builtin/worktree.c:117 #, c-format msgid "Removing worktrees/%s: invalid gitdir file" msgstr "Rimuovo worktrees/%s: file gitdir non valido" -#: builtin/worktree.c:127 +#: builtin/worktree.c:126 #, c-format msgid "Removing worktrees/%s: gitdir file points to non-existent location" msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente" -#: builtin/worktree.c:166 +#: builtin/worktree.c:165 msgid "report pruned working trees" msgstr "segnala gli alberi di lavoro eliminati" -#: builtin/worktree.c:168 +#: builtin/worktree.c:167 msgid "expire working trees older than <time>" msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>" -#: builtin/worktree.c:235 +#: builtin/worktree.c:234 #, c-format msgid "'%s' already exists" msgstr "'%s' esiste già" -#: builtin/worktree.c:252 +#: builtin/worktree.c:244 #, c-format msgid "unable to re-add worktree '%s'" msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'" -#: builtin/worktree.c:257 +#: builtin/worktree.c:249 #, c-format msgid "" "'%s' is a missing but locked worktree;\n" @@ -21028,7 +22233,7 @@ msgstr "" "usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per " "rimuoverlo" -#: builtin/worktree.c:259 +#: builtin/worktree.c:251 #, c-format msgid "" "'%s' is a missing but already registered worktree;\n" @@ -21037,129 +22242,129 @@ msgstr "" "'%s' è un albero di lavoro mancante ma già registrato;\n" "usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo" -#: builtin/worktree.c:309 +#: builtin/worktree.c:301 #, c-format msgid "could not create directory of '%s'" msgstr "impossibile creare la directory di '%s'" -#: builtin/worktree.c:440 builtin/worktree.c:446 +#: builtin/worktree.c:432 builtin/worktree.c:438 #, c-format msgid "Preparing worktree (new branch '%s')" msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')" -#: builtin/worktree.c:442 +#: builtin/worktree.c:434 #, c-format msgid "Preparing worktree (resetting branch '%s'; was at %s)" msgstr "" "Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a " "%s)" -#: builtin/worktree.c:451 +#: builtin/worktree.c:443 #, c-format msgid "Preparing worktree (checking out '%s')" msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')" -#: builtin/worktree.c:457 +#: builtin/worktree.c:449 #, c-format msgid "Preparing worktree (detached HEAD %s)" msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)" -#: builtin/worktree.c:498 +#: builtin/worktree.c:490 msgid "checkout <branch> even if already checked out in other worktree" msgstr "" "esegui il checkout di <branch> anche se tale operazione è stata eseguita in " "un altro albero di lavoro" -#: builtin/worktree.c:501 +#: builtin/worktree.c:493 msgid "create a new branch" msgstr "crea un nuovo branch" -#: builtin/worktree.c:503 +#: builtin/worktree.c:495 msgid "create or reset a branch" msgstr "crea o reimposta un branch" -#: builtin/worktree.c:505 +#: builtin/worktree.c:497 msgid "populate the new working tree" msgstr "popola il nuovo albero di lavoro" -#: builtin/worktree.c:506 +#: builtin/worktree.c:498 msgid "keep the new working tree locked" msgstr "mantieni bloccato il nuovo albero di lavoro" -#: builtin/worktree.c:509 +#: builtin/worktree.c:501 msgid "set up tracking mode (see git-branch(1))" msgstr "imposta la modalità tracking (vedi git-branch(1))" -#: builtin/worktree.c:512 +#: builtin/worktree.c:504 msgid "try to match the new branch name with a remote-tracking branch" msgstr "" "tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch " "remoto da tracciare" -#: builtin/worktree.c:520 +#: builtin/worktree.c:512 msgid "-b, -B, and --detach are mutually exclusive" msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive" -#: builtin/worktree.c:581 +#: builtin/worktree.c:573 msgid "--[no-]track can only be used if a new branch is created" msgstr "" "l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch" -#: builtin/worktree.c:681 +#: builtin/worktree.c:673 msgid "reason for locking" msgstr "motivo di blocco" -#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800 -#: builtin/worktree.c:927 +#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792 +#: builtin/worktree.c:919 #, c-format msgid "'%s' is not a working tree" msgstr "'%s' non è un albero di lavoro" -#: builtin/worktree.c:695 builtin/worktree.c:728 +#: builtin/worktree.c:687 builtin/worktree.c:720 msgid "The main working tree cannot be locked or unlocked" msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale" -#: builtin/worktree.c:700 +#: builtin/worktree.c:692 #, c-format msgid "'%s' is already locked, reason: %s" msgstr "'%s' è già bloccato per questo motivo: %s" -#: builtin/worktree.c:702 +#: builtin/worktree.c:694 #, c-format msgid "'%s' is already locked" msgstr "'%s' è già bloccato" -#: builtin/worktree.c:730 +#: builtin/worktree.c:722 #, c-format msgid "'%s' is not locked" msgstr "'%s' non è bloccato" -#: builtin/worktree.c:771 +#: builtin/worktree.c:763 msgid "working trees containing submodules cannot be moved or removed" msgstr "" "gli alberi di lavoro contenenti sottomoduli non possono essere spostati o " "rimossi" -#: builtin/worktree.c:779 +#: builtin/worktree.c:771 msgid "force move even if worktree is dirty or locked" msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:802 builtin/worktree.c:929 +#: builtin/worktree.c:794 builtin/worktree.c:921 #, c-format msgid "'%s' is a main working tree" msgstr "'%s' è un albero di lavoro principale" -#: builtin/worktree.c:807 +#: builtin/worktree.c:799 #, c-format msgid "could not figure out destination name from '%s'" msgstr "impossibile determinare il nome destinazione da '%s'" -#: builtin/worktree.c:813 +#: builtin/worktree.c:805 #, c-format msgid "target '%s' already exists" msgstr "la destinazione '%s' esiste già" -#: builtin/worktree.c:821 +#: builtin/worktree.c:813 #, c-format msgid "" "cannot move a locked working tree, lock reason: %s\n" @@ -21169,7 +22374,7 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:823 +#: builtin/worktree.c:815 msgid "" "cannot move a locked working tree;\n" "use 'move -f -f' to override or unlock first" @@ -21178,36 +22383,37 @@ msgstr "" "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:826 +#: builtin/worktree.c:818 #, c-format msgid "validation failed, cannot move working tree: %s" msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s" -#: builtin/worktree.c:831 +#: builtin/worktree.c:823 #, c-format msgid "failed to move '%s' to '%s'" msgstr "spostamento di '%s' in '%s' non riuscito" -#: builtin/worktree.c:879 +#: builtin/worktree.c:871 #, c-format msgid "failed to run 'git status' on '%s'" msgstr "esecuzione di 'git status' su '%s' non riuscita" -#: builtin/worktree.c:883 +#: builtin/worktree.c:875 #, c-format -msgid "'%s' is dirty, use --force to delete it" -msgstr "'%s' è sporco, usa --force per eliminarlo" +msgid "'%s' contains modified or untracked files, use --force to delete it" +msgstr "" +"'%s' contiene file modificati o non tracciati, usa --force per eliminarlo" -#: builtin/worktree.c:888 +#: builtin/worktree.c:880 #, c-format msgid "failed to run 'git status' on '%s', code %d" msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d" -#: builtin/worktree.c:911 +#: builtin/worktree.c:903 msgid "force removal even if worktree is dirty or locked" msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato" -#: builtin/worktree.c:934 +#: builtin/worktree.c:926 #, c-format msgid "" "cannot remove a locked working tree, lock reason: %s\n" @@ -21217,7 +22423,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:936 +#: builtin/worktree.c:928 msgid "" "cannot remove a locked working tree;\n" "use 'remove -f -f' to override or unlock first" @@ -21226,7 +22432,7 @@ msgstr "" "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire " "l'operazione" -#: builtin/worktree.c:939 +#: builtin/worktree.c:931 #, c-format msgid "validation failed, cannot remove working tree: %s" msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s" @@ -21247,6 +22453,21 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>" msgid "only useful for debugging" msgstr "utile solo per il debug" +#: fast-import.c:3125 +#, c-format +msgid "Expected 'mark' command, got %s" +msgstr "Atteso comando 'mark', ricevuto %s" + +#: fast-import.c:3130 +#, c-format +msgid "Expected 'to' command, got %s" +msgstr "Atteso comando 'to', ricevuto %s" + +#: fast-import.c:3254 +#, c-format +msgid "feature '%s' forbidden in input without --allow-unsafe-features" +msgstr "funzionalità '%s' vietata nell'input senza --allow-unsafe-features" + #: credential-cache--daemon.c:223 #, c-format msgid "" @@ -21362,25 +22583,25 @@ msgstr "" "l'alias '%s' modifica le variabili d'ambiente.\n" "Puoi usare '!git' nell'alias per farlo" -#: git.c:377 +#: git.c:376 #, c-format msgid "empty alias for %s" msgstr "alias vuoto per %s" -#: git.c:380 +#: git.c:379 #, c-format msgid "recursive alias: %s" msgstr "alias ricorsivo: %s" -#: git.c:460 +#: git.c:459 msgid "write failure on standard output" msgstr "errore di scrittura sullo standard output" -#: git.c:462 +#: git.c:461 msgid "unknown write failure on standard output" msgstr "errore di scrittura sconosciuto sullo standard output" -#: git.c:464 +#: git.c:463 msgid "close failed on standard output" msgstr "chiusura dello standard output non riuscita" @@ -21434,24 +22655,24 @@ msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0" msgid "Protocol restrictions not supported with cURL < 7.19.4" msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4" -#: http.c:1085 +#: http.c:1086 #, c-format msgid "Unsupported SSL backend '%s'. Supported SSL backends:" msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:" -#: http.c:1092 +#: http.c:1093 #, c-format msgid "Could not set SSL backend to '%s': cURL was built without SSL backends" msgstr "" "Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza " "backend SSL" -#: http.c:1096 +#: http.c:1097 #, c-format msgid "Could not set SSL backend to '%s': already set" msgstr "Impossibile impostare il backend SSL a '%s': già impostato" -#: http.c:1965 +#: http.c:1966 #, c-format msgid "" "unable to update url base from redirection:\n" @@ -21462,155 +22683,166 @@ msgstr "" " richiesta: %s\n" " redirect: %s" -#: remote-curl.c:157 +#: remote-curl.c:166 #, c-format msgid "invalid quoting in push-option value: '%s'" msgstr "virgolette non valide nel valore push-option: '%s'" -#: remote-curl.c:254 +#: remote-curl.c:263 #, c-format msgid "%sinfo/refs not valid: is this a git repository?" msgstr "%sinfo/refs non valido: è un repository Git?" -#: remote-curl.c:355 +#: remote-curl.c:364 msgid "invalid server response; expected service, got flush packet" msgstr "" "risposta del server non valida; atteso servizio, ricevuto pacchetto flush" -#: remote-curl.c:386 +#: remote-curl.c:395 #, c-format msgid "invalid server response; got '%s'" msgstr "risposta del server non valida; ricevuto '%s'" -#: remote-curl.c:446 +#: remote-curl.c:455 #, c-format msgid "repository '%s' not found" msgstr "repository '%s' non trovato" -#: remote-curl.c:450 +#: remote-curl.c:459 #, c-format msgid "Authentication failed for '%s'" msgstr "Autenticazione non riuscita per '%s'" -#: remote-curl.c:454 +#: remote-curl.c:463 #, c-format msgid "unable to access '%s': %s" msgstr "impossibile accedere a '%s': %s" -#: remote-curl.c:460 +#: remote-curl.c:469 #, c-format msgid "redirecting to %s" msgstr "redirezione a %s in corso" -#: remote-curl.c:584 +#: remote-curl.c:593 msgid "shouldn't have EOF when not gentle on EOF" msgstr "" "non dovrebbe esserci un pacchetto fine file se non si è accomodanti con " "questi ultimi" -#: remote-curl.c:664 +#: remote-curl.c:673 msgid "unable to rewind rpc post data - try increasing http.postBuffer" msgstr "" "impossibile ritornare a un punto precedente dei dati POST RPC - prova ad " "aumentare il valore di http.postBuffer" -#: remote-curl.c:724 +#: remote-curl.c:733 #, c-format msgid "RPC failed; %s" msgstr "RPC non riuscita; %s" -#: remote-curl.c:764 +#: remote-curl.c:773 msgid "cannot handle pushes this big" msgstr "impossibile gestire push così grandi" -#: remote-curl.c:879 +#: remote-curl.c:888 #, c-format msgid "cannot deflate request; zlib deflate error %d" msgstr "" "impossibile eseguire il deflate della richiesta; errore deflate zlib %d" -#: remote-curl.c:883 +#: remote-curl.c:892 #, c-format msgid "cannot deflate request; zlib end error %d" msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d" -#: remote-curl.c:1014 +#: remote-curl.c:1023 msgid "dumb http transport does not support shallow capabilities" msgstr "il trasporto http stupido non supporta le funzionalità shallow" -#: remote-curl.c:1028 +#: remote-curl.c:1038 msgid "fetch failed." msgstr "recupero non riuscito." -#: remote-curl.c:1076 +#: remote-curl.c:1086 msgid "cannot fetch by sha1 over smart http" msgstr "" "impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP " "intelligente" -#: remote-curl.c:1120 remote-curl.c:1126 +#: remote-curl.c:1130 remote-curl.c:1136 #, c-format msgid "protocol error: expected sha/ref, got '%s'" msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'" -#: remote-curl.c:1138 remote-curl.c:1252 +#: remote-curl.c:1148 remote-curl.c:1263 #, c-format msgid "http transport does not support %s" msgstr "il trasporto HTTP non supporta %s" -#: remote-curl.c:1174 +#: remote-curl.c:1184 msgid "git-http-push failed" msgstr "git-http-push non riuscito" -#: remote-curl.c:1360 +#: remote-curl.c:1369 msgid "remote-curl: usage: git remote-curl <remote> [<url>]" msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]" -#: remote-curl.c:1392 +#: remote-curl.c:1401 msgid "remote-curl: error reading command stream from git" msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git" -#: remote-curl.c:1399 +#: remote-curl.c:1408 msgid "remote-curl: fetch attempted without a local repo" msgstr "remote-curl: tentato un fetch senza un repository locale" -#: remote-curl.c:1439 +#: remote-curl.c:1448 #, c-format msgid "remote-curl: unknown command '%s' from git" msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git" -#: list-objects-filter-options.h:61 +#: list-objects-filter-options.h:85 msgid "args" msgstr "argomenti" -#: list-objects-filter-options.h:62 +#: list-objects-filter-options.h:86 msgid "object filtering" msgstr "filtraggio oggetti" -#: parse-options.h:170 +#: parse-options.h:183 msgid "expiry-date" msgstr "data-scadenza" -#: parse-options.h:184 +#: parse-options.h:197 msgid "no-op (backward compatibility)" msgstr "no-op (retrocompatibilità)" -#: parse-options.h:305 +#: parse-options.h:309 msgid "be more verbose" msgstr "visualizza più dettagli" -#: parse-options.h:307 +#: parse-options.h:311 msgid "be more quiet" msgstr "visualizza meno dettagli" -#: parse-options.h:313 +#: parse-options.h:317 msgid "use <n> digits to display SHA-1s" msgstr "usa <n> cifre per mostrare gli hash SHA-1" -#: parse-options.h:332 +#: parse-options.h:336 msgid "how to strip spaces and #comments from message" msgstr "come rimuovere gli spazi e i #commenti dal messaggio" +#: parse-options.h:337 +msgid "read pathspec from file" +msgstr "leggi gli specificatori percorso da un file" + +#: parse-options.h:338 +msgid "" +"with --pathspec-from-file, pathspec elements are separated with NUL character" +msgstr "" +"con --pathspec-from-file gli elementi specificatori percorso sono separati " +"da un carattere NUL" + #: ref-filter.h:101 msgid "key" msgstr "chiave" @@ -22140,163 +23372,171 @@ msgid "Common Git shell script setup code" msgstr "Codice comune di inizializzazione di Git per gli script shell" #: command-list.h:171 +msgid "Initialize and modify the sparse-checkout" +msgstr "Inizializza e modifica sparse-checkout" + +#: command-list.h:172 msgid "Stash the changes in a dirty working directory away" msgstr "Mette da parte le modifiche in una directory di lavoro sporca" -#: command-list.h:172 +#: command-list.h:173 msgid "Add file contents to the staging area" msgstr "Aggiunge i contenuti dei file all'area di staging" -#: command-list.h:173 +#: command-list.h:174 msgid "Show the working tree status" msgstr "Visualizza lo stato dell'albero di lavoro" -#: command-list.h:174 +#: command-list.h:175 msgid "Remove unnecessary whitespace" msgstr "Rimuove spazi bianchi non necessari" -#: command-list.h:175 +#: command-list.h:176 msgid "Initialize, update or inspect submodules" msgstr "Inizializza, aggiorna o esamina sottomoduli" -#: command-list.h:176 +#: command-list.h:177 msgid "Bidirectional operation between a Subversion repository and Git" msgstr "Operatività bidirezionale tra un repository Subversion e Git" -#: command-list.h:177 +#: command-list.h:178 msgid "Switch branches" msgstr "Passa da un branch a un altro" -#: command-list.h:178 +#: command-list.h:179 msgid "Read, modify and delete symbolic refs" msgstr "Legge, modifica ed elimina riferimenti simbolici" -#: command-list.h:179 +#: command-list.h:180 msgid "Create, list, delete or verify a tag object signed with GPG" msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG" -#: command-list.h:180 +#: command-list.h:181 msgid "Creates a temporary file with a blob's contents" msgstr "Crea un file temporaneo con i contenuti di un blob" -#: command-list.h:181 +#: command-list.h:182 msgid "Unpack objects from a packed archive" msgstr "Decomprime gli oggetti da un archivio sottoposto a pack" -#: command-list.h:182 +#: command-list.h:183 msgid "Register file contents in the working tree to the index" msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice" -#: command-list.h:183 +#: command-list.h:184 msgid "Update the object name stored in a ref safely" msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento" -#: command-list.h:184 +#: command-list.h:185 msgid "Update auxiliary info file to help dumb servers" msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi" -#: command-list.h:185 +#: command-list.h:186 msgid "Send archive back to git-archive" msgstr "Reinvia l'archivio a git-archive" -#: command-list.h:186 +#: command-list.h:187 msgid "Send objects packed back to git-fetch-pack" msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack" -#: command-list.h:187 +#: command-list.h:188 msgid "Show a Git logical variable" msgstr "Visualizza una variabile logica di Git" -#: command-list.h:188 +#: command-list.h:189 msgid "Check the GPG signature of commits" msgstr "Verifica la firma GPG dei commit" -#: command-list.h:189 +#: command-list.h:190 msgid "Validate packed Git archive files" msgstr "Convalida i file archivio sottoposti a pack di Git" -#: command-list.h:190 +#: command-list.h:191 msgid "Check the GPG signature of tags" msgstr "Verifica la firma GPG dei tag" -#: command-list.h:191 +#: command-list.h:192 msgid "Git web interface (web frontend to Git repositories)" msgstr "Interfaccia Web per Git (frontend Web ai repository Git)" -#: command-list.h:192 +#: command-list.h:193 msgid "Show logs with difference each commit introduces" msgstr "" "Visualizza i registri insieme alle differenze introdotte da ciascun commit" -#: command-list.h:193 +#: command-list.h:194 msgid "Manage multiple working trees" msgstr "Gestisce alberi di lavoro multipli" -#: command-list.h:194 +#: command-list.h:195 msgid "Create a tree object from the current index" msgstr "Crea un oggetto albero dall'indice corrente" -#: command-list.h:195 +#: command-list.h:196 msgid "Defining attributes per path" msgstr "Definizione di attributi per percorso" -#: command-list.h:196 +#: command-list.h:197 msgid "Git command-line interface and conventions" msgstr "Interfaccia a riga di comando di Git e convenzioni" -#: command-list.h:197 +#: command-list.h:198 msgid "A Git core tutorial for developers" msgstr "Un tutorial Git di base per gli sviluppatori" -#: command-list.h:198 +#: command-list.h:199 msgid "Git for CVS users" msgstr "Git per utenti CVS" -#: command-list.h:199 +#: command-list.h:200 msgid "Tweaking diff output" msgstr "Messa a punto dell'output di diff" -#: command-list.h:200 +#: command-list.h:201 msgid "A useful minimum set of commands for Everyday Git" msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git" -#: command-list.h:201 +#: command-list.h:202 msgid "A Git Glossary" msgstr "Un glossario di Git" -#: command-list.h:202 +#: command-list.h:203 msgid "Hooks used by Git" msgstr "Hook usati da Git" -#: command-list.h:203 +#: command-list.h:204 msgid "Specifies intentionally untracked files to ignore" msgstr "Specifica i file intenzionalmente non tracciati da ignorare" -#: command-list.h:204 +#: command-list.h:205 msgid "Defining submodule properties" msgstr "Definizione proprietà sottomodulo" -#: command-list.h:205 +#: command-list.h:206 msgid "Git namespaces" msgstr "Spazi dei nomi Git" -#: command-list.h:206 +#: command-list.h:207 msgid "Git Repository Layout" msgstr "Struttura repository Git" -#: command-list.h:207 +#: command-list.h:208 msgid "Specifying revisions and ranges for Git" msgstr "Come specificare revisioni e intervalli in Git" -#: command-list.h:208 +#: command-list.h:209 +msgid "Mounting one repository inside another" +msgstr "Monto un repository dentro un altro" + +#: command-list.h:210 msgid "A tutorial introduction to Git: part two" msgstr "Un tutorial introduttivo per Git: seconda parte" -#: command-list.h:209 +#: command-list.h:211 msgid "A tutorial introduction to Git" msgstr "Un tutorial introduttivo per Git" -#: command-list.h:210 +#: command-list.h:212 msgid "An overview of recommended workflows with Git" msgstr "Una panoramica dei flussi di lavoro raccomandati in Git" @@ -22423,144 +23663,133 @@ msgstr "Provo un merge semplice con $pretty_name" msgid "Simple merge did not work, trying automatic merge." msgstr "Il merge semplice non ha funzionato, provo il merge automatico." -#: git-legacy-stash.sh:220 +#: git-legacy-stash.sh:221 msgid "Cannot remove temporary index (can't happen)" msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)" -#: git-legacy-stash.sh:271 +#: git-legacy-stash.sh:272 #, sh-format msgid "Cannot update $ref_stash with $w_commit" msgstr "Impossibile aggiornare $ref_stash con $w_commit" -#: git-legacy-stash.sh:323 +#: git-legacy-stash.sh:324 #, sh-format msgid "error: unknown option for 'stash push': $option" msgstr "errore: opzione sconosciuta per 'stash push': $option" -#: git-legacy-stash.sh:355 +#: git-legacy-stash.sh:356 #, sh-format msgid "Saved working directory and index state $stash_msg" msgstr "Directory di lavoro e stato indice salvati: $stash_msg" -#: git-legacy-stash.sh:535 +#: git-legacy-stash.sh:536 #, sh-format msgid "unknown option: $opt" msgstr "opzione sconosciuta: $opt" -#: git-legacy-stash.sh:555 +#: git-legacy-stash.sh:556 #, sh-format msgid "Too many revisions specified: $REV" msgstr "Troppe revisioni specificate: $REV" -#: git-legacy-stash.sh:570 +#: git-legacy-stash.sh:571 #, sh-format msgid "$reference is not a valid reference" msgstr "$reference non è un riferimento valido" -#: git-legacy-stash.sh:598 +#: git-legacy-stash.sh:599 #, sh-format msgid "'$args' is not a stash-like commit" msgstr "'$args' non è un commit di tipo stash" -#: git-legacy-stash.sh:609 +#: git-legacy-stash.sh:610 #, sh-format msgid "'$args' is not a stash reference" msgstr "'$args' non è un riferimento a uno stash" -#: git-legacy-stash.sh:617 +#: git-legacy-stash.sh:618 msgid "unable to refresh index" msgstr "impossibile aggiornare l'indice" -#: git-legacy-stash.sh:621 +#: git-legacy-stash.sh:622 msgid "Cannot apply a stash in the middle of a merge" msgstr "Impossibile applicare uno stash nel mezzo di un merge" -#: git-legacy-stash.sh:629 +#: git-legacy-stash.sh:630 msgid "Conflicts in index. Try without --index." msgstr "Ci sono conflitti in index. Prova senza --index." -#: git-legacy-stash.sh:631 +#: git-legacy-stash.sh:632 msgid "Could not save index tree" msgstr "Non è stato possibile salvare l'albero indice" -#: git-legacy-stash.sh:640 +#: git-legacy-stash.sh:641 msgid "Could not restore untracked files from stash entry" msgstr "" "Non è stato possibile ripristinare i file non tracciati dalla voce stash" -#: git-legacy-stash.sh:665 +#: git-legacy-stash.sh:666 msgid "Cannot unstage modified files" msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging" -#: git-legacy-stash.sh:703 +#: git-legacy-stash.sh:704 #, sh-format msgid "Dropped ${REV} ($s)" msgstr "${REV} eliminata ($s)" -#: git-legacy-stash.sh:704 +#: git-legacy-stash.sh:705 #, sh-format msgid "${REV}: Could not drop stash entry" msgstr "${REV}: non è stato possibile rimuovere la voce di stash" -#: git-legacy-stash.sh:791 +#: git-legacy-stash.sh:792 msgid "(To restore them type \"git stash apply\")" msgstr "(Per ripristinarli digita \"git stash apply\")" -#: git-submodule.sh:200 +#: git-submodule.sh:203 msgid "Relative path can only be used from the toplevel of the working tree" msgstr "" "Il percorso relativo può essere usato solo dal primo livello dell'albero di " "lavoro" -#: git-submodule.sh:210 +#: git-submodule.sh:213 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../" -#: git-submodule.sh:229 +#: git-submodule.sh:232 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' esiste già nell'indice" -#: git-submodule.sh:232 +#: git-submodule.sh:235 #, sh-format msgid "'$sm_path' already exists in the index and is not a submodule" msgstr "'$sm_path' esiste già nell'indice e non è un sottomodulo" -#: git-submodule.sh:239 +#: git-submodule.sh:242 #, sh-format msgid "'$sm_path' does not have a commit checked out" msgstr "'$sm_path' non ha un commit di cui è stato eseguito il checkout" -#: git-submodule.sh:245 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$sm_path\n" -"Use -f if you really want to add it." -msgstr "" -"Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n" -"$sm_path\n" -"Usa -f se vuoi davvero aggiungerlo." - -#: git-submodule.sh:268 +#: git-submodule.sh:273 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Aggiunta del repository esistente in '$sm_path' all'indice" -#: git-submodule.sh:270 +#: git-submodule.sh:275 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' esiste già e non è un repository Git valido" -#: git-submodule.sh:278 +#: git-submodule.sh:283 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" "È stata trovata localmente una directory Git per '$sm_name' con i seguenti " "remoti:" -#: git-submodule.sh:280 +#: git-submodule.sh:285 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from\n" @@ -22577,39 +23806,39 @@ msgstr "" "altro\n" "nome con l'opzione '--name'." -#: git-submodule.sh:286 +#: git-submodule.sh:291 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'." -#: git-submodule.sh:298 +#: git-submodule.sh:303 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'" -#: git-submodule.sh:303 +#: git-submodule.sh:308 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:312 +#: git-submodule.sh:317 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registrazione del sottomodulo '$sm_path' non riuscita" -#: git-submodule.sh:573 +#: git-submodule.sh:590 #, sh-format msgid "Unable to find current revision in submodule path '$displaypath'" msgstr "" "Impossibile trovare la revisione corrente nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:583 +#: git-submodule.sh:600 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'" -#: git-submodule.sh:588 +#: git-submodule.sh:605 #, sh-format msgid "" "Unable to find current ${remote_name}/${branch} revision in submodule path " @@ -22618,7 +23847,7 @@ msgstr "" "Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel " "percorso del sottomodulo '$sm_path'" -#: git-submodule.sh:606 +#: git-submodule.sh:623 #, sh-format msgid "" "Unable to fetch in submodule path '$displaypath'; trying to directly fetch " @@ -22627,7 +23856,7 @@ msgstr "" "Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; " "provo a recuperare direttamente $sha1:" -#: git-submodule.sh:612 +#: git-submodule.sh:629 #, sh-format msgid "" "Fetched in submodule path '$displaypath', but it did not contain $sha1. " @@ -22636,79 +23865,79 @@ msgstr "" "Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva " "$sha1. Fetch diretto di tale commit non riuscito." -#: git-submodule.sh:619 +#: git-submodule.sh:636 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:620 +#: git-submodule.sh:637 #, sh-format msgid "Submodule path '$displaypath': checked out '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'" -#: git-submodule.sh:624 +#: git-submodule.sh:641 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:625 +#: git-submodule.sh:642 #, sh-format msgid "Submodule path '$displaypath': rebased into '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'" -#: git-submodule.sh:630 +#: git-submodule.sh:647 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$displaypath'" msgstr "" "Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:631 +#: git-submodule.sh:648 #, sh-format msgid "Submodule path '$displaypath': merged in '$sha1'" msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'" -#: git-submodule.sh:636 +#: git-submodule.sh:653 #, sh-format msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'" msgstr "" "Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo " "'$displaypath'" -#: git-submodule.sh:637 +#: git-submodule.sh:654 #, sh-format msgid "Submodule path '$displaypath': '$command $sha1'" msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'" -#: git-submodule.sh:668 +#: git-submodule.sh:685 #, sh-format msgid "Failed to recurse into submodule path '$displaypath'" msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita" -#: git-submodule.sh:830 +#: git-submodule.sh:896 msgid "The --cached option cannot be used with the --files option" msgstr "L'opzione --cached non può essere usata con l'opzione --files" -#: git-submodule.sh:882 +#: git-submodule.sh:948 #, sh-format msgid "unexpected mode $mod_dst" msgstr "modalità $mod_dst inattesa" -#: git-submodule.sh:902 +#: git-submodule.sh:968 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_src" msgstr " Attenzione: $display_name non contiene il commit $sha1_src" -#: git-submodule.sh:905 +#: git-submodule.sh:971 #, sh-format msgid " Warn: $display_name doesn't contain commit $sha1_dst" msgstr " Attenzione: $display_name non contiene il commit $sha1_dst" -#: git-submodule.sh:908 +#: git-submodule.sh:974 #, sh-format msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" @@ -23034,6 +24263,10 @@ msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)" msgstr[0] "Rebase di $shortrevisions su $shortonto ($todocount comando)" msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)" +#: git-rebase--preserve-merges.sh:955 +msgid "Note that empty commits are commented out" +msgstr "Nota che i commit vuoti sono commentati" + #: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002 msgid "Could not init rewritten commits" msgstr "Impossibile inizializzare i commit riscritti" @@ -23110,81 +24343,19 @@ msgid "Unable to determine absolute path of git directory" msgstr "Impossibile determinare il percorso assoluto della directory Git" #. TRANSLATORS: you can adjust this to align "git add -i" status menu -#: git-add--interactive.perl:210 +#: git-add--interactive.perl:212 #, perl-format msgid "%12s %12s %s" msgstr "%20s %32s %s" -#: git-add--interactive.perl:211 -msgid "staged" -msgstr "nell'area di staging" - -#: git-add--interactive.perl:211 -msgid "unstaged" -msgstr "rimosso dall'area di staging" - -#: git-add--interactive.perl:267 git-add--interactive.perl:292 -msgid "binary" -msgstr "binario" - -#: git-add--interactive.perl:276 git-add--interactive.perl:330 -msgid "nothing" -msgstr "non fare nulla" - -#: git-add--interactive.perl:312 git-add--interactive.perl:327 -msgid "unchanged" -msgstr "non modificato" - -#: git-add--interactive.perl:623 -#, perl-format -msgid "added %d path\n" -msgid_plural "added %d paths\n" -msgstr[0] "aggiunto %d percorso\n" -msgstr[1] "aggiunti %d percorsi\n" - -#: git-add--interactive.perl:626 -#, perl-format -msgid "updated %d path\n" -msgid_plural "updated %d paths\n" -msgstr[0] "aggiornato %d percorso\n" -msgstr[1] "aggiornati %d percorsi\n" - -#: git-add--interactive.perl:629 -#, perl-format -msgid "reverted %d path\n" -msgid_plural "reverted %d paths\n" -msgstr[0] "ripristinato %d percorso\n" -msgstr[1] "ripristinati %d percorsi\n" - -#: git-add--interactive.perl:632 +#: git-add--interactive.perl:634 #, perl-format msgid "touched %d path\n" msgid_plural "touched %d paths\n" msgstr[0] "eseguito touch su %d percorso\n" msgstr[1] "eseguito touch su %d percorsi\n" -#: git-add--interactive.perl:641 -msgid "Update" -msgstr "Aggiorna" - -#: git-add--interactive.perl:653 -msgid "Revert" -msgstr "Esegui il revert" - -#: git-add--interactive.perl:676 -#, perl-format -msgid "note: %s is untracked now.\n" -msgstr "nota: %s ora non è tracciato.\n" - -#: git-add--interactive.perl:687 -msgid "Add untracked" -msgstr "Aggiungi file non tracciati" - -#: git-add--interactive.perl:693 -msgid "No untracked files.\n" -msgstr "Nessun file non tracciato.\n" - -#: git-add--interactive.perl:1051 +#: git-add--interactive.perl:1053 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for staging." @@ -23192,7 +24363,7 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per l'aggiunta all'area di staging." -#: git-add--interactive.perl:1054 +#: git-add--interactive.perl:1056 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for stashing." @@ -23200,7 +24371,7 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per lo stash." -#: git-add--interactive.perl:1057 +#: git-add--interactive.perl:1059 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for unstaging." @@ -23208,8 +24379,8 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per la rimozione dall'area di staging." -#: git-add--interactive.perl:1060 git-add--interactive.perl:1069 -#: git-add--interactive.perl:1075 +#: git-add--interactive.perl:1062 git-add--interactive.perl:1071 +#: git-add--interactive.perl:1077 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for applying." @@ -23217,8 +24388,8 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per l'applicazione." -#: git-add--interactive.perl:1063 git-add--interactive.perl:1066 -#: git-add--interactive.perl:1072 +#: git-add--interactive.perl:1065 git-add--interactive.perl:1068 +#: git-add--interactive.perl:1074 msgid "" "If the patch applies cleanly, the edited hunk will immediately be\n" "marked for discarding." @@ -23226,18 +24397,12 @@ msgstr "" "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" "contrassegnato immediatamente per la rimozione." -#: git-add--interactive.perl:1109 +#: git-add--interactive.perl:1111 #, perl-format msgid "failed to open hunk edit file for writing: %s" msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s" -#: git-add--interactive.perl:1110 -msgid "Manual hunk edit mode -- see bottom for a quick guide.\n" -msgstr "" -"Modalità manuale modifica hunt - vedi la fine del file per una guida " -"veloce.\n" - -#: git-add--interactive.perl:1116 +#: git-add--interactive.perl:1118 #, perl-format msgid "" "---\n" @@ -23250,36 +24415,12 @@ msgstr "" "Per rimuovere '%s' righe, eliminale.\n" "Le righe che iniziano con %s saranno rimosse.\n" -#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages. -#: git-add--interactive.perl:1124 -msgid "" -"If it does not apply cleanly, you will be given an opportunity to\n" -"edit again. If all lines of the hunk are removed, then the edit is\n" -"aborted and the hunk is left unchanged.\n" -msgstr "" -"Se non può essere applicata senza problemi, ti sarà data la possibilità\n" -"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n" -"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n" - -#: git-add--interactive.perl:1138 +#: git-add--interactive.perl:1140 #, perl-format msgid "failed to open hunk edit file for reading: %s" msgstr "apertura del file di modifica hunk in lettura non riuscita: %s" -#. TRANSLATORS: do not translate [y/n] -#. The program will only accept that input -#. at this point. -#. Consider translating (saying "no" discards!) as -#. (saying "n" for "no" discards!) if the translation -#. of the word "no" does not start with n. -#: git-add--interactive.perl:1237 -msgid "" -"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? " -msgstr "" -"L'hunk modificato non può essere applicato senza problemi. Modificarlo di " -"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? " - -#: git-add--interactive.perl:1246 +#: git-add--interactive.perl:1248 msgid "" "y - stage this hunk\n" "n - do not stage this hunk\n" @@ -23296,7 +24437,7 @@ msgstr "" "d - non aggiungere né quest'hunk né quelli successivi nel file all'area di " "staging" -#: git-add--interactive.perl:1252 +#: git-add--interactive.perl:1254 msgid "" "y - stash this hunk\n" "n - do not stash this hunk\n" @@ -23310,7 +24451,7 @@ msgstr "" "a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n" "d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file" -#: git-add--interactive.perl:1258 +#: git-add--interactive.perl:1260 msgid "" "y - unstage this hunk\n" "n - do not unstage this hunk\n" @@ -23327,7 +24468,7 @@ msgstr "" "d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di " "staging" -#: git-add--interactive.perl:1264 +#: git-add--interactive.perl:1266 msgid "" "y - apply this hunk to index\n" "n - do not apply this hunk to index\n" @@ -23341,7 +24482,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1270 git-add--interactive.perl:1288 +#: git-add--interactive.perl:1272 git-add--interactive.perl:1290 msgid "" "y - discard this hunk from worktree\n" "n - do not discard this hunk from worktree\n" @@ -23355,7 +24496,7 @@ msgstr "" "a - rimuovi quest'hunk e tutti quelli successivi nel file\n" "d - non rimuovere né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1276 +#: git-add--interactive.perl:1278 msgid "" "y - discard this hunk from index and worktree\n" "n - do not discard this hunk from index and worktree\n" @@ -23369,7 +24510,7 @@ msgstr "" "a - rimuovi quest'hunk e tutti quelli successivi nel file\n" "d - non rimuovere né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1282 +#: git-add--interactive.perl:1284 msgid "" "y - apply this hunk to index and worktree\n" "n - do not apply this hunk to index and worktree\n" @@ -23383,7 +24524,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1294 +#: git-add--interactive.perl:1296 msgid "" "y - apply this hunk to worktree\n" "n - do not apply this hunk to worktree\n" @@ -23397,7 +24538,7 @@ msgstr "" "a - applica quest'hunk e tutti quelli successivi nel file\n" "d - non applicare né quest'hunk né quelli successivi nel file" -#: git-add--interactive.perl:1309 +#: git-add--interactive.perl:1311 msgid "" "g - select a hunk to go to\n" "/ - search for a hunk matching the given regex\n" @@ -23421,234 +24562,85 @@ msgstr "" "e - modifica manualmente l'hunk corrente\n" "? - stampa una guida\n" -#: git-add--interactive.perl:1340 +#: git-add--interactive.perl:1342 msgid "The selected hunks do not apply to the index!\n" msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n" -#: git-add--interactive.perl:1341 -msgid "Apply them to the worktree anyway? " -msgstr "Vuoi comunque applicarli all'albero di lavoro? " - -#: git-add--interactive.perl:1344 -msgid "Nothing was applied.\n" -msgstr "Non è stato applicato nulla.\n" - -#: git-add--interactive.perl:1355 +#: git-add--interactive.perl:1357 #, perl-format msgid "ignoring unmerged: %s\n" msgstr "ignoro ciò che non è stato sottoposto a merge: %s\n" -#: git-add--interactive.perl:1364 -msgid "Only binary files changed.\n" -msgstr "Sono stati modificati solo file binari.\n" - -#: git-add--interactive.perl:1366 -msgid "No changes.\n" -msgstr "Nessuna modifica.\n" - -#: git-add--interactive.perl:1374 -msgid "Patch update" -msgstr "Aggiornamento patch" - -#: git-add--interactive.perl:1426 -#, perl-format -msgid "Stage mode change [y,n,q,a,d%s,?]? " -msgstr "Modifica modo stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1427 -#, perl-format -msgid "Stage deletion [y,n,q,a,d%s,?]? " -msgstr "Eliminazione stage [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1428 -#, perl-format -msgid "Stage this hunk [y,n,q,a,d%s,?]? " -msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1431 -#, perl-format -msgid "Stash mode change [y,n,q,a,d%s,?]? " -msgstr "Modifica modo stash [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1432 -#, perl-format -msgid "Stash deletion [y,n,q,a,d%s,?]? " -msgstr "Eliminazione stash [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1433 -#, perl-format -msgid "Stash this hunk [y,n,q,a,d%s,?]? " -msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1436 -#, perl-format -msgid "Unstage mode change [y,n,q,a,d%s,?]? " -msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1437 -#, perl-format -msgid "Unstage deletion [y,n,q,a,d%s,?]? " -msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1438 -#, perl-format -msgid "Unstage this hunk [y,n,q,a,d%s,?]? " -msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1441 -#, perl-format -msgid "Apply mode change to index [y,n,q,a,d%s,?]? " -msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1442 -#, perl-format -msgid "Apply deletion to index [y,n,q,a,d%s,?]? " -msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1443 -#, perl-format -msgid "Apply this hunk to index [y,n,q,a,d%s,?]? " -msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1446 git-add--interactive.perl:1461 -#, perl-format -msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1447 git-add--interactive.perl:1462 -#, perl-format -msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1448 git-add--interactive.perl:1463 -#, perl-format -msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? " -msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1451 -#, perl-format -msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d" -"%s,?]? " - -#: git-add--interactive.perl:1452 -#, perl-format -msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1453 -#, perl-format -msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1456 -#, perl-format -msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d" -"%s,?]? " - -#: git-add--interactive.perl:1457 -#, perl-format -msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1458 -#, perl-format -msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? " -msgstr "" -"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? " - -#: git-add--interactive.perl:1466 +#: git-add--interactive.perl:1468 #, perl-format msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1467 +#: git-add--interactive.perl:1469 #, perl-format msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1468 +#: git-add--interactive.perl:1470 #, perl-format msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? " msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? " -#: git-add--interactive.perl:1568 +#: git-add--interactive.perl:1570 msgid "No other hunks to goto\n" msgstr "Nessun altro hunk a cui andare\n" -#: git-add--interactive.perl:1575 -msgid "go to which hunk (<ret> to see more)? " -msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? " - -#: git-add--interactive.perl:1577 -msgid "go to which hunk? " -msgstr "a quale hunk desideri andare? " - -#: git-add--interactive.perl:1586 +#: git-add--interactive.perl:1588 #, perl-format msgid "Invalid number: '%s'\n" msgstr "Numero non valido: '%s'\n" -#: git-add--interactive.perl:1591 +#: git-add--interactive.perl:1593 #, perl-format msgid "Sorry, only %d hunk available.\n" msgid_plural "Sorry, only %d hunks available.\n" msgstr[0] "Mi dispiace, è disponibile solo %d hunk.\n" msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n" -#: git-add--interactive.perl:1617 +#: git-add--interactive.perl:1619 msgid "No other hunks to search\n" msgstr "Nessun altro hunk in cui ricercare\n" -#: git-add--interactive.perl:1621 -msgid "search for regex? " -msgstr "cercare un'espressione regolare? " - -#: git-add--interactive.perl:1634 +#: git-add--interactive.perl:1636 #, perl-format msgid "Malformed search regexp %s: %s\n" msgstr "Espressione regolare di ricerca %s malformata: %s\n" -#: git-add--interactive.perl:1644 +#: git-add--interactive.perl:1646 msgid "No hunk matches the given pattern\n" msgstr "Nessun hunk corrisponde al pattern fornito\n" -#: git-add--interactive.perl:1656 git-add--interactive.perl:1678 +#: git-add--interactive.perl:1658 git-add--interactive.perl:1680 msgid "No previous hunk\n" msgstr "Nessun hunk precedente\n" -#: git-add--interactive.perl:1665 git-add--interactive.perl:1684 +#: git-add--interactive.perl:1667 git-add--interactive.perl:1686 msgid "No next hunk\n" msgstr "Nessun hunk successivo\n" -#: git-add--interactive.perl:1690 +#: git-add--interactive.perl:1692 msgid "Sorry, cannot split this hunk\n" msgstr "Mi dispiace, non posso suddividere quest'hunk\n" -#: git-add--interactive.perl:1696 +#: git-add--interactive.perl:1698 #, perl-format msgid "Split into %d hunk.\n" msgid_plural "Split into %d hunks.\n" msgstr[0] "Suddiviso in %d hunk.\n" msgstr[1] "Suddiviso in %d hunk.\n" -#: git-add--interactive.perl:1706 +#: git-add--interactive.perl:1708 msgid "Sorry, cannot edit this hunk\n" msgstr "Mi dispiace, non posso modificare quest'hunk\n" -#: git-add--interactive.perl:1752 -msgid "Review diff" -msgstr "Rivedi diff" - #. TRANSLATORS: please do not translate the command names #. 'status', 'update', 'revert', etc. -#: git-add--interactive.perl:1771 +#: git-add--interactive.perl:1773 msgid "" "status - show paths with changes\n" "update - add working tree state to the staged set of changes\n" @@ -23668,19 +24660,19 @@ msgstr "" "add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n" " modifiche nell'area di staging\n" -#: git-add--interactive.perl:1788 git-add--interactive.perl:1793 -#: git-add--interactive.perl:1796 git-add--interactive.perl:1803 -#: git-add--interactive.perl:1806 git-add--interactive.perl:1813 -#: git-add--interactive.perl:1817 git-add--interactive.perl:1823 +#: git-add--interactive.perl:1790 git-add--interactive.perl:1795 +#: git-add--interactive.perl:1798 git-add--interactive.perl:1805 +#: git-add--interactive.perl:1808 git-add--interactive.perl:1815 +#: git-add--interactive.perl:1819 git-add--interactive.perl:1825 msgid "missing --" msgstr "-- mancante" -#: git-add--interactive.perl:1819 +#: git-add--interactive.perl:1821 #, perl-format msgid "unknown --patch mode: %s" msgstr "modalità --patch sconosciuta: %s" -#: git-add--interactive.perl:1825 git-add--interactive.perl:1831 +#: git-add--interactive.perl:1827 git-add--interactive.perl:1833 #, perl-format msgid "invalid argument %s, expecting --" msgstr "argomento %s non valido, atteso --" @@ -24060,6 +25052,175 @@ msgstr "Salto %s con il suffisso di backup '%s'.\n" msgid "Do you really want to send %s? [y|N]: " msgstr "Inviare %s? [y|N]: " +#~ msgid "{drop,keep,ask}" +#~ msgstr "{drop,keep,ask}" + +#, c-format +#~ msgid "Stage mode change [y,n,a,q,d%s,?]? " +#~ msgstr "Modifica modo stage [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage deletion [y,n,a,q,d%s,?]? " +#~ msgstr "Eliminazione stage [y,n,a,q,d%s,?]? " + +#, c-format +#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? " +#~ msgstr "Eseguire lo stage di quest'hunk [y,n,a,q,d%s,?]? " + +#~ msgid "" +#~ "If the patch applies cleanly, the edited hunk will immediately be\n" +#~ "marked for staging.\n" +#~ msgstr "" +#~ "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n" +#~ "contrassegnato immediatamente per l'aggiunta all'area di staging.\n" + +#~ msgid "" +#~ "y - stage this hunk\n" +#~ "n - do not stage this hunk\n" +#~ "q - quit; do not stage this hunk or any of the remaining ones\n" +#~ "a - stage this and all the remaining hunks\n" +#~ "d - do not stage this hunk nor any of the remaining hunks\n" +#~ msgstr "" +#~ "y - aggiungi quest'hunk all'area di staging\n" +#~ "n - non aggiungere quest'hunk all'area di staging\n" +#~ "q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di " +#~ "staging\n" +#~ "a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di " +#~ "staging\n" +#~ "d - non aggiungere né quest'hunk né quelli successivi nel file all'area " +#~ "di staging\n" + +#, c-format +#~ msgid "could not copy '%s' to '%s'." +#~ msgstr "impossibile copiare '%s' in '%s'." + +#~ msgid "malformed ident line" +#~ msgstr "riga ident malformata" + +#~ msgid "corrupted author without date information" +#~ msgstr "informazioni sull'autore corrotte (senza data)" + +#, c-format +#~ msgid "could not parse '%.*s'" +#~ msgstr "impossibile analizzare '%.*s'" + +#, c-format +#~ msgid "could not checkout %s" +#~ msgstr "impossibile eseguire il checkout di %s" + +#, c-format +#~ msgid "filename in tree entry contains backslash: '%s'" +#~ msgstr "il nome file nella voce albero contiene una barra rovesciata: '%s'" + +#, c-format +#~ msgid "Use -f if you really want to add them.\n" +#~ msgstr "Usa -f se vuoi davvero aggiungerli.\n" + +#, c-format +#~ msgid "Maybe you wanted to say 'git add .'?\n" +#~ msgstr "Forse intendevi dire 'git add .'?\n" + +#, c-format +#~ msgid "packfile is invalid: %s" +#~ msgstr "packfile non valido: %s" + +#, c-format +#~ msgid "unable to open packfile for reuse: %s" +#~ msgstr "impossibile aprire il packfile per il suo riuso: %s" + +#~ msgid "unable to seek in reused packfile" +#~ msgstr "impossibile eseguire seek nel packfile riusato" + +#~ msgid "unable to read from reused packfile" +#~ msgstr "impossibile leggere dal packfile riusato" + +#~ msgid "no HEAD?" +#~ msgstr "nessun'HEAD?" + +#~ msgid "make committer date match author date" +#~ msgstr "" +#~ "fai corrispondere la data della persona che ha eseguito il commit alla " +#~ "data autore" + +#~ msgid "ignore author date and use current date" +#~ msgstr "ignora la data autore e usa la data corrente" + +#~ msgid "synonym of --reset-author-date" +#~ msgstr "sinonimo di --reset-author-date" + +#~ msgid "ignore changes in whitespace" +#~ msgstr "ignora modifiche agli spazi bianchi" + +#~ msgid "preserve empty commits during rebase" +#~ msgstr "mantieni i commit vuoti durante il rebase" + +#~ msgid "cannot combine --use-bitmap-index with object filtering" +#~ msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti" + +#, sh-format +#~ msgid "" +#~ "The following path is ignored by one of your .gitignore files:\n" +#~ "$sm_path\n" +#~ "Use -f if you really want to add it." +#~ msgstr "" +#~ "Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n" +#~ "$sm_path\n" +#~ "Usa -f se vuoi davvero aggiungerlo." + +#, c-format +#~ msgid "unable to get tree for %s" +#~ msgstr "impossibile recuperare l'albero per %s" + +#~ msgid "Use an experimental heuristic to improve diffs" +#~ msgstr "Usa un'euristica sperimentale per migliorare i diff" + +#~ msgid "git commit-graph [--object-dir <objdir>]" +#~ msgstr "git commit-graph [--object-dir <directory oggetti>]" + +#~ msgid "git commit-graph read [--object-dir <objdir>]" +#~ msgstr "git commit-graph read [--object-dir <directory oggetti>]" + +#, c-format +#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value" +#~ msgstr "" +#~ "valore core.untrackedCache '%s' non valido; utilizzerò il valore " +#~ "predefinito 'keep'" + +#~ msgid "cannot change partial clone promisor remote" +#~ msgstr "impossibile modificare il remoto promettente del clone parziale" + +#~ msgid "error building trees" +#~ msgstr "errore durante la costruzione degli alberi" + +#, c-format +#~ msgid "invalid date format '%s' in '%s'" +#~ msgstr "formato data '%s' non valido in '%s'" + +#~ msgid "writing root commit" +#~ msgstr "scrittura commit radice in corso" + +#, c-format +#~ msgid "staged changes in the following files may be lost: %s" +#~ msgstr "" +#~ "le modifiche in stage nei seguenti file potrebbero andare perdute: %s" + +#~ msgid "" +#~ "--filter can only be used with the remote configured in extensions." +#~ "partialClone" +#~ msgstr "" +#~ "--filter può essere usato solo con il remoto configurato nelle estensioni." +#~ "partialClone" + +#~ msgid "verify commit-msg hook" +#~ msgstr "verifica hook commit-msg" + +#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'" +#~ msgstr "impossibile combinare '--rebase-merges' con '--strategy-option'" + +#, c-format +#~ msgid "invalid sparse value '%s'" +#~ msgstr "valore sparse non valido: '%s'" + #~ msgid "" #~ "Fetch normally indicates which branches had a forced update, but that " #~ "check has been disabled." @@ -24133,9 +25294,6 @@ msgstr "Inviare %s? [y|N]: " #~ "impossibile eseguire l'attività in modalità interattiva con lo standard " #~ "input non collegato a un terminale." -#~ msgid "failed to open '%s'" -#~ msgstr "apertura di '%s' non riuscita" - #~ msgid "failed to stat %s\n" #~ msgstr "stat di %s non riuscito\n" |