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
25946 lines
744 KiB
Text
25946 lines
744 KiB
Text
# Swedish translations for Git.
|
|
# Copyright (C) 2010-2020 Peter Krefting <peter@softwolves.pp.se>
|
|
# This file is distributed under the same license as the Git package.
|
|
# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020.
|
|
#
|
|
msgid ""
|
|
msgstr ""
|
|
"Project-Id-Version: git 2.26.0\n"
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
|
"POT-Creation-Date: 2020-03-11 15:26+0800\n"
|
|
"PO-Revision-Date: 2020-03-17 18:30+0100\n"
|
|
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
|
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
|
"Language: sv\n"
|
|
"MIME-Version: 1.0\n"
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
|
"X-Generator: Gtranslator 2.91.7\n"
|
|
|
|
#: add-interactive.c:368
|
|
#, c-format
|
|
msgid "Huh (%s)?"
|
|
msgstr "Vadå (%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 "kunde inte läsa indexet"
|
|
|
|
#: add-interactive.c:576 git-add--interactive.perl:269
|
|
#: git-add--interactive.perl:294
|
|
msgid "binary"
|
|
msgstr "binär"
|
|
|
|
#: add-interactive.c:634 git-add--interactive.perl:278
|
|
#: git-add--interactive.perl:332
|
|
msgid "nothing"
|
|
msgstr "ingenting"
|
|
|
|
#: add-interactive.c:635 git-add--interactive.perl:314
|
|
#: git-add--interactive.perl:329
|
|
msgid "unchanged"
|
|
msgstr "oändrad"
|
|
|
|
#: add-interactive.c:672 git-add--interactive.perl:643
|
|
msgid "Update"
|
|
msgstr "Uppdatera"
|
|
|
|
#: add-interactive.c:689 add-interactive.c:877
|
|
#, c-format
|
|
msgid "could not stage '%s'"
|
|
msgstr "kunde inte köa \"%s\""
|
|
|
|
#: add-interactive.c:695 add-interactive.c:884 sequencer.c:3317
|
|
#: builtin/rebase.c:899
|
|
msgid "could not write index"
|
|
msgstr "kunde inte skriva indexet"
|
|
|
|
#: 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] "uppdaterade %d sökväg\n"
|
|
msgstr[1] "uppdaterade %d sökvägar\n"
|
|
|
|
#: add-interactive.c:716 git-add--interactive.perl:678
|
|
#, c-format, perl-format
|
|
msgid "note: %s is untracked now.\n"
|
|
msgstr "observera: %s spåras inte längre.\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 misslyckades för sökvägen \"%s\""
|
|
|
|
#: add-interactive.c:751 git-add--interactive.perl:655
|
|
msgid "Revert"
|
|
msgstr "Återställ"
|
|
|
|
#: add-interactive.c:767
|
|
msgid "Could not parse HEAD^{tree}"
|
|
msgstr "kunde inte tolka 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] "återställde %d sökväg\n"
|
|
msgstr[1] "återställde %d sökvägar\n"
|
|
|
|
#: add-interactive.c:856 git-add--interactive.perl:695
|
|
#, c-format
|
|
msgid "No untracked files.\n"
|
|
msgstr "Inga ospårade filer.\n"
|
|
|
|
#: add-interactive.c:860 git-add--interactive.perl:689
|
|
msgid "Add untracked"
|
|
msgstr "Lägg till ospårad"
|
|
|
|
#: 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] "lade till %d sökväg\n"
|
|
msgstr[1] "lade till %d sökvägar\n"
|
|
|
|
#: add-interactive.c:917
|
|
#, c-format
|
|
msgid "ignoring unmerged: %s"
|
|
msgstr "ignorerar ej sammanslagen: %s"
|
|
|
|
#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
|
|
#, c-format
|
|
msgid "Only binary files changed.\n"
|
|
msgstr "Endast binära filer ändrade.\n"
|
|
|
|
#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
|
|
#, c-format
|
|
msgid "No changes.\n"
|
|
msgstr "Inga ändringar.\n"
|
|
|
|
#: add-interactive.c:935 git-add--interactive.perl:1376
|
|
msgid "Patch update"
|
|
msgstr "Uppdatera patch"
|
|
|
|
#: add-interactive.c:974 git-add--interactive.perl:1754
|
|
msgid "Review diff"
|
|
msgstr "Granska diff"
|
|
|
|
#: add-interactive.c:1002
|
|
msgid "show paths with changes"
|
|
msgstr "visa sökvägar med ändringar"
|
|
|
|
#: add-interactive.c:1004
|
|
msgid "add working tree state to the staged set of changes"
|
|
msgstr "lägg arbetskatalogens tillstånd till köade ändringar"
|
|
|
|
#: add-interactive.c:1006
|
|
msgid "revert staged set of changes back to the HEAD version"
|
|
msgstr "återställ köade ändringar tillbaka till HEAD-versionen"
|
|
|
|
#: add-interactive.c:1008
|
|
msgid "pick hunks and update selectively"
|
|
msgstr "välj stycken och uppdatera selektivt"
|
|
|
|
#: add-interactive.c:1010
|
|
msgid "view diff between HEAD and index"
|
|
msgstr "visa skillnad mellan HEAD och index"
|
|
|
|
#: add-interactive.c:1012
|
|
msgid "add contents of untracked files to the staged set of changes"
|
|
msgstr "lägg innehåll i ospårade filer till köade ändringar"
|
|
|
|
#: add-interactive.c:1020 add-interactive.c:1069
|
|
msgid "Prompt help:"
|
|
msgstr "Kommandoradshjälp:"
|
|
|
|
#: add-interactive.c:1022
|
|
msgid "select a single item"
|
|
msgstr "markera en post"
|
|
|
|
#: add-interactive.c:1024
|
|
msgid "select a range of items"
|
|
msgstr "markera intervall av poster"
|
|
|
|
#: add-interactive.c:1026
|
|
msgid "select multiple ranges"
|
|
msgstr "markera flera intervall"
|
|
|
|
#: add-interactive.c:1028 add-interactive.c:1073
|
|
msgid "select item based on unique prefix"
|
|
msgstr "markera post baserad på unikt prefix"
|
|
|
|
#: add-interactive.c:1030
|
|
msgid "unselect specified items"
|
|
msgstr "avmarkera angivna poster"
|
|
|
|
#: add-interactive.c:1032
|
|
msgid "choose all items"
|
|
msgstr "välj alla poster"
|
|
|
|
#: add-interactive.c:1034
|
|
msgid "(empty) finish selecting"
|
|
msgstr "(tomt) avsluta markering"
|
|
|
|
#: add-interactive.c:1071
|
|
msgid "select a numbered item"
|
|
msgstr "markera en numrerad post"
|
|
|
|
#: add-interactive.c:1075
|
|
msgid "(empty) select nothing"
|
|
msgstr "(tomt) markera ingenting"
|
|
|
|
#: add-interactive.c:1083 builtin/clean.c:822 git-add--interactive.perl:1851
|
|
msgid "*** Commands ***"
|
|
msgstr "*** Kommandon ***"
|
|
|
|
#: add-interactive.c:1084 builtin/clean.c:823 git-add--interactive.perl:1848
|
|
msgid "What now"
|
|
msgstr "Vad nu"
|
|
|
|
#: add-interactive.c:1136 git-add--interactive.perl:213
|
|
msgid "staged"
|
|
msgstr "köad"
|
|
|
|
#: add-interactive.c:1136 git-add--interactive.perl:213
|
|
msgid "unstaged"
|
|
msgstr "ej köad"
|
|
|
|
#: 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 "sökväg"
|
|
|
|
#: add-interactive.c:1143
|
|
msgid "could not refresh index"
|
|
msgstr "kunde inte uppdatera indexet"
|
|
|
|
#: add-interactive.c:1157 builtin/clean.c:787 git-add--interactive.perl:1765
|
|
#, c-format
|
|
msgid "Bye.\n"
|
|
msgstr "Hej då.\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 "Köa ändrat läge [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 "Köa borttagning [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 "Köa stycket [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 ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att köas "
|
|
"omedelbart."
|
|
|
|
#: 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 - köa stycket\n"
|
|
"n - köa inte stycket\n"
|
|
"q - avsluta; köa inte stycket eller något av de följande\n"
|
|
"a - köa stycket och alla följande i filen\n"
|
|
"d - köa inte stycket eller något av de följande i filen\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 "Stash:a ändrat läge [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 "Stash:a borttagning [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 "Stash:a stycket [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 ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
|
|
"i \"stash\" omedelbart."
|
|
|
|
#: 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 - \"stash\":a stycket\n"
|
|
"n - \"stash\":a inte stycket\n"
|
|
"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
|
|
"a - \"stash\":a stycket och alla följande i filen\n"
|
|
"d - \"stash\":a inte stycket eller något av de följande i filen\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 "Ta bort ändrat läge från kön [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 "Ta bort borttagning från kön [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 "Ta bort stycket från kön [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 ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
|
|
"från kön omedelbart."
|
|
|
|
#: 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 - ta bort stycket från kön\n"
|
|
"n - ta inte bort stycket från kön\n"
|
|
"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
|
|
"a - ta bort stycket och alla följande i filen från kön\n"
|
|
"d - ta inte bort stycket eller något av de följande i filen från kön\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 "Applicera ändrat läge på indexet [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 "Applicera borttagning på indexet [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 "Applicera stycket på indexet [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 ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
|
|
"för applicering omedelbart."
|
|
|
|
#: 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 - applicera stycket på indexet\n"
|
|
"n - applicera inte stycket på indexet\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen\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 "Kasta ändrat läge från arbetskatalogen [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 "Kasta borttagning från arbetskatalogen [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 "Kasta stycket från arbetskatalogen [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 ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
|
|
"för kasta omedelbart."
|
|
|
|
#: 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 - förkasta stycket från arbetskatalogen\n"
|
|
"n - förkasta inte stycket från arbetskatalogen\n"
|
|
"q - avsluta; förkasta inte stycket eller något av de följande\n"
|
|
"a - förkasta stycket och alla följande i filen\n"
|
|
"d - förkasta inte stycket eller något av de följande i filen\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 "Kasta ändrat läge från indexet och arbetskatalogen [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 "Kasta borttagning från indexet och arbetskatalogen [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 "Kasta stycket från indexet och arbetskatalogen [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 - förkasta stycket från indexet och arbetskatalogen\n"
|
|
"n - förkasta inte stycket från indexet och arbetskatalogen\n"
|
|
"q - avsluta; förkasta inte stycket eller något av de följande\n"
|
|
"a - förkasta stycket och alla följande i filen\n"
|
|
"d - förkasta inte stycket eller något av de följande i filen\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 "Applicera ändrat läge på indexet och arbetskatalogen [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 "Applicera borttagning på indexet och arbetskatalogen [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 "Applicera stycket på indexet och arbetskatalogen [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 - applicera stycket på indexet och arbetskatalogen\n"
|
|
"n - applicera inte stycket på indexet och arbetskatalogen\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen\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 - applicera stycket på arbetskatalogen\n"
|
|
"n - applicera inte stycket på arbetskatalogen\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen\n"
|
|
|
|
#: add-patch.c:318
|
|
#, c-format
|
|
msgid "could not parse hunk header '%.*s'"
|
|
msgstr "kunde inte tolka styckehuvudet \"%.*s\""
|
|
|
|
#: add-patch.c:337 add-patch.c:341
|
|
#, c-format
|
|
msgid "could not parse colored hunk header '%.*s'"
|
|
msgstr "kunde inte tolka färgat styckehuvud \"%.*s\""
|
|
|
|
#: add-patch.c:395
|
|
msgid "could not parse diff"
|
|
msgstr "kunde inte tolka diff"
|
|
|
|
#: add-patch.c:414
|
|
msgid "could not parse colored diff"
|
|
msgstr "kunde inte tolka färgad diff"
|
|
|
|
#: add-patch.c:428
|
|
#, c-format
|
|
msgid "failed to run '%s'"
|
|
msgstr "misslyckades att köra \"%s\""
|
|
|
|
#: add-patch.c:587
|
|
msgid "mismatched output from interactive.diffFilter"
|
|
msgstr "omaka utdata från interactive.diffFilter"
|
|
|
|
#: add-patch.c:588
|
|
msgid ""
|
|
"Your filter must maintain a one-to-one correspondence\n"
|
|
"between its input and output lines."
|
|
msgstr ""
|
|
"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
|
|
"ditt filter."
|
|
|
|
#: add-patch.c:761
|
|
#, c-format
|
|
msgid ""
|
|
"expected context line #%d in\n"
|
|
"%.*s"
|
|
msgstr ""
|
|
"förväntade sammanhangsrad %d i\n"
|
|
"%.*s"
|
|
|
|
#: add-patch.c:776
|
|
#, c-format
|
|
msgid ""
|
|
"hunks do not overlap:\n"
|
|
"%.*s\n"
|
|
"\tdoes not end with:\n"
|
|
"%.*s"
|
|
msgstr ""
|
|
"stycken överlappar inte:\n"
|
|
"%.*s\n"
|
|
"\tavslutas inte med:\n"
|
|
"%.*s"
|
|
|
|
#: add-patch.c:1052 git-add--interactive.perl:1112
|
|
msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
|
|
msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\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"
|
|
"Ta bort \"%c\" rader genom att göra dem \" \"-rader (sammanhang).\n"
|
|
"Ta bort \"%c\" rader genom att radera dem.\n"
|
|
"Rader som börjar med %c kommer att tas bort.\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 ""
|
|
"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n"
|
|
"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
|
|
"redigeringen och stycket lämnas oförändrat.\n"
|
|
|
|
#: add-patch.c:1103
|
|
msgid "could not parse hunk header"
|
|
msgstr "kunde inte tolka styckehuvud"
|
|
|
|
#: add-patch.c:1148
|
|
msgid "'git apply --cached' failed"
|
|
msgstr "\"git apply --cached\" misslyckades"
|
|
|
|
#. 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 ""
|
|
"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
|
|
"[y/n]? "
|
|
|
|
#: add-patch.c:1261
|
|
msgid "The selected hunks do not apply to the index!"
|
|
msgstr "Markerade stycken kan inte appliceras på indexet!"
|
|
|
|
#: add-patch.c:1262 git-add--interactive.perl:1343
|
|
msgid "Apply them to the worktree anyway? "
|
|
msgstr "Applicera dem på arbetskatalogen trots det? "
|
|
|
|
#: add-patch.c:1269 git-add--interactive.perl:1346
|
|
msgid "Nothing was applied.\n"
|
|
msgstr "Ingenting applicerades.\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 - lämna stycket obestämt, se nästa obestämda stycke\n"
|
|
"J - lämna stycket obestämt, se nästa stycke\n"
|
|
"k - lämna stycket obestämt, se föregående obestämda stycke\n"
|
|
"K - lämna stycket obestämt, se föregående stycke\n"
|
|
"g - välj ett stycke att gå till\n"
|
|
"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"
|
|
"s - dela aktuellt stycke i mindre styckens\n"
|
|
"e - redigera aktuellt stycke manuellt\n"
|
|
"? - visa hjälp\n"
|
|
|
|
#: add-patch.c:1447 add-patch.c:1457
|
|
msgid "No previous hunk"
|
|
msgstr "Inget föregående stycke"
|
|
|
|
#: add-patch.c:1452 add-patch.c:1462
|
|
msgid "No next hunk"
|
|
msgstr "Inget följande stycke"
|
|
|
|
#: add-patch.c:1468
|
|
msgid "No other hunks to goto"
|
|
msgstr "Inga andra stycken att gå till"
|
|
|
|
#: add-patch.c:1479 git-add--interactive.perl:1577
|
|
msgid "go to which hunk (<ret> to see more)? "
|
|
msgstr "gå till vilket stycke (<ret> för att se fler)? "
|
|
|
|
#: add-patch.c:1480 git-add--interactive.perl:1579
|
|
msgid "go to which hunk? "
|
|
msgstr "gå till vilket stycke? "
|
|
|
|
#: add-patch.c:1491
|
|
#, c-format
|
|
msgid "Invalid number: '%s'"
|
|
msgstr "Ogiltigt siffervärde: \"%s\""
|
|
|
|
#: add-patch.c:1496
|
|
#, c-format
|
|
msgid "Sorry, only %d hunk available."
|
|
msgid_plural "Sorry, only %d hunks available."
|
|
msgstr[0] "Beklagar, det finns bara %d stycke."
|
|
msgstr[1] "Beklagar, det finns bara %d stycken."
|
|
|
|
#: add-patch.c:1505
|
|
msgid "No other hunks to search"
|
|
msgstr "Inga andra stycken att söka efter"
|
|
|
|
#: add-patch.c:1511 git-add--interactive.perl:1623
|
|
msgid "search for regex? "
|
|
msgstr "sök efter reguljärt uttryck? "
|
|
|
|
#: add-patch.c:1526
|
|
#, c-format
|
|
msgid "Malformed search regexp %s: %s"
|
|
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s"
|
|
|
|
#: add-patch.c:1543
|
|
msgid "No hunk matches the given pattern"
|
|
msgstr "Inga stycken motsvarar givet mönster"
|
|
|
|
#: add-patch.c:1550
|
|
msgid "Sorry, cannot split this hunk"
|
|
msgstr "Beklagar, kan inte dela stycket"
|
|
|
|
#: add-patch.c:1554
|
|
#, c-format
|
|
msgid "Split into %d hunks."
|
|
msgstr "Dela i %d stycken."
|
|
|
|
#: add-patch.c:1558
|
|
msgid "Sorry, cannot edit this hunk"
|
|
msgstr "Beklagar, kan inte redigera stycket"
|
|
|
|
#: add-patch.c:1609
|
|
msgid "'git apply' failed"
|
|
msgstr "\"git apply\" misslyckades"
|
|
|
|
#: advice.c:115
|
|
#, c-format
|
|
msgid "%shint: %.*s%s\n"
|
|
msgstr "%stips: %.*s%s\n"
|
|
|
|
#: advice.c:168
|
|
msgid "Cherry-picking is not possible because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en cherry-pick eftersom du har filer som inte slagits "
|
|
"samman."
|
|
|
|
#: advice.c:170
|
|
msgid "Committing is not possible because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en incheckning eftersom du har filer som inte slagits "
|
|
"samman."
|
|
|
|
#: advice.c:172
|
|
msgid "Merging is not possible because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en sammanslagning eftersom du har filer som inte slagits "
|
|
"samman."
|
|
|
|
#: advice.c:174
|
|
msgid "Pulling is not possible because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en \"pull\" eftersom du har filer som inte slagits samman."
|
|
|
|
#: advice.c:176
|
|
msgid "Reverting is not possible because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en \"revert\" eftersom du har filer som inte slagits "
|
|
"samman."
|
|
|
|
#: advice.c:178
|
|
#, c-format
|
|
msgid "It is not possible to %s because you have unmerged files."
|
|
msgstr ""
|
|
"Du kan inte utföra en \"%s\" eftersom du har filer som inte slagits samman."
|
|
|
|
#: advice.c: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."
|
|
msgstr ""
|
|
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
|
|
"som lämpligt för att ange lösning och checka in."
|
|
|
|
#: advice.c:194
|
|
msgid "Exiting because of an unresolved conflict."
|
|
msgstr "Avslutar på grund av olöst konflikgt."
|
|
|
|
#: advice.c:199 builtin/merge.c:1335
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
|
|
|
|
#: advice.c:201
|
|
msgid "Please, commit your changes before merging."
|
|
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
|
|
|
|
#: advice.c:202
|
|
msgid "Exiting because of unfinished merge."
|
|
msgstr "Avslutar på grund av ofullbordad sammanslagning."
|
|
|
|
#: advice.c:208
|
|
#, c-format
|
|
msgid ""
|
|
"Note: switching to '%s'.\n"
|
|
"\n"
|
|
"You are in 'detached HEAD' state. You can look around, make experimental\n"
|
|
"changes and commit them, and you can discard any commits you make in this\n"
|
|
"state without impacting any branches by switching back to a branch.\n"
|
|
"\n"
|
|
"If you want to create a new branch to retain commits you create, you may\n"
|
|
"do so (now or later) by using -c with the switch command. Example:\n"
|
|
"\n"
|
|
" git switch -c <new-branch-name>\n"
|
|
"\n"
|
|
"Or undo this operation with:\n"
|
|
"\n"
|
|
" git switch -\n"
|
|
"\n"
|
|
"Turn off this advice by setting config variable advice.detachedHead to "
|
|
"false\n"
|
|
"\n"
|
|
msgstr ""
|
|
"Observera: checkar ut \"%s\".\n"
|
|
"\n"
|
|
"Du har nu ett \"frånkopplat HEAD\". Du kan se dig omkring, experimentera\n"
|
|
"med ändringar och checka in dem, och du kan kasta incheckningar du gör\n"
|
|
"i det här läget utan att det påverkar grenar genom att växla tillbaka\n"
|
|
"till en gren.\n"
|
|
"\n"
|
|
"Om du vill skapa en ny gren för att behålla ändringarna du skapar, kan\n"
|
|
"du göra det (nu eller senare) genom att använda switch-kommandot med -c.\n"
|
|
"Exempel:\n"
|
|
"\n"
|
|
" git switch -c <namn-på-ny-gren>\n"
|
|
"\n"
|
|
"Eller gör den här ändringen ogjord med:\n"
|
|
"\n"
|
|
" git switch -\n"
|
|
"\n"
|
|
"Stäng av den här hjälptexten genom att sätta konfigurationsvariabeln\n"
|
|
"advice.detachedHead till false\n"
|
|
"\n"
|
|
|
|
#: alias.c:50
|
|
msgid "cmdline ends with \\"
|
|
msgstr "kommandorad avslutas med \\"
|
|
|
|
#: alias.c:51
|
|
msgid "unclosed quote"
|
|
msgstr "citat ej stängt"
|
|
|
|
#: apply.c:69
|
|
#, c-format
|
|
msgid "unrecognized whitespace option '%s'"
|
|
msgstr "okänt alternativ för whitespace: \"%s\""
|
|
|
|
#: apply.c:85
|
|
#, c-format
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
|
|
|
|
#: apply.c:135
|
|
msgid "--reject and --3way cannot be used together."
|
|
msgstr "--reject och --3way kan inte användas samtidigt."
|
|
|
|
#: apply.c:137
|
|
msgid "--cached and --3way cannot be used together."
|
|
msgstr "--cached och --3way kan inte användas samtidigt."
|
|
|
|
#: apply.c:140
|
|
msgid "--3way outside a repository"
|
|
msgstr "--3way utanför arkiv"
|
|
|
|
#: apply.c:151
|
|
msgid "--index outside a repository"
|
|
msgstr "--index utanför arkiv"
|
|
|
|
#: apply.c:154
|
|
msgid "--cached outside a repository"
|
|
msgstr "--cached utanför arkiv"
|
|
|
|
#: apply.c:801
|
|
#, c-format
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
|
|
|
|
#: apply.c:810
|
|
#, c-format
|
|
msgid "regexec returned %d for input: %s"
|
|
msgstr "regexec returnerade %d för indata: %s"
|
|
|
|
#: apply.c:884
|
|
#, c-format
|
|
msgid "unable to find filename in patch at line %d"
|
|
msgstr "kan inte hitta filnamn i patchen på rad %d"
|
|
|
|
#: apply.c:922
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
|
|
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
|
|
|
|
#: apply.c:928
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
|
|
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
|
|
|
|
#: apply.c:929
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
|
|
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
|
|
|
|
#: apply.c:934
|
|
#, c-format
|
|
msgid "git apply: bad git-diff - expected /dev/null on line %d"
|
|
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
|
|
|
|
#: apply.c:963
|
|
#, c-format
|
|
msgid "invalid mode on line %d: %s"
|
|
msgstr "ogiltigt läge på rad %d: %s"
|
|
|
|
#: apply.c:1282
|
|
#, c-format
|
|
msgid "inconsistent header lines %d and %d"
|
|
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
|
|
|
|
#: apply.c:1372
|
|
#, c-format
|
|
msgid ""
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
"component (line %d)"
|
|
msgid_plural ""
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
"components (line %d)"
|
|
msgstr[0] ""
|
|
"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
|
|
"tas bort (rad %d)"
|
|
msgstr[1] ""
|
|
"git-diff-huvudet saknar filnamnsinformation när %d ledande "
|
|
"sökvägskomponenter\n"
|
|
"tas bort (rad %d)"
|
|
|
|
#: apply.c:1385
|
|
#, c-format
|
|
msgid "git diff header lacks filename information (line %d)"
|
|
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
|
|
|
|
#: apply.c:1481
|
|
#, c-format
|
|
msgid "recount: unexpected line: %.*s"
|
|
msgstr "recount: förväntade rad: %.*s"
|
|
|
|
#: apply.c:1550
|
|
#, c-format
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
msgstr "patch-fragment utan huvud på rad %d: %.*s"
|
|
|
|
#: apply.c:1753
|
|
msgid "new file depends on old contents"
|
|
msgstr "ny fil beror på gammalt innehåll"
|
|
|
|
#: apply.c:1755
|
|
msgid "deleted file still has contents"
|
|
msgstr "borttagen fil har fortfarande innehåll"
|
|
|
|
#: apply.c:1789
|
|
#, c-format
|
|
msgid "corrupt patch at line %d"
|
|
msgstr "trasig patch på rad %d"
|
|
|
|
#: apply.c:1826
|
|
#, c-format
|
|
msgid "new file %s depends on old contents"
|
|
msgstr "nya filen %s beror på gammalt innehåll"
|
|
|
|
#: apply.c:1828
|
|
#, c-format
|
|
msgid "deleted file %s still has contents"
|
|
msgstr "borttagna filen %s har fortfarande innehåll"
|
|
|
|
#: apply.c:1831
|
|
#, c-format
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
msgstr "** varning: filen %s blir tom men har inte tagits bort"
|
|
|
|
#: apply.c:1978
|
|
#, c-format
|
|
msgid "corrupt binary patch at line %d: %.*s"
|
|
msgstr "trasig binärpatch på rad %d: %.*s"
|
|
|
|
#: apply.c:2015
|
|
#, c-format
|
|
msgid "unrecognized binary patch at line %d"
|
|
msgstr "binärpatchen på rad %d känns inte igen"
|
|
|
|
#: apply.c:2177
|
|
#, c-format
|
|
msgid "patch with only garbage at line %d"
|
|
msgstr "patch med bara skräp på rad %d"
|
|
|
|
#: apply.c:2263
|
|
#, c-format
|
|
msgid "unable to read symlink %s"
|
|
msgstr "kunde inte läsa symboliska länken %s"
|
|
|
|
#: apply.c:2267
|
|
#, c-format
|
|
msgid "unable to open or read %s"
|
|
msgstr "kunde inte öppna eller läsa %s"
|
|
|
|
#: apply.c:2936
|
|
#, c-format
|
|
msgid "invalid start of line: '%c'"
|
|
msgstr "felaktig inledning på rad: \"%c\""
|
|
|
|
#: 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] "Stycke %d lyckades på %d (offset %d rad)."
|
|
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
|
|
|
|
#: apply.c:3069
|
|
#, c-format
|
|
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
|
|
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
|
|
|
|
#: apply.c:3075
|
|
#, c-format
|
|
msgid ""
|
|
"while searching for:\n"
|
|
"%.*s"
|
|
msgstr ""
|
|
"vid sökning efter:\n"
|
|
"%.*s"
|
|
|
|
#: apply.c:3097
|
|
#, c-format
|
|
msgid "missing binary patch data for '%s'"
|
|
msgstr "saknar binära patchdata för \"%s\""
|
|
|
|
#: apply.c:3105
|
|
#, c-format
|
|
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
|
|
msgstr ""
|
|
"kan inte applicera en binärpatch baklänges utan den omvända patchen för \"%s"
|
|
"\""
|
|
|
|
#: apply.c:3152
|
|
#, c-format
|
|
msgid "cannot apply binary patch to '%s' without full index line"
|
|
msgstr ""
|
|
"kan inte applicera binärpatch på \"%s\" utan den fullständiga indexraden"
|
|
|
|
#: apply.c:3163
|
|
#, c-format
|
|
msgid ""
|
|
"the patch applies to '%s' (%s), which does not match the current contents."
|
|
msgstr ""
|
|
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
|
|
"innehållet."
|
|
|
|
#: apply.c:3171
|
|
#, c-format
|
|
msgid "the patch applies to an empty '%s' but it is not empty"
|
|
msgstr "patchen appliceras på en tom \"%s\", men den är inte tom"
|
|
|
|
#: apply.c:3189
|
|
#, c-format
|
|
msgid "the necessary postimage %s for '%s' cannot be read"
|
|
msgstr "nödvändig efterbild %s för \"%s\" kan inte läsas"
|
|
|
|
#: apply.c:3202
|
|
#, c-format
|
|
msgid "binary patch does not apply to '%s'"
|
|
msgstr "binärpatchen kan inte tillämpas på \"%s\""
|
|
|
|
#: apply.c:3209
|
|
#, c-format
|
|
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
|
|
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
|
|
|
|
#: apply.c:3230
|
|
#, c-format
|
|
msgid "patch failed: %s:%ld"
|
|
msgstr "patch misslyckades: %s:%ld"
|
|
|
|
#: apply.c:3353
|
|
#, c-format
|
|
msgid "cannot checkout %s"
|
|
msgstr "kan inte checka ut %s"
|
|
|
|
#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:298
|
|
#, c-format
|
|
msgid "failed to read %s"
|
|
msgstr "misslyckades läsa %s"
|
|
|
|
#: apply.c:3413
|
|
#, c-format
|
|
msgid "reading from '%s' beyond a symbolic link"
|
|
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
|
|
|
|
#: apply.c:3442 apply.c:3685
|
|
#, c-format
|
|
msgid "path %s has been renamed/deleted"
|
|
msgstr "sökvägen %s har ändrat namn/tagits bort"
|
|
|
|
#: apply.c:3528 apply.c:3700
|
|
#, c-format
|
|
msgid "%s: does not exist in index"
|
|
msgstr "%s: finns inte i indexet"
|
|
|
|
#: apply.c:3537 apply.c:3708
|
|
#, c-format
|
|
msgid "%s: does not match index"
|
|
msgstr "%s: motsvarar inte indexet"
|
|
|
|
#: apply.c:3572
|
|
msgid "repository lacks the necessary blob to fall back on 3-way merge."
|
|
msgstr ""
|
|
"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
|
|
"vägssammanslagning."
|
|
|
|
#: apply.c:3575
|
|
#, c-format
|
|
msgid "Falling back to three-way merge...\n"
|
|
msgstr "Faller tillbaka på trevägssammanslagning...\n"
|
|
|
|
#: apply.c:3591 apply.c:3595
|
|
#, c-format
|
|
msgid "cannot read the current contents of '%s'"
|
|
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
|
|
|
|
#: apply.c:3607
|
|
#, c-format
|
|
msgid "Failed to fall back on three-way merge...\n"
|
|
msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
|
|
|
|
#: apply.c:3621
|
|
#, c-format
|
|
msgid "Applied patch to '%s' with conflicts.\n"
|
|
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
|
|
|
|
#: apply.c:3626
|
|
#, c-format
|
|
msgid "Applied patch to '%s' cleanly.\n"
|
|
msgstr "Tillämpade patchen på \"%s\" rent.\n"
|
|
|
|
#: apply.c:3652
|
|
msgid "removal patch leaves file contents"
|
|
msgstr "patch för borttagning lämnar kvar filinnehåll"
|
|
|
|
#: apply.c:3725
|
|
#, c-format
|
|
msgid "%s: wrong type"
|
|
msgstr "%s: fel typ"
|
|
|
|
#: apply.c:3727
|
|
#, c-format
|
|
msgid "%s has type %o, expected %o"
|
|
msgstr "%s har typen %o, förväntade %o"
|
|
|
|
#: 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 "ogiltig sökväg \"%s\""
|
|
|
|
#: apply.c:3936
|
|
#, c-format
|
|
msgid "%s: already exists in index"
|
|
msgstr "%s: finns redan i indexet"
|
|
|
|
#: apply.c:3939
|
|
#, c-format
|
|
msgid "%s: already exists in working directory"
|
|
msgstr "%s: finns redan i arbetskatalogen"
|
|
|
|
#: apply.c:3959
|
|
#, c-format
|
|
msgid "new mode (%o) of %s does not match old mode (%o)"
|
|
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
|
|
|
|
#: apply.c:3964
|
|
#, c-format
|
|
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
|
|
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
|
|
|
|
#: apply.c:3984
|
|
#, c-format
|
|
msgid "affected file '%s' is beyond a symbolic link"
|
|
msgstr "den berörda filen \"%s\" är på andra sidan av en symbolisk länk"
|
|
|
|
#: apply.c:3988
|
|
#, c-format
|
|
msgid "%s: patch does not apply"
|
|
msgstr "%s: patchen kan inte tillämpas"
|
|
|
|
#: apply.c:4003
|
|
#, c-format
|
|
msgid "Checking patch %s..."
|
|
msgstr "Kontrollerar patchen %s..."
|
|
|
|
#: apply.c:4095
|
|
#, c-format
|
|
msgid "sha1 information is lacking or useless for submodule %s"
|
|
msgstr "sha1-informationen saknas eller är oanvändbar för undermodulen %s"
|
|
|
|
#: apply.c:4102
|
|
#, c-format
|
|
msgid "mode change for %s, which is not in current HEAD"
|
|
msgstr "nytt läge för %s, som inte finns i nuvarande HEAD"
|
|
|
|
#: apply.c:4105
|
|
#, c-format
|
|
msgid "sha1 information is lacking or useless (%s)."
|
|
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
|
|
|
|
#: apply.c:4114
|
|
#, c-format
|
|
msgid "could not add %s to temporary index"
|
|
msgstr "kunde inte lägga till %s till temporärt index"
|
|
|
|
#: apply.c:4124
|
|
#, c-format
|
|
msgid "could not write temporary index to %s"
|
|
msgstr "kunde inte skriva temporärt index till %s"
|
|
|
|
#: apply.c:4262
|
|
#, c-format
|
|
msgid "unable to remove %s from index"
|
|
msgstr "kan inte ta bort %s från indexet"
|
|
|
|
#: apply.c:4296
|
|
#, c-format
|
|
msgid "corrupt patch for submodule %s"
|
|
msgstr "trasig patch för undermodulen %s"
|
|
|
|
#: apply.c:4302
|
|
#, c-format
|
|
msgid "unable to stat newly created file '%s'"
|
|
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
|
|
|
|
#: apply.c:4310
|
|
#, c-format
|
|
msgid "unable to create backing store for newly created file %s"
|
|
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
|
|
|
|
#: apply.c:4316 apply.c:4461
|
|
#, c-format
|
|
msgid "unable to add cache entry for %s"
|
|
msgstr "kan inte lägga till cachepost för %s"
|
|
|
|
#: apply.c:4359
|
|
#, c-format
|
|
msgid "failed to write to '%s'"
|
|
msgstr "misslyckades skriva till \"%s\""
|
|
|
|
#: apply.c:4363
|
|
#, c-format
|
|
msgid "closing file '%s'"
|
|
msgstr "stänger filen \"%s\""
|
|
|
|
#: apply.c:4433
|
|
#, c-format
|
|
msgid "unable to write file '%s' mode %o"
|
|
msgstr "kan inte skriva filen \"%s\" läge %o"
|
|
|
|
#: apply.c:4531
|
|
#, c-format
|
|
msgid "Applied patch %s cleanly."
|
|
msgstr "Tillämpade patchen %s rent."
|
|
|
|
#: apply.c:4539
|
|
msgid "internal error"
|
|
msgstr "internt fel"
|
|
|
|
#: apply.c:4542
|
|
#, c-format
|
|
msgid "Applying patch %%s with %d reject..."
|
|
msgid_plural "Applying patch %%s with %d rejects..."
|
|
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
|
|
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
|
|
|
|
#: apply.c:4553
|
|
#, c-format
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
|
|
|
|
#: apply.c:4561 builtin/fetch.c:901 builtin/fetch.c:1201
|
|
#, c-format
|
|
msgid "cannot open %s"
|
|
msgstr "kan inte öppna %s"
|
|
|
|
#: apply.c:4575
|
|
#, c-format
|
|
msgid "Hunk #%d applied cleanly."
|
|
msgstr "Stycke %d tillämpades rent."
|
|
|
|
#: apply.c:4579
|
|
#, c-format
|
|
msgid "Rejected hunk #%d."
|
|
msgstr "Refuserar stycke %d."
|
|
|
|
#: apply.c:4698
|
|
#, c-format
|
|
msgid "Skipped patch '%s'."
|
|
msgstr "Ignorerar patch \"%s\"."
|
|
|
|
#: apply.c:4706
|
|
msgid "unrecognized input"
|
|
msgstr "indata känns inte igen"
|
|
|
|
#: apply.c:4726
|
|
msgid "unable to read index file"
|
|
msgstr "kan inte läsa indexfilen"
|
|
|
|
#: apply.c:4883
|
|
#, c-format
|
|
msgid "can't open patch '%s': %s"
|
|
msgstr "kan inte öppna patchen \"%s\": %s"
|
|
|
|
#: apply.c:4910
|
|
#, c-format
|
|
msgid "squelched %d whitespace error"
|
|
msgid_plural "squelched %d whitespace errors"
|
|
msgstr[0] "undertryckte %d fel i blanksteg"
|
|
msgstr[1] "undertryckte %d fel i blanksteg"
|
|
|
|
#: apply.c:4916 apply.c:4931
|
|
#, c-format
|
|
msgid "%d line adds whitespace errors."
|
|
msgid_plural "%d lines add whitespace errors."
|
|
msgstr[0] "%d rad lägger till fel i blanksteg."
|
|
msgstr[1] "%d rader lägger till fel i blanksteg."
|
|
|
|
#: apply.c:4924
|
|
#, c-format
|
|
msgid "%d line applied after fixing whitespace errors."
|
|
msgid_plural "%d lines applied after fixing whitespace errors."
|
|
msgstr[0] "%d rad applicerade efter att ha rättat fel i blanksteg."
|
|
msgstr[1] "%d rader applicerade efter att ha rättat fel i blanksteg."
|
|
|
|
#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
|
|
msgid "Unable to write new index file"
|
|
msgstr "Kunde inte skriva ny indexfil"
|
|
|
|
#: apply.c:4968
|
|
msgid "don't apply changes matching the given path"
|
|
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
|
|
|
|
#: apply.c:4971
|
|
msgid "apply changes matching the given path"
|
|
msgstr "tillämpa ändringar som motsvarar given sökväg"
|
|
|
|
#: apply.c:4973 builtin/am.c:2260
|
|
msgid "num"
|
|
msgstr "antal"
|
|
|
|
#: apply.c:4974
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
|
|
|
|
#: apply.c:4977
|
|
msgid "ignore additions made by the patch"
|
|
msgstr "ignorera tillägg gjorda av patchen"
|
|
|
|
#: apply.c:4979
|
|
msgid "instead of applying the patch, output diffstat for the input"
|
|
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
|
|
|
|
#: apply.c:4983
|
|
msgid "show number of added and deleted lines in decimal notation"
|
|
msgstr "visa antal tillagda och borttagna rader decimalt"
|
|
|
|
#: apply.c:4985
|
|
msgid "instead of applying the patch, output a summary for the input"
|
|
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
|
|
|
|
#: apply.c:4987
|
|
msgid "instead of applying the patch, see if the patch is applicable"
|
|
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
|
|
|
|
#: apply.c:4989
|
|
msgid "make sure the patch is applicable to the current index"
|
|
msgstr "se till att patchen kan tillämpas på aktuellt index"
|
|
|
|
#: apply.c:4991
|
|
msgid "mark new files with `git add --intent-to-add`"
|
|
msgstr "markera nya filer med \"git add --intent-to-add\""
|
|
|
|
#: apply.c:4993
|
|
msgid "apply a patch without touching the working tree"
|
|
msgstr "tillämpa en patch utan att röra arbetskatalogen"
|
|
|
|
#: apply.c:4995
|
|
msgid "accept a patch that touches outside the working area"
|
|
msgstr "godta en patch som rör filer utanför arbetskatalogen"
|
|
|
|
#: apply.c:4998
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
|
|
|
|
#: apply.c:5000
|
|
msgid "attempt three-way merge if a patch does not apply"
|
|
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
|
|
|
|
#: apply.c:5002
|
|
msgid "build a temporary index based on embedded index information"
|
|
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
|
|
|
|
#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:524
|
|
msgid "paths are separated with NUL character"
|
|
msgstr "sökvägar avdelas med NUL-tecken"
|
|
|
|
#: apply.c:5007
|
|
msgid "ensure at least <n> lines of context match"
|
|
msgstr "se till att åtminstone <n> rader sammanhang är lika"
|
|
|
|
#: 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:3457 builtin/rebase.c:1508
|
|
msgid "action"
|
|
msgstr "åtgärd"
|
|
|
|
#: apply.c:5009
|
|
msgid "detect new or modified lines that have whitespace errors"
|
|
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
|
|
|
|
#: apply.c:5012 apply.c:5015
|
|
msgid "ignore changes in whitespace when finding context"
|
|
msgstr "ignorera ändringar i blanktecken för sammanhang"
|
|
|
|
#: apply.c:5018
|
|
msgid "apply the patch in reverse"
|
|
msgstr "tillämpa patchen baklänges"
|
|
|
|
#: apply.c:5020
|
|
msgid "don't expect at least one line of context"
|
|
msgstr "förvänta inte minst en rad sammanhang"
|
|
|
|
#: apply.c:5022
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
|
|
|
|
#: apply.c:5024
|
|
msgid "allow overlapping hunks"
|
|
msgstr "tillåt överlappande stycken"
|
|
|
|
#: 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 "var pratsam"
|
|
|
|
#: apply.c:5027
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
|
|
|
|
#: apply.c:5030
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
msgstr "lite inte på antalet linjer i styckehuvuden"
|
|
|
|
#: apply.c:5032 builtin/am.c:2248
|
|
msgid "root"
|
|
msgstr "rot"
|
|
|
|
#: apply.c:5033
|
|
msgid "prepend <root> to all filenames"
|
|
msgstr "lägg till <rot> i alla filnamn"
|
|
|
|
#: archive.c:14
|
|
msgid "git archive [<options>] <tree-ish> [<path>...]"
|
|
msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
|
|
|
|
#: archive.c:15
|
|
msgid "git archive --list"
|
|
msgstr "git archive --list"
|
|
|
|
#: archive.c:16
|
|
msgid ""
|
|
"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
|
|
msgstr ""
|
|
"git archive --remote <arkiv> [--exec <kmd>] [<flaggor>] <träd-igt> "
|
|
"[<sökväg>...]"
|
|
|
|
#: archive.c:17
|
|
msgid "git archive --remote <repo> [--exec <cmd>] --list"
|
|
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
|
|
|
|
#: 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 "sökvägsangivelsen \"%s\" motsvarade inte några filer"
|
|
|
|
#: archive.c:396
|
|
#, c-format
|
|
msgid "no such ref: %.*s"
|
|
msgstr "ingen sådan referens: %.*s"
|
|
|
|
#: archive.c:401
|
|
#, c-format
|
|
msgid "not a valid object name: %s"
|
|
msgstr "objektnamnet är inte giltigt: %s"
|
|
|
|
#: archive.c:414
|
|
#, c-format
|
|
msgid "not a tree object: %s"
|
|
msgstr "inte ett trädobjekt: %s"
|
|
|
|
#: archive.c:426
|
|
msgid "current working directory is untracked"
|
|
msgstr "aktuell arbetskatalog är inte spårad"
|
|
|
|
#: archive.c:457
|
|
msgid "fmt"
|
|
msgstr "fmt"
|
|
|
|
#: archive.c:457
|
|
msgid "archive format"
|
|
msgstr "arkivformat"
|
|
|
|
#: archive.c:458 builtin/log.c:1653
|
|
msgid "prefix"
|
|
msgstr "prefix"
|
|
|
|
#: archive.c:459
|
|
msgid "prepend prefix to each pathname in the archive"
|
|
msgstr "lägg till prefix till varje sökväg i arkivet"
|
|
|
|
#: archive.c: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 "fil"
|
|
|
|
#: archive.c:461 builtin/archive.c:90
|
|
msgid "write the archive to this file"
|
|
msgstr "skriv arkivet till filen"
|
|
|
|
#: archive.c:463
|
|
msgid "read .gitattributes in working directory"
|
|
msgstr "läs .gitattributes i arbetskatalogen"
|
|
|
|
#: archive.c:464
|
|
msgid "report archived files on stderr"
|
|
msgstr "rapportera arkiverade filer på standard fel"
|
|
|
|
#: archive.c:465
|
|
msgid "store only"
|
|
msgstr "endast spara"
|
|
|
|
#: archive.c:466
|
|
msgid "compress faster"
|
|
msgstr "komprimera snabbare"
|
|
|
|
#: archive.c:474
|
|
msgid "compress better"
|
|
msgstr "komprimera bättre"
|
|
|
|
#: archive.c:477
|
|
msgid "list supported archive formats"
|
|
msgstr "visa understödda arkivformat"
|
|
|
|
#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
|
|
#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
|
|
msgid "repo"
|
|
msgstr "arkiv"
|
|
|
|
#: archive.c:480 builtin/archive.c:92
|
|
msgid "retrieve the archive from remote repository <repo>"
|
|
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
|
|
|
|
#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
|
|
#: builtin/notes.c:498
|
|
msgid "command"
|
|
msgstr "kommando"
|
|
|
|
#: archive.c:482 builtin/archive.c:94
|
|
msgid "path to the remote git-upload-archive command"
|
|
msgstr "sökväg till kommandot git-upload-archive på fjärren"
|
|
|
|
#: archive.c:489
|
|
msgid "Unexpected option --remote"
|
|
msgstr "Oväntad flagga --remote"
|
|
|
|
#: archive.c:491
|
|
msgid "Option --exec can only be used together with --remote"
|
|
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
|
|
|
|
#: archive.c:493
|
|
msgid "Unexpected option --output"
|
|
msgstr "Oväntad flagga --output"
|
|
|
|
#: archive.c:515
|
|
#, c-format
|
|
msgid "Unknown archive format '%s'"
|
|
msgstr "Okänt arkivformat \"%s\""
|
|
|
|
#: archive.c:522
|
|
#, c-format
|
|
msgid "Argument not supported for format '%s': -%d"
|
|
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
|
|
|
|
#: archive-tar.c:125 archive-zip.c:351
|
|
#, c-format
|
|
msgid "cannot stream blob %s"
|
|
msgstr "kan inte strömma blob:en %s"
|
|
|
|
#: archive-tar.c:266 archive-zip.c:369
|
|
#, c-format
|
|
msgid "unsupported file mode: 0%o (SHA1: %s)"
|
|
msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
|
|
|
|
#: archive-tar.c:293 archive-zip.c:359
|
|
#, c-format
|
|
msgid "cannot read %s"
|
|
msgstr "kan inte läsa %s"
|
|
|
|
#: archive-tar.c:465
|
|
#, c-format
|
|
msgid "unable to start '%s' filter"
|
|
msgstr "kunde inte starta filtret \"%s\""
|
|
|
|
#: archive-tar.c:468
|
|
msgid "unable to redirect descriptor"
|
|
msgstr "kan inte omdirigera handtag"
|
|
|
|
#: archive-tar.c:475
|
|
#, c-format
|
|
msgid "'%s' filter reported error"
|
|
msgstr "filtret \"%s\" rapporterade fel"
|
|
|
|
#: archive-zip.c:319
|
|
#, c-format
|
|
msgid "path is not valid UTF-8: %s"
|
|
msgstr "sökvägen är inte giltig UTF-8: %s"
|
|
|
|
#: archive-zip.c:323
|
|
#, c-format
|
|
msgid "path too long (%d chars, SHA1: %s): %s"
|
|
msgstr "sökvägen för lång (%d tecken, SHA1: %s): %s"
|
|
|
|
#: archive-zip.c:480 builtin/pack-objects.c:231 builtin/pack-objects.c:234
|
|
#, c-format
|
|
msgid "deflate error (%d)"
|
|
msgstr "fel i deflate (%d)"
|
|
|
|
#: archive-zip.c:615
|
|
#, c-format
|
|
msgid "timestamp too large for this system: %<PRIuMAX>"
|
|
msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
|
|
|
|
#: attr.c:212
|
|
#, c-format
|
|
msgid "%.*s is not a valid attribute name"
|
|
msgstr "%-*s är inte ett giltigt namn på attribut"
|
|
|
|
#: attr.c:369
|
|
#, c-format
|
|
msgid "%s not allowed: %s:%d"
|
|
msgstr "%s inte tillåtet: %s:%d"
|
|
|
|
#: attr.c:409
|
|
msgid ""
|
|
"Negative patterns are ignored in git attributes\n"
|
|
"Use '\\!' for literal leading exclamation."
|
|
msgstr ""
|
|
"Negativa mönster ignoreras i git-attribut\n"
|
|
"Använd '\\!' för att inleda med ett utropstecken."
|
|
|
|
#: bisect.c:468
|
|
#, c-format
|
|
msgid "Badly quoted content in file '%s': %s"
|
|
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
|
|
|
|
#: bisect.c:678
|
|
#, c-format
|
|
msgid "We cannot bisect more!\n"
|
|
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
|
|
|
|
#: bisect.c:745
|
|
#, c-format
|
|
msgid "Not a valid commit name %s"
|
|
msgstr "Namnet på incheckningen är inte giltigt: %s"
|
|
|
|
#: bisect.c:770
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is bad.\n"
|
|
"This means the bug has been fixed between %s and [%s].\n"
|
|
msgstr ""
|
|
"Sammanslagningsbasen %s är trasig.\n"
|
|
"Det betyder att felet har rättats mellan %s och [%s].\n"
|
|
|
|
#: bisect.c:775
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is new.\n"
|
|
"The property has changed between %s and [%s].\n"
|
|
msgstr ""
|
|
"Sammanslagningsbasen %s är ny.\n"
|
|
"Egenskapen har ändrats mellan %s och [%s].\n"
|
|
|
|
#: bisect.c:780
|
|
#, c-format
|
|
msgid ""
|
|
"The merge base %s is %s.\n"
|
|
"This means the first '%s' commit is between %s and [%s].\n"
|
|
msgstr ""
|
|
"Sammanslagningsbasen %s är %s.\n"
|
|
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
|
|
|
|
#: bisect.c:788
|
|
#, c-format
|
|
msgid ""
|
|
"Some %s revs are not ancestors of the %s rev.\n"
|
|
"git bisect cannot work properly in this case.\n"
|
|
"Maybe you mistook %s and %s revs?\n"
|
|
msgstr ""
|
|
"Några %s-revisioner är inte föräldrar till %s-revisionen.\n"
|
|
"git bisect kan inte fungera korrekt i detta fall.\n"
|
|
"Kanske du skrev fel %s- och %s-revisioner?\n"
|
|
|
|
#: bisect.c:801
|
|
#, c-format
|
|
msgid ""
|
|
"the merge base between %s and [%s] must be skipped.\n"
|
|
"So we cannot be sure the first %s commit is between %s and %s.\n"
|
|
"We continue anyway."
|
|
msgstr ""
|
|
"sammanslagningsbasen mellan %s och [%s] måste hoppas över.\n"
|
|
"Vi kan inte vara säkra på att den första %s incheckningen är mellan %s och "
|
|
"%s.\n"
|
|
"Vi fortsätter ändå."
|
|
|
|
#: bisect.c:840
|
|
#, c-format
|
|
msgid "Bisecting: a merge base must be tested\n"
|
|
msgstr "Bisect: en sammanslagningsbas måste testas\n"
|
|
|
|
#: bisect.c:890
|
|
#, c-format
|
|
msgid "a %s revision is needed"
|
|
msgstr "en %s-revision behövs"
|
|
|
|
#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:254
|
|
#, c-format
|
|
msgid "could not create file '%s'"
|
|
msgstr "kunde inte skapa filen \"%s\""
|
|
|
|
#: bisect.c:966 builtin/merge.c:149
|
|
#, c-format
|
|
msgid "could not read file '%s'"
|
|
msgstr "kunde inte läsa filen \"%s\""
|
|
|
|
#: bisect.c:997
|
|
msgid "reading bisect refs failed"
|
|
msgstr "misslyckades läsa bisect-referenser"
|
|
|
|
#: bisect.c:1019
|
|
#, c-format
|
|
msgid "%s was both %s and %s\n"
|
|
msgstr "%s var både %s och %s\n"
|
|
|
|
#: bisect.c:1028
|
|
#, c-format
|
|
msgid ""
|
|
"No testable commit found.\n"
|
|
"Maybe you started with bad path parameters?\n"
|
|
msgstr ""
|
|
"Ingen testbar incheckning hittades.\n"
|
|
"Kanske du startade med felaktiga sökvägsparametrar?\n"
|
|
|
|
#: bisect.c:1057
|
|
#, c-format
|
|
msgid "(roughly %d step)"
|
|
msgid_plural "(roughly %d steps)"
|
|
msgstr[0] "(ungefär %d steg)"
|
|
msgstr[1] "(ungefär %d steg)"
|
|
|
|
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
|
|
#. steps)" translation.
|
|
#.
|
|
#: 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"
|
|
msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
|
|
msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
|
|
|
|
#: blame.c:2700
|
|
msgid "--contents and --reverse do not blend well."
|
|
msgstr "--contents och --reverse fungerar inte så bra tillsammans."
|
|
|
|
#: blame.c:2714
|
|
msgid "cannot use --contents with final commit object name"
|
|
msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
|
|
|
|
#: blame.c:2735
|
|
msgid "--reverse and --first-parent together require specified latest commit"
|
|
msgstr ""
|
|
"--reverse och --first-parent tillsammans kräver att du anger senaste "
|
|
"incheckningen"
|
|
|
|
#: blame.c: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 "misslyckades skapa revisionstraversering"
|
|
|
|
#: blame.c:2762
|
|
msgid ""
|
|
"--reverse --first-parent together require range along first-parent chain"
|
|
msgstr ""
|
|
"--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
|
|
"kedjan"
|
|
|
|
#: blame.c:2773
|
|
#, c-format
|
|
msgid "no such path %s in %s"
|
|
msgstr "sökvägen %s i %s finns inte"
|
|
|
|
#: blame.c:2784
|
|
#, c-format
|
|
msgid "cannot read blob %s for path %s"
|
|
msgstr "kan inte läsa objektet %s för sökvägen %s"
|
|
|
|
#: branch.c:53
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"After fixing the error cause you may try to fix up\n"
|
|
"the remote tracking information by invoking\n"
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
msgstr ""
|
|
"\n"
|
|
"När du har rättat felorsaken kan du försöka rätta\n"
|
|
"fjärrspårningsinformationen genom att utföra\n"
|
|
"\"git branch --set-upstream-to=%s%s%s\"."
|
|
|
|
#: branch.c:67
|
|
#, c-format
|
|
msgid "Not setting branch %s as its own upstream."
|
|
msgstr "Ställer inte in grenen %s som sin egen uppströmsgren."
|
|
|
|
#: branch.c:93
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
|
|
msgstr ""
|
|
"Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\" genom "
|
|
"ombasering."
|
|
|
|
#: branch.c:94
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
|
|
msgstr "Grenen %s ställdes in att spåra fjärrgrenen \"%s\" från \"%s\"."
|
|
|
|
#: branch.c:98
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track local branch '%s' by rebasing."
|
|
msgstr ""
|
|
"Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\" genom "
|
|
"ombasering."
|
|
|
|
#: branch.c:99
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track local branch '%s'."
|
|
msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
|
|
|
|
#: branch.c:104
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
|
|
msgstr ""
|
|
"Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\" genom ombasering."
|
|
|
|
#: branch.c:105
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track remote ref '%s'."
|
|
msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
|
|
|
|
#: branch.c:109
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track local ref '%s' by rebasing."
|
|
msgstr ""
|
|
"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
|
|
"ombasering."
|
|
|
|
#: branch.c:110
|
|
#, c-format
|
|
msgid "Branch '%s' set up to track local ref '%s'."
|
|
msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
|
|
|
|
#: branch.c:119
|
|
msgid "Unable to write upstream branch configuration"
|
|
msgstr "Kan inte skriva inställningar för uppströmsgren"
|
|
|
|
#: branch.c:156
|
|
#, c-format
|
|
msgid "Not tracking: ambiguous information for ref %s"
|
|
msgstr "Spårar inte: tvetydig information för referensen %s"
|
|
|
|
#: branch.c:189
|
|
#, c-format
|
|
msgid "'%s' is not a valid branch name."
|
|
msgstr "\"%s\" är inte ett giltigt grennamn."
|
|
|
|
#: branch.c:208
|
|
#, c-format
|
|
msgid "A branch named '%s' already exists."
|
|
msgstr "Det finns redan en gren som heter \"%s\"."
|
|
|
|
#: branch.c:213
|
|
msgid "Cannot force update the current branch."
|
|
msgstr "Kan inte tvinga uppdatering av aktuell gren."
|
|
|
|
#: branch.c:233
|
|
#, c-format
|
|
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
|
|
msgstr "Kan inte ställa in spårning; startpunkten \"%s\" är inte en gren."
|
|
|
|
#: branch.c:235
|
|
#, c-format
|
|
msgid "the requested upstream branch '%s' does not exist"
|
|
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
|
|
|
|
#: branch.c:237
|
|
msgid ""
|
|
"\n"
|
|
"If you are planning on basing your work on an upstream\n"
|
|
"branch that already exists at the remote, you may need to\n"
|
|
"run \"git fetch\" to retrieve it.\n"
|
|
"\n"
|
|
"If you are planning to push out a new local branch that\n"
|
|
"will track its remote counterpart, you may want to use\n"
|
|
"\"git push -u\" to set the upstream config as you push."
|
|
msgstr ""
|
|
"\n"
|
|
"Om du har tänkt basera ditt arbete på en uppströmsgren\n"
|
|
"som redan finns på fjärren kan du behöva köra \"git fetch\"\n"
|
|
"för att hämta den.\n"
|
|
"\n"
|
|
"Om du har tänkt sända in en ny lokal gren som ska\n"
|
|
"spåra dess fjärrmotsvarighet kan du använda \"git push -u\"\n"
|
|
"för att ställa in uppströmskonfigurationen när du sänder in."
|
|
|
|
#: branch.c:281
|
|
#, c-format
|
|
msgid "Not a valid object name: '%s'."
|
|
msgstr "Objektnamnet är inte giltigt: \"%s\"."
|
|
|
|
#: branch.c:301
|
|
#, c-format
|
|
msgid "Ambiguous object name: '%s'."
|
|
msgstr "Objektnamnet är tvetydigt: \"%s\"."
|
|
|
|
#: branch.c:306
|
|
#, c-format
|
|
msgid "Not a valid branch point: '%s'."
|
|
msgstr "Avgreningspunkten är inte giltig: \"%s\"."
|
|
|
|
#: branch.c:364
|
|
#, c-format
|
|
msgid "'%s' is already checked out at '%s'"
|
|
msgstr "\"%s\" är redan utcheckad på \"%s\""
|
|
|
|
#: branch.c:387
|
|
#, c-format
|
|
msgid "HEAD of working tree %s is not updated"
|
|
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
|
|
|
|
#: bundle.c:36
|
|
#, c-format
|
|
msgid "'%s' does not look like a v2 bundle file"
|
|
msgstr "'%s' ser inte ut som en v2-bundle-fil"
|
|
|
|
#: bundle.c:64
|
|
#, c-format
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
msgstr "okänt huvud: %s%s (%d)"
|
|
|
|
#: 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 "kunde inte öppna \"%s\""
|
|
|
|
#: bundle.c:143
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
|
|
|
|
#: bundle.c:146
|
|
msgid "need a repository to verify a bundle"
|
|
msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
|
|
|
|
#: bundle.c:197
|
|
#, c-format
|
|
msgid "The bundle contains this ref:"
|
|
msgid_plural "The bundle contains these %d refs:"
|
|
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
|
|
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
|
|
|
|
#: bundle.c:204
|
|
msgid "The bundle records a complete history."
|
|
msgstr "Paketet (bundlen) beskriver en komplett historik."
|
|
|
|
#: bundle.c:206
|
|
#, c-format
|
|
msgid "The bundle requires this ref:"
|
|
msgid_plural "The bundle requires these %d refs:"
|
|
msgstr[0] "Paketet (bundlen) kräver denna referens:"
|
|
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
|
|
|
|
#: bundle.c:273
|
|
msgid "unable to dup bundle descriptor"
|
|
msgstr "kan inte duplicera pakethandtag"
|
|
|
|
#: bundle.c:280
|
|
msgid "Could not spawn pack-objects"
|
|
msgstr "Kunde inte starta pack-objects"
|
|
|
|
#: bundle.c:291
|
|
msgid "pack-objects died"
|
|
msgstr "pack-objects misslyckades"
|
|
|
|
#: bundle.c:333
|
|
msgid "rev-list died"
|
|
msgstr "rev-list dog"
|
|
|
|
#: bundle.c:382
|
|
#, c-format
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
|
|
|
|
#: bundle.c:461 builtin/log.c:203 builtin/log.c:1814 builtin/shortlog.c:306
|
|
#, c-format
|
|
msgid "unrecognized argument: %s"
|
|
msgstr "okänt argument: %s"
|
|
|
|
#: bundle.c:469
|
|
msgid "Refusing to create empty bundle."
|
|
msgstr "Vägrar skapa ett tomt paket (bundle)."
|
|
|
|
#: bundle.c:479
|
|
#, c-format
|
|
msgid "cannot create '%s'"
|
|
msgstr "kan inte skapa \"%s\""
|
|
|
|
#: bundle.c:504
|
|
msgid "index-pack died"
|
|
msgstr "index-pack dog"
|
|
|
|
#: color.c:329
|
|
#, c-format
|
|
msgid "invalid color value: %.*s"
|
|
msgstr "felaktigt färgvärde: %.*s"
|
|
|
|
#: 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 "kunde inte tolka %s"
|
|
|
|
#: commit.c:53
|
|
#, c-format
|
|
msgid "%s %s is not a commit!"
|
|
msgstr "%s %s är inte en incheckning!"
|
|
|
|
#: commit.c:193
|
|
msgid ""
|
|
"Support for <GIT_DIR>/info/grafts is deprecated\n"
|
|
"and will be removed in a future Git version.\n"
|
|
"\n"
|
|
"Please use \"git replace --convert-graft-file\"\n"
|
|
"to convert the grafts into replace refs.\n"
|
|
"\n"
|
|
"Turn this message off by running\n"
|
|
"\"git config advice.graftFileDeprecated false\""
|
|
msgstr ""
|
|
"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
|
|
"kommer tas bort i en framtida version av Git.\n"
|
|
"\n"
|
|
"Använd \"git replace --convert-graft-file\"\n"
|
|
"för att omvandla grafts till ersättningsreferenser.\n"
|
|
"\n"
|
|
"Slå av detta meddelande genom att skriva\n"
|
|
"\"git config advice.graftFileDeprecated false\""
|
|
|
|
#: commit.c:1153
|
|
#, c-format
|
|
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
|
|
msgstr ""
|
|
"Incheckningen %s har en obetrodd GPG-signatur som påstås vara gjord av %s."
|
|
|
|
#: commit.c:1157
|
|
#, c-format
|
|
msgid "Commit %s has a bad GPG signature allegedly by %s."
|
|
msgstr ""
|
|
"Incheckningen %s har en felaktig GPG-signatur som påstås vara gjord av %s."
|
|
|
|
#: commit.c:1160
|
|
#, c-format
|
|
msgid "Commit %s does not have a GPG signature."
|
|
msgstr "Incheckning %s har inte någon GPG-signatur."
|
|
|
|
#: commit.c:1163
|
|
#, c-format
|
|
msgid "Commit %s has a good GPG signature by %s\n"
|
|
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
|
|
|
|
#: commit.c: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"
|
|
"variable i18n.commitencoding to the encoding your project uses.\n"
|
|
msgstr ""
|
|
"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"
|
|
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
|
|
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
|
|
|
|
#: commit-graph.c:122
|
|
msgid "commit-graph file is too small"
|
|
msgstr "incheckningsgraffilen %s är för liten"
|
|
|
|
#: commit-graph.c:189
|
|
#, c-format
|
|
msgid "commit-graph signature %X does not match signature %X"
|
|
msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
|
|
|
|
#: commit-graph.c:196
|
|
#, c-format
|
|
msgid "commit-graph version %X does not match version %X"
|
|
msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
|
|
|
|
#: commit-graph.c:203
|
|
#, c-format
|
|
msgid "commit-graph hash version %X does not match version %X"
|
|
msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
|
|
|
|
#: commit-graph.c:226
|
|
msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
|
|
msgstr ""
|
|
"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
|
|
"ofullständig"
|
|
|
|
#: commit-graph.c:237
|
|
#, c-format
|
|
msgid "commit-graph improper chunk offset %08x%08x"
|
|
msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
|
|
|
|
#: commit-graph.c:280
|
|
#, c-format
|
|
msgid "commit-graph chunk id %08x appears multiple times"
|
|
msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
|
|
|
|
#: commit-graph.c:343
|
|
msgid "commit-graph has no base graphs chunk"
|
|
msgstr "incheckningsgrafen har inga bas-graf-stycken"
|
|
|
|
#: commit-graph.c:353
|
|
msgid "commit-graph chain does not match"
|
|
msgstr "incheckningsgrafens kedja stämmer inte"
|
|
|
|
#: commit-graph.c:401
|
|
#, c-format
|
|
msgid "invalid commit-graph chain: line '%s' not a hash"
|
|
msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
|
|
|
|
#: commit-graph.c:425
|
|
msgid "unable to find all commit-graph files"
|
|
msgstr "kan inte hitta alla incheckingsgraffiler"
|
|
|
|
#: commit-graph.c:558 commit-graph.c:618
|
|
msgid "invalid commit position. commit-graph is likely corrupt"
|
|
msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
|
|
|
|
#: commit-graph.c:579
|
|
#, c-format
|
|
msgid "could not find commit %s"
|
|
msgstr "kunde inte hitta incheckningen %s"
|
|
|
|
#: commit-graph.c:852 builtin/am.c:1292
|
|
#, c-format
|
|
msgid "unable to parse commit %s"
|
|
msgstr "kunde inte tolka incheckningen %s"
|
|
|
|
#: commit-graph.c:1011 builtin/pack-objects.c:2782
|
|
#, c-format
|
|
msgid "unable to get type of object %s"
|
|
msgstr "kunde inte hämta typ för objektet %s"
|
|
|
|
#: commit-graph.c:1043
|
|
msgid "Loading known commits in commit graph"
|
|
msgstr "Läser in kända incheckningar i incheckningsgraf"
|
|
|
|
#: commit-graph.c:1060
|
|
msgid "Expanding reachable commits in commit graph"
|
|
msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
|
|
|
|
#: commit-graph.c:1079
|
|
msgid "Clearing commit marks in commit graph"
|
|
msgstr "Rensar incheckningsmärken i incheckningsgraf"
|
|
|
|
#: commit-graph.c:1098
|
|
msgid "Computing commit graph generation numbers"
|
|
msgstr "Beräknar generationsvärden för incheckningsgraf"
|
|
|
|
#: 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] "Söker incheckningar för incheckingsgraf i %d paket"
|
|
msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
|
|
|
|
#: commit-graph.c:1186
|
|
#, c-format
|
|
msgid "error adding pack %s"
|
|
msgstr "fel vid tillägg av paketet %s"
|
|
|
|
#: commit-graph.c:1190
|
|
#, c-format
|
|
msgid "error opening index for %s"
|
|
msgstr "fel vid öppning av indexet för %s"
|
|
|
|
#: 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"
|
|
msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
|
|
msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
|
|
|
|
#: commit-graph.c:1234
|
|
#, c-format
|
|
msgid "invalid commit object id: %s"
|
|
msgstr "ogiltigt inchecknings-objekt-id %s"
|
|
|
|
#: commit-graph.c:1249
|
|
msgid "Finding commits for commit graph among packed objects"
|
|
msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
|
|
|
|
#: commit-graph.c:1264
|
|
msgid "Counting distinct commits in commit graph"
|
|
msgstr "Räknar olika incheckningar i incheckningsgraf"
|
|
|
|
#: commit-graph.c:1294
|
|
msgid "Finding extra edges in commit graph"
|
|
msgstr "Söker ytterligare kanter i incheckingsgraf"
|
|
|
|
#: commit-graph.c:1340
|
|
msgid "failed to write correct number of base graph ids"
|
|
msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
|
|
|
|
#: commit-graph.c:1373 midx.c:814
|
|
#, c-format
|
|
msgid "unable to create leading directories of %s"
|
|
msgstr "kunde inte skapa inledande kataloger för %s"
|
|
|
|
#: commit-graph.c:1385 builtin/index-pack.c:306 builtin/repack.c:248
|
|
#, c-format
|
|
msgid "unable to create '%s'"
|
|
msgstr "kunde inte skapa \"%s\""
|
|
|
|
#: 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] "Skriver ut incheckningsgraf i %d pass"
|
|
msgstr[1] "Skriver ut incheckningsgraf i %d pass"
|
|
|
|
#: commit-graph.c:1486
|
|
msgid "unable to open commit-graph chain file"
|
|
msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
|
|
|
|
#: commit-graph.c:1498
|
|
msgid "failed to rename base commit-graph file"
|
|
msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
|
|
|
|
#: commit-graph.c:1518
|
|
msgid "failed to rename temporary commit-graph file"
|
|
msgstr "kunde inte byta namn på temporär incheckningsgraffil"
|
|
|
|
#: commit-graph.c:1631
|
|
msgid "Scanning merged commits"
|
|
msgstr "Söker sammanslagna incheckningar"
|
|
|
|
#: commit-graph.c:1642
|
|
#, c-format
|
|
msgid "unexpected duplicate commit id %s"
|
|
msgstr "oväntat duplicerat inchecknings-id %s"
|
|
|
|
#: commit-graph.c:1665
|
|
msgid "Merging commit-graph"
|
|
msgstr "Slår ihop incheckningsgraf"
|
|
|
|
#: commit-graph.c:1844
|
|
#, c-format
|
|
msgid "the commit graph format cannot write %d commits"
|
|
msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
|
|
|
|
#: commit-graph.c:1855
|
|
msgid "too many commits to write graph"
|
|
msgstr "för många incheckningar för att skriva graf"
|
|
|
|
#: commit-graph.c:1944
|
|
msgid "the commit-graph file has incorrect checksum and is likely corrupt"
|
|
msgstr ""
|
|
"filen med incheckningsgraf har felaktig checksumma och är troligtvis trasig"
|
|
|
|
#: commit-graph.c:1954
|
|
#, c-format
|
|
msgid "commit-graph has incorrect OID order: %s then %s"
|
|
msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
|
|
|
|
#: commit-graph.c:1964 commit-graph.c:1979
|
|
#, c-format
|
|
msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
|
|
msgstr ""
|
|
"incheckningsgrafen har felaktig utbredningsvärde: fanout[%d] = %u != %u"
|
|
|
|
#: commit-graph.c:1971
|
|
#, c-format
|
|
msgid "failed to parse commit %s from commit-graph"
|
|
msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
|
|
|
|
#: commit-graph.c:1989
|
|
msgid "Verifying commits in commit graph"
|
|
msgstr "Bekräftar incheckningar i incheckningsgrafen"
|
|
|
|
#: commit-graph.c:2003
|
|
#, c-format
|
|
msgid "failed to parse commit %s from object database for commit-graph"
|
|
msgstr ""
|
|
"misslyckades tolka incheckning %s från objektdatabasen för incheckningsgraf"
|
|
|
|
#: commit-graph.c:2010
|
|
#, c-format
|
|
msgid "root tree OID for commit %s in commit-graph is %s != %s"
|
|
msgstr "rot-trädets OID för incheckningen %s i incheckningsgrafen är %s != %s"
|
|
|
|
#: commit-graph.c:2020
|
|
#, c-format
|
|
msgid "commit-graph parent list for commit %s is too long"
|
|
msgstr "incheckningsgrafens föräldralista för incheckningen %s är för lång"
|
|
|
|
#: commit-graph.c:2029
|
|
#, c-format
|
|
msgid "commit-graph parent for %s is %s != %s"
|
|
msgstr "incheckningsgrafens förälder för %s är %s != %s"
|
|
|
|
#: commit-graph.c:2042
|
|
#, c-format
|
|
msgid "commit-graph parent list for commit %s terminates early"
|
|
msgstr ""
|
|
"incheckningsgrafens föräldralista för incheckningen %s avslutas för tidigt"
|
|
|
|
#: commit-graph.c:2047
|
|
#, c-format
|
|
msgid ""
|
|
"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
|
|
msgstr ""
|
|
"incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
|
|
"noll på annan plats"
|
|
|
|
#: commit-graph.c:2051
|
|
#, c-format
|
|
msgid ""
|
|
"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
|
|
msgstr ""
|
|
"incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
|
|
"%s, men noll på annan plats"
|
|
|
|
#: commit-graph.c:2066
|
|
#, c-format
|
|
msgid "commit-graph generation for commit %s is %u != %u"
|
|
msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
|
|
|
|
#: commit-graph.c:2072
|
|
#, c-format
|
|
msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
|
|
msgstr ""
|
|
"incheckningsdatumet för incheckningen %s i incheckningsgrafen är %<PRIuMAX> !"
|
|
"= %<PRIuMAX>"
|
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
msgid "memory exhausted"
|
|
msgstr "minnet slut"
|
|
|
|
#: config.c:124
|
|
#, c-format
|
|
msgid ""
|
|
"exceeded maximum include depth (%d) while including\n"
|
|
"\t%s\n"
|
|
"from\n"
|
|
"\t%s\n"
|
|
"This might be due to circular includes."
|
|
msgstr ""
|
|
"överskred maximalt inkluderingsdjup (%d) när\n"
|
|
"\t%s\n"
|
|
"inkluderades från\n"
|
|
"\t%s\n"
|
|
"Det kan bero på cirkulära inkluderingar."
|
|
|
|
#: config.c:140
|
|
#, c-format
|
|
msgid "could not expand include path '%s'"
|
|
msgstr "kunde inte expandera inkluderingssökväg \"%s\""
|
|
|
|
#: config.c:151
|
|
msgid "relative config includes must come from files"
|
|
msgstr "relativa konfigureringsinkluderingar måste komma från filer"
|
|
|
|
#: config.c:197
|
|
msgid "relative config include conditionals must come from files"
|
|
msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
|
|
|
|
#: config.c:376
|
|
#, c-format
|
|
msgid "key does not contain a section: %s"
|
|
msgstr "nyckeln innehåller inte ett stycke: %s"
|
|
|
|
#: config.c:382
|
|
#, c-format
|
|
msgid "key does not contain variable name: %s"
|
|
msgstr "nyckeln innehåller inte variabelnamn: %s"
|
|
|
|
#: config.c:406 sequencer.c:2444
|
|
#, c-format
|
|
msgid "invalid key: %s"
|
|
msgstr "felaktig nyckel: %s"
|
|
|
|
#: config.c:412
|
|
#, c-format
|
|
msgid "invalid key (newline): %s"
|
|
msgstr "ogiltig nyckel (nyradstecken): %s"
|
|
|
|
#: config.c:448 config.c:460
|
|
#, c-format
|
|
msgid "bogus config parameter: %s"
|
|
msgstr "falsk konfigureringsparameter: %s"
|
|
|
|
#: config.c:495
|
|
#, c-format
|
|
msgid "bogus format in %s"
|
|
msgstr "felaktigt format i %s"
|
|
|
|
#: config.c:821
|
|
#, c-format
|
|
msgid "bad config line %d in blob %s"
|
|
msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
|
|
|
|
#: config.c:825
|
|
#, c-format
|
|
msgid "bad config line %d in file %s"
|
|
msgstr "felaktig konfigurationsfil rad %d i filen %s"
|
|
|
|
#: config.c:829
|
|
#, c-format
|
|
msgid "bad config line %d in standard input"
|
|
msgstr "felaktig konfigurationsfil rad %d i standard in"
|
|
|
|
#: config.c:833
|
|
#, c-format
|
|
msgid "bad config line %d in submodule-blob %s"
|
|
msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
|
|
|
|
#: config.c:837
|
|
#, c-format
|
|
msgid "bad config line %d in command line %s"
|
|
msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
|
|
|
|
#: config.c:841
|
|
#, c-format
|
|
msgid "bad config line %d in %s"
|
|
msgstr "felaktig konfigurationsfil rad %d i %s"
|
|
|
|
#: config.c:978
|
|
msgid "out of range"
|
|
msgstr "utanför intervallet"
|
|
|
|
#: config.c:978
|
|
msgid "invalid unit"
|
|
msgstr "ogiltig enhet"
|
|
|
|
#: config.c:979
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s': %s"
|
|
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
|
|
|
|
#: config.c:998
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
|
|
msgstr ""
|
|
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: %s"
|
|
|
|
#: config.c:1001
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in file %s: %s"
|
|
msgstr ""
|
|
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: %s"
|
|
|
|
#: config.c:1004
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in standard input: %s"
|
|
msgstr ""
|
|
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: %s"
|
|
|
|
#: config.c:1007
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
|
|
msgstr ""
|
|
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-blob:"
|
|
"en %s: %s"
|
|
|
|
#: config.c:1010
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
|
|
msgstr ""
|
|
"felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
|
|
"%s: %s"
|
|
|
|
#: config.c:1013
|
|
#, c-format
|
|
msgid "bad numeric config value '%s' for '%s' in %s: %s"
|
|
msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: %s"
|
|
|
|
#: config.c:1108
|
|
#, c-format
|
|
msgid "failed to expand user dir in: '%s'"
|
|
msgstr "misslyckades expandera användarkatalog i: \"%s\""
|
|
|
|
#: config.c:1117
|
|
#, c-format
|
|
msgid "'%s' for '%s' is not a valid timestamp"
|
|
msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
|
|
|
|
#: config.c:1208
|
|
#, c-format
|
|
msgid "abbrev length out of range: %d"
|
|
msgstr "förkortningslängd utanför intervallet: %d"
|
|
|
|
#: config.c:1222 config.c:1233
|
|
#, c-format
|
|
msgid "bad zlib compression level %d"
|
|
msgstr "felaktigt zlib-komprimeringsgrad %d"
|
|
|
|
#: config.c:1325
|
|
msgid "core.commentChar should only be one character"
|
|
msgstr "core.commentChar kan bara vara ett tecken"
|
|
|
|
#: config.c:1358
|
|
#, c-format
|
|
msgid "invalid mode for object creation: %s"
|
|
msgstr "felaktigt läge för skapande av objekt: %s"
|
|
|
|
#: config.c:1430
|
|
#, c-format
|
|
msgid "malformed value for %s"
|
|
msgstr "felformat värde för %s"
|
|
|
|
#: config.c:1456
|
|
#, c-format
|
|
msgid "malformed value for %s: %s"
|
|
msgstr "felformat värde för %s: %s"
|
|
|
|
#: config.c:1457
|
|
msgid "must be one of nothing, matching, simple, upstream or current"
|
|
msgstr "måste vara en av nothing, matching, simple, upstream eller current"
|
|
|
|
#: config.c:1518 builtin/pack-objects.c:3541
|
|
#, c-format
|
|
msgid "bad pack compression level %d"
|
|
msgstr "felaktig paketkomprimeringsgrad %d"
|
|
|
|
#: config.c:1639
|
|
#, c-format
|
|
msgid "unable to load config blob object '%s'"
|
|
msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
|
|
|
|
#: config.c:1642
|
|
#, c-format
|
|
msgid "reference '%s' does not point to a blob"
|
|
msgstr "referensen \"%s\" pekar inte på en blob"
|
|
|
|
#: config.c:1659
|
|
#, c-format
|
|
msgid "unable to resolve config blob '%s'"
|
|
msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
|
|
|
|
#: config.c:1689
|
|
#, c-format
|
|
msgid "failed to parse %s"
|
|
msgstr "kunde inte tolka %s"
|
|
|
|
#: config.c:1743
|
|
msgid "unable to parse command-line config"
|
|
msgstr "kan inte tolka kommandoradskonfiguration"
|
|
|
|
#: config.c:2097
|
|
msgid "unknown error occurred while reading the configuration files"
|
|
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
|
|
|
|
#: config.c:2267
|
|
#, c-format
|
|
msgid "Invalid %s: '%s'"
|
|
msgstr "Felaktigt %s: \"%s\""
|
|
|
|
#: config.c:2312
|
|
#, c-format
|
|
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
|
|
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
|
|
|
|
#: config.c:2358
|
|
#, c-format
|
|
msgid "unable to parse '%s' from command-line config"
|
|
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
|
|
|
|
#: config.c:2360
|
|
#, c-format
|
|
msgid "bad config variable '%s' in file '%s' at line %d"
|
|
msgstr "felaktig konfigurationsvariabel \"%s\" i filen \"%s\" på rad %d"
|
|
|
|
#: config.c:2441
|
|
#, c-format
|
|
msgid "invalid section name '%s'"
|
|
msgstr "felaktigt sektionsnamn \"%s\""
|
|
|
|
#: config.c:2473
|
|
#, c-format
|
|
msgid "%s has multiple values"
|
|
msgstr "%s har flera värden"
|
|
|
|
#: config.c:2502
|
|
#, c-format
|
|
msgid "failed to write new configuration file %s"
|
|
msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
|
|
|
|
#: config.c:2754 config.c:3078
|
|
#, c-format
|
|
msgid "could not lock config file %s"
|
|
msgstr "kunde inte låsa konfigurationsfilen %s"
|
|
|
|
#: config.c:2765
|
|
#, c-format
|
|
msgid "opening %s"
|
|
msgstr "öppnar %s"
|
|
|
|
#: config.c:2800 builtin/config.c:344
|
|
#, c-format
|
|
msgid "invalid pattern: %s"
|
|
msgstr "ogiltigt mönster: %s"
|
|
|
|
#: config.c:2825
|
|
#, c-format
|
|
msgid "invalid config file %s"
|
|
msgstr "ogiltig konfigurationsfil: \"%s\""
|
|
|
|
#: config.c:2838 config.c:3091
|
|
#, c-format
|
|
msgid "fstat on %s failed"
|
|
msgstr "fstat misslyckades på %s"
|
|
|
|
#: config.c:2849
|
|
#, c-format
|
|
msgid "unable to mmap '%s'"
|
|
msgstr "kunde inte utföra mmap på \"%s\""
|
|
|
|
#: config.c:2858 config.c:3096
|
|
#, c-format
|
|
msgid "chmod on %s failed"
|
|
msgstr "chmod misslyckades på %s"
|
|
|
|
#: config.c:2943 config.c:3193
|
|
#, c-format
|
|
msgid "could not write config file %s"
|
|
msgstr "kunde inte skriva konfigurationsfilen %s"
|
|
|
|
#: config.c:2977
|
|
#, c-format
|
|
msgid "could not set '%s' to '%s'"
|
|
msgstr "kunde inte ställa in \"%s\" till \"%s\""
|
|
|
|
#: config.c:2979 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
|
|
#, c-format
|
|
msgid "could not unset '%s'"
|
|
msgstr "kunde inte ta bort inställning för \"%s\""
|
|
|
|
#: config.c:3069
|
|
#, c-format
|
|
msgid "invalid section name: %s"
|
|
msgstr "felaktigt namn på stycke: %s"
|
|
|
|
#: config.c:3236
|
|
#, c-format
|
|
msgid "missing value for '%s'"
|
|
msgstr "värde saknas för \"%s\""
|
|
|
|
#: connect.c:61
|
|
msgid "the remote end hung up upon initial contact"
|
|
msgstr "fjärren lade på vid inledande kontakt"
|
|
|
|
#: connect.c:63
|
|
msgid ""
|
|
"Could not read from remote repository.\n"
|
|
"\n"
|
|
"Please make sure you have the correct access rights\n"
|
|
"and the repository exists."
|
|
msgstr ""
|
|
"Kunde inte läsa från fjärrarkiv.\n"
|
|
"\n"
|
|
"Se till att du har korrekt åtkomstbehörighet\n"
|
|
"och att arkivet existerar."
|
|
|
|
#: connect.c:81
|
|
#, c-format
|
|
msgid "server doesn't support '%s'"
|
|
msgstr "Servern stöder inte \"%s\""
|
|
|
|
#: connect.c:103
|
|
#, c-format
|
|
msgid "server doesn't support feature '%s'"
|
|
msgstr "servern stöder inte funktionen \"%s\""
|
|
|
|
#: connect.c:114
|
|
msgid "expected flush after capabilities"
|
|
msgstr "förväntade \"flush\" efter förmågor"
|
|
|
|
#: connect.c:233
|
|
#, c-format
|
|
msgid "ignoring capabilities after first line '%s'"
|
|
msgstr "ignorerar förmågor efter första raden \"%s\""
|
|
|
|
#: connect.c:252
|
|
msgid "protocol error: unexpected capabilities^{}"
|
|
msgstr "protokollfel: förväntade inte capabilities^{}"
|
|
|
|
#: connect.c:273
|
|
#, c-format
|
|
msgid "protocol error: expected shallow sha-1, got '%s'"
|
|
msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
|
|
|
|
#: connect.c:275
|
|
msgid "repository on the other end cannot be shallow"
|
|
msgstr "arkivet på andra sidan kan inte vara grunt"
|
|
|
|
#: connect.c:313
|
|
msgid "invalid packet"
|
|
msgstr "ogiltigt paket"
|
|
|
|
#: connect.c:333
|
|
#, c-format
|
|
msgid "protocol error: unexpected '%s'"
|
|
msgstr "protokollfel: förväntade inte \"%s\""
|
|
|
|
#: connect.c:441
|
|
#, c-format
|
|
msgid "invalid ls-refs response: %s"
|
|
msgstr "ogiltigt svar på ls-refs: %s"
|
|
|
|
#: connect.c:445
|
|
msgid "expected flush after ref listing"
|
|
msgstr "oväntad \"flush\" efter ref-listan"
|
|
|
|
#: connect.c:544
|
|
#, c-format
|
|
msgid "protocol '%s' is not supported"
|
|
msgstr "protokollet \"%s\" stöds inte"
|
|
|
|
#: connect.c:595
|
|
msgid "unable to set SO_KEEPALIVE on socket"
|
|
msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
|
|
|
|
#: connect.c:635 connect.c:698
|
|
#, c-format
|
|
msgid "Looking up %s ... "
|
|
msgstr "Slår upp %s..."
|
|
|
|
#: connect.c:639
|
|
#, c-format
|
|
msgid "unable to look up %s (port %s) (%s)"
|
|
msgstr "kan inte slå upp %s (port %s) (%s)"
|
|
|
|
#. TRANSLATORS: this is the end of "Looking up %s ... "
|
|
#: connect.c:643 connect.c:714
|
|
#, c-format
|
|
msgid ""
|
|
"done.\n"
|
|
"Connecting to %s (port %s) ... "
|
|
msgstr ""
|
|
"klart.\n"
|
|
"Ansluter till %s (port %s)..."
|
|
|
|
#: connect.c:665 connect.c:742
|
|
#, c-format
|
|
msgid ""
|
|
"unable to connect to %s:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"kunde inte ansluta till %s:\n"
|
|
"%s"
|
|
|
|
#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
|
|
#: connect.c:671 connect.c:748
|
|
msgid "done."
|
|
msgstr "klart."
|
|
|
|
#: connect.c:702
|
|
#, c-format
|
|
msgid "unable to look up %s (%s)"
|
|
msgstr "kunde inte slå upp %s (%s)"
|
|
|
|
#: connect.c:708
|
|
#, c-format
|
|
msgid "unknown port %s"
|
|
msgstr "okänd port %s"
|
|
|
|
#: connect.c:845 connect.c:1175
|
|
#, c-format
|
|
msgid "strange hostname '%s' blocked"
|
|
msgstr "konstigt värdnamn \"%s\" blockerat"
|
|
|
|
#: connect.c:847
|
|
#, c-format
|
|
msgid "strange port '%s' blocked"
|
|
msgstr "konstig port \"%s\" blockerad"
|
|
|
|
#: connect.c:857
|
|
#, c-format
|
|
msgid "cannot start proxy %s"
|
|
msgstr "kan inte starta mellanserver (proxy) %s"
|
|
|
|
#: connect.c:928
|
|
msgid "no path specified; see 'git help pull' for valid url syntax"
|
|
msgstr "ingen sökväg angavs; se \"git help pull\" för giltig URL-syntax"
|
|
|
|
#: connect.c:1123
|
|
msgid "ssh variant 'simple' does not support -4"
|
|
msgstr "ssh-varianten \"simple\" stöder inte -4"
|
|
|
|
#: connect.c:1135
|
|
msgid "ssh variant 'simple' does not support -6"
|
|
msgstr "ssh-varianten \"simple\" stöder inte -6"
|
|
|
|
#: connect.c:1152
|
|
msgid "ssh variant 'simple' does not support setting port"
|
|
msgstr "ssh-varianten \"simple\" stöder inte val av port"
|
|
|
|
#: connect.c:1264
|
|
#, c-format
|
|
msgid "strange pathname '%s' blocked"
|
|
msgstr "konstigt sökvägsnamn \"%s\" blockerat"
|
|
|
|
#: connect.c:1311
|
|
msgid "unable to fork"
|
|
msgstr "kunde inte grena (fork)"
|
|
|
|
# Vague original, not networking-related, but rather related to the actual
|
|
# objects in the database.
|
|
#: connected.c:98 builtin/fsck.c:208 builtin/prune.c:43
|
|
msgid "Checking connectivity"
|
|
msgstr "Kontrollerar konnektivitet"
|
|
|
|
#: connected.c:110
|
|
msgid "Could not run 'git rev-list'"
|
|
msgstr "Kunde inte köra \"git rev-list\""
|
|
|
|
#: connected.c:130
|
|
msgid "failed write to rev-list"
|
|
msgstr "kunde inte skriva till rev-list"
|
|
|
|
#: connected.c:137
|
|
msgid "failed to close rev-list's stdin"
|
|
msgstr "kunde inte stänga rev-list:s standard in"
|
|
|
|
#: convert.c:194
|
|
#, c-format
|
|
msgid "illegal crlf_action %d"
|
|
msgstr "felaktig crlf_action %d"
|
|
|
|
#: convert.c:207
|
|
#, c-format
|
|
msgid "CRLF would be replaced by LF in %s"
|
|
msgstr "CRLF skulle ersättas av LF i %s"
|
|
|
|
#: convert.c:209
|
|
#, c-format
|
|
msgid ""
|
|
"CRLF will be replaced by LF in %s.\n"
|
|
"The file will have its original line endings in your working directory"
|
|
msgstr ""
|
|
"CRLF kommer att ersättas av LF i %s.\n"
|
|
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
|
|
|
|
#: convert.c:217
|
|
#, c-format
|
|
msgid "LF would be replaced by CRLF in %s"
|
|
msgstr "LF skulle ersättas av CRLF i %s"
|
|
|
|
#: convert.c:219
|
|
#, c-format
|
|
msgid ""
|
|
"LF will be replaced by CRLF in %s.\n"
|
|
"The file will have its original line endings in your working directory"
|
|
msgstr ""
|
|
"LF kommer att ersättas av CRLF i %s.\n"
|
|
"Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
|
|
|
|
#: convert.c:284
|
|
#, c-format
|
|
msgid "BOM is prohibited in '%s' if encoded as %s"
|
|
msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
|
|
|
|
#: convert.c:291
|
|
#, c-format
|
|
msgid ""
|
|
"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
|
|
"working-tree-encoding."
|
|
msgstr ""
|
|
"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som "
|
|
"teckenkodning i arbetskatalogen."
|
|
|
|
#: convert.c:304
|
|
#, c-format
|
|
msgid "BOM is required in '%s' if encoded as %s"
|
|
msgstr "BOM krävs om \"%s\" kodas som %s"
|
|
|
|
#: convert.c:306
|
|
#, c-format
|
|
msgid ""
|
|
"The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
|
|
"%sLE (depending on the byte order) as working-tree-encoding."
|
|
msgstr ""
|
|
"Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
|
|
"(beroende på byteordning) som teckenkodning i arbetskatalogen."
|
|
|
|
#: convert.c:419 convert.c:490
|
|
#, c-format
|
|
msgid "failed to encode '%s' from %s to %s"
|
|
msgstr "misslyckades omkoda \"%s\" från %s till %s"
|
|
|
|
#: convert.c:462
|
|
#, c-format
|
|
msgid "encoding '%s' from %s to %s and back is not the same"
|
|
msgstr ""
|
|
"omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
|
|
|
|
#: convert.c:668
|
|
#, c-format
|
|
msgid "cannot fork to run external filter '%s'"
|
|
msgstr "kan inte grena (fork) för att köra externt filter \"%s\""
|
|
|
|
#: convert.c:688
|
|
#, c-format
|
|
msgid "cannot feed the input to external filter '%s'"
|
|
msgstr "kunde inte skicka indata till externt filter \"%s\""
|
|
|
|
#: convert.c:695
|
|
#, c-format
|
|
msgid "external filter '%s' failed %d"
|
|
msgstr "externt filter \"%s\" misslyckades %d"
|
|
|
|
#: convert.c:730 convert.c:733
|
|
#, c-format
|
|
msgid "read from external filter '%s' failed"
|
|
msgstr "läsning från externt filter \"%s\" misslyckades"
|
|
|
|
#: convert.c:736 convert.c:791
|
|
#, c-format
|
|
msgid "external filter '%s' failed"
|
|
msgstr "externt filter \"%s\" misslyckades"
|
|
|
|
#: convert.c:839
|
|
msgid "unexpected filter type"
|
|
msgstr "oväntad filtertyp"
|
|
|
|
#: convert.c:850
|
|
msgid "path name too long for external filter"
|
|
msgstr "sökvägen för lång för externt filter"
|
|
|
|
#: convert.c:924
|
|
#, c-format
|
|
msgid ""
|
|
"external filter '%s' is not available anymore although not all paths have "
|
|
"been filtered"
|
|
msgstr ""
|
|
"externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
|
|
"inte har filtrerats"
|
|
|
|
#: convert.c:1223
|
|
msgid "true/false are no valid working-tree-encodings"
|
|
msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
|
|
|
|
#: convert.c:1411 convert.c:1445
|
|
#, c-format
|
|
msgid "%s: clean filter '%s' failed"
|
|
msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
|
|
|
|
#: convert.c:1489
|
|
#, c-format
|
|
msgid "%s: smudge filter %s failed"
|
|
msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
|
|
|
|
#: date.c:138
|
|
msgid "in the future"
|
|
msgstr "i framtiden"
|
|
|
|
#: date.c:144
|
|
#, c-format
|
|
msgid "%<PRIuMAX> second ago"
|
|
msgid_plural "%<PRIuMAX> seconds ago"
|
|
msgstr[0] "%<PRIuMAX> sekund sedan"
|
|
msgstr[1] "%<PRIuMAX> sekunder sedan"
|
|
|
|
#: date.c:151
|
|
#, c-format
|
|
msgid "%<PRIuMAX> minute ago"
|
|
msgid_plural "%<PRIuMAX> minutes ago"
|
|
msgstr[0] "%<PRIuMAX> minut sedan"
|
|
msgstr[1] "%<PRIuMAX> minuter sedan"
|
|
|
|
#: date.c:158
|
|
#, c-format
|
|
msgid "%<PRIuMAX> hour ago"
|
|
msgid_plural "%<PRIuMAX> hours ago"
|
|
msgstr[0] "%<PRIuMAX> timme sedan"
|
|
msgstr[1] "%<PRIuMAX> timmar sedan"
|
|
|
|
#: date.c:165
|
|
#, c-format
|
|
msgid "%<PRIuMAX> day ago"
|
|
msgid_plural "%<PRIuMAX> days ago"
|
|
msgstr[0] "%<PRIuMAX> dag sedan"
|
|
msgstr[1] "%<PRIuMAX> dagar sedan"
|
|
|
|
#: date.c:171
|
|
#, c-format
|
|
msgid "%<PRIuMAX> week ago"
|
|
msgid_plural "%<PRIuMAX> weeks ago"
|
|
msgstr[0] "%<PRIuMAX> vecka sedan"
|
|
msgstr[1] "%<PRIuMAX> veckor sedan"
|
|
|
|
#: date.c:178
|
|
#, c-format
|
|
msgid "%<PRIuMAX> month ago"
|
|
msgid_plural "%<PRIuMAX> months ago"
|
|
msgstr[0] "%<PRIuMAX> månad sedan"
|
|
msgstr[1] "%<PRIuMAX> månader sedan"
|
|
|
|
#: date.c:189
|
|
#, c-format
|
|
msgid "%<PRIuMAX> year"
|
|
msgid_plural "%<PRIuMAX> years"
|
|
msgstr[0] "%<PRIuMAX> år"
|
|
msgstr[1] "%<PRIuMAX> år"
|
|
|
|
#. TRANSLATORS: "%s" is "<n> years"
|
|
#: date.c:192
|
|
#, c-format
|
|
msgid "%s, %<PRIuMAX> month ago"
|
|
msgid_plural "%s, %<PRIuMAX> months ago"
|
|
msgstr[0] "%s, %<PRIuMAX> månad sedan"
|
|
msgstr[1] "%s, %<PRIuMAX> månader sedan"
|
|
|
|
#: date.c:197 date.c:202
|
|
#, c-format
|
|
msgid "%<PRIuMAX> year ago"
|
|
msgid_plural "%<PRIuMAX> years ago"
|
|
msgstr[0] "%<PRIuMAX> år sedan"
|
|
msgstr[1] "%<PRIuMAX> år sedan"
|
|
|
|
#: delta-islands.c:272
|
|
msgid "Propagating island marks"
|
|
msgstr "Sprider ö-markeringar"
|
|
|
|
#: delta-islands.c:290
|
|
#, c-format
|
|
msgid "bad tree object %s"
|
|
msgstr "felaktigt trädobjektet %s"
|
|
|
|
#: delta-islands.c:334
|
|
#, c-format
|
|
msgid "failed to load island regex for '%s': %s"
|
|
msgstr "kunde inte hämta ö-regex för \"%s\": %s"
|
|
|
|
#: delta-islands.c:390
|
|
#, c-format
|
|
msgid "island regex from config has too many capture groups (max=%d)"
|
|
msgstr "ö-regex från konfiguration har för många fångstgrupper (max=%d)"
|
|
|
|
#: delta-islands.c:467
|
|
#, c-format
|
|
msgid "Marked %d islands, done.\n"
|
|
msgstr "Markerade %d öar, klar.\n"
|
|
|
|
#: diffcore-order.c:24
|
|
#, c-format
|
|
msgid "failed to read orderfile '%s'"
|
|
msgstr "kunde inte läsa orderfilen \"%s\""
|
|
|
|
#: diffcore-rename.c:543
|
|
msgid "Performing inexact rename detection"
|
|
msgstr "Utför onöjaktig namnbytesdetektering"
|
|
|
|
#: diff-no-index.c:238
|
|
msgid "git diff --no-index [<options>] <path> <path>"
|
|
msgstr "git diff --no-index [<flaggor>] <sökväg> <sökväg>"
|
|
|
|
#: diff-no-index.c:263
|
|
msgid ""
|
|
"Not a git repository. Use --no-index to compare two paths outside a working "
|
|
"tree"
|
|
msgstr ""
|
|
"Inte ett git-arkiv. Använd --no-index för att jämföra två sökvägar utanför "
|
|
"en arbetskatalog."
|
|
|
|
#: diff.c:155
|
|
#, c-format
|
|
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
|
|
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
|
|
|
|
#: diff.c:160
|
|
#, c-format
|
|
msgid " Unknown dirstat parameter '%s'\n"
|
|
msgstr " Okänd dirstat-parameter \"%s\"\n"
|
|
|
|
#: diff.c:296
|
|
msgid ""
|
|
"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
|
|
"'dimmed-zebra', 'plain'"
|
|
msgstr ""
|
|
"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
|
|
"\"blocks\", \"zebra\", \"dimmed_zebra\", \"plain\""
|
|
|
|
#: diff.c:324
|
|
#, c-format
|
|
msgid ""
|
|
"unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
|
|
"'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-change'"
|
|
msgstr ""
|
|
"okänt läge \"%s\" för color-moved-ws, möjliga värden är \"ignore-space-change"
|
|
"\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
|
|
"\""
|
|
|
|
#: diff.c:332
|
|
msgid ""
|
|
"color-moved-ws: allow-indentation-change cannot be combined with other "
|
|
"whitespace modes"
|
|
msgstr ""
|
|
"color-moved-ws: allow-indentation-change kan inte kombineras med andra "
|
|
"blankstegslägen"
|
|
|
|
#: diff.c:405
|
|
#, c-format
|
|
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
|
|
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
|
|
|
|
#: diff.c:465
|
|
#, c-format
|
|
msgid ""
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
|
|
"%s"
|
|
|
|
#: diff.c:4202
|
|
#, c-format
|
|
msgid "external diff died, stopping at %s"
|
|
msgstr "extern diff dog, stannar vid %s"
|
|
|
|
#: diff.c:4547
|
|
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
|
|
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
|
|
|
|
#: diff.c:4550
|
|
msgid "-G, -S and --find-object are mutually exclusive"
|
|
msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
|
|
|
|
#: diff.c:4628
|
|
msgid "--follow requires exactly one pathspec"
|
|
msgstr "--follow kräver exakt en sökvägsangivelse"
|
|
|
|
#: diff.c:4676
|
|
#, c-format
|
|
msgid "invalid --stat value: %s"
|
|
msgstr "ogiltigt värde för --stat: %s"
|
|
|
|
#: 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 förväntar ett numeriskt värde"
|
|
|
|
#: diff.c:4713
|
|
#, c-format
|
|
msgid ""
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
|
|
"%s"
|
|
|
|
#: diff.c:4798
|
|
#, c-format
|
|
msgid "unknown change class '%c' in --diff-filter=%s"
|
|
msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
|
|
|
|
#: diff.c:4822
|
|
#, c-format
|
|
msgid "unknown value after ws-error-highlight=%.*s"
|
|
msgstr "okänt värde efter ws-error-highlight=%.*s"
|
|
|
|
#: diff.c:4836
|
|
#, c-format
|
|
msgid "unable to resolve '%s'"
|
|
msgstr "kunde inte slå upp \"%s\""
|
|
|
|
#: diff.c:4886 diff.c:4892
|
|
#, c-format
|
|
msgid "%s expects <n>/<m> form"
|
|
msgstr "%s förväntar formen <n>/<m>"
|
|
|
|
#: diff.c:4904
|
|
#, c-format
|
|
msgid "%s expects a character, got '%s'"
|
|
msgstr "%s förväntar ett tecken, fick \"%s\""
|
|
|
|
#: diff.c:4925
|
|
#, c-format
|
|
msgid "bad --color-moved argument: %s"
|
|
msgstr "felaktigt argument till --color-moved: %s"
|
|
|
|
#: diff.c:4944
|
|
#, c-format
|
|
msgid "invalid mode '%s' in --color-moved-ws"
|
|
msgstr "ogiltigt läge %s\" i --color-moved-ws"
|
|
|
|
#: diff.c:4984
|
|
msgid ""
|
|
"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
|
|
"\"histogram\""
|
|
msgstr ""
|
|
"flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
|
|
"\"histogram\""
|
|
|
|
#: diff.c:5020 diff.c:5040
|
|
#, c-format
|
|
msgid "invalid argument to %s"
|
|
msgstr "ogiltigt argument för %s"
|
|
|
|
#: diff.c:5178
|
|
#, c-format
|
|
msgid "failed to parse --submodule option parameter: '%s'"
|
|
msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
|
|
|
|
#: diff.c:5234
|
|
#, c-format
|
|
msgid "bad --word-diff argument: %s"
|
|
msgstr "felaktigt argument --word-diff: %s"
|
|
|
|
#: diff.c:5257
|
|
msgid "Diff output format options"
|
|
msgstr "Formatflaggor för diff-utdata"
|
|
|
|
#: diff.c:5259 diff.c:5265
|
|
msgid "generate patch"
|
|
msgstr "skapar patch"
|
|
|
|
#: diff.c:5262 builtin/log.c:173
|
|
msgid "suppress diff output"
|
|
msgstr "undertryck diff-utdata"
|
|
|
|
#: diff.c:5267 diff.c:5381 diff.c:5388
|
|
msgid "<n>"
|
|
msgstr "<n>"
|
|
|
|
#: diff.c:5268 diff.c:5271
|
|
msgid "generate diffs with <n> lines context"
|
|
msgstr "skapa diffar med <n> rader sammanhang"
|
|
|
|
#: diff.c:5273
|
|
msgid "generate the diff in raw format"
|
|
msgstr "generera diff i råformat"
|
|
|
|
#: diff.c:5276
|
|
msgid "synonym for '-p --raw'"
|
|
msgstr "synonym till \"-p --raw\""
|
|
|
|
#: diff.c:5280
|
|
msgid "synonym for '-p --stat'"
|
|
msgstr "synonym till \"-p --stat\""
|
|
|
|
#: diff.c:5284
|
|
msgid "machine friendly --stat"
|
|
msgstr "maskinläsbar --stat"
|
|
|
|
#: diff.c:5287
|
|
msgid "output only the last line of --stat"
|
|
msgstr "skriv bara ut den sista raden för --stat"
|
|
|
|
#: diff.c:5289 diff.c:5297
|
|
msgid "<param1,param2>..."
|
|
msgstr "<param1,param2>..."
|
|
|
|
#: diff.c:5290
|
|
msgid ""
|
|
"output the distribution of relative amount of changes for each sub-directory"
|
|
msgstr ""
|
|
"skriv ut distributionen av relativa mängder ändringar för varje underkatalog"
|
|
|
|
#: diff.c:5294
|
|
msgid "synonym for --dirstat=cumulative"
|
|
msgstr "synonym för --dirstat=cumulative"
|
|
|
|
#: diff.c:5298
|
|
msgid "synonym for --dirstat=files,param1,param2..."
|
|
msgstr "synonym för --dirstat=filer,param1,param2..."
|
|
|
|
#: diff.c:5302
|
|
msgid "warn if changes introduce conflict markers or whitespace errors"
|
|
msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
|
|
|
|
#: diff.c:5305
|
|
msgid "condensed summary such as creations, renames and mode changes"
|
|
msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
|
|
|
|
#: diff.c:5308
|
|
msgid "show only names of changed files"
|
|
msgstr "visa endast namnen på ändrade filer"
|
|
|
|
#: diff.c:5311
|
|
msgid "show only names and status of changed files"
|
|
msgstr "visa endast namn och status för ändrade filer"
|
|
|
|
#: diff.c:5313
|
|
msgid "<width>[,<name-width>[,<count>]]"
|
|
msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
|
|
|
|
#: diff.c:5314
|
|
msgid "generate diffstat"
|
|
msgstr "skapa diffstat"
|
|
|
|
#: diff.c:5316 diff.c:5319 diff.c:5322
|
|
msgid "<width>"
|
|
msgstr "<bredd>"
|
|
|
|
#: diff.c:5317
|
|
msgid "generate diffstat with a given width"
|
|
msgstr "generera en diffstat med given bredd"
|
|
|
|
#: diff.c:5320
|
|
msgid "generate diffstat with a given name width"
|
|
msgstr "generera en diffstat med given namnbredd"
|
|
|
|
#: diff.c:5323
|
|
msgid "generate diffstat with a given graph width"
|
|
msgstr "generera en diffstat med given grafbredd"
|
|
|
|
#: diff.c:5325
|
|
msgid "<count>"
|
|
msgstr "<antal>"
|
|
|
|
#: diff.c:5326
|
|
msgid "generate diffstat with limited lines"
|
|
msgstr "generera diffstat med begränsade rader"
|
|
|
|
#: diff.c:5329
|
|
msgid "generate compact summary in diffstat"
|
|
msgstr "skapa kompakt översikt i diffstat"
|
|
|
|
#: diff.c:5332
|
|
msgid "output a binary diff that can be applied"
|
|
msgstr "skapa en binärdiff som kan appliceras"
|
|
|
|
#: diff.c:5335
|
|
msgid "show full pre- and post-image object names on the \"index\" lines"
|
|
msgstr ""
|
|
"visa fullständiga objektnamn i \"index\"-rader för läget både före och efter"
|
|
|
|
#: diff.c:5337
|
|
msgid "show colored diff"
|
|
msgstr "visa färgad diff"
|
|
|
|
#: diff.c:5338
|
|
msgid "<kind>"
|
|
msgstr "<typ>"
|
|
|
|
#: diff.c:5339
|
|
msgid ""
|
|
"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
|
|
"diff"
|
|
msgstr ""
|
|
"ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
|
|
"\"new\" (nya) rader i diffen"
|
|
|
|
#: diff.c:5342
|
|
msgid ""
|
|
"do not munge pathnames and use NULs as output field terminators in --raw or "
|
|
"--numstat"
|
|
msgstr ""
|
|
"skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
|
|
"eller --numstat"
|
|
|
|
#: diff.c:5345 diff.c:5348 diff.c:5351 diff.c:5457
|
|
msgid "<prefix>"
|
|
msgstr "<prefix>"
|
|
|
|
#: diff.c:5346
|
|
msgid "show the given source prefix instead of \"a/\""
|
|
msgstr "visa givet källprefix istället för \"a/\""
|
|
|
|
#: diff.c:5349
|
|
msgid "show the given destination prefix instead of \"b/\""
|
|
msgstr "visa givet målprefix istället för \"b/\""
|
|
|
|
#: diff.c:5352
|
|
msgid "prepend an additional prefix to every line of output"
|
|
msgstr "lägg till ytterligare prefix på alla rader i utdata"
|
|
|
|
#: diff.c:5355
|
|
msgid "do not show any source or destination prefix"
|
|
msgstr "visa inte käll- eller målprefix"
|
|
|
|
#: diff.c:5358
|
|
msgid "show context between diff hunks up to the specified number of lines"
|
|
msgstr "visa sammnhang mellan diff-stycken upp till angivet antal rader"
|
|
|
|
#: diff.c:5362 diff.c:5367 diff.c:5372
|
|
msgid "<char>"
|
|
msgstr "<tecken>"
|
|
|
|
#: diff.c:5363
|
|
msgid "specify the character to indicate a new line instead of '+'"
|
|
msgstr "ange tecken för att ange ny rad istället för \"+\""
|
|
|
|
#: diff.c:5368
|
|
msgid "specify the character to indicate an old line instead of '-'"
|
|
msgstr "ange tecken för att ange gammal rad istället för \"-\""
|
|
|
|
#: diff.c:5373
|
|
msgid "specify the character to indicate a context instead of ' '"
|
|
msgstr "ange tecken för att ange sammanhang istället för \" \""
|
|
|
|
#: diff.c:5376
|
|
msgid "Diff rename options"
|
|
msgstr "Diff-namnbytesflaggor"
|
|
|
|
#: diff.c:5377
|
|
msgid "<n>[/<m>]"
|
|
msgstr "<n>[/<m>]"
|
|
|
|
#: diff.c:5378
|
|
msgid "break complete rewrite changes into pairs of delete and create"
|
|
msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
|
|
|
|
#: diff.c:5382
|
|
msgid "detect renames"
|
|
msgstr "detektera namnändringar"
|
|
|
|
#: diff.c:5386
|
|
msgid "omit the preimage for deletes"
|
|
msgstr "ta bort för-version för borttagningar"
|
|
|
|
#: diff.c:5389
|
|
msgid "detect copies"
|
|
msgstr "detektera kopior"
|
|
|
|
#: diff.c:5393
|
|
msgid "use unmodified files as source to find copies"
|
|
msgstr "använd oförändrade som källa för att hitta kopior"
|
|
|
|
#: diff.c:5395
|
|
msgid "disable rename detection"
|
|
msgstr "inaktivera detektering av namnbyten"
|
|
|
|
#: diff.c:5398
|
|
msgid "use empty blobs as rename source"
|
|
msgstr "använd tomma blob:ar som namnändringskälla"
|
|
|
|
#: diff.c:5400
|
|
msgid "continue listing the history of a file beyond renames"
|
|
msgstr "fortsätt lista historiken för en fil bortom namnändringar"
|
|
|
|
#: diff.c:5403
|
|
msgid ""
|
|
"prevent rename/copy detection if the number of rename/copy targets exceeds "
|
|
"given limit"
|
|
msgstr ""
|
|
"förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
|
|
"given gräns"
|
|
|
|
#: diff.c:5405
|
|
msgid "Diff algorithm options"
|
|
msgstr "Alternativ för diff-algoritm"
|
|
|
|
#: diff.c:5407
|
|
msgid "produce the smallest possible diff"
|
|
msgstr "skapa minsta möjliga diff"
|
|
|
|
#: diff.c:5410
|
|
msgid "ignore whitespace when comparing lines"
|
|
msgstr "ignorera blanktecken vid radjämförelse"
|
|
|
|
#: diff.c:5413
|
|
msgid "ignore changes in amount of whitespace"
|
|
msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
|
|
|
|
#: diff.c:5416
|
|
msgid "ignore changes in whitespace at EOL"
|
|
msgstr "ignorera blanktecken vid radslut"
|
|
|
|
#: diff.c:5419
|
|
msgid "ignore carrier-return at the end of line"
|
|
msgstr "ignorera CR-tecken vid radslut"
|
|
|
|
#: diff.c:5422
|
|
msgid "ignore changes whose lines are all blank"
|
|
msgstr "ignorera ändringar i rader som är helt blanka"
|
|
|
|
#: diff.c:5425
|
|
msgid "heuristic to shift diff hunk boundaries for easy reading"
|
|
msgstr "heuristik för att flytta diff-gränser för lättare läsning"
|
|
|
|
#: diff.c:5428
|
|
msgid "generate diff using the \"patience diff\" algorithm"
|
|
msgstr "skapa diffar med algoritmen \"patience diff\""
|
|
|
|
#: diff.c:5432
|
|
msgid "generate diff using the \"histogram diff\" algorithm"
|
|
msgstr "skapa diffar med algoritmen \"histogram diff\""
|
|
|
|
#: diff.c:5434
|
|
msgid "<algorithm>"
|
|
msgstr "<algoritm>"
|
|
|
|
#: diff.c:5435
|
|
msgid "choose a diff algorithm"
|
|
msgstr "välj en diff-algoritm"
|
|
|
|
#: diff.c:5437
|
|
msgid "<text>"
|
|
msgstr "<text>"
|
|
|
|
#: diff.c:5438
|
|
msgid "generate diff using the \"anchored diff\" algorithm"
|
|
msgstr "skapa diffar med algoritmen \"anchored diff\""
|
|
|
|
#: diff.c:5440 diff.c:5449 diff.c:5452
|
|
msgid "<mode>"
|
|
msgstr "<läge>"
|
|
|
|
#: diff.c:5441
|
|
msgid "show word diff, using <mode> to delimit changed words"
|
|
msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
|
|
|
|
#: diff.c:5443 diff.c:5446 diff.c:5491
|
|
msgid "<regex>"
|
|
msgstr "<reguttr>"
|
|
|
|
#: diff.c:5444
|
|
msgid "use <regex> to decide what a word is"
|
|
msgstr "använd <reguttr> för att bestämma vad som är ett ord"
|
|
|
|
#: diff.c:5447
|
|
msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
|
|
msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
|
|
|
|
#: diff.c:5450
|
|
msgid "moved lines of code are colored differently"
|
|
msgstr "flyttade kodrader färgas på annat sätt"
|
|
|
|
#: diff.c:5453
|
|
msgid "how white spaces are ignored in --color-moved"
|
|
msgstr "hur blanktecken ignoreras i --color-moved"
|
|
|
|
#: diff.c:5456
|
|
msgid "Other diff options"
|
|
msgstr "Andra diff-flaggor"
|
|
|
|
#: diff.c:5458
|
|
msgid "when run from subdir, exclude changes outside and show relative paths"
|
|
msgstr ""
|
|
"vid start från underkatalog, uteslut ändringar utanför och visa relativa "
|
|
"sökvägar"
|
|
|
|
#: diff.c:5462
|
|
msgid "treat all files as text"
|
|
msgstr "hantera alla filer som text"
|
|
|
|
#: diff.c:5464
|
|
msgid "swap two inputs, reverse the diff"
|
|
msgstr "växla två indatafiler, vänd diffen"
|
|
|
|
#: diff.c:5466
|
|
msgid "exit with 1 if there were differences, 0 otherwise"
|
|
msgstr "avsluta med 1 vid ändringar, annars 0"
|
|
|
|
#: diff.c:5468
|
|
msgid "disable all output of the program"
|
|
msgstr "slå av alla utdata från programmet"
|
|
|
|
#: diff.c:5470
|
|
msgid "allow an external diff helper to be executed"
|
|
msgstr "tillåt köra en extern diff-hjälpare"
|
|
|
|
#: diff.c:5472
|
|
msgid "run external text conversion filters when comparing binary files"
|
|
msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
|
|
|
|
#: diff.c:5474
|
|
msgid "<when>"
|
|
msgstr "<när>"
|
|
|
|
#: diff.c:5475
|
|
msgid "ignore changes to submodules in the diff generation"
|
|
msgstr "ignorera ändringar i undermoduler när diffen skapas"
|
|
|
|
#: diff.c:5478
|
|
msgid "<format>"
|
|
msgstr "<format>"
|
|
|
|
#: diff.c:5479
|
|
msgid "specify how differences in submodules are shown"
|
|
msgstr "ange hur ändringar i undermoduler visas"
|
|
|
|
#: diff.c:5483
|
|
msgid "hide 'git add -N' entries from the index"
|
|
msgstr "dölj \"git add -N\"-poster från indexet"
|
|
|
|
#: diff.c:5486
|
|
msgid "treat 'git add -N' entries as real in the index"
|
|
msgstr "tolka \"git add -N\"-poster som äkta i indexet"
|
|
|
|
#: diff.c:5488
|
|
msgid "<string>"
|
|
msgstr "<sträng>"
|
|
|
|
#: diff.c:5489
|
|
msgid ""
|
|
"look for differences that change the number of occurrences of the specified "
|
|
"string"
|
|
msgstr "se efter ändringar som ändrar antalet förekomster av angiven sträng"
|
|
|
|
#: diff.c:5492
|
|
msgid ""
|
|
"look for differences that change the number of occurrences of the specified "
|
|
"regex"
|
|
msgstr ""
|
|
"se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
|
|
"uttryck"
|
|
|
|
#: diff.c:5495
|
|
msgid "show all changes in the changeset with -S or -G"
|
|
msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
|
|
|
|
#: diff.c:5498
|
|
msgid "treat <string> in -S as extended POSIX regular expression"
|
|
msgstr "tolka <sträng> i -S som utökade POSIX-reguljära uttryck"
|
|
|
|
#: diff.c:5501
|
|
msgid "control the order in which files appear in the output"
|
|
msgstr "styr ordningen i vilken filer visas i utdata"
|
|
|
|
#: diff.c:5502
|
|
msgid "<object-id>"
|
|
msgstr "<objekt-id>"
|
|
|
|
#: diff.c:5503
|
|
msgid ""
|
|
"look for differences that change the number of occurrences of the specified "
|
|
"object"
|
|
msgstr "se efter ändringar som ändrar antalet förekomster av angivet objekt"
|
|
|
|
#: diff.c:5505
|
|
msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
|
|
msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
|
|
|
|
#: diff.c:5506
|
|
msgid "select files by diff type"
|
|
msgstr "välj filter efter diff-typ"
|
|
|
|
#: diff.c:5508
|
|
msgid "<file>"
|
|
msgstr "<fil>"
|
|
|
|
#: diff.c:5509
|
|
msgid "Output to a specific file"
|
|
msgstr "Skriv utdata till en specifik fil"
|
|
|
|
#: diff.c:6164
|
|
msgid "inexact rename detection was skipped due to too many files."
|
|
msgstr ""
|
|
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
|
|
|
|
#: diff.c:6167
|
|
msgid "only found copies from modified paths due to too many files."
|
|
msgstr "hittade bara kopior från ändrade sökvägar på grund av för många filer."
|
|
|
|
#: diff.c:6170
|
|
#, c-format
|
|
msgid ""
|
|
"you may want to set your %s variable to at least %d and retry the command."
|
|
msgstr ""
|
|
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
|
|
|
|
#: dir.c:555
|
|
#, c-format
|
|
msgid "pathspec '%s' did not match any file(s) known to git"
|
|
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några av git kända filer"
|
|
|
|
#: dir.c:695 dir.c:724 dir.c:737
|
|
#, c-format
|
|
msgid "unrecognized pattern: '%s'"
|
|
msgstr "okänt mönster: %s"
|
|
|
|
#: dir.c:754 dir.c:768
|
|
#, c-format
|
|
msgid "unrecognized negative pattern: '%s'"
|
|
msgstr "okänt negativt mönster: %s"
|
|
|
|
#: dir.c:786
|
|
#, c-format
|
|
msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
|
|
msgstr ""
|
|
"din \"sparse-checkout\"-fil kan ha problem: mönstret \"%s\" förekommer flera "
|
|
"gånger"
|
|
|
|
#: dir.c:796
|
|
msgid "disabling cone pattern matching"
|
|
msgstr "inaktiverar konmönstermatchning"
|
|
|
|
#: dir.c:1173
|
|
#, c-format
|
|
msgid "cannot use %s as an exclude file"
|
|
msgstr "kan inte använda %s som exkluderingsfil"
|
|
|
|
#: dir.c:2144
|
|
#, c-format
|
|
msgid "could not open directory '%s'"
|
|
msgstr "kunde inte öppna katalogen \"%s\""
|
|
|
|
#: dir.c:2479
|
|
msgid "failed to get kernel name and information"
|
|
msgstr "misslyckades hämta kärnans namn och information"
|
|
|
|
#: dir.c:2603
|
|
msgid "untracked cache is disabled on this system or location"
|
|
msgstr "ospårad cache är inaktiverad på systemet eller platsen"
|
|
|
|
#: dir.c:3407
|
|
#, c-format
|
|
msgid "index file corrupt in repo %s"
|
|
msgstr "indexfilen trasig i arkivet %s"
|
|
|
|
#: dir.c:3452 dir.c:3457
|
|
#, c-format
|
|
msgid "could not create directories for %s"
|
|
msgstr "kunde inte skapa kataloger för %s"
|
|
|
|
#: dir.c:3486
|
|
#, c-format
|
|
msgid "could not migrate git directory from '%s' to '%s'"
|
|
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
|
|
|
|
#: editor.c:73
|
|
#, c-format
|
|
msgid "hint: Waiting for your editor to close the file...%c"
|
|
msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
|
|
|
|
#: entry.c:178
|
|
msgid "Filtering content"
|
|
msgstr "Filtrerar innehåll"
|
|
|
|
#: entry.c:476
|
|
#, c-format
|
|
msgid "could not stat file '%s'"
|
|
msgstr "kunde inte ta status på filen \"%s\""
|
|
|
|
#: environment.c:149
|
|
#, c-format
|
|
msgid "bad git namespace path \"%s\""
|
|
msgstr "felaktig git-namnrymdssökväg \"%s\""
|
|
|
|
#: environment.c:331
|
|
#, c-format
|
|
msgid "could not set GIT_DIR to '%s'"
|
|
msgstr "kunde inte ställa in GIT_DIR till \"%s\""
|
|
|
|
#: exec-cmd.c:363
|
|
#, c-format
|
|
msgid "too many args to run %s"
|
|
msgstr "för många flaggor för att köra %s"
|
|
|
|
#: fetch-pack.c:150
|
|
msgid "git fetch-pack: expected shallow list"
|
|
msgstr "git fetch-pack: förväntade grund lista"
|
|
|
|
#: fetch-pack.c:153
|
|
msgid "git fetch-pack: expected a flush packet after shallow list"
|
|
msgstr "git fetch-pack: förväntade ett flush-paket efter grund lista"
|
|
|
|
#: fetch-pack.c:164
|
|
msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
|
|
msgstr "git fetch-pack: förväntade ACK/NAK, fick flush-paket"
|
|
|
|
#: fetch-pack.c:184
|
|
#, c-format
|
|
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
|
|
msgstr "git fetch-pack: förväntade ACK/NAK, fick \"%s\""
|
|
|
|
#: fetch-pack.c:195
|
|
msgid "unable to write to remote"
|
|
msgstr "kunde inte skriva till fjärren"
|
|
|
|
#: fetch-pack.c:257
|
|
msgid "--stateless-rpc requires multi_ack_detailed"
|
|
msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
|
|
|
|
#: fetch-pack.c:356 fetch-pack.c:1340
|
|
#, c-format
|
|
msgid "invalid shallow line: %s"
|
|
msgstr "ogiltig \"shallow\"-rad: %s"
|
|
|
|
#: fetch-pack.c:362 fetch-pack.c:1346
|
|
#, c-format
|
|
msgid "invalid unshallow line: %s"
|
|
msgstr "ogiltig \"unshallow\"-rad: %s"
|
|
|
|
#: fetch-pack.c:364 fetch-pack.c:1348
|
|
#, c-format
|
|
msgid "object not found: %s"
|
|
msgstr "objektet hittades inte: %s"
|
|
|
|
#: fetch-pack.c:367 fetch-pack.c:1351
|
|
#, c-format
|
|
msgid "error in object: %s"
|
|
msgstr "fel i objekt: %s"
|
|
|
|
#: fetch-pack.c:369 fetch-pack.c:1353
|
|
#, c-format
|
|
msgid "no shallow found: %s"
|
|
msgstr "ingen \"shallow\" hittades: %s"
|
|
|
|
#: fetch-pack.c:372 fetch-pack.c:1357
|
|
#, c-format
|
|
msgid "expected shallow/unshallow, got %s"
|
|
msgstr "förväntade shallow/unshallow, fick %s"
|
|
|
|
#: fetch-pack.c:414
|
|
#, c-format
|
|
msgid "got %s %d %s"
|
|
msgstr "fick %s %d %s"
|
|
|
|
#: fetch-pack.c:431
|
|
#, c-format
|
|
msgid "invalid commit %s"
|
|
msgstr "ogiltig incheckning %s"
|
|
|
|
#: fetch-pack.c:462
|
|
msgid "giving up"
|
|
msgstr "ger upp"
|
|
|
|
#: fetch-pack.c:475 progress.c:323
|
|
msgid "done"
|
|
msgstr "klart"
|
|
|
|
#: fetch-pack.c:487
|
|
#, c-format
|
|
msgid "got %s (%d) %s"
|
|
msgstr "fick %s (%d) %s"
|
|
|
|
#: fetch-pack.c:533
|
|
#, c-format
|
|
msgid "Marking %s as complete"
|
|
msgstr "Markerar %s som komplett"
|
|
|
|
#: fetch-pack.c:754
|
|
#, c-format
|
|
msgid "already have %s (%s)"
|
|
msgstr "har redan %s (%s)"
|
|
|
|
#: fetch-pack.c:818
|
|
msgid "fetch-pack: unable to fork off sideband demultiplexer"
|
|
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
|
|
|
|
#: fetch-pack.c:826
|
|
msgid "protocol error: bad pack header"
|
|
msgstr "protokollfel: felaktigt packhuvud"
|
|
|
|
#: fetch-pack.c:900
|
|
#, c-format
|
|
msgid "fetch-pack: unable to fork off %s"
|
|
msgstr "fetch-patch: kunde inte grena av %s"
|
|
|
|
#: fetch-pack.c:916
|
|
#, c-format
|
|
msgid "%s failed"
|
|
msgstr "%s misslyckades"
|
|
|
|
#: fetch-pack.c:918
|
|
msgid "error in sideband demultiplexer"
|
|
msgstr "fel i sidbands-avmultiplexare"
|
|
|
|
#: fetch-pack.c:965
|
|
#, c-format
|
|
msgid "Server version is %.*s"
|
|
msgstr "Serverversionen är %.*s"
|
|
|
|
#: 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 "Servern stöder %s"
|
|
|
|
#: fetch-pack.c:972
|
|
msgid "Server does not support shallow clients"
|
|
msgstr "Servern stöder inte klienter med grunda arkiv"
|
|
|
|
#: fetch-pack.c:1032
|
|
msgid "Server does not support --shallow-since"
|
|
msgstr "Servern stöder inte --shallow-since"
|
|
|
|
#: fetch-pack.c:1037
|
|
msgid "Server does not support --shallow-exclude"
|
|
msgstr "Servern stöder inte --shallow-exclude"
|
|
|
|
#: fetch-pack.c:1041
|
|
msgid "Server does not support --deepen"
|
|
msgstr "Servern stöder inte --deepen"
|
|
|
|
#: fetch-pack.c:1058
|
|
msgid "no common commits"
|
|
msgstr "inga gemensamma incheckningar"
|
|
|
|
#: fetch-pack.c:1070 fetch-pack.c:1536
|
|
msgid "git fetch-pack: fetch failed."
|
|
msgstr "git fetch-patch: hämtning misslyckades."
|
|
|
|
#: fetch-pack.c:1209
|
|
msgid "Server does not support shallow requests"
|
|
msgstr "Servern stöder inte grunda förfrågningar"
|
|
|
|
#: fetch-pack.c:1216
|
|
msgid "Server supports filter"
|
|
msgstr "Servern stöder filter"
|
|
|
|
#: fetch-pack.c:1239
|
|
msgid "unable to write request to remote"
|
|
msgstr "kunde inte skriva anrop till fjärren"
|
|
|
|
#: fetch-pack.c:1257
|
|
#, c-format
|
|
msgid "error reading section header '%s'"
|
|
msgstr "fel vid läsning av styckehuvudet \"%s\""
|
|
|
|
#: fetch-pack.c:1263
|
|
#, c-format
|
|
msgid "expected '%s', received '%s'"
|
|
msgstr "förväntade \"%s\", tog emot \"%s\""
|
|
|
|
#: fetch-pack.c:1303
|
|
#, c-format
|
|
msgid "unexpected acknowledgment line: '%s'"
|
|
msgstr "förväntade bekräftelserad: \"%s\""
|
|
|
|
#: fetch-pack.c:1308
|
|
#, c-format
|
|
msgid "error processing acks: %d"
|
|
msgstr "fel vid hantering av bekräftelser: %d"
|
|
|
|
#: fetch-pack.c:1318
|
|
msgid "expected packfile to be sent after 'ready'"
|
|
msgstr "väntade att paketfil skulle sändas efter \"ready\""
|
|
|
|
#: fetch-pack.c:1320
|
|
msgid "expected no other sections to be sent after no 'ready'"
|
|
msgstr ""
|
|
"väntade inte att några ytterligare sektioner skulle sändas efter \"ready\""
|
|
|
|
#: fetch-pack.c:1362
|
|
#, c-format
|
|
msgid "error processing shallow info: %d"
|
|
msgstr "fel vid hantering av grund (\"shallow\") info: %d"
|
|
|
|
#: fetch-pack.c:1409
|
|
#, c-format
|
|
msgid "expected wanted-ref, got '%s'"
|
|
msgstr "förväntade wanted-ref, fick %s"
|
|
|
|
#: fetch-pack.c:1414
|
|
#, c-format
|
|
msgid "unexpected wanted-ref: '%s'"
|
|
msgstr "oväntad wanted-ref: \"%s\""
|
|
|
|
#: fetch-pack.c:1419
|
|
#, c-format
|
|
msgid "error processing wanted refs: %d"
|
|
msgstr "fel vid hantering av önskade referenser: %d"
|
|
|
|
#: fetch-pack.c:1762
|
|
msgid "no matching remote head"
|
|
msgstr "inget motsvarande fjärrhuvud"
|
|
|
|
#: fetch-pack.c:1785 builtin/clone.c:689
|
|
msgid "remote did not send all necessary objects"
|
|
msgstr "fjärren sände inte alla nödvändiga objekt"
|
|
|
|
#: fetch-pack.c:1812
|
|
#, c-format
|
|
msgid "no such remote ref %s"
|
|
msgstr "ingen sådan fjärreferens: %s"
|
|
|
|
#: fetch-pack.c:1815
|
|
#, c-format
|
|
msgid "Server does not allow request for unadvertised object %s"
|
|
msgstr "Servern tillåter inte förfrågan om ej tillkännagivet objekt %s"
|
|
|
|
#: gpg-interface.c:408
|
|
msgid "gpg failed to sign the data"
|
|
msgstr "gpg misslyckades signera data"
|
|
|
|
#: gpg-interface.c:434
|
|
msgid "could not create temporary file"
|
|
msgstr "kunde inte skapa temporära fil"
|
|
|
|
#: gpg-interface.c:437
|
|
#, c-format
|
|
msgid "failed writing detached signature to '%s'"
|
|
msgstr "misslyckades skriva fristående signatur till \"%s\""
|
|
|
|
#: graph.c:98
|
|
#, c-format
|
|
msgid "ignore invalid color '%.*s' in log.graphColors"
|
|
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
|
|
|
|
#: grep.c:668
|
|
msgid ""
|
|
"given pattern contains NULL byte (via -f <file>). This is only supported "
|
|
"with -P under PCRE v2"
|
|
msgstr ""
|
|
"angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
|
|
"P under PCRE v2"
|
|
|
|
#: grep.c:2128
|
|
#, c-format
|
|
msgid "'%s': unable to read %s"
|
|
msgstr "\"%s\" kunde inte läsa %s"
|
|
|
|
#: 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 "misslyckades ta status på \"%s\""
|
|
|
|
#: grep.c:2156
|
|
#, c-format
|
|
msgid "'%s': short read"
|
|
msgstr "\"%s\": kort läsning"
|
|
|
|
#: help.c:23
|
|
msgid "start a working area (see also: git help tutorial)"
|
|
msgstr "starta arbetskatalog (se också: git help tutorial)"
|
|
|
|
#: help.c:24
|
|
msgid "work on the current change (see also: git help everyday)"
|
|
msgstr "jobba med aktuell förändring (se också: git help everyday)"
|
|
|
|
#: help.c:25
|
|
msgid "examine the history and state (see also: git help revisions)"
|
|
msgstr "utforska historiken och tillståndet (se också: git help revisions)"
|
|
|
|
#: help.c:26
|
|
msgid "grow, mark and tweak your common history"
|
|
msgstr "utöka, markera och justera din gemensamma historik"
|
|
|
|
#: help.c:27
|
|
msgid "collaborate (see also: git help workflows)"
|
|
msgstr "samarbeta (se också: git help workflows)"
|
|
|
|
#: help.c:31
|
|
msgid "Main Porcelain Commands"
|
|
msgstr "Huvudsakliga porslinskommandon"
|
|
|
|
#: help.c:32
|
|
msgid "Ancillary Commands / Manipulators"
|
|
msgstr "Tilläggskommandon / manipulerare"
|
|
|
|
#: help.c:33
|
|
msgid "Ancillary Commands / Interrogators"
|
|
msgstr "Tilläggskommandon / frågare"
|
|
|
|
#: help.c:34
|
|
msgid "Interacting with Others"
|
|
msgstr "Interaktion med andra"
|
|
|
|
#: help.c:35
|
|
msgid "Low-level Commands / Manipulators"
|
|
msgstr "Lågnivåkommandon / maniupulerare"
|
|
|
|
#: help.c:36
|
|
msgid "Low-level Commands / Interrogators"
|
|
msgstr "Lågnivåkommandon / frågare"
|
|
|
|
#: help.c:37
|
|
msgid "Low-level Commands / Syncing Repositories"
|
|
msgstr "Lågnivåkommandon / synka arkiv"
|
|
|
|
#: help.c:38
|
|
msgid "Low-level Commands / Internal Helpers"
|
|
msgstr "Lågnivåkommandon / interna hjälpare"
|
|
|
|
#: help.c:298
|
|
#, c-format
|
|
msgid "available git commands in '%s'"
|
|
msgstr "git-kommandon tillgängliga i \"%s\""
|
|
|
|
#: help.c:305
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
msgstr "git-kommandon från andra platser i din $PATH"
|
|
|
|
#: help.c:314
|
|
msgid "These are common Git commands used in various situations:"
|
|
msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
|
|
|
|
#: help.c:363 git.c:98
|
|
#, c-format
|
|
msgid "unsupported command listing type '%s'"
|
|
msgstr "okänd kommandolisttyp \"%s\""
|
|
|
|
#: help.c:403
|
|
msgid "The common Git guides are:"
|
|
msgstr "De vanliga Git-vägledningarna är:"
|
|
|
|
#: help.c:512
|
|
msgid "See 'git help <command>' to read about a specific subcommand"
|
|
msgstr "Se \"git help <kommando>\" för att läsa om ett specifikt underkommando"
|
|
|
|
#: help.c:517
|
|
msgid "External commands"
|
|
msgstr "Externa kommandon"
|
|
|
|
#: help.c:532
|
|
msgid "Command aliases"
|
|
msgstr "Kommadoalias"
|
|
|
|
#: help.c:596
|
|
#, c-format
|
|
msgid ""
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
msgstr ""
|
|
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
|
|
"köra det. Kanske git-%s är trasigt?"
|
|
|
|
#: help.c:655
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
|
|
|
|
#: help.c:677
|
|
#, c-format
|
|
msgid "WARNING: You called a Git command named '%s', which does not exist."
|
|
msgstr "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns."
|
|
|
|
#: help.c:682
|
|
#, c-format
|
|
msgid "Continuing under the assumption that you meant '%s'."
|
|
msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
|
|
|
|
#: help.c:687
|
|
#, c-format
|
|
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
|
|
msgstr ""
|
|
"Fortsätter om %0.1f sekunder, under förutsättningen att du menade \"%s\"."
|
|
|
|
#: help.c:695
|
|
#, c-format
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
|
|
|
|
#: help.c:699
|
|
msgid ""
|
|
"\n"
|
|
"The most similar command is"
|
|
msgid_plural ""
|
|
"\n"
|
|
"The most similar commands are"
|
|
msgstr[0] ""
|
|
"\n"
|
|
"Mest likt kommando är"
|
|
msgstr[1] ""
|
|
"\n"
|
|
"Mest lika kommandon är"
|
|
|
|
#: help.c:714
|
|
msgid "git version [<options>]"
|
|
msgstr "git version [<flaggor>]"
|
|
|
|
#: help.c:783
|
|
#, c-format
|
|
msgid "%s: %s - %s"
|
|
msgstr "%s: %s - %s"
|
|
|
|
#: help.c:787
|
|
msgid ""
|
|
"\n"
|
|
"Did you mean this?"
|
|
msgid_plural ""
|
|
"\n"
|
|
"Did you mean one of these?"
|
|
msgstr[0] ""
|
|
"\n"
|
|
"Menade du detta?"
|
|
msgstr[1] ""
|
|
"\n"
|
|
"Menade du ett av dessa?"
|
|
|
|
#: ident.c:349
|
|
msgid ""
|
|
"\n"
|
|
"*** Please tell me who you are.\n"
|
|
"\n"
|
|
"Run\n"
|
|
"\n"
|
|
" git config --global user.email \"you@example.com\"\n"
|
|
" git config --global user.name \"Your Name\"\n"
|
|
"\n"
|
|
"to set your account's default identity.\n"
|
|
"Omit --global to set the identity only in this repository.\n"
|
|
"\n"
|
|
msgstr ""
|
|
"\n"
|
|
"*** Vänligen berätta vem du är.\n"
|
|
"\n"
|
|
"Kör\n"
|
|
"\n"
|
|
" git config --global user.email \"du@example.com\"\n"
|
|
" git config --global user.name \"Ditt Namn\"\n"
|
|
"\n"
|
|
"för att ställa in ditt kontos standardidentitet.\n"
|
|
"Kör utan --global för att endast ändra i aktuellt arkiv.\n"
|
|
"\n"
|
|
|
|
#: ident.c:379
|
|
msgid "no email was given and auto-detection is disabled"
|
|
msgstr "ingen e-post angavs och autodetektering är inaktiverad"
|
|
|
|
#: ident.c:384
|
|
#, c-format
|
|
msgid "unable to auto-detect email address (got '%s')"
|
|
msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
|
|
|
|
#: ident.c:401
|
|
msgid "no name was given and auto-detection is disabled"
|
|
msgstr "inget namn angavs och autodetektering är inaktiverad"
|
|
|
|
#: ident.c:407
|
|
#, c-format
|
|
msgid "unable to auto-detect name (got '%s')"
|
|
msgstr "kunde inte autodetektera namn (fick \"%s\")"
|
|
|
|
#: ident.c:415
|
|
#, c-format
|
|
msgid "empty ident name (for <%s>) not allowed"
|
|
msgstr "tomt ident-namn (för <%s>) ej tillåtet"
|
|
|
|
#: ident.c:421
|
|
#, c-format
|
|
msgid "name consists only of disallowed characters: %s"
|
|
msgstr "namnet består enbart av ej tillåtna tecken: %s"
|
|
|
|
#: ident.c:436 builtin/commit.c:635
|
|
#, c-format
|
|
msgid "invalid date format: %s"
|
|
msgstr "felaktigt datumformat: %s"
|
|
|
|
#: list-objects.c:127
|
|
#, c-format
|
|
msgid "entry '%s' in tree %s has tree mode, but is not a tree"
|
|
msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
|
|
|
|
#: list-objects.c:140
|
|
#, c-format
|
|
msgid "entry '%s' in tree %s has blob mode, but is not a blob"
|
|
msgstr "posten \"%s\" i trädet %s har blob-läge, men är inte en blob"
|
|
|
|
#: list-objects.c:375
|
|
#, c-format
|
|
msgid "unable to load root tree for commit %s"
|
|
msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
|
|
|
|
#: list-objects-filter.c:492
|
|
#, c-format
|
|
msgid "unable to access sparse blob in '%s'"
|
|
msgstr "kunde inte nå gles blob på \"%s\""
|
|
|
|
#: list-objects-filter.c:495
|
|
#, c-format
|
|
msgid "unable to parse sparse filter data in %s"
|
|
msgstr "kunde inte tolka gles filterdata i %s"
|
|
|
|
#: list-objects-filter-options.c:58
|
|
msgid "expected 'tree:<depth>'"
|
|
msgstr "förväntade \"tree:<djup>\""
|
|
|
|
#: list-objects-filter-options.c:73
|
|
msgid "sparse:path filters support has been dropped"
|
|
msgstr "sparse:sökväg-filter stöds inte längre"
|
|
|
|
#: list-objects-filter-options.c:86
|
|
#, c-format
|
|
msgid "invalid filter-spec '%s'"
|
|
msgstr "felaktig filterspecifikation: \"%s\""
|
|
|
|
#: list-objects-filter-options.c:102
|
|
#, c-format
|
|
msgid "must escape char in sub-filter-spec: '%c'"
|
|
msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
|
|
|
|
#: list-objects-filter-options.c:144
|
|
msgid "expected something after combine:"
|
|
msgstr "förväntade någonting efter combine:"
|
|
|
|
#: list-objects-filter-options.c:226
|
|
msgid "multiple filter-specs cannot be combined"
|
|
msgstr "flera filterspecifikationer kan inte kombineras"
|
|
|
|
#: lockfile.c:151
|
|
#, c-format
|
|
msgid ""
|
|
"Unable to create '%s.lock': %s.\n"
|
|
"\n"
|
|
"Another git process seems to be running in this repository, e.g.\n"
|
|
"an editor opened by 'git commit'. Please make sure all processes\n"
|
|
"are terminated then try again. If it still fails, a git process\n"
|
|
"may have crashed in this repository earlier:\n"
|
|
"remove the file manually to continue."
|
|
msgstr ""
|
|
"Kunde inte skapa \"%s.lock\": %s.\n"
|
|
"\n"
|
|
"Det verkar som en annan git-process kör i det här arkivet, t.ex.\n"
|
|
"ett textredigeringsprogram startat av \"git commit\". Se till att\n"
|
|
"alla processer avslutats och försök sedan igen. Om det fortfarande\n"
|
|
"misslyckas kanske en git-process har kraschat i det här arkivet\n"
|
|
"tidigare:\n"
|
|
"ta bort filen manuellt för att fortsätta."
|
|
|
|
#: lockfile.c:159
|
|
#, c-format
|
|
msgid "Unable to create '%s.lock': %s"
|
|
msgstr "Kunde inte skapa \"%s.lock\": %s"
|
|
|
|
#: merge.c:41
|
|
msgid "failed to read the cache"
|
|
msgstr "misslyckades läsa cachen"
|
|
|
|
#: 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 "kunde inte skriva ny indexfil"
|
|
|
|
#: merge-recursive.c:356
|
|
msgid "(bad commit)\n"
|
|
msgstr "(felaktig incheckning)\n"
|
|
|
|
#: merge-recursive.c:379
|
|
#, c-format
|
|
msgid "add_cacheinfo failed for path '%s'; merge aborting."
|
|
msgstr ""
|
|
"add_cahceinfo misslyckades för sökvägen \"%s\"; avslutar sammanslagningen."
|
|
|
|
#: merge-recursive.c:388
|
|
#, c-format
|
|
msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
|
|
msgstr ""
|
|
"add_cacheinfo misslyckades uppdatera för sökvägen \"%s\"; avslutar "
|
|
"sammanslagningen."
|
|
|
|
#: merge-recursive.c:874
|
|
#, c-format
|
|
msgid "failed to create path '%s'%s"
|
|
msgstr "misslyckades skapa sökvägen \"%s\"%s"
|
|
|
|
#: merge-recursive.c:885
|
|
#, c-format
|
|
msgid "Removing %s to make room for subdirectory\n"
|
|
msgstr "Tar bort %s för att göra plats för underkatalog\n"
|
|
|
|
#: merge-recursive.c:899 merge-recursive.c:918
|
|
msgid ": perhaps a D/F conflict?"
|
|
msgstr ": kanske en K/F-konflikt?"
|
|
|
|
#: merge-recursive.c:908
|
|
#, c-format
|
|
msgid "refusing to lose untracked file at '%s'"
|
|
msgstr "vägrar förlora ospårad fil vid \"%s\""
|
|
|
|
#: merge-recursive.c:949 builtin/cat-file.c:41
|
|
#, c-format
|
|
msgid "cannot read object %s '%s'"
|
|
msgstr "kan inte läsa objektet %s: \"%s\""
|
|
|
|
#: merge-recursive.c:954
|
|
#, c-format
|
|
msgid "blob expected for %s '%s'"
|
|
msgstr "blob förväntades för %s \"%s\""
|
|
|
|
#: merge-recursive.c:979
|
|
#, c-format
|
|
msgid "failed to open '%s': %s"
|
|
msgstr "misslyckades öppna \"%s\": %s"
|
|
|
|
#: merge-recursive.c:990
|
|
#, c-format
|
|
msgid "failed to symlink '%s': %s"
|
|
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
|
|
|
|
#: merge-recursive.c:995
|
|
#, c-format
|
|
msgid "do not know what to do with %06o %s '%s'"
|
|
msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
|
|
|
|
#: merge-recursive.c:1191
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (not checked out)"
|
|
msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
|
|
|
|
#: merge-recursive.c:1198
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (commits not present)"
|
|
msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
|
|
|
|
#: merge-recursive.c:1205
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (commits don't follow merge-base)"
|
|
msgstr ""
|
|
"Misslyckades slå ihop undermodulen %s (incheckningar följer inte "
|
|
"sammanslagningsbasen)"
|
|
|
|
#: merge-recursive.c:1213 merge-recursive.c:1225
|
|
#, c-format
|
|
msgid "Fast-forwarding submodule %s to the following commit:"
|
|
msgstr "Snabbspolar undermodulen %s till följande incheckning:"
|
|
|
|
#: merge-recursive.c:1216 merge-recursive.c:1228
|
|
#, c-format
|
|
msgid "Fast-forwarding submodule %s"
|
|
msgstr "Snabbspolar undermodulen %s"
|
|
|
|
#: merge-recursive.c:1251
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (merge following commits not found)"
|
|
msgstr ""
|
|
"Misslyckades slå ihop undermodulen %s (sammanslagning efter incheckningar "
|
|
"hittades inte)"
|
|
|
|
#: merge-recursive.c:1255
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (not fast-forward)"
|
|
msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
|
|
|
|
#: merge-recursive.c:1256
|
|
msgid "Found a possible merge resolution for the submodule:\n"
|
|
msgstr "Hittade en möjlig lösning av sammanslagning för undermodulen:\n"
|
|
|
|
#: merge-recursive.c:1259
|
|
#, c-format
|
|
msgid ""
|
|
"If this is correct simply add it to the index for example\n"
|
|
"by using:\n"
|
|
"\n"
|
|
" git update-index --cacheinfo 160000 %s \"%s\"\n"
|
|
"\n"
|
|
"which will accept this suggestion.\n"
|
|
msgstr ""
|
|
"Om detta är riktigt lägger du bara till det i indexet, till\n"
|
|
"exempel så här:\n"
|
|
"\n"
|
|
" git update-index --cacheinfo 160000 %s \"%s\"\n"
|
|
"\n"
|
|
"vilket godtar lösningen.\n"
|
|
|
|
#: merge-recursive.c:1268
|
|
#, c-format
|
|
msgid "Failed to merge submodule %s (multiple merges found)"
|
|
msgstr ""
|
|
"Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
|
|
|
|
#: merge-recursive.c:1341
|
|
msgid "Failed to execute internal merge"
|
|
msgstr "Misslyckades exekvera intern sammanslagning"
|
|
|
|
#: merge-recursive.c:1346
|
|
#, c-format
|
|
msgid "Unable to add %s to database"
|
|
msgstr "Kunde inte lägga till %s till databasen"
|
|
|
|
#: merge-recursive.c:1378
|
|
#, c-format
|
|
msgid "Auto-merging %s"
|
|
msgstr "Slår ihop %s automatiskt"
|
|
|
|
#: merge-recursive.c:1402
|
|
#, c-format
|
|
msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
|
|
msgstr "Fel: Vägrar förlora ospårad fil vid %s; skriver till %s istället."
|
|
|
|
#: merge-recursive.c:1474
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
"in tree."
|
|
msgstr ""
|
|
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
|
|
"i trädet."
|
|
|
|
#: merge-recursive.c:1479
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
"left in tree."
|
|
msgstr ""
|
|
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
|
|
"%s lämnad i trädet."
|
|
|
|
#: merge-recursive.c:1486
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
|
|
"in tree at %s."
|
|
msgstr ""
|
|
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
|
|
"i trädet vid %s."
|
|
|
|
#: merge-recursive.c:1491
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
|
|
"left in tree at %s."
|
|
msgstr ""
|
|
"KONFLIKT (%s/radera): %s raderad i %s och %s till %s i %s. Versionen %s av "
|
|
"%s lämnad i trädet vid %s."
|
|
|
|
#: merge-recursive.c:1526
|
|
msgid "rename"
|
|
msgstr "namnbyte"
|
|
|
|
#: merge-recursive.c:1526
|
|
msgid "renamed"
|
|
msgstr "namnbytt"
|
|
|
|
#: merge-recursive.c:1577 merge-recursive.c:2472 merge-recursive.c:3117
|
|
#, c-format
|
|
msgid "Refusing to lose dirty file at %s"
|
|
msgstr "Vägrar förlora lortig fil vid \"%s\""
|
|
|
|
#: merge-recursive.c:1587
|
|
#, c-format
|
|
msgid "Refusing to lose untracked file at %s, even though it's in the way."
|
|
msgstr "Vägrar förlora ospårad fil vid %s, trots att den är i vägen."
|
|
|
|
#: merge-recursive.c:1645
|
|
#, c-format
|
|
msgid "CONFLICT (rename/add): Rename %s->%s in %s. Added %s in %s"
|
|
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. Lade till %s i %s"
|
|
|
|
#: merge-recursive.c:1676
|
|
#, c-format
|
|
msgid "%s is a directory in %s adding as %s instead"
|
|
msgstr "%s är en katalog i %s lägger till som %s istället"
|
|
|
|
#: merge-recursive.c:1681
|
|
#, c-format
|
|
msgid "Refusing to lose untracked file at %s; adding as %s instead"
|
|
msgstr "Vägrar förlora ospårad fil vid %s; lägger till som %s istället"
|
|
|
|
#: merge-recursive.c:1708
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
|
|
"\"->\"%s\" in \"%s\"%s"
|
|
msgstr ""
|
|
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
|
|
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
|
|
|
|
#: merge-recursive.c:1713
|
|
msgid " (left unresolved)"
|
|
msgstr " (lämnad olöst)"
|
|
|
|
#: merge-recursive.c:1793
|
|
#, c-format
|
|
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
|
|
msgstr ""
|
|
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
|
|
|
|
#: merge-recursive.c:2056
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (directory rename split): Unclear where to place %s because "
|
|
"directory %s was renamed to multiple other directories, with no destination "
|
|
"getting a majority of the files."
|
|
msgstr ""
|
|
"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
|
|
"katalogen %s bytte namn till flera andra kataloger, utan att någon "
|
|
"destination fick en majoritet av filerna."
|
|
|
|
#: merge-recursive.c:2088
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
|
|
"implicit directory rename(s) putting the following path(s) there: %s."
|
|
msgstr ""
|
|
"KONFLIKT (implicit nämnändrad kat): Befintlig fil/kat vid %s är i vägen för "
|
|
"implicit namnändrad(e) katalog(er) som lägger dit följande sökväg(ar): %s."
|
|
|
|
#: merge-recursive.c:2098
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
|
|
"implicit directory renames tried to put these paths there: %s"
|
|
msgstr ""
|
|
"KONFLIKT (implicit namnändrad kat): Kan inte koppla mer än en sökväg till "
|
|
"%s; implicita katalognamnändringar försökte lägga följande sökvägar där: %s"
|
|
|
|
#: merge-recursive.c:2190
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
|
|
">%s in %s"
|
|
msgstr ""
|
|
"KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
|
|
"%s->%s i %s"
|
|
|
|
#: merge-recursive.c:2435
|
|
#, c-format
|
|
msgid ""
|
|
"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
|
|
"renamed."
|
|
msgstr ""
|
|
"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
|
|
"bytt namn."
|
|
|
|
#: merge-recursive.c:2961
|
|
#, c-format
|
|
msgid "cannot read object %s"
|
|
msgstr "kan inte läsa objektet %s"
|
|
|
|
#: merge-recursive.c:2964
|
|
#, c-format
|
|
msgid "object %s is not a blob"
|
|
msgstr "objektet %s är inte en blob"
|
|
|
|
#: merge-recursive.c:3028
|
|
msgid "modify"
|
|
msgstr "ändra"
|
|
|
|
#: merge-recursive.c:3028
|
|
msgid "modified"
|
|
msgstr "ändrad"
|
|
|
|
#: merge-recursive.c:3040
|
|
msgid "content"
|
|
msgstr "innehåll"
|
|
|
|
#: merge-recursive.c:3044
|
|
msgid "add/add"
|
|
msgstr "tillägg/tillägg"
|
|
|
|
#: merge-recursive.c:3067
|
|
#, c-format
|
|
msgid "Skipped %s (merged same as existing)"
|
|
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
|
|
|
|
#: merge-recursive.c:3089 git-submodule.sh:1003
|
|
msgid "submodule"
|
|
msgstr "undermodul"
|
|
|
|
#: merge-recursive.c:3090
|
|
#, c-format
|
|
msgid "CONFLICT (%s): Merge conflict in %s"
|
|
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
|
|
|
|
#: merge-recursive.c:3120
|
|
#, c-format
|
|
msgid "Adding as %s instead"
|
|
msgstr "Lägger till som %s istället"
|
|
|
|
#: merge-recursive.c:3203
|
|
#, c-format
|
|
msgid ""
|
|
"Path updated: %s added in %s inside a directory that was renamed in %s; "
|
|
"moving it to %s."
|
|
msgstr ""
|
|
"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
|
|
"flyttar den till %s."
|
|
|
|
#: merge-recursive.c:3206
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (file location): %s added in %s inside a directory that was renamed "
|
|
"in %s, suggesting it should perhaps be moved to %s."
|
|
msgstr ""
|
|
"KONFLIKT (filplacering): %s lade till %s inuti en katalog som bytte namn i "
|
|
"%s, föreslår att den bör flyttas till%s."
|
|
|
|
#: merge-recursive.c:3210
|
|
#, c-format
|
|
msgid ""
|
|
"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
|
|
"%s; moving it to %s."
|
|
msgstr ""
|
|
"Uppdaterad sökväg: %s bytte namn till %s i %s, inuti en katalog som bytte "
|
|
"namn i %s; flyttar den till %s."
|
|
|
|
#: merge-recursive.c:3213
|
|
#, c-format
|
|
msgid ""
|
|
"CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
|
|
"was renamed in %s, suggesting it should perhaps be moved to %s."
|
|
msgstr ""
|
|
"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
|
|
"bytte namn i %s; flyttar den till %s."
|
|
|
|
#: merge-recursive.c:3327
|
|
#, c-format
|
|
msgid "Removing %s"
|
|
msgstr "Tar bort %s"
|
|
|
|
#: merge-recursive.c:3350
|
|
msgid "file/directory"
|
|
msgstr "fil/katalog"
|
|
|
|
#: merge-recursive.c:3355
|
|
msgid "directory/file"
|
|
msgstr "katalog/fil"
|
|
|
|
#: merge-recursive.c:3362
|
|
#, c-format
|
|
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
|
|
msgstr ""
|
|
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
|
|
|
|
#: merge-recursive.c:3371
|
|
#, c-format
|
|
msgid "Adding %s"
|
|
msgstr "Lägger till %s"
|
|
|
|
#: merge-recursive.c:3380
|
|
#, c-format
|
|
msgid "CONFLICT (add/add): Merge conflict in %s"
|
|
msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
|
|
|
|
#: merge-recursive.c:3424
|
|
msgid "Already up to date!"
|
|
msgstr "Redan à jour!"
|
|
|
|
#: merge-recursive.c:3433
|
|
#, c-format
|
|
msgid "merging of trees %s and %s failed"
|
|
msgstr "sammanslagning av träden %s och %s misslyckades"
|
|
|
|
#: merge-recursive.c:3537
|
|
msgid "Merging:"
|
|
msgstr "Slår ihop:"
|
|
|
|
#: merge-recursive.c:3550
|
|
#, c-format
|
|
msgid "found %u common ancestor:"
|
|
msgid_plural "found %u common ancestors:"
|
|
msgstr[0] "hittade %u gemensam förfader:"
|
|
msgstr[1] "hittade %u gemensamma förfäder:"
|
|
|
|
#: merge-recursive.c:3600
|
|
msgid "merge returned no commit"
|
|
msgstr "sammanslagningen returnerade ingen incheckning"
|
|
|
|
#: merge-recursive.c:3659
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
" %s"
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av "
|
|
"sammanslagning:\n"
|
|
" %s"
|
|
|
|
#: merge-recursive.c:3756
|
|
#, c-format
|
|
msgid "Could not parse object '%s'"
|
|
msgstr "Kunde inte tolka objektet \"%s\""
|
|
|
|
#: merge-recursive.c:3774 builtin/merge.c:697 builtin/merge.c:877
|
|
msgid "Unable to write index."
|
|
msgstr "Kunde inte skriva indexet."
|
|
|
|
#: midx.c:68
|
|
#, c-format
|
|
msgid "multi-pack-index file %s is too small"
|
|
msgstr "multi-pack-indexfilen %s är för liten"
|
|
|
|
#: midx.c:84
|
|
#, c-format
|
|
msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
|
|
msgstr "multi-pack-indexsignaturen 0x%08x stämmer inte med signaturen 0x%08x"
|
|
|
|
#: midx.c:89
|
|
#, c-format
|
|
msgid "multi-pack-index version %d not recognized"
|
|
msgstr "multi-pack-indexversionen %d stöds inte"
|
|
|
|
#: midx.c:94
|
|
#, c-format
|
|
msgid "hash version %u does not match"
|
|
msgstr "hash-versionen %u stämmer inte"
|
|
|
|
#: midx.c:108
|
|
msgid "invalid chunk offset (too large)"
|
|
msgstr "felaktigt offset för stycke (för stort)"
|
|
|
|
#: midx.c:132
|
|
msgid "terminating multi-pack-index chunk id appears earlier than expected"
|
|
msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat"
|
|
|
|
#: midx.c:145
|
|
msgid "multi-pack-index missing required pack-name chunk"
|
|
msgstr "multi-pack-index saknar krävd paketnamn-stycke"
|
|
|
|
#: midx.c:147
|
|
msgid "multi-pack-index missing required OID fanout chunk"
|
|
msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
|
|
|
|
#: midx.c:149
|
|
msgid "multi-pack-index missing required OID lookup chunk"
|
|
msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
|
|
|
|
#: midx.c:151
|
|
msgid "multi-pack-index missing required object offsets chunk"
|
|
msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
|
|
|
|
#: midx.c:165
|
|
#, c-format
|
|
msgid "multi-pack-index pack names out of order: '%s' before '%s'"
|
|
msgstr "multi-pack-index-paketnamn i fel ordning: \"%s\" före \"%s\""
|
|
|
|
#: midx.c:210
|
|
#, c-format
|
|
msgid "bad pack-int-id: %u (%u total packs)"
|
|
msgstr "bad pack-int-id: %u (%u paket totalt)"
|
|
|
|
#: midx.c:260
|
|
msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
|
|
msgstr "multi-pack-index skriver 64-bitars offset, men off_t är för liten"
|
|
|
|
#: midx.c:288
|
|
msgid "error preparing packfile from multi-pack-index"
|
|
msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
|
|
|
|
#: midx.c:472
|
|
#, c-format
|
|
msgid "failed to add packfile '%s'"
|
|
msgstr "misslyckades läsa paketfilen \"%s\""
|
|
|
|
#: midx.c:478
|
|
#, c-format
|
|
msgid "failed to open pack-index '%s'"
|
|
msgstr "misslyckades öppna paketindexet \"%s\""
|
|
|
|
#: midx.c:538
|
|
#, c-format
|
|
msgid "failed to locate object %d in packfile"
|
|
msgstr "misslyckades hitta objekt %d i paketfilen"
|
|
|
|
#: midx.c:842
|
|
msgid "Adding packfiles to multi-pack-index"
|
|
msgstr "Lägger till paketfiler till multi-pack-index"
|
|
|
|
#: midx.c:875
|
|
#, c-format
|
|
msgid "did not see pack-file %s to drop"
|
|
msgstr "såg inte paketfilen %s som skulle kastas"
|
|
|
|
#: midx.c:973
|
|
msgid "Writing chunks to multi-pack-index"
|
|
msgstr "Skriver stycken till multi-pack-index"
|
|
|
|
#: midx.c:1052
|
|
#, c-format
|
|
msgid "failed to clear multi-pack-index at %s"
|
|
msgstr "misslyckades städa multi-pack-index på %s"
|
|
|
|
#: midx.c:1108
|
|
msgid "Looking for referenced packfiles"
|
|
msgstr "Ser efter refererade packfiler"
|
|
|
|
#: midx.c:1123
|
|
#, c-format
|
|
msgid ""
|
|
"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
|
|
msgstr ""
|
|
"oid-utbredning i fel ordning: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
|
|
|
|
#: midx.c:1128
|
|
msgid "Verifying OID order in multi-pack-index"
|
|
msgstr "Bekräftar OID-ordning i multi-pack-index"
|
|
|
|
#: midx.c:1137
|
|
#, c-format
|
|
msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
|
|
msgstr "oid-uppslagning i fel ordning: oid[%d] = %s >= %s = oid[%d]"
|
|
|
|
#: midx.c:1157
|
|
msgid "Sorting objects by packfile"
|
|
msgstr "Sorterar objekt efter packfil"
|
|
|
|
#: midx.c:1164
|
|
msgid "Verifying object offsets"
|
|
msgstr "Bekräftar offset för objekt"
|
|
|
|
#: midx.c:1180
|
|
#, c-format
|
|
msgid "failed to load pack entry for oid[%d] = %s"
|
|
msgstr "misslyckades läsa paketpost för oid[%d] = %s"
|
|
|
|
#: midx.c:1186
|
|
#, c-format
|
|
msgid "failed to load pack-index for packfile %s"
|
|
msgstr "misslyckades läsa paketindex för paketfil %s"
|
|
|
|
#: midx.c:1195
|
|
#, c-format
|
|
msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
|
|
msgstr "felaktigt objekt-offset för oid[%d] = %s: %<PRIx64> != %<PRIx64>"
|
|
|
|
#: midx.c:1220
|
|
msgid "Counting referenced objects"
|
|
msgstr "Räknar refererade objekt"
|
|
|
|
#: midx.c:1230
|
|
msgid "Finding and deleting unreferenced packfiles"
|
|
msgstr "Ser efter och tar bort orefererade packfiler"
|
|
|
|
#: midx.c:1388
|
|
msgid "could not start pack-objects"
|
|
msgstr "kunde inte starta pack-objects"
|
|
|
|
#: midx.c:1407
|
|
msgid "could not finish pack-objects"
|
|
msgstr "kunde inte avsluta pack-objects"
|
|
|
|
#: name-hash.c:537
|
|
#, c-format
|
|
msgid "unable to create lazy_dir thread: %s"
|
|
msgstr "misslyckades skapa lazy_dir-tråd: %s"
|
|
|
|
#: name-hash.c:559
|
|
#, c-format
|
|
msgid "unable to create lazy_name thread: %s"
|
|
msgstr "misslyckades skapa lazy_name-tråd: %s"
|
|
|
|
#: name-hash.c:565
|
|
#, c-format
|
|
msgid "unable to join lazy_name thread: %s"
|
|
msgstr "misslyckades utföra join på lazy_name-tråd: %s"
|
|
|
|
#: notes-merge.c:277
|
|
#, c-format
|
|
msgid ""
|
|
"You have not concluded your previous notes merge (%s exists).\n"
|
|
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to "
|
|
"commit/abort the previous merge before you start a new notes merge."
|
|
msgstr ""
|
|
"Du har inte avslutat föregående antecknings-sammanslagning (%s finns).\n"
|
|
"Använd \"git notes merge --commit\" eller \"git notes merge --abort\" för "
|
|
"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
|
|
"ny antecknings-sammanslagning."
|
|
|
|
#: notes-merge.c:284
|
|
#, c-format
|
|
msgid "You have not concluded your notes merge (%s exists)."
|
|
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
|
|
|
|
#: notes-utils.c:46
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
|
|
|
|
#: notes-utils.c:105
|
|
#, c-format
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
|
|
|
|
#: notes-utils.c:115
|
|
#, c-format
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
|
|
|
|
#. TRANSLATORS: The first %s is the name of
|
|
#. the environment variable, the second %s is
|
|
#. its value.
|
|
#.
|
|
#: notes-utils.c:145
|
|
#, c-format
|
|
msgid "Bad %s value: '%s'"
|
|
msgstr "Felaktigt värde på %s: \"%s\""
|
|
|
|
#: object.c:53
|
|
#, c-format
|
|
msgid "invalid object type \"%s\""
|
|
msgstr "ogiltig objekttyp \"%s\""
|
|
|
|
#: object.c:173
|
|
#, c-format
|
|
msgid "object %s is a %s, not a %s"
|
|
msgstr "objektet %s är en %s, inte en %s"
|
|
|
|
#: object.c:233
|
|
#, c-format
|
|
msgid "object %s has unknown type id %d"
|
|
msgstr "objektet %s har okänd typ-id %d"
|
|
|
|
#: object.c:246
|
|
#, c-format
|
|
msgid "unable to parse object: %s"
|
|
msgstr "kunde inte tolka objektet: %s"
|
|
|
|
#: object.c:266 object.c:278
|
|
#, c-format
|
|
msgid "hash mismatch %s"
|
|
msgstr "hashvärde stämmer inte överens %s"
|
|
|
|
#: packfile.c:629
|
|
msgid "offset before end of packfile (broken .idx?)"
|
|
msgstr "offset före slutet av packfilen (trasig .idx?)"
|
|
|
|
#: packfile.c:1899
|
|
#, c-format
|
|
msgid "offset before start of pack index for %s (corrupt index?)"
|
|
msgstr "offset före slutet av packindex för %s (trasigt index?)"
|
|
|
|
#: packfile.c:1903
|
|
#, c-format
|
|
msgid "offset beyond end of pack index for %s (truncated index?)"
|
|
msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
|
|
|
|
#: pack-bitmap.c:800 pack-bitmap.c:806 builtin/pack-objects.c:2134
|
|
#, c-format
|
|
msgid "unable to get size of %s"
|
|
msgstr "kan inte hämta storlek på %s"
|
|
|
|
#: parse-options.c:38
|
|
#, c-format
|
|
msgid "%s requires a value"
|
|
msgstr "%s behöver ett värde"
|
|
|
|
#: parse-options.c:73
|
|
#, c-format
|
|
msgid "%s is incompatible with %s"
|
|
msgstr "%s är inkompatibel med %s"
|
|
|
|
#: parse-options.c:78
|
|
#, c-format
|
|
msgid "%s : incompatible with something else"
|
|
msgstr "%s: inkompatibelt med något annat"
|
|
|
|
#: parse-options.c:92 parse-options.c:96 parse-options.c:317
|
|
#, c-format
|
|
msgid "%s takes no value"
|
|
msgstr "%s tar inget värde"
|
|
|
|
#: parse-options.c:94
|
|
#, c-format
|
|
msgid "%s isn't available"
|
|
msgstr "%s är inte tillgängligt"
|
|
|
|
#: parse-options.c:217
|
|
#, c-format
|
|
msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
|
|
msgstr "%s förväntar ett icke-negativt heltalsvärde, med valfritt k/m/g-suffix"
|
|
|
|
#: parse-options.c:386
|
|
#, c-format
|
|
msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
|
|
msgstr "tvetydig flagga: %s (kan vara --%s%s eller --%s%s)"
|
|
|
|
#: parse-options.c:420 parse-options.c:428
|
|
#, c-format
|
|
msgid "did you mean `--%s` (with two dashes)?"
|
|
msgstr "menade du \"--%s\" (med två bindestreck)?"
|
|
|
|
#: parse-options.c:857
|
|
#, c-format
|
|
msgid "unknown option `%s'"
|
|
msgstr "okänd flagga \"%s\""
|
|
|
|
#: parse-options.c:859
|
|
#, c-format
|
|
msgid "unknown switch `%c'"
|
|
msgstr "okänd flagga \"%c\""
|
|
|
|
#: parse-options.c:861
|
|
#, c-format
|
|
msgid "unknown non-ascii option in string: `%s'"
|
|
msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
|
|
|
|
#: parse-options.c:885
|
|
msgid "..."
|
|
msgstr "..."
|
|
|
|
#: parse-options.c:904
|
|
#, c-format
|
|
msgid "usage: %s"
|
|
msgstr "användning: %s"
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
#. one in "usage: %s" translation.
|
|
#.
|
|
#: parse-options.c:910
|
|
#, c-format
|
|
msgid " or: %s"
|
|
msgstr " eller: %s"
|
|
|
|
#: parse-options.c:913
|
|
#, c-format
|
|
msgid " %s"
|
|
msgstr " %s"
|
|
|
|
#: parse-options.c:952
|
|
msgid "-NUM"
|
|
msgstr "-TAL"
|
|
|
|
#: parse-options.c:966
|
|
#, c-format
|
|
msgid "alias of --%s"
|
|
msgstr "alias för --%s"
|
|
|
|
#: parse-options-cb.c:20 parse-options-cb.c:24
|
|
#, c-format
|
|
msgid "option `%s' expects a numerical value"
|
|
msgstr "flaggan \"%s\" antar ett numeriskt värde"
|
|
|
|
#: parse-options-cb.c:41
|
|
#, c-format
|
|
msgid "malformed expiration date '%s'"
|
|
msgstr "trasigt utlöpsdatum: \"%s\""
|
|
|
|
#: parse-options-cb.c:54
|
|
#, c-format
|
|
msgid "option `%s' expects \"always\", \"auto\", or \"never\""
|
|
msgstr ""
|
|
"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
|
|
|
|
#: parse-options-cb.c:130 parse-options-cb.c:147
|
|
#, c-format
|
|
msgid "malformed object name '%s'"
|
|
msgstr "felformat objektnamn \"%s\""
|
|
|
|
#: path.c:915
|
|
#, c-format
|
|
msgid "Could not make %s writable by group"
|
|
msgstr "Kunde inte göra %s skrivbar för gruppen"
|
|
|
|
#: pathspec.c:130
|
|
msgid "Escape character '\\' not allowed as last character in attr value"
|
|
msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
|
|
|
|
#: pathspec.c:148
|
|
msgid "Only one 'attr:' specification is allowed."
|
|
msgstr "Endast en \"attr:\"-angivelse tillåten."
|
|
|
|
#: pathspec.c:151
|
|
msgid "attr spec must not be empty"
|
|
msgstr "attr-angivelse kan inte vara tom"
|
|
|
|
#: pathspec.c:194
|
|
#, c-format
|
|
msgid "invalid attribute name %s"
|
|
msgstr "ogiltigt attributnamn %s"
|
|
|
|
#: pathspec.c:259
|
|
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
|
|
msgstr ""
|
|
"de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
|
|
|
|
#: pathspec.c:266
|
|
msgid ""
|
|
"global 'literal' pathspec setting is incompatible with all other global "
|
|
"pathspec settings"
|
|
msgstr ""
|
|
"den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
|
|
"globala sökvägsinställningar"
|
|
|
|
#: pathspec.c:306
|
|
msgid "invalid parameter for pathspec magic 'prefix'"
|
|
msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
|
|
|
|
#: pathspec.c:327
|
|
#, c-format
|
|
msgid "Invalid pathspec magic '%.*s' in '%s'"
|
|
msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
|
|
|
|
#: pathspec.c:332
|
|
#, c-format
|
|
msgid "Missing ')' at the end of pathspec magic in '%s'"
|
|
msgstr "\")\" saknas i slutet av sökvägsuttrycket för \"%s\""
|
|
|
|
#: pathspec.c:370
|
|
#, c-format
|
|
msgid "Unimplemented pathspec magic '%c' in '%s'"
|
|
msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
|
|
|
|
#: pathspec.c:429
|
|
#, c-format
|
|
msgid "%s: 'literal' and 'glob' are incompatible"
|
|
msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
|
|
|
|
#: pathspec.c:442
|
|
#, c-format
|
|
msgid "%s: '%s' is outside repository at '%s'"
|
|
msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
|
|
|
|
#: pathspec.c:517
|
|
#, c-format
|
|
msgid "'%s' (mnemonic: '%c')"
|
|
msgstr "\"%s\" (minnesstöd: \"%c\")"
|
|
|
|
#: pathspec.c:527
|
|
#, c-format
|
|
msgid "%s: pathspec magic not supported by this command: %s"
|
|
msgstr "%s: sökvägsuttrycket hanteras inte av det här kommandot: %s"
|
|
|
|
#: pathspec.c:594
|
|
#, c-format
|
|
msgid "pathspec '%s' is beyond a symbolic link"
|
|
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
|
|
|
|
#: pathspec.c:639
|
|
#, c-format
|
|
msgid "line is badly quoted: %s"
|
|
msgstr "linjen er felaktigt citerad: %s"
|
|
|
|
#: pkt-line.c:92
|
|
msgid "unable to write flush packet"
|
|
msgstr "kan inte skriva flush-paket"
|
|
|
|
#: pkt-line.c:99
|
|
msgid "unable to write delim packet"
|
|
msgstr "kan inte skriva delim-paket"
|
|
|
|
#: pkt-line.c:106
|
|
msgid "flush packet write failed"
|
|
msgstr "fel vid skrivning av \"flush\"-paket"
|
|
|
|
#: pkt-line.c:146 pkt-line.c:232
|
|
msgid "protocol error: impossibly long line"
|
|
msgstr "protokollfel: omöjligt lång rad"
|
|
|
|
#: pkt-line.c:162 pkt-line.c:164
|
|
msgid "packet write with format failed"
|
|
msgstr "paketskrivning med format misslyckades"
|
|
|
|
#: pkt-line.c:196
|
|
msgid "packet write failed - data exceeds max packet size"
|
|
msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
|
|
|
|
#: pkt-line.c:203 pkt-line.c:210
|
|
msgid "packet write failed"
|
|
msgstr "paketskrivning misslyckades"
|
|
|
|
#: pkt-line.c:295
|
|
msgid "read error"
|
|
msgstr "läsfel"
|
|
|
|
#: pkt-line.c:303
|
|
msgid "the remote end hung up unexpectedly"
|
|
msgstr "fjärren lade på oväntat"
|
|
|
|
#: pkt-line.c:331
|
|
#, c-format
|
|
msgid "protocol error: bad line length character: %.4s"
|
|
msgstr "protokollfel: felaktig radlängdstecken: %.4s"
|
|
|
|
#: pkt-line.c:341 pkt-line.c:346
|
|
#, c-format
|
|
msgid "protocol error: bad line length %d"
|
|
msgstr "protokollfel: felaktig radlängd: %d"
|
|
|
|
#: pkt-line.c:362
|
|
#, c-format
|
|
msgid "remote error: %s"
|
|
msgstr "fjärrfel: %s"
|
|
|
|
#: preload-index.c:119
|
|
msgid "Refreshing index"
|
|
msgstr "Uppdaterar indexet"
|
|
|
|
#: preload-index.c:138
|
|
#, c-format
|
|
msgid "unable to create threaded lstat: %s"
|
|
msgstr "kunde inte skapa trådad lstat: %s"
|
|
|
|
#: pretty.c:981
|
|
msgid "unable to parse --pretty format"
|
|
msgstr "kunde inte tolka format för --pretty"
|
|
|
|
#: promisor-remote.c:23
|
|
msgid "Remote with no URL"
|
|
msgstr "Fjärr utan URL"
|
|
|
|
#: promisor-remote.c:58
|
|
#, c-format
|
|
msgid "promisor remote name cannot begin with '/': %s"
|
|
msgstr "kontraktsfjärr kan inte börja med \"/\": %s"
|
|
|
|
#: range-diff.c:75
|
|
msgid "could not start `log`"
|
|
msgstr "kunde inte starta \"log\""
|
|
|
|
#: range-diff.c:77
|
|
msgid "could not read `log` output"
|
|
msgstr "kunde inte läsa utdata från \"log\""
|
|
|
|
#: range-diff.c:96 sequencer.c:5020
|
|
#, c-format
|
|
msgid "could not parse commit '%s'"
|
|
msgstr "kunde inte tolka incheckningen \"%s\""
|
|
|
|
#: range-diff.c:122
|
|
#, c-format
|
|
msgid "could not parse git header '%.*s'"
|
|
msgstr "kunde inte tolka git-huvudet \"%.*s\""
|
|
|
|
#: range-diff.c:285
|
|
msgid "failed to generate diff"
|
|
msgstr "misslyckades skapa diff"
|
|
|
|
#: range-diff.c:518 range-diff.c:520
|
|
#, c-format
|
|
msgid "could not parse log for '%s'"
|
|
msgstr "kunde inte tolka loggen för \"%s\""
|
|
|
|
#: read-cache.c:680
|
|
#, c-format
|
|
msgid "will not add file alias '%s' ('%s' already exists in index)"
|
|
msgstr "lägger inte till filalias \"%s\" (\"%s\" finns redan i indexet)"
|
|
|
|
#: read-cache.c:696
|
|
msgid "cannot create an empty blob in the object database"
|
|
msgstr "kan inte skapa tom blob i objektdatabasen"
|
|
|
|
#: read-cache.c:718
|
|
#, c-format
|
|
msgid "%s: can only add regular files, symbolic links or git-directories"
|
|
msgstr ""
|
|
"%s: kan bara lägga till vanliga filer, symboliska länkar och git-kataloger"
|
|
|
|
#: read-cache.c:723
|
|
#, c-format
|
|
msgid "'%s' does not have a commit checked out"
|
|
msgstr "\"%s\" har inte någon utcheckad incheckning"
|
|
|
|
#: read-cache.c:775
|
|
#, c-format
|
|
msgid "unable to index file '%s'"
|
|
msgstr "kan inte indexera filen \"%s\""
|
|
|
|
#: read-cache.c:794
|
|
#, c-format
|
|
msgid "unable to add '%s' to index"
|
|
msgstr "kan inte lägga till \"%s\" till indexet"
|
|
|
|
#: read-cache.c:805
|
|
#, c-format
|
|
msgid "unable to stat '%s'"
|
|
msgstr "kan inte ta status på \"%s\""
|
|
|
|
#: read-cache.c:1330
|
|
#, c-format
|
|
msgid "'%s' appears as both a file and as a directory"
|
|
msgstr "\"%s\" finns både som en fil och en katalog"
|
|
|
|
#: read-cache.c:1536
|
|
msgid "Refresh index"
|
|
msgstr "Uppdatera indexet"
|
|
|
|
#: read-cache.c:1651
|
|
#, c-format
|
|
msgid ""
|
|
"index.version set, but the value is invalid.\n"
|
|
"Using version %i"
|
|
msgstr ""
|
|
"index.version satt, men värdet är ogiltigt.\n"
|
|
"Använder version %i"
|
|
|
|
#: read-cache.c:1661
|
|
#, c-format
|
|
msgid ""
|
|
"GIT_INDEX_VERSION set, but the value is invalid.\n"
|
|
"Using version %i"
|
|
msgstr ""
|
|
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
|
|
"Använder version %i"
|
|
|
|
#: read-cache.c:1717
|
|
#, c-format
|
|
msgid "bad signature 0x%08x"
|
|
msgstr "felaktig signatur 0x%08x"
|
|
|
|
#: read-cache.c:1720
|
|
#, c-format
|
|
msgid "bad index version %d"
|
|
msgstr "felaktig indexversion %d"
|
|
|
|
#: read-cache.c:1729
|
|
msgid "bad index file sha1 signature"
|
|
msgstr "felaktig sha1-signatur för indexfil"
|
|
|
|
#: read-cache.c:1759
|
|
#, c-format
|
|
msgid "index uses %.4s extension, which we do not understand"
|
|
msgstr "index använder filtillägget %.4s, vilket vi inte förstår"
|
|
|
|
#: read-cache.c:1761
|
|
#, c-format
|
|
msgid "ignoring %.4s extension"
|
|
msgstr "ignorerar filtillägget %.4s"
|
|
|
|
#: read-cache.c:1798
|
|
#, c-format
|
|
msgid "unknown index entry format 0x%08x"
|
|
msgstr "okänt format 0x%08x på indexpost"
|
|
|
|
#: read-cache.c:1814
|
|
#, c-format
|
|
msgid "malformed name field in the index, near path '%s'"
|
|
msgstr "felformat namnfält i indexet, nära sökvägen \"%s\""
|
|
|
|
#: read-cache.c:1871
|
|
msgid "unordered stage entries in index"
|
|
msgstr "osorterade köposter i index"
|
|
|
|
#: read-cache.c:1874
|
|
#, c-format
|
|
msgid "multiple stage entries for merged file '%s'"
|
|
msgstr "flera köposter för den sammanslagna filen \"%s\""
|
|
|
|
#: read-cache.c:1877
|
|
#, c-format
|
|
msgid "unordered stage entries for '%s'"
|
|
msgstr "osorterade köposter för \"%s\""
|
|
|
|
#: 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 "indexfilen trasig"
|
|
|
|
#: read-cache.c:2124
|
|
#, c-format
|
|
msgid "unable to create load_cache_entries thread: %s"
|
|
msgstr "kunde inte läsa in cache_entries-tråden: %s"
|
|
|
|
#: read-cache.c:2137
|
|
#, c-format
|
|
msgid "unable to join load_cache_entries thread: %s"
|
|
msgstr "kunde inte utföra join på cache_entries-tråden: %s"
|
|
|
|
#: read-cache.c:2170
|
|
#, c-format
|
|
msgid "%s: index file open failed"
|
|
msgstr "%s: öppning av indexfilen misslyckades"
|
|
|
|
#: read-cache.c:2174
|
|
#, c-format
|
|
msgid "%s: cannot stat the open index"
|
|
msgstr "%s: kan inte ta startus på det öppna indexet"
|
|
|
|
#: read-cache.c:2178
|
|
#, c-format
|
|
msgid "%s: index file smaller than expected"
|
|
msgstr "%s: indexfilen mindre än förväntat"
|
|
|
|
#: read-cache.c:2182
|
|
#, c-format
|
|
msgid "%s: unable to map index file"
|
|
msgstr "%s: kan inte koppla indexfilen"
|
|
|
|
#: read-cache.c:2224
|
|
#, c-format
|
|
msgid "unable to create load_index_extensions thread: %s"
|
|
msgstr "kunde inte skapa load_index_extensions-tråden: %s"
|
|
|
|
#: read-cache.c:2251
|
|
#, c-format
|
|
msgid "unable to join load_index_extensions thread: %s"
|
|
msgstr "kunde inte utföra join på load_index_extensions-tråden: %s"
|
|
|
|
#: read-cache.c:2283
|
|
#, c-format
|
|
msgid "could not freshen shared index '%s'"
|
|
msgstr "kunde inte uppdatera delat index \"%s\""
|
|
|
|
#: read-cache.c:2330
|
|
#, c-format
|
|
msgid "broken index, expect %s in %s, got %s"
|
|
msgstr "trasigt index, förväntade %s i %s, fick %s"
|
|
|
|
#: read-cache.c:3026 strbuf.c:1160 wrapper.c:622 builtin/merge.c:1122
|
|
#, c-format
|
|
msgid "could not close '%s'"
|
|
msgstr "kunde inte stänga \"%s\""
|
|
|
|
#: read-cache.c:3129 sequencer.c:2343 sequencer.c:3959
|
|
#, c-format
|
|
msgid "could not stat '%s'"
|
|
msgstr "kunde inte ta status på \"%s\""
|
|
|
|
#: read-cache.c:3142
|
|
#, c-format
|
|
msgid "unable to open git dir: %s"
|
|
msgstr "kunde inte öppna git-katalog: %s"
|
|
|
|
#: read-cache.c:3154
|
|
#, c-format
|
|
msgid "unable to unlink: %s"
|
|
msgstr "misslyckades ta bort länken: %s"
|
|
|
|
#: read-cache.c:3179
|
|
#, c-format
|
|
msgid "cannot fix permission bits on '%s'"
|
|
msgstr "kan inte rätta behörighetsbitar på \"%s\""
|
|
|
|
#: read-cache.c:3328
|
|
#, c-format
|
|
msgid "%s: cannot drop to stage #0"
|
|
msgstr "%s: kan inte återgå till kö 0"
|
|
|
|
#: 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 ""
|
|
"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
|
|
"continue\".\n"
|
|
"Avbryt ombaseringen med \"git rebase --abort\".\n"
|
|
|
|
#: rebase-interactive.c:33
|
|
#, c-format
|
|
msgid ""
|
|
"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
|
|
msgstr ""
|
|
"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
|
|
|
|
#: rebase-interactive.c:42
|
|
msgid ""
|
|
"\n"
|
|
"Commands:\n"
|
|
"p, pick <commit> = use commit\n"
|
|
"r, reword <commit> = use commit, but edit the commit message\n"
|
|
"e, edit <commit> = use commit, but stop for amending\n"
|
|
"s, squash <commit> = use commit, but meld into previous commit\n"
|
|
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
|
|
"x, exec <command> = run command (the rest of the line) using shell\n"
|
|
"b, break = stop here (continue rebase later with 'git rebase --continue')\n"
|
|
"d, drop <commit> = remove commit\n"
|
|
"l, label <label> = label current HEAD with a name\n"
|
|
"t, reset <label> = reset HEAD to a label\n"
|
|
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
|
|
". create a merge commit using the original merge commit's\n"
|
|
". message (or the oneline, if no original merge commit was\n"
|
|
". specified). Use -c <commit> to reword the commit message.\n"
|
|
"\n"
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Kommandon:\n"
|
|
"p, pick <incheckning> = använd incheckning\n"
|
|
"r, reword <incheckning> = använd incheckning, men redigera "
|
|
"incheckningsmeddelandet\n"
|
|
"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
|
|
"s, squash <incheckning> = använd incheckning, men infoga i föregående "
|
|
"incheckning\n"
|
|
"f, fixup <incheckning> = som \"squash\", men förkasta "
|
|
"incheckningsmeddelandet\n"
|
|
"x, exec <kommando> = kör kommando (resten av raden) i skalet\n"
|
|
"b, break = stoppa här (fortsätt ombaseringen senare med \"git rebase --"
|
|
"continue\")\n"
|
|
"d, drop <incheckning> = ta bort incheckning\n"
|
|
"l, label <etikett> = ge aktuellt HEAD ett namn\n"
|
|
"t, reset <etikett> = återställ HEAD till en etikett\n"
|
|
"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
|
|
". skapa en sammanslagning med ursprungligt meddelande (eller\n"
|
|
". enrads, om inget incheckningsmeddelande angavs). Använd\n"
|
|
". -v <incheckning> för att skriva om meddelandet.\n"
|
|
"\n"
|
|
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
|
|
|
|
#: rebase-interactive.c:63
|
|
#, c-format
|
|
msgid "Rebase %s onto %s (%d command)"
|
|
msgid_plural "Rebase %s onto %s (%d commands)"
|
|
msgstr[0] "Ombasera %s på %s (%d kommando)"
|
|
msgstr[1] "Ombasera %s på %s (%d kommandon)"
|
|
|
|
#: 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"
|
|
msgstr ""
|
|
"\n"
|
|
"Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
|
|
"incheckning.\n"
|
|
|
|
#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
|
|
msgid ""
|
|
"\n"
|
|
"If you remove a line here THAT COMMIT WILL BE LOST.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
|
|
|
|
#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
|
|
msgid ""
|
|
"\n"
|
|
"You are editing the todo file of an ongoing interactive rebase.\n"
|
|
"To continue rebase after editing, run:\n"
|
|
" git rebase --continue\n"
|
|
"\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Du redigerar \"todo\"-filen för en pågående interaktiv ombasering.\n"
|
|
"För att forsätta ombasera efter redigeringen, kör:\n"
|
|
" git rebase --continue\n"
|
|
"\n"
|
|
|
|
#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
|
|
msgid ""
|
|
"\n"
|
|
"However, if you remove everything, the rebase will be aborted.\n"
|
|
"\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
|
|
"\n"
|
|
|
|
#: 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 "kunde inte skriva \"%s\""
|
|
|
|
#: rebase-interactive.c:116 builtin/rebase.c:184 builtin/rebase.c:210
|
|
#: builtin/rebase.c:234
|
|
#, c-format
|
|
msgid "could not write '%s'."
|
|
msgstr "kunde inte skriva \"%s\"."
|
|
|
|
#: rebase-interactive.c:193
|
|
#, c-format
|
|
msgid ""
|
|
"Warning: some commits may have been dropped accidentally.\n"
|
|
"Dropped commits (newer to older):\n"
|
|
msgstr ""
|
|
"Varning: vissa incheckningar kan av misstag ha tappats.\n"
|
|
"Tappade incheckningar (nyaste först):\n"
|
|
|
|
#: rebase-interactive.c:200
|
|
#, c-format
|
|
msgid ""
|
|
"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
|
|
"\n"
|
|
"Use 'git config rebase.missingCommitsCheck' to change the level of "
|
|
"warnings.\n"
|
|
"The possible behaviours are: ignore, warn, error.\n"
|
|
"\n"
|
|
msgstr ""
|
|
"För att undvika det här meddelandet kan du använda \"drop\" för att "
|
|
"explicit\n"
|
|
"kasta en incheckning.\n"
|
|
"\n"
|
|
"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
|
|
"varningsnivån.\n"
|
|
"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
|
|
"\" (fel).\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 "kunde inte läsa \"%s\"."
|
|
|
|
#: refs.c:262
|
|
#, c-format
|
|
msgid "%s does not point to a valid object!"
|
|
msgstr "\"%s\" pekar inte på ett giltigt objekt!"
|
|
|
|
#: refs.c:667
|
|
#, c-format
|
|
msgid "ignoring dangling symref %s"
|
|
msgstr "ignorerar dinglande symbolisk referens %s"
|
|
|
|
#: refs.c:669 ref-filter.c:2098
|
|
#, c-format
|
|
msgid "ignoring broken ref %s"
|
|
msgstr "ignorerar trasig referens %s"
|
|
|
|
#: refs.c:804
|
|
#, c-format
|
|
msgid "could not open '%s' for writing: %s"
|
|
msgstr "kunde inte öppna \"%s\" för skrivning: %s"
|
|
|
|
#: refs.c:814 refs.c:865
|
|
#, c-format
|
|
msgid "could not read ref '%s'"
|
|
msgstr "Kunde inte läsa referensen \"%s\""
|
|
|
|
#: refs.c:820
|
|
#, c-format
|
|
msgid "ref '%s' already exists"
|
|
msgstr "referensen \"%s\" finns redan"
|
|
|
|
#: refs.c:825
|
|
#, c-format
|
|
msgid "unexpected object ID when writing '%s'"
|
|
msgstr "oväntat objekt-id vid skrivning \"%s\""
|
|
|
|
#: 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 "kunde inte skriva till \"%s\""
|
|
|
|
#: 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 "kunde inte öppna \"%s\" för skrivning"
|
|
|
|
#: refs.c:867
|
|
#, c-format
|
|
msgid "unexpected object ID when deleting '%s'"
|
|
msgstr "oväntat objekt-id vid borttagning \"%s\""
|
|
|
|
#: refs.c:998
|
|
#, c-format
|
|
msgid "log for ref %s has gap after %s"
|
|
msgstr "loggen för referensen %s har lucka efter %s"
|
|
|
|
#: refs.c:1004
|
|
#, c-format
|
|
msgid "log for ref %s unexpectedly ended on %s"
|
|
msgstr "loggen för referensen %s slutade oväntat på %s"
|
|
|
|
#: refs.c:1063
|
|
#, c-format
|
|
msgid "log for %s is empty"
|
|
msgstr "loggen för %s är tom"
|
|
|
|
#: refs.c:1155
|
|
#, c-format
|
|
msgid "refusing to update ref with bad name '%s'"
|
|
msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
|
|
|
|
#: refs.c:1231
|
|
#, c-format
|
|
msgid "update_ref failed for ref '%s': %s"
|
|
msgstr "update_ref misslyckades för referensen \"%s\": %s"
|
|
|
|
#: refs.c:2023
|
|
#, c-format
|
|
msgid "multiple updates for ref '%s' not allowed"
|
|
msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
|
|
|
|
#: refs.c:2055
|
|
msgid "ref updates forbidden inside quarantine environment"
|
|
msgstr "referensuppdateringar förbjudna i karantänmiljö"
|
|
|
|
#: refs.c:2151 refs.c:2181
|
|
#, c-format
|
|
msgid "'%s' exists; cannot create '%s'"
|
|
msgstr "\"%s\" finns; kan inte skapa \"%s\""
|
|
|
|
#: refs.c:2157 refs.c:2192
|
|
#, c-format
|
|
msgid "cannot process '%s' and '%s' at the same time"
|
|
msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
|
|
|
|
#: refs/files-backend.c:1233
|
|
#, c-format
|
|
msgid "could not remove reference %s"
|
|
msgstr "kunde inte ta bort referensen %s"
|
|
|
|
#: 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 "kunde inte ta bort referensen %s: %s"
|
|
|
|
#: refs/files-backend.c:1250 refs/packed-backend.c:1554
|
|
#, c-format
|
|
msgid "could not delete references: %s"
|
|
msgstr "kunde inte ta bort referenser: %s"
|
|
|
|
#: refspec.c:137
|
|
#, c-format
|
|
msgid "invalid refspec '%s'"
|
|
msgstr "felaktig referensspecifikation: \"%s\""
|
|
|
|
#: ref-filter.c:42 wt-status.c:1938
|
|
msgid "gone"
|
|
msgstr "försvunnen"
|
|
|
|
#: ref-filter.c:43
|
|
#, c-format
|
|
msgid "ahead %d"
|
|
msgstr "före %d"
|
|
|
|
#: ref-filter.c:44
|
|
#, c-format
|
|
msgid "behind %d"
|
|
msgstr "bakom %d"
|
|
|
|
#: ref-filter.c:45
|
|
#, c-format
|
|
msgid "ahead %d, behind %d"
|
|
msgstr "före %d, bakom %d"
|
|
|
|
#: ref-filter.c:165
|
|
#, c-format
|
|
msgid "expected format: %%(color:<color>)"
|
|
msgstr "förväntat format: %%(color:<color>)"
|
|
|
|
#: ref-filter.c:167
|
|
#, c-format
|
|
msgid "unrecognized color: %%(color:%s)"
|
|
msgstr "okänd färg: %%(color:%s)"
|
|
|
|
#: ref-filter.c:189
|
|
#, c-format
|
|
msgid "Integer value expected refname:lstrip=%s"
|
|
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
|
|
|
|
#: ref-filter.c:193
|
|
#, c-format
|
|
msgid "Integer value expected refname:rstrip=%s"
|
|
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
|
|
|
|
#: ref-filter.c:195
|
|
#, c-format
|
|
msgid "unrecognized %%(%s) argument: %s"
|
|
msgstr "okänt %%(%s)-argument: %s"
|
|
|
|
#: ref-filter.c:250
|
|
#, c-format
|
|
msgid "%%(objecttype) does not take arguments"
|
|
msgstr "%%(objecttype) tar inte argument"
|
|
|
|
#: ref-filter.c:272
|
|
#, c-format
|
|
msgid "unrecognized %%(objectsize) argument: %s"
|
|
msgstr "okänt %%(objectsize)-argument: %s"
|
|
|
|
#: ref-filter.c:280
|
|
#, c-format
|
|
msgid "%%(deltabase) does not take arguments"
|
|
msgstr "%%(deltabase) tar inte argument"
|
|
|
|
#: ref-filter.c:292
|
|
#, c-format
|
|
msgid "%%(body) does not take arguments"
|
|
msgstr "%%(body) tar inte argument"
|
|
|
|
#: ref-filter.c:301
|
|
#, c-format
|
|
msgid "%%(subject) does not take arguments"
|
|
msgstr "%%(subject) tar inte argument"
|
|
|
|
#: ref-filter.c:323
|
|
#, c-format
|
|
msgid "unknown %%(trailers) argument: %s"
|
|
msgstr "okänt %%(trailers)-argument: %s"
|
|
|
|
#: ref-filter.c:352
|
|
#, c-format
|
|
msgid "positive value expected contents:lines=%s"
|
|
msgstr "positivt värde förväntat contents:lines=%s"
|
|
|
|
#: ref-filter.c:354
|
|
#, c-format
|
|
msgid "unrecognized %%(contents) argument: %s"
|
|
msgstr "okänt %%(contents)-argument: %s"
|
|
|
|
#: ref-filter.c:369
|
|
#, c-format
|
|
msgid "positive value expected objectname:short=%s"
|
|
msgstr "positivt värde förväntat objectname:short=%s"
|
|
|
|
#: ref-filter.c:373
|
|
#, c-format
|
|
msgid "unrecognized %%(objectname) argument: %s"
|
|
msgstr "okänt %%(objectname)-argument: %s"
|
|
|
|
#: ref-filter.c:403
|
|
#, c-format
|
|
msgid "expected format: %%(align:<width>,<position>)"
|
|
msgstr "förväntat format: %%(align:<bredd>,<position>)"
|
|
|
|
#: ref-filter.c:415
|
|
#, c-format
|
|
msgid "unrecognized position:%s"
|
|
msgstr "okänd position:%s"
|
|
|
|
#: ref-filter.c:422
|
|
#, c-format
|
|
msgid "unrecognized width:%s"
|
|
msgstr "okänd bredd:%s"
|
|
|
|
#: ref-filter.c:431
|
|
#, c-format
|
|
msgid "unrecognized %%(align) argument: %s"
|
|
msgstr "okänt %%(align)-argument: %s"
|
|
|
|
#: ref-filter.c:439
|
|
#, c-format
|
|
msgid "positive width expected with the %%(align) atom"
|
|
msgstr "positiv bredd förväntad med atomen %%(align)"
|
|
|
|
#: ref-filter.c:457
|
|
#, c-format
|
|
msgid "unrecognized %%(if) argument: %s"
|
|
msgstr "okänt %%(if)-argument: %s"
|
|
|
|
#: ref-filter.c:559
|
|
#, c-format
|
|
msgid "malformed field name: %.*s"
|
|
msgstr "felformat fältnamn: %.*s"
|
|
|
|
#: ref-filter.c:586
|
|
#, c-format
|
|
msgid "unknown field name: %.*s"
|
|
msgstr "okänt fältnamn: %.*s"
|
|
|
|
#: ref-filter.c:590
|
|
#, c-format
|
|
msgid ""
|
|
"not a git repository, but the field '%.*s' requires access to object data"
|
|
msgstr ""
|
|
"inte ett git-arkiv, men fältet \"%.*s\" kräver tillgång till objektdata"
|
|
|
|
#: ref-filter.c:714
|
|
#, c-format
|
|
msgid "format: %%(if) atom used without a %%(then) atom"
|
|
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
|
|
|
|
#: ref-filter.c:777
|
|
#, c-format
|
|
msgid "format: %%(then) atom used without an %%(if) atom"
|
|
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
|
|
|
|
#: ref-filter.c:779
|
|
#, c-format
|
|
msgid "format: %%(then) atom used more than once"
|
|
msgstr "format: atomen %%(then) använd mer än en gång"
|
|
|
|
#: ref-filter.c:781
|
|
#, c-format
|
|
msgid "format: %%(then) atom used after %%(else)"
|
|
msgstr "format: atomen %%(then) använd efter %%(else)"
|
|
|
|
#: ref-filter.c:809
|
|
#, c-format
|
|
msgid "format: %%(else) atom used without an %%(if) atom"
|
|
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
|
|
|
|
#: ref-filter.c:811
|
|
#, c-format
|
|
msgid "format: %%(else) atom used without a %%(then) atom"
|
|
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
|
|
|
|
#: ref-filter.c:813
|
|
#, c-format
|
|
msgid "format: %%(else) atom used more than once"
|
|
msgstr "format: atomen %%(else) använd mer än en gång"
|
|
|
|
#: ref-filter.c:828
|
|
#, c-format
|
|
msgid "format: %%(end) atom used without corresponding atom"
|
|
msgstr "format: atomen %%(end) använd utan motsvarande atom"
|
|
|
|
#: ref-filter.c:885
|
|
#, c-format
|
|
msgid "malformed format string %s"
|
|
msgstr "felformad formatsträng %s"
|
|
|
|
#: ref-filter.c:1488
|
|
#, c-format
|
|
msgid "no branch, rebasing %s"
|
|
msgstr "ingen gren, ombaserar %s"
|
|
|
|
#: ref-filter.c:1491
|
|
#, c-format
|
|
msgid "no branch, rebasing detached HEAD %s"
|
|
msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
|
|
|
|
#: ref-filter.c:1494
|
|
#, c-format
|
|
msgid "no branch, bisect started on %s"
|
|
msgstr "ingen gren, \"bisect\" startad på %s"
|
|
|
|
#: ref-filter.c:1504
|
|
msgid "no branch"
|
|
msgstr "ingen gren"
|
|
|
|
#: ref-filter.c:1540 ref-filter.c:1749
|
|
#, c-format
|
|
msgid "missing object %s for %s"
|
|
msgstr "objektet %s saknas för %s"
|
|
|
|
#: ref-filter.c:1550
|
|
#, c-format
|
|
msgid "parse_object_buffer failed on %s for %s"
|
|
msgstr "parse_object_buffer misslyckades på %s för %s"
|
|
|
|
#: ref-filter.c:2004
|
|
#, c-format
|
|
msgid "malformed object at '%s'"
|
|
msgstr "felformat objekt vid \"%s\""
|
|
|
|
#: ref-filter.c:2093
|
|
#, c-format
|
|
msgid "ignoring ref with broken name %s"
|
|
msgstr "ignorerar referens med trasigt namn %s"
|
|
|
|
#: ref-filter.c:2389
|
|
#, c-format
|
|
msgid "format: %%(end) atom missing"
|
|
msgstr "format: atomen %%(end) saknas"
|
|
|
|
#: ref-filter.c:2489
|
|
#, c-format
|
|
msgid "option `%s' is incompatible with --merged"
|
|
msgstr "flaggan \"%s\" är inkompatibel med --merged"
|
|
|
|
#: ref-filter.c:2492
|
|
#, c-format
|
|
msgid "option `%s' is incompatible with --no-merged"
|
|
msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
|
|
|
|
#: ref-filter.c:2502
|
|
#, c-format
|
|
msgid "malformed object name %s"
|
|
msgstr "felformat objektnamn %s"
|
|
|
|
#: ref-filter.c:2507
|
|
#, c-format
|
|
msgid "option `%s' must point to a commit"
|
|
msgstr "flaggan \"%s\" måste peka på en incheckning"
|
|
|
|
#: remote.c:366
|
|
#, c-format
|
|
msgid "config remote shorthand cannot begin with '/': %s"
|
|
msgstr "konfigurerad kortform för fjärr kan inte börja med \"/\": %s"
|
|
|
|
#: remote.c:414
|
|
msgid "more than one receivepack given, using the first"
|
|
msgstr "mer än en receivepack angavs, använder den första"
|
|
|
|
#: remote.c:422
|
|
msgid "more than one uploadpack given, using the first"
|
|
msgstr "mer än en uploadpack angavs, använder den första"
|
|
|
|
#: remote.c:612
|
|
#, c-format
|
|
msgid "Cannot fetch both %s and %s to %s"
|
|
msgstr "Kan inte hämta både %s och %s till %s"
|
|
|
|
#: remote.c:616
|
|
#, c-format
|
|
msgid "%s usually tracks %s, not %s"
|
|
msgstr "%s spårar vanligtvis %s, inte %s"
|
|
|
|
#: remote.c:620
|
|
#, c-format
|
|
msgid "%s tracks both %s and %s"
|
|
msgstr "%s spårar både %s och %s"
|
|
|
|
#: remote.c:688
|
|
#, c-format
|
|
msgid "key '%s' of pattern had no '*'"
|
|
msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
|
|
|
|
#: remote.c:698
|
|
#, c-format
|
|
msgid "value '%s' of pattern has no '*'"
|
|
msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
|
|
|
|
#: remote.c:1004
|
|
#, c-format
|
|
msgid "src refspec %s does not match any"
|
|
msgstr "käll-referensspecifikationen %s motsvarar ingen"
|
|
|
|
#: remote.c:1009
|
|
#, c-format
|
|
msgid "src refspec %s matches more than one"
|
|
msgstr "käll-referensspecifikationen %s motsvarar mer än en"
|
|
|
|
#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
|
|
#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
|
|
#. the <src>.
|
|
#.
|
|
#: remote.c:1024
|
|
#, c-format
|
|
msgid ""
|
|
"The destination you provided is not a full refname (i.e.,\n"
|
|
"starting with \"refs/\"). We tried to guess what you meant by:\n"
|
|
"\n"
|
|
"- Looking for a ref that matches '%s' on the remote side.\n"
|
|
"- Checking if the <src> being pushed ('%s')\n"
|
|
" is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
|
|
" refs/{heads,tags}/ prefix on the remote side.\n"
|
|
"\n"
|
|
"Neither worked, so we gave up. You must fully qualify the ref."
|
|
msgstr ""
|
|
"Målet du angav är inte ett komplett referensamn (dvs.,\n"
|
|
"startar med \"refs/\"). Vi försökte gissa vad du menade genom att:\n"
|
|
"\n"
|
|
"- Se efter en referens som motsvarar \"%s\" på fjärrsidan.\n"
|
|
"- Se om <källan> som sänds (\"%s\")\n"
|
|
" är en referens i \"refs/{heads,tags}/\". Om så lägger vi till\n"
|
|
" motsvarande refs/{heads,tags}/-prefix på fjärrsidan.\n"
|
|
"\n"
|
|
"Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
|
|
|
|
#: remote.c:1044
|
|
#, c-format
|
|
msgid ""
|
|
"The <src> part of the refspec is a commit object.\n"
|
|
"Did you mean to create a new branch by pushing to\n"
|
|
"'%s:refs/heads/%s'?"
|
|
msgstr ""
|
|
"<Källa>-delen av ref.spec-en är ett incheckningsobjekt.\n"
|
|
"Var det meningen att skapa en ny gren genom att sända\n"
|
|
"till \"%s:refs/heads/%s\"?"
|
|
|
|
#: remote.c:1049
|
|
#, c-format
|
|
msgid ""
|
|
"The <src> part of the refspec is a tag object.\n"
|
|
"Did you mean to create a new tag by pushing to\n"
|
|
"'%s:refs/tags/%s'?"
|
|
msgstr ""
|
|
"<Källa>-delen av ref.spec-en är ett taggobjekt.\n"
|
|
"Var det meningen att skapa en ny tagg genom att sända\n"
|
|
"till \"%s:refs/tags/%s\"?"
|
|
|
|
#: remote.c:1054
|
|
#, c-format
|
|
msgid ""
|
|
"The <src> part of the refspec is a tree object.\n"
|
|
"Did you mean to tag a new tree by pushing to\n"
|
|
"'%s:refs/tags/%s'?"
|
|
msgstr ""
|
|
"<Källa>-delen av ref.spec-en är ett trädobjekt.\n"
|
|
"Var det meningen att tagga ett nytt träd genom att sända\n"
|
|
"till \"%s:refs/tags/%s\"?"
|
|
|
|
#: remote.c:1059
|
|
#, c-format
|
|
msgid ""
|
|
"The <src> part of the refspec is a blob object.\n"
|
|
"Did you mean to tag a new blob by pushing to\n"
|
|
"'%s:refs/tags/%s'?"
|
|
msgstr ""
|
|
"<Källa>-delen av ref.spec-en är ett blobobjekt.\n"
|
|
"Var det meningen att tagga en ny blob genom att sända\n"
|
|
"till \"%s:refs/tags/%s\"?"
|
|
|
|
#: remote.c:1095
|
|
#, c-format
|
|
msgid "%s cannot be resolved to branch"
|
|
msgstr "%s kan inte slås upp till en gren"
|
|
|
|
#: remote.c:1106
|
|
#, c-format
|
|
msgid "unable to delete '%s': remote ref does not exist"
|
|
msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
|
|
|
|
#: remote.c:1118
|
|
#, c-format
|
|
msgid "dst refspec %s matches more than one"
|
|
msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
|
|
|
|
#: remote.c:1125
|
|
#, c-format
|
|
msgid "dst ref %s receives from more than one src"
|
|
msgstr "fjärr-referensen \"%s\" hämtar från mer än en källa"
|
|
|
|
#: remote.c:1628 remote.c:1729
|
|
msgid "HEAD does not point to a branch"
|
|
msgstr "HEAD pekar inte på en gren"
|
|
|
|
#: remote.c:1637
|
|
#, c-format
|
|
msgid "no such branch: '%s'"
|
|
msgstr "okänd gren: \"%s\""
|
|
|
|
#: remote.c:1640
|
|
#, c-format
|
|
msgid "no upstream configured for branch '%s'"
|
|
msgstr "ingen standarduppström angiven för grenen \"%s\""
|
|
|
|
#: remote.c:1646
|
|
#, c-format
|
|
msgid "upstream branch '%s' not stored as a remote-tracking branch"
|
|
msgstr "uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
|
|
|
|
#: remote.c:1661
|
|
#, c-format
|
|
msgid "push destination '%s' on remote '%s' has no local tracking branch"
|
|
msgstr "push-målet \"%s\" på fjärren \"%s\" har ingen lokalt spårande gren"
|
|
|
|
#: remote.c:1673
|
|
#, c-format
|
|
msgid "branch '%s' has no remote for pushing"
|
|
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
|
|
|
|
#: remote.c:1683
|
|
#, c-format
|
|
msgid "push refspecs for '%s' do not include '%s'"
|
|
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
|
|
|
|
#: remote.c:1696
|
|
msgid "push has no destination (push.default is 'nothing')"
|
|
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
|
|
|
|
#: remote.c:1718
|
|
msgid "cannot resolve 'simple' push to a single destination"
|
|
msgstr "\"enkel push\" motsvarar flera olika mål"
|
|
|
|
#: remote.c:1844
|
|
#, c-format
|
|
msgid "couldn't find remote ref %s"
|
|
msgstr "Kunde inte hitta fjärr-referensen %s"
|
|
|
|
#: remote.c:1857
|
|
#, c-format
|
|
msgid "* Ignoring funny ref '%s' locally"
|
|
msgstr "* Ignorerar märklig referens \"%s\" lokalt"
|
|
|
|
#: remote.c:2020
|
|
#, c-format
|
|
msgid "Your branch is based on '%s', but the upstream is gone.\n"
|
|
msgstr "Din gren är baserad på \"%s\", men den har försvunnit uppströms.\n"
|
|
|
|
#: remote.c:2024
|
|
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
|
|
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
|
|
|
|
#: remote.c:2027
|
|
#, c-format
|
|
msgid "Your branch is up to date with '%s'.\n"
|
|
msgstr "Din gren är à jour med \"%s\".\n"
|
|
|
|
#: remote.c:2031
|
|
#, c-format
|
|
msgid "Your branch and '%s' refer to different commits.\n"
|
|
msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
|
|
|
|
#: remote.c:2034
|
|
#, c-format
|
|
msgid " (use \"%s\" for details)\n"
|
|
msgstr " (använd \"%s\" för detaljer)\n"
|
|
|
|
#: 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] "Din gren ligger före \"%s\" med %d incheckning.\n"
|
|
msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
|
|
|
|
#: remote.c:2044
|
|
msgid " (use \"git push\" to publish your local commits)\n"
|
|
msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n"
|
|
|
|
#: remote.c:2047
|
|
#, c-format
|
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
|
msgid_plural ""
|
|
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
|
|
msgstr[0] ""
|
|
"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n"
|
|
msgstr[1] ""
|
|
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
|
|
|
|
#: remote.c:2055
|
|
msgid " (use \"git pull\" to update your local branch)\n"
|
|
msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n"
|
|
|
|
#: remote.c:2058
|
|
#, c-format
|
|
msgid ""
|
|
"Your branch and '%s' have diverged,\n"
|
|
"and have %d and %d different commit each, respectively.\n"
|
|
msgid_plural ""
|
|
"Your branch and '%s' have diverged,\n"
|
|
"and have %d and %d different commits each, respectively.\n"
|
|
msgstr[0] ""
|
|
"Din gren och \"%s\" har divergerat,\n"
|
|
"och har %d respektive %d olika incheckning.\n"
|
|
msgstr[1] ""
|
|
"Din gren och \"%s\" har divergerat,\n"
|
|
"och har %d respektive %d olika incheckningar.\n"
|
|
|
|
#: remote.c:2068
|
|
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
|
|
msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n"
|
|
|
|
#: remote.c:2251
|
|
#, c-format
|
|
msgid "cannot parse expected object name '%s'"
|
|
msgstr "kan inte tolka förväntat objektnamn \"%s\""
|
|
|
|
#: replace-object.c:21
|
|
#, c-format
|
|
msgid "bad replace ref name: %s"
|
|
msgstr "felaktig ersättningsreferensnamn: %s"
|
|
|
|
#: replace-object.c:30
|
|
#, c-format
|
|
msgid "duplicate replace ref: %s"
|
|
msgstr "duplicerat ersättningsreferensnamn: %s"
|
|
|
|
#: replace-object.c:82
|
|
#, c-format
|
|
msgid "replace depth too high for object %s"
|
|
msgstr "ersättningsdjupet för högt för objektet %s"
|
|
|
|
#: rerere.c:217 rerere.c:226 rerere.c:229
|
|
msgid "corrupt MERGE_RR"
|
|
msgstr "trasig MERGE_RR"
|
|
|
|
#: rerere.c:264 rerere.c:269
|
|
msgid "unable to write rerere record"
|
|
msgstr "kunde inte skriva rerere-post"
|
|
|
|
#: rerere.c:495
|
|
#, c-format
|
|
msgid "there were errors while writing '%s' (%s)"
|
|
msgstr "fel vid skrivning av \"%s\" (%s)"
|
|
|
|
#: rerere.c:498
|
|
#, c-format
|
|
msgid "failed to flush '%s'"
|
|
msgstr "misslyckades spola \"%s\""
|
|
|
|
#: rerere.c:503 rerere.c:1039
|
|
#, c-format
|
|
msgid "could not parse conflict hunks in '%s'"
|
|
msgstr "kunde inte tolka konflikt-stycket i \"%s\""
|
|
|
|
#: rerere.c:684
|
|
#, c-format
|
|
msgid "failed utime() on '%s'"
|
|
msgstr "\"utime()\" misslyckades på \"%s\""
|
|
|
|
#: rerere.c:694
|
|
#, c-format
|
|
msgid "writing '%s' failed"
|
|
msgstr "misslyckades skriva \"%s\""
|
|
|
|
#: rerere.c:714
|
|
#, c-format
|
|
msgid "Staged '%s' using previous resolution."
|
|
msgstr "Köade \"%s\" med sparad lösning."
|
|
|
|
#: rerere.c:753
|
|
#, c-format
|
|
msgid "Recorded resolution for '%s'."
|
|
msgstr "Sparade lösning för \"%s\"."
|
|
|
|
#: rerere.c:788
|
|
#, c-format
|
|
msgid "Resolved '%s' using previous resolution."
|
|
msgstr "Löste \"%s\" med tidigare lösning."
|
|
|
|
#: rerere.c:803
|
|
#, c-format
|
|
msgid "cannot unlink stray '%s'"
|
|
msgstr "kan inte ta bort lös länk \"%s\""
|
|
|
|
#: rerere.c:807
|
|
#, c-format
|
|
msgid "Recorded preimage for '%s'"
|
|
msgstr "Sparade förhandsbild för \"%s\""
|
|
|
|
#: 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 "kunde inte skapa katalogen \"%s\""
|
|
|
|
#: rerere.c:1057
|
|
#, c-format
|
|
msgid "failed to update conflicted state in '%s'"
|
|
msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
|
|
|
|
#: rerere.c:1068 rerere.c:1075
|
|
#, c-format
|
|
msgid "no remembered resolution for '%s'"
|
|
msgstr "inget sparat sammanslagningsresultat för \"%s\""
|
|
|
|
#: rerere.c:1077
|
|
#, c-format
|
|
msgid "cannot unlink '%s'"
|
|
msgstr "kan inte ta bort länken \"%s\""
|
|
|
|
#: rerere.c:1087
|
|
#, c-format
|
|
msgid "Updated preimage for '%s'"
|
|
msgstr "Uppdaterade förhandsbild för \"%s\""
|
|
|
|
#: rerere.c:1096
|
|
#, c-format
|
|
msgid "Forgot resolution for '%s'\n"
|
|
msgstr "Glömde lösning för \"%s\"\n"
|
|
|
|
#: rerere.c:1199
|
|
msgid "unable to open rr-cache directory"
|
|
msgstr "kan inte uppdatera katalogen rr-cache"
|
|
|
|
#: revision.c:2497
|
|
msgid "your current branch appears to be broken"
|
|
msgstr "din nuvarande gren verkar vara trasig"
|
|
|
|
#: revision.c:2500
|
|
#, c-format
|
|
msgid "your current branch '%s' does not have any commits yet"
|
|
msgstr "din nuvarande gren \"%s\" innehåller ännu inte några incheckningar"
|
|
|
|
#: revision.c:2708
|
|
msgid "--first-parent is incompatible with --bisect"
|
|
msgstr "--first-parent är inkompatibelt med --bisect"
|
|
|
|
#: revision.c:2712
|
|
msgid "-L does not yet support diff formats besides -p and -s"
|
|
msgstr "-L stöder ännu inte andra diff-format än -p och -s"
|
|
|
|
#: run-command.c:763
|
|
msgid "open /dev/null failed"
|
|
msgstr "misslyckades öppna /dev/null"
|
|
|
|
#: run-command.c:1269
|
|
#, c-format
|
|
msgid "cannot create async thread: %s"
|
|
msgstr "kan inte skapa asynkron tråd: %s"
|
|
|
|
#: run-command.c:1333
|
|
#, c-format
|
|
msgid ""
|
|
"The '%s' hook was ignored because it's not set as executable.\n"
|
|
"You can disable this warning with `git config advice.ignoredHook false`."
|
|
msgstr ""
|
|
"Kroken \"%s\" ignorerades eftersom den inte är markerad som körbar.\n"
|
|
"Du kan inaktivera varningen med \"git config advice.ignoredHook false\"."
|
|
|
|
#: send-pack.c:144
|
|
msgid "unexpected flush packet while reading remote unpack status"
|
|
msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
|
|
|
|
#: send-pack.c:146
|
|
#, c-format
|
|
msgid "unable to parse remote unpack status: %s"
|
|
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
|
|
|
|
#: send-pack.c:148
|
|
#, c-format
|
|
msgid "remote unpack failed: %s"
|
|
msgstr "fjärruppackning misslyckades: %s"
|
|
|
|
#: send-pack.c:309
|
|
msgid "failed to sign the push certificate"
|
|
msgstr "misslyckades underteckna push-certifikatet"
|
|
|
|
#: send-pack.c:423
|
|
msgid "the receiving end does not support --signed push"
|
|
msgstr "mottagarsidan stöder inte push med --signed"
|
|
|
|
#: send-pack.c:425
|
|
msgid ""
|
|
"not sending a push certificate since the receiving end does not support --"
|
|
"signed push"
|
|
msgstr ""
|
|
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
|
|
"signed"
|
|
|
|
#: send-pack.c:437
|
|
msgid "the receiving end does not support --atomic push"
|
|
msgstr "mottagarsidan stöder inte push med --atomic"
|
|
|
|
#: send-pack.c:442
|
|
msgid "the receiving end does not support push options"
|
|
msgstr "mottagarsidan stöder inte push-flaggor"
|
|
|
|
#: sequencer.c:191
|
|
#, c-format
|
|
msgid "invalid commit message cleanup mode '%s'"
|
|
msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
|
|
|
|
#: sequencer.c:296
|
|
#, c-format
|
|
msgid "could not delete '%s'"
|
|
msgstr "kunde inte ta bort \"%s\""
|
|
|
|
#: sequencer.c:315 builtin/rebase.c:785 builtin/rebase.c:1750 builtin/rm.c:385
|
|
#, c-format
|
|
msgid "could not remove '%s'"
|
|
msgstr "kunde inte ta bort \"%s\""
|
|
|
|
#: sequencer.c:325
|
|
msgid "revert"
|
|
msgstr "revert"
|
|
|
|
#: sequencer.c:327
|
|
msgid "cherry-pick"
|
|
msgstr "cherry-pick"
|
|
|
|
#: sequencer.c:329
|
|
msgid "rebase"
|
|
msgstr "rebase"
|
|
|
|
#: sequencer.c:331
|
|
#, c-format
|
|
msgid "unknown action: %d"
|
|
msgstr "okänd funktion: %d"
|
|
|
|
#: sequencer.c:389
|
|
msgid ""
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
msgstr ""
|
|
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
|
|
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
|
|
|
|
#: sequencer.c:392
|
|
msgid ""
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
"and commit the result with 'git commit'"
|
|
msgstr ""
|
|
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
|
|
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
|
|
"och checka in resultatet med \"git commit\""
|
|
|
|
#: sequencer.c:405 sequencer.c:2901
|
|
#, c-format
|
|
msgid "could not lock '%s'"
|
|
msgstr "kunde inte låsa \"%s\""
|
|
|
|
#: sequencer.c:412
|
|
#, c-format
|
|
msgid "could not write eol to '%s'"
|
|
msgstr "kunde inte skriva radslut till \"%s\""
|
|
|
|
#: sequencer.c:417 sequencer.c:2706 sequencer.c:2907 sequencer.c:2921
|
|
#: sequencer.c:3185
|
|
#, c-format
|
|
msgid "failed to finalize '%s'"
|
|
msgstr "misslyckades färdigställa \"%s\""
|
|
|
|
#: 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 "kunde inte läsa \"%s\""
|
|
|
|
#: sequencer.c:466
|
|
#, c-format
|
|
msgid "your local changes would be overwritten by %s."
|
|
msgstr "dina lokala ändringar skulle skrivas över av %s."
|
|
|
|
#: sequencer.c:470
|
|
msgid "commit your changes or stash them to proceed."
|
|
msgstr "checka in dina ändringar eller använd \"stash\" för att fortsätta."
|
|
|
|
#: sequencer.c:502
|
|
#, c-format
|
|
msgid "%s: fast-forward"
|
|
msgstr "%s: snabbspola"
|
|
|
|
#: sequencer.c:541 builtin/tag.c:565
|
|
#, c-format
|
|
msgid "Invalid cleanup mode %s"
|
|
msgstr "Felaktigt städningsläge %s"
|
|
|
|
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
|
|
#. "rebase".
|
|
#.
|
|
#: sequencer.c:635
|
|
#, c-format
|
|
msgid "%s: Unable to write new index file"
|
|
msgstr "%s: Kunde inte skriva ny indexfil"
|
|
|
|
#: sequencer.c:652
|
|
msgid "unable to update cache tree"
|
|
msgstr "kan inte uppdatera cacheträd"
|
|
|
|
#: sequencer.c:666
|
|
msgid "could not resolve HEAD commit"
|
|
msgstr "kunde inte bestämma HEAD:s incheckning"
|
|
|
|
#: sequencer.c:746
|
|
#, c-format
|
|
msgid "no key present in '%.*s'"
|
|
msgstr "ingen nyckel i \"%.*s\""
|
|
|
|
#: sequencer.c:757
|
|
#, c-format
|
|
msgid "unable to dequote value of '%s'"
|
|
msgstr "kan inte ta bort citering av värdet \"%s\""
|
|
|
|
#: 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 "kunde inte öppna \"%s\" för läsning"
|
|
|
|
#: sequencer.c:804
|
|
msgid "'GIT_AUTHOR_NAME' already given"
|
|
msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
|
|
|
|
#: sequencer.c:809
|
|
msgid "'GIT_AUTHOR_EMAIL' already given"
|
|
msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
|
|
|
|
#: sequencer.c:814
|
|
msgid "'GIT_AUTHOR_DATE' already given"
|
|
msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
|
|
|
|
#: sequencer.c:818
|
|
#, c-format
|
|
msgid "unknown variable '%s'"
|
|
msgstr "okänd variabel \"%s\""
|
|
|
|
#: sequencer.c:823
|
|
msgid "missing 'GIT_AUTHOR_NAME'"
|
|
msgstr "\"GIT_AUTHOR_NAME\" saknas"
|
|
|
|
#: sequencer.c:825
|
|
msgid "missing 'GIT_AUTHOR_EMAIL'"
|
|
msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
|
|
|
|
#: sequencer.c:827
|
|
msgid "missing 'GIT_AUTHOR_DATE'"
|
|
msgstr "\"GIT_AUTHOR_DATE\" saknas"
|
|
|
|
#: sequencer.c:876
|
|
#, c-format
|
|
msgid ""
|
|
"you have staged changes in your working tree\n"
|
|
"If these changes are meant to be squashed into the previous commit, run:\n"
|
|
"\n"
|
|
" git commit --amend %s\n"
|
|
"\n"
|
|
"If they are meant to go into a new commit, run:\n"
|
|
"\n"
|
|
" git commit %s\n"
|
|
"\n"
|
|
"In both cases, once you're done, continue with:\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
msgstr ""
|
|
"du har köade ändringar i din arbetskatalog.\n"
|
|
"Om ändringarna ska läggas in i föregående incheckning, kör:\n"
|
|
"\n"
|
|
" git commit --amend %s\n"
|
|
"\n"
|
|
"Om de ska checkas in i en egen incheckning, kör:\n"
|
|
"\n"
|
|
" git commit %s\n"
|
|
"\n"
|
|
"Oavsett vilket, när du är färdig fortsätter du med:\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
|
|
#: sequencer.c:1148
|
|
msgid "'prepare-commit-msg' hook failed"
|
|
msgstr "kroken \"prepare-commit-msg\" misslyckades"
|
|
|
|
#: 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"
|
|
"You can suppress this message by setting them explicitly. Run the\n"
|
|
"following command and follow the instructions in your editor to edit\n"
|
|
"your configuration file:\n"
|
|
"\n"
|
|
" git config --global --edit\n"
|
|
"\n"
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
"\n"
|
|
" git commit --amend --reset-author\n"
|
|
msgstr ""
|
|
"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
|
|
"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
|
|
"kan förhindra det här meddelandet genom att ställa dem explicit.\n"
|
|
"Kör följande kommandon och följ instruktionerna i textredigeraren\n"
|
|
"för att redigera din konfigurationsfil:\n"
|
|
"\n"
|
|
" git config --global --edit\n"
|
|
"\n"
|
|
"När du gjort det kan du rätta identiteten som användes för den här\n"
|
|
"incheckningen med:\n"
|
|
"\n"
|
|
" git commit --amend --reset-author\n"
|
|
|
|
#: 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"
|
|
"You can suppress this message by setting them explicitly:\n"
|
|
"\n"
|
|
" git config --global user.name \"Your Name\"\n"
|
|
" git config --global user.email you@example.com\n"
|
|
"\n"
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
|
"\n"
|
|
" git commit --amend --reset-author\n"
|
|
msgstr ""
|
|
"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
|
|
"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
|
|
"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
|
|
"\n"
|
|
" git config --global user.name \"Ditt namn\"\n"
|
|
" git config --global user.email du@example.com\n"
|
|
"\n"
|
|
"När du gjort det kan du rätta identiteten som användes för den här\n"
|
|
"incheckningen med:\n"
|
|
"\n"
|
|
" git commit --amend --reset-author\n"
|
|
|
|
#: sequencer.c:1209
|
|
msgid "couldn't look up newly created commit"
|
|
msgstr "kunde inte slå upp en precis skapad incheckning"
|
|
|
|
#: sequencer.c:1211
|
|
msgid "could not parse newly created commit"
|
|
msgstr "kunde inte tolka en precis skapad incheckning"
|
|
|
|
#: sequencer.c:1257
|
|
msgid "unable to resolve HEAD after creating commit"
|
|
msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
|
|
|
|
#: sequencer.c:1259
|
|
msgid "detached HEAD"
|
|
msgstr "frånkopplad HEAD"
|
|
|
|
#: sequencer.c:1263
|
|
msgid " (root-commit)"
|
|
msgstr " (rotincheckning)"
|
|
|
|
#: sequencer.c:1284
|
|
msgid "could not parse HEAD"
|
|
msgstr "kunde inte tolka HEAD"
|
|
|
|
#: sequencer.c:1286
|
|
#, c-format
|
|
msgid "HEAD %s is not a commit!"
|
|
msgstr "HEAD %s är inte en incheckning!"
|
|
|
|
#: sequencer.c:1290 sequencer.c:1364 builtin/commit.c:1574
|
|
msgid "could not parse HEAD commit"
|
|
msgstr "kunde inte tolka HEAD:s incheckning"
|
|
|
|
#: sequencer.c:1342 sequencer.c:1968
|
|
msgid "unable to parse commit author"
|
|
msgstr "kunde inte tolka incheckningens författare"
|
|
|
|
#: sequencer.c:1353 builtin/am.c:1566 builtin/merge.c:687
|
|
msgid "git write-tree failed to write a tree"
|
|
msgstr "git write-tree misslyckades skriva ett träd"
|
|
|
|
#: sequencer.c:1386 sequencer.c:1447
|
|
#, c-format
|
|
msgid "unable to read commit message from '%s'"
|
|
msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
|
|
|
|
#: 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 "kunde inte skriva incheckningsobjekt"
|
|
|
|
#: sequencer.c:1474
|
|
#, c-format
|
|
msgid "could not parse commit %s"
|
|
msgstr "kunde inte tolka incheckningen %s"
|
|
|
|
#: sequencer.c:1479
|
|
#, c-format
|
|
msgid "could not parse parent commit %s"
|
|
msgstr "kunde inte tolka föräldraincheckningen %s"
|
|
|
|
#: sequencer.c:1562 sequencer.c:1673
|
|
#, c-format
|
|
msgid "unknown command: %d"
|
|
msgstr "okänt kommando: %d"
|
|
|
|
#: sequencer.c:1620 sequencer.c:1645
|
|
#, c-format
|
|
msgid "This is a combination of %d commits."
|
|
msgstr "Det här är en kombination av %d incheckningar."
|
|
|
|
#: sequencer.c:1630
|
|
msgid "need a HEAD to fixup"
|
|
msgstr "behöver en HEAD-incheckning att rätta"
|
|
|
|
#: sequencer.c:1632 sequencer.c:3212
|
|
msgid "could not read HEAD"
|
|
msgstr "kunde inte läsa HEAD"
|
|
|
|
#: sequencer.c:1634
|
|
msgid "could not read HEAD's commit message"
|
|
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
|
|
|
|
#: sequencer.c:1640
|
|
#, c-format
|
|
msgid "cannot write '%s'"
|
|
msgstr "kan inte skriva \"%s\""
|
|
|
|
#: sequencer.c:1647 git-rebase--preserve-merges.sh:496
|
|
msgid "This is the 1st commit message:"
|
|
msgstr "Det här är 1:a incheckningsmeddelandet:"
|
|
|
|
#: sequencer.c:1655
|
|
#, c-format
|
|
msgid "could not read commit message of %s"
|
|
msgstr "kunde inte läsa incheckningsmeddelande för %s"
|
|
|
|
#: sequencer.c:1662
|
|
#, c-format
|
|
msgid "This is the commit message #%d:"
|
|
msgstr "Det här är incheckningsmeddelande %d:"
|
|
|
|
#: sequencer.c:1668
|
|
#, c-format
|
|
msgid "The commit message #%d will be skipped:"
|
|
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
|
|
|
|
#: sequencer.c:1756
|
|
msgid "your index file is unmerged."
|
|
msgstr "din indexfil har inte slagits ihop."
|
|
|
|
#: sequencer.c:1763
|
|
msgid "cannot fixup root commit"
|
|
msgstr "kan inte göra \"fixup\" på rotincheckning"
|
|
|
|
#: sequencer.c:1782
|
|
#, c-format
|
|
msgid "commit %s is a merge but no -m option was given."
|
|
msgstr "incheckning %s är en sammanslagning, men flaggan -m angavs inte."
|
|
|
|
#: sequencer.c:1790 sequencer.c:1798
|
|
#, c-format
|
|
msgid "commit %s does not have parent %d"
|
|
msgstr "incheckning %s har inte förälder %d"
|
|
|
|
#: sequencer.c:1804
|
|
#, c-format
|
|
msgid "cannot get commit message for %s"
|
|
msgstr "kan inte hämta incheckningsmeddelande för %s"
|
|
|
|
#. TRANSLATORS: The first %s will be a "todo" command like
|
|
#. "revert" or "pick", the second %s a SHA1.
|
|
#: sequencer.c:1823
|
|
#, c-format
|
|
msgid "%s: cannot parse parent commit %s"
|
|
msgstr "%s: kan inte tolka föräldraincheckningen %s"
|
|
|
|
#: sequencer.c:1888
|
|
#, c-format
|
|
msgid "could not rename '%s' to '%s'"
|
|
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
|
|
|
|
#: sequencer.c:1943
|
|
#, c-format
|
|
msgid "could not revert %s... %s"
|
|
msgstr "kunde inte ångra %s... %s"
|
|
|
|
#: sequencer.c:1944
|
|
#, c-format
|
|
msgid "could not apply %s... %s"
|
|
msgstr "kunde inte tillämpa %s... %s"
|
|
|
|
#: sequencer.c:1961
|
|
#, c-format
|
|
msgid "dropping %s %s -- patch contents already upstream\n"
|
|
msgstr "utelämnar %s %s -- patchinnehållet finns redan uppströms\n"
|
|
|
|
#: sequencer.c:2018
|
|
#, c-format
|
|
msgid "git %s: failed to read the index"
|
|
msgstr "git %s: misslyckades läsa indexet"
|
|
|
|
#: sequencer.c:2025
|
|
#, c-format
|
|
msgid "git %s: failed to refresh the index"
|
|
msgstr "git %s: misslyckades uppdatera indexet"
|
|
|
|
#: sequencer.c:2102
|
|
#, c-format
|
|
msgid "%s does not accept arguments: '%s'"
|
|
msgstr "%s tar inte argument: \"%s\""
|
|
|
|
#: sequencer.c:2111
|
|
#, c-format
|
|
msgid "missing arguments for %s"
|
|
msgstr "argument saknas för %s"
|
|
|
|
#: sequencer.c:2142
|
|
#, c-format
|
|
msgid "could not parse '%s'"
|
|
msgstr "kunde inte tolka \"%s\""
|
|
|
|
#: sequencer.c:2203
|
|
#, c-format
|
|
msgid "invalid line %d: %.*s"
|
|
msgstr "ogiltig rad %d: %.*s"
|
|
|
|
#: sequencer.c:2214
|
|
#, c-format
|
|
msgid "cannot '%s' without a previous commit"
|
|
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
|
|
|
|
#: sequencer.c:2298
|
|
msgid "cancelling a cherry picking in progress"
|
|
msgstr "avbryter pågående \"cherry-pick\""
|
|
|
|
#: sequencer.c:2305
|
|
msgid "cancelling a revert in progress"
|
|
msgstr "avbryter pågående \"revert\""
|
|
|
|
#: sequencer.c:2349
|
|
msgid "please fix this using 'git rebase --edit-todo'."
|
|
msgstr "rätta det med \"git rebase --edit-todo\"."
|
|
|
|
#: sequencer.c:2351
|
|
#, c-format
|
|
msgid "unusable instruction sheet: '%s'"
|
|
msgstr "oanvändbart manus: \"%s\""
|
|
|
|
#: sequencer.c:2356
|
|
msgid "no commits parsed."
|
|
msgstr "inga incheckningar lästes."
|
|
|
|
#: sequencer.c:2367
|
|
msgid "cannot cherry-pick during a revert."
|
|
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
|
|
|
|
#: sequencer.c:2369
|
|
msgid "cannot revert during a cherry-pick."
|
|
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
|
|
|
|
#: sequencer.c:2447
|
|
#, c-format
|
|
msgid "invalid value for %s: %s"
|
|
msgstr "felaktigt värde för %s: %s"
|
|
|
|
#: sequencer.c:2540
|
|
msgid "unusable squash-onto"
|
|
msgstr "oanvändbar squash-onto"
|
|
|
|
#: sequencer.c:2556
|
|
#, c-format
|
|
msgid "malformed options sheet: '%s'"
|
|
msgstr "trasigt manus: \"%s\""
|
|
|
|
#: sequencer.c:2644 sequencer.c:4361
|
|
msgid "empty commit set passed"
|
|
msgstr "den angivna uppsättningen incheckningar är tom"
|
|
|
|
#: sequencer.c:2660
|
|
msgid "revert is already in progress"
|
|
msgstr "en \"revert\" pågår redan"
|
|
|
|
#: sequencer.c:2662
|
|
#, c-format
|
|
msgid "try \"git revert (--continue | %s--abort | --quit)\""
|
|
msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
|
|
|
|
#: sequencer.c:2665
|
|
msgid "cherry-pick is already in progress"
|
|
msgstr "en \"cherry-pick\" pågår redan"
|
|
|
|
#: sequencer.c:2667
|
|
#, c-format
|
|
msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
|
|
msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
|
|
|
|
#: sequencer.c:2681
|
|
#, c-format
|
|
msgid "could not create sequencer directory '%s'"
|
|
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
|
|
|
|
#: sequencer.c:2696
|
|
msgid "could not lock HEAD"
|
|
msgstr "kunde inte låsa HEAD"
|
|
|
|
#: sequencer.c:2756 sequencer.c:4099
|
|
msgid "no cherry-pick or revert in progress"
|
|
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
|
|
|
|
#: sequencer.c:2758 sequencer.c:2769
|
|
msgid "cannot resolve HEAD"
|
|
msgstr "kan inte bestämma HEAD"
|
|
|
|
#: sequencer.c:2760 sequencer.c:2804
|
|
msgid "cannot abort from a branch yet to be born"
|
|
msgstr "kan inte avbryta från en gren som ännu inte är född"
|
|
|
|
#: sequencer.c:2790 builtin/grep.c:724
|
|
#, c-format
|
|
msgid "cannot open '%s'"
|
|
msgstr "kan inte öppna \"%s\""
|
|
|
|
#: sequencer.c:2792
|
|
#, c-format
|
|
msgid "cannot read '%s': %s"
|
|
msgstr "kan inte läsa \"%s\": %s"
|
|
|
|
#: sequencer.c:2793
|
|
msgid "unexpected end of file"
|
|
msgstr "oväntat filslut"
|
|
|
|
#: sequencer.c:2799
|
|
#, c-format
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
|
|
|
|
#: sequencer.c:2810
|
|
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
|
|
msgstr ""
|
|
"Du verkar ha flyttat HEAD.\n"
|
|
"Spolar inte tillbaka, kontrollera HEAD!"
|
|
|
|
#: sequencer.c:2851
|
|
msgid "no revert in progress"
|
|
msgstr "ingen \"revers\" pågår"
|
|
|
|
#: sequencer.c:2859
|
|
msgid "no cherry-pick in progress"
|
|
msgstr "ingen \"cherry-pick\" pågår"
|
|
|
|
#: sequencer.c:2869
|
|
msgid "failed to skip the commit"
|
|
msgstr "kunde inte hoppa över incheckningen"
|
|
|
|
#: sequencer.c:2876
|
|
msgid "there is nothing to skip"
|
|
msgstr "ingenting att hoppa över"
|
|
|
|
#: sequencer.c:2879
|
|
#, c-format
|
|
msgid ""
|
|
"have you committed already?\n"
|
|
"try \"git %s --continue\""
|
|
msgstr ""
|
|
"har du redan checkat in?\n"
|
|
"testa \"git %s --continue\""
|
|
|
|
#: sequencer.c:3003 sequencer.c:4011
|
|
#, c-format
|
|
msgid "could not update %s"
|
|
msgstr "kunde inte uppdatera %s"
|
|
|
|
#: sequencer.c:3042 sequencer.c:3991
|
|
msgid "cannot read HEAD"
|
|
msgstr "kan inte läsa HEAD"
|
|
|
|
#: sequencer.c:3059
|
|
#, c-format
|
|
msgid "unable to copy '%s' to '%s'"
|
|
msgstr "kan inte kopiera in \"%s\" till \"%s\""
|
|
|
|
#: sequencer.c:3067
|
|
#, c-format
|
|
msgid ""
|
|
"You can amend the commit now, with\n"
|
|
"\n"
|
|
" git commit --amend %s\n"
|
|
"\n"
|
|
"Once you are satisfied with your changes, run\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
msgstr ""
|
|
"Du kan utöka incheckningen nu, med\n"
|
|
"\n"
|
|
"\tgit commit --amend %s\n"
|
|
"\n"
|
|
"När du är nöjd med dina ändringar kör du\n"
|
|
"\n"
|
|
"\tgit rebase --continue\n"
|
|
|
|
#: sequencer.c:3077
|
|
#, c-format
|
|
msgid "Could not apply %s... %.*s"
|
|
msgstr "Kunde inte tillämpa %s... %.*s"
|
|
|
|
#: sequencer.c:3084
|
|
#, c-format
|
|
msgid "Could not merge %.*s"
|
|
msgstr "Kunde inte slå ihop %.*s"
|
|
|
|
#: sequencer.c:3098 sequencer.c:3102 builtin/difftool.c:641
|
|
#, c-format
|
|
msgid "could not copy '%s' to '%s'"
|
|
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
|
|
|
|
#: sequencer.c:3129
|
|
#, c-format
|
|
msgid ""
|
|
"execution failed: %s\n"
|
|
"%sYou can fix the problem, and then run\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
"\n"
|
|
msgstr ""
|
|
"körningen misslyckades: %s\n"
|
|
"%sDu kan rätta problemet och sedan köra\n"
|
|
"\n"
|
|
"\tgit rebase --continue\n"
|
|
"\n"
|
|
|
|
#: sequencer.c:3135
|
|
msgid "and made changes to the index and/or the working tree\n"
|
|
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen\n"
|
|
|
|
#: sequencer.c:3141
|
|
#, c-format
|
|
msgid ""
|
|
"execution succeeded: %s\n"
|
|
"but left changes to the index and/or the working tree\n"
|
|
"Commit or stash your changes, and then run\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
"\n"
|
|
msgstr ""
|
|
"körningen lyckades: %s\n"
|
|
"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
|
|
"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
|
|
"\n"
|
|
"\tgit rebase --continue\n"
|
|
"\n"
|
|
|
|
#: sequencer.c:3202
|
|
#, c-format
|
|
msgid "illegal label name: '%.*s'"
|
|
msgstr "ogiltigt etikettnamn: \"%.*s\""
|
|
|
|
#: sequencer.c:3256
|
|
msgid "writing fake root commit"
|
|
msgstr "skriver fejkad rotincheckning"
|
|
|
|
#: sequencer.c:3261
|
|
msgid "writing squash-onto"
|
|
msgstr "skriver squash-onto"
|
|
|
|
#: sequencer.c:3299 builtin/rebase.c:880 builtin/rebase.c:886
|
|
#, c-format
|
|
msgid "failed to find tree of %s"
|
|
msgstr "kunde inte hitta trädet för %s."
|
|
|
|
#: sequencer.c:3344
|
|
#, c-format
|
|
msgid "could not resolve '%s'"
|
|
msgstr "kunde inte upplösa \"%s\""
|
|
|
|
#: sequencer.c:3375
|
|
msgid "cannot merge without a current revision"
|
|
msgstr "kan inte slå ihop utan en aktuell incheckning"
|
|
|
|
#: sequencer.c:3397
|
|
#, c-format
|
|
msgid "unable to parse '%.*s'"
|
|
msgstr "kan inte tolka \"%.*s\""
|
|
|
|
#: sequencer.c:3406
|
|
#, c-format
|
|
msgid "nothing to merge: '%.*s'"
|
|
msgstr "inget att slå samman: \"%.*s\""
|
|
|
|
#: sequencer.c:3418
|
|
msgid "octopus merge cannot be executed on top of a [new root]"
|
|
msgstr "\"octopus\"-sammanslagning kan inte köras ovanpå en [ny rot]"
|
|
|
|
#: sequencer.c:3434
|
|
#, c-format
|
|
msgid "could not get commit message of '%s'"
|
|
msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
|
|
|
|
#: sequencer.c:3594
|
|
#, c-format
|
|
msgid "could not even attempt to merge '%.*s'"
|
|
msgstr "kunde inte ens försöka slå ihop \"%.*s\""
|
|
|
|
#: sequencer.c:3610
|
|
msgid "merge: Unable to write new index file"
|
|
msgstr "sammanslagning: Kunde inte skriva ny indexfil"
|
|
|
|
#: sequencer.c:3679 builtin/rebase.c:737
|
|
#, c-format
|
|
msgid "Applied autostash.\n"
|
|
msgstr "Tillämpade autostash.\n"
|
|
|
|
#: sequencer.c:3691
|
|
#, c-format
|
|
msgid "cannot store %s"
|
|
msgstr "kan inte spara %s"
|
|
|
|
#: sequencer.c:3694 builtin/rebase.c:753 git-rebase--preserve-merges.sh:113
|
|
#, c-format
|
|
msgid ""
|
|
"Applying autostash resulted in conflicts.\n"
|
|
"Your changes are safe in the stash.\n"
|
|
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
|
|
msgstr ""
|
|
"Tillämpning av autostash gav konflikter.\n"
|
|
"Dina ändringar är säkra i stashen.\n"
|
|
"Du kan när som helst använda \"git stash pop\" eller \"git stash drop\".\n"
|
|
|
|
#: sequencer.c:3755
|
|
#, c-format
|
|
msgid "%s: not a valid OID"
|
|
msgstr "%s: inte ett giltigt OID"
|
|
|
|
#: sequencer.c:3760 git-rebase--preserve-merges.sh:779
|
|
msgid "could not detach HEAD"
|
|
msgstr "kunde inte koppla från HEAD"
|
|
|
|
#: sequencer.c:3775
|
|
#, c-format
|
|
msgid "Stopped at HEAD\n"
|
|
msgstr "Stoppade på HEAD\n"
|
|
|
|
#: sequencer.c:3777
|
|
#, c-format
|
|
msgid "Stopped at %s\n"
|
|
msgstr "Stoppade på %s\n"
|
|
|
|
#: sequencer.c:3785
|
|
#, c-format
|
|
msgid ""
|
|
"Could not execute the todo command\n"
|
|
"\n"
|
|
" %.*s\n"
|
|
"It has been rescheduled; To edit the command before continuing, please\n"
|
|
"edit the todo list first:\n"
|
|
"\n"
|
|
" git rebase --edit-todo\n"
|
|
" git rebase --continue\n"
|
|
msgstr ""
|
|
"Kunde inte köra todo-kommandot\n"
|
|
"\n"
|
|
" %.*s\n"
|
|
"Det har lagts tillbaka i kön; För att redigera kommandot innan du\n"
|
|
"fortsätter, redigera först attgöra-listan:\n"
|
|
"\n"
|
|
" git rebase --edit-todo\n"
|
|
" git rebase --continue\n"
|
|
|
|
#: sequencer.c:3869
|
|
#, c-format
|
|
msgid "Stopped at %s... %.*s\n"
|
|
msgstr "Stoppade på %s... %.*s\n"
|
|
|
|
#: sequencer.c:3940
|
|
#, c-format
|
|
msgid "unknown command %d"
|
|
msgstr "okänt kommando %d"
|
|
|
|
#: sequencer.c:3999
|
|
msgid "could not read orig-head"
|
|
msgstr "kunde inte läsa orig-head"
|
|
|
|
#: sequencer.c:4004
|
|
msgid "could not read 'onto'"
|
|
msgstr "kunde inte läsa \"onto\""
|
|
|
|
#: sequencer.c:4018
|
|
#, c-format
|
|
msgid "could not update HEAD to %s"
|
|
msgstr "kunde inte uppdatera HEAD till %s"
|
|
|
|
#: sequencer.c:4111
|
|
msgid "cannot rebase: You have unstaged changes."
|
|
msgstr "kan inte ombasera: Du har oköade ändringar."
|
|
|
|
#: sequencer.c:4120
|
|
msgid "cannot amend non-existing commit"
|
|
msgstr "kan inte lägga till incheckning som inte finns"
|
|
|
|
#: sequencer.c:4122
|
|
#, c-format
|
|
msgid "invalid file: '%s'"
|
|
msgstr "ogiltig fil: \"%s\""
|
|
|
|
#: sequencer.c:4124
|
|
#, c-format
|
|
msgid "invalid contents: '%s'"
|
|
msgstr "ogiltigt innehåll: \"%s\""
|
|
|
|
#: sequencer.c:4127
|
|
msgid ""
|
|
"\n"
|
|
"You have uncommitted changes in your working tree. Please, commit them\n"
|
|
"first and then run 'git rebase --continue' again."
|
|
msgstr ""
|
|
"\n"
|
|
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
|
|
"först och kör sedan \"git rebase --continue\" igen."
|
|
|
|
#: sequencer.c:4163 sequencer.c:4202
|
|
#, c-format
|
|
msgid "could not write file: '%s'"
|
|
msgstr "kunde inte skriva fil: \"%s\""
|
|
|
|
#: sequencer.c:4217
|
|
msgid "could not remove CHERRY_PICK_HEAD"
|
|
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
|
|
|
|
#: sequencer.c:4224
|
|
msgid "could not commit staged changes."
|
|
msgstr "kunde inte checka in köade ändringar."
|
|
|
|
#: sequencer.c:4338
|
|
#, c-format
|
|
msgid "%s: can't cherry-pick a %s"
|
|
msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
|
|
|
|
#: sequencer.c:4342
|
|
#, c-format
|
|
msgid "%s: bad revision"
|
|
msgstr "%s: felaktig revision"
|
|
|
|
#: sequencer.c:4377
|
|
msgid "can't revert as initial commit"
|
|
msgstr "kan inte ångra som första incheckning"
|
|
|
|
#: sequencer.c:4846
|
|
msgid "make_script: unhandled options"
|
|
msgstr "make_script: flaggor som inte stöds"
|
|
|
|
#: sequencer.c:4849
|
|
msgid "make_script: error preparing revisions"
|
|
msgstr "make_script: fel när revisioner skulle förberedas"
|
|
|
|
#: sequencer.c:5083 sequencer.c:5100
|
|
msgid "nothing to do"
|
|
msgstr "inget att göra"
|
|
|
|
#: sequencer.c:5119
|
|
msgid "could not skip unnecessary pick commands"
|
|
msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
|
|
|
|
#: sequencer.c:5213
|
|
msgid "the script was already rearranged."
|
|
msgstr "skriptet har redan omordnats."
|
|
|
|
#: setup.c:124
|
|
#, c-format
|
|
msgid "'%s' is outside repository at '%s'"
|
|
msgstr "\"%s\" är utanför arkivet på \"%s\""
|
|
|
|
#: setup.c:175
|
|
#, c-format
|
|
msgid ""
|
|
"%s: no such path in the working tree.\n"
|
|
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
|
|
msgstr ""
|
|
"%s: sökvägen finns inte i arbetskatalogen.\n"
|
|
"Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
|
|
"lokalt."
|
|
|
|
#: setup.c:188
|
|
#, c-format
|
|
msgid ""
|
|
"ambiguous argument '%s': unknown revision or path not in the working tree.\n"
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
msgstr ""
|
|
"tvetydigt argument \"%s\": okänd revision eller sökväg inte i "
|
|
"arbetskatalogen.\n"
|
|
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
|
|
"\"git <kommando> [<revision>...] -- [<fil>...]\""
|
|
|
|
#: setup.c:254
|
|
#, c-format
|
|
msgid "option '%s' must come before non-option arguments"
|
|
msgstr "flaggan \"%s\" måste anges före argument som inte är flaggor"
|
|
|
|
#: setup.c:273
|
|
#, c-format
|
|
msgid ""
|
|
"ambiguous argument '%s': both revision and filename\n"
|
|
"Use '--' to separate paths from revisions, like this:\n"
|
|
"'git <command> [<revision>...] -- [<file>...]'"
|
|
msgstr ""
|
|
"tvetydigt argument \"%s\": både revision och filnamn\n"
|
|
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
|
|
"\"git <kommando> [<revision>...] -- [<fil>...]\""
|
|
|
|
#: setup.c:409
|
|
msgid "unable to set up work tree using invalid config"
|
|
msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
|
|
|
|
#: setup.c:413
|
|
msgid "this operation must be run in a work tree"
|
|
msgstr "funktionen måste köras i en arbetskatalog"
|
|
|
|
#: setup.c:559
|
|
#, c-format
|
|
msgid "Expected git repo version <= %d, found %d"
|
|
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
|
|
|
|
#: setup.c:567
|
|
msgid "unknown repository extensions found:"
|
|
msgstr "okända arkivutökningar hittades:"
|
|
|
|
#: setup.c:586
|
|
#, c-format
|
|
msgid "error opening '%s'"
|
|
msgstr "fel vid öppning av \"%s\""
|
|
|
|
#: setup.c:588
|
|
#, c-format
|
|
msgid "too large to be a .git file: '%s'"
|
|
msgstr "för stor för att vara en .git-fil: \"%s\""
|
|
|
|
#: setup.c:590
|
|
#, c-format
|
|
msgid "error reading %s"
|
|
msgstr "fel vid läsning av %s"
|
|
|
|
#: setup.c:592
|
|
#, c-format
|
|
msgid "invalid gitfile format: %s"
|
|
msgstr "ogiltigt gitfilformat: %s"
|
|
|
|
#: setup.c:594
|
|
#, c-format
|
|
msgid "no path in gitfile: %s"
|
|
msgstr "ingen sökväg i gitfil: %s"
|
|
|
|
#: setup.c:596
|
|
#, c-format
|
|
msgid "not a git repository: %s"
|
|
msgstr "inte ett git-arkiv: %s"
|
|
|
|
#: setup.c:695
|
|
#, c-format
|
|
msgid "'$%s' too big"
|
|
msgstr "\"$%s\" för stor"
|
|
|
|
#: setup.c:709
|
|
#, c-format
|
|
msgid "not a git repository: '%s'"
|
|
msgstr "inte ett git-arkiv: \"%s\""
|
|
|
|
#: setup.c:738 setup.c:740 setup.c:771
|
|
#, c-format
|
|
msgid "cannot chdir to '%s'"
|
|
msgstr "kan inte byta katalog (chdir) till \"%s\""
|
|
|
|
#: setup.c:743 setup.c:799 setup.c:809 setup.c:848 setup.c:856
|
|
msgid "cannot come back to cwd"
|
|
msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
|
|
|
|
#: setup.c:870
|
|
#, c-format
|
|
msgid "failed to stat '%*s%s%s'"
|
|
msgstr "misslyckades ta status på \"%*ss%s%s\""
|
|
|
|
#: setup.c:1108
|
|
msgid "Unable to read current working directory"
|
|
msgstr "Kan inte läsa aktuell arbetskatalog"
|
|
|
|
#: setup.c:1117 setup.c:1123
|
|
#, c-format
|
|
msgid "cannot change to '%s'"
|
|
msgstr "kan inte byta till \"%s\""
|
|
|
|
#: setup.c:1128
|
|
#, c-format
|
|
msgid "not a git repository (or any of the parent directories): %s"
|
|
msgstr "inte ett git-arkiv (eller någon av föräldrakatalogerna): %s"
|
|
|
|
#: setup.c:1134
|
|
#, c-format
|
|
msgid ""
|
|
"not a git repository (or any parent up to mount point %s)\n"
|
|
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
|
|
msgstr ""
|
|
"inte ett git-arkiv (eller någon av föräldrakatalogerna upp till "
|
|
"monteringspunkten %s)\n"
|
|
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
|
|
|
|
#: setup.c:1245
|
|
#, c-format
|
|
msgid ""
|
|
"problem with core.sharedRepository filemode value (0%.3o).\n"
|
|
"The owner of files must always have read and write permissions."
|
|
msgstr ""
|
|
"problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
|
|
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
|
|
|
|
#: setup.c:1289
|
|
msgid "open /dev/null or dup failed"
|
|
msgstr "misslyckades öppna /dev/null eller \"dup\""
|
|
|
|
#: setup.c:1304
|
|
msgid "fork failed"
|
|
msgstr "\"fork\" misslyckades"
|
|
|
|
#: setup.c:1309
|
|
msgid "setsid failed"
|
|
msgstr "\"setsid\" misslyckades"
|
|
|
|
#: sha1-file.c:452
|
|
#, c-format
|
|
msgid "object directory %s does not exist; check .git/objects/info/alternates"
|
|
msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
|
|
|
|
#: sha1-file.c:503
|
|
#, c-format
|
|
msgid "unable to normalize alternate object path: %s"
|
|
msgstr "kunde inte normalisera supplerande objektsökväg: %s"
|
|
|
|
#: sha1-file.c:575
|
|
#, c-format
|
|
msgid "%s: ignoring alternate object stores, nesting too deep"
|
|
msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
|
|
|
|
#: sha1-file.c:582
|
|
#, c-format
|
|
msgid "unable to normalize object directory: %s"
|
|
msgstr "kan inte normalisera objektkatalogen: %s"
|
|
|
|
#: sha1-file.c:625
|
|
msgid "unable to fdopen alternates lockfile"
|
|
msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
|
|
|
|
#: sha1-file.c:643
|
|
msgid "unable to read alternates file"
|
|
msgstr "kan inte läsa \"alternates\"-filen"
|
|
|
|
#: sha1-file.c:650
|
|
msgid "unable to move new alternates file into place"
|
|
msgstr "kan inte flytta ny \"alternates\"-fil på plats"
|
|
|
|
#: sha1-file.c:685
|
|
#, c-format
|
|
msgid "path '%s' does not exist"
|
|
msgstr "sökvägen \"%s\" finns inte"
|
|
|
|
#: sha1-file.c:711
|
|
#, c-format
|
|
msgid "reference repository '%s' as a linked checkout is not supported yet."
|
|
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
|
|
|
|
#: sha1-file.c:717
|
|
#, c-format
|
|
msgid "reference repository '%s' is not a local repository."
|
|
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
|
|
|
|
#: sha1-file.c:723
|
|
#, c-format
|
|
msgid "reference repository '%s' is shallow"
|
|
msgstr "referensarkivet \"%s\" är grunt"
|
|
|
|
#: sha1-file.c:731
|
|
#, c-format
|
|
msgid "reference repository '%s' is grafted"
|
|
msgstr "referensarkivet \"%s\" är ympat"
|
|
|
|
#: sha1-file.c:791
|
|
#, c-format
|
|
msgid "invalid line while parsing alternate refs: %s"
|
|
msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
|
|
|
|
#: sha1-file.c:943
|
|
#, c-format
|
|
msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
|
|
msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
|
|
|
|
#: sha1-file.c:964
|
|
msgid "mmap failed"
|
|
msgstr "mmap misslyckades"
|
|
|
|
#: sha1-file.c:1128
|
|
#, c-format
|
|
msgid "object file %s is empty"
|
|
msgstr "objektfilen %s är tom"
|
|
|
|
#: sha1-file.c:1263 sha1-file.c:2443
|
|
#, c-format
|
|
msgid "corrupt loose object '%s'"
|
|
msgstr "trasigt löst objekt \"%s\""
|
|
|
|
#: sha1-file.c:1265 sha1-file.c:2447
|
|
#, c-format
|
|
msgid "garbage at end of loose object '%s'"
|
|
msgstr "skräp i slutet av löst objekt \"%s\""
|
|
|
|
#: sha1-file.c:1307
|
|
msgid "invalid object type"
|
|
msgstr "felaktig objekttyp"
|
|
|
|
#: sha1-file.c:1391
|
|
#, c-format
|
|
msgid "unable to unpack %s header with --allow-unknown-type"
|
|
msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
|
|
|
|
#: sha1-file.c:1394
|
|
#, c-format
|
|
msgid "unable to unpack %s header"
|
|
msgstr "kan inte packa upp %s-huvudet"
|
|
|
|
#: sha1-file.c:1400
|
|
#, c-format
|
|
msgid "unable to parse %s header with --allow-unknown-type"
|
|
msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
|
|
|
|
#: sha1-file.c:1403
|
|
#, c-format
|
|
msgid "unable to parse %s header"
|
|
msgstr "kan inte tolka %s-huvud"
|
|
|
|
#: sha1-file.c:1629
|
|
#, c-format
|
|
msgid "failed to read object %s"
|
|
msgstr "misslyckades läsa objektet %s"
|
|
|
|
#: sha1-file.c:1633
|
|
#, c-format
|
|
msgid "replacement %s not found for %s"
|
|
msgstr "ersättningen %s hittades inte för %s"
|
|
|
|
#: sha1-file.c:1637
|
|
#, c-format
|
|
msgid "loose object %s (stored in %s) is corrupt"
|
|
msgstr "löst objekt %s (lagrat i %s) är trasigt"
|
|
|
|
#: sha1-file.c:1641
|
|
#, c-format
|
|
msgid "packed object %s (stored in %s) is corrupt"
|
|
msgstr "packat objekt %s (lagrat i %s) är trasigt"
|
|
|
|
#: sha1-file.c:1746
|
|
#, c-format
|
|
msgid "unable to write file %s"
|
|
msgstr "kunde inte skriva filen %s"
|
|
|
|
#: sha1-file.c:1753
|
|
#, c-format
|
|
msgid "unable to set permission to '%s'"
|
|
msgstr "kan inte sätta behörigheten till \"%s\""
|
|
|
|
#: sha1-file.c:1760
|
|
msgid "file write error"
|
|
msgstr "fel vid skrivning av fil"
|
|
|
|
#: sha1-file.c:1780
|
|
msgid "error when closing loose object file"
|
|
msgstr "fel vid stängning av fil för löst objekt"
|
|
|
|
#: sha1-file.c:1845
|
|
#, c-format
|
|
msgid "insufficient permission for adding an object to repository database %s"
|
|
msgstr ""
|
|
"otillräcklig behörighet för att lägga till objekt till arkivdatabasen %s"
|
|
|
|
#: sha1-file.c:1847
|
|
msgid "unable to create temporary file"
|
|
msgstr "kan inte skapa temporär fil"
|
|
|
|
#: sha1-file.c:1871
|
|
msgid "unable to write loose object file"
|
|
msgstr "kunde inte skriva fil för löst objekt"
|
|
|
|
#: sha1-file.c:1877
|
|
#, c-format
|
|
msgid "unable to deflate new object %s (%d)"
|
|
msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
|
|
|
|
#: sha1-file.c:1881
|
|
#, c-format
|
|
msgid "deflateEnd on object %s failed (%d)"
|
|
msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
|
|
|
|
#: sha1-file.c:1885
|
|
#, c-format
|
|
msgid "confused by unstable object source data for %s"
|
|
msgstr "förvirrad av instabil objektkälldata för %s"
|
|
|
|
#: sha1-file.c:1895 builtin/pack-objects.c:1054
|
|
#, c-format
|
|
msgid "failed utime() on %s"
|
|
msgstr "\"utime()\" misslyckades på %s"
|
|
|
|
#: sha1-file.c:1972
|
|
#, c-format
|
|
msgid "cannot read object for %s"
|
|
msgstr "kan inte läsa objekt för %s"
|
|
|
|
#: sha1-file.c:2011
|
|
msgid "corrupt commit"
|
|
msgstr "trasik incheckning"
|
|
|
|
#: sha1-file.c:2019
|
|
msgid "corrupt tag"
|
|
msgstr "trasig tagg"
|
|
|
|
#: sha1-file.c:2119
|
|
#, c-format
|
|
msgid "read error while indexing %s"
|
|
msgstr "läsfel vid indexering av %s"
|
|
|
|
#: sha1-file.c:2122
|
|
#, c-format
|
|
msgid "short read while indexing %s"
|
|
msgstr "för lite lästes vid indexering av %s"
|
|
|
|
#: sha1-file.c:2195 sha1-file.c:2205
|
|
#, c-format
|
|
msgid "%s: failed to insert into database"
|
|
msgstr "%s: misslyckades lägga in i databasen"
|
|
|
|
#: sha1-file.c:2211
|
|
#, c-format
|
|
msgid "%s: unsupported file type"
|
|
msgstr "%s: filtypen stöds ej"
|
|
|
|
#: sha1-file.c:2235
|
|
#, c-format
|
|
msgid "%s is not a valid object"
|
|
msgstr "%s är inte ett giltigt objekt"
|
|
|
|
#: sha1-file.c:2237
|
|
#, c-format
|
|
msgid "%s is not a valid '%s' object"
|
|
msgstr "%s är inte ett giltigt \"%s\"-objekt"
|
|
|
|
#: sha1-file.c:2264 builtin/index-pack.c:155
|
|
#, c-format
|
|
msgid "unable to open %s"
|
|
msgstr "kan inte öppna %s"
|
|
|
|
#: sha1-file.c:2454 sha1-file.c:2507
|
|
#, c-format
|
|
msgid "hash mismatch for %s (expected %s)"
|
|
msgstr "hash stämmer inte för %s (förväntade %s)"
|
|
|
|
#: sha1-file.c:2478
|
|
#, c-format
|
|
msgid "unable to mmap %s"
|
|
msgstr "kan inte utföra \"mmap\" för %s"
|
|
|
|
#: sha1-file.c:2483
|
|
#, c-format
|
|
msgid "unable to unpack header of %s"
|
|
msgstr "kan inte packa upp huvud för %s"
|
|
|
|
#: sha1-file.c:2489
|
|
#, c-format
|
|
msgid "unable to parse header of %s"
|
|
msgstr "kan inte tolka huvud för %s"
|
|
|
|
#: sha1-file.c:2500
|
|
#, c-format
|
|
msgid "unable to unpack contents of %s"
|
|
msgstr "kan inte tolka innehåll i %s"
|
|
|
|
#: sha1-name.c:486
|
|
#, c-format
|
|
msgid "short SHA1 %s is ambiguous"
|
|
msgstr "kort SHA1 %s är tvetydig"
|
|
|
|
#: sha1-name.c:497
|
|
msgid "The candidates are:"
|
|
msgstr "Kandidaterna är:"
|
|
|
|
#: 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"
|
|
"may be created by mistake. For example,\n"
|
|
"\n"
|
|
" git switch -c $br $(git rev-parse ...)\n"
|
|
"\n"
|
|
"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
|
|
"examine these refs and maybe delete them. Turn this message off by\n"
|
|
"running \"git config advice.objectNameWarning false\""
|
|
msgstr ""
|
|
"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
|
|
"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
|
|
"referenser kan skapas av misstag. Till exempel, för\n"
|
|
"\n"
|
|
" git switch -c $br $(git rev-parse ...)\n"
|
|
"\n"
|
|
"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
|
|
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
|
|
"genom att köra \"git config advice.objectNameWarning false\""
|
|
|
|
#: sha1-name.c:916
|
|
#, c-format
|
|
msgid "log for '%.*s' only goes back to %s"
|
|
msgstr "loggen för \"%.*s\" räcker bara tillbaka till %s"
|
|
|
|
#: sha1-name.c:924
|
|
#, c-format
|
|
msgid "log for '%.*s' only has %d entries"
|
|
msgstr "loggen för \"%.*s\" har bara %d poster"
|
|
|
|
#: sha1-name.c:1689
|
|
#, c-format
|
|
msgid "path '%s' exists on disk, but not in '%.*s'"
|
|
msgstr "Sökvägen \"%s\" finns på disken, men inte i \"%.*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 ""
|
|
"sökvägen \"%s\" finns, men inte i \"%s\"\n"
|
|
"tips: Menade du \"%.*s:%s\", även känd som \"%.*s:./%s\"?"
|
|
|
|
#: sha1-name.c:1704
|
|
#, c-format
|
|
msgid "path '%s' does not exist in '%.*s'"
|
|
msgstr "sökvägen \"%s\" finns inte i \"%.*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 ""
|
|
"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
|
|
"tips: Menade du \":%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 ""
|
|
"sökvägen \"%s\" finns i indexet, men inte i \"%s\"\n"
|
|
"tips: Menade du \":%d:%s\", även känd som \":%d:./%s\"?"
|
|
|
|
#: sha1-name.c:1756
|
|
#, c-format
|
|
msgid "path '%s' exists on disk, but not in the index"
|
|
msgstr "sökvägen \"%s\" finns på disk, men inte i indexet"
|
|
|
|
#: sha1-name.c:1758
|
|
#, c-format
|
|
msgid "path '%s' does not exist (neither on disk nor in the index)"
|
|
msgstr "sökvägen \"%s\" finns inte (varken i disken eller i indexet)"
|
|
|
|
#: sha1-name.c:1771
|
|
msgid "relative path syntax can't be used outside working tree"
|
|
msgstr "relativ sökväg kan inte användas utanför arbetskatalogen"
|
|
|
|
#: sha1-name.c:1909
|
|
#, c-format
|
|
msgid "invalid object name '%.*s'."
|
|
msgstr "felaktigt objektnamn \"%.*s\"."
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 gibibyte
|
|
#: strbuf.c:837
|
|
#, c-format
|
|
msgid "%u.%2.2u GiB"
|
|
msgstr "%u,%2.2u GiB"
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
|
|
#: 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:847
|
|
#, c-format
|
|
msgid "%u.%2.2u MiB"
|
|
msgstr "%u,%2.2u MiB"
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
|
|
#: 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:856
|
|
#, c-format
|
|
msgid "%u.%2.2u KiB"
|
|
msgstr "%u,%2.2u KiB"
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
|
|
#: 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:864
|
|
#, c-format
|
|
msgid "%u byte"
|
|
msgid_plural "%u bytes"
|
|
msgstr[0] "%u byte"
|
|
msgstr[1] "%u bytes"
|
|
|
|
#. TRANSLATORS: IEC 80000-13:2008 byte/second
|
|
#: strbuf.c:866
|
|
#, c-format
|
|
msgid "%u byte/s"
|
|
msgid_plural "%u bytes/s"
|
|
msgstr[0] "%u byte/s"
|
|
msgstr[1] "%u bytes/s"
|
|
|
|
#: strbuf.c:1164
|
|
#, c-format
|
|
msgid "could not edit '%s'"
|
|
msgstr "kunde inte redigera \"%s\""
|
|
|
|
#: submodule.c:114 submodule.c:143
|
|
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
|
|
msgstr ""
|
|
"Kan inte ändra .gitmodules-fil som inte slagits ihop, lös "
|
|
"sammanslagningskonflikter först"
|
|
|
|
#: submodule.c:118 submodule.c:147
|
|
#, c-format
|
|
msgid "Could not find section in .gitmodules where path=%s"
|
|
msgstr "Hittade inte någon sektion i .gitmodules där sökväg=%s"
|
|
|
|
#: submodule.c:154
|
|
#, c-format
|
|
msgid "Could not remove .gitmodules entry for %s"
|
|
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
|
|
|
|
#: submodule.c:165
|
|
msgid "staging updated .gitmodules failed"
|
|
msgstr "misslyckades köa uppdaterad .gitmodules"
|
|
|
|
#: submodule.c:327
|
|
#, c-format
|
|
msgid "in unpopulated submodule '%s'"
|
|
msgstr "i ej utcheckad undermodul \"%s\""
|
|
|
|
#: submodule.c:358
|
|
#, c-format
|
|
msgid "Pathspec '%s' is in submodule '%.*s'"
|
|
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
|
|
|
|
#: submodule.c:434
|
|
#, c-format
|
|
msgid "bad --ignore-submodules argument: %s"
|
|
msgstr "felaktigt argument till --ignore-submodules: %s"
|
|
|
|
#: submodule.c:815
|
|
#, c-format
|
|
msgid ""
|
|
"Submodule in commit %s at path: '%s' collides with a submodule named the "
|
|
"same. Skipping it."
|
|
msgstr ""
|
|
"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
|
|
"med samma namn. Hoppar över den."
|
|
|
|
#: submodule.c:910
|
|
#, c-format
|
|
msgid "submodule entry '%s' (%s) is a %s, not a commit"
|
|
msgstr "undermodulposten \"%s\" (%s) är en %s, inte en incheckning"
|
|
|
|
#: submodule.c:995
|
|
#, c-format
|
|
msgid ""
|
|
"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
|
|
"submodule %s"
|
|
msgstr ""
|
|
"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
|
|
"undermodulen \"%s\""
|
|
|
|
#: submodule.c:1118
|
|
#, c-format
|
|
msgid "process for submodule '%s' failed"
|
|
msgstr "process för undermodulen \"%s\" misslyckades"
|
|
|
|
#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:2045
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
|
msgstr "Misslyckades slå upp HEAD som giltig referens."
|
|
|
|
#: submodule.c:1158
|
|
#, c-format
|
|
msgid "Pushing submodule '%s'\n"
|
|
msgstr "Sänder undermodulen \"%s\"\n"
|
|
|
|
#: submodule.c:1161
|
|
#, c-format
|
|
msgid "Unable to push submodule '%s'\n"
|
|
msgstr "Kunde inte sända undermodulen \"%s\"\n"
|
|
|
|
#: submodule.c:1453
|
|
#, c-format
|
|
msgid "Fetching submodule %s%s\n"
|
|
msgstr "Hämtar undermodulen %s%s\n"
|
|
|
|
#: submodule.c:1483
|
|
#, c-format
|
|
msgid "Could not access submodule '%s'\n"
|
|
msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
|
|
|
|
#: submodule.c:1637
|
|
#, c-format
|
|
msgid ""
|
|
"Errors during submodule fetch:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Fel vid hämtning av undermodul:\n"
|
|
"%s"
|
|
|
|
#: submodule.c:1662
|
|
#, c-format
|
|
msgid "'%s' not recognized as a git repository"
|
|
msgstr "\"%s\" känns inte igen som ett git-arkiv"
|
|
|
|
#: submodule.c:1679
|
|
#, c-format
|
|
msgid "Could not run 'git status --porcelain=2' in submodule %s"
|
|
msgstr "Kunde inte köra \"git status --porcelain=2\" i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1720
|
|
#, c-format
|
|
msgid "'git status --porcelain=2' failed in submodule %s"
|
|
msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1800
|
|
#, c-format
|
|
msgid "could not start 'git status' in submodule '%s'"
|
|
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1813
|
|
#, c-format
|
|
msgid "could not run 'git status' in submodule '%s'"
|
|
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1828
|
|
#, c-format
|
|
msgid "Could not unset core.worktree setting in submodule '%s'"
|
|
msgstr "Kunde inte ta bort inställningen core.worktree i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1855 submodule.c:2165
|
|
#, c-format
|
|
msgid "could not recurse into submodule '%s'"
|
|
msgstr "kunde inte rekursera in i undermodulen \"%s\""
|
|
|
|
#: submodule.c:1876
|
|
msgid "could not reset submodule index"
|
|
msgstr "kunde inte återställa indexet i undermodul"
|
|
|
|
#: submodule.c:1918
|
|
#, c-format
|
|
msgid "submodule '%s' has dirty index"
|
|
msgstr "undermodulen \"%s\" har ett smutsigt index"
|
|
|
|
#: submodule.c:1970
|
|
#, c-format
|
|
msgid "Submodule '%s' could not be updated."
|
|
msgstr "Undermoduler \"%s\" kunde inte uppdateras."
|
|
|
|
#: submodule.c:2038
|
|
#, c-format
|
|
msgid "submodule git dir '%s' is inside git dir '%.*s'"
|
|
msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
|
|
|
|
#: submodule.c:2059
|
|
#, c-format
|
|
msgid ""
|
|
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
|
|
msgstr ""
|
|
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
|
|
"stöds ej"
|
|
|
|
#: submodule.c:2071 submodule.c:2130
|
|
#, c-format
|
|
msgid "could not lookup name for submodule '%s'"
|
|
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
|
|
|
|
#: submodule.c:2075
|
|
#, c-format
|
|
msgid "refusing to move '%s' into an existing git dir"
|
|
msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
|
|
|
|
#: submodule.c:2082
|
|
#, c-format
|
|
msgid ""
|
|
"Migrating git directory of '%s%s' from\n"
|
|
"'%s' to\n"
|
|
"'%s'\n"
|
|
msgstr ""
|
|
"Migrerar git-katalogen för \"%s%s\" från\n"
|
|
"\"%s\" till\n"
|
|
"\"%s\"\n"
|
|
|
|
#: submodule.c:2209
|
|
msgid "could not start ls-files in .."
|
|
msgstr "kunde inte starta ls-files i .."
|
|
|
|
#: submodule.c:2248
|
|
#, c-format
|
|
msgid "ls-tree returned unexpected return code %d"
|
|
msgstr "ls-tree returnerade en oväntad returkod %d"
|
|
|
|
#: submodule-config.c:236
|
|
#, c-format
|
|
msgid "ignoring suspicious submodule name: %s"
|
|
msgstr "ignorerar misstänkt undermodulnamn: %s"
|
|
|
|
#: submodule-config.c:303
|
|
msgid "negative values not allowed for submodule.fetchjobs"
|
|
msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
|
|
|
|
#: submodule-config.c:401
|
|
#, c-format
|
|
msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
|
|
msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
|
|
|
|
#: submodule-config.c:498
|
|
#, c-format
|
|
msgid "invalid value for %s"
|
|
msgstr "ogiltigt värde för %s"
|
|
|
|
#: submodule-config.c:765
|
|
#, c-format
|
|
msgid "Could not update .gitmodules entry %s"
|
|
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
|
|
|
|
#: trailer.c:238
|
|
#, c-format
|
|
msgid "running trailer command '%s' failed"
|
|
msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
|
|
|
|
#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
|
|
#: trailer.c:557
|
|
#, c-format
|
|
msgid "unknown value '%s' for key '%s'"
|
|
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
|
|
|
|
#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
|
|
#, c-format
|
|
msgid "more than one %s"
|
|
msgstr "mer än en %s"
|
|
|
|
#: trailer.c:730
|
|
#, c-format
|
|
msgid "empty trailer token in trailer '%.*s'"
|
|
msgstr "tom släpradssymbol i släpraden \"%.*s\""
|
|
|
|
#: trailer.c:750
|
|
#, c-format
|
|
msgid "could not read input file '%s'"
|
|
msgstr "kunde inte läsa indatafilen \"%s\""
|
|
|
|
#: trailer.c:753
|
|
msgid "could not read from stdin"
|
|
msgstr "kunde inte läsa från standard in"
|
|
|
|
#: trailer.c:1011 wrapper.c:665
|
|
#, c-format
|
|
msgid "could not stat %s"
|
|
msgstr "kunde inte ta status på %s"
|
|
|
|
#: trailer.c:1013
|
|
#, c-format
|
|
msgid "file %s is not a regular file"
|
|
msgstr "filen %s är inte en normal fil"
|
|
|
|
#: trailer.c:1015
|
|
#, c-format
|
|
msgid "file %s is not writable by user"
|
|
msgstr "filen %s är inte skrivbar av användaren"
|
|
|
|
#: trailer.c:1027
|
|
msgid "could not open temporary file"
|
|
msgstr "kunde inte öppna temporär fil"
|
|
|
|
#: trailer.c:1067
|
|
#, c-format
|
|
msgid "could not rename temporary file to %s"
|
|
msgstr "kunde inte byta namn på temporär fil till %s"
|
|
|
|
#: transport.c:116
|
|
#, c-format
|
|
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
|
|
msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
|
|
|
|
#: transport.c:145
|
|
#, c-format
|
|
msgid "could not read bundle '%s'"
|
|
msgstr "kunde inte läsa paketet (bundlen) \"%s\""
|
|
|
|
#: transport.c:214
|
|
#, c-format
|
|
msgid "transport: invalid depth option '%s'"
|
|
msgstr "transport: ogiltig flagga för depth: \"%s\""
|
|
|
|
#: transport.c:266
|
|
msgid "see protocol.version in 'git help config' for more details"
|
|
msgstr "se protocol.version i \"git help config\" för mer information"
|
|
|
|
#: transport.c:267
|
|
msgid "server options require protocol version 2 or later"
|
|
msgstr "serverflaggor kräver protokollversion 2 eller senare"
|
|
|
|
#: transport.c:632
|
|
msgid "could not parse transport.color.* config"
|
|
msgstr "kunde inte tolka inställningen för transport.color.*"
|
|
|
|
#: transport.c:705
|
|
msgid "support for protocol v2 not implemented yet"
|
|
msgstr "stöd för protokoll v2 ännu ej implementerat"
|
|
|
|
#: transport.c:831
|
|
#, c-format
|
|
msgid "unknown value for config '%s': %s"
|
|
msgstr "okänt värde för inställningen \"%s\": %s"
|
|
|
|
#: transport.c:897
|
|
#, c-format
|
|
msgid "transport '%s' not allowed"
|
|
msgstr "transporten \"%s\" tillåts inte"
|
|
|
|
#: transport.c:949
|
|
msgid "git-over-rsync is no longer supported"
|
|
msgstr "git-over-rsync stöds inte längre"
|
|
|
|
#: transport.c:1044
|
|
#, c-format
|
|
msgid ""
|
|
"The following submodule paths contain changes that can\n"
|
|
"not be found on any remote:\n"
|
|
msgstr ""
|
|
"Följande undermodulsökvägar innehåller ändringar som\n"
|
|
"inte kan hittas av fjärrarna:\n"
|
|
|
|
#: transport.c:1048
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"Please try\n"
|
|
"\n"
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
"\n"
|
|
"or cd to the path and use\n"
|
|
"\n"
|
|
"\tgit push\n"
|
|
"\n"
|
|
"to push them to a remote.\n"
|
|
"\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Testa\n"
|
|
"\n"
|
|
"\tgit push --recurse-submodules=on-demand\n"
|
|
"\n"
|
|
"eller cd till sökvägen och använd\n"
|
|
"\n"
|
|
"\tgit push\n"
|
|
"\n"
|
|
"för att sända dem till fjärren.\n"
|
|
"\n"
|
|
|
|
#: transport.c:1056
|
|
msgid "Aborting."
|
|
msgstr "Avbryter."
|
|
|
|
#: transport.c:1201
|
|
msgid "failed to push all needed submodules"
|
|
msgstr "kunde inte sända alla nödvändiga undermoduler"
|
|
|
|
#: transport.c:1345 transport-helper.c:657
|
|
msgid "operation not supported by protocol"
|
|
msgstr "funktionen stöds inte av protokollet"
|
|
|
|
#: transport-helper.c:61 transport-helper.c:90
|
|
msgid "full write to remote helper failed"
|
|
msgstr "komplett skrivning till fjärrhjälpare misslyckades"
|
|
|
|
#: transport-helper.c:144
|
|
#, c-format
|
|
msgid "unable to find remote helper for '%s'"
|
|
msgstr "kan inte hitta fjärrhjälpare för \"%s\""
|
|
|
|
#: transport-helper.c:160 transport-helper.c:571
|
|
msgid "can't dup helper output fd"
|
|
msgstr "kunde inte duplicera utdata-filhandtag"
|
|
|
|
#: transport-helper.c:211
|
|
#, c-format
|
|
msgid ""
|
|
"unknown mandatory capability %s; this remote helper probably needs newer "
|
|
"version of Git"
|
|
msgstr ""
|
|
"okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
|
|
"nyare version av Git"
|
|
|
|
#: transport-helper.c:217
|
|
msgid "this remote helper should implement refspec capability"
|
|
msgstr ""
|
|
"fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
|
|
"(refspec)"
|
|
|
|
#: transport-helper.c:284 transport-helper.c:425
|
|
#, c-format
|
|
msgid "%s unexpectedly said: '%s'"
|
|
msgstr "%s sade oväntat: \"%s\""
|
|
|
|
#: transport-helper.c:414
|
|
#, c-format
|
|
msgid "%s also locked %s"
|
|
msgstr "%s låste också %s"
|
|
|
|
#: transport-helper.c:493
|
|
msgid "couldn't run fast-import"
|
|
msgstr "kunde inte köra fast-import"
|
|
|
|
#: transport-helper.c:516
|
|
msgid "error while running fast-import"
|
|
msgstr "fel när fast-import kördes"
|
|
|
|
#: transport-helper.c:545 transport-helper.c:1134
|
|
#, c-format
|
|
msgid "could not read ref %s"
|
|
msgstr "kunde inte läsa referensen %s"
|
|
|
|
#: transport-helper.c:590
|
|
#, c-format
|
|
msgid "unknown response to connect: %s"
|
|
msgstr "okänt svar på ansluntning: %s"
|
|
|
|
#: transport-helper.c:612
|
|
msgid "setting remote service path not supported by protocol"
|
|
msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
|
|
|
|
#: transport-helper.c:614
|
|
msgid "invalid remote service path"
|
|
msgstr "felaktig sökväg till fjärrtjänst"
|
|
|
|
#: transport-helper.c:660
|
|
#, c-format
|
|
msgid "can't connect to subservice %s"
|
|
msgstr "kan inte ansluta till undertjänsten %s"
|
|
|
|
#: transport-helper.c:736
|
|
#, c-format
|
|
msgid "expected ok/error, helper said '%s'"
|
|
msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
|
|
|
|
#: transport-helper.c:789
|
|
#, c-format
|
|
msgid "helper reported unexpected status of %s"
|
|
msgstr "hjälparen returnerade oväntad status %s"
|
|
|
|
#: transport-helper.c:850
|
|
#, c-format
|
|
msgid "helper %s does not support dry-run"
|
|
msgstr "hjälparen %s stöder inte dry-run"
|
|
|
|
#: transport-helper.c:853
|
|
#, c-format
|
|
msgid "helper %s does not support --signed"
|
|
msgstr "hjälparen %s stöder inte --signed"
|
|
|
|
#: transport-helper.c:856
|
|
#, c-format
|
|
msgid "helper %s does not support --signed=if-asked"
|
|
msgstr "hjälparen %s stöder inte --signed=if-asked"
|
|
|
|
#: transport-helper.c:861
|
|
#, c-format
|
|
msgid "helper %s does not support --atomic"
|
|
msgstr "hjälparen %s stöder inte --atomic"
|
|
|
|
#: transport-helper.c:867
|
|
#, c-format
|
|
msgid "helper %s does not support 'push-option'"
|
|
msgstr "hjälparen %s stöder inte \"push-option\""
|
|
|
|
#: transport-helper.c:965
|
|
msgid "remote-helper doesn't support push; refspec needed"
|
|
msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
|
|
|
|
#: transport-helper.c:970
|
|
#, c-format
|
|
msgid "helper %s does not support 'force'"
|
|
msgstr "hjälparen %s stöder inte \"force\""
|
|
|
|
#: transport-helper.c:1017
|
|
msgid "couldn't run fast-export"
|
|
msgstr "kunde inte köra fast-export"
|
|
|
|
#: transport-helper.c:1022
|
|
msgid "error while running fast-export"
|
|
msgstr "fel vid körning av fast-export"
|
|
|
|
#: transport-helper.c:1047
|
|
#, c-format
|
|
msgid ""
|
|
"No refs in common and none specified; doing nothing.\n"
|
|
"Perhaps you should specify a branch such as 'master'.\n"
|
|
msgstr ""
|
|
"Inga gemensamma referenser och inga angavs; gör inget.\n"
|
|
"Du kanske borde ange en gren såsom \"master\".\n"
|
|
|
|
#: transport-helper.c:1120
|
|
#, c-format
|
|
msgid "malformed response in ref list: %s"
|
|
msgstr "felformat svar i referenslistan: %s"
|
|
|
|
#: transport-helper.c:1272
|
|
#, c-format
|
|
msgid "read(%s) failed"
|
|
msgstr "läs(%s) misslyckades"
|
|
|
|
#: transport-helper.c:1299
|
|
#, c-format
|
|
msgid "write(%s) failed"
|
|
msgstr "skriv(%s) misslyckades"
|
|
|
|
#: transport-helper.c:1348
|
|
#, c-format
|
|
msgid "%s thread failed"
|
|
msgstr "%s-tråden misslyckades"
|
|
|
|
#: transport-helper.c:1352
|
|
#, c-format
|
|
msgid "%s thread failed to join: %s"
|
|
msgstr "%s-tråden misslyckades ansluta: %s"
|
|
|
|
#: transport-helper.c:1371 transport-helper.c:1375
|
|
#, c-format
|
|
msgid "can't start thread for copying data: %s"
|
|
msgstr "kan inte starta tråd för kopiering av data: %s"
|
|
|
|
#: transport-helper.c:1412
|
|
#, c-format
|
|
msgid "%s process failed to wait"
|
|
msgstr "processen %s misslyckades vänta"
|
|
|
|
#: transport-helper.c:1416
|
|
#, c-format
|
|
msgid "%s process failed"
|
|
msgstr "processen %s misslyckades"
|
|
|
|
#: transport-helper.c:1434 transport-helper.c:1443
|
|
msgid "can't start thread for copying data"
|
|
msgstr "kan inte skapa tråd för kopiering av data"
|
|
|
|
#: tree-walk.c:32
|
|
msgid "too-short tree object"
|
|
msgstr "trädobjekt för kort"
|
|
|
|
#: tree-walk.c:38
|
|
msgid "malformed mode in tree entry"
|
|
msgstr "felformat läge i trädpost"
|
|
|
|
#: tree-walk.c:42
|
|
msgid "empty filename in tree entry"
|
|
msgstr "tomt filnamn i trädpost"
|
|
|
|
#: tree-walk.c:117
|
|
msgid "too-short tree file"
|
|
msgstr "trädfil för kort"
|
|
|
|
#: unpack-trees.c:110
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
"%%sPlease commit your changes or stash them before you switch branches."
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
|
|
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
|
|
|
|
#: unpack-trees.c:112
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:115
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
"%%sPlease commit your changes or stash them before you merge."
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av "
|
|
"sammanslagning:\n"
|
|
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
|
|
|
|
#: unpack-trees.c:117
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av "
|
|
"sammanslagning:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:120
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
"%%sPlease commit your changes or stash them before you %s."
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
|
|
"%%sChecka in dina ändringar eller använd \"stash\" innan du \"%s\"."
|
|
|
|
#: unpack-trees.c:122
|
|
#, c-format
|
|
msgid ""
|
|
"Your local changes to the following files would be overwritten by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:127
|
|
#, c-format
|
|
msgid ""
|
|
"Updating the following directories would lose untracked files in them:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Uppdatering av följande kataloger gör att ospårade filer går förlorade i "
|
|
"dem:\n"
|
|
"%s"
|
|
|
|
#: unpack-trees.c:131
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
"%%sPlease move or remove them before you switch branches."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
|
|
"%%sFlytta eller ta bort dem innan du byter gren."
|
|
|
|
#: unpack-trees.c:133
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:136
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
"%%sPlease move or remove them before you merge."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av "
|
|
"sammanslagningen:\n"
|
|
"%%sFlytta eller ta bort dem innan du slår samman."
|
|
|
|
#: unpack-trees.c:138
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av "
|
|
"sammanslagningen:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:141
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
"%%sPlease move or remove them before you %s."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
|
|
"%%sFlytta eller ta bort dem innan du \"%s\"."
|
|
|
|
#: unpack-trees.c:143
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be removed by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:149
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by "
|
|
"checkout:\n"
|
|
"%%sPlease move or remove them before you switch branches."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
|
|
"utcheckningen:\n"
|
|
"%%sFlytta eller ta bort dem innan du byter gren."
|
|
|
|
#: unpack-trees.c:151
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by "
|
|
"checkout:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
|
|
"utcheckningen:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:154
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
"%%sPlease move or remove them before you merge."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
|
|
"sammanslagningen:\n"
|
|
"%%sFlytta eller ta bort dem innan du byter gren."
|
|
|
|
#: unpack-trees.c:156
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by merge:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av "
|
|
"sammanslagningen:\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:159
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
"%%sPlease move or remove them before you %s."
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
|
|
"%%sFlytta eller ta bort dem innan du \"%s\"."
|
|
|
|
#: unpack-trees.c:161
|
|
#, c-format
|
|
msgid ""
|
|
"The following untracked working tree files would be overwritten by %s:\n"
|
|
"%%s"
|
|
msgstr ""
|
|
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
|
|
"%%s"
|
|
|
|
#: unpack-trees.c:169
|
|
#, c-format
|
|
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
|
|
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
|
|
|
|
#: unpack-trees.c:172
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot update sparse checkout: the following entries are not up to date:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
|
|
"%s"
|
|
|
|
#: unpack-trees.c:174
|
|
#, c-format
|
|
msgid ""
|
|
"The following working tree files would be overwritten by sparse checkout "
|
|
"update:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles "
|
|
"utcheckning:\n"
|
|
"%s"
|
|
|
|
#: unpack-trees.c:176
|
|
#, c-format
|
|
msgid ""
|
|
"The following working tree files would be removed by sparse checkout "
|
|
"update:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
|
|
"utcheckning:\n"
|
|
"%s"
|
|
|
|
#: unpack-trees.c:178
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot update submodule:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Kan inte uppdatera undermodul:\n"
|
|
"%s"
|
|
|
|
#: unpack-trees.c:255
|
|
#, c-format
|
|
msgid "Aborting\n"
|
|
msgstr "Avbryter\n"
|
|
|
|
#: unpack-trees.c:317
|
|
msgid "Updating files"
|
|
msgstr "Uppdaterar filer"
|
|
|
|
#: 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"
|
|
"colliding group is in the working tree:\n"
|
|
msgstr ""
|
|
"följande sökvägar har kolliderat (t.ex. skiftlägeskänsliga\n"
|
|
"sökvägar på ett okänsligt filsystem) och endast en från samma\n"
|
|
"kollisionsgrupp finns i arbetskatalogen:\n"
|
|
|
|
#: unpack-trees.c:1445
|
|
msgid "Updating index flags"
|
|
msgstr "Uppdaterar indexflaggor"
|
|
|
|
#: urlmatch.c:163
|
|
msgid "invalid URL scheme name or missing '://' suffix"
|
|
msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
|
|
|
|
#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
|
|
#, c-format
|
|
msgid "invalid %XX escape sequence"
|
|
msgstr "ogiltig %XX-teckensekvens"
|
|
|
|
#: urlmatch.c:215
|
|
msgid "missing host and scheme is not 'file:'"
|
|
msgstr "värd saknas och schemat är inte \"file:\""
|
|
|
|
#: urlmatch.c:232
|
|
msgid "a 'file:' URL may not have a port number"
|
|
msgstr "en \"file:\"-URL kan inte innehålla portnummer"
|
|
|
|
#: urlmatch.c:247
|
|
msgid "invalid characters in host name"
|
|
msgstr "ogiltiga tecken i värdnamnet"
|
|
|
|
#: urlmatch.c:292 urlmatch.c:303
|
|
msgid "invalid port number"
|
|
msgstr "felaktigt portnummer"
|
|
|
|
#: urlmatch.c:371
|
|
msgid "invalid '..' path segment"
|
|
msgstr "felaktigt \"..\"-sökvägssegment"
|
|
|
|
#: walker.c:170
|
|
msgid "Fetching objects"
|
|
msgstr "Hämtar objekt"
|
|
|
|
#: worktree.c:259 builtin/am.c:2099
|
|
#, c-format
|
|
msgid "failed to read '%s'"
|
|
msgstr "misslyckades läsa \"%s\""
|
|
|
|
#: worktree.c:305
|
|
#, c-format
|
|
msgid "'%s' at main working tree is not the repository directory"
|
|
msgstr "\"%s\" i huvudarbetskatalogen är inte arkivkatalogen"
|
|
|
|
#: worktree.c:316
|
|
#, c-format
|
|
msgid "'%s' file does not contain absolute path to the working tree location"
|
|
msgstr "filen \"%s\" innehåller inte absolut sökväg till arbetskatalogen"
|
|
|
|
#: worktree.c:328
|
|
#, c-format
|
|
msgid "'%s' does not exist"
|
|
msgstr "\"%s\" finns inte"
|
|
|
|
#: worktree.c:334
|
|
#, c-format
|
|
msgid "'%s' is not a .git file, error code %d"
|
|
msgstr "\"%s\" är inte en .git-fil, felkod %d"
|
|
|
|
#: worktree.c:342
|
|
#, c-format
|
|
msgid "'%s' does not point back to '%s'"
|
|
msgstr "\"%s\" pekar inte tillbaka till \"%s\""
|
|
|
|
#: wrapper.c:186 wrapper.c:356
|
|
#, c-format
|
|
msgid "could not open '%s' for reading and writing"
|
|
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
|
|
|
|
#: wrapper.c:387 wrapper.c:588
|
|
#, c-format
|
|
msgid "unable to access '%s'"
|
|
msgstr "kan inte komma åt \"%s\""
|
|
|
|
#: wrapper.c:596
|
|
msgid "unable to get current working directory"
|
|
msgstr "kan inte hämta aktuell arbetskatalog"
|
|
|
|
#: wt-status.c:158
|
|
msgid "Unmerged paths:"
|
|
msgstr "Ej sammanslagna sökvägar:"
|
|
|
|
#: wt-status.c:187 wt-status.c:219
|
|
msgid " (use \"git restore --staged <file>...\" to unstage)"
|
|
msgstr " (använd \"git restore --staged <fil>...\" för att ta bort från kö)"
|
|
|
|
#: wt-status.c:190 wt-status.c:222
|
|
#, c-format
|
|
msgid " (use \"git restore --source=%s --staged <file>...\" to unstage)"
|
|
msgstr ""
|
|
" (använd \"git restore --source=%s --staged <fil>...\" för att ta bort från "
|
|
"kö)"
|
|
|
|
#: wt-status.c:193 wt-status.c:225
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
|
|
|
|
#: wt-status.c:197
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
|
|
|
|
#: wt-status.c:199 wt-status.c:203
|
|
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
|
|
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
|
|
|
|
#: wt-status.c:201
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
|
|
|
|
#: wt-status.c:211 wt-status.c:1074
|
|
msgid "Changes to be committed:"
|
|
msgstr "Ändringar att checka in:"
|
|
|
|
#: wt-status.c:234 wt-status.c:1083
|
|
msgid "Changes not staged for commit:"
|
|
msgstr "Ändringar ej i incheckningskön:"
|
|
|
|
#: wt-status.c:238
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
|
msgstr ""
|
|
" (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)"
|
|
|
|
#: wt-status.c:240
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
|
msgstr ""
|
|
" (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)"
|
|
|
|
#: wt-status.c:241
|
|
msgid ""
|
|
" (use \"git restore <file>...\" to discard changes in working directory)"
|
|
msgstr ""
|
|
" (använd \"git restore <fil>...\" för att förkasta ändringar i "
|
|
"arbetskatalogen)"
|
|
|
|
#: wt-status.c:243
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
|
msgstr ""
|
|
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
|
|
|
|
#: wt-status.c:254
|
|
#, c-format
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
|
msgstr ""
|
|
" (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)"
|
|
|
|
#: wt-status.c:268
|
|
msgid "both deleted:"
|
|
msgstr "borttaget av bägge:"
|
|
|
|
#: wt-status.c:270
|
|
msgid "added by us:"
|
|
msgstr "tillagt av oss:"
|
|
|
|
#: wt-status.c:272
|
|
msgid "deleted by them:"
|
|
msgstr "borttaget av dem:"
|
|
|
|
#: wt-status.c:274
|
|
msgid "added by them:"
|
|
msgstr "tillagt av dem:"
|
|
|
|
#: wt-status.c:276
|
|
msgid "deleted by us:"
|
|
msgstr "borttaget av oss:"
|
|
|
|
#: wt-status.c:278
|
|
msgid "both added:"
|
|
msgstr "tillagt av bägge:"
|
|
|
|
#: wt-status.c:280
|
|
msgid "both modified:"
|
|
msgstr "ändrat av bägge:"
|
|
|
|
#: wt-status.c:290
|
|
msgid "new file:"
|
|
msgstr "ny fil:"
|
|
|
|
#: wt-status.c:292
|
|
msgid "copied:"
|
|
msgstr "kopierad:"
|
|
|
|
#: wt-status.c:294
|
|
msgid "deleted:"
|
|
msgstr "borttagen:"
|
|
|
|
#: wt-status.c:296
|
|
msgid "modified:"
|
|
msgstr "ändrad:"
|
|
|
|
#: wt-status.c:298
|
|
msgid "renamed:"
|
|
msgstr "namnbytt:"
|
|
|
|
#: wt-status.c:300
|
|
msgid "typechange:"
|
|
msgstr "typbyte:"
|
|
|
|
#: wt-status.c:302
|
|
msgid "unknown:"
|
|
msgstr "okänd:"
|
|
|
|
#: wt-status.c:304
|
|
msgid "unmerged:"
|
|
msgstr "osammanslagen:"
|
|
|
|
#: wt-status.c:384
|
|
msgid "new commits, "
|
|
msgstr "nya incheckningar, "
|
|
|
|
#: wt-status.c:386
|
|
msgid "modified content, "
|
|
msgstr "ändrat innehåll, "
|
|
|
|
#: wt-status.c:388
|
|
msgid "untracked content, "
|
|
msgstr "ospårat innehåll, "
|
|
|
|
#: wt-status.c:906
|
|
#, c-format
|
|
msgid "Your stash currently has %d entry"
|
|
msgid_plural "Your stash currently has %d entries"
|
|
msgstr[0] "Stashen innehåller just nu %d post"
|
|
msgstr[1] "Stashen innehåller just nu %d poster"
|
|
|
|
#: wt-status.c:938
|
|
msgid "Submodules changed but not updated:"
|
|
msgstr "Undermoduler ändrade men inte uppdaterade:"
|
|
|
|
#: wt-status.c:940
|
|
msgid "Submodule changes to be committed:"
|
|
msgstr "Undermodulers ändringar att checka in:"
|
|
|
|
#: wt-status.c:1022
|
|
msgid ""
|
|
"Do not modify or remove the line above.\n"
|
|
"Everything below it will be ignored."
|
|
msgstr ""
|
|
"Raden ovan får inte ändras eller tas bort.\n"
|
|
"Allt under den kommer tas bort."
|
|
|
|
#: wt-status.c:1114
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"It took %.2f seconds to compute the branch ahead/behind values.\n"
|
|
"You can use '--no-ahead-behind' to avoid this.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Det tog %.2f sekunder att räkna före/bakom-värden.\n"
|
|
"Du kan använda \"--no-ahead-behind\" för undvika detta.\n"
|
|
|
|
#: wt-status.c:1144
|
|
msgid "You have unmerged paths."
|
|
msgstr "Du har ej sammanslagna sökvägar."
|
|
|
|
#: wt-status.c:1147
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
msgstr " (rätta konflikter och kör \"git commit\")"
|
|
|
|
#: wt-status.c:1149
|
|
msgid " (use \"git merge --abort\" to abort the merge)"
|
|
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
|
|
|
|
#: wt-status.c:1153
|
|
msgid "All conflicts fixed but you are still merging."
|
|
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
|
|
|
|
#: wt-status.c:1156
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
|
|
|
|
#: wt-status.c:1165
|
|
msgid "You are in the middle of an am session."
|
|
msgstr "Du är i mitten av en körning av \"git am\"."
|
|
|
|
#: wt-status.c:1168
|
|
msgid "The current patch is empty."
|
|
msgstr "Aktuell patch är tom."
|
|
|
|
#: wt-status.c:1172
|
|
msgid " (fix conflicts and then run \"git am --continue\")"
|
|
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
|
|
|
|
#: wt-status.c:1174
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
|
|
|
|
#: wt-status.c:1176
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
|
|
|
|
#: wt-status.c:1309
|
|
msgid "git-rebase-todo is missing."
|
|
msgstr "git-rebase-todo saknas."
|
|
|
|
#: wt-status.c:1311
|
|
msgid "No commands done."
|
|
msgstr "Inga kommandon utförda."
|
|
|
|
#: wt-status.c:1314
|
|
#, c-format
|
|
msgid "Last command done (%d command done):"
|
|
msgid_plural "Last commands done (%d commands done):"
|
|
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
|
|
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
|
|
|
|
#: wt-status.c:1325
|
|
#, c-format
|
|
msgid " (see more in file %s)"
|
|
msgstr " (se fler i filen %s)"
|
|
|
|
#: wt-status.c:1330
|
|
msgid "No commands remaining."
|
|
msgstr "Inga kommandon återstår."
|
|
|
|
#: wt-status.c:1333
|
|
#, c-format
|
|
msgid "Next command to do (%d remaining command):"
|
|
msgid_plural "Next commands to do (%d remaining commands):"
|
|
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
|
|
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
|
|
|
|
#: wt-status.c:1341
|
|
msgid " (use \"git rebase --edit-todo\" to view and edit)"
|
|
msgstr " (använd \"git rebase --edit-todo\" för att visa och redigera)"
|
|
|
|
#: wt-status.c:1353
|
|
#, c-format
|
|
msgid "You are currently rebasing branch '%s' on '%s'."
|
|
msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"."
|
|
|
|
#: wt-status.c:1358
|
|
msgid "You are currently rebasing."
|
|
msgstr "Du håller på med en ombasering."
|
|
|
|
#: wt-status.c:1371
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
|
|
|
|
#: wt-status.c:1373
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
|
|
|
|
#: wt-status.c:1375
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
|
|
|
|
#: wt-status.c:1382
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
|
|
|
|
#: wt-status.c:1386
|
|
#, c-format
|
|
msgid ""
|
|
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
|
|
msgstr ""
|
|
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
|
|
"ovanpå \"%s\"."
|
|
|
|
#: wt-status.c:1391
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
msgstr "Du håller på att dela upp en incheckning i en ombasering."
|
|
|
|
#: wt-status.c:1394
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
|
|
|
|
#: wt-status.c:1398
|
|
#, c-format
|
|
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
|
|
msgstr ""
|
|
"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" "
|
|
"ovanpå \"%s\"."
|
|
|
|
#: wt-status.c:1403
|
|
msgid "You are currently editing a commit during a rebase."
|
|
msgstr "Du håller på att redigera en incheckning under en ombasering."
|
|
|
|
#: wt-status.c:1406
|
|
msgid " (use \"git commit --amend\" to amend the current commit)"
|
|
msgstr ""
|
|
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
|
|
|
|
#: wt-status.c:1408
|
|
msgid ""
|
|
" (use \"git rebase --continue\" once you are satisfied with your changes)"
|
|
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
|
|
|
|
#: wt-status.c:1419
|
|
msgid "Cherry-pick currently in progress."
|
|
msgstr "Cherry-pick pågår."
|
|
|
|
#: wt-status.c:1422
|
|
#, c-format
|
|
msgid "You are currently cherry-picking commit %s."
|
|
msgstr "Du håller på med en \"cherry-pick\" av incheckningen %s."
|
|
|
|
#: wt-status.c:1429
|
|
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
|
|
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
|
|
|
|
#: wt-status.c:1432
|
|
msgid " (run \"git cherry-pick --continue\" to continue)"
|
|
msgstr " (kör \"git cherry-pick --continue\" för att fortsätta)"
|
|
|
|
#: wt-status.c:1435
|
|
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
|
|
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
|
|
|
|
#: wt-status.c:1437
|
|
msgid " (use \"git cherry-pick --skip\" to skip this patch)"
|
|
msgstr " (använd \"git cherry-pick --skip\" för att hoppa över patchen)"
|
|
|
|
#: wt-status.c:1439
|
|
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
|
|
msgstr ""
|
|
" (använd \"git cherry-pick --abort\" för att avbryta \"cherry-pick\"-"
|
|
"operationen)"
|
|
|
|
#: wt-status.c:1449
|
|
msgid "Revert currently in progress."
|
|
msgstr "Ångring pågår."
|
|
|
|
#: wt-status.c:1452
|
|
#, c-format
|
|
msgid "You are currently reverting commit %s."
|
|
msgstr "Du håller på med att ångra incheckningen %s."
|
|
|
|
#: wt-status.c:1458
|
|
msgid " (fix conflicts and run \"git revert --continue\")"
|
|
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
|
|
|
|
#: wt-status.c:1461
|
|
msgid " (run \"git revert --continue\" to continue)"
|
|
msgstr " (kör \"git revert --continue\" för att fortsätta)"
|
|
|
|
#: wt-status.c:1464
|
|
msgid " (all conflicts fixed: run \"git revert --continue\")"
|
|
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
|
|
|
|
#: wt-status.c:1466
|
|
msgid " (use \"git revert --skip\" to skip this patch)"
|
|
msgstr " (använd \"git revert --skip\" för att hoppa över patchen)"
|
|
|
|
#: wt-status.c:1468
|
|
msgid " (use \"git revert --abort\" to cancel the revert operation)"
|
|
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
|
|
|
|
#: wt-status.c:1478
|
|
#, c-format
|
|
msgid "You are currently bisecting, started from branch '%s'."
|
|
msgstr "Du håller på med en \"bisect\", startad från grenen \"%s\"."
|
|
|
|
#: wt-status.c:1482
|
|
msgid "You are currently bisecting."
|
|
msgstr "Du håller på med en \"bisect\"."
|
|
|
|
#: wt-status.c:1485
|
|
msgid " (use \"git bisect reset\" to get back to the original branch)"
|
|
msgstr ""
|
|
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
|
|
|
|
#: wt-status.c:1694
|
|
msgid "On branch "
|
|
msgstr "På grenen "
|
|
|
|
#: wt-status.c:1701
|
|
msgid "interactive rebase in progress; onto "
|
|
msgstr "interaktiv ombasering pågår; ovanpå "
|
|
|
|
#: wt-status.c:1703
|
|
msgid "rebase in progress; onto "
|
|
msgstr "ombasering pågår; ovanpå "
|
|
|
|
#: wt-status.c:1713
|
|
msgid "Not currently on any branch."
|
|
msgstr "Inte på någon gren för närvarande."
|
|
|
|
#: wt-status.c:1730
|
|
msgid "Initial commit"
|
|
msgstr "Första incheckning"
|
|
|
|
#: wt-status.c:1731
|
|
msgid "No commits yet"
|
|
msgstr "Inga incheckningar ännu"
|
|
|
|
#: wt-status.c:1745
|
|
msgid "Untracked files"
|
|
msgstr "Ospårade filer"
|
|
|
|
#: wt-status.c:1747
|
|
msgid "Ignored files"
|
|
msgstr "Ignorerade filer"
|
|
|
|
#: wt-status.c:1751
|
|
#, c-format
|
|
msgid ""
|
|
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
|
|
"may speed it up, but you have to be careful not to forget to add\n"
|
|
"new files yourself (see 'git help status')."
|
|
msgstr ""
|
|
"Det tog %.2f sekunder att räkna upp ospårade filer. \"status -uno\"\n"
|
|
"kan gå snabbare, men du måste vara försiktig så du inte glömmer\n"
|
|
"lägga till nya filer själv (se \"git help status\")."
|
|
|
|
# %s är nästa sträng eller tom.
|
|
#: wt-status.c:1757
|
|
#, c-format
|
|
msgid "Untracked files not listed%s"
|
|
msgstr "Ospårade filer visas ej%s"
|
|
|
|
#: wt-status.c:1759
|
|
msgid " (use -u option to show untracked files)"
|
|
msgstr " (använd flaggan -u för att visa ospårade filer)"
|
|
|
|
#: wt-status.c:1765
|
|
msgid "No changes"
|
|
msgstr "Inga ändringar"
|
|
|
|
#: wt-status.c:1770
|
|
#, c-format
|
|
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
|
|
msgstr ""
|
|
"inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a"
|
|
"\")\n"
|
|
|
|
#: wt-status.c:1773
|
|
#, c-format
|
|
msgid "no changes added to commit\n"
|
|
msgstr "inga ändringar att checka in\n"
|
|
|
|
#: wt-status.c:1776
|
|
#, c-format
|
|
msgid ""
|
|
"nothing added to commit but untracked files present (use \"git add\" to "
|
|
"track)\n"
|
|
msgstr ""
|
|
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
|
|
"\")\n"
|
|
|
|
#: wt-status.c:1779
|
|
#, c-format
|
|
msgid "nothing added to commit but untracked files present\n"
|
|
msgstr "inget köat för incheckning, men ospårade filer finns\n"
|
|
|
|
#: wt-status.c:1782
|
|
#, c-format
|
|
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
|
|
msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n"
|
|
|
|
#: wt-status.c:1785 wt-status.c:1790
|
|
#, c-format
|
|
msgid "nothing to commit\n"
|
|
msgstr "inget att checka in\n"
|
|
|
|
#: wt-status.c:1788
|
|
#, c-format
|
|
msgid "nothing to commit (use -u to show untracked files)\n"
|
|
msgstr "inget att checka in (använd -u för att visa ospårade filer)\n"
|
|
|
|
#: wt-status.c:1792
|
|
#, c-format
|
|
msgid "nothing to commit, working tree clean\n"
|
|
msgstr "inget att checka in, arbetskatalogen ren\n"
|
|
|
|
#: wt-status.c:1905
|
|
msgid "No commits yet on "
|
|
msgstr "Inga incheckningar ännu på "
|
|
|
|
#: wt-status.c:1909
|
|
msgid "HEAD (no branch)"
|
|
msgstr "HEAD (ingen gren)"
|
|
|
|
#: wt-status.c:1940
|
|
msgid "different"
|
|
msgstr "olika"
|
|
|
|
#: wt-status.c:1942 wt-status.c:1950
|
|
msgid "behind "
|
|
msgstr "efter "
|
|
|
|
#: wt-status.c:1945 wt-status.c:1948
|
|
msgid "ahead "
|
|
msgstr "före "
|
|
|
|
#. TRANSLATORS: the action is e.g. "pull with rebase"
|
|
#: wt-status.c:2470
|
|
#, c-format
|
|
msgid "cannot %s: You have unstaged changes."
|
|
msgstr "kan inte %s: Du har oköade ändringar."
|
|
|
|
#: wt-status.c:2476
|
|
msgid "additionally, your index contains uncommitted changes."
|
|
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
|
|
|
|
#: wt-status.c:2478
|
|
#, c-format
|
|
msgid "cannot %s: Your index contains uncommitted changes."
|
|
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
|
|
|
|
#: compat/precompose_utf8.c:58 builtin/clone.c:455
|
|
#, c-format
|
|
msgid "failed to unlink '%s'"
|
|
msgstr "misslyckades ta bort länken \"%s\""
|
|
|
|
#: builtin/add.c:26
|
|
msgid "git add [<options>] [--] <pathspec>..."
|
|
msgstr "git add [<flaggor>] [--] <sökväg>..."
|
|
|
|
#: builtin/add.c:88
|
|
#, c-format
|
|
msgid "unexpected diff status %c"
|
|
msgstr "diff-status %c förväntades inte"
|
|
|
|
#: builtin/add.c:93 builtin/commit.c:288
|
|
msgid "updating files failed"
|
|
msgstr "misslyckades uppdatera filer"
|
|
|
|
#: builtin/add.c:103
|
|
#, c-format
|
|
msgid "remove '%s'\n"
|
|
msgstr "ta bort \"%s\"\n"
|
|
|
|
#: builtin/add.c:178
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
|
|
|
|
#: builtin/add.c:266 builtin/rev-parse.c:899
|
|
msgid "Could not read the index"
|
|
msgstr "Kunde inte läsa indexet"
|
|
|
|
#: builtin/add.c:277
|
|
#, c-format
|
|
msgid "Could not open '%s' for writing."
|
|
msgstr "Kunde inte öppna \"%s\" för skrivning."
|
|
|
|
#: builtin/add.c:281
|
|
msgid "Could not write patch"
|
|
msgstr "Kunde inte skriva patch"
|
|
|
|
#: builtin/add.c:284
|
|
msgid "editing patch failed"
|
|
msgstr "redigering av patch misslyckades"
|
|
|
|
#: builtin/add.c:287
|
|
#, c-format
|
|
msgid "Could not stat '%s'"
|
|
msgstr "Kunde inte ta status på \"%s\""
|
|
|
|
#: builtin/add.c:289
|
|
msgid "Empty patch. Aborted."
|
|
msgstr "Tom patch. Avbryter."
|
|
|
|
#: builtin/add.c:294
|
|
#, c-format
|
|
msgid "Could not apply '%s'"
|
|
msgstr "Kunde inte tillämpa \"%s\""
|
|
|
|
#: builtin/add.c:302
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
|
|
|
#: builtin/add.c: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 "testkörning"
|
|
|
|
#: builtin/add.c:325
|
|
msgid "interactive picking"
|
|
msgstr "plocka interaktivt"
|
|
|
|
#: builtin/add.c:326 builtin/checkout.c:1511 builtin/reset.c:307
|
|
msgid "select hunks interactively"
|
|
msgstr "välj stycken interaktivt"
|
|
|
|
#: builtin/add.c:327
|
|
msgid "edit current diff and apply"
|
|
msgstr "redigera aktuell diff och applicera"
|
|
|
|
#: builtin/add.c:328
|
|
msgid "allow adding otherwise ignored files"
|
|
msgstr "tillåt lägga till annars ignorerade filer"
|
|
|
|
#: builtin/add.c:329
|
|
msgid "update tracked files"
|
|
msgstr "uppdatera spårade filer"
|
|
|
|
#: builtin/add.c:330
|
|
msgid "renormalize EOL of tracked files (implies -u)"
|
|
msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
|
|
|
|
#: builtin/add.c:331
|
|
msgid "record only the fact that the path will be added later"
|
|
msgstr "registrera endast att sökvägen kommer läggas till senare"
|
|
|
|
#: builtin/add.c:332
|
|
msgid "add changes from all tracked and untracked files"
|
|
msgstr "lägg till ändringar från alla spårade och ospårade filer"
|
|
|
|
#: builtin/add.c:335
|
|
msgid "ignore paths removed in the working tree (same as --no-all)"
|
|
msgstr "ignorera sökvägar borttagna i arbetskatalogen (samma som --no-all)"
|
|
|
|
#: builtin/add.c:337
|
|
msgid "don't add, only refresh the index"
|
|
msgstr "lägg inte till, uppdatera endast indexet"
|
|
|
|
#: builtin/add.c:338
|
|
msgid "just skip files which cannot be added because of errors"
|
|
msgstr "hoppa bara över filer som inte kan läggas till på grund av fel"
|
|
|
|
#: builtin/add.c:339
|
|
msgid "check if - even missing - files are ignored in dry run"
|
|
msgstr "se om - även saknade - filer ignoreras i testkörning"
|
|
|
|
#: builtin/add.c:341 builtin/update-index.c:1004
|
|
msgid "override the executable bit of the listed files"
|
|
msgstr "överstyr exekveringsbiten för angivna filer"
|
|
|
|
#: builtin/add.c:343
|
|
msgid "warn when adding an embedded repository"
|
|
msgstr "varna när ett inbyggt arkiv läggs till"
|
|
|
|
#: builtin/add.c:345
|
|
msgid "backend for `git stash -p`"
|
|
msgstr "bakända för \"git stash -p\""
|
|
|
|
#: builtin/add.c:363
|
|
#, c-format
|
|
msgid ""
|
|
"You've added another git repository inside your current repository.\n"
|
|
"Clones of the outer repository will not contain the contents of\n"
|
|
"the embedded repository and will not know how to obtain it.\n"
|
|
"If you meant to add a submodule, use:\n"
|
|
"\n"
|
|
"\tgit submodule add <url> %s\n"
|
|
"\n"
|
|
"If you added this path by mistake, you can remove it from the\n"
|
|
"index with:\n"
|
|
"\n"
|
|
"\tgit rm --cached %s\n"
|
|
"\n"
|
|
"See \"git help submodule\" for more information."
|
|
msgstr ""
|
|
"Du har lagt till ett annat git-arkiv inuti aktuellt arkiv.\n"
|
|
"Kloner av det yttre arkivet kommer inte innehålla innehållet från\n"
|
|
"det inbäddade arkivet eller veta hur man får tag på det.\n"
|
|
"Om du tänkte lägga till en undermodul, skrev:\n"
|
|
"\n"
|
|
"\tgit submodule add <url> %s\n"
|
|
"\n"
|
|
"Om du lade till sökvägen av misstag tar du bort den från indexet\n"
|
|
"med:\n"
|
|
"\n"
|
|
"\tgit rm --cached %s\n"
|
|
"\n"
|
|
"Se \"git help submodule\" för ytterligare information."
|
|
|
|
#: builtin/add.c:391
|
|
#, c-format
|
|
msgid "adding embedded git repository: %s"
|
|
msgstr "lägger till inbäddat git-arkiv: %s"
|
|
|
|
#: 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 ""
|
|
"Använd -f om du verkligen vill lägga till dem.\n"
|
|
"Slå av detta meddelande med\n"
|
|
"\"git config advice.addIgnoredFile false\""
|
|
|
|
#: builtin/add.c:419
|
|
msgid "adding files failed"
|
|
msgstr "misslyckades lägga till filer"
|
|
|
|
#: builtin/add.c:447 builtin/commit.c:348
|
|
msgid "--pathspec-from-file is incompatible with --interactive/--patch"
|
|
msgstr "--pathspec-from-file är inkompatibelt med --interactive/--patch"
|
|
|
|
#: builtin/add.c:464
|
|
msgid "--pathspec-from-file is incompatible with --edit"
|
|
msgstr "--pathspec-from-file är inkompatibelt med --edit"
|
|
|
|
#: builtin/add.c:476
|
|
msgid "-A and -u are mutually incompatible"
|
|
msgstr "-A och -u är ömsesidigt inkompatibla"
|
|
|
|
#: builtin/add.c:479
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
|
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
|
|
|
|
#: builtin/add.c:483
|
|
#, c-format
|
|
msgid "--chmod param '%s' must be either -x or +x"
|
|
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
|
|
|
|
#: 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 är inkompatibelt med sökvägsangivelsesparametrar"
|
|
|
|
#: 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 kräver --pathspec-from-file"
|
|
|
|
#: builtin/add.c:512
|
|
#, c-format
|
|
msgid "Nothing specified, nothing added.\n"
|
|
msgstr "Inget angivet, inget tillagt.\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 ""
|
|
"Tänkte du kanske säga \"git add .\"?\n"
|
|
"Slå av detta meddelande genom att köra\n"
|
|
"\"git config advice.addEmptyPathspec false\""
|
|
|
|
#: builtin/am.c:352
|
|
msgid "could not parse author script"
|
|
msgstr "kunde inte tolka författarskript"
|
|
|
|
#: builtin/am.c:436
|
|
#, c-format
|
|
msgid "'%s' was deleted by the applypatch-msg hook"
|
|
msgstr "\"%s\" togs bort av kroken applypatch-msg"
|
|
|
|
#: builtin/am.c:478
|
|
#, c-format
|
|
msgid "Malformed input line: '%s'."
|
|
msgstr "Felaktig indatarad: \"%s\"."
|
|
|
|
#: builtin/am.c:516
|
|
#, c-format
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
|
|
|
|
#: builtin/am.c:542
|
|
msgid "fseek failed"
|
|
msgstr "\"fseek\" misslyckades"
|
|
|
|
#: builtin/am.c:730
|
|
#, c-format
|
|
msgid "could not parse patch '%s'"
|
|
msgstr "kunde inte tolka patchen \"%s\""
|
|
|
|
#: builtin/am.c:795
|
|
msgid "Only one StGIT patch series can be applied at once"
|
|
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
|
|
|
|
#: builtin/am.c:843
|
|
msgid "invalid timestamp"
|
|
msgstr "ogiltig tidsstämpel"
|
|
|
|
#: builtin/am.c:848 builtin/am.c:860
|
|
msgid "invalid Date line"
|
|
msgstr "ogiltig \"Date\"-rad"
|
|
|
|
#: builtin/am.c:855
|
|
msgid "invalid timezone offset"
|
|
msgstr "ogiltig tidszons-offset"
|
|
|
|
#: builtin/am.c:948
|
|
msgid "Patch format detection failed."
|
|
msgstr "Misslyckades detektera patchformat."
|
|
|
|
#: builtin/am.c:953 builtin/clone.c:409
|
|
#, c-format
|
|
msgid "failed to create directory '%s'"
|
|
msgstr "misslyckades skapa katalogen \"%s\""
|
|
|
|
#: builtin/am.c:958
|
|
msgid "Failed to split patches."
|
|
msgstr "Misslyckades dela patchar."
|
|
|
|
#: builtin/am.c:1089
|
|
#, c-format
|
|
msgid "When you have resolved this problem, run \"%s --continue\"."
|
|
msgstr "När du har löst problemet, kör \"%s --continue\"."
|
|
|
|
#: builtin/am.c:1090
|
|
#, c-format
|
|
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
|
|
msgstr "Om du hellre vill hoppa över patchen, kör \"%s --skip\" i stället."
|
|
|
|
#: builtin/am.c:1091
|
|
#, c-format
|
|
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
|
|
msgstr ""
|
|
"För att återgå till ursprunglig gren och sluta patcha, kör \"%s --abort\"."
|
|
|
|
#: builtin/am.c:1174
|
|
msgid "Patch sent with format=flowed; space at the end of lines might be lost."
|
|
msgstr ""
|
|
"Patch sänd med format=flowed; blanksteg på slut av rader kan ha tappats."
|
|
|
|
#: builtin/am.c:1202
|
|
msgid "Patch is empty."
|
|
msgstr "Patchen är tom."
|
|
|
|
#: builtin/am.c:1267
|
|
#, c-format
|
|
msgid "missing author line in commit %s"
|
|
msgstr "saknad \"author\"-rad i incheckningen %s"
|
|
|
|
#: builtin/am.c:1270
|
|
#, c-format
|
|
msgid "invalid ident line: %.*s"
|
|
msgstr "ogiltig ident-rad: %.*s"
|
|
|
|
#: builtin/am.c:1489
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
|
msgstr ""
|
|
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
|
|
"vägssammanslagning."
|
|
|
|
#: builtin/am.c:1491
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
msgstr "Använder indexinfo för att återskapa ett basträd..."
|
|
|
|
#: builtin/am.c:1510
|
|
msgid ""
|
|
"Did you hand edit your patch?\n"
|
|
"It does not apply to blobs recorded in its index."
|
|
msgstr ""
|
|
"Har du handredigerat din patch?\n"
|
|
"Den kan inte tillämpas på blobbar som antecknats i dess index."
|
|
|
|
#: builtin/am.c:1516
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
msgstr ""
|
|
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
|
|
|
|
#: builtin/am.c:1542
|
|
msgid "Failed to merge in the changes."
|
|
msgstr "Misslyckades slå ihop ändringarna."
|
|
|
|
#: builtin/am.c:1574
|
|
msgid "applying to an empty history"
|
|
msgstr "tillämpar på en tom historik"
|
|
|
|
#: builtin/am.c:1621 builtin/am.c:1625
|
|
#, c-format
|
|
msgid "cannot resume: %s does not exist."
|
|
msgstr "kan inte återuppta: %s finns inte."
|
|
|
|
#: builtin/am.c:1643
|
|
msgid "Commit Body is:"
|
|
msgstr "Incheckningskroppen är:"
|
|
|
|
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
|
#. in your translation. The program will only accept English
|
|
#. input at this point.
|
|
#.
|
|
#: builtin/am.c:1653
|
|
#, c-format
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
|
|
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla: "
|
|
|
|
#: builtin/am.c:1700 builtin/commit.c:398
|
|
msgid "unable to write index file"
|
|
msgstr "kan inte skriva indexfil"
|
|
|
|
#: builtin/am.c:1704
|
|
#, c-format
|
|
msgid "Dirty index: cannot apply patches (dirty: %s)"
|
|
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
|
|
|
|
#: builtin/am.c:1744 builtin/am.c:1812
|
|
#, c-format
|
|
msgid "Applying: %.*s"
|
|
msgstr "Tillämpar: %.*s"
|
|
|
|
#: builtin/am.c:1761
|
|
msgid "No changes -- Patch already applied."
|
|
msgstr "Inga ändringar -- Patchen har redan tillämpats."
|
|
|
|
#: builtin/am.c:1767
|
|
#, c-format
|
|
msgid "Patch failed at %s %.*s"
|
|
msgstr "Patch misslyckades på %s %.*s"
|
|
|
|
#: builtin/am.c:1771
|
|
msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
|
|
msgstr ""
|
|
"Använd \"git am --show-current-patch=diff\" för att se patchen som "
|
|
"misslyckades"
|
|
|
|
#: 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"
|
|
"already introduced the same changes; you might want to skip this patch."
|
|
msgstr ""
|
|
"Inga ändringar - glömde du att använda \"git add\"?\n"
|
|
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
|
|
"introducerat samma ändringar; kanske du bör hoppa över patchen."
|
|
|
|
#: builtin/am.c:1822
|
|
msgid ""
|
|
"You still have unmerged paths in your index.\n"
|
|
"You should 'git add' each file with resolved conflicts to mark them as "
|
|
"such.\n"
|
|
"You might run `git rm` on a file to accept \"deleted by them\" for it."
|
|
msgstr ""
|
|
"Du har fortfarande ej sammanslagna sökvägar i indexet.\n"
|
|
"Du bör köra \"git add\" på filer med lösta konflikter för att ange dem som "
|
|
"lösta.\n"
|
|
"Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
|
|
|
|
#: 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 "Kan inte tolka objektet \"%s\"."
|
|
|
|
#: builtin/am.c:1981
|
|
msgid "failed to clean index"
|
|
msgstr "misslyckades städa upp indexet"
|
|
|
|
#: builtin/am.c:2025
|
|
msgid ""
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
"Not rewinding to ORIG_HEAD"
|
|
msgstr ""
|
|
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
|
|
"Återställer inte till ORIG_HEAD"
|
|
|
|
#: builtin/am.c:2132
|
|
#, c-format
|
|
msgid "Invalid value for --patch-format: %s"
|
|
msgstr "Felaktigt värde för --patch-format: %s"
|
|
|
|
#: builtin/am.c:2172
|
|
#, c-format
|
|
msgid "Invalid value for --show-current-patch: %s"
|
|
msgstr "Felaktigt värde för --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 är inkompatibelt med --show-current-patch=%s"
|
|
|
|
#: builtin/am.c:2207
|
|
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
|
|
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
|
|
|
|
#: builtin/am.c:2208
|
|
msgid "git am [<options>] (--continue | --skip | --abort)"
|
|
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
|
|
|
|
#: builtin/am.c:2214
|
|
msgid "run interactively"
|
|
msgstr "kör interaktivt"
|
|
|
|
#: builtin/am.c:2216
|
|
msgid "historical option -- no-op"
|
|
msgstr "historisk flagga -- no-op"
|
|
|
|
#: builtin/am.c:2218
|
|
msgid "allow fall back on 3way merging if needed"
|
|
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
|
|
|
|
#: 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 "var tyst"
|
|
|
|
#: builtin/am.c:2221
|
|
msgid "add a Signed-off-by line to the commit message"
|
|
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
|
|
|
|
#: builtin/am.c:2224
|
|
msgid "recode into utf8 (default)"
|
|
msgstr "koda om till utf8 (standard)"
|
|
|
|
#: builtin/am.c:2226
|
|
msgid "pass -k flag to git-mailinfo"
|
|
msgstr "sänd flaggan -k till git-mailinfo"
|
|
|
|
#: builtin/am.c:2228
|
|
msgid "pass -b flag to git-mailinfo"
|
|
msgstr "sänd flaggan -b till git-mailinfo"
|
|
|
|
#: builtin/am.c:2230
|
|
msgid "pass -m flag to git-mailinfo"
|
|
msgstr "sänd flaggan -m till git-mailinfo"
|
|
|
|
#: builtin/am.c:2232
|
|
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
|
|
msgstr "sänd flaggan --keep-cr till git-mailsplit för mbox-formatet"
|
|
|
|
#: builtin/am.c:2235
|
|
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
|
|
msgstr "sänd inte flaggan --keep-cr till git-mailsplit oberoende av am.keepcr"
|
|
|
|
#: builtin/am.c:2238
|
|
msgid "strip everything before a scissors line"
|
|
msgstr "ta bort allting före en saxlinje"
|
|
|
|
#: 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 "sänd det genom git-apply"
|
|
|
|
#: 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:154 parse-options.h:175 parse-options.h:316
|
|
msgid "n"
|
|
msgstr "n"
|
|
|
|
#: 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 "format"
|
|
|
|
#: builtin/am.c:2264
|
|
msgid "format the patch(es) are in"
|
|
msgstr "format för patch(ar)"
|
|
|
|
#: builtin/am.c:2270
|
|
msgid "override error message when patch failure occurs"
|
|
msgstr "överstyr felmeddelanden när patchfel uppstår"
|
|
|
|
#: builtin/am.c:2272
|
|
msgid "continue applying patches after resolving a conflict"
|
|
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
|
|
|
|
#: builtin/am.c:2275
|
|
msgid "synonyms for --continue"
|
|
msgstr "synonymer till --continue"
|
|
|
|
#: builtin/am.c:2278
|
|
msgid "skip the current patch"
|
|
msgstr "hoppa över den aktuella grenen"
|
|
|
|
#: builtin/am.c:2281
|
|
msgid "restore the original branch and abort the patching operation."
|
|
msgstr "återställ originalgrenen och avbryt patchningen."
|
|
|
|
#: builtin/am.c:2284
|
|
msgid "abort the patching operation but keep HEAD where it is."
|
|
msgstr "avbryt patchningen men behåll HEAD där det är."
|
|
|
|
#: builtin/am.c:2288
|
|
msgid "show the patch being applied"
|
|
msgstr "visa patchen som tillämpas"
|
|
|
|
#: builtin/am.c:2293
|
|
msgid "lie about committer date"
|
|
msgstr "ljug om incheckningsdatum"
|
|
|
|
#: builtin/am.c:2295
|
|
msgid "use current timestamp for author date"
|
|
msgstr "använd nuvarande tidsstämpel för författardatum"
|
|
|
|
#: 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 "nyckel-id"
|
|
|
|
#: builtin/am.c:2298 builtin/rebase.c:518 builtin/rebase.c:1557
|
|
msgid "GPG-sign commits"
|
|
msgstr "GPG-signera incheckningar"
|
|
|
|
#: builtin/am.c:2301
|
|
msgid "(internal use for git-rebase)"
|
|
msgstr "(används internt av git-rebase)"
|
|
|
|
#: 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."
|
|
msgstr ""
|
|
"Flaggan -b/--binary har varit utan funktion länge, och\n"
|
|
"kommer tas bort. Vi ber dig att inte använda den längre."
|
|
|
|
#: builtin/am.c:2326
|
|
msgid "failed to read the index"
|
|
msgstr "misslyckades läsa indexet"
|
|
|
|
#: builtin/am.c:2341
|
|
#, c-format
|
|
msgid "previous rebase directory %s still exists but mbox given."
|
|
msgstr "tidigare rebase-katalog %s finns fortfarande, men mbox angavs."
|
|
|
|
#: builtin/am.c:2365
|
|
#, c-format
|
|
msgid ""
|
|
"Stray %s directory found.\n"
|
|
"Use \"git am --abort\" to remove it."
|
|
msgstr ""
|
|
"Kvarbliven katalog %s hittades.\n"
|
|
"Använd \"git am --abort\" för att ta bort den."
|
|
|
|
#: builtin/am.c:2371
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
|
|
|
|
#: builtin/am.c:2381
|
|
msgid "interactive mode requires patches on the command line"
|
|
msgstr "interaktivt läge kräver patchar på kommandoraden"
|
|
|
|
#: builtin/apply.c:8
|
|
msgid "git apply [<options>] [<patch>...]"
|
|
msgstr "git apply [<flaggor>] [<patch>...]"
|
|
|
|
#: builtin/archive.c:17
|
|
#, c-format
|
|
msgid "could not create archive file '%s'"
|
|
msgstr "kunde inte skapa arkivfilen \"%s\""
|
|
|
|
#: builtin/archive.c:20
|
|
msgid "could not redirect output"
|
|
msgstr "kunde inte omdirigera utdata"
|
|
|
|
#: builtin/archive.c:37
|
|
msgid "git archive: Remote with no URL"
|
|
msgstr "git archive: Fjärr utan URL"
|
|
|
|
#: builtin/archive.c:61
|
|
msgid "git archive: expected ACK/NAK, got a flush packet"
|
|
msgstr "git archive: förväntade ACK/NAK, fick flush-paket"
|
|
|
|
#: builtin/archive.c:64
|
|
#, c-format
|
|
msgid "git archive: NACK %s"
|
|
msgstr "git archive: NACK %s"
|
|
|
|
#: builtin/archive.c:65
|
|
msgid "git archive: protocol error"
|
|
msgstr "git archive: protokollfel"
|
|
|
|
#: builtin/archive.c:69
|
|
msgid "git archive: expected a flush"
|
|
msgstr "git archive: förväntade en tömning (flush)"
|
|
|
|
#: builtin/bisect--helper.c:22
|
|
msgid "git bisect--helper --next-all [--no-checkout]"
|
|
msgstr "git bisect--helper --next-all [--no-checkout]"
|
|
|
|
#: builtin/bisect--helper.c:23
|
|
msgid "git bisect--helper --write-terms <bad_term> <good_term>"
|
|
msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"
|
|
|
|
#: builtin/bisect--helper.c:24
|
|
msgid "git bisect--helper --bisect-clean-state"
|
|
msgstr "git bisect--helper --bisect-clean-state"
|
|
|
|
#: builtin/bisect--helper.c:25
|
|
msgid "git bisect--helper --bisect-reset [<commit>]"
|
|
msgstr "git bisect--helper --bisect-reset [<incheckning>]"
|
|
|
|
#: builtin/bisect--helper.c:26
|
|
msgid ""
|
|
"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
|
|
"<bad_term>"
|
|
msgstr ""
|
|
"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
|
|
"för-rätt> <term-för-fel>"
|
|
|
|
#: builtin/bisect--helper.c:27
|
|
msgid ""
|
|
"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
|
|
"<bad_term>"
|
|
msgstr ""
|
|
"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> "
|
|
"<term-för-fel>"
|
|
|
|
#: builtin/bisect--helper.c:28
|
|
msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
|
|
msgstr ""
|
|
"git bisect--helper --bisect-next-check <term-för-rätt> <term-för-fel> <eterm>"
|
|
|
|
#: builtin/bisect--helper.c:29
|
|
msgid ""
|
|
"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
|
|
"term-new]"
|
|
msgstr ""
|
|
"git-bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
|
|
"term-new]"
|
|
|
|
#: builtin/bisect--helper.c:30
|
|
msgid ""
|
|
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
|
|
"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
|
|
msgstr ""
|
|
"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
|
|
"=<term>][--no-checkout] [<fel> [<rätt>...]] [--] [<sökvägar>...]"
|
|
|
|
#: builtin/bisect--helper.c:86
|
|
#, c-format
|
|
msgid "'%s' is not a valid term"
|
|
msgstr "\"%s\" är inte en giltig term"
|
|
|
|
#: builtin/bisect--helper.c:90
|
|
#, c-format
|
|
msgid "can't use the builtin command '%s' as a term"
|
|
msgstr "kan inte använda det inbyggda kommandot \"%s\" som term"
|
|
|
|
#: builtin/bisect--helper.c:100
|
|
#, c-format
|
|
msgid "can't change the meaning of the term '%s'"
|
|
msgstr "kan inte ändra betydelsen av termen \"%s\""
|
|
|
|
#: builtin/bisect--helper.c:111
|
|
msgid "please use two different terms"
|
|
msgstr "termerna måste vara olika"
|
|
|
|
#: builtin/bisect--helper.c:118
|
|
msgid "could not open the file BISECT_TERMS"
|
|
msgstr "kunde inte öppna filen BISECT_TERMS"
|
|
|
|
#: builtin/bisect--helper.c:155
|
|
#, c-format
|
|
msgid "We are not bisecting.\n"
|
|
msgstr "Vi utför ingen bisect för tillfället.\n"
|
|
|
|
#: builtin/bisect--helper.c:163
|
|
#, c-format
|
|
msgid "'%s' is not a valid commit"
|
|
msgstr "\"%s\" är inte en giltig incheckning"
|
|
|
|
#: builtin/bisect--helper.c:172
|
|
#, c-format
|
|
msgid ""
|
|
"could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
|
|
msgstr ""
|
|
"Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
|
|
"<incheckning>\"."
|
|
|
|
#: builtin/bisect--helper.c:216
|
|
#, c-format
|
|
msgid "Bad bisect_write argument: %s"
|
|
msgstr "Felaktigt argument till bisect_write: %s"
|
|
|
|
#: builtin/bisect--helper.c:221
|
|
#, c-format
|
|
msgid "couldn't get the oid of the rev '%s'"
|
|
msgstr "kan inte läsa oid för referensen \"%s\""
|
|
|
|
#: builtin/bisect--helper.c:233
|
|
#, c-format
|
|
msgid "couldn't open the file '%s'"
|
|
msgstr "kunde inte öppna filen \"%s\""
|
|
|
|
#: builtin/bisect--helper.c:259
|
|
#, c-format
|
|
msgid "Invalid command: you're currently in a %s/%s bisect"
|
|
msgstr "Ogiltigt kommando: du utför just nu en \"bisect\" med %s/%s."
|
|
|
|
#: builtin/bisect--helper.c:286
|
|
#, c-format
|
|
msgid ""
|
|
"You need to give me at least one %s and %s revision.\n"
|
|
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
|
|
msgstr ""
|
|
"Du måste ange åtminstone en %s och en %s version.\n"
|
|
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
|
|
|
|
#: builtin/bisect--helper.c:290
|
|
#, c-format
|
|
msgid ""
|
|
"You need to start by \"git bisect start\".\n"
|
|
"You then need to give me at least one %s and %s revision.\n"
|
|
"You can use \"git bisect %s\" and \"git bisect %s\" for that."
|
|
msgstr ""
|
|
"Du måste starta med \"git bisect start\".\n"
|
|
"Du måste sedan ange åtminstone en %s och en %s version.\n"
|
|
"(Du kan använda \"git bisect %s\" och \"git bisect %s\" för detta.)"
|
|
|
|
#: builtin/bisect--helper.c:310
|
|
#, c-format
|
|
msgid "bisecting only with a %s commit"
|
|
msgstr "utför bisect med endast en %s incheckning"
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
#. translation. The program will only accept English input
|
|
#. at this point.
|
|
#.
|
|
#: builtin/bisect--helper.c:318
|
|
msgid "Are you sure [Y/n]? "
|
|
msgstr "Är du säker [Y=ja/N=nej]? "
|
|
|
|
#: builtin/bisect--helper.c:379
|
|
msgid "no terms defined"
|
|
msgstr "inga termer angivna"
|
|
|
|
#: builtin/bisect--helper.c:382
|
|
#, c-format
|
|
msgid ""
|
|
"Your current terms are %s for the old state\n"
|
|
"and %s for the new state.\n"
|
|
msgstr ""
|
|
"Aktuella termer är %s för det gamla tillståndet\n"
|
|
"och %s för det nya tillståndet.\n"
|
|
|
|
#: builtin/bisect--helper.c:392
|
|
#, c-format
|
|
msgid ""
|
|
"invalid argument %s for 'git bisect terms'.\n"
|
|
"Supported options are: --term-good|--term-old and --term-bad|--term-new."
|
|
msgstr ""
|
|
"ogiltigt argument %s för \"git bisect terms\".\n"
|
|
"Flaggor som stöds är: --term-good|--term-old och --term-bad|--term-new."
|
|
|
|
#: builtin/bisect--helper.c:478
|
|
#, c-format
|
|
msgid "unrecognized option: '%s'"
|
|
msgstr "okänd flagga: %s"
|
|
|
|
#: builtin/bisect--helper.c:482
|
|
#, c-format
|
|
msgid "'%s' does not appear to be a valid revision"
|
|
msgstr "\"%s\" verkar inte vara en giltig revision"
|
|
|
|
#: builtin/bisect--helper.c:514
|
|
msgid "bad HEAD - I need a HEAD"
|
|
msgstr "felaktigt HEAD - Jag behöver ett HEAD"
|
|
|
|
#: builtin/bisect--helper.c:529
|
|
#, c-format
|
|
msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
|
|
msgstr ""
|
|
"misslyckades checka ut \"%s\". Försök \"git bisect reset <giltig_gren>\"."
|
|
|
|
# cogito-relaterat
|
|
#: builtin/bisect--helper.c:550
|
|
msgid "won't bisect on cg-seek'ed tree"
|
|
msgstr "kör inte \"bisect\" på träd där \"cg-seek\" använts"
|
|
|
|
#: builtin/bisect--helper.c:553
|
|
msgid "bad HEAD - strange symbolic ref"
|
|
msgstr "felaktigt HEAD - konstig symbolisk referens"
|
|
|
|
#: builtin/bisect--helper.c:577
|
|
#, c-format
|
|
msgid "invalid ref: '%s'"
|
|
msgstr "ogiltig referens: \"%s\""
|
|
|
|
#: builtin/bisect--helper.c:633
|
|
msgid "perform 'git bisect next'"
|
|
msgstr "utför 'git bisect next'"
|
|
|
|
#: builtin/bisect--helper.c:635
|
|
msgid "write the terms to .git/BISECT_TERMS"
|
|
msgstr "skriv termerna i .git/BISECT_TERMS"
|
|
|
|
#: builtin/bisect--helper.c:637
|
|
msgid "cleanup the bisection state"
|
|
msgstr "städar upp bisect-tillstånd"
|
|
|
|
#: builtin/bisect--helper.c:639
|
|
msgid "check for expected revs"
|
|
msgstr "kontrollera för förväntade versioner"
|
|
|
|
#: builtin/bisect--helper.c:641
|
|
msgid "reset the bisection state"
|
|
msgstr "återställ bisect-tillstånd"
|
|
|
|
#: builtin/bisect--helper.c:643
|
|
msgid "write out the bisection state in BISECT_LOG"
|
|
msgstr "skriver bisect-tillståndet i BISECT_LOG"
|
|
|
|
#: builtin/bisect--helper.c:645
|
|
msgid "check and set terms in a bisection state"
|
|
msgstr "visa och ange termer för bisect-tillstånd"
|
|
|
|
#: builtin/bisect--helper.c:647
|
|
msgid "check whether bad or good terms exist"
|
|
msgstr "se efter om termer för rätt och fel finns"
|
|
|
|
#: builtin/bisect--helper.c:649
|
|
msgid "print out the bisect terms"
|
|
msgstr "skriv ut termer för bisect"
|
|
|
|
#: builtin/bisect--helper.c:651
|
|
msgid "start the bisect session"
|
|
msgstr "påbörja bisect-körningen"
|
|
|
|
#: builtin/bisect--helper.c:653
|
|
msgid "update BISECT_HEAD instead of checking out the current commit"
|
|
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
|
|
|
|
#: builtin/bisect--helper.c:655
|
|
msgid "no log for BISECT_WRITE"
|
|
msgstr "ingen logg för BISECT_WRITE"
|
|
|
|
#: builtin/bisect--helper.c:673
|
|
msgid "--write-terms requires two arguments"
|
|
msgstr "--write-terms kräver två argument"
|
|
|
|
#: builtin/bisect--helper.c:677
|
|
msgid "--bisect-clean-state requires no arguments"
|
|
msgstr "--bisect-clean-state tar inga argument"
|
|
|
|
#: builtin/bisect--helper.c:684
|
|
msgid "--bisect-reset requires either no argument or a commit"
|
|
msgstr "--bisect-reset kräver antingen inget argument eller en incheckning"
|
|
|
|
#: builtin/bisect--helper.c:688
|
|
msgid "--bisect-write requires either 4 or 5 arguments"
|
|
msgstr "--bisect-write kräver antingen 4 eller 5 argument"
|
|
|
|
#: builtin/bisect--helper.c:694
|
|
msgid "--check-and-set-terms requires 3 arguments"
|
|
msgstr "--check-and-set-terms kräver tre argument"
|
|
|
|
#: builtin/bisect--helper.c:700
|
|
msgid "--bisect-next-check requires 2 or 3 arguments"
|
|
msgstr "--bisect-next-check kräver 2 eller 3 argument"
|
|
|
|
#: builtin/bisect--helper.c:706
|
|
msgid "--bisect-terms requires 0 or 1 argument"
|
|
msgstr "--bisect-terms kräver noll eller ett argument"
|
|
|
|
#: builtin/blame.c:31
|
|
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
|
|
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
|
|
|
|
#: builtin/blame.c:36
|
|
msgid "<rev-opts> are documented in git-rev-list(1)"
|
|
msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
|
|
|
|
#: builtin/blame.c:409
|
|
#, c-format
|
|
msgid "expecting a color: %s"
|
|
msgstr "förväntade en färg: %s"
|
|
|
|
#: builtin/blame.c:416
|
|
msgid "must end with a color"
|
|
msgstr "måste sluta med en färg"
|
|
|
|
#: builtin/blame.c:729
|
|
#, c-format
|
|
msgid "invalid color '%s' in color.blame.repeatedLines"
|
|
msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
|
|
|
|
#: builtin/blame.c:747
|
|
msgid "invalid value for blame.coloring"
|
|
msgstr "ogiltigt värde för blame.coloring"
|
|
|
|
#: builtin/blame.c:822
|
|
#, c-format
|
|
msgid "cannot find revision %s to ignore"
|
|
msgstr "kan inte hitta revision %s att ignorera"
|
|
|
|
#: builtin/blame.c:844
|
|
msgid "Show blame entries as we find them, incrementally"
|
|
msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
|
|
|
|
#: builtin/blame.c:845
|
|
msgid "Show blank SHA-1 for boundary commits (Default: off)"
|
|
msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
|
|
|
|
#: builtin/blame.c:846
|
|
msgid "Do not treat root commits as boundaries (Default: off)"
|
|
msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
|
|
|
|
#: builtin/blame.c:847
|
|
msgid "Show work cost statistics"
|
|
msgstr "Visa statistik över arbetskostnad"
|
|
|
|
#: builtin/blame.c:848
|
|
msgid "Force progress reporting"
|
|
msgstr "Tvinga förloppsrapportering"
|
|
|
|
#: builtin/blame.c:849
|
|
msgid "Show output score for blame entries"
|
|
msgstr "Visa utdatapoäng för klandringsposter"
|
|
|
|
#: builtin/blame.c:850
|
|
msgid "Show original filename (Default: auto)"
|
|
msgstr "Visa originalfilnamn (Standard: auto)"
|
|
|
|
#: builtin/blame.c:851
|
|
msgid "Show original linenumber (Default: off)"
|
|
msgstr "Visa ursprungligt radnummer (Standard: av)"
|
|
|
|
#: builtin/blame.c:852
|
|
msgid "Show in a format designed for machine consumption"
|
|
msgstr "Visa i ett format avsett för maskinkonsumtion"
|
|
|
|
#: builtin/blame.c:853
|
|
msgid "Show porcelain format with per-line commit information"
|
|
msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
|
|
|
|
#: builtin/blame.c:854
|
|
msgid "Use the same output mode as git-annotate (Default: off)"
|
|
msgstr "Använd samma utdataläge som git-annotate (Standard: av)"
|
|
|
|
#: builtin/blame.c:855
|
|
msgid "Show raw timestamp (Default: off)"
|
|
msgstr "Visa rå tidsstämpel (Standard: av)"
|
|
|
|
#: builtin/blame.c:856
|
|
msgid "Show long commit SHA1 (Default: off)"
|
|
msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
|
|
|
|
#: builtin/blame.c:857
|
|
msgid "Suppress author name and timestamp (Default: off)"
|
|
msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
|
|
|
|
#: builtin/blame.c:858
|
|
msgid "Show author email instead of name (Default: off)"
|
|
msgstr "Visa författarens e-post istället för namn (Standard: av)"
|
|
|
|
#: builtin/blame.c:859
|
|
msgid "Ignore whitespace differences"
|
|
msgstr "Ignorera ändringar i blanksteg"
|
|
|
|
#: builtin/blame.c:860 builtin/log.c:1702
|
|
msgid "rev"
|
|
msgstr "rev"
|
|
|
|
#: builtin/blame.c:860
|
|
msgid "Ignore <rev> when blaming"
|
|
msgstr "ignorera <rev> vid klandren"
|
|
|
|
#: builtin/blame.c:861
|
|
msgid "Ignore revisions from <file>"
|
|
msgstr "ignorera revisioner från <fil>"
|
|
|
|
#: builtin/blame.c:862
|
|
msgid "color redundant metadata from previous line differently"
|
|
msgstr "färglägg redundant metadata från tidigare rader annorlunda"
|
|
|
|
#: builtin/blame.c:863
|
|
msgid "color lines by age"
|
|
msgstr "färglägg rader efter ålder"
|
|
|
|
#: builtin/blame.c:864
|
|
msgid "Spend extra cycles to find better match"
|
|
msgstr "Slösa extra cykler med att hitta bättre träff"
|
|
|
|
#: builtin/blame.c:865
|
|
msgid "Use revisions from <file> instead of calling git-rev-list"
|
|
msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list"
|
|
|
|
#: builtin/blame.c:866
|
|
msgid "Use <file>'s contents as the final image"
|
|
msgstr "Använd <fil>s innehåll som slutgiltig bild"
|
|
|
|
#: builtin/blame.c:867 builtin/blame.c:868
|
|
msgid "score"
|
|
msgstr "poäng"
|
|
|
|
#: builtin/blame.c:867
|
|
msgid "Find line copies within and across files"
|
|
msgstr "Hitta kopierade rader inuti och mellan filer"
|
|
|
|
#: builtin/blame.c:868
|
|
msgid "Find line movements within and across files"
|
|
msgstr "Hitta flyttade rader inuti och mellan filer"
|
|
|
|
#: builtin/blame.c:869
|
|
msgid "n,m"
|
|
msgstr "n,m"
|
|
|
|
#: builtin/blame.c:869
|
|
msgid "Process only line range n,m, counting from 1"
|
|
msgstr "Behandla endast radintervallet n,m, med början på 1"
|
|
|
|
#: builtin/blame.c:921
|
|
msgid "--progress can't be used with --incremental or porcelain formats"
|
|
msgstr "--progress kan inte användas med --incremental eller porslinsformat"
|
|
|
|
#. TRANSLATORS: This string is used to tell us the
|
|
#. maximum display width for a relative timestamp in
|
|
#. "git blame" output. For C locale, "4 years, 11
|
|
#. months ago", which takes 22 places, is the longest
|
|
#. among various forms of relative timestamps, but
|
|
#. your language may need more or fewer display
|
|
#. columns.
|
|
#.
|
|
#: builtin/blame.c:972
|
|
msgid "4 years, 11 months ago"
|
|
msgstr "4 år, 11 månader sedan"
|
|
|
|
#: builtin/blame.c:1079
|
|
#, c-format
|
|
msgid "file %s has only %lu line"
|
|
msgid_plural "file %s has only %lu lines"
|
|
msgstr[0] "filen %s har bara %lu rad"
|
|
msgstr[1] "filen %s har bara %lu rader"
|
|
|
|
#: builtin/blame.c:1125
|
|
msgid "Blaming lines"
|
|
msgstr "Klandra rader"
|
|
|
|
#: builtin/branch.c:29
|
|
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
|
|
msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
|
|
|
|
#: builtin/branch.c:30
|
|
msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
|
|
msgstr "git branch [<flaggor>] [-l] [-f] <grennamn> [<startpunkt>]"
|
|
|
|
#: builtin/branch.c:31
|
|
msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
|
|
msgstr "git branch [<flaggor>] [-r] (-d | -D) <grennamn>..."
|
|
|
|
#: builtin/branch.c:32
|
|
msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
|
|
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
|
|
|
|
#: builtin/branch.c:33
|
|
msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
|
|
msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"
|
|
|
|
#: builtin/branch.c:34
|
|
msgid "git branch [<options>] [-r | -a] [--points-at]"
|
|
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
|
|
|
|
#: builtin/branch.c:35
|
|
msgid "git branch [<options>] [-r | -a] [--format]"
|
|
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
|
|
|
|
#: builtin/branch.c:154
|
|
#, c-format
|
|
msgid ""
|
|
"deleting branch '%s' that has been merged to\n"
|
|
" '%s', but not yet merged to HEAD."
|
|
msgstr ""
|
|
"tar bort grenen \"%s\" som har slagits ihop med\n"
|
|
" \"%s\", men ännu inte slagits ihop med HEAD."
|
|
|
|
#: builtin/branch.c:158
|
|
#, c-format
|
|
msgid ""
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
" '%s', even though it is merged to HEAD."
|
|
msgstr ""
|
|
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
|
|
" \"%s\", trots att den har slagits ihop med HEAD."
|
|
|
|
#: builtin/branch.c:172
|
|
#, c-format
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
|
|
|
|
#: builtin/branch.c:176
|
|
#, c-format
|
|
msgid ""
|
|
"The branch '%s' is not fully merged.\n"
|
|
"If you are sure you want to delete it, run 'git branch -D %s'."
|
|
msgstr ""
|
|
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
|
|
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
|
|
|
|
#: builtin/branch.c:189
|
|
msgid "Update of config-file failed"
|
|
msgstr "Misslyckades uppdatera konfigurationsfil"
|
|
|
|
#: builtin/branch.c:220
|
|
msgid "cannot use -a with -d"
|
|
msgstr "kan inte ange -a med -d"
|
|
|
|
#: builtin/branch.c:226
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
|
|
|
|
#: builtin/branch.c:240
|
|
#, c-format
|
|
msgid "Cannot delete branch '%s' checked out at '%s'"
|
|
msgstr "Kan inte ta bort grenen \"%s\" som är utcheckad på \"%s\""
|
|
|
|
#: builtin/branch.c:255
|
|
#, c-format
|
|
msgid "remote-tracking branch '%s' not found."
|
|
msgstr "fjärrspårande grenen \"%s\" hittades inte."
|
|
|
|
#: builtin/branch.c:256
|
|
#, c-format
|
|
msgid "branch '%s' not found."
|
|
msgstr "grenen \"%s\" hittades inte."
|
|
|
|
#: builtin/branch.c:271
|
|
#, c-format
|
|
msgid "Error deleting remote-tracking branch '%s'"
|
|
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
|
|
|
|
#: builtin/branch.c:272
|
|
#, c-format
|
|
msgid "Error deleting branch '%s'"
|
|
msgstr "Fel vid borttagning av grenen \"%s\""
|
|
|
|
#: builtin/branch.c:279
|
|
#, c-format
|
|
msgid "Deleted remote-tracking branch %s (was %s).\n"
|
|
msgstr "Tog bort fjärrspårande grenen %s (var %s).\n"
|
|
|
|
#: builtin/branch.c:280
|
|
#, c-format
|
|
msgid "Deleted branch %s (was %s).\n"
|
|
msgstr "Tog bort grenen %s (var %s).\n"
|
|
|
|
#: builtin/branch.c:429 builtin/tag.c:61
|
|
msgid "unable to parse format string"
|
|
msgstr "kan inte tolka formatsträng"
|
|
|
|
#: builtin/branch.c:460
|
|
msgid "could not resolve HEAD"
|
|
msgstr "kunde inte slå upp HEAD"
|
|
|
|
#: builtin/branch.c:466
|
|
#, c-format
|
|
msgid "HEAD (%s) points outside of refs/heads/"
|
|
msgstr "HEAD (%s) pekar utenför refs/heads/"
|
|
|
|
#: builtin/branch.c:481
|
|
#, c-format
|
|
msgid "Branch %s is being rebased at %s"
|
|
msgstr "Grenen %s ombaseras på %s"
|
|
|
|
#: builtin/branch.c:485
|
|
#, c-format
|
|
msgid "Branch %s is being bisected at %s"
|
|
msgstr "Grenen %s är i en \"bisect\" på %s"
|
|
|
|
#: builtin/branch.c:502
|
|
msgid "cannot copy the current branch while not on any."
|
|
msgstr "kunde inte kopiera aktuell gren när du inte befinner dig på någon."
|
|
|
|
#: builtin/branch.c:504
|
|
msgid "cannot rename the current branch while not on any."
|
|
msgstr ""
|
|
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
|
|
|
|
#: builtin/branch.c:515
|
|
#, c-format
|
|
msgid "Invalid branch name: '%s'"
|
|
msgstr "Felaktigt namn på gren: \"%s\""
|
|
|
|
#: builtin/branch.c:542
|
|
msgid "Branch rename failed"
|
|
msgstr "Misslyckades byta namn på gren"
|
|
|
|
#: builtin/branch.c:544
|
|
msgid "Branch copy failed"
|
|
msgstr "Misslyckades kopiera gren"
|
|
|
|
#: builtin/branch.c:548
|
|
#, c-format
|
|
msgid "Created a copy of a misnamed branch '%s'"
|
|
msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
|
|
|
|
#: builtin/branch.c:551
|
|
#, c-format
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
|
|
|
|
#: builtin/branch.c:557
|
|
#, c-format
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
|
|
|
|
#: builtin/branch.c:566
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
|
|
|
|
#: builtin/branch.c:568
|
|
msgid "Branch is copied, but update of config-file failed"
|
|
msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
|
|
|
|
#: builtin/branch.c:584
|
|
#, c-format
|
|
msgid ""
|
|
"Please edit the description for the branch\n"
|
|
" %s\n"
|
|
"Lines starting with '%c' will be stripped.\n"
|
|
msgstr ""
|
|
"Redigera beskrivningen för grenen\n"
|
|
" %s\n"
|
|
"Rader som inleds med \"%c\" ignoreras.\n"
|
|
|
|
#: builtin/branch.c:618
|
|
msgid "Generic options"
|
|
msgstr "Allmänna flaggor"
|
|
|
|
#: builtin/branch.c:620
|
|
msgid "show hash and subject, give twice for upstream branch"
|
|
msgstr "visa hash och ärenderad, ange två gånger för uppströmsgren"
|
|
|
|
#: builtin/branch.c:621
|
|
msgid "suppress informational messages"
|
|
msgstr "undertryck informationsmeddelanden"
|
|
|
|
#: builtin/branch.c:622
|
|
msgid "set up tracking mode (see git-pull(1))"
|
|
msgstr "ställ in spårningsläge (se git-pull(1))"
|
|
|
|
#: builtin/branch.c:624
|
|
msgid "do not use"
|
|
msgstr "använd ej"
|
|
|
|
#: builtin/branch.c:626 builtin/rebase.c:513
|
|
msgid "upstream"
|
|
msgstr "uppströms"
|
|
|
|
#: builtin/branch.c:626
|
|
msgid "change the upstream info"
|
|
msgstr "ändra uppströmsinformationen"
|
|
|
|
#: builtin/branch.c:627
|
|
msgid "unset the upstream info"
|
|
msgstr "ta bort uppströmsinformationen"
|
|
|
|
#: builtin/branch.c:628
|
|
msgid "use colored output"
|
|
msgstr "använd färgad utdata"
|
|
|
|
#: builtin/branch.c:629
|
|
msgid "act on remote-tracking branches"
|
|
msgstr "arbeta på fjärrspårande grenar"
|
|
|
|
#: builtin/branch.c:631 builtin/branch.c:633
|
|
msgid "print only branches that contain the commit"
|
|
msgstr "visa endast grenar som innehåller incheckningen"
|
|
|
|
#: builtin/branch.c:632 builtin/branch.c:634
|
|
msgid "print only branches that don't contain the commit"
|
|
msgstr "visa endast grenar som inte innehåller incheckningen"
|
|
|
|
#: builtin/branch.c:637
|
|
msgid "Specific git-branch actions:"
|
|
msgstr "Specifika git-branch-åtgärder:"
|
|
|
|
#: builtin/branch.c:638
|
|
msgid "list both remote-tracking and local branches"
|
|
msgstr "visa både fjärrspårande och lokala grenar"
|
|
|
|
#: builtin/branch.c:640
|
|
msgid "delete fully merged branch"
|
|
msgstr "ta bort helt sammanslagen gren"
|
|
|
|
#: builtin/branch.c:641
|
|
msgid "delete branch (even if not merged)"
|
|
msgstr "ta bort gren (även om inte helt sammanslagen)"
|
|
|
|
#: builtin/branch.c:642
|
|
msgid "move/rename a branch and its reflog"
|
|
msgstr "flytta/ta bort en gren och dess reflogg"
|
|
|
|
#: builtin/branch.c:643
|
|
msgid "move/rename a branch, even if target exists"
|
|
msgstr "flytta/ta bort en gren, även om målet finns"
|
|
|
|
#: builtin/branch.c:644
|
|
msgid "copy a branch and its reflog"
|
|
msgstr "kopiera en gren och dess reflogg"
|
|
|
|
#: builtin/branch.c:645
|
|
msgid "copy a branch, even if target exists"
|
|
msgstr "kopiera en gren, även om målet finns"
|
|
|
|
#: builtin/branch.c:646
|
|
msgid "list branch names"
|
|
msgstr "lista namn på grenar"
|
|
|
|
#: builtin/branch.c:647
|
|
msgid "show current branch name"
|
|
msgstr "visa namn på aktuell gren"
|
|
|
|
#: builtin/branch.c:648
|
|
msgid "create the branch's reflog"
|
|
msgstr "skapa grenens reflogg"
|
|
|
|
#: builtin/branch.c:650
|
|
msgid "edit the description for the branch"
|
|
msgstr "redigera beskrivning för grenen"
|
|
|
|
#: builtin/branch.c:651
|
|
msgid "force creation, move/rename, deletion"
|
|
msgstr "tvinga skapande, flytt/namnändring, borttagande"
|
|
|
|
#: builtin/branch.c:652
|
|
msgid "print only branches that are merged"
|
|
msgstr "visa endast sammanslagna grenar"
|
|
|
|
#: builtin/branch.c:653
|
|
msgid "print only branches that are not merged"
|
|
msgstr "visa endast ej sammanslagna grenar"
|
|
|
|
#: builtin/branch.c:654
|
|
msgid "list branches in columns"
|
|
msgstr "visa grenar i spalter"
|
|
|
|
#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
|
|
#: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
|
|
#: builtin/tag.c:433
|
|
msgid "object"
|
|
msgstr "objekt"
|
|
|
|
#: builtin/branch.c:658
|
|
msgid "print only branches of the object"
|
|
msgstr "visa endast grenar för objektet"
|
|
|
|
#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
|
|
msgid "sorting and filtering are case insensitive"
|
|
msgstr "sortering och filtrering skiljer gemener och VERSALER"
|
|
|
|
#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
|
|
#: builtin/verify-tag.c:38
|
|
msgid "format to use for the output"
|
|
msgstr "format att använda för utdata"
|
|
|
|
#: builtin/branch.c:684 builtin/clone.c:785
|
|
msgid "HEAD not found below refs/heads!"
|
|
msgstr "HEAD hittades inte under refs/heads!"
|
|
|
|
#: builtin/branch.c:708
|
|
msgid "--column and --verbose are incompatible"
|
|
msgstr "--column och --verbose är inkompatibla"
|
|
|
|
#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
|
|
msgid "branch name required"
|
|
msgstr "grennamn krävs"
|
|
|
|
#: builtin/branch.c:753
|
|
msgid "Cannot give description to detached HEAD"
|
|
msgstr "Kan inte beskriva frånkopplad HEAD"
|
|
|
|
#: builtin/branch.c:758
|
|
msgid "cannot edit description of more than one branch"
|
|
msgstr "kan inte redigera beskrivning för mer än en gren"
|
|
|
|
#: builtin/branch.c:765
|
|
#, c-format
|
|
msgid "No commit on branch '%s' yet."
|
|
msgstr "Inga incheckningar på grenen \"%s\" ännu."
|
|
|
|
#: builtin/branch.c:768
|
|
#, c-format
|
|
msgid "No branch named '%s'."
|
|
msgstr "Ingen gren vid namnet \"%s\"."
|
|
|
|
#: builtin/branch.c:783
|
|
msgid "too many branches for a copy operation"
|
|
msgstr "för många grenar för kopiering"
|
|
|
|
#: builtin/branch.c:792
|
|
msgid "too many arguments for a rename operation"
|
|
msgstr "för många flaggor för namnbyte"
|
|
|
|
#: builtin/branch.c:797
|
|
msgid "too many arguments to set new upstream"
|
|
msgstr "för många flaggor för att byta uppström"
|
|
|
|
#: builtin/branch.c:801
|
|
#, c-format
|
|
msgid ""
|
|
"could not set upstream of HEAD to %s when it does not point to any branch."
|
|
msgstr ""
|
|
"kunde inte sätta uppström för HEAD till %s när det inte pekar mot någon gren."
|
|
|
|
#: builtin/branch.c:804 builtin/branch.c:827
|
|
#, c-format
|
|
msgid "no such branch '%s'"
|
|
msgstr "okänd gren \"%s\""
|
|
|
|
#: builtin/branch.c:808
|
|
#, c-format
|
|
msgid "branch '%s' does not exist"
|
|
msgstr "grenen \"%s\" finns inte"
|
|
|
|
#: builtin/branch.c:821
|
|
msgid "too many arguments to unset upstream"
|
|
msgstr "för många flaggor för att ta bort uppström"
|
|
|
|
#: builtin/branch.c:825
|
|
msgid "could not unset upstream of HEAD when it does not point to any branch."
|
|
msgstr ""
|
|
"kunde inte ta bort uppström för HEAD när det inte pekar mot någon gren."
|
|
|
|
#: builtin/branch.c:831
|
|
#, c-format
|
|
msgid "Branch '%s' has no upstream information"
|
|
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
|
|
|
|
#: builtin/branch.c:841
|
|
msgid ""
|
|
"The -a, and -r, options to 'git branch' do not take a branch name.\n"
|
|
"Did you mean to use: -a|-r --list <pattern>?"
|
|
msgstr ""
|
|
"Flaggorna -a och -r på \"git branch\" tar inte ett namn på gren.\n"
|
|
"Menade du att använda: -a|-r --list <mönster>?"
|
|
|
|
#: builtin/branch.c:845
|
|
msgid ""
|
|
"the '--set-upstream' option is no longer supported. Please use '--track' or "
|
|
"'--set-upstream-to' instead."
|
|
msgstr ""
|
|
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
|
|
"eller --set-upstream-to istället."
|
|
|
|
#: builtin/bundle.c:15 builtin/bundle.c:23
|
|
msgid "git bundle create [<options>] <file> <git-rev-list args>"
|
|
msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>"
|
|
|
|
#: builtin/bundle.c:16 builtin/bundle.c:28
|
|
msgid "git bundle verify [<options>] <file>"
|
|
msgstr "git bundle verify [<flaggor>] <fil>"
|
|
|
|
#: builtin/bundle.c:17 builtin/bundle.c:33
|
|
msgid "git bundle list-heads <file> [<refname>...]"
|
|
msgstr "git bundle list-heads <fil> [<refnamn>...]"
|
|
|
|
#: builtin/bundle.c:18 builtin/bundle.c:38
|
|
msgid "git bundle unbundle <file> [<refname>...]"
|
|
msgstr "git bundle unbundle <fil> [<refnamn>...]"
|
|
|
|
#: builtin/bundle.c:66 builtin/pack-objects.c:3375
|
|
msgid "do not show progress meter"
|
|
msgstr "visa inte förloppsindikator"
|
|
|
|
#: builtin/bundle.c:68 builtin/pack-objects.c:3377
|
|
msgid "show progress meter"
|
|
msgstr "visa förloppsindikator"
|
|
|
|
#: builtin/bundle.c:70 builtin/pack-objects.c:3379
|
|
msgid "show progress meter during object writing phase"
|
|
msgstr "visa förloppsindikator under objektskrivningsfasen"
|
|
|
|
#: builtin/bundle.c:73 builtin/pack-objects.c:3382
|
|
msgid "similar to --all-progress when progress meter is shown"
|
|
msgstr "som --all-progress när förloppsindikatorn visas"
|
|
|
|
#: builtin/bundle.c:93
|
|
msgid "Need a repository to create a bundle."
|
|
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
|
|
|
|
#: builtin/bundle.c:104
|
|
msgid "do not show bundle details"
|
|
msgstr "visa inte paketdetaljer"
|
|
|
|
#: builtin/bundle.c:119
|
|
#, c-format
|
|
msgid "%s is okay\n"
|
|
msgstr "%s är okej\n"
|
|
|
|
#: builtin/bundle.c:160
|
|
msgid "Need a repository to unbundle."
|
|
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
|
|
|
|
#: builtin/bundle.c:168 builtin/remote.c:1686
|
|
msgid "be verbose; must be placed before a subcommand"
|
|
msgstr "var pratsam; måste skrivas före ett underkommando"
|
|
|
|
#: builtin/bundle.c:190 builtin/remote.c:1717
|
|
#, c-format
|
|
msgid "Unknown subcommand: %s"
|
|
msgstr "Okänt underkommando: %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>"
|
|
msgstr ""
|
|
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
|
|
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
|
|
|
|
#: builtin/cat-file.c:596
|
|
msgid ""
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
"filters]"
|
|
msgstr ""
|
|
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
|
|
"filters]"
|
|
|
|
#: builtin/cat-file.c:617
|
|
msgid "only one batch option may be specified"
|
|
msgstr "endast en buntflagga kan anges"
|
|
|
|
#: builtin/cat-file.c:635
|
|
msgid "<type> can be one of: blob, tree, commit, tag"
|
|
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
|
|
|
|
#: builtin/cat-file.c:636
|
|
msgid "show object type"
|
|
msgstr "visa objekttyp"
|
|
|
|
#: builtin/cat-file.c:637
|
|
msgid "show object size"
|
|
msgstr "visa objektstorlek"
|
|
|
|
#: builtin/cat-file.c:639
|
|
msgid "exit with zero when there's no error"
|
|
msgstr "avsluta med noll när det inte uppstått något fel"
|
|
|
|
#: builtin/cat-file.c:640
|
|
msgid "pretty-print object's content"
|
|
msgstr "visa objektets innehåll snyggt"
|
|
|
|
#: builtin/cat-file.c:642
|
|
msgid "for blob objects, run textconv on object's content"
|
|
msgstr "för blob-objekt, kör filter på objektets innehåll"
|
|
|
|
#: builtin/cat-file.c:644
|
|
msgid "for blob objects, run filters on object's content"
|
|
msgstr "för blob-objekt, kör filger på objektets innehåll"
|
|
|
|
#: builtin/cat-file.c:645 git-submodule.sh:1002
|
|
msgid "blob"
|
|
msgstr "blob"
|
|
|
|
#: builtin/cat-file.c:646
|
|
msgid "use a specific path for --textconv/--filters"
|
|
msgstr "använd specifik sökväg för --textconv/--filters"
|
|
|
|
#: builtin/cat-file.c:648
|
|
msgid "allow -s and -t to work with broken/corrupt objects"
|
|
msgstr "låter -s och -t att fungera med trasiga/sönderskrivna objekt"
|
|
|
|
#: builtin/cat-file.c:649
|
|
msgid "buffer --batch output"
|
|
msgstr "buffra utdata från --batch"
|
|
|
|
#: builtin/cat-file.c:651
|
|
msgid "show info and content of objects fed from the standard input"
|
|
msgstr "visa information och innehåll för objekt som listas på standard in"
|
|
|
|
#: builtin/cat-file.c:655
|
|
msgid "show info about objects fed from the standard input"
|
|
msgstr "visa information för objekt som listas på standard in"
|
|
|
|
#: builtin/cat-file.c:659
|
|
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
|
|
msgstr ""
|
|
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
|
|
|
|
#: builtin/cat-file.c:661
|
|
msgid "show all objects with --batch or --batch-check"
|
|
msgstr "visa alla objekt med --batch eller --batch-check"
|
|
|
|
#: builtin/cat-file.c:663
|
|
msgid "do not order --batch-all-objects output"
|
|
msgstr "ordna inte --batch-all-objects output"
|
|
|
|
#: builtin/check-attr.c:13
|
|
msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
|
|
msgstr "git check-attr [-a | --all | <attr>...] [--] <sökväg>..."
|
|
|
|
#: builtin/check-attr.c:14
|
|
msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
|
|
|
|
#: builtin/check-attr.c:21
|
|
msgid "report all attributes set on file"
|
|
msgstr "visa alla attribut som satts på filen"
|
|
|
|
#: builtin/check-attr.c:22
|
|
msgid "use .gitattributes only from the index"
|
|
msgstr "använd .gitattributes endast från indexet"
|
|
|
|
#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
|
|
msgid "read file names from stdin"
|
|
msgstr "läs filnamn från standard in"
|
|
|
|
#: builtin/check-attr.c:25 builtin/check-ignore.c:27
|
|
msgid "terminate input and output records by a NUL character"
|
|
msgstr "avsluta in- och utdataposter med NUL-tecken"
|
|
|
|
#: builtin/check-ignore.c:21 builtin/checkout.c:1464 builtin/gc.c:537
|
|
#: builtin/worktree.c:499
|
|
msgid "suppress progress reporting"
|
|
msgstr "undertryck förloppsrapportering"
|
|
|
|
#: builtin/check-ignore.c:29
|
|
msgid "show non-matching input paths"
|
|
msgstr "visa indatasökvägar som inte träffas"
|
|
|
|
#: builtin/check-ignore.c:31
|
|
msgid "ignore index when checking"
|
|
msgstr "ignorera index vid kontroll"
|
|
|
|
#: builtin/check-ignore.c:163
|
|
msgid "cannot specify pathnames with --stdin"
|
|
msgstr "kan inte ange sökvägsnamn med --stdin"
|
|
|
|
#: builtin/check-ignore.c:166
|
|
msgid "-z only makes sense with --stdin"
|
|
msgstr "-z kan endast användas tillsammans med --stdin"
|
|
|
|
#: builtin/check-ignore.c:168
|
|
msgid "no path specified"
|
|
msgstr "ingen sökväg angavs"
|
|
|
|
#: builtin/check-ignore.c:172
|
|
msgid "--quiet is only valid with a single pathname"
|
|
msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
|
|
|
|
#: builtin/check-ignore.c:174
|
|
msgid "cannot have both --quiet and --verbose"
|
|
msgstr "kan inte använda både --quiet och --verbose"
|
|
|
|
#: builtin/check-ignore.c:177
|
|
msgid "--non-matching is only valid with --verbose"
|
|
msgstr "--non-matching är endast giltig med --verbose"
|
|
|
|
#: builtin/check-mailmap.c:9
|
|
msgid "git check-mailmap [<options>] <contact>..."
|
|
msgstr "git check-mailmap [<flaggor>] <kontakt>..."
|
|
|
|
#: builtin/check-mailmap.c:14
|
|
msgid "also read contacts from stdin"
|
|
msgstr "läs även kontakter från standard in"
|
|
|
|
#: builtin/check-mailmap.c:25
|
|
#, c-format
|
|
msgid "unable to parse contact: %s"
|
|
msgstr "kunde inte tolka kontakt: %s"
|
|
|
|
#: builtin/check-mailmap.c:48
|
|
msgid "no contacts specified"
|
|
msgstr "inga kontakter angavs"
|
|
|
|
#: builtin/checkout-index.c:131
|
|
msgid "git checkout-index [<options>] [--] [<file>...]"
|
|
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
|
|
|
|
#: builtin/checkout-index.c:148
|
|
msgid "stage should be between 1 and 3 or all"
|
|
msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
|
|
|
|
#: builtin/checkout-index.c:164
|
|
msgid "check out all files in the index"
|
|
msgstr "checka ut alla filer i indexet"
|
|
|
|
#: builtin/checkout-index.c:165
|
|
msgid "force overwrite of existing files"
|
|
msgstr "tvinga överskrivning av befintliga filer"
|
|
|
|
#: builtin/checkout-index.c:167
|
|
msgid "no warning for existing files and files not in index"
|
|
msgstr "ingen varning för existerande filer och filer ej i indexet"
|
|
|
|
#: builtin/checkout-index.c:169
|
|
msgid "don't checkout new files"
|
|
msgstr "checka inte ut nya filer"
|
|
|
|
#: builtin/checkout-index.c:171
|
|
msgid "update stat information in the index file"
|
|
msgstr "uppdatera stat-information i indexfilen"
|
|
|
|
#: builtin/checkout-index.c:175
|
|
msgid "read list of paths from the standard input"
|
|
msgstr "läs listan över sökvägar från standard in"
|
|
|
|
#: builtin/checkout-index.c:177
|
|
msgid "write the content to temporary files"
|
|
msgstr "skriv innehåll till temporära filer"
|
|
|
|
#: builtin/checkout-index.c:178 builtin/column.c:31
|
|
#: 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 "sträng"
|
|
|
|
#: builtin/checkout-index.c:179
|
|
msgid "when creating files, prepend <string>"
|
|
msgstr "när filer skapas, lägg till <sträng> först"
|
|
|
|
#: builtin/checkout-index.c:181
|
|
msgid "copy out the files from named stage"
|
|
msgstr "kopiera ut filer från namngiven etapp"
|
|
|
|
#: builtin/checkout.c:31
|
|
msgid "git checkout [<options>] <branch>"
|
|
msgstr "git checkout [<flaggor>] <gren>"
|
|
|
|
#: builtin/checkout.c:32
|
|
msgid "git checkout [<options>] [<branch>] -- <file>..."
|
|
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
|
|
|
|
#: builtin/checkout.c:37
|
|
msgid "git switch [<options>] [<branch>]"
|
|
msgstr "git switch [<flaggor>] [<gren>]"
|
|
|
|
#: builtin/checkout.c:42
|
|
msgid "git restore [<options>] [--source=<branch>] <file>..."
|
|
msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
|
|
|
|
#: builtin/checkout.c:175 builtin/checkout.c:214
|
|
#, c-format
|
|
msgid "path '%s' does not have our version"
|
|
msgstr "sökvägen \"%s\" har inte vår version"
|
|
|
|
#: builtin/checkout.c:177 builtin/checkout.c:216
|
|
#, c-format
|
|
msgid "path '%s' does not have their version"
|
|
msgstr "sökvägen \"%s\" har inte deras version"
|
|
|
|
#: builtin/checkout.c:193
|
|
#, c-format
|
|
msgid "path '%s' does not have all necessary versions"
|
|
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
|
|
|
|
#: builtin/checkout.c:243
|
|
#, c-format
|
|
msgid "path '%s' does not have necessary versions"
|
|
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
|
|
|
|
#: builtin/checkout.c:261
|
|
#, c-format
|
|
msgid "path '%s': cannot merge"
|
|
msgstr "sökväg \"%s\": kan inte slå ihop"
|
|
|
|
#: builtin/checkout.c:277
|
|
#, c-format
|
|
msgid "Unable to add merge result for '%s'"
|
|
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
|
|
|
|
#: builtin/checkout.c:377
|
|
#, c-format
|
|
msgid "Recreated %d merge conflict"
|
|
msgid_plural "Recreated %d merge conflicts"
|
|
msgstr[0] "Återskapade %d sammanslagningskonflikt"
|
|
msgstr[1] "Återskapade %d sammanslagningskonflikter"
|
|
|
|
#: builtin/checkout.c:382
|
|
#, c-format
|
|
msgid "Updated %d path from %s"
|
|
msgid_plural "Updated %d paths from %s"
|
|
msgstr[0] "Uppdaterade %d sökväg från %s"
|
|
msgstr[1] "Uppdaterade %d sökvägar från %s"
|
|
|
|
#: builtin/checkout.c:389
|
|
#, c-format
|
|
msgid "Updated %d path from the index"
|
|
msgid_plural "Updated %d paths from the index"
|
|
msgstr[0] "Uppdaterade %d sökväg från indexet"
|
|
msgstr[1] "Uppdaterade %d sökvägar från indexet"
|
|
|
|
#: builtin/checkout.c: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\" kan inte användas vid uppdatering av sökvägar"
|
|
|
|
#: builtin/checkout.c:425 builtin/checkout.c:428
|
|
#, c-format
|
|
msgid "'%s' cannot be used with %s"
|
|
msgstr "\"%s\" kan inte användas med %s"
|
|
|
|
#: builtin/checkout.c:432
|
|
#, c-format
|
|
msgid "Cannot update paths and switch to branch '%s' at the same time."
|
|
msgstr "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt."
|
|
|
|
#: builtin/checkout.c:436
|
|
#, c-format
|
|
msgid "neither '%s' or '%s' is specified"
|
|
msgstr "varken \"%s\" eller \"%s\" har angivits"
|
|
|
|
#: builtin/checkout.c:440
|
|
#, c-format
|
|
msgid "'%s' must be used when '%s' is not specified"
|
|
msgstr "\"%s\" måste användas när \"%s\" inte anges"
|
|
|
|
#: builtin/checkout.c:445 builtin/checkout.c:450
|
|
#, c-format
|
|
msgid "'%s' or '%s' cannot be used with %s"
|
|
msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
|
|
|
|
#: builtin/checkout.c:509 builtin/checkout.c:516
|
|
#, c-format
|
|
msgid "path '%s' is unmerged"
|
|
msgstr "sökvägen \"%s\" har inte slagits ihop"
|
|
|
|
#: builtin/checkout.c:684 builtin/sparse-checkout.c:106
|
|
msgid "you need to resolve your current index first"
|
|
msgstr "du måste lösa ditt befintliga index först"
|
|
|
|
#: builtin/checkout.c:734
|
|
#, c-format
|
|
msgid ""
|
|
"cannot continue with staged changes in the following files:\n"
|
|
"%s"
|
|
msgstr ""
|
|
"kan inte fortsätta med köade ändringar i följande filer:\n"
|
|
"%s"
|
|
|
|
#: builtin/checkout.c:837
|
|
#, c-format
|
|
msgid "Can not do reflog for '%s': %s\n"
|
|
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
|
|
|
|
#: builtin/checkout.c:879
|
|
msgid "HEAD is now at"
|
|
msgstr "HEAD är nu på"
|
|
|
|
#: builtin/checkout.c:883 builtin/clone.c:717
|
|
msgid "unable to update HEAD"
|
|
msgstr "kan inte uppdatera HEAD"
|
|
|
|
#: builtin/checkout.c:887
|
|
#, c-format
|
|
msgid "Reset branch '%s'\n"
|
|
msgstr "Återställ gren \"%s\"\n"
|
|
|
|
#: builtin/checkout.c:890
|
|
#, c-format
|
|
msgid "Already on '%s'\n"
|
|
msgstr "Redan på \"%s\"\n"
|
|
|
|
#: builtin/checkout.c:894
|
|
#, c-format
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
msgstr "Växlade till och nollställde grenen \"%s\"\n"
|
|
|
|
#: builtin/checkout.c:896 builtin/checkout.c:1320
|
|
#, c-format
|
|
msgid "Switched to a new branch '%s'\n"
|
|
msgstr "Växlade till en ny gren \"%s\"\n"
|
|
|
|
#: builtin/checkout.c:898
|
|
#, c-format
|
|
msgid "Switched to branch '%s'\n"
|
|
msgstr "Växlade till grenen \"%s\"\n"
|
|
|
|
#: builtin/checkout.c:949
|
|
#, c-format
|
|
msgid " ... and %d more.\n"
|
|
msgstr " ... och %d till.\n"
|
|
|
|
#: builtin/checkout.c:955
|
|
#, c-format
|
|
msgid ""
|
|
"Warning: you are leaving %d commit behind, not connected to\n"
|
|
"any of your branches:\n"
|
|
"\n"
|
|
"%s\n"
|
|
msgid_plural ""
|
|
"Warning: you are leaving %d commits behind, not connected to\n"
|
|
"any of your branches:\n"
|
|
"\n"
|
|
"%s\n"
|
|
msgstr[0] ""
|
|
"Varning: du lämnar %d incheckning bakom dig som inte är ansluten till\n"
|
|
"någon av dina grenar:\n"
|
|
"\n"
|
|
"%s\n"
|
|
msgstr[1] ""
|
|
"Varning: du lämnar %d incheckningar bakom dig som inte är ansluta till\n"
|
|
"någon av dina grenar:\n"
|
|
"\n"
|
|
"%s\n"
|
|
|
|
#: 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"
|
|
"to do so with:\n"
|
|
"\n"
|
|
" git branch <new-branch-name> %s\n"
|
|
"\n"
|
|
msgid_plural ""
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
"to do so with:\n"
|
|
"\n"
|
|
" git branch <new-branch-name> %s\n"
|
|
"\n"
|
|
msgstr[0] ""
|
|
"Om du vill behålla den genom att skapa en ny gren är nu en bra tidpunkt\n"
|
|
"att göra så, med:\n"
|
|
"\n"
|
|
" git branch <nytt_grennamn> %s\n"
|
|
"\n"
|
|
msgstr[1] ""
|
|
"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"
|
|
"att göra så, med:\n"
|
|
"\n"
|
|
" git branch <nytt_grennamn> %s\n"
|
|
"\n"
|
|
|
|
#: builtin/checkout.c:1009
|
|
msgid "internal error in revision walk"
|
|
msgstr "internt fel vid genomgång av revisioner (revision walk)"
|
|
|
|
#: builtin/checkout.c:1013
|
|
msgid "Previous HEAD position was"
|
|
msgstr "Tidigare position för HEAD var"
|
|
|
|
#: builtin/checkout.c:1053 builtin/checkout.c:1315
|
|
msgid "You are on a branch yet to be born"
|
|
msgstr "Du är på en gren som ännu inte är född"
|
|
|
|
#: builtin/checkout.c:1128
|
|
#, c-format
|
|
msgid ""
|
|
"'%s' could be both a local file and a tracking branch.\n"
|
|
"Please use -- (and optionally --no-guess) to disambiguate"
|
|
msgstr ""
|
|
"\"%s\" kan vara både en lokal fil och en spårande gren.\n"
|
|
"Använd -- (och möjligen --no-guess) för att göra otvetydig"
|
|
|
|
#: builtin/checkout.c: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 ""
|
|
"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n"
|
|
"göra det genom att ange hela namnet med flaggan --track:\n"
|
|
"\n"
|
|
" git checkout --track origin/<namn>\n"
|
|
"\n"
|
|
"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
|
|
"föredra en fjärr, t.ex fjärren \"origin\" kan du ställa in\n"
|
|
"checkout.defaultRemote=origin i din konfiguration."
|
|
|
|
#: builtin/checkout.c:1145
|
|
#, c-format
|
|
msgid "'%s' matched multiple (%d) remote tracking branches"
|
|
msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
|
|
|
|
#: builtin/checkout.c:1211
|
|
msgid "only one reference expected"
|
|
msgstr "endast en referens förväntades"
|
|
|
|
#: builtin/checkout.c:1228
|
|
#, c-format
|
|
msgid "only one reference expected, %d given."
|
|
msgstr "endast en referens förväntades, %d gavs."
|
|
|
|
#: builtin/checkout.c:1274 builtin/worktree.c:283 builtin/worktree.c:448
|
|
#, c-format
|
|
msgid "invalid reference: %s"
|
|
msgstr "felaktig referens: %s"
|
|
|
|
#: builtin/checkout.c:1287 builtin/checkout.c:1649
|
|
#, c-format
|
|
msgid "reference is not a tree: %s"
|
|
msgstr "referensen är inte ett träd: %s"
|
|
|
|
#: builtin/checkout.c:1334
|
|
#, c-format
|
|
msgid "a branch is expected, got tag '%s'"
|
|
msgstr "förväntade gren, fick taggen \"%s\""
|
|
|
|
#: builtin/checkout.c:1336
|
|
#, c-format
|
|
msgid "a branch is expected, got remote branch '%s'"
|
|
msgstr "förväntade gren, fick fjärrgrenen \"%s\""
|
|
|
|
#: builtin/checkout.c:1337 builtin/checkout.c:1345
|
|
#, c-format
|
|
msgid "a branch is expected, got '%s'"
|
|
msgstr "förväntade gren, fick \"%s\""
|
|
|
|
#: builtin/checkout.c:1340
|
|
#, c-format
|
|
msgid "a branch is expected, got commit '%s'"
|
|
msgstr "förväntade gren, fick incheckningen \"%s\""
|
|
|
|
#: builtin/checkout.c:1356
|
|
msgid ""
|
|
"cannot switch branch while merging\n"
|
|
"Consider \"git merge --quit\" or \"git worktree add\"."
|
|
msgstr ""
|
|
"kan inte växla gren vid sammanslagning\n"
|
|
"Överväg \"git merge --quit\" eller \"git worktree add\"."
|
|
|
|
#: builtin/checkout.c:1360
|
|
msgid ""
|
|
"cannot switch branch in the middle of an am session\n"
|
|
"Consider \"git am --quit\" or \"git worktree add\"."
|
|
msgstr ""
|
|
"kan inte växla gren mitt i en \"am\"-körning\n"
|
|
"Överväg \"git am --quit\" eller \"git worktree add\"."
|
|
|
|
#: builtin/checkout.c:1364
|
|
msgid ""
|
|
"cannot switch branch while rebasing\n"
|
|
"Consider \"git rebase --quit\" or \"git worktree add\"."
|
|
msgstr ""
|
|
"kan inte växla gren vid ombasering\n"
|
|
"Överväg \"git rebase --quit\" eller \"git worktree add\"."
|
|
|
|
#: builtin/checkout.c:1368
|
|
msgid ""
|
|
"cannot switch branch while cherry-picking\n"
|
|
"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
|
|
msgstr ""
|
|
"kan inte växla gren i en \"cherry-pick\"\n"
|
|
"Överväg \"git cherry-pick --quit\" eller \"git worktree add\"."
|
|
|
|
#: builtin/checkout.c:1372
|
|
msgid ""
|
|
"cannot switch branch while reverting\n"
|
|
"Consider \"git revert --quit\" or \"git worktree add\"."
|
|
msgstr ""
|
|
"kan inte växla gren i en \"revert\"\n"
|
|
"Överväg \"git revert --quit\" eller \"git worktree add\"."
|
|
|
|
#: builtin/checkout.c:1376
|
|
msgid "you are switching branch while bisecting"
|
|
msgstr "då växlar grenar medan du gör en \"bisect\""
|
|
|
|
#: builtin/checkout.c:1383
|
|
msgid "paths cannot be used with switching branches"
|
|
msgstr "sökvägar kan inte användas vid byte av gren"
|
|
|
|
#: builtin/checkout.c:1386 builtin/checkout.c:1390 builtin/checkout.c:1394
|
|
#, c-format
|
|
msgid "'%s' cannot be used with switching branches"
|
|
msgstr "\"%s\" kan inte användas vid byte av gren"
|
|
|
|
#: 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\" kan inte användas med \"%s\""
|
|
|
|
#: builtin/checkout.c:1411
|
|
#, c-format
|
|
msgid "'%s' cannot take <start-point>"
|
|
msgstr "\"%s\" kan inte ta <startpunkt>"
|
|
|
|
#: builtin/checkout.c:1419
|
|
#, c-format
|
|
msgid "Cannot switch branch to a non-commit '%s'"
|
|
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
|
|
|
|
#: builtin/checkout.c:1426
|
|
msgid "missing branch or commit argument"
|
|
msgstr "saknar gren- eller incheckingsargument"
|
|
|
|
#: 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 "tvinga förloppsrapportering"
|
|
|
|
#: builtin/checkout.c:1469
|
|
msgid "perform a 3-way merge with the new branch"
|
|
msgstr "utför en 3-vägssammanslagning för den nya grenen"
|
|
|
|
#: builtin/checkout.c:1470 builtin/log.c:1690 parse-options.h:322
|
|
msgid "style"
|
|
msgstr "stil"
|
|
|
|
#: builtin/checkout.c:1471
|
|
msgid "conflict style (merge or diff3)"
|
|
msgstr "konfliktstil (merge eller diff3)"
|
|
|
|
#: builtin/checkout.c:1483 builtin/worktree.c:496
|
|
msgid "detach HEAD at named commit"
|
|
msgstr "koppla från HEAD vid namngiven incheckning"
|
|
|
|
#: builtin/checkout.c:1484
|
|
msgid "set upstream info for new branch"
|
|
msgstr "sätt uppströmsinformation för ny gren"
|
|
|
|
#: builtin/checkout.c:1486
|
|
msgid "force checkout (throw away local modifications)"
|
|
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
|
|
|
|
#: builtin/checkout.c:1488
|
|
msgid "new-branch"
|
|
msgstr "ny-gren"
|
|
|
|
#: builtin/checkout.c:1488
|
|
msgid "new unparented branch"
|
|
msgstr "ny gren utan förälder"
|
|
|
|
#: builtin/checkout.c:1490 builtin/merge.c:289
|
|
msgid "update ignored files (default)"
|
|
msgstr "uppdatera ignorerade filer (standard)"
|
|
|
|
#: builtin/checkout.c:1493
|
|
msgid "do not check if another worktree is holding the given ref"
|
|
msgstr ""
|
|
"kontrollera inte om en annan arbetskatalog håller den angivna referensen"
|
|
|
|
#: builtin/checkout.c:1506
|
|
msgid "checkout our version for unmerged files"
|
|
msgstr "checka ut vår version för ej sammanslagna filer"
|
|
|
|
#: builtin/checkout.c:1509
|
|
msgid "checkout their version for unmerged files"
|
|
msgstr "checka ut deras version för ej sammanslagna filer"
|
|
|
|
#: builtin/checkout.c:1513
|
|
msgid "do not limit pathspecs to sparse entries only"
|
|
msgstr "begränsa inte sökvägar till endast glesa poster"
|
|
|
|
#: builtin/checkout.c:1565
|
|
msgid "-b, -B and --orphan are mutually exclusive"
|
|
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
|
|
|
|
#: builtin/checkout.c:1568
|
|
msgid "-p and --overlay are mutually exclusive"
|
|
msgstr "-p och --overlay är ömsesidigt uteslutande"
|
|
|
|
#: builtin/checkout.c:1605
|
|
msgid "--track needs a branch name"
|
|
msgstr "--track behöver ett namn på en gren"
|
|
|
|
#: builtin/checkout.c:1610
|
|
msgid "missing branch name; try -b"
|
|
msgstr "grennamn saknas; försök med -b"
|
|
|
|
#: builtin/checkout.c:1642
|
|
#, c-format
|
|
msgid "could not resolve %s"
|
|
msgstr "kunde inte upplösa %s"
|
|
|
|
#: builtin/checkout.c:1658
|
|
msgid "invalid path specification"
|
|
msgstr "felaktig sökvägsangivelse"
|
|
|
|
#: builtin/checkout.c:1665
|
|
#, c-format
|
|
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
|
|
msgstr ""
|
|
"\"%s\" är inte en incheckning och grenen \"%s\" kan inte skapas från den"
|
|
|
|
#: builtin/checkout.c:1669
|
|
#, c-format
|
|
msgid "git checkout: --detach does not take a path argument '%s'"
|
|
msgstr "git checkout: --detach tar inte en sökväg som argument \"%s\""
|
|
|
|
#: builtin/checkout.c:1678
|
|
msgid "--pathspec-from-file is incompatible with --detach"
|
|
msgstr "--pathspec-from-file är inkompatibelt med --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 är inkompatibelt med --patch"
|
|
|
|
#: builtin/checkout.c:1692
|
|
msgid ""
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
"checking out of the index."
|
|
msgstr ""
|
|
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
|
|
"du checkar ut från indexet."
|
|
|
|
#: builtin/checkout.c:1697
|
|
msgid "you must specify path(s) to restore"
|
|
msgstr "du måste ange katalog(er) att återställa"
|
|
|
|
#: 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 "gren"
|
|
|
|
#: builtin/checkout.c:1724
|
|
msgid "create and checkout a new branch"
|
|
msgstr "skapa och checka ut en ny gren"
|
|
|
|
#: builtin/checkout.c:1726
|
|
msgid "create/reset and checkout a branch"
|
|
msgstr "skapa/nollställ och checka ut en gren"
|
|
|
|
#: builtin/checkout.c:1727
|
|
msgid "create reflog for new branch"
|
|
msgstr "skapa reflogg för ny gren"
|
|
|
|
#: builtin/checkout.c:1729
|
|
msgid "second guess 'git checkout <no-such-branch>' (default)"
|
|
msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
|
|
|
|
#: builtin/checkout.c:1730
|
|
msgid "use overlay mode (default)"
|
|
msgstr "använd överläggsläge (standard)"
|
|
|
|
#: builtin/checkout.c:1775
|
|
msgid "create and switch to a new branch"
|
|
msgstr "skapa och växla till en ny gren"
|
|
|
|
#: builtin/checkout.c:1777
|
|
msgid "create/reset and switch to a branch"
|
|
msgstr "skapa/nollställ och växla till en gren"
|
|
|
|
#: builtin/checkout.c:1779
|
|
msgid "second guess 'git switch <no-such-branch>'"
|
|
msgstr "förutspå \"git checkout <gren-saknas>\""
|
|
|
|
#: builtin/checkout.c:1781
|
|
msgid "throw away local modifications"
|
|
msgstr "kasta bort lokala ändringar"
|
|
|
|
#: builtin/checkout.c:1813
|
|
msgid "which tree-ish to checkout from"
|
|
msgstr "vilken träd-igt att checka ut från"
|
|
|
|
#: builtin/checkout.c:1815
|
|
msgid "restore the index"
|
|
msgstr "återställ indexet"
|
|
|
|
#: builtin/checkout.c:1817
|
|
msgid "restore the working tree (default)"
|
|
msgstr "återställ arbetskatalogen (förval)"
|
|
|
|
#: builtin/checkout.c:1819
|
|
msgid "ignore unmerged entries"
|
|
msgstr "ignorera ej sammanslagna poster"
|
|
|
|
#: builtin/checkout.c:1820
|
|
msgid "use overlay mode"
|
|
msgstr "använd överläggsläge"
|
|
|
|
#: builtin/clean.c:28
|
|
msgid ""
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
|
|
msgstr ""
|
|
"git clean [-d] [-f] [-i] [-n] [-q] [-e <mönster>] [-x | -X] [--] "
|
|
"<sökvägar>..."
|
|
|
|
#: builtin/clean.c:32
|
|
#, c-format
|
|
msgid "Removing %s\n"
|
|
msgstr "Tar bort %s\n"
|
|
|
|
#: builtin/clean.c:33
|
|
#, c-format
|
|
msgid "Would remove %s\n"
|
|
msgstr "Skulle ta bort %s\n"
|
|
|
|
#: builtin/clean.c:34
|
|
#, c-format
|
|
msgid "Skipping repository %s\n"
|
|
msgstr "Hoppar över arkivet %s\n"
|
|
|
|
#: builtin/clean.c:35
|
|
#, c-format
|
|
msgid "Would skip repository %s\n"
|
|
msgstr "Skulle hoppa över arkivet %s\n"
|
|
|
|
#: builtin/clean.c:36
|
|
#, c-format
|
|
msgid "failed to remove %s"
|
|
msgstr "misslyckades ta bort %s"
|
|
|
|
#: builtin/clean.c:37
|
|
#, c-format
|
|
msgid "could not lstat %s\n"
|
|
msgstr "kunde inte ta status (\"lstat\") på %s\n"
|
|
|
|
#: builtin/clean.c:301 git-add--interactive.perl:595
|
|
#, c-format
|
|
msgid ""
|
|
"Prompt help:\n"
|
|
"1 - select a numbered item\n"
|
|
"foo - select item based on unique prefix\n"
|
|
" - (empty) select nothing\n"
|
|
msgstr ""
|
|
"Kommandohjälp:\n"
|
|
"1 - markera en numrerad post\n"
|
|
"foo - markera post baserad på unikt prefix\n"
|
|
" - (tomt) markera ingenting\n"
|
|
|
|
#: builtin/clean.c:305 git-add--interactive.perl:604
|
|
#, c-format
|
|
msgid ""
|
|
"Prompt help:\n"
|
|
"1 - select a single item\n"
|
|
"3-5 - select a range of items\n"
|
|
"2-3,6-9 - select multiple ranges\n"
|
|
"foo - select item based on unique prefix\n"
|
|
"-... - unselect specified items\n"
|
|
"* - choose all items\n"
|
|
" - (empty) finish selecting\n"
|
|
msgstr ""
|
|
"Kommandohjälp:\n"
|
|
"1 - markera en ensam post\n"
|
|
"3-5 - markera ett intervall med poster\n"
|
|
"2-3,6-9 - markera flera intervall\n"
|
|
"foo - markera post baserad på unikt prefix\n"
|
|
"-... - avmarkera specifika poster\n"
|
|
"* - välj alla poster\n"
|
|
" - (tomt) avsluta markering\n"
|
|
|
|
#: builtin/clean.c:521 git-add--interactive.perl:570
|
|
#: git-add--interactive.perl:575
|
|
#, c-format, perl-format
|
|
msgid "Huh (%s)?\n"
|
|
msgstr "Vadå (%s)?\n"
|
|
|
|
#: builtin/clean.c:663
|
|
#, c-format
|
|
msgid "Input ignore patterns>> "
|
|
msgstr "Ange ignoreringsmönster>>"
|
|
|
|
#: builtin/clean.c:700
|
|
#, c-format
|
|
msgid "WARNING: Cannot find items matched by: %s"
|
|
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
|
|
|
|
#: builtin/clean.c:721
|
|
msgid "Select items to delete"
|
|
msgstr "Välj poster att ta bort"
|
|
|
|
#. TRANSLATORS: Make sure to keep [y/N] as is
|
|
#: builtin/clean.c:762
|
|
#, c-format
|
|
msgid "Remove %s [y/N]? "
|
|
msgstr "Ta bort %s [Y=ja / N=nej]? "
|
|
|
|
#: builtin/clean.c:795
|
|
msgid ""
|
|
"clean - start cleaning\n"
|
|
"filter by pattern - exclude items from deletion\n"
|
|
"select by numbers - select items to be deleted by numbers\n"
|
|
"ask each - confirm each deletion (like \"rm -i\")\n"
|
|
"quit - stop cleaning\n"
|
|
"help - this screen\n"
|
|
"? - help for prompt selection"
|
|
msgstr ""
|
|
"clean - börja städa\n"
|
|
"filter by pattern - uteslut poster från borttagning\n"
|
|
"select by numbers - markera poster som ska tas bort med siffror\n"
|
|
"ask each - bekräfta varje borttagning (som \"rm -i\")\n"
|
|
"quit - sluta städa\n"
|
|
"help - denna skärm\n"
|
|
"? - hjälp för kommandoval"
|
|
|
|
#: builtin/clean.c:831
|
|
msgid "Would remove the following item:"
|
|
msgid_plural "Would remove the following items:"
|
|
msgstr[0] "Skulle ta bort följande post:"
|
|
msgstr[1] "Skulle ta bort följande poster:"
|
|
|
|
#: builtin/clean.c:847
|
|
msgid "No more files to clean, exiting."
|
|
msgstr "Inga fler filer att städa, avslutar."
|
|
|
|
#: builtin/clean.c:909
|
|
msgid "do not print names of files removed"
|
|
msgstr "skriv inte ut namn på borttagna filer"
|
|
|
|
#: builtin/clean.c:911
|
|
msgid "force"
|
|
msgstr "tvinga"
|
|
|
|
#: builtin/clean.c:912
|
|
msgid "interactive cleaning"
|
|
msgstr "städa interaktivt"
|
|
|
|
#: builtin/clean.c:914
|
|
msgid "remove whole directories"
|
|
msgstr "ta bort hela kataloger"
|
|
|
|
#: 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 "mönster"
|
|
|
|
#: builtin/clean.c:916
|
|
msgid "add <pattern> to ignore rules"
|
|
msgstr "lägg till <mönster> till ignoreringsregler"
|
|
|
|
#: builtin/clean.c:917
|
|
msgid "remove ignored files, too"
|
|
msgstr "ta även bort ignorerade filer"
|
|
|
|
#: builtin/clean.c:919
|
|
msgid "remove only ignored files"
|
|
msgstr "ta endast bort ignorerade filer"
|
|
|
|
#: builtin/clean.c:937
|
|
msgid "-x and -X cannot be used together"
|
|
msgstr "-x och -X kan inte användas samtidigt"
|
|
|
|
#: builtin/clean.c:941
|
|
msgid ""
|
|
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
|
|
"clean"
|
|
msgstr ""
|
|
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
|
|
"städa"
|
|
|
|
#: builtin/clean.c:944
|
|
msgid ""
|
|
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
|
|
"refusing to clean"
|
|
msgstr ""
|
|
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
|
|
"angavs; vägrar städa"
|
|
|
|
#: builtin/clone.c:45
|
|
msgid "git clone [<options>] [--] <repo> [<dir>]"
|
|
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
|
|
|
|
#: builtin/clone.c:93
|
|
msgid "don't create a checkout"
|
|
msgstr "skapa inte någon utcheckning"
|
|
|
|
#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
|
|
msgid "create a bare repository"
|
|
msgstr "skapa ett naket (\"bare\") arkiv"
|
|
|
|
#: builtin/clone.c:98
|
|
msgid "create a mirror repository (implies bare)"
|
|
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
|
|
|
|
#: builtin/clone.c:100
|
|
msgid "to clone from a local repository"
|
|
msgstr "för att klona från ett lokalt arkiv"
|
|
|
|
#: builtin/clone.c:102
|
|
msgid "don't use local hardlinks, always copy"
|
|
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
|
|
|
|
#: builtin/clone.c:104
|
|
msgid "setup as shared repository"
|
|
msgstr "skapa som ett delat arkiv"
|
|
|
|
#: builtin/clone.c:107
|
|
msgid "pathspec"
|
|
msgstr "sökvägsangivelse"
|
|
|
|
#: builtin/clone.c:107
|
|
msgid "initialize submodules in the clone"
|
|
msgstr "initiera undermoduler i klonen"
|
|
|
|
#: builtin/clone.c:110
|
|
msgid "number of submodules cloned in parallel"
|
|
msgstr "antal undermoduler som klonas parallellt"
|
|
|
|
#: builtin/clone.c:111 builtin/init-db.c:486
|
|
msgid "template-directory"
|
|
msgstr "mallkatalog"
|
|
|
|
#: builtin/clone.c:112 builtin/init-db.c:487
|
|
msgid "directory from which templates will be used"
|
|
msgstr "katalog att använda mallar från"
|
|
|
|
#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
|
|
#: builtin/submodule--helper.c:1912
|
|
msgid "reference repository"
|
|
msgstr "referensarkiv"
|
|
|
|
#: builtin/clone.c:118 builtin/submodule--helper.c:1409
|
|
#: builtin/submodule--helper.c:1914
|
|
msgid "use --reference only while cloning"
|
|
msgstr "använd --reference endast under kloningen"
|
|
|
|
#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
|
|
#: builtin/pack-objects.c:3441 builtin/repack.c:327
|
|
msgid "name"
|
|
msgstr "namn"
|
|
|
|
#: builtin/clone.c:120
|
|
msgid "use <name> instead of 'origin' to track upstream"
|
|
msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
|
|
|
|
#: builtin/clone.c:122
|
|
msgid "checkout <branch> instead of the remote's HEAD"
|
|
msgstr "checka ut <gren> istället för fjärrens HEAD"
|
|
|
|
#: builtin/clone.c:124
|
|
msgid "path to git-upload-pack on the remote"
|
|
msgstr "sökväg till git-upload-pack på fjärren"
|
|
|
|
#: builtin/clone.c:125 builtin/fetch.c:168 builtin/grep.c:828
|
|
#: builtin/pull.c:207
|
|
msgid "depth"
|
|
msgstr "djup"
|
|
|
|
#: builtin/clone.c:126
|
|
msgid "create a shallow clone of that depth"
|
|
msgstr "skapa en grund klon på detta djup"
|
|
|
|
#: builtin/clone.c:127 builtin/fetch.c:170 builtin/pack-objects.c:3430
|
|
msgid "time"
|
|
msgstr "tid"
|
|
|
|
#: builtin/clone.c:128
|
|
msgid "create a shallow clone since a specific time"
|
|
msgstr "skapa en grund klon från en angiven tidpunkt"
|
|
|
|
#: builtin/clone.c:129 builtin/fetch.c:172 builtin/fetch.c:195
|
|
#: builtin/rebase.c:1480
|
|
msgid "revision"
|
|
msgstr "revision"
|
|
|
|
#: builtin/clone.c:130 builtin/fetch.c:173
|
|
msgid "deepen history of shallow clone, excluding rev"
|
|
msgstr "fördjupa historik för grund klon, exkludera revisionen"
|
|
|
|
#: builtin/clone.c:132 builtin/submodule--helper.c:1419
|
|
#: builtin/submodule--helper.c:1928
|
|
msgid "clone only one branch, HEAD or --branch"
|
|
msgstr "klona endast en gren, HEAD eller --branch"
|
|
|
|
#: builtin/clone.c:134
|
|
msgid "don't clone any tags, and make later fetches not to follow them"
|
|
msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
|
|
|
|
#: builtin/clone.c:136
|
|
msgid "any cloned submodules will be shallow"
|
|
msgstr "klonade undermoduler kommer vara grunda"
|
|
|
|
#: builtin/clone.c:137 builtin/init-db.c:495
|
|
msgid "gitdir"
|
|
msgstr "gitkat"
|
|
|
|
#: builtin/clone.c:138 builtin/init-db.c:496
|
|
msgid "separate git dir from working tree"
|
|
msgstr "separera gitkatalogen från arbetskatalogen"
|
|
|
|
#: builtin/clone.c:139
|
|
msgid "key=value"
|
|
msgstr "nyckel=värde"
|
|
|
|
#: builtin/clone.c:140
|
|
msgid "set config inside the new repository"
|
|
msgstr "ställ in konfiguration i det nya arkivet"
|
|
|
|
#: 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 "serverspecifik"
|
|
|
|
#: 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 ""
|
|
"inget att checka in\n"
|
|
"flagga att sända"
|
|
|
|
#: builtin/clone.c:143 builtin/fetch.c:191 builtin/pull.c:220
|
|
#: builtin/push.c:574
|
|
msgid "use IPv4 addresses only"
|
|
msgstr "använd endast IPv4-adresser"
|
|
|
|
#: builtin/clone.c:145 builtin/fetch.c:193 builtin/pull.c:223
|
|
#: builtin/push.c:576
|
|
msgid "use IPv6 addresses only"
|
|
msgstr "använd endast IPv6-adresser"
|
|
|
|
#: builtin/clone.c:149
|
|
msgid "any cloned submodules will use their remote-tracking branch"
|
|
msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
|
|
|
|
#: builtin/clone.c:151
|
|
msgid "initialize sparse-checkout file to include only files at root"
|
|
msgstr "initiera sparse-checkout-filen till att bara inkludera filer i roten"
|
|
|
|
#: builtin/clone.c:287
|
|
msgid ""
|
|
"No directory name could be guessed.\n"
|
|
"Please specify a directory on the command line"
|
|
msgstr ""
|
|
"Kunde inte gissa katalognamn.\n"
|
|
"Ange en katalog på kommandoraden"
|
|
|
|
#: builtin/clone.c:340
|
|
#, c-format
|
|
msgid "info: Could not add alternate for '%s': %s\n"
|
|
msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
|
|
|
|
#: builtin/clone.c:413
|
|
#, c-format
|
|
msgid "%s exists and is not a directory"
|
|
msgstr "%s finns och är ingen katalog"
|
|
|
|
#: builtin/clone.c:430
|
|
#, c-format
|
|
msgid "failed to start iterator over '%s'"
|
|
msgstr "misslyckades starta iterator över \"%s\""
|
|
|
|
#: builtin/clone.c:460
|
|
#, c-format
|
|
msgid "failed to create link '%s'"
|
|
msgstr "misslyckades skapa länken \"%s\""
|
|
|
|
#: builtin/clone.c:464
|
|
#, c-format
|
|
msgid "failed to copy file to '%s'"
|
|
msgstr "misslyckades kopiera filen till \"%s\""
|
|
|
|
#: builtin/clone.c:469
|
|
#, c-format
|
|
msgid "failed to iterate over '%s'"
|
|
msgstr "misslyckades iterera över \"%s\""
|
|
|
|
#: builtin/clone.c:494
|
|
#, c-format
|
|
msgid "done.\n"
|
|
msgstr "klart.\n"
|
|
|
|
#: builtin/clone.c:508
|
|
msgid ""
|
|
"Clone succeeded, but checkout failed.\n"
|
|
"You can inspect what was checked out with 'git status'\n"
|
|
"and retry with 'git restore --source=HEAD :/'\n"
|
|
msgstr ""
|
|
"Klonen lyckades, men utcheckningen misslyckades.\n"
|
|
"Du kan inspektera det som checkades ut med \"git status\"\n"
|
|
"och försöka med \"git restore -source=HEAD :/\"\n"
|
|
|
|
#: builtin/clone.c:585
|
|
#, c-format
|
|
msgid "Could not find remote branch %s to clone."
|
|
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
|
|
|
|
#: builtin/clone.c:705
|
|
#, c-format
|
|
msgid "unable to update %s"
|
|
msgstr "kan inte uppdatera %s"
|
|
|
|
#: builtin/clone.c:753
|
|
msgid "failed to initialize sparse-checkout"
|
|
msgstr "misslyckades initiera sparse-checkout"
|
|
|
|
#: builtin/clone.c:776
|
|
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
|
|
msgstr ""
|
|
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
|
|
|
|
#: builtin/clone.c:807
|
|
msgid "unable to checkout working tree"
|
|
msgstr "kunde inte checka ut arbetskatalogen"
|
|
|
|
#: builtin/clone.c:862
|
|
msgid "unable to write parameters to config file"
|
|
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
|
|
|
|
#: builtin/clone.c:925
|
|
msgid "cannot repack to clean up"
|
|
msgstr "kan inte packa om för att städa upp"
|
|
|
|
#: builtin/clone.c:927
|
|
msgid "cannot unlink temporary alternates file"
|
|
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
|
|
|
|
#: builtin/clone.c:965 builtin/receive-pack.c:1950
|
|
msgid "Too many arguments."
|
|
msgstr "För många argument."
|
|
|
|
#: builtin/clone.c:969
|
|
msgid "You must specify a repository to clone."
|
|
msgstr "Du måste ange ett arkiv att klona."
|
|
|
|
#: builtin/clone.c:982
|
|
#, c-format
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
msgstr "flaggorna --bare och --origin %s är inkompatibla."
|
|
|
|
#: builtin/clone.c:985
|
|
msgid "--bare and --separate-git-dir are incompatible."
|
|
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
|
|
|
|
#: builtin/clone.c:998
|
|
#, c-format
|
|
msgid "repository '%s' does not exist"
|
|
msgstr "arkivet \"%s\" finns inte"
|
|
|
|
#: builtin/clone.c:1004 builtin/fetch.c:1796
|
|
#, c-format
|
|
msgid "depth %s is not a positive number"
|
|
msgstr "djupet %s är inte ett positivt tal"
|
|
|
|
#: builtin/clone.c:1014
|
|
#, c-format
|
|
msgid "destination path '%s' already exists and is not an empty directory."
|
|
msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog."
|
|
|
|
#: builtin/clone.c:1024
|
|
#, c-format
|
|
msgid "working tree '%s' already exists."
|
|
msgstr "arbetsträdet \"%s\" finns redan."
|
|
|
|
#: 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 "kunde inte skapa inledande kataloger för \"%s\""
|
|
|
|
#: builtin/clone.c:1044
|
|
#, c-format
|
|
msgid "could not create work tree dir '%s'"
|
|
msgstr "kunde inte skapa arbetskatalogen \"%s\""
|
|
|
|
#: builtin/clone.c:1064
|
|
#, c-format
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
|
|
|
|
#: builtin/clone.c:1066
|
|
#, c-format
|
|
msgid "Cloning into '%s'...\n"
|
|
msgstr "Klonar till \"%s\"...\n"
|
|
|
|
#: builtin/clone.c:1090
|
|
msgid ""
|
|
"clone --recursive is not compatible with both --reference and --reference-if-"
|
|
"able"
|
|
msgstr ""
|
|
"clone --recursive är inte kompatibel med --reference och --reference-if-able"
|
|
|
|
#: builtin/clone.c:1154
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
|
|
|
|
#: builtin/clone.c:1156
|
|
msgid "--shallow-since is ignored in local clones; use file:// instead."
|
|
msgstr "--shallow-since ignoreras i lokala kloningar; använd file:// istället."
|
|
|
|
#: builtin/clone.c:1158
|
|
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
|
|
msgstr ""
|
|
"--shallow-exclude ignoreras i lokala kloningar; använd file:// istället."
|
|
|
|
#: builtin/clone.c:1160
|
|
msgid "--filter is ignored in local clones; use file:// instead."
|
|
msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
|
|
|
|
#: builtin/clone.c:1163
|
|
msgid "source repository is shallow, ignoring --local"
|
|
msgstr "källarkivet är grunt, ignorerar --local"
|
|
|
|
#: builtin/clone.c:1168
|
|
msgid "--local is ignored"
|
|
msgstr "--local ignoreras"
|
|
|
|
#: builtin/clone.c:1243 builtin/clone.c:1251
|
|
#, c-format
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
|
|
|
|
#: builtin/clone.c:1254
|
|
msgid "You appear to have cloned an empty repository."
|
|
msgstr "Du verkar ha klonat ett tomt arkiv."
|
|
|
|
#: builtin/column.c:10
|
|
msgid "git column [<options>]"
|
|
msgstr "git column [<flaggor>]"
|
|
|
|
#: builtin/column.c:27
|
|
msgid "lookup config vars"
|
|
msgstr "slå upp konfigurationsvariabler"
|
|
|
|
#: builtin/column.c:28 builtin/column.c:29
|
|
msgid "layout to use"
|
|
msgstr "utseende att använda"
|
|
|
|
#: builtin/column.c:30
|
|
msgid "Maximum width"
|
|
msgstr "Maximal bredd"
|
|
|
|
#: builtin/column.c:31
|
|
msgid "Padding space on left border"
|
|
msgstr "Spaltfyllnad i vänsterkanten"
|
|
|
|
#: builtin/column.c:32
|
|
msgid "Padding space on right border"
|
|
msgstr "Spaltfyllnad i högerkanten"
|
|
|
|
#: builtin/column.c:33
|
|
msgid "Padding space between columns"
|
|
msgstr "Spaltfyllnad mellan spalter"
|
|
|
|
#: builtin/column.c:51
|
|
msgid "--command must be the first argument"
|
|
msgstr "--command måste vara första argument"
|
|
|
|
#: builtin/commit-tree.c:18
|
|
msgid ""
|
|
"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
|
|
"<file>)...] <tree>"
|
|
msgstr ""
|
|
"git commit-tree [(-p <föräldrer>)...] [-S[<nyckelid>]] [(-m "
|
|
"<meddelande>)...] [(-F <fil>)...] <träd>"
|
|
|
|
#: builtin/commit-tree.c:31
|
|
#, c-format
|
|
msgid "duplicate parent %s ignored"
|
|
msgstr "duplicerad förälder %s ignorerades"
|
|
|
|
#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:526
|
|
#, c-format
|
|
msgid "not a valid object name %s"
|
|
msgstr "objektnamnet är inte giltigt: %s"
|
|
|
|
#: builtin/commit-tree.c:93
|
|
#, c-format
|
|
msgid "git commit-tree: failed to open '%s'"
|
|
msgstr "git commit-tree: misslyckades öppna \"%s\""
|
|
|
|
#: builtin/commit-tree.c:96
|
|
#, c-format
|
|
msgid "git commit-tree: failed to read '%s'"
|
|
msgstr "git commit-tree: misslyckades läsa \"%s\""
|
|
|
|
#: builtin/commit-tree.c:98
|
|
#, c-format
|
|
msgid "git commit-tree: failed to close '%s'"
|
|
msgstr "git commit-tree: misslyckades stänga \"%s\""
|
|
|
|
#: builtin/commit-tree.c:111
|
|
msgid "parent"
|
|
msgstr "förälder"
|
|
|
|
#: builtin/commit-tree.c:112
|
|
msgid "id of a parent commit object"
|
|
msgstr "id på ett förälderincheckningsobjekt"
|
|
|
|
#: 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 "meddelande"
|
|
|
|
#: builtin/commit-tree.c:115 builtin/commit.c:1501
|
|
msgid "commit message"
|
|
msgstr "incheckningsmeddelande"
|
|
|
|
#: builtin/commit-tree.c:118
|
|
msgid "read commit log message from file"
|
|
msgstr "läs incheckningsloggmeddelande från fil"
|
|
|
|
#: 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 "GPG-signera incheckning"
|
|
|
|
#: builtin/commit-tree.c:133
|
|
msgid "must give exactly one tree"
|
|
msgstr "måste ange exakt ett träd"
|
|
|
|
#: builtin/commit-tree.c:140
|
|
msgid "git commit-tree: failed to read"
|
|
msgstr "git commit-tree: misslyckades läsa"
|
|
|
|
#: builtin/commit.c:41
|
|
msgid "git commit [<options>] [--] <pathspec>..."
|
|
msgstr "git commit [<flaggor>] [--] <sökväg>..."
|
|
|
|
#: builtin/commit.c:46
|
|
msgid "git status [<options>] [--] <pathspec>..."
|
|
msgstr "git status [<flaggor>] [--] <sökväg>..."
|
|
|
|
#: builtin/commit.c:51
|
|
msgid ""
|
|
"You asked to amend the most recent commit, but doing so would make\n"
|
|
"it empty. You can repeat your command with --allow-empty, or you can\n"
|
|
"remove the commit entirely with \"git reset HEAD^\".\n"
|
|
msgstr ""
|
|
"Du bad om att utöka den senaste incheckningen, men om du gör det\n"
|
|
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
|
|
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
|
|
|
|
#: builtin/commit.c:56
|
|
msgid ""
|
|
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
|
|
"If you wish to commit it anyway, use:\n"
|
|
"\n"
|
|
" git commit --allow-empty\n"
|
|
"\n"
|
|
msgstr ""
|
|
"Den tidigare \"cherry-pick\":en är nu tom, kanske på grund av en löst\n"
|
|
"konflikt. Om du vill checka in den ändå använder du:\n"
|
|
"\n"
|
|
" git commit --allow-empty\n"
|
|
"\n"
|
|
|
|
#: builtin/commit.c:63
|
|
msgid "Otherwise, please use 'git cherry-pick --skip'\n"
|
|
msgstr "Använd annars \"git cherry-pick --skip\"\n"
|
|
|
|
#: builtin/commit.c:66
|
|
msgid ""
|
|
"and then use:\n"
|
|
"\n"
|
|
" git cherry-pick --continue\n"
|
|
"\n"
|
|
"to resume cherry-picking the remaining commits.\n"
|
|
"If you wish to skip this commit, use:\n"
|
|
"\n"
|
|
" git cherry-pick --skip\n"
|
|
"\n"
|
|
msgstr ""
|
|
"och sedan:\n"
|
|
"\n"
|
|
" git cherry-pick --continue\n"
|
|
"\n"
|
|
"för att fortsätta \"cherry-pick\" med resterande incheckningar.\n"
|
|
"Om du vill hoppa över den här incheckningen, använd:\n"
|
|
"\n"
|
|
" git cherry-pick --skip\n"
|
|
"\n"
|
|
|
|
#: builtin/commit.c:315
|
|
msgid "failed to unpack HEAD tree object"
|
|
msgstr "misslyckades packa upp HEAD:s trädobjekt"
|
|
|
|
#: builtin/commit.c:351
|
|
msgid "--pathspec-from-file with -a does not make sense"
|
|
msgstr "--pathspec-from-file med -a ger ingen mening"
|
|
|
|
#: builtin/commit.c:364
|
|
msgid "No paths with --include/--only does not make sense."
|
|
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
|
|
|
|
#: builtin/commit.c:376
|
|
msgid "unable to create temporary index"
|
|
msgstr "kunde inte skapa temporär indexfil"
|
|
|
|
#: builtin/commit.c:385
|
|
msgid "interactive add failed"
|
|
msgstr "interaktiv tilläggning misslyckades"
|
|
|
|
#: builtin/commit.c:400
|
|
msgid "unable to update temporary index"
|
|
msgstr "kan inte uppdatera temporärt index"
|
|
|
|
#: builtin/commit.c:402
|
|
msgid "Failed to update main cache tree"
|
|
msgstr "Misslyckades uppdatera huvud-cacheträdet"
|
|
|
|
#: builtin/commit.c:427 builtin/commit.c:450 builtin/commit.c:496
|
|
msgid "unable to write new_index file"
|
|
msgstr "kunde inte skriva filen new_index"
|
|
|
|
#: builtin/commit.c:479
|
|
msgid "cannot do a partial commit during a merge."
|
|
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
|
|
|
|
#: builtin/commit.c:481
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
|
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
|
|
|
|
#: builtin/commit.c:489
|
|
msgid "cannot read the index"
|
|
msgstr "kan inte läsa indexet"
|
|
|
|
#: builtin/commit.c:508
|
|
msgid "unable to write temporary index file"
|
|
msgstr "kunde inte skriva temporär indexfil"
|
|
|
|
#: builtin/commit.c:606
|
|
#, c-format
|
|
msgid "commit '%s' lacks author header"
|
|
msgstr "incheckningen \"%s\" saknar författarhuvud"
|
|
|
|
#: builtin/commit.c:608
|
|
#, c-format
|
|
msgid "commit '%s' has malformed author line"
|
|
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
|
|
|
|
#: builtin/commit.c:627
|
|
msgid "malformed --author parameter"
|
|
msgstr "felformad \"--author\"-flagga"
|
|
|
|
#: builtin/commit.c:680
|
|
msgid ""
|
|
"unable to select a comment character that is not used\n"
|
|
"in the current commit message"
|
|
msgstr ""
|
|
"kunde inte välja ett kommentarstecken som inte använts\n"
|
|
"i det befintliga incheckningsmeddelandet"
|
|
|
|
#: builtin/commit.c:718 builtin/commit.c:751 builtin/commit.c:1097
|
|
#, c-format
|
|
msgid "could not lookup commit %s"
|
|
msgstr "kunde inte slå upp incheckningen %s"
|
|
|
|
#: builtin/commit.c:730 builtin/shortlog.c:319
|
|
#, c-format
|
|
msgid "(reading log message from standard input)\n"
|
|
msgstr "(läser loggmeddelande från standard in)\n"
|
|
|
|
#: builtin/commit.c:732
|
|
msgid "could not read log from standard input"
|
|
msgstr "kunde inte läsa logg från standard in"
|
|
|
|
#: builtin/commit.c:736
|
|
#, c-format
|
|
msgid "could not read log file '%s'"
|
|
msgstr "kunde inte läsa loggfilen \"%s\""
|
|
|
|
#: builtin/commit.c:767 builtin/commit.c:783
|
|
msgid "could not read SQUASH_MSG"
|
|
msgstr "kunde inte läsa SQUASH_MSG"
|
|
|
|
#: builtin/commit.c:774
|
|
msgid "could not read MERGE_MSG"
|
|
msgstr "kunde inte läsa MERGE_MSG"
|
|
|
|
#: builtin/commit.c:834
|
|
msgid "could not write commit template"
|
|
msgstr "kunde inte skriva incheckningsmall"
|
|
|
|
#: builtin/commit.c:853
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"It looks like you may be committing a merge.\n"
|
|
"If this is not correct, please remove the file\n"
|
|
"\t%s\n"
|
|
"and try again.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Det verkar som du checkar in en sammanslagning.\n"
|
|
"Om det inte stämmer tar du bort filen\n"
|
|
"\t%s\n"
|
|
"och försöker igen.\n"
|
|
|
|
#: builtin/commit.c:858
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"It looks like you may be committing a cherry-pick.\n"
|
|
"If this is not correct, please remove the file\n"
|
|
"\t%s\n"
|
|
"and try again.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Det verkar som du checkar in en cherry-pick.\n"
|
|
"Om det inte stämmer tar du bort filen\n"
|
|
"\t%s\n"
|
|
"och försöker igen.\n"
|
|
|
|
#: builtin/commit.c:871
|
|
#, c-format
|
|
msgid ""
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
|
"with '%c' will be ignored, and an empty message aborts the commit.\n"
|
|
msgstr ""
|
|
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
|
|
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
|
|
"incheckningen.\n"
|
|
|
|
#: builtin/commit.c:879
|
|
#, c-format
|
|
msgid ""
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
|
"with '%c' will be kept; you may remove them yourself if you want to.\n"
|
|
"An empty message aborts the commit.\n"
|
|
msgstr ""
|
|
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
|
|
"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
|
|
"Ett tomt meddelande avbryter incheckningen.\n"
|
|
|
|
#: builtin/commit.c:896
|
|
#, c-format
|
|
msgid "%sAuthor: %.*s <%.*s>"
|
|
msgstr "%sFörfattare: %.*s <%.*s>"
|
|
|
|
#: builtin/commit.c:904
|
|
#, c-format
|
|
msgid "%sDate: %s"
|
|
msgstr "%sDatum: %s"
|
|
|
|
#: builtin/commit.c:911
|
|
#, c-format
|
|
msgid "%sCommitter: %.*s <%.*s>"
|
|
msgstr "%sIncheckare: %.*s <%.*s>"
|
|
|
|
#: builtin/commit.c:929
|
|
msgid "Cannot read index"
|
|
msgstr "Kan inte läsa indexet"
|
|
|
|
#: builtin/commit.c:997
|
|
msgid "Error building trees"
|
|
msgstr "Fel vid byggande av träd"
|
|
|
|
#: builtin/commit.c:1011 builtin/tag.c:275
|
|
#, c-format
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
|
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
|
|
|
|
#: builtin/commit.c:1055
|
|
#, c-format
|
|
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
|
|
msgstr ""
|
|
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
|
|
|
|
#: builtin/commit.c:1069
|
|
#, c-format
|
|
msgid "Invalid ignored mode '%s'"
|
|
msgstr "Ogiltigt ignorerat läge \"%s\""
|
|
|
|
#: builtin/commit.c:1087 builtin/commit.c:1327
|
|
#, c-format
|
|
msgid "Invalid untracked files mode '%s'"
|
|
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
|
|
|
|
#: builtin/commit.c:1127
|
|
msgid "--long and -z are incompatible"
|
|
msgstr "--long och -z är inkompatibla"
|
|
|
|
#: builtin/commit.c:1171
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
msgstr "Kan inte använda både --reset-author och --author"
|
|
|
|
#: builtin/commit.c:1180
|
|
msgid "You have nothing to amend."
|
|
msgstr "Du har inget att utöka."
|
|
|
|
#: builtin/commit.c:1183
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
|
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
|
|
|
|
#: builtin/commit.c:1185
|
|
msgid "You are in the middle of a cherry-pick -- cannot amend."
|
|
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
|
|
|
|
#: builtin/commit.c:1188
|
|
msgid "Options --squash and --fixup cannot be used together"
|
|
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
|
|
|
|
#: builtin/commit.c:1198
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
|
|
|
|
#: builtin/commit.c:1200
|
|
msgid "Option -m cannot be combined with -c/-C/-F."
|
|
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F."
|
|
|
|
#: builtin/commit.c:1208
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
|
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
|
|
|
|
#: builtin/commit.c:1225
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
msgstr ""
|
|
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
|
|
|
|
#: builtin/commit.c:1231
|
|
#, c-format
|
|
msgid "paths '%s ...' with -a does not make sense"
|
|
msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
|
|
|
|
#: builtin/commit.c:1362 builtin/commit.c:1524
|
|
msgid "show status concisely"
|
|
msgstr "visa koncis status"
|
|
|
|
#: builtin/commit.c:1364 builtin/commit.c:1526
|
|
msgid "show branch information"
|
|
msgstr "visa information om gren"
|
|
|
|
#: builtin/commit.c:1366
|
|
msgid "show stash information"
|
|
msgstr "visa information om stash"
|
|
|
|
#: builtin/commit.c:1368 builtin/commit.c:1528
|
|
msgid "compute full ahead/behind values"
|
|
msgstr "beräkna fullständiga före-/efter-värden"
|
|
|
|
#: builtin/commit.c:1370
|
|
msgid "version"
|
|
msgstr "version"
|
|
|
|
#: builtin/commit.c:1370 builtin/commit.c:1530 builtin/push.c:549
|
|
#: builtin/worktree.c:643
|
|
msgid "machine-readable output"
|
|
msgstr "maskinläsbar utdata"
|
|
|
|
#: builtin/commit.c:1373 builtin/commit.c:1532
|
|
msgid "show status in long format (default)"
|
|
msgstr "visa status i långt format (standard)"
|
|
|
|
#: builtin/commit.c:1376 builtin/commit.c:1535
|
|
msgid "terminate entries with NUL"
|
|
msgstr "terminera poster med NUL"
|
|
|
|
#: 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 "läge"
|
|
|
|
#: builtin/commit.c:1379 builtin/commit.c:1538
|
|
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
|
|
msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
|
|
|
|
#: builtin/commit.c:1383
|
|
msgid ""
|
|
"show ignored files, optional modes: traditional, matching, no. (Default: "
|
|
"traditional)"
|
|
msgstr ""
|
|
"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
|
|
"traditional)"
|
|
|
|
#: builtin/commit.c:1385 parse-options.h:192
|
|
msgid "when"
|
|
msgstr "när"
|
|
|
|
#: builtin/commit.c:1386
|
|
msgid ""
|
|
"ignore changes to submodules, optional when: all, dirty, untracked. "
|
|
"(Default: all)"
|
|
msgstr ""
|
|
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
|
|
"(Default: all)"
|
|
|
|
#: builtin/commit.c:1388
|
|
msgid "list untracked files in columns"
|
|
msgstr "visa ospårade filer i spalter"
|
|
|
|
#: builtin/commit.c:1389
|
|
msgid "do not detect renames"
|
|
msgstr "detektera inte namnändringar"
|
|
|
|
#: builtin/commit.c:1391
|
|
msgid "detect renames, optionally set similarity index"
|
|
msgstr "detektera namnändringar, möjligen sätt likhetsindex"
|
|
|
|
#: builtin/commit.c:1411
|
|
msgid "Unsupported combination of ignored and untracked-files arguments"
|
|
msgstr "Kombinationen av argument för ignorerade och ospårade filer stöds ej"
|
|
|
|
#: builtin/commit.c:1494
|
|
msgid "suppress summary after successful commit"
|
|
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
|
|
|
|
#: builtin/commit.c:1495
|
|
msgid "show diff in commit message template"
|
|
msgstr "visa diff i mallen för incheckningsmeddelandet"
|
|
|
|
#: builtin/commit.c:1497
|
|
msgid "Commit message options"
|
|
msgstr "Alternativ för incheckningsmeddelande"
|
|
|
|
#: builtin/commit.c:1498 builtin/merge.c:275 builtin/tag.c:414
|
|
msgid "read message from file"
|
|
msgstr "läs meddelande från fil"
|
|
|
|
#: builtin/commit.c:1499
|
|
msgid "author"
|
|
msgstr "författare"
|
|
|
|
#: builtin/commit.c:1499
|
|
msgid "override author for commit"
|
|
msgstr "överstyr författare för incheckningen"
|
|
|
|
#: builtin/commit.c:1500 builtin/gc.c:538
|
|
msgid "date"
|
|
msgstr "datum"
|
|
|
|
#: builtin/commit.c:1500
|
|
msgid "override date for commit"
|
|
msgstr "överstyr datum för incheckningen"
|
|
|
|
#: 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 "incheckning"
|
|
|
|
#: builtin/commit.c:1502
|
|
msgid "reuse and edit message from specified commit"
|
|
msgstr "återanvänd och redigera meddelande från angiven incheckning"
|
|
|
|
#: builtin/commit.c:1503
|
|
msgid "reuse message from specified commit"
|
|
msgstr "återanvänd meddelande från angiven incheckning"
|
|
|
|
#: builtin/commit.c:1504
|
|
msgid "use autosquash formatted message to fixup specified commit"
|
|
msgstr ""
|
|
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
|
|
|
|
#: builtin/commit.c:1505
|
|
msgid "use autosquash formatted message to squash specified commit"
|
|
msgstr ""
|
|
"använd autosquash-formaterat meddelande för att slå ihop med angiven "
|
|
"incheckning"
|
|
|
|
#: builtin/commit.c:1506
|
|
msgid "the commit is authored by me now (used with -C/-c/--amend)"
|
|
msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)"
|
|
|
|
#: builtin/commit.c:1507 builtin/log.c:1634 builtin/merge.c:290
|
|
#: builtin/pull.c:144 builtin/revert.c:110
|
|
msgid "add Signed-off-by:"
|
|
msgstr "lägg till Signed-off-by:"
|
|
|
|
#: builtin/commit.c:1508
|
|
msgid "use specified template file"
|
|
msgstr "använd angiven mallfil"
|
|
|
|
#: builtin/commit.c:1509
|
|
msgid "force edit of commit"
|
|
msgstr "tvinga redigering av incheckning"
|
|
|
|
#: builtin/commit.c:1511
|
|
msgid "include status in commit message template"
|
|
msgstr "inkludera status i mallen för incheckningsmeddelandet"
|
|
|
|
#: builtin/commit.c:1516
|
|
msgid "Commit contents options"
|
|
msgstr "Alternativ för incheckningens innehåll"
|
|
|
|
#: builtin/commit.c:1517
|
|
msgid "commit all changed files"
|
|
msgstr "checka in alla ändrade filer"
|
|
|
|
#: builtin/commit.c:1518
|
|
msgid "add specified files to index for commit"
|
|
msgstr "lägg till angivna filer till indexet för incheckning"
|
|
|
|
#: builtin/commit.c:1519
|
|
msgid "interactively add files"
|
|
msgstr "lägg till filer interaktivt"
|
|
|
|
#: builtin/commit.c:1520
|
|
msgid "interactively add changes"
|
|
msgstr "lägg till ändringar interaktivt"
|
|
|
|
#: builtin/commit.c:1521
|
|
msgid "commit only specified files"
|
|
msgstr "checka endast in angivna filer"
|
|
|
|
#: builtin/commit.c:1522
|
|
msgid "bypass pre-commit and commit-msg hooks"
|
|
msgstr "förbigå pre-commit- och commit-msg-krokar"
|
|
|
|
#: builtin/commit.c:1523
|
|
msgid "show what would be committed"
|
|
msgstr "visa vad som skulle checkas in"
|
|
|
|
#: builtin/commit.c:1536
|
|
msgid "amend previous commit"
|
|
msgstr "lägg till föregående incheckning"
|
|
|
|
#: builtin/commit.c:1537
|
|
msgid "bypass post-rewrite hook"
|
|
msgstr "förbigå post-rewrite-krok"
|
|
|
|
#: builtin/commit.c:1544
|
|
msgid "ok to record an empty change"
|
|
msgstr "ok att registrera en tom ändring"
|
|
|
|
#: builtin/commit.c:1546
|
|
msgid "ok to record a change with an empty message"
|
|
msgstr "ok att registrera en ändring med tomt meddelande"
|
|
|
|
#: builtin/commit.c:1619
|
|
#, c-format
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
|
msgstr "Trasig MERGE_HEAD-fil (%s)"
|
|
|
|
#: builtin/commit.c:1626
|
|
msgid "could not read MERGE_MODE"
|
|
msgstr "kunde inte läsa MERGE_MODE"
|
|
|
|
#: builtin/commit.c:1645
|
|
#, c-format
|
|
msgid "could not read commit message: %s"
|
|
msgstr "kunde inte läsa incheckningsmeddelande: %s"
|
|
|
|
#: builtin/commit.c:1652
|
|
#, c-format
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
|
|
|
|
#: builtin/commit.c:1657
|
|
#, c-format
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
|
|
|
|
#: 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"
|
|
"not exceeded, and then \"git restore --staged :/\" to recover."
|
|
msgstr ""
|
|
"arkivet har uppdaterats, men kunde inte skriva filen\n"
|
|
"new_index. Kontrollera att disken inte är full och\n"
|
|
"att kvoten inte har överskridits, och kör sedan\n"
|
|
"\"git restore --staged :/\" för att återställa."
|
|
|
|
#: 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 <objkat>] [--shallow] [--[no-]progress]"
|
|
|
|
#: 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] [--[no-]progress] <split options>"
|
|
msgstr ""
|
|
"git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
|
|
"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>"
|
|
|
|
#: builtin/commit-graph.c:52
|
|
#, c-format
|
|
msgid "could not find object directory matching %s"
|
|
msgstr "kunde inte hitta objektkatalog för %s"
|
|
|
|
#: 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 "kat"
|
|
|
|
#: builtin/commit-graph.c:69 builtin/commit-graph.c:126
|
|
#: builtin/commit-graph.c:211
|
|
msgid "The object directory to store the graph"
|
|
msgstr "Objektkatalogen där grafen ska lagras"
|
|
|
|
#: builtin/commit-graph.c:71
|
|
msgid "if the commit-graph is split, only verify the tip file"
|
|
msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
|
|
|
|
#: builtin/commit-graph.c:94 t/helper/test-read-graph.c:23
|
|
#, c-format
|
|
msgid "Could not open commit-graph '%s'"
|
|
msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
|
|
|
|
#: builtin/commit-graph.c:128
|
|
msgid "start walk at all refs"
|
|
msgstr "starta traversering vid alla referenser"
|
|
|
|
#: builtin/commit-graph.c:130
|
|
msgid "scan pack-indexes listed by stdin for commits"
|
|
msgstr "sök paketindex listade på standard in efter incheckningar"
|
|
|
|
#: builtin/commit-graph.c:132
|
|
msgid "start walk at commits listed by stdin"
|
|
msgstr "börja gå genom incheckningar listade på standard in"
|
|
|
|
#: builtin/commit-graph.c:134
|
|
msgid "include all commits already in the commit-graph file"
|
|
msgstr "ta med alla incheckningar redan i filen commit-graph"
|
|
|
|
#: builtin/commit-graph.c:137
|
|
msgid "allow writing an incremental commit-graph file"
|
|
msgstr "tillåt skriva en inkrementell incheckningsgraffil"
|
|
|
|
#: builtin/commit-graph.c:139 builtin/commit-graph.c:143
|
|
msgid "maximum number of commits in a non-base split commit-graph"
|
|
msgstr ""
|
|
"maximalt antal incheckningar i en delad incheckingsgraf som inte är bad"
|
|
|
|
#: builtin/commit-graph.c:141
|
|
msgid "maximum ratio between two levels of a split commit-graph"
|
|
msgstr "maximalt förhållande mellan två nivåer av en delad incheckningsgraf"
|
|
|
|
#: builtin/commit-graph.c:159
|
|
msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
|
|
msgstr "använd som mest en av --reachable, --stdin-commit och --stdin-packs"
|
|
|
|
#: builtin/config.c:11
|
|
msgid "git config [<options>]"
|
|
msgstr "git config [<flaggor>]"
|
|
|
|
#: builtin/config.c:104 builtin/env--helper.c:23
|
|
#, c-format
|
|
msgid "unrecognized --type argument, %s"
|
|
msgstr "okänt argument för --type, %s"
|
|
|
|
#: builtin/config.c:116
|
|
msgid "only one type at a time"
|
|
msgstr "endast en typ åt gången"
|
|
|
|
#: builtin/config.c:125
|
|
msgid "Config file location"
|
|
msgstr "Konfigurationsfilens plats"
|
|
|
|
#: builtin/config.c:126
|
|
msgid "use global config file"
|
|
msgstr "använd global konfigurationsfil"
|
|
|
|
#: builtin/config.c:127
|
|
msgid "use system config file"
|
|
msgstr "använd systemets konfigurationsfil"
|
|
|
|
#: builtin/config.c:128
|
|
msgid "use repository config file"
|
|
msgstr "använd arkivets konfigurationsfil"
|
|
|
|
#: builtin/config.c:129
|
|
msgid "use per-worktree config file"
|
|
msgstr "använd arbetskatalogens konfigurationsfil"
|
|
|
|
#: builtin/config.c:130
|
|
msgid "use given config file"
|
|
msgstr "använd angiven konfigurationsfil"
|
|
|
|
#: builtin/config.c:131
|
|
msgid "blob-id"
|
|
msgstr "blob-id"
|
|
|
|
#: builtin/config.c:131
|
|
msgid "read config from given blob object"
|
|
msgstr "läs konfiguration från givet blob-objekt"
|
|
|
|
#: builtin/config.c:132
|
|
msgid "Action"
|
|
msgstr "Åtgärd"
|
|
|
|
#: builtin/config.c:133
|
|
msgid "get value: name [value-regex]"
|
|
msgstr "hämta värde: namn [värde-reguttr]"
|
|
|
|
#: builtin/config.c:134
|
|
msgid "get all values: key [value-regex]"
|
|
msgstr "hämta alla värden: nyckel [värde-reguttr]"
|
|
|
|
#: builtin/config.c:135
|
|
msgid "get values for regexp: name-regex [value-regex]"
|
|
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
|
|
|
|
#: builtin/config.c:136
|
|
msgid "get value specific for the URL: section[.var] URL"
|
|
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
|
|
|
|
#: builtin/config.c:137
|
|
msgid "replace all matching variables: name value [value_regex]"
|
|
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
|
|
|
|
#: builtin/config.c:138
|
|
msgid "add a new variable: name value"
|
|
msgstr "lägg till en ny variabel: namn värde"
|
|
|
|
#: builtin/config.c:139
|
|
msgid "remove a variable: name [value-regex]"
|
|
msgstr "ta bort en variabel: namn [värde-reguttr]"
|
|
|
|
#: builtin/config.c:140
|
|
msgid "remove all matches: name [value-regex]"
|
|
msgstr "ta bort alla träffar: namn [värde-reguttr]"
|
|
|
|
#: builtin/config.c:141
|
|
msgid "rename section: old-name new-name"
|
|
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
|
|
|
|
#: builtin/config.c:142
|
|
msgid "remove a section: name"
|
|
msgstr "ta bort en sektion: namn"
|
|
|
|
#: builtin/config.c:143
|
|
msgid "list all"
|
|
msgstr "visa alla"
|
|
|
|
#: builtin/config.c:144
|
|
msgid "open an editor"
|
|
msgstr "öppna textredigeringsprogram"
|
|
|
|
#: builtin/config.c:145
|
|
msgid "find the color configured: slot [default]"
|
|
msgstr "hitta den inställda färgen: slot [default]"
|
|
|
|
#: builtin/config.c:146
|
|
msgid "find the color setting: slot [stdout-is-tty]"
|
|
msgstr "hitta färginställningen: slot [stdout-is-tty]"
|
|
|
|
#: builtin/config.c:147
|
|
msgid "Type"
|
|
msgstr "Typ"
|
|
|
|
#: builtin/config.c:148 builtin/env--helper.c:38
|
|
msgid "value is given this type"
|
|
msgstr "värdet har givits denna typ"
|
|
|
|
#: builtin/config.c:149
|
|
msgid "value is \"true\" or \"false\""
|
|
msgstr "värdet är \"true\" eller \"false\""
|
|
|
|
#: builtin/config.c:150
|
|
msgid "value is decimal number"
|
|
msgstr "värdet är ett decimalt tal"
|
|
|
|
#: builtin/config.c:151
|
|
msgid "value is --bool or --int"
|
|
msgstr "värdet är --bool eller --int"
|
|
|
|
#: builtin/config.c:152
|
|
msgid "value is a path (file or directory name)"
|
|
msgstr "värdet är en sökväg (fil- eller katalognamn)"
|
|
|
|
#: builtin/config.c:153
|
|
msgid "value is an expiry date"
|
|
msgstr "värdet är ett utgångsdatum"
|
|
|
|
#: builtin/config.c:154
|
|
msgid "Other"
|
|
msgstr "Andra"
|
|
|
|
#: builtin/config.c:155
|
|
msgid "terminate values with NUL byte"
|
|
msgstr "terminera värden med NUL-byte"
|
|
|
|
#: builtin/config.c:156
|
|
msgid "show variable names only"
|
|
msgstr "visa endast variabelnamn"
|
|
|
|
#: builtin/config.c:157
|
|
msgid "respect include directives on lookup"
|
|
msgstr "respektera inkluderingsdirektiv vid uppslag"
|
|
|
|
#: builtin/config.c:158
|
|
msgid "show origin of config (file, standard input, blob, command line)"
|
|
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
|
|
|
|
#: builtin/config.c:159
|
|
msgid "show scope of config (worktree, local, global, system, command)"
|
|
msgstr ""
|
|
"visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, "
|
|
"kommando)"
|
|
|
|
#: builtin/config.c:160 builtin/env--helper.c:40
|
|
msgid "value"
|
|
msgstr "värde"
|
|
|
|
#: builtin/config.c:160
|
|
msgid "with --get, use default value when missing entry"
|
|
msgstr "med --get, använd standardvärde vid saknad post"
|
|
|
|
#: builtin/config.c:174
|
|
#, c-format
|
|
msgid "wrong number of arguments, should be %d"
|
|
msgstr "fel antal argument, skulle vara %d"
|
|
|
|
#: builtin/config.c:176
|
|
#, c-format
|
|
msgid "wrong number of arguments, should be from %d to %d"
|
|
msgstr "fel antal argument, skulle vara från %d till %d"
|
|
|
|
#: builtin/config.c:324
|
|
#, c-format
|
|
msgid "invalid key pattern: %s"
|
|
msgstr "felaktigt nyckelmönster: %s"
|
|
|
|
#: builtin/config.c:360
|
|
#, c-format
|
|
msgid "failed to format default config value: %s"
|
|
msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
|
|
|
|
#: builtin/config.c:417
|
|
#, c-format
|
|
msgid "cannot parse color '%s'"
|
|
msgstr "kan inte tolka färgen \"%s\""
|
|
|
|
#: builtin/config.c:459
|
|
msgid "unable to parse default color value"
|
|
msgstr "kan inte tolka standardfärgvärde"
|
|
|
|
#: builtin/config.c:512 builtin/config.c:768
|
|
msgid "not in a git directory"
|
|
msgstr "inte i en git-katalog"
|
|
|
|
#: builtin/config.c:515
|
|
msgid "writing to stdin is not supported"
|
|
msgstr "skriva till standard in stöds inte"
|
|
|
|
#: builtin/config.c:518
|
|
msgid "writing config blobs is not supported"
|
|
msgstr "skriva konfigurations-blobbar stöds inte"
|
|
|
|
#: builtin/config.c:603
|
|
#, c-format
|
|
msgid ""
|
|
"# This is Git's per-user configuration file.\n"
|
|
"[user]\n"
|
|
"# Please adapt and uncomment the following lines:\n"
|
|
"#\tname = %s\n"
|
|
"#\temail = %s\n"
|
|
msgstr ""
|
|
"# Detta är Gits användarspecifika konfigurationsfil\n"
|
|
"[user]\n"
|
|
"# Justera och ta bort kommenteringsmärket från följande rader:\n"
|
|
"#\tname = %s\n"
|
|
"#\temail = %s\n"
|
|
|
|
#: builtin/config.c:627
|
|
msgid "only one config file at a time"
|
|
msgstr "endast en konfigurationsfil åt gången"
|
|
|
|
#: builtin/config.c:632
|
|
msgid "--local can only be used inside a git repository"
|
|
msgstr "--local kan bara användas inuti ett git-arkiv"
|
|
|
|
#: builtin/config.c:635
|
|
msgid "--blob can only be used inside a git repository"
|
|
msgstr "--blob kan bara användas inuti ett git-arkiv"
|
|
|
|
#: builtin/config.c:655
|
|
msgid "$HOME not set"
|
|
msgstr "$HOME inte satt"
|
|
|
|
#: 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"
|
|
"section in \"git help worktree\" for details"
|
|
msgstr ""
|
|
"--worktree kan inte användas med flera arbetskataloger om inte\n"
|
|
"konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n"
|
|
"\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer"
|
|
|
|
#: builtin/config.c:714
|
|
msgid "--get-color and variable type are incoherent"
|
|
msgstr "--get-color och variabeltyp stämmer inte överens"
|
|
|
|
#: builtin/config.c:719
|
|
msgid "only one action at a time"
|
|
msgstr "endast en åtgärd åt gången"
|
|
|
|
#: builtin/config.c:732
|
|
msgid "--name-only is only applicable to --list or --get-regexp"
|
|
msgstr "--name-only gäller bara för --list eller --get-regexp"
|
|
|
|
#: builtin/config.c:738
|
|
msgid ""
|
|
"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
|
|
"list"
|
|
msgstr ""
|
|
"--show-origin gäller bara för --get, --get-all, --get-regexp och --list"
|
|
|
|
#: builtin/config.c:744
|
|
msgid "--default is only applicable to --get"
|
|
msgstr "--default gäller bara för --get"
|
|
|
|
#: builtin/config.c:757
|
|
#, c-format
|
|
msgid "unable to read config file '%s'"
|
|
msgstr "kan inte konfigurationsfil \"%s\""
|
|
|
|
#: builtin/config.c:760
|
|
msgid "error processing config file(s)"
|
|
msgstr "fel vid hantering av konfigurationsfil(er)"
|
|
|
|
#: builtin/config.c:770
|
|
msgid "editing stdin is not supported"
|
|
msgstr "redigering av standard in stöds ej"
|
|
|
|
#: builtin/config.c:772
|
|
msgid "editing blobs is not supported"
|
|
msgstr "redigering av blobbar stöds ej"
|
|
|
|
#: builtin/config.c:786
|
|
#, c-format
|
|
msgid "cannot create configuration file %s"
|
|
msgstr "kan inte skapa konfigurationsfilen \"%s\""
|
|
|
|
#: builtin/config.c:799
|
|
#, c-format
|
|
msgid ""
|
|
"cannot overwrite multiple values with a single value\n"
|
|
" Use a regexp, --add or --replace-all to change %s."
|
|
msgstr ""
|
|
"kan inte skriva över flera värden med ett ensamt värde\n"
|
|
" Använd en regexp, --add eller --replace-all för att ändra %s."
|
|
|
|
#: builtin/config.c:873 builtin/config.c:884
|
|
#, c-format
|
|
msgid "no such section: %s"
|
|
msgstr "ingen sådan sektion: %s"
|
|
|
|
#: builtin/count-objects.c:90
|
|
msgid "git count-objects [-v] [-H | --human-readable]"
|
|
msgstr "git count-objects [-v] [-H | --human-readable]"
|
|
|
|
#: builtin/count-objects.c:100
|
|
msgid "print sizes in human readable format"
|
|
msgstr "skriv storlekar i människoläsbart format"
|
|
|
|
#: builtin/describe.c:26
|
|
msgid "git describe [<options>] [<commit-ish>...]"
|
|
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
|
|
|
|
#: builtin/describe.c:27
|
|
msgid "git describe [<options>] --dirty"
|
|
msgstr "git describe [<flaggor>] --dirty"
|
|
|
|
#: builtin/describe.c:62
|
|
msgid "head"
|
|
msgstr "huvud"
|
|
|
|
#: builtin/describe.c:62
|
|
msgid "lightweight"
|
|
msgstr "lättviktig"
|
|
|
|
#: builtin/describe.c:62
|
|
msgid "annotated"
|
|
msgstr "annoterad"
|
|
|
|
#: builtin/describe.c:275
|
|
#, c-format
|
|
msgid "annotated tag %s not available"
|
|
msgstr "den annoterade taggen %s inte tillgänglig"
|
|
|
|
#: builtin/describe.c:279
|
|
#, c-format
|
|
msgid "annotated tag %s has no embedded name"
|
|
msgstr "den annoterade taggen %s har inget inbäddat namn"
|
|
|
|
#: builtin/describe.c:281
|
|
#, c-format
|
|
msgid "tag '%s' is really '%s' here"
|
|
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
|
|
|
|
#: builtin/describe.c:325
|
|
#, c-format
|
|
msgid "no tag exactly matches '%s'"
|
|
msgstr "ingen tagg motsvarar \"%s\" exakt"
|
|
|
|
#: builtin/describe.c:327
|
|
#, c-format
|
|
msgid "No exact match on refs or tags, searching to describe\n"
|
|
msgstr ""
|
|
"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
|
|
|
|
#: builtin/describe.c:394
|
|
#, c-format
|
|
msgid "finished search at %s\n"
|
|
msgstr "avslutade sökning på %s\n"
|
|
|
|
#: builtin/describe.c:421
|
|
#, c-format
|
|
msgid ""
|
|
"No annotated tags can describe '%s'.\n"
|
|
"However, there were unannotated tags: try --tags."
|
|
msgstr ""
|
|
"Inga annoterade taggar kan beskriva \"%s\".\n"
|
|
"Det finns dock oannoterade taggar: testa --tags."
|
|
|
|
#: builtin/describe.c:425
|
|
#, c-format
|
|
msgid ""
|
|
"No tags can describe '%s'.\n"
|
|
"Try --always, or create some tags."
|
|
msgstr ""
|
|
"Inga taggar kan beskriva \"%s\".\n"
|
|
"Testa --always, eller skapa några taggar."
|
|
|
|
#: builtin/describe.c:455
|
|
#, c-format
|
|
msgid "traversed %lu commits\n"
|
|
msgstr "traverserade %lu incheckningar\n"
|
|
|
|
#: builtin/describe.c:458
|
|
#, c-format
|
|
msgid ""
|
|
"more than %i tags found; listed %i most recent\n"
|
|
"gave up search at %s\n"
|
|
msgstr ""
|
|
"mer än %i taggar hittades; listar de %i senaste\n"
|
|
"gav upp sökningen vid %s\n"
|
|
|
|
#: builtin/describe.c:526
|
|
#, c-format
|
|
msgid "describe %s\n"
|
|
msgstr "beskriva %s\n"
|
|
|
|
#: builtin/describe.c:529
|
|
#, c-format
|
|
msgid "Not a valid object name %s"
|
|
msgstr "Objektnamnet är inte giltigt: %s"
|
|
|
|
#: builtin/describe.c:537
|
|
#, c-format
|
|
msgid "%s is neither a commit nor blob"
|
|
msgstr "%s är varken incheckning eller blob"
|
|
|
|
#: builtin/describe.c:551
|
|
msgid "find the tag that comes after the commit"
|
|
msgstr "hitta taggen som kommer efter incheckningen"
|
|
|
|
#: builtin/describe.c:552
|
|
msgid "debug search strategy on stderr"
|
|
msgstr "felsök sökstrategin på standard fel"
|
|
|
|
#: builtin/describe.c:553
|
|
msgid "use any ref"
|
|
msgstr "använd alla referenser"
|
|
|
|
#: builtin/describe.c:554
|
|
msgid "use any tag, even unannotated"
|
|
msgstr "använd alla taggar, även oannoterade"
|
|
|
|
#: builtin/describe.c:555
|
|
msgid "always use long format"
|
|
msgstr "använd alltid långt format"
|
|
|
|
#: builtin/describe.c:556
|
|
msgid "only follow first parent"
|
|
msgstr "följ endast första föräldern"
|
|
|
|
#: builtin/describe.c:559
|
|
msgid "only output exact matches"
|
|
msgstr "skriv endast ut exakta träffar"
|
|
|
|
#: builtin/describe.c:561
|
|
msgid "consider <n> most recent tags (default: 10)"
|
|
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
|
|
|
|
#: builtin/describe.c:563
|
|
msgid "only consider tags matching <pattern>"
|
|
msgstr "överväg endast taggar som motsvarar <mönster>"
|
|
|
|
#: builtin/describe.c:565
|
|
msgid "do not consider tags matching <pattern>"
|
|
msgstr "överväg inte taggar som motsvarar <mönster>"
|
|
|
|
#: builtin/describe.c:567 builtin/name-rev.c:535
|
|
msgid "show abbreviated commit object as fallback"
|
|
msgstr "visa förkortade incheckningsobjekt som standard"
|
|
|
|
#: builtin/describe.c:568 builtin/describe.c:571
|
|
msgid "mark"
|
|
msgstr "märke"
|
|
|
|
#: builtin/describe.c:569
|
|
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
|
|
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
|
|
|
|
#: builtin/describe.c:572
|
|
msgid "append <mark> on broken working tree (default: \"-broken\")"
|
|
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
|
|
|
|
#: builtin/describe.c:590
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
msgstr "--long är inkompatibel med --abbrev=0"
|
|
|
|
#: builtin/describe.c:619
|
|
msgid "No names found, cannot describe anything."
|
|
msgstr "Inga namn hittades, kan inte beskriva något."
|
|
|
|
#: builtin/describe.c:670
|
|
msgid "--dirty is incompatible with commit-ishes"
|
|
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
|
|
|
|
#: builtin/describe.c:672
|
|
msgid "--broken is incompatible with commit-ishes"
|
|
msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
|
|
|
|
#: builtin/diff.c:84
|
|
#, c-format
|
|
msgid "'%s': not a regular file or symlink"
|
|
msgstr "\"%s\": inte en normal fil eller symbolisk länk"
|
|
|
|
#: builtin/diff.c:235
|
|
#, c-format
|
|
msgid "invalid option: %s"
|
|
msgstr "ogiltig flagga: %s"
|
|
|
|
#: builtin/diff.c:350
|
|
msgid "Not a git repository"
|
|
msgstr "Inte ett git-arkiv"
|
|
|
|
#: builtin/diff.c:394
|
|
#, c-format
|
|
msgid "invalid object '%s' given."
|
|
msgstr "objektet \"%s\" som angavs är felaktigt."
|
|
|
|
#: builtin/diff.c:403
|
|
#, c-format
|
|
msgid "more than two blobs given: '%s'"
|
|
msgstr "mer än två blobbar angavs: \"%s\""
|
|
|
|
#: builtin/diff.c:408
|
|
#, c-format
|
|
msgid "unhandled object '%s' given."
|
|
msgstr "ej hanterat objekt \"%s\" angavs."
|
|
|
|
#: builtin/difftool.c:30
|
|
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
|
|
msgstr ""
|
|
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
|
|
|
|
#: builtin/difftool.c:260
|
|
#, c-format
|
|
msgid "failed: %d"
|
|
msgstr "misslyckades: %d"
|
|
|
|
#: builtin/difftool.c:302
|
|
#, c-format
|
|
msgid "could not read symlink %s"
|
|
msgstr "kunde inte läsa symboliska länken %s"
|
|
|
|
#: builtin/difftool.c:304
|
|
#, c-format
|
|
msgid "could not read symlink file %s"
|
|
msgstr "kunde inte läsa symbolisk länk-fil %s"
|
|
|
|
#: builtin/difftool.c:312
|
|
#, c-format
|
|
msgid "could not read object %s for symlink %s"
|
|
msgstr "kunde inte läsa objektet %s för symboliska länken %s"
|
|
|
|
#: builtin/difftool.c:413
|
|
msgid ""
|
|
"combined diff formats('-c' and '--cc') are not supported in\n"
|
|
"directory diff mode('-d' and '--dir-diff')."
|
|
msgstr ""
|
|
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
|
|
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
|
|
|
|
#: builtin/difftool.c:634
|
|
#, c-format
|
|
msgid "both files modified: '%s' and '%s'."
|
|
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
|
|
|
|
#: builtin/difftool.c:636
|
|
msgid "working tree file has been left."
|
|
msgstr "filen i arbetskatalogen lämnades kvar."
|
|
|
|
#: builtin/difftool.c:647
|
|
#, c-format
|
|
msgid "temporary files exist in '%s'."
|
|
msgstr "temporära filer finns i \"%s\"."
|
|
|
|
#: builtin/difftool.c:648
|
|
msgid "you may want to cleanup or recover these."
|
|
msgstr "du kanske vill städa eller rädda dem."
|
|
|
|
#: builtin/difftool.c:697
|
|
msgid "use `diff.guitool` instead of `diff.tool`"
|
|
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
|
|
|
|
#: builtin/difftool.c:699
|
|
msgid "perform a full-directory diff"
|
|
msgstr "utför diff för hela katalogen"
|
|
|
|
#: builtin/difftool.c:701
|
|
msgid "do not prompt before launching a diff tool"
|
|
msgstr "fråga inte vid start av diff-verktyg"
|
|
|
|
#: builtin/difftool.c:706
|
|
msgid "use symlinks in dir-diff mode"
|
|
msgstr "använd symboliska länkar i katalogdiffläge"
|
|
|
|
#: builtin/difftool.c:707
|
|
msgid "tool"
|
|
msgstr "verktyg"
|
|
|
|
#: builtin/difftool.c:708
|
|
msgid "use the specified diff tool"
|
|
msgstr "använd angivet diff-verktyg"
|
|
|
|
#: builtin/difftool.c:710
|
|
msgid "print a list of diff tools that may be used with `--tool`"
|
|
msgstr "visa en lista över diff-verktyg som kan användas med \"--tool\""
|
|
|
|
#: builtin/difftool.c:713
|
|
msgid ""
|
|
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
|
|
"code"
|
|
msgstr ""
|
|
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
|
|
"skilt från noll"
|
|
|
|
#: builtin/difftool.c:716
|
|
msgid "specify a custom command for viewing diffs"
|
|
msgstr "ange eget kommando för att visa diffar"
|
|
|
|
#: builtin/difftool.c:717
|
|
msgid "passed to `diff`"
|
|
msgstr "sändes till \"diff\""
|
|
|
|
#: builtin/difftool.c:732
|
|
msgid "difftool requires worktree or --no-index"
|
|
msgstr "difftool kräver en arbetskatalog eller --no-index"
|
|
|
|
#: builtin/difftool.c:739
|
|
msgid "--dir-diff is incompatible with --no-index"
|
|
msgstr "--dir-diff är inkompatibelt med --no-index"
|
|
|
|
#: builtin/difftool.c:742
|
|
msgid "--gui, --tool and --extcmd are mutually exclusive"
|
|
msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
|
|
|
|
#: builtin/difftool.c:750
|
|
msgid "no <tool> given for --tool=<tool>"
|
|
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
|
|
|
|
#: builtin/difftool.c:757
|
|
msgid "no <cmd> given for --extcmd=<cmd>"
|
|
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
|
|
|
|
#: builtin/env--helper.c:6
|
|
msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
|
|
msgstr "git env--helper --type=[bool|ulong] <flaggor> <miljövariabel>"
|
|
|
|
#: builtin/env--helper.c:37 builtin/hash-object.c:98
|
|
msgid "type"
|
|
msgstr "typ"
|
|
|
|
#: builtin/env--helper.c:41
|
|
msgid "default for git_env_*(...) to fall back on"
|
|
msgstr "standard för git_env_*(...) att falla tillbaka på"
|
|
|
|
#: builtin/env--helper.c:43
|
|
msgid "be quiet only use git_env_*() value as exit code"
|
|
msgstr "var tyst, använd bara git_env_*() som resultatvärde"
|
|
|
|
#: builtin/env--helper.c:62
|
|
#, c-format
|
|
msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
|
|
msgstr ""
|
|
"flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte "
|
|
"\"%s\""
|
|
|
|
#: builtin/env--helper.c:77
|
|
#, c-format
|
|
msgid ""
|
|
"option `--default' expects an unsigned long value with `--type=ulong`, not `"
|
|
"%s`"
|
|
msgstr ""
|
|
"flaggan \"--default\" förväntar ett teckenlöst långt värde med \"--type=ulong"
|
|
"\", inte \"%s\""
|
|
|
|
#: builtin/fast-export.c:29
|
|
msgid "git fast-export [rev-list-opts]"
|
|
msgstr "git fast-export [rev-list-flaggor]"
|
|
|
|
#: builtin/fast-export.c:853
|
|
msgid "Error: Cannot export nested tags unless --mark-tags is specified."
|
|
msgstr "Fel: Kan inte exportera nästlade taggar såvida inte --mark-tags anges."
|
|
|
|
#: builtin/fast-export.c:1152
|
|
msgid "show progress after <n> objects"
|
|
msgstr "visa förlopp efter <n> objekt"
|
|
|
|
#: builtin/fast-export.c:1154
|
|
msgid "select handling of signed tags"
|
|
msgstr "välj hantering av signerade taggar"
|
|
|
|
#: builtin/fast-export.c:1157
|
|
msgid "select handling of tags that tag filtered objects"
|
|
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
|
|
|
|
#: builtin/fast-export.c:1160
|
|
msgid "select handling of commit messages in an alternate encoding"
|
|
msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
|
|
|
|
#: builtin/fast-export.c:1163
|
|
msgid "Dump marks to this file"
|
|
msgstr "Dumpa märken till filen"
|
|
|
|
#: builtin/fast-export.c:1165
|
|
msgid "Import marks from this file"
|
|
msgstr "Importera märken från filen"
|
|
|
|
#: builtin/fast-export.c:1169
|
|
msgid "Import marks from this file if it exists"
|
|
msgstr "Importera märken från filen, om den finns"
|
|
|
|
#: builtin/fast-export.c:1171
|
|
msgid "Fake a tagger when tags lack one"
|
|
msgstr "Fejka taggare när taggen saknar en"
|
|
|
|
#: builtin/fast-export.c:1173
|
|
msgid "Output full tree for each commit"
|
|
msgstr "Skriv ut hela trädet för varje incheckning"
|
|
|
|
#: builtin/fast-export.c:1175
|
|
msgid "Use the done feature to terminate the stream"
|
|
msgstr "Använd done-funktionen för att avsluta strömmen"
|
|
|
|
#: builtin/fast-export.c:1176
|
|
msgid "Skip output of blob data"
|
|
msgstr "Hoppa över skrivning av blob-data"
|
|
|
|
#: builtin/fast-export.c:1177 builtin/log.c:1705
|
|
msgid "refspec"
|
|
msgstr "referensspecifikation"
|
|
|
|
#: builtin/fast-export.c:1178
|
|
msgid "Apply refspec to exported refs"
|
|
msgstr "Applicera referensspecifikation på exporterade referenser"
|
|
|
|
#: builtin/fast-export.c:1179
|
|
msgid "anonymize output"
|
|
msgstr "anonymisera utdata"
|
|
|
|
#: builtin/fast-export.c:1181
|
|
msgid "Reference parents which are not in fast-export stream by object id"
|
|
msgstr "Referera föräldrar som inte finns i fast-export-ström med objekt-id"
|
|
|
|
#: builtin/fast-export.c:1183
|
|
msgid "Show original object ids of blobs/commits"
|
|
msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar"
|
|
|
|
#: builtin/fast-export.c:1185
|
|
msgid "Label tags with mark ids"
|
|
msgstr "Märk taggar med märke-id"
|
|
|
|
#: builtin/fast-export.c:1220
|
|
msgid "Cannot pass both --import-marks and --import-marks-if-exists"
|
|
msgstr "Kan inte ange både --import-marks och --import-marks-if-exists"
|
|
|
|
#: builtin/fetch.c:34
|
|
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
|
|
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
|
|
|
|
#: builtin/fetch.c:35
|
|
msgid "git fetch [<options>] <group>"
|
|
msgstr "git fetch [<flaggor>] <grupp>"
|
|
|
|
#: builtin/fetch.c:36
|
|
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
|
|
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
|
|
|
|
#: builtin/fetch.c:37
|
|
msgid "git fetch --all [<options>]"
|
|
msgstr "git fetch --all [<flaggor>]"
|
|
|
|
#: builtin/fetch.c:116
|
|
msgid "fetch.parallel cannot be negative"
|
|
msgstr "fetch.parallel kan inte vara negativt"
|
|
|
|
#: builtin/fetch.c:139 builtin/pull.c:184
|
|
msgid "fetch from all remotes"
|
|
msgstr "hämta från alla fjärrar"
|
|
|
|
#: builtin/fetch.c:141 builtin/pull.c:228
|
|
msgid "set upstream for git pull/fetch"
|
|
msgstr "ställ in uppström för git pull/fetch"
|
|
|
|
#: builtin/fetch.c:143 builtin/pull.c:187
|
|
msgid "append to .git/FETCH_HEAD instead of overwriting"
|
|
msgstr "lägg till i .git/FETCH_HEAD istället för att skriva över"
|
|
|
|
#: builtin/fetch.c:145 builtin/pull.c:190
|
|
msgid "path to upload pack on remote end"
|
|
msgstr "sökväg till upload pack på fjärren"
|
|
|
|
#: builtin/fetch.c:146
|
|
msgid "force overwrite of local reference"
|
|
msgstr "tvinga överskrivning av lokal referens"
|
|
|
|
#: builtin/fetch.c:148
|
|
msgid "fetch from multiple remotes"
|
|
msgstr "hämta från flera fjärrar"
|
|
|
|
#: builtin/fetch.c:150 builtin/pull.c:194
|
|
msgid "fetch all tags and associated objects"
|
|
msgstr "hämta alla taggar och associerade objekt"
|
|
|
|
#: builtin/fetch.c:152
|
|
msgid "do not fetch all tags (--no-tags)"
|
|
msgstr "hämta inte alla taggar (--no-tags)"
|
|
|
|
#: builtin/fetch.c:154
|
|
msgid "number of submodules fetched in parallel"
|
|
msgstr "antal undermoduler som hämtas parallellt"
|
|
|
|
#: builtin/fetch.c:156 builtin/pull.c:197
|
|
msgid "prune remote-tracking branches no longer on remote"
|
|
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
|
|
|
|
#: builtin/fetch.c:158
|
|
msgid "prune local tags no longer on remote and clobber changed tags"
|
|
msgstr ""
|
|
"rensa lokala taggar inte längre på fjärren och skriv över ändrade taggar"
|
|
|
|
#: builtin/fetch.c:159 builtin/fetch.c:182 builtin/pull.c:121
|
|
msgid "on-demand"
|
|
msgstr "on-demand"
|
|
|
|
#: builtin/fetch.c:160
|
|
msgid "control recursive fetching of submodules"
|
|
msgstr "styr rekursiv hämtning av undermoduler"
|
|
|
|
#: builtin/fetch.c:164 builtin/pull.c:205
|
|
msgid "keep downloaded pack"
|
|
msgstr "behåll hämtade paket"
|
|
|
|
#: builtin/fetch.c:166
|
|
msgid "allow updating of HEAD ref"
|
|
msgstr "tillåt uppdatering av HEAD-referens"
|
|
|
|
#: builtin/fetch.c:169 builtin/fetch.c:175 builtin/pull.c:208
|
|
msgid "deepen history of shallow clone"
|
|
msgstr "fördjupa historik för grund klon"
|
|
|
|
#: builtin/fetch.c:171
|
|
msgid "deepen history of shallow repository based on time"
|
|
msgstr "fördjupa historik för grund klon baserad på tid"
|
|
|
|
#: builtin/fetch.c:177 builtin/pull.c:211
|
|
msgid "convert to a complete repository"
|
|
msgstr "konvertera till komplett arkiv"
|
|
|
|
#: builtin/fetch.c:180
|
|
msgid "prepend this to submodule path output"
|
|
msgstr "lägg till i början av undermodulens sökvägsutdata"
|
|
|
|
#: builtin/fetch.c:183
|
|
msgid ""
|
|
"default for recursive fetching of submodules (lower priority than config "
|
|
"files)"
|
|
msgstr ""
|
|
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
|
|
"konfigurationsfiler)"
|
|
|
|
#: builtin/fetch.c:187 builtin/pull.c:214
|
|
msgid "accept refs that update .git/shallow"
|
|
msgstr "tar emot referenser som uppdaterar .git/shallow"
|
|
|
|
#: builtin/fetch.c:188 builtin/pull.c:216
|
|
msgid "refmap"
|
|
msgstr "referenskarta"
|
|
|
|
#: builtin/fetch.c:189 builtin/pull.c:217
|
|
msgid "specify fetch refmap"
|
|
msgstr "ange referenskarta för \"fetch\""
|
|
|
|
#: builtin/fetch.c:196
|
|
msgid "report that we have only objects reachable from this object"
|
|
msgstr "rapportera att vi bara har objekt nåbara från detta objektet"
|
|
|
|
#: builtin/fetch.c:199
|
|
msgid "run 'gc --auto' after fetching"
|
|
msgstr "kör \"gc --auto\" efter hämtning"
|
|
|
|
#: builtin/fetch.c:201 builtin/pull.c:226
|
|
msgid "check for forced-updates on all updated branches"
|
|
msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
|
|
|
|
#: builtin/fetch.c:203
|
|
msgid "write the commit-graph after fetching"
|
|
msgstr "skriv incheckingsgrafen efter hämtning"
|
|
|
|
#: builtin/fetch.c:513
|
|
msgid "Couldn't find remote ref HEAD"
|
|
msgstr "Kunde inte hitta fjärr-referensen HEAD"
|
|
|
|
#: builtin/fetch.c:653
|
|
#, c-format
|
|
msgid "configuration fetch.output contains invalid value %s"
|
|
msgstr "konfigurationen för fetch.output innehåller ogiltigt värde %s"
|
|
|
|
#: builtin/fetch.c:751
|
|
#, c-format
|
|
msgid "object %s not found"
|
|
msgstr "objektet %s hittades inte"
|
|
|
|
#: builtin/fetch.c:755
|
|
msgid "[up to date]"
|
|
msgstr "[àjour]"
|
|
|
|
#: builtin/fetch.c:768 builtin/fetch.c:784 builtin/fetch.c:856
|
|
msgid "[rejected]"
|
|
msgstr "[refuserad]"
|
|
|
|
#: builtin/fetch.c:769
|
|
msgid "can't fetch in current branch"
|
|
msgstr "kan inte hämta i aktuell gren"
|
|
|
|
#: builtin/fetch.c:779
|
|
msgid "[tag update]"
|
|
msgstr "[uppdaterad tagg]"
|
|
|
|
#: builtin/fetch.c:780 builtin/fetch.c:817 builtin/fetch.c:839
|
|
#: builtin/fetch.c:851
|
|
msgid "unable to update local ref"
|
|
msgstr "kunde inte uppdatera lokal ref"
|
|
|
|
#: builtin/fetch.c:784
|
|
msgid "would clobber existing tag"
|
|
msgstr "skulle skriva över befintlig tagg"
|
|
|
|
#: builtin/fetch.c:806
|
|
msgid "[new tag]"
|
|
msgstr "[ny tagg]"
|
|
|
|
#: builtin/fetch.c:809
|
|
msgid "[new branch]"
|
|
msgstr "[ny gren]"
|
|
|
|
#: builtin/fetch.c:812
|
|
msgid "[new ref]"
|
|
msgstr "[ny ref]"
|
|
|
|
#: builtin/fetch.c:851
|
|
msgid "forced update"
|
|
msgstr "tvingad uppdatering"
|
|
|
|
#: builtin/fetch.c:856
|
|
msgid "non-fast-forward"
|
|
msgstr "ej snabbspolad"
|
|
|
|
#: 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"
|
|
"flag or run 'git config fetch.showForcedUpdates true'."
|
|
msgstr ""
|
|
"Fetch visar normalt vilka grenar som tvångsuppdaterats, men testet har "
|
|
"slagits\n"
|
|
"av. För att slå på igen, använd flaggan \"--show-forced-updates\" eller kör\n"
|
|
"\"git config fetch.showForcedUpdates true\"."
|
|
|
|
#: builtin/fetch.c:881
|
|
#, c-format
|
|
msgid ""
|
|
"It took %.2f seconds to check forced updates. You can use\n"
|
|
"'--no-show-forced-updates' or run 'git config fetch.showForcedUpdates "
|
|
"false'\n"
|
|
" to avoid this check.\n"
|
|
msgstr ""
|
|
"Det tog %.2f sekunder att se efter tvångsuppdateringar. Du kan använda\n"
|
|
"\"--no-show-forced-updates\" eller köra \"git config fetch."
|
|
"showForcedUpdates\n"
|
|
"false\" för att undvika testet.\n"
|
|
|
|
#: builtin/fetch.c:920
|
|
#, c-format
|
|
msgid "%s did not send all necessary objects\n"
|
|
msgstr "%s sände inte alla nödvändiga objekt\n"
|
|
|
|
#: builtin/fetch.c:941
|
|
#, c-format
|
|
msgid "reject %s because shallow roots are not allowed to be updated"
|
|
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
|
|
|
|
#: builtin/fetch.c:1026 builtin/fetch.c:1164
|
|
#, c-format
|
|
msgid "From %.*s\n"
|
|
msgstr "Från %.*s\n"
|
|
|
|
#: builtin/fetch.c:1037
|
|
#, c-format
|
|
msgid ""
|
|
"some local refs could not be updated; try running\n"
|
|
" 'git remote prune %s' to remove any old, conflicting branches"
|
|
msgstr ""
|
|
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
|
|
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
|
|
|
|
#: builtin/fetch.c:1134
|
|
#, c-format
|
|
msgid " (%s will become dangling)"
|
|
msgstr " (%s kommer bli dinglande)"
|
|
|
|
#: builtin/fetch.c:1135
|
|
#, c-format
|
|
msgid " (%s has become dangling)"
|
|
msgstr " (%s har blivit dinglande)"
|
|
|
|
#: builtin/fetch.c:1167
|
|
msgid "[deleted]"
|
|
msgstr "[borttagen]"
|
|
|
|
#: builtin/fetch.c:1168 builtin/remote.c:1112
|
|
msgid "(none)"
|
|
msgstr "(ingen)"
|
|
|
|
#: builtin/fetch.c:1191
|
|
#, c-format
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
|
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
|
|
|
|
#: builtin/fetch.c:1210
|
|
#, c-format
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
|
|
|
|
#: builtin/fetch.c:1213
|
|
#, c-format
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
|
msgstr "Flaggan \"%s\" ignoreras för %s\n"
|
|
|
|
#: builtin/fetch.c:1421
|
|
msgid "multiple branches detected, incompatible with --set-upstream"
|
|
msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
|
|
|
|
#: builtin/fetch.c:1436
|
|
msgid "not setting upstream for a remote remote-tracking branch"
|
|
msgstr "ställer inte in uppströmsgren för en fjärrspårande gren på fjärren"
|
|
|
|
#: builtin/fetch.c:1438
|
|
msgid "not setting upstream for a remote tag"
|
|
msgstr "ställer inte in uppström för en fjärrtag"
|
|
|
|
#: builtin/fetch.c:1440
|
|
msgid "unknown branch type"
|
|
msgstr "okänd grentyp"
|
|
|
|
#: builtin/fetch.c:1442
|
|
msgid ""
|
|
"no source branch found.\n"
|
|
"you need to specify exactly one branch with the --set-upstream option."
|
|
msgstr ""
|
|
"hittade ingen källgren.\n"
|
|
"du måste ange exakt en gren med flaggan --set-upstream."
|
|
|
|
#: builtin/fetch.c:1568 builtin/fetch.c:1631
|
|
#, c-format
|
|
msgid "Fetching %s\n"
|
|
msgstr "Hämtar %s\n"
|
|
|
|
#: builtin/fetch.c:1578 builtin/fetch.c:1633 builtin/remote.c:101
|
|
#, c-format
|
|
msgid "Could not fetch %s"
|
|
msgstr "Kunde inte hämta %s"
|
|
|
|
#: builtin/fetch.c:1590
|
|
#, c-format
|
|
msgid "could not fetch '%s' (exit code: %d)\n"
|
|
msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
|
|
|
|
#: 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."
|
|
msgstr ""
|
|
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
|
|
"fjärrarkiv som nya incheckningar ska hämtas från."
|
|
|
|
#: builtin/fetch.c:1730
|
|
msgid "You need to specify a tag name."
|
|
msgstr "Du måste ange namnet på en tagg."
|
|
|
|
#: builtin/fetch.c:1780
|
|
msgid "Negative depth in --deepen is not supported"
|
|
msgstr "Negativa djup stöds inte i --deepen"
|
|
|
|
#: builtin/fetch.c:1782
|
|
msgid "--deepen and --depth are mutually exclusive"
|
|
msgstr "--deepen och --depth är ömsesidigt uteslutande"
|
|
|
|
#: builtin/fetch.c:1787
|
|
msgid "--depth and --unshallow cannot be used together"
|
|
msgstr "--depth och --unshallow kan inte användas samtidigt"
|
|
|
|
#: builtin/fetch.c:1789
|
|
msgid "--unshallow on a complete repository does not make sense"
|
|
msgstr "--unshallow kan inte användas på ett komplett arkiv"
|
|
|
|
#: builtin/fetch.c:1805
|
|
msgid "fetch --all does not take a repository argument"
|
|
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
|
|
|
|
#: builtin/fetch.c:1807
|
|
msgid "fetch --all does not make sense with refspecs"
|
|
msgstr "fetch --all kan inte anges med referensspecifikationer"
|
|
|
|
#: builtin/fetch.c:1816
|
|
#, c-format
|
|
msgid "No such remote or remote group: %s"
|
|
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
|
|
|
|
#: builtin/fetch.c:1823
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
|
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
|
|
|
|
#: builtin/fetch.c:1841
|
|
msgid ""
|
|
"--filter can only be used with the remote configured in extensions."
|
|
"partialclone"
|
|
msgstr ""
|
|
"--filter kan endast användas med fjärren konfigurerad i extensions."
|
|
"partialclone"
|
|
|
|
#: builtin/fmt-merge-msg.c:18
|
|
msgid ""
|
|
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
|
|
msgstr ""
|
|
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
|
|
|
|
#: builtin/fmt-merge-msg.c:671
|
|
msgid "populate log with at most <n> entries from shortlog"
|
|
msgstr "fyll i loggen med som mest <n> poster från shortlog"
|
|
|
|
#: builtin/fmt-merge-msg.c:674
|
|
msgid "alias for --log (deprecated)"
|
|
msgstr "alias för --log (avråds)"
|
|
|
|
#: builtin/fmt-merge-msg.c:677
|
|
msgid "text"
|
|
msgstr "text"
|
|
|
|
#: builtin/fmt-merge-msg.c:678
|
|
msgid "use <text> as start of message"
|
|
msgstr "inled meddelande med <text>"
|
|
|
|
#: builtin/fmt-merge-msg.c:679
|
|
msgid "file to read from"
|
|
msgstr "fil att läsa från"
|
|
|
|
#: builtin/for-each-ref.c:10
|
|
msgid "git for-each-ref [<options>] [<pattern>]"
|
|
msgstr "git for-each-ref [<flaggor>] [<mönster>]"
|
|
|
|
#: builtin/for-each-ref.c:11
|
|
msgid "git for-each-ref [--points-at <object>]"
|
|
msgstr "git for-each-ref [--points-at <objekt>]"
|
|
|
|
#: builtin/for-each-ref.c:12
|
|
msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
|
|
msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]"
|
|
|
|
#: builtin/for-each-ref.c:13
|
|
msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
|
|
msgstr ""
|
|
"git for-each-ref [--contains [<incheckning>]] [--no-contains [<incheckning>]]"
|
|
|
|
#: builtin/for-each-ref.c:28
|
|
msgid "quote placeholders suitably for shells"
|
|
msgstr "citera platshållare passande för skal"
|
|
|
|
#: builtin/for-each-ref.c:30
|
|
msgid "quote placeholders suitably for perl"
|
|
msgstr "citera platshållare passande för perl"
|
|
|
|
#: builtin/for-each-ref.c:32
|
|
msgid "quote placeholders suitably for python"
|
|
msgstr "citera platshållare passande för python"
|
|
|
|
#: builtin/for-each-ref.c:34
|
|
msgid "quote placeholders suitably for Tcl"
|
|
msgstr "citera platshållare passande för Tcl"
|
|
|
|
#: builtin/for-each-ref.c:37
|
|
msgid "show only <n> matched refs"
|
|
msgstr "visa endast <n> träffade refs"
|
|
|
|
#: builtin/for-each-ref.c:39 builtin/tag.c:439
|
|
msgid "respect format colors"
|
|
msgstr "använd formatfärger"
|
|
|
|
#: builtin/for-each-ref.c:42
|
|
msgid "print only refs which points at the given object"
|
|
msgstr "visa endast referenser som pekar på objektet"
|
|
|
|
#: builtin/for-each-ref.c:44
|
|
msgid "print only refs that are merged"
|
|
msgstr "visa endast referenser som slagits samman"
|
|
|
|
#: builtin/for-each-ref.c:45
|
|
msgid "print only refs that are not merged"
|
|
msgstr "visa endast referenser som ej slagits samman"
|
|
|
|
#: builtin/for-each-ref.c:46
|
|
msgid "print only refs which contain the commit"
|
|
msgstr "visa endast referenser som innehåller incheckningen"
|
|
|
|
#: builtin/for-each-ref.c:47
|
|
msgid "print only refs which don't contain the commit"
|
|
msgstr "visa endast referenser som inte innehåller incheckningen"
|
|
|
|
#: builtin/fsck.c:68 builtin/fsck.c:147 builtin/fsck.c:148
|
|
msgid "unknown"
|
|
msgstr "okänd"
|
|
|
|
#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
|
|
#: builtin/fsck.c:100 builtin/fsck.c:120
|
|
#, c-format
|
|
msgid "error in %s %s: %s"
|
|
msgstr "fel i %s %s: %s"
|
|
|
|
#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
|
|
#: builtin/fsck.c:114
|
|
#, c-format
|
|
msgid "warning in %s %s: %s"
|
|
msgstr "varning i %s %s: %s"
|
|
|
|
#: builtin/fsck.c:143 builtin/fsck.c:146
|
|
#, c-format
|
|
msgid "broken link from %7s %s"
|
|
msgstr "trasig länk från %7s %s"
|
|
|
|
#: builtin/fsck.c:155
|
|
msgid "wrong object type in link"
|
|
msgstr "fel objekttyp i länk"
|
|
|
|
#: builtin/fsck.c:171
|
|
#, c-format
|
|
msgid ""
|
|
"broken link from %7s %s\n"
|
|
" to %7s %s"
|
|
msgstr ""
|
|
"trasig länk från %7s %s\n"
|
|
" till %7s %s"
|
|
|
|
#: builtin/fsck.c:282
|
|
#, c-format
|
|
msgid "missing %s %s"
|
|
msgstr "saknat %s %s"
|
|
|
|
#: builtin/fsck.c:309
|
|
#, c-format
|
|
msgid "unreachable %s %s"
|
|
msgstr "onåbart %s %s"
|
|
|
|
#: builtin/fsck.c:329
|
|
#, c-format
|
|
msgid "dangling %s %s"
|
|
msgstr "hängande %s %s"
|
|
|
|
#: builtin/fsck.c:339
|
|
msgid "could not create lost-found"
|
|
msgstr "kunde inte skapa lost-found"
|
|
|
|
#: builtin/fsck.c:350
|
|
#, c-format
|
|
msgid "could not finish '%s'"
|
|
msgstr "kunde inte avsluta \"%s\""
|
|
|
|
#: builtin/fsck.c:367
|
|
#, c-format
|
|
msgid "Checking %s"
|
|
msgstr "Kontrollerar %s"
|
|
|
|
# Vague original, not networking-related, but rather related to the actual
|
|
# objects in the database.
|
|
#: builtin/fsck.c:405
|
|
#, c-format
|
|
msgid "Checking connectivity (%d objects)"
|
|
msgstr "Kontrollerar konnektivitet (%d objekt)"
|
|
|
|
#: builtin/fsck.c:424
|
|
#, c-format
|
|
msgid "Checking %s %s"
|
|
msgstr "Kontrollerar %s %s"
|
|
|
|
#: builtin/fsck.c:429
|
|
msgid "broken links"
|
|
msgstr "trasiga länkar"
|
|
|
|
#: builtin/fsck.c:438
|
|
#, c-format
|
|
msgid "root %s"
|
|
msgstr "roten %s"
|
|
|
|
#: builtin/fsck.c:446
|
|
#, c-format
|
|
msgid "tagged %s %s (%s) in %s"
|
|
msgstr "taggad %s %s (%s) i %s"
|
|
|
|
#: builtin/fsck.c:475
|
|
#, c-format
|
|
msgid "%s: object corrupt or missing"
|
|
msgstr "%s: objekt trasigt eller saknas"
|
|
|
|
#: builtin/fsck.c:500
|
|
#, c-format
|
|
msgid "%s: invalid reflog entry %s"
|
|
msgstr "%s: ogiltig reflog-post %s"
|
|
|
|
#: builtin/fsck.c:514
|
|
#, c-format
|
|
msgid "Checking reflog %s->%s"
|
|
msgstr "Kontrollerar reflog %s->%s"
|
|
|
|
#: builtin/fsck.c:548
|
|
#, c-format
|
|
msgid "%s: invalid sha1 pointer %s"
|
|
msgstr "%s: ogiltig sha1-pekare %s"
|
|
|
|
#: builtin/fsck.c:555
|
|
#, c-format
|
|
msgid "%s: not a commit"
|
|
msgstr "%s: inte en incheckning!"
|
|
|
|
#: builtin/fsck.c:609
|
|
msgid "notice: No default references"
|
|
msgstr "obs: Inga förvalda referenser"
|
|
|
|
#: builtin/fsck.c:624
|
|
#, c-format
|
|
msgid "%s: object corrupt or missing: %s"
|
|
msgstr "%s: objektet trasigt eller saknas: %s"
|
|
|
|
#: builtin/fsck.c:637
|
|
#, c-format
|
|
msgid "%s: object could not be parsed: %s"
|
|
msgstr "%s: objektet kunde inte tolkas: %s"
|
|
|
|
#: builtin/fsck.c:657
|
|
#, c-format
|
|
msgid "bad sha1 file: %s"
|
|
msgstr "ogiltig sha1-fil: %s"
|
|
|
|
#: builtin/fsck.c:672
|
|
msgid "Checking object directory"
|
|
msgstr "Kontrollerar objektkatalog"
|
|
|
|
#: builtin/fsck.c:675
|
|
msgid "Checking object directories"
|
|
msgstr "Kontrollerar objektkataloger"
|
|
|
|
#: builtin/fsck.c:690
|
|
#, c-format
|
|
msgid "Checking %s link"
|
|
msgstr "Kontrollerar %s-länk"
|
|
|
|
#: builtin/fsck.c:695 builtin/index-pack.c:843
|
|
#, c-format
|
|
msgid "invalid %s"
|
|
msgstr "ogiltigt %s"
|
|
|
|
#: builtin/fsck.c:702
|
|
#, c-format
|
|
msgid "%s points to something strange (%s)"
|
|
msgstr "%s pekar på något konstigt (%s)"
|
|
|
|
#: builtin/fsck.c:708
|
|
#, c-format
|
|
msgid "%s: detached HEAD points at nothing"
|
|
msgstr "%s: frånkopplat HEAD pekar på ingenting"
|
|
|
|
#: builtin/fsck.c:712
|
|
#, c-format
|
|
msgid "notice: %s points to an unborn branch (%s)"
|
|
msgstr "obs: %s pekar på en ofödd gren (%s)"
|
|
|
|
#: builtin/fsck.c:724
|
|
msgid "Checking cache tree"
|
|
msgstr "Kontrollerar cacheträd"
|
|
|
|
#: builtin/fsck.c:729
|
|
#, c-format
|
|
msgid "%s: invalid sha1 pointer in cache-tree"
|
|
msgstr "%s: ogiltig sha1-pekare i cacheträd"
|
|
|
|
#: builtin/fsck.c:738
|
|
msgid "non-tree in cache-tree"
|
|
msgstr "icke-träd i cacheträd"
|
|
|
|
#: builtin/fsck.c:769
|
|
msgid "git fsck [<options>] [<object>...]"
|
|
msgstr "git fsck [<flaggor>] [<objekt>...]"
|
|
|
|
#: builtin/fsck.c:775
|
|
msgid "show unreachable objects"
|
|
msgstr "visa onåbara objekt"
|
|
|
|
#: builtin/fsck.c:776
|
|
msgid "show dangling objects"
|
|
msgstr "visa dinglande objekt"
|
|
|
|
#: builtin/fsck.c:777
|
|
msgid "report tags"
|
|
msgstr "rapportera taggar"
|
|
|
|
#: builtin/fsck.c:778
|
|
msgid "report root nodes"
|
|
msgstr "rapportera rotnoder"
|
|
|
|
#: builtin/fsck.c:779
|
|
msgid "make index objects head nodes"
|
|
msgstr "gör indexojekt till huvudnoder"
|
|
|
|
#: builtin/fsck.c:780
|
|
msgid "make reflogs head nodes (default)"
|
|
msgstr "gör refloggar till huvudnoder (standard)"
|
|
|
|
#: builtin/fsck.c:781
|
|
msgid "also consider packs and alternate objects"
|
|
msgstr "ta även hänsyn till paket och supplerande objekt"
|
|
|
|
# Vague original, not networking-related, but rather related to the actual
|
|
# objects in the database.
|
|
#: builtin/fsck.c:782
|
|
msgid "check only connectivity"
|
|
msgstr "kontrollera endast konnektivitet"
|
|
|
|
#: builtin/fsck.c:783
|
|
msgid "enable more strict checking"
|
|
msgstr "aktivera striktare kontroll"
|
|
|
|
#: builtin/fsck.c:785
|
|
msgid "write dangling objects in .git/lost-found"
|
|
msgstr "skriv dinglande objekt i .git/lost-found"
|
|
|
|
#: builtin/fsck.c:786 builtin/prune.c:132
|
|
msgid "show progress"
|
|
msgstr "visa förlopp"
|
|
|
|
#: builtin/fsck.c:787
|
|
msgid "show verbose names for reachable objects"
|
|
msgstr "visa ordrika namn för nåbara objekt"
|
|
|
|
#: builtin/fsck.c:846 builtin/index-pack.c:225
|
|
msgid "Checking objects"
|
|
msgstr "Kontrollerar objekt"
|
|
|
|
#: builtin/fsck.c:874
|
|
#, c-format
|
|
msgid "%s: object missing"
|
|
msgstr "%s: objekt saknas"
|
|
|
|
#: builtin/fsck.c:885
|
|
#, c-format
|
|
msgid "invalid parameter: expected sha1, got '%s'"
|
|
msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
|
|
|
|
#: builtin/gc.c:35
|
|
msgid "git gc [<options>]"
|
|
msgstr "git gc [<flaggor>]"
|
|
|
|
#: builtin/gc.c:90
|
|
#, c-format
|
|
msgid "Failed to fstat %s: %s"
|
|
msgstr "Misslyckades ta status (fstat) på %s: %s"
|
|
|
|
#: builtin/gc.c:126
|
|
#, c-format
|
|
msgid "failed to parse '%s' value '%s'"
|
|
msgstr "misslyckades tolka \"%s\" värde \"%s\""
|
|
|
|
#: builtin/gc.c:475 builtin/init-db.c:55
|
|
#, c-format
|
|
msgid "cannot stat '%s'"
|
|
msgstr "kan inte ta status på \"%s\""
|
|
|
|
#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
|
|
#, c-format
|
|
msgid "cannot read '%s'"
|
|
msgstr "kunde inte läsa \"%s\""
|
|
|
|
#: builtin/gc.c:491
|
|
#, c-format
|
|
msgid ""
|
|
"The last gc run reported the following. Please correct the root cause\n"
|
|
"and remove %s.\n"
|
|
"Automatic cleanup will not be performed until the file is removed.\n"
|
|
"\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Senaste körningen av git gc rapporterade följande. Fixa grundproblemet\n"
|
|
"och ta bort %s.\n"
|
|
"Automatisk städning kommer inte utföras förrän filen tas bort.\n"
|
|
"\n"
|
|
"%s"
|
|
|
|
#: builtin/gc.c:539
|
|
msgid "prune unreferenced objects"
|
|
msgstr "rensa ej refererade objekt"
|
|
|
|
#: builtin/gc.c:541
|
|
msgid "be more thorough (increased runtime)"
|
|
msgstr "var mer grundlig (ökar körtiden)"
|
|
|
|
#: builtin/gc.c:542
|
|
msgid "enable auto-gc mode"
|
|
msgstr "aktivera auto-gc-läge"
|
|
|
|
#: builtin/gc.c:545
|
|
msgid "force running gc even if there may be another gc running"
|
|
msgstr "tvinga gc-körning även om en annan gc kanske körs"
|
|
|
|
#: builtin/gc.c:548
|
|
msgid "repack all other packs except the largest pack"
|
|
msgstr "packa om alla paket förutom det största paketet"
|
|
|
|
#: builtin/gc.c:565
|
|
#, c-format
|
|
msgid "failed to parse gc.logexpiry value %s"
|
|
msgstr "kunde inte tolka värdet %s för gc.logexpiry"
|
|
|
|
#: builtin/gc.c:576
|
|
#, c-format
|
|
msgid "failed to parse prune expiry value %s"
|
|
msgstr "kunde inte tolka värdet %s för prune expiry"
|
|
|
|
#: builtin/gc.c:596
|
|
#, c-format
|
|
msgid "Auto packing the repository in background for optimum performance.\n"
|
|
msgstr "Packar arkivet automatiskt i bakgrunden för optimal prestanda.\n"
|
|
|
|
#: builtin/gc.c:598
|
|
#, c-format
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
|
|
|
|
#: builtin/gc.c:599
|
|
#, c-format
|
|
msgid "See \"git help gc\" for manual housekeeping.\n"
|
|
msgstr "Se \"git help gc\" för manuell hushållning.\n"
|
|
|
|
#: builtin/gc.c:639
|
|
#, c-format
|
|
msgid ""
|
|
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
|
|
msgstr ""
|
|
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
|
|
"är fallet)"
|
|
|
|
#: builtin/gc.c:694
|
|
msgid ""
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
|
msgstr ""
|
|
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
|
|
"dem."
|
|
|
|
#: builtin/grep.c:30
|
|
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
|
|
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
|
|
|
|
#: builtin/grep.c:225
|
|
#, c-format
|
|
msgid "grep: failed to create thread: %s"
|
|
msgstr "grep: misslyckades skapa tråd. %s"
|
|
|
|
#: builtin/grep.c:279
|
|
#, c-format
|
|
msgid "invalid number of threads specified (%d) for %s"
|
|
msgstr "felaktigt antal trådar angivet (%d) för %s"
|
|
|
|
#. TRANSLATORS: %s is the configuration
|
|
#. variable for tweaking threads, currently
|
|
#. grep.threads
|
|
#.
|
|
#: 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 "trådstöd saknas, ignorerar %s"
|
|
|
|
#: builtin/grep.c:453 builtin/grep.c:578 builtin/grep.c:618
|
|
#, c-format
|
|
msgid "unable to read tree (%s)"
|
|
msgstr "kunde inte läsa träd (%s)"
|
|
|
|
#: builtin/grep.c:633
|
|
#, c-format
|
|
msgid "unable to grep from object of type %s"
|
|
msgstr "kunde inte \"grep\" från objekt av typen %s"
|
|
|
|
#: builtin/grep.c:704
|
|
#, c-format
|
|
msgid "switch `%c' expects a numerical value"
|
|
msgstr "flaggan \"%c\" antar ett numeriskt värde"
|
|
|
|
#: builtin/grep.c:803
|
|
msgid "search in index instead of in the work tree"
|
|
msgstr "sök i indexet istället för i arbetskatalogen"
|
|
|
|
#: builtin/grep.c:805
|
|
msgid "find in contents not managed by git"
|
|
msgstr "sök i innehåll som inte hanteras av git"
|
|
|
|
#: builtin/grep.c:807
|
|
msgid "search in both tracked and untracked files"
|
|
msgstr "sök i både spårade och ospårade filer"
|
|
|
|
#: builtin/grep.c:809
|
|
msgid "ignore files specified via '.gitignore'"
|
|
msgstr "ignorera filer angivna i \".gitignore\""
|
|
|
|
#: builtin/grep.c:811
|
|
msgid "recursively search in each submodule"
|
|
msgstr "sök varje undermodul rekursivt"
|
|
|
|
#: builtin/grep.c:814
|
|
msgid "show non-matching lines"
|
|
msgstr "visa rader som inte träffas"
|
|
|
|
#: builtin/grep.c:816
|
|
msgid "case insensitive matching"
|
|
msgstr "skiftlägesokänslig sökning"
|
|
|
|
#: builtin/grep.c:818
|
|
msgid "match patterns only at word boundaries"
|
|
msgstr "matcha endast mönster vid ordgränser"
|
|
|
|
#: builtin/grep.c:820
|
|
msgid "process binary files as text"
|
|
msgstr "hantera binärfiler som text"
|
|
|
|
#: builtin/grep.c:822
|
|
msgid "don't match patterns in binary files"
|
|
msgstr "träffa inte mönster i binärfiler"
|
|
|
|
#: builtin/grep.c:825
|
|
msgid "process binary files with textconv filters"
|
|
msgstr "hantera binärfiler med textconv-filter"
|
|
|
|
#: builtin/grep.c:827
|
|
msgid "search in subdirectories (default)"
|
|
msgstr "sök i underkataloger (standard)"
|
|
|
|
#: builtin/grep.c:829
|
|
msgid "descend at most <depth> levels"
|
|
msgstr "gå som mest ned <djup> nivåer"
|
|
|
|
#: builtin/grep.c:833
|
|
msgid "use extended POSIX regular expressions"
|
|
msgstr "använd utökade POSIX-reguljära uttryck"
|
|
|
|
#: builtin/grep.c:836
|
|
msgid "use basic POSIX regular expressions (default)"
|
|
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
|
|
|
|
#: builtin/grep.c:839
|
|
msgid "interpret patterns as fixed strings"
|
|
msgstr "tolka mönster som fixerade strängar"
|
|
|
|
#: builtin/grep.c:842
|
|
msgid "use Perl-compatible regular expressions"
|
|
msgstr "använd Perlkompatibla reguljära uttryck"
|
|
|
|
#: builtin/grep.c:845
|
|
msgid "show line numbers"
|
|
msgstr "visa radnummer"
|
|
|
|
#: builtin/grep.c:846
|
|
msgid "show column number of first match"
|
|
msgstr "visa kolumnnummer för första träff"
|
|
|
|
#: builtin/grep.c:847
|
|
msgid "don't show filenames"
|
|
msgstr "visa inte filnamn"
|
|
|
|
#: builtin/grep.c:848
|
|
msgid "show filenames"
|
|
msgstr "visa filnamn"
|
|
|
|
#: builtin/grep.c:850
|
|
msgid "show filenames relative to top directory"
|
|
msgstr "visa filnamn relativa till toppkatalogen"
|
|
|
|
#: builtin/grep.c:852
|
|
msgid "show only filenames instead of matching lines"
|
|
msgstr "visa endast filnamn istället för träffade rader"
|
|
|
|
#: builtin/grep.c:854
|
|
msgid "synonym for --files-with-matches"
|
|
msgstr "synonym för --files-with-matches"
|
|
|
|
#: builtin/grep.c:857
|
|
msgid "show only the names of files without match"
|
|
msgstr "visa endast namn på filer utan träffar"
|
|
|
|
#: builtin/grep.c:859
|
|
msgid "print NUL after filenames"
|
|
msgstr "skriv NUL efter filnamn"
|
|
|
|
#: builtin/grep.c:862
|
|
msgid "show only matching parts of a line"
|
|
msgstr "visa endast träffade delar av rader"
|
|
|
|
#: builtin/grep.c:864
|
|
msgid "show the number of matches instead of matching lines"
|
|
msgstr "visa antal träffar istället för träffade rader"
|
|
|
|
#: builtin/grep.c:865
|
|
msgid "highlight matches"
|
|
msgstr "ljusmarkera träffar"
|
|
|
|
#: builtin/grep.c:867
|
|
msgid "print empty line between matches from different files"
|
|
msgstr "skriv tomma rader mellan träffar från olika filer"
|
|
|
|
#: builtin/grep.c:869
|
|
msgid "show filename only once above matches from same file"
|
|
msgstr "visa filnamn endast en gång ovanför träffar från samma fil"
|
|
|
|
#: builtin/grep.c:872
|
|
msgid "show <n> context lines before and after matches"
|
|
msgstr "visa <n> rader sammanhang före och efter träffar"
|
|
|
|
#: builtin/grep.c:875
|
|
msgid "show <n> context lines before matches"
|
|
msgstr "visa <n> rader sammanhang före träffar"
|
|
|
|
#: builtin/grep.c:877
|
|
msgid "show <n> context lines after matches"
|
|
msgstr "visa <n> rader sammanhang efter träffar"
|
|
|
|
#: builtin/grep.c:879
|
|
msgid "use <n> worker threads"
|
|
msgstr "använd <n> jobbtrådar"
|
|
|
|
#: builtin/grep.c:880
|
|
msgid "shortcut for -C NUM"
|
|
msgstr "genväg för -C NUM"
|
|
|
|
#: builtin/grep.c:883
|
|
msgid "show a line with the function name before matches"
|
|
msgstr "visa en rad med funktionsnamnet före träffen"
|
|
|
|
#: builtin/grep.c:885
|
|
msgid "show the surrounding function"
|
|
msgstr "visa den omkringliggande funktionen"
|
|
|
|
#: builtin/grep.c:888
|
|
msgid "read patterns from file"
|
|
msgstr "läs mönster från fil"
|
|
|
|
#: builtin/grep.c:890
|
|
msgid "match <pattern>"
|
|
msgstr "träffa <mönster>"
|
|
|
|
#: builtin/grep.c:892
|
|
msgid "combine patterns specified with -e"
|
|
msgstr "kombinera mönster som anges med -e"
|
|
|
|
#: builtin/grep.c:904
|
|
msgid "indicate hit with exit status without output"
|
|
msgstr "ange träff med slutstatuskod utan utdata"
|
|
|
|
#: builtin/grep.c:906
|
|
msgid "show only matches from files that match all patterns"
|
|
msgstr "visa endast träffar från filer som träffar alla mönster"
|
|
|
|
#: builtin/grep.c:908
|
|
msgid "show parse tree for grep expression"
|
|
msgstr "visa analysträd för grep-uttryck"
|
|
|
|
#: builtin/grep.c:912
|
|
msgid "pager"
|
|
msgstr "bläddrare"
|
|
|
|
#: builtin/grep.c:912
|
|
msgid "show matching files in the pager"
|
|
msgstr "visa träffade filer i filbläddraren"
|
|
|
|
#: builtin/grep.c:916
|
|
msgid "allow calling of grep(1) (ignored by this build)"
|
|
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
|
|
|
|
#: builtin/grep.c:983
|
|
msgid "no pattern given"
|
|
msgstr "inget mönster angavs"
|
|
|
|
#: builtin/grep.c:1019
|
|
msgid "--no-index or --untracked cannot be used with revs"
|
|
msgstr "--no-index och --untracked kan inte användas med revisioner"
|
|
|
|
#: builtin/grep.c:1027
|
|
#, c-format
|
|
msgid "unable to resolve revision: %s"
|
|
msgstr "kan inte slå upp revision: %s"
|
|
|
|
#: builtin/grep.c:1057
|
|
msgid "--untracked not supported with --recurse-submodules"
|
|
msgstr "--untracked stöds inte med --recurse-submodules"
|
|
|
|
#: builtin/grep.c:1061
|
|
msgid "invalid option combination, ignoring --threads"
|
|
msgstr "ogiltig kombination av flaggor, ignorerar --threads"
|
|
|
|
#: builtin/grep.c:1064 builtin/pack-objects.c:3547
|
|
msgid "no threads support, ignoring --threads"
|
|
msgstr "trådstöd saknas, ignorerar --threads"
|
|
|
|
#: builtin/grep.c:1067 builtin/index-pack.c:1535 builtin/pack-objects.c:2851
|
|
#, c-format
|
|
msgid "invalid number of threads specified (%d)"
|
|
msgstr "felaktigt antal trådar angivet (%d)"
|
|
|
|
#: builtin/grep.c:1101
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
|
|
|
|
#: builtin/grep.c:1127
|
|
msgid "--cached or --untracked cannot be used with --no-index"
|
|
msgstr "--cached och --untracked kan inte användas med --no-index"
|
|
|
|
#: builtin/grep.c:1133
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents"
|
|
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll"
|
|
|
|
#: builtin/grep.c:1141
|
|
msgid "both --cached and trees are given"
|
|
msgstr "både --cached och träd angavs"
|
|
|
|
#: builtin/hash-object.c:85
|
|
msgid ""
|
|
"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
|
|
"[--] <file>..."
|
|
msgstr ""
|
|
"git hash-object [-t <typ>] [-w] [--path=<fil> | --no-filters] [--stdin] [--] "
|
|
"<fil>..."
|
|
|
|
#: builtin/hash-object.c:86
|
|
msgid "git hash-object --stdin-paths"
|
|
msgstr "git hash-object --stdin-paths"
|
|
|
|
#: builtin/hash-object.c:98
|
|
msgid "object type"
|
|
msgstr "objekttyp"
|
|
|
|
#: builtin/hash-object.c:99
|
|
msgid "write the object into the object database"
|
|
msgstr "skriv objektet till objektdatabasen"
|
|
|
|
#: builtin/hash-object.c:101
|
|
msgid "read the object from stdin"
|
|
msgstr "läs objektet från standard in"
|
|
|
|
#: builtin/hash-object.c:103
|
|
msgid "store file as is without filters"
|
|
msgstr "spara filen som den är utan filer"
|
|
|
|
#: builtin/hash-object.c:104
|
|
msgid ""
|
|
"just hash any random garbage to create corrupt objects for debugging Git"
|
|
msgstr ""
|
|
"hasha slumpmässigt skräp för att skapa korrupta objekt för felsökning av Git"
|
|
|
|
#: builtin/hash-object.c:105
|
|
msgid "process file as it were from this path"
|
|
msgstr "hantera filen som om den kom från sökvägen"
|
|
|
|
#: builtin/help.c:46
|
|
msgid "print all available commands"
|
|
msgstr "visa alla tillgängliga kommandon"
|
|
|
|
#: builtin/help.c:47
|
|
msgid "exclude guides"
|
|
msgstr "uteslut vägledningar"
|
|
|
|
#: builtin/help.c:48
|
|
msgid "print list of useful guides"
|
|
msgstr "lista användbara vägledningar"
|
|
|
|
#: builtin/help.c:49
|
|
msgid "print all configuration variable names"
|
|
msgstr "visa namn på alla konfigurationsvariabler"
|
|
|
|
#: builtin/help.c:51
|
|
msgid "show man page"
|
|
msgstr "visa manualsida"
|
|
|
|
#: builtin/help.c:52
|
|
msgid "show manual in web browser"
|
|
msgstr "visa manual i webbläsare"
|
|
|
|
#: builtin/help.c:54
|
|
msgid "show info page"
|
|
msgstr "visa info-sida"
|
|
|
|
#: builtin/help.c:56
|
|
msgid "print command description"
|
|
msgstr "visa kommandobeskrivning"
|
|
|
|
#: builtin/help.c:61
|
|
msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
|
|
msgstr "git help [--all] [--guides] [--man | --web | --info] [<kommando>]"
|
|
|
|
#: builtin/help.c:77
|
|
#, c-format
|
|
msgid "unrecognized help format '%s'"
|
|
msgstr "okänt hjälpformat: \"%s\""
|
|
|
|
#: builtin/help.c:104
|
|
msgid "Failed to start emacsclient."
|
|
msgstr "Misslyckades starta emacsclient."
|
|
|
|
#: builtin/help.c:117
|
|
msgid "Failed to parse emacsclient version."
|
|
msgstr "Kunde inte tolka emacsclient-version."
|
|
|
|
#: builtin/help.c:125
|
|
#, c-format
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
|
msgstr "emacsclient version \"%d\" för gammal (< 22)."
|
|
|
|
#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
|
|
#, c-format
|
|
msgid "failed to exec '%s'"
|
|
msgstr "exec misslyckades för \"%s\""
|
|
|
|
#: builtin/help.c:221
|
|
#, c-format
|
|
msgid ""
|
|
"'%s': path for unsupported man viewer.\n"
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
msgstr ""
|
|
"\"%s\": sökväg för man-visare som ej stöds.\n"
|
|
"Använd \"man.<verktyg>.cmd\" istället."
|
|
|
|
#: builtin/help.c:233
|
|
#, c-format
|
|
msgid ""
|
|
"'%s': cmd for supported man viewer.\n"
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
msgstr ""
|
|
"\"%s\": kommando för man-visare som stöds.\n"
|
|
"Använd \"man.<verktyg>.path\" istället."
|
|
|
|
#: builtin/help.c:350
|
|
#, c-format
|
|
msgid "'%s': unknown man viewer."
|
|
msgstr "\"%s\": okänd man-visare."
|
|
|
|
#: builtin/help.c:367
|
|
msgid "no man viewer handled the request"
|
|
msgstr "ingen man-visare hanterade förfrågan"
|
|
|
|
#: builtin/help.c:375
|
|
msgid "no info viewer handled the request"
|
|
msgstr "ingen info-visare hanterade förfrågan"
|
|
|
|
#: builtin/help.c:434 builtin/help.c:445 git.c:336
|
|
#, c-format
|
|
msgid "'%s' is aliased to '%s'"
|
|
msgstr "\"%s\" är ett alias för \"%s\""
|
|
|
|
#: builtin/help.c:448 git.c:365
|
|
#, c-format
|
|
msgid "bad alias.%s string: %s"
|
|
msgstr "felaktig alias.%s-sträng: %s"
|
|
|
|
#: builtin/help.c:477 builtin/help.c:507
|
|
#, c-format
|
|
msgid "usage: %s%s"
|
|
msgstr "användning: %s%s"
|
|
|
|
#: builtin/help.c:491
|
|
msgid "'git help config' for more information"
|
|
msgstr "\"git help config\" för mer information"
|
|
|
|
#: builtin/index-pack.c:185
|
|
#, c-format
|
|
msgid "object type mismatch at %s"
|
|
msgstr "objekttyp stämmer inte överens vid %s"
|
|
|
|
#: builtin/index-pack.c:205
|
|
#, c-format
|
|
msgid "did not receive expected object %s"
|
|
msgstr "emottog inte det förväntade objektet %s"
|
|
|
|
#: builtin/index-pack.c:208
|
|
#, c-format
|
|
msgid "object %s: expected type %s, found %s"
|
|
msgstr "objektet %s: förväntad typ %s, såg %s"
|
|
|
|
#: builtin/index-pack.c:258
|
|
#, c-format
|
|
msgid "cannot fill %d byte"
|
|
msgid_plural "cannot fill %d bytes"
|
|
msgstr[0] "kan inte fylla %d byte"
|
|
msgstr[1] "kan inte fylla %d byte"
|
|
|
|
#: builtin/index-pack.c:268
|
|
msgid "early EOF"
|
|
msgstr "tidigt filslut"
|
|
|
|
#: builtin/index-pack.c:269
|
|
msgid "read error on input"
|
|
msgstr "indataläsfel"
|
|
|
|
#: builtin/index-pack.c:281
|
|
msgid "used more bytes than were available"
|
|
msgstr "använde fler byte än tillgängligt"
|
|
|
|
#: builtin/index-pack.c:288 builtin/pack-objects.c:606
|
|
msgid "pack too large for current definition of off_t"
|
|
msgstr "paket för stort för nuvarande definition av off_t"
|
|
|
|
#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
|
|
msgid "pack exceeds maximum allowed size"
|
|
msgstr "paket är större än tillåten maximal storlek"
|
|
|
|
#: builtin/index-pack.c:312
|
|
#, c-format
|
|
msgid "cannot open packfile '%s'"
|
|
msgstr "kan inte öppna paketfilen \"%s\""
|
|
|
|
#: builtin/index-pack.c:326
|
|
msgid "pack signature mismatch"
|
|
msgstr "paketsignatur stämmer inte överens"
|
|
|
|
#: builtin/index-pack.c:328
|
|
#, c-format
|
|
msgid "pack version %<PRIu32> unsupported"
|
|
msgstr "paketversion %<PRIu32> stöds ej"
|
|
|
|
#: builtin/index-pack.c:346
|
|
#, c-format
|
|
msgid "pack has bad object at offset %<PRIuMAX>: %s"
|
|
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
|
|
|
|
#: builtin/index-pack.c:466
|
|
#, c-format
|
|
msgid "inflate returned %d"
|
|
msgstr "inflate returnerade %d"
|
|
|
|
#: builtin/index-pack.c:515
|
|
msgid "offset value overflow for delta base object"
|
|
msgstr "indexvärdespill för deltabasobjekt"
|
|
|
|
#: builtin/index-pack.c:523
|
|
msgid "delta base offset is out of bound"
|
|
msgstr "deltabasindex utanför gränsen"
|
|
|
|
#: builtin/index-pack.c:531
|
|
#, c-format
|
|
msgid "unknown object type %d"
|
|
msgstr "okänd objekttyp %d"
|
|
|
|
#: builtin/index-pack.c:562
|
|
msgid "cannot pread pack file"
|
|
msgstr "kan inte utföra \"pread\" på paketfil"
|
|
|
|
#: builtin/index-pack.c:564
|
|
#, c-format
|
|
msgid "premature end of pack file, %<PRIuMAX> byte missing"
|
|
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
|
|
msgstr[0] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
|
|
msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
|
|
|
|
#: builtin/index-pack.c:590
|
|
msgid "serious inflate inconsistency"
|
|
msgstr "allvarlig inflate-inkonsekvens"
|
|
|
|
#: 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 "SHA1-KOLLISION UPPTÄCKT VID %s !"
|
|
|
|
#: 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 "kunde inte läsa %s"
|
|
|
|
#: builtin/index-pack.c:802
|
|
#, c-format
|
|
msgid "cannot read existing object info %s"
|
|
msgstr "kan inte läsa information om befintligt objekt %s"
|
|
|
|
#: builtin/index-pack.c:810
|
|
#, c-format
|
|
msgid "cannot read existing object %s"
|
|
msgstr "kan inte läsa befintligt objekt %s"
|
|
|
|
#: builtin/index-pack.c:824
|
|
#, c-format
|
|
msgid "invalid blob object %s"
|
|
msgstr "ogiltigt blob-objekt %s"
|
|
|
|
#: builtin/index-pack.c:827 builtin/index-pack.c:846
|
|
msgid "fsck error in packed object"
|
|
msgstr "fsck-fel i packat objekt"
|
|
|
|
#: builtin/index-pack.c:848
|
|
#, c-format
|
|
msgid "Not all child objects of %s are reachable"
|
|
msgstr "Inte alla barnobjekt för %s kan nås"
|
|
|
|
#: builtin/index-pack.c:920 builtin/index-pack.c:951
|
|
msgid "failed to apply delta"
|
|
msgstr "misslyckades tillämpa delta"
|
|
|
|
#: builtin/index-pack.c:1121
|
|
msgid "Receiving objects"
|
|
msgstr "Tar emot objekt"
|
|
|
|
#: builtin/index-pack.c:1121
|
|
msgid "Indexing objects"
|
|
msgstr "Skapar index för objekt"
|
|
|
|
#: builtin/index-pack.c:1155
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
|
msgstr "paketet är trasigt (SHA1 stämmer inte)"
|
|
|
|
#: builtin/index-pack.c:1160
|
|
msgid "cannot fstat packfile"
|
|
msgstr "kan inte utföra \"fstat\" på paketfil"
|
|
|
|
#: builtin/index-pack.c:1163
|
|
msgid "pack has junk at the end"
|
|
msgstr "paket har skräp i slutet"
|
|
|
|
#: builtin/index-pack.c:1175
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
|
|
|
|
#: builtin/index-pack.c:1198
|
|
msgid "Resolving deltas"
|
|
msgstr "Analyserar delta"
|
|
|
|
#: builtin/index-pack.c:1208 builtin/pack-objects.c:2615
|
|
#, c-format
|
|
msgid "unable to create thread: %s"
|
|
msgstr "kunde inte skapa tråd: %s"
|
|
|
|
#: builtin/index-pack.c:1249
|
|
msgid "confusion beyond insanity"
|
|
msgstr "förvirrad bortom vanvett"
|
|
|
|
#: builtin/index-pack.c:1255
|
|
#, c-format
|
|
msgid "completed with %d local object"
|
|
msgid_plural "completed with %d local objects"
|
|
msgstr[0] "slutfördes med %d lokalt objekt"
|
|
msgstr[1] "slutfördes med %d lokala objekt"
|
|
|
|
#: builtin/index-pack.c:1267
|
|
#, c-format
|
|
msgid "Unexpected tail checksum for %s (disk corruption?)"
|
|
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
|
|
|
|
#: builtin/index-pack.c:1271
|
|
#, c-format
|
|
msgid "pack has %d unresolved delta"
|
|
msgid_plural "pack has %d unresolved deltas"
|
|
msgstr[0] "paketet har %d oanalyserat delta"
|
|
msgstr[1] "paketet har %d oanalyserade delta"
|
|
|
|
#: builtin/index-pack.c:1295
|
|
#, c-format
|
|
msgid "unable to deflate appended object (%d)"
|
|
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
|
|
|
|
#: builtin/index-pack.c:1392
|
|
#, c-format
|
|
msgid "local object %s is corrupt"
|
|
msgstr "lokalt objekt %s är trasigt"
|
|
|
|
#: builtin/index-pack.c:1406
|
|
#, c-format
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
|
|
|
|
#: builtin/index-pack.c:1431
|
|
#, c-format
|
|
msgid "cannot write %s file '%s'"
|
|
msgstr "kan inte ta skriva %s-fil \"%s\""
|
|
|
|
#: builtin/index-pack.c:1439
|
|
#, c-format
|
|
msgid "cannot close written %s file '%s'"
|
|
msgstr "kan inte stänga skriven %s-fil \"%s\""
|
|
|
|
#: builtin/index-pack.c:1463
|
|
msgid "error while closing pack file"
|
|
msgstr "fel vid stängning av paketfil"
|
|
|
|
#: builtin/index-pack.c:1477
|
|
msgid "cannot store pack file"
|
|
msgstr "kan inte spara paketfil"
|
|
|
|
#: builtin/index-pack.c:1485
|
|
msgid "cannot store index file"
|
|
msgstr "kan inte spara indexfil"
|
|
|
|
#: builtin/index-pack.c:1529 builtin/pack-objects.c:2862
|
|
#, c-format
|
|
msgid "bad pack.indexversion=%<PRIu32>"
|
|
msgstr "felaktig pack.indexversion=%<PRIu32>"
|
|
|
|
#: builtin/index-pack.c:1597
|
|
#, c-format
|
|
msgid "Cannot open existing pack file '%s'"
|
|
msgstr "Kan inte öppna befintlig paketfil \"%s\""
|
|
|
|
#: builtin/index-pack.c:1599
|
|
#, c-format
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
|
msgstr "Kan inte öppna befintlig paket-idx-fil för \"%s\""
|
|
|
|
#: builtin/index-pack.c:1647
|
|
#, c-format
|
|
msgid "non delta: %d object"
|
|
msgid_plural "non delta: %d objects"
|
|
msgstr[0] "icke-delta: %d objekt"
|
|
msgstr[1] "icke-delta: %d objekt"
|
|
|
|
#: builtin/index-pack.c:1654
|
|
#, c-format
|
|
msgid "chain length = %d: %lu object"
|
|
msgid_plural "chain length = %d: %lu objects"
|
|
msgstr[0] "kedjelängd = %d: %lu objekt"
|
|
msgstr[1] "kedjelängd = %d: %lu objekt"
|
|
|
|
#: builtin/index-pack.c:1693
|
|
msgid "Cannot come back to cwd"
|
|
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
|
|
|
|
#: 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 "felaktig %s"
|
|
|
|
#: builtin/index-pack.c:1781
|
|
msgid "--fix-thin cannot be used without --stdin"
|
|
msgstr "--fix-thin kan inte användas med --stdin"
|
|
|
|
#: builtin/index-pack.c:1783
|
|
msgid "--stdin requires a git repository"
|
|
msgstr "--stdin kräver ett git-arkiv"
|
|
|
|
#: builtin/index-pack.c:1789
|
|
msgid "--verify with no packfile name given"
|
|
msgstr "--verify angavs utan paketfilnamn"
|
|
|
|
#: builtin/index-pack.c:1837 builtin/unpack-objects.c:582
|
|
msgid "fsck error in pack objects"
|
|
msgstr "fsck-fel i packat objekt"
|
|
|
|
#: builtin/init-db.c:61
|
|
#, c-format
|
|
msgid "cannot stat template '%s'"
|
|
msgstr "kan inte ta status på mallen \"%s\""
|
|
|
|
#: builtin/init-db.c:66
|
|
#, c-format
|
|
msgid "cannot opendir '%s'"
|
|
msgstr "kan inte öppna katalogen (opendir) \"%s\""
|
|
|
|
#: builtin/init-db.c:78
|
|
#, c-format
|
|
msgid "cannot readlink '%s'"
|
|
msgstr "kan inte läsa länk (readlink) \"%s\""
|
|
|
|
#: builtin/init-db.c:80
|
|
#, c-format
|
|
msgid "cannot symlink '%s' '%s'"
|
|
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
|
|
|
|
#: builtin/init-db.c:86
|
|
#, c-format
|
|
msgid "cannot copy '%s' to '%s'"
|
|
msgstr "kan inte kopiera \"%s\" till \"%s\""
|
|
|
|
#: builtin/init-db.c:90
|
|
#, c-format
|
|
msgid "ignoring template %s"
|
|
msgstr "ignorerar mallen %s"
|
|
|
|
#: builtin/init-db.c:121
|
|
#, c-format
|
|
msgid "templates not found in %s"
|
|
msgstr "mallarna hittades inte i %s"
|
|
|
|
#: builtin/init-db.c:136
|
|
#, c-format
|
|
msgid "not copying templates from '%s': %s"
|
|
msgstr "kopierade inte mallar från \"%s\": %s"
|
|
|
|
#: builtin/init-db.c:334
|
|
#, c-format
|
|
msgid "unable to handle file type %d"
|
|
msgstr "kan inte hantera filtyp %d"
|
|
|
|
#: builtin/init-db.c:337
|
|
#, c-format
|
|
msgid "unable to move %s to %s"
|
|
msgstr "kan inte flytta %s till %s"
|
|
|
|
#: builtin/init-db.c:354 builtin/init-db.c:357
|
|
#, c-format
|
|
msgid "%s already exists"
|
|
msgstr "%s finns redan"
|
|
|
|
#: builtin/init-db.c:413
|
|
#, c-format
|
|
msgid "Reinitialized existing shared Git repository in %s%s\n"
|
|
msgstr "Ominitierade befintligt delat Git-arkiv i %s%s\n"
|
|
|
|
#: builtin/init-db.c:414
|
|
#, c-format
|
|
msgid "Reinitialized existing Git repository in %s%s\n"
|
|
msgstr "Ominitierade befintligt Git-arkiv i %s%s\n"
|
|
|
|
#: builtin/init-db.c:418
|
|
#, c-format
|
|
msgid "Initialized empty shared Git repository in %s%s\n"
|
|
msgstr "Initierade tomt delat Git-arkiv i %s%s\n"
|
|
|
|
#: builtin/init-db.c:419
|
|
#, c-format
|
|
msgid "Initialized empty Git repository in %s%s\n"
|
|
msgstr "Initierade tomt Git-arkiv i %s%s\n"
|
|
|
|
#: builtin/init-db.c:468
|
|
msgid ""
|
|
"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
|
|
"shared[=<permissions>]] [<directory>]"
|
|
msgstr ""
|
|
"git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
|
|
"shared[=<behörigheter>]] [<katalog>]"
|
|
|
|
#: builtin/init-db.c:491
|
|
msgid "permissions"
|
|
msgstr "behörigheter"
|
|
|
|
#: builtin/init-db.c:492
|
|
msgid "specify that the git repository is to be shared amongst several users"
|
|
msgstr "ange att git-arkivet ska delas bland flera användare"
|
|
|
|
#: builtin/init-db.c:529 builtin/init-db.c:534
|
|
#, c-format
|
|
msgid "cannot mkdir %s"
|
|
msgstr "kan inte skapa katalogen (mkdir) %s"
|
|
|
|
#: builtin/init-db.c:538
|
|
#, c-format
|
|
msgid "cannot chdir to %s"
|
|
msgstr "kan inte byta katalog (chdir) till %s"
|
|
|
|
#: builtin/init-db.c:559
|
|
#, c-format
|
|
msgid ""
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
"dir=<directory>)"
|
|
msgstr ""
|
|
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
|
|
"dir=<katalog>)"
|
|
|
|
#: builtin/init-db.c:587
|
|
#, c-format
|
|
msgid "Cannot access work tree '%s'"
|
|
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
|
|
|
|
#: builtin/interpret-trailers.c:16
|
|
msgid ""
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
"<token>[(=|:)<value>])...] [<file>...]"
|
|
msgstr ""
|
|
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
|
|
"<symbol>[(=|:)<värde>])...] [<fil>...]"
|
|
|
|
#: builtin/interpret-trailers.c:95
|
|
msgid "edit files in place"
|
|
msgstr "redigera filer på plats"
|
|
|
|
#: builtin/interpret-trailers.c:96
|
|
msgid "trim empty trailers"
|
|
msgstr "ta bort tomma släprader"
|
|
|
|
#: builtin/interpret-trailers.c:99
|
|
msgid "where to place the new trailer"
|
|
msgstr "var nya släprader ska placeras"
|
|
|
|
#: builtin/interpret-trailers.c:101
|
|
msgid "action if trailer already exists"
|
|
msgstr "att göra om släprader redan finns"
|
|
|
|
#: builtin/interpret-trailers.c:103
|
|
msgid "action if trailer is missing"
|
|
msgstr "att göra om släprader saknas"
|
|
|
|
#: builtin/interpret-trailers.c:105
|
|
msgid "output only the trailers"
|
|
msgstr "visa endast släprader"
|
|
|
|
#: builtin/interpret-trailers.c:106
|
|
msgid "do not apply config rules"
|
|
msgstr "använd inte regler från konfigurationen"
|
|
|
|
#: builtin/interpret-trailers.c:107
|
|
msgid "join whitespace-continued values"
|
|
msgstr "slå ihop värden avdelade med blanksteg"
|
|
|
|
#: builtin/interpret-trailers.c:108
|
|
msgid "set parsing options"
|
|
msgstr "välj tolkningsalternativ"
|
|
|
|
#: builtin/interpret-trailers.c:110
|
|
msgid "do not treat --- specially"
|
|
msgstr "tolka inte --- speciellt"
|
|
|
|
#: builtin/interpret-trailers.c:111
|
|
msgid "trailer"
|
|
msgstr "släprad"
|
|
|
|
#: builtin/interpret-trailers.c:112
|
|
msgid "trailer(s) to add"
|
|
msgstr "släprad(er) att lägga till"
|
|
|
|
#: builtin/interpret-trailers.c:123
|
|
msgid "--trailer with --only-input does not make sense"
|
|
msgstr "--trailer med --only-input ger ingen mening"
|
|
|
|
#: builtin/interpret-trailers.c:133
|
|
msgid "no input file given for in-place editing"
|
|
msgstr "ingen indatafil angiven för redigering på plats"
|
|
|
|
#: builtin/log.c:56
|
|
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
|
|
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
|
|
|
|
#: builtin/log.c:57
|
|
msgid "git show [<options>] <object>..."
|
|
msgstr "git show [<flaggor>] <objekt>..."
|
|
|
|
#: builtin/log.c:110
|
|
#, c-format
|
|
msgid "invalid --decorate option: %s"
|
|
msgstr "ogiltig flagga för --decorate: %s"
|
|
|
|
#: builtin/log.c:174
|
|
msgid "show source"
|
|
msgstr "visa källkod"
|
|
|
|
#: builtin/log.c:175
|
|
msgid "Use mail map file"
|
|
msgstr "Använd e-postmappningsfil"
|
|
|
|
#: builtin/log.c:177
|
|
msgid "only decorate refs that match <pattern>"
|
|
msgstr "dekorera endast referenser som motsvarar <mönster>"
|
|
|
|
#: builtin/log.c:179
|
|
msgid "do not decorate refs that match <pattern>"
|
|
msgstr "dekorera inte referenser som motsvarar <mönster>"
|
|
|
|
#: builtin/log.c:180
|
|
msgid "decorate options"
|
|
msgstr "dekoreringsflaggor"
|
|
|
|
#: builtin/log.c:183
|
|
msgid "Process line range n,m in file, counting from 1"
|
|
msgstr "Behandla radintervallet n,m i filen, med början på 1"
|
|
|
|
#: builtin/log.c:281
|
|
#, c-format
|
|
msgid "Final output: %d %s\n"
|
|
msgstr "Slututdata: %d %s\n"
|
|
|
|
#: builtin/log.c:535
|
|
#, c-format
|
|
msgid "git show %s: bad file"
|
|
msgstr "git show %s: felaktig fil"
|
|
|
|
#: builtin/log.c:550 builtin/log.c:645
|
|
#, c-format
|
|
msgid "could not read object %s"
|
|
msgstr "kunde inte läsa objektet %s"
|
|
|
|
#: builtin/log.c:670
|
|
#, c-format
|
|
msgid "unknown type: %d"
|
|
msgstr "okänd typ: %d"
|
|
|
|
#: builtin/log.c:814
|
|
#, c-format
|
|
msgid "%s: invalid cover from description mode"
|
|
msgstr "%s: ogiltigt omslag från beskrivningsläge"
|
|
|
|
#: builtin/log.c:821
|
|
msgid "format.headers without value"
|
|
msgstr "format.headers utan värde"
|
|
|
|
#: builtin/log.c:936
|
|
msgid "name of output directory is too long"
|
|
msgstr "namnet på utdatakatalogen är för långt"
|
|
|
|
#: builtin/log.c:952
|
|
#, c-format
|
|
msgid "cannot open patch file %s"
|
|
msgstr "kan inte öppna patchfilen %s"
|
|
|
|
#: builtin/log.c:969
|
|
msgid "need exactly one range"
|
|
msgstr "behöver precis ett intervall"
|
|
|
|
#: builtin/log.c:979
|
|
msgid "not a range"
|
|
msgstr "inte ett intervall"
|
|
|
|
#: builtin/log.c:1143
|
|
msgid "cover letter needs email format"
|
|
msgstr "omslagsbrevet behöver e-postformat"
|
|
|
|
#: builtin/log.c:1149
|
|
msgid "failed to create cover-letter file"
|
|
msgstr "misslyckades skapa fil för omslagsbrev"
|
|
|
|
#: builtin/log.c:1228
|
|
#, c-format
|
|
msgid "insane in-reply-to: %s"
|
|
msgstr "tokigt in-reply-to: %s"
|
|
|
|
#: builtin/log.c:1255
|
|
msgid "git format-patch [<options>] [<since> | <revision-range>]"
|
|
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
|
|
|
|
#: builtin/log.c:1313
|
|
msgid "two output directories?"
|
|
msgstr "två utdatakataloger?"
|
|
|
|
#: builtin/log.c:1424 builtin/log.c:2197 builtin/log.c:2199 builtin/log.c:2211
|
|
#, c-format
|
|
msgid "unknown commit %s"
|
|
msgstr "okänd incheckning %s"
|
|
|
|
#: 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 "misslyckades slå upp \"%s\" som en giltig referens"
|
|
|
|
#: builtin/log.c:1439
|
|
msgid "could not find exact merge base"
|
|
msgstr "kunde inte hitta exakt sammanslagningsbas"
|
|
|
|
#: 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"
|
|
"Or you could specify base commit by --base=<base-commit-id> manually"
|
|
msgstr ""
|
|
"kunde inte hämta uppström, om du vill lagra basincheckningen automatiskt,\n"
|
|
"använd git branch --set-upstream-to för att spåra en fjärrgren.\n"
|
|
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> manuellt"
|
|
|
|
#: builtin/log.c:1463
|
|
msgid "failed to find exact merge base"
|
|
msgstr "kunde inte hitta exakt sammanslagningsbas"
|
|
|
|
#: builtin/log.c:1474
|
|
msgid "base commit should be the ancestor of revision list"
|
|
msgstr "basincheckningen bör vara förfader till revisionslistan"
|
|
|
|
#: builtin/log.c:1478
|
|
msgid "base commit shouldn't be in revision list"
|
|
msgstr "basincheckningen bör inte vara i revisionslistan"
|
|
|
|
#: builtin/log.c:1531
|
|
msgid "cannot get patch id"
|
|
msgstr "kan inte hämta patch-id"
|
|
|
|
#: builtin/log.c:1583
|
|
msgid "failed to infer range-diff ranges"
|
|
msgstr "misslyckades räkna ut intervall range-diff"
|
|
|
|
#: builtin/log.c:1629
|
|
msgid "use [PATCH n/m] even with a single patch"
|
|
msgstr "använd [PATCH n/m] även för en ensam patch"
|
|
|
|
#: builtin/log.c:1632
|
|
msgid "use [PATCH] even with multiple patches"
|
|
msgstr "använd [PATCH] även för flera patchar"
|
|
|
|
#: builtin/log.c:1636
|
|
msgid "print patches to standard out"
|
|
msgstr "skriv patcharna på standard ut"
|
|
|
|
#: builtin/log.c:1638
|
|
msgid "generate a cover letter"
|
|
msgstr "generera ett följebrev"
|
|
|
|
#: builtin/log.c:1640
|
|
msgid "use simple number sequence for output file names"
|
|
msgstr "använd enkel nummersekvens för utdatafilnamn"
|
|
|
|
#: builtin/log.c:1641
|
|
msgid "sfx"
|
|
msgstr "sfx"
|
|
|
|
#: builtin/log.c:1642
|
|
msgid "use <sfx> instead of '.patch'"
|
|
msgstr "använd <sfx> istället för \".patch\""
|
|
|
|
#: builtin/log.c:1644
|
|
msgid "start numbering patches at <n> instead of 1"
|
|
msgstr "börja numrera patchar på <n> istället för 1"
|
|
|
|
#: builtin/log.c:1646
|
|
msgid "mark the series as Nth re-roll"
|
|
msgstr "markera serien som N:te försök"
|
|
|
|
#: builtin/log.c:1648
|
|
msgid "Use [RFC PATCH] instead of [PATCH]"
|
|
msgstr "Använd [RFC PATCH] istället för [PATCH]"
|
|
|
|
#: builtin/log.c:1651
|
|
msgid "cover-from-description-mode"
|
|
msgstr "cover-from-description-läge"
|
|
|
|
#: builtin/log.c:1652
|
|
msgid "generate parts of a cover letter based on a branch's description"
|
|
msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
|
|
|
|
#: builtin/log.c:1654
|
|
msgid "Use [<prefix>] instead of [PATCH]"
|
|
msgstr "Använd [<prefix>] istället för [PATCH]"
|
|
|
|
#: builtin/log.c:1657
|
|
msgid "store resulting files in <dir>"
|
|
msgstr "spara filerna i <katalog>"
|
|
|
|
#: builtin/log.c:1660
|
|
msgid "don't strip/add [PATCH]"
|
|
msgstr "ta inte bort eller lägg till [PATCH]"
|
|
|
|
#: builtin/log.c:1663
|
|
msgid "don't output binary diffs"
|
|
msgstr "skriv inte binära diffar"
|
|
|
|
#: builtin/log.c:1665
|
|
msgid "output all-zero hash in From header"
|
|
msgstr "använd hashvärde med nollor i From-huvud"
|
|
|
|
#: builtin/log.c:1667
|
|
msgid "don't include a patch matching a commit upstream"
|
|
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
|
|
|
|
#: builtin/log.c:1669
|
|
msgid "show patch format instead of default (patch + stat)"
|
|
msgstr "visa patchformat istället för standard (patch + stat)"
|
|
|
|
#: builtin/log.c:1671
|
|
msgid "Messaging"
|
|
msgstr "E-post"
|
|
|
|
#: builtin/log.c:1672
|
|
msgid "header"
|
|
msgstr "huvud"
|
|
|
|
#: builtin/log.c:1673
|
|
msgid "add email header"
|
|
msgstr "lägg till e-posthuvud"
|
|
|
|
#: builtin/log.c:1674 builtin/log.c:1676
|
|
msgid "email"
|
|
msgstr "epost"
|
|
|
|
#: builtin/log.c:1674
|
|
msgid "add To: header"
|
|
msgstr "lägg till mottagarhuvud (\"To:\")"
|
|
|
|
#: builtin/log.c:1676
|
|
msgid "add Cc: header"
|
|
msgstr "lägg till kopiehuvud (\"Cc:\")"
|
|
|
|
#: builtin/log.c:1678
|
|
msgid "ident"
|
|
msgstr "ident"
|
|
|
|
#: builtin/log.c:1679
|
|
msgid "set From address to <ident> (or committer ident if absent)"
|
|
msgstr "sätt Från-adress till <ident> (eller incheckare om ident saknas)"
|
|
|
|
#: builtin/log.c:1681
|
|
msgid "message-id"
|
|
msgstr "meddelande-id"
|
|
|
|
#: builtin/log.c:1682
|
|
msgid "make first mail a reply to <message-id>"
|
|
msgstr "gör det första brevet ett svar till <meddelande-id>"
|
|
|
|
#: builtin/log.c:1683 builtin/log.c:1686
|
|
msgid "boundary"
|
|
msgstr "gräns"
|
|
|
|
#: builtin/log.c:1684
|
|
msgid "attach the patch"
|
|
msgstr "bifoga patchen"
|
|
|
|
#: builtin/log.c:1687
|
|
msgid "inline the patch"
|
|
msgstr "gör patchen ett inline-objekt"
|
|
|
|
#: builtin/log.c:1691
|
|
msgid "enable message threading, styles: shallow, deep"
|
|
msgstr "aktivera brevtrådning, typer: shallow, deep"
|
|
|
|
#: builtin/log.c:1693
|
|
msgid "signature"
|
|
msgstr "signatur"
|
|
|
|
#: builtin/log.c:1694
|
|
msgid "add a signature"
|
|
msgstr "lägg till signatur"
|
|
|
|
#: builtin/log.c:1695
|
|
msgid "base-commit"
|
|
msgstr "basincheckning"
|
|
|
|
#: builtin/log.c:1696
|
|
msgid "add prerequisite tree info to the patch series"
|
|
msgstr "lägg till förhandskrävd trädinfo i patchserien"
|
|
|
|
#: builtin/log.c:1698
|
|
msgid "add a signature from a file"
|
|
msgstr "lägg till signatur från fil"
|
|
|
|
#: builtin/log.c:1699
|
|
msgid "don't print the patch filenames"
|
|
msgstr "visa inte filnamn för patchar"
|
|
|
|
#: builtin/log.c:1701
|
|
msgid "show progress while generating patches"
|
|
msgstr "visa förloppsindikator medan patchar skapas"
|
|
|
|
#: builtin/log.c:1703
|
|
msgid "show changes against <rev> in cover letter or single patch"
|
|
msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
|
|
|
|
#: builtin/log.c:1706
|
|
msgid "show changes against <refspec> in cover letter or single patch"
|
|
msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
|
|
|
|
#: builtin/log.c:1708
|
|
msgid "percentage by which creation is weighted"
|
|
msgstr "procent som skapelse vägs med"
|
|
|
|
#: builtin/log.c:1792
|
|
#, c-format
|
|
msgid "invalid ident line: %s"
|
|
msgstr "ogiltig ident-rad: %s"
|
|
|
|
#: builtin/log.c:1807
|
|
msgid "-n and -k are mutually exclusive"
|
|
msgstr "-n och -k kan inte användas samtidigt"
|
|
|
|
#: builtin/log.c:1809
|
|
msgid "--subject-prefix/--rfc and -k are mutually exclusive"
|
|
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
|
|
|
|
#: builtin/log.c:1817
|
|
msgid "--name-only does not make sense"
|
|
msgstr "kan inte använda --name-only"
|
|
|
|
#: builtin/log.c:1819
|
|
msgid "--name-status does not make sense"
|
|
msgstr "kan inte använda --name-status"
|
|
|
|
#: builtin/log.c:1821
|
|
msgid "--check does not make sense"
|
|
msgstr "kan inte använda --check"
|
|
|
|
#: builtin/log.c:1854
|
|
msgid "standard output, or directory, which one?"
|
|
msgstr "standard ut, eller katalog, vilken ska det vara?"
|
|
|
|
#: builtin/log.c:1958
|
|
msgid "--interdiff requires --cover-letter or single patch"
|
|
msgstr "--interdiff kräver --cover-letter eller ensam patch"
|
|
|
|
#: builtin/log.c:1962
|
|
msgid "Interdiff:"
|
|
msgstr "Interdiff:"
|
|
|
|
#: builtin/log.c:1963
|
|
#, c-format
|
|
msgid "Interdiff against v%d:"
|
|
msgstr "Interdiff mot v%d:"
|
|
|
|
#: builtin/log.c:1969
|
|
msgid "--creation-factor requires --range-diff"
|
|
msgstr "--creation-factor kräver --range-diff"
|
|
|
|
#: builtin/log.c:1973
|
|
msgid "--range-diff requires --cover-letter or single patch"
|
|
msgstr "--range-diff kräver --cover-letter eller ensam patch"
|
|
|
|
#: builtin/log.c:1981
|
|
msgid "Range-diff:"
|
|
msgstr "Intervall-diff:"
|
|
|
|
#: builtin/log.c:1982
|
|
#, c-format
|
|
msgid "Range-diff against v%d:"
|
|
msgstr "Intervall-diff mot v%d:"
|
|
|
|
#: builtin/log.c:1993
|
|
#, c-format
|
|
msgid "unable to read signature file '%s'"
|
|
msgstr "kunde inte läsa signaturfil \"%s\""
|
|
|
|
#: builtin/log.c:2029
|
|
msgid "Generating patches"
|
|
msgstr "Skapar patchar"
|
|
|
|
#: builtin/log.c:2073
|
|
msgid "failed to create output files"
|
|
msgstr "misslyckades skapa utdatafiler"
|
|
|
|
#: builtin/log.c:2132
|
|
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
|
|
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
|
|
|
|
#: builtin/log.c:2186
|
|
#, c-format
|
|
msgid ""
|
|
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
|
|
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
|
|
|
|
#: builtin/ls-files.c:470
|
|
msgid "git ls-files [<options>] [<file>...]"
|
|
msgstr "git ls-files [<flaggor>] [<fil>...]"
|
|
|
|
#: builtin/ls-files.c:526
|
|
msgid "identify the file status with tags"
|
|
msgstr "identifiera filstatus med taggar"
|
|
|
|
#: builtin/ls-files.c:528
|
|
msgid "use lowercase letters for 'assume unchanged' files"
|
|
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
|
|
|
|
#: builtin/ls-files.c:530
|
|
msgid "use lowercase letters for 'fsmonitor clean' files"
|
|
msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
|
|
|
|
#: builtin/ls-files.c:532
|
|
msgid "show cached files in the output (default)"
|
|
msgstr "visa cachade filer i utdata (standard)"
|
|
|
|
#: builtin/ls-files.c:534
|
|
msgid "show deleted files in the output"
|
|
msgstr "visa borttagna filer i utdata"
|
|
|
|
#: builtin/ls-files.c:536
|
|
msgid "show modified files in the output"
|
|
msgstr "visa modifierade filer i utdata"
|
|
|
|
#: builtin/ls-files.c:538
|
|
msgid "show other files in the output"
|
|
msgstr "visa andra filer i utdata"
|
|
|
|
#: builtin/ls-files.c:540
|
|
msgid "show ignored files in the output"
|
|
msgstr "visa ignorerade filer i utdata"
|
|
|
|
#: builtin/ls-files.c:543
|
|
msgid "show staged contents' object name in the output"
|
|
msgstr "visa köat innehålls objektnamn i utdata"
|
|
|
|
#: builtin/ls-files.c:545
|
|
msgid "show files on the filesystem that need to be removed"
|
|
msgstr "visa filer i filsystemet som behöver tas bort"
|
|
|
|
#: builtin/ls-files.c:547
|
|
msgid "show 'other' directories' names only"
|
|
msgstr "visa endast namn för \"andra\" kataloger"
|
|
|
|
#: builtin/ls-files.c:549
|
|
msgid "show line endings of files"
|
|
msgstr "visa radslut i filer"
|
|
|
|
#: builtin/ls-files.c:551
|
|
msgid "don't show empty directories"
|
|
msgstr "visa inte tomma kataloger"
|
|
|
|
#: builtin/ls-files.c:554
|
|
msgid "show unmerged files in the output"
|
|
msgstr "visa ej sammanslagna filer i utdata"
|
|
|
|
#: builtin/ls-files.c:556
|
|
msgid "show resolve-undo information"
|
|
msgstr "visa \"resolve-undo\"-information"
|
|
|
|
#: builtin/ls-files.c:558
|
|
msgid "skip files matching pattern"
|
|
msgstr "hoppa över filer som motsvarar mönster"
|
|
|
|
#: builtin/ls-files.c:561
|
|
msgid "exclude patterns are read from <file>"
|
|
msgstr "exkludera mönster som läses från <fil>"
|
|
|
|
#: builtin/ls-files.c:564
|
|
msgid "read additional per-directory exclude patterns in <file>"
|
|
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
|
|
|
|
#: builtin/ls-files.c:566
|
|
msgid "add the standard git exclusions"
|
|
msgstr "lägg till git:s standardexkluderingar"
|
|
|
|
#: builtin/ls-files.c:570
|
|
msgid "make the output relative to the project top directory"
|
|
msgstr "gör utdata relativ till projektets toppkatalog"
|
|
|
|
#: builtin/ls-files.c:573
|
|
msgid "recurse through submodules"
|
|
msgstr "rekursera ner i undermoduler"
|
|
|
|
#: builtin/ls-files.c:575
|
|
msgid "if any <file> is not in the index, treat this as an error"
|
|
msgstr "om en <fil> inte är indexet, betrakta det som ett fel"
|
|
|
|
#: builtin/ls-files.c:576
|
|
msgid "tree-ish"
|
|
msgstr "träd-igt"
|
|
|
|
#: builtin/ls-files.c:577
|
|
msgid "pretend that paths removed since <tree-ish> are still present"
|
|
msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns"
|
|
|
|
#: builtin/ls-files.c:579
|
|
msgid "show debugging data"
|
|
msgstr "visa felsökningsutdata"
|
|
|
|
#: builtin/ls-remote.c:9
|
|
msgid ""
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
" [--symref] [<repository> [<refs>...]]"
|
|
msgstr ""
|
|
"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
|
|
" [-q | --quiet] [--exit-code] [--get-url]\n"
|
|
" [--symref] [<arkiv> [<referenser>...]]"
|
|
|
|
#: builtin/ls-remote.c:59
|
|
msgid "do not print remote URL"
|
|
msgstr "visa inte fjärr-URL"
|
|
|
|
#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1561
|
|
msgid "exec"
|
|
msgstr "exec"
|
|
|
|
#: builtin/ls-remote.c:61 builtin/ls-remote.c:63
|
|
msgid "path of git-upload-pack on the remote host"
|
|
msgstr "sökväg till git-upload-pack på fjärren"
|
|
|
|
#: builtin/ls-remote.c:65
|
|
msgid "limit to tags"
|
|
msgstr "begränsa till taggar"
|
|
|
|
#: builtin/ls-remote.c:66
|
|
msgid "limit to heads"
|
|
msgstr "begränsa till huvuden"
|
|
|
|
#: builtin/ls-remote.c:67
|
|
msgid "do not show peeled tags"
|
|
msgstr "visa inte avskalade taggar"
|
|
|
|
#: builtin/ls-remote.c:69
|
|
msgid "take url.<base>.insteadOf into account"
|
|
msgstr "ta hänsyn till url.<bas>.insteadOf"
|
|
|
|
#: builtin/ls-remote.c:72
|
|
msgid "exit with exit code 2 if no matching refs are found"
|
|
msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
|
|
|
|
#: builtin/ls-remote.c:75
|
|
msgid "show underlying ref in addition to the object pointed by it"
|
|
msgstr "visa underliggande referens och objektet det pekar på"
|
|
|
|
#: builtin/ls-tree.c:30
|
|
msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
|
|
msgstr "git ls-tree [<flaggor>] <träd-igt> [<sökväg>...]"
|
|
|
|
#: builtin/ls-tree.c:128
|
|
msgid "only show trees"
|
|
msgstr "visa endast träd"
|
|
|
|
#: builtin/ls-tree.c:130
|
|
msgid "recurse into subtrees"
|
|
msgstr "rekursera ner i underträd"
|
|
|
|
#: builtin/ls-tree.c:132
|
|
msgid "show trees when recursing"
|
|
msgstr "visa träd medan rekursering"
|
|
|
|
#: builtin/ls-tree.c:135
|
|
msgid "terminate entries with NUL byte"
|
|
msgstr "terminera poster med NUL-byte"
|
|
|
|
#: builtin/ls-tree.c:136
|
|
msgid "include object size"
|
|
msgstr "inkludera objektstorlek"
|
|
|
|
#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
|
|
msgid "list only filenames"
|
|
msgstr "visa endast filnamn"
|
|
|
|
#: builtin/ls-tree.c:143
|
|
msgid "use full path names"
|
|
msgstr "använd fullständiga sökvägsnamn"
|
|
|
|
#: builtin/ls-tree.c:145
|
|
msgid "list entire tree; not just current directory (implies --full-name)"
|
|
msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
|
|
|
|
#: builtin/mailsplit.c:241
|
|
#, c-format
|
|
msgid "empty mbox: '%s'"
|
|
msgstr "tom mbox: \"%s\""
|
|
|
|
#: builtin/merge.c:55
|
|
msgid "git merge [<options>] [<commit>...]"
|
|
msgstr "git merge [<flaggor>] [<incheckning>...]"
|
|
|
|
#: builtin/merge.c:56
|
|
msgid "git merge --abort"
|
|
msgstr "git merge --abort"
|
|
|
|
#: builtin/merge.c:57
|
|
msgid "git merge --continue"
|
|
msgstr "git merge --continue"
|
|
|
|
#: builtin/merge.c:119
|
|
msgid "switch `m' requires a value"
|
|
msgstr "flaggan \"m\" behöver ett värde"
|
|
|
|
#: builtin/merge.c:142
|
|
#, c-format
|
|
msgid "option `%s' requires a value"
|
|
msgstr "flaggan \"%s\" behöver ett värde"
|
|
|
|
#: builtin/merge.c:188
|
|
#, c-format
|
|
msgid "Could not find merge strategy '%s'.\n"
|
|
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
|
|
|
|
#: builtin/merge.c:189
|
|
#, c-format
|
|
msgid "Available strategies are:"
|
|
msgstr "Tillgängliga strategier är:"
|
|
|
|
#: builtin/merge.c:194
|
|
#, c-format
|
|
msgid "Available custom strategies are:"
|
|
msgstr "Tillgängliga skräddarsydda strategier är:"
|
|
|
|
#: builtin/merge.c:245 builtin/pull.c:132
|
|
msgid "do not show a diffstat at the end of the merge"
|
|
msgstr "visa inte en diffstat när sammanslagningen är färdig"
|
|
|
|
#: builtin/merge.c:248 builtin/pull.c:135
|
|
msgid "show a diffstat at the end of the merge"
|
|
msgstr "visa en diffstat när sammanslagningen är färdig"
|
|
|
|
#: builtin/merge.c:249 builtin/pull.c:138
|
|
msgid "(synonym to --stat)"
|
|
msgstr "(synonym till --stat)"
|
|
|
|
#: builtin/merge.c:251 builtin/pull.c:141
|
|
msgid "add (at most <n>) entries from shortlog to merge commit message"
|
|
msgstr ""
|
|
"lägg till (som mest <n>) poster från shortlog till incheckningsmeddelandet"
|
|
|
|
#: builtin/merge.c:254 builtin/pull.c:147
|
|
msgid "create a single commit instead of doing a merge"
|
|
msgstr "skapa en ensam incheckning istället för en sammanslagning"
|
|
|
|
#: builtin/merge.c:256 builtin/pull.c:150
|
|
msgid "perform a commit if the merge succeeds (default)"
|
|
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
|
|
|
|
#: builtin/merge.c:258 builtin/pull.c:153
|
|
msgid "edit message before committing"
|
|
msgstr "redigera meddelande innan incheckning"
|
|
|
|
#: builtin/merge.c:260
|
|
msgid "allow fast-forward (default)"
|
|
msgstr "tillåt snabbspolning (standard)"
|
|
|
|
#: builtin/merge.c:262 builtin/pull.c:160
|
|
msgid "abort if fast-forward is not possible"
|
|
msgstr "avbryt om snabbspolning inte är möjlig"
|
|
|
|
#: builtin/merge.c:266 builtin/pull.c:163
|
|
msgid "verify that the named commit has a valid GPG signature"
|
|
msgstr "bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
|
|
|
|
#: builtin/merge.c:267 builtin/notes.c:787 builtin/pull.c:167
|
|
#: builtin/rebase.c:520 builtin/rebase.c:1575 builtin/revert.c:114
|
|
msgid "strategy"
|
|
msgstr "strategi"
|
|
|
|
#: builtin/merge.c:268 builtin/pull.c:168
|
|
msgid "merge strategy to use"
|
|
msgstr "sammanslagningsstrategi att använda"
|
|
|
|
#: builtin/merge.c:269 builtin/pull.c:171
|
|
msgid "option=value"
|
|
msgstr "alternativ=värde"
|
|
|
|
#: builtin/merge.c:270 builtin/pull.c:172
|
|
msgid "option for selected merge strategy"
|
|
msgstr "alternativ för vald sammanslagningsstrategi"
|
|
|
|
#: builtin/merge.c:272
|
|
msgid "merge commit message (for a non-fast-forward merge)"
|
|
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
|
|
|
|
#: builtin/merge.c:279
|
|
msgid "abort the current in-progress merge"
|
|
msgstr "avbryt den pågående sammanslagningen"
|
|
|
|
#: builtin/merge.c:281
|
|
msgid "--abort but leave index and working tree alone"
|
|
msgstr "--abort men lämna index och arbetskatalog ensamma"
|
|
|
|
#: builtin/merge.c:283
|
|
msgid "continue the current in-progress merge"
|
|
msgstr "fortsätt den pågående sammanslagningen"
|
|
|
|
#: builtin/merge.c:285 builtin/pull.c:179
|
|
msgid "allow merging unrelated histories"
|
|
msgstr "tillåt sammanslagning av orelaterade historier"
|
|
|
|
#: builtin/merge.c:291
|
|
msgid "bypass pre-merge-commit and commit-msg hooks"
|
|
msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
|
|
|
|
#: builtin/merge.c:308
|
|
msgid "could not run stash."
|
|
msgstr "kunde köra stash."
|
|
|
|
#: builtin/merge.c:313
|
|
msgid "stash failed"
|
|
msgstr "stash misslyckades"
|
|
|
|
#: builtin/merge.c:318
|
|
#, c-format
|
|
msgid "not a valid object: %s"
|
|
msgstr "inte ett giltigt objekt: %s"
|
|
|
|
#: builtin/merge.c:340 builtin/merge.c:357
|
|
msgid "read-tree failed"
|
|
msgstr "read-tree misslyckades"
|
|
|
|
#: builtin/merge.c:387
|
|
msgid " (nothing to squash)"
|
|
msgstr " (inget att platta till)"
|
|
|
|
#: builtin/merge.c:398
|
|
#, c-format
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
|
|
|
|
#: builtin/merge.c:448
|
|
#, c-format
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
|
|
|
|
#: builtin/merge.c:499
|
|
#, c-format
|
|
msgid "'%s' does not point to a commit"
|
|
msgstr "\"%s\" verkar inte peka på en incheckning"
|
|
|
|
#: builtin/merge.c:586
|
|
#, c-format
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
|
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
|
|
|
|
#: builtin/merge.c:708
|
|
msgid "Not handling anything other than two heads merge."
|
|
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
|
|
|
|
#: builtin/merge.c:722
|
|
#, c-format
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
msgstr "Felaktig flagga för merge-recursive: -X%s"
|
|
|
|
#: builtin/merge.c:737
|
|
#, c-format
|
|
msgid "unable to write %s"
|
|
msgstr "kunde inte skriva %s"
|
|
|
|
#: builtin/merge.c:789
|
|
#, c-format
|
|
msgid "Could not read from '%s'"
|
|
msgstr "Kunde inte läsa från \"%s\""
|
|
|
|
#: builtin/merge.c:798
|
|
#, c-format
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
msgstr ""
|
|
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
|
|
"den.\n"
|
|
|
|
#: builtin/merge.c:804
|
|
msgid ""
|
|
"Please enter a commit message to explain why this merge is necessary,\n"
|
|
"especially if it merges an updated upstream into a topic branch.\n"
|
|
"\n"
|
|
msgstr ""
|
|
"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"
|
|
"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"
|
|
"temagren.\n"
|
|
"\n"
|
|
|
|
#: builtin/merge.c:809
|
|
msgid "An empty message aborts the commit.\n"
|
|
msgstr "Ett tomt meddelande avbryter incheckningen.\n"
|
|
|
|
#: builtin/merge.c:812
|
|
#, c-format
|
|
msgid ""
|
|
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
|
|
"the commit.\n"
|
|
msgstr ""
|
|
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
|
|
"avbryter incheckningen.\n"
|
|
|
|
#: builtin/merge.c:865
|
|
msgid "Empty commit message."
|
|
msgstr "Tomt incheckningsmeddelande."
|
|
|
|
#: builtin/merge.c:880
|
|
#, c-format
|
|
msgid "Wonderful.\n"
|
|
msgstr "Underbart.\n"
|
|
|
|
#: builtin/merge.c:941
|
|
#, c-format
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
msgstr ""
|
|
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
|
|
|
|
#: builtin/merge.c:980
|
|
msgid "No current branch."
|
|
msgstr "Inte på någon gren."
|
|
|
|
#: builtin/merge.c:982
|
|
msgid "No remote for the current branch."
|
|
msgstr "Ingen fjärr för aktuell gren."
|
|
|
|
#: builtin/merge.c:984
|
|
msgid "No default upstream defined for the current branch."
|
|
msgstr "Ingen standarduppström angiven för aktuell gren."
|
|
|
|
#: builtin/merge.c:989
|
|
#, c-format
|
|
msgid "No remote-tracking branch for %s from %s"
|
|
msgstr "Ingen fjärrspårande gren för %s från %s"
|
|
|
|
#: builtin/merge.c:1046
|
|
#, c-format
|
|
msgid "Bad value '%s' in environment '%s'"
|
|
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
|
|
|
|
#: builtin/merge.c:1149
|
|
#, c-format
|
|
msgid "not something we can merge in %s: %s"
|
|
msgstr "inte något vi kan slå ihop med %s: %s"
|
|
|
|
#: builtin/merge.c:1183
|
|
msgid "not something we can merge"
|
|
msgstr "inte något vi kan slå ihop"
|
|
|
|
#: builtin/merge.c:1286
|
|
msgid "--abort expects no arguments"
|
|
msgstr "--abort tar inga argument"
|
|
|
|
#: builtin/merge.c:1290
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
|
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
|
|
|
|
#: builtin/merge.c:1299
|
|
msgid "--quit expects no arguments"
|
|
msgstr "--quit tar inga argument"
|
|
|
|
#: builtin/merge.c:1312
|
|
msgid "--continue expects no arguments"
|
|
msgstr "--continue tar inga argument"
|
|
|
|
#: builtin/merge.c:1316
|
|
msgid "There is no merge in progress (MERGE_HEAD missing)."
|
|
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
|
|
|
|
#: builtin/merge.c:1332
|
|
msgid ""
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
|
"Please, commit your changes before you merge."
|
|
msgstr ""
|
|
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
|
|
"Checka in dina ändringar innan du slår ihop."
|
|
|
|
#: builtin/merge.c:1339
|
|
msgid ""
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
|
"Please, commit your changes before you merge."
|
|
msgstr ""
|
|
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
|
|
"Checka in dina ändringar innan du slår ihop."
|
|
|
|
#: builtin/merge.c:1342
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
|
|
|
|
#: builtin/merge.c:1356
|
|
msgid "You cannot combine --squash with --no-ff."
|
|
msgstr "Du kan inte kombinera --squash med --no-ff."
|
|
|
|
#: builtin/merge.c:1358
|
|
msgid "You cannot combine --squash with --commit."
|
|
msgstr "Du kan inte kombinera --squash med --commit."
|
|
|
|
#: builtin/merge.c:1374
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
|
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
|
|
|
|
#: builtin/merge.c:1391
|
|
msgid "Squash commit into empty head not supported yet"
|
|
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
|
|
|
|
#: builtin/merge.c:1393
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
|
|
|
|
#: builtin/merge.c:1398
|
|
#, c-format
|
|
msgid "%s - not something we can merge"
|
|
msgstr "%s - inte något vi kan slå ihop"
|
|
|
|
#: builtin/merge.c:1400
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud"
|
|
|
|
#: builtin/merge.c:1481
|
|
msgid "refusing to merge unrelated histories"
|
|
msgstr "vägrar slå samman orelaterad historik"
|
|
|
|
#: builtin/merge.c:1490
|
|
msgid "Already up to date."
|
|
msgstr "Redan à jour."
|
|
|
|
#: builtin/merge.c:1500
|
|
#, c-format
|
|
msgid "Updating %s..%s\n"
|
|
msgstr "Uppdaterar %s..%s\n"
|
|
|
|
#: builtin/merge.c:1542
|
|
#, c-format
|
|
msgid "Trying really trivial in-index merge...\n"
|
|
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
|
|
|
|
#: builtin/merge.c:1549
|
|
#, c-format
|
|
msgid "Nope.\n"
|
|
msgstr "Nej.\n"
|
|
|
|
#: builtin/merge.c:1574
|
|
msgid "Already up to date. Yeeah!"
|
|
msgstr "Redan à jour. Toppen!"
|
|
|
|
#: builtin/merge.c:1580
|
|
msgid "Not possible to fast-forward, aborting."
|
|
msgstr "Kan inte snabbspola, avbryter."
|
|
|
|
#: builtin/merge.c:1603 builtin/merge.c:1668
|
|
#, c-format
|
|
msgid "Rewinding the tree to pristine...\n"
|
|
msgstr "Återspolar trädet till orört...\n"
|
|
|
|
#: builtin/merge.c:1607
|
|
#, c-format
|
|
msgid "Trying merge strategy %s...\n"
|
|
msgstr "Försöker sammanslagningsstrategin %s...\n"
|
|
|
|
#: builtin/merge.c:1659
|
|
#, c-format
|
|
msgid "No merge strategy handled the merge.\n"
|
|
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
|
|
|
|
#: builtin/merge.c:1661
|
|
#, c-format
|
|
msgid "Merge with strategy %s failed.\n"
|
|
msgstr "Sammanslagning med strategin %s misslyckades.\n"
|
|
|
|
#: builtin/merge.c:1670
|
|
#, c-format
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
msgstr "Använder %s för att förbereda lösning för hand.\n"
|
|
|
|
#: builtin/merge.c:1682
|
|
#, c-format
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
msgstr ""
|
|
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
|
|
|
|
#: builtin/merge-base.c:32
|
|
msgid "git merge-base [-a | --all] <commit> <commit>..."
|
|
msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
|
|
|
|
#: builtin/merge-base.c:33
|
|
msgid "git merge-base [-a | --all] --octopus <commit>..."
|
|
msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
|
|
|
|
#: builtin/merge-base.c:34
|
|
msgid "git merge-base --independent <commit>..."
|
|
msgstr "git merge-base --independent <incheckning>..."
|
|
|
|
#: builtin/merge-base.c:35
|
|
msgid "git merge-base --is-ancestor <commit> <commit>"
|
|
msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"
|
|
|
|
#: builtin/merge-base.c:36
|
|
msgid "git merge-base --fork-point <ref> [<commit>]"
|
|
msgstr "git merge-base --fork-point <ref> [<incheckning>]"
|
|
|
|
#: builtin/merge-base.c:153
|
|
msgid "output all common ancestors"
|
|
msgstr "skriv ut alla gemensamma anfäder"
|
|
|
|
#: builtin/merge-base.c:155
|
|
msgid "find ancestors for a single n-way merge"
|
|
msgstr "hitta anfader för enkel n-vägssammanslagning"
|
|
|
|
#: builtin/merge-base.c:157
|
|
msgid "list revs not reachable from others"
|
|
msgstr "visa revisioner som inte kan nås från andra"
|
|
|
|
#: builtin/merge-base.c:159
|
|
msgid "is the first one ancestor of the other?"
|
|
msgstr "är den första anfader till den andra?"
|
|
|
|
#: builtin/merge-base.c:161
|
|
msgid "find where <commit> forked from reflog of <ref>"
|
|
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
|
|
|
|
#: builtin/merge-file.c:9
|
|
msgid ""
|
|
"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
|
|
"<orig-file> <file2>"
|
|
msgstr ""
|
|
"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
|
|
"<origfil> <fil2>"
|
|
|
|
#: builtin/merge-file.c:35
|
|
msgid "send results to standard output"
|
|
msgstr "sänd resultat till standard ut"
|
|
|
|
#: builtin/merge-file.c:36
|
|
msgid "use a diff3 based merge"
|
|
msgstr "använd diff3-baserad sammanslagning"
|
|
|
|
#: builtin/merge-file.c:37
|
|
msgid "for conflicts, use our version"
|
|
msgstr "för konflikter, använd vår version"
|
|
|
|
#: builtin/merge-file.c:39
|
|
msgid "for conflicts, use their version"
|
|
msgstr "för konflikter, använd deras version"
|
|
|
|
#: builtin/merge-file.c:41
|
|
msgid "for conflicts, use a union version"
|
|
msgstr "för konflikter, använd en förenad version"
|
|
|
|
#: builtin/merge-file.c:44
|
|
msgid "for conflicts, use this marker size"
|
|
msgstr "för konflikter, använd denna markörstorlek"
|
|
|
|
#: builtin/merge-file.c:45
|
|
msgid "do not warn about conflicts"
|
|
msgstr "varna inte om konflikter"
|
|
|
|
#: builtin/merge-file.c:47
|
|
msgid "set labels for file1/orig-file/file2"
|
|
msgstr "sätt etiketter för fil1/origfil/fil2"
|
|
|
|
#: builtin/merge-recursive.c:47
|
|
#, c-format
|
|
msgid "unknown option %s"
|
|
msgstr "okänd flagga %s"
|
|
|
|
#: builtin/merge-recursive.c:53
|
|
#, c-format
|
|
msgid "could not parse object '%s'"
|
|
msgstr "kunde inte tolka objektet \"%s\""
|
|
|
|
#: 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] "kan inte hantera mer än %d bas. Ignorerar %s."
|
|
msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s."
|
|
|
|
#: builtin/merge-recursive.c:65
|
|
msgid "not handling anything other than two heads merge."
|
|
msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
|
|
|
|
#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
|
|
#, c-format
|
|
msgid "could not resolve ref '%s'"
|
|
msgstr "kunde inte bestämma referensen \"%s\""
|
|
|
|
#: builtin/merge-recursive.c:82
|
|
#, c-format
|
|
msgid "Merging %s with %s\n"
|
|
msgstr "Slår ihop %s med %s\n"
|
|
|
|
#: builtin/mktree.c:66
|
|
msgid "git mktree [-z] [--missing] [--batch]"
|
|
msgstr "git mktree [-z] [--missing] [--batch]"
|
|
|
|
#: builtin/mktree.c:154
|
|
msgid "input is NUL terminated"
|
|
msgstr "indata är NUL-terminerad"
|
|
|
|
#: builtin/mktree.c:155 builtin/write-tree.c:26
|
|
msgid "allow missing objects"
|
|
msgstr "tillåt saknade objekt"
|
|
|
|
#: builtin/mktree.c:156
|
|
msgid "allow creation of more than one tree"
|
|
msgstr "tillåt skapa mer än ett träd"
|
|
|
|
#: builtin/multi-pack-index.c:9
|
|
msgid ""
|
|
"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
|
|
"size=<size>)"
|
|
msgstr ""
|
|
"git multi-pack-index [<flaggor>] (write|verify|expire|repack --batch-"
|
|
"size=<storlek>)"
|
|
|
|
#: builtin/multi-pack-index.c:26
|
|
msgid "object directory containing set of packfile and pack-index pairs"
|
|
msgstr "objektkatalog med uppsättning av par med paketfiler och pack-index"
|
|
|
|
#: builtin/multi-pack-index.c:29
|
|
msgid ""
|
|
"during repack, collect pack-files of smaller size into a batch that is "
|
|
"larger than this size"
|
|
msgstr ""
|
|
"vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
|
|
"storlekt"
|
|
|
|
#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:67
|
|
msgid "too many arguments"
|
|
msgstr "för många argument"
|
|
|
|
#: builtin/multi-pack-index.c:60
|
|
msgid "--batch-size option is only for 'repack' subcommand"
|
|
msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
|
|
|
|
#: builtin/multi-pack-index.c:69
|
|
#, c-format
|
|
msgid "unrecognized subcommand: %s"
|
|
msgstr "okänt underkommando: %s"
|
|
|
|
#: builtin/mv.c:18
|
|
msgid "git mv [<options>] <source>... <destination>"
|
|
msgstr "git mv [<flaggor>] <källa>... <mål>"
|
|
|
|
#: builtin/mv.c:83
|
|
#, c-format
|
|
msgid "Directory %s is in index and no submodule?"
|
|
msgstr "Katalogen %s är i indexet och inte en undermodul?"
|
|
|
|
#: builtin/mv.c:85
|
|
msgid "Please stage your changes to .gitmodules or stash them to proceed"
|
|
msgstr ""
|
|
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
|
|
|
|
#: builtin/mv.c:103
|
|
#, c-format
|
|
msgid "%.*s is in index"
|
|
msgstr "%.*s är i indexet"
|
|
|
|
#: builtin/mv.c:125
|
|
msgid "force move/rename even if target exists"
|
|
msgstr "tvinga flytta/ändra namn även om målet finns"
|
|
|
|
#: builtin/mv.c:127
|
|
msgid "skip move/rename errors"
|
|
msgstr "hoppa över fel vid flytt/namnändring"
|
|
|
|
#: builtin/mv.c:169
|
|
#, c-format
|
|
msgid "destination '%s' is not a directory"
|
|
msgstr "destinationen \"%s\" är ingen katalog"
|
|
|
|
#: builtin/mv.c:180
|
|
#, c-format
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
|
|
|
|
#: builtin/mv.c:184
|
|
msgid "bad source"
|
|
msgstr "felaktig källa"
|
|
|
|
#: builtin/mv.c:187
|
|
msgid "can not move directory into itself"
|
|
msgstr "kan inte flytta katalog till sig själv"
|
|
|
|
#: builtin/mv.c:190
|
|
msgid "cannot move directory over file"
|
|
msgstr "kan inte flytta katalog över fil"
|
|
|
|
#: builtin/mv.c:199
|
|
msgid "source directory is empty"
|
|
msgstr "källkatalogen är tom"
|
|
|
|
#: builtin/mv.c:224
|
|
msgid "not under version control"
|
|
msgstr "inte versionshanterad"
|
|
|
|
#: builtin/mv.c:227
|
|
msgid "destination exists"
|
|
msgstr "destinationen finns"
|
|
|
|
#: builtin/mv.c:235
|
|
#, c-format
|
|
msgid "overwriting '%s'"
|
|
msgstr "skriver över \"%s\""
|
|
|
|
#: builtin/mv.c:238
|
|
msgid "Cannot overwrite"
|
|
msgstr "Kan inte skriva över"
|
|
|
|
#: builtin/mv.c:241
|
|
msgid "multiple sources for the same target"
|
|
msgstr "flera källor för samma mål"
|
|
|
|
#: builtin/mv.c:243
|
|
msgid "destination directory does not exist"
|
|
msgstr "destinationskatalogen finns inte"
|
|
|
|
#: builtin/mv.c:250
|
|
#, c-format
|
|
msgid "%s, source=%s, destination=%s"
|
|
msgstr "%s, källa=%s, mål=%s"
|
|
|
|
#: builtin/mv.c:271
|
|
#, c-format
|
|
msgid "Renaming %s to %s\n"
|
|
msgstr "Byter namn på %s till %s\n"
|
|
|
|
#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:518
|
|
#, c-format
|
|
msgid "renaming '%s' failed"
|
|
msgstr "misslyckades byta namn på \"%s\""
|
|
|
|
#: builtin/name-rev.c:465
|
|
msgid "git name-rev [<options>] <commit>..."
|
|
msgstr "git name-rev [<flaggor>] <incheckning>..."
|
|
|
|
#: builtin/name-rev.c:466
|
|
msgid "git name-rev [<options>] --all"
|
|
msgstr "git name-rev [<flaggor>] --all"
|
|
|
|
#: builtin/name-rev.c:467
|
|
msgid "git name-rev [<options>] --stdin"
|
|
msgstr "git name-rev [<flaggor>] --stdin"
|
|
|
|
#: builtin/name-rev.c:524
|
|
msgid "print only names (no SHA-1)"
|
|
msgstr "skriv endast namn (ingen SHA-1)"
|
|
|
|
#: builtin/name-rev.c:525
|
|
msgid "only use tags to name the commits"
|
|
msgstr "använd endast taggar för att namnge incheckningar"
|
|
|
|
#: builtin/name-rev.c:527
|
|
msgid "only use refs matching <pattern>"
|
|
msgstr "använd endast referenser som motsvarar <mönster>"
|
|
|
|
#: builtin/name-rev.c:529
|
|
msgid "ignore refs matching <pattern>"
|
|
msgstr "ignorera referenser som motsvarar <mönster>"
|
|
|
|
#: builtin/name-rev.c:531
|
|
msgid "list all commits reachable from all refs"
|
|
msgstr "lista alla incheckningar som kan nås alla referenser"
|
|
|
|
#: builtin/name-rev.c:532
|
|
msgid "read from stdin"
|
|
msgstr "läs från standard in"
|
|
|
|
#: builtin/name-rev.c:533
|
|
msgid "allow to print `undefined` names (default)"
|
|
msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
|
|
|
|
#: builtin/name-rev.c:539
|
|
msgid "dereference tags in the input (internal use)"
|
|
msgstr "avreferera taggar i indata (används internt)"
|
|
|
|
#: builtin/notes.c:28
|
|
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
|
|
msgstr "git notes [--ref <anteckningsref>] [list [<objekt>]]"
|
|
|
|
#: builtin/notes.c:29
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
|
|
"| (-c | -C) <object>] [<object>]"
|
|
msgstr ""
|
|
"git notes [--ref <anteckningsref>] add [-f] [--allow-empty] [-m <medd> | -F "
|
|
"<fil> | (-c | -C) <objekt>] [<objekt>]"
|
|
|
|
#: builtin/notes.c:30
|
|
msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
|
|
msgstr ""
|
|
"git notes [--ref <anteckningsref>] copy [-f] <från-objekt> <till-objekt>"
|
|
|
|
#: builtin/notes.c:31
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
|
|
"(-c | -C) <object>] [<object>]"
|
|
msgstr ""
|
|
"git notes [--ref <anteckningsref>] append [--allow-empty] [-m <medd> | -F "
|
|
"<fil> | (-c | -C) <objekt>] [<objekt>]"
|
|
|
|
#: builtin/notes.c:32
|
|
msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
|
|
msgstr "git notes [--ref <anteckningsref>] edit [--allow-empty] [<objekt>]"
|
|
|
|
#: builtin/notes.c:33
|
|
msgid "git notes [--ref <notes-ref>] show [<object>]"
|
|
msgstr "git notes [--ref <anteckningsref>] show [<objekt>]"
|
|
|
|
#: builtin/notes.c:34
|
|
msgid ""
|
|
"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
|
|
msgstr ""
|
|
"git notes [--ref <anteckningsref>] merge [-v | -q] [-s <strategi>] "
|
|
"<anteckningsref>"
|
|
|
|
#: builtin/notes.c:35
|
|
msgid "git notes merge --commit [-v | -q]"
|
|
msgstr "git notes merge --commit [-v | -q]"
|
|
|
|
#: builtin/notes.c:36
|
|
msgid "git notes merge --abort [-v | -q]"
|
|
msgstr "git notes merge --abort [-v | -q]"
|
|
|
|
#: builtin/notes.c:37
|
|
msgid "git notes [--ref <notes-ref>] remove [<object>...]"
|
|
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
|
|
|
|
#: builtin/notes.c:38
|
|
msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
|
|
msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]"
|
|
|
|
#: builtin/notes.c:39
|
|
msgid "git notes [--ref <notes-ref>] get-ref"
|
|
msgstr "git notes [--ref <anteckningsref>] get-ref"
|
|
|
|
#: builtin/notes.c:44
|
|
msgid "git notes [list [<object>]]"
|
|
msgstr "git notes [list [<objekt>]]"
|
|
|
|
#: builtin/notes.c:49
|
|
msgid "git notes add [<options>] [<object>]"
|
|
msgstr "git notes add [<flaggor>] [<objekt>]"
|
|
|
|
#: builtin/notes.c:54
|
|
msgid "git notes copy [<options>] <from-object> <to-object>"
|
|
msgstr "git notes copy [<flaggor>] <från-objekt> <till-objekt>"
|
|
|
|
#: builtin/notes.c:55
|
|
msgid "git notes copy --stdin [<from-object> <to-object>]..."
|
|
msgstr "git notes copy --stdin [<från-objekt> <till-objekt>]..."
|
|
|
|
#: builtin/notes.c:60
|
|
msgid "git notes append [<options>] [<object>]"
|
|
msgstr "git notes append [<flaggor>] [<objekt>]"
|
|
|
|
#: builtin/notes.c:65
|
|
msgid "git notes edit [<object>]"
|
|
msgstr "git notes edit [<objekt>]"
|
|
|
|
#: builtin/notes.c:70
|
|
msgid "git notes show [<object>]"
|
|
msgstr "git notes show [<objekt>]"
|
|
|
|
#: builtin/notes.c:75
|
|
msgid "git notes merge [<options>] <notes-ref>"
|
|
msgstr "git notes merge [<flaggor>] <anteckningsref>"
|
|
|
|
#: builtin/notes.c:76
|
|
msgid "git notes merge --commit [<options>]"
|
|
msgstr "git notes merge --commit [<flaggor>]"
|
|
|
|
#: builtin/notes.c:77
|
|
msgid "git notes merge --abort [<options>]"
|
|
msgstr "git notes merge --abort [<flaggor>]"
|
|
|
|
#: builtin/notes.c:82
|
|
msgid "git notes remove [<object>]"
|
|
msgstr "git notes remove [<objekt>]"
|
|
|
|
#: builtin/notes.c:87
|
|
msgid "git notes prune [<options>]"
|
|
msgstr "git notes prune [<flaggor>]"
|
|
|
|
#: builtin/notes.c:92
|
|
msgid "git notes get-ref"
|
|
msgstr "git notes get-ref"
|
|
|
|
#: builtin/notes.c:97
|
|
msgid "Write/edit the notes for the following object:"
|
|
msgstr "Skriv/redigera anteckningar för följande objekt:"
|
|
|
|
#: builtin/notes.c:150
|
|
#, c-format
|
|
msgid "unable to start 'show' for object '%s'"
|
|
msgstr "kunde inte starta \"show\" för objektet \"%s\""
|
|
|
|
#: builtin/notes.c:154
|
|
msgid "could not read 'show' output"
|
|
msgstr "kunde inte läsa utdata från \"show\""
|
|
|
|
#: builtin/notes.c:162
|
|
#, c-format
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
|
|
|
|
#: builtin/notes.c:197
|
|
msgid "please supply the note contents using either -m or -F option"
|
|
msgstr "ange innehåll för anteckningen med antingen -m eller -F"
|
|
|
|
#: builtin/notes.c:206
|
|
msgid "unable to write note object"
|
|
msgstr "kunde inte skriva anteckningsobjekt"
|
|
|
|
#: builtin/notes.c:208
|
|
#, c-format
|
|
msgid "the note contents have been left in %s"
|
|
msgstr "anteckningens innehåll har lämnats kvar i %s"
|
|
|
|
#: builtin/notes.c:242 builtin/tag.c:532
|
|
#, c-format
|
|
msgid "could not open or read '%s'"
|
|
msgstr "kunde inte öppna eller läsa \"%s\""
|
|
|
|
#: builtin/notes.c:263 builtin/notes.c:313 builtin/notes.c:315
|
|
#: builtin/notes.c:383 builtin/notes.c:438 builtin/notes.c:526
|
|
#: builtin/notes.c:531 builtin/notes.c:610 builtin/notes.c:672
|
|
#, c-format
|
|
msgid "failed to resolve '%s' as a valid ref."
|
|
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
|
|
|
|
#: builtin/notes.c:265
|
|
#, c-format
|
|
msgid "failed to read object '%s'."
|
|
msgstr "kunde inte läsa objektet \"%s\"."
|
|
|
|
#: builtin/notes.c:268
|
|
#, c-format
|
|
msgid "cannot read note data from non-blob object '%s'."
|
|
msgstr "kan inte läsa anteckningsdata från icke-blob-objektet \"%s\"."
|
|
|
|
#: builtin/notes.c:309
|
|
#, c-format
|
|
msgid "malformed input line: '%s'."
|
|
msgstr "felaktig indatarad: \"%s\"."
|
|
|
|
#: builtin/notes.c:324
|
|
#, c-format
|
|
msgid "failed to copy notes from '%s' to '%s'"
|
|
msgstr "misslyckades kopiera anteckningar från \"%s\" till \"%s\""
|
|
|
|
#. TRANSLATORS: the first %s will be replaced by a git
|
|
#. notes command: 'add', 'merge', 'remove', etc.
|
|
#.
|
|
#: builtin/notes.c:356
|
|
#, c-format
|
|
msgid "refusing to %s notes in %s (outside of refs/notes/)"
|
|
msgstr "vägrar utföra \"%s\" på anteckningar i %s (utanför refs/notes/)"
|
|
|
|
#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:509
|
|
#: builtin/notes.c:521 builtin/notes.c:598 builtin/notes.c:665
|
|
#: builtin/notes.c:815 builtin/notes.c:963 builtin/notes.c:985
|
|
msgid "too many parameters"
|
|
msgstr "för många parametrar"
|
|
|
|
#: builtin/notes.c:389 builtin/notes.c:678
|
|
#, c-format
|
|
msgid "no note found for object %s."
|
|
msgstr "inga anteckningar hittades för objektet %s."
|
|
|
|
#: builtin/notes.c:410 builtin/notes.c:576
|
|
msgid "note contents as a string"
|
|
msgstr "anteckningsinnehåll som sträng"
|
|
|
|
#: builtin/notes.c:413 builtin/notes.c:579
|
|
msgid "note contents in a file"
|
|
msgstr "anteckningsinnehåll i en fil"
|
|
|
|
#: builtin/notes.c:416 builtin/notes.c:582
|
|
msgid "reuse and edit specified note object"
|
|
msgstr "återanvänd och redigera angivet anteckningsobjekt"
|
|
|
|
#: builtin/notes.c:419 builtin/notes.c:585
|
|
msgid "reuse specified note object"
|
|
msgstr "återanvänd angivet anteckningsobjekt"
|
|
|
|
#: builtin/notes.c:422 builtin/notes.c:588
|
|
msgid "allow storing empty note"
|
|
msgstr "tillåt lagra tom anteckning"
|
|
|
|
#: builtin/notes.c:423 builtin/notes.c:496
|
|
msgid "replace existing notes"
|
|
msgstr "ersätt befintliga anteckningar"
|
|
|
|
#: builtin/notes.c:448
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
"existing notes"
|
|
msgstr ""
|
|
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
|
|
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
|
|
|
|
#: builtin/notes.c:463 builtin/notes.c:544
|
|
#, c-format
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
|
|
|
|
#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
|
|
#, c-format
|
|
msgid "Removing note for object %s\n"
|
|
msgstr "Tar bort anteckning för objektet %s\n"
|
|
|
|
#: builtin/notes.c:497
|
|
msgid "read objects from stdin"
|
|
msgstr "läs objekt från standard in"
|
|
|
|
#: builtin/notes.c:499
|
|
msgid "load rewriting config for <command> (implies --stdin)"
|
|
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
|
|
|
|
#: builtin/notes.c:517
|
|
msgid "too few parameters"
|
|
msgstr "för få parametrar"
|
|
|
|
#: builtin/notes.c:538
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
"existing notes"
|
|
msgstr ""
|
|
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
|
|
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
|
|
|
|
#: builtin/notes.c:550
|
|
#, c-format
|
|
msgid "missing notes on source object %s. Cannot copy."
|
|
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
|
|
|
|
#: builtin/notes.c:603
|
|
#, c-format
|
|
msgid ""
|
|
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
|
|
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
|
|
msgstr ""
|
|
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
|
|
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
|
|
|
|
#: builtin/notes.c:698
|
|
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
|
|
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
|
|
|
|
#: builtin/notes.c:700
|
|
msgid "failed to delete ref NOTES_MERGE_REF"
|
|
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
|
|
|
|
#: builtin/notes.c:702
|
|
msgid "failed to remove 'git notes merge' worktree"
|
|
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
|
|
|
|
#: builtin/notes.c:722
|
|
msgid "failed to read ref NOTES_MERGE_PARTIAL"
|
|
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
|
|
|
|
#: builtin/notes.c:724
|
|
msgid "could not find commit from NOTES_MERGE_PARTIAL."
|
|
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
|
|
|
|
#: builtin/notes.c:726
|
|
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
|
|
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
|
|
|
|
#: builtin/notes.c:739
|
|
msgid "failed to resolve NOTES_MERGE_REF"
|
|
msgstr "misslyckades bestämma NOTES_MERGE_REF"
|
|
|
|
#: builtin/notes.c:742
|
|
msgid "failed to finalize notes merge"
|
|
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
|
|
|
|
#: builtin/notes.c:768
|
|
#, c-format
|
|
msgid "unknown notes merge strategy %s"
|
|
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
|
|
|
|
#: builtin/notes.c:784
|
|
msgid "General options"
|
|
msgstr "Allmänna flaggor"
|
|
|
|
#: builtin/notes.c:786
|
|
msgid "Merge options"
|
|
msgstr "Flaggor för sammanslagning"
|
|
|
|
#: builtin/notes.c:788
|
|
msgid ""
|
|
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
|
|
"cat_sort_uniq)"
|
|
msgstr ""
|
|
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
|
|
"cat_sort_uniq)"
|
|
|
|
#: builtin/notes.c:790
|
|
msgid "Committing unmerged notes"
|
|
msgstr "Checkar in ej sammanslagna anteckningar"
|
|
|
|
#: builtin/notes.c:792
|
|
msgid "finalize notes merge by committing unmerged notes"
|
|
msgstr ""
|
|
"färdigställ sammanslagning av anteckningar genom att checka in ej "
|
|
"sammanslagna anteckningar"
|
|
|
|
#: builtin/notes.c:794
|
|
msgid "Aborting notes merge resolution"
|
|
msgstr "Avbryt lösning av sammanslagning av anteckningar"
|
|
|
|
#: builtin/notes.c:796
|
|
msgid "abort notes merge"
|
|
msgstr "avbryt sammanslagning av anteckningar"
|
|
|
|
#: builtin/notes.c:807
|
|
msgid "cannot mix --commit, --abort or -s/--strategy"
|
|
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
|
|
|
|
#: builtin/notes.c:812
|
|
msgid "must specify a notes ref to merge"
|
|
msgstr "måste ange en antecknings-referens att slå ihop"
|
|
|
|
#: builtin/notes.c:836
|
|
#, c-format
|
|
msgid "unknown -s/--strategy: %s"
|
|
msgstr "okänd -s/--strategy: %s"
|
|
|
|
#: builtin/notes.c:873
|
|
#, c-format
|
|
msgid "a notes merge into %s is already in-progress at %s"
|
|
msgstr "sammanslagning av anteckningar till %s är redan igångsatt på %s"
|
|
|
|
#: builtin/notes.c:876
|
|
#, c-format
|
|
msgid "failed to store link to current notes ref (%s)"
|
|
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
|
|
|
|
#: builtin/notes.c:878
|
|
#, c-format
|
|
msgid ""
|
|
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
|
|
"'git notes merge --commit', or abort the merge with 'git notes merge --"
|
|
"abort'.\n"
|
|
msgstr ""
|
|
"Automatisk sammanslagning av anteckningar misslyckades. Rätta konflikter i "
|
|
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
|
|
"sammanslagningen med \"git notes merge --abort\".\n"
|
|
|
|
#: builtin/notes.c:897 builtin/tag.c:545
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
|
|
|
|
#: builtin/notes.c:900
|
|
#, c-format
|
|
msgid "Object %s has no note\n"
|
|
msgstr "Objektet %s har ingen anteckning\n"
|
|
|
|
#: builtin/notes.c:912
|
|
msgid "attempt to remove non-existent note is not an error"
|
|
msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
|
|
|
|
#: builtin/notes.c:915
|
|
msgid "read object names from the standard input"
|
|
msgstr "läs objektnamn från standard in"
|
|
|
|
#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
|
|
msgid "do not remove, show only"
|
|
msgstr "ta inte bort, bara visa"
|
|
|
|
#: builtin/notes.c:955
|
|
msgid "report pruned notes"
|
|
msgstr "rapportera borttagna anteckningar"
|
|
|
|
#: builtin/notes.c:998
|
|
msgid "notes-ref"
|
|
msgstr "anteckningar-ref"
|
|
|
|
#: builtin/notes.c:999
|
|
msgid "use notes from <notes-ref>"
|
|
msgstr "använd anteckningar från <anteckningsref>"
|
|
|
|
#: builtin/notes.c:1034 builtin/stash.c:1643
|
|
#, c-format
|
|
msgid "unknown subcommand: %s"
|
|
msgstr "okänt underkommando: %s"
|
|
|
|
#: builtin/pack-objects.c:52
|
|
msgid ""
|
|
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
|
|
msgstr ""
|
|
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
|
|
|
|
#: builtin/pack-objects.c:53
|
|
msgid ""
|
|
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
|
|
msgstr ""
|
|
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
|
|
|
|
#: builtin/pack-objects.c:430
|
|
#, c-format
|
|
msgid "bad packed object CRC for %s"
|
|
msgstr "felaktig CRC för packat objekt %s"
|
|
|
|
#: builtin/pack-objects.c:441
|
|
#, c-format
|
|
msgid "corrupt packed object for %s"
|
|
msgstr "trasigt packat objekt för %s"
|
|
|
|
#: builtin/pack-objects.c:572
|
|
#, c-format
|
|
msgid "recursive delta detected for object %s"
|
|
msgstr "rekursivt delta upptäcktes för objektet %s"
|
|
|
|
#: builtin/pack-objects.c:783
|
|
#, c-format
|
|
msgid "ordered %u objects, expected %<PRIu32>"
|
|
msgstr "ordnade %u objekt, förväntade %<PRIu32>"
|
|
|
|
#: builtin/pack-objects.c:972
|
|
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
|
|
msgstr ""
|
|
"inaktiverar skrivning av bitkarta, paket delas på grund av pack.packSizeLimit"
|
|
|
|
#: builtin/pack-objects.c:985
|
|
msgid "Writing objects"
|
|
msgstr "Skriver objekt"
|
|
|
|
#: builtin/pack-objects.c:1046 builtin/update-index.c:90
|
|
#, c-format
|
|
msgid "failed to stat %s"
|
|
msgstr "misslyckades ta status på %s"
|
|
|
|
#: builtin/pack-objects.c:1099
|
|
#, c-format
|
|
msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
|
|
msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
|
|
|
|
#: builtin/pack-objects.c:1297
|
|
msgid "disabling bitmap writing, as some objects are not being packed"
|
|
msgstr "inaktiverar skrivning av bitkarta då några objekt inte packas"
|
|
|
|
#: builtin/pack-objects.c:1724
|
|
#, c-format
|
|
msgid "delta base offset overflow in pack for %s"
|
|
msgstr "deltabasoffset utanför gränsen i pack för %s"
|
|
|
|
#: builtin/pack-objects.c:1733
|
|
#, c-format
|
|
msgid "delta base offset out of bound for %s"
|
|
msgstr "deltabasoffset utanför gränsvärden för %s"
|
|
|
|
#: builtin/pack-objects.c:2004
|
|
msgid "Counting objects"
|
|
msgstr "Räknar objekt"
|
|
|
|
#: builtin/pack-objects.c:2149
|
|
#, c-format
|
|
msgid "unable to parse object header of %s"
|
|
msgstr "kunde inte tolka objekthuvud för %s"
|
|
|
|
#: builtin/pack-objects.c:2219 builtin/pack-objects.c:2235
|
|
#: builtin/pack-objects.c:2245
|
|
#, c-format
|
|
msgid "object %s cannot be read"
|
|
msgstr "objektet %s kunde inte läsas"
|
|
|
|
#: builtin/pack-objects.c:2222 builtin/pack-objects.c:2249
|
|
#, c-format
|
|
msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
|
|
msgstr "objektet %s har inkonsistent objektlängd (%<PRIuMAX> mot %<PRIuMAX>)"
|
|
|
|
#: builtin/pack-objects.c:2259
|
|
msgid "suboptimal pack - out of memory"
|
|
msgstr "icke-optimalt pack - minnet slut"
|
|
|
|
#: builtin/pack-objects.c:2574
|
|
#, c-format
|
|
msgid "Delta compression using up to %d threads"
|
|
msgstr "Deltakomprimering använder upp till %d trådar"
|
|
|
|
#: builtin/pack-objects.c:2713
|
|
#, c-format
|
|
msgid "unable to pack objects reachable from tag %s"
|
|
msgstr "kan inte packa objekt nåbara från taggen %s"
|
|
|
|
#: builtin/pack-objects.c:2801
|
|
msgid "Compressing objects"
|
|
msgstr "Komprimerar objekt"
|
|
|
|
#: builtin/pack-objects.c:2807
|
|
msgid "inconsistency with delta count"
|
|
msgstr "deltaräknaren är inkonsekvent"
|
|
|
|
#: builtin/pack-objects.c:2888
|
|
#, c-format
|
|
msgid ""
|
|
"expected edge object ID, got garbage:\n"
|
|
" %s"
|
|
msgstr ""
|
|
"förväntade kant-objekt-id, fick skräp:\n"
|
|
" %s"
|
|
|
|
#: builtin/pack-objects.c:2894
|
|
#, c-format
|
|
msgid ""
|
|
"expected object ID, got garbage:\n"
|
|
" %s"
|
|
msgstr ""
|
|
"förväntade objekt-id, fick skräp:\n"
|
|
" %s"
|
|
|
|
#: builtin/pack-objects.c:2992
|
|
msgid "invalid value for --missing"
|
|
msgstr "ogiltigt värde för --missing"
|
|
|
|
#: builtin/pack-objects.c:3051 builtin/pack-objects.c:3159
|
|
msgid "cannot open pack index"
|
|
msgstr "kan inte öppna paketfilen"
|
|
|
|
#: builtin/pack-objects.c:3082
|
|
#, c-format
|
|
msgid "loose object at %s could not be examined"
|
|
msgstr "lösa objekt på %s kunde inte underökas"
|
|
|
|
#: builtin/pack-objects.c:3167
|
|
msgid "unable to force loose object"
|
|
msgstr "kan inte tvinga lösa objekt"
|
|
|
|
#: builtin/pack-objects.c:3260
|
|
#, c-format
|
|
msgid "not a rev '%s'"
|
|
msgstr "inte en referens \"%s\""
|
|
|
|
#: builtin/pack-objects.c:3263
|
|
#, c-format
|
|
msgid "bad revision '%s'"
|
|
msgstr "felaktig revision \"%s\""
|
|
|
|
#: builtin/pack-objects.c:3288
|
|
msgid "unable to add recent objects"
|
|
msgstr "kan inte lägga till nya objekt"
|
|
|
|
#: builtin/pack-objects.c:3341
|
|
#, c-format
|
|
msgid "unsupported index version %s"
|
|
msgstr "indexversionen %s stöds ej"
|
|
|
|
#: builtin/pack-objects.c:3345
|
|
#, c-format
|
|
msgid "bad index version '%s'"
|
|
msgstr "felaktig indexversion \"%s\""
|
|
|
|
#: builtin/pack-objects.c:3383
|
|
msgid "<version>[,<offset>]"
|
|
msgstr "<version>[,<offset>]"
|
|
|
|
#: builtin/pack-objects.c:3384
|
|
msgid "write the pack index file in the specified idx format version"
|
|
msgstr "skriv paketindexfilen i angiven indexformatversion"
|
|
|
|
#: builtin/pack-objects.c:3387
|
|
msgid "maximum size of each output pack file"
|
|
msgstr "maximal storlek på varje utdatapaketfil"
|
|
|
|
#: builtin/pack-objects.c:3389
|
|
msgid "ignore borrowed objects from alternate object store"
|
|
msgstr "ignorera lånade objekt från supplerande objektlager"
|
|
|
|
#: builtin/pack-objects.c:3391
|
|
msgid "ignore packed objects"
|
|
msgstr "ignorera packade objekt"
|
|
|
|
#: builtin/pack-objects.c:3393
|
|
msgid "limit pack window by objects"
|
|
msgstr "begränsa paketfönster efter objekt"
|
|
|
|
#: builtin/pack-objects.c:3395
|
|
msgid "limit pack window by memory in addition to object limit"
|
|
msgstr "begränsa paketfönster efter minne förutom objektgräns"
|
|
|
|
#: builtin/pack-objects.c:3397
|
|
msgid "maximum length of delta chain allowed in the resulting pack"
|
|
msgstr "maximal längd på deltakedja tillåten i slutligt paket"
|
|
|
|
#: builtin/pack-objects.c:3399
|
|
msgid "reuse existing deltas"
|
|
msgstr "återanvänd befintliga delta"
|
|
|
|
#: builtin/pack-objects.c:3401
|
|
msgid "reuse existing objects"
|
|
msgstr "återanvänd befintliga objekt"
|
|
|
|
#: builtin/pack-objects.c:3403
|
|
msgid "use OFS_DELTA objects"
|
|
msgstr "använd OFS_DELTA-objekt"
|
|
|
|
#: builtin/pack-objects.c:3405
|
|
msgid "use threads when searching for best delta matches"
|
|
msgstr "använd trådar vid sökning efter bästa deltaträffar"
|
|
|
|
#: builtin/pack-objects.c:3407
|
|
msgid "do not create an empty pack output"
|
|
msgstr "försök inte skapa tom paketutdata"
|
|
|
|
#: builtin/pack-objects.c:3409
|
|
msgid "read revision arguments from standard input"
|
|
msgstr "läs revisionsargument från standard in"
|
|
|
|
#: builtin/pack-objects.c:3411
|
|
msgid "limit the objects to those that are not yet packed"
|
|
msgstr "begränsa objekt till dem som ännu inte packats"
|
|
|
|
#: builtin/pack-objects.c:3414
|
|
msgid "include objects reachable from any reference"
|
|
msgstr "inkludera objekt som kan nås från någon referens"
|
|
|
|
#: builtin/pack-objects.c:3417
|
|
msgid "include objects referred by reflog entries"
|
|
msgstr "inkludera objekt som refereras från referensloggposter"
|
|
|
|
#: builtin/pack-objects.c:3420
|
|
msgid "include objects referred to by the index"
|
|
msgstr "inkludera objekt som refereras från indexet"
|
|
|
|
#: builtin/pack-objects.c:3423
|
|
msgid "output pack to stdout"
|
|
msgstr "skriv paket på standard ut"
|
|
|
|
#: builtin/pack-objects.c:3425
|
|
msgid "include tag objects that refer to objects to be packed"
|
|
msgstr "inkludera taggobjekt som refererar objekt som ska packas"
|
|
|
|
#: builtin/pack-objects.c:3427
|
|
msgid "keep unreachable objects"
|
|
msgstr "behåll onåbara objekt"
|
|
|
|
#: builtin/pack-objects.c:3429
|
|
msgid "pack loose unreachable objects"
|
|
msgstr "packa lösa onåbara objekt"
|
|
|
|
#: builtin/pack-objects.c:3431
|
|
msgid "unpack unreachable objects newer than <time>"
|
|
msgstr "packa upp onåbara objekt nyare än <tid>"
|
|
|
|
#: builtin/pack-objects.c:3434
|
|
msgid "use the sparse reachability algorithm"
|
|
msgstr "använd gles-nåbarhetsalgoritmen"
|
|
|
|
#: builtin/pack-objects.c:3436
|
|
msgid "create thin packs"
|
|
msgstr "skapa tunna paket"
|
|
|
|
#: builtin/pack-objects.c:3438
|
|
msgid "create packs suitable for shallow fetches"
|
|
msgstr "skapa packfiler lämpade för grunda hämtningar"
|
|
|
|
#: builtin/pack-objects.c:3440
|
|
msgid "ignore packs that have companion .keep file"
|
|
msgstr "ignorera paket som har tillhörande .keep-fil"
|
|
|
|
#: builtin/pack-objects.c:3442
|
|
msgid "ignore this pack"
|
|
msgstr "ignorera detta paket"
|
|
|
|
#: builtin/pack-objects.c:3444
|
|
msgid "pack compression level"
|
|
msgstr "komprimeringsgrad för paket"
|
|
|
|
#: builtin/pack-objects.c:3446
|
|
msgid "do not hide commits by grafts"
|
|
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
|
|
|
|
#: builtin/pack-objects.c:3448
|
|
msgid "use a bitmap index if available to speed up counting objects"
|
|
msgstr "använd bitkartindex om tillgängligt för att räkna objekt snabbare"
|
|
|
|
#: builtin/pack-objects.c:3450
|
|
msgid "write a bitmap index together with the pack index"
|
|
msgstr "använd bitkartindex tillsammans med packindexet"
|
|
|
|
#: builtin/pack-objects.c:3454
|
|
msgid "write a bitmap index if possible"
|
|
msgstr "skriv bitkartindex om möjligt"
|
|
|
|
#: builtin/pack-objects.c:3458
|
|
msgid "handling for missing objects"
|
|
msgstr "hantering av saknade objekt"
|
|
|
|
#: builtin/pack-objects.c:3461
|
|
msgid "do not pack objects in promisor packfiles"
|
|
msgstr "packa inte objekt i kontraktspackfiler"
|
|
|
|
#: builtin/pack-objects.c:3463
|
|
msgid "respect islands during delta compression"
|
|
msgstr "respektera öar under deltakomprimering"
|
|
|
|
#: builtin/pack-objects.c:3492
|
|
#, c-format
|
|
msgid "delta chain depth %d is too deep, forcing %d"
|
|
msgstr "deltakedjedjupet %d är för djupt, påtvingar %d"
|
|
|
|
#: builtin/pack-objects.c:3497
|
|
#, c-format
|
|
msgid "pack.deltaCacheLimit is too high, forcing %d"
|
|
msgstr "pack.deltaCacheLimit är för högt, påtvingar %d"
|
|
|
|
#: builtin/pack-objects.c:3551
|
|
msgid "--max-pack-size cannot be used to build a pack for transfer"
|
|
msgstr ""
|
|
"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
|
|
|
|
#: builtin/pack-objects.c:3553
|
|
msgid "minimum pack size limit is 1 MiB"
|
|
msgstr "minsta packstorlek är 1 MiB"
|
|
|
|
#: builtin/pack-objects.c:3558
|
|
msgid "--thin cannot be used to build an indexable pack"
|
|
msgstr "--thin kan inte användas för att bygga ett indexerbart paket"
|
|
|
|
#: builtin/pack-objects.c:3561
|
|
msgid "--keep-unreachable and --unpack-unreachable are incompatible"
|
|
msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
|
|
|
|
#: builtin/pack-objects.c:3567
|
|
msgid "cannot use --filter without --stdout"
|
|
msgstr "kan inte använda --filter utan --stdout"
|
|
|
|
#: builtin/pack-objects.c:3627
|
|
msgid "Enumerating objects"
|
|
msgstr "Räknar upp objekt"
|
|
|
|
#: builtin/pack-objects.c:3657
|
|
#, c-format
|
|
msgid ""
|
|
"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
|
|
"reused %<PRIu32>"
|
|
msgstr ""
|
|
"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), "
|
|
"paket-återanvända %<PRIu32>"
|
|
|
|
#: builtin/pack-refs.c:8
|
|
msgid "git pack-refs [<options>]"
|
|
msgstr "git pack-refs [<flaggor>]"
|
|
|
|
#: builtin/pack-refs.c:16
|
|
msgid "pack everything"
|
|
msgstr "packa allt"
|
|
|
|
#: builtin/pack-refs.c:17
|
|
msgid "prune loose refs (default)"
|
|
msgstr "ta bort lösa referenser (standard)"
|
|
|
|
#: builtin/prune-packed.c:9
|
|
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
|
|
|
|
#: builtin/prune-packed.c:42
|
|
msgid "Removing duplicate objects"
|
|
msgstr "Tar bort duplicerade objekt"
|
|
|
|
#: builtin/prune.c:12
|
|
msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
|
|
msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
|
|
|
|
#: builtin/prune.c:131
|
|
msgid "report pruned objects"
|
|
msgstr "rapportera borttagna objekt"
|
|
|
|
#: builtin/prune.c:134
|
|
msgid "expire objects older than <time>"
|
|
msgstr "låt tid gå ut för objekt äldre än <tid>"
|
|
|
|
#: builtin/prune.c:136
|
|
msgid "limit traversal to objects outside promisor packfiles"
|
|
msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
|
|
|
|
#: builtin/prune.c:150
|
|
msgid "cannot prune in a precious-objects repo"
|
|
msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
|
|
|
|
#: builtin/pull.c:45 builtin/pull.c:47
|
|
#, c-format
|
|
msgid "Invalid value for %s: %s"
|
|
msgstr "Felaktigt värde för %s: %s"
|
|
|
|
#: builtin/pull.c:67
|
|
msgid "git pull [<options>] [<repository> [<refspec>...]]"
|
|
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
|
|
|
|
#: builtin/pull.c:122
|
|
msgid "control for recursive fetching of submodules"
|
|
msgstr "styrning för rekursiv hämtning av undermoduler"
|
|
|
|
#: builtin/pull.c:126
|
|
msgid "Options related to merging"
|
|
msgstr "Alternativ gällande sammanslagning"
|
|
|
|
#: builtin/pull.c:129
|
|
msgid "incorporate changes by rebasing rather than merging"
|
|
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
|
|
|
|
#: builtin/pull.c:157 builtin/rebase.c:471 builtin/revert.c:126
|
|
msgid "allow fast-forward"
|
|
msgstr "tillåt snabbspolning"
|
|
|
|
#: builtin/pull.c:166
|
|
msgid "automatically stash/stash pop before and after rebase"
|
|
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
|
|
|
|
#: builtin/pull.c:182
|
|
msgid "Options related to fetching"
|
|
msgstr "Alternativ gällande hämtningar"
|
|
|
|
#: builtin/pull.c:192
|
|
msgid "force overwrite of local branch"
|
|
msgstr "tvinga överskrivning av lokal gren"
|
|
|
|
#: builtin/pull.c:200
|
|
msgid "number of submodules pulled in parallel"
|
|
msgstr "antal undermoduler som hämtas parallellt"
|
|
|
|
#: builtin/pull.c:300
|
|
#, c-format
|
|
msgid "Invalid value for pull.ff: %s"
|
|
msgstr "Felaktigt värde för pull.ff: %s"
|
|
|
|
#: builtin/pull.c:426
|
|
msgid ""
|
|
"There is no candidate for rebasing against among the refs that you just "
|
|
"fetched."
|
|
msgstr ""
|
|
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
|
|
"hämtat."
|
|
|
|
#: builtin/pull.c:428
|
|
msgid ""
|
|
"There are no candidates for merging among the refs that you just fetched."
|
|
msgstr ""
|
|
"Det finns ingen kandidat för sammanslagning bland referenserna du precis har "
|
|
"hämtat."
|
|
|
|
#: builtin/pull.c:429
|
|
msgid ""
|
|
"Generally this means that you provided a wildcard refspec which had no\n"
|
|
"matches on the remote end."
|
|
msgstr ""
|
|
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
|
|
"motsvarade något i fjärränden."
|
|
|
|
#: builtin/pull.c:432
|
|
#, c-format
|
|
msgid ""
|
|
"You asked to pull from the remote '%s', but did not specify\n"
|
|
"a branch. Because this is not the default configured remote\n"
|
|
"for your current branch, you must specify a branch on the command line."
|
|
msgstr ""
|
|
"Du bad om att hämta från fjärren \"%s\", men angav inte någon\n"
|
|
"gren. Eftersom det inte är den fjärr som är konfigurerad som\n"
|
|
"standard för aktuell gren måste du ange en gren på kommandoraden."
|
|
|
|
#: builtin/pull.c:437 builtin/rebase.c:1409 git-parse-remote.sh:73
|
|
msgid "You are not currently on a branch."
|
|
msgstr "Du är inte på någon gren för närvarande."
|
|
|
|
#: builtin/pull.c:439 builtin/pull.c:454 git-parse-remote.sh:79
|
|
msgid "Please specify which branch you want to rebase against."
|
|
msgstr "Ange vilken gren du vill ombasera mot."
|
|
|
|
#: builtin/pull.c:441 builtin/pull.c:456 git-parse-remote.sh:82
|
|
msgid "Please specify which branch you want to merge with."
|
|
msgstr "Ange vilken gren du vill slå samman med."
|
|
|
|
#: builtin/pull.c:442 builtin/pull.c:457
|
|
msgid "See git-pull(1) for details."
|
|
msgstr "Se git-pull(1) för detaljer."
|
|
|
|
#: builtin/pull.c:444 builtin/pull.c:450 builtin/pull.c:459
|
|
#: builtin/rebase.c:1415 git-parse-remote.sh:64
|
|
msgid "<remote>"
|
|
msgstr "<fjärr>"
|
|
|
|
#: builtin/pull.c:444 builtin/pull.c:459 builtin/pull.c:464
|
|
#: git-parse-remote.sh:65
|
|
msgid "<branch>"
|
|
msgstr "<gren>"
|
|
|
|
#: builtin/pull.c:452 builtin/rebase.c:1407 git-parse-remote.sh:75
|
|
msgid "There is no tracking information for the current branch."
|
|
msgstr "Det finns ingen spårningsinformation för aktuell gren."
|
|
|
|
#: builtin/pull.c:461 git-parse-remote.sh:95
|
|
msgid ""
|
|
"If you wish to set tracking information for this branch you can do so with:"
|
|
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
|
|
|
|
#: builtin/pull.c:466
|
|
#, c-format
|
|
msgid ""
|
|
"Your configuration specifies to merge with the ref '%s'\n"
|
|
"from the remote, but no such ref was fetched."
|
|
msgstr ""
|
|
"Dina inställningar anger sammanslagning med referensen \"%s\"\n"
|
|
"från fjärren, men någon sådan referens togs inte emot."
|
|
|
|
#: builtin/pull.c:576
|
|
#, c-format
|
|
msgid "unable to access commit %s"
|
|
msgstr "kunde inte komma åt incheckningen %s"
|
|
|
|
#: builtin/pull.c:857
|
|
msgid "ignoring --verify-signatures for rebase"
|
|
msgstr "ignorera --verify-signatures för ombasering"
|
|
|
|
#: builtin/pull.c:912
|
|
msgid "--[no-]autostash option is only valid with --rebase."
|
|
msgstr "--[no-]autostash är endast giltig med --rebase."
|
|
|
|
#: builtin/pull.c:920
|
|
msgid "Updating an unborn branch with changes added to the index."
|
|
msgstr "Uppdaterar en ofödd gren med ändringar som lagts till i indexet."
|
|
|
|
#: builtin/pull.c:924
|
|
msgid "pull with rebase"
|
|
msgstr "pull med ombasering"
|
|
|
|
#: builtin/pull.c:925
|
|
msgid "please commit or stash them."
|
|
msgstr "checka in eller använd \"stash\" på dem."
|
|
|
|
#: builtin/pull.c:950
|
|
#, c-format
|
|
msgid ""
|
|
"fetch updated the current branch head.\n"
|
|
"fast-forwarding your working tree from\n"
|
|
"commit %s."
|
|
msgstr ""
|
|
"fetch uppdaterade huvudet för aktuell gren.\n"
|
|
"snabbspolar din arbetskatalog från\n"
|
|
"incheckningen %s."
|
|
|
|
#: builtin/pull.c:956
|
|
#, c-format
|
|
msgid ""
|
|
"Cannot fast-forward your working tree.\n"
|
|
"After making sure that you saved anything precious from\n"
|
|
"$ git diff %s\n"
|
|
"output, run\n"
|
|
"$ git reset --hard\n"
|
|
"to recover."
|
|
msgstr ""
|
|
"Kan inte snabbspola din arbetskatalog.\n"
|
|
"När du är säker på att du har sparat allt värdefullt i utdata från\n"
|
|
"$ git diff %s\n"
|
|
"kör du\n"
|
|
"$ git reset --hard\n"
|
|
"för att återgå."
|
|
|
|
#: builtin/pull.c:971
|
|
msgid "Cannot merge multiple branches into empty head."
|
|
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
|
|
|
|
#: builtin/pull.c:975
|
|
msgid "Cannot rebase onto multiple branches."
|
|
msgstr "Kan inte ombasera ovanpå flera grenar."
|
|
|
|
#: builtin/pull.c:982
|
|
msgid "cannot rebase with locally recorded submodule modifications"
|
|
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
|
|
|
|
#: builtin/push.c:19
|
|
msgid "git push [<options>] [<repository> [<refspec>...]]"
|
|
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
|
|
|
|
#: builtin/push.c:112
|
|
msgid "tag shorthand without <tag>"
|
|
msgstr "taggförkortning utan <tagg>"
|
|
|
|
#: builtin/push.c:122
|
|
msgid "--delete only accepts plain target ref names"
|
|
msgstr "--delete godtar endast enkla målreferensnamn"
|
|
|
|
#: builtin/push.c:168
|
|
msgid ""
|
|
"\n"
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
msgstr ""
|
|
"\n"
|
|
"För att välja ett av alternativen permanent, se push.default i \"git help "
|
|
"config\"."
|
|
|
|
#: builtin/push.c:171
|
|
#, c-format
|
|
msgid ""
|
|
"The upstream branch of your current branch does not match\n"
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
"on the remote, use\n"
|
|
"\n"
|
|
" git push %s HEAD:%s\n"
|
|
"\n"
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
"\n"
|
|
" git push %s HEAD\n"
|
|
"%s"
|
|
msgstr ""
|
|
"Uppströmsgrenen för din nuvarande gren stämmer inte överens\n"
|
|
"med namnet på din aktuella gren. För att sända till uppströmsgrenen\n"
|
|
"i fjärrarkivet använder du\n"
|
|
"\n"
|
|
" git push %s HEAD:%s\n"
|
|
"\n"
|
|
"För att sända till grenen med samma namn i fjärrarkivet använder du\n"
|
|
"\n"
|
|
" git push %s HEAD\n"
|
|
"%s"
|
|
|
|
#: builtin/push.c:186
|
|
#, c-format
|
|
msgid ""
|
|
"You are not currently on a branch.\n"
|
|
"To push the history leading to the current (detached HEAD)\n"
|
|
"state now, use\n"
|
|
"\n"
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
msgstr ""
|
|
"Du är inte på någon gren för närvarande.\n"
|
|
"För att sända in historiken som leder till den aktuella (frånkopplat\n"
|
|
"HEAD) situationen använder du\n"
|
|
"\n"
|
|
" git push %s HEAD:<namn-på-fjärrgren>\n"
|
|
|
|
#: builtin/push.c:200
|
|
#, c-format
|
|
msgid ""
|
|
"The current branch %s has no upstream branch.\n"
|
|
"To push the current branch and set the remote as upstream, use\n"
|
|
"\n"
|
|
" git push --set-upstream %s %s\n"
|
|
msgstr ""
|
|
"Den aktuella grenen %s har ingen uppströmsgren.\n"
|
|
"För att sända aktuell gren och ange fjärrarkiv som uppström använder du\n"
|
|
"\n"
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
#: builtin/push.c:208
|
|
#, c-format
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
|
|
|
|
#: builtin/push.c:211
|
|
#, c-format
|
|
msgid ""
|
|
"You are pushing to remote '%s', which is not the upstream of\n"
|
|
"your current branch '%s', without telling me what to push\n"
|
|
"to update which remote branch."
|
|
msgstr ""
|
|
"Du sänder till fjärren \"%s\", som inte är uppströms för den\n"
|
|
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
|
|
"ska sändas för att uppdatera fjärrgrenen."
|
|
|
|
#: builtin/push.c:270
|
|
msgid ""
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
|
msgstr ""
|
|
"Du angav inga referensspecifikationer att sända, och push.default är "
|
|
"\"nothing\"."
|
|
|
|
#: 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"
|
|
"'git pull ...') before pushing again.\n"
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
msgstr ""
|
|
"Uppdateringar avvisades då änden på din befintliga gren är bakom\n"
|
|
"dess fjärrmotsvarighet. Integrera fjärrändringarna (t.ex\n"
|
|
"\"git pull ....\") innan du sänder igen.\n"
|
|
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
|
|
|
#: 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"
|
|
"(e.g. 'git pull ...') before pushing again.\n"
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
msgstr ""
|
|
"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n"
|
|
"fjärrmotsvarighet. Checka ut grenen och integrera fjärrändringarna (t.ex.\n"
|
|
"\"git pull ...\") innan du sänder igen.\n"
|
|
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
|
|
|
#: 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"
|
|
"to the same ref. You may want to first integrate the remote changes\n"
|
|
"(e.g., 'git pull ...') before pushing again.\n"
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
msgstr ""
|
|
"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n"
|
|
"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n"
|
|
"referenser. Det kan vara en idé att först integrera fjärrändringarna\n"
|
|
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
|
|
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
|
|
|
|
#: builtin/push.c:296
|
|
msgid "Updates were rejected because the tag already exists in the remote."
|
|
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
|
|
|
|
#: 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"
|
|
"without using the '--force' option.\n"
|
|
msgstr ""
|
|
"Du kan inte uppdatera en fjärr-referens som pekar på ett objekt som\n"
|
|
"inte är en incheckning, eller uppdatera en fjärr-referens så att den\n"
|
|
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
|
|
"\"--force\".\n"
|
|
|
|
#: builtin/push.c:360
|
|
#, c-format
|
|
msgid "Pushing to %s\n"
|
|
msgstr "Sänder till %s\n"
|
|
|
|
#: builtin/push.c:367
|
|
#, c-format
|
|
msgid "failed to push some refs to '%s'"
|
|
msgstr "misslyckades sända vissa referenser till \"%s\""
|
|
|
|
#: builtin/push.c:542
|
|
msgid "repository"
|
|
msgstr "arkiv"
|
|
|
|
#: builtin/push.c:543 builtin/send-pack.c:164
|
|
msgid "push all refs"
|
|
msgstr "sänd alla referenser"
|
|
|
|
#: builtin/push.c:544 builtin/send-pack.c:166
|
|
msgid "mirror all refs"
|
|
msgstr "spegla alla referenser"
|
|
|
|
#: builtin/push.c:546
|
|
msgid "delete refs"
|
|
msgstr "ta bort referenser"
|
|
|
|
#: builtin/push.c:547
|
|
msgid "push tags (can't be used with --all or --mirror)"
|
|
msgstr "sänd taggar (kan inte användas med --all eller --mirror)"
|
|
|
|
#: builtin/push.c:550 builtin/send-pack.c:167
|
|
msgid "force updates"
|
|
msgstr "tvinga uppdateringar"
|
|
|
|
#: builtin/push.c:552 builtin/send-pack.c:181
|
|
msgid "<refname>:<expect>"
|
|
msgstr "<refnamn>:<förvänta>"
|
|
|
|
#: builtin/push.c:553 builtin/send-pack.c:182
|
|
msgid "require old value of ref to be at this value"
|
|
msgstr "kräv att ref:s tidigare värde är detta"
|
|
|
|
#: builtin/push.c:556
|
|
msgid "control recursive pushing of submodules"
|
|
msgstr "styr rekursiv insändning av undermoduler"
|
|
|
|
#: builtin/push.c:558 builtin/send-pack.c:175
|
|
msgid "use thin pack"
|
|
msgstr "använd tunna paket"
|
|
|
|
#: builtin/push.c:559 builtin/push.c:560 builtin/send-pack.c:161
|
|
#: builtin/send-pack.c:162
|
|
msgid "receive pack program"
|
|
msgstr "program för att ta emot paket"
|
|
|
|
#: builtin/push.c:561
|
|
msgid "set upstream for git pull/status"
|
|
msgstr "ställ in uppström för git pull/status"
|
|
|
|
#: builtin/push.c:564
|
|
msgid "prune locally removed refs"
|
|
msgstr "ta bort lokalt borttagna referenser"
|
|
|
|
#: builtin/push.c:566
|
|
msgid "bypass pre-push hook"
|
|
msgstr "förbigå pre-push-krok"
|
|
|
|
#: builtin/push.c:567
|
|
msgid "push missing but relevant tags"
|
|
msgstr "sänd in saknade men relevanta taggar"
|
|
|
|
#: builtin/push.c:570 builtin/send-pack.c:169
|
|
msgid "GPG sign the push"
|
|
msgstr "GPG-signera insändningen"
|
|
|
|
#: builtin/push.c:572 builtin/send-pack.c:176
|
|
msgid "request atomic transaction on remote side"
|
|
msgstr "begär atomiska transaktioner på fjärrsidan"
|
|
|
|
#: builtin/push.c:590
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
|
|
|
|
#: builtin/push.c:592
|
|
msgid "--delete doesn't make sense without any refs"
|
|
msgstr "--delete kan inte användas utan referenser"
|
|
|
|
#: builtin/push.c:612
|
|
#, c-format
|
|
msgid "bad repository '%s'"
|
|
msgstr "felaktigt arkiv \"%s\""
|
|
|
|
#: 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 ""
|
|
"Ingen destination har angivits.\n"
|
|
"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n"
|
|
"\n"
|
|
" git remote add <namn> <url>\n"
|
|
"\n"
|
|
"och sänd sedan med hjälp av fjärrnamnet\n"
|
|
"\n"
|
|
" git push <namn>\n"
|
|
|
|
#: builtin/push.c:628
|
|
msgid "--all and --tags are incompatible"
|
|
msgstr "--all och --tags är inkompatibla"
|
|
|
|
#: builtin/push.c:630
|
|
msgid "--all can't be combined with refspecs"
|
|
msgstr "--all kan inte kombineras med referensspecifikationer"
|
|
|
|
#: builtin/push.c:634
|
|
msgid "--mirror and --tags are incompatible"
|
|
msgstr "--mirror och --tags är inkompatibla"
|
|
|
|
#: builtin/push.c:636
|
|
msgid "--mirror can't be combined with refspecs"
|
|
msgstr "--mirror kan inte kombineras med referensspecifikationer"
|
|
|
|
#: builtin/push.c:639
|
|
msgid "--all and --mirror are incompatible"
|
|
msgstr "--all och --mirror är inkompatibla"
|
|
|
|
#: builtin/push.c:643
|
|
msgid "push options must not have new line characters"
|
|
msgstr "push-flaggor kan inte innehålla radbrytning"
|
|
|
|
#: builtin/range-diff.c:8
|
|
msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
|
|
msgstr ""
|
|
"git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>"
|
|
|
|
#: builtin/range-diff.c:9
|
|
msgid "git range-diff [<options>] <old-tip>...<new-tip>"
|
|
msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>"
|
|
|
|
#: builtin/range-diff.c:10
|
|
msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
|
|
msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>"
|
|
|
|
#: builtin/range-diff.c:22
|
|
msgid "Percentage by which creation is weighted"
|
|
msgstr "Procent som skapelse vägs med"
|
|
|
|
#: builtin/range-diff.c:24
|
|
msgid "use simple diff colors"
|
|
msgstr "använd enkla diff-färger"
|
|
|
|
#: builtin/range-diff.c:26
|
|
msgid "notes"
|
|
msgstr "anteckningar"
|
|
|
|
#: builtin/range-diff.c:26
|
|
msgid "passed to 'git log'"
|
|
msgstr "sänds till \"git log\""
|
|
|
|
#: builtin/range-diff.c:50 builtin/range-diff.c:54
|
|
#, c-format
|
|
msgid "no .. in range: '%s'"
|
|
msgstr ".. saknas i intervall: \"%s\""
|
|
|
|
#: builtin/range-diff.c:64
|
|
msgid "single arg format must be symmetric range"
|
|
msgstr "ensamt argument måste vara symmetriskt intervall"
|
|
|
|
#: builtin/range-diff.c:79
|
|
msgid "need two commit ranges"
|
|
msgstr "behöver två incheckningsintervall"
|
|
|
|
#: builtin/read-tree.c:41
|
|
msgid ""
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
|
"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
|
|
msgstr ""
|
|
"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
|
|
"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
|
|
"index-output=<fil>] (--empty | <träd-igt1> [<träd-igt2> [<träd-igt3>]])"
|
|
|
|
#: builtin/read-tree.c:124
|
|
msgid "write resulting index to <file>"
|
|
msgstr "skriv resulterande index till <fil>"
|
|
|
|
#: builtin/read-tree.c:127
|
|
msgid "only empty the index"
|
|
msgstr "töm bara indexet"
|
|
|
|
#: builtin/read-tree.c:129
|
|
msgid "Merging"
|
|
msgstr "Sammanslagning"
|
|
|
|
#: builtin/read-tree.c:131
|
|
msgid "perform a merge in addition to a read"
|
|
msgstr "utför en sammanslagning i tillägg till en läsning"
|
|
|
|
#: builtin/read-tree.c:133
|
|
msgid "3-way merge if no file level merging required"
|
|
msgstr "3-vägssammanslagning om sammanslagning på filnivå ej krävs"
|
|
|
|
#: builtin/read-tree.c:135
|
|
msgid "3-way merge in presence of adds and removes"
|
|
msgstr "3-vägssammanslagning när det finns tillägg och borttagningar"
|
|
|
|
#: builtin/read-tree.c:137
|
|
msgid "same as -m, but discard unmerged entries"
|
|
msgstr "som -m, men kasta bort ej sammanslagna poster"
|
|
|
|
#: builtin/read-tree.c:138
|
|
msgid "<subdirectory>/"
|
|
msgstr "<underkatalog>/"
|
|
|
|
#: builtin/read-tree.c:139
|
|
msgid "read the tree into the index under <subdirectory>/"
|
|
msgstr "läs in trädet i indexet under <underkatalog>/"
|
|
|
|
#: builtin/read-tree.c:142
|
|
msgid "update working tree with merge result"
|
|
msgstr "uppdatera arbetskatalogen med resultatet från sammanslagningen"
|
|
|
|
#: builtin/read-tree.c:144
|
|
msgid "gitignore"
|
|
msgstr "gitignore"
|
|
|
|
#: builtin/read-tree.c:145
|
|
msgid "allow explicitly ignored files to be overwritten"
|
|
msgstr "tillåt explicit ignorerade filer att skrivas över"
|
|
|
|
#: builtin/read-tree.c:148
|
|
msgid "don't check the working tree after merging"
|
|
msgstr "kontrollera inte arbetskatalogen efter sammanslagning"
|
|
|
|
#: builtin/read-tree.c:149
|
|
msgid "don't update the index or the work tree"
|
|
msgstr "uppdatera inte indexet eller arbetskatalogen"
|
|
|
|
#: builtin/read-tree.c:151
|
|
msgid "skip applying sparse checkout filter"
|
|
msgstr "hoppa över att applicera filter för gles utcheckning"
|
|
|
|
#: builtin/read-tree.c:153
|
|
msgid "debug unpack-trees"
|
|
msgstr "felsök unpack-trees"
|
|
|
|
#: builtin/read-tree.c:157
|
|
msgid "suppress feedback messages"
|
|
msgstr "undertryck återkopplingsmeddelanden"
|
|
|
|
#: builtin/read-tree.c:188
|
|
msgid "You need to resolve your current index first"
|
|
msgstr "Du måste lösa ditt befintliga index först"
|
|
|
|
#: builtin/rebase.c:32
|
|
msgid ""
|
|
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
|
|
"[<upstream> [<branch>]]"
|
|
msgstr ""
|
|
"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] "
|
|
"[<uppström> [<gren>]]"
|
|
|
|
#: builtin/rebase.c:34
|
|
msgid ""
|
|
"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
|
|
msgstr ""
|
|
"git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]"
|
|
|
|
#: builtin/rebase.c:36
|
|
msgid "git rebase --continue | --abort | --skip | --edit-todo"
|
|
msgstr "git rebase --continue | --abort | --skip | --edit-todo"
|
|
|
|
#: builtin/rebase.c:175 builtin/rebase.c:199 builtin/rebase.c:226
|
|
#, c-format
|
|
msgid "unusable todo list: '%s'"
|
|
msgstr "oanvändbar todo-lista: %s"
|
|
|
|
#: builtin/rebase.c:292
|
|
#, c-format
|
|
msgid "could not create temporary %s"
|
|
msgstr "kunde inte skapa temporär %s"
|
|
|
|
#: builtin/rebase.c:298
|
|
msgid "could not mark as interactive"
|
|
msgstr "kunde inte markera som interaktiv"
|
|
|
|
#: builtin/rebase.c:352
|
|
msgid "could not generate todo list"
|
|
msgstr "Kunde inte skapa attgöra-lista"
|
|
|
|
#: builtin/rebase.c:391
|
|
msgid "a base commit must be provided with --upstream or --onto"
|
|
msgstr "en basincheckning måste anges med --upstream eller --onto"
|
|
|
|
#: builtin/rebase.c:461
|
|
msgid "git rebase--interactive [<options>]"
|
|
msgstr "git rebase--interactive [<flaggor>]"
|
|
|
|
#: builtin/rebase.c:474 builtin/rebase.c:1550
|
|
msgid "(DEPRECATED) keep empty commits"
|
|
msgstr "(FÖRÅLDRAD) behåll tomma incheckningar"
|
|
|
|
#: builtin/rebase.c:478 builtin/revert.c:128
|
|
msgid "allow commits with empty messages"
|
|
msgstr "tillåt incheckningar med tomt meddelande"
|
|
|
|
#: builtin/rebase.c:480
|
|
msgid "rebase merge commits"
|
|
msgstr "ombasera sammanslagningar"
|
|
|
|
#: builtin/rebase.c:482
|
|
msgid "keep original branch points of cousins"
|
|
msgstr "behåll ursprungliga förgreningspunkter för kusiner"
|
|
|
|
#: builtin/rebase.c:484
|
|
msgid "move commits that begin with squash!/fixup!"
|
|
msgstr "flytta incheckningar som inleds med squash!/fixup!"
|
|
|
|
#: builtin/rebase.c:485
|
|
msgid "sign commits"
|
|
msgstr "signera incheckningar"
|
|
|
|
#: builtin/rebase.c:487 builtin/rebase.c:1490
|
|
msgid "display a diffstat of what changed upstream"
|
|
msgstr "vis diffstat för vad som ändrats uppströms"
|
|
|
|
#: builtin/rebase.c:489
|
|
msgid "continue rebase"
|
|
msgstr "fortsätt ombasering"
|
|
|
|
#: builtin/rebase.c:491
|
|
msgid "skip commit"
|
|
msgstr "hoppa över incheckning"
|
|
|
|
#: builtin/rebase.c:492
|
|
msgid "edit the todo list"
|
|
msgstr "redigera attgöra-listan"
|
|
|
|
#: builtin/rebase.c:494
|
|
msgid "show the current patch"
|
|
msgstr "visa nuvarande patch"
|
|
|
|
#: builtin/rebase.c:497
|
|
msgid "shorten commit ids in the todo list"
|
|
msgstr "förkorta inchecknings-id i todo-listan"
|
|
|
|
#: builtin/rebase.c:499
|
|
msgid "expand commit ids in the todo list"
|
|
msgstr "utöka inchecknings-id i todo-listan"
|
|
|
|
#: builtin/rebase.c:501
|
|
msgid "check the todo list"
|
|
msgstr "kontrollera todo-listan"
|
|
|
|
#: builtin/rebase.c:503
|
|
msgid "rearrange fixup/squash lines"
|
|
msgstr "ordna om fixup-/squash-rader"
|
|
|
|
#: builtin/rebase.c:505
|
|
msgid "insert exec commands in todo list"
|
|
msgstr "lägg in exec-kommandon i todo-listan"
|
|
|
|
#: builtin/rebase.c:506
|
|
msgid "onto"
|
|
msgstr "ovanpå"
|
|
|
|
#: builtin/rebase.c:509
|
|
msgid "restrict-revision"
|
|
msgstr "restrict-revision"
|
|
|
|
#: builtin/rebase.c:509
|
|
msgid "restrict revision"
|
|
msgstr "begränsa revision"
|
|
|
|
#: builtin/rebase.c:511
|
|
msgid "squash-onto"
|
|
msgstr "squash-onto"
|
|
|
|
#: builtin/rebase.c:512
|
|
msgid "squash onto"
|
|
msgstr "tryck ihop ovanpå"
|
|
|
|
#: builtin/rebase.c:514
|
|
msgid "the upstream commit"
|
|
msgstr "uppströmsincheckningen"
|
|
|
|
#: builtin/rebase.c:516
|
|
msgid "head-name"
|
|
msgstr "head-name"
|
|
|
|
#: builtin/rebase.c:516
|
|
msgid "head name"
|
|
msgstr "namn på huvud"
|
|
|
|
#: builtin/rebase.c:521
|
|
msgid "rebase strategy"
|
|
msgstr "sammanslagningsstrategi"
|
|
|
|
#: builtin/rebase.c:522
|
|
msgid "strategy-opts"
|
|
msgstr "strategy-opts"
|
|
|
|
#: builtin/rebase.c:523
|
|
msgid "strategy options"
|
|
msgstr "strategiflaggor"
|
|
|
|
#: builtin/rebase.c:524
|
|
msgid "switch-to"
|
|
msgstr "switch-to"
|
|
|
|
#: builtin/rebase.c:525
|
|
msgid "the branch or commit to checkout"
|
|
msgstr "gren eller inchecking att checka ut"
|
|
|
|
#: builtin/rebase.c:526
|
|
msgid "onto-name"
|
|
msgstr "onto-name"
|
|
|
|
#: builtin/rebase.c:526
|
|
msgid "onto name"
|
|
msgstr "på-namn"
|
|
|
|
#: builtin/rebase.c:527
|
|
msgid "cmd"
|
|
msgstr "kmd"
|
|
|
|
#: builtin/rebase.c:527
|
|
msgid "the command to run"
|
|
msgstr "kommando att köra"
|
|
|
|
#: builtin/rebase.c:530 builtin/rebase.c:1584
|
|
msgid "automatically re-schedule any `exec` that fails"
|
|
msgstr "kör automatiskt alla \"exec\" som misslyckas på nytt"
|
|
|
|
#: builtin/rebase.c:546
|
|
msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
|
|
msgstr "--[no-]rebase-cousins har ingen effekt utan --rebase-merges"
|
|
|
|
#: builtin/rebase.c:562
|
|
#, c-format
|
|
msgid "%s requires an interactive rebase"
|
|
msgstr "%s kräver en interaktiv ombasering"
|
|
|
|
#: builtin/rebase.c:612
|
|
#, c-format
|
|
msgid "could not get 'onto': '%s'"
|
|
msgstr "kunde inte hämta \"onto\": \"%s\""
|
|
|
|
#: builtin/rebase.c:627
|
|
#, c-format
|
|
msgid "invalid orig-head: '%s'"
|
|
msgstr "ogiltigt orig-head: \"%s\""
|
|
|
|
#: builtin/rebase.c:652
|
|
#, c-format
|
|
msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
|
|
msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
|
|
|
|
#: builtin/rebase.c:728
|
|
#, c-format
|
|
msgid "Could not read '%s'"
|
|
msgstr "Kunde inte läsa \"%s\""
|
|
|
|
#: builtin/rebase.c:746
|
|
#, c-format
|
|
msgid "Cannot store %s"
|
|
msgstr "Kan inte spara %s"
|
|
|
|
#: builtin/rebase.c:853
|
|
msgid "could not determine HEAD revision"
|
|
msgstr "kunde inte bestämma HEAD-revision"
|
|
|
|
#: 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"
|
|
"You can instead skip this commit: run \"git rebase --skip\".\n"
|
|
"To abort and get back to the state before \"git rebase\", run \"git rebase --"
|
|
"abort\"."
|
|
msgstr ""
|
|
"Lös alla konflikter manuellt, märk dem som lösta med\n"
|
|
"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n"
|
|
"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n"
|
|
"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
|
|
"rebase --abort\"."
|
|
|
|
#: builtin/rebase.c:1058
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"git encountered an error while preparing the patches to replay\n"
|
|
"these revisions:\n"
|
|
"\n"
|
|
" %s\n"
|
|
"\n"
|
|
"As a result, git cannot rebase them."
|
|
msgstr ""
|
|
"\n"
|
|
"git upptäckte ett fel när det skulle förbereda patchar för att\n"
|
|
"återskapa dessa revisioner:\n"
|
|
"\n"
|
|
" %s\n"
|
|
"\n"
|
|
"Därför kan inte git ombasera dessa."
|
|
|
|
#: builtin/rebase.c:1383
|
|
#, c-format
|
|
msgid ""
|
|
"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
|
|
"\"."
|
|
msgstr ""
|
|
"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
|
|
|
|
#: builtin/rebase.c:1401
|
|
#, c-format
|
|
msgid ""
|
|
"%s\n"
|
|
"Please specify which branch you want to rebase against.\n"
|
|
"See git-rebase(1) for details.\n"
|
|
"\n"
|
|
" git rebase '<branch>'\n"
|
|
"\n"
|
|
msgstr ""
|
|
"%s\n"
|
|
"Ange vilken gren du vill ombasera mot.\n"
|
|
"Se git-rebase(1) för detaljer.\n"
|
|
"\n"
|
|
" git rebase '<gren>'\n"
|
|
"\n"
|
|
|
|
#: builtin/rebase.c:1417
|
|
#, c-format
|
|
msgid ""
|
|
"If you wish to set tracking information for this branch you can do so with:\n"
|
|
"\n"
|
|
" git branch --set-upstream-to=%s/<branch> %s\n"
|
|
"\n"
|
|
msgstr ""
|
|
"Om du vill ange spårningsinformation för grenen kan du göra det med:\n"
|
|
"\n"
|
|
" git branch --set-upstream-to=%s/<gren> %s\n"
|
|
"\n"
|
|
|
|
#: builtin/rebase.c:1447
|
|
msgid "exec commands cannot contain newlines"
|
|
msgstr "exec-kommandon kan inte innehålla nyradstecken"
|
|
|
|
#: builtin/rebase.c:1451
|
|
msgid "empty exec command"
|
|
msgstr "tomt exec-kommando"
|
|
|
|
#: builtin/rebase.c:1481
|
|
msgid "rebase onto given branch instead of upstream"
|
|
msgstr "ombasera mot given grenen istället för uppström"
|
|
|
|
#: builtin/rebase.c:1483
|
|
msgid "use the merge-base of upstream and branch as the current base"
|
|
msgstr "använd sammanslagningsbasen mellan uppströms och gren som aktuell bas"
|
|
|
|
#: builtin/rebase.c:1485
|
|
msgid "allow pre-rebase hook to run"
|
|
msgstr "tillåt pre-rebase-krok att köra"
|
|
|
|
#: builtin/rebase.c:1487
|
|
msgid "be quiet. implies --no-stat"
|
|
msgstr "var tyst. implicerar --no-stat"
|
|
|
|
#: builtin/rebase.c:1493
|
|
msgid "do not show diffstat of what changed upstream"
|
|
msgstr "visa inte en diffstat för vad som ändrats uppströms"
|
|
|
|
#: builtin/rebase.c:1496
|
|
msgid "add a Signed-off-by: line to each commit"
|
|
msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
|
|
|
|
#: builtin/rebase.c:1498 builtin/rebase.c:1502 builtin/rebase.c:1504
|
|
msgid "passed to 'git am'"
|
|
msgstr "sänds till \"git am\""
|
|
|
|
#: builtin/rebase.c:1506 builtin/rebase.c:1508
|
|
msgid "passed to 'git apply'"
|
|
msgstr "sänds till \"git apply\""
|
|
|
|
#: builtin/rebase.c:1510 builtin/rebase.c:1513
|
|
msgid "cherry-pick all commits, even if unchanged"
|
|
msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
|
|
|
|
#: builtin/rebase.c:1515
|
|
msgid "continue"
|
|
msgstr "fortsätt"
|
|
|
|
#: builtin/rebase.c:1518
|
|
msgid "skip current patch and continue"
|
|
msgstr "hoppa över nuvarande patch och fortsätt"
|
|
|
|
#: builtin/rebase.c:1520
|
|
msgid "abort and check out the original branch"
|
|
msgstr "avbryt och checka ut ursprungsgrenen"
|
|
|
|
#: builtin/rebase.c:1523
|
|
msgid "abort but keep HEAD where it is"
|
|
msgstr "avbryt men behåll HEAD där det är"
|
|
|
|
#: builtin/rebase.c:1524
|
|
msgid "edit the todo list during an interactive rebase"
|
|
msgstr "redigera attgöra-listan under interaktiv ombasering."
|
|
|
|
#: builtin/rebase.c:1527
|
|
msgid "show the patch file being applied or merged"
|
|
msgstr "visa patchen som tillämpas eller slås samman"
|
|
|
|
#: builtin/rebase.c:1530
|
|
msgid "use apply strategies to rebase"
|
|
msgstr "använd appliceringstrategier för ombasering"
|
|
|
|
#: builtin/rebase.c:1534
|
|
msgid "use merging strategies to rebase"
|
|
msgstr "använd sammanslagningsstrategier för ombasering"
|
|
|
|
#: builtin/rebase.c:1538
|
|
msgid "let the user edit the list of commits to rebase"
|
|
msgstr "låt användaren redigera listan över incheckningar att ombasera"
|
|
|
|
#: builtin/rebase.c:1542
|
|
msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
|
|
msgstr ""
|
|
"(AVRÅDS) försök återskapa sammanslagningar istället för att ignorera dem"
|
|
|
|
#: builtin/rebase.c:1547
|
|
msgid "how to handle commits that become empty"
|
|
msgstr "hur incheckningar som blir tomma ska hanteras"
|
|
|
|
#: builtin/rebase.c:1554
|
|
msgid "move commits that begin with squash!/fixup! under -i"
|
|
msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
|
|
|
|
#: builtin/rebase.c:1560
|
|
msgid "automatically stash/stash pop before and after"
|
|
msgstr "utför automatiskt stash/stash pop före och efter"
|
|
|
|
#: builtin/rebase.c:1562
|
|
msgid "add exec lines after each commit of the editable list"
|
|
msgstr "lägg till exec-rader efter varje incheckning i den redigerbara listan"
|
|
|
|
#: builtin/rebase.c:1566
|
|
msgid "allow rebasing commits with empty messages"
|
|
msgstr "tillåt ombasering av incheckningar med tomt meddelande"
|
|
|
|
#: builtin/rebase.c:1570
|
|
msgid "try to rebase merges instead of skipping them"
|
|
msgstr "försök ombasera sammanslagningar istället för att ignorera dem"
|
|
|
|
#: builtin/rebase.c:1573
|
|
msgid "use 'merge-base --fork-point' to refine upstream"
|
|
msgstr "använd \"merge-base --fork-point\" för att förfina uppström"
|
|
|
|
#: builtin/rebase.c:1575
|
|
msgid "use the given merge strategy"
|
|
msgstr "använd angiven sammanslagningsstrategi"
|
|
|
|
#: builtin/rebase.c:1577 builtin/revert.c:115
|
|
msgid "option"
|
|
msgstr "alternativ"
|
|
|
|
#: builtin/rebase.c:1578
|
|
msgid "pass the argument through to the merge strategy"
|
|
msgstr "sänd flaggan till sammanslagningsstrategin"
|
|
|
|
#: builtin/rebase.c:1581
|
|
msgid "rebase all reachable commits up to the root(s)"
|
|
msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
|
|
|
|
#: builtin/rebase.c:1598
|
|
msgid ""
|
|
"the rebase.useBuiltin support has been removed!\n"
|
|
"See its entry in 'git help config' for details."
|
|
msgstr ""
|
|
"stödet för rebase.useBuiltin har tagits bort!\n"
|
|
"Se posten för det i \"git help config\" för detaljer."
|
|
|
|
#: builtin/rebase.c:1604
|
|
msgid "It looks like 'git am' is in progress. Cannot rebase."
|
|
msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
|
|
|
|
#: builtin/rebase.c:1645
|
|
msgid ""
|
|
"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
|
|
msgstr ""
|
|
"git rebase --preserve-merges avråds från. Använd --rebase-merges istället."
|
|
|
|
#: builtin/rebase.c:1650
|
|
msgid "cannot combine '--keep-base' with '--onto'"
|
|
msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
|
|
|
|
#: builtin/rebase.c:1652
|
|
msgid "cannot combine '--keep-base' with '--root'"
|
|
msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
|
|
|
|
#: builtin/rebase.c:1656
|
|
msgid "No rebase in progress?"
|
|
msgstr "Ingen ombasering pågår?"
|
|
|
|
#: builtin/rebase.c:1660
|
|
msgid "The --edit-todo action can only be used during interactive rebase."
|
|
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
|
|
|
|
#: builtin/rebase.c:1683
|
|
msgid "Cannot read HEAD"
|
|
msgstr "Kan inte läsa HEAD"
|
|
|
|
#: builtin/rebase.c:1695
|
|
msgid ""
|
|
"You must edit all merge conflicts and then\n"
|
|
"mark them as resolved using git add"
|
|
msgstr ""
|
|
"Du måste redigera alla sammanslagningskonflikter och\n"
|
|
"därefter markera dem som lösta med git add"
|
|
|
|
#: builtin/rebase.c:1714
|
|
msgid "could not discard worktree changes"
|
|
msgstr "kunde inte kasta ändringar i arbetskatalogen"
|
|
|
|
#: builtin/rebase.c:1733
|
|
#, c-format
|
|
msgid "could not move back to %s"
|
|
msgstr "kunde inte flytta tillbaka till %s"
|
|
|
|
#: builtin/rebase.c:1778
|
|
#, c-format
|
|
msgid ""
|
|
"It seems that there is already a %s directory, and\n"
|
|
"I wonder if you are in the middle of another rebase. If that is the\n"
|
|
"case, please try\n"
|
|
"\t%s\n"
|
|
"If that is not the case, please\n"
|
|
"\t%s\n"
|
|
"and run me again. I am stopping in case you still have something\n"
|
|
"valuable there.\n"
|
|
msgstr ""
|
|
"Det verkar som katalogen %s redan existerar, och\n"
|
|
"jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
|
|
"fallet, försök\n"
|
|
"\t%s\n"
|
|
"Om så inte är fallet, kör\n"
|
|
"\t%s\n"
|
|
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
|
|
"något av värde där.\n"
|
|
|
|
#: builtin/rebase.c:1806
|
|
msgid "switch `C' expects a numerical value"
|
|
msgstr "flaggan \"C\" förväntar ett numeriskt värde"
|
|
|
|
#: builtin/rebase.c:1847
|
|
#, c-format
|
|
msgid "Unknown mode: %s"
|
|
msgstr "Okänt läge: %s"
|
|
|
|
#: builtin/rebase.c:1869
|
|
msgid "--strategy requires --merge or --interactive"
|
|
msgstr "--strategy kräver --merge eller --interactive"
|
|
|
|
#: builtin/rebase.c:1899
|
|
msgid "cannot combine apply options with merge options"
|
|
msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
|
|
|
|
#: builtin/rebase.c:1912
|
|
#, c-format
|
|
msgid "Unknown rebase backend: %s"
|
|
msgstr "Okänd rebase-bakända: %s"
|
|
|
|
#: builtin/rebase.c:1937
|
|
msgid "--reschedule-failed-exec requires --exec or --interactive"
|
|
msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
|
|
|
|
#: builtin/rebase.c:1957
|
|
msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
|
|
msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
|
|
|
|
#: builtin/rebase.c:1961
|
|
msgid ""
|
|
"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
|
|
msgstr ""
|
|
"fel: kan inte kombinera \"--preserve-merges\" med \"--reschedule-failed-exec"
|
|
"\""
|
|
|
|
#: builtin/rebase.c:1985
|
|
#, c-format
|
|
msgid "invalid upstream '%s'"
|
|
msgstr "felaktig uppström \"%s\""
|
|
|
|
#: builtin/rebase.c:1991
|
|
msgid "Could not create new root commit"
|
|
msgstr "kunde inte skapa ny rotincheckning"
|
|
|
|
#: builtin/rebase.c:2017
|
|
#, c-format
|
|
msgid "'%s': need exactly one merge base with branch"
|
|
msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
|
|
|
|
#: builtin/rebase.c:2020
|
|
#, c-format
|
|
msgid "'%s': need exactly one merge base"
|
|
msgstr "\"%s\": behöver precis en sammanslagningsbas"
|
|
|
|
#: builtin/rebase.c:2028
|
|
#, c-format
|
|
msgid "Does not point to a valid commit '%s'"
|
|
msgstr "Pekar inte på en giltig incheckning: \"%s\""
|
|
|
|
#: builtin/rebase.c:2054
|
|
#, c-format
|
|
msgid "fatal: no such branch/commit '%s'"
|
|
msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
|
|
|
|
#: builtin/rebase.c:2062 builtin/submodule--helper.c:40
|
|
#: builtin/submodule--helper.c:1990
|
|
#, c-format
|
|
msgid "No such ref: %s"
|
|
msgstr "Ingen sådan referens: %s"
|
|
|
|
#: builtin/rebase.c:2073
|
|
msgid "Could not resolve HEAD to a revision"
|
|
msgstr "Kunde inte bestämma HEAD:s incheckning"
|
|
|
|
#: builtin/rebase.c:2111
|
|
msgid "Cannot autostash"
|
|
msgstr "Kan inte utföra \"autostash\""
|
|
|
|
#: builtin/rebase.c:2114
|
|
#, c-format
|
|
msgid "Unexpected stash response: '%s'"
|
|
msgstr "Oväntat svar från stash: \"%s\""
|
|
|
|
#: builtin/rebase.c:2120
|
|
#, c-format
|
|
msgid "Could not create directory for '%s'"
|
|
msgstr "Kunde inte skapa katalog för \"%s\""
|
|
|
|
#: builtin/rebase.c:2123
|
|
#, c-format
|
|
msgid "Created autostash: %s\n"
|
|
msgstr "Skapade autostash: %s\n"
|
|
|
|
#: builtin/rebase.c:2126
|
|
msgid "could not reset --hard"
|
|
msgstr "kunde inte utföra \"reset --hard\""
|
|
|
|
#: builtin/rebase.c:2135
|
|
msgid "Please commit or stash them."
|
|
msgstr "Checka in eller använd \"stash\" på dem."
|
|
|
|
#: builtin/rebase.c:2169
|
|
#, c-format
|
|
msgid "could not switch to %s"
|
|
msgstr "kunde inte växla till %s"
|
|
|
|
#: builtin/rebase.c:2180
|
|
msgid "HEAD is up to date."
|
|
msgstr "HEAD är à jour."
|
|
|
|
#: builtin/rebase.c:2182
|
|
#, c-format
|
|
msgid "Current branch %s is up to date.\n"
|
|
msgstr "Aktuell gren %s är à jour.\n"
|
|
|
|
#: builtin/rebase.c:2190
|
|
msgid "HEAD is up to date, rebase forced."
|
|
msgstr "HEAD är à jour, ombasering framtvingad."
|
|
|
|
#: builtin/rebase.c:2192
|
|
#, c-format
|
|
msgid "Current branch %s is up to date, rebase forced.\n"
|
|
msgstr "Aktuell gren %s är à jour, ombasering framtvingad.\n"
|
|
|
|
#: builtin/rebase.c:2200
|
|
msgid "The pre-rebase hook refused to rebase."
|
|
msgstr "Kroken pre-rebase vägrade ombaseringen."
|
|
|
|
#: builtin/rebase.c:2207
|
|
#, c-format
|
|
msgid "Changes to %s:\n"
|
|
msgstr "Ändringar till %s:\n"
|
|
|
|
#: builtin/rebase.c:2210
|
|
#, c-format
|
|
msgid "Changes from %s to %s:\n"
|
|
msgstr "Ändringar från %s till %s:\n"
|
|
|
|
#: builtin/rebase.c:2235
|
|
#, c-format
|
|
msgid "First, rewinding head to replay your work on top of it...\n"
|
|
msgstr ""
|
|
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det...\n"
|
|
|
|
#: builtin/rebase.c:2244
|
|
msgid "Could not detach HEAD"
|
|
msgstr "Kunde inte koppla från HEAD"
|
|
|
|
#: builtin/rebase.c:2253
|
|
#, c-format
|
|
msgid "Fast-forwarded %s to %s.\n"
|
|
msgstr "Snabbspolade %s till %s.\n"
|
|
|
|
#: builtin/receive-pack.c:33
|
|
msgid "git receive-pack <git-dir>"
|
|
msgstr "git receive-pack <git-katalog>"
|
|
|
|
#: 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"
|
|
"with what you pushed, and will require 'git reset --hard' to match\n"
|
|
"the work tree to HEAD.\n"
|
|
"\n"
|
|
"You can set the 'receive.denyCurrentBranch' configuration variable\n"
|
|
"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
|
|
"its current branch; however, this is not recommended unless you\n"
|
|
"arranged to update its work tree to match what you pushed in some\n"
|
|
"other way.\n"
|
|
"\n"
|
|
"To squelch this message and still keep the default behaviour, set\n"
|
|
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
|
|
msgstr ""
|
|
"Normalt tillåts inte uppdatering av aktuell gren i ett icke-naket\n"
|
|
"arkiv, då index och arbetskatalog inte kommer stämma med det du\n"
|
|
"sände och \"git reset --hard\" krävs för att få arbetskatalogen och\n"
|
|
"HEAD att stämma överens.\n"
|
|
"\n"
|
|
"Du kan ställa in variabeln \"receive.denyCurrentBranch\" till\n"
|
|
"\"ignore\" eller \"warn\" i fjärrarkivet för att tillåta sändning till\n"
|
|
"dess aktuella gren; detta rekommenderas dock inte såvida du inte\n"
|
|
"sett till att dess arbetskatalog uppdateras till det tu sände in\n"
|
|
"på annat sätt.\n"
|
|
"\n"
|
|
"För att undvika detta meddelande och fortfarande behålla det\n"
|
|
"normala beteendet, sätt \"receive.denyCurrentBranch\" till \"refuse\"."
|
|
|
|
#: builtin/receive-pack.c: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"
|
|
"\n"
|
|
"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
|
|
"'warn' or 'ignore' in the remote repository to allow deleting the\n"
|
|
"current branch, with or without a warning message.\n"
|
|
"\n"
|
|
"To squelch this message, you can set it to 'refuse'."
|
|
msgstr ""
|
|
"Normalt tillåts inte radering av aktuell gren, eftersom nästa\n"
|
|
"\"git clone\" inte kommer innebära att några filer checkas ut,\n"
|
|
"vilket är förvirrande.\n"
|
|
"\n"
|
|
"Du kan ställa in variabeln \"receive.denyDeleteCurrent\" till\n"
|
|
"\"warn\" eller \"ignore\" i fjärrarkivet för att tillåta borttagning\n"
|
|
"av aktuell gren, med eller utan varningsmeddelande.\n"
|
|
"\n"
|
|
"För att undvika detta meddelande kan du sätta det till \"refuse\"."
|
|
|
|
#: builtin/receive-pack.c:1938
|
|
msgid "quiet"
|
|
msgstr "tyst"
|
|
|
|
#: builtin/receive-pack.c:1952
|
|
msgid "You must specify a directory."
|
|
msgstr "Du måste ange en katalog."
|
|
|
|
#: builtin/reflog.c:17
|
|
msgid ""
|
|
"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
|
|
"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
|
|
"<refs>..."
|
|
msgstr ""
|
|
"git reflog expire [--expire=<tid>] [--expire-unreachable=<tid>] [--rewrite] "
|
|
"[--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
|
|
"<referenser>..."
|
|
|
|
#: builtin/reflog.c:22
|
|
msgid ""
|
|
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
|
|
"<refs>..."
|
|
msgstr ""
|
|
"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
|
|
"<referenser>..."
|
|
|
|
#: builtin/reflog.c:25
|
|
msgid "git reflog exists <ref>"
|
|
msgstr "git reflog exists <referens>"
|
|
|
|
#: builtin/reflog.c:568 builtin/reflog.c:573
|
|
#, c-format
|
|
msgid "'%s' is not a valid timestamp"
|
|
msgstr "\"%s\" är inte en giltig tidsstämpel"
|
|
|
|
#: builtin/reflog.c:606
|
|
#, c-format
|
|
msgid "Marking reachable objects..."
|
|
msgstr "Markerar nåbara objekt..."
|
|
|
|
#: builtin/reflog.c:644
|
|
#, c-format
|
|
msgid "%s points nowhere!"
|
|
msgstr "%s pekar ingenstans!"
|
|
|
|
#: builtin/reflog.c:696
|
|
msgid "no reflog specified to delete"
|
|
msgstr "ingen referenslogg att ta bort angavs"
|
|
|
|
#: builtin/reflog.c:705
|
|
#, c-format
|
|
msgid "not a reflog: %s"
|
|
msgstr "inte en referenslogg: %s"
|
|
|
|
#: builtin/reflog.c:710
|
|
#, c-format
|
|
msgid "no reflog for '%s'"
|
|
msgstr "ingen referenslogg för \"%s\""
|
|
|
|
#: builtin/reflog.c:756
|
|
#, c-format
|
|
msgid "invalid ref format: %s"
|
|
msgstr "felaktigt referensformat: %s"
|
|
|
|
#: builtin/reflog.c:765
|
|
msgid "git reflog [ show | expire | delete | exists ]"
|
|
msgstr "git reflog [ show | expire | delete | exists ]"
|
|
|
|
#: builtin/remote.c:17
|
|
msgid "git remote [-v | --verbose]"
|
|
msgstr "git remote [-v | --verbose]"
|
|
|
|
#: builtin/remote.c:18
|
|
msgid ""
|
|
"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
|
"mirror=<fetch|push>] <name> <url>"
|
|
msgstr ""
|
|
"git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
|
|
"mirror=<fetch|push>] <namn> <url>"
|
|
|
|
#: builtin/remote.c:19 builtin/remote.c:39
|
|
msgid "git remote rename <old> <new>"
|
|
msgstr "git remote rename <gammal> <ny>"
|
|
|
|
#: builtin/remote.c:20 builtin/remote.c:44
|
|
msgid "git remote remove <name>"
|
|
msgstr "git remote remove <namn>"
|
|
|
|
#: builtin/remote.c:21 builtin/remote.c:49
|
|
msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
|
|
msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
|
|
|
|
#: builtin/remote.c:22
|
|
msgid "git remote [-v | --verbose] show [-n] <name>"
|
|
msgstr "git remote [-v | --verbose] show [-n] <namn>"
|
|
|
|
#: builtin/remote.c:23
|
|
msgid "git remote prune [-n | --dry-run] <name>"
|
|
msgstr "git remote prune [-n | --dry-run] <namn>"
|
|
|
|
#: builtin/remote.c:24
|
|
msgid ""
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
|
|
msgstr ""
|
|
"git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
|
|
|
|
#: builtin/remote.c:25
|
|
msgid "git remote set-branches [--add] <name> <branch>..."
|
|
msgstr "git remote set-branches [--add] <namn> <gren>..."
|
|
|
|
#: builtin/remote.c:26 builtin/remote.c:75
|
|
msgid "git remote get-url [--push] [--all] <name>"
|
|
msgstr "git remote get-url [--push] [--all] <namn>"
|
|
|
|
#: builtin/remote.c:27 builtin/remote.c:80
|
|
msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
|
|
msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
|
|
|
|
#: builtin/remote.c:28 builtin/remote.c:81
|
|
msgid "git remote set-url --add <name> <newurl>"
|
|
msgstr "git remote set-url --add <namn> <nyurl>"
|
|
|
|
#: builtin/remote.c:29 builtin/remote.c:82
|
|
msgid "git remote set-url --delete <name> <url>"
|
|
msgstr "git remote set-url --delete <namn> <url>"
|
|
|
|
#: builtin/remote.c:34
|
|
msgid "git remote add [<options>] <name> <url>"
|
|
msgstr "git remote add [<flaggor>] <namn> <url>"
|
|
|
|
#: builtin/remote.c:54
|
|
msgid "git remote set-branches <name> <branch>..."
|
|
msgstr "git remote set-branches <namn> <gren>..."
|
|
|
|
#: builtin/remote.c:55
|
|
msgid "git remote set-branches --add <name> <branch>..."
|
|
msgstr "git remote set-branches --add <namn> <gren>..."
|
|
|
|
#: builtin/remote.c:60
|
|
msgid "git remote show [<options>] <name>"
|
|
msgstr "git remote show [<flaggor>] <namn>"
|
|
|
|
#: builtin/remote.c:65
|
|
msgid "git remote prune [<options>] <name>"
|
|
msgstr "git remote prune [<flaggor>] <namn>"
|
|
|
|
#: builtin/remote.c:70
|
|
msgid "git remote update [<options>] [<group> | <remote>]..."
|
|
msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
|
|
|
|
#: builtin/remote.c:99
|
|
#, c-format
|
|
msgid "Updating %s"
|
|
msgstr "Uppdaterar %s"
|
|
|
|
#: builtin/remote.c:131
|
|
msgid ""
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
msgstr ""
|
|
"--mirror är farlig och föråldrad; använd\n"
|
|
"\t --mirror=fetch eller --mirror=push istället"
|
|
|
|
#: builtin/remote.c:148
|
|
#, c-format
|
|
msgid "unknown mirror argument: %s"
|
|
msgstr "okänt argument till mirror: %s"
|
|
|
|
#: builtin/remote.c:164
|
|
msgid "fetch the remote branches"
|
|
msgstr "hämta fjärrgrenarna"
|
|
|
|
#: builtin/remote.c:166
|
|
msgid "import all tags and associated objects when fetching"
|
|
msgstr "importera alla taggar och associerade objekt vid hämtning"
|
|
|
|
#: builtin/remote.c:169
|
|
msgid "or do not fetch any tag at all (--no-tags)"
|
|
msgstr "eller hämta inte några taggar alls (--no-tags)"
|
|
|
|
#: builtin/remote.c:171
|
|
msgid "branch(es) to track"
|
|
msgstr "gren(ar) att spåra"
|
|
|
|
#: builtin/remote.c:172
|
|
msgid "master branch"
|
|
msgstr "huvudgren"
|
|
|
|
#: builtin/remote.c:174
|
|
msgid "set up remote as a mirror to push to or fetch from"
|
|
msgstr "ställ in arkiv som spegel att sända eller ta emot från"
|
|
|
|
#: builtin/remote.c:186
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
|
msgstr "att ange en master-gren ger ingen mening med --mirror"
|
|
|
|
#: builtin/remote.c:188
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
|
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
|
|
|
|
#: builtin/remote.c:195 builtin/remote.c:696
|
|
#, c-format
|
|
msgid "remote %s already exists."
|
|
msgstr "fjärrarkivet %s finns redan."
|
|
|
|
#: builtin/remote.c:199 builtin/remote.c:700
|
|
#, c-format
|
|
msgid "'%s' is not a valid remote name"
|
|
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
|
|
|
|
#: builtin/remote.c:239
|
|
#, c-format
|
|
msgid "Could not setup master '%s'"
|
|
msgstr "Kunde inte skapa master \"%s\""
|
|
|
|
#: builtin/remote.c:354
|
|
#, c-format
|
|
msgid "Could not get fetch map for refspec %s"
|
|
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
|
|
|
|
#: builtin/remote.c:453 builtin/remote.c:461
|
|
msgid "(matching)"
|
|
msgstr "(matchande)"
|
|
|
|
#: builtin/remote.c:465
|
|
msgid "(delete)"
|
|
msgstr "(ta bort)"
|
|
|
|
#: builtin/remote.c:653
|
|
#, c-format
|
|
msgid "could not set '%s'"
|
|
msgstr "kunde inte ställa in \"%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 ""
|
|
"Konfigurationen för %s för remote.pushDefault i:\n"
|
|
"\t%s:%d\n"
|
|
"anger nu den icke-existerande fjärren \"%s\""
|
|
|
|
#: builtin/remote.c:689 builtin/remote.c:832 builtin/remote.c:940
|
|
#, c-format
|
|
msgid "No such remote: '%s'"
|
|
msgstr "Ingen sådan fjärr: \"%s\""
|
|
|
|
#: builtin/remote.c:706
|
|
#, c-format
|
|
msgid "Could not rename config section '%s' to '%s'"
|
|
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
|
|
|
|
#: builtin/remote.c:726
|
|
#, c-format
|
|
msgid ""
|
|
"Not updating non-default fetch refspec\n"
|
|
"\t%s\n"
|
|
"\tPlease update the configuration manually if necessary."
|
|
msgstr ""
|
|
"Uppdaterar inte icke-standard hämtningsreferensspecifikation\n"
|
|
"\t%s\n"
|
|
"\tUppdatera konfigurationen manuellt om nödvändigt."
|
|
|
|
#: builtin/remote.c:766
|
|
#, c-format
|
|
msgid "deleting '%s' failed"
|
|
msgstr "misslyckades ta bort \"%s\""
|
|
|
|
#: builtin/remote.c:800
|
|
#, c-format
|
|
msgid "creating '%s' failed"
|
|
msgstr "misslyckades skapa \"%s\""
|
|
|
|
#: builtin/remote.c:876
|
|
msgid ""
|
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
|
|
"to delete it, use:"
|
|
msgid_plural ""
|
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
|
|
"to delete them, use:"
|
|
msgstr[0] ""
|
|
"Observera: En gren utanför hierarkin refs/remotes/ togs inte bort;\n"
|
|
"för att ta bort den, använd:"
|
|
msgstr[1] ""
|
|
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
|
|
"för att ta bort dem, använd:"
|
|
|
|
#: builtin/remote.c:890
|
|
#, c-format
|
|
msgid "Could not remove config section '%s'"
|
|
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
|
|
|
|
#: builtin/remote.c:993
|
|
#, c-format
|
|
msgid " new (next fetch will store in remotes/%s)"
|
|
msgstr " ny (nästa hämtning sparar i remotes/%s)"
|
|
|
|
#: builtin/remote.c:996
|
|
msgid " tracked"
|
|
msgstr " spårad"
|
|
|
|
#: builtin/remote.c:998
|
|
msgid " stale (use 'git remote prune' to remove)"
|
|
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
|
|
|
|
#: builtin/remote.c:1000
|
|
msgid " ???"
|
|
msgstr " ???"
|
|
|
|
#: builtin/remote.c:1041
|
|
#, c-format
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
|
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
|
|
|
|
#: builtin/remote.c:1050
|
|
#, c-format
|
|
msgid "rebases interactively onto remote %s"
|
|
msgstr "ombaseras interaktivt på fjärren %s"
|
|
|
|
#: builtin/remote.c:1052
|
|
#, c-format
|
|
msgid "rebases interactively (with merges) onto remote %s"
|
|
msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
|
|
|
|
#: builtin/remote.c:1055
|
|
#, c-format
|
|
msgid "rebases onto remote %s"
|
|
msgstr "ombaseras på fjärren %s"
|
|
|
|
#: builtin/remote.c:1059
|
|
#, c-format
|
|
msgid " merges with remote %s"
|
|
msgstr " sammanslås med fjärren %s"
|
|
|
|
#: builtin/remote.c:1062
|
|
#, c-format
|
|
msgid "merges with remote %s"
|
|
msgstr "sammanslås med fjärren %s"
|
|
|
|
#: builtin/remote.c:1065
|
|
#, c-format
|
|
msgid "%-*s and with remote %s\n"
|
|
msgstr "%-*s och med fjärren %s\n"
|
|
|
|
#: builtin/remote.c:1108
|
|
msgid "create"
|
|
msgstr "skapa"
|
|
|
|
#: builtin/remote.c:1111
|
|
msgid "delete"
|
|
msgstr "ta bort"
|
|
|
|
#: builtin/remote.c:1115
|
|
msgid "up to date"
|
|
msgstr "àjour"
|
|
|
|
#: builtin/remote.c:1118
|
|
msgid "fast-forwardable"
|
|
msgstr "kan snabbspolas"
|
|
|
|
#: builtin/remote.c:1121
|
|
msgid "local out of date"
|
|
msgstr "lokal föråldrad"
|
|
|
|
#: builtin/remote.c:1128
|
|
#, c-format
|
|
msgid " %-*s forces to %-*s (%s)"
|
|
msgstr " %-*s tvingar till %-*s (%s)"
|
|
|
|
#: builtin/remote.c:1131
|
|
#, c-format
|
|
msgid " %-*s pushes to %-*s (%s)"
|
|
msgstr " %-*s sänder till %-*s (%s)"
|
|
|
|
#: builtin/remote.c:1135
|
|
#, c-format
|
|
msgid " %-*s forces to %s"
|
|
msgstr " %-*s tvingar till %s"
|
|
|
|
#: builtin/remote.c:1138
|
|
#, c-format
|
|
msgid " %-*s pushes to %s"
|
|
msgstr " %-*s sänder till %s"
|
|
|
|
#: builtin/remote.c:1206
|
|
msgid "do not query remotes"
|
|
msgstr "fråga inte fjärrar"
|
|
|
|
#: builtin/remote.c:1233
|
|
#, c-format
|
|
msgid "* remote %s"
|
|
msgstr "* fjärr %s"
|
|
|
|
#: builtin/remote.c:1234
|
|
#, c-format
|
|
msgid " Fetch URL: %s"
|
|
msgstr " Hämt-URL: %s"
|
|
|
|
#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
|
|
msgid "(no URL)"
|
|
msgstr "(ingen URL)"
|
|
|
|
#. TRANSLATORS: the colon ':' should align
|
|
#. with the one in " Fetch URL: %s"
|
|
#. translation.
|
|
#.
|
|
#: builtin/remote.c:1249 builtin/remote.c:1251
|
|
#, c-format
|
|
msgid " Push URL: %s"
|
|
msgstr " Sänd-URL: %s"
|
|
|
|
#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
|
|
#, c-format
|
|
msgid " HEAD branch: %s"
|
|
msgstr " HEAD-gren: %s"
|
|
|
|
#: builtin/remote.c:1253
|
|
msgid "(not queried)"
|
|
msgstr "(inte förfrågad)"
|
|
|
|
#: builtin/remote.c:1255
|
|
msgid "(unknown)"
|
|
msgstr "(okänd)"
|
|
|
|
#: builtin/remote.c:1259
|
|
#, c-format
|
|
msgid ""
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
|
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
|
|
|
|
#: builtin/remote.c:1271
|
|
#, c-format
|
|
msgid " Remote branch:%s"
|
|
msgid_plural " Remote branches:%s"
|
|
msgstr[0] " Fjärrgren:%s"
|
|
msgstr[1] " Fjärrgrenar:%s"
|
|
|
|
#: builtin/remote.c:1274 builtin/remote.c:1300
|
|
msgid " (status not queried)"
|
|
msgstr " (status inte förfrågad)"
|
|
|
|
#: builtin/remote.c:1283
|
|
msgid " Local branch configured for 'git pull':"
|
|
msgid_plural " Local branches configured for 'git pull':"
|
|
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
|
|
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
|
|
|
|
#: builtin/remote.c:1291
|
|
msgid " Local refs will be mirrored by 'git push'"
|
|
msgstr " Lokala referenser speglas av \"git push\""
|
|
|
|
#: 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] " Lokal referens konfigurerad för \"git push\"%s:"
|
|
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
|
|
|
|
#: builtin/remote.c:1318
|
|
msgid "set refs/remotes/<name>/HEAD according to remote"
|
|
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
|
|
|
|
#: builtin/remote.c:1320
|
|
msgid "delete refs/remotes/<name>/HEAD"
|
|
msgstr "ta bort refs/remotes/<namn>/HEAD"
|
|
|
|
#: builtin/remote.c:1335
|
|
msgid "Cannot determine remote HEAD"
|
|
msgstr "Kan inte bestämma HEAD på fjärren"
|
|
|
|
#: builtin/remote.c:1337
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
|
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
|
|
|
|
#: builtin/remote.c:1347
|
|
#, c-format
|
|
msgid "Could not delete %s"
|
|
msgstr "Kunde inte ta bort %s"
|
|
|
|
#: builtin/remote.c:1355
|
|
#, c-format
|
|
msgid "Not a valid ref: %s"
|
|
msgstr "Inte en giltig referens: %s"
|
|
|
|
#: builtin/remote.c:1357
|
|
#, c-format
|
|
msgid "Could not setup %s"
|
|
msgstr "Kunde inte ställa in %s"
|
|
|
|
#: builtin/remote.c:1375
|
|
#, c-format
|
|
msgid " %s will become dangling!"
|
|
msgstr " %s kommer bli dinglande!"
|
|
|
|
#: builtin/remote.c:1376
|
|
#, c-format
|
|
msgid " %s has become dangling!"
|
|
msgstr " %s har blivit dinglande!"
|
|
|
|
#: builtin/remote.c:1386
|
|
#, c-format
|
|
msgid "Pruning %s"
|
|
msgstr "Rensar %s"
|
|
|
|
#: builtin/remote.c:1387
|
|
#, c-format
|
|
msgid "URL: %s"
|
|
msgstr "URL: %s"
|
|
|
|
#: builtin/remote.c:1403
|
|
#, c-format
|
|
msgid " * [would prune] %s"
|
|
msgstr " * [skulle rensa] %s"
|
|
|
|
#: builtin/remote.c:1406
|
|
#, c-format
|
|
msgid " * [pruned] %s"
|
|
msgstr " * [rensad] %s"
|
|
|
|
#: builtin/remote.c:1451
|
|
msgid "prune remotes after fetching"
|
|
msgstr "rensa fjärrar efter hämtning"
|
|
|
|
#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
|
|
#, c-format
|
|
msgid "No such remote '%s'"
|
|
msgstr "Ingen sådan fjärr \"%s\""
|
|
|
|
#: builtin/remote.c:1530
|
|
msgid "add branch"
|
|
msgstr "lägg till gren"
|
|
|
|
#: builtin/remote.c:1537
|
|
msgid "no remote specified"
|
|
msgstr "ingen fjärr angavs"
|
|
|
|
#: builtin/remote.c:1554
|
|
msgid "query push URLs rather than fetch URLs"
|
|
msgstr "fråga sänd-URL:er istället för hämta-URL:er"
|
|
|
|
#: builtin/remote.c:1556
|
|
msgid "return all URLs"
|
|
msgstr "returnera alla URL:er"
|
|
|
|
#: builtin/remote.c:1584
|
|
#, c-format
|
|
msgid "no URLs configured for remote '%s'"
|
|
msgstr "ingen URL:er angivna för fjärren \"%s\""
|
|
|
|
#: builtin/remote.c:1610
|
|
msgid "manipulate push URLs"
|
|
msgstr "manipulera URL:ar för sändning"
|
|
|
|
#: builtin/remote.c:1612
|
|
msgid "add URL"
|
|
msgstr "lägg till URL"
|
|
|
|
#: builtin/remote.c:1614
|
|
msgid "delete URLs"
|
|
msgstr "ta bort URL:ar"
|
|
|
|
#: builtin/remote.c:1621
|
|
msgid "--add --delete doesn't make sense"
|
|
msgstr "--add --delete ger ingen mening"
|
|
|
|
#: builtin/remote.c:1660
|
|
#, c-format
|
|
msgid "Invalid old URL pattern: %s"
|
|
msgstr "Felaktig gammalt URL-mönster: %s"
|
|
|
|
#: builtin/remote.c:1668
|
|
#, c-format
|
|
msgid "No such URL found: %s"
|
|
msgstr "Ingen sådan URL hittades: %s"
|
|
|
|
#: builtin/remote.c:1670
|
|
msgid "Will not delete all non-push URLs"
|
|
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
|
|
|
|
#: builtin/repack.c:23
|
|
msgid "git repack [<options>]"
|
|
msgstr "git repack [<flaggor>]"
|
|
|
|
#: builtin/repack.c:28
|
|
msgid ""
|
|
"Incremental repacks are incompatible with bitmap indexes. Use\n"
|
|
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
|
|
msgstr ""
|
|
"Inkrementella ompackningar är inte kompatibla med bitmapp-index.\n"
|
|
"Använd --no-write-bitmap-index eller inaktivera inställningen\n"
|
|
"pack.writebitmaps"
|
|
|
|
#: builtin/repack.c:191
|
|
msgid "could not start pack-objects to repack promisor objects"
|
|
msgstr "kunde inte starta pack-objects för att packa om kontraktsobjekt"
|
|
|
|
#: builtin/repack.c:230 builtin/repack.c:416
|
|
msgid "repack: Expecting full hex object ID lines only from pack-objects."
|
|
msgstr ""
|
|
"repack: Förväntar kompletta hex-objekt-id-rader endast från pack-objects."
|
|
|
|
#: builtin/repack.c:254
|
|
msgid "could not finish pack-objects to repack promisor objects"
|
|
msgstr "kunde inte avsluta pack-objects för att packa om kontraktsobjekt"
|
|
|
|
#: builtin/repack.c:292
|
|
msgid "pack everything in a single pack"
|
|
msgstr "packa allt i ett enda paket"
|
|
|
|
#: builtin/repack.c:294
|
|
msgid "same as -a, and turn unreachable objects loose"
|
|
msgstr "samma som -a, och gör onåbara objekt lösa"
|
|
|
|
#: builtin/repack.c:297
|
|
msgid "remove redundant packs, and run git-prune-packed"
|
|
msgstr "ta bort överflödiga paket, och kör git-prune-packed"
|
|
|
|
#: builtin/repack.c:299
|
|
msgid "pass --no-reuse-delta to git-pack-objects"
|
|
msgstr "sänd --no-reuse-delta till git-pack-objects"
|
|
|
|
#: builtin/repack.c:301
|
|
msgid "pass --no-reuse-object to git-pack-objects"
|
|
msgstr "sänd --no-reuse-object till git-pack-objects"
|
|
|
|
#: builtin/repack.c:303
|
|
msgid "do not run git-update-server-info"
|
|
msgstr "kör inte git-update-server-info"
|
|
|
|
#: builtin/repack.c:306
|
|
msgid "pass --local to git-pack-objects"
|
|
msgstr "sänd --local till git-pack-objects"
|
|
|
|
#: builtin/repack.c:308
|
|
msgid "write bitmap index"
|
|
msgstr "skriv bitkartindex"
|
|
|
|
#: builtin/repack.c:310
|
|
msgid "pass --delta-islands to git-pack-objects"
|
|
msgstr "sänd --delta-islands till git-pack-objects"
|
|
|
|
#: builtin/repack.c:311
|
|
msgid "approxidate"
|
|
msgstr "cirkadatum"
|
|
|
|
#: builtin/repack.c:312
|
|
msgid "with -A, do not loosen objects older than this"
|
|
msgstr "med -A, lös inte upp objekt äldre än detta"
|
|
|
|
#: builtin/repack.c:314
|
|
msgid "with -a, repack unreachable objects"
|
|
msgstr "med -a, packa om onåbara objekt"
|
|
|
|
#: builtin/repack.c:316
|
|
msgid "size of the window used for delta compression"
|
|
msgstr "storlek på fönster använt för deltakomprimering"
|
|
|
|
#: builtin/repack.c:317 builtin/repack.c:323
|
|
msgid "bytes"
|
|
msgstr "byte"
|
|
|
|
#: builtin/repack.c:318
|
|
msgid "same as the above, but limit memory size instead of entries count"
|
|
msgstr "samma som ovan, men begränsa minnesstorleken istället för postantal"
|
|
|
|
#: builtin/repack.c:320
|
|
msgid "limits the maximum delta depth"
|
|
msgstr "begränsa maximalt deltadjup"
|
|
|
|
#: builtin/repack.c:322
|
|
msgid "limits the maximum number of threads"
|
|
msgstr "begränsar maximalt antal trådar"
|
|
|
|
#: builtin/repack.c:324
|
|
msgid "maximum size of each packfile"
|
|
msgstr "maximal storlek på varje paketfil"
|
|
|
|
#: builtin/repack.c:326
|
|
msgid "repack objects in packs marked with .keep"
|
|
msgstr "packa om objekt i paket märkta med .keep"
|
|
|
|
#: builtin/repack.c:328
|
|
msgid "do not repack this pack"
|
|
msgstr "packa inte om detta paket"
|
|
|
|
#: builtin/repack.c:338
|
|
msgid "cannot delete packs in a precious-objects repo"
|
|
msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
|
|
|
|
#: builtin/repack.c:342
|
|
msgid "--keep-unreachable and -A are incompatible"
|
|
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
|
|
|
|
#: builtin/repack.c:425
|
|
msgid "Nothing new to pack."
|
|
msgstr "Inget nytt att packa."
|
|
|
|
#: builtin/repack.c:486
|
|
#, c-format
|
|
msgid ""
|
|
"WARNING: Some packs in use have been renamed by\n"
|
|
"WARNING: prefixing old- to their name, in order to\n"
|
|
"WARNING: replace them with the new version of the\n"
|
|
"WARNING: file. But the operation failed, and the\n"
|
|
"WARNING: attempt to rename them back to their\n"
|
|
"WARNING: original names also failed.\n"
|
|
"WARNING: Please rename them in %s manually:\n"
|
|
msgstr ""
|
|
"VARNING: Namnen på några paket har bytts genom att\n"
|
|
"VARNING: lägga till old- före namnen, för att byta\n"
|
|
"VARNING: dem mot den nya versionen av filen. Men\n"
|
|
"VARNING: operationen misslyckades, och försöket att\n"
|
|
"VARNING: byta tillbaka till det ursprungliga\n"
|
|
"VARNING: namnet misslyckades också.\n"
|
|
"VARNING: Byt namn på dem i %s manuellt:\n"
|
|
|
|
#: builtin/repack.c:534
|
|
#, c-format
|
|
msgid "failed to remove '%s'"
|
|
msgstr "misslyckades ta bort \"%s\""
|
|
|
|
#: builtin/replace.c:22
|
|
msgid "git replace [-f] <object> <replacement>"
|
|
msgstr "git replace [-f] <objekt> <ersättning>"
|
|
|
|
#: builtin/replace.c:23
|
|
msgid "git replace [-f] --edit <object>"
|
|
msgstr "git replace [-f] --edit <objekt>"
|
|
|
|
#: builtin/replace.c:24
|
|
msgid "git replace [-f] --graft <commit> [<parent>...]"
|
|
msgstr "git replace [-f] --graft <incheckning> [<förälder>...]"
|
|
|
|
#: builtin/replace.c:25
|
|
msgid "git replace [-f] --convert-graft-file"
|
|
msgstr "git replace [-f] --convert-graft-file"
|
|
|
|
#: builtin/replace.c:26
|
|
msgid "git replace -d <object>..."
|
|
msgstr "git replace -d <objekt>..."
|
|
|
|
#: builtin/replace.c:27
|
|
msgid "git replace [--format=<format>] [-l [<pattern>]]"
|
|
msgstr "git replace [--format=<format>] [-l [<mönster>]]"
|
|
|
|
#: builtin/replace.c:90
|
|
#, c-format
|
|
msgid ""
|
|
"invalid replace format '%s'\n"
|
|
"valid formats are 'short', 'medium' and 'long'"
|
|
msgstr ""
|
|
"ogiltigt ersättningsformat \"%s\"\n"
|
|
"giltiga format är \"short\", \"medium\" och \"long\""
|
|
|
|
#: builtin/replace.c:125
|
|
#, c-format
|
|
msgid "replace ref '%s' not found"
|
|
msgstr "ersättningsreferensen \"%s\" hittades inte"
|
|
|
|
#: builtin/replace.c:141
|
|
#, c-format
|
|
msgid "Deleted replace ref '%s'"
|
|
msgstr "Tog bort ersättningsreferensen \"%s\""
|
|
|
|
#: builtin/replace.c:153
|
|
#, c-format
|
|
msgid "'%s' is not a valid ref name"
|
|
msgstr "\"%s\" är inte ett giltigt referensnamn"
|
|
|
|
#: builtin/replace.c:158
|
|
#, c-format
|
|
msgid "replace ref '%s' already exists"
|
|
msgstr "ersättningsreferensen \"%s\" finns redan"
|
|
|
|
#: builtin/replace.c:178
|
|
#, c-format
|
|
msgid ""
|
|
"Objects must be of the same type.\n"
|
|
"'%s' points to a replaced object of type '%s'\n"
|
|
"while '%s' points to a replacement object of type '%s'."
|
|
msgstr ""
|
|
"Objekt måste vara av samma typ.\n"
|
|
"\"%s\" pekar på ett ersatt objekt med typen \"%s\"\n"
|
|
"medan \"%s\" pekar på ett ersättningsobjekt av typen \"%s\"."
|
|
|
|
#: builtin/replace.c:229
|
|
#, c-format
|
|
msgid "unable to open %s for writing"
|
|
msgstr "kan inte öppna %s för skrivning"
|
|
|
|
#: builtin/replace.c:242
|
|
msgid "cat-file reported failure"
|
|
msgstr "cat-file rapporterade misslyckande"
|
|
|
|
#: builtin/replace.c:258
|
|
#, c-format
|
|
msgid "unable to open %s for reading"
|
|
msgstr "kan inte öppna %s för läsning"
|
|
|
|
#: builtin/replace.c:272
|
|
msgid "unable to spawn mktree"
|
|
msgstr "kan inte starta mktree"
|
|
|
|
#: builtin/replace.c:276
|
|
msgid "unable to read from mktree"
|
|
msgstr "kan inte läsa från mktree"
|
|
|
|
#: builtin/replace.c:285
|
|
msgid "mktree reported failure"
|
|
msgstr "mktree rapporterade misslyckande"
|
|
|
|
#: builtin/replace.c:289
|
|
msgid "mktree did not return an object name"
|
|
msgstr "mktree returnerade inte ett objektnamn"
|
|
|
|
#: builtin/replace.c:298
|
|
#, c-format
|
|
msgid "unable to fstat %s"
|
|
msgstr "kan inte utföra \"fstat\" på %s"
|
|
|
|
#: builtin/replace.c:303
|
|
msgid "unable to write object to database"
|
|
msgstr "kan inte skriva objektet till databasen"
|
|
|
|
#: 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 "objektnamnet är inte giltigt: \"%s\""
|
|
|
|
#: builtin/replace.c:326
|
|
#, c-format
|
|
msgid "unable to get object type for %s"
|
|
msgstr "kan inte läsa objekttyp för %s"
|
|
|
|
#: builtin/replace.c:342
|
|
msgid "editing object file failed"
|
|
msgstr "misslyckades redigera objektfilen"
|
|
|
|
#: builtin/replace.c:351
|
|
#, c-format
|
|
msgid "new object is the same as the old one: '%s'"
|
|
msgstr "nytt objekt är samma som det gamla: \"%s\""
|
|
|
|
#: builtin/replace.c:384
|
|
#, c-format
|
|
msgid "could not parse %s as a commit"
|
|
msgstr "kunde inte tolka %s som incheckning"
|
|
|
|
#: builtin/replace.c:416
|
|
#, c-format
|
|
msgid "bad mergetag in commit '%s'"
|
|
msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
|
|
|
|
#: builtin/replace.c:418
|
|
#, c-format
|
|
msgid "malformed mergetag in commit '%s'"
|
|
msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
|
|
|
|
#: builtin/replace.c:430
|
|
#, c-format
|
|
msgid ""
|
|
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
|
|
"instead of --graft"
|
|
msgstr ""
|
|
"den ursprungliga incheckningen \"%s\" innehåller sammanslagningstaggen \"%s"
|
|
"\" som har förkastats; använd --edit istället för --graft"
|
|
|
|
#: builtin/replace.c:469
|
|
#, c-format
|
|
msgid "the original commit '%s' has a gpg signature"
|
|
msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
|
|
|
|
#: builtin/replace.c:470
|
|
msgid "the signature will be removed in the replacement commit!"
|
|
msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
|
|
|
|
#: builtin/replace.c:480
|
|
#, c-format
|
|
msgid "could not write replacement commit for: '%s'"
|
|
msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
|
|
|
|
#: builtin/replace.c:488
|
|
#, c-format
|
|
msgid "graft for '%s' unnecessary"
|
|
msgstr "ympning för \"%s\" behövs inte"
|
|
|
|
#: builtin/replace.c:492
|
|
#, c-format
|
|
msgid "new commit is the same as the old one: '%s'"
|
|
msgstr "ny incheckning är samma som den gamla: \"%s\""
|
|
|
|
#: builtin/replace.c:527
|
|
#, c-format
|
|
msgid ""
|
|
"could not convert the following graft(s):\n"
|
|
"%s"
|
|
msgstr ""
|
|
"kunde inte konvertera följande ympning(ar):\n"
|
|
"%s"
|
|
|
|
#: builtin/replace.c:548
|
|
msgid "list replace refs"
|
|
msgstr "visa ersättningsreferenser"
|
|
|
|
#: builtin/replace.c:549
|
|
msgid "delete replace refs"
|
|
msgstr "ta bort ersättningsreferenser"
|
|
|
|
#: builtin/replace.c:550
|
|
msgid "edit existing object"
|
|
msgstr "redigera befintligt objekt"
|
|
|
|
#: builtin/replace.c:551
|
|
msgid "change a commit's parents"
|
|
msgstr "ändra en inchecknings föräldrar"
|
|
|
|
#: builtin/replace.c:552
|
|
msgid "convert existing graft file"
|
|
msgstr "konvertera befintlig ympningsfil"
|
|
|
|
#: builtin/replace.c:553
|
|
msgid "replace the ref if it exists"
|
|
msgstr "ersätt referensen om den finns"
|
|
|
|
#: builtin/replace.c:555
|
|
msgid "do not pretty-print contents for --edit"
|
|
msgstr "använd inte snygg visning av innehåll för --edit"
|
|
|
|
#: builtin/replace.c:556
|
|
msgid "use this format"
|
|
msgstr "använd detta format"
|
|
|
|
#: builtin/replace.c:569
|
|
msgid "--format cannot be used when not listing"
|
|
msgstr "--format kan inte användas utanför listning"
|
|
|
|
#: builtin/replace.c:577
|
|
msgid "-f only makes sense when writing a replacement"
|
|
msgstr "-f kan endast användas vid skrivning av ersättning"
|
|
|
|
#: builtin/replace.c:581
|
|
msgid "--raw only makes sense with --edit"
|
|
msgstr "--raw kan bara användas med --edit"
|
|
|
|
#: builtin/replace.c:587
|
|
msgid "-d needs at least one argument"
|
|
msgstr "-d behöver minst ett argument"
|
|
|
|
#: builtin/replace.c:593
|
|
msgid "bad number of arguments"
|
|
msgstr "fel antal argument"
|
|
|
|
#: builtin/replace.c:599
|
|
msgid "-e needs exactly one argument"
|
|
msgstr "-e tar exakt ett argument"
|
|
|
|
#: builtin/replace.c:605
|
|
msgid "-g needs at least one argument"
|
|
msgstr "-g tar minst ett argument"
|
|
|
|
#: builtin/replace.c:611
|
|
msgid "--convert-graft-file takes no argument"
|
|
msgstr "--convert-graft-file tar inga argument"
|
|
|
|
#: builtin/replace.c:617
|
|
msgid "only one pattern can be given with -l"
|
|
msgstr "endast ett mönster kan anges med -l"
|
|
|
|
#: builtin/rerere.c:13
|
|
msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
|
msgstr "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
|
|
|
|
#: builtin/rerere.c:60
|
|
msgid "register clean resolutions in index"
|
|
msgstr "registrera rena lösningar i indexet"
|
|
|
|
#: builtin/rerere.c:79
|
|
msgid "'git rerere forget' without paths is deprecated"
|
|
msgstr "\"git rerere forget\" utan sökvägar är föråldrat"
|
|
|
|
#: builtin/rerere.c:113
|
|
#, c-format
|
|
msgid "unable to generate diff for '%s'"
|
|
msgstr "misslyckades skapa diff för \"%s\""
|
|
|
|
#: builtin/reset.c:32
|
|
msgid ""
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
|
|
msgstr ""
|
|
"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
|
|
|
|
#: builtin/reset.c:33
|
|
msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
|
|
msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
|
|
|
|
#: builtin/reset.c:34
|
|
msgid ""
|
|
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
|
|
msgstr ""
|
|
"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<träd-igt>]"
|
|
|
|
#: builtin/reset.c:35
|
|
msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
|
|
msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
|
|
|
|
#: builtin/reset.c:41
|
|
msgid "mixed"
|
|
msgstr "blandad"
|
|
|
|
#: builtin/reset.c:41
|
|
msgid "soft"
|
|
msgstr "mjuk"
|
|
|
|
#: builtin/reset.c:41
|
|
msgid "hard"
|
|
msgstr "hård"
|
|
|
|
#: builtin/reset.c:41
|
|
msgid "merge"
|
|
msgstr "sammanslagning"
|
|
|
|
#: builtin/reset.c:41
|
|
msgid "keep"
|
|
msgstr "behåll"
|
|
|
|
#: builtin/reset.c:82
|
|
msgid "You do not have a valid HEAD."
|
|
msgstr "Du har inte en giltig HEAD."
|
|
|
|
#: builtin/reset.c:84
|
|
msgid "Failed to find tree of HEAD."
|
|
msgstr "Kunde inte hitta trädet för HEAD."
|
|
|
|
#: builtin/reset.c:90
|
|
#, c-format
|
|
msgid "Failed to find tree of %s."
|
|
msgstr "Kunde inte hitta trädet för %s."
|
|
|
|
#: builtin/reset.c:115
|
|
#, c-format
|
|
msgid "HEAD is now at %s"
|
|
msgstr "HEAD är nu på %s"
|
|
|
|
#: builtin/reset.c:194
|
|
#, c-format
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
|
|
|
|
#: builtin/reset.c:294 builtin/stash.c:520 builtin/stash.c:595
|
|
#: builtin/stash.c:619
|
|
msgid "be quiet, only report errors"
|
|
msgstr "var tyst, rapportera endast fel"
|
|
|
|
#: builtin/reset.c:296
|
|
msgid "reset HEAD and index"
|
|
msgstr "återställ HEAD och index"
|
|
|
|
#: builtin/reset.c:297
|
|
msgid "reset only HEAD"
|
|
msgstr "återställ endast HEAD"
|
|
|
|
#: builtin/reset.c:299 builtin/reset.c:301
|
|
msgid "reset HEAD, index and working tree"
|
|
msgstr "återställ HEAD, index och arbetskatalog"
|
|
|
|
#: builtin/reset.c:303
|
|
msgid "reset HEAD but keep local changes"
|
|
msgstr "återställ HEAD men behåll lokala ändringar"
|
|
|
|
#: builtin/reset.c:309
|
|
msgid "record only the fact that removed paths will be added later"
|
|
msgstr "registrera endast att borttagna sökvägar kommer läggas till senare"
|
|
|
|
#: builtin/reset.c:343
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid revision."
|
|
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
|
|
|
|
#: builtin/reset.c:351
|
|
#, c-format
|
|
msgid "Failed to resolve '%s' as a valid tree."
|
|
msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd."
|
|
|
|
#: builtin/reset.c:360
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
|
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
|
|
|
|
#: builtin/reset.c:370
|
|
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
|
|
msgstr ""
|
|
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
|
|
|
|
#: builtin/reset.c:372
|
|
#, c-format
|
|
msgid "Cannot do %s reset with paths."
|
|
msgstr "Kan inte göra %s återställning med sökvägar."
|
|
|
|
#: builtin/reset.c:387
|
|
#, c-format
|
|
msgid "%s reset is not allowed in a bare repository"
|
|
msgstr "%s återställning tillåts inte i ett naket arkiv"
|
|
|
|
#: builtin/reset.c:391
|
|
msgid "-N can only be used with --mixed"
|
|
msgstr "-N kan endast användas med --mixed"
|
|
|
|
#: builtin/reset.c:412
|
|
msgid "Unstaged changes after reset:"
|
|
msgstr "Oköade ändringar efter återställning:"
|
|
|
|
#: builtin/reset.c:415
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"It took %.2f seconds to enumerate unstaged changes after reset. You can\n"
|
|
"use '--quiet' to avoid this. Set the config setting reset.quiet to true\n"
|
|
"to make this the default.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Det tog %.2f sekunder att räkna upp oköade ändringar efter återställning.\n"
|
|
"Du kan använda \"--quiet\" för att förhindra detta. Ställ "
|
|
"konfigurationsvariabeln\n"
|
|
"reset.quiet till true för att göra detta till förval.\n"
|
|
|
|
#: builtin/reset.c:425
|
|
#, c-format
|
|
msgid "Could not reset index file to revision '%s'."
|
|
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
|
|
|
|
#: builtin/reset.c:429
|
|
msgid "Could not write new index file."
|
|
msgstr "Kunde inte skriva ny indexfil."
|
|
|
|
#: builtin/rev-list.c:499
|
|
msgid "cannot combine --exclude-promisor-objects and --missing"
|
|
msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
|
|
|
|
#: builtin/rev-list.c:560
|
|
msgid "object filtering requires --objects"
|
|
msgstr "objektfiltrering kräver --objects"
|
|
|
|
#: builtin/rev-list.c:610
|
|
msgid "rev-list does not support display of notes"
|
|
msgstr "rev-list stöder inte visning av anteckningar"
|
|
|
|
#: builtin/rev-list.c:615
|
|
msgid "marked counting is incompatible with --objects"
|
|
msgstr "markerad räkning är inkompatibelt med --objects"
|
|
|
|
#: builtin/rev-parse.c:408
|
|
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
|
|
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
|
|
|
|
#: builtin/rev-parse.c:413
|
|
msgid "keep the `--` passed as an arg"
|
|
msgstr "behåll \"--\" sänt som argument"
|
|
|
|
#: builtin/rev-parse.c:415
|
|
msgid "stop parsing after the first non-option argument"
|
|
msgstr "sluta tolka efter första argument som inte är flagga"
|
|
|
|
#: builtin/rev-parse.c:418
|
|
msgid "output in stuck long form"
|
|
msgstr "utdata fast i lång form"
|
|
|
|
#: builtin/rev-parse.c:551
|
|
msgid ""
|
|
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
|
|
" or: git rev-parse --sq-quote [<arg>...]\n"
|
|
" or: git rev-parse [<options>] [<arg>...]\n"
|
|
"\n"
|
|
"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
|
|
msgstr ""
|
|
"git rev-parse --parseopt [<flaggor>] -- [<argument>...]\n"
|
|
" eller: git rev-parse --sq-quote [<argument>...]\n"
|
|
" eller: git rev-parse [<flaggor>] [<argument>...]\n"
|
|
"\n"
|
|
"Kör \"git rev-parse --parseopt -h\" för mer information om den första "
|
|
"varianten."
|
|
|
|
#: builtin/revert.c:24
|
|
msgid "git revert [<options>] <commit-ish>..."
|
|
msgstr "git revert [<flaggor>] <incheckning-igt>..."
|
|
|
|
#: builtin/revert.c:25
|
|
msgid "git revert <subcommand>"
|
|
msgstr "git revert <underkommando>"
|
|
|
|
#: builtin/revert.c:30
|
|
msgid "git cherry-pick [<options>] <commit-ish>..."
|
|
msgstr "git cherry-pick [<flaggor>] <incheckning-igt>..."
|
|
|
|
#: builtin/revert.c:31
|
|
msgid "git cherry-pick <subcommand>"
|
|
msgstr "git cherry-pick <underkommando>"
|
|
|
|
#: builtin/revert.c:72
|
|
#, c-format
|
|
msgid "option `%s' expects a number greater than zero"
|
|
msgstr "flaggan \"%s\" antar ett numeriskt värde större än noll"
|
|
|
|
#: builtin/revert.c:92
|
|
#, c-format
|
|
msgid "%s: %s cannot be used with %s"
|
|
msgstr "%s: %s kan inte användas med %s"
|
|
|
|
#: builtin/revert.c:102
|
|
msgid "end revert or cherry-pick sequence"
|
|
msgstr "avsluta revert- eller cherry-pick-sekvens"
|
|
|
|
#: builtin/revert.c:103
|
|
msgid "resume revert or cherry-pick sequence"
|
|
msgstr "återuppta revert- eller cherry-pick-sekvens"
|
|
|
|
#: builtin/revert.c:104
|
|
msgid "cancel revert or cherry-pick sequence"
|
|
msgstr "avbryt revert- eller cherry-pick-sekvens"
|
|
|
|
#: builtin/revert.c:105
|
|
msgid "skip current commit and continue"
|
|
msgstr "hoppa över nuvarande incheckning och fortsätt"
|
|
|
|
#: builtin/revert.c:107
|
|
msgid "don't automatically commit"
|
|
msgstr "checka inte in automatiskt"
|
|
|
|
#: builtin/revert.c:108
|
|
msgid "edit the commit message"
|
|
msgstr "redigera incheckningsmeddelandet"
|
|
|
|
#: builtin/revert.c:111
|
|
msgid "parent-number"
|
|
msgstr "nummer-på-förälder"
|
|
|
|
#: builtin/revert.c:112
|
|
msgid "select mainline parent"
|
|
msgstr "välj förälder för huvudlinje"
|
|
|
|
#: builtin/revert.c:114
|
|
msgid "merge strategy"
|
|
msgstr "sammanslagningsstrategi"
|
|
|
|
#: builtin/revert.c:116
|
|
msgid "option for merge strategy"
|
|
msgstr "alternativ för sammanslagningsstrategi"
|
|
|
|
#: builtin/revert.c:125
|
|
msgid "append commit name"
|
|
msgstr "lägg till incheckningsnamn"
|
|
|
|
#: builtin/revert.c:127
|
|
msgid "preserve initially empty commits"
|
|
msgstr "behåll incheckningar som börjar som tomma"
|
|
|
|
#: builtin/revert.c:129
|
|
msgid "keep redundant, empty commits"
|
|
msgstr "behåll redundanta, tomma incheckningar"
|
|
|
|
#: builtin/revert.c:232
|
|
msgid "revert failed"
|
|
msgstr "\"revert\" misslyckades"
|
|
|
|
#: builtin/revert.c:245
|
|
msgid "cherry-pick failed"
|
|
msgstr "\"cherry-pick\" misslyckades"
|
|
|
|
#: builtin/rm.c:19
|
|
msgid "git rm [<options>] [--] <file>..."
|
|
msgstr "git rm [<flaggor>] [--] <fil>..."
|
|
|
|
#: builtin/rm.c:207
|
|
msgid ""
|
|
"the following file has staged content different from both the\n"
|
|
"file and the HEAD:"
|
|
msgid_plural ""
|
|
"the following files have staged content different from both the\n"
|
|
"file and the HEAD:"
|
|
msgstr[0] ""
|
|
"följande fil har köat innehåll som skiljer sig både från filen och HEAD:"
|
|
msgstr[1] ""
|
|
"följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
|
|
|
|
#: builtin/rm.c:212
|
|
msgid ""
|
|
"\n"
|
|
"(use -f to force removal)"
|
|
msgstr ""
|
|
"\n"
|
|
"(använd -f för att tvinga borttagning)"
|
|
|
|
#: builtin/rm.c:216
|
|
msgid "the following file has changes staged in the index:"
|
|
msgid_plural "the following files have changes staged in the index:"
|
|
msgstr[0] "följande fil har ändringar köade i indexet:"
|
|
msgstr[1] "följande filer har ändringar köade i indexet:"
|
|
|
|
#: builtin/rm.c:220 builtin/rm.c:229
|
|
msgid ""
|
|
"\n"
|
|
"(use --cached to keep the file, or -f to force removal)"
|
|
msgstr ""
|
|
"\n"
|
|
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
|
|
|
|
#: builtin/rm.c:226
|
|
msgid "the following file has local modifications:"
|
|
msgid_plural "the following files have local modifications:"
|
|
msgstr[0] "följande fil har lokala ändringar:"
|
|
msgstr[1] "följande filer har lokala ändringar:"
|
|
|
|
#: builtin/rm.c:243
|
|
msgid "do not list removed files"
|
|
msgstr "lista inte borttagna filer"
|
|
|
|
#: builtin/rm.c:244
|
|
msgid "only remove from the index"
|
|
msgstr "ta bara bort från indexet"
|
|
|
|
#: builtin/rm.c:245
|
|
msgid "override the up-to-date check"
|
|
msgstr "överstyr àjour-testet"
|
|
|
|
#: builtin/rm.c:246
|
|
msgid "allow recursive removal"
|
|
msgstr "tillåt rekursiv borttagning"
|
|
|
|
#: builtin/rm.c:248
|
|
msgid "exit with a zero status even if nothing matched"
|
|
msgstr "avsluta med nollstatus även om inget träffades"
|
|
|
|
#: builtin/rm.c:282
|
|
msgid "No pathspec was given. Which files should I remove?"
|
|
msgstr "Ingen sökvägsangivelse gavs. Vilka filer ska jag ta bort?"
|
|
|
|
#: builtin/rm.c:305
|
|
msgid "please stage your changes to .gitmodules or stash them to proceed"
|
|
msgstr ""
|
|
"löa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
|
|
|
|
#: builtin/rm.c:323
|
|
#, c-format
|
|
msgid "not removing '%s' recursively without -r"
|
|
msgstr "tar inte bort \"%s\" rekursivt utan -r"
|
|
|
|
#: builtin/rm.c:362
|
|
#, c-format
|
|
msgid "git rm: unable to remove %s"
|
|
msgstr "git rm: kan inte ta bort %s"
|
|
|
|
#: builtin/send-pack.c:20
|
|
msgid ""
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
|
|
"[<ref>...]\n"
|
|
" --all and explicit <ref> specification are mutually exclusive."
|
|
msgstr ""
|
|
"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
|
|
"receive-pack>] [--verbose] [--thin] [--atomic] [<värd>:]<katalog> "
|
|
"[<ref>...]\n"
|
|
" --all och explicit angiven <ref> är ömsesidigt uteslutande."
|
|
|
|
#: builtin/send-pack.c:163
|
|
msgid "remote name"
|
|
msgstr "fjärrnamn"
|
|
|
|
#: builtin/send-pack.c:177
|
|
msgid "use stateless RPC protocol"
|
|
msgstr "använd tillståndslöst RPC-protokoll"
|
|
|
|
#: builtin/send-pack.c:178
|
|
msgid "read refs from stdin"
|
|
msgstr "läs referenser från standard in"
|
|
|
|
#: builtin/send-pack.c:179
|
|
msgid "print status from remote helper"
|
|
msgstr "visa status från fjärrhjälpare"
|
|
|
|
#: builtin/shortlog.c:14
|
|
msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
|
|
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
|
|
|
|
#: builtin/shortlog.c:15
|
|
msgid "git log --pretty=short | git shortlog [<options>]"
|
|
msgstr "git log --pretty=short | git shortlog [<flaggor>]"
|
|
|
|
#: builtin/shortlog.c:264
|
|
msgid "Group by committer rather than author"
|
|
msgstr "Gruppera efter incheckare istället för författare"
|
|
|
|
#: builtin/shortlog.c:266
|
|
msgid "sort output according to the number of commits per author"
|
|
msgstr "sortera utdata enligt antal incheckningar per författare"
|
|
|
|
#: builtin/shortlog.c:268
|
|
msgid "Suppress commit descriptions, only provides commit count"
|
|
msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
|
|
|
|
#: builtin/shortlog.c:270
|
|
msgid "Show the email address of each author"
|
|
msgstr "Visa e-postadress för varje författare"
|
|
|
|
#: builtin/shortlog.c:271
|
|
msgid "<w>[,<i1>[,<i2>]]"
|
|
msgstr "<w>[,<i1>[,<i2>]]"
|
|
|
|
#: builtin/shortlog.c:272
|
|
msgid "Linewrap output"
|
|
msgstr "Radbryt utdata"
|
|
|
|
#: builtin/shortlog.c:301
|
|
msgid "too many arguments given outside repository"
|
|
msgstr "för många flaggor givna utanför arkivet"
|
|
|
|
#: builtin/show-branch.c:13
|
|
msgid ""
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
|
"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
|
|
msgstr ""
|
|
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
|
|
"\t\t[--current] [--color[=<när>] | --no-color] [--sparse]\n"
|
|
"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
|
|
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <mönster>)...]"
|
|
|
|
#: builtin/show-branch.c:17
|
|
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
|
|
msgstr "git show-branch (-g | --reflog)[=<n>[,<bas>]] [--list] [<ref>]"
|
|
|
|
#: builtin/show-branch.c:395
|
|
#, c-format
|
|
msgid "ignoring %s; cannot handle more than %d ref"
|
|
msgid_plural "ignoring %s; cannot handle more than %d refs"
|
|
msgstr[0] "ignorerar %s; kan inte hantera mer än %d referens"
|
|
msgstr[1] "ignorerar %s; kan inte hantera mer än %d referenser"
|
|
|
|
#: builtin/show-branch.c:548
|
|
#, c-format
|
|
msgid "no matching refs with %s"
|
|
msgstr "inga motsvarande referenser med %s"
|
|
|
|
#: builtin/show-branch.c:645
|
|
msgid "show remote-tracking and local branches"
|
|
msgstr "visa fjärrspårande och lokala grenar"
|
|
|
|
#: builtin/show-branch.c:647
|
|
msgid "show remote-tracking branches"
|
|
msgstr "visa fjärrspårande grenar"
|
|
|
|
#: builtin/show-branch.c:649
|
|
msgid "color '*!+-' corresponding to the branch"
|
|
msgstr "färga \"*!+-\" enligt grenen"
|
|
|
|
#: builtin/show-branch.c:651
|
|
msgid "show <n> more commits after the common ancestor"
|
|
msgstr "visa <n> ytterligare incheckningar efter gemensam anfader"
|
|
|
|
#: builtin/show-branch.c:653
|
|
msgid "synonym to more=-1"
|
|
msgstr "synonym till more=-1"
|
|
|
|
#: builtin/show-branch.c:654
|
|
msgid "suppress naming strings"
|
|
msgstr "undertyck namnsträngar"
|
|
|
|
#: builtin/show-branch.c:656
|
|
msgid "include the current branch"
|
|
msgstr "inkludera aktuell gren"
|
|
|
|
#: builtin/show-branch.c:658
|
|
msgid "name commits with their object names"
|
|
msgstr "namnge incheckningar med deras objektnamn"
|
|
|
|
#: builtin/show-branch.c:660
|
|
msgid "show possible merge bases"
|
|
msgstr "visa möjliga sammanslagningsbaser"
|
|
|
|
#: builtin/show-branch.c:662
|
|
msgid "show refs unreachable from any other ref"
|
|
msgstr "visa referenser som inte kan nås från någon annan referens"
|
|
|
|
#: builtin/show-branch.c:664
|
|
msgid "show commits in topological order"
|
|
msgstr "visa incheckningar i topologisk ordning"
|
|
|
|
#: builtin/show-branch.c:667
|
|
msgid "show only commits not on the first branch"
|
|
msgstr "visa endast incheckningar inte på den första grenen"
|
|
|
|
#: builtin/show-branch.c:669
|
|
msgid "show merges reachable from only one tip"
|
|
msgstr "visa sammanslagningar som endast kan nås från en spets"
|
|
|
|
#: builtin/show-branch.c:671
|
|
msgid "topologically sort, maintaining date order where possible"
|
|
msgstr "sortera topologiskt, behåll datumordning när möjligt"
|
|
|
|
#: builtin/show-branch.c:674
|
|
msgid "<n>[,<base>]"
|
|
msgstr "<n>[,<bas>]"
|
|
|
|
#: builtin/show-branch.c:675
|
|
msgid "show <n> most recent ref-log entries starting at base"
|
|
msgstr "visa <n> nyaste refloggposter med början på bas"
|
|
|
|
#: builtin/show-branch.c:711
|
|
msgid ""
|
|
"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
|
|
msgstr ""
|
|
"--reflog är inkompatibel med --all, --remotes, --independent eller --merge-"
|
|
"base"
|
|
|
|
#: builtin/show-branch.c:735
|
|
msgid "no branches given, and HEAD is not valid"
|
|
msgstr "inga grenar angavs, och HEAD är inte giltigt"
|
|
|
|
#: builtin/show-branch.c:738
|
|
msgid "--reflog option needs one branch name"
|
|
msgstr "--reflog behöver ett namn på en gren"
|
|
|
|
#: builtin/show-branch.c:741
|
|
#, c-format
|
|
msgid "only %d entry can be shown at one time."
|
|
msgid_plural "only %d entries can be shown at one time."
|
|
msgstr[0] "maximalt %d poster kan visas samtidigt."
|
|
msgstr[1] "maximalt %d poster kan visas samtidigt."
|
|
|
|
#: builtin/show-branch.c:745
|
|
#, c-format
|
|
msgid "no such ref %s"
|
|
msgstr "ingen sådan referens %s"
|
|
|
|
#: builtin/show-branch.c:831
|
|
#, c-format
|
|
msgid "cannot handle more than %d rev."
|
|
msgid_plural "cannot handle more than %d revs."
|
|
msgstr[0] "kan inte hantera mer än %d revision."
|
|
msgstr[1] "kan inte hantera mer än %d revisioner."
|
|
|
|
#: builtin/show-branch.c:835
|
|
#, c-format
|
|
msgid "'%s' is not a valid ref."
|
|
msgstr "\"%s\" är inte en giltig referens."
|
|
|
|
#: builtin/show-branch.c:838
|
|
#, c-format
|
|
msgid "cannot find commit %s (%s)"
|
|
msgstr "hittar inte incheckning %s (%s)"
|
|
|
|
#: builtin/show-ref.c:12
|
|
msgid ""
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
|
|
msgstr ""
|
|
"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
|
|
"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<mönster>...]"
|
|
|
|
#: builtin/show-ref.c:13
|
|
msgid "git show-ref --exclude-existing[=<pattern>]"
|
|
msgstr "git show-ref --exclude-existing[=<mönster>]"
|
|
|
|
#: builtin/show-ref.c:162
|
|
msgid "only show tags (can be combined with heads)"
|
|
msgstr "visa endast taggar (kan kombineras med huvuden)"
|
|
|
|
#: builtin/show-ref.c:163
|
|
msgid "only show heads (can be combined with tags)"
|
|
msgstr "visa endast huvuden (kan kombineras med taggar)"
|
|
|
|
#: builtin/show-ref.c:164
|
|
msgid "stricter reference checking, requires exact ref path"
|
|
msgstr "striktare referenskontroll, kräver exakt referenssökväg"
|
|
|
|
#: builtin/show-ref.c:167 builtin/show-ref.c:169
|
|
msgid "show the HEAD reference, even if it would be filtered out"
|
|
msgstr "visa HEAD-refrens, även när den skulle filtreras ut"
|
|
|
|
#: builtin/show-ref.c:171
|
|
msgid "dereference tags into object IDs"
|
|
msgstr "avreferera taggar till objekt-id"
|
|
|
|
#: builtin/show-ref.c:173
|
|
msgid "only show SHA1 hash using <n> digits"
|
|
msgstr "visa SHA1-hash endast med <n> siffror"
|
|
|
|
#: builtin/show-ref.c:177
|
|
msgid "do not print results to stdout (useful with --verify)"
|
|
msgstr "visa inte resultat på standard ut (användbart med --verify)"
|
|
|
|
#: builtin/show-ref.c:179
|
|
msgid "show refs from stdin that aren't in local repository"
|
|
msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
|
|
|
|
#: builtin/sparse-checkout.c:21
|
|
msgid "git sparse-checkout (init|list|set|add|disable) <options>"
|
|
msgstr "git sparse-checkout (init|list|set|add|disable) <flaggor>"
|
|
|
|
#: builtin/sparse-checkout.c:64
|
|
msgid "this worktree is not sparse (sparse-checkout file may not exist)"
|
|
msgstr ""
|
|
"arbetskatalogen är inte glest (sparse-checkout-filen kanske inte finns)"
|
|
|
|
#: builtin/sparse-checkout.c:225
|
|
msgid "failed to create directory for sparse-checkout file"
|
|
msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
|
|
|
|
#: builtin/sparse-checkout.c:266
|
|
msgid "failed to set extensions.worktreeConfig setting"
|
|
msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
|
|
|
|
#: 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 "initiera sparse-checkout i konläge"
|
|
|
|
#: builtin/sparse-checkout.c:308
|
|
msgid "initialize sparse-checkout"
|
|
msgstr "initiera sparse-checkout"
|
|
|
|
#: builtin/sparse-checkout.c:341
|
|
#, c-format
|
|
msgid "failed to open '%s'"
|
|
msgstr "misslyckades öppna \"%s\""
|
|
|
|
#: builtin/sparse-checkout.c:398
|
|
#, c-format
|
|
msgid "could not normalize path %s"
|
|
msgstr "kunde inte normalisera sökvägen \"%s\""
|
|
|
|
#: builtin/sparse-checkout.c:410
|
|
msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
|
|
msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
|
|
|
|
#: builtin/sparse-checkout.c:435
|
|
#, c-format
|
|
msgid "unable to unquote C-style string '%s'"
|
|
msgstr "kan inte ta bort citering av C-sträng \"%s\""
|
|
|
|
#: builtin/sparse-checkout.c:489 builtin/sparse-checkout.c:513
|
|
msgid "unable to load existing sparse-checkout patterns"
|
|
msgstr "kunde inte läsa in existerande mönster för gles utcheckning"
|
|
|
|
#: builtin/sparse-checkout.c:558
|
|
msgid "read patterns from standard in"
|
|
msgstr "läs mönster från standard in"
|
|
|
|
#: builtin/sparse-checkout.c:564
|
|
msgid "set sparse-checkout patterns"
|
|
msgstr "ställ in filter för gles utcheckning"
|
|
|
|
#: builtin/sparse-checkout.c:581
|
|
msgid "disable sparse-checkout"
|
|
msgstr "inaktivera gles utcheckning"
|
|
|
|
#: builtin/sparse-checkout.c:593
|
|
msgid "error while refreshing working directory"
|
|
msgstr "fel vid uppdatering av arbetskatalog"
|
|
|
|
#: builtin/stash.c:22 builtin/stash.c:38
|
|
msgid "git stash list [<options>]"
|
|
msgstr "git stash list [<flaggor>]"
|
|
|
|
#: builtin/stash.c:23 builtin/stash.c:43
|
|
msgid "git stash show [<options>] [<stash>]"
|
|
msgstr "git stash show [<flaggor>] [<stash>]"
|
|
|
|
#: builtin/stash.c:24 builtin/stash.c:48
|
|
msgid "git stash drop [-q|--quiet] [<stash>]"
|
|
msgstr "git stash drop [-q|--quiet] [<stash>]"
|
|
|
|
#: builtin/stash.c:25
|
|
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:63
|
|
msgid "git stash branch <branchname> [<stash>]"
|
|
msgstr "git stash branch <grennamn> [<stash>]"
|
|
|
|
#: builtin/stash.c:27 builtin/stash.c:68
|
|
msgid "git stash clear"
|
|
msgstr "git stash clear"
|
|
|
|
#: 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 <meddelande>]\n"
|
|
" [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
|
|
" [--] [<sökväg>...]]"
|
|
|
|
#: 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>]"
|
|
msgstr ""
|
|
"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
|
|
" [-u|--include-untracked] [-a|--all] [<meddelande>]"
|
|
|
|
#: builtin/stash.c:53
|
|
msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
|
|
msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
|
|
|
|
#: builtin/stash.c:58
|
|
msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
|
|
msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
|
|
|
|
#: builtin/stash.c:73
|
|
msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
|
|
msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
|
|
|
|
#: 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 <meddelande>]\n"
|
|
" [--] [<sökväg>...]]"
|
|
|
|
#: builtin/stash.c:128
|
|
#, c-format
|
|
msgid "'%s' is not a stash-like commit"
|
|
msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"
|
|
|
|
#: builtin/stash.c:148
|
|
#, c-format
|
|
msgid "Too many revisions specified:%s"
|
|
msgstr "För många revisioner angivna:%s"
|
|
|
|
#: builtin/stash.c:162 git-legacy-stash.sh:549
|
|
msgid "No stash entries found."
|
|
msgstr "Inga \"stash\"-poster hittades."
|
|
|
|
#: builtin/stash.c:176
|
|
#, c-format
|
|
msgid "%s is not a valid reference"
|
|
msgstr "%s är inte en giltigt referens"
|
|
|
|
#: builtin/stash.c:225 git-legacy-stash.sh:75
|
|
msgid "git stash clear with parameters is unimplemented"
|
|
msgstr "\"git stash clear\" med parametrar har inte implementerats"
|
|
|
|
#: builtin/stash.c:404
|
|
msgid "cannot apply a stash in the middle of a merge"
|
|
msgstr "kan inte tillämpa en \"stash\" mitt i en sammanslagning"
|
|
|
|
#: builtin/stash.c:415
|
|
#, c-format
|
|
msgid "could not generate diff %s^!."
|
|
msgstr "kunde inte skapa diff %s^!."
|
|
|
|
#: builtin/stash.c:422
|
|
msgid "conflicts in index.Try without --index."
|
|
msgstr "konflikter i indexet. Testa utan --index."
|
|
|
|
#: builtin/stash.c:428
|
|
msgid "could not save index tree"
|
|
msgstr "kunde inte spara indexträd"
|
|
|
|
#: builtin/stash.c:437
|
|
msgid "could not restore untracked files from stash"
|
|
msgstr "kunde inte återställa ospårade filer från stash-post"
|
|
|
|
#: builtin/stash.c:451
|
|
#, c-format
|
|
msgid "Merging %s with %s"
|
|
msgstr "Slår ihop %s med %s"
|
|
|
|
#: builtin/stash.c:461 git-legacy-stash.sh:681
|
|
msgid "Index was not unstashed."
|
|
msgstr "Indexet har inte tagits upp ur \"stash\":en"
|
|
|
|
#: builtin/stash.c:522 builtin/stash.c:621
|
|
msgid "attempt to recreate the index"
|
|
msgstr "försök återskapa indexet"
|
|
|
|
#: builtin/stash.c:555
|
|
#, c-format
|
|
msgid "Dropped %s (%s)"
|
|
msgstr "Kastade %s (%s)"
|
|
|
|
#: builtin/stash.c:558
|
|
#, c-format
|
|
msgid "%s: Could not drop stash entry"
|
|
msgstr "%s: Kunde inte kasta \"stash\"-post"
|
|
|
|
#: builtin/stash.c:583
|
|
#, c-format
|
|
msgid "'%s' is not a stash reference"
|
|
msgstr "\"%s\" är inte en \"stash\"-referens"
|
|
|
|
#: builtin/stash.c:633 git-legacy-stash.sh:695
|
|
msgid "The stash entry is kept in case you need it again."
|
|
msgstr "Stash-posten behålls ifall du behöver den igen."
|
|
|
|
#: builtin/stash.c:656 git-legacy-stash.sh:713
|
|
msgid "No branch name specified"
|
|
msgstr "Inget grennamn angavs"
|
|
|
|
#: builtin/stash.c:796 builtin/stash.c:833
|
|
#, c-format
|
|
msgid "Cannot update %s with %s"
|
|
msgstr "Kan inte uppdatera %s med %s"
|
|
|
|
#: builtin/stash.c:814 builtin/stash.c:1478 builtin/stash.c:1543
|
|
msgid "stash message"
|
|
msgstr "\"stash\"-meddelande"
|
|
|
|
#: builtin/stash.c:824
|
|
msgid "\"git stash store\" requires one <commit> argument"
|
|
msgstr "\"git stash store\" kräver ett <incheckning>-argument"
|
|
|
|
#: builtin/stash.c:1049 git-legacy-stash.sh:218
|
|
msgid "No changes selected"
|
|
msgstr "Inga ändringar valda"
|
|
|
|
#: builtin/stash.c:1149 git-legacy-stash.sh:150
|
|
msgid "You do not have the initial commit yet"
|
|
msgstr "Du har inte den första incheckningen ännu"
|
|
|
|
#: builtin/stash.c:1176 git-legacy-stash.sh:165
|
|
msgid "Cannot save the current index state"
|
|
msgstr "Kan inte spara aktuellt tillstånd för indexet"
|
|
|
|
#: builtin/stash.c:1185 git-legacy-stash.sh:180
|
|
msgid "Cannot save the untracked files"
|
|
msgstr "Kan inte spara ospårade filer"
|
|
|
|
#: 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 "Kan inte spara aktuellt tillstånd för arbetskatalogen"
|
|
|
|
#: builtin/stash.c:1233 git-legacy-stash.sh:234
|
|
msgid "Cannot record working tree state"
|
|
msgstr "Kan inte registrera tillstånd för arbetskatalog"
|
|
|
|
#: builtin/stash.c:1282 git-legacy-stash.sh:338
|
|
msgid "Can't use --patch and --include-untracked or --all at the same time"
|
|
msgstr "Kan inte använda --patch och --include-untracked eller --all samtidigt"
|
|
|
|
#: builtin/stash.c:1298
|
|
msgid "Did you forget to 'git add'?"
|
|
msgstr "Glömde du använda \"git add\"?"
|
|
|
|
#: builtin/stash.c:1313 git-legacy-stash.sh:346
|
|
msgid "No local changes to save"
|
|
msgstr "Inga lokala ändringar att spara"
|
|
|
|
#: builtin/stash.c:1320 git-legacy-stash.sh:351
|
|
msgid "Cannot initialize stash"
|
|
msgstr "Kan inte initiera \"stash\""
|
|
|
|
#: builtin/stash.c:1335 git-legacy-stash.sh:355
|
|
msgid "Cannot save the current status"
|
|
msgstr "Kan inte spara aktuell status"
|
|
|
|
#: builtin/stash.c:1340
|
|
#, c-format
|
|
msgid "Saved working directory and index state %s"
|
|
msgstr "Sparade arbetskatalogen och indexstatus %s"
|
|
|
|
#: builtin/stash.c:1430 git-legacy-stash.sh:385
|
|
msgid "Cannot remove worktree changes"
|
|
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
|
|
|
|
#: builtin/stash.c:1469 builtin/stash.c:1534
|
|
msgid "keep index"
|
|
msgstr "behåll indexet"
|
|
|
|
#: builtin/stash.c:1471 builtin/stash.c:1536
|
|
msgid "stash in patch mode"
|
|
msgstr "\"stash\" i \"patch\"-läge"
|
|
|
|
#: builtin/stash.c:1472 builtin/stash.c:1537
|
|
msgid "quiet mode"
|
|
msgstr "tyst läge"
|
|
|
|
#: builtin/stash.c:1474 builtin/stash.c:1539
|
|
msgid "include untracked files in stash"
|
|
msgstr "ta med ospårade filer i \"stash\""
|
|
|
|
#: builtin/stash.c:1476 builtin/stash.c:1541
|
|
msgid "include ignore files"
|
|
msgstr "ta med ignorerade filer"
|
|
|
|
#: builtin/stash.c:1600
|
|
#, c-format
|
|
msgid "could not exec %s"
|
|
msgstr "kunde inte köra %s"
|
|
|
|
#: builtin/stripspace.c:18
|
|
msgid "git stripspace [-s | --strip-comments]"
|
|
msgstr "git stripspace [-s | --strip-comments]"
|
|
|
|
#: builtin/stripspace.c:19
|
|
msgid "git stripspace [-c | --comment-lines]"
|
|
msgstr "git stripspace [-c | --comment-lines]"
|
|
|
|
#: builtin/stripspace.c:37
|
|
msgid "skip and remove all lines starting with comment character"
|
|
msgstr "hoppa över och ta bort alla rader som inleds med kommentarstecken"
|
|
|
|
#: builtin/stripspace.c:40
|
|
msgid "prepend comment character and space to each line"
|
|
msgstr "lägg in kommentarstecken och blanksteg först på varje rad"
|
|
|
|
#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
|
|
#, c-format
|
|
msgid "Expecting a full ref name, got %s"
|
|
msgstr "Förväntade fullt referensnamn, fick %s"
|
|
|
|
#: builtin/submodule--helper.c:64
|
|
msgid "submodule--helper print-default-remote takes no arguments"
|
|
msgstr "submodule--helper print-default-remote tar inga argument"
|
|
|
|
#: builtin/submodule--helper.c:102
|
|
#, c-format
|
|
msgid "cannot strip one component off url '%s'"
|
|
msgstr "kan inte ta bort en komponent från url:en \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
|
|
msgid "alternative anchor for relative paths"
|
|
msgstr "alternativa ankare för relativa sökvägar"
|
|
|
|
#: builtin/submodule--helper.c:415
|
|
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
|
|
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
|
|
|
|
#: 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 "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
|
|
|
|
#: builtin/submodule--helper.c:524
|
|
#, c-format
|
|
msgid "Entering '%s'\n"
|
|
msgstr "Går in i \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:527
|
|
#, c-format
|
|
msgid ""
|
|
"run_command returned non-zero status for %s\n"
|
|
"."
|
|
msgstr ""
|
|
"run_command returnerade icke-nollstatus för %s\n"
|
|
"."
|
|
|
|
#: builtin/submodule--helper.c:549
|
|
#, c-format
|
|
msgid ""
|
|
"run_command returned non-zero status while recursing in the nested "
|
|
"submodules of %s\n"
|
|
"."
|
|
msgstr ""
|
|
"run_command returnerade icke-nollstatus vid rekursering in i nästlade "
|
|
"undermoduler för %s\n"
|
|
"."
|
|
|
|
#: builtin/submodule--helper.c:565
|
|
msgid "Suppress output of entering each submodule command"
|
|
msgstr "Dölj utdata från för varje undermodulskommando som startas"
|
|
|
|
#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
|
|
msgid "Recurse into nested submodules"
|
|
msgstr "Rekursera in i nästlade undermoduler"
|
|
|
|
#: builtin/submodule--helper.c:572
|
|
msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
|
|
msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
|
|
|
|
#: builtin/submodule--helper.c:599
|
|
#, c-format
|
|
msgid ""
|
|
"could not look up configuration '%s'. Assuming this repository is its own "
|
|
"authoritative upstream."
|
|
msgstr ""
|
|
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
|
|
"officiella uppström."
|
|
|
|
#: builtin/submodule--helper.c:667
|
|
#, c-format
|
|
msgid "Failed to register url for submodule path '%s'"
|
|
msgstr "Misslyckades registrera url för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:671
|
|
#, c-format
|
|
msgid "Submodule '%s' (%s) registered for path '%s'\n"
|
|
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:681
|
|
#, c-format
|
|
msgid "warning: command update mode suggested for submodule '%s'\n"
|
|
msgstr "varning: kommandouppdateringsläge föreslogs för undermodulen \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:688
|
|
#, c-format
|
|
msgid "Failed to register update mode for submodule path '%s'"
|
|
msgstr "Misslyckades registrera uppdateringsläge för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:710
|
|
msgid "Suppress output for initializing a submodule"
|
|
msgstr "Dölj utdata från initiering av undermodul"
|
|
|
|
#: builtin/submodule--helper.c:715
|
|
msgid "git submodule--helper init [<options>] [<path>]"
|
|
msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
|
|
|
|
#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
|
|
#, c-format
|
|
msgid "no submodule mapping found in .gitmodules for path '%s'"
|
|
msgstr "hittade ingen undermodulmappning i .gitmodules för sökvägen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:837
|
|
#, c-format
|
|
msgid "could not resolve HEAD ref inside the submodule '%s'"
|
|
msgstr "kunde inte bestämma HEAD:s incheckning i undermodulen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
|
|
#, c-format
|
|
msgid "failed to recurse into submodule '%s'"
|
|
msgstr "misslyckades rekursera in i undermodulen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
|
|
msgid "Suppress submodule status output"
|
|
msgstr "Hindra statusutskrift för undermodul"
|
|
|
|
#: builtin/submodule--helper.c:889
|
|
msgid ""
|
|
"Use commit stored in the index instead of the one stored in the submodule "
|
|
"HEAD"
|
|
msgstr ""
|
|
"Visa incheckning från indexet istället för den som lagrats i undermodulens "
|
|
"HEAD"
|
|
|
|
#: builtin/submodule--helper.c:890
|
|
msgid "recurse into nested submodules"
|
|
msgstr "rekursera in i nästlade undermoduler"
|
|
|
|
#: builtin/submodule--helper.c:895
|
|
msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
|
|
msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
|
|
|
|
#: builtin/submodule--helper.c:919
|
|
msgid "git submodule--helper name <path>"
|
|
msgstr "git submodule--helper name <sökväg>"
|
|
|
|
#: builtin/submodule--helper.c:983
|
|
#, c-format
|
|
msgid "Synchronizing submodule url for '%s'\n"
|
|
msgstr "Synkroniserar undermodul-url för \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:989
|
|
#, c-format
|
|
msgid "failed to register url for submodule path '%s'"
|
|
msgstr "misslyckades registrera url för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1003
|
|
#, c-format
|
|
msgid "failed to get the default remote for submodule '%s'"
|
|
msgstr "misslyckades hämta standardfjärr för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1014
|
|
#, c-format
|
|
msgid "failed to update remote for submodule '%s'"
|
|
msgstr "misslyckades uppdatera fjärr för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1061
|
|
msgid "Suppress output of synchronizing submodule url"
|
|
msgstr "Dölj utdata från synkroniering av undermodul-url"
|
|
|
|
#: builtin/submodule--helper.c:1068
|
|
msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
|
|
msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
|
|
|
|
#: builtin/submodule--helper.c:1122
|
|
#, c-format
|
|
msgid ""
|
|
"Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
|
|
"really want to remove it including all of its history)"
|
|
msgstr ""
|
|
"Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
|
|
"\" om du verkligen vill ta bort den och all dess historik)"
|
|
|
|
#: builtin/submodule--helper.c:1134
|
|
#, c-format
|
|
msgid ""
|
|
"Submodule work tree '%s' contains local modifications; use '-f' to discard "
|
|
"them"
|
|
msgstr ""
|
|
"Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
|
|
"dem"
|
|
|
|
#: builtin/submodule--helper.c:1142
|
|
#, c-format
|
|
msgid "Cleared directory '%s'\n"
|
|
msgstr "Rensade katalogen \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:1144
|
|
#, c-format
|
|
msgid "Could not remove submodule work tree '%s'\n"
|
|
msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:1155
|
|
#, c-format
|
|
msgid "could not create empty submodule directory %s"
|
|
msgstr "kunde inte skapa tom undermodulskatalog %s"
|
|
|
|
#: builtin/submodule--helper.c:1171
|
|
#, c-format
|
|
msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
|
|
msgstr "Undermodulen \"%s\" (%s) registrerad för sökvägen \"%s\"\n"
|
|
|
|
#: builtin/submodule--helper.c:1200
|
|
msgid "Remove submodule working trees even if they contain local changes"
|
|
msgstr ""
|
|
"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
|
|
|
|
#: builtin/submodule--helper.c:1201
|
|
msgid "Unregister all submodules"
|
|
msgstr "Avregistrera alla undermoduler"
|
|
|
|
#: builtin/submodule--helper.c:1206
|
|
msgid ""
|
|
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
|
|
msgstr ""
|
|
"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
|
|
|
|
#: builtin/submodule--helper.c:1220
|
|
msgid "Use '--all' if you really want to deinitialize all submodules"
|
|
msgstr "Använd \"--all\" om du verkligen vill avinitiera alla undermoduler"
|
|
|
|
#: builtin/submodule--helper.c: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 ""
|
|
"En suppleant beräknad från överprojektets suppleant är ogiltig.\n"
|
|
"För att i så fall låta Git klona utan ett suppleant, sätt\n"
|
|
"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
|
|
"med \"--reference-if-able\" istället för \"--reference\"."
|
|
|
|
#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
|
|
#, c-format
|
|
msgid "submodule '%s' cannot add alternate: %s"
|
|
msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
|
|
|
|
#: builtin/submodule--helper.c:1367
|
|
#, c-format
|
|
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
|
|
msgstr "Värdet \"%s\" i submodule.alternateErrorStrategy förstås inte"
|
|
|
|
#: builtin/submodule--helper.c:1374
|
|
#, c-format
|
|
msgid "Value '%s' for submodule.alternateLocation is not recognized"
|
|
msgstr "Värdet \"%s\" i submodule.alternateLocation förstås inte"
|
|
|
|
#: builtin/submodule--helper.c:1398
|
|
msgid "where the new submodule will be cloned to"
|
|
msgstr "var den nya undermodulen ska klonas till"
|
|
|
|
#: builtin/submodule--helper.c:1401
|
|
msgid "name of the new submodule"
|
|
msgstr "namn på den nya undermodulen"
|
|
|
|
#: builtin/submodule--helper.c:1404
|
|
msgid "url where to clone the submodule from"
|
|
msgstr "URL att klona undermodulen från"
|
|
|
|
#: builtin/submodule--helper.c:1412
|
|
msgid "depth for shallow clones"
|
|
msgstr "djup för grunda kloner"
|
|
|
|
#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
|
|
msgid "force cloning progress"
|
|
msgstr "tvinga kloningsförlopp"
|
|
|
|
#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1926
|
|
msgid "disallow cloning into non-empty directory"
|
|
msgstr "förhindra kloning till icke-tom katalog"
|
|
|
|
#: builtin/submodule--helper.c:1424
|
|
msgid ""
|
|
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
|
|
"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
|
|
"<url> --path <path>"
|
|
msgstr ""
|
|
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
|
|
"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
|
|
"path <sökväg>"
|
|
|
|
#: builtin/submodule--helper.c:1449
|
|
#, c-format
|
|
msgid "refusing to create/use '%s' in another submodule's git dir"
|
|
msgstr "vägrar skapa/använda \"%s\" i en annan undermoduls gitkatalog"
|
|
|
|
#: builtin/submodule--helper.c:1460
|
|
#, c-format
|
|
msgid "clone of '%s' into submodule path '%s' failed"
|
|
msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1464
|
|
#, c-format
|
|
msgid "directory not empty: '%s'"
|
|
msgstr "katalogen inte tom: \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1476
|
|
#, c-format
|
|
msgid "could not get submodule directory for '%s'"
|
|
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1512
|
|
#, c-format
|
|
msgid "Invalid update mode '%s' for submodule path '%s'"
|
|
msgstr "Ogiltigt uppdateringsläge \"%s\" för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1516
|
|
#, c-format
|
|
msgid "Invalid update mode '%s' configured for submodule path '%s'"
|
|
msgstr ""
|
|
"Ogiltigt uppdateringsläge \"%s\" konfigurerat för undermodulsökväg \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1617
|
|
#, c-format
|
|
msgid "Submodule path '%s' not initialized"
|
|
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
|
|
|
|
#: builtin/submodule--helper.c:1621
|
|
msgid "Maybe you want to use 'update --init'?"
|
|
msgstr "Kanske menade du att använda \"update --init\"?"
|
|
|
|
#: builtin/submodule--helper.c:1651
|
|
#, c-format
|
|
msgid "Skipping unmerged submodule %s"
|
|
msgstr "Hoppar över ej sammanslagen undermodul %s"
|
|
|
|
#: builtin/submodule--helper.c:1680
|
|
#, c-format
|
|
msgid "Skipping submodule '%s'"
|
|
msgstr "Hoppar över undermodulen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:1830
|
|
#, c-format
|
|
msgid "Failed to clone '%s'. Retry scheduled"
|
|
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
|
|
|
|
#: builtin/submodule--helper.c:1841
|
|
#, c-format
|
|
msgid "Failed to clone '%s' a second time, aborting"
|
|
msgstr "Misslyckades klona \"%s\" för andra gången, avbryter"
|
|
|
|
#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
|
|
msgid "path into the working tree"
|
|
msgstr "sökväg inuti arbetskatalogen"
|
|
|
|
#: builtin/submodule--helper.c:1906
|
|
msgid "path into the working tree, across nested submodule boundaries"
|
|
msgstr "sökväg inuti arbetskatalogen, genom nästlade undermodulgränser"
|
|
|
|
#: builtin/submodule--helper.c:1910
|
|
msgid "rebase, merge, checkout or none"
|
|
msgstr "rebase, merge, checkout eller none"
|
|
|
|
#: builtin/submodule--helper.c:1916
|
|
msgid "Create a shallow clone truncated to the specified number of revisions"
|
|
msgstr "Skapa en grund klon trunkerad till angivet antal revisioner"
|
|
|
|
#: builtin/submodule--helper.c:1919
|
|
msgid "parallel jobs"
|
|
msgstr "parallella jobb"
|
|
|
|
#: builtin/submodule--helper.c:1921
|
|
msgid "whether the initial clone should follow the shallow recommendation"
|
|
msgstr "om den första klonen ska följa rekommendation för grund kloning"
|
|
|
|
#: builtin/submodule--helper.c:1922
|
|
msgid "don't print cloning progress"
|
|
msgstr "skriv inte klonförlopp"
|
|
|
|
#: builtin/submodule--helper.c:1933
|
|
msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
|
|
msgstr "git submodule--helper update-clone [--prefix=<sökväg>] [<sökväg>...]"
|
|
|
|
#: builtin/submodule--helper.c:1946
|
|
msgid "bad value for update parameter"
|
|
msgstr "felaktigt värde för parametern update"
|
|
|
|
#: builtin/submodule--helper.c:1994
|
|
#, c-format
|
|
msgid ""
|
|
"Submodule (%s) branch configured to inherit branch from superproject, but "
|
|
"the superproject is not on any branch"
|
|
msgstr ""
|
|
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
|
|
"huvudprojektet är inte på någon gren"
|
|
|
|
#: builtin/submodule--helper.c:2117
|
|
#, c-format
|
|
msgid "could not get a repository handle for submodule '%s'"
|
|
msgstr "kunde inte få tag i arkivhandtag för undermodulen \"%s\""
|
|
|
|
#: builtin/submodule--helper.c:2150
|
|
msgid "recurse into submodules"
|
|
msgstr "rekursera ner i undermoduler"
|
|
|
|
#: builtin/submodule--helper.c:2156
|
|
msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
|
|
msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
|
|
|
|
#: builtin/submodule--helper.c:2212
|
|
msgid "check if it is safe to write to the .gitmodules file"
|
|
msgstr "se om det är säkert att skriva till .gitmodules-filen"
|
|
|
|
#: builtin/submodule--helper.c:2215
|
|
msgid "unset the config in the .gitmodules file"
|
|
msgstr "ta bort konfigurationen från .gitmodules-filen"
|
|
|
|
#: builtin/submodule--helper.c:2220
|
|
msgid "git submodule--helper config <name> [<value>]"
|
|
msgstr "git submodule--helper config <namn> [<värde>]"
|
|
|
|
#: builtin/submodule--helper.c:2221
|
|
msgid "git submodule--helper config --unset <name>"
|
|
msgstr "git submodule--helper config --unset <namn>"
|
|
|
|
#: builtin/submodule--helper.c:2222
|
|
msgid "git submodule--helper config --check-writeable"
|
|
msgstr "git submodule--helper config --check-writeable"
|
|
|
|
#: 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 "se till att .gitmodules finns i arbetskatalogen"
|
|
|
|
#: builtin/submodule--helper.c:2291 git.c:433 git.c:684
|
|
#, c-format
|
|
msgid "%s doesn't support --super-prefix"
|
|
msgstr "%s stöder inte --super-prefix"
|
|
|
|
#: builtin/submodule--helper.c:2297
|
|
#, c-format
|
|
msgid "'%s' is not a valid submodule--helper subcommand"
|
|
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
|
|
|
|
#: builtin/symbolic-ref.c:8
|
|
msgid "git symbolic-ref [<options>] <name> [<ref>]"
|
|
msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
|
|
|
|
#: builtin/symbolic-ref.c:9
|
|
msgid "git symbolic-ref -d [-q] <name>"
|
|
msgstr "git symbolic-ref -d [-q] <namn>"
|
|
|
|
#: builtin/symbolic-ref.c:40
|
|
msgid "suppress error message for non-symbolic (detached) refs"
|
|
msgstr ""
|
|
"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
|
|
|
|
#: builtin/symbolic-ref.c:41
|
|
msgid "delete symbolic ref"
|
|
msgstr "ta bort symbolisk referens"
|
|
|
|
#: builtin/symbolic-ref.c:42
|
|
msgid "shorten ref output"
|
|
msgstr "förkorta ref-utdata"
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
|
|
msgid "reason"
|
|
msgstr "skäl"
|
|
|
|
#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
|
|
msgid "reason of the update"
|
|
msgstr "skäl till uppdateringen"
|
|
|
|
#: builtin/tag.c:25
|
|
msgid ""
|
|
"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
|
|
"\t\t<tagname> [<head>]"
|
|
msgstr ""
|
|
"git tag [-a | -s | -u <nyckel-id>] [-f] [-m <medd> | -F <fil>]\n"
|
|
"\t\t<taggnamn> [<huvud>]"
|
|
|
|
#: builtin/tag.c:27
|
|
msgid "git tag -d <tagname>..."
|
|
msgstr "git tag -d <taggnamn>..."
|
|
|
|
#: builtin/tag.c:28
|
|
msgid ""
|
|
"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
|
|
"points-at <object>]\n"
|
|
"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
|
|
msgstr ""
|
|
"git tag -l [-n[<antal>]] [--contains <incheckning>] [--no-contains "
|
|
"<incheckning>] [--points-at <objekt>]\n"
|
|
"\t\t[--format=<format>] [--[no-]merged [<incheckning>]] [<mönster>...]"
|
|
|
|
#: builtin/tag.c:30
|
|
msgid "git tag -v [--format=<format>] <tagname>..."
|
|
msgstr "git tag -v [--format=<format>] <taggnamn>..."
|
|
|
|
#: builtin/tag.c:89
|
|
#, c-format
|
|
msgid "tag '%s' not found."
|
|
msgstr "taggen \"%s\" hittades inte."
|
|
|
|
#: builtin/tag.c:105
|
|
#, c-format
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
|
msgstr "Tog bort tagg \"%s\" (var %s)\n"
|
|
|
|
#: builtin/tag.c:135
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"Write a message for tag:\n"
|
|
" %s\n"
|
|
"Lines starting with '%c' will be ignored.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Skriv ett meddelande för taggen:\n"
|
|
" %s\n"
|
|
"Rader som inleds med \"%c\" ignoreras.\n"
|
|
|
|
#: builtin/tag.c:139
|
|
#, c-format
|
|
msgid ""
|
|
"\n"
|
|
"Write a message for tag:\n"
|
|
" %s\n"
|
|
"Lines starting with '%c' will be kept; you may remove them yourself if you "
|
|
"want to.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Skriv ett meddelande för taggen:\n"
|
|
" %s\n"
|
|
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
|
|
"du vill.\n"
|
|
|
|
#: builtin/tag.c:198
|
|
msgid "unable to sign the tag"
|
|
msgstr "kunde inte signera taggen"
|
|
|
|
#: builtin/tag.c:200
|
|
msgid "unable to write tag file"
|
|
msgstr "kunde inte skriva tagg-filen"
|
|
|
|
#: builtin/tag.c:216
|
|
#, c-format
|
|
msgid ""
|
|
"You have created a nested tag. The object referred to by your new tag is\n"
|
|
"already a tag. If you meant to tag the object that it points to, use:\n"
|
|
"\n"
|
|
"\tgit tag -f %s %s^{}"
|
|
msgstr ""
|
|
"Du har skapat en nästlad tagg. Objektet som refereras av din nya tagg är\n"
|
|
"redan en tagg. Om du skulle tagga objektet den pekar på, använd:\n"
|
|
"\n"
|
|
"\tgit tag -f %s %s^{}"
|
|
|
|
#: builtin/tag.c:232
|
|
msgid "bad object type."
|
|
msgstr "felaktig objekttyp."
|
|
|
|
#: builtin/tag.c:284
|
|
msgid "no tag message?"
|
|
msgstr "inget taggmeddelande?"
|
|
|
|
#: builtin/tag.c:291
|
|
#, c-format
|
|
msgid "The tag message has been left in %s\n"
|
|
msgstr "Taggmeddelandet har lämnats i %s\n"
|
|
|
|
#: builtin/tag.c:402
|
|
msgid "list tag names"
|
|
msgstr "lista taggnamn"
|
|
|
|
#: builtin/tag.c:404
|
|
msgid "print <n> lines of each tag message"
|
|
msgstr "visa <n> rader från varje taggmeddelande"
|
|
|
|
#: builtin/tag.c:406
|
|
msgid "delete tags"
|
|
msgstr "ta bort taggar"
|
|
|
|
#: builtin/tag.c:407
|
|
msgid "verify tags"
|
|
msgstr "verifiera taggar"
|
|
|
|
#: builtin/tag.c:409
|
|
msgid "Tag creation options"
|
|
msgstr "Alternativ för att skapa taggar"
|
|
|
|
#: builtin/tag.c:411
|
|
msgid "annotated tag, needs a message"
|
|
msgstr "annoterad tagg, behöver meddelande"
|
|
|
|
#: builtin/tag.c:413
|
|
msgid "tag message"
|
|
msgstr "taggmeddelande"
|
|
|
|
#: builtin/tag.c:415
|
|
msgid "force edit of tag message"
|
|
msgstr "tvinga redigering av incheckningsmeddelande"
|
|
|
|
#: builtin/tag.c:416
|
|
msgid "annotated and GPG-signed tag"
|
|
msgstr "annoterad och GPG-signerad tagg"
|
|
|
|
#: builtin/tag.c:419
|
|
msgid "use another key to sign the tag"
|
|
msgstr "använd annan nyckel för att signera taggen"
|
|
|
|
#: builtin/tag.c:420
|
|
msgid "replace the tag if exists"
|
|
msgstr "ersätt taggen om den finns"
|
|
|
|
#: builtin/tag.c:421 builtin/update-ref.c:369
|
|
msgid "create a reflog"
|
|
msgstr "skapa en reflog"
|
|
|
|
#: builtin/tag.c:423
|
|
msgid "Tag listing options"
|
|
msgstr "Alternativ för listning av taggar"
|
|
|
|
#: builtin/tag.c:424
|
|
msgid "show tag list in columns"
|
|
msgstr "lista taggar i spalter"
|
|
|
|
#: builtin/tag.c:425 builtin/tag.c:427
|
|
msgid "print only tags that contain the commit"
|
|
msgstr "visa endast taggar som innehåller incheckningen"
|
|
|
|
#: builtin/tag.c:426 builtin/tag.c:428
|
|
msgid "print only tags that don't contain the commit"
|
|
msgstr "visa endast taggar som inte innehåller incheckningen"
|
|
|
|
#: builtin/tag.c:429
|
|
msgid "print only tags that are merged"
|
|
msgstr "visa endast taggar som slagits samman"
|
|
|
|
#: builtin/tag.c:430
|
|
msgid "print only tags that are not merged"
|
|
msgstr "visa endast taggar som ej slagits samman"
|
|
|
|
#: builtin/tag.c:434
|
|
msgid "print only tags of the object"
|
|
msgstr "visa endast taggar för objektet"
|
|
|
|
#: builtin/tag.c:482
|
|
msgid "--column and -n are incompatible"
|
|
msgstr "--column och -n är inkompatibla"
|
|
|
|
#: builtin/tag.c:504
|
|
msgid "-n option is only allowed in list mode"
|
|
msgstr "Flaggan -n är endast tillåten i listläge"
|
|
|
|
#: builtin/tag.c:506
|
|
msgid "--contains option is only allowed in list mode"
|
|
msgstr "Flaggan --contains är endast tillåten i listläge"
|
|
|
|
#: builtin/tag.c:508
|
|
msgid "--no-contains option is only allowed in list mode"
|
|
msgstr "Flaggan --no-contains är endast tillåten i listläge"
|
|
|
|
#: builtin/tag.c:510
|
|
msgid "--points-at option is only allowed in list mode"
|
|
msgstr "Flaggan --points-at är endast tillåten i listläge"
|
|
|
|
#: builtin/tag.c:512
|
|
msgid "--merged and --no-merged options are only allowed in list mode"
|
|
msgstr "Flaggorna --merged och --no-merged är endast tillåtna i listläge"
|
|
|
|
#: builtin/tag.c:523
|
|
msgid "only one -F or -m option is allowed."
|
|
msgstr "endast en av flaggorna -F eller -m tillåts."
|
|
|
|
#: builtin/tag.c:542
|
|
msgid "too many params"
|
|
msgstr "för många parametrar"
|
|
|
|
#: builtin/tag.c:548
|
|
#, c-format
|
|
msgid "'%s' is not a valid tag name."
|
|
msgstr "\"%s\" är inte ett giltigt taggnamn."
|
|
|
|
#: builtin/tag.c:553
|
|
#, c-format
|
|
msgid "tag '%s' already exists"
|
|
msgstr "taggen \"%s\" finns redan"
|
|
|
|
#: builtin/tag.c:584
|
|
#, c-format
|
|
msgid "Updated tag '%s' (was %s)\n"
|
|
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
|
|
|
|
#: builtin/unpack-objects.c:502
|
|
msgid "Unpacking objects"
|
|
msgstr "Packar upp objekt"
|
|
|
|
#: builtin/update-index.c:84
|
|
#, c-format
|
|
msgid "failed to create directory %s"
|
|
msgstr "misslyckades skapa katalogen %s"
|
|
|
|
#: builtin/update-index.c:100
|
|
#, c-format
|
|
msgid "failed to create file %s"
|
|
msgstr "misslyckades skapa filen %s"
|
|
|
|
#: builtin/update-index.c:108
|
|
#, c-format
|
|
msgid "failed to delete file %s"
|
|
msgstr "misslyckades ta bort filen %s"
|
|
|
|
#: builtin/update-index.c:115 builtin/update-index.c:221
|
|
#, c-format
|
|
msgid "failed to delete directory %s"
|
|
msgstr "misslyckades ta bort katalogen %s"
|
|
|
|
#: builtin/update-index.c:140
|
|
#, c-format
|
|
msgid "Testing mtime in '%s' "
|
|
msgstr "Testar mtime i \"%s\" "
|
|
|
|
#: builtin/update-index.c:154
|
|
msgid "directory stat info does not change after adding a new file"
|
|
msgstr "stat-informationen för en katalog ändras inte när nya filer läggs till"
|
|
|
|
#: builtin/update-index.c:167
|
|
msgid "directory stat info does not change after adding a new directory"
|
|
msgstr ""
|
|
"stat-informationen för en katalog ändras inte när nya kataloger läggs till"
|
|
|
|
#: builtin/update-index.c:180
|
|
msgid "directory stat info changes after updating a file"
|
|
msgstr "stat-informationen för en katalog ändras när filer uppdateras"
|
|
|
|
#: builtin/update-index.c:191
|
|
msgid "directory stat info changes after adding a file inside subdirectory"
|
|
msgstr ""
|
|
"stat-informationen för en katalog ändras när filer läggs till i en "
|
|
"underkatalog"
|
|
|
|
#: builtin/update-index.c:202
|
|
msgid "directory stat info does not change after deleting a file"
|
|
msgstr "stat-informationen för en katalog ändras inte när en fil tas bort"
|
|
|
|
#: builtin/update-index.c:215
|
|
msgid "directory stat info does not change after deleting a directory"
|
|
msgstr "stat-informationen för en katalog ändras inte när en katalog tas bort"
|
|
|
|
#: builtin/update-index.c:222
|
|
msgid " OK"
|
|
msgstr " OK"
|
|
|
|
#: builtin/update-index.c:591
|
|
msgid "git update-index [<options>] [--] [<file>...]"
|
|
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
|
|
|
|
#: builtin/update-index.c:974
|
|
msgid "continue refresh even when index needs update"
|
|
msgstr "fortsätt uppdatera även när index inte är àjour"
|
|
|
|
#: builtin/update-index.c:977
|
|
msgid "refresh: ignore submodules"
|
|
msgstr "refresh: ignorera undermoduler"
|
|
|
|
#: builtin/update-index.c:980
|
|
msgid "do not ignore new files"
|
|
msgstr "ignorera inte nya filer"
|
|
|
|
#: builtin/update-index.c:982
|
|
msgid "let files replace directories and vice-versa"
|
|
msgstr "låt filer ersätta kataloger och omvänt"
|
|
|
|
#: builtin/update-index.c:984
|
|
msgid "notice files missing from worktree"
|
|
msgstr "lägg märke till filer som saknas i arbetskatalogen"
|
|
|
|
#: builtin/update-index.c:986
|
|
msgid "refresh even if index contains unmerged entries"
|
|
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
|
|
|
|
#: builtin/update-index.c:989
|
|
msgid "refresh stat information"
|
|
msgstr "uppdatera statusinformation"
|
|
|
|
#: builtin/update-index.c:993
|
|
msgid "like --refresh, but ignore assume-unchanged setting"
|
|
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
|
|
|
|
#: builtin/update-index.c:997
|
|
msgid "<mode>,<object>,<path>"
|
|
msgstr "<läge>,<objekt>,<sökväg>"
|
|
|
|
#: builtin/update-index.c:998
|
|
msgid "add the specified entry to the index"
|
|
msgstr "lägg till angiven post i indexet"
|
|
|
|
#: builtin/update-index.c:1008
|
|
msgid "mark files as \"not changing\""
|
|
msgstr "markera filer som \"ändras inte\""
|
|
|
|
#: builtin/update-index.c:1011
|
|
msgid "clear assumed-unchanged bit"
|
|
msgstr "rensa \"assume-unchanged\"-biten"
|
|
|
|
#: builtin/update-index.c:1014
|
|
msgid "mark files as \"index-only\""
|
|
msgstr "markera filer som \"endast index\""
|
|
|
|
#: builtin/update-index.c:1017
|
|
msgid "clear skip-worktree bit"
|
|
msgstr "töm \"skip-worktree\"-biten"
|
|
|
|
#: builtin/update-index.c:1020
|
|
msgid "do not touch index-only entries"
|
|
msgstr "rör inte \"endast index\"-poster"
|
|
|
|
#: builtin/update-index.c:1022
|
|
msgid "add to index only; do not add content to object database"
|
|
msgstr "lägg endast till indexet; lägg inte till innehållet i objektdatabasen"
|
|
|
|
#: builtin/update-index.c:1024
|
|
msgid "remove named paths even if present in worktree"
|
|
msgstr "ta bort namngivna sökvägar även om de finns i arbetskatalogen"
|
|
|
|
#: builtin/update-index.c:1026
|
|
msgid "with --stdin: input lines are terminated by null bytes"
|
|
msgstr "med --stdin: indatarader termineras med null-byte"
|
|
|
|
#: builtin/update-index.c:1028
|
|
msgid "read list of paths to be updated from standard input"
|
|
msgstr "läs lista över sökvägar att uppdatera från standard in"
|
|
|
|
#: builtin/update-index.c:1032
|
|
msgid "add entries from standard input to the index"
|
|
msgstr "lägg poster från standard in till indexet"
|
|
|
|
#: builtin/update-index.c:1036
|
|
msgid "repopulate stages #2 and #3 for the listed paths"
|
|
msgstr "återfyll etapp 2 och 3 från angivna sökvägar"
|
|
|
|
#: builtin/update-index.c:1040
|
|
msgid "only update entries that differ from HEAD"
|
|
msgstr "uppdatera endast poster som skiljer sig från HEAD"
|
|
|
|
#: builtin/update-index.c:1044
|
|
msgid "ignore files missing from worktree"
|
|
msgstr "ignorera filer som saknas i arbetskatalogen"
|
|
|
|
#: builtin/update-index.c:1047
|
|
msgid "report actions to standard output"
|
|
msgstr "rapportera åtgärder på standard ut"
|
|
|
|
#: builtin/update-index.c:1049
|
|
msgid "(for porcelains) forget saved unresolved conflicts"
|
|
msgstr "(för porslin) glöm sparade olösta konflikter"
|
|
|
|
#: builtin/update-index.c:1053
|
|
msgid "write index in this format"
|
|
msgstr "skriv index i detta format"
|
|
|
|
#: builtin/update-index.c:1055
|
|
msgid "enable or disable split index"
|
|
msgstr "aktivera eller inaktivera delat index"
|
|
|
|
#: builtin/update-index.c:1057
|
|
msgid "enable/disable untracked cache"
|
|
msgstr "aktivera/inaktivera ospårad cache"
|
|
|
|
#: builtin/update-index.c:1059
|
|
msgid "test if the filesystem supports untracked cache"
|
|
msgstr "testa om filsystemet stöder ospårad cache"
|
|
|
|
#: builtin/update-index.c:1061
|
|
msgid "enable untracked cache without testing the filesystem"
|
|
msgstr "aktivera ospårad cache utan att testa filsystemet"
|
|
|
|
#: builtin/update-index.c:1063
|
|
msgid "write out the index even if is not flagged as changed"
|
|
msgstr "skriv ut indexet även om det inte angivits som ändrat"
|
|
|
|
#: builtin/update-index.c:1065
|
|
msgid "enable or disable file system monitor"
|
|
msgstr "aktivera eller inaktivera filsystemsövervakning"
|
|
|
|
#: builtin/update-index.c:1067
|
|
msgid "mark files as fsmonitor valid"
|
|
msgstr "markera filer som \"fsmonitor valid\""
|
|
|
|
#: builtin/update-index.c:1070
|
|
msgid "clear fsmonitor valid bit"
|
|
msgstr "töm \"fsmonitor valid\"-bit"
|
|
|
|
#: builtin/update-index.c:1173
|
|
msgid ""
|
|
"core.splitIndex is set to false; remove or change it, if you really want to "
|
|
"enable split index"
|
|
msgstr ""
|
|
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
|
|
"vill aktivera delat index"
|
|
|
|
#: builtin/update-index.c:1182
|
|
msgid ""
|
|
"core.splitIndex is set to true; remove or change it, if you really want to "
|
|
"disable split index"
|
|
msgstr ""
|
|
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
|
|
"vill inaktivera delat index"
|
|
|
|
#: 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"
|
|
msgstr ""
|
|
"core.untrackedCache är satt till true; ta bort eller ändra det om du "
|
|
"verkligen vill inaktivera den ospårade cachen"
|
|
|
|
#: builtin/update-index.c:1198
|
|
msgid "Untracked cache disabled"
|
|
msgstr "Ospårad cache är inaktiverad"
|
|
|
|
#: 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"
|
|
msgstr ""
|
|
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
|
|
"verkligen vill aktivera den ospårade cachen"
|
|
|
|
#: builtin/update-index.c:1210
|
|
#, c-format
|
|
msgid "Untracked cache enabled for '%s'"
|
|
msgstr "Ospårad cache är aktiverad för \"%s\""
|
|
|
|
#: builtin/update-index.c:1218
|
|
msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
|
|
msgstr "core.fsmonitor inte satt; sätt om du verkligen vill aktivera fsmonitor"
|
|
|
|
#: builtin/update-index.c:1222
|
|
msgid "fsmonitor enabled"
|
|
msgstr "fsmonitor aktiverat"
|
|
|
|
#: builtin/update-index.c:1225
|
|
msgid ""
|
|
"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
|
|
msgstr ""
|
|
"core.fsmonitor är satt; ta bort om du verkligen vill inaktivera fsmonitor"
|
|
|
|
#: builtin/update-index.c:1229
|
|
msgid "fsmonitor disabled"
|
|
msgstr "fsmonitor inaktiverat"
|
|
|
|
#: builtin/update-ref.c:10
|
|
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
|
|
msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"
|
|
|
|
#: builtin/update-ref.c:11
|
|
msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
|
|
msgstr "git update-ref [<flaggor>] <refnamn> <gammaltvärde> [<nyttvärde>]"
|
|
|
|
#: builtin/update-ref.c:12
|
|
msgid "git update-ref [<options>] --stdin [-z]"
|
|
msgstr "git update-ref [<flaggor>] --stdin [-z]"
|
|
|
|
#: builtin/update-ref.c:364
|
|
msgid "delete the reference"
|
|
msgstr "ta bort referensen"
|
|
|
|
#: builtin/update-ref.c:366
|
|
msgid "update <refname> not the one it points to"
|
|
msgstr "uppdatera <refnamn> inte det den pekar på"
|
|
|
|
#: builtin/update-ref.c:367
|
|
msgid "stdin has NUL-terminated arguments"
|
|
msgstr "standard in har NUL-terminerade argument"
|
|
|
|
#: builtin/update-ref.c:368
|
|
msgid "read updates from stdin"
|
|
msgstr "läs uppdateringar från standard in"
|
|
|
|
#: builtin/update-server-info.c:7
|
|
msgid "git update-server-info [--force]"
|
|
msgstr "git update-server-info [--force]"
|
|
|
|
#: builtin/update-server-info.c:15
|
|
msgid "update the info files from scratch"
|
|
msgstr "uppdatera informationsfilerna från grunden"
|
|
|
|
#: builtin/upload-pack.c:11
|
|
msgid "git upload-pack [<options>] <dir>"
|
|
msgstr "git upload-pack [<flaggor>] <katalog>"
|
|
|
|
#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
|
|
msgid "quit after a single request/response exchange"
|
|
msgstr "avsluta omedelbart efter första anrop/svar-utväxling"
|
|
|
|
#: builtin/upload-pack.c:25
|
|
msgid "exit immediately after initial ref advertisement"
|
|
msgstr "avsluta omedelbart efter inledande kungörelse av referenser"
|
|
|
|
#: builtin/upload-pack.c:27
|
|
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
|
|
msgstr "testa inte <katalog>/.git/ om <katalog> inte är en Git-katalog"
|
|
|
|
#: builtin/upload-pack.c:29
|
|
msgid "interrupt transfer after <n> seconds of inactivity"
|
|
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
|
|
|
|
#: builtin/verify-commit.c:19
|
|
msgid "git verify-commit [-v | --verbose] <commit>..."
|
|
msgstr "git verify-commit [-v | --verbose] <incheckning>..."
|
|
|
|
#: builtin/verify-commit.c:68
|
|
msgid "print commit contents"
|
|
msgstr "visa innehåll för incheckning"
|
|
|
|
#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
|
|
msgid "print raw gpg status output"
|
|
msgstr "visa råa gpg-statusdata"
|
|
|
|
#: builtin/verify-pack.c:55
|
|
msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
|
|
msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
|
|
|
|
#: builtin/verify-pack.c:65
|
|
msgid "verbose"
|
|
msgstr "pratsam"
|
|
|
|
#: builtin/verify-pack.c:67
|
|
msgid "show statistics only"
|
|
msgstr "visa endast statistik"
|
|
|
|
#: builtin/verify-tag.c:18
|
|
msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
|
|
msgstr "git verify-tag [-v | --verbose] [--format=<format] <tagg>..."
|
|
|
|
#: builtin/verify-tag.c:36
|
|
msgid "print tag contents"
|
|
msgstr "visa innehåll för tag"
|
|
|
|
#: builtin/worktree.c:17
|
|
msgid "git worktree add [<options>] <path> [<commit-ish>]"
|
|
msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
|
|
|
|
#: builtin/worktree.c:18
|
|
msgid "git worktree list [<options>]"
|
|
msgstr "git worktree list [<flaggor>]"
|
|
|
|
#: builtin/worktree.c:19
|
|
msgid "git worktree lock [<options>] <path>"
|
|
msgstr "git worktree lock [<flaggor>] <sökväg>"
|
|
|
|
#: builtin/worktree.c:20
|
|
msgid "git worktree move <worktree> <new-path>"
|
|
msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
|
|
|
|
#: builtin/worktree.c:21
|
|
msgid "git worktree prune [<options>]"
|
|
msgstr "git worktree prune [<flaggor>]"
|
|
|
|
#: builtin/worktree.c:22
|
|
msgid "git worktree remove [<options>] <worktree>"
|
|
msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
|
|
|
|
#: builtin/worktree.c:23
|
|
msgid "git worktree unlock <path>"
|
|
msgstr "git worktree unlock <sökväg>"
|
|
|
|
#: builtin/worktree.c:60 builtin/worktree.c:891
|
|
#, c-format
|
|
msgid "failed to delete '%s'"
|
|
msgstr "misslyckades ta bort \"%s\""
|
|
|
|
#: builtin/worktree.c:79
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: not a valid directory"
|
|
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
|
|
|
|
#: builtin/worktree.c:85
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: gitdir file does not exist"
|
|
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
|
|
|
|
#: builtin/worktree.c:90 builtin/worktree.c:99
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
|
|
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
|
|
|
|
#: builtin/worktree.c:109
|
|
#, c-format
|
|
msgid ""
|
|
"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
|
|
"%<PRIuMAX>)"
|
|
msgstr ""
|
|
"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
|
|
"%<PRIuMAX>)"
|
|
|
|
#: builtin/worktree.c:117
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: invalid gitdir file"
|
|
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
|
|
|
|
#: builtin/worktree.c:126
|
|
#, c-format
|
|
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
|
|
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
|
|
|
|
#: builtin/worktree.c:165
|
|
msgid "report pruned working trees"
|
|
msgstr "rapportera borttagna arbetskataloger"
|
|
|
|
#: builtin/worktree.c:167
|
|
msgid "expire working trees older than <time>"
|
|
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
|
|
|
|
#: builtin/worktree.c:234
|
|
#, c-format
|
|
msgid "'%s' already exists"
|
|
msgstr "\"%s\" finns redan"
|
|
|
|
#: builtin/worktree.c:244
|
|
#, c-format
|
|
msgid "unable to re-add worktree '%s'"
|
|
msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen"
|
|
|
|
#: builtin/worktree.c:249
|
|
#, c-format
|
|
msgid ""
|
|
"'%s' is a missing but locked worktree;\n"
|
|
"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
|
|
msgstr ""
|
|
"\"%s\" är en saknad men låst arbetskatalog;\n"
|
|
"använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
|
|
"\"remove\" för att rensa"
|
|
|
|
#: builtin/worktree.c:251
|
|
#, c-format
|
|
msgid ""
|
|
"'%s' is a missing but already registered worktree;\n"
|
|
"use 'add -f' to override, or 'prune' or 'remove' to clear"
|
|
msgstr ""
|
|
"\"%s\" är en saknad men redan registrerad arbetskatalog;\n"
|
|
"använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för "
|
|
"att rensa"
|
|
|
|
#: builtin/worktree.c:301
|
|
#, c-format
|
|
msgid "could not create directory of '%s'"
|
|
msgstr "kunde inte skapa katalogen \"%s\""
|
|
|
|
#: builtin/worktree.c:432 builtin/worktree.c:438
|
|
#, c-format
|
|
msgid "Preparing worktree (new branch '%s')"
|
|
msgstr "Förbereder arbetskatalog (ny gren \"%s\")"
|
|
|
|
#: builtin/worktree.c:434
|
|
#, c-format
|
|
msgid "Preparing worktree (resetting branch '%s'; was at %s)"
|
|
msgstr "Förbereder arbetskatalog (återställer gren \"%s\"; var på %s)"
|
|
|
|
#: builtin/worktree.c:443
|
|
#, c-format
|
|
msgid "Preparing worktree (checking out '%s')"
|
|
msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
|
|
|
|
#: builtin/worktree.c:449
|
|
#, c-format
|
|
msgid "Preparing worktree (detached HEAD %s)"
|
|
msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
|
|
|
|
#: builtin/worktree.c:490
|
|
msgid "checkout <branch> even if already checked out in other worktree"
|
|
msgstr ""
|
|
"checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
|
|
|
|
#: builtin/worktree.c:493
|
|
msgid "create a new branch"
|
|
msgstr "skapa en ny gren"
|
|
|
|
#: builtin/worktree.c:495
|
|
msgid "create or reset a branch"
|
|
msgstr "skapa eller återställ en gren"
|
|
|
|
#: builtin/worktree.c:497
|
|
msgid "populate the new working tree"
|
|
msgstr "befolka den nya arbetskatalogen"
|
|
|
|
#: builtin/worktree.c:498
|
|
msgid "keep the new working tree locked"
|
|
msgstr "låt arbetskatalogen förbli låst"
|
|
|
|
#: builtin/worktree.c:501
|
|
msgid "set up tracking mode (see git-branch(1))"
|
|
msgstr "ställ in spårningsläge (se git-branch(1))"
|
|
|
|
#: builtin/worktree.c:504
|
|
msgid "try to match the new branch name with a remote-tracking branch"
|
|
msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
|
|
|
|
#: builtin/worktree.c:512
|
|
msgid "-b, -B, and --detach are mutually exclusive"
|
|
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
|
|
|
|
#: builtin/worktree.c:573
|
|
msgid "--[no-]track can only be used if a new branch is created"
|
|
msgstr "--[no-]track kan endast användas när ny gran skapas"
|
|
|
|
#: builtin/worktree.c:673
|
|
msgid "reason for locking"
|
|
msgstr "orsak till lås"
|
|
|
|
#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
|
|
#: builtin/worktree.c:919
|
|
#, c-format
|
|
msgid "'%s' is not a working tree"
|
|
msgstr "\"%s\" är inte en arbetskatalog"
|
|
|
|
#: builtin/worktree.c:687 builtin/worktree.c:720
|
|
msgid "The main working tree cannot be locked or unlocked"
|
|
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
|
|
|
|
#: builtin/worktree.c:692
|
|
#, c-format
|
|
msgid "'%s' is already locked, reason: %s"
|
|
msgstr "\"%s\" är redan låst, orsak: %s"
|
|
|
|
#: builtin/worktree.c:694
|
|
#, c-format
|
|
msgid "'%s' is already locked"
|
|
msgstr "\"%s\" är redan låst"
|
|
|
|
#: builtin/worktree.c:722
|
|
#, c-format
|
|
msgid "'%s' is not locked"
|
|
msgstr "\"%s\" är inte låst"
|
|
|
|
#: builtin/worktree.c:763
|
|
msgid "working trees containing submodules cannot be moved or removed"
|
|
msgstr "arbetskataloger med undermoduler kan inte flyttas eller tas bort"
|
|
|
|
#: builtin/worktree.c:771
|
|
msgid "force move even if worktree is dirty or locked"
|
|
msgstr "tvinga flyttning även om arbetskatalogen är smutsig eller låst"
|
|
|
|
#: builtin/worktree.c:794 builtin/worktree.c:921
|
|
#, c-format
|
|
msgid "'%s' is a main working tree"
|
|
msgstr "\"%s\" är inte en huvudarbetskatalog"
|
|
|
|
#: builtin/worktree.c:799
|
|
#, c-format
|
|
msgid "could not figure out destination name from '%s'"
|
|
msgstr "kunde inte lista ut målnamn från \"%s\""
|
|
|
|
#: builtin/worktree.c:805
|
|
#, c-format
|
|
msgid "target '%s' already exists"
|
|
msgstr "målet \"%s\" finns redan"
|
|
|
|
#: builtin/worktree.c:813
|
|
#, c-format
|
|
msgid ""
|
|
"cannot move a locked working tree, lock reason: %s\n"
|
|
"use 'move -f -f' to override or unlock first"
|
|
msgstr ""
|
|
"kan inte flytta en låst arbetskatalog, orsak till lås: %s\n"
|
|
"använd \"move -f -f\" för att överstyra, eller lås upp först"
|
|
|
|
#: builtin/worktree.c:815
|
|
msgid ""
|
|
"cannot move a locked working tree;\n"
|
|
"use 'move -f -f' to override or unlock first"
|
|
msgstr ""
|
|
"kan inte flytta en låst arbetskatalog;\n"
|
|
"använd \"move -f -f\" för att överstyra, eller lås upp först"
|
|
|
|
#: builtin/worktree.c:818
|
|
#, c-format
|
|
msgid "validation failed, cannot move working tree: %s"
|
|
msgstr "kontroll misslyckades, kan inte flytta arbetskatalog: %s"
|
|
|
|
#: builtin/worktree.c:823
|
|
#, c-format
|
|
msgid "failed to move '%s' to '%s'"
|
|
msgstr "misslyckades flytta \"%s\" till \"%s\""
|
|
|
|
#: builtin/worktree.c:871
|
|
#, c-format
|
|
msgid "failed to run 'git status' on '%s'"
|
|
msgstr "misslyckades köra \"git status\" på \"%s\""
|
|
|
|
#: builtin/worktree.c:875
|
|
#, c-format
|
|
msgid "'%s' contains modified or untracked files, use --force to delete it"
|
|
msgstr ""
|
|
"\"%s\" innehåller ändrade eller ospårade filer, använd --force för att ta "
|
|
"bort det"
|
|
|
|
#: builtin/worktree.c:880
|
|
#, c-format
|
|
msgid "failed to run 'git status' on '%s', code %d"
|
|
msgstr "misslyckades köra \"git status\" på \"%s\", kod %d"
|
|
|
|
#: builtin/worktree.c:903
|
|
msgid "force removal even if worktree is dirty or locked"
|
|
msgstr "tvinga ta bort även om arbetskatalogen är smutsig eller låst"
|
|
|
|
#: builtin/worktree.c:926
|
|
#, c-format
|
|
msgid ""
|
|
"cannot remove a locked working tree, lock reason: %s\n"
|
|
"use 'remove -f -f' to override or unlock first"
|
|
msgstr ""
|
|
"kan inte ta bort en låst arbetskatalog, orsak till låset: %s\n"
|
|
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
|
|
|
|
#: builtin/worktree.c:928
|
|
msgid ""
|
|
"cannot remove a locked working tree;\n"
|
|
"use 'remove -f -f' to override or unlock first"
|
|
msgstr ""
|
|
"kan inte ta bort en låst arbetskatalog;\n"
|
|
"använd \"remove -f -f\" för att överstyra, eller lås upp först"
|
|
|
|
#: builtin/worktree.c:931
|
|
#, c-format
|
|
msgid "validation failed, cannot remove working tree: %s"
|
|
msgstr "kontroll misslyckades, kan inte ta bort arbetskatalog: %s"
|
|
|
|
#: builtin/write-tree.c:15
|
|
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
|
msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
|
|
|
|
#: builtin/write-tree.c:28
|
|
msgid "<prefix>/"
|
|
msgstr "<prefix>/"
|
|
|
|
#: builtin/write-tree.c:29
|
|
msgid "write tree object for a subdirectory <prefix>"
|
|
msgstr "visa trädobjekt för underkatalogen <prefix>"
|
|
|
|
#: builtin/write-tree.c:31
|
|
msgid "only useful for debugging"
|
|
msgstr "endast användbart vid felsökning"
|
|
|
|
#: fast-import.c:3125
|
|
#, c-format
|
|
msgid "Expected 'mark' command, got %s"
|
|
msgstr "Förväntade \"mark\"-kommando, fick %s"
|
|
|
|
#: fast-import.c:3130
|
|
#, c-format
|
|
msgid "Expected 'to' command, got %s"
|
|
msgstr "Förväntade \"to\"-kommando, fick %s"
|
|
|
|
#: fast-import.c:3254
|
|
#, c-format
|
|
msgid "feature '%s' forbidden in input without --allow-unsafe-features"
|
|
msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
|
|
|
|
#: credential-cache--daemon.c:223
|
|
#, c-format
|
|
msgid ""
|
|
"The permissions on your socket directory are too loose; other\n"
|
|
"users may be able to read your cached credentials. Consider running:\n"
|
|
"\n"
|
|
"\tchmod 0700 %s"
|
|
msgstr ""
|
|
"Behörigheten på din uttags-katalog (socket) är för lös; andra\n"
|
|
"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n"
|
|
"\n"
|
|
"\tchmod 0700 %s"
|
|
|
|
#: credential-cache--daemon.c:272
|
|
msgid "print debugging messages to stderr"
|
|
msgstr "skriv felsökningsmeddelanden på standard fel"
|
|
|
|
#: t/helper/test-reach.c:152
|
|
#, c-format
|
|
msgid "commit %s is not marked reachable"
|
|
msgstr "incheckning %s är inte märkt nåbar"
|
|
|
|
#: t/helper/test-reach.c:162
|
|
msgid "too many commits marked reachable"
|
|
msgstr "för många incheckningar markerade nåbara"
|
|
|
|
#: t/helper/test-serve-v2.c:7
|
|
msgid "test-tool serve-v2 [<options>]"
|
|
msgstr "test-tool serve-v2 [<flaggor>]"
|
|
|
|
#: t/helper/test-serve-v2.c:19
|
|
msgid "exit immediately after advertising capabilities"
|
|
msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
|
|
|
|
#: git.c:27
|
|
msgid ""
|
|
"git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
|
|
" [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
|
|
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
|
|
"bare]\n"
|
|
" [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
|
|
" <command> [<args>]"
|
|
msgstr ""
|
|
"git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
|
|
" [--exec-path[=<sökväg>]] [--html-path] [--man-path] [--info-"
|
|
"path]\n"
|
|
" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
|
|
"bare]\n"
|
|
" [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
|
|
" <kommando> [<flaggor>]"
|
|
|
|
#: git.c:34
|
|
msgid ""
|
|
"'git help -a' and 'git help -g' list available subcommands and some\n"
|
|
"concept guides. See 'git help <command>' or 'git help <concept>'\n"
|
|
"to read about a specific subcommand or concept.\n"
|
|
"See 'git help git' for an overview of the system."
|
|
msgstr ""
|
|
"\"git help -a\" och \"git help -g\" visar tillgängliga underkommandon och\n"
|
|
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
|
|
"<koncept>\" för att läsa mer om specifika underkommandon och koncept.\n"
|
|
"See \"git help git\" för en översikt över systemet."
|
|
|
|
#: git.c:186
|
|
#, c-format
|
|
msgid "no directory given for --git-dir\n"
|
|
msgstr "ingen katalog angavs för --git-dir\n"
|
|
|
|
#: git.c:200
|
|
#, c-format
|
|
msgid "no namespace given for --namespace\n"
|
|
msgstr "ingen namnrymd angavs för --namespace\n"
|
|
|
|
#: git.c:214
|
|
#, c-format
|
|
msgid "no directory given for --work-tree\n"
|
|
msgstr "ingen katalog angavs för --work-tree\n"
|
|
|
|
#: git.c:228
|
|
#, c-format
|
|
msgid "no prefix given for --super-prefix\n"
|
|
msgstr "inget prefix angavs för --super-prefix\n"
|
|
|
|
#: git.c:250
|
|
#, c-format
|
|
msgid "-c expects a configuration string\n"
|
|
msgstr "-c förväntar en konfigurationssträng\n"
|
|
|
|
#: git.c:288
|
|
#, c-format
|
|
msgid "no directory given for -C\n"
|
|
msgstr "ingen katalog angavs för -C\n"
|
|
|
|
#: git.c:314
|
|
#, c-format
|
|
msgid "unknown option: %s\n"
|
|
msgstr "okänd flagga: %s\n"
|
|
|
|
#: git.c:360
|
|
#, c-format
|
|
msgid "while expanding alias '%s': '%s'"
|
|
msgstr "vid expandering av aliaset \"%s\": \"%s\""
|
|
|
|
#: git.c:369
|
|
#, c-format
|
|
msgid ""
|
|
"alias '%s' changes environment variables.\n"
|
|
"You can use '!git' in the alias to do this"
|
|
msgstr ""
|
|
"aliaset \"%s\" ändrar miljövariabler.\n"
|
|
"Du kan använda \"!git\" i aliaset för att göra det"
|
|
|
|
#: git.c:376
|
|
#, c-format
|
|
msgid "empty alias for %s"
|
|
msgstr "tomt alias för %s"
|
|
|
|
#: git.c:379
|
|
#, c-format
|
|
msgid "recursive alias: %s"
|
|
msgstr "rekursivt alias: %s"
|
|
|
|
#: git.c:459
|
|
msgid "write failure on standard output"
|
|
msgstr "skrivfel på standard ut"
|
|
|
|
#: git.c:461
|
|
msgid "unknown write failure on standard output"
|
|
msgstr "okänt skrivfel på standard ut"
|
|
|
|
#: git.c:463
|
|
msgid "close failed on standard output"
|
|
msgstr "stäng misslyckades på standard ut"
|
|
|
|
#: git.c:793
|
|
#, c-format
|
|
msgid "alias loop detected: expansion of '%s' does not terminate:%s"
|
|
msgstr "alias-slinga detekterades: expansionen av \"%s\" avslutas aldrig:%s"
|
|
|
|
#: git.c:843
|
|
#, c-format
|
|
msgid "cannot handle %s as a builtin"
|
|
msgstr "kan inte hantera %s som inbyggd"
|
|
|
|
#: git.c:856
|
|
#, c-format
|
|
msgid ""
|
|
"usage: %s\n"
|
|
"\n"
|
|
msgstr ""
|
|
"användning: %s\n"
|
|
"\n"
|
|
|
|
#: git.c:876
|
|
#, c-format
|
|
msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
|
|
msgstr ""
|
|
"expandering av alias \"%s\" misslyckades; \"%s\" är inte ett git-kommando\n"
|
|
|
|
#: git.c:888
|
|
#, c-format
|
|
msgid "failed to run command '%s': %s\n"
|
|
msgstr "misslyckades köra kommandot \"%s\": %s\n"
|
|
|
|
#: http.c:378
|
|
#, c-format
|
|
msgid "negative value for http.postbuffer; defaulting to %d"
|
|
msgstr "http.postbuffer har negativt värde; använder förvalet %d"
|
|
|
|
#: http.c:399
|
|
msgid "Delegation control is not supported with cURL < 7.22.0"
|
|
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
|
|
|
|
#: http.c:408
|
|
msgid "Public key pinning not supported with cURL < 7.44.0"
|
|
msgstr "Fastnålning av öppen nyckel stöds inte av cURL < 7.44.0"
|
|
|
|
#: http.c:876
|
|
msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
|
|
msgstr "CURLSSLOPT_NO_REVOKE stöds inte av cURL < 7.44.0"
|
|
|
|
#: http.c:949
|
|
msgid "Protocol restrictions not supported with cURL < 7.19.4"
|
|
msgstr "Prtokollbegränsningar stöds inte av cURL < 7.19.4"
|
|
|
|
#: http.c:1086
|
|
#, c-format
|
|
msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
|
|
msgstr "SSL-bakändan \"%s\" stöds inte. Dessa SSL-bakändor stöds:"
|
|
|
|
#: http.c:1093
|
|
#, c-format
|
|
msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
|
|
msgstr "Kan inte sätta SSL-bakända till \"%s\": cURL byggdes utan SSL-bakändor"
|
|
|
|
#: http.c:1097
|
|
#, c-format
|
|
msgid "Could not set SSL backend to '%s': already set"
|
|
msgstr "Kunde inte sätta SSL-bakända till \"%s\": redan valt"
|
|
|
|
#: http.c:1966
|
|
#, c-format
|
|
msgid ""
|
|
"unable to update url base from redirection:\n"
|
|
" asked for: %s\n"
|
|
" redirect: %s"
|
|
msgstr ""
|
|
"kan inte uppdatera urlbas från omdirigerin:\n"
|
|
" bad om: %s\n"
|
|
" omdirigering: %s"
|
|
|
|
#: remote-curl.c:166
|
|
#, c-format
|
|
msgid "invalid quoting in push-option value: '%s'"
|
|
msgstr "felaktig citering på värde för push-option: \"%s\""
|
|
|
|
#: remote-curl.c:263
|
|
#, c-format
|
|
msgid "%sinfo/refs not valid: is this a git repository?"
|
|
msgstr "%sinfo/refs inte giltig: är detta ett git-arkiv?"
|
|
|
|
#: remote-curl.c:364
|
|
msgid "invalid server response; expected service, got flush packet"
|
|
msgstr "ogiltigt svar från servern; förväntade tjänst, fick flush-paket"
|
|
|
|
#: remote-curl.c:395
|
|
#, c-format
|
|
msgid "invalid server response; got '%s'"
|
|
msgstr "ogiltigt svar från servern; fick \"%s\""
|
|
|
|
#: remote-curl.c:455
|
|
#, c-format
|
|
msgid "repository '%s' not found"
|
|
msgstr "arkivet \"%s\" hittades inte"
|
|
|
|
#: remote-curl.c:459
|
|
#, c-format
|
|
msgid "Authentication failed for '%s'"
|
|
msgstr "Autentisering misslyckades \"%s\""
|
|
|
|
#: remote-curl.c:463
|
|
#, c-format
|
|
msgid "unable to access '%s': %s"
|
|
msgstr "kan inte komma åt \"%s\": %s"
|
|
|
|
#: remote-curl.c:469
|
|
#, c-format
|
|
msgid "redirecting to %s"
|
|
msgstr "omdirigerar till %s"
|
|
|
|
#: remote-curl.c:593
|
|
msgid "shouldn't have EOF when not gentle on EOF"
|
|
msgstr "borde inte ha EOF när inte försiktig på EOF"
|
|
|
|
#: remote-curl.c:673
|
|
msgid "unable to rewind rpc post data - try increasing http.postBuffer"
|
|
msgstr "kunde inte spola tillbaka rpc-postdata - försök öka http.postBuffer"
|
|
|
|
#: remote-curl.c:733
|
|
#, c-format
|
|
msgid "RPC failed; %s"
|
|
msgstr "RPC misslyckades; %s"
|
|
|
|
#: remote-curl.c:773
|
|
msgid "cannot handle pushes this big"
|
|
msgstr "kan inte hantera så stora sändningar"
|
|
|
|
#: remote-curl.c:888
|
|
#, c-format
|
|
msgid "cannot deflate request; zlib deflate error %d"
|
|
msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
|
|
|
|
#: remote-curl.c:892
|
|
#, c-format
|
|
msgid "cannot deflate request; zlib end error %d"
|
|
msgstr "kan inte packa upp anrop; zlib-slutfel %d"
|
|
|
|
#: remote-curl.c:1023
|
|
msgid "dumb http transport does not support shallow capabilities"
|
|
msgstr "dum http-transport stöder inte grunda arkiv"
|
|
|
|
#: remote-curl.c:1038
|
|
msgid "fetch failed."
|
|
msgstr "mottagning misslyckades."
|
|
|
|
#: remote-curl.c:1086
|
|
msgid "cannot fetch by sha1 over smart http"
|
|
msgstr "kan inte hämta med sha1 över smart http"
|
|
|
|
#: remote-curl.c:1130 remote-curl.c:1136
|
|
#, c-format
|
|
msgid "protocol error: expected sha/ref, got '%s'"
|
|
msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
|
|
|
|
#: remote-curl.c:1148 remote-curl.c:1263
|
|
#, c-format
|
|
msgid "http transport does not support %s"
|
|
msgstr "http-transporten stöder inte %s"
|
|
|
|
#: remote-curl.c:1184
|
|
msgid "git-http-push failed"
|
|
msgstr "git-http-push misslyckades"
|
|
|
|
#: remote-curl.c:1369
|
|
msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
|
|
msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
|
|
|
|
#: remote-curl.c:1401
|
|
msgid "remote-curl: error reading command stream from git"
|
|
msgstr "remote-curl: fel vid läsning av kommandoström från git"
|
|
|
|
#: remote-curl.c:1408
|
|
msgid "remote-curl: fetch attempted without a local repo"
|
|
msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
|
|
|
|
#: remote-curl.c:1448
|
|
#, c-format
|
|
msgid "remote-curl: unknown command '%s' from git"
|
|
msgstr "remote-curl: okänt kommando \"%s\" från git"
|
|
|
|
#: list-objects-filter-options.h:85
|
|
msgid "args"
|
|
msgstr "argument"
|
|
|
|
#: list-objects-filter-options.h:86
|
|
msgid "object filtering"
|
|
msgstr "objektfiltrering"
|
|
|
|
#: parse-options.h:183
|
|
msgid "expiry-date"
|
|
msgstr "giltig-till"
|
|
|
|
#: parse-options.h:197
|
|
msgid "no-op (backward compatibility)"
|
|
msgstr "ingen funktion (bakåtkompatibilitet)"
|
|
|
|
#: parse-options.h:309
|
|
msgid "be more verbose"
|
|
msgstr "var mer pratsam"
|
|
|
|
#: parse-options.h:311
|
|
msgid "be more quiet"
|
|
msgstr "var mer tyst"
|
|
|
|
#: parse-options.h:317
|
|
msgid "use <n> digits to display SHA-1s"
|
|
msgstr "använd <n> siffror för att visa SHA-1:or"
|
|
|
|
#: parse-options.h:336
|
|
msgid "how to strip spaces and #comments from message"
|
|
msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
|
|
|
|
#: parse-options.h:337
|
|
msgid "read pathspec from file"
|
|
msgstr "läs sökvägsangivelse från fil"
|
|
|
|
#: parse-options.h:338
|
|
msgid ""
|
|
"with --pathspec-from-file, pathspec elements are separated with NUL character"
|
|
msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
|
|
|
|
#: ref-filter.h:101
|
|
msgid "key"
|
|
msgstr "nyckel"
|
|
|
|
#: ref-filter.h:101
|
|
msgid "field name to sort on"
|
|
msgstr "fältnamn att sortera på"
|
|
|
|
#: rerere.h:44
|
|
msgid "update the index with reused conflict resolution if possible"
|
|
msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
|
|
|
|
#: wt-status.h:67
|
|
msgid "HEAD detached at "
|
|
msgstr "HEAD frånkopplad vid "
|
|
|
|
#: wt-status.h:68
|
|
msgid "HEAD detached from "
|
|
msgstr "HEAD frånkopplad från "
|
|
|
|
#: command-list.h:50
|
|
msgid "Add file contents to the index"
|
|
msgstr "Lägg filinnehåll till indexet"
|
|
|
|
#: command-list.h:51
|
|
msgid "Apply a series of patches from a mailbox"
|
|
msgstr "Tillämpa en serie patchar från en brevlåda"
|
|
|
|
#: command-list.h:52
|
|
msgid "Annotate file lines with commit information"
|
|
msgstr "Kommentera filrader med incheckningsinformation"
|
|
|
|
#: command-list.h:53
|
|
msgid "Apply a patch to files and/or to the index"
|
|
msgstr "Tillämpa en patch på filer och/eller indexet"
|
|
|
|
#: command-list.h:54
|
|
msgid "Import a GNU Arch repository into Git"
|
|
msgstr "Importera ett GNU Arch-arkiv till Git"
|
|
|
|
#: command-list.h:55
|
|
msgid "Create an archive of files from a named tree"
|
|
msgstr "Skapa ett arkiv över filer från ett namngivet träd"
|
|
|
|
#: command-list.h:56
|
|
msgid "Use binary search to find the commit that introduced a bug"
|
|
msgstr "Använd binärsökning för att hitta ändringen som introducerade ett fel"
|
|
|
|
#: command-list.h:57
|
|
msgid "Show what revision and author last modified each line of a file"
|
|
msgstr "Visa version och författare som sist modifierade varje rad i en fil"
|
|
|
|
#: command-list.h:58
|
|
msgid "List, create, or delete branches"
|
|
msgstr "Visa, skapa eller ta bort grenar"
|
|
|
|
#: command-list.h:59
|
|
msgid "Move objects and refs by archive"
|
|
msgstr "Flytta objekt och referenser efter arkiv"
|
|
|
|
#: command-list.h:60
|
|
msgid "Provide content or type and size information for repository objects"
|
|
msgstr ""
|
|
"Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
|
|
|
|
#: command-list.h:61
|
|
msgid "Display gitattributes information"
|
|
msgstr "Visa information från gitattributes"
|
|
|
|
#: command-list.h:62
|
|
msgid "Debug gitignore / exclude files"
|
|
msgstr "Felsök gitignore / exkluderings-filer"
|
|
|
|
#: command-list.h:63
|
|
msgid "Show canonical names and email addresses of contacts"
|
|
msgstr "Visa kanoniska namn och e-postadresser för kontakter"
|
|
|
|
#: command-list.h:64
|
|
msgid "Switch branches or restore working tree files"
|
|
msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
|
|
|
|
#: command-list.h:65
|
|
msgid "Copy files from the index to the working tree"
|
|
msgstr "Kopiera filer från indexet till arbetskatalogen"
|
|
|
|
#: command-list.h:66
|
|
msgid "Ensures that a reference name is well formed"
|
|
msgstr "Se till att referensen är välformad"
|
|
|
|
#: command-list.h:67
|
|
msgid "Find commits yet to be applied to upstream"
|
|
msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
|
|
|
|
#: command-list.h:68
|
|
msgid "Apply the changes introduced by some existing commits"
|
|
msgstr "Applicera ändringarna introducerade av befintliga incheckningar"
|
|
|
|
#: command-list.h:69
|
|
msgid "Graphical alternative to git-commit"
|
|
msgstr "Grafiskt alternativ till git-commit"
|
|
|
|
#: command-list.h:70
|
|
msgid "Remove untracked files from the working tree"
|
|
msgstr "Ta bort ospårade filer från arbetskatalogen"
|
|
|
|
#: command-list.h:71
|
|
msgid "Clone a repository into a new directory"
|
|
msgstr "Klona ett arkiv till en ny katalog"
|
|
|
|
#: command-list.h:72
|
|
msgid "Display data in columns"
|
|
msgstr "Visa data i kolumner"
|
|
|
|
#: command-list.h:73
|
|
msgid "Record changes to the repository"
|
|
msgstr "Protokollför ändringar i arkivet"
|
|
|
|
#: command-list.h:74
|
|
msgid "Write and verify Git commit-graph files"
|
|
msgstr "Skriv och verifiera Git-incheckningsgraffiler"
|
|
|
|
#: command-list.h:75
|
|
msgid "Create a new commit object"
|
|
msgstr "Skapa ett nytt incheckningsobjekt"
|
|
|
|
#: command-list.h:76
|
|
msgid "Get and set repository or global options"
|
|
msgstr "Läs och skriv alternativ för arkiv eller globalt"
|
|
|
|
#: command-list.h:77
|
|
msgid "Count unpacked number of objects and their disk consumption"
|
|
msgstr "Räkna antal opackade objekt och mängd diskutrymme"
|
|
|
|
#: command-list.h:78
|
|
msgid "Retrieve and store user credentials"
|
|
msgstr "Hämta och spara användarreferenser"
|
|
|
|
#: command-list.h:79
|
|
msgid "Helper to temporarily store passwords in memory"
|
|
msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"
|
|
|
|
#: command-list.h:80
|
|
msgid "Helper to store credentials on disk"
|
|
msgstr "Hjälpprogram för att lagra användarreferenser på disk"
|
|
|
|
#: command-list.h:81
|
|
msgid "Export a single commit to a CVS checkout"
|
|
msgstr "Exportera en enkel incheckning i en CVS-utcheckning"
|
|
|
|
#: command-list.h:82
|
|
msgid "Salvage your data out of another SCM people love to hate"
|
|
msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"
|
|
|
|
#: command-list.h:83
|
|
msgid "A CVS server emulator for Git"
|
|
msgstr "En CVS-serveremulator för Git"
|
|
|
|
#: command-list.h:84
|
|
msgid "A really simple server for Git repositories"
|
|
msgstr "En riktigt enkel server för Git-arkiv"
|
|
|
|
#: command-list.h:85
|
|
msgid "Give an object a human readable name based on an available ref"
|
|
msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"
|
|
|
|
#: command-list.h:86
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
|
msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
|
|
|
|
#: command-list.h:87
|
|
msgid "Compares files in the working tree and the index"
|
|
msgstr "Jämför filer i arbetskatalogen och indexet"
|
|
|
|
#: command-list.h:88
|
|
msgid "Compare a tree to the working tree or index"
|
|
msgstr "Jämför en träd med arbetskatalogen eller indexet"
|
|
|
|
#: command-list.h:89
|
|
msgid "Compares the content and mode of blobs found via two tree objects"
|
|
msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt"
|
|
|
|
#: command-list.h:90
|
|
msgid "Show changes using common diff tools"
|
|
msgstr "Visa ändringar med vanliga diff-verktyg"
|
|
|
|
#: command-list.h:91
|
|
msgid "Git data exporter"
|
|
msgstr "Exporterare för Git-data"
|
|
|
|
#: command-list.h:92
|
|
msgid "Backend for fast Git data importers"
|
|
msgstr "Bakända för snabba Git-dataimporterare"
|
|
|
|
#: command-list.h:93
|
|
msgid "Download objects and refs from another repository"
|
|
msgstr "Hämta objekt och referenser från annat arkiv"
|
|
|
|
#: command-list.h:94
|
|
msgid "Receive missing objects from another repository"
|
|
msgstr "Ta emot saknade objekt från annat arkiv"
|
|
|
|
#: command-list.h:95
|
|
msgid "Rewrite branches"
|
|
msgstr "Skriv om grenar"
|
|
|
|
#: command-list.h:96
|
|
msgid "Produce a merge commit message"
|
|
msgstr "Skapa incheckningsmeddelande för en sammanslagning"
|
|
|
|
#: command-list.h:97
|
|
msgid "Output information on each ref"
|
|
msgstr "Visa information för varje referens"
|
|
|
|
#: command-list.h:98
|
|
msgid "Prepare patches for e-mail submission"
|
|
msgstr "Förbered patchar för insändning via e-post"
|
|
|
|
#: command-list.h:99
|
|
msgid "Verifies the connectivity and validity of the objects in the database"
|
|
msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"
|
|
|
|
#: command-list.h:100
|
|
msgid "Cleanup unnecessary files and optimize the local repository"
|
|
msgstr "Städa onödiga filer och optimera det lokala arkivet"
|
|
|
|
#: command-list.h:101
|
|
msgid "Extract commit ID from an archive created using git-archive"
|
|
msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive"
|
|
|
|
#: command-list.h:102
|
|
msgid "Print lines matching a pattern"
|
|
msgstr "Visa rader som motsvarar mönster"
|
|
|
|
#: command-list.h:103
|
|
msgid "A portable graphical interface to Git"
|
|
msgstr "Ett portabelt grafiskt gränssnitt för Git"
|
|
|
|
#: command-list.h:104
|
|
msgid "Compute object ID and optionally creates a blob from a file"
|
|
msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil"
|
|
|
|
#: command-list.h:105
|
|
msgid "Display help information about Git"
|
|
msgstr "Visa hjälpinformation om Git"
|
|
|
|
#: command-list.h:106
|
|
msgid "Server side implementation of Git over HTTP"
|
|
msgstr "Serversideimplementation av Git över HTTP"
|
|
|
|
#: command-list.h:107
|
|
msgid "Download from a remote Git repository via HTTP"
|
|
msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"
|
|
|
|
#: command-list.h:108
|
|
msgid "Push objects over HTTP/DAV to another repository"
|
|
msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
|
|
|
|
#: command-list.h:109
|
|
msgid "Send a collection of patches from stdin to an IMAP folder"
|
|
msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"
|
|
|
|
#: command-list.h:110
|
|
msgid "Build pack index file for an existing packed archive"
|
|
msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
|
|
|
|
#: command-list.h:111
|
|
msgid "Create an empty Git repository or reinitialize an existing one"
|
|
msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
|
|
|
|
#: command-list.h:112
|
|
msgid "Instantly browse your working repository in gitweb"
|
|
msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
|
|
|
|
#: command-list.h:113
|
|
msgid "Add or parse structured information in commit messages"
|
|
msgstr ""
|
|
"Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
|
|
|
|
#: command-list.h:114
|
|
msgid "The Git repository browser"
|
|
msgstr "Bläddraren för Git-arkiv"
|
|
|
|
#: command-list.h:115
|
|
msgid "Show commit logs"
|
|
msgstr "Visa incheckningsloggar"
|
|
|
|
#: command-list.h:116
|
|
msgid "Show information about files in the index and the working tree"
|
|
msgstr "Visa information om filer i indexet och arbetskatalogen"
|
|
|
|
#: command-list.h:117
|
|
msgid "List references in a remote repository"
|
|
msgstr "Lista referenser i ett fjärrarkiv"
|
|
|
|
#: command-list.h:118
|
|
msgid "List the contents of a tree object"
|
|
msgstr "Visa innehållet i ett trädobjekt"
|
|
|
|
#: command-list.h:119
|
|
msgid "Extracts patch and authorship from a single e-mail message"
|
|
msgstr "Hämta patch och ägarskap från ett enkelt e-postmeddelande"
|
|
|
|
#: command-list.h:120
|
|
msgid "Simple UNIX mbox splitter program"
|
|
msgstr "Enkelt program för att dela en UNIX mbox"
|
|
|
|
#: command-list.h:121
|
|
msgid "Join two or more development histories together"
|
|
msgstr "Slå ihop två eller flera utvecklingshistorier"
|
|
|
|
#: command-list.h:122
|
|
msgid "Find as good common ancestors as possible for a merge"
|
|
msgstr "Hitta en så bra anfader som möjligt för sammanslagning"
|
|
|
|
#: command-list.h:123
|
|
msgid "Run a three-way file merge"
|
|
msgstr "Kör en trevägs-filsammanslagning"
|
|
|
|
#: command-list.h:124
|
|
msgid "Run a merge for files needing merging"
|
|
msgstr "Kör en sammanslagning för filer som behöver det"
|
|
|
|
#: command-list.h:125
|
|
msgid "The standard helper program to use with git-merge-index"
|
|
msgstr "Förvalt hjälpprogram att använda tillsammans med git-merge-index"
|
|
|
|
#: command-list.h:126
|
|
msgid "Run merge conflict resolution tools to resolve merge conflicts"
|
|
msgstr "Kör verktyg för lösning av sammanslagningskonflikter"
|
|
|
|
#: command-list.h:127
|
|
msgid "Show three-way merge without touching index"
|
|
msgstr "Visa trevägssammanslagning utan att röra indexet"
|
|
|
|
#: command-list.h:128
|
|
msgid "Write and verify multi-pack-indexes"
|
|
msgstr "Skriv och verifiera multi-pack-index"
|
|
|
|
#: command-list.h:129
|
|
msgid "Creates a tag object"
|
|
msgstr "Skapar ett taggobjekt"
|
|
|
|
#: command-list.h:130
|
|
msgid "Build a tree-object from ls-tree formatted text"
|
|
msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
|
|
|
|
#: command-list.h:131
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
|
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
|
|
|
|
#: command-list.h:132
|
|
msgid "Find symbolic names for given revs"
|
|
msgstr "Hitta symboliska namn för givna referenser"
|
|
|
|
#: command-list.h:133
|
|
msgid "Add or inspect object notes"
|
|
msgstr "Lägg till eller inspektera objektanteckningar"
|
|
|
|
#: command-list.h:134
|
|
msgid "Import from and submit to Perforce repositories"
|
|
msgstr "Importera från eller sänd till Perforce-arkiv"
|
|
|
|
#: command-list.h:135
|
|
msgid "Create a packed archive of objects"
|
|
msgstr "Skapa ett packat arkiv med objekt"
|
|
|
|
#: command-list.h:136
|
|
msgid "Find redundant pack files"
|
|
msgstr "Hitta redundanta pack-filer"
|
|
|
|
#: command-list.h:137
|
|
msgid "Pack heads and tags for efficient repository access"
|
|
msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
|
|
|
|
#: command-list.h:138
|
|
msgid "Routines to help parsing remote repository access parameters"
|
|
msgstr ""
|
|
"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv"
|
|
|
|
#: command-list.h:139
|
|
msgid "Compute unique ID for a patch"
|
|
msgstr "Beräkna unik ID för en patch"
|
|
|
|
#: command-list.h:140
|
|
msgid "Prune all unreachable objects from the object database"
|
|
msgstr "Ta bort alla onåbara objekt från objektdatabasen"
|
|
|
|
#: command-list.h:141
|
|
msgid "Remove extra objects that are already in pack files"
|
|
msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
|
|
|
|
#: command-list.h:142
|
|
msgid "Fetch from and integrate with another repository or a local branch"
|
|
msgstr "Hämta från och integrera med annat arkiv eller en lokal gren"
|
|
|
|
#: command-list.h:143
|
|
msgid "Update remote refs along with associated objects"
|
|
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
|
|
|
|
#: command-list.h:144
|
|
msgid "Applies a quilt patchset onto the current branch"
|
|
msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
|
|
|
|
#: command-list.h:145
|
|
msgid "Compare two commit ranges (e.g. two versions of a branch)"
|
|
msgstr "Jämför två incheckningsintervall (dvs. två versioner av en gren)"
|
|
|
|
#: command-list.h:146
|
|
msgid "Reads tree information into the index"
|
|
msgstr "Läser trädinformation in i indexet"
|
|
|
|
#: command-list.h:147
|
|
msgid "Reapply commits on top of another base tip"
|
|
msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
|
|
|
|
#: command-list.h:148
|
|
msgid "Receive what is pushed into the repository"
|
|
msgstr "Ta emot det som sänds till arkivet"
|
|
|
|
#: command-list.h:149
|
|
msgid "Manage reflog information"
|
|
msgstr "Hantera referenslogg-information"
|
|
|
|
#: command-list.h:150
|
|
msgid "Manage set of tracked repositories"
|
|
msgstr "Hantera uppsättningen spårade arkiv"
|
|
|
|
#: command-list.h:151
|
|
msgid "Pack unpacked objects in a repository"
|
|
msgstr "Packa opackade objekt i ett arkiv"
|
|
|
|
#: command-list.h:152
|
|
msgid "Create, list, delete refs to replace objects"
|
|
msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
|
|
|
|
#: command-list.h:153
|
|
msgid "Generates a summary of pending changes"
|
|
msgstr "Skapar en sammanfattning av väntande ändringar"
|
|
|
|
#: command-list.h:154
|
|
msgid "Reuse recorded resolution of conflicted merges"
|
|
msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
|
|
|
|
#: command-list.h:155
|
|
msgid "Reset current HEAD to the specified state"
|
|
msgstr "Återställ aktuell HEAD till angivet tillstånd"
|
|
|
|
#: command-list.h:156
|
|
msgid "Restore working tree files"
|
|
msgstr "Återställ filer i arbetskatalogen"
|
|
|
|
#: command-list.h:157
|
|
msgid "Revert some existing commits"
|
|
msgstr "Återställ några befintliga incheckningar"
|
|
|
|
#: command-list.h:158
|
|
msgid "Lists commit objects in reverse chronological order"
|
|
msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
|
|
|
|
#: command-list.h:159
|
|
msgid "Pick out and massage parameters"
|
|
msgstr "Plocka ut och massera parametrar"
|
|
|
|
#: command-list.h:160
|
|
msgid "Remove files from the working tree and from the index"
|
|
msgstr "Ta bort filer från arbetskatalogen och från indexet"
|
|
|
|
#: command-list.h:161
|
|
msgid "Send a collection of patches as emails"
|
|
msgstr "Sänd en uppsättning patchar som e-post"
|
|
|
|
#: command-list.h:162
|
|
msgid "Push objects over Git protocol to another repository"
|
|
msgstr "Sänd objekt över Git-protokollet till annat arkiv"
|
|
|
|
#: command-list.h:163
|
|
msgid "Restricted login shell for Git-only SSH access"
|
|
msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
|
|
|
|
#: command-list.h:164
|
|
msgid "Summarize 'git log' output"
|
|
msgstr "Summera \"git log\"-utdata"
|
|
|
|
#: command-list.h:165
|
|
msgid "Show various types of objects"
|
|
msgstr "Visa olika sorters objekt"
|
|
|
|
#: command-list.h:166
|
|
msgid "Show branches and their commits"
|
|
msgstr "Visa grenar och deras incheckningar"
|
|
|
|
#: command-list.h:167
|
|
msgid "Show packed archive index"
|
|
msgstr "Skapa packat arkivindex"
|
|
|
|
#: command-list.h:168
|
|
msgid "List references in a local repository"
|
|
msgstr "Visa referenser i ett lokalt arkiv"
|
|
|
|
#: command-list.h:169
|
|
msgid "Git's i18n setup code for shell scripts"
|
|
msgstr "Git:s i18n-startkod för skalskript"
|
|
|
|
#: command-list.h:170
|
|
msgid "Common Git shell script setup code"
|
|
msgstr "Gemensam skriptstartkod för Git"
|
|
|
|
#: command-list.h:171
|
|
msgid "Initialize and modify the sparse-checkout"
|
|
msgstr "Initiera och modifiera sparse-checkout"
|
|
|
|
#: command-list.h:172
|
|
msgid "Stash the changes in a dirty working directory away"
|
|
msgstr "Spara undan ändringar i en lortig arbetskatalog"
|
|
|
|
#: command-list.h:173
|
|
msgid "Add file contents to the staging area"
|
|
msgstr "Lägg filinnehållet till indexet"
|
|
|
|
#: command-list.h:174
|
|
msgid "Show the working tree status"
|
|
msgstr "Visa status för arbetskatalogen"
|
|
|
|
#: command-list.h:175
|
|
msgid "Remove unnecessary whitespace"
|
|
msgstr "Ta bort onödiga blanksteg"
|
|
|
|
#: command-list.h:176
|
|
msgid "Initialize, update or inspect submodules"
|
|
msgstr "Initiera, uppdatera eller inspektera undermoduler"
|
|
|
|
#: command-list.h:177
|
|
msgid "Bidirectional operation between a Subversion repository and Git"
|
|
msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
|
|
|
|
#: command-list.h:178
|
|
msgid "Switch branches"
|
|
msgstr "Byt gren"
|
|
|
|
#: command-list.h:179
|
|
msgid "Read, modify and delete symbolic refs"
|
|
msgstr "Läs, modifiera eller ta bort symbolisk referens"
|
|
|
|
#: command-list.h:180
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
|
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
|
|
|
|
#: command-list.h:181
|
|
msgid "Creates a temporary file with a blob's contents"
|
|
msgstr "Skapar temporära filer med innehållet från en blob"
|
|
|
|
#: command-list.h:182
|
|
msgid "Unpack objects from a packed archive"
|
|
msgstr "Packa upp objekt från ett pakat arkiv"
|
|
|
|
#: command-list.h:183
|
|
msgid "Register file contents in the working tree to the index"
|
|
msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
|
|
|
|
#: command-list.h:184
|
|
msgid "Update the object name stored in a ref safely"
|
|
msgstr "Uppdatera objektnamnet i en referens på ett säkert sätt"
|
|
|
|
#: command-list.h:185
|
|
msgid "Update auxiliary info file to help dumb servers"
|
|
msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
|
|
|
|
#: command-list.h:186
|
|
msgid "Send archive back to git-archive"
|
|
msgstr "Sänd arkivet tillbaka till git-archive"
|
|
|
|
#: command-list.h:187
|
|
msgid "Send objects packed back to git-fetch-pack"
|
|
msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
|
|
|
|
#: command-list.h:188
|
|
msgid "Show a Git logical variable"
|
|
msgstr "Visa en logisk Git-variabel"
|
|
|
|
#: command-list.h:189
|
|
msgid "Check the GPG signature of commits"
|
|
msgstr "Kontrollera GPG-signaturer för incheckningar"
|
|
|
|
#: command-list.h:190
|
|
msgid "Validate packed Git archive files"
|
|
msgstr "Bekräfta packade Git-arkivfiler"
|
|
|
|
#: command-list.h:191
|
|
msgid "Check the GPG signature of tags"
|
|
msgstr "Kontrollera GPG-signaturer i taggar"
|
|
|
|
#: command-list.h:192
|
|
msgid "Git web interface (web frontend to Git repositories)"
|
|
msgstr "Git-webbgränssnitt (webbframända för Git-arkiv)"
|
|
|
|
#: command-list.h:193
|
|
msgid "Show logs with difference each commit introduces"
|
|
msgstr "Visa loggar med differenser varje incheckning introducerar"
|
|
|
|
#: command-list.h:194
|
|
msgid "Manage multiple working trees"
|
|
msgstr "Hantera ytterligare arbetskataloger"
|
|
|
|
#: command-list.h:195
|
|
msgid "Create a tree object from the current index"
|
|
msgstr "Skapa ett trädobjekt från aktuellt index"
|
|
|
|
#: command-list.h:196
|
|
msgid "Defining attributes per path"
|
|
msgstr "Definierar attribut per sökväg"
|
|
|
|
#: command-list.h:197
|
|
msgid "Git command-line interface and conventions"
|
|
msgstr "Gits kommandoradsgränssnitt och -konventioner"
|
|
|
|
#: command-list.h:198
|
|
msgid "A Git core tutorial for developers"
|
|
msgstr "Grundläggande Git-handledning för utvecklare"
|
|
|
|
#: command-list.h:199
|
|
msgid "Git for CVS users"
|
|
msgstr "Git för CVS-användare"
|
|
|
|
#: command-list.h:200
|
|
msgid "Tweaking diff output"
|
|
msgstr "Justrea diff-utdata"
|
|
|
|
#: command-list.h:201
|
|
msgid "A useful minimum set of commands for Everyday Git"
|
|
msgstr "Ett användbart minsta uppsättning kommandon för vardags-Git"
|
|
|
|
#: command-list.h:202
|
|
msgid "A Git Glossary"
|
|
msgstr "En Git-ordlista"
|
|
|
|
#: command-list.h:203
|
|
msgid "Hooks used by Git"
|
|
msgstr "Krokar som används av Git"
|
|
|
|
#: command-list.h:204
|
|
msgid "Specifies intentionally untracked files to ignore"
|
|
msgstr "Ange avsiktligen ospårade filer att ignorera"
|
|
|
|
#: command-list.h:205
|
|
msgid "Defining submodule properties"
|
|
msgstr "Ange egenskaper för undermoduler"
|
|
|
|
#: command-list.h:206
|
|
msgid "Git namespaces"
|
|
msgstr "Git-namnrymder"
|
|
|
|
#: command-list.h:207
|
|
msgid "Git Repository Layout"
|
|
msgstr "Gits arkivlayout"
|
|
|
|
#: command-list.h:208
|
|
msgid "Specifying revisions and ranges for Git"
|
|
msgstr "Ange versioner och intervall i Git"
|
|
|
|
#: command-list.h:209
|
|
msgid "Mounting one repository inside another"
|
|
msgstr "Monterar ett arkiv inuti ett annat"
|
|
|
|
#: command-list.h:210
|
|
msgid "A tutorial introduction to Git: part two"
|
|
msgstr "Introduktion till Git: del två"
|
|
|
|
#: command-list.h:211
|
|
msgid "A tutorial introduction to Git"
|
|
msgstr "Introduktion till Git"
|
|
|
|
#: command-list.h:212
|
|
msgid "An overview of recommended workflows with Git"
|
|
msgstr "Översikt över rekommenderade arbetsflöden med Git"
|
|
|
|
#: git-bisect.sh:54
|
|
msgid "You need to start by \"git bisect start\""
|
|
msgstr "Du måste starta med \"git bisect start\""
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
#. translation. The program will only accept English input
|
|
#. at this point.
|
|
#: git-bisect.sh:60
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
|
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
|
|
|
|
#: git-bisect.sh:101
|
|
#, sh-format
|
|
msgid "Bad rev input: $arg"
|
|
msgstr "Felaktig rev-indata: $arg"
|
|
|
|
#: git-bisect.sh:121
|
|
#, sh-format
|
|
msgid "Bad rev input: $bisected_head"
|
|
msgstr "Felaktig rev-indata: $bisected_head"
|
|
|
|
#: git-bisect.sh:130
|
|
#, sh-format
|
|
msgid "Bad rev input: $rev"
|
|
msgstr "Felaktig rev-indata: $rev"
|
|
|
|
#: git-bisect.sh:139
|
|
#, sh-format
|
|
msgid "'git bisect $TERM_BAD' can take only one argument."
|
|
msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
|
|
|
|
#: git-bisect.sh:209
|
|
msgid "No logfile given"
|
|
msgstr "Ingen loggfil angiven"
|
|
|
|
#: git-bisect.sh:210
|
|
#, sh-format
|
|
msgid "cannot read $file for replaying"
|
|
msgstr "kan inte läsa $file för uppspelning"
|
|
|
|
#: git-bisect.sh:232
|
|
msgid "?? what are you talking about?"
|
|
msgstr "?? vad menar du?"
|
|
|
|
#: git-bisect.sh:241
|
|
msgid "bisect run failed: no command provided."
|
|
msgstr "bisect-körning misslyckades: inget kommando gavs."
|
|
|
|
#: git-bisect.sh:246
|
|
#, sh-format
|
|
msgid "running $command"
|
|
msgstr "kör $command"
|
|
|
|
#: git-bisect.sh:253
|
|
#, sh-format
|
|
msgid ""
|
|
"bisect run failed:\n"
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
msgstr ""
|
|
"\"bisect\"-körningen misslyckades:\n"
|
|
"felkod $res från \"$command\" är < 0 eller >= 128"
|
|
|
|
#: git-bisect.sh:279
|
|
msgid "bisect run cannot continue any more"
|
|
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
|
|
|
|
#: git-bisect.sh:285
|
|
#, sh-format
|
|
msgid ""
|
|
"bisect run failed:\n"
|
|
"'bisect_state $state' exited with error code $res"
|
|
msgstr ""
|
|
"\"bisect\"-körningen misslyckades:\n"
|
|
"\"bisect_state $state\" avslutades med felkoden $res"
|
|
|
|
#: git-bisect.sh:292
|
|
msgid "bisect run success"
|
|
msgstr "\"bisect\"-körningen lyckades"
|
|
|
|
#: git-bisect.sh:300
|
|
msgid "We are not bisecting."
|
|
msgstr "Vi utför ingen bisect för tillfället."
|
|
|
|
#: git-merge-octopus.sh:46
|
|
msgid ""
|
|
"Error: Your local changes to the following files would be overwritten by "
|
|
"merge"
|
|
msgstr ""
|
|
"Fel: Dina lokala ändringar av följande filer skulle skrivas över av "
|
|
"sammanslagning"
|
|
|
|
#: git-merge-octopus.sh:61
|
|
msgid "Automated merge did not work."
|
|
msgstr "Automatisk sammanslagning misslyckades."
|
|
|
|
#: git-merge-octopus.sh:62
|
|
msgid "Should not be doing an octopus."
|
|
msgstr "Borde inte använda octopus."
|
|
|
|
#: git-merge-octopus.sh:73
|
|
#, sh-format
|
|
msgid "Unable to find common commit with $pretty_name"
|
|
msgstr "Kunde inte hitta gemensam incheckning med $pretty_name"
|
|
|
|
#: git-merge-octopus.sh:77
|
|
#, sh-format
|
|
msgid "Already up to date with $pretty_name"
|
|
msgstr "Redan à jour med $pretty_name"
|
|
|
|
#: git-merge-octopus.sh:89
|
|
#, sh-format
|
|
msgid "Fast-forwarding to: $pretty_name"
|
|
msgstr "Snabbspolar till: $pretty_name"
|
|
|
|
#: git-merge-octopus.sh:97
|
|
#, sh-format
|
|
msgid "Trying simple merge with $pretty_name"
|
|
msgstr "Försök enkel sammanslagning med $pretty_name"
|
|
|
|
#: git-merge-octopus.sh:102
|
|
msgid "Simple merge did not work, trying automatic merge."
|
|
msgstr "Enkel sammanslagning misslyckades, försöker automatisk sammanslagning."
|
|
|
|
#: git-legacy-stash.sh:221
|
|
msgid "Cannot remove temporary index (can't happen)"
|
|
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
|
|
|
|
#: git-legacy-stash.sh:272
|
|
#, sh-format
|
|
msgid "Cannot update $ref_stash with $w_commit"
|
|
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
|
|
|
|
#: git-legacy-stash.sh:324
|
|
#, sh-format
|
|
msgid "error: unknown option for 'stash push': $option"
|
|
msgstr "fel: okänd flagga för \"stash push\": $option"
|
|
|
|
#: git-legacy-stash.sh:356
|
|
#, sh-format
|
|
msgid "Saved working directory and index state $stash_msg"
|
|
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
|
|
|
|
#: git-legacy-stash.sh:536
|
|
#, sh-format
|
|
msgid "unknown option: $opt"
|
|
msgstr "okänd flagga: $opt"
|
|
|
|
#: git-legacy-stash.sh:556
|
|
#, sh-format
|
|
msgid "Too many revisions specified: $REV"
|
|
msgstr "För många revisioner angivna: $REV"
|
|
|
|
#: git-legacy-stash.sh:571
|
|
#, sh-format
|
|
msgid "$reference is not a valid reference"
|
|
msgstr "$reference är inte en giltig referens"
|
|
|
|
#: git-legacy-stash.sh:599
|
|
#, sh-format
|
|
msgid "'$args' is not a stash-like commit"
|
|
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
|
|
|
|
#: git-legacy-stash.sh:610
|
|
#, sh-format
|
|
msgid "'$args' is not a stash reference"
|
|
msgstr "\"$args\" är inte en \"stash\"-referens"
|
|
|
|
#: git-legacy-stash.sh:618
|
|
msgid "unable to refresh index"
|
|
msgstr "kan inte uppdatera indexet"
|
|
|
|
#: git-legacy-stash.sh:622
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
|
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
|
|
|
|
#: git-legacy-stash.sh:630
|
|
msgid "Conflicts in index. Try without --index."
|
|
msgstr "Konflikter i indexet. Testa utan --index."
|
|
|
|
#: git-legacy-stash.sh:632
|
|
msgid "Could not save index tree"
|
|
msgstr "Kunde inte spara indexträd"
|
|
|
|
#: git-legacy-stash.sh:641
|
|
msgid "Could not restore untracked files from stash entry"
|
|
msgstr "Kunde inte återställa ospårade filer från stash-post"
|
|
|
|
#: git-legacy-stash.sh:666
|
|
msgid "Cannot unstage modified files"
|
|
msgstr "Kan inte ta bort ändrade filer ur kön"
|
|
|
|
#: git-legacy-stash.sh:704
|
|
#, sh-format
|
|
msgid "Dropped ${REV} ($s)"
|
|
msgstr "Kastade ${REV} ($s)"
|
|
|
|
#: git-legacy-stash.sh:705
|
|
#, sh-format
|
|
msgid "${REV}: Could not drop stash entry"
|
|
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
|
|
|
|
#: git-legacy-stash.sh:792
|
|
msgid "(To restore them type \"git stash apply\")"
|
|
msgstr "(För att återställa dem, skriv \"git stash apply\")"
|
|
|
|
#: git-submodule.sh:203
|
|
msgid "Relative path can only be used from the toplevel of the working tree"
|
|
msgstr "Relativ sökväg kan endast användas från arbetskatalogens toppnivå"
|
|
|
|
#: git-submodule.sh:213
|
|
#, sh-format
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
|
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
|
|
|
|
#: git-submodule.sh:232
|
|
#, sh-format
|
|
msgid "'$sm_path' already exists in the index"
|
|
msgstr "\"$sm_path\" finns redan i indexet"
|
|
|
|
#: git-submodule.sh:235
|
|
#, sh-format
|
|
msgid "'$sm_path' already exists in the index and is not a submodule"
|
|
msgstr "\"$sm_path\" finns redan i indexet och är inte en undermodul"
|
|
|
|
#: git-submodule.sh:242
|
|
#, sh-format
|
|
msgid "'$sm_path' does not have a commit checked out"
|
|
msgstr "\"$sm_path\" har inte någon utcheckad incheckning"
|
|
|
|
#: git-submodule.sh:273
|
|
#, sh-format
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
|
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
|
|
|
|
#: git-submodule.sh:275
|
|
#, sh-format
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
|
|
|
|
#: git-submodule.sh:283
|
|
#, sh-format
|
|
msgid "A git directory for '$sm_name' is found locally with remote(s):"
|
|
msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):"
|
|
|
|
#: git-submodule.sh:285
|
|
#, sh-format
|
|
msgid ""
|
|
"If you want to reuse this local git directory instead of cloning again from\n"
|
|
" $realrepo\n"
|
|
"use the '--force' option. If the local git directory is not the correct "
|
|
"repo\n"
|
|
"or you are unsure what this means choose another name with the '--name' "
|
|
"option."
|
|
msgstr ""
|
|
"Om du vill återanvända den lokala git-katalogen instället för att klona på "
|
|
"nytt från\n"
|
|
" $realrepo\n"
|
|
"kan du använda flaggan \"--force\". Om den lokala git-katalogen inte är "
|
|
"korrekt\n"
|
|
"arkiv eller om du är osäker på vad det här betyder, välj ett annat namn med\n"
|
|
"flaggan \"--name\"."
|
|
|
|
#: git-submodule.sh:291
|
|
#, sh-format
|
|
msgid "Reactivating local git directory for submodule '$sm_name'."
|
|
msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt."
|
|
|
|
#: git-submodule.sh:303
|
|
#, sh-format
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
|
|
|
|
#: git-submodule.sh:308
|
|
#, sh-format
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
|
|
|
|
#: git-submodule.sh:317
|
|
#, sh-format
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
|
|
|
|
#: git-submodule.sh:590
|
|
#, sh-format
|
|
msgid "Unable to find current revision in submodule path '$displaypath'"
|
|
msgstr "Kan inte hitta aktuell revision i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:600
|
|
#, sh-format
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
|
|
|
|
#: git-submodule.sh:605
|
|
#, sh-format
|
|
msgid ""
|
|
"Unable to find current ${remote_name}/${branch} revision in submodule path "
|
|
"'$sm_path'"
|
|
msgstr ""
|
|
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
|
|
"undermodulsökvägen \"$sm_path\""
|
|
|
|
#: git-submodule.sh:623
|
|
#, sh-format
|
|
msgid ""
|
|
"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
|
|
"$sha1:"
|
|
msgstr ""
|
|
"Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
|
|
"direkt:"
|
|
|
|
#: git-submodule.sh:629
|
|
#, sh-format
|
|
msgid ""
|
|
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
|
|
"Direct fetching of that commit failed."
|
|
msgstr ""
|
|
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
|
|
"Direkt hämtning av incheckningen misslyckades."
|
|
|
|
#: git-submodule.sh:636
|
|
#, sh-format
|
|
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
|
|
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:637
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': checked out '$sha1'"
|
|
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
|
|
|
|
#: git-submodule.sh:641
|
|
#, sh-format
|
|
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
|
|
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:642
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': rebased into '$sha1'"
|
|
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
|
|
|
|
#: git-submodule.sh:647
|
|
#, sh-format
|
|
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
|
|
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:648
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': merged in '$sha1'"
|
|
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
|
|
|
|
#: git-submodule.sh:653
|
|
#, sh-format
|
|
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
|
|
msgstr ""
|
|
"Misslyckades köra \"$command $sha1\" i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:654
|
|
#, sh-format
|
|
msgid "Submodule path '$displaypath': '$command $sha1'"
|
|
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
|
|
|
|
#: git-submodule.sh:685
|
|
#, sh-format
|
|
msgid "Failed to recurse into submodule path '$displaypath'"
|
|
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
|
|
|
|
#: git-submodule.sh:896
|
|
msgid "The --cached option cannot be used with the --files option"
|
|
msgstr "Flaggan --cached kan inte användas med flaggan --files"
|
|
|
|
#: git-submodule.sh:948
|
|
#, sh-format
|
|
msgid "unexpected mode $mod_dst"
|
|
msgstr "oväntat läge $mod_dst"
|
|
|
|
#: git-submodule.sh:968
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_src"
|
|
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
|
|
|
|
#: git-submodule.sh:971
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
|
|
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
|
|
|
|
#: git-submodule.sh:974
|
|
#, sh-format
|
|
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
|
|
msgstr ""
|
|
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
|
|
"$sha1_dst"
|
|
|
|
#: git-parse-remote.sh:89
|
|
#, sh-format
|
|
msgid "See git-${cmd}(1) for details."
|
|
msgstr "Se git-${cmd}(1) för detaljer."
|
|
|
|
#: git-rebase--preserve-merges.sh:109
|
|
msgid "Applied autostash."
|
|
msgstr "Tillämpade autostash."
|
|
|
|
#: git-rebase--preserve-merges.sh:112
|
|
#, sh-format
|
|
msgid "Cannot store $stash_sha1"
|
|
msgstr "Kan inte spara $stash_sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:191
|
|
#, sh-format
|
|
msgid "Rebasing ($new_count/$total)"
|
|
msgstr "Ombaserar ($new_count/$total)"
|
|
|
|
#: git-rebase--preserve-merges.sh:207
|
|
msgid ""
|
|
"\n"
|
|
"Commands:\n"
|
|
"p, pick <commit> = use commit\n"
|
|
"r, reword <commit> = use commit, but edit the commit message\n"
|
|
"e, edit <commit> = use commit, but stop for amending\n"
|
|
"s, squash <commit> = use commit, but meld into previous commit\n"
|
|
"f, fixup <commit> = like \"squash\", but discard this commit's log message\n"
|
|
"x, exec <commit> = run command (the rest of the line) using shell\n"
|
|
"d, drop <commit> = remove commit\n"
|
|
"l, label <label> = label current HEAD with a name\n"
|
|
"t, reset <label> = reset HEAD to a label\n"
|
|
"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
|
|
". create a merge commit using the original merge commit's\n"
|
|
". message (or the oneline, if no original merge commit was\n"
|
|
". specified). Use -c <commit> to reword the commit message.\n"
|
|
"\n"
|
|
"These lines can be re-ordered; they are executed from top to bottom.\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Kommandon:\n"
|
|
"p, pick <incheckning> = använd incheckning\n"
|
|
"r, reword <incheckning> = använd incheckning, men redigera "
|
|
"incheckningsmeddelandet\n"
|
|
"e, edit <incheckning> = använd incheckning, men stanna för tillägg\n"
|
|
"s, squash <incheckning> = använd incheckning, men infoga i föregående "
|
|
"incheckning\n"
|
|
"f, fixup <incheckning> = som \"squash\", men förkasta "
|
|
"incheckningsmeddelandet\n"
|
|
"x, exec <incheckning> = kör kommando (resten av raden) i skalet\n"
|
|
"d, drop <incheckning> = ta bort incheckning\n"
|
|
"l, label <etikett> = ge aktuellt HEAD ett namn\n"
|
|
"t, reset <etikett> = återställ HEAD till en etikett\n"
|
|
"m, merge [-C <incheckning> | -c <incheckning>] <etikett> [# <enrads>]\n"
|
|
". skapa en sammanslagning med ursprungligt meddelande (eller\n"
|
|
". enrads, om inget incheckningsmeddelande angavs). Använd\n"
|
|
". -v <incheckning> för att skriva om meddelandet.\n"
|
|
"\n"
|
|
"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
|
|
|
|
#: git-rebase--preserve-merges.sh:270
|
|
#, sh-format
|
|
msgid ""
|
|
"You can amend the commit now, with\n"
|
|
"\n"
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"Once you are satisfied with your changes, run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
"Du kan utöka incheckningen nu, med\n"
|
|
"\n"
|
|
"\tgit commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"När du är nöjd med dina ändringar kör du\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
|
|
#: git-rebase--preserve-merges.sh:295
|
|
#, sh-format
|
|
msgid "$sha1: not a commit that can be picked"
|
|
msgstr "$sha1: inte en incheckning som kan väljas"
|
|
|
|
#: git-rebase--preserve-merges.sh:334
|
|
#, sh-format
|
|
msgid "Invalid commit name: $sha1"
|
|
msgstr "Felaktigt incheckningsnamn: $sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:364
|
|
msgid "Cannot write current commit's replacement sha1"
|
|
msgstr "Kan inte skriva ersättnings-sha1 för aktuell incheckning"
|
|
|
|
#: git-rebase--preserve-merges.sh:415
|
|
#, sh-format
|
|
msgid "Fast-forward to $sha1"
|
|
msgstr "Snabbspolade till $sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:417
|
|
#, sh-format
|
|
msgid "Cannot fast-forward to $sha1"
|
|
msgstr "Kan inte snabbspola till $sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:426
|
|
#, sh-format
|
|
msgid "Cannot move HEAD to $first_parent"
|
|
msgstr "Kan inte flytta HEAD till $first_parent"
|
|
|
|
#: git-rebase--preserve-merges.sh:431
|
|
#, sh-format
|
|
msgid "Refusing to squash a merge: $sha1"
|
|
msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:449
|
|
#, sh-format
|
|
msgid "Error redoing merge $sha1"
|
|
msgstr "Fel när sammanslagningen $sha1 skulle göras om"
|
|
|
|
#: git-rebase--preserve-merges.sh:458
|
|
#, sh-format
|
|
msgid "Could not pick $sha1"
|
|
msgstr "Kunde inte välja $sha1"
|
|
|
|
#: git-rebase--preserve-merges.sh:467
|
|
#, sh-format
|
|
msgid "This is the commit message #${n}:"
|
|
msgstr "Det här är incheckningsmeddelande ${n}:"
|
|
|
|
#: git-rebase--preserve-merges.sh:472
|
|
#, sh-format
|
|
msgid "The commit message #${n} will be skipped:"
|
|
msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
|
|
|
|
#: git-rebase--preserve-merges.sh:483
|
|
#, sh-format
|
|
msgid "This is a combination of $count commit."
|
|
msgid_plural "This is a combination of $count commits."
|
|
msgstr[0] "Det här är en kombination av $count incheckning."
|
|
msgstr[1] "Det här är en kombination av $count incheckningar."
|
|
|
|
#: git-rebase--preserve-merges.sh:492
|
|
#, sh-format
|
|
msgid "Cannot write $fixup_msg"
|
|
msgstr "Kan inte skriva $fixup_msg"
|
|
|
|
#: git-rebase--preserve-merges.sh:495
|
|
msgid "This is a combination of 2 commits."
|
|
msgstr "Det här är en kombination av 2 incheckningar."
|
|
|
|
#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
|
|
#: git-rebase--preserve-merges.sh:582
|
|
#, sh-format
|
|
msgid "Could not apply $sha1... $rest"
|
|
msgstr "Kunde inte tillämpa $sha1... $rest"
|
|
|
|
#: git-rebase--preserve-merges.sh:611
|
|
#, sh-format
|
|
msgid ""
|
|
"Could not amend commit after successfully picking $sha1... $rest\n"
|
|
"This is most likely due to an empty commit message, or the pre-commit hook\n"
|
|
"failed. If the pre-commit hook failed, you may need to resolve the issue "
|
|
"before\n"
|
|
"you are able to reword the commit."
|
|
msgstr ""
|
|
"Kunde inte utöka incheckning efter att ha lyckats välja $sha1... $rest\n"
|
|
"Det är antagligen på grund av ett tomt incheckningsmeddelande, eller att\n"
|
|
"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
|
|
"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
|
|
|
|
#: git-rebase--preserve-merges.sh:626
|
|
#, sh-format
|
|
msgid "Stopped at $sha1_abbrev... $rest"
|
|
msgstr "Stoppade på $sha1_abbrev... $rest"
|
|
|
|
#: git-rebase--preserve-merges.sh:641
|
|
#, sh-format
|
|
msgid "Cannot '$squash_style' without a previous commit"
|
|
msgstr "Kan inte utföra \"$squash_style\" utan en föregående incheckning"
|
|
|
|
#: git-rebase--preserve-merges.sh:683
|
|
#, sh-format
|
|
msgid "Executing: $rest"
|
|
msgstr "Kör: $rest"
|
|
|
|
#: git-rebase--preserve-merges.sh:691
|
|
#, sh-format
|
|
msgid "Execution failed: $rest"
|
|
msgstr "Körning misslyckades: $rest"
|
|
|
|
#: git-rebase--preserve-merges.sh:693
|
|
msgid "and made changes to the index and/or the working tree"
|
|
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
|
|
|
|
#: git-rebase--preserve-merges.sh:695
|
|
msgid ""
|
|
"You can fix the problem, and then run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
"Du kan rätta problemet och sedan köra\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
|
|
#. TRANSLATORS: after these lines is a command to be issued by the user
|
|
#: git-rebase--preserve-merges.sh:708
|
|
#, sh-format
|
|
msgid ""
|
|
"Execution succeeded: $rest\n"
|
|
"but left changes to the index and/or the working tree\n"
|
|
"Commit or stash your changes, and then run\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
msgstr ""
|
|
"Körningen lyckades: $rest\n"
|
|
"men lämnade kvar ändringar i indexet och/eller arbetskatalogen\n"
|
|
"Checka in eller utför \"stash\" på ändringarna och kör sedan\n"
|
|
"\n"
|
|
"\tgit rebase --continue"
|
|
|
|
#: git-rebase--preserve-merges.sh:719
|
|
#, sh-format
|
|
msgid "Unknown command: $command $sha1 $rest"
|
|
msgstr "Okänt kommando: $command $sha1 $rest"
|
|
|
|
#: git-rebase--preserve-merges.sh:720
|
|
msgid "Please fix this using 'git rebase --edit-todo'."
|
|
msgstr "Rätta det med \"git rebase --edit-todo\"."
|
|
|
|
#: git-rebase--preserve-merges.sh:755
|
|
#, sh-format
|
|
msgid "Successfully rebased and updated $head_name."
|
|
msgstr "Lyckades ombasera och uppdatera $head_name."
|
|
|
|
#: git-rebase--preserve-merges.sh:812
|
|
msgid "Could not remove CHERRY_PICK_HEAD"
|
|
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
|
|
|
|
#: git-rebase--preserve-merges.sh:817
|
|
#, sh-format
|
|
msgid ""
|
|
"You have staged changes in your working tree.\n"
|
|
"If these changes are meant to be\n"
|
|
"squashed into the previous commit, run:\n"
|
|
"\n"
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"If they are meant to go into a new commit, run:\n"
|
|
"\n"
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"In both cases, once you're done, continue with:\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
msgstr ""
|
|
"Du har köade ändringar i din arbetskatalog.\n"
|
|
"Om det är meningen att ändringarna\n"
|
|
"ska läggas in i föregående incheckning, kör:\n"
|
|
"\n"
|
|
" git commit --amend $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"Om de ska checkas in i en egen incheckning, kör:\n"
|
|
"\n"
|
|
" git commit $gpg_sign_opt_quoted\n"
|
|
"\n"
|
|
"Oavsett vilket, när du är färdig fortsätter du med:\n"
|
|
"\n"
|
|
" git rebase --continue\n"
|
|
|
|
#: git-rebase--preserve-merges.sh:834
|
|
msgid "Error trying to find the author identity to amend commit"
|
|
msgstr "Fel vid försök att hitta författaridentitet för att utöka incheckning"
|
|
|
|
#: git-rebase--preserve-merges.sh:839
|
|
msgid ""
|
|
"You have uncommitted changes in your working tree. Please commit them\n"
|
|
"first and then run 'git rebase --continue' again."
|
|
msgstr ""
|
|
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
|
|
"först och kör sedan \"git rebase --continue\" igen."
|
|
|
|
#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
|
|
msgid "Could not commit staged changes."
|
|
msgstr "Kunde inte checka in köade ändringar."
|
|
|
|
#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
|
|
msgid "Could not execute editor"
|
|
msgstr "Kunde inte starta textredigerare"
|
|
|
|
#: git-rebase--preserve-merges.sh:900
|
|
#, sh-format
|
|
msgid "Could not checkout $switch_to"
|
|
msgstr "Kunde inte checka ut $switch_to"
|
|
|
|
#: git-rebase--preserve-merges.sh:907
|
|
msgid "No HEAD?"
|
|
msgstr "Inget HEAD?"
|
|
|
|
#: git-rebase--preserve-merges.sh:908
|
|
#, sh-format
|
|
msgid "Could not create temporary $state_dir"
|
|
msgstr "Kunde inte skapa temporär $state_dir"
|
|
|
|
#: git-rebase--preserve-merges.sh:911
|
|
msgid "Could not mark as interactive"
|
|
msgstr "Kunde inte markera som interaktiv"
|
|
|
|
#: git-rebase--preserve-merges.sh:943
|
|
#, sh-format
|
|
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
|
|
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
|
|
msgstr[0] "Ombasera $shortrevisions på $shortonto ($todocount incheckning)"
|
|
msgstr[1] "Ombasera $shortrevisions på $shortonto ($todocount incheckningar)"
|
|
|
|
#: git-rebase--preserve-merges.sh:955
|
|
msgid "Note that empty commits are commented out"
|
|
msgstr "Observera att tomma incheckningar är utkommenterade"
|
|
|
|
#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
|
|
msgid "Could not init rewritten commits"
|
|
msgstr "Kunde inte initiera omskrivna incheckningar"
|
|
|
|
#: git-sh-setup.sh:89 git-sh-setup.sh:94
|
|
#, sh-format
|
|
msgid "usage: $dashless $USAGE"
|
|
msgstr "använd: $dashless $USAGE"
|
|
|
|
#: git-sh-setup.sh:191
|
|
#, sh-format
|
|
msgid "Cannot chdir to $cdup, the toplevel of the working tree"
|
|
msgstr "Kunde inte byta katalog till $cdup, toppnivån på arbetskatalogen"
|
|
|
|
#: git-sh-setup.sh:200 git-sh-setup.sh:207
|
|
#, sh-format
|
|
msgid "fatal: $program_name cannot be used without a working tree."
|
|
msgstr "ödesdigetrt: $program_name kan inte användas utan arbetskatalog."
|
|
|
|
#: git-sh-setup.sh:221
|
|
msgid "Cannot rebase: You have unstaged changes."
|
|
msgstr "Kan inte ombasera: Du har oköade ändringar."
|
|
|
|
#: git-sh-setup.sh:224
|
|
msgid "Cannot rewrite branches: You have unstaged changes."
|
|
msgstr "Kan inte skriva om grenar: Du har oköade ändringar."
|
|
|
|
#: git-sh-setup.sh:227
|
|
msgid "Cannot pull with rebase: You have unstaged changes."
|
|
msgstr "Kan inte hämta med ombasering: Du har oköade ändringar."
|
|
|
|
#: git-sh-setup.sh:230
|
|
#, sh-format
|
|
msgid "Cannot $action: You have unstaged changes."
|
|
msgstr "Kan inte $action: Du har oköade ändringar."
|
|
|
|
#: git-sh-setup.sh:243
|
|
msgid "Cannot rebase: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
"Kan inte ombasera: Ditt index innehåller ändringar som inte checkats in."
|
|
|
|
#: git-sh-setup.sh:246
|
|
msgid "Cannot pull with rebase: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
"Kan inte hämta med ombasering: Ditt index innehåller oincheckade ändringar."
|
|
|
|
#: git-sh-setup.sh:249
|
|
#, sh-format
|
|
msgid "Cannot $action: Your index contains uncommitted changes."
|
|
msgstr ""
|
|
"Kan inte $action: Ditt index innehåller ändringar som inte checkats in."
|
|
|
|
#: git-sh-setup.sh:253
|
|
msgid "Additionally, your index contains uncommitted changes."
|
|
msgstr "Dessutom innehåller dit index ändringar som inte har checkats in."
|
|
|
|
#: git-sh-setup.sh:373
|
|
msgid "You need to run this command from the toplevel of the working tree."
|
|
msgstr "Du måste köra kommandot från arbetskatalogens toppnivå."
|
|
|
|
#: git-sh-setup.sh:378
|
|
msgid "Unable to determine absolute path of git directory"
|
|
msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
|
|
|
|
#. TRANSLATORS: you can adjust this to align "git add -i" status menu
|
|
#: git-add--interactive.perl:212
|
|
#, perl-format
|
|
msgid "%12s %12s %s"
|
|
msgstr "%12s %12s %s"
|
|
|
|
#: git-add--interactive.perl:634
|
|
#, perl-format
|
|
msgid "touched %d path\n"
|
|
msgid_plural "touched %d paths\n"
|
|
msgstr[0] "rörde %d sökväg\n"
|
|
msgstr[1] "rörde %d sökvägar\n"
|
|
|
|
#: git-add--interactive.perl:1053
|
|
msgid ""
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
"marked for staging."
|
|
msgstr ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
"köas omedelbart."
|
|
|
|
#: git-add--interactive.perl:1056
|
|
msgid ""
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
"marked for stashing."
|
|
msgstr ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
"läggas till i \"stash\" omedelbart."
|
|
|
|
#: git-add--interactive.perl:1059
|
|
msgid ""
|
|
"If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
"marked for unstaging."
|
|
msgstr ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
"tas bort från kön omedelbart."
|
|
|
|
#: 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."
|
|
msgstr ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
"markeras för applicering omedelbart."
|
|
|
|
#: 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."
|
|
msgstr ""
|
|
"Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
"markeras för kasta omedelbart."
|
|
|
|
#: git-add--interactive.perl:1111
|
|
#, perl-format
|
|
msgid "failed to open hunk edit file for writing: %s"
|
|
msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
|
|
|
|
#: git-add--interactive.perl:1118
|
|
#, perl-format
|
|
msgid ""
|
|
"---\n"
|
|
"To remove '%s' lines, make them ' ' lines (context).\n"
|
|
"To remove '%s' lines, delete them.\n"
|
|
"Lines starting with %s will be removed.\n"
|
|
msgstr ""
|
|
"---\n"
|
|
"Ta bort \"%s\" rader genom att göra dem \" \"-rader (sammanhang).\n"
|
|
"Ta bort \"%s\" rader genom att radera dem.\n"
|
|
"Rader som börjar med %s kommer att tas bort.\n"
|
|
|
|
#: git-add--interactive.perl:1140
|
|
#, perl-format
|
|
msgid "failed to open hunk edit file for reading: %s"
|
|
msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
|
|
|
|
#: git-add--interactive.perl:1248
|
|
msgid ""
|
|
"y - stage this hunk\n"
|
|
"n - do not stage this hunk\n"
|
|
"q - quit; do not stage this hunk or any of the remaining ones\n"
|
|
"a - stage this hunk and all later hunks in the file\n"
|
|
"d - do not stage this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - köa stycket\n"
|
|
"n - köa inte stycket\n"
|
|
"q - avsluta; köa inte stycket eller något av de följande\n"
|
|
"a - köa stycket och alla följande i filen\n"
|
|
"d - köa inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1254
|
|
msgid ""
|
|
"y - stash this hunk\n"
|
|
"n - do not stash this hunk\n"
|
|
"q - quit; do not stash this hunk or any of the remaining ones\n"
|
|
"a - stash this hunk and all later hunks in the file\n"
|
|
"d - do not stash this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - \"stash\":a stycket\n"
|
|
"n - \"stash\":a inte stycket\n"
|
|
"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
|
|
"a - \"stash\":a stycket och alla följande i filen\n"
|
|
"d - \"stash\":a inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1260
|
|
msgid ""
|
|
"y - unstage this hunk\n"
|
|
"n - do not unstage this hunk\n"
|
|
"q - quit; do not unstage this hunk or any of the remaining ones\n"
|
|
"a - unstage this hunk and all later hunks in the file\n"
|
|
"d - do not unstage this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - ta bort stycket från kön\n"
|
|
"n - ta inte bort stycket från kön\n"
|
|
"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
|
|
"a - ta bort stycket och alla följande i filen från kön\n"
|
|
"d - ta inte bort stycket eller något av de följande i filen från kön"
|
|
|
|
#: git-add--interactive.perl:1266
|
|
msgid ""
|
|
"y - apply this hunk to index\n"
|
|
"n - do not apply this hunk to index\n"
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - applicera stycket på indexet\n"
|
|
"n - applicera inte stycket på indexet\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
|
|
msgid ""
|
|
"y - discard this hunk from worktree\n"
|
|
"n - do not discard this hunk from worktree\n"
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - förkasta stycket från arbetskatalogen\n"
|
|
"n - förkasta inte stycket från arbetskatalogen\n"
|
|
"q - avsluta; förkasta inte stycket eller något av de följande\n"
|
|
"a - förkasta stycket och alla följande i filen\n"
|
|
"d - förkasta inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1278
|
|
msgid ""
|
|
"y - discard this hunk from index and worktree\n"
|
|
"n - do not discard this hunk from index and worktree\n"
|
|
"q - quit; do not discard this hunk or any of the remaining ones\n"
|
|
"a - discard this hunk and all later hunks in the file\n"
|
|
"d - do not discard this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - förkasta stycket från indexet och arbetskatalogen\n"
|
|
"n - förkasta inte stycket från indexet och arbetskatalogen\n"
|
|
"q - avsluta; förkasta inte stycket eller något av de följande\n"
|
|
"a - förkasta stycket och alla följande i filen\n"
|
|
"d - förkasta inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1284
|
|
msgid ""
|
|
"y - apply this hunk to index and worktree\n"
|
|
"n - do not apply this hunk to index and worktree\n"
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - applicera stycket på indexet och arbetskatalogen\n"
|
|
"n - applicera inte stycket på indexet och arbetskatalogen\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1296
|
|
msgid ""
|
|
"y - apply this hunk to worktree\n"
|
|
"n - do not apply this hunk to worktree\n"
|
|
"q - quit; do not apply this hunk or any of the remaining ones\n"
|
|
"a - apply this hunk and all later hunks in the file\n"
|
|
"d - do not apply this hunk or any of the later hunks in the file"
|
|
msgstr ""
|
|
"y - applicera stycket på arbetskatalogen\n"
|
|
"n - applicera inte stycket på arbetskatalogen\n"
|
|
"q - avsluta; applicera inte stycket eller något av de följande\n"
|
|
"a - applicera stycket och alla följande i filen\n"
|
|
"d - applicera inte stycket eller något av de följande i filen"
|
|
|
|
#: git-add--interactive.perl:1311
|
|
msgid ""
|
|
"g - select a hunk to go to\n"
|
|
"/ - search for a hunk matching the given regex\n"
|
|
"j - leave this hunk undecided, see next undecided hunk\n"
|
|
"J - leave this hunk undecided, see next hunk\n"
|
|
"k - leave this hunk undecided, see previous undecided hunk\n"
|
|
"K - leave this hunk undecided, see previous hunk\n"
|
|
"s - split the current hunk into smaller hunks\n"
|
|
"e - manually edit the current hunk\n"
|
|
"? - print help\n"
|
|
msgstr ""
|
|
"g - välj ett stycke att gå till\n"
|
|
"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"
|
|
"j - lämna stycket obestämt, se nästa obestämda stycke\n"
|
|
"J - lämna stycket obestämt, se nästa stycke\n"
|
|
"k - lämna stycket obestämt, se föregående obestämda stycke\n"
|
|
"K - lämna stycket obestämt, se föregående stycke\n"
|
|
"s - dela aktuellt stycke i mindre styckens\n"
|
|
"e - redigera aktuellt stycke manuellt\n"
|
|
"? - visa hjälp\n"
|
|
|
|
#: git-add--interactive.perl:1342
|
|
msgid "The selected hunks do not apply to the index!\n"
|
|
msgstr "Markerade stycken kan inte appliceras på indexet!\n"
|
|
|
|
#: git-add--interactive.perl:1357
|
|
#, perl-format
|
|
msgid "ignoring unmerged: %s\n"
|
|
msgstr "ignorerar ej sammanslagen: %s\n"
|
|
|
|
#: git-add--interactive.perl:1468
|
|
#, perl-format
|
|
msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
|
|
msgstr "Applicera ändrat läge på arbetskatalogen [y,n,q,a,d%s,?]? "
|
|
|
|
#: git-add--interactive.perl:1469
|
|
#, perl-format
|
|
msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
|
|
msgstr "Applicera borttagning på arbetskatalogen [y,n,q,a,d%s,?]? "
|
|
|
|
#: git-add--interactive.perl:1470
|
|
#, perl-format
|
|
msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
|
|
msgstr "Applicera stycket på arbetskatalogen [y,n,q,a,d%s,?]? "
|
|
|
|
#: git-add--interactive.perl:1570
|
|
msgid "No other hunks to goto\n"
|
|
msgstr "Inga andra stycken att gå till\n"
|
|
|
|
#: git-add--interactive.perl:1588
|
|
#, perl-format
|
|
msgid "Invalid number: '%s'\n"
|
|
msgstr "Ogiltigt siffervärde: \"%s\"\n"
|
|
|
|
#: git-add--interactive.perl:1593
|
|
#, perl-format
|
|
msgid "Sorry, only %d hunk available.\n"
|
|
msgid_plural "Sorry, only %d hunks available.\n"
|
|
msgstr[0] "Beklagar, det finns bara %d stycke.\n"
|
|
msgstr[1] "Beklagar, det finns bara %d stycken.\n"
|
|
|
|
#: git-add--interactive.perl:1619
|
|
msgid "No other hunks to search\n"
|
|
msgstr "Inga andra stycken att söka efter\n"
|
|
|
|
#: git-add--interactive.perl:1636
|
|
#, perl-format
|
|
msgid "Malformed search regexp %s: %s\n"
|
|
msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
|
|
|
|
#: git-add--interactive.perl:1646
|
|
msgid "No hunk matches the given pattern\n"
|
|
msgstr "Inga stycken motsvarar givet mönster\n"
|
|
|
|
#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
|
|
msgid "No previous hunk\n"
|
|
msgstr "Inget föregående stycke\n"
|
|
|
|
#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
|
|
msgid "No next hunk\n"
|
|
msgstr "Inget följande stycke\n"
|
|
|
|
#: git-add--interactive.perl:1692
|
|
msgid "Sorry, cannot split this hunk\n"
|
|
msgstr "Beklagar, kan inte dela stycket\n"
|
|
|
|
#: git-add--interactive.perl:1698
|
|
#, perl-format
|
|
msgid "Split into %d hunk.\n"
|
|
msgid_plural "Split into %d hunks.\n"
|
|
msgstr[0] "Dela i %d stycke.\n"
|
|
msgstr[1] "Dela i %d stycken.\n"
|
|
|
|
#: git-add--interactive.perl:1708
|
|
msgid "Sorry, cannot edit this hunk\n"
|
|
msgstr "Beklagar, kan inte redigera stycket\n"
|
|
|
|
#. TRANSLATORS: please do not translate the command names
|
|
#. 'status', 'update', 'revert', etc.
|
|
#: git-add--interactive.perl:1773
|
|
msgid ""
|
|
"status - show paths with changes\n"
|
|
"update - add working tree state to the staged set of changes\n"
|
|
"revert - revert staged set of changes back to the HEAD version\n"
|
|
"patch - pick hunks and update selectively\n"
|
|
"diff - view diff between HEAD and index\n"
|
|
"add untracked - add contents of untracked files to the staged set of "
|
|
"changes\n"
|
|
msgstr ""
|
|
"status - visa sökvägar med ändringar\n"
|
|
"update - lägg arbetskatalogens tillstånd till köade ändringar\n"
|
|
"revert - återställ köade ändringar till HEAD-versionen\n"
|
|
"patch - välj och uppdatera valda stycken\n"
|
|
"diff - visa diff mellan HEAD och index\n"
|
|
"add untracked - lägg till innehåll i ospårade filer till köade ändringar\n"
|
|
|
|
#: git-add--interactive.perl: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 "saknad --"
|
|
|
|
#: git-add--interactive.perl:1821
|
|
#, perl-format
|
|
msgid "unknown --patch mode: %s"
|
|
msgstr "okänt läge för --patch: %s"
|
|
|
|
#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
|
|
#, perl-format
|
|
msgid "invalid argument %s, expecting --"
|
|
msgstr "felaktigt argument %s, förväntar --"
|
|
|
|
#: git-send-email.perl:138
|
|
msgid "local zone differs from GMT by a non-minute interval\n"
|
|
msgstr "lokal zon skiljer sig från GMT med delar av minuter\n"
|
|
|
|
#: git-send-email.perl:145 git-send-email.perl:151
|
|
msgid "local time offset greater than or equal to 24 hours\n"
|
|
msgstr "lokal tidszonförskjutning större än eller lika med 24 timmar\n"
|
|
|
|
#: git-send-email.perl:223 git-send-email.perl:229
|
|
msgid "the editor exited uncleanly, aborting everything"
|
|
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
|
|
|
|
#: git-send-email.perl:310
|
|
#, perl-format
|
|
msgid ""
|
|
"'%s' contains an intermediate version of the email you were composing.\n"
|
|
msgstr ""
|
|
"\"%s\" innehåller en mellanliggande version av e-postbrevet du skrev.\n"
|
|
|
|
#: git-send-email.perl:315
|
|
#, perl-format
|
|
msgid "'%s.final' contains the composed email.\n"
|
|
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
|
|
|
|
#: git-send-email.perl:408
|
|
msgid "--dump-aliases incompatible with other options\n"
|
|
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
|
|
|
|
#: git-send-email.perl:481 git-send-email.perl:683
|
|
msgid "Cannot run git format-patch from outside a repository\n"
|
|
msgstr "Kan inte köra git format-patch från utanför arkivet\n"
|
|
|
|
#: git-send-email.perl:484
|
|
msgid ""
|
|
"`batch-size` and `relogin` must be specified together (via command-line or "
|
|
"configuration option)\n"
|
|
msgstr ""
|
|
"\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
|
|
"eller konfigurationsflagga)\n"
|
|
|
|
#: git-send-email.perl:497
|
|
#, perl-format
|
|
msgid "Unknown --suppress-cc field: '%s'\n"
|
|
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
|
|
|
|
#: git-send-email.perl:528
|
|
#, perl-format
|
|
msgid "Unknown --confirm setting: '%s'\n"
|
|
msgstr "Okänd inställning i --confirm: \"%s\"\n"
|
|
|
|
#: git-send-email.perl:556
|
|
#, perl-format
|
|
msgid "warning: sendmail alias with quotes is not supported: %s\n"
|
|
msgstr "varning: sendmail-alias med citationstecken stöds inte. %s\n"
|
|
|
|
#: git-send-email.perl:558
|
|
#, perl-format
|
|
msgid "warning: `:include:` not supported: %s\n"
|
|
msgstr "varning: \":include:\" stöds inte: %s\n"
|
|
|
|
#: git-send-email.perl:560
|
|
#, perl-format
|
|
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
|
|
msgstr "varning: omdirigering til \"/fil\" eller \"|rör\" stöds inte: %s\n"
|
|
|
|
#: git-send-email.perl:565
|
|
#, perl-format
|
|
msgid "warning: sendmail line is not recognized: %s\n"
|
|
msgstr "varning: sendmail-raden känns inte igen: %s\n"
|
|
|
|
#: git-send-email.perl:649
|
|
#, perl-format
|
|
msgid ""
|
|
"File '%s' exists but it could also be the range of commits\n"
|
|
"to produce patches for. Please disambiguate by...\n"
|
|
"\n"
|
|
" * Saying \"./%s\" if you mean a file; or\n"
|
|
" * Giving --format-patch option if you mean a range.\n"
|
|
msgstr ""
|
|
"Filen \"%s\" finns men kan också vara ett incheckningsintervall\n"
|
|
"att skapa patchar för. Gör otvetydigt genom att...\n"
|
|
"\n"
|
|
" * Säga \"./%s\" om du menar en fil; eller\n"
|
|
" * Ange flaggan --format-patch om du menar ett intervall.\n"
|
|
|
|
#: git-send-email.perl:670
|
|
#, perl-format
|
|
msgid "Failed to opendir %s: %s"
|
|
msgstr "Misslyckades utföra opendir %s: %s"
|
|
|
|
#: git-send-email.perl:694
|
|
#, perl-format
|
|
msgid ""
|
|
"fatal: %s: %s\n"
|
|
"warning: no patches were sent\n"
|
|
msgstr ""
|
|
"ödesdigert: %s: %s\n"
|
|
"varning: inga patchar har sänts\n"
|
|
|
|
#: git-send-email.perl:705
|
|
msgid ""
|
|
"\n"
|
|
"No patch files specified!\n"
|
|
"\n"
|
|
msgstr ""
|
|
"\n"
|
|
"Inga patchfiler angavs!\n"
|
|
"\n"
|
|
|
|
#: git-send-email.perl:718
|
|
#, perl-format
|
|
msgid "No subject line in %s?"
|
|
msgstr "Ingen ärenderad i %s?"
|
|
|
|
#: git-send-email.perl:728
|
|
#, perl-format
|
|
msgid "Failed to open for writing %s: %s"
|
|
msgstr "Kunde inte öppna för skrivning %s: %s"
|
|
|
|
#: git-send-email.perl:739
|
|
msgid ""
|
|
"Lines beginning in \"GIT:\" will be removed.\n"
|
|
"Consider including an overall diffstat or table of contents\n"
|
|
"for the patch you are writing.\n"
|
|
"\n"
|
|
"Clear the body content if you don't wish to send a summary.\n"
|
|
msgstr ""
|
|
"Rader som börjar med \"GIT:\" kommer tas bort.\n"
|
|
"Överväg att ta med en övergripande diffstatus eller\n"
|
|
"innehållsförteckning för patchen du skriver.\n"
|
|
"\n"
|
|
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
|
|
|
|
#: git-send-email.perl:763
|
|
#, perl-format
|
|
msgid "Failed to open %s: %s"
|
|
msgstr "Misslyckades öppna %s: %s"
|
|
|
|
#: git-send-email.perl:780
|
|
#, perl-format
|
|
msgid "Failed to open %s.final: %s"
|
|
msgstr "Misslyckades öppna %s.final: %s"
|
|
|
|
#: git-send-email.perl:823
|
|
msgid "Summary email is empty, skipping it\n"
|
|
msgstr "Sammanfattande brev tomt, hoppar över\n"
|
|
|
|
#. TRANSLATORS: please keep [y/N] as is.
|
|
#: git-send-email.perl:858
|
|
#, perl-format
|
|
msgid "Are you sure you want to use <%s> [y/N]? "
|
|
msgstr "Är du säker på att du vill använda <%s> [Y=ja, N=nej]? "
|
|
|
|
#: git-send-email.perl:913
|
|
msgid ""
|
|
"The following files are 8bit, but do not declare a Content-Transfer-"
|
|
"Encoding.\n"
|
|
msgstr ""
|
|
"Följande filer är åttabitars, men anger inte en Content-Transfer-Encoding.\n"
|
|
|
|
#: git-send-email.perl:918
|
|
msgid "Which 8bit encoding should I declare [UTF-8]? "
|
|
msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
|
|
|
|
#: git-send-email.perl:926
|
|
#, perl-format
|
|
msgid ""
|
|
"Refusing to send because the patch\n"
|
|
"\t%s\n"
|
|
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
|
|
"want to send.\n"
|
|
msgstr ""
|
|
"Vägrar sända eftersom patchen\n"
|
|
"\t%s\n"
|
|
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
|
|
"vill sända.\n"
|
|
|
|
#: git-send-email.perl:945
|
|
msgid "To whom should the emails be sent (if anyone)?"
|
|
msgstr "Till vem ska breven sändas (om någon)?"
|
|
|
|
#: git-send-email.perl:963
|
|
#, perl-format
|
|
msgid "fatal: alias '%s' expands to itself\n"
|
|
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
|
|
|
|
#: git-send-email.perl:975
|
|
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
|
|
msgstr ""
|
|
"Message-ID att använda som In-Reply-To för det första brevet (om något)? "
|
|
|
|
#: git-send-email.perl:1033 git-send-email.perl:1041
|
|
#, perl-format
|
|
msgid "error: unable to extract a valid address from: %s\n"
|
|
msgstr "fel: kunde inte få fram en giltig adress från: %s\n"
|
|
|
|
#. TRANSLATORS: Make sure to include [q] [d] [e] in your
|
|
#. translation. The program will only accept English input
|
|
#. at this point.
|
|
#: git-send-email.perl:1045
|
|
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
|
|
msgstr "Vad vill du göra med adressen? (q=avsluta, d=kasta, e=redigera): "
|
|
|
|
#: git-send-email.perl:1362
|
|
#, perl-format
|
|
msgid "CA path \"%s\" does not exist"
|
|
msgstr "CA-sökvägen \"%s\" finns inte"
|
|
|
|
#: git-send-email.perl:1445
|
|
msgid ""
|
|
" The Cc list above has been expanded by additional\n"
|
|
" addresses found in the patch commit message. By default\n"
|
|
" send-email prompts before sending whenever this occurs.\n"
|
|
" This behavior is controlled by the sendemail.confirm\n"
|
|
" configuration setting.\n"
|
|
"\n"
|
|
" For additional information, run 'git send-email --help'.\n"
|
|
" To retain the current behavior, but squelch this message,\n"
|
|
" run 'git config --global sendemail.confirm auto'.\n"
|
|
"\n"
|
|
msgstr ""
|
|
" Kopielistan ovan har utökats av ytterligare adresser\n"
|
|
" funna i patchens incheckningsmeddelande. Send-email\n"
|
|
" frågar som standard innan sändning när detta sker.\n"
|
|
" Beteendet styrs av konfigurationsinställningen\n"
|
|
" sendemail.confirm\n"
|
|
"\n"
|
|
" För ytterligare information, kör \"git send-email --help\".\n"
|
|
" För att behålla nuvarande beteende, men dölja detta\n"
|
|
" meddelande, kör \"git config --global sendemail.confirm auto\".\n"
|
|
"\n"
|
|
|
|
#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
|
|
#. translation. The program will only accept English input
|
|
#. at this point.
|
|
#: git-send-email.perl:1460
|
|
msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
|
|
msgstr "Sända brevet? (y=ja, n=nej, e=redigera, q=avsluta, a=alla): "
|
|
|
|
#: git-send-email.perl:1463
|
|
msgid "Send this email reply required"
|
|
msgstr "Svar krävs på frågan \"Sända brevet?\""
|
|
|
|
#: git-send-email.perl:1491
|
|
msgid "The required SMTP server is not properly defined."
|
|
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
|
|
|
|
#: git-send-email.perl:1538
|
|
#, perl-format
|
|
msgid "Server does not support STARTTLS! %s"
|
|
msgstr "Servern stöder inte SMARTTLS! %s"
|
|
|
|
#: git-send-email.perl:1543 git-send-email.perl:1547
|
|
#, perl-format
|
|
msgid "STARTTLS failed! %s"
|
|
msgstr "STARTTLS misslyckades! %s"
|
|
|
|
#: git-send-email.perl:1556
|
|
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
|
|
msgstr ""
|
|
"Kan inte initiera SMTP korrekt. Kontrollera inställningarna och använd --"
|
|
"smtp-debug."
|
|
|
|
#: git-send-email.perl:1574
|
|
#, perl-format
|
|
msgid "Failed to send %s\n"
|
|
msgstr "Misslyckades sända %s\n"
|
|
|
|
#: git-send-email.perl:1577
|
|
#, perl-format
|
|
msgid "Dry-Sent %s\n"
|
|
msgstr "Test-Sände %s\n"
|
|
|
|
#: git-send-email.perl:1577
|
|
#, perl-format
|
|
msgid "Sent %s\n"
|
|
msgstr "Sände %s\n"
|
|
|
|
#: git-send-email.perl:1579
|
|
msgid "Dry-OK. Log says:\n"
|
|
msgstr "Test-OK. Loggen säger:\n"
|
|
|
|
#: git-send-email.perl:1579
|
|
msgid "OK. Log says:\n"
|
|
msgstr "OK. Loggen säger:\n"
|
|
|
|
#: git-send-email.perl:1591
|
|
msgid "Result: "
|
|
msgstr "Resultat: "
|
|
|
|
#: git-send-email.perl:1594
|
|
msgid "Result: OK\n"
|
|
msgstr "Resultat: OK\n"
|
|
|
|
#: git-send-email.perl:1612
|
|
#, perl-format
|
|
msgid "can't open file %s"
|
|
msgstr "kan inte öppna filen %s"
|
|
|
|
#: git-send-email.perl:1659 git-send-email.perl:1679
|
|
#, perl-format
|
|
msgid "(mbox) Adding cc: %s from line '%s'\n"
|
|
msgstr "(mbox) Lägger till cc: %s från raden \"%s\"\n"
|
|
|
|
#: git-send-email.perl:1665
|
|
#, perl-format
|
|
msgid "(mbox) Adding to: %s from line '%s'\n"
|
|
msgstr "(mbox) Lägger till to: %s från raden \"%s\"\n"
|
|
|
|
#: git-send-email.perl:1718
|
|
#, perl-format
|
|
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
|
|
msgstr "(icke-mbox) Lägger till cc: %s från raden \"%s\"\n"
|
|
|
|
#: git-send-email.perl:1753
|
|
#, perl-format
|
|
msgid "(body) Adding cc: %s from line '%s'\n"
|
|
msgstr "(kropp) Lägger till cc: %s från raden \"%s\"\n"
|
|
|
|
#: git-send-email.perl:1864
|
|
#, perl-format
|
|
msgid "(%s) Could not execute '%s'"
|
|
msgstr "(%s) Kunde inte köra \"%s\""
|
|
|
|
#: git-send-email.perl:1871
|
|
#, perl-format
|
|
msgid "(%s) Adding %s: %s from: '%s'\n"
|
|
msgstr "(%s) Lägger till %s: %s från: \"%s\"\n"
|
|
|
|
#: git-send-email.perl:1875
|
|
#, perl-format
|
|
msgid "(%s) failed to close pipe to '%s'"
|
|
msgstr "(%s) misslyckades stänga röret till \"%s\""
|
|
|
|
#: git-send-email.perl:1905
|
|
msgid "cannot send message as 7bit"
|
|
msgstr "kan inte sända brev som sjubitars"
|
|
|
|
#: git-send-email.perl:1913
|
|
msgid "invalid transfer encoding"
|
|
msgstr "ogiltig överföringskondning"
|
|
|
|
#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
|
|
#, perl-format
|
|
msgid "unable to open %s: %s\n"
|
|
msgstr "kunde inte öppna %s: %s\n"
|
|
|
|
#: git-send-email.perl:1957
|
|
#, perl-format
|
|
msgid "%s: patch contains a line longer than 998 characters"
|
|
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
|
|
|
|
#: git-send-email.perl:1974
|
|
#, perl-format
|
|
msgid "Skipping %s with backup suffix '%s'.\n"
|
|
msgstr ""
|
|
"Hoppar över %s med filnamnstillägget \"%s\" som används för "
|
|
"säkerhetskopior.\n"
|
|
|
|
#. TRANSLATORS: please keep "[y|N]" as is.
|
|
#: git-send-email.perl:1978
|
|
#, perl-format
|
|
msgid "Do you really want to send %s? [y|N]: "
|
|
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
|
|
|
|
#~ msgid "{drop,keep,ask}"
|
|
#~ msgstr "{drop,keep,ask}"
|
|
|
|
#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
|
|
#~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "
|
|
|
|
#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
|
|
#~ msgstr "Köa borttagning [y,n,a,q,d%s,?]? "
|
|
|
|
#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
|
|
#~ msgstr "Köa stycket [y,n,a,q,d%s,?]? "
|
|
|
|
#~ msgid ""
|
|
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
#~ "marked for staging.\n"
|
|
#~ msgstr ""
|
|
#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
#~ "köas omedelbart.\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 - köa stycket\n"
|
|
#~ "n - köa inte stycket\n"
|
|
#~ "q - avsluta; köa inte stycket eller något av de följande\n"
|
|
#~ "a - köa detta och alla följande stycken\n"
|
|
#~ "d - köa inte stycket eller något av de stycken som följer\n"
|
|
|
|
#~ msgid "could not copy '%s' to '%s'."
|
|
#~ msgstr "kunde inte kopiera \"%s\" till \"%s\"."
|
|
|
|
#~ msgid "malformed ident line"
|
|
#~ msgstr "felaktig ident-rad"
|
|
|
|
#~ msgid "corrupted author without date information"
|
|
#~ msgstr "trasig författare utan datuminformation"
|
|
|
|
#~ msgid "could not parse '%.*s'"
|
|
#~ msgstr "kunde inte tolka \"%.*s\""
|
|
|
|
#~ msgid "could not checkout %s"
|
|
#~ msgstr "kunde inte checka ut %s"
|
|
|
|
#~ msgid "filename in tree entry contains backslash: '%s'"
|
|
#~ msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\""
|
|
|
|
#~ msgid "Use -f if you really want to add them.\n"
|
|
#~ msgstr "Använd -f om du verkligen vill lägga till dem.\n"
|
|
|
|
#~ msgid "Maybe you wanted to say 'git add .'?\n"
|
|
#~ msgstr "Kanske menade du att skriva \"git add .\"?\n"
|
|
|
|
#~ msgid "packfile is invalid: %s"
|
|
#~ msgstr "packfil är ogiltig: %s"
|
|
|
|
#~ msgid "unable to open packfile for reuse: %s"
|
|
#~ msgstr "kan inte öppna packfil för återanvändning: %s"
|
|
|
|
#~ msgid "unable to seek in reused packfile"
|
|
#~ msgstr "kan inte söka i återanvänd packfil"
|
|
|
|
#~ msgid "unable to read from reused packfile"
|
|
#~ msgstr "kan inte läsa från återanvänd packfil"
|
|
|
|
#~ msgid "no HEAD?"
|
|
#~ msgstr "inget HEAD?"
|
|
|
|
#~ msgid "make committer date match author date"
|
|
#~ msgstr "sätt incheckningsdatum till författardatum"
|
|
|
|
#~ msgid "ignore author date and use current date"
|
|
#~ msgstr "ignorera författardatum och använd nuvarande"
|
|
|
|
#~ msgid "synonym of --reset-author-date"
|
|
#~ msgstr "synonym för --reset-author-date"
|
|
|
|
#~ msgid "ignore changes in whitespace"
|
|
#~ msgstr "ignorera ändringar i blanksteg"
|
|
|
|
#~ msgid "preserve empty commits during rebase"
|
|
#~ msgstr "behåll tomma incheckningar under ombasering"
|
|
|
|
#~ msgid "cannot combine --use-bitmap-index with object filtering"
|
|
#~ msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
|
|
|
|
#~ 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 ""
|
|
#~ "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
|
#~ "$sm_path\n"
|
|
#~ "Använd -f om du verkligen vill lägga till den."
|
|
|
|
#~ msgid "unable to get tree for %s"
|
|
#~ msgstr "kunde inte hämta trädet på %s"
|
|
|
|
#~ msgid "Use an experimental heuristic to improve diffs"
|
|
#~ msgstr "Använd en experimentell algoritm för att förbättra diffar"
|
|
|
|
#~ msgid "git commit-graph [--object-dir <objdir>]"
|
|
#~ msgstr "git commit-graph [--object-dir <objkat>]"
|
|
|
|
#~ msgid "git commit-graph read [--object-dir <objdir>]"
|
|
#~ msgstr "git commit-graph read [--object-dir <objkat>]"
|
|
|
|
#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
|
|
#~ msgstr ""
|
|
#~ "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep"
|
|
#~ "\""
|
|
|
|
#~ msgid "cannot change partial clone promisor remote"
|
|
#~ msgstr "kan inte ändra kontraktsfjärr för delvis kloning"
|
|
|
|
#~ msgid "error building trees"
|
|
#~ msgstr "fel vid byggande av träd"
|
|
|
|
#~ msgid "invalid date format '%s' in '%s'"
|
|
#~ msgstr "ogiltigt datumformat \"%s\" i \"%s\""
|
|
|
|
#~ msgid "writing root commit"
|
|
#~ msgstr "skriver rotincheckning"
|
|
|
|
#~ msgid "staged changes in the following files may be lost: %s"
|
|
#~ msgstr "köade ändringar i följande filer kan gå förlorade: %s"
|
|
|
|
#~ msgid ""
|
|
#~ "--filter can only be used with the remote configured in extensions."
|
|
#~ "partialClone"
|
|
#~ msgstr ""
|
|
#~ "--filter kan endast användas med fjärren konfigurerad i extensions."
|
|
#~ "partialClone"
|
|
|
|
#~ msgid "verify commit-msg hook"
|
|
#~ msgstr "bekräfta commit-msg-krok"
|
|
|
|
#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
|
|
#~ msgstr "kan inte kombinera \"--rebase-merges\" med \"--strategy-option\""
|
|
|
|
#~ msgid "invalid sparse value '%s'"
|
|
#~ msgstr "ogiltigt värde för sparse: \"%s\""
|
|
|
|
#~ msgid ""
|
|
#~ "Fetch normally indicates which branches had a forced update, but that "
|
|
#~ "check has been disabled."
|
|
#~ msgstr ""
|
|
#~ "Hämtning visar vanligtvis vilka grenar som har en tvingad uppdatering, "
|
|
#~ "men det testet har slagits av."
|
|
|
|
#~ msgid ""
|
|
#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
|
|
#~ msgstr ""
|
|
#~ "eller kör \"git config fetch.showForcedUpdates false\" för undvika "
|
|
#~ "testet.\n"
|
|
|
|
#~ msgid ""
|
|
#~ "log.mailmap is not set; its implicit value will change in an\n"
|
|
#~ "upcoming release. To squelch this message and preserve current\n"
|
|
#~ "behaviour, set the log.mailmap configuration value to false.\n"
|
|
#~ "\n"
|
|
#~ "To squelch this message and adopt the new behaviour now, set the\n"
|
|
#~ "log.mailmap configuration value to true.\n"
|
|
#~ "\n"
|
|
#~ "See 'git help config' and search for 'log.mailmap' for further "
|
|
#~ "information."
|
|
#~ msgstr ""
|
|
#~ "log.mailmap har inte satts: förvalet kommer ändras i en kommande\n"
|
|
#~ "version. För att dölja det här meddelandet och behålla nuvarande\n"
|
|
#~ "beteende, sätt konfigurationsvariabeln log.mailmap till false.\n"
|
|
#~ "\n"
|
|
#~ "För att dölja det här meddelandet och använda det nya beteendet,\n"
|
|
#~ "sätt konfigurationsvariabeln log.mailmap till true.\n"
|
|
#~ "\n"
|
|
#~ "Se \"git help config\" och sök efter \"log.mailmap\" för mer information."
|
|
|
|
#~ msgid "Server supports multi_ack_detailed"
|
|
#~ msgstr "Servern stöder \"multi_ack_detailed\""
|
|
|
|
#~ msgid "Server supports no-done"
|
|
#~ msgstr "Servern stöder \"no-done\""
|
|
|
|
#~ msgid "Server supports multi_ack"
|
|
#~ msgstr "Servern stöder \"multi_ack\""
|
|
|
|
#~ msgid "Server supports side-band-64k"
|
|
#~ msgstr "Servern stöder \"side-band-64k\""
|
|
|
|
#~ msgid "Server supports side-band"
|
|
#~ msgstr "Servern stöder \"side-band\""
|
|
|
|
#~ msgid "Server supports allow-tip-sha1-in-want"
|
|
#~ msgstr "Servern stöder \"allow-tip-sha1-in-want\""
|
|
|
|
#~ msgid "Server supports allow-reachable-sha1-in-want"
|
|
#~ msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
|
|
|
|
#~ msgid "Server supports ofs-delta"
|
|
#~ msgstr "Servern stöder \"ofs-delta\""
|
|
|
|
#~ msgid "(HEAD detached at %s)"
|
|
#~ msgstr "(HEAD frånkopplat vid %s)"
|
|
|
|
#~ msgid "(HEAD detached from %s)"
|
|
#~ msgstr "(HEAD frånkopplat från %s)"
|
|
|
|
#~ msgid "Checking out files"
|
|
#~ msgstr "Checkar ut filer"
|
|
|
|
#~ msgid "cannot be interactive without stdin connected to a terminal."
|
|
#~ msgstr ""
|
|
#~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
|
|
|
|
#~ msgid "failed to stat %s\n"
|
|
#~ msgstr "misslyckades ta status på %s\n"
|
|
|
|
#~ msgid ""
|
|
#~ "If you wish to skip this commit, use:\n"
|
|
#~ "\n"
|
|
#~ " git reset\n"
|
|
#~ "\n"
|
|
#~ "Then \"git cherry-pick --continue\" will resume cherry-picking\n"
|
|
#~ "the remaining commits.\n"
|
|
#~ msgstr ""
|
|
#~ "Om du vill hoppa över incheckningen, använd:\n"
|
|
#~ "\n"
|
|
#~ " git reset\n"
|
|
#~ "\n"
|
|
#~ "\"git cherry-pick --continue\" kommer därefter att återuppta\n"
|
|
#~ "cherry-pick för återstående incheckningar.\n"
|
|
|
|
#~ msgid "unrecognized verb: %s"
|
|
#~ msgstr "okänt verb: %s"
|
|
|
|
#~ msgid "hash version %X does not match version %X"
|
|
#~ msgstr "hash-versionen %X stämmer inte med versionen %X"
|
|
|
|
#~ msgid "option '%s' requires a value"
|
|
#~ msgstr "flaggan \"%s\" behöver ett värde"
|
|
|
|
#~ msgid "could not transform the todo list"
|
|
#~ msgstr "kunde inte transformera att göra-listan"
|
|
|
|
#~ msgid "default"
|
|
#~ msgstr "standard"
|
|
|
|
#~ msgid "Could not create directory '%s'"
|
|
#~ msgstr "Kunde inte skapa katalogen \"%s\""
|
|
|
|
#~ msgid "allow rerere to update index with resolved conflict"
|
|
#~ msgstr "tillåt rerere att uppdatera index med lösa konflikter"
|
|
|
|
#~ msgid "could not open %s"
|
|
#~ msgstr "kunde inte öppna %s"
|
|
|
|
#~ msgid "Could not move back to $head_name"
|
|
#~ msgstr "Kunde inte flytta tillbaka till $head_name"
|
|
|
|
#~ msgid ""
|
|
#~ "It seems that there is already a $state_dir_base directory, and\n"
|
|
#~ "I wonder if you are in the middle of another rebase. If that is the\n"
|
|
#~ "case, please try\n"
|
|
#~ "\t$cmd_live_rebase\n"
|
|
#~ "If that is not the case, please\n"
|
|
#~ "\t$cmd_clear_stale_rebase\n"
|
|
#~ "and run me again. I am stopping in case you still have something\n"
|
|
#~ "valuable there."
|
|
#~ msgstr ""
|
|
#~ "Det verkar som katalogen $state_dir_base redan existerar, och\n"
|
|
#~ "jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
|
|
#~ "fallet, försök\n"
|
|
#~ "\t$cmd_live_rebase\n"
|
|
#~ "Om så inte är fallet, kör\n"
|
|
#~ "\t$cmd_clear_stale_rebase\n"
|
|
#~ "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
|
|
#~ "något av värde där."
|
|
|
|
#~ msgid ""
|
|
#~ "fatal: cannot combine am options with either interactive or merge options"
|
|
#~ msgstr ""
|
|
#~ "ödesdigert: kan inte kombinera am-flaggor med antingen interaktiv- eller "
|
|
#~ "sammanslagningsflaggor"
|
|
|
|
#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
|
|
#~ msgstr ""
|
|
#~ "ödesdigert: kan inte kombinera \"--signoff\" med \"--preserve-merges\""
|
|
|
|
#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
|
|
#~ msgstr ""
|
|
#~ "ödesdigert: kan inte kombinera \"--preserve-merges\" med \"--rebase-merges"
|
|
#~ "\""
|
|
|
|
#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
|
|
#~ msgstr ""
|
|
#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy-option"
|
|
#~ "\""
|
|
|
|
#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
|
|
#~ msgstr ""
|
|
#~ "ödesdigert: kan inte kombinera \"--rebase-merges\" med \"--strategy\""
|
|
|
|
#~ msgid "invalid upstream '$upstream_name'"
|
|
#~ msgstr "ogiltig uppström \"$upstream_name\""
|
|
|
|
#~ msgid "$onto_name: there are more than one merge bases"
|
|
#~ msgstr "$onto_name: mer än en sammanslagningsbas finns"
|
|
|
|
#~ msgid "$onto_name: there is no merge base"
|
|
#~ msgstr "$onto_name: ingen sammanslagningsbas finns"
|
|
|
|
#~ msgid "Does not point to a valid commit: $onto_name"
|
|
#~ msgstr "Peka på en giltig incheckning: $onto_name"
|
|
|
|
#~ msgid "fatal: no such branch/commit '$branch_name'"
|
|
#~ msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
|
|
|
|
#~ msgid "Created autostash: $stash_abbrev"
|
|
#~ msgstr "Skapade autostash: $stash_abbrev"
|
|
|
|
#~ msgid "Current branch $branch_name is up to date."
|
|
#~ msgstr "Aktuell gren $branch_name är à jour."
|
|
|
|
#~ msgid "Current branch $branch_name is up to date, rebase forced."
|
|
#~ msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
|
|
|
|
#~ msgid "Changes to $onto:"
|
|
#~ msgstr "Ändringar till $onto:"
|
|
|
|
#~ msgid "Changes from $mb to $onto:"
|
|
#~ msgstr "Ändringar från $mb till $onto:"
|
|
|
|
#~ msgid "Fast-forwarded $branch_name to $onto_name."
|
|
#~ msgstr "Snabbspolade $branch_name till $onto_name."
|
|
|
|
#~ msgid "First, rewinding head to replay your work on top of it..."
|
|
#~ msgstr ""
|
|
#~ "Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
|
|
|
|
#~ msgid "ignoring unknown color-moved-ws mode '%s'"
|
|
#~ msgstr "ignorerar okänt läge för color-mode-ws \"%s\""
|
|
|
|
#~ msgid "only 'tree:0' is supported"
|
|
#~ msgstr "endast \"tree:0\" stöds"
|
|
|
|
#~ msgid "Renaming %s to %s and %s to %s instead"
|
|
#~ msgstr "Byter namn på %s till %s och %s till %s istället"
|
|
|
|
#~ msgid "Adding merged %s"
|
|
#~ msgstr "Lägger till sammanslagen %s"
|
|
|
|
#~ msgid "Internal error"
|
|
#~ msgstr "Internt fel"
|
|
|
|
#~ msgid "mainline was specified but commit %s is not a merge."
|
|
#~ msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
|
|
|
|
#~ msgid "unable to write sha1 filename %s"
|
|
#~ msgstr "kan inte skriva sha1-filnamn %s"
|
|
|
|
#~ msgid "cannot read sha1_file for %s"
|
|
#~ msgstr "kan inte läsa sha1_file för %s"
|
|
|
|
#~ msgid ""
|
|
#~ "error: cannot combine interactive options (--interactive, --exec, --"
|
|
#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
|
|
#~ "options (%s)"
|
|
#~ msgstr ""
|
|
#~ "fel: kan inte kombinera interaktiva flaggor (--interactive, --exec, --"
|
|
#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) med am-"
|
|
#~ "flaggor (%s)"
|
|
|
|
#~ msgid ""
|
|
#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
|
|
#~ "option) with am options (%s)"
|
|
#~ msgstr ""
|
|
#~ "fel: kan inte kombinera sammanslagningsflaggor (--merge, --strategy, --"
|
|
#~ "strategy-option) med am-flaggor (%s)"
|
|
|
|
#~ msgid "unrecognised option: '$arg'"
|
|
#~ msgstr "flaggan känns inte igen: \"$arg\""
|
|
|
|
#~ msgid "'$invalid' is not a valid commit"
|
|
#~ msgstr "\"$invalid\" är inte en giltig incheckning"
|
|
|
|
#~ msgid "could not parse '%s' (looking for '%s')"
|
|
#~ msgstr "kunde inte tolka \"%s\" (letar efter \"%s\")"
|
|
|
|
#~ msgid "deprecated synonym for --create-reflog"
|
|
#~ msgstr "avrådd synonym för --create-reflog"
|
|
|
|
#~ msgid "Can't stat %s"
|
|
#~ msgstr "Kan inte ta status på %s"
|
|
|
|
#~ msgid "abort rebase"
|
|
#~ msgstr "avbryt ombasering"
|
|
|
|
#~ msgid "make rebase script"
|
|
#~ msgstr "skapa ombaseringsskript"
|
|
|
|
#~ msgid "No such remote: %s"
|
|
#~ msgstr "Inget sådant fjärrarkiv: %s"
|
|
|
|
#~ msgid "cannot move a locked working tree"
|
|
#~ msgstr "kan inte flytta en låst arbetskatalog"
|
|
|
|
#~ msgid "cannot remove a locked working tree"
|
|
#~ msgstr "kan inte ta bort en låst arbetskatalog"
|
|
|
|
#~ msgid ""
|
|
#~ "\n"
|
|
#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
|
|
#~ "\n"
|
|
#~ "\t"
|
|
#~ msgstr ""
|
|
#~ "\n"
|
|
#~ "\tOmbaseringen kommer dock att avbrytas om du tar bort allting.\n"
|
|
#~ "\n"
|
|
#~ "\t"
|
|
|
|
#~ msgid "Dirty index: cannot merge (dirty: %s)"
|
|
#~ msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
|
|
|
|
#~ msgid "(+/-)x"
|
|
#~ msgstr "(+/-)x"
|
|
|
|
#~ msgid "<command>"
|
|
#~ msgstr "<kommando>"
|
|
|
|
#~ msgid "push|fetch"
|
|
#~ msgstr "push|fetch"
|
|
|
|
#~ msgid "w[,i1[,i2]]"
|
|
#~ msgstr "w[,i1[,i2]]"
|
|
|
|
#~ msgid "Entering '$displaypath'"
|
|
#~ msgstr "Går in i \"$displaypath\""
|
|
|
|
#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
|
|
#~ msgstr ""
|
|
#~ "Stoppar på \"$displaypath\"; skriptet returnerade en status skild från "
|
|
#~ "noll."
|
|
|
|
#~ msgid "Everyday Git With 20 Commands Or So"
|
|
#~ msgstr "Git för dagligt bruk i ungefär 20 kommandon"
|
|
|
|
#~ msgid "Could not open '%s' for writing"
|
|
#~ msgstr "Kunde inte öppna \"%s\" för skrivning"
|
|
|
|
#~ msgid ""
|
|
#~ "unexpected 1st line of squash message:\n"
|
|
#~ "\n"
|
|
#~ "\t%.*s"
|
|
#~ msgstr ""
|
|
#~ "oväntad första rad i squash-meddelande:\n"
|
|
#~ "\n"
|
|
#~ "\t%.*s"
|
|
|
|
#~ msgid ""
|
|
#~ "invalid 1st line of squash message:\n"
|
|
#~ "\n"
|
|
#~ "\t%.*s"
|
|
#~ msgstr ""
|
|
#~ "ogiltig första rad i squash-meddelande:\n"
|
|
#~ "\n"
|
|
#~ "\t%.*s"
|
|
|
|
#~ msgid "BUG: returned path string doesn't match cwd?"
|
|
#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
|
|
|
|
#~ msgid "Error in object"
|
|
#~ msgstr "Fel i objekt"
|
|
|
|
#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
|
|
#~ msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
|
|
|
|
#~ msgid "invalid filter-spec expression '%s'"
|
|
#~ msgstr "ogiltig filterspec-utryck \"%s\""
|
|
|
|
#~ msgid "The copy of the patch that failed is found in: %s"
|
|
#~ msgstr "En kopia av patchen som misslyckades finns i: %s"
|
|
|
|
#~ msgid "pathspec and --all are incompatible"
|
|
#~ msgstr "sökvägsangivelse och --all är inkompatibla"
|
|
|
|
#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
|
|
#~ msgstr ""
|
|
#~ "Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
|
|
|
|
#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
|
|
#~ msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
|
|
|
|
#~ msgid ""
|
|
#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
|
|
#~ "please use . instead if you meant to match all paths"
|
|
#~ msgstr ""
|
|
#~ "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
|
|
#~ "utgåva. använd istället . om du vill träffa alla sökvägar"
|
|
|
|
#~ msgid "could not truncate '%s'"
|
|
#~ msgstr "kunde inte trunkera \"%s\""
|
|
|
|
#~ msgid "could not close %s"
|
|
#~ msgstr "kunde inte stänga %s"
|
|
|
|
#~ msgid "Copied a misnamed branch '%s' away"
|
|
#~ msgstr "Kopierade bort en felaktigt namngiven gren \"%s\""
|
|
|
|
#~ msgid "it does not make sense to create 'HEAD' manually"
|
|
#~ msgstr "kan inte skapa \"HEAD\" manuellt"
|
|
|
|
#~ msgid "Don't know how to clone %s"
|
|
#~ msgstr "Vet inte hur man klonar %s"
|
|
|
|
#~ msgid "Don't know how to fetch from %s"
|
|
#~ msgstr "Vet inte hur man hämtar från %s"
|
|
|
|
#~ msgid "'$term' is not a valid term"
|
|
#~ msgstr "\"$term\" är inte en giltig term"
|
|
|
|
#~ msgid ""
|
|
#~ "error: unknown option for 'stash save': $option\n"
|
|
#~ " To provide a message, use git stash save -- '$option'"
|
|
#~ msgstr ""
|
|
#~ "fel: felaktig flagga för \"stash save\": $option\n"
|
|
#~ " För att ange ett meddelande, använd git stash save -- \"$option\""
|
|
|
|
#~ msgid "Failed to recurse into submodule path '$sm_path'"
|
|
#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
|
|
|
|
#~ msgid "%%(trailers) does not take arguments"
|
|
#~ msgstr "%%(trailers) tar inte argument"
|
|
|
|
#~ msgid ""
|
|
#~ "unrecognized setting %s for optionrebase.missingCommitsCheck. Ignoring."
|
|
#~ msgstr ""
|
|
#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
|
|
|
|
#~ msgid "%"
|
|
#~ msgid_plural "%"
|
|
#~ msgstr[0] "%"
|
|
#~ msgstr[1] "%"
|
|
|
|
#~ msgid "%s, %"
|
|
#~ msgid_plural "%s, %"
|
|
#~ msgstr[0] "%s. %"
|
|
#~ msgstr[1] "%s. %"
|
|
|
|
#~ msgid "submodule update strategy not supported for submodule '%s'"
|
|
#~ msgstr ""
|
|
#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
|
|
|
|
#~ msgid "change upstream info"
|
|
#~ msgstr "ändra uppströmsinformation"
|
|
|
|
#~ msgid ""
|
|
#~ "\n"
|
|
#~ "If you wanted to make '%s' track '%s', do this:\n"
|
|
#~ "\n"
|
|
#~ msgstr ""
|
|
#~ "\n"
|
|
#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
|
|
#~ "\n"
|
|
|
|
#~ msgid "basename"
|
|
#~ msgstr "basnamn"
|
|
|
|
#~ msgid ""
|
|
#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
|
|
#~ " - $line"
|
|
#~ msgstr ""
|
|
#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
|
|
#~ " - $line"
|
|
|
|
#~ msgid ""
|
|
#~ "Warning: the command isn't recognized in the following line:\n"
|
|
#~ " - $line"
|
|
#~ msgstr ""
|
|
#~ "Varning: kommandot kändes inte igen på följande rad:\n"
|
|
#~ " - $line"
|
|
|
|
#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
|
|
#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
|
|
|
|
#~ msgid "in %0.1f seconds automatically..."
|
|
#~ msgstr "automatiskt om %0.1f sekunder..."
|
|
|
|
#~ msgid "dup2(%d,%d) failed"
|
|
#~ msgstr "dup2(%d,%d) misslyckades"
|
|
|
|
#~ msgid "Initial commit on "
|
|
#~ msgstr "Första incheckning på "
|
|
|
|
#~ msgid "Patch is empty. Was it split wrong?"
|
|
#~ msgstr "Patchen är tom. Delades den upp felaktigt?"
|
|
|
|
#~ msgid ""
|
|
#~ "You still have unmerged paths in your index.\n"
|
|
#~ "Did you forget to use 'git add'?"
|
|
#~ msgstr ""
|
|
#~ "Du har fortfarande sökvägar som inte slagits samman i ditt index.\n"
|
|
#~ "Glömde du att använda \"git add\"?"
|
|
|
|
#~ msgid ""
|
|
#~ "Cannot update paths and switch to branch '%s' at the same time.\n"
|
|
#~ "Did you intend to checkout '%s' which can not be resolved as commit?"
|
|
#~ msgstr ""
|
|
#~ "Kan inte uppdatera sökvägar och växla till grenen \"%s\" samtidigt.\n"
|
|
#~ "Ville du checka ut \"%s\" som inte kan lösas som en utcheckning?"
|
|
|
|
#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
|
|
#~ msgstr ""
|
|
#~ "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
|
|
|
|
#~ msgid "default mode for recursion"
|
|
#~ msgstr "standardläge för rekursion"
|
|
|
|
#~ msgid "submodule--helper subcommand must be called with a subcommand"
|
|
#~ msgstr ""
|
|
#~ "underkommandot submodule--helper måste anropas med ett underkommando"
|
|
|
|
#~ msgid "could not stat '%s"
|
|
#~ msgstr "kunde inte ta status på \"%s\""
|
|
|
|
#~ msgid "tag: tagging "
|
|
#~ msgstr "tag: taggar"
|
|
|
|
#~ msgid "commit object"
|
|
#~ msgstr "incheckningsobjekt"
|
|
|
|
#~ msgid "tree object"
|
|
#~ msgstr "trädobjekt"
|
|
|
|
#~ msgid "blob object"
|
|
#~ msgstr "blob-objekt"
|
|
|
|
#~ msgid ""
|
|
#~ "There is nothing to exclude from by :(exclude) patterns.\n"
|
|
#~ "Perhaps you forgot to add either ':/' or '.' ?"
|
|
#~ msgstr ""
|
|
#~ "Ingenting att exkludera från med :(exkludera)-mönster.\n"
|
|
#~ "Glömde du kanske att antingen lägga till \":/\" eller \".\"?"
|
|
|
|
#~ msgid "unrecognized format: %%(%s)"
|
|
#~ msgstr "okänt format: %%(%s)"
|
|
|
|
#~ msgid ":strip= requires a positive integer argument"
|
|
#~ msgstr ":strip= kräver ett positivt heltalsargument"
|
|
|
|
#~ msgid "ref '%s' does not have %ld components to :strip"
|
|
#~ msgstr "referensen \"%s\" har inte %ld komponenter för :strip"
|
|
|
|
#~ msgid "[%s: gone]"
|
|
#~ msgstr "[%s: försvunnen]"
|
|
|
|
#~ msgid "[%s]"
|
|
#~ msgstr "[%s]"
|
|
|
|
#~ msgid "[%s: behind %d]"
|
|
#~ msgstr "[%s: bakom %d] "
|
|
|
|
#~ msgid "[%s: ahead %d]"
|
|
#~ msgstr "[%s: före %d] "
|
|
|
|
#~ msgid "[%s: ahead %d, behind %d]"
|
|
#~ msgstr "[%s: före %d, bakom %d] "
|
|
|
|
#~ msgid " **** invalid ref ****"
|
|
#~ msgstr " **** ogiltig ref ****"
|
|
|
|
#~ msgid "insanely long object directory %.*s"
|
|
#~ msgstr "tokigt lång objektkatalog %.*s"
|
|
|
|
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
|
|
#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
|
|
|
|
#~ msgid "tag name too long: %.*s..."
|
|
#~ msgstr "taggnamnet för långt: %.*s..."
|
|
|
|
#~ msgid "tag header too big."
|
|
#~ msgstr "tagghuvud för stort."
|
|
|
|
#~ msgid ""
|
|
#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
|
|
#~ "marked for discarding"
|
|
#~ msgstr ""
|
|
#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
|
|
#~ "markeras för kasta omedelbart"
|
|
|
|
#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
|
|
#~ msgstr ""
|
|
#~ "Använd en experimentell algoritm baserad på tomma rader för att förbättra "
|
|
#~ "diffar"
|
|
|
|
#~ msgid "Clever... amending the last one with dirty index."
|
|
#~ msgstr "Smart... utöka den senaste med smutsigt index."
|
|
|
|
#~ msgid ""
|
|
#~ "the following submodule (or one of its nested submodules)\n"
|
|
#~ "uses a .git directory:"
|
|
#~ msgid_plural ""
|
|
#~ "the following submodules (or one of their nested submodules)\n"
|
|
#~ "use a .git directory:"
|
|
#~ msgstr[0] ""
|
|
#~ "följande undermodul (eller en av dess nästlade undermoduler)\n"
|
|
#~ "använder en .git-katalog:"
|
|
#~ msgstr[1] ""
|
|
#~ "följande undermoduler (eller en av deras nästlade undermoduler)\n"
|
|
#~ "använder en .git-katalog:"
|
|
|
|
#~ msgid ""
|
|
#~ "\n"
|
|
#~ "(use 'rm -rf' if you really want to remove it including all of its "
|
|
#~ "history)"
|
|
#~ msgstr ""
|
|
#~ "\n"
|
|
#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
|
|
|
|
#~ msgid "Error wrapping up %s."
|
|
#~ msgstr "Fel vid ombrytning av %s."
|
|
|
|
#~ msgid "Your local changes would be overwritten by cherry-pick."
|
|
#~ msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
|
|
|
|
#~ msgid "Cannot revert during another revert."
|
|
#~ msgstr "Kan inte utföra \"revert\" under en annan \"revert\"."
|
|
|
|
#~ msgid "Cannot cherry-pick during another cherry-pick."
|
|
#~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
|
|
|
|
#~ msgid "Could not open %s"
|
|
#~ msgstr "Kunde inte öppna %s"
|
|
|
|
#~ msgid "Could not format %s."
|
|
#~ msgstr "Kunde inte formatera %s."
|
|
|
|
#~ msgid "%s: %s"
|
|
#~ msgstr "%s: %s"
|
|
|
|
#~ msgid "You need to set your committer info first"
|
|
#~ msgstr "Du måste ställa in din incheckarinformation först"
|
|
|
|
#~ msgid "bad numeric config value '%s' for '%s': invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": ogiltig enhet"
|
|
|
|
#~ msgid "bad numeric config value '%s' for '%s' in blob %s: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i blob:en %s: "
|
|
#~ "ogiltig enhet"
|
|
|
|
#~ msgid "bad numeric config value '%s' for '%s' in file %s: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i filen %s: "
|
|
#~ "ogiltig enhet"
|
|
|
|
#~ msgid ""
|
|
#~ "bad numeric config value '%s' for '%s' in standard input: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i standard in: "
|
|
#~ "ogiltig enhet"
|
|
|
|
#~ msgid ""
|
|
#~ "bad numeric config value '%s' for '%s' in submodule-blob %s: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i undermodul-"
|
|
#~ "blob:en %s: ogiltig enhet"
|
|
|
|
#~ msgid ""
|
|
#~ "bad numeric config value '%s' for '%s' in command line %s: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i kommandoraden "
|
|
#~ "%s: ogiltig enhet"
|
|
|
|
#~ msgid "bad numeric config value '%s' for '%s' in %s: invalid unit"
|
|
#~ msgstr ""
|
|
#~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig "
|
|
#~ "enhet"
|
|
|
|
#~ msgid "This is the 2nd commit message:"
|
|
#~ msgstr "Det här är 2:a incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 3rd commit message:"
|
|
#~ msgstr "Det här är 3:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 4th commit message:"
|
|
#~ msgstr "Det här är 4:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 5th commit message:"
|
|
#~ msgstr "Det här är 5:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 6th commit message:"
|
|
#~ msgstr "Det här är 6:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 7th commit message:"
|
|
#~ msgstr "Det här är 7:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 8th commit message:"
|
|
#~ msgstr "Det här är 8:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 9th commit message:"
|
|
#~ msgstr "Det här är 9:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the 10th commit message:"
|
|
#~ msgstr "Det här är 10:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the ${n}th commit message:"
|
|
#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the ${n}st commit message:"
|
|
#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the ${n}nd commit message:"
|
|
#~ msgstr "Det här är ${n}:a incheckningsmeddelandet:"
|
|
|
|
#~ msgid "This is the ${n}rd commit message:"
|
|
#~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
|
|
|
|
#~ msgid "The 1st commit message will be skipped:"
|
|
#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 2nd commit message will be skipped:"
|
|
#~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 3rd commit message will be skipped:"
|
|
#~ msgstr "3:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 4th commit message will be skipped:"
|
|
#~ msgstr "4:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 5th commit message will be skipped:"
|
|
#~ msgstr "5:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 6th commit message will be skipped:"
|
|
#~ msgstr "6:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 7th commit message will be skipped:"
|
|
#~ msgstr "7:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 8th commit message will be skipped:"
|
|
#~ msgstr "8:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 9th commit message will be skipped:"
|
|
#~ msgstr "9:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The 10th commit message will be skipped:"
|
|
#~ msgstr "10:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The ${n}th commit message will be skipped:"
|
|
#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The ${n}st commit message will be skipped:"
|
|
#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The ${n}nd commit message will be skipped:"
|
|
#~ msgstr "${n}:a incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "The ${n}rd commit message will be skipped:"
|
|
#~ msgstr "${n}:e incheckningsmeddelandet kommer hoppas över:"
|
|
|
|
#~ msgid "could not run gpg."
|
|
#~ msgstr "kunde inte köra gpg."
|
|
|
|
#~ msgid "gpg did not accept the data"
|
|
#~ msgstr "gpg godtog inte data"
|
|
|
|
#~ msgid "unsupported object type in the tree"
|
|
#~ msgstr "objekttyp som ej stöds upptäcktes i trädet"
|
|
|
|
#~ msgid "Fatal merge failure, shouldn't happen."
|
|
#~ msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
|
|
|
|
#~ msgid "Unprocessed path??? %s"
|
|
#~ msgstr "Obehandlad sökväg??? %s"
|
|
|
|
#~ msgid "Cannot %s during a %s"
|
|
#~ msgstr "kan inte %s under en %s"
|
|
|
|
#~ msgid "Can't cherry-pick into empty head"
|
|
#~ msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
|
|
|
|
#~ msgid "could not open %s for writing"
|
|
#~ msgstr "kunde inte öppna %s för skrivning"
|
|
|
|
#~ msgid "bug: unhandled unmerged status %x"
|
|
#~ msgstr "programfel: ej hanterad \"unmerged\"-status %x"
|
|
|
|
#~ msgid "bug: unhandled diff status %c"
|
|
#~ msgstr "programfel: diff-status %c ej hanterad"
|
|
|
|
#~ msgid "could not write branch description template"
|
|
#~ msgstr "kunde inte skriva grenbeskrivningsmall"
|
|
|
|
#~ msgid "corrupt index file"
|
|
#~ msgstr "indexfilen är trasig"
|
|
|
|
#~ msgid "detach the HEAD at named commit"
|
|
#~ msgstr "koppla från HEAD vid namngiven incheckning"
|
|
|
|
# Vague original, not networking-related, but rather related to the actual
|
|
# objects downloaded.
|
|
#~ msgid "Checking connectivity... "
|
|
#~ msgstr "Kontrollerar om vi fick alla objekt..."
|
|
|
|
#~ msgid " (unable to update local ref)"
|
|
#~ msgstr " (kunde inte uppdatera lokal ref)"
|
|
|
|
#~ msgid "Reinitialized existing"
|
|
#~ msgstr "Ominitierade befintligt"
|
|
|
|
#~ msgid "Initialized empty"
|
|
#~ msgstr "Initierade tomt"
|
|
|
|
#~ msgid " shared"
|
|
#~ msgstr " delat"
|
|
|
|
#~ msgid "Verify that the named commit has a valid GPG signature"
|
|
#~ msgstr "Bekräfta att den namngivna incheckningen har en giltig GPG-signatur"
|
|
|
|
#~ msgid "Writing SQUASH_MSG"
|
|
#~ msgstr "Skriver SQUASH_MSG"
|
|
|
|
#~ msgid "Finishing SQUASH_MSG"
|
|
#~ msgstr "Avslutar SQUASH_MSG"
|
|
|
|
#~ msgid " and with remote"
|
|
#~ msgstr " och med fjärren"
|
|
|
|
#~ msgid "removing '%s' failed"
|
|
#~ msgstr "misslyckades ta bort \"%s\""
|
|
|
|
#~ msgid "Please call 'bisect_state' with at least one argument."
|
|
#~ msgstr "Anropa \"bisect_state\" med minst ett argument."
|
|
|
|
#~ msgid ""
|
|
#~ "If you want to reuse this local git directory instead of cloning again "
|
|
#~ "from"
|
|
#~ msgstr ""
|
|
#~ "För att återanvända den lokala git-katalogen istället för att på nytt "
|
|
#~ "klona från"
|
|
|
|
#~ msgid ""
|
|
#~ "use the '--force' option. If the local git directory is not the correct "
|
|
#~ "repo"
|
|
#~ msgstr ""
|
|
#~ "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt "
|
|
#~ "arkiv"
|
|
|
|
#~ msgid ""
|
|
#~ "or you are unsure what this means choose another name with the '--name' "
|
|
#~ "option."
|
|
#~ msgstr ""
|
|
#~ "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--"
|
|
#~ "name\"."
|
|
|
|
#~ msgid "Submodule work tree '$displaypath' contains a .git directory"
|
|
#~ msgstr ""
|
|
#~ "Undermodulens arbetskatalog \"$displaypath\" innehåller katalogen \".git\""
|
|
|
|
#~ msgid ""
|
|
#~ "(use 'rm -rf' if you really want to remove it including all of its "
|
|
#~ "history)"
|
|
#~ msgstr ""
|
|
#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
|
|
|
|
#~ msgid "'%s': %s"
|
|
#~ msgstr "\"%s\": %s"
|
|
|
|
#~ msgid " git branch -d %s\n"
|
|
#~ msgstr " git branch -d %s\n"
|
|
|
|
#~ msgid " git branch --set-upstream-to %s\n"
|
|
#~ msgstr " git branch --set-upstream-to %s\n"
|
|
|
|
#~ msgid "cannot open %s: %s\n"
|
|
#~ msgstr "kan inte öppna %s: %s\n"
|
|
|
|
#~ msgid "Please, stage your changes to .gitmodules or stash them to proceed"
|
|
#~ msgstr ""
|
|
#~ "Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
|
|
|
|
#~ msgid "failed to remove: %s"
|
|
#~ msgstr "misslyckades ta bort: %s"
|
|
|
|
#~ msgid ""
|
|
#~ "Submodule path '$displaypath' not initialized\n"
|
|
#~ "Maybe you want to use 'update --init'?"
|
|
#~ msgstr ""
|
|
#~ "Undermodulen \"$displaypath\" har inte initierats\n"
|
|
#~ "Kanske du vill köra \"update --init\"?"
|
|
|
|
#~ msgid "Forward-port local commits to the updated upstream head"
|
|
#~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
|
|
|
|
#~ msgid "improper format entered align:%s"
|
|
#~ msgstr "felaktigt format angivet align:%s"
|
|
|
|
#~ msgid ""
|
|
#~ "push.default is unset; its implicit value has changed in\n"
|
|
#~ "Git 2.0 from 'matching' to 'simple'. To squelch this message\n"
|
|
#~ "and maintain the traditional behavior, use:\n"
|
|
#~ "\n"
|
|
#~ " git config --global push.default matching\n"
|
|
#~ "\n"
|
|
#~ "To squelch this message and adopt the new behavior now, use:\n"
|
|
#~ "\n"
|
|
#~ " git config --global push.default simple\n"
|
|
#~ "\n"
|
|
#~ "When push.default is set to 'matching', git will push local branches\n"
|
|
#~ "to the remote branches that already exist with the same name.\n"
|
|
#~ "\n"
|
|
#~ "Since Git 2.0, Git defaults to the more conservative 'simple'\n"
|
|
#~ "behavior, which only pushes the current branch to the corresponding\n"
|
|
#~ "remote branch that 'git pull' uses to update the current branch.\n"
|
|
#~ "\n"
|
|
#~ "See 'git help config' and search for 'push.default' for further "
|
|
#~ "information.\n"
|
|
#~ "(the 'simple' mode was introduced in Git 1.7.11. Use the similar mode\n"
|
|
#~ "'current' instead of 'simple' if you sometimes use older versions of Git)"
|
|
#~ msgstr ""
|
|
#~ "push.default har inte ställts in; dess underförstådda värde\n"
|
|
#~ "ändras i Git 2.0 från \"matching\" till \"simple\". För att\n"
|
|
#~ "undertrycka det här meddelandet och behålla traditionellt beteende\n"
|
|
#~ "skriver du:\n"
|
|
#~ "\n"
|
|
#~ " git config --global push.default matching\n"
|
|
#~ "\n"
|
|
#~ "För att undertrycka meddelandet och välja det nya beteendet nu skriver "
|
|
#~ "du:\n"
|
|
#~ "\n"
|
|
#~ " git config --global push.default simple\n"
|
|
#~ "\n"
|
|
#~ "När push.default är satt till \"matching\" kommer git att sända lokala "
|
|
#~ "grenar\n"
|
|
#~ "till fjärrgrenar som redan finns och som har samma namn.\n"
|
|
#~ "\n"
|
|
#~ "Git 2.0 kommer som standard välja den mer konservativa inställningen\n"
|
|
#~ "\"simple\", vilket bara sänder in den aktuella grenen till den "
|
|
#~ "motsvarande\n"
|
|
#~ "fjärrgren \"git pull\" använder för att uppdatera den aktuella grenen.\n"
|
|
#~ "\n"
|
|
#~ "Se \"git help config\" och sök efter \"push.default\" för ytterligare \n"
|
|
#~ "information. (Läget \"simple\" introducerades i Git 1.7.11. Använd det\n"
|
|
#~ "liknande läget \"current\" istället för \"simple\" om du ibland använder\n"
|
|
#~ "äldre versioner av Git.)"
|
|
|
|
#~ msgid "check|on-demand|no"
|
|
#~ msgstr "check|on-demand|no"
|
|
|
|
#~ msgid "Could not append '%s'"
|
|
#~ msgstr "Kunde inte lägga till på \"%s\""
|
|
|
|
#~ msgid "Testing "
|
|
#~ msgstr "Testar"
|
|
|
|
#~ msgid "unable to look up current user in the passwd file: %s"
|
|
#~ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
|
|
|
|
#~ msgid "no such user"
|
|
#~ msgstr "okänd användare"
|
|
|
|
#~ msgid "branch '%s' does not point at a commit"
|
|
#~ msgstr "grenen \"%s\" pekar inte på en incheckning"
|
|
|
|
#~ msgid "print only merged branches"
|
|
#~ msgstr "visa endast sammanslagna grenar"
|
|
|
|
#~ msgid "--dissociate given, but there is no --reference"
|
|
#~ msgstr "--dissociate angavs, men --reference har inte angivits"
|
|
|
|
#~ msgid "show usage"
|
|
#~ msgstr "visa användning"
|
|
|
|
#~ msgid "insanely long template name %s"
|
|
#~ msgstr "tokigt långt namn på mallen %s"
|
|
|
|
#~ msgid "insanely long symlink %s"
|
|
#~ msgstr "tokigt lång symbolisk länk %s"
|
|
|
|
#~ msgid "insanely long template path %s"
|
|
#~ msgstr "tokigt lång mallsökväg %s"
|
|
|
|
#~ msgid "false|true|preserve"
|
|
#~ msgstr "false|true|preserve"
|
|
|
|
#~ msgid "unsupported sort specification '%s'"
|
|
#~ msgstr "sorteringsangivelsen \"%s\" stöds ej"
|
|
|
|
#~ msgid "unsupported sort specification '%s' in variable '%s'"
|
|
#~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej"
|
|
|
|
#~ msgid "switch 'points-at' requires an object"
|
|
#~ msgstr "flaggan \"points-at\" behöver ett objekt"
|
|
|
|
#~ msgid "--sort and -n are incompatible"
|
|
#~ msgstr "--sort och -n är inkompatibla"
|
|
|
|
#~ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
|
|
#~ msgstr "Gitkatalog \"$a\" ingår i undermodulsökvägen \"$b\" eller omvänt"
|
|
|
|
#~ msgid "BUG: reopen a lockfile that is still open"
|
|
#~ msgstr "FEL: återöppna en låsfil som fortfarande är öppen"
|
|
|
|
#~ msgid "BUG: reopen a lockfile that has been committed"
|
|
#~ msgstr "FEL: återöppna en låsfil som har överlämnats"
|
|
|
|
#~ msgid "option %s does not accept negative form"
|
|
#~ msgstr "flaggan %s godtar inte negativ form"
|
|
|
|
#~ msgid "-b and -B are mutually exclusive"
|
|
#~ msgstr "-b och -B kan inte användas samtidigt"
|
|
|
|
#~ msgid ""
|
|
#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
|
|
#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
|
|
#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
|
|
#~ "\"."
|
|
#~ msgstr ""
|
|
#~ "När du har löst problemet kör du \"$cmdline --continue\".\n"
|
|
#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
|
|
#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
|
|
|
|
#~ msgid "Patch format $patch_format is not supported."
|
|
#~ msgstr "Patchformatet $patch_format stöds inte."
|
|
|
|
#~ msgid "Please make up your mind. --skip or --abort?"
|
|
#~ msgstr "Bestäm dig. --skip eller --abort?"
|
|
|
|
#~ msgid ""
|
|
#~ "Patch is empty. Was it split wrong?\n"
|
|
#~ "If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
|
|
#~ "To restore the original branch and stop patching run \"$cmdline --abort\"."
|
|
#~ msgstr ""
|
|
#~ "Patchen är tom. Delades den upp felaktigt?\n"
|
|
#~ "Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
|
|
#~ "För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
|
|
|
|
#~ msgid "Patch does not have a valid e-mail address."
|
|
#~ msgstr "Patchen har inte någon giltig e-postadress."
|
|
|
|
#~ msgid "Applying: $FIRSTLINE"
|
|
#~ msgstr "Tillämpar: $FIRSTLINE"
|
|
|
|
#~ msgid "Patch failed at $msgnum $FIRSTLINE"
|
|
#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
|
|
|
|
#~ msgid ""
|
|
#~ "Pull is not possible because you have unmerged files.\n"
|
|
#~ "Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
|
#~ "as appropriate to mark resolution and make a commit."
|
|
#~ msgstr ""
|
|
#~ "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"
|
|
#~ "Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
|
|
#~ "där det är lämpligt för att ange lösning och checka in."
|
|
|
|
#~ msgid "no branch specified"
|
|
#~ msgstr "inget grennamn angavs"
|
|
|
|
#~ msgid "prune .git/worktrees"
|
|
#~ msgstr "rensa .git/worktrees"
|
|
|
|
#~ msgid "The most commonly used git commands are:"
|
|
#~ msgstr "De mest använda git-kommandona är:"
|
|
|
|
#~ msgid "No such branch: '%s'"
|
|
#~ msgstr "Okänd gren: \"%s\""
|
|
|
|
#~ msgid "Could not create git link %s"
|
|
#~ msgstr "Kunde inte skapa gitlänk %s"
|
|
|
|
#~ msgid "Invalid gc.pruneexpire: '%s'"
|
|
#~ msgstr "Ogiltig gc.pruneexpire: '%s'"
|
|
|
|
#~ msgid "(detached from %s)"
|
|
#~ msgstr "(frånkopplad från %s)"
|
|
|
|
#~ msgid "No existing author found with '%s'"
|
|
#~ msgstr "Hittade ingen befintlig författare med \"%s\""
|
|
|
|
#~ msgid "search also in ignored files"
|
|
#~ msgstr "sök även i ignorerade filer"
|
|
|
|
#~ msgid "git remote set-head <name> (-a | --auto | -d | --delete |<branch>)"
|
|
#~ msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
|
|
|
|
#~ msgid "no files added"
|
|
#~ msgstr "inga filer har lagts till"
|
|
|
|
#~ msgid "slot"
|
|
#~ msgstr "plats"
|
|
|
|
#~ msgid "Failed to lock ref for update"
|
|
#~ msgstr "Misslyckades låsa referens för uppdatering"
|
|
|
|
#~ msgid "Failed to write ref"
|
|
#~ msgstr "Misslyckades skriva referens"
|
|
|
|
#~ msgid "Failed to lock HEAD during fast_forward_to"
|
|
#~ msgstr "Misslyckades låsa HEAD under \"fast_forward_to\""
|
|
|
|
#~ msgid "cannot lock HEAD ref"
|
|
#~ msgstr "kunde inte låsa HEAD-referens"
|
|
|
|
#~ msgid "cannot update HEAD ref"
|
|
#~ msgstr "kunde inte uppdatera HEAD-referens"
|
|
|
|
#~ msgid "%s: cannot lock the ref"
|
|
#~ msgstr "%s: kan inte låsa referensen"
|
|
|
|
#~ msgid "commit has empty message"
|
|
#~ msgstr "incheckningen har ett tomt meddelande"
|
|
|
|
#~ msgid "Failed to chdir: %s"
|
|
#~ msgstr "Kunde inte byta katalog (chdir): %s"
|
|
|
|
#~ msgid "Tracking not set up: name too long: %s"
|
|
#~ msgstr "Spårning har inte ställts in: namnet för långt: %s"
|
|
|
|
#~ msgid "could not find .gitmodules in index"
|
|
#~ msgstr "kunde inte hitta .gitmodules i indexet"
|
|
|
|
#~ msgid "reading updated .gitmodules failed"
|
|
#~ msgstr "misslyckades läsa uppdaterad .gitmodules"
|
|
|
|
#~ msgid "unable to stat updated .gitmodules"
|
|
#~ msgstr "kan inte ta status på uppdaterad .gitmodules"
|
|
|
|
#~ msgid "unable to remove .gitmodules from index"
|
|
#~ msgstr "kan inte ta bort .gitmodules från indexet"
|
|
|
|
#~ msgid "adding updated .gitmodules failed"
|
|
#~ msgstr "misslyckades lägga till uppdaterad .gitmodules"
|
|
|
|
#~ msgid "bug"
|
|
#~ msgstr "programfel"
|
|
|
|
#~ msgid ", behind "
|
|
#~ msgstr ", efter "
|
|
|
|
#~ msgid ""
|
|
#~ "The behavior of 'git add %s (or %s)' with no path argument from a\n"
|
|
#~ "subdirectory of the tree will change in Git 2.0 and should not be used "
|
|
#~ "anymore.\n"
|
|
#~ "To add content for the whole tree, run:\n"
|
|
#~ "\n"
|
|
#~ " git add %s :/\n"
|
|
#~ " (or git add %s :/)\n"
|
|
#~ "\n"
|
|
#~ "To restrict the command to the current directory, run:\n"
|
|
#~ "\n"
|
|
#~ " git add %s .\n"
|
|
#~ " (or git add %s .)\n"
|
|
#~ "\n"
|
|
#~ "With the current Git version, the command is restricted to the current "
|
|
#~ "directory.\n"
|
|
#~ msgstr ""
|
|
#~ "Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n"
|
|
#~ "underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre "
|
|
#~ "användas.\n"
|
|
#~ "För att lägga till innehållet för hela trädet, använd:\n"
|
|
#~ "\n"
|
|
#~ " git add %s :/\n"
|
|
#~ " (eller git add %s :/)\n"
|
|
#~ "\n"
|
|
#~ "För att begränsa kommandot till aktuell katalog, använd:\n"
|
|
#~ "\n"
|
|
#~ " git add %s .\n"
|
|
#~ " (eller git add %s .)\n"
|
|
#~ "\n"
|
|
#~ "I nuvarande version av Git begränsas kommandot till aktuell katalog.\n"
|
|
|
|
#~ msgid ""
|
|
#~ "You ran 'git add' with neither '-A (--all)' or '--ignore-removal',\n"
|
|
#~ "whose behaviour will change in Git 2.0 with respect to paths you "
|
|
#~ "removed.\n"
|
|
#~ "Paths like '%s' that are\n"
|
|
#~ "removed from your working tree are ignored with this version of Git.\n"
|
|
#~ "\n"
|
|
#~ "* 'git add --ignore-removal <pathspec>', which is the current default,\n"
|
|
#~ " ignores paths you removed from your working tree.\n"
|
|
#~ "\n"
|
|
#~ "* 'git add --all <pathspec>' will let you also record the removals.\n"
|
|
#~ "\n"
|
|
#~ "Run 'git status' to check the paths you removed from your working tree.\n"
|
|
#~ msgstr ""
|
|
#~ "Du körde \"git add\" utan varken \"-A (--all)\" eller \"--ignore-removal"
|
|
#~ "\".\n"
|
|
#~ "Beteendet kommer ändras i Git 2.0 vad gäller sökvägar du tagit bort.\n"
|
|
#~ "Sökvägar som \"%s\", som har\n"
|
|
#~ "tagits bort från din arbetskatalog ignoreras i den här versionen av Git.\n"
|
|
#~ "\n"
|
|
#~ "* \"git add --ignore-removal <sökväg>\", som är förvalet just nu,\n"
|
|
#~ " ignorerar sökvägar du har tagit bort från arbetskatalogen.\n"
|
|
#~ "\n"
|
|
#~ "* \"git add --all <sökväg>\" låter dig även registrera borttagningarna.\n"
|
|
#~ "\n"
|
|
#~ "Kör \"git status\" för att kontrollera sökvägarna du tagit bort från\n"
|
|
#~ "arbetskatalogen.\n"
|
|
|
|
#~ msgid "key id"
|
|
#~ msgstr "nyckel-id"
|
|
|
|
#~ msgid ""
|
|
#~ "Auto packing the repository for optimum performance. You may also\n"
|
|
#~ "run \"git gc\" manually. See \"git help gc\" for more information.\n"
|
|
#~ msgstr ""
|
|
#~ "Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
|
|
#~ "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"
|
|
|
|
#~ msgid ""
|
|
#~ "Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
#~ "counterpart. If you did not intend to push that branch, you may want to\n"
|
|
#~ "specify branches to push or set the 'push.default' configuration "
|
|
#~ "variable\n"
|
|
#~ "to 'simple', 'current' or 'upstream' to push only the current branch."
|
|
#~ msgstr ""
|
|
#~ "Uppdateringar avvisades då änden på en insänd gren är bakom dess\n"
|
|
#~ "fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n"
|
|
#~ "du specificera grenar att sända, eller ändra inställningsvariabeln\n"
|
|
#~ "\"push-default\" till \"simple\", \"current\" eller \"upstream\" för att "
|
|
#~ "endast\n"
|
|
#~ "sända aktuell gren."
|
|
|
|
#~ msgid "copied: %s -> %s"
|
|
#~ msgstr "kopierad: %s -> %s"
|
|
|
|
#~ msgid "deleted: %s"
|
|
#~ msgstr "borttagen: %s"
|
|
|
|
#~ msgid "modified: %s"
|
|
#~ msgstr "ändrad: %s"
|
|
|
|
#~ msgid "renamed: %s -> %s"
|
|
#~ msgstr "namnbyte: %s -> %s"
|
|
|
|
#~ msgid "unmerged: %s"
|
|
#~ msgstr "osammansl.: %s"
|
|
|
|
#~ msgid "input paths are terminated by a null character"
|
|
#~ msgstr "sökvägar avdelas med null-tecken"
|
|
|
|
#~ msgid ""
|
|
#~ "Aborting. Consider using either the --force or --include-untracked option."
|
|
#~ msgstr ""
|
|
#~ "Avbryter. Överväg att använda antingen flaggan --force eller --include-"
|
|
#~ "untracked."
|
|
|
|
#~ msgid " (fix conflicts and then run \"git am --resolved\")"
|
|
#~ msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
|
|
|
|
#~ msgid " (all conflicts fixed: run \"git commit\")"
|
|
#~ msgstr " (alla konflikter har rättats: kör \"git commit\")"
|
|
|
|
#~ msgid "more than %d trees given: '%s'"
|
|
#~ msgstr "mer än %d träd angavs: \"%s\""
|
|
|
|
#~ msgid ""
|
|
#~ "'%s' has changes staged in the index\n"
|
|
#~ "(use --cached to keep the file, or -f to force removal)"
|
|
#~ msgstr ""
|
|
#~ "\"%s\" har köade ändringar i indexet\n"
|
|
#~ "(använd --cached för att behålla filen eller -f för att tvinga "
|
|
#~ "borttagning)"
|
|
|
|
#~ msgid "show commits where no parent comes before its children"
|
|
#~ msgstr "visa incheckningar där ingen förälder kommer före dess barn"
|
|
|
|
#~ msgid "show the HEAD reference"
|
|
#~ msgstr "visa HEAD-referensen"
|
|
|
|
#~ msgid "Unable to fetch in submodule path '$prefix$sm_path'"
|
|
#~ msgstr "Kan inte hämta i undermodulsökväg \"$prefix$sm_path\""
|
|
|
|
#~ msgid "Failed to recurse into submodule path '$prefix$sm_path'"
|
|
#~ msgstr "Misslyckades rekursera in i undermodulsökvägen \"$prefix$sm_path\""
|
|
|
|
#~ msgid "It took %.2f seconds to enumerate untracked files. 'status -uno'"
|
|
#~ msgstr "Det tog %.2f sekunder att räkna ospårade filer. \"status -uno\""
|
|
|
|
#~ msgid "may speed it up, but you have to be careful not to forget to add"
|
|
#~ msgstr "kanske gör det snabbare, men du måste vara försiktig så att du"
|
|
|
|
#~ msgid "new files yourself (see 'git help status')."
|
|
#~ msgstr "inte glömmer lägga till filer själv (se \"git help status\")"
|
|
|
|
#~ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]"
|
|
#~ msgstr ""
|
|
#~ "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]"
|
|
|
|
#~ msgid "use any ref in .git/refs"
|
|
#~ msgstr "använd alla referenser i .git/refs"
|
|
|
|
#~ msgid "use any tag in .git/refs/tags"
|
|
#~ msgstr "använd alla taggar i .git/refs/tags"
|
|
|
|
#~ msgid "failed to close pipe to 'show' for object '%s'"
|
|
#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""
|
|
|
|
#~ msgid "You do not have a valid HEAD"
|
|
#~ msgstr "Du har ingen giltig HEAD"
|
|
|
|
#~ msgid "oops"
|
|
#~ msgstr "hoppsan"
|
|
|
|
#~ msgid "Not removing %s\n"
|
|
#~ msgstr "Tar inte bort %s\n"
|
|
|
|
#~ msgid "git remote set-head <name> (-a | -d | <branch>])"
|
|
#~ msgstr "git remote set-head <namn> (-a | -d | <gren>])"
|
|
|
|
#~ msgid " %d file changed"
|
|
#~ msgid_plural " %d files changed"
|
|
#~ msgstr[0] " %d fil ändrad"
|
|
#~ msgstr[1] " %d filer ändrade"
|
|
|
|
#~ msgid ", %d insertion(+)"
|
|
#~ msgid_plural ", %d insertions(+)"
|
|
#~ msgstr[0] ", %d tillägg(+)"
|
|
#~ msgstr[1] ", %d tillägg(+)"
|
|
|
|
#~ msgid ", %d deletion(-)"
|
|
#~ msgid_plural ", %d deletions(-)"
|
|
#~ msgstr[0] ", %d borttagning(-)"
|
|
#~ msgstr[1] ", %d borttagningar(-)"
|
|
|
|
#~ msgid " (use \"git add\" to track)"
|
|
#~ msgstr " (spåra med \"git add\")"
|
|
|
|
#~ msgid "--detach cannot be used with -b/-B/--orphan"
|
|
#~ msgstr "--detcah kan inte användas med -b/-B/--orphan"
|
|
|
|
#~ msgid "--detach cannot be used with -t"
|
|
#~ msgstr "--detach kan inte användas med -t"
|
|
|
|
#~ msgid "--orphan and -b|-B are mutually exclusive"
|
|
#~ msgstr "--orphan och -b|-B kan inte användas samtidigt"
|
|
|
|
#~ msgid "--orphan cannot be used with -t"
|
|
#~ msgstr "--orphan kan inte användas med -t"
|
|
|
|
#~ msgid "git checkout: -f and -m are incompatible"
|
|
#~ msgstr "git checkout: -f och -m är inkompatibla"
|
|
|
|
#~ msgid ""
|
|
#~ "git checkout: updating paths is incompatible with switching branches."
|
|
#~ msgstr ""
|
|
#~ "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."
|
|
|
|
#~ msgid "diff setup failed"
|
|
#~ msgstr "misslyckades sätta upp för diff"
|
|
|
|
#~ msgid "merge-recursive: disk full?"
|
|
#~ msgstr "merge-recursive: disk full?"
|
|
|
|
#~ msgid "diff_setup_done failed"
|
|
#~ msgstr "diff_setup_done misslyckades"
|
|
|
|
#~ msgid "%s: has been deleted/renamed"
|
|
#~ msgstr "%s: har tagits bort/ändrat namn"
|
|
|
|
#~ msgid "'%s': not a documentation directory."
|
|
#~ msgstr "\"%s\": inte en dokumentationskatalog."
|
|
|
|
#~ msgid "Could not extract email from committer identity."
|
|
#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
|
|
|
|
#~ msgid "--"
|
|
#~ msgstr "--"
|
|
|
|
#~ msgid "# Changed but not updated:"
|
|
#~ msgstr "# Ändrade men inte uppdaterade:"
|
|
|
|
#~ msgid "git checkout: we do not like '%s' as a branch name."
|
|
#~ msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
|
|
|
|
#~ msgid "git checkout: branch %s already exists"
|
|
#~ msgstr "git checkout: grenen %s finns redan"
|
|
|
|
#~ msgid "Paths with --interactive does not make sense."
|
|
#~ msgstr "Kan inte ange sökvägar med --interactive."
|
|
|
|
#~ msgid "No HEAD commit to compare with (yet)"
|
|
#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"
|
|
|
|
#~ msgid "cannot mix --fixed-strings and regexp"
|
|
#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck"
|
|
|
|
#~ msgid "%s; will overwrite!"
|
|
#~ msgstr "%s; kommer skriva över!"
|