From 8ea38f47bbabf00c17ff8964c722e413ed37444e Mon Sep 17 00:00:00 2001 From: Thynson Date: Wed, 29 Feb 2012 01:57:24 +0800 Subject: [PATCH 01/12] l10n: Improve zh_CN translation for lines insertion and deletion. Signed-off-by: Thynson --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 0a7dbe3c6a..ea26daa717 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -105,13 +105,13 @@ msgstr[0] " %d 个文件被修改" #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" -msgstr[0] "，%d 行插入(+)" +msgstr[0] "，插入 %d 行(+)" #: diff.c:1363 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" -msgstr[0] "，%d 行删除(-)" +msgstr[0] "，删除 %d 行(-)" #: diff.c:3364 #, c-format From 70fc47bf564260ccf22ebff4ea97941aaae751eb Mon Sep 17 00:00:00 2001 From: Thynson Date: Wed, 29 Feb 2012 01:58:30 +0800 Subject: [PATCH 02/12] l10n: Improve zh_CN translation for msg about branch deletion deny Signed-off-by: Thynson Signed-off-by: Jiang Xin --- po/zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index ea26daa717..a964030fc8 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -803,7 +803,7 @@ msgid "" "deleting branch '%s' that has been merged to\n" " '%s', but not yet merged to HEAD." msgstr "" -"要删除的分支 '%s' 已经合并到\n" +"将要删除的分支 '%s' 已经被合并到\n" " '%s'，但未合并到 HEAD。" #: builtin/branch.c:141 @@ -812,8 +812,8 @@ msgid "" "not deleting branch '%s' that is not yet merged to\n" " '%s', even though it is merged to HEAD." msgstr "" -"不要删除分支 '%s' 其尚未合并到\n" -" '%s'，虽然它已经合并到 HEAD。" +"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" +" 然而却尚未被合并到分支 '%s' 。" # 汉字之间无空格，故删除尾部空格 #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" From a9ce45430b380b982de6f6cf24a96849e4d2feed Mon Sep 17 00:00:00 2001 From: Thynson Date: Wed, 29 Feb 2012 02:03:39 +0800 Subject: [PATCH 03/12] l10n: Improve zh_CN translation for empty cherry-pick msg. Signed-off-by: Thynson Signed-off-by: Jiang Xin --- po/zh_CN.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index a964030fc8..9d0674c4e6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1395,11 +1395,12 @@ msgid "" "\n" "Otherwise, please use 'git reset'\n" msgstr "" -"之前的拣选操作现在为空，可能是由冲突解决导致的。如果您想继续提交，用：\n" +"之前的拣选操作现在是一个空提交，可能是由冲突解决导致的。如果您无论如何\n" +"也要提交，使用命令：\n" "\n" " git commit --allow-empty\n" "\n" -"否则，请用 'git reset'\n" +"否则，请使用命令 'git reset'\n" #: builtin/commit.c:205 builtin/reset.c:33 msgid "merge" From 1b150dc96fc11f5d3a8a1442bd364035e38bb549 Mon Sep 17 00:00:00 2001 From: Thynson Date: Wed, 29 Feb 2012 02:08:22 +0800 Subject: [PATCH 04/12] l10n: Improve zh_CN translation for msg that make empty commit when amend. Signed-off-by: Thynson Signed-off-by: Jiang Xin --- po/zh_CN.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 9d0674c4e6..1f50b724eb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1383,8 +1383,8 @@ msgid "" "it empty. You can repeat your command with --allow-empty, or you can\n" "remove the commit entirely with \"git reset HEAD^\".\n" msgstr "" -"您要求修补最近的提交，但这么做会造成空提交。您可重复您的命令并带上\n" -"--allow-empty 选项，或者您可以整个删除该提交用 \"git reset HEAD^\"。\n" +"您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" +"--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" #: builtin/commit.c:59 msgid "" From 2d0dc4746444a1d9fea40332d97ad39a995daaba Mon Sep 17 00:00:00 2001 From: Thynson Date: Wed, 29 Feb 2012 02:18:52 +0800 Subject: [PATCH 05/12] l10n: Improve commit msg for zh_CN translation Signed-off-by: Thynson Signed-off-by: Jiang Xin --- po/zh_CN.po | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 1f50b724eb..d7d5b92c71 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -797,6 +797,7 @@ msgstr "git archive: 协议错误" msgid "git archive: expected a flush" msgstr "git archive: 预期一个刷新" +# 保持原换行格式，在输出时 %s 的替代内容会让字串变长 #: builtin/branch.c:137 #, c-format msgid "" @@ -806,6 +807,7 @@ msgstr "" "将要删除的分支 '%s' 已经被合并到\n" " '%s'，但未合并到 HEAD。" +# 保持原换行格式，在输出时 %s 的替代内容会让字串变长 #: builtin/branch.c:141 #, c-format msgid "" @@ -1515,28 +1517,29 @@ msgstr "" "\t%s\n" "然后重试。\n" -# 注意保持前导空格 #: builtin/commit.c:796 msgid "Please enter the commit message for your changes." msgstr "请为您的修改输入提交说明。" +# 前导空格用于拼接英文字串，中文字串拼接无需空格 #: builtin/commit.c:799 msgid "" " Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -" 以 '#' 开头\n" -"的行将被忽略，而且空提交说明将会终止提交。\n" +"以 '#' 开头\n" +"的行将被忽略，并且空的提交说明将会中止提交。\n" -# 注意保持前导空格 +# 前导空格用于拼接英文字串，中文字串拼接无需空格 #: builtin/commit.c:804 msgid "" " Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -" 以 '#' 开头\n" -"的行将被保留，您可以删除它们如果您想这样做。空提交说明将会终止提交。\n" +"以 '#' 开头\n" +"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n" +"中止提交。\n" # 为保证在输出中对齐，注意调整句中空格！ #: builtin/commit.c:816 From aa9565f7ccfeee2df9f4d950f1a2822befd0244b Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Mon, 5 Mar 2012 13:16:27 +0800 Subject: [PATCH 06/12] l10n: Update zh_CN translation for 1.7.9.2 In order to show detailed dirty status of submodules in long format, git stripped the last ", " from the concatenate sting by a two-byte backstep. So for keeping the two-byte backstep valid, won't touch the end ", " for translation. Signed-off-by: Jiang Xin --- po/zh_CN.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index d7d5b92c71..3b818e24de 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -497,15 +497,15 @@ msgstr "双方修改：" #: wt-status.c:248 msgid "new commits, " -msgstr "新提交，" +msgstr "新提交, " #: wt-status.c:250 msgid "modified content, " -msgstr "修改的内容，" +msgstr "修改的内容, " #: wt-status.c:252 msgid "untracked content, " -msgstr "未跟踪的内容，" +msgstr "未跟踪的内容, " # 为保证在输出中对齐，注意调整句中空格！ #: wt-status.c:266 From 2b911f818543ae608ea357da8e567f74470f5adf Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 8 Mar 2012 10:20:20 +0800 Subject: [PATCH 07/12] l10n: Update git.pot (1 new message) Update file 'po/git.pot' to v1.7.10-rc0: * Add 1 new l10n string in the new generated "git.pot" file at line: 191 Signed-off-by: Jiang Xin --- po/git.pot | 356 +++++++++++++++++++++++++++-------------------------- 1 file changed, 181 insertions(+), 175 deletions(-) diff --git a/po/git.pot b/po/git.pot index efcda39705..8bdaf3cc34 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2012-02-28 09:17+0800\n" +"POT-Creation-Date: 2012-03-08 10:19+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -63,49 +63,49 @@ msgstr "" msgid "failed to close rev-list's stdin: %s" msgstr "" -#: diff.c:104 +#: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" msgstr "" -#: diff.c:109 +#: diff.c:110 #, c-format msgid " Unknown dirstat parameter '%.*s'\n" msgstr "" -#: diff.c:205 +#: diff.c:210 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:1331 +#: diff.c:1336 msgid " 0 files changed\n" msgstr "" -#: diff.c:1335 +#: diff.c:1340 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] "" msgstr[1] "" -#: diff.c:1352 +#: diff.c:1357 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "" msgstr[1] "" -#: diff.c:1363 +#: diff.c:1368 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "" msgstr[1] "" -#: diff.c:3364 +#: diff.c:3424 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -124,17 +124,17 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: grep.c:1285 +#: grep.c:1280 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1302 +#: grep.c:1297 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1313 +#: grep.c:1308 #, c-format msgid "'%s': short read %s" msgstr "" @@ -172,221 +172,227 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983 -#: builtin/merge.c:1093 builtin/merge.c:1103 +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 +#: builtin/merge.c:1095 builtin/merge.c:1105 #, c-format msgid "Could not open '%s' for writing" msgstr "" -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 -#: builtin/merge.c:1095 builtin/merge.c:1108 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 +#: builtin/merge.c:1097 builtin/merge.c:1110 #, c-format msgid "Could not write to '%s'" msgstr "" -#: sequencer.c:142 +#: sequencer.c:143 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '" +msgstr "" + +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:154 sequencer.c:680 sequencer.c:763 +#: sequencer.c:159 sequencer.c:685 sequencer.c:768 #, c-format msgid "Could not write to %s" msgstr "" -#: sequencer.c:157 +#: sequencer.c:162 #, c-format msgid "Error wrapping up %s" msgstr "" -#: sequencer.c:172 +#: sequencer.c:177 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" -#: sequencer.c:174 +#: sequencer.c:179 msgid "Your local changes would be overwritten by revert." msgstr "" -#: sequencer.c:177 +#: sequencer.c:182 msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:227 +#: sequencer.c:232 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:293 +#: sequencer.c:298 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:296 +#: sequencer.c:301 msgid "You do not have a valid HEAD" msgstr "" -#: sequencer.c:311 +#: sequencer.c:316 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:319 +#: sequencer.c:324 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:323 +#: sequencer.c:328 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:334 +#: sequencer.c:339 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:338 +#: sequencer.c:343 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:422 +#: sequencer.c:427 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:423 +#: sequencer.c:428 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709 -#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" -#: sequencer.c:448 +#: sequencer.c:453 msgid "empty commit set passed" msgstr "" -#: sequencer.c:456 -#, c-format -msgid "git %s: failed to read the index" -msgstr "" - #: sequencer.c:461 #, c-format +msgid "git %s: failed to read the index" +msgstr "" + +#: sequencer.c:466 +#, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:546 +#: sequencer.c:551 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:568 +#: sequencer.c:573 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:573 +#: sequencer.c:578 msgid "No commits parsed." msgstr "" -#: sequencer.c:586 +#: sequencer.c:591 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:590 +#: sequencer.c:595 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:597 +#: sequencer.c:602 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:625 +#: sequencer.c:630 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:628 +#: sequencer.c:633 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:640 +#: sequencer.c:645 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:661 +#: sequencer.c:666 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:662 +#: sequencer.c:667 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:666 +#: sequencer.c:671 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:682 sequencer.c:767 +#: sequencer.c:687 sequencer.c:772 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:701 sequencer.c:835 +#: sequencer.c:706 sequencer.c:840 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:703 +#: sequencer.c:708 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:705 +#: sequencer.c:710 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:727 +#: sequencer.c:732 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:730 +#: sequencer.c:735 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:731 +#: sequencer.c:736 msgid "unexpected end of file" msgstr "" -#: sequencer.c:737 +#: sequencer.c:742 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:922 +#: sequencer.c:927 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:923 +#: sequencer.c:928 msgid "Can't cherry-pick into empty head" msgstr "" @@ -845,56 +851,56 @@ msgstr "" msgid "(no branch)" msgstr "" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "some refs could not be read" msgstr "" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "cannot rename the current branch while not on any." msgstr "" -#: builtin/branch.c:585 +#: builtin/branch.c:589 #, c-format msgid "Invalid branch name: '%s'" msgstr "" -#: builtin/branch.c:600 -msgid "Branch rename failed" -msgstr "" - #: builtin/branch.c:604 -#, c-format -msgid "Renamed a misnamed branch '%s' away" +msgid "Branch rename failed" msgstr "" #: builtin/branch.c:608 #, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:612 +#, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "" -#: builtin/branch.c:615 +#: builtin/branch.c:619 msgid "Branch is renamed, but update of config-file failed" msgstr "" -#: builtin/branch.c:630 +#: builtin/branch.c:634 #, c-format msgid "malformed object name %s" msgstr "" -#: builtin/branch.c:654 +#: builtin/branch.c:658 #, c-format msgid "could not write branch description template: %s\n" msgstr "" -#: builtin/branch.c:742 +#: builtin/branch.c:746 msgid "Failed to resolve HEAD as a valid ref." msgstr "" -#: builtin/branch.c:747 builtin/clone.c:558 +#: builtin/branch.c:751 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:805 +#: builtin/branch.c:809 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" @@ -956,11 +962,11 @@ msgid "path '%s' is unmerged" msgstr "" #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:809 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "" -#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "" @@ -1552,7 +1558,7 @@ msgstr "" msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1452 builtin/merge.c:507 +#: builtin/commit.c:1452 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "" @@ -1576,7 +1582,7 @@ msgstr "" msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 msgid "failed to write commit object" msgstr "" @@ -1683,26 +1689,26 @@ msgstr "" msgid "invalid option: %s" msgstr "" -#: builtin/diff.c:293 +#: builtin/diff.c:297 msgid "Not a git repository" msgstr "" -#: builtin/diff.c:343 +#: builtin/diff.c:347 #, c-format msgid "invalid object '%s' given." msgstr "" -#: builtin/diff.c:348 +#: builtin/diff.c:352 #, c-format msgid "more than %d trees given: '%s'" msgstr "" -#: builtin/diff.c:358 +#: builtin/diff.c:362 #, c-format msgid "more than two blobs given: '%s'" msgstr "" -#: builtin/diff.c:366 +#: builtin/diff.c:370 #, c-format msgid "unhandled object '%s' given." msgstr "" @@ -1915,32 +1921,32 @@ msgstr "" msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "no pattern given." msgstr "" -#: builtin/grep.c:903 +#: builtin/grep.c:902 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:967 +#: builtin/grep.c:966 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:972 +#: builtin/grep.c:971 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:975 +#: builtin/grep.c:974 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:983 +#: builtin/grep.c:982 msgid "both --cached and trees are given." msgstr "" @@ -2086,109 +2092,109 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:185 +#: builtin/log.c:187 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:393 builtin/log.c:479 +#: builtin/log.c:395 builtin/log.c:483 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:503 +#: builtin/log.c:507 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:592 +#: builtin/log.c:596 msgid "format.headers without value" msgstr "" -#: builtin/log.c:665 +#: builtin/log.c:669 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:676 +#: builtin/log.c:680 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:690 +#: builtin/log.c:694 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:698 +#: builtin/log.c:702 msgid "Not a range." msgstr "" -#: builtin/log.c:735 +#: builtin/log.c:739 msgid "Could not extract email from committer identity." msgstr "" -#: builtin/log.c:781 +#: builtin/log.c:785 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:875 +#: builtin/log.c:879 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:948 +#: builtin/log.c:952 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1169 +#: builtin/log.c:1173 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1214 +#: builtin/log.c:1218 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1216 +#: builtin/log.c:1220 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1221 builtin/shortlog.c:284 +#: builtin/log.c:1225 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "" -#: builtin/log.c:1224 +#: builtin/log.c:1228 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1230 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1228 +#: builtin/log.c:1232 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1251 +#: builtin/log.c:1255 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1253 +#: builtin/log.c:1257 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1406 +#: builtin/log.c:1410 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1510 +#: builtin/log.c:1514 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "" -#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 #, c-format msgid "Unknown commit %s" msgstr "" @@ -2251,53 +2257,53 @@ msgstr "" msgid "No merge message -- not updating HEAD\n" msgstr "" -#: builtin/merge.c:435 +#: builtin/merge.c:437 #, c-format msgid "'%s' does not point to a commit" msgstr "" -#: builtin/merge.c:534 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "" -#: builtin/merge.c:627 +#: builtin/merge.c:629 msgid "git write-tree failed to write a tree" msgstr "" -#: builtin/merge.c:677 +#: builtin/merge.c:679 msgid "failed to read the cache" msgstr "" -#: builtin/merge.c:694 +#: builtin/merge.c:696 msgid "Unable to write index." msgstr "" -#: builtin/merge.c:707 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "" -#: builtin/merge.c:721 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "" -#: builtin/merge.c:735 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "" -#: builtin/merge.c:874 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "" -#: builtin/merge.c:883 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" -#: builtin/merge.c:889 +#: builtin/merge.c:891 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" @@ -2306,140 +2312,140 @@ msgid "" "the commit.\n" msgstr "" -#: builtin/merge.c:913 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "" -#: builtin/merge.c:925 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "" -#: builtin/merge.c:998 +#: builtin/merge.c:1000 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -#: builtin/merge.c:1014 +#: builtin/merge.c:1016 #, c-format msgid "'%s' is not a commit" msgstr "" -#: builtin/merge.c:1055 +#: builtin/merge.c:1057 msgid "No current branch." msgstr "" -#: builtin/merge.c:1057 +#: builtin/merge.c:1059 msgid "No remote for the current branch." msgstr "" -#: builtin/merge.c:1059 +#: builtin/merge.c:1061 msgid "No default upstream defined for the current branch." msgstr "" -#: builtin/merge.c:1064 +#: builtin/merge.c:1066 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "" -#: builtin/merge.c:1186 +#: builtin/merge.c:1188 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "" -#: builtin/merge.c:1202 git-pull.sh:31 +#: builtin/merge.c:1204 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1205 git-pull.sh:34 +#: builtin/merge.c:1207 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "" -#: builtin/merge.c:1209 +#: builtin/merge.c:1211 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." msgstr "" -#: builtin/merge.c:1212 +#: builtin/merge.c:1214 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "" -#: builtin/merge.c:1221 +#: builtin/merge.c:1223 msgid "You cannot combine --squash with --no-ff." msgstr "" -#: builtin/merge.c:1226 +#: builtin/merge.c:1228 msgid "You cannot combine --no-ff with --ff-only." msgstr "" -#: builtin/merge.c:1233 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "" -#: builtin/merge.c:1264 +#: builtin/merge.c:1266 msgid "Can merge only exactly one commit into empty head" msgstr "" -#: builtin/merge.c:1267 +#: builtin/merge.c:1269 msgid "Squash commit into empty head not supported yet" msgstr "" -#: builtin/merge.c:1269 +#: builtin/merge.c:1271 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1273 builtin/merge.c:1317 +#: builtin/merge.c:1275 builtin/merge.c:1319 #, c-format msgid "%s - not something we can merge" msgstr "" -#: builtin/merge.c:1383 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1421 +#: builtin/merge.c:1423 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1428 +#: builtin/merge.c:1430 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1460 +#: builtin/merge.c:1462 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1483 builtin/merge.c:1560 +#: builtin/merge.c:1485 builtin/merge.c:1562 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1487 +#: builtin/merge.c:1489 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1551 +#: builtin/merge.c:1553 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1553 +#: builtin/merge.c:1555 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1562 +#: builtin/merge.c:1564 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1573 +#: builtin/merge.c:1575 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -3038,76 +3044,76 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" -#: git-am.sh:135 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" -#: git-am.sh:144 +#: git-am.sh:147 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -#: git-am.sh:153 +#: git-am.sh:156 msgid "Falling back to patching base and 3-way merge..." msgstr "" -#: git-am.sh:265 +#: git-am.sh:268 msgid "Only one StGIT patch series can be applied at once" msgstr "" -#: git-am.sh:352 +#: git-am.sh:355 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "" -#: git-am.sh:354 +#: git-am.sh:357 msgid "Patch format detection failed." msgstr "" -#: git-am.sh:406 +#: git-am.sh:409 msgid "-d option is no longer supported. Do not use." msgstr "" -#: git-am.sh:469 +#: git-am.sh:472 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "" -#: git-am.sh:474 +#: git-am.sh:477 msgid "Please make up your mind. --skip or --abort?" msgstr "" -#: git-am.sh:501 +#: git-am.sh:504 msgid "Resolve operation not in progress, we are not resuming." msgstr "" -#: git-am.sh:567 +#: git-am.sh:570 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" -#: git-am.sh:743 +#: git-am.sh:746 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:754 +#: git-am.sh:757 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "" -#: git-am.sh:790 +#: git-am.sh:793 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "" -#: git-am.sh:835 +#: git-am.sh:838 msgid "No changes -- Patch already applied." msgstr "" -#: git-am.sh:861 +#: git-am.sh:864 msgid "applying to an empty history" msgstr "" From 0eb8fa3a05706ae55e5597d8384c303a00ce1e11 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Sun, 12 Sep 2010 21:10:21 +0100 Subject: [PATCH 08/12] po/sv.po: add Swedish translation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Peter Krefting Signed-off-by: Ævar Arnfjörð Bjarmason (cherry picked from commit 54ce07007c7988268d43619c580e81fbca09d37b) --- po/sv.po | 3492 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 3492 insertions(+) create mode 100644 po/sv.po diff --git a/po/sv.po b/po/sv.po new file mode 100644 index 0000000000..78b4d9a11d --- /dev/null +++ b/po/sv.po @@ -0,0 +1,3492 @@ +# Swedish translations for Git. +# Copyright (C) 2010 Peter krefting +# This file is distributed under the same license as the Git package. +# Peter krefting , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: git 1.7.3\n" +"Report-Msgid-Bugs-To: Git Mailing List \n" +"POT-Creation-Date: 2010-09-20 15:16+0000\n" +"PO-Revision-Date: 2010-09-12 21:07+0100\n" +"Last-Translator: Peter Krefting \n" +"Language-Team: Swedish \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" + +#: wt-status.c:56 +msgid "# Unmerged paths:" +msgstr "# Ej sammanslagna sökvägar:" + +#: wt-status.c:62 wt-status.c:79 +#, c-format +msgid "# (use \"git reset %s ...\" to unstage)" +msgstr "# (använd \"git reset %s ...\" för att ta bort från kö)" + +#: wt-status.c:64 wt-status.c:81 +msgid "# (use \"git rm --cached ...\" to unstage)" +msgstr "# (använd \"git rm --cached ...\" för att ta bort från kö)" + +#: wt-status.c:65 +msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr "# (använd \"git add/rm ...\" som lämpligt för att ange lösning)" + +#: wt-status.c:73 +msgid "# Changes to be committed:" +msgstr "# Ändringar att checka in:" + +#: wt-status.c:91 +msgid "# Changed but not updated:" +msgstr "# Ändrade men inte uppdaterade:" + +#: wt-status.c:95 +msgid "# (use \"git add ...\" to update what will be committed)" +msgstr "" +"# (använd \"git add ...\" för att uppdatera vad som skall checkas in)" + +#: wt-status.c:97 +msgid "# (use \"git add/rm ...\" to update what will be committed)" +msgstr "" +"# (använd \"git add/rm ...\" för att uppdatera vad som skall checkas " +"in)" + +#: wt-status.c:98 +msgid "" +"# (use \"git checkout -- ...\" to discard changes in working " +"directory)" +msgstr "" +"# (använd \"git checkout -- ...\" för att förkasta ändringar i " +"arbetskatalogen)" + +#: wt-status.c:100 +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:109 +#, c-format +msgid "# %s files:" +msgstr "# %s filer:" + +#: wt-status.c:112 +#, c-format +msgid "# (use \"git %s ...\" to include in what will be committed)" +msgstr "" +"# (använd \"git %s ...\" för att ta med i vad som skall checkas in)" + +#: wt-status.c:129 +msgid "bug" +msgstr "programfel" + +#: wt-status.c:134 +msgid "both deleted:" +msgstr "borttaget av bägge:" + +#: wt-status.c:135 +msgid "added by us:" +msgstr "tillagt av oss:" + +#: wt-status.c:136 +msgid "deleted by them:" +msgstr "borttaget av dem:" + +#: wt-status.c:137 +msgid "added by them:" +msgstr "tillagt av dem:" + +#: wt-status.c:138 +msgid "deleted by us:" +msgstr "borttaget av oss:" + +#: wt-status.c:139 +msgid "both added:" +msgstr "tillagt av bägge:" + +#: wt-status.c:140 +msgid "both modified:" +msgstr "ändrat av bägge:" + +#: wt-status.c:170 +msgid "new commits, " +msgstr "nya incheckningar, " + +#: wt-status.c:172 +msgid "modified content, " +msgstr "ändrat innehåll, " + +#: wt-status.c:174 +msgid "untracked content, " +msgstr "ospårat innehåll, " + +#: wt-status.c:188 +#, c-format +msgid "new file: %s" +msgstr "ny fil: %s" + +#: wt-status.c:191 +#, c-format +msgid "copied: %s -> %s" +msgstr "kopierad: %s -> %s" + +#: wt-status.c:194 +#, c-format +msgid "deleted: %s" +msgstr "borttagen: %s" + +#: wt-status.c:197 +#, c-format +msgid "modified: %s" +msgstr "ändrad: %s" + +#: wt-status.c:200 +#, c-format +msgid "renamed: %s -> %s" +msgstr "namnbyte: %s -> %s" + +#: wt-status.c:203 +#, c-format +msgid "typechange: %s" +msgstr "typbyte: %s" + +#: wt-status.c:206 +#, c-format +msgid "unknown: %s" +msgstr "okänd: %s" + +#: wt-status.c:209 +#, c-format +msgid "unmerged: %s" +msgstr "osammansl.: %s" + +#: wt-status.c:212 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "programfel: diff-status %c ej hanterad" + +#: wt-status.c:635 +msgid "On branch " +msgstr "På grenen " + +#: wt-status.c:642 +msgid "Not currently on any branch." +msgstr "Inte på någon gren för närvarande." + +#: wt-status.c:652 +msgid "# Initial commit" +msgstr "# Grundincheckning" + +#: wt-status.c:666 +msgid "Untracked" +msgstr "Ospårad" + +#: wt-status.c:668 +msgid "Ignored" +msgstr "Ignorerad" + +#: wt-status.c:670 +#, c-format +msgid "# Untracked files not listed%s\n" +msgstr "# Ospårade filer visas ej%s\n" + +#: wt-status.c:672 +msgid " (use -u option to show untracked files)" +msgstr " (använd flaggan -u för att visa ospårade filer)" + +#: wt-status.c:678 +#, c-format +msgid "# No changes\n" +msgstr "# Inga ändringar\n" + +#: wt-status.c:682 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "inga ändringar att checka in%s\n" + +#: wt-status.c:684 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (använd \"git add\" och/eller \"git commit -a\")" + +#: wt-status.c:686 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "inget köat för incheckning, men ospårade filer finns%s\n" + +#: wt-status.c:688 +msgid " (use \"git add\" to track)" +msgstr " (använd \"git add\" för att spåra)" + +#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#, c-format +msgid "nothing to commit%s\n" +msgstr "inget att checka in%s\n" + +#: wt-status.c:691 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" + +#: wt-status.c:694 +msgid " (use -u to show untracked files)" +msgstr " (använd -u för att visa ospårade filer)" + +#: wt-status.c:697 +msgid " (working directory clean)" +msgstr " (arbetskatalogen ren)" + +#: wt-status.c:795 +msgid "HEAD (no branch)" +msgstr "HEAD (ingen gren)" + +#: wt-status.c:801 +msgid "Initial commit on " +msgstr "Grundincheckning på " + +#: wt-status.c:816 +msgid "behind " +msgstr "efter " + +#: wt-status.c:819 wt-status.c:822 +msgid "ahead " +msgstr "före " + +#: wt-status.c:824 +msgid ", behind " +msgstr ", efter " + +#: builtin/add.c:41 +#, c-format +msgid "unexpected diff status %c" +msgstr "diff-status %c förväntades inte" + +#: builtin/add.c:67 builtin/commit.c:244 +msgid "updating files failed" +msgstr "misslyckades uppdatera filer" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "ta bort \"%s\"\n" + +#: builtin/add.c:175 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: builtin/add.c:191 +msgid "Unstaged changes after refreshing the index:" +msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" + +#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" + +#: builtin/add.c:208 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: builtin/add.c:275 +msgid "Could not read the index" +msgstr "Kunde inte läsa indexet" + +#: builtin/add.c:284 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: builtin/add.c:288 +msgid "Could not write patch" +msgstr "Kunde inte skriva patch" + +#: builtin/add.c:293 +#, c-format +msgid "Could not stat '%s'" +msgstr "Kunde inte ta status på \"%s\"" + +#: builtin/add.c:295 +msgid "Empty patch. Aborted." +msgstr "Tom patch. Avbryter." + +#: builtin/add.c:301 +#, c-format +msgid "Could not apply '%s'" +msgstr "Kunde inte applicera \"%s\"" + +#: builtin/add.c:349 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Använd -f om du verkligen vill lägga till dem.\n" + +#: builtin/add.c:350 +msgid "no files added" +msgstr "inga filer har lagts till" + +#: builtin/add.c:356 +msgid "adding files failed" +msgstr "misslyckades lägga till filer" + +#: builtin/add.c:388 +msgid "-A and -u are mutually incompatible" +msgstr "-A och -u är ömsesidigt inkompatibla" + +#: builtin/add.c:390 +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:410 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "Inget angivet, inget tillagt.\n" + +#: builtin/add.c:411 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Kanske menade du att skriva \"git add .\"?\n" + +#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 +#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +msgid "index file corrupt" +msgstr "indexfilen trasig" + +#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +msgid "Unable to write new index file" +msgstr "Kunde inte skriva ny indexfil" + +#: 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:36 +msgid "git archive: Remote with no URL" +msgstr "git archive: Fjärr utan URL" + +#: builtin/archive.c:46 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: förväntade ACK/NAK, fick EOF" + +#: builtin/archive.c:51 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:52 +msgid "git archive: protocol error" +msgstr "git archive: protokollfel" + +#: builtin/archive.c:57 +msgid "git archive: expected a flush" +msgstr "git archive: förväntade en tömning (flush)" + +#: builtin/branch.c:136 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but it is not yet merged to HEAD." +msgstr "" +"tar bort grenen \"%s\" som inte har slagits ihop med\n" +" \"%s\", men som ännu inte slagits ihop med HEAD." + +#: builtin/branch.c:140 +#, 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." + +#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" +#: builtin/branch.c:161 +msgid "remote " +msgstr "fjärr" + +#: builtin/branch.c:169 +msgid "cannot use -a with -d" +msgstr "kan inte ange -a med -d" + +#: builtin/branch.c:175 +msgid "Couldn't look up commit object for HEAD" +msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" + +#: builtin/branch.c:180 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." + +#: builtin/branch.c:190 +#, c-format +msgid "%sbranch '%s' not found." +msgstr "%sgrenen \"%s\" hittades inte." + +#: builtin/branch.c:198 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" + +#: builtin/branch.c:204 +#, 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:212 +#, c-format +msgid "Error deleting %sbranch '%s'" +msgstr "Fel vid borttagning av %sgrenen \"%s\"" + +#: builtin/branch.c:217 +#, c-format +msgid "Deleted %sbranch %s (was %s).\n" +msgstr "Tog bort %sgrenen %s (var %s).\n" + +#: builtin/branch.c:222 +msgid "Update of config-file failed" +msgstr "Misslyckades uppdatera konfigurationsfil" + +#: builtin/branch.c:304 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "grenen \"%s\" pekar inte på en incheckning" + +#: builtin/branch.c:381 +#, c-format +msgid "behind %d] " +msgstr "bakom %d] " + +#: builtin/branch.c:383 +#, c-format +msgid "ahead %d] " +msgstr "före %d] " + +#: builtin/branch.c:385 +#, c-format +msgid "ahead %d, behind %d] " +msgstr "före %d, bakom %d] " + +#: builtin/branch.c:484 +msgid "(no branch)" +msgstr "(ingen gren)" + +#: builtin/branch.c:544 +msgid "some refs could not be read" +msgstr "vissa referenser kunde inte läsas" + +#: builtin/branch.c:557 +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:567 builtin/branch.c:571 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Felaktigt namn på gren: \"%s\"" + +#: builtin/branch.c:574 +#, c-format +msgid "A branch named '%s' already exists." +msgstr "Det finns redan en gren som heter \"%s\"" + +#: builtin/branch.c:580 +msgid "Branch rename failed" +msgstr "Misslyckades byta namn på gren" + +#: builtin/branch.c:584 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" + +#: builtin/branch.c:588 +#, 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:595 +msgid "Branch is renamed, but update of config-file failed" +msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" + +#: builtin/branch.c:610 +#, c-format +msgid "malformed object name %s" +msgstr "felformat objektnamn %s" + +#: builtin/branch.c:680 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Misslyckades slå upp HEAD som giltig referens" + +#: builtin/branch.c:686 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD hittades inte under refs/heads!" + +#: builtin/branch.c:706 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " +"grennamn" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s är okej\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." + +#: builtin/checkout.c:107 builtin/checkout.c:135 +#, c-format +msgid "path '%s' does not have our version" +msgstr "sökvägen \"%s\" har inte vår version" + +#: builtin/checkout.c:109 builtin/checkout.c:137 +#, c-format +msgid "path '%s' does not have their version" +msgstr "sökvägen \"%s\" har inte deras version" + +#: builtin/checkout.c:120 +#, c-format +msgid "path '%s' does not have all three versions" +msgstr "sökvägen \"%s\" har inte alla tre versionerna" + +#: builtin/checkout.c:155 +#, c-format +msgid "path '%s' does not have all 3 versions" +msgstr "sökvägen \"%s\" har inte alla 3 versionerna" + +#: builtin/checkout.c:172 +#, c-format +msgid "path '%s': cannot merge" +msgstr "sökväg \"%s\": kan inte slå ihop" + +#: builtin/checkout.c:189 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" + +#: builtin/checkout.c:194 builtin/reset.c:170 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" + +#: builtin/checkout.c:216 builtin/checkout.c:371 +msgid "corrupt index file" +msgstr "indexfilen är trasig" + +#: builtin/checkout.c:244 builtin/checkout.c:251 +#, c-format +msgid "path '%s' is unmerged" +msgstr "sökvägen \"%s\" har inte slagits ihop" + +#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 +#: builtin/merge.c:737 +msgid "unable to write new index file" +msgstr "kunde inte skriva ny indexfil" + +#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +msgid "diff_setup_done failed" +msgstr "diff_setup_done misslyckades" + +#: builtin/checkout.c:393 +msgid "you need to resolve your current index first" +msgstr "du måste lösa ditt befintliga index först" + +#: builtin/checkout.c:524 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Kan inte skapa referenslog för \"%s\"\n" + +#: builtin/checkout.c:550 +#, c-format +msgid "Already on '%s'\n" +msgstr "Redan på \"%s\"\n" + +#: builtin/checkout.c:554 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Växlade till och nollställde grenen \"%s\"\n" + +#: builtin/checkout.c:556 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Växlade till en ny gren \"%s\"\n" + +#: builtin/checkout.c:558 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Växlade till grenen \"%s\"\n" + +#: builtin/checkout.c:575 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:603 +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:617 +msgid "Previous HEAD position was" +msgstr "Tidigare position för HEAD var" + +#: builtin/checkout.c:730 +msgid "-B cannot be used with -b" +msgstr "-B kan inte användas med -b" + +#: builtin/checkout.c:738 +msgid "--patch is incompatible with all other options" +msgstr "--patch är inkompatibel med alla andra flaggor" + +#: builtin/checkout.c:744 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:751 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:757 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan och --b|-B kan inte användas samtidigt" + +#: builtin/checkout.c:759 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kan inte användas med -t" + +#: builtin/checkout.c:769 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f och -m är inkompatibla" + +#. case (1) +#: builtin/checkout.c:815 +#, c-format +msgid "invalid reference: %s" +msgstr "felaktig referens: %s" + +#. case (1): want a tree +#: builtin/checkout.c:852 +#, c-format +msgid "reference is not a tree: %s" +msgstr "referensen är inte ett träd: %s" + +#: builtin/checkout.c:878 +msgid "invalid path specification" +msgstr "felaktig sökvägsangivelse" + +#: builtin/checkout.c:886 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" +"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" +"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" + +#: builtin/checkout.c:888 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." + +#: builtin/checkout.c:893 +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:904 +#, c-format +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." + +#: builtin/checkout.c:909 +#, c-format +msgid "git checkout: branch %s already exists" +msgstr "git checkout: grenen %s finns redan" + +#: builtin/checkout.c:916 +msgid "Cannot switch branch to a non-commit." +msgstr "Kan inte växla gren på en icke-incheckning." + +#: builtin/checkout.c:919 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs är inkompatibla när du växlar gren." + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x och -X kan inte användas samtidigt" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " +"städa" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " +"vägrar städa" + +#: builtin/clean.c:154 builtin/clean.c:175 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:158 builtin/clean.c:178 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:161 builtin/clean.c:181 +#, c-format +msgid "failed to remove '%s'" +msgstr "kunde inte ta bort \"%s\"" + +#: builtin/clean.c:165 +#, c-format +msgid "Would not remove %s\n" +msgstr "Skulle inte ta bort %s\n" + +#: builtin/clean.c:167 +#, c-format +msgid "Not removing %s\n" +msgstr "Tar inte bort %s\n" + +#: builtin/clone.c:208 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "referensarkivet \"%s\" är inte en lokal katalog." + +#: builtin/clone.c:235 +#, c-format +msgid "failed to open '%s'" +msgstr "misslyckades öppna \"%s\"" + +#: builtin/clone.c:239 +#, c-format +msgid "failed to create directory '%s'" +msgstr "misslyckades skapa katalogen \"%s\"" + +#: builtin/clone.c:241 builtin/diff.c:74 +#, c-format +msgid "failed to stat '%s'" +msgstr "misslyckades ta status på \"%s\"" + +#: builtin/clone.c:243 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s finns och är ingen katalog" + +#: builtin/clone.c:257 +#, c-format +msgid "failed to stat %s\n" +msgstr "misslyckades ta status på %s\n" + +#: builtin/clone.c:267 +#, c-format +msgid "failed to unlink '%s'" +msgstr "misslyckades ta bort länken \"%s\"" + +#: builtin/clone.c:272 +#, c-format +msgid "failed to create link '%s'" +msgstr "misslyckades skapa länken \"%s\"" + +#: builtin/clone.c:276 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "misslyckades kopiera filen till \"%s\"" + +#: builtin/clone.c:305 +#, c-format +msgid "done.\n" +msgstr "klart.\n" + +#: builtin/clone.c:387 +msgid "Too many arguments." +msgstr "För många argument." + +#: builtin/clone.c:391 +msgid "You must specify a repository to clone." +msgstr "Du måste ange ett arkiv att klona." + +#: builtin/clone.c:399 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#: builtin/clone.c:428 +#, 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:438 +#, c-format +msgid "working tree '%s' already exists." +msgstr "arbetsträdet \"%s\" finns redan." + +#: builtin/clone.c:451 builtin/clone.c:465 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:454 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "kunde inte skapa arbetskatalogen \"%s\"" + +#: builtin/clone.c:470 +#, c-format +msgid "Cloning into bare repository %s\n" +msgstr "Klonar till ett naket arkiv %s\n" + +#: builtin/clone.c:472 +#, c-format +msgid "Cloning into %s\n" +msgstr "Klonar till %s\n" + +#: builtin/clone.c:530 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Vet inte hur man klonar %s" + +#: builtin/clone.c:569 +#, c-format +msgid "Remote branch %s not found in upstream %s, using HEAD instead" +msgstr "" +"Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället" + +#: builtin/clone.c:579 +msgid "You appear to have cloned an empty repository." +msgstr "Du verkar ha klonat ett tomt arkiv." + +#: builtin/clone.c:621 +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/commit.c:41 +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" +"If the identity used for this commit is wrong, you can fix it with:\n" +"\n" +" git commit --amend --author='Your Name '\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" +"Om identiteten som användes för incheckningen är felaktig kan du\n" +"rätta den med:\n" +"\n" +" git commit --amend --author='Ditt namn '\n" + +#: builtin/commit.c:53 +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:271 +msgid "failed to unpack HEAD tree object" +msgstr "misslyckades packa upp HEAD:s trädobjekt" + +#: builtin/commit.c:299 +msgid "interactive add failed" +msgstr "interaktiv tilläggning misslyckades" + +#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +msgid "unable to write new_index file" +msgstr "kunde inte skriva filen new_index" + +#: builtin/commit.c:380 +msgid "cannot do a partial commit during a merge." +msgstr "kan inte utföra en delvis incheckning under en sammanslagning." + +#: builtin/commit.c:389 +msgid "cannot read the index" +msgstr "kan inte läsa indexet" + +#: builtin/commit.c:409 +msgid "unable to write temporary index file" +msgstr "kunde inte skriva temporär indexfil" + +#: builtin/commit.c:456 builtin/commit.c:1294 +msgid "could not parse HEAD commit" +msgstr "kunde inte tolka HEAD:s incheckning" + +#: builtin/commit.c:475 builtin/commit.c:481 +#, c-format +msgid "invalid commit: %s" +msgstr "felaktig incheckning: %s" + +#: builtin/commit.c:499 +msgid "malformed --author parameter" +msgstr "felformad \"--author\"-flagga" + +#: builtin/commit.c:573 builtin/shortlog.c:299 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(läser loggmeddelande från standard in)\n" + +#: builtin/commit.c:575 +msgid "could not read log from standard input" +msgstr "kunde inte läsa logg från standard in" + +#: builtin/commit.c:579 +#, c-format +msgid "could not read log file '%s'" +msgstr "kunde inte läsa loggfilen \"%s\"" + +#: builtin/commit.c:585 +msgid "commit has empty message" +msgstr "incheckningen har ett tomt meddelande" + +#: builtin/commit.c:591 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:595 +msgid "could not read SQUASH_MSG" +msgstr "kunde inte läsa SQUASH_MSG" + +#: builtin/commit.c:599 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/commit.c:612 +#, c-format +msgid "could not open '%s'" +msgstr "kunde inte öppna \"%s\"" + +#: builtin/commit.c:636 +msgid "could not write commit template" +msgstr "kunde inte skriva incheckningsmall" + +#: builtin/commit.c:650 +#, 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" +"#\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" +"#\n" + +#: builtin/commit.c:659 +#, c-format +msgid "" +"\n" +"# Please enter the commit message for your changes." +msgstr "" +"\n" +"# Ange ett incheckningsmeddelande för dina ändringar." + +#: builtin/commit.c:663 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" + +#: builtin/commit.c:668 +#, c-format +msgid "" +" Lines starting\n" +"# with '#' will be kept; you may remove them yourself if you want to.\n" +"# An empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"# Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:680 +#, c-format +msgid "%s# Author: %s\n" +msgstr "%s# Författare: %s\n" + +#: builtin/commit.c:688 +#, c-format +msgid "%s# Committer: %s\n" +msgstr "%s# Incheckare: %s\n" + +#: builtin/commit.c:705 +msgid "Cannot read index" +msgstr "Kan inte läsa indexet" + +#: builtin/commit.c:737 +msgid "Error building trees" +msgstr "Fel vid byggande av träd" + +#: builtin/commit.c:752 builtin/tag.c:321 +#, 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:832 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Hittade ingen befintlig författare med \"%s\"" + +#: builtin/commit.c:847 builtin/commit.c:1039 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ogiltigt läge för ospårade filer: \"%s\"" + +#: builtin/commit.c:864 +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:878 +msgid "You have nothing to amend." +msgstr "Du har inget att utöka." + +#: builtin/commit.c:880 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Du är i mitten av en incheckning -- kan inte utöka." + +#: builtin/commit.c:889 +msgid "Only one of -c/-C/-F can be used." +msgstr "Kan endast använda en av -c/-C/-F." + +#: builtin/commit.c:891 +msgid "Option -m cannot be combined with -c/-C/-F." +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." + +#: builtin/commit.c:897 +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:906 +#, c-format +msgid "could not lookup commit %s" +msgstr "kunde inte slå upp incheckningen %s" + +#: builtin/commit.c:909 +#, c-format +msgid "could not parse commit %s" +msgstr "kunde inte tolka incheckningen %s" + +#: builtin/commit.c:937 +msgid "Only one of --include/--only/--all/--interactive can be used." +msgstr "Endast en av --include/--only/--all/--interactive kan användas." + +#: builtin/commit.c:939 +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:941 +msgid "Clever... amending the last one with dirty index." +msgstr "Smart... utöka den senaste med smutsigt index." + +#: builtin/commit.c:943 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..." + +#: builtin/commit.c:953 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Felaktigt städningsläge %s" + +#: builtin/commit.c:958 +msgid "Paths with -a does not make sense." +msgstr "Kan inte ange sökvägar med -a." + +#: builtin/commit.c:960 +msgid "Paths with --interactive does not make sense." +msgstr "Kan inte ange sökvägar med --interactive." + +#: builtin/commit.c:1142 +msgid "couldn't look up newly created commit" +msgstr "kunde inte slå upp en precis skapad incheckning" + +#: builtin/commit.c:1144 +msgid "could not parse newly created commit" +msgstr "kunde inte tolka en precis skapad incheckning" + +#: builtin/commit.c:1185 +msgid "detached HEAD" +msgstr "frånkopplad HEAD" + +#: builtin/commit.c:1187 +msgid " (root-commit)" +msgstr " (rotincheckning)" + +#: builtin/commit.c:1307 builtin/merge.c:461 +#, c-format +msgid "could not open '%s' for reading" +msgstr "kunde inte öppna \"%s\" för läsning" + +#: builtin/commit.c:1312 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Trasig MERGE_HEAD-fil (%s)" + +#: builtin/commit.c:1319 +msgid "could not read MERGE_MODE" +msgstr "kunde inte läsa MERGE_MODE" + +#: builtin/commit.c:1336 +#, c-format +msgid "could not read commit message: %s" +msgstr "kunde inte läsa incheckningsmeddelande: %s" + +#: builtin/commit.c:1350 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" + +#: builtin/commit.c:1358 +msgid "failed to write commit object" +msgstr "kunde inte skriva incheckningsobjekt" + +#: builtin/commit.c:1375 +msgid "cannot lock HEAD ref" +msgstr "kunde inte låsa HEAD-referens" + +#: builtin/commit.c:1379 +msgid "cannot update HEAD ref" +msgstr "kunde inte uppdatera HEAD-referens" + +#: builtin/commit.c:1388 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "" +"Arkivet har uppdaterats, men kunde inte skriva filen\n" +"new_index. Kontrollera att disken inte är full och\n" +"att kvoten inte har överskridits, och kör sedan\n" +"\"git reset HEAD\" för att återställa." + +#: builtin/describe.c:205 +#, c-format +msgid "annotated tag %s not available" +msgstr "den dekorerade taggen %s inte tillgänglig" + +#: builtin/describe.c:209 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "den dekorerade taggen %s har inget inbäddat namn" + +#: builtin/describe.c:211 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "taggen \"%s\" är i verkligheten \"%s\" här" + +#: builtin/describe.c:238 +#, c-format +msgid "Not a valid object name %s" +msgstr "Objektnamnet är inte giltigt: %s" + +#: builtin/describe.c:241 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s är inte ett giltigt \"%s\"-objekt" + +#: builtin/describe.c:258 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "ingen tagg motsvarar \"%s\" exakt" + +#: builtin/describe.c:260 +#, c-format +msgid "searching to describe %s\n" +msgstr "söker för att beskriva %s\n" + +#: builtin/describe.c:295 +#, c-format +msgid "finished search at %s\n" +msgstr "avslutade sökning på %s\n" + +#: builtin/describe.c:319 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Inga dekorerade taggar kan beskriva \"%s\".\n" +"Det finns dock odekorerade taggar: testa --tags." + +#: builtin/describe.c:323 +#, 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:344 +#, c-format +msgid "traversed %lu commits\n" +msgstr "traverserade %lu incheckningar\n" + +#: builtin/describe.c:347 +#, 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:398 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long är inkompatibel med --abbrev=0" + +#: builtin/describe.c:423 +msgid "No names found, cannot describe anything." +msgstr "Inga namn hittades, kan inte beskriva något." + +#: builtin/describe.c:430 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty är inkompatibelt med \"committish\"-värden" + +#: builtin/diff.c:76 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "\"%s\": inte en normal fil eller symbolisk länk" + +#: builtin/diff.c:225 +#, c-format +msgid "invalid option: %s" +msgstr "ogiltig flagga: %s" + +#: builtin/diff.c:302 +msgid "Not a git repository" +msgstr "Inte ett git-arkiv" + +#: builtin/diff.c:334 +msgid "No HEAD commit to compare with (yet)" +msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" + +#: builtin/diff.c:349 +#, c-format +msgid "invalid object '%s' given." +msgstr "objektet \"%s\" som angavs är felaktigt." + +#: builtin/diff.c:354 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "mer än %d träd angavs: \"%s\"" + +#: builtin/diff.c:364 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "mer än två blobbar angavs: \"%s\"" + +#: builtin/diff.c:372 +#, c-format +msgid "unhandled object '%s' given." +msgstr "ej hanterat objekt \"%s\" angavs." + +#: builtin/fetch.c:175 +msgid "Couldn't find remote ref HEAD" +msgstr "Kunde inte hitta fjärr-referensen HEAD" + +#: builtin/fetch.c:228 +#, c-format +msgid "object %s not found" +msgstr "objektet %s hittades inte" + +#: builtin/fetch.c:233 +msgid "[up to date]" +msgstr "[àjour]" + +#. +#. * If this is the head, and it's not okay to update +#. * the head, and the old value of the head isn't empty... +#. +#: builtin/fetch.c:246 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" + +#: builtin/fetch.c:247 builtin/fetch.c:309 +msgid "[rejected]" +msgstr "[refuserad]" + +#: builtin/fetch.c:257 +msgid "[tag update]" +msgstr "[uppdaterad tagg]" + +#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +msgid " (unable to update local ref)" +msgstr " (kunde inte uppdatera lokal ref)" + +#: builtin/fetch.c:270 +msgid "[new tag]" +msgstr "[ny tagg]" + +#: builtin/fetch.c:274 +msgid "[new branch]" +msgstr "[ny gren]" + +#: builtin/fetch.c:305 +msgid "unable to update local ref" +msgstr "kunde inte uppdatera lokal ref" + +#: builtin/fetch.c:305 +msgid "forced update" +msgstr "tvingad uppdatering" + +#: builtin/fetch.c:310 +msgid "(non-fast-forward)" +msgstr "(ej snabbspolad)" + +#: builtin/fetch.c:328 builtin/fetch.c:651 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "kan inte öppna %s. %s\n" + +#: builtin/fetch.c:406 +#, c-format +msgid "From %.*s\n" +msgstr "Från %.*s\n" + +#: builtin/fetch.c:417 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"några 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:467 +msgid "could not run rev-list" +msgstr "kunde inte köra rev-list" + +#: builtin/fetch.c:481 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "kunde inte skriva till rev-list: %s" + +#: builtin/fetch.c:488 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "kunde inte stänga rev-list:s standard in: %s" + +#: builtin/fetch.c:515 +#, c-format +msgid " (%s will become dangling)\n" +msgstr " (%s kommer bli dinglande)\n" + +#: builtin/fetch.c:516 +#, c-format +msgid " (%s has become dangling)\n" +msgstr " (%s har blivit dinglande)\n" + +#: builtin/fetch.c:523 +msgid "[deleted]" +msgstr "[borttagen]" + +#: builtin/fetch.c:524 +msgid "(none)" +msgstr "(ingen)" + +#: builtin/fetch.c:641 +#, 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:675 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "Vet inte hur man hämtar från %s" + +#: builtin/fetch.c:729 +#, 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:732 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "Flaggan \"%s\" ignoreras för %s\n" + +#: builtin/fetch.c:821 +#, c-format +msgid "Fetching %s\n" +msgstr "Hämtar %s\n" + +#: builtin/fetch.c:823 +#, c-format +msgid "Could not fetch %s" +msgstr "Kunde inte hämta %s" + +#: builtin/fetch.c:839 +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 skall hämtas från." + +#: builtin/fetch.c:859 +msgid "You need to specify a tag name." +msgstr "Du måste ange namnet på en tagg." + +#: builtin/fetch.c:899 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all tar inte namnet på ett arkiv som argument" + +#: builtin/fetch.c:901 +msgid "fetch --all does not make sense with refspecs" +msgstr "fetch --all kan inte anges med referensspecifikationer" + +#: builtin/fetch.c:912 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "Fjärren eller fjärrgruppen finns inte: %s" + +#: builtin/fetch.c:920 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Kan inte hämta från grupp och ange referensspecifikationer" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "Felaktigt %s: \"%s\"" + +#: builtin/gc.c:78 +msgid "Too many options specified" +msgstr "För många flaggor angavs" + +#: builtin/gc.c:103 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "tokigt lång objektkatalog %.*s" + +#: builtin/gc.c:220 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "Packar arkivet automatiskt för optimal prestanda.\n" + +#: builtin/gc.c:223 +#, c-format +msgid "" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information." +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." + +#: builtin/gc.c:251 +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:252 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: misslyckades skapa tråd. %s" + +#: builtin/grep.c:457 +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\" kunde inte läsa %s" + +#: builtin/grep.c:508 +#, c-format +msgid "'%s': %s" +msgstr "\"%s\": %s" + +#: builtin/grep.c:519 +#, c-format +msgid "'%s': short read %s" +msgstr "\"%s\": kort läsning %s" + +#: builtin/grep.c:581 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Kunde inte byta katalog (chdir): %s" + +#: builtin/grep.c:671 builtin/grep.c:697 +#, c-format +msgid "unable to read tree (%s)" +msgstr "kunde inte läsa träd (%s)" + +#: builtin/grep.c:703 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "Kunde inte \"grep\" från objekt av typen %s" + +#: builtin/grep.c:755 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "flaggan \"%c\" antar ett numeriskt värde" + +#: builtin/grep.c:771 +#, c-format +msgid "cannot open '%s'" +msgstr "kan inte öppna \"%s\"" + +#: builtin/grep.c:1012 +msgid "no pattern given." +msgstr "inget mönster angavs." + +#: builtin/grep.c:1016 +msgid "cannot mix --fixed-strings and regexp" +msgstr "kan inte blanda --fixed-strings och reguljära uttryck" + +#: builtin/grep.c:1041 +#, c-format +msgid "bad object %s" +msgstr "felaktigt objekt %s" + +#: builtin/grep.c:1068 +msgid "--open-files-in-pager only works on the worktree" +msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" + +#: builtin/grep.c:1093 +msgid "--cached cannot be used with --no-index." +msgstr "--cached kan inte användas med --no-index." + +#: builtin/grep.c:1095 +msgid "--no-index cannot be used with revs." +msgstr "--no-index kan inte användas med revisioner." + +#: builtin/grep.c:1104 +msgid "both --cached and trees are given." +msgstr "både --cached och träd angavs." + +#: builtin/init-db.c:34 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Kunde inte göra %s skrivbar för grubben" + +#: builtin/init-db.c:61 +#, c-format +msgid "insanely long template name %s" +msgstr "tokigt långt namn på mallen %s" + +#: builtin/init-db.c:66 +#, c-format +msgid "cannot stat '%s'" +msgstr "kan inte ta status på \"%s\"" + +#: builtin/init-db.c:72 +#, c-format +msgid "cannot stat template '%s'" +msgstr "kan inte ta status på mallen \"%s\"" + +#: builtin/init-db.c:79 +#, c-format +msgid "cannot opendir '%s'" +msgstr "kan inte öppna katalogen (opendir) \"%s\"" + +#: builtin/init-db.c:96 +#, c-format +msgid "cannot readlink '%s'" +msgstr "kan inte läsa länk (readlink) \"%s\"" + +#: builtin/init-db.c:98 +#, c-format +msgid "insanely long symlink %s" +msgstr "tokigt lång symbolisk länk %s" + +#: builtin/init-db.c:101 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" + +#: builtin/init-db.c:105 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "kan inte kopiera \"%s\" till \"%s\"" + +#: builtin/init-db.c:109 +#, c-format +msgid "ignoring template %s" +msgstr "ignorerar mallen %s" + +#: builtin/init-db.c:132 +#, c-format +msgid "insanely long template path %s" +msgstr "tokigt lång mallsökväg %s" + +#: builtin/init-db.c:140 +#, c-format +msgid "templates not found %s" +msgstr "mallarna hittades inte %s" + +#: builtin/init-db.c:153 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" + +#: builtin/init-db.c:191 +#, c-format +msgid "insane git directory %s" +msgstr "tokig git-katalog %s" + +#. TRANSLATORS: The first '%s' is either "Reinitialized +#. existing" or "Initialized empty", the second " shared" or +#. "", and the last '%s%s' is the verbatim directory name. +#: builtin/init-db.c:355 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s Git-arkiv i %s%s\n" + +#: builtin/init-db.c:356 +msgid "Reinitialized existing" +msgstr "Ominitierade befintligt" + +#: builtin/init-db.c:356 +msgid "Initialized empty" +msgstr "Initierade tomt" + +#: builtin/init-db.c:357 +msgid " shared" +msgstr " delat" + +#: builtin/init-db.c:376 +msgid "cannot tell cwd" +msgstr "kan inte läsa aktuell katalog (cwd)" + +#: builtin/init-db.c:450 builtin/init-db.c:457 +#, c-format +msgid "cannot mkdir %s" +msgstr "kan inte skapa katalogen (mkdir) %s" + +#: builtin/init-db.c:461 +#, c-format +msgid "cannot chdir to %s" +msgstr "kan inte byta katalog (chdir) till %s" + +#: builtin/init-db.c:483 +#, c-format +msgid "" +"%s (or --work-tree=) not allowed without specifying %s (or --git-" +"dir=)" +msgstr "" +"%s (eller --work-tree=) inte tillåtet utan att ange %s (eller --git-" +"dir=)" + +#: builtin/init-db.c:509 +msgid "Cannot access current working directory" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: builtin/init-db.c:512 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: builtin/log.c:104 +#, c-format +msgid "invalid --decorate option: %s" +msgstr "felaktigt värde till --decorate: %s" + +#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: builtin/log.c:156 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Slututdata: %d %s\n" + +#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 +#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 +msgid "revision walk setup failed" +msgstr "misslyckades skapa revisionstraversering" + +#: builtin/log.c:347 builtin/log.c:434 +#, c-format +msgid "Could not read object %s" +msgstr "Kunde inte läsa objektet %s" + +#: builtin/log.c:458 +#, c-format +msgid "Unknown type: %d" +msgstr "Okänd typ: %d" + +#: builtin/log.c:558 +msgid "format.headers without value" +msgstr "format.headers utan värde" + +#: builtin/log.c:630 +msgid "name of output directory is too long" +msgstr "namn på utdatakatalogen är för lång" + +#: builtin/log.c:641 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Kan inte öppna patchfilen %s" + +#: builtin/log.c:655 +msgid "Need exactly one range." +msgstr "Behöver precis ett intervall." + +#: builtin/log.c:663 +msgid "Not a range." +msgstr "Inte ett intervall." + +#: builtin/log.c:700 +msgid "Could not extract email from committer identity." +msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." + +#: builtin/log.c:732 +msgid "Cover letter needs email format" +msgstr "Omslagsbrevet behöver e-postformat" + +#: builtin/log.c:825 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "tokigt in-reply-to: %s" + +#: builtin/log.c:898 +msgid "Two output directories?" +msgstr "Två utdatakataloger?" + +#: builtin/log.c:1087 +#, c-format +msgid "bogus committer info %s" +msgstr "felaktig incheckarinformation %s" + +#: builtin/log.c:1132 +msgid "-n and -k are mutually exclusive." +msgstr "-n och -k kan inte användas samtidigt." + +#: builtin/log.c:1134 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix och -k kan inte användas samtidigt." + +#: builtin/log.c:1141 +msgid "--name-only does not make sense" +msgstr "kan inte använda --name-only" + +#: builtin/log.c:1143 +msgid "--name-status does not make sense" +msgstr "kan inte använda --name-status" + +#: builtin/log.c:1145 +msgid "--check does not make sense" +msgstr "kan inte använda --check" + +#: builtin/log.c:1166 +msgid "standard output, or directory, which one?" +msgstr "standard ut, eller katalog, vilken skall det vara?" + +#: builtin/log.c:1168 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Kunde inte skapa katalogen \"%s\"" + +#: builtin/log.c:1307 +msgid "Failed to create output files" +msgstr "Misslyckades skapa utdatafiler" + +#: builtin/log.c:1394 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify manually.\n" +msgstr "Kunde inte hitta en spårad fjärrgren, ange manuellt.\n" + +#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#, c-format +msgid "Unknown commit %s" +msgstr "Okänd incheckning %s" + +#: builtin/merge.c:82 +msgid "switch `m' requires a value" +msgstr "flaggan \"m\" behöver ett värde" + +#: builtin/merge.c:119 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" + +#: builtin/merge.c:120 +#, c-format +msgid "Available strategies are:" +msgstr "Tillgängliga strategier är:" + +#: builtin/merge.c:125 +#, c-format +msgid "Available custom strategies are:" +msgstr "Tillgängliga skräddarsydda strategier är:" + +#: builtin/merge.c:223 +msgid "could not run stash." +msgstr "kunde köra stash." + +#: builtin/merge.c:228 +msgid "stash failed" +msgstr "stash misslyckades" + +#: builtin/merge.c:233 +#, c-format +msgid "not a valid object: %s" +msgstr "inte ett giltigt objekt: %s" + +#: builtin/merge.c:250 +msgid "read-tree failed" +msgstr "read-tree misslyckades" + +#: builtin/merge.c:279 +msgid " (nothing to squash)" +msgstr " (inget att platta till)" + +#: builtin/merge.c:292 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 +#: builtin/merge.c:1309 +#, c-format +msgid "Could not write to '%s'" +msgstr "Kunde inte skriva till \"%s\"" + +#: builtin/merge.c:323 +msgid "Writing SQUASH_MSG" +msgstr "Skriver SQUASH_MSG" + +#: builtin/merge.c:325 +msgid "Finishing SQUASH_MSG" +msgstr "Avslutar SQUASH_MSG" + +#: builtin/merge.c:345 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" + +#: builtin/merge.c:396 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "\"%s\" verkar inte peka på en incheckning" + +#: builtin/merge.c:491 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" + +#: builtin/merge.c:553 +msgid "git write-tree failed to write a tree" +msgstr "git write--tree misslyckades skriva ett träd" + +#: builtin/merge.c:594 +msgid "failed to read the cache" +msgstr "misslyckads läsa cachen" + +#: builtin/merge.c:611 +msgid "Unable to write index." +msgstr "Kunde inte skriva indexet." + +#: builtin/merge.c:624 +msgid "Not handling anything other than two heads merge." +msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." + +#: builtin/merge.c:651 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Felaktig flagga för merge-recursive: -X%s" + +#: builtin/merge.c:666 +#, c-format +msgid "unable to write %s" +msgstr "kunde inte skriva %s" + +#: builtin/merge.c:791 +#, c-format +msgid "Wonderful.\n" +msgstr "Underbart.\n" + +#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 +#: builtin/merge.c:1303 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: builtin/merge.c:856 +#, 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:871 +#, c-format +msgid "'%s' is not a commit" +msgstr "\"%s\" är inte en incheckning" + +#: builtin/merge.c:921 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:924 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." + +#: builtin/merge.c:951 +msgid "You cannot combine --squash with --no-ff." +msgstr "Du kan inte kombinera --squash med --no-ff." + +#: builtin/merge.c:956 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Du kan inte kombinera --no-ff med --ff-only." + +#: builtin/merge.c:984 +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:987 +msgid "Squash commit into empty head not supported yet" +msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" + +#: builtin/merge.c:989 +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:993 builtin/merge.c:1041 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - inte något vi kan slå ihop" + +#: builtin/merge.c:1099 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Uppdaterar %s..%s\n" + +#: builtin/merge.c:1133 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" + +#: builtin/merge.c:1137 +#, c-format +msgid "Nope.\n" +msgstr "Nej.\n" + +#: builtin/merge.c:1170 +msgid "Not possible to fast-forward, aborting." +msgstr "Kan inte snabbspola, avbryter." + +#: builtin/merge.c:1196 builtin/merge.c:1269 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "Återspolar trädet till ofördärvat...\n" + +#: builtin/merge.c:1200 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Försöker sammanslagninsstrategin %s...\n" + +#: builtin/merge.c:1261 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" + +#: builtin/merge.c:1263 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Sammanslaning med strategin %s misslyckades.\n" + +#: builtin/merge.c:1271 +#, 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:1314 +#, 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/mv.c:103 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" + +#: builtin/mv.c:107 +msgid "bad source" +msgstr "felaktig källa" + +#: builtin/mv.c:110 +msgid "can not move directory into itself" +msgstr "kan inte flytta katalog till sig själv" + +#: builtin/mv.c:113 +msgid "cannot move directory over file" +msgstr "kan inte flytta katalog över fil" + +#: builtin/mv.c:123 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Vad? %.*s är i indexet?" + +#: builtin/mv.c:135 +msgid "source directory is empty" +msgstr "källkatalogen är tom" + +#: builtin/mv.c:166 +msgid "not under version control" +msgstr "inte versionshanterad" + +#: builtin/mv.c:168 +msgid "destination exists" +msgstr "destinationen finns" + +#: builtin/mv.c:175 +#, c-format +msgid "%s; will overwrite!" +msgstr "%s; kommer skriva över!" + +#: builtin/mv.c:178 +msgid "Cannot overwrite" +msgstr "Kan inte skriva över" + +#: builtin/mv.c:181 +msgid "multiple sources for the same target" +msgstr "flera källor för samma mål" + +#: builtin/mv.c:196 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, källa=%s, mål=%s" + +#: builtin/mv.c:206 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Byter namn på %s till %s\n" + +#: builtin/mv.c:209 +#, c-format +msgid "renaming '%s' failed" +msgstr "misslyckades byta namn på \"%s\"" + +#: builtin/notes.c:122 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "kunde int estarta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:128 +msgid "can't fdopen 'show' output fd" +msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#: builtin/notes.c:138 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#: builtin/notes.c:141 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" + +#: builtin/notes.c:158 builtin/tag.c:311 +#, c-format +msgid "could not create file '%s'" +msgstr "kunde inte skapa filen \"%s\"" + +#: builtin/notes.c:172 +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:193 builtin/notes.c:797 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Tar bort anteckning för objektet %s\n" + +#: builtin/notes.c:198 +msgid "unable to write note object" +msgstr "kunde inte skriva anteckningsobjekt" + +#: builtin/notes.c:200 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Anteckningens innehåll har lämnats kvar i %s" + +#: builtin/notes.c:234 builtin/tag.c:445 +#, c-format +msgid "cannot read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/notes.c:236 builtin/tag.c:448 +#, c-format +msgid "could not open or read '%s'" +msgstr "kunde inte öppna eller läsa \"%s\"" + +#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 +#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 +#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Kunde inte slå upp \"%s\" som en giltig referens." + +#: builtin/notes.c:258 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Kunde inte läsa objektet \"%s\"." + +#: builtin/notes.c:283 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" + +#: builtin/notes.c:295 +msgid "Failed to write current notes tree to database" +msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" + +#: builtin/notes.c:307 +msgid "Failed to commit notes tree to database" +msgstr "Kunde inte checka in anteckningsträd i databasen" + +#: builtin/notes.c:339 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Felaktigt värde för notes.rewriteMode: '%s'" + +#: builtin/notes.c:349 +#, 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 +#: builtin/notes.c:376 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Felaktigt värde på %s: \"%s\"" + +#: builtin/notes.c:440 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Felaktig indatarad: \"%s\"." + +#: builtin/notes.c:455 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" + +# FIXME: Untranslatable! +# +#. TRANSLATORS: The first %s is one of "git notes ACTION", +#. e.g. "add", "copy", "append" etc. +#: builtin/notes.c:481 +#, c-format +msgid "Refusing to %s notes in %s (outside of refs/notes/)" +msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" + +#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 +#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 +#: builtin/notes.c:782 builtin/notes.c:821 +msgid "too many parameters" +msgstr "för många parametrar" + +#: builtin/notes.c:505 +msgid "list" +msgstr "list" + +#: builtin/notes.c:514 builtin/notes.c:758 +#, c-format +msgid "No note found for object %s." +msgstr "Inga anteckningar hittades för objektet %s." + +#: builtin/notes.c:562 +msgid "add" +msgstr "add" + +#: builtin/notes.c:567 +#, 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:572 builtin/notes.c:649 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Skriver över befintliga anteckningar för objektet %s\n" + +#: builtin/notes.c:622 +msgid "too few parameters" +msgstr "för få parametrar" + +#: builtin/notes.c:638 +msgid "copy" +msgstr "copy" + +#: builtin/notes.c:643 +#, 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:655 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." + +#: builtin/notes.c:703 +#, 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:754 +msgid "show" +msgstr "show" + +#: builtin/notes.c:791 +msgid "remove" +msgstr "remove" + +#: builtin/notes.c:795 +#, c-format +msgid "Object %s has no note\n" +msgstr "Objektet %s har ingen anteckning\n" + +#: builtin/notes.c:825 +msgid "prune" +msgstr "prune" + +#: builtin/notes.c:877 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Okänt underkommando: %s" + +#: builtin/push.c:43 +msgid "tag shorthand without " +msgstr "taggförkortning utan " + +#: builtin/push.c:62 +msgid "--delete only accepts plain target ref names" +msgstr "--delete godtar endast enkla målreferensnamn" + +#: builtin/push.c:72 +msgid "You are not currently on a branch." +msgstr "Du är inte på någon gren för närvarande." + +#: builtin/push.c:74 +#, c-format +msgid "The current branch %s is not tracking anything." +msgstr "Den aktuella grenen %s spårar ingenting." + +#: builtin/push.c:77 +#, c-format +msgid "The current branch %s is tracking multiple branches, refusing to push." +msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." + +#: builtin/push.c:100 +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:120 +#, c-format +msgid "Pushing to %s\n" +msgstr "Sänder till %s\n" + +#: builtin/push.c:124 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "misslyckades sända några referenser till \"%s\"" + +#: builtin/push.c:132 +#, c-format +msgid "" +"To prevent you from losing history, non-fast-forward updates were rejected\n" +"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" +"'Note about fast-forwards' section of 'git push --help' for details.\n" +msgstr "" +"För att förhindra att du tappar historik har icke snabbspolande " +"uppdateringar\n" +"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder " +"igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " +"detaljer.\n" + +#: builtin/push.c:149 +#, c-format +msgid "bad repository '%s'" +msgstr "felaktigt arkiv \"%s\"" + +#: builtin/push.c:150 +msgid "No destination configured to push to." +msgstr "Har inte ställt in någon destination att sända till." + +#: builtin/push.c:158 +msgid "--all and --tags are incompatible" +msgstr "--all och --tags är inkompatibla" + +#: builtin/push.c:159 +msgid "--all can't be combined with refspecs" +msgstr "--all kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:164 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror och --tags är inkompatibla" + +#: builtin/push.c:165 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror kan inte kombineras med referensspecifikationer" + +#: builtin/push.c:170 +msgid "--all and --mirror are incompatible" +msgstr "--all och --mirror är inkompatibla" + +#: builtin/push.c:235 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete är imkompatibel med --all, --mirror och --tags" + +#: builtin/push.c:237 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete kan inte användas utan referenser" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "blandad" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "mjuk" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "hård" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "sammanslagning" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "behåll" + +#: builtin/reset.c:95 +msgid "You do not have a valid HEAD." +msgstr "Du har inte en giltig HEAD." + +#: builtin/reset.c:97 +msgid "Failed to find tree of HEAD." +msgstr "Kunde inte hitta träder för HEAD." + +#: builtin/reset.c:103 +#, c-format +msgid "Failed to find tree of %s." +msgstr "Kunde inte hitta träder för %s." + +#: builtin/reset.c:108 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + +#: builtin/reset.c:118 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD är nu på %s" + +#: builtin/reset.c:142 +msgid "Could not read index" +msgstr "Kunde inte läsa indexet" + +#: builtin/reset.c:145 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:225 +#, c-format +msgid "Reflog action message too long: %.*s..." +msgstr "Reflog-händelsemeddelande för långt: %.*s..." + +#: builtin/reset.c:231 +#, 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:307 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Kan inte tolka objektet \"%s\"" + +#: builtin/reset.c:312 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch är inkompatibel med --{hard,mixed,soft}" + +#: builtin/reset.c:321 +msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." +msgstr "" +"--mixed rekommenderas inte med sökvägar; använd \"git reset -- \"." + +#: builtin/reset.c:323 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "Kan inte göra %s återställning med sökvägar." + +#: builtin/reset.c:335 +#, 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:351 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." + +#: builtin/revert.c:82 +msgid "program error" +msgstr "programfel" + +#: builtin/revert.c:154 builtin/revert.c:188 +#, c-format +msgid "Could not read commit message of %s" +msgstr "Kunde inte läsa incheckningsmeddelandet för %s" + +#: builtin/revert.c:202 +#, c-format +msgid "Could not extract author email from %s" +msgstr "Kunde inte hämta författarens e-postadress från %s" + +#: builtin/revert.c:214 +#, c-format +msgid "Could not extract author time from %s" +msgstr "Kunde inte hämta författartid från %s" + +#: builtin/revert.c:230 +#, c-format +msgid "No author information found in %s" +msgstr "Hittade ingen författarinformation i %s" + +#: builtin/revert.c:267 +#, c-format +msgid "Could not write to %s." +msgstr "Kunde inte skriva till %s." + +#: builtin/revert.c:270 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fel vid ombrytning av %s" + +#: builtin/revert.c:290 +msgid "" +"Your local changes would be overwritten by revert.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"revert\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#: builtin/revert.c:293 +msgid "" +"Your local changes would be overwritten by cherry-pick.\n" +"Please, commit your changes or stash them to proceed." +msgstr "" +"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" +"Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:351 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Kunde inte skriva ny indexfil" + +#: builtin/revert.c:417 +msgid "Your index file is unmerged." +msgstr "Din indexfil har inte slagits ihop." + +#: builtin/revert.c:420 +msgid "You do not have a valid HEAD" +msgstr "Du har ingen giltig HEAD" + +#: builtin/revert.c:428 +msgid "Cannot revert a root commit" +msgstr "Kan inte ångra en rotincheckning" + +#: builtin/revert.c:437 +#, 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." + +#: builtin/revert.c:445 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Incheckning %s har inte förälder %d" + +#: builtin/revert.c:449 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: builtin/revert.c:460 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kan inte tolka föräldraincheckningen %s" + +#: builtin/revert.c:464 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kan inte hämta incheckningsmeddelande för %s" + +#: builtin/revert.c:525 +#, c-format +msgid "could not revert %s... %s" +msgstr "kunde inte ångra %s... %s" + +#: builtin/revert.c:526 +#, c-format +msgid "could not apply %s... %s" +msgstr "kunde inte applicera %s... %s" + +#: builtin/revert.c:559 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: builtin/revert.c:573 +msgid "cherry-pick --ff cannot be used with --signoff" +msgstr "cherry-pick --ff kan inte användas med --signoff" + +#: builtin/revert.c:575 +msgid "cherry-pick --ff cannot be used with --no-commit" +msgstr "cherry-pick --ff kan inte användas med --no-commit" + +#: builtin/revert.c:577 +msgid "cherry-pick --ff cannot be used with -x" +msgstr "cherry-pick --ff kan inte användas med -x" + +#: builtin/revert.c:579 +msgid "cherry-pick --ff cannot be used with --edit" +msgstr "cherry-pick --ff kan inte användas med --edit" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: builtin/revert.c:584 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: builtin/rm.c:118 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" +"(använd -f för att tvinga borttagning)" + +#: builtin/rm.c:124 +#, c-format +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)" + +#: builtin/rm.c:128 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"\"%s\" har lokala ändringar\n" +"(använd --cached för att behålla filen eller -f för att tvinga borttagning)" + +#: builtin/rm.c:202 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "tar inte bort \"%s\" rekursivt utan -r" + +#: builtin/rm.c:238 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: kan inte ta bort %s" + +#: builtin/shortlog.c:161 +#, c-format +msgid "Missing author: %s" +msgstr "Saknad författare: %s" + +#: builtin/tag.c:123 builtin/tag.c:464 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "taggnamnet för långt: %.*s..." + +#: builtin/tag.c:128 +#, c-format +msgid "tag '%s' not found." +msgstr "taggen \"%s\" hittades inte." + +#: builtin/tag.c:143 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tog bort tagg \"%s\" (var %s)\n" + +#: builtin/tag.c:155 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "kunde inte bekräfta taggen \"%s\"" + +#: builtin/tag.c:170 +msgid "committer info too long." +msgstr "incheckarinformation för lång." + +#: builtin/tag.c:190 +msgid "could not run gpg." +msgstr "kunde inte köra gpg." + +#: builtin/tag.c:196 +msgid "gpg did not accept the tag data" +msgstr "gpg godtog inte taggdata" + +#: builtin/tag.c:203 +msgid "gpg failed to sign the tag" +msgstr "gpg misslyckades signera taggen" + +#: builtin/tag.c:218 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Skriv ett taggmeddelande\n" +"#\n" + +#: builtin/tag.c:226 +#, c-format +msgid "signing key value too long (%.10s...)" +msgstr "signeringsnyckelvärdet för långt (%.10s...)" + +#: builtin/tag.c:272 +msgid "unable to sign the tag" +msgstr "kunde inte signera taggen" + +#: builtin/tag.c:274 +msgid "unable to write tag file" +msgstr "kunde inte skriva tagg-filen" + +#: builtin/tag.c:289 +msgid "bad object type." +msgstr "felaktig objekttyp" + +#: builtin/tag.c:302 +msgid "tag header too big." +msgstr "tagghuvud för stort." + +#: builtin/tag.c:329 +msgid "no tag message?" +msgstr "inget taggmeddelande?" + +#: builtin/tag.c:335 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Taggmeddelandet har lämnats i %s\n" + +#: builtin/tag.c:428 +msgid "-n option is only allowed with -l." +msgstr "Flaggan -n är endast tillåten tillsammans med -l." + +#: builtin/tag.c:430 +msgid "--contains option is only allowed with -l." +msgstr "Flaggan --contains är endast tillåten tillsammans med -l" + +#: builtin/tag.c:438 +msgid "only one -F or -m option is allowed." +msgstr "endast en av flaggorna -F eller -m tillåts." + +#: builtin/tag.c:458 +msgid "too many params" +msgstr "för många parametrar" + +#: builtin/tag.c:466 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "\"%s\" är inte ett giltigt taggnamn." + +#: builtin/tag.c:471 +#, c-format +msgid "tag '%s' already exists" +msgstr "taggen \"%s\" finns redan" + +#: builtin/tag.c:479 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: kan inte låsa referensen" + +#: builtin/tag.c:481 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: kan inte uppdatera referensen" + +#: builtin/tag.c:483 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Uppdaterad tagg \"%s\" (var %s)\n" + +#: git-am.sh:47 +msgid "You need to set your committer info first" +msgstr "Du måste ställa in din incheckarinformation först" + +#: git-am.sh:80 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\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 "" +"När du har löst problemet kör du \"$cmdline --resolved\".\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\"." + +#: git-am.sh:96 +msgid "Cannot fall back to three-way merge." +msgstr "Kan inte falla tillbaka på trevägssammanslagning." + +#: git-am.sh:111 +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." + +#: git-am.sh:120 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Vill du handredigera din patch?\n" +"Den kan inte appliceras på blobbar som antecknats i dess index." + +#: git-am.sh:236 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Endast en StGIT-patchserie kan appliceras åt gången" + +#: git-am.sh:288 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Patchformatet $patch_format stöds inte." + +#: git-am.sh:290 +msgid "Patch format detection failed." +msgstr "Misslyckades detektera patchformat." + +#: git-am.sh:340 +msgid "-d option is no longer supported. Do not use." +msgstr "Flaggan -d stöds inte lägre. Använd inte." + +#: git-am.sh:403 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs." + +#: git-am.sh:408 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Bestäm dig. --skip eller --abort?" + +#: git-am.sh:434 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Lösningsoperation pågår inte, vi återupptar inte." + +#: git-am.sh:499 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" + +#: git-am.sh:595 +#, sh-format +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\"." + +#: git-am.sh:632 +msgid "Patch does not have a valid e-mail address." +msgstr "Patchen har inte någon giltig e-postadress." + +#: git-am.sh:679 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" +"kan inte vara interaktiv om standard in inte är ansluten till en terminal." + +#: git-am.sh:683 +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. +#: git-am.sh:690 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " + +#: git-am.sh:726 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Applicerar: $FIRSTLINE" + +#: git-am.sh:747 +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 ändrinar - glömde du använda \"git add\"?\n" +"Om det inte är något kvar att köa kan det hända att någon annan redan\n" +"introducerat samma ändringar; kanske du bör hoppa över patchen." + +#: git-am.sh:755 +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 använda \"git add\"?" + +#: git-am.sh:771 +msgid "No changes -- Patch already applied." +msgstr "Inga ändringar -- Patchen har redan applicerats." + +#: git-am.sh:781 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" + +#: git-am.sh:797 +msgid "applying to an empty history" +msgstr "applicerar på en tom historik" + +#: git-bisect.sh:39 +#, fuzzy +msgid "You need to start by \"git bisect start\"" +msgstr "Du måste ställa in din incheckarinformation först" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:45 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "" + +#: git-bisect.sh:64 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:83 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:87 +msgid "Bad HEAD - strange symbolic ref" +msgstr "" + +#: git-bisect.sh:117 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "" + +#: git-bisect.sh:162 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "" + +#: git-bisect.sh:190 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:204 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "" + +#: git-bisect.sh:207 +msgid "Bad rev input: HEAD" +msgstr "" + +#: git-bisect.sh:216 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:222 +msgid "'git bisect bad' can take only one argument." +msgstr "" + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:245 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:251 +msgid "Are you sure [Y/n]? " +msgstr "" + +#: git-bisect.sh:261 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:264 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:316 +msgid "We are not bisecting." +msgstr "" + +#: git-bisect.sh:323 +#, fuzzy, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "\"%s\" är inte en incheckning" + +#: git-bisect.sh:352 +#, fuzzy, sh-format +msgid "cannot read $file for replaying" +msgstr "kan inte läsa indexet" + +#: git-bisect.sh:368 +msgid "?? what are you talking about?" +msgstr "" + +#: git-bisect.sh:380 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:386 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:409 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:414 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:420 +msgid "bisect run success" +msgstr "" + +#: git-pull.sh:21 +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 '\n" +"as appropriate to mark resolution, or use 'git commit -a'." +msgstr "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" + +#: git-pull.sh:141 +msgid "" +"There is no candidate for rebasing against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" + +#: git-pull.sh:145 +msgid "" +"There are no candidates for merging against among the refs that you just " +"fetched.\n" +"Generally this means that you provided a wildcard refspec which had no\n" +"matches on the remote end." +msgstr "" + +#. TRANSLATORS: $requested_remote will be a remote name, like +#. "origin" or "avar" +#: git-pull.sh:153 +#, sh-format +msgid "" +"You asked to pull from the remote '$requested_remote', 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 "" + +#: git-pull.sh:157 +msgid "" +"You are not currently on a branch, so I cannot use any\n" +"'branch..merge' in your configuration file.\n" +"Please specify which remote branch you want to use on the command\n" +"line and try again (e.g. 'git pull ').\n" +"See git-pull(1) for details." +msgstr "" + +#: git-pull.sh:165 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to rebase against, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often rebase against the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +" rebase = true\n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" + +#: git-pull.sh:186 +#, sh-format +msgid "" +"You asked me to pull without telling me which branch you\n" +"want to merge with, and 'branch.${curr_branch}.merge' in\n" +"your configuration file does not tell me, either. Please\n" +"specify which branch you want to use on the command line and\n" +"try again (e.g. 'git pull ').\n" +"See git-pull(1) for details.\n" +"\n" +"If you often merge with the same branch, you may want to\n" +"use something like the following in your configuration file:\n" +"\n" +" [branch \"${curr_branch}\"]\n" +" remote = \n" +" merge = \n" +"\n" +" [remote \"\"]\n" +" url = \n" +" fetch = \n" +"\n" +"See git-config(1) for details." +msgstr "" + +#: git-pull.sh:210 +#, sh-format +msgid "" +"Your configuration specifies to rebase against the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." +msgstr "" + +#: git-pull.sh:213 +#, sh-format +msgid "" +"Your configuration specifies to merge with the ref '$upstream_branch'\n" +"from the remote, but no such ref was fetched." +msgstr "" + +#: git-pull.sh:226 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#: git-pull.sh:232 +msgid "refusing to pull with rebase: your working tree is not up-to-date" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:260 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:285 +#, fuzzy +msgid "Cannot merge multiple branches into empty head" +msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." + +#: git-pull.sh:289 +msgid "Cannot rebase onto multiple branches" +msgstr "" + +#: git-stash.sh:41 +msgid "git stash clear with parameters is unimplemented" +msgstr "" + +#: git-stash.sh:63 +#, fuzzy +msgid "You do not have the initial commit yet" +msgstr "Du har ingen giltig HEAD" + +#: git-stash.sh:78 +#, fuzzy +msgid "Cannot save the current index state" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: git-stash.sh:94 git-stash.sh:107 +#, fuzzy +msgid "Cannot save the current worktree state" +msgstr "Kan inte komma åt aktuell arbetskatalog" + +#: git-stash.sh:111 +#, fuzzy +msgid "No changes selected" +msgstr "# Inga ändringar\n" + +#: git-stash.sh:114 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:127 +#, fuzzy +msgid "Cannot record working tree state" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: git-stash.sh:176 +msgid "No local changes to save" +msgstr "" + +#: git-stash.sh:180 +msgid "Cannot initialize stash" +msgstr "" + +#: git-stash.sh:188 +msgid "Cannot save the current status" +msgstr "" + +#: git-stash.sh:201 +#, fuzzy +msgid "Cannot remove worktree changes" +msgstr "Kan inte komma åt arbetskatalogen \"%s\"" + +#: git-stash.sh:303 +msgid "No stash found." +msgstr "" + +#: git-stash.sh:310 +#, fuzzy, sh-format +msgid "Too many revisions specified: $REV" +msgstr "För många flaggor angavs" + +#: git-stash.sh:316 +#, fuzzy, sh-format +msgid "$reference is not valid reference" +msgstr "referensen är inte ett träd: %s" + +#. maintainers: it would be better if git rev-parse indicated +#. this condition with a non-zero status code but as of 1.7.2.1 it +#. it did not. So, we use non-empty stderr output as a proxy for the +#. condition of interest. +#: git-stash.sh:337 +#, sh-format +msgid "$REV does not exist in the stash log" +msgstr "" + +#: git-stash.sh:351 +#, fuzzy, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "\"%s\" är inte en incheckning" + +#: git-stash.sh:362 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "" + +#: git-stash.sh:372 +msgid "Cannot apply to a dirty working tree, please stage your changes" +msgstr "" + +#: git-stash.sh:376 +#, fuzzy +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." + +#: git-stash.sh:384 +msgid "Conflicts in index. Try without --index." +msgstr "" + +#: git-stash.sh:386 +#, fuzzy +msgid "Could not save index tree" +msgstr "Kunde inte läsa indexet" + +#: git-stash.sh:412 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:426 +#, fuzzy +msgid "Index was not unstashed." +msgstr "kunde köra stash." + +#: git-stash.sh:443 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "" + +#: git-stash.sh:444 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "" + +#: git-stash.sh:451 +#, fuzzy +msgid "No branch name specified" +msgstr "Misslyckades byta namn på gren" + +#: git-stash.sh:522 +msgid "(To restore them type \"git stash apply\")" +msgstr "" + +#: git-submodule.sh:38 +#, sh-format +msgid "remote ($remote) does not have a url defined in .git/config" +msgstr "" + +#: git-submodule.sh:79 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$path'" +msgstr "" + +#: git-submodule.sh:105 +#, sh-format +msgid "Directory '$path' exists, but is neither empty nor a git repository" +msgstr "" + +#: git-submodule.sh:109 +#, sh-format +msgid "A file already exist at path '$path'" +msgstr "" + +#: git-submodule.sh:117 +#, sh-format +msgid "Clone of '$url' into submodule path '$path' failed" +msgstr "" + +#: git-submodule.sh:190 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "" + +#: git-submodule.sh:207 +#, fuzzy, sh-format +msgid "'$path' already exists in the index" +msgstr "kan inte läsa indexet" + +#: git-submodule.sh:211 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:222 +#, sh-format +msgid "Adding existing repo at '$path' to the index" +msgstr "" + +#: git-submodule.sh:224 +#, fuzzy, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." + +#: git-submodule.sh:247 +#, sh-format +msgid "Unable to checkout submodule '$path'" +msgstr "" + +#: git-submodule.sh:251 +#, fuzzy, sh-format +msgid "Failed to add submodule '$path'" +msgstr "Kunde inte läsa objektet \"%s\"." + +#: git-submodule.sh:256 +#, sh-format +msgid "Failed to register submodule '$path'" +msgstr "" + +#: git-submodule.sh:294 +#, sh-format +msgid "Entering '$prefix$path'" +msgstr "" + +#: git-submodule.sh:306 +#, sh-format +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "" + +#: git-submodule.sh:349 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:359 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:364 +#, sh-format +msgid "Failed to register update mode for submodule path '$path'" +msgstr "" + +#: git-submodule.sh:366 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$path'" +msgstr "" + +#: git-submodule.sh:444 +#, sh-format +msgid "" +"Submodule path '$path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:456 +#, sh-format +msgid "Unable to find current revision in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:476 +#, sh-format +msgid "Unable to fetch in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$path'" +msgstr "" + +#: git-submodule.sh:483 +#, sh-format +msgid "Submodule path '$path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:488 +#, sh-format +msgid "Submodule path '$path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:493 +#, sh-format +msgid "Submodule path '$path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:504 git-submodule.sh:797 +#, sh-format +msgid "Failed to recurse into submodule path '$path'" +msgstr "" + +#: git-submodule.sh:588 +msgid "--" +msgstr "" + +#. unexpected type +#: git-submodule.sh:628 +#, fuzzy, sh-format +msgid "unexpected mode $mod_dst" +msgstr "diff-status %c förväntades inte" + +#: git-submodule.sh:646 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr "" + +#: git-submodule.sh:649 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr "" + +#: git-submodule.sh:652 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr "" + +#: git-submodule.sh:677 +msgid "blob" +msgstr "" + +#: git-submodule.sh:678 +msgid "submodule" +msgstr "" + +#: git-submodule.sh:715 +#, fuzzy +msgid "# Submodules changed but not updated:" +msgstr "# Ändrade men inte uppdaterade:" + +#: git-submodule.sh:717 +#, fuzzy +msgid "# Submodule changes to be committed:" +msgstr "# Ändringar att checka in:" + +#: git-submodule.sh:844 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" From 6874b9edb1a6278e3dbfe5f80030872260f225a8 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Thu, 8 Mar 2012 10:56:37 +0100 Subject: [PATCH 09/12] Update Swedish translation (732t0f0u). This update includes a replay of some review fixes from the initial translation run in 2010, which I cannot find having committed anywhere. Add myself to the po/TEAMS file as well. Signed-off-by: Peter Krefting --- po/TEAMS | 3 + po/sv.po | 3468 ++++++++++++++++++++++++++++++------------------------ 2 files changed, 1921 insertions(+), 1550 deletions(-) diff --git a/po/TEAMS b/po/TEAMS index 1d173ac349..0184493f21 100644 --- a/po/TEAMS +++ b/po/TEAMS @@ -4,6 +4,9 @@ Core Git translation language teams Language: is (Icelandic) Leader: Ævar Arnfjörð Bjarmason +Language: sv (Swedish) +Leader: Peter Krefting + Language: zh_CN (Simplified Chinese) Repository: https://github.com/gotgit/git-po-zh_CN/ Leader: Jiang Xin diff --git a/po/sv.po b/po/sv.po index 78b4d9a11d..0d778dc6e5 100644 --- a/po/sv.po +++ b/po/sv.po @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010 Peter krefting +# Copyright (C) 2010-2012 Peter krefting # This file is distributed under the same license as the Git package. -# Peter krefting , 2010. +# Peter Krefting , 2010, 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: git 1.7.3\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2010-09-20 15:16+0000\n" -"PO-Revision-Date: 2010-09-12 21:07+0100\n" +"POT-Creation-Date: 2012-03-08 10:19+0800\n" +"PO-Revision-Date: 2012-03-08 10:53+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -17,250 +17,648 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wt-status.c:56 -msgid "# Unmerged paths:" -msgstr "# Ej sammanslagna sökvägar:" - -#: wt-status.c:62 wt-status.c:79 +#: advice.c:34 #, c-format -msgid "# (use \"git reset %s ...\" to unstage)" -msgstr "# (använd \"git reset %s ...\" för att ta bort från kö)" +msgid "hint: %.*s\n" +msgstr "tips: %.*s\n" -#: wt-status.c:64 wt-status.c:81 -msgid "# (use \"git rm --cached ...\" to unstage)" -msgstr "# (använd \"git rm --cached ...\" för att ta bort från kö)" - -#: wt-status.c:65 -msgid "# (use \"git add/rm ...\" as appropriate to mark resolution)" -msgstr "# (använd \"git add/rm ...\" som lämpligt för att ange lösning)" - -#: wt-status.c:73 -msgid "# Changes to be committed:" -msgstr "# Ändringar att checka in:" - -#: wt-status.c:91 -msgid "# Changed but not updated:" -msgstr "# Ändrade men inte uppdaterade:" - -#: wt-status.c:95 -msgid "# (use \"git add ...\" to update what will be committed)" -msgstr "" -"# (använd \"git add ...\" för att uppdatera vad som skall checkas in)" - -#: wt-status.c:97 -msgid "# (use \"git add/rm ...\" to update what will be committed)" -msgstr "" -"# (använd \"git add/rm ...\" för att uppdatera vad som skall checkas " -"in)" - -#: wt-status.c:98 +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:64 msgid "" -"# (use \"git checkout -- ...\" to discard changes in working " -"directory)" +"Fix them up in the work tree,\n" +"and then use 'git add/rm ' as\n" +"appropriate to mark resolution and make a commit,\n" +"or use 'git commit -a'." msgstr "" -"# (använd \"git checkout -- ...\" för att förkasta ändringar i " +"Rätta dem i din arbetskatalog,\n" +"och använd sedan \"git add/rm \" som\n" +"lämpligt för att ange lösning och checka in,\n" +"eller använd \"git commit -a\"." + +#: commit.c:47 +#, c-format +msgid "could not parse %s" +msgstr "kunde inte tolka %s" + +#: commit.c:49 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s är inte en incheckning!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "minnet slut" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Kunde inte köra \"git rev-list\"" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "kunde inte skriva till rev-list: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "kunde inte stänga rev-list:s standard in: %s" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Okänd dirstat-parameter \"%.*s\"\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" +"%s" + +#: diff.c:1336 +msgid " 0 files changed\n" +msgstr " 0 filer ändrade\n" + +#: diff.c:1340 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d fil ändrad" +msgstr[1] " %d filer ändrade" + +#: diff.c:1357 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d tillägg(+)" +msgstr[1] ", %d tillägg(+)" + +#: diff.c:1368 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d borttagning(-)" +msgstr[1] ", %d borttagningar(-)" + +#: diff.c:3424 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Misslyckades tolka argument till flaggan --dirstat/-X;\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "kunde inte köra gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg godtog inte data" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg misslyckades signera data" + +#: grep.c:1280 +#, c-format +msgid "'%s': unable to read %s" +msgstr "\"%s\" kunde inte läsa %s" + +#: grep.c:1297 +#, c-format +msgid "'%s': %s" +msgstr "\"%s\": %s" + +#: grep.c:1308 +#, c-format +msgid "'%s': short read %s" +msgstr "\"%s\": kort läsning %s" + +#: help.c:287 +#, 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?" + +#: remote.c:1607 +#, 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:1613 +#, 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:1621 +#, 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" + +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 +#: builtin/merge.c:1095 builtin/merge.c:1105 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Kunde inte öppna \"%s\" för skrivning" + +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 +#: builtin/merge.c:1097 builtin/merge.c:1110 +#, c-format +msgid "Could not write to '%s'" +msgstr "Kunde inte skriva till \"%s\"" + +#: sequencer.c:143 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '" +msgstr "" +"efter att ha löst konflikterna, markera de rättade sökvägarna\n" +"med \"git add \" eller \"git rm \"" + +#: sequencer.c:146 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '\n" +"and commit the result with 'git commit'" +msgstr "" +"efter att ha löst konflikterna, markera de rättade sökvägarna\n" +"med \"git add \" eller \"git rm \"\n" +"och checka in resultatet med \"git commit\"" + +#: sequencer.c:159 sequencer.c:685 sequencer.c:768 +#, c-format +msgid "Could not write to %s" +msgstr "Kunde inte skriva till %s" + +#: sequencer.c:162 +#, c-format +msgid "Error wrapping up %s" +msgstr "Fel vid ombrytning av %s" + +#: sequencer.c:177 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"." + +#: sequencer.c:179 +msgid "Your local changes would be overwritten by revert." +msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"." + +#: sequencer.c:182 +msgid "Commit your changes or stash them to proceed." +msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:232 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: Kunde inte skriva ny indexfil" + +#: sequencer.c:298 +msgid "Your index file is unmerged." +msgstr "Din indexfil har inte slagits ihop." + +#: sequencer.c:301 +msgid "You do not have a valid HEAD" +msgstr "Du har ingen giltig HEAD" + +#: sequencer.c:316 +#, 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:324 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Incheckning %s har inte förälder %d" + +#: sequencer.c:328 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:339 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "%s: kan inte tolka föräldraincheckningen %s" + +#: sequencer.c:343 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Kan inte hämta incheckningsmeddelande för %s" + +#: sequencer.c:427 +#, c-format +msgid "could not revert %s... %s" +msgstr "kunde inte ångra %s... %s" + +#: sequencer.c:428 +#, c-format +msgid "could not apply %s... %s" +msgstr "kunde inte applicera %s... %s" + +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "misslyckades skapa revisionstraversering" + +#: sequencer.c:453 +msgid "empty commit set passed" +msgstr "den angivna uppsättningen incheckningar är tom" + +#: sequencer.c:461 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: misslyckades läsa indexet" + +#: sequencer.c:466 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: misslyckades uppdatera indexet" + +#: sequencer.c:551 +#, c-format +msgid "Cannot %s during a %s" +msgstr "kan inte %s under en %s" + +#: sequencer.c:573 +#, c-format +msgid "Could not parse line %d." +msgstr "Kan inte tolka rad %d." + +#: sequencer.c:578 +msgid "No commits parsed." +msgstr "Inga incheckningar lästes." + +#: sequencer.c:591 +#, c-format +msgid "Could not open %s" +msgstr "Kunde inte öppna %s" + +#: sequencer.c:595 +#, c-format +msgid "Could not read %s." +msgstr "kunde inte läsa %s." + +#: sequencer.c:602 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Oanvändbart manus: %s" + +#: sequencer.c:630 +#, c-format +msgid "Invalid key: %s" +msgstr "Felaktig nyckel: %s" + +#: sequencer.c:633 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Felaktigt värde för %s: %s" + +#: sequencer.c:645 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Trasigt manus: %s" + +#: sequencer.c:666 +msgid "a cherry-pick or revert is already in progress" +msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" + +#: sequencer.c:667 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:671 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" + +#: sequencer.c:687 sequencer.c:772 +#, c-format +msgid "Error wrapping up %s." +msgstr "Fel vid ombrytning av %s." + +#: sequencer.c:706 sequencer.c:840 +msgid "no cherry-pick or revert in progress" +msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" + +#: sequencer.c:708 +msgid "cannot resolve HEAD" +msgstr "kan inte bestämma HEAD" + +#: sequencer.c:710 +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:732 +#, c-format +msgid "cannot open %s: %s" +msgstr "kan inte öppna %s: %s" + +#: sequencer.c:735 +#, c-format +msgid "cannot read %s: %s" +msgstr "kan inte läsa %s: %s" + +#: sequencer.c:736 +msgid "unexpected end of file" +msgstr "oväntat filslut" + +#: sequencer.c:742 +#, 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:765 +#, c-format +msgid "Could not format %s." +msgstr "Kunde inte formatera %s." + +#: sequencer.c:927 +msgid "Can't revert as initial commit" +msgstr "Kan inte ångra som första incheckning" + +#: sequencer.c:928 +msgid "Can't cherry-pick into empty head" +msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" + +#: wt-status.c:134 +msgid "Unmerged paths:" +msgstr "Ej sammanslagna sökvägar:" + +#: wt-status.c:140 wt-status.c:157 +#, c-format +msgid " (use \"git reset %s ...\" to unstage)" +msgstr " (använd \"git reset %s ...\" för att ta bort från kö)" + +#: wt-status.c:142 wt-status.c:159 +msgid " (use \"git rm --cached ...\" to unstage)" +msgstr " (använd \"git rm --cached ...\" för att ta bort från kö)" + +#: wt-status.c:143 +msgid " (use \"git add/rm ...\" as appropriate to mark resolution)" +msgstr " (använd \"git add/rm ...\" som lämpligt för att ange lösning)" + +#: wt-status.c:151 +msgid "Changes to be committed:" +msgstr "Ändringar att checka in:" + +#: wt-status.c:169 +msgid "Changes not staged for commit:" +msgstr "Ändringar ej i incheckningskön:" + +#: wt-status.c:173 +msgid " (use \"git add ...\" to update what will be committed)" +msgstr "" +" (använd \"git add ...\" för att uppdatera vad som skall checkas in)" + +#: wt-status.c:175 +msgid " (use \"git add/rm ...\" to update what will be committed)" +msgstr "" +" (använd \"git add/rm ...\" för att uppdatera vad som skall checkas in)" + +#: wt-status.c:176 +msgid "" +" (use \"git checkout -- ...\" to discard changes in working directory)" +msgstr "" +" (använd \"git checkout -- ...\" för att förkasta ändringar i " "arbetskatalogen)" -#: wt-status.c:100 -msgid "# (commit or discard the untracked or modified content in submodules)" +#: wt-status.c:178 +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)" +" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)" -#: wt-status.c:109 +# %s är ett verb ("Untracked"/"Ignored"). +#: wt-status.c:187 #, c-format -msgid "# %s files:" -msgstr "# %s filer:" +msgid "%s files:" +msgstr "%s filer:" -#: wt-status.c:112 +#: wt-status.c:190 #, c-format -msgid "# (use \"git %s ...\" to include in what will be committed)" +msgid " (use \"git %s ...\" to include in what will be committed)" msgstr "" -"# (använd \"git %s ...\" för att ta med i vad som skall checkas in)" +" (använd \"git %s ...\" för att ta med i vad som skall checkas in)" -#: wt-status.c:129 +#: wt-status.c:207 msgid "bug" msgstr "programfel" -#: wt-status.c:134 +#: wt-status.c:212 msgid "both deleted:" msgstr "borttaget av bägge:" -#: wt-status.c:135 +#: wt-status.c:213 msgid "added by us:" msgstr "tillagt av oss:" -#: wt-status.c:136 +#: wt-status.c:214 msgid "deleted by them:" msgstr "borttaget av dem:" -#: wt-status.c:137 +#: wt-status.c:215 msgid "added by them:" msgstr "tillagt av dem:" -#: wt-status.c:138 +#: wt-status.c:216 msgid "deleted by us:" msgstr "borttaget av oss:" -#: wt-status.c:139 +#: wt-status.c:217 msgid "both added:" msgstr "tillagt av bägge:" -#: wt-status.c:140 +#: wt-status.c:218 msgid "both modified:" msgstr "ändrat av bägge:" -#: wt-status.c:170 +#: wt-status.c:248 msgid "new commits, " msgstr "nya incheckningar, " -#: wt-status.c:172 +#: wt-status.c:250 msgid "modified content, " msgstr "ändrat innehåll, " -#: wt-status.c:174 +#: wt-status.c:252 msgid "untracked content, " msgstr "ospårat innehåll, " -#: wt-status.c:188 +#: wt-status.c:266 #, c-format msgid "new file: %s" msgstr "ny fil: %s" -#: wt-status.c:191 +#: wt-status.c:269 #, c-format msgid "copied: %s -> %s" msgstr "kopierad: %s -> %s" -#: wt-status.c:194 +#: wt-status.c:272 #, c-format msgid "deleted: %s" msgstr "borttagen: %s" -#: wt-status.c:197 +#: wt-status.c:275 #, c-format msgid "modified: %s" msgstr "ändrad: %s" -#: wt-status.c:200 +#: wt-status.c:278 #, c-format msgid "renamed: %s -> %s" msgstr "namnbyte: %s -> %s" -#: wt-status.c:203 +#: wt-status.c:281 #, c-format msgid "typechange: %s" msgstr "typbyte: %s" -#: wt-status.c:206 +#: wt-status.c:284 #, c-format msgid "unknown: %s" msgstr "okänd: %s" -#: wt-status.c:209 +#: wt-status.c:287 #, c-format msgid "unmerged: %s" msgstr "osammansl.: %s" -#: wt-status.c:212 +#: wt-status.c:290 #, c-format msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:635 +#: wt-status.c:713 msgid "On branch " msgstr "På grenen " -#: wt-status.c:642 +#: wt-status.c:720 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:652 -msgid "# Initial commit" -msgstr "# Grundincheckning" +#: wt-status.c:731 +msgid "Initial commit" +msgstr "Första incheckning" -#: wt-status.c:666 +#: wt-status.c:745 msgid "Untracked" msgstr "Ospårad" -#: wt-status.c:668 +#: wt-status.c:747 msgid "Ignored" msgstr "Ignorerad" -#: wt-status.c:670 +# %s är nästa sträng eller tom. +#: wt-status.c:749 #, c-format -msgid "# Untracked files not listed%s\n" -msgstr "# Ospårade filer visas ej%s\n" +msgid "Untracked files not listed%s" +msgstr "Ospårade filer visas ej%s" -#: wt-status.c:672 +#: wt-status.c:751 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:678 -#, c-format -msgid "# No changes\n" -msgstr "# Inga ändringar\n" +#: wt-status.c:757 +msgid "No changes" +msgstr "Inga ändringar" -#: wt-status.c:682 +#: wt-status.c:761 #, c-format msgid "no changes added to commit%s\n" msgstr "inga ändringar att checka in%s\n" -#: wt-status.c:684 +#: wt-status.c:763 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr " (använd \"git add\" och/eller \"git commit -a\")" -#: wt-status.c:686 +#: wt-status.c:765 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "inget köat för incheckning, men ospårade filer finns%s\n" -#: wt-status.c:688 +#: wt-status.c:767 msgid " (use \"git add\" to track)" msgstr " (använd \"git add\" för att spåra)" -#: wt-status.c:690 wt-status.c:693 wt-status.c:696 +#: wt-status.c:769 wt-status.c:772 wt-status.c:775 #, c-format msgid "nothing to commit%s\n" msgstr "inget att checka in%s\n" -#: wt-status.c:691 +#: wt-status.c:770 msgid " (create/copy files and use \"git add\" to track)" msgstr " (skapa/kopiera filer och använd \"git add\" för att spåra)" -#: wt-status.c:694 +#: wt-status.c:773 msgid " (use -u to show untracked files)" msgstr " (använd -u för att visa ospårade filer)" -#: wt-status.c:697 +#: wt-status.c:776 msgid " (working directory clean)" msgstr " (arbetskatalogen ren)" -#: wt-status.c:795 +#: wt-status.c:884 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:801 +#: wt-status.c:890 msgid "Initial commit on " -msgstr "Grundincheckning på " +msgstr "Första incheckning på " -#: wt-status.c:816 +#: wt-status.c:905 msgid "behind " msgstr "efter " -#: wt-status.c:819 wt-status.c:822 +#: wt-status.c:908 wt-status.c:911 msgid "ahead " msgstr "före " -#: wt-status.c:824 +#: wt-status.c:913 msgid ", behind " msgstr ", efter " -#: builtin/add.c:41 +#: builtin/add.c:62 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:244 +#: builtin/add.c:67 builtin/commit.c:298 msgid "updating files failed" msgstr "misslyckades uppdatera filer" @@ -269,89 +667,93 @@ msgstr "misslyckades uppdatera filer" msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:175 +#: builtin/add.c:176 #, c-format msgid "Path '%s' is in submodule '%.*s'" msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" -#: builtin/add.c:191 +#: builtin/add.c:192 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:194 builtin/add.c:452 builtin/rm.c:194 +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: builtin/add.c:208 +#: builtin/add.c:209 #, c-format msgid "'%s' is beyond a symbolic link" msgstr "\"%s\" är på andra sidan av en symbolisk länk" -#: builtin/add.c:275 +#: builtin/add.c:276 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:284 +#: builtin/add.c:286 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:288 +#: builtin/add.c:290 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:293 +#: builtin/add.c:295 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:295 +#: builtin/add.c:297 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:301 +#: builtin/add.c:303 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte applicera \"%s\"" -#: builtin/add.c:349 +#: builtin/add.c:312 +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:352 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:350 +#: builtin/add.c:353 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:356 +#: builtin/add.c:359 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:388 +#: builtin/add.c:391 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:390 +#: builtin/add.c:393 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:410 +#: builtin/add.c:413 #, c-format msgid "Nothing specified, nothing added.\n" msgstr "Inget angivet, inget tillagt.\n" -#: builtin/add.c:411 +#: builtin/add.c:414 #, c-format msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:417 builtin/clean.c:95 builtin/commit.c:301 -#: builtin/commit.c:310 builtin/mv.c:77 builtin/rm.c:171 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/rm.c:162 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:468 builtin/mv.c:223 builtin/rm.c:268 +#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -364,37 +766,42 @@ msgstr "Kunde inte skapa arkivfilen \"%s\"" msgid "could not redirect output" msgstr "kunde inte omdirigera utdata" -#: builtin/archive.c:36 +#: builtin/archive.c:37 msgid "git archive: Remote with no URL" msgstr "git archive: Fjärr utan URL" -#: builtin/archive.c:46 +#: builtin/archive.c:58 msgid "git archive: expected ACK/NAK, got EOF" msgstr "git archive: förväntade ACK/NAK, fick EOF" -#: builtin/archive.c:51 +#: builtin/archive.c:63 #, c-format msgid "git archive: NACK %s" msgstr "git archive: NACK %s" -#: builtin/archive.c:52 +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "fjärrfel: %s" + +#: builtin/archive.c:66 msgid "git archive: protocol error" msgstr "git archive: protokollfel" -#: builtin/archive.c:57 +#: builtin/archive.c:71 msgid "git archive: expected a flush" msgstr "git archive: förväntade en tömning (flush)" -#: builtin/branch.c:136 +#: builtin/branch.c:137 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" -" '%s', but it is not yet merged to HEAD." +" '%s', but not yet merged to HEAD." msgstr "" -"tar bort grenen \"%s\" som inte har slagits ihop med\n" -" \"%s\", men som ännu inte slagits ihop med HEAD." +"tar bort grenen \"%s\" som har slagits ihop med\n" +" \"%s\", men ännu inte slagits ihop med HEAD." -#: builtin/branch.c:140 +#: builtin/branch.c:141 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -404,34 +811,34 @@ msgstr "" " \"%s\", trots att den har slagits ihop med HEAD." #. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:161 +#: builtin/branch.c:163 msgid "remote " msgstr "fjärr" -#: builtin/branch.c:169 +#: builtin/branch.c:171 msgid "cannot use -a with -d" msgstr "kan inte ange -a med -d" -#: builtin/branch.c:175 +#: builtin/branch.c:177 msgid "Couldn't look up commit object for HEAD" msgstr "Kunde inte slå upp incheckningsobjekt för HEAD" -#: builtin/branch.c:180 +#: builtin/branch.c:182 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande." -#: builtin/branch.c:190 +#: builtin/branch.c:192 #, c-format msgid "%sbranch '%s' not found." msgstr "%sgrenen \"%s\" hittades inte." -#: builtin/branch.c:198 +#: builtin/branch.c:200 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\"" -#: builtin/branch.c:204 +#: builtin/branch.c:206 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -440,95 +847,95 @@ 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:212 +#: builtin/branch.c:214 #, c-format msgid "Error deleting %sbranch '%s'" msgstr "Fel vid borttagning av %sgrenen \"%s\"" -#: builtin/branch.c:217 +#: builtin/branch.c:219 #, c-format msgid "Deleted %sbranch %s (was %s).\n" msgstr "Tog bort %sgrenen %s (var %s).\n" -#: builtin/branch.c:222 +#: builtin/branch.c:224 msgid "Update of config-file failed" msgstr "Misslyckades uppdatera konfigurationsfil" -#: builtin/branch.c:304 +#: builtin/branch.c:322 #, c-format msgid "branch '%s' does not point at a commit" msgstr "grenen \"%s\" pekar inte på en incheckning" -#: builtin/branch.c:381 +#: builtin/branch.c:394 #, c-format msgid "behind %d] " msgstr "bakom %d] " -#: builtin/branch.c:383 +#: builtin/branch.c:396 #, c-format msgid "ahead %d] " msgstr "före %d] " -#: builtin/branch.c:385 +#: builtin/branch.c:398 #, c-format msgid "ahead %d, behind %d] " msgstr "före %d, bakom %d] " -#: builtin/branch.c:484 +#: builtin/branch.c:501 msgid "(no branch)" msgstr "(ingen gren)" -#: builtin/branch.c:544 +#: builtin/branch.c:566 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" -#: builtin/branch.c:557 +#: builtin/branch.c:579 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:567 builtin/branch.c:571 +#: builtin/branch.c:589 #, c-format msgid "Invalid branch name: '%s'" msgstr "Felaktigt namn på gren: \"%s\"" -#: builtin/branch.c:574 -#, c-format -msgid "A branch named '%s' already exists." -msgstr "Det finns redan en gren som heter \"%s\"" - -#: builtin/branch.c:580 +#: builtin/branch.c:604 msgid "Branch rename failed" msgstr "Misslyckades byta namn på gren" -#: builtin/branch.c:584 +#: builtin/branch.c:608 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\"" -#: builtin/branch.c:588 +#: builtin/branch.c:612 #, 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:595 +#: builtin/branch.c:619 msgid "Branch is renamed, but update of config-file failed" msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen" -#: builtin/branch.c:610 +#: builtin/branch.c:634 #, c-format msgid "malformed object name %s" msgstr "felformat objektnamn %s" -#: builtin/branch.c:680 +#: builtin/branch.c:658 +#, c-format +msgid "could not write branch description template: %s\n" +msgstr "kunde inte skriva grenbeskrivningsmall: %s\n" + +#: builtin/branch.c:746 msgid "Failed to resolve HEAD as a valid ref." msgstr "Misslyckades slå upp HEAD som giltig referens" -#: builtin/branch.c:686 +#: builtin/branch.c:751 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:706 +#: builtin/branch.c:809 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " @@ -547,145 +954,206 @@ msgstr "Behöver ett arkiv för att skapa ett paket (bundle)." msgid "Need a repository to unbundle." msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)." -#: builtin/checkout.c:107 builtin/checkout.c:135 +#: builtin/checkout.c:113 builtin/checkout.c:146 #, c-format msgid "path '%s' does not have our version" msgstr "sökvägen \"%s\" har inte vår version" -#: builtin/checkout.c:109 builtin/checkout.c:137 +#: builtin/checkout.c:115 builtin/checkout.c:148 #, c-format msgid "path '%s' does not have their version" msgstr "sökvägen \"%s\" har inte deras version" -#: builtin/checkout.c:120 +#: builtin/checkout.c:131 #, c-format -msgid "path '%s' does not have all three versions" -msgstr "sökvägen \"%s\" har inte alla tre versionerna" +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:155 +#: builtin/checkout.c:175 #, c-format -msgid "path '%s' does not have all 3 versions" -msgstr "sökvägen \"%s\" har inte alla 3 versionerna" +msgid "path '%s' does not have necessary versions" +msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner" -#: builtin/checkout.c:172 +#: builtin/checkout.c:192 #, c-format msgid "path '%s': cannot merge" msgstr "sökväg \"%s\": kan inte slå ihop" -#: builtin/checkout.c:189 +#: builtin/checkout.c:209 #, c-format msgid "Unable to add merge result for '%s'" msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\"" -#: builtin/checkout.c:194 builtin/reset.c:170 +#: builtin/checkout.c:212 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/checkout.c:216 builtin/checkout.c:371 +#: builtin/checkout.c:234 builtin/checkout.c:392 msgid "corrupt index file" msgstr "indexfilen är trasig" -#: builtin/checkout.c:244 builtin/checkout.c:251 +#: builtin/checkout.c:264 builtin/checkout.c:271 #, c-format msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" -#: builtin/checkout.c:280 builtin/checkout.c:475 builtin/clone.c:658 -#: builtin/merge.c:737 +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" -#: builtin/checkout.c:297 builtin/diff.c:307 builtin/merge.c:367 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done misslyckades" -#: builtin/checkout.c:393 +#: builtin/checkout.c:414 msgid "you need to resolve your current index first" msgstr "du måste lösa ditt befintliga index först" -#: builtin/checkout.c:524 +#: builtin/checkout.c:533 #, c-format msgid "Can not do reflog for '%s'\n" msgstr "Kan inte skapa referenslog för \"%s\"\n" -#: builtin/checkout.c:550 +#: builtin/checkout.c:565 +msgid "HEAD is now at" +msgstr "HEAD är nu på" + +#: builtin/checkout.c:572 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Återställ gren \"%s\"\n" + +#: builtin/checkout.c:575 #, c-format msgid "Already on '%s'\n" msgstr "Redan på \"%s\"\n" -#: builtin/checkout.c:554 +#: builtin/checkout.c:579 #, c-format msgid "Switched to and reset branch '%s'\n" msgstr "Växlade till och nollställde grenen \"%s\"\n" -#: builtin/checkout.c:556 +#: builtin/checkout.c:581 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "Växlade till en ny gren \"%s\"\n" -#: builtin/checkout.c:558 +#: builtin/checkout.c:583 #, c-format msgid "Switched to branch '%s'\n" msgstr "Växlade till grenen \"%s\"\n" -#: builtin/checkout.c:575 -msgid "HEAD is now at" -msgstr "HEAD är nu på" +#: builtin/checkout.c:639 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... och %d till.\n" -#: builtin/checkout.c:603 -msgid "You are on a branch yet to be born" -msgstr "Du är på en gren som ännu inte är född" +#. The singular version +#: builtin/checkout.c:645 +#, 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:617 +#: builtin/checkout.c:663 +#, c-format +msgid "" +"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 "" +"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:692 +msgid "internal error in revision walk" +msgstr "internt fel vid genomgång av revisioner (revision walk)" + +#: builtin/checkout.c:696 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:730 -msgid "-B cannot be used with -b" -msgstr "-B kan inte användas med -b" - -#: builtin/checkout.c:738 -msgid "--patch is incompatible with all other options" -msgstr "--patch är inkompatibel med alla andra flaggor" - -#: builtin/checkout.c:744 -msgid "--track needs a branch name" -msgstr "--track behöver ett namn på en gren" - -#: builtin/checkout.c:751 -msgid "Missing branch name; try -b" -msgstr "Grennamn saknas; försök med -b" - -#: builtin/checkout.c:757 -msgid "--orphan and -b|-B are mutually exclusive" -msgstr "--orphan och --b|-B kan inte användas samtidigt" - -#: builtin/checkout.c:759 -msgid "--orphan cannot be used with -t" -msgstr "--orphan kan inte användas med -t" - -#: builtin/checkout.c:769 -msgid "git checkout: -f and -m are incompatible" -msgstr "git checkout: -f och -m är inkompatibla" +#: builtin/checkout.c:722 +msgid "You are on a branch yet to be born" +msgstr "Du är på en gren som ännu inte är född" #. case (1) -#: builtin/checkout.c:815 +#: builtin/checkout.c:853 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:852 +#: builtin/checkout.c:892 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:878 +#: builtin/checkout.c:972 +msgid "-B cannot be used with -b" +msgstr "-B kan inte användas med -b" + +#: builtin/checkout.c:981 +msgid "--patch is incompatible with all other options" +msgstr "--patch är inkompatibel med alla andra flaggor" + +#: builtin/checkout.c:984 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detcah kan inte användas med -b/-B/--orphan" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -t" +msgstr "--detach kan inte användas med -t" + +#: builtin/checkout.c:992 +msgid "--track needs a branch name" +msgstr "--track behöver ett namn på en gren" + +#: builtin/checkout.c:999 +msgid "Missing branch name; try -b" +msgstr "Grennamn saknas; försök med -b" + +#: builtin/checkout.c:1005 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "--orphan och -b|-B kan inte användas samtidigt" + +#: builtin/checkout.c:1007 +msgid "--orphan cannot be used with -t" +msgstr "--orphan kan inte användas med -t" + +#: builtin/checkout.c:1017 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f och -m är inkompatibla" + +#: builtin/checkout.c:1051 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:886 +#: builtin/checkout.c:1059 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -694,11 +1162,15 @@ msgstr "" "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: builtin/checkout.c:888 +#: builtin/checkout.c:1061 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: builtin/checkout.c:893 +#: builtin/checkout.c:1066 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach tar inte en sökväg som argument" + +#: builtin/checkout.c:1069 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -706,23 +1178,13 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:904 -#, c-format -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." - -#: builtin/checkout.c:909 -#, c-format -msgid "git checkout: branch %s already exists" -msgstr "git checkout: grenen %s finns redan" - -#: builtin/checkout.c:916 +#: builtin/checkout.c:1088 msgid "Cannot switch branch to a non-commit." msgstr "Kan inte växla gren på en icke-incheckning." -#: builtin/checkout.c:919 +#: builtin/checkout.c:1091 msgid "--ours/--theirs is incompatible with switching branches." -msgstr "--ours/--theirs är inkompatibla när du växlar gren." +msgstr "--ours/--theirs är inkompatibla med att byta gren." #: builtin/clean.c:78 msgid "-x and -X cannot be used together" @@ -743,145 +1205,158 @@ msgstr "" "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " "vägrar städa" -#: builtin/clean.c:154 builtin/clean.c:175 +#: builtin/clean.c:155 builtin/clean.c:176 #, c-format msgid "Would remove %s\n" msgstr "Skulle ta bort %s\n" -#: builtin/clean.c:158 builtin/clean.c:178 +#: builtin/clean.c:159 builtin/clean.c:179 #, c-format msgid "Removing %s\n" msgstr "Tar bort %s\n" -#: builtin/clean.c:161 builtin/clean.c:181 +#: builtin/clean.c:162 builtin/clean.c:182 #, c-format -msgid "failed to remove '%s'" -msgstr "kunde inte ta bort \"%s\"" +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" -#: builtin/clean.c:165 +#: builtin/clean.c:166 #, c-format msgid "Would not remove %s\n" msgstr "Skulle inte ta bort %s\n" -#: builtin/clean.c:167 +#: builtin/clean.c:168 #, c-format msgid "Not removing %s\n" msgstr "Tar inte bort %s\n" -#: builtin/clone.c:208 +#: builtin/clone.c:243 #, c-format msgid "reference repository '%s' is not a local directory." msgstr "referensarkivet \"%s\" är inte en lokal katalog." -#: builtin/clone.c:235 +#: builtin/clone.c:302 #, c-format msgid "failed to open '%s'" msgstr "misslyckades öppna \"%s\"" -#: builtin/clone.c:239 +#: builtin/clone.c:306 #, c-format msgid "failed to create directory '%s'" msgstr "misslyckades skapa katalogen \"%s\"" -#: builtin/clone.c:241 builtin/diff.c:74 +#: builtin/clone.c:308 builtin/diff.c:75 #, c-format msgid "failed to stat '%s'" msgstr "misslyckades ta status på \"%s\"" -#: builtin/clone.c:243 +#: builtin/clone.c:310 #, c-format msgid "%s exists and is not a directory" msgstr "%s finns och är ingen katalog" -#: builtin/clone.c:257 +#: builtin/clone.c:324 #, c-format msgid "failed to stat %s\n" msgstr "misslyckades ta status på %s\n" -#: builtin/clone.c:267 +#: builtin/clone.c:341 #, c-format msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/clone.c:272 +#: builtin/clone.c:346 #, c-format msgid "failed to create link '%s'" msgstr "misslyckades skapa länken \"%s\"" -#: builtin/clone.c:276 +#: builtin/clone.c:350 #, c-format msgid "failed to copy file to '%s'" msgstr "misslyckades kopiera filen till \"%s\"" -#: builtin/clone.c:305 +#: builtin/clone.c:373 #, c-format msgid "done.\n" msgstr "klart.\n" -#: builtin/clone.c:387 -msgid "Too many arguments." -msgstr "För många argument." - -#: builtin/clone.c:391 -msgid "You must specify a repository to clone." -msgstr "Du måste ange ett arkiv att klona." - -#: builtin/clone.c:399 +#: builtin/clone.c:440 #, c-format -msgid "--bare and --origin %s options are incompatible." -msgstr "flaggorna --bare och --origin %s är inkompatibla." +msgid "Could not find remote branch %s to clone." +msgstr "Kunde inte hitta fjärrgrenen %s för att klona." -#: builtin/clone.c:428 -#, 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:438 -#, c-format -msgid "working tree '%s' already exists." -msgstr "arbetsträdet \"%s\" finns redan." - -#: builtin/clone.c:451 builtin/clone.c:465 -#, c-format -msgid "could not create leading directories of '%s'" -msgstr "kunde inte skapa inledande kataloger för \"%s\"" - -#: builtin/clone.c:454 -#, c-format -msgid "could not create work tree dir '%s'." -msgstr "kunde inte skapa arbetskatalogen \"%s\"" - -#: builtin/clone.c:470 -#, c-format -msgid "Cloning into bare repository %s\n" -msgstr "Klonar till ett naket arkiv %s\n" - -#: builtin/clone.c:472 -#, c-format -msgid "Cloning into %s\n" -msgstr "Klonar till %s\n" - -#: builtin/clone.c:530 -#, c-format -msgid "Don't know how to clone %s" -msgstr "Vet inte hur man klonar %s" - -#: builtin/clone.c:569 -#, c-format -msgid "Remote branch %s not found in upstream %s, using HEAD instead" -msgstr "" -"Fjärrgrenen %s hittades inte i uppströmsarkivet %s, använder HEAD istället" - -#: builtin/clone.c:579 -msgid "You appear to have cloned an empty repository." -msgstr "Du verkar ha klonat ett tomt arkiv." - -#: builtin/clone.c:621 +#: builtin/clone.c:549 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/commit.c:41 +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "För många argument." + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "Du måste ange ett arkiv att klona." + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "flaggorna --bare och --origin %s är inkompatibla." + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "arkivet \"%s\" finns inte" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" + +#: builtin/clone.c:683 +#, 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:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "arbetsträdet \"%s\" finns redan." + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "kunde inte skapa inledande kataloger för \"%s\"" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "kunde inte skapa arbetskatalogen \"%s\"" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Klonar till ett naket arkiv \"%s\"...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Klonar till \"%s\"...\n" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Vet inte hur man klonar %s" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "Du verkar ha klonat ett tomt arkiv." + +#: builtin/commit.c:42 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -890,9 +1365,9 @@ msgid "" " git config --global user.name \"Your Name\"\n" " git config --global user.email you@example.com\n" "\n" -"If the identity used for this commit is wrong, you can fix it with:\n" +"After doing this, you may fix the identity used for this commit with:\n" "\n" -" git commit --amend --author='Your Name '\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" @@ -901,12 +1376,12 @@ msgstr "" " git config --global user.name \"Ditt namn\"\n" " git config --global user.email du@example.com\n" "\n" -"Om identiteten som användes för incheckningen är felaktig kan du\n" -"rätta den med:\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 --author='Ditt namn '\n" +" git commit --amend --reset-author\n" -#: builtin/commit.c:53 +#: builtin/commit.c:54 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" @@ -916,279 +1391,302 @@ msgstr "" "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:271 +#: builtin/commit.c:59 +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" +"Otherwise, please use 'git reset'\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" +"Annars använder du \"git reset\"\n" + +#: builtin/commit.c:205 builtin/reset.c:33 +msgid "merge" +msgstr "sammanslagning" + +#: builtin/commit.c:208 +msgid "cherry-pick" +msgstr "cherry-pick" + +#: builtin/commit.c:325 msgid "failed to unpack HEAD tree object" msgstr "misslyckades packa upp HEAD:s trädobjekt" -#: builtin/commit.c:299 +#: builtin/commit.c:367 +msgid "unable to create temporary index" +msgstr "kunde inte skapa temporär indexfil" + +#: builtin/commit.c:373 msgid "interactive add failed" msgstr "interaktiv tilläggning misslyckades" -#: builtin/commit.c:330 builtin/commit.c:350 builtin/commit.c:396 +#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 msgid "unable to write new_index file" msgstr "kunde inte skriva filen new_index" -#: builtin/commit.c:380 -msgid "cannot do a partial commit during a merge." -msgstr "kan inte utföra en delvis incheckning under en sammanslagning." +# %s är antingen "merge" eller "cherry-pick". +#: builtin/commit.c:457 +#, c-format +msgid "cannot do a partial commit during a %s." +msgstr "kan inte utföra en delvis incheckning under en %s" -#: builtin/commit.c:389 +#: builtin/commit.c:466 msgid "cannot read the index" msgstr "kan inte läsa indexet" -#: builtin/commit.c:409 +#: builtin/commit.c:486 msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:456 builtin/commit.c:1294 -msgid "could not parse HEAD commit" -msgstr "kunde inte tolka HEAD:s incheckning" - -#: builtin/commit.c:475 builtin/commit.c:481 +#: builtin/commit.c:550 builtin/commit.c:556 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:499 +#: builtin/commit.c:579 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:573 builtin/shortlog.c:299 +#: builtin/commit.c:635 #, c-format -msgid "(reading log message from standard input)\n" -msgstr "(läser loggmeddelande från standard in)\n" +msgid "Malformed ident string: '%s'" +msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:575 -msgid "could not read log from standard input" -msgstr "kunde inte läsa logg från standard in" - -#: builtin/commit.c:579 -#, c-format -msgid "could not read log file '%s'" -msgstr "kunde inte läsa loggfilen \"%s\"" - -#: builtin/commit.c:585 -msgid "commit has empty message" -msgstr "incheckningen har ett tomt meddelande" - -#: builtin/commit.c:591 -msgid "could not read MERGE_MSG" -msgstr "kunde inte läsa MERGE_MSG" - -#: builtin/commit.c:595 -msgid "could not read SQUASH_MSG" -msgstr "kunde inte läsa SQUASH_MSG" - -#: builtin/commit.c:599 -#, c-format -msgid "could not read '%s'" -msgstr "kunde inte läsa \"%s\"" - -#: builtin/commit.c:612 -#, c-format -msgid "could not open '%s'" -msgstr "kunde inte öppna \"%s\"" - -#: builtin/commit.c:636 -msgid "could not write commit template" -msgstr "kunde inte skriva incheckningsmall" - -#: builtin/commit.c:650 -#, 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" -"#\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" -"#\n" - -#: builtin/commit.c:659 -#, c-format -msgid "" -"\n" -"# Please enter the commit message for your changes." -msgstr "" -"\n" -"# Ange ett incheckningsmeddelande för dina ändringar." - -#: builtin/commit.c:663 -#, c-format -msgid "" -" Lines starting\n" -"# with '#' will be ignored, and an empty message aborts the commit.\n" -msgstr "" -" Rader som inleds\n" -"# med \"#\" kommer ignoreras, och ett tomt meddelande avbryter " -"incheckningen.\n" - -#: builtin/commit.c:668 -#, c-format -msgid "" -" Lines starting\n" -"# with '#' will be kept; you may remove them yourself if you want to.\n" -"# An empty message aborts the commit.\n" -msgstr "" -" Rader som inleds\n" -"# med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" -"# Ett tomt meddelande avbryter incheckningen.\n" - -#: builtin/commit.c:680 -#, c-format -msgid "%s# Author: %s\n" -msgstr "%s# Författare: %s\n" - -#: builtin/commit.c:688 -#, c-format -msgid "%s# Committer: %s\n" -msgstr "%s# Incheckare: %s\n" - -#: builtin/commit.c:705 -msgid "Cannot read index" -msgstr "Kan inte läsa indexet" - -#: builtin/commit.c:737 -msgid "Error building trees" -msgstr "Fel vid byggande av träd" - -#: builtin/commit.c:752 builtin/tag.c:321 -#, 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:832 -#, c-format -msgid "No existing author found with '%s'" -msgstr "Hittade ingen befintlig författare med \"%s\"" - -#: builtin/commit.c:847 builtin/commit.c:1039 -#, c-format -msgid "Invalid untracked files mode '%s'" -msgstr "Ogiltigt läge för ospårade filer: \"%s\"" - -#: builtin/commit.c:864 -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:878 -msgid "You have nothing to amend." -msgstr "Du har inget att utöka." - -#: builtin/commit.c:880 -msgid "You are in the middle of a merge -- cannot amend." -msgstr "Du är i mitten av en incheckning -- kan inte utöka." - -#: builtin/commit.c:889 -msgid "Only one of -c/-C/-F can be used." -msgstr "Kan endast använda en av -c/-C/-F." - -#: builtin/commit.c:891 -msgid "Option -m cannot be combined with -c/-C/-F." -msgstr "Flaggan -m kan inte kombineras med -c/-C/-F." - -#: builtin/commit.c:897 -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:906 +#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:909 +#: builtin/commit.c:682 builtin/shortlog.c:296 #, c-format -msgid "could not parse commit %s" -msgstr "kunde inte tolka incheckningen %s" +msgid "(reading log message from standard input)\n" +msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:937 -msgid "Only one of --include/--only/--all/--interactive can be used." -msgstr "Endast en av --include/--only/--all/--interactive kan användas." +#: builtin/commit.c:684 +msgid "could not read log from standard input" +msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:939 +#: builtin/commit.c:688 +#, c-format +msgid "could not read log file '%s'" +msgstr "kunde inte läsa loggfilen \"%s\"" + +#: builtin/commit.c:694 +msgid "commit has empty message" +msgstr "incheckningen har ett tomt meddelande" + +#: builtin/commit.c:710 +msgid "could not read MERGE_MSG" +msgstr "kunde inte läsa MERGE_MSG" + +#: builtin/commit.c:714 +msgid "could not read SQUASH_MSG" +msgstr "kunde inte läsa SQUASH_MSG" + +#: builtin/commit.c:718 +#, c-format +msgid "could not read '%s'" +msgstr "kunde inte läsa \"%s\"" + +#: builtin/commit.c:746 +#, c-format +msgid "could not open '%s'" +msgstr "kunde inte öppna \"%s\"" + +#: builtin/commit.c:770 +msgid "could not write commit template" +msgstr "kunde inte skriva incheckningsmall" + +# %s är "merge" eller "cherry-pick" +#: builtin/commit.c:783 +#, c-format +msgid "" +"\n" +"It looks like you may be committing a %s.\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 %s.\n" +"Om det inte stämmer tar du bort filen\n" +"\t%s\n" +"och försöker igen.\n" + +#: builtin/commit.c:796 +msgid "Please enter the commit message for your changes." +msgstr "Ange ett incheckningsmeddelande för dina ändringar." + +#: builtin/commit.c:799 +msgid "" +" Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:804 +msgid "" +" Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +" Rader som inleds\n" +"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"Ett tomt meddelande avbryter incheckningen.\n" + +#: builtin/commit.c:816 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sFörfattare: %s" + +#: builtin/commit.c:823 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sIncheckare: %s" + +#: builtin/commit.c:843 +msgid "Cannot read index" +msgstr "Kan inte läsa indexet" + +#: builtin/commit.c:880 +msgid "Error building trees" +msgstr "Fel vid byggande av träd" + +#: builtin/commit.c:895 builtin/tag.c:357 +#, 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:975 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Hittade ingen befintlig författare med \"%s\"" + +#: builtin/commit.c:990 builtin/commit.c:1182 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Ogiltigt läge för ospårade filer: \"%s\"" + +#: builtin/commit.c:1030 +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:1041 +msgid "You have nothing to amend." +msgstr "Du har inget att utöka." + +#: builtin/commit.c:1043 +#, c-format +msgid "You are in the middle of a %s -- cannot amend." +msgstr "Du är i mitten av en %s -- kan inte utöka." + +#: builtin/commit.c:1045 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" + +#: builtin/commit.c:1055 +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:1057 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup." + +#: builtin/commit.c:1063 +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:1080 +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:1082 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:941 +#: builtin/commit.c:1084 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:943 +#: builtin/commit.c:1086 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." -msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only-paths..." +msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:953 +#: builtin/commit.c:1096 builtin/tag.c:556 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:958 +#: builtin/commit.c:1101 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:960 -msgid "Paths with --interactive does not make sense." -msgstr "Kan inte ange sökvägar med --interactive." - -#: builtin/commit.c:1142 +#: builtin/commit.c:1280 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1144 +#: builtin/commit.c:1282 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1185 +#: builtin/commit.c:1323 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1187 +#: builtin/commit.c:1325 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1307 builtin/merge.c:461 +#: builtin/commit.c:1415 +msgid "could not parse HEAD commit" +msgstr "kunde inte tolka HEAD:s incheckning" + +#: builtin/commit.c:1452 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1312 +#: builtin/commit.c:1459 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1319 +#: builtin/commit.c:1466 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1336 +#: builtin/commit.c:1485 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1350 +#: builtin/commit.c:1499 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1358 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1375 +#: builtin/commit.c:1535 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1379 +#: builtin/commit.c:1539 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1388 +#: builtin/commit.c:1550 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1199,56 +1697,56 @@ msgstr "" "att kvoten inte har överskridits, och kör sedan\n" "\"git reset HEAD\" för att återställa." -#: builtin/describe.c:205 +#: builtin/describe.c:234 #, c-format msgid "annotated tag %s not available" -msgstr "den dekorerade taggen %s inte tillgänglig" +msgstr "den annoterade taggen %s inte tillgänglig" -#: builtin/describe.c:209 +#: builtin/describe.c:238 #, c-format msgid "annotated tag %s has no embedded name" -msgstr "den dekorerade taggen %s har inget inbäddat namn" +msgstr "den annoterade taggen %s har inget inbäddat namn" -#: builtin/describe.c:211 +#: builtin/describe.c:240 #, c-format msgid "tag '%s' is really '%s' here" msgstr "taggen \"%s\" är i verkligheten \"%s\" här" -#: builtin/describe.c:238 +#: builtin/describe.c:267 #, c-format msgid "Not a valid object name %s" msgstr "Objektnamnet är inte giltigt: %s" -#: builtin/describe.c:241 +#: builtin/describe.c:270 #, c-format msgid "%s is not a valid '%s' object" msgstr "%s är inte ett giltigt \"%s\"-objekt" -#: builtin/describe.c:258 +#: builtin/describe.c:287 #, c-format msgid "no tag exactly matches '%s'" msgstr "ingen tagg motsvarar \"%s\" exakt" -#: builtin/describe.c:260 +#: builtin/describe.c:289 #, c-format msgid "searching to describe %s\n" msgstr "söker för att beskriva %s\n" -#: builtin/describe.c:295 +#: builtin/describe.c:329 #, c-format msgid "finished search at %s\n" msgstr "avslutade sökning på %s\n" -#: builtin/describe.c:319 +#: builtin/describe.c:353 #, c-format msgid "" "No annotated tags can describe '%s'.\n" "However, there were unannotated tags: try --tags." msgstr "" -"Inga dekorerade taggar kan beskriva \"%s\".\n" -"Det finns dock odekorerade taggar: testa --tags." +"Inga annoterade taggar kan beskriva \"%s\".\n" +"Det finns dock oannoterade taggar: testa --tags." -#: builtin/describe.c:323 +#: builtin/describe.c:357 #, c-format msgid "" "No tags can describe '%s'.\n" @@ -1257,12 +1755,12 @@ msgstr "" "Inga taggar kan beskriva \"%s\".\n" "Testa --always, eller skapa några taggar." -#: builtin/describe.c:344 +#: builtin/describe.c:378 #, c-format msgid "traversed %lu commits\n" msgstr "traverserade %lu incheckningar\n" -#: builtin/describe.c:347 +#: builtin/describe.c:381 #, c-format msgid "" "more than %i tags found; listed %i most recent\n" @@ -1271,121 +1769,118 @@ msgstr "" "mer än %i taggar hittades; listar de %i senaste\n" "gav upp sökningen vid %s\n" -#: builtin/describe.c:398 +#: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" msgstr "--long är inkompatibel med --abbrev=0" -#: builtin/describe.c:423 +#: builtin/describe.c:462 msgid "No names found, cannot describe anything." msgstr "Inga namn hittades, kan inte beskriva något." -#: builtin/describe.c:430 +#: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" msgstr "--dirty är inkompatibelt med \"committish\"-värden" -#: builtin/diff.c:76 +#: builtin/diff.c:77 #, c-format msgid "'%s': not a regular file or symlink" msgstr "\"%s\": inte en normal fil eller symbolisk länk" -#: builtin/diff.c:225 +#: builtin/diff.c:220 #, c-format msgid "invalid option: %s" msgstr "ogiltig flagga: %s" -#: builtin/diff.c:302 +#: builtin/diff.c:297 msgid "Not a git repository" msgstr "Inte ett git-arkiv" -#: builtin/diff.c:334 -msgid "No HEAD commit to compare with (yet)" -msgstr "Ingen HEAD-incheckning att jämföra med (ännu)" - -#: builtin/diff.c:349 +#: builtin/diff.c:347 #, c-format msgid "invalid object '%s' given." msgstr "objektet \"%s\" som angavs är felaktigt." -#: builtin/diff.c:354 +#: builtin/diff.c:352 #, c-format msgid "more than %d trees given: '%s'" msgstr "mer än %d träd angavs: \"%s\"" -#: builtin/diff.c:364 +#: builtin/diff.c:362 #, c-format msgid "more than two blobs given: '%s'" msgstr "mer än två blobbar angavs: \"%s\"" -#: builtin/diff.c:372 +#: builtin/diff.c:370 #, c-format msgid "unhandled object '%s' given." msgstr "ej hanterat objekt \"%s\" angavs." -#: builtin/fetch.c:175 +#: builtin/fetch.c:200 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:228 +#: builtin/fetch.c:252 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:233 +#: builtin/fetch.c:258 msgid "[up to date]" msgstr "[àjour]" -#. -#. * If this is the head, and it's not okay to update -#. * the head, and the old value of the head isn't empty... -#. -#: builtin/fetch.c:246 +#: builtin/fetch.c:272 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:247 builtin/fetch.c:309 +#: builtin/fetch.c:273 builtin/fetch.c:351 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:257 +#: builtin/fetch.c:284 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:258 builtin/fetch.c:280 builtin/fetch.c:293 +#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:270 +#: builtin/fetch.c:298 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:274 +#: builtin/fetch.c:302 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:305 +#: builtin/fetch.c:347 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:305 +#: builtin/fetch.c:347 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:310 +#: builtin/fetch.c:353 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:328 builtin/fetch.c:651 +#: builtin/fetch.c:384 builtin/fetch.c:676 #, c-format msgid "cannot open %s: %s\n" -msgstr "kan inte öppna %s. %s\n" +msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:406 +#: builtin/fetch.c:393 +#, 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:479 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:417 +#: builtin/fetch.c:490 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -1394,69 +1889,55 @@ msgstr "" "några 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:467 -msgid "could not run rev-list" -msgstr "kunde inte köra rev-list" - -#: builtin/fetch.c:481 -#, c-format -msgid "failed write to rev-list: %s" -msgstr "kunde inte skriva till rev-list: %s" - -#: builtin/fetch.c:488 -#, c-format -msgid "failed to close rev-list's stdin: %s" -msgstr "kunde inte stänga rev-list:s standard in: %s" - -#: builtin/fetch.c:515 +#: builtin/fetch.c:540 #, c-format msgid " (%s will become dangling)\n" msgstr " (%s kommer bli dinglande)\n" -#: builtin/fetch.c:516 +#: builtin/fetch.c:541 #, c-format msgid " (%s has become dangling)\n" msgstr " (%s har blivit dinglande)\n" -#: builtin/fetch.c:523 +#: builtin/fetch.c:548 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:524 +#: builtin/fetch.c:549 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:641 +#: builtin/fetch.c:666 #, 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:675 +#: builtin/fetch.c:700 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:729 +#: builtin/fetch.c:777 #, 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:732 +#: builtin/fetch.c:780 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:821 +#: builtin/fetch.c:879 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:823 +#: builtin/fetch.c:881 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:839 +#: builtin/fetch.c:898 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -1464,24 +1945,24 @@ msgstr "" "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n" "fjärrarkiv som nya incheckningar skall hämtas från." -#: builtin/fetch.c:859 +#: builtin/fetch.c:918 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:899 +#: builtin/fetch.c:970 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:901 +#: builtin/fetch.c:972 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:912 +#: builtin/fetch.c:983 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:920 +#: builtin/fetch.c:991 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -1499,206 +1980,213 @@ msgstr "För många flaggor angavs" msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:220 +#: builtin/gc.c:223 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:223 +#: builtin/gc.c:226 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" -"run \"git gc\" manually. See \"git help gc\" for more information." +"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." +"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" -#: builtin/gc.c:251 +#: builtin/gc.c:256 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:252 +#: builtin/grep.c:216 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep: misslyckades skapa tråd. %s" -#: builtin/grep.c:457 -#, c-format -msgid "'%s': unable to read %s" -msgstr "\"%s\" kunde inte läsa %s" - -#: builtin/grep.c:508 -#, c-format -msgid "'%s': %s" -msgstr "\"%s\": %s" - -#: builtin/grep.c:519 -#, c-format -msgid "'%s': short read %s" -msgstr "\"%s\": kort läsning %s" - -#: builtin/grep.c:581 +#: builtin/grep.c:402 #, c-format msgid "Failed to chdir: %s" msgstr "Kunde inte byta katalog (chdir): %s" -#: builtin/grep.c:671 builtin/grep.c:697 +#: builtin/grep.c:478 builtin/grep.c:512 #, c-format msgid "unable to read tree (%s)" msgstr "kunde inte läsa träd (%s)" -#: builtin/grep.c:703 +#: builtin/grep.c:526 #, c-format msgid "unable to grep from object of type %s" msgstr "Kunde inte \"grep\" från objekt av typen %s" -#: builtin/grep.c:755 +#: builtin/grep.c:584 #, c-format msgid "switch `%c' expects a numerical value" msgstr "flaggan \"%c\" antar ett numeriskt värde" -#: builtin/grep.c:771 +#: builtin/grep.c:601 #, c-format msgid "cannot open '%s'" msgstr "kan inte öppna \"%s\"" -#: builtin/grep.c:1012 +#: builtin/grep.c:888 msgid "no pattern given." msgstr "inget mönster angavs." -#: builtin/grep.c:1016 -msgid "cannot mix --fixed-strings and regexp" -msgstr "kan inte blanda --fixed-strings och reguljära uttryck" - -#: builtin/grep.c:1041 +#: builtin/grep.c:902 #, c-format msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:1068 +#: builtin/grep.c:943 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:1093 -msgid "--cached cannot be used with --no-index." -msgstr "--cached kan inte användas med --no-index." +#: builtin/grep.c:966 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:1095 -msgid "--no-index cannot be used with revs." -msgstr "--no-index kan inte användas med revisioner." +#: builtin/grep.c:971 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:1104 +#: builtin/grep.c:974 +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:982 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." -#: builtin/init-db.c:34 +#: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" -msgstr "Kunde inte göra %s skrivbar för grubben" +msgstr "Kunde inte göra %s skrivbar för gruppen" -#: builtin/init-db.c:61 +#: builtin/init-db.c:62 #, c-format msgid "insanely long template name %s" msgstr "tokigt långt namn på mallen %s" -#: builtin/init-db.c:66 +#: builtin/init-db.c:67 #, c-format msgid "cannot stat '%s'" msgstr "kan inte ta status på \"%s\"" -#: builtin/init-db.c:72 +#: builtin/init-db.c:73 #, c-format msgid "cannot stat template '%s'" msgstr "kan inte ta status på mallen \"%s\"" -#: builtin/init-db.c:79 +#: builtin/init-db.c:80 #, c-format msgid "cannot opendir '%s'" msgstr "kan inte öppna katalogen (opendir) \"%s\"" -#: builtin/init-db.c:96 +#: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" msgstr "kan inte läsa länk (readlink) \"%s\"" -#: builtin/init-db.c:98 +#: builtin/init-db.c:99 #, c-format msgid "insanely long symlink %s" msgstr "tokigt lång symbolisk länk %s" -#: builtin/init-db.c:101 +#: builtin/init-db.c:102 #, c-format msgid "cannot symlink '%s' '%s'" msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\"" -#: builtin/init-db.c:105 +#: builtin/init-db.c:106 #, c-format msgid "cannot copy '%s' to '%s'" msgstr "kan inte kopiera \"%s\" till \"%s\"" -#: builtin/init-db.c:109 +#: builtin/init-db.c:110 #, c-format msgid "ignoring template %s" msgstr "ignorerar mallen %s" -#: builtin/init-db.c:132 +#: builtin/init-db.c:133 #, c-format msgid "insanely long template path %s" msgstr "tokigt lång mallsökväg %s" -#: builtin/init-db.c:140 +#: builtin/init-db.c:141 #, c-format msgid "templates not found %s" msgstr "mallarna hittades inte %s" -#: builtin/init-db.c:153 +#: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\"" -#: builtin/init-db.c:191 +#: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" msgstr "tokig git-katalog %s" -#. TRANSLATORS: The first '%s' is either "Reinitialized -#. existing" or "Initialized empty", the second " shared" or -#. "", and the last '%s%s' is the verbatim directory name. -#: builtin/init-db.c:355 +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s finns redan" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "kan inte hantera filtyp %d" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "kan inte flytta %s till %s" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "Kunde inte skapa gitlänk %s" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:419 #, c-format msgid "%s%s Git repository in %s%s\n" msgstr "%s%s Git-arkiv i %s%s\n" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Reinitialized existing" msgstr "Ominitierade befintligt" -#: builtin/init-db.c:356 +#: builtin/init-db.c:420 msgid "Initialized empty" msgstr "Initierade tomt" -#: builtin/init-db.c:357 +#: builtin/init-db.c:421 msgid " shared" msgstr " delat" -#: builtin/init-db.c:376 +#: builtin/init-db.c:440 msgid "cannot tell cwd" msgstr "kan inte läsa aktuell katalog (cwd)" -#: builtin/init-db.c:450 builtin/init-db.c:457 +#: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format msgid "cannot mkdir %s" msgstr "kan inte skapa katalogen (mkdir) %s" -#: builtin/init-db.c:461 +#: builtin/init-db.c:532 #, c-format msgid "cannot chdir to %s" msgstr "kan inte byta katalog (chdir) till %s" -#: builtin/init-db.c:483 +#: builtin/init-db.c:554 #, c-format msgid "" "%s (or --work-tree=) not allowed without specifying %s (or --git-" @@ -1707,255 +2195,285 @@ msgstr "" "%s (eller --work-tree=) inte tillåtet utan att ange %s (eller --git-" "dir=)" -#: builtin/init-db.c:509 +#: builtin/init-db.c:578 msgid "Cannot access current working directory" msgstr "Kan inte komma åt aktuell arbetskatalog" -#: builtin/init-db.c:512 +#: builtin/init-db.c:585 #, c-format msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/log.c:104 -#, c-format -msgid "invalid --decorate option: %s" -msgstr "felaktigt värde till --decorate: %s" - -#: builtin/log.c:113 builtin/log.c:1138 builtin/shortlog.c:287 -#, c-format -msgid "unrecognized argument: %s" -msgstr "okänt argument: %s" - -#: builtin/log.c:156 +#: builtin/log.c:187 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:255 builtin/log.c:674 builtin/log.c:1222 builtin/log.c:1428 -#: builtin/merge.c:310 builtin/revert.c:556 builtin/shortlog.c:184 -msgid "revision walk setup failed" -msgstr "misslyckades skapa revisionstraversering" - -#: builtin/log.c:347 builtin/log.c:434 +#: builtin/log.c:395 builtin/log.c:483 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:458 +#: builtin/log.c:507 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:558 +#: builtin/log.c:596 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:630 +#: builtin/log.c:669 msgid "name of output directory is too long" -msgstr "namn på utdatakatalogen är för lång" +msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:641 +#: builtin/log.c:680 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:655 +#: builtin/log.c:694 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:663 +#: builtin/log.c:702 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:700 +#: builtin/log.c:739 msgid "Could not extract email from committer identity." msgstr "Kunde inte extrahera e-postadress från incheckarens identitet." -#: builtin/log.c:732 +#: builtin/log.c:785 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:825 +#: builtin/log.c:879 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:898 +#: builtin/log.c:952 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1087 +#: builtin/log.c:1173 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1132 +#: builtin/log.c:1218 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1134 +#: builtin/log.c:1220 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1141 +#: builtin/log.c:1225 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "okänt argument: %s" + +#: builtin/log.c:1228 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1143 +#: builtin/log.c:1230 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1145 +#: builtin/log.c:1232 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1166 +#: builtin/log.c:1255 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1168 +#: builtin/log.c:1257 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1307 +#: builtin/log.c:1410 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1394 +#: builtin/log.c:1514 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange manuellt.\n" -#: builtin/log.c:1410 builtin/log.c:1412 builtin/log.c:1424 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/merge.c:82 +#: builtin/merge.c:91 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:119 +#: builtin/merge.c:128 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:120 +#: builtin/merge.c:129 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:125 +#: builtin/merge.c:134 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:223 +#: builtin/merge.c:241 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:228 +#: builtin/merge.c:246 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:233 +#: builtin/merge.c:251 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:250 +#: builtin/merge.c:270 builtin/merge.c:287 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:279 +#: builtin/merge.c:317 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:292 +#: builtin/merge.c:330 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:295 builtin/merge.c:1290 builtin/merge.c:1299 -#: builtin/merge.c:1309 -#, c-format -msgid "Could not write to '%s'" -msgstr "Kunde inte skriva till \"%s\"" - -#: builtin/merge.c:323 +#: builtin/merge.c:362 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:325 +#: builtin/merge.c:364 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" -#: builtin/merge.c:345 +#: builtin/merge.c:386 #, c-format msgid "No merge message -- not updating HEAD\n" msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n" -#: builtin/merge.c:396 +#: builtin/merge.c:437 #, c-format msgid "'%s' does not point to a commit" msgstr "\"%s\" verkar inte peka på en incheckning" -#: builtin/merge.c:491 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "Felaktig branch.%s.mergeoptions-sträng: %s" -#: builtin/merge.c:553 +#: builtin/merge.c:629 msgid "git write-tree failed to write a tree" -msgstr "git write--tree misslyckades skriva ett träd" +msgstr "git write-tree misslyckades skriva ett träd" -#: builtin/merge.c:594 +#: builtin/merge.c:679 msgid "failed to read the cache" msgstr "misslyckads läsa cachen" -#: builtin/merge.c:611 +#: builtin/merge.c:696 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: builtin/merge.c:624 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:651 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:666 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:791 +#: builtin/merge.c:876 +#, c-format +msgid "Could not read from '%s'" +msgstr "Kunde inte läsa från \"%s\"" + +#: builtin/merge.c:885 +#, 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:891 +msgid "" +"Please enter a commit message to explain why this merge is necessary,\n" +"especially if it merges an updated upstream into a topic branch.\n" +"\n" +"Lines starting with '#' will be ignored, and an empty message aborts\n" +"the commit.\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" +"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"avbryter incheckningen.\n" + +#: builtin/merge.c:915 +msgid "Empty commit message." +msgstr "Tomt incheckningsmeddelande." + +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:840 builtin/merge.c:1287 builtin/merge.c:1295 -#: builtin/merge.c:1303 -#, c-format -msgid "Could not open '%s' for writing" -msgstr "Kunde inte öppna \"%s\" för skrivning" - -#: builtin/merge.c:856 +#: builtin/merge.c:1000 #, 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:871 +#: builtin/merge.c:1016 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:921 git-pull.sh:31 +#: builtin/merge.c:1057 +msgid "No current branch." +msgstr "Inte på någon gren." + +#: builtin/merge.c:1059 +msgid "No remote for the current branch." +msgstr "Ingen fjärr för aktuell gren." + +#: builtin/merge.c:1061 +msgid "No default upstream defined for the current branch." +msgstr "Ingen standarduppström angiven för aktuell gren." + +#: builtin/merge.c:1066 +#, 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:1188 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." + +#: builtin/merge.c:1204 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -1963,280 +2481,271 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:924 git-pull.sh:34 +#: builtin/merge.c:1207 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:951 +#: builtin/merge.c:1211 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" +"Checka in dina ändringar innan du kan slå ihop." + +#: builtin/merge.c:1214 +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:1223 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:956 +#: builtin/merge.c:1228 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:984 +#: builtin/merge.c:1235 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." + +#: builtin/merge.c:1266 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:987 +#: builtin/merge.c:1269 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:989 +#: builtin/merge.c:1271 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:993 builtin/merge.c:1041 +#: builtin/merge.c:1275 builtin/merge.c:1319 #, c-format msgid "%s - not something we can merge" msgstr "%s - inte något vi kan slå ihop" -#: builtin/merge.c:1099 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1133 +#: builtin/merge.c:1423 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1137 +#: builtin/merge.c:1430 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1170 +#: builtin/merge.c:1462 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1196 builtin/merge.c:1269 +#: builtin/merge.c:1485 builtin/merge.c:1562 #, c-format msgid "Rewinding the tree to pristine...\n" -msgstr "Återspolar trädet till ofördärvat...\n" +msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1200 +#: builtin/merge.c:1489 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1261 +#: builtin/merge.c:1553 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1263 +#: builtin/merge.c:1555 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslaning med strategin %s misslyckades.\n" -#: builtin/merge.c:1271 +#: builtin/merge.c:1564 #, 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:1314 +#: builtin/merge.c:1575 #, 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/mv.c:103 +#: builtin/mv.c:108 #, c-format msgid "Checking rename of '%s' to '%s'\n" msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n" -#: builtin/mv.c:107 +#: builtin/mv.c:112 msgid "bad source" msgstr "felaktig källa" -#: builtin/mv.c:110 +#: builtin/mv.c:115 msgid "can not move directory into itself" msgstr "kan inte flytta katalog till sig själv" -#: builtin/mv.c:113 +#: builtin/mv.c:118 msgid "cannot move directory over file" msgstr "kan inte flytta katalog över fil" -#: builtin/mv.c:123 +#: builtin/mv.c:128 #, c-format msgid "Huh? %.*s is in index?" msgstr "Vad? %.*s är i indexet?" -#: builtin/mv.c:135 +#: builtin/mv.c:140 msgid "source directory is empty" msgstr "källkatalogen är tom" -#: builtin/mv.c:166 +#: builtin/mv.c:171 msgid "not under version control" msgstr "inte versionshanterad" -#: builtin/mv.c:168 +#: builtin/mv.c:173 msgid "destination exists" msgstr "destinationen finns" -#: builtin/mv.c:175 +#: builtin/mv.c:181 #, c-format -msgid "%s; will overwrite!" -msgstr "%s; kommer skriva över!" +msgid "overwriting '%s'" +msgstr "skriver över \"%s\"" -#: builtin/mv.c:178 +#: builtin/mv.c:184 msgid "Cannot overwrite" msgstr "Kan inte skriva över" -#: builtin/mv.c:181 +#: builtin/mv.c:187 msgid "multiple sources for the same target" msgstr "flera källor för samma mål" -#: builtin/mv.c:196 +#: builtin/mv.c:202 #, c-format msgid "%s, source=%s, destination=%s" msgstr "%s, källa=%s, mål=%s" -#: builtin/mv.c:206 +#: builtin/mv.c:212 #, c-format msgid "Renaming %s to %s\n" msgstr "Byter namn på %s till %s\n" -#: builtin/mv.c:209 +#: builtin/mv.c:215 #, c-format msgid "renaming '%s' failed" msgstr "misslyckades byta namn på \"%s\"" -#: builtin/notes.c:122 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" -msgstr "kunde int estarta \"show\" för objektet \"%s\"" +msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:128 +#: builtin/notes.c:145 msgid "can't fdopen 'show' output fd" msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" -#: builtin/notes.c:138 +#: builtin/notes.c:155 #, c-format msgid "failed to close pipe to 'show' for object '%s'" msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" -#: builtin/notes.c:141 +#: builtin/notes.c:158 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:158 builtin/tag.c:311 +#: builtin/notes.c:175 builtin/tag.c:343 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:172 +#: builtin/notes.c:189 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:193 builtin/notes.c:797 +#: builtin/notes.c:210 builtin/notes.c:973 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:198 +#: builtin/notes.c:215 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:200 +#: builtin/notes.c:217 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:234 builtin/tag.c:445 +#: builtin/notes.c:251 builtin/tag.c:521 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:236 builtin/tag.c:448 +#: builtin/notes.c:253 builtin/tag.c:524 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:255 builtin/notes.c:444 builtin/notes.c:446 -#: builtin/notes.c:508 builtin/notes.c:560 builtin/notes.c:631 -#: builtin/notes.c:636 builtin/notes.c:710 builtin/notes.c:752 -#: builtin/notes.c:789 builtin/reset.c:303 builtin/tag.c:461 +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:258 +#: builtin/notes.c:275 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:283 +#: builtin/notes.c:299 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:295 -msgid "Failed to write current notes tree to database" -msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" - -#: builtin/notes.c:307 -msgid "Failed to commit notes tree to database" -msgstr "Kunde inte checka in anteckningsträd i databasen" - -#: builtin/notes.c:339 +#: builtin/notes.c:340 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:349 +#: builtin/notes.c:350 #, 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 -#: builtin/notes.c:376 +#: builtin/notes.c:377 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:440 +#: builtin/notes.c:441 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:455 +#: builtin/notes.c:456 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -# FIXME: Untranslatable! -# -#. TRANSLATORS: The first %s is one of "git notes ACTION", -#. e.g. "add", "copy", "append" etc. -#: builtin/notes.c:481 -#, c-format -msgid "Refusing to %s notes in %s (outside of refs/notes/)" -msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" - -#: builtin/notes.c:501 builtin/notes.c:553 builtin/notes.c:614 -#: builtin/notes.c:626 builtin/notes.c:698 builtin/notes.c:745 -#: builtin/notes.c:782 builtin/notes.c:821 +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:505 -msgid "list" -msgstr "list" - -#: builtin/notes.c:514 builtin/notes.c:758 +#: builtin/notes.c:513 builtin/notes.c:772 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:562 -msgid "add" -msgstr "add" - -#: builtin/notes.c:567 +#: builtin/notes.c:580 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2245,20 +2754,16 @@ 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:572 builtin/notes.c:649 +#: builtin/notes.c:585 builtin/notes.c:662 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:622 +#: builtin/notes.c:635 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:638 -msgid "copy" -msgstr "copy" - -#: builtin/notes.c:643 +#: builtin/notes.c:656 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -2267,12 +2772,12 @@ 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:655 +#: builtin/notes.c:668 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:703 +#: builtin/notes.c:717 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -2281,68 +2786,95 @@ 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:754 -msgid "show" -msgstr "show" - -#: builtin/notes.c:791 -msgid "remove" -msgstr "remove" - -#: builtin/notes.c:795 +#: builtin/notes.c:971 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:825 -msgid "prune" -msgstr "prune" - -#: builtin/notes.c:877 +#: builtin/notes.c:1103 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/push.c:43 +#: builtin/pack-objects.c:2310 +#, c-format +msgid "unsupported index version %s" +msgstr "indexversionen %s stöds ej" + +#: builtin/pack-objects.c:2314 +#, c-format +msgid "bad index version '%s'" +msgstr "felaktig indexversion \"%s\"" + +#: builtin/pack-objects.c:2322 +#, c-format +msgid "option %s does not accept negative form" +msgstr "flaggan %s godtar inte negativ form" + +#: builtin/pack-objects.c:2326 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" + +#: builtin/push.c:44 msgid "tag shorthand without " msgstr "taggförkortning utan " -#: builtin/push.c:62 +#: builtin/push.c:63 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:72 -msgid "You are not currently on a branch." -msgstr "Du är inte på någon gren för närvarande." - -#: builtin/push.c:74 +#: builtin/push.c:73 #, c-format -msgid "The current branch %s is not tracking anything." -msgstr "Den aktuella grenen %s spårar ingenting." +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:\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:\n" -#: builtin/push.c:77 +#: builtin/push.c:80 #, c-format -msgid "The current branch %s is tracking multiple branches, refusing to push." -msgstr "Den aktuella grenen %s spårar flera grenar, vägrar sända." +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:100 +#: builtin/push.c:88 +#, 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:111 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:120 +#: builtin/push.c:131 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:124 +#: builtin/push.c:135 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända några referenser till \"%s\"" -#: builtin/push.c:132 +#: builtin/push.c:143 #, c-format msgid "" "To prevent you from losing history, non-fast-forward updates were rejected\n" @@ -2356,40 +2888,57 @@ msgstr "" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " "detaljer.\n" -#: builtin/push.c:149 +#: builtin/push.c:160 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:150 -msgid "No destination configured to push to." -msgstr "Har inte ställt in någon destination att sända till." +#: builtin/push.c:161 +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 \n" +"\n" +"and then push using the remote name\n" +"\n" +" git push \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 \n" +"\n" +"och sänd sedan med hjälp av fjärrnamnet\n" +"\n" +" git push \n" -#: builtin/push.c:158 +#: builtin/push.c:176 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:159 +#: builtin/push.c:177 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:164 +#: builtin/push.c:182 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:165 +#: builtin/push.c:183 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:170 +#: builtin/push.c:188 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:235 +#: builtin/push.c:274 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:237 +#: builtin/push.c:276 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -2405,215 +2954,92 @@ msgstr "mjuk" msgid "hard" msgstr "hård" -#: builtin/reset.c:33 -msgid "merge" -msgstr "sammanslagning" - #: builtin/reset.c:33 msgid "keep" msgstr "behåll" -#: builtin/reset.c:95 +#: builtin/reset.c:77 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:97 +#: builtin/reset.c:79 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:103 +#: builtin/reset.c:85 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:108 +#: builtin/reset.c:96 msgid "Could not write new index file." msgstr "Kunde inte skriva ny indexfil." -#: builtin/reset.c:118 +#: builtin/reset.c:106 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:142 +#: builtin/reset.c:130 msgid "Could not read index" msgstr "Kunde inte läsa indexet" -#: builtin/reset.c:145 +#: builtin/reset.c:133 msgid "Unstaged changes after reset:" msgstr "Oköade ändringar efter återställning:" -#: builtin/reset.c:225 -#, c-format -msgid "Reflog action message too long: %.*s..." -msgstr "Reflog-händelsemeddelande för långt: %.*s..." - -#: builtin/reset.c:231 +#: builtin/reset.c:223 #, 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:307 +#: builtin/reset.c:297 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:312 +#: builtin/reset.c:302 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:321 +#: builtin/reset.c:311 msgid "--mixed with paths is deprecated; use 'git reset -- ' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- \"." -#: builtin/reset.c:323 +#: builtin/reset.c:313 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:335 +#: builtin/reset.c:325 #, 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:351 +#: builtin/reset.c:341 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/revert.c:82 +#: builtin/revert.c:70 builtin/revert.c:91 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s kan inte användas med %s" + +#: builtin/revert.c:126 msgid "program error" msgstr "programfel" -#: builtin/revert.c:154 builtin/revert.c:188 -#, c-format -msgid "Could not read commit message of %s" -msgstr "Kunde inte läsa incheckningsmeddelandet för %s" +#: builtin/revert.c:209 +msgid "revert failed" +msgstr "\"revert\" misslyckades" -#: builtin/revert.c:202 -#, c-format -msgid "Could not extract author email from %s" -msgstr "Kunde inte hämta författarens e-postadress från %s" +#: builtin/revert.c:224 +msgid "cherry-pick failed" +msgstr "\"cherry-pick\" misslyckades" -#: builtin/revert.c:214 -#, c-format -msgid "Could not extract author time from %s" -msgstr "Kunde inte hämta författartid från %s" - -#: builtin/revert.c:230 -#, c-format -msgid "No author information found in %s" -msgstr "Hittade ingen författarinformation i %s" - -#: builtin/revert.c:267 -#, c-format -msgid "Could not write to %s." -msgstr "Kunde inte skriva till %s." - -#: builtin/revert.c:270 -#, c-format -msgid "Error wrapping up %s" -msgstr "Fel vid ombrytning av %s" - -#: builtin/revert.c:290 -msgid "" -"Your local changes would be overwritten by revert.\n" -"Please, commit your changes or stash them to proceed." -msgstr "" -"Dina lokala ändringar skulle skrivas över av \"revert\".\n" -"Checka in dina ändringar eller använd \"stash\" för att fortsätta." - -#: builtin/revert.c:293 -msgid "" -"Your local changes would be overwritten by cherry-pick.\n" -"Please, commit your changes or stash them to proceed." -msgstr "" -"Dina lokala ändringar skulle skrivas över av \"cherry-pick\".\n" -"Checka in dina ändringar eller använd \"stash\" för att fortsätta." - -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:351 -#, c-format -msgid "%s: Unable to write new index file" -msgstr "%s: Kunde inte skriva ny indexfil" - -#: builtin/revert.c:417 -msgid "Your index file is unmerged." -msgstr "Din indexfil har inte slagits ihop." - -#: builtin/revert.c:420 -msgid "You do not have a valid HEAD" -msgstr "Du har ingen giltig HEAD" - -#: builtin/revert.c:428 -msgid "Cannot revert a root commit" -msgstr "Kan inte ångra en rotincheckning" - -#: builtin/revert.c:437 -#, 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." - -#: builtin/revert.c:445 -#, c-format -msgid "Commit %s does not have parent %d" -msgstr "Incheckning %s har inte förälder %d" - -#: builtin/revert.c:449 -#, c-format -msgid "Mainline was specified but commit %s is not a merge." -msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" - -#. TRANSLATORS: The first %s will be "revert" or -#. "cherry-pick", the second %s a SHA1 -#: builtin/revert.c:460 -#, c-format -msgid "%s: cannot parse parent commit %s" -msgstr "%s: kan inte tolka föräldraincheckningen %s" - -#: builtin/revert.c:464 -#, c-format -msgid "Cannot get commit message for %s" -msgstr "Kan inte hämta incheckningsmeddelande för %s" - -#: builtin/revert.c:525 -#, c-format -msgid "could not revert %s... %s" -msgstr "kunde inte ångra %s... %s" - -#: builtin/revert.c:526 -#, c-format -msgid "could not apply %s... %s" -msgstr "kunde inte applicera %s... %s" - -#: builtin/revert.c:559 -msgid "empty commit set passed" -msgstr "den angivna uppsättningen incheckningar är tom" - -#: builtin/revert.c:573 -msgid "cherry-pick --ff cannot be used with --signoff" -msgstr "cherry-pick --ff kan inte användas med --signoff" - -#: builtin/revert.c:575 -msgid "cherry-pick --ff cannot be used with --no-commit" -msgstr "cherry-pick --ff kan inte användas med --no-commit" - -#: builtin/revert.c:577 -msgid "cherry-pick --ff cannot be used with -x" -msgstr "cherry-pick --ff kan inte användas med -x" - -#: builtin/revert.c:579 -msgid "cherry-pick --ff cannot be used with --edit" -msgstr "cherry-pick --ff kan inte användas med --edit" - -#. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: builtin/revert.c:584 -#, c-format -msgid "git %s: failed to read the index" -msgstr "git %s: misslyckades läsa indexet" - -#: builtin/rm.c:118 +#: builtin/rm.c:109 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -2622,7 +3048,7 @@ msgstr "" "\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n" "(använd -f för att tvinga borttagning)" -#: builtin/rm.c:124 +#: builtin/rm.c:115 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -2631,7 +3057,7 @@ 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)" -#: builtin/rm.c:128 +#: builtin/rm.c:119 #, c-format msgid "" "'%s' has local modifications\n" @@ -2640,401 +3066,336 @@ msgstr "" "\"%s\" har lokala ändringar\n" "(använd --cached för att behålla filen eller -f för att tvinga borttagning)" -#: builtin/rm.c:202 +#: builtin/rm.c:194 #, c-format msgid "not removing '%s' recursively without -r" msgstr "tar inte bort \"%s\" rekursivt utan -r" -#: builtin/rm.c:238 +#: builtin/rm.c:230 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm: kan inte ta bort %s" -#: builtin/shortlog.c:161 +#: builtin/shortlog.c:157 #, c-format msgid "Missing author: %s" -msgstr "Saknad författare: %s" +msgstr "Författare saknas: %s" -#: builtin/tag.c:123 builtin/tag.c:464 +#: builtin/tag.c:58 +#, c-format +msgid "malformed object at '%s'" +msgstr "felformat objekt vid \"%s\"" + +#: builtin/tag.c:205 #, c-format msgid "tag name too long: %.*s..." msgstr "taggnamnet för långt: %.*s..." -#: builtin/tag.c:128 +#: builtin/tag.c:210 #, c-format msgid "tag '%s' not found." msgstr "taggen \"%s\" hittades inte." -#: builtin/tag.c:143 +#: builtin/tag.c:225 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Tog bort tagg \"%s\" (var %s)\n" -#: builtin/tag.c:155 +#: builtin/tag.c:237 #, c-format msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" -#: builtin/tag.c:170 -msgid "committer info too long." -msgstr "incheckarinformation för lång." - -#: builtin/tag.c:190 -msgid "could not run gpg." -msgstr "kunde inte köra gpg." - -#: builtin/tag.c:196 -msgid "gpg did not accept the tag data" -msgstr "gpg godtog inte taggdata" - -#: builtin/tag.c:203 -msgid "gpg failed to sign the tag" -msgstr "gpg misslyckades signera taggen" - -#: builtin/tag.c:218 +#: builtin/tag.c:247 msgid "" "\n" "#\n" "# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" "#\n" msgstr "" "\n" "#\n" "# Skriv ett taggmeddelande\n" +"# Rader som inleds med \"#\" ignoreras.\n" "#\n" -#: builtin/tag.c:226 -#, c-format -msgid "signing key value too long (%.10s...)" -msgstr "signeringsnyckelvärdet för långt (%.10s...)" +#: builtin/tag.c:254 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Skriv ett taggmeddelande\n" +"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n" +"# du vill.\n" +"#\n" -#: builtin/tag.c:272 +#: builtin/tag.c:294 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:274 +#: builtin/tag.c:296 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:289 +#: builtin/tag.c:321 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:302 +#: builtin/tag.c:334 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:329 +#: builtin/tag.c:366 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:335 +#: builtin/tag.c:372 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:428 +#: builtin/tag.c:421 +msgid "switch 'points-at' requires an object" +msgstr "flaggan \"points-at\" behöver ett object" + +#: builtin/tag.c:423 +#, c-format +msgid "malformed object name '%s'" +msgstr "felformat objektnamn \"%s\"" + +#: builtin/tag.c:502 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:430 +#: builtin/tag.c:504 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:438 +#: builtin/tag.c:506 +msgid "--points-at option is only allowed with -l." +msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." + +#: builtin/tag.c:514 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:458 +#: builtin/tag.c:534 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:466 +#: builtin/tag.c:540 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:471 +#: builtin/tag.c:545 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:479 +#: builtin/tag.c:563 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kan inte låsa referensen" -#: builtin/tag.c:481 +#: builtin/tag.c:565 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kan inte uppdatera referensen" -#: builtin/tag.c:483 +#: builtin/tag.c:567 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" -#: git-am.sh:47 +#: git-am.sh:49 msgid "You need to set your committer info first" msgstr "Du måste ställa in din incheckarinformation först" -#: git-am.sh:80 -#, sh-format -msgid "" -"When you have resolved this problem run \"$cmdline --resolved\".\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 "" -"När du har löst problemet kör du \"$cmdline --resolved\".\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\"." - -#: git-am.sh:96 -msgid "Cannot fall back to three-way merge." -msgstr "Kan inte falla tillbaka på trevägssammanslagning." - -#: git-am.sh:111 +#: git-am.sh:136 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." -#: git-am.sh:120 +#: git-am.sh:147 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." msgstr "" -"Vill du handredigera din patch?\n" +"Har du handredigerat din patch?\n" "Den kan inte appliceras på blobbar som antecknats i dess index." -#: git-am.sh:236 +#: git-am.sh:156 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" +"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..." + +#: git-am.sh:268 msgid "Only one StGIT patch series can be applied at once" msgstr "Endast en StGIT-patchserie kan appliceras åt gången" -#: git-am.sh:288 +#: git-am.sh:355 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "Patchformatet $patch_format stöds inte." -#: git-am.sh:290 +#: git-am.sh:357 msgid "Patch format detection failed." msgstr "Misslyckades detektera patchformat." -#: git-am.sh:340 +#: git-am.sh:409 msgid "-d option is no longer supported. Do not use." msgstr "Flaggan -d stöds inte lägre. Använd inte." -#: git-am.sh:403 +#: git-am.sh:472 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." -msgstr "tidigare rebase-katalog $dotest finns redan, men mbox angavs." +msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs." -#: git-am.sh:408 +#: git-am.sh:477 msgid "Please make up your mind. --skip or --abort?" msgstr "Bestäm dig. --skip eller --abort?" -#: git-am.sh:434 +#: git-am.sh:504 msgid "Resolve operation not in progress, we are not resuming." msgstr "Lösningsoperation pågår inte, vi återupptar inte." -#: git-am.sh:499 +#: git-am.sh:570 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "Smutsigt index: kan inte applicera patchar (smutsiga: $files)" -#: git-am.sh:595 -#, sh-format -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\"." - -#: git-am.sh:632 -msgid "Patch does not have a valid e-mail address." -msgstr "Patchen har inte någon giltig e-postadress." - -#: git-am.sh:679 +#: git-am.sh:746 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" "kan inte vara interaktiv om standard in inte är ansluten till en terminal." -#: git-am.sh:683 -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. -#: git-am.sh:690 +#: git-am.sh:757 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "Applicera? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla " -#: git-am.sh:726 +#: git-am.sh:793 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "Applicerar: $FIRSTLINE" -#: git-am.sh:747 -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 ändrinar - glömde du använda \"git add\"?\n" -"Om det inte är något kvar att köa kan det hända att någon annan redan\n" -"introducerat samma ändringar; kanske du bör hoppa över patchen." - -#: git-am.sh:755 -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 använda \"git add\"?" - -#: git-am.sh:771 +#: git-am.sh:838 msgid "No changes -- Patch already applied." msgstr "Inga ändringar -- Patchen har redan applicerats." -#: git-am.sh:781 -#, sh-format -msgid "Patch failed at $msgnum $FIRSTLINE" -msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" - -#: git-am.sh:797 +#: git-am.sh:864 msgid "applying to an empty history" msgstr "applicerar på en tom historik" -#: git-bisect.sh:39 -#, fuzzy -msgid "You need to start by \"git bisect start\"" -msgstr "Du måste ställa in din incheckarinformation först" - #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:45 +#: git-bisect.sh:54 msgid "Do you want me to do it for you [Y/n]? " -msgstr "" +msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?" -#: git-bisect.sh:64 -msgid "Bad HEAD - I need a HEAD" -msgstr "" +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "flaggan känns inte igen: \"$arg\"" -#: git-bisect.sh:83 -msgid "won't bisect on seeked tree" -msgstr "" - -#: git-bisect.sh:87 -msgid "Bad HEAD - strange symbolic ref" -msgstr "" - -#: git-bisect.sh:117 +#: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "" +msgstr "\"$arg\" verkar inte vara en giltig revision" -#: git-bisect.sh:162 +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "Felaktigt HEAD - Jag behöver ett HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset '." +msgstr "" +"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset " +"\"" + +# cogito-relaterat +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "kör inte \"bisect\" på ett \"seeked\"-träd" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "Felaktigt HEAD - konstig symbolisk referens" + +#: git-bisect.sh:189 #, sh-format msgid "Bad bisect_write argument: $state" -msgstr "" +msgstr "Felaktigt argument till bisect_write: $state" -#: git-bisect.sh:190 +#: git-bisect.sh:218 #, sh-format msgid "Bad rev input: $arg" -msgstr "" +msgstr "Felaktig rev-indata: $arg" -#: git-bisect.sh:204 +#: git-bisect.sh:232 msgid "Please call 'bisect_state' with at least one argument." -msgstr "" +msgstr "Anropa \"bisect_state\" med minst ett argument." -#: git-bisect.sh:207 -msgid "Bad rev input: HEAD" -msgstr "" - -#: git-bisect.sh:216 +#: git-bisect.sh:244 #, sh-format msgid "Bad rev input: $rev" -msgstr "" +msgstr "Felaktig rev-indata: $rev" -#: git-bisect.sh:222 +#: git-bisect.sh:250 msgid "'git bisect bad' can take only one argument." -msgstr "" - -#. have bad but not good. we could bisect although -#. this is less optimum. -#: git-bisect.sh:245 -msgid "Warning: bisecting only with a bad commit." -msgstr "" +msgstr "\"git bisect bad\" kan bara ta ett argument." #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. -#: git-bisect.sh:251 +#: git-bisect.sh:279 msgid "Are you sure [Y/n]? " -msgstr "" +msgstr "Är du säker [Y=ja/N=nej]? " -#: git-bisect.sh:261 -msgid "" -"You need to give me at least one good and one bad revisions.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" -msgstr "" - -#: git-bisect.sh:264 -msgid "" -"You need to start by \"git bisect start\".\n" -"You then need to give me at least one good and one bad revisions.\n" -"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" -msgstr "" - -#: git-bisect.sh:316 -msgid "We are not bisecting." -msgstr "" - -#: git-bisect.sh:323 -#, fuzzy, sh-format +#: git-bisect.sh:354 +#, sh-format msgid "'$invalid' is not a valid commit" -msgstr "\"%s\" är inte en incheckning" +msgstr "\"$invalid\" är inte en giltig incheckning" -#: git-bisect.sh:352 -#, fuzzy, sh-format +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset '." +msgstr "" +"Kunde inte checka ut original-HEAD \"$branch\".\n" +"Försök \"git bisect reset \"." + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Ingen loggfil angiven" + +#: git-bisect.sh:391 +#, sh-format msgid "cannot read $file for replaying" -msgstr "kan inte läsa indexet" +msgstr "kan inte läsa $file för uppspelning" -#: git-bisect.sh:368 +#: git-bisect.sh:408 msgid "?? what are you talking about?" -msgstr "" +msgstr "?? vad menar du?" -#: git-bisect.sh:380 -#, sh-format -msgid "running $command" -msgstr "" - -#: git-bisect.sh:386 -#, sh-format -msgid "" -"bisect run failed:\n" -"exit code $res from '$command' is < 0 or >= 128" -msgstr "" - -#: git-bisect.sh:409 -msgid "bisect run cannot continue any more" -msgstr "" - -#: git-bisect.sh:414 -#, sh-format -msgid "" -"bisect run failed:\n" -"'bisect_state $state' exited with error code $res" -msgstr "" - -#: git-bisect.sh:420 -msgid "bisect run success" -msgstr "" +#: git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Vi utför ingen bisect för tillfället." #: git-pull.sh:21 msgid "" @@ -3042,451 +3403,458 @@ msgid "" "Please, fix them up in the work tree, and then use 'git add/rm '\n" "as appropriate to mark resolution, or use 'git commit -a'." 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 \"\n" +"där det är lämpligt för att ange lösning, eller använd \"git commit -a\"." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." -msgstr "" +msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in." -#: git-pull.sh:141 -msgid "" -"There is no candidate for rebasing against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" - -#: git-pull.sh:145 -msgid "" -"There are no candidates for merging against among the refs that you just " -"fetched.\n" -"Generally this means that you provided a wildcard refspec which had no\n" -"matches on the remote end." -msgstr "" - -#. TRANSLATORS: $requested_remote will be a remote name, like -#. "origin" or "avar" -#: git-pull.sh:153 -#, sh-format -msgid "" -"You asked to pull from the remote '$requested_remote', 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 "" - -#: git-pull.sh:157 -msgid "" -"You are not currently on a branch, so I cannot use any\n" -"'branch..merge' in your configuration file.\n" -"Please specify which remote branch you want to use on the command\n" -"line and try again (e.g. 'git pull ').\n" -"See git-pull(1) for details." -msgstr "" - -#: git-pull.sh:165 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to rebase against, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often rebase against the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -" rebase = true\n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" - -#: git-pull.sh:186 -#, sh-format -msgid "" -"You asked me to pull without telling me which branch you\n" -"want to merge with, and 'branch.${curr_branch}.merge' in\n" -"your configuration file does not tell me, either. Please\n" -"specify which branch you want to use on the command line and\n" -"try again (e.g. 'git pull ').\n" -"See git-pull(1) for details.\n" -"\n" -"If you often merge with the same branch, you may want to\n" -"use something like the following in your configuration file:\n" -"\n" -" [branch \"${curr_branch}\"]\n" -" remote = \n" -" merge = \n" -"\n" -" [remote \"\"]\n" -" url = \n" -" fetch = \n" -"\n" -"See git-config(1) for details." -msgstr "" - -#: git-pull.sh:210 -#, sh-format -msgid "" -"Your configuration specifies to rebase against the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" - -#: git-pull.sh:213 -#, sh-format -msgid "" -"Your configuration specifies to merge with the ref '$upstream_branch'\n" -"from the remote, but no such ref was fetched." -msgstr "" - -#: git-pull.sh:226 +#: git-pull.sh:197 msgid "updating an unborn branch with changes added to the index" -msgstr "" +msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet" -#: git-pull.sh:232 -msgid "refusing to pull with rebase: your working tree is not up-to-date" -msgstr "" - -#. The fetch involved updating the current branch. -#. The working tree and the index file is still based on the -#. $orig_head commit, but we are merging into $curr_head. -#. First update the working tree to match $curr_head. -#: git-pull.sh:260 -#, sh-format -msgid "" -"Warning: fetch updated the current branch head.\n" -"Warning: fast-forwarding your working tree from\n" -"Warning: commit $orig_head." -msgstr "" - -#: git-pull.sh:285 -#, fuzzy +#: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" -msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud." +msgstr "Kan inte slå ihop flera grenar i ett tomt huvud." -#: git-pull.sh:289 +#: git-pull.sh:257 msgid "Cannot rebase onto multiple branches" -msgstr "" +msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar" -#: git-stash.sh:41 +#: git-stash.sh:51 msgid "git stash clear with parameters is unimplemented" -msgstr "" +msgstr "\"git stash clear\" med parametrar har inte implementerats" -#: git-stash.sh:63 -#, fuzzy +#: git-stash.sh:74 msgid "You do not have the initial commit yet" -msgstr "Du har ingen giltig HEAD" +msgstr "Du har inte den första incheckningen ännu" -#: git-stash.sh:78 -#, fuzzy +#: git-stash.sh:89 msgid "Cannot save the current index state" -msgstr "Kan inte komma åt aktuell arbetskatalog" +msgstr "Kan inte spara aktuellt tillstånd för indexet" -#: git-stash.sh:94 git-stash.sh:107 -#, fuzzy +#: git-stash.sh:123 git-stash.sh:136 msgid "Cannot save the current worktree state" -msgstr "Kan inte komma åt aktuell arbetskatalog" +msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen" -#: git-stash.sh:111 -#, fuzzy +#: git-stash.sh:140 msgid "No changes selected" -msgstr "# Inga ändringar\n" +msgstr "Inga ändringar valda" -#: git-stash.sh:114 +#: git-stash.sh:143 msgid "Cannot remove temporary index (can't happen)" -msgstr "" +msgstr "Kan inte ta bort temporärt index (kan inte inträffa)" -#: git-stash.sh:127 -#, fuzzy +#: git-stash.sh:156 msgid "Cannot record working tree state" -msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +msgstr "Kan inte registrera tillstånd för arbetskatalog" -#: git-stash.sh:176 +#: git-stash.sh:223 msgid "No local changes to save" -msgstr "" +msgstr "Inga lokala ändringar att spara" -#: git-stash.sh:180 +#: git-stash.sh:227 msgid "Cannot initialize stash" -msgstr "" +msgstr "Kan inte initiera \"stash\"" -#: git-stash.sh:188 +#: git-stash.sh:235 msgid "Cannot save the current status" -msgstr "" +msgstr "Kan inte spara aktuell status" -#: git-stash.sh:201 -#, fuzzy +#: git-stash.sh:253 msgid "Cannot remove worktree changes" -msgstr "Kan inte komma åt arbetskatalogen \"%s\"" +msgstr "Kan inte ta bort ändringar i arbetskatalogen" -#: git-stash.sh:303 +#: git-stash.sh:352 msgid "No stash found." -msgstr "" +msgstr "Ingen \"stash\" hittades." -#: git-stash.sh:310 -#, fuzzy, sh-format -msgid "Too many revisions specified: $REV" -msgstr "För många flaggor angavs" - -#: git-stash.sh:316 -#, fuzzy, sh-format -msgid "$reference is not valid reference" -msgstr "referensen är inte ett träd: %s" - -#. maintainers: it would be better if git rev-parse indicated -#. this condition with a non-zero status code but as of 1.7.2.1 it -#. it did not. So, we use non-empty stderr output as a proxy for the -#. condition of interest. -#: git-stash.sh:337 +#: git-stash.sh:359 #, sh-format -msgid "$REV does not exist in the stash log" -msgstr "" +msgid "Too many revisions specified: $REV" +msgstr "För många revisioner angivna: $REV" -#: git-stash.sh:351 -#, fuzzy, sh-format +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference är inte en giltig referens." + +#: git-stash.sh:393 +#, sh-format msgid "'$args' is not a stash-like commit" -msgstr "\"%s\" är inte en incheckning" +msgstr "\"$args\" är inte en \"stash\"-liknande incheckning" -#: git-stash.sh:362 +#: git-stash.sh:404 #, sh-format msgid "'$args' is not a stash reference" -msgstr "" - -#: git-stash.sh:372 -msgid "Cannot apply to a dirty working tree, please stage your changes" -msgstr "" - -#: git-stash.sh:376 -#, fuzzy -msgid "Cannot apply a stash in the middle of a merge" -msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." - -#: git-stash.sh:384 -msgid "Conflicts in index. Try without --index." -msgstr "" - -#: git-stash.sh:386 -#, fuzzy -msgid "Could not save index tree" -msgstr "Kunde inte läsa indexet" +msgstr "\"$args\" är inte en \"stash\"-referens" #: git-stash.sh:412 -msgid "Cannot unstage modified files" -msgstr "" +msgid "unable to refresh index" +msgstr "kan inte uppdatera indexet" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Kan inte applicera en \"stash\" mitt i en sammanslagning" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Konflikter i indexet. Testa utan --index." #: git-stash.sh:426 -#, fuzzy -msgid "Index was not unstashed." -msgstr "kunde köra stash." +msgid "Could not save index tree" +msgstr "Kunde inte spara indexträd" -#: git-stash.sh:443 +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "Kan inte ta bort ändrade filer ur kön" + +#: git-stash.sh:491 #, sh-format msgid "Dropped ${REV} ($s)" -msgstr "" +msgstr "Kastade ${REV} ($s)" -#: git-stash.sh:444 +#: git-stash.sh:492 #, sh-format msgid "${REV}: Could not drop stash entry" -msgstr "" +msgstr "${REV}: Kunde inte kasta \"stash\"-post" -#: git-stash.sh:451 -#, fuzzy +#: git-stash.sh:499 msgid "No branch name specified" -msgstr "Misslyckades byta namn på gren" +msgstr "Inget grennamn angavs" -#: git-stash.sh:522 +#: git-stash.sh:570 msgid "(To restore them type \"git stash apply\")" -msgstr "" +msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:38 +#: git-submodule.sh:56 #, sh-format -msgid "remote ($remote) does not have a url defined in .git/config" -msgstr "" +msgid "cannot strip one component off url '$remoteurl'" +msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" -#: git-submodule.sh:79 +#: git-submodule.sh:108 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$path'" -msgstr "" +msgstr "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$path\"" -#: git-submodule.sh:105 -#, sh-format -msgid "Directory '$path' exists, but is neither empty nor a git repository" -msgstr "" - -#: git-submodule.sh:109 -#, sh-format -msgid "A file already exist at path '$path'" -msgstr "" - -#: git-submodule.sh:117 +#: git-submodule.sh:173 #, sh-format msgid "Clone of '$url' into submodule path '$path' failed" -msgstr "" - -#: git-submodule.sh:190 -#, sh-format -msgid "repo URL: '$repo' must be absolute or begin with ./|../" -msgstr "" - -#: git-submodule.sh:207 -#, fuzzy, sh-format -msgid "'$path' already exists in the index" -msgstr "kan inte läsa indexet" - -#: git-submodule.sh:211 -#, sh-format -msgid "" -"The following path is ignored by one of your .gitignore files:\n" -"$path\n" -"Use -f if you really want to add it." -msgstr "" - -#: git-submodule.sh:222 -#, sh-format -msgid "Adding existing repo at '$path' to the index" -msgstr "" - -#: git-submodule.sh:224 -#, fuzzy, sh-format -msgid "'$path' already exists and is not a valid git repo" -msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." +msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\"" #: git-submodule.sh:247 #, 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:264 +#, sh-format +msgid "'$path' already exists in the index" +msgstr "\"$path\" finns redan i indexet" + +#: git-submodule.sh:281 +#, sh-format +msgid "'$path' already exists and is not a valid git repo" +msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv" + +#: git-submodule.sh:295 +#, sh-format msgid "Unable to checkout submodule '$path'" -msgstr "" +msgstr "Kan inte checka ut undermodul \"$path\"" -#: git-submodule.sh:251 -#, fuzzy, sh-format +#: git-submodule.sh:300 +#, sh-format msgid "Failed to add submodule '$path'" -msgstr "Kunde inte läsa objektet \"%s\"." +msgstr "Misslyckades lägga till underkatalog \"$path\"" -#: git-submodule.sh:256 +#: git-submodule.sh:305 #, sh-format msgid "Failed to register submodule '$path'" -msgstr "" +msgstr "Misslyckades registrera undermodul \"$path\"" -#: git-submodule.sh:294 +#: git-submodule.sh:347 #, sh-format msgid "Entering '$prefix$path'" -msgstr "" - -#: git-submodule.sh:306 -#, sh-format -msgid "Stopping at '$path'; script returned non-zero status." -msgstr "" - -#: git-submodule.sh:349 -#, sh-format -msgid "No url found for submodule path '$path' in .gitmodules" -msgstr "" +msgstr "Går in i \"$prefix$path\"" #: git-submodule.sh:359 #, sh-format -msgid "Failed to register url for submodule path '$path'" -msgstr "" +msgid "Stopping at '$path'; script returned non-zero status." +msgstr "Stoppar på \"$path\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:364 +#: git-submodule.sh:401 +#, sh-format +msgid "No url found for submodule path '$path' in .gitmodules" +msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules" + +#: git-submodule.sh:410 +#, sh-format +msgid "Failed to register url for submodule path '$path'" +msgstr "Misslyckades registrera url för underkatalogsökväg \"$path\"" + +#: git-submodule.sh:418 #, sh-format msgid "Failed to register update mode for submodule path '$path'" msgstr "" +"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$path\"" -#: git-submodule.sh:366 +#: git-submodule.sh:420 #, sh-format msgid "Submodule '$name' ($url) registered for path '$path'" -msgstr "" +msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$path\"" -#: git-submodule.sh:444 +#: git-submodule.sh:519 #, sh-format msgid "" "Submodule path '$path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" +"Undermodulen \"$path\" har inte initierats\n" +"Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:456 +#: git-submodule.sh:532 #, sh-format msgid "Unable to find current revision in submodule path '$path'" -msgstr "" +msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$path\"" -#: git-submodule.sh:476 +#: git-submodule.sh:551 #, sh-format msgid "Unable to fetch in submodule path '$path'" -msgstr "" +msgstr "Kan inte hämta i undermodulsökväg \"$path\"" -#: git-submodule.sh:482 git-submodule.sh:487 git-submodule.sh:492 +#: git-submodule.sh:565 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$path'" -msgstr "" +msgstr "Kan inte göra \"rebase\" av \"$sha1\" i undermodulsökväg \"$path\"" -#: git-submodule.sh:483 +#: git-submodule.sh:566 #, sh-format msgid "Submodule path '$path': rebased into '$sha1'" -msgstr "" +msgstr "Undermodulsökvägen \"$path\": \"rebase\":ad in i \"$sha1\"" -#: git-submodule.sh:488 +#: git-submodule.sh:571 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$path'" +msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$path\"" + +#: git-submodule.sh:572 #, sh-format msgid "Submodule path '$path': merged in '$sha1'" -msgstr "" +msgstr "Undermodulsökvägen \"$path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:493 +#: git-submodule.sh:577 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$path'" +msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$path\"" + +#: git-submodule.sh:578 #, sh-format msgid "Submodule path '$path': checked out '$sha1'" -msgstr "" +msgstr "Undermodulsökvägen \"$path\": checkade ut \"$sha1\"" -#: git-submodule.sh:504 git-submodule.sh:797 +#: git-submodule.sh:600 git-submodule.sh:923 #, sh-format msgid "Failed to recurse into submodule path '$path'" -msgstr "" +msgstr "Misslyckades rekursera in i undermodulsökvägen \"$path\"" -#: git-submodule.sh:588 +#: git-submodule.sh:708 msgid "--" -msgstr "" +msgstr "--" -#. unexpected type -#: git-submodule.sh:628 -#, fuzzy, sh-format -msgid "unexpected mode $mod_dst" -msgstr "diff-status %c förväntades inte" - -#: git-submodule.sh:646 +#: git-submodule.sh:766 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" -msgstr "" +msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:649 +#: git-submodule.sh:769 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" -msgstr "" +msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:652 +#: git-submodule.sh:772 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" -msgstr "" +msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst" -#: git-submodule.sh:677 +#: git-submodule.sh:797 msgid "blob" -msgstr "" +msgstr "blob" -#: git-submodule.sh:678 +#: git-submodule.sh:798 msgid "submodule" -msgstr "" +msgstr "undermodul" -#: git-submodule.sh:715 -#, fuzzy -msgid "# Submodules changed but not updated:" -msgstr "# Ändrade men inte uppdaterade:" - -#: git-submodule.sh:717 -#, fuzzy -msgid "# Submodule changes to be committed:" -msgstr "# Ändringar att checka in:" - -#: git-submodule.sh:844 +#: git-submodule.sh:969 #, sh-format msgid "Synchronizing submodule url for '$name'" -msgstr "" +msgstr "Synkroniserar undermodul-url för \"$name\"" + +#~ msgid "# Changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" + +#~ msgid "A branch named '%s' already exists." +#~ msgstr "Det finns redan en gren som heter \"%s\"" + +#~ msgid "path '%s' does not have all 3 versions" +#~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna" + +#~ 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 "invalid --decorate option: %s" +#~ msgstr "felaktigt värde till --decorate: %s" + +#~ msgid "%s; will overwrite!" +#~ msgstr "%s; kommer skriva över!" + +#~ msgid "Failed to write current notes tree to database" +#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen" + +#~ msgid "Failed to commit notes tree to database" +#~ msgstr "Kunde inte checka in anteckningsträd i databasen" + +# FIXME: Untranslatable! +# +#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)" +#~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)" + +#~ msgid "list" +#~ msgstr "list" + +#~ msgid "add" +#~ msgstr "add" + +#~ msgid "copy" +#~ msgstr "copy" + +#~ msgid "show" +#~ msgstr "show" + +#~ msgid "remove" +#~ msgstr "remove" + +#~ msgid "prune" +#~ msgstr "prune" + +#~ msgid "The current branch %s is not tracking anything." +#~ msgstr "Den aktuella grenen %s spårar ingenting." + +#~ msgid "No destination configured to push to." +#~ msgstr "Har inte ställt in någon destination att sända till." + +#~ msgid "Reflog action message too long: %.*s..." +#~ msgstr "Reflog-händelsemeddelande för långt: %.*s..." + +#~ msgid "Could not read commit message of %s" +#~ msgstr "Kunde inte läsa incheckningsmeddelandet för %s" + +#~ msgid "Could not extract author email from %s" +#~ msgstr "Kunde inte hämta författarens e-postadress från %s" + +#~ msgid "Could not extract author time from %s" +#~ msgstr "Kunde inte hämta författartid från %s" + +#~ msgid "No author information found in %s" +#~ msgstr "Hittade ingen författarinformation i %s" + +#~ msgid "cherry-pick --ff cannot be used with --signoff" +#~ msgstr "cherry-pick --ff kan inte användas med --signoff" + +#~ msgid "cherry-pick --ff cannot be used with --no-commit" +#~ msgstr "cherry-pick --ff kan inte användas med --no-commit" + +#~ msgid "cherry-pick --ff cannot be used with -x" +#~ msgstr "cherry-pick --ff kan inte användas med -x" + +#~ msgid "cherry-pick --ff cannot be used with --edit" +#~ msgstr "cherry-pick --ff kan inte användas med --edit" + +#~ msgid "committer info too long." +#~ msgstr "incheckarinformation för lång." + +#~ msgid "" +#~ "\n" +#~ "#\n" +#~ "# Write a tag message\n" +#~ "#\n" +#~ msgstr "" +#~ "\n" +#~ "#\n" +#~ "# Skriv ett taggmeddelande\n" +#~ "#\n" + +#~ msgid "signing key value too long (%.10s...)" +#~ msgstr "signeringsnyckelvärdet för långt (%.10s...)" + +#~ msgid "" +#~ "When you have resolved this problem run \"$cmdline --resolved\".\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 "" +#~ "När du har löst problemet kör du \"$cmdline --resolved\".\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 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 "Commit Body is:" +#~ msgstr "Incheckningskroppen är:" + +#~ 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 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." + +#~ 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 använda \"git add\"?" + +#~ msgid "Patch failed at $msgnum $FIRSTLINE" +#~ msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE" + +#, fuzzy +#~ msgid "You need to start by \"git bisect start\"" +#~ msgstr "Du måste ställa in din incheckarinformation först" + +#, fuzzy +#~ msgid "Index was not unstashed." +#~ msgstr "kunde köra stash." + +#, fuzzy +#~ msgid "# Submodules changed but not updated:" +#~ msgstr "# Ändrade men inte uppdaterade:" + +#, fuzzy +#~ msgid "# Submodule changes to be committed:" +#~ msgstr "# Ändringar att checka in:" From 14c8bced15cb1148f3e3211c10732b1992334784 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 8 Mar 2012 12:06:53 +0800 Subject: [PATCH 10/12] l10n: Update zh_CN translation for 1.7.10-rc0 Translate 1 new message from Git 1.7.10-rc0. Signed-off-by: Jiang Xin --- po/zh_CN.po | 346 +++++++++++++++++++++++++++------------------------- 1 file changed, 177 insertions(+), 169 deletions(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3b818e24de..3d2137ac89 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List \n" -"POT-Creation-Date: 2012-02-28 09:17+0800\n" +"POT-Creation-Date: 2012-03-08 10:19+0800\n" "PO-Revision-Date: 2012-01-30 00:00+0800\n" "Last-Translator: Jiang Xin \n" "Language-Team: GitHub \n" @@ -71,18 +71,18 @@ msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入：%s" # 注意保持前导空格 -#: diff.c:104 +#: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" msgstr " 无法解析 dirstat 阈值 '%.*s'\n" # 注意保持前导空格 -#: diff.c:109 +#: diff.c:110 #, c-format msgid " Unknown dirstat parameter '%.*s'\n" msgstr " 未知 dirstat 参数 '%.*s'\n" -#: diff.c:205 +#: diff.c:210 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -91,29 +91,29 @@ msgstr "" "配置变量 'diff.dirstat' 出错：\n" "%s" -#: diff.c:1331 +#: diff.c:1336 msgid " 0 files changed\n" msgstr "0 个文件被修改\n" -#: diff.c:1335 +#: diff.c:1340 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" -#: diff.c:1352 +#: diff.c:1357 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "，插入 %d 行(+)" -#: diff.c:1363 +#: diff.c:1368 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "，删除 %d 行(-)" -#: diff.c:3364 +#: diff.c:3424 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -134,17 +134,17 @@ msgstr "gpg 没有接受数据" msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: grep.c:1285 +#: grep.c:1280 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1302 +#: grep.c:1297 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1313 +#: grep.c:1308 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" @@ -183,19 +183,27 @@ msgstr[0] "" "您的分支和 '%s' 出现了偏离，\n" "并且各自分别有 %d 和 %d 处不同的提交。\n" -#: sequencer.c:120 builtin/merge.c:862 builtin/merge.c:983 -#: builtin/merge.c:1093 builtin/merge.c:1103 +#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 +#: builtin/merge.c:1095 builtin/merge.c:1105 #, c-format msgid "Could not open '%s' for writing" msgstr "无法打开 '%s' 以写入" -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:865 -#: builtin/merge.c:1095 builtin/merge.c:1108 +#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 +#: builtin/merge.c:1097 builtin/merge.c:1110 #, c-format msgid "Could not write to '%s'" msgstr "无法写入 '%s'" -#: sequencer.c:142 +#: sequencer.c:143 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add ' or 'git rm '" +msgstr "" +"冲突解决完毕后，用 'git add ' 或 'git rm '\n" +"命令标记修正后的文件" + +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add ' or 'git rm '\n" @@ -204,202 +212,202 @@ msgstr "" "冲突解决完毕后，用 'git add ' 或 'git rm '\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:154 sequencer.c:680 sequencer.c:763 +#: sequencer.c:159 sequencer.c:685 sequencer.c:768 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:157 +#: sequencer.c:162 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:172 +#: sequencer.c:177 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:174 +#: sequencer.c:179 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:177 +#: sequencer.c:182 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:227 +#: sequencer.c:232 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新暂存区文件" -#: sequencer.c:293 +#: sequencer.c:298 msgid "Your index file is unmerged." msgstr "您的暂存区文件未完成合并。" -#: sequencer.c:296 +#: sequencer.c:301 msgid "You do not have a valid HEAD" msgstr "您没有一个有效的 HEAD" -#: sequencer.c:311 +#: sequencer.c:316 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:319 +#: sequencer.c:324 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:323 +#: sequencer.c:328 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "提供了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:334 +#: sequencer.c:339 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:338 +#: sequencer.c:343 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:422 +#: sequencer.c:427 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:423 +#: sequencer.c:428 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:445 sequencer.c:904 builtin/log.c:286 builtin/log.c:709 -#: builtin/log.c:1325 builtin/log.c:1544 builtin/merge.c:348 +#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "版本遍历设置失败" -#: sequencer.c:448 +#: sequencer.c:453 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:456 +#: sequencer.c:461 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: 无法读取暂存区" -#: sequencer.c:461 +#: sequencer.c:466 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: 无法刷新暂存区" -#: sequencer.c:546 +#: sequencer.c:551 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在 %s 过程中" -#: sequencer.c:568 +#: sequencer.c:573 #, c-format msgid "Could not parse line %d." msgstr "无法解析第 %d 行。" -#: sequencer.c:573 +#: sequencer.c:578 msgid "No commits parsed." msgstr "未有提交被解析。" -#: sequencer.c:586 +#: sequencer.c:591 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:590 +#: sequencer.c:595 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:597 +#: sequencer.c:602 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:625 +#: sequencer.c:630 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:628 +#: sequencer.c:633 #, c-format msgid "Invalid value for %s: %s" msgstr "无效的 %s 值：%s" -#: sequencer.c:640 +#: sequencer.c:645 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:661 +#: sequencer.c:666 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:662 +#: sequencer.c:667 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:666 +#: sequencer.c:671 #, c-format msgid "Could not create sequencer directory %s" msgstr "无法创建序列目录 %s" -#: sequencer.c:682 sequencer.c:767 +#: sequencer.c:687 sequencer.c:772 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:701 sequencer.c:835 +#: sequencer.c:706 sequencer.c:840 msgid "no cherry-pick or revert in progress" msgstr "没有拣选或还原操作在进行" -#: sequencer.c:703 +#: sequencer.c:708 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:705 +#: sequencer.c:710 msgid "cannot abort from a branch yet to be born" msgstr "不能从未初始分支终止" -#: sequencer.c:727 +#: sequencer.c:732 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:730 +#: sequencer.c:735 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:731 +#: sequencer.c:736 msgid "unexpected end of file" msgstr "未预期的文件结束" -#: sequencer.c:737 +#: sequencer.c:742 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存预拣选提交的 HEAD 文件 '%s' 损坏" -#: sequencer.c:760 +#: sequencer.c:765 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:922 +#: sequencer.c:927 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:923 +#: sequencer.c:928 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -896,56 +904,56 @@ msgstr "领先 %d，落后 %d] " msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:562 +#: builtin/branch.c:566 msgid "some refs could not be read" msgstr "一些引用无法读取" -#: builtin/branch.c:575 +#: builtin/branch.c:579 msgid "cannot rename the current branch while not on any." msgstr "无法重命名不存在的当前分支。" -#: builtin/branch.c:585 +#: builtin/branch.c:589 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:600 +#: builtin/branch.c:604 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:604 +#: builtin/branch.c:608 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:608 +#: builtin/branch.c:612 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:615 +#: builtin/branch.c:619 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:630 +#: builtin/branch.c:634 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:654 +#: builtin/branch.c:658 #, c-format msgid "could not write branch description template: %s\n" msgstr "不能写分支描述模版：%s\n" -#: builtin/branch.c:742 +#: builtin/branch.c:746 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:747 builtin/clone.c:558 +#: builtin/branch.c:751 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "未在 /refs/heads 下发现 HEAD！" -#: builtin/branch.c:805 +#: builtin/branch.c:809 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" @@ -1007,11 +1015,11 @@ msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:809 +#: builtin/merge.c:811 msgid "unable to write new index file" msgstr "无法写新的暂存区文件" -#: builtin/checkout.c:319 builtin/diff.c:298 builtin/merge.c:406 +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 msgid "diff_setup_done failed" msgstr "diff_setup_done 失败" @@ -1652,7 +1660,7 @@ msgstr " （根提交）" msgid "could not parse HEAD commit" msgstr "无法解析 HEAD 提交" -#: builtin/commit.c:1452 builtin/merge.c:507 +#: builtin/commit.c:1452 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "无法打开 '%s' 读取" @@ -1676,7 +1684,7 @@ msgstr "无法读取提交说明：%s" msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1514 builtin/merge.c:933 builtin/merge.c:966 +#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 msgid "failed to write commit object" msgstr "写提交对象失败" @@ -1791,26 +1799,26 @@ msgstr "'%s'：不是一个正规文件或符号链接" msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:293 +#: builtin/diff.c:297 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:343 +#: builtin/diff.c:347 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:348 +#: builtin/diff.c:352 #, c-format msgid "more than %d trees given: '%s'" msgstr "提供了超过 %d 个树对象：'%s'" -#: builtin/diff.c:358 +#: builtin/diff.c:362 #, c-format msgid "more than two blobs given: '%s'" msgstr "提供了超过两个 blob 对象：'%s'" -#: builtin/diff.c:366 +#: builtin/diff.c:370 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" @@ -2030,32 +2038,32 @@ msgstr "开关 `%c' 期望一个数字值" msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:889 +#: builtin/grep.c:888 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:903 +#: builtin/grep.c:902 #, c-format msgid "bad object %s" msgstr "坏对象 %s" -#: builtin/grep.c:944 +#: builtin/grep.c:943 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:967 +#: builtin/grep.c:966 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 共用" -#: builtin/grep.c:972 +#: builtin/grep.c:971 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本共用。" -#: builtin/grep.c:975 +#: builtin/grep.c:974 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于跟踪内容。" -#: builtin/grep.c:983 +#: builtin/grep.c:982 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -2203,109 +2211,109 @@ msgstr "不能访问当前工作目录" msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:185 +#: builtin/log.c:187 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:393 builtin/log.c:479 +#: builtin/log.c:395 builtin/log.c:483 #, c-format msgid "Could not read object %s" msgstr "无法读取对象 %s" -#: builtin/log.c:503 +#: builtin/log.c:507 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:592 +#: builtin/log.c:596 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:665 +#: builtin/log.c:669 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:676 +#: builtin/log.c:680 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:690 +#: builtin/log.c:694 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:698 +#: builtin/log.c:702 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:735 +#: builtin/log.c:739 msgid "Could not extract email from committer identity." msgstr "无法从提交者身份中提取邮件地址。" -#: builtin/log.c:781 +#: builtin/log.c:785 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:875 +#: builtin/log.c:879 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:948 +#: builtin/log.c:952 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1169 +#: builtin/log.c:1173 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1214 +#: builtin/log.c:1218 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1216 +#: builtin/log.c:1220 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1221 builtin/shortlog.c:284 +#: builtin/log.c:1225 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "未识别的参数：%s" -#: builtin/log.c:1224 +#: builtin/log.c:1228 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1226 +#: builtin/log.c:1230 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1228 +#: builtin/log.c:1232 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1251 +#: builtin/log.c:1255 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1253 +#: builtin/log.c:1257 #, c-format msgid "Could not create directory '%s'" msgstr "无法创建目录 '%s'" -#: builtin/log.c:1406 +#: builtin/log.c:1410 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1510 +#: builtin/log.c:1514 #, c-format msgid "" "Could not find a tracked remote branch, please specify manually.\n" msgstr "无法找到跟踪的远程分支，请手工提供 。\n" -#: builtin/log.c:1526 builtin/log.c:1528 builtin/log.c:1540 +#: builtin/log.c:1530 builtin/log.c:1532 builtin/log.c:1544 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -2369,53 +2377,53 @@ msgstr "完成 SQUASH_MSG" msgid "No merge message -- not updating HEAD\n" msgstr "无合并信息 -- 未更新 HEAD\n" -#: builtin/merge.c:435 +#: builtin/merge.c:437 #, c-format msgid "'%s' does not point to a commit" msgstr "'%s' 没有指向一个提交" -#: builtin/merge.c:534 +#: builtin/merge.c:536 #, c-format msgid "Bad branch.%s.mergeoptions string: %s" msgstr "错的 branch.%s.mergeoptions 字串：%s" -#: builtin/merge.c:627 +#: builtin/merge.c:629 msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:677 +#: builtin/merge.c:679 msgid "failed to read the cache" msgstr "无法读取缓存" -#: builtin/merge.c:694 +#: builtin/merge.c:696 msgid "Unable to write index." msgstr "不能写暂存区。" -#: builtin/merge.c:707 +#: builtin/merge.c:709 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:721 +#: builtin/merge.c:723 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:735 +#: builtin/merge.c:737 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:874 +#: builtin/merge.c:876 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:883 +#: builtin/merge.c:885 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:889 +#: builtin/merge.c:891 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" @@ -2428,47 +2436,47 @@ msgstr "" "\n" "以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:913 +#: builtin/merge.c:915 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:925 +#: builtin/merge.c:927 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:998 +#: builtin/merge.c:1000 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1014 +#: builtin/merge.c:1016 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:1055 +#: builtin/merge.c:1057 msgid "No current branch." msgstr "当前不在分支上。" -#: builtin/merge.c:1057 +#: builtin/merge.c:1059 msgid "No remote for the current branch." msgstr "当前分支没有远程版本库。" -#: builtin/merge.c:1059 +#: builtin/merge.c:1061 msgid "No default upstream defined for the current branch." msgstr "当前分支未定义默认上游分支。" -#: builtin/merge.c:1064 +#: builtin/merge.c:1066 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1186 +#: builtin/merge.c:1188 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）" -#: builtin/merge.c:1202 git-pull.sh:31 +#: builtin/merge.c:1204 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -2476,11 +2484,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请先提交您的修改，您才能合并。" -#: builtin/merge.c:1205 git-pull.sh:34 +#: builtin/merge.c:1207 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1209 +#: builtin/merge.c:1211 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -2488,84 +2496,84 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请先提交您的修改，您才能合并。" -#: builtin/merge.c:1212 +#: builtin/merge.c:1214 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1221 +#: builtin/merge.c:1223 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 共用。" -#: builtin/merge.c:1226 +#: builtin/merge.c:1228 msgid "You cannot combine --no-ff with --ff-only." msgstr "您不能将 --no-ff 与 --ff-only 共用。" -#: builtin/merge.c:1233 +#: builtin/merge.c:1235 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指出提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1264 +#: builtin/merge.c:1266 msgid "Can merge only exactly one commit into empty head" msgstr "只可将一个提交合并到空分支上" -#: builtin/merge.c:1267 +#: builtin/merge.c:1269 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1269 +#: builtin/merge.c:1271 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1273 builtin/merge.c:1317 +#: builtin/merge.c:1275 builtin/merge.c:1319 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不是我们可以合并的东西" -#: builtin/merge.c:1383 +#: builtin/merge.c:1385 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1421 +#: builtin/merge.c:1423 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的暂存区内合并...\n" -#: builtin/merge.c:1428 +#: builtin/merge.c:1430 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1460 +#: builtin/merge.c:1462 msgid "Not possible to fast-forward, aborting." msgstr "不可能快进式，终止。" -#: builtin/merge.c:1483 builtin/merge.c:1560 +#: builtin/merge.c:1485 builtin/merge.c:1562 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1487 +#: builtin/merge.c:1489 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1551 +#: builtin/merge.c:1553 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1555 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1562 +#: builtin/merge.c:1564 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1573 +#: builtin/merge.c:1575 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" @@ -3204,11 +3212,11 @@ msgstr "已更新tag '%s'（曾为 %s）\n" msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" -#: git-am.sh:135 +#: git-am.sh:136 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" -#: git-am.sh:144 +#: git-am.sh:147 msgid "" "Did you hand edit your patch?\n" "It does not apply to blobs recorded in its index." @@ -3216,46 +3224,46 @@ msgstr "" "您是否曾手动编辑过您的补丁？\n" "无法应用补丁到暂存区的数据中。" -#: git-am.sh:153 +#: git-am.sh:156 msgid "Falling back to patching base and 3-way merge..." msgstr "转而使用补丁应用的基础版本和三路合并..." -#: git-am.sh:265 +#: git-am.sh:268 msgid "Only one StGIT patch series can be applied at once" msgstr "一次只能有一个 StGIT 补丁队列被应用" -#: git-am.sh:352 +#: git-am.sh:355 #, sh-format msgid "Patch format $patch_format is not supported." msgstr "不支持 $patch_format 补丁格式。" -#: git-am.sh:354 +#: git-am.sh:357 msgid "Patch format detection failed." msgstr "补丁格式检测失败。" -#: git-am.sh:406 +#: git-am.sh:409 msgid "-d option is no longer supported. Do not use." msgstr "不再支持 -d 选项。不要使用。" -#: git-am.sh:469 +#: git-am.sh:472 #, sh-format msgid "previous rebase directory $dotest still exists but mbox given." msgstr "之前的变基目录 $dotest 仍然存在但给出了mbox。" -#: git-am.sh:474 +#: git-am.sh:477 msgid "Please make up your mind. --skip or --abort?" msgstr "请下决心。--skip 或是 --abort ？" -#: git-am.sh:501 +#: git-am.sh:504 msgid "Resolve operation not in progress, we are not resuming." msgstr "解决操作未进行，我们不会继续。" -#: git-am.sh:567 +#: git-am.sh:570 #, sh-format msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的暂存区：不能应用补丁（脏文件：$files）" -#: git-am.sh:743 +#: git-am.sh:746 msgid "cannot be interactive without stdin connected to a terminal." msgstr "没有和终端关联的标准输入不能进行交互式操作。" @@ -3263,20 +3271,20 @@ msgstr "没有和终端关联的标准输入不能进行交互式操作。" #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. -#: git-am.sh:754 +#: git-am.sh:757 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " -#: git-am.sh:790 +#: git-am.sh:793 #, sh-format msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" -#: git-am.sh:835 +#: git-am.sh:838 msgid "No changes -- Patch already applied." msgstr "没有变更 -- 补丁已经应用过。" -#: git-am.sh:861 +#: git-am.sh:864 msgid "applying to an empty history" msgstr "正应用到一个空历史上" From 1aabac6580f9902bddf6d150a4bd2967d15d9ca2 Mon Sep 17 00:00:00 2001 From: Thynson Date: Sat, 3 Mar 2012 08:34:28 +0800 Subject: [PATCH 11/12] l10n: Improve zh_CN trans for msg that cannot fast-forward Signed-off-by: Thynson --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index 3d2137ac89..a1096e93c6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2546,7 +2546,7 @@ msgstr "无。\n" #: builtin/merge.c:1462 msgid "Not possible to fast-forward, aborting." -msgstr "不可能快进式，终止。" +msgstr "无法快进，终止。" #: builtin/merge.c:1485 builtin/merge.c:1562 #, c-format From 6672dc8e694f412090417a95cd6cd4b2b5be6da1 Mon Sep 17 00:00:00 2001 From: Thynson Date: Sat, 3 Mar 2012 09:03:27 +0800 Subject: [PATCH 12/12] l10n: Improve zh_CN translation for msg "not something we can merge" Signed-off-by: Thynson --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/zh_CN.po b/po/zh_CN.po index a1096e93c6..713542fdcd 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2527,7 +2527,7 @@ msgstr "到空分支的非快进式提交没有意义" #: builtin/merge.c:1275 builtin/merge.c:1319 #, c-format msgid "%s - not something we can merge" -msgstr "%s - 不是我们可以合并的东西" +msgstr "%s - 不能被合并" #: builtin/merge.c:1385 #, c-format