Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
git
提交
cc2f50da
G
git
项目概览
李少辉-开发者
/
git
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
git
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cc2f50da
编写于
8月 09, 2012
作者:
P
Peter Krefting
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
l10n: Update Swedish translation (1168t0f0u)
Signed-off-by:
N
Peter Krefting
<
peter@softwolves.pp.se
>
上级
da53e27e
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
903 addition
and
510 deletion
+903
-510
po/sv.po
po/sv.po
+903
-510
未找到文件。
po/sv.po
浏览文件 @
cc2f50da
...
...
@@ -5,10 +5,10 @@
#
msgid ""
msgstr ""
"Project-Id-Version: git 1.7.1
0
\n"
"Project-Id-Version: git 1.7.1
2
\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
"POT-Creation-Date: 2012-0
7-03 10:23
+0800\n"
"PO-Revision-Date: 2012-0
7-04 19:33
+0100\n"
"POT-Creation-Date: 2012-0
8-06 23:47
+0800\n"
"PO-Revision-Date: 2012-0
8-09 06:36
+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
...
...
@@ -48,7 +48,7 @@ msgstr "'%s' ser inte ut som en v2-bundle-fil"
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
#: bundle.c:89 builtin/commit.c:69
6
#: bundle.c:89 builtin/commit.c:69
9
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
...
...
@@ -58,7 +58,7 @@ msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
#: builtin/log.c:72
1 builtin/log.c:1310 builtin/log.c:1529
builtin/merge.c:347
#: builtin/log.c:72
6 builtin/log.c:1316 builtin/log.c:1535
builtin/merge.c:347
#: builtin/shortlog.c:181
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
...
...
@@ -85,7 +85,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"
msgid "rev-list died"
msgstr "rev-list dog"
#: bundle.c:300 builtin/log.c:12
06
builtin/shortlog.c:284
#: bundle.c:300 builtin/log.c:12
12
builtin/shortlog.c:284
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
...
...
@@ -231,8 +231,8 @@ msgstr ""
"%s"
#: diff.c:1400
msgid " 0 files changed
\n
"
msgstr " 0 filer ändrade
\n
"
msgid " 0 files changed"
msgstr " 0 filer ändrade"
#: diff.c:1404
#, c-format
...
...
@@ -255,7 +255,7 @@ msgid_plural ", %d deletions(-)"
msgstr[0] ", %d borttagning(-)"
msgstr[1] ", %d borttagningar(-)"
#: diff.c:34
78
#: diff.c:34
61
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
...
...
@@ -291,16 +291,16 @@ msgstr "\"%s\": %s"
msgid "'%s': short read %s"
msgstr "\"%s\": kort läsning %s"
#: help.c:2
08
#: help.c:2
12
#, c-format
msgid "available git commands in '%s'"
msgstr "git-kommandon tillgängliga i \"%s\""
#: help.c:21
5
#: help.c:21
9
msgid "git commands available from elsewhere on your $PATH"
msgstr "git-kommandon från andra platser i din $PATH"
#: help.c:27
1
#: help.c:27
5
#, c-format
msgid ""
"'%s' appears to be a git command, but we were not\n"
...
...
@@ -309,11 +309,11 @@ msgstr ""
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
"köra det. Kanske git-%s är trasigt?"
#: help.c:3
28
#: help.c:3
32
msgid "Uh oh. Your system reports no Git commands at all."
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
#: help.c:35
0
#: help.c:35
4
#, c-format
msgid ""
"WARNING: You called a Git command named '%s', which does not exist.\n"
...
...
@@ -322,17 +322,17 @@ msgstr ""
"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
"Fortsätter under förutsättningen att du menade \"%s\""
#: help.c:35
5
#: help.c:35
9
#, c-format
msgid "in %0.1f seconds automatically..."
msgstr "automatiskt om %0.1f sekunder..."
#: help.c:36
2
#: help.c:36
6
#, c-format
msgid "git: '%s' is not a git command. See 'git --help'."
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
#: help.c:3
66
#: help.c:3
70
msgid ""
"\n"
"Did you mean this?"
...
...
@@ -346,35 +346,297 @@ msgstr[1] ""
"\n"
"Menade du ett av dessa?"
#: parse-options.c:493
#: merge-recursive.c:190
#, c-format
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
#: merge-recursive.c:206
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
#: merge-recursive.c:268
msgid "error building trees"
msgstr "fel vid byggande av träd"
#: merge-recursive.c:497
msgid "diff setup failed"
msgstr "misslyckades sätta upp för diff"
#: merge-recursive.c:627
msgid "merge-recursive: disk full?"
msgstr "merge-recursive: disk full?"
#: merge-recursive.c:690
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
#: merge-recursive.c:701
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Tar bort %s för att göra plats för underkatalog\n"
#. something else exists
#. .. but not some other error (who really cares what?)
#: merge-recursive.c:715 merge-recursive.c:736
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
#: merge-recursive.c:726
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
#: merge-recursive.c:766
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
#: merge-recursive.c:768
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
#: merge-recursive.c:791 builtin/clone.c:302
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
#: merge-recursive.c:799
#, c-format
msgid "failed to symlink '%s'"
msgstr "misslyckades ta skapa symboliska länken \"%s\""
#: merge-recursive.c:802
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
#: merge-recursive.c:939
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
#: merge-recursive.c:943
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
#: merge-recursive.c:959
msgid "unsupported object type in the tree"
msgstr "objekttyp som ej stöds upptäcktes i trädet"
#: merge-recursive.c:1038 merge-recursive.c:1052
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
#: merge-recursive.c:1044 merge-recursive.c:1057
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr ""
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet vid %s."
#: merge-recursive.c:1098
msgid "rename"
msgstr "namnbyte"
#: merge-recursive.c:1098
msgid "renamed"
msgstr "namnbytt"
#: merge-recursive.c:1154
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s är en katalog i %s lägger till som %s istället"
#: merge-recursive.c:1176
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
#: merge-recursive.c:1181
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
#: merge-recursive.c:1235
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"KONFLIKT (namnbyte/namnbyte): Namnbyte %s->%s i %s. Namnbyte %s->%s i %s"
#: merge-recursive.c:1265
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
#: merge-recursive.c:1464
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
#: merge-recursive.c:1474
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
#: merge-recursive.c:1479 merge-recursive.c:1677
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s iställer"
#: merge-recursive.c:1530
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
#: merge-recursive.c:1533
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
#: merge-recursive.c:1581
msgid "modify"
msgstr "ändra"
#: merge-recursive.c:1581
msgid "modified"
msgstr "ändrad"
#: merge-recursive.c:1591
msgid "content"
msgstr "innehåll"
#: merge-recursive.c:1598
msgid "add/add"
msgstr "tillägg/tillägg"
#: merge-recursive.c:1632
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
#: merge-recursive.c:1646
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
#: merge-recursive.c:1650 git-submodule.sh:844
msgid "submodule"
msgstr "undermodul"
#: merge-recursive.c:1651
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
#: merge-recursive.c:1741
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
#: merge-recursive.c:1766
msgid "file/directory"
msgstr "fil/katalog"
#: merge-recursive.c:1772
msgid "directory/file"
msgstr "katalog/fil"
#: merge-recursive.c:1777
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"KONFLIKT (%s): Det finns en katalog med namnet %s i %s. Lägger till %s som %s"
#: merge-recursive.c:1787
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
#: merge-recursive.c:1804
msgid "Fatal merge failure, shouldn't happen."
msgstr "Ödesdigert sammanslagningsfel, borde inte inträffa."
#: merge-recursive.c:1823
msgid "Already up-to-date!"
msgstr "Redan à jour!"
#: merge-recursive.c:1832
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
#: merge-recursive.c:1862
#, c-format
msgid "Unprocessed path??? %s"
msgstr "Obehandlad sökväg??? %s"
#: merge-recursive.c:1907
msgid "Merging:"
msgstr "Slår ihop:"
#: merge-recursive.c:1920
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "hittade %u gemensam förfader:"
msgstr[1] "hittade %u gemensamma förfäder:"
#: merge-recursive.c:1957
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
#: merge-recursive.c:2014
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
#: merge-recursive.c:2026 builtin/merge.c:697
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
#: parse-options.c:494
msgid "..."
msgstr "..."
#: parse-options.c:51
1
#: parse-options.c:51
2
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation
#: parse-options.c:51
5
#: parse-options.c:51
6
#, c-format
msgid " or: %s"
msgstr " eller: %s"
#: parse-options.c:51
8
#: parse-options.c:51
9
#, c-format
msgid " %s"
msgstr " %s"
#: remote.c:16
29
#: remote.c:16
32
#, 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:163
5
#: remote.c:163
8
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
...
...
@@ -384,7 +646,7 @@ msgstr[0] ""
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
#: remote.c:164
3
#: remote.c:164
6
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
...
...
@@ -608,7 +870,7 @@ msgstr "kan inte bestämma HEAD"
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:805 builtin/apply.c:3
697
#: sequencer.c:805 builtin/apply.c:3
988
#, c-format
msgid "cannot open %s: %s"
msgstr "kan inte öppna %s: %s"
...
...
@@ -640,21 +902,21 @@ msgstr "Kan inte ångra som första incheckning"
msgid "Can't cherry-pick into empty head"
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
#: sha1_name.c:
86
4
#: sha1_name.c:
104
4
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
#: sha1_name.c:
86
7
#: sha1_name.c:
104
7
#, c-format
msgid "No such branch: '%s'"
msgstr "Okänd gren: \"%s\""
#: sha1_name.c:
86
9
#: sha1_name.c:
104
9
#, c-format
msgid "No upstream configured for branch '%s'"
msgstr "Ingen standarduppström angiven för grenen \"%s\""
#: sha1_name.c:
87
2
#: sha1_name.c:
105
2
#, c-format
msgid "Upstream branch '%s' not stored as a remote-tracking branch"
msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren"
...
...
@@ -668,343 +930,343 @@ msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
msgid "no such user"
msgstr "okänd användare"
#: wt-status.c:14
1
#: wt-status.c:14
0
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
#: wt-status.c:16
8 wt-status.c:195
#: wt-status.c:16
7 wt-status.c:194
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
#: wt-status.c:1
70 wt-status.c:197
#: wt-status.c:1
69 wt-status.c:196
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
#: wt-status.c:17
4
#: wt-status.c:17
3
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
#: wt-status.c:17
6 wt-status.c:180
#: wt-status.c:17
5 wt-status.c:179
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
#: wt-status.c:17
8
#: wt-status.c:17
7
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
#: wt-status.c:18
9
#: wt-status.c:18
8
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
#: wt-status.c:20
7
#: wt-status.c:20
6
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
#: wt-status.c:21
1
#: wt-status.c:21
0
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
#: wt-status.c:21
3
#: wt-status.c:21
2
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
#: wt-status.c:21
4
#: wt-status.c:21
3
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
#: wt-status.c:21
6
#: wt-status.c:21
5
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)"
# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
#: wt-status.c:22
5
#: wt-status.c:22
4
#, c-format
msgid "%s files:"
msgstr "%se filer:"
#: wt-status.c:22
8
#: wt-status.c:22
7
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i vad som skall checkas in)"
#: wt-status.c:24
5
#: wt-status.c:24
4
msgid "bug"
msgstr "programfel"
#: wt-status.c:2
50
#: wt-status.c:2
49
msgid "both deleted:"
msgstr "borttaget av bägge:"
#: wt-status.c:25
1
#: wt-status.c:25
0
msgid "added by us:"
msgstr "tillagt av oss:"
#: wt-status.c:25
2
#: wt-status.c:25
1
msgid "deleted by them:"
msgstr "borttaget av dem:"
#: wt-status.c:25
3
#: wt-status.c:25
2
msgid "added by them:"
msgstr "tillagt av dem:"
#: wt-status.c:25
4
#: wt-status.c:25
3
msgid "deleted by us:"
msgstr "borttaget av oss:"
#: wt-status.c:25
5
#: wt-status.c:25
4
msgid "both added:"
msgstr "tillagt av bägge:"
#: wt-status.c:25
6
#: wt-status.c:25
5
msgid "both modified:"
msgstr "ändrat av bägge:"
#: wt-status.c:28
6
#: wt-status.c:28
5
msgid "new commits, "
msgstr "nya incheckningar, "
#: wt-status.c:28
8
#: wt-status.c:28
7
msgid "modified content, "
msgstr "ändrat innehåll, "
#: wt-status.c:2
90
#: wt-status.c:2
89
msgid "untracked content, "
msgstr "ospårat innehåll, "
#: wt-status.c:30
4
#: wt-status.c:30
3
#, c-format
msgid "new file: %s"
msgstr "ny fil: %s"
#: wt-status.c:30
7
#: wt-status.c:30
6
#, c-format
msgid "copied: %s -> %s"
msgstr "kopierad: %s -> %s"
#: wt-status.c:3
10
#: wt-status.c:3
09
#, c-format
msgid "deleted: %s"
msgstr "borttagen: %s"
#: wt-status.c:31
3
#: wt-status.c:31
2
#, c-format
msgid "modified: %s"
msgstr "ändrad: %s"
#: wt-status.c:31
6
#: wt-status.c:31
5
#, c-format
msgid "renamed: %s -> %s"
msgstr "namnbyte: %s -> %s"
#: wt-status.c:31
9
#: wt-status.c:31
8
#, c-format
msgid "typechange: %s"
msgstr "typbyte: %s"
#: wt-status.c:32
2
#: wt-status.c:32
1
#, c-format
msgid "unknown: %s"
msgstr "okänd: %s"
#: wt-status.c:32
5
#: wt-status.c:32
4
#, c-format
msgid "unmerged: %s"
msgstr "osammansl.: %s"
#: wt-status.c:32
8
#: wt-status.c:32
7
#, c-format
msgid "bug: unhandled diff status %c"
msgstr "programfel: diff-status %c ej hanterad"
#: wt-status.c:78
6
#: wt-status.c:78
5
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
#: wt-status.c:78
9 wt-status.c:913
#: wt-status.c:78
8 wt-status.c:912
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
#: wt-status.c:79
2
#: wt-status.c:79
1
msgid "All conflicts fixed but you are still merging."
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
#: wt-status.c:79
5
#: wt-status.c:79
4
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
#: wt-status.c:80
5
#: wt-status.c:80
4
msgid "You are in the middle of an am session."
msgstr "Du är i mitten av en körning av \"git am\"."
#: wt-status.c:80
8
#: wt-status.c:80
7
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
#: wt-status.c:81
2
#: wt-status.c:81
1
msgid " (fix conflicts and then run \"git am --resolved\")"
msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
#: wt-status.c:81
4
#: wt-status.c:81
3
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
#: wt-status.c:81
6
#: wt-status.c:81
5
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
#: wt-status.c:87
4 wt-status.c:884
#: wt-status.c:87
3 wt-status.c:883
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
#: wt-status.c:87
7
#: wt-status.c:87
6
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
#: wt-status.c:87
9
#: wt-status.c:87
8
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
#: wt-status.c:88
1
#: wt-status.c:88
0
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
#: wt-status.c:88
7
#: wt-status.c:88
6
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
#: wt-status.c:88
9
#: wt-status.c:88
8
msgid "You are currently splitting a commit during a rebase."
msgstr "Du håller på att dela upp en incheckning i en ombasering."
#: wt-status.c:89
2
#: wt-status.c:89
1
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
#: wt-status.c:89
4
#: wt-status.c:89
3
msgid "You are currently editing a commit during a rebase."
msgstr "Du håller på att redigera en incheckning under en ombasering."
#: wt-status.c:89
7
#: wt-status.c:89
6
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (använd \"git commit --amend\" för att lägga till på aktuell incheckning)"
#: wt-status.c:89
9
#: wt-status.c:89
8
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)"
#: wt-status.c:90
9
#: wt-status.c:90
8
msgid "You are currently cherry-picking."
msgstr "Du håller på med en \"cherry-pick\"."
#: wt-status.c:91
6
#: wt-status.c:91
5
msgid " (all conflicts fixed: run \"git commit\")"
msgstr " (alla konflikter har rättats: kör \"git commit\")"
#: wt-status.c:92
5
#: wt-status.c:92
4
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
#: wt-status.c:92
8
#: wt-status.c:92
7
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)"
#: wt-status.c:97
9
#: wt-status.c:97
8
msgid "On branch "
msgstr "På grenen "
#: wt-status.c:98
6
#: wt-status.c:98
5
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
#: wt-status.c:99
8
#: wt-status.c:99
7
msgid "Initial commit"
msgstr "Första incheckning"
#: wt-status.c:101
2
#: wt-status.c:101
1
msgid "Untracked"
msgstr "Ospårad"
#: wt-status.c:101
4
#: wt-status.c:101
3
msgid "Ignored"
msgstr "Ignorerad"
# %s är nästa sträng eller tom.
#: wt-status.c:101
6
#: wt-status.c:101
5
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
#: wt-status.c:101
8
#: wt-status.c:101
7
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
#: wt-status.c:102
4
#: wt-status.c:102
3
msgid "No changes"
msgstr "Inga ändringar"
#: wt-status.c:102
8
#: wt-status.c:102
7
#, c-format
msgid "no changes added to commit%s\n"
msgstr "inga ändringar att checka in%s\n"
#: wt-status.c:10
30
#: wt-status.c:10
29
msgid " (use \"git add\" and/or \"git commit -a\")"
msgstr " (använd \"git add\" och/eller \"git commit -a\")"
#: wt-status.c:103
2
#: wt-status.c:103
1
#, 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:103
4
#: wt-status.c:103
3
msgid " (use \"git add\" to track)"
msgstr " (använd \"git add\" för att spåra)"
#: wt-status.c:103
6 wt-status.c:1039 wt-status.c:1042
#: wt-status.c:103
5 wt-status.c:1038 wt-status.c:1041
#, c-format
msgid "nothing to commit%s\n"
msgstr "inget att checka in%s\n"
#: wt-status.c:103
7
#: wt-status.c:103
6
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:10
40
#: wt-status.c:10
39
msgid " (use -u to show untracked files)"
msgstr " (använd -u för att visa ospårade filer)"
#: wt-status.c:104
3
#: wt-status.c:104
2
msgid " (working directory clean)"
msgstr " (arbetskatalogen ren)"
#: wt-status.c:115
1
#: wt-status.c:115
0
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
#: wt-status.c:115
7
#: wt-status.c:115
6
msgid "Initial commit on "
msgstr "Första incheckning på "
#: wt-status.c:117
2
#: wt-status.c:117
1
msgid "behind "
msgstr "efter "
#: wt-status.c:117
5 wt-status.c:1178
#: wt-status.c:117
4 wt-status.c:1177
msgid "ahead "
msgstr "före "
#: wt-status.c:11
80
#: wt-status.c:11
79
msgid ", behind "
msgstr ", efter "
...
...
@@ -1013,7 +1275,7 @@ msgstr ", efter "
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
#: builtin/add.c:67 builtin/commit.c:22
6
#: builtin/add.c:67 builtin/commit.c:22
9
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
...
...
@@ -1103,75 +1365,75 @@ msgstr "Inget angivet, inget tillagt.\n"
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:28
6
builtin/mv.c:82
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:28
9
builtin/mv.c:82
#: builtin/rm.c:162
msgid "index file corrupt"
msgstr "indexfilen trasig"
#: builtin/add.c:480 builtin/apply.c:4
108
builtin/mv.c:229 builtin/rm.c:260
#: builtin/add.c:480 builtin/apply.c:4
433
builtin/mv.c:229 builtin/rm.c:260
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
#: builtin/apply.c:5
3
#: builtin/apply.c:5
7
msgid "git apply [options] [<patch>...]"
msgstr "git apply [flaggor] [<patch>...]"
#: builtin/apply.c:1
06
#: builtin/apply.c:1
10
#, c-format
msgid "unrecognized whitespace option '%s'"
msgstr "okänt alternativ för whitespace: \"%s\""
#: builtin/apply.c:12
1
#: builtin/apply.c:12
5
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
#: builtin/apply.c:8
15
#: builtin/apply.c:8
24
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
#: builtin/apply.c:8
24
#: builtin/apply.c:8
33
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
#: builtin/apply.c:9
05
#: builtin/apply.c:9
14
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
#: builtin/apply.c:9
37
#: builtin/apply.c:9
46
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
#: builtin/apply.c:9
41
#: builtin/apply.c:9
50
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
#: builtin/apply.c:9
42
#: builtin/apply.c:9
51
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
#: builtin/apply.c:9
49
#: builtin/apply.c:9
58
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
#: builtin/apply.c:1
394
#: builtin/apply.c:1
403
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
#: builtin/apply.c:14
51
#: builtin/apply.c:14
60
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
#: builtin/apply.c:14
68
#: builtin/apply.c:14
77
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
...
...
@@ -1187,82 +1449,82 @@ msgstr[1] ""
"sökvägskomponenter\n"
"tas bort (rad %d)"
#: builtin/apply.c:16
28
#: builtin/apply.c:16
37
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
#: builtin/apply.c:163
0
#: builtin/apply.c:163
9
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
#: builtin/apply.c:16
56
#: builtin/apply.c:16
65
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
#: builtin/apply.c:1
692
#: builtin/apply.c:1
701
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
#: builtin/apply.c:1
694
#: builtin/apply.c:1
703
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
#: builtin/apply.c:1
697
#: builtin/apply.c:1
706
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** varning: filen %s blir tom men har inte tagits bort"
#: builtin/apply.c:18
43
#: builtin/apply.c:18
52
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
#. there has to be one hunk (forward hunk)
#: builtin/apply.c:18
72
#: builtin/apply.c:18
81
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
#: builtin/apply.c:19
58
#: builtin/apply.c:19
67
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
#: builtin/apply.c:20
48
#: builtin/apply.c:20
57
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
#: builtin/apply.c:20
52
#: builtin/apply.c:20
61
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
#: builtin/apply.c:21
23
#: builtin/apply.c:21
32
msgid "oops"
msgstr "hoppsan"
#: builtin/apply.c:26
45
#: builtin/apply.c:26
54
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
#: builtin/apply.c:27
63
#: builtin/apply.c:27
72
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
msgstr[0] "Stycke %d lyckades på %d (offset %d rad)."
msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
#: builtin/apply.c:27
75
#: builtin/apply.c:27
84
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d"
#: builtin/apply.c:27
81
#: builtin/apply.c:27
90
#, c-format
msgid ""
"while searching for:\n"
...
...
@@ -1271,313 +1533,321 @@ msgstr ""
"vid sökning efter:\n"
"%.*s"
#: builtin/apply.c:280
0
#: builtin/apply.c:280
9
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
#: builtin/apply.c:29
03
#: builtin/apply.c:29
12
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
#: builtin/apply.c:29
09
#: builtin/apply.c:29
18
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)"
#: builtin/apply.c:293
0
#: builtin/apply.c:293
9
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
#: builtin/apply.c:30
45
#: builtin/apply.c:30
61
#, c-format
msgid "
patch %s has been renamed/deleted
"
msgstr "
patchen %s har ändrat namn/tagits bort
"
msgid "
cannot checkout %s
"
msgstr "
kan inte checka ut %s
"
#: builtin/apply.c:3
052 builtin/apply.c:306
9
#: builtin/apply.c:3
106 builtin/apply.c:3115 builtin/apply.c:315
9
#, c-format
msgid "read of %s failed"
msgstr "misslyckades läsa %s"
#: builtin/apply.c:3084
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
#: builtin/apply.c:3105
#: builtin/apply.c:3139 builtin/apply.c:3361
#, c-format
msgid "
%s: already exists in working directory
"
msgstr "
%s: finns redan i arbetskatalogen
"
msgid "
path %s has been renamed/deleted
"
msgstr "
sökvägen %s har ändrat namn/tagits bort
"
#: builtin/apply.c:3
143
#: builtin/apply.c:3
220 builtin/apply.c:3375
#, c-format
msgid "%s:
has been deleted/renamed
"
msgstr "%s:
har tagits bort/ändrat namn
"
msgid "%s:
does not exist in index
"
msgstr "%s:
finns inte i indexet
"
#: builtin/apply.c:3
148 builtin/apply.c:317
9
#: builtin/apply.c:3
224 builtin/apply.c:3367 builtin/apply.c:338
9
#, c-format
msgid "%s: %s"
msgstr "%s: %s"
#: builtin/apply.c:3159
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
#: builtin/apply.c:3173
#: builtin/apply.c:3229 builtin/apply.c:3383
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
#: builtin/apply.c:3190
#: builtin/apply.c:3331
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
#: builtin/apply.c:3400
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
#: builtin/apply.c:3
19
2
#: builtin/apply.c:3
40
2
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
#: builtin/apply.c:3
247
#: builtin/apply.c:3
503
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
#: builtin/apply.c:3267
#: builtin/apply.c:3506
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
#: builtin/apply.c:3526
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)"
#: builtin/apply.c:3
272
#: builtin/apply.c:3
531
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s"
#: builtin/apply.c:3
280
#: builtin/apply.c:3
539
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
#: builtin/apply.c:3
293
#: builtin/apply.c:3
552
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
#: builtin/apply.c:3
348 builtin/checkout.c:212
builtin/reset.c:158
#: builtin/apply.c:3
607 builtin/checkout.c:213
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/apply.c:3
491
#: builtin/apply.c:3
750
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
#: builtin/apply.c:3
51
8
#: builtin/apply.c:3
77
8
#, c-format
msgid "corrupt patch for subproject %s"
msgstr "trasig patch för underprojektet %s"
#: builtin/apply.c:3
52
2
#: builtin/apply.c:3
78
2
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
#: builtin/apply.c:3
52
7
#: builtin/apply.c:3
78
7
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s"
#: builtin/apply.c:3
530
#: builtin/apply.c:3
790 builtin/apply.c:3898
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
#: builtin/apply.c:3
56
3
#: builtin/apply.c:3
82
3
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
#: builtin/apply.c:3
61
2
#: builtin/apply.c:3
87
2
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
#: builtin/apply.c:3
668
#: builtin/apply.c:3
959
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
#: builtin/apply.c:3
676
#: builtin/apply.c:3
967
msgid "internal error"
msgstr "internt fel"
#. Say this even without --verbose
#: builtin/apply.c:3
679
#: builtin/apply.c:3
970
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "Tillämpade patchen %%s med %d refuserad..."
msgstr[1] "Tillämpade patchen %%s med %d refuserade..."
#: builtin/apply.c:3
689
#: builtin/apply.c:3
980
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
#: builtin/apply.c:
3710
#: builtin/apply.c:
4001
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
#: builtin/apply.c:
3713
#: builtin/apply.c:
4004
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
#: builtin/apply.c:
384
4
#: builtin/apply.c:
415
4
msgid "unrecognized input"
msgstr "indata känns inte igen"
#: builtin/apply.c:
385
5
#: builtin/apply.c:
416
5
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
#: builtin/apply.c:
3970 builtin/apply.c:3973
#: builtin/apply.c:
4284 builtin/apply.c:4287
msgid "path"
msgstr "sökväg"
#: builtin/apply.c:
3971
#: builtin/apply.c:
4285
msgid "don't apply changes matching the given path"
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
#: builtin/apply.c:
3974
#: builtin/apply.c:
4288
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
#: builtin/apply.c:
3976
#: builtin/apply.c:
4290
msgid "num"
msgstr "antal"
#: builtin/apply.c:
3977
#: builtin/apply.c:
4291
msgid "remove <num> leading slashes from traditional diff paths"
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
#: builtin/apply.c:
3980
#: builtin/apply.c:
4294
msgid "ignore additions made by the patch"
msgstr "ignorera tillägg gjorda av patchen"
#: builtin/apply.c:
3982
#: builtin/apply.c:
4296
msgid "instead of applying the patch, output diffstat for the input"
msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata"
#: builtin/apply.c:
3986
#: builtin/apply.c:
4300
msgid "shows number of added and deleted lines in decimal notation"
msgstr "visar antal tillagda och borttagna rader decimalt"
#: builtin/apply.c:
3988
#: builtin/apply.c:
4302
msgid "instead of applying the patch, output a summary for the input"
msgstr "istället för att tillämpa patchen, skriv ut en summering av indata"
#: builtin/apply.c:
3990
#: builtin/apply.c:
4304
msgid "instead of applying the patch, see if the patch is applicable"
msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas"
#: builtin/apply.c:
3992
#: builtin/apply.c:
4306
msgid "make sure the patch is applicable to the current index"
msgstr "se till att patchen kan tillämpas på aktuellt index"
#: builtin/apply.c:
3994
#: builtin/apply.c:
4308
msgid "apply a patch without touching the working tree"
msgstr "tillämpa en patch utan att röra arbetskatalogen"
#: builtin/apply.c:
3996
#: builtin/apply.c:
4310
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
#: builtin/apply.c:3998
#: builtin/apply.c:4312
msgid "attempt three-way merge if a patch does not apply"
msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
#: builtin/apply.c:4314
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
#: builtin/apply.c:4
000
#: builtin/apply.c:4
316
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
#: builtin/apply.c:4
003
#: builtin/apply.c:4
319
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
#: builtin/apply.c:4
004
#: builtin/apply.c:4
320
msgid "action"
msgstr "åtgärd"
#: builtin/apply.c:4
005
#: builtin/apply.c:4
321
msgid "detect new or modified lines that have whitespace errors"
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
#: builtin/apply.c:4
008 builtin/apply.c:4011
#: builtin/apply.c:4
324 builtin/apply.c:4327
msgid "ignore changes in whitespace when finding context"
msgstr "ignorera ändringar i blanktecken för sammanhang"
#: builtin/apply.c:4
014
#: builtin/apply.c:4
330
msgid "apply the patch in reverse"
msgstr "tillämpa patchen baklänges"
#: builtin/apply.c:4
016
#: builtin/apply.c:4
332
msgid "don't expect at least one line of context"
msgstr "förvänta inte minst en rad sammanhang"
#: builtin/apply.c:4
018
#: builtin/apply.c:4
334
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
#: builtin/apply.c:4
020
#: builtin/apply.c:4
336
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
#: builtin/apply.c:4
021
#: builtin/apply.c:4
337
msgid "be verbose"
msgstr "var pratsam"
#: builtin/apply.c:4
023
#: builtin/apply.c:4
339
msgid "tolerate incorrectly detected missing new-line at the end of file"
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
#: builtin/apply.c:4
026
#: builtin/apply.c:4
342
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
#: builtin/apply.c:4
028
#: builtin/apply.c:4
344
msgid "root"
msgstr "rot"
#: builtin/apply.c:4
029
#: builtin/apply.c:4
345
msgid "prepend <root> to all filenames"
msgstr "lägg till <rot> i alla filnamn"
#: builtin/apply.c:4050
#: builtin/apply.c:4367
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
#: builtin/apply.c:4375
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
#: builtin/apply.c:4
053
#: builtin/apply.c:4
378
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
#: builtin/apply.c:4
069
#: builtin/apply.c:4
394
#, c-format
msgid "can't open patch '%s'"
msgstr "kan inte öppna patchen \"%s\""
#: builtin/apply.c:4
083
#: builtin/apply.c:4
408
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "undertryckte %d fel i blanksteg"
msgstr[1] "undertryckte %d fel i blanksteg"
#: builtin/apply.c:4
089 builtin/apply.c:4099
#: builtin/apply.c:4
414 builtin/apply.c:4424
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
...
...
@@ -1783,7 +2053,7 @@ msgstr "kunde inte skriva grenbeskrivningsmall: %s"
msgid "Failed to resolve HEAD as a valid ref."
msgstr "Misslyckades slå upp HEAD som giltig referens"
#: builtin/branch.c:788 builtin/clone.c:5
58
#: builtin/branch.c:788 builtin/clone.c:5
61
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
...
...
@@ -1810,99 +2080,99 @@ 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:11
3 builtin/checkout.c:146
#: builtin/checkout.c:11
4 builtin/checkout.c:147
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
#: builtin/checkout.c:11
5 builtin/checkout.c:148
#: builtin/checkout.c:11
6 builtin/checkout.c:149
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
#: builtin/checkout.c:13
1
#: builtin/checkout.c:13
2
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
#: builtin/checkout.c:17
5
#: builtin/checkout.c:17
6
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
#: builtin/checkout.c:19
2
#: builtin/checkout.c:19
3
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
#: builtin/checkout.c:2
09
#: builtin/checkout.c:2
10
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
#: builtin/checkout.c:23
4 builtin/checkout.c:392
#: builtin/checkout.c:23
5 builtin/checkout.c:393
msgid "corrupt index file"
msgstr "indexfilen är trasig"
#: builtin/checkout.c:26
4 builtin/checkout.c:271
#: builtin/checkout.c:26
5 builtin/checkout.c:272
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
#: builtin/checkout.c:30
2 builtin/checkout.c:498 builtin/clone.c:583
#: builtin/checkout.c:30
3 builtin/checkout.c:499 builtin/clone.c:586
#: builtin/merge.c:812
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
#: builtin/checkout.c:3
19
builtin/diff.c:302 builtin/merge.c:408
#: builtin/checkout.c:3
20
builtin/diff.c:302 builtin/merge.c:408
msgid "diff_setup_done failed"
msgstr "diff_setup_done misslyckades"
#: builtin/checkout.c:41
4
#: builtin/checkout.c:41
5
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
#: builtin/checkout.c:53
3
#: builtin/checkout.c:53
4
#, c-format
msgid "Can not do reflog for '%s'\n"
msgstr "Kan inte skapa referenslog för \"%s\"\n"
#: builtin/checkout.c:56
6
#: builtin/checkout.c:56
7
msgid "HEAD is now at"
msgstr "HEAD är nu på"
#: builtin/checkout.c:57
3
#: builtin/checkout.c:57
4
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
#: builtin/checkout.c:57
6
#: builtin/checkout.c:57
7
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
#: builtin/checkout.c:58
0
#: builtin/checkout.c:58
1
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
#: builtin/checkout.c:58
2
#: builtin/checkout.c:58
3
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
#: builtin/checkout.c:58
4
#: builtin/checkout.c:58
5
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
#: builtin/checkout.c:64
0
#: builtin/checkout.c:64
1
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
#. The singular version
#: builtin/checkout.c:64
6
#: builtin/checkout.c:64
7
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
...
...
@@ -1925,7 +2195,7 @@ msgstr[1] ""
"\n"
"%s\n"
#: builtin/checkout.c:66
4
#: builtin/checkout.c:66
5
#, c-format
msgid ""
"If you want to keep them by creating a new branch, this may be a good time\n"
...
...
@@ -1940,71 +2210,71 @@ msgstr ""
" git branch nytt_grennamn %s\n"
"\n"
#: builtin/checkout.c:69
4
#: builtin/checkout.c:69
5
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
#: builtin/checkout.c:69
8
#: builtin/checkout.c:69
9
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
#: builtin/checkout.c:72
4
#: builtin/checkout.c:72
5 builtin/checkout.c:920
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:85
5
#: builtin/checkout.c:85
6
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
#. case (1): want a tree
#: builtin/checkout.c:89
4
#: builtin/checkout.c:89
5
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
#: builtin/checkout.c:97
4
#: builtin/checkout.c:97
7
msgid "-B cannot be used with -b"
msgstr "-B kan inte användas med -b"
#: builtin/checkout.c:98
3
#: builtin/checkout.c:98
6
msgid "--patch is incompatible with all other options"
msgstr "--patch är inkompatibel med alla andra flaggor"
#: builtin/checkout.c:98
6
#: builtin/checkout.c:98
9
msgid "--detach cannot be used with -b/-B/--orphan"
msgstr "--detcah kan inte användas med -b/-B/--orphan"
#: builtin/checkout.c:9
88
#: builtin/checkout.c:9
91
msgid "--detach cannot be used with -t"
msgstr "--detach kan inte användas med -t"
#: builtin/checkout.c:99
4
#: builtin/checkout.c:99
7
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
#: builtin/checkout.c:100
1
#: builtin/checkout.c:100
4
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
#: builtin/checkout.c:10
07
#: builtin/checkout.c:10
10
msgid "--orphan and -b|-B are mutually exclusive"
msgstr "--orphan och -b|-B kan inte användas samtidigt"
#: builtin/checkout.c:10
09
#: builtin/checkout.c:10
12
msgid "--orphan cannot be used with -t"
msgstr "--orphan kan inte användas med -t"
#: builtin/checkout.c:10
19
#: builtin/checkout.c:10
22
msgid "git checkout: -f and -m are incompatible"
msgstr "git checkout: -f och -m är inkompatibla"
#: builtin/checkout.c:105
3
#: builtin/checkout.c:105
6
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
#: builtin/checkout.c:106
1
#: builtin/checkout.c:106
4
#, c-format
msgid ""
"git checkout: updating paths is incompatible with switching branches.\n"
...
...
@@ -2013,15 +2283,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:106
3
#: builtin/checkout.c:106
6
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:10
68
#: builtin/checkout.c:10
71
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:107
1
#: builtin/checkout.c:107
4
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
...
...
@@ -2029,11 +2299,11 @@ msgstr ""
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
"du checkar ut från indexet."
#: builtin/checkout.c:109
0
#: builtin/checkout.c:109
3
msgid "Cannot switch branch to a non-commit."
msgstr "Kan inte växla gren på en icke-incheckning."
#: builtin/checkout.c:109
3
#: builtin/checkout.c:109
6
msgid "--ours/--theirs is incompatible with switching branches."
msgstr "--ours/--theirs är inkompatibla med att byta gren."
...
...
@@ -2086,11 +2356,6 @@ msgstr "Tar inte bort %s\n"
msgid "reference repository '%s' is not a local directory."
msgstr "referensarkivet \"%s\" är inte en lokal katalog."
#: builtin/clone.c:302
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
#: builtin/clone.c:306
#, c-format
msgid "failed to create directory '%s'"
...
...
@@ -2131,79 +2396,79 @@ msgstr "misslyckades kopiera filen till \"%s\""
msgid "done.\n"
msgstr "klart.\n"
#: builtin/clone.c:44
0
#: builtin/clone.c:44
3
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
#: builtin/clone.c:5
49
#: builtin/clone.c:5
52
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"HEAD hos fjärren pekar på en obefintlig referens, kan inte checka ut.\n"
#: builtin/clone.c:6
39
#: builtin/clone.c:6
42
msgid "Too many arguments."
msgstr "För många argument."
#: builtin/clone.c:64
3
#: builtin/clone.c:64
6
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
#: builtin/clone.c:65
4
#: builtin/clone.c:65
7
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
#: builtin/clone.c:6
68
#: builtin/clone.c:6
71
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
#: builtin/clone.c:67
3
#: builtin/clone.c:67
6
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
#: builtin/clone.c:68
3
#: builtin/clone.c:68
6
#, 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:69
3
#: builtin/clone.c:69
6
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
#: builtin/clone.c:70
6 builtin/clone.c:720
#: builtin/clone.c:70
9 builtin/clone.c:723
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
#: builtin/clone.c:7
09
#: builtin/clone.c:7
12
#, c-format
msgid "could not create work tree dir '%s'."
msgstr "kunde inte skapa arbetskatalogen \"%s\""
#: builtin/clone.c:7
28
#: builtin/clone.c:7
31
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
#: builtin/clone.c:73
0
#: builtin/clone.c:73
3
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
#: builtin/clone.c:78
6
#: builtin/clone.c:78
9
#, c-format
msgid "Don't know how to clone %s"
msgstr "Vet inte hur man klonar %s"
#: builtin/clone.c:83
5
#: builtin/clone.c:83
8
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
#: builtin/clone.c:84
2
#: builtin/clone.c:84
5
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
...
...
@@ -2262,93 +2527,93 @@ msgstr ""
"\n"
"Annars använder du \"git reset\"\n"
#: builtin/commit.c:25
3
#: builtin/commit.c:25
6
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
#: builtin/commit.c:29
5
#: builtin/commit.c:29
8
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
#: builtin/commit.c:30
1
#: builtin/commit.c:30
4
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
#: builtin/commit.c:33
4 builtin/commit.c:355 builtin/commit.c:405
#: builtin/commit.c:33
7 builtin/commit.c:358 builtin/commit.c:408
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
#: builtin/commit.c:38
6
#: builtin/commit.c:38
9
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
#: builtin/commit.c:3
88
#: builtin/commit.c:3
91
msgid "cannot do a partial commit during a cherry-pick."
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
#: builtin/commit.c:
398
#: builtin/commit.c:
401
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
#: builtin/commit.c:4
18
#: builtin/commit.c:4
21
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
#: builtin/commit.c:49
3 builtin/commit.c:499
#: builtin/commit.c:49
6 builtin/commit.c:502
#, c-format
msgid "invalid commit: %s"
msgstr "felaktig incheckning: %s"
#: builtin/commit.c:52
2
#: builtin/commit.c:52
5
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
#: builtin/commit.c:58
2
#: builtin/commit.c:58
5
#, c-format
msgid "Malformed ident string: '%s'"
msgstr "Felaktig indragningssträng: \"%s\""
#: builtin/commit.c:62
0 builtin/commit.c:653 builtin/commit.c:967
#: builtin/commit.c:62
3 builtin/commit.c:656 builtin/commit.c:970
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
#: builtin/commit.c:63
2
builtin/shortlog.c:296
#: builtin/commit.c:63
5
builtin/shortlog.c:296
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
#: builtin/commit.c:63
4
#: builtin/commit.c:63
7
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
#: builtin/commit.c:6
38
#: builtin/commit.c:6
41
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
#: builtin/commit.c:64
4
#: builtin/commit.c:64
7
msgid "commit has empty message"
msgstr "incheckningen har ett tomt meddelande"
#: builtin/commit.c:66
0
#: builtin/commit.c:66
3
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
#: builtin/commit.c:66
4
#: builtin/commit.c:66
7
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
#: builtin/commit.c:6
68
#: builtin/commit.c:6
71
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
#: builtin/commit.c:72
0
#: builtin/commit.c:72
3
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
#: builtin/commit.c:73
1
#: builtin/commit.c:73
4
#, c-format
msgid ""
"\n"
...
...
@@ -2363,7 +2628,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
#: builtin/commit.c:73
6
#: builtin/commit.c:73
9
#, c-format
msgid ""
"\n"
...
...
@@ -2378,7 +2643,7 @@ msgstr ""
"\t%s\n"
"och försöker igen.\n"
#: builtin/commit.c:7
48
#: builtin/commit.c:7
51
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be ignored, and an empty message aborts the commit.\n"
...
...
@@ -2386,7 +2651,7 @@ msgstr ""
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
#: builtin/commit.c:75
3
#: builtin/commit.c:75
6
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '#' will be kept; you may remove them yourself if you want to.\n"
...
...
@@ -2396,159 +2661,159 @@ msgstr ""
"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
"Ett tomt meddelande avbryter incheckningen.\n"
#: builtin/commit.c:76
6
#: builtin/commit.c:76
9
#, c-format
msgid "%sAuthor: %s"
msgstr "%sFörfattare: %s"
#: builtin/commit.c:77
3
#: builtin/commit.c:77
6
#, c-format
msgid "%sCommitter: %s"
msgstr "%sIncheckare: %s"
#: builtin/commit.c:79
3
#: builtin/commit.c:79
6
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
#: builtin/commit.c:83
0
#: builtin/commit.c:83
3
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
#: builtin/commit.c:84
5
builtin/tag.c:361
#: builtin/commit.c:84
8
builtin/tag.c:361
#, 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:94
2
#: builtin/commit.c:94
5
#, c-format
msgid "No existing author found with '%s'"
msgstr "Hittade ingen befintlig författare med \"%s\""
#: builtin/commit.c:9
57 builtin/commit.c:1157
#: builtin/commit.c:9
60 builtin/commit.c:1160
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
#: builtin/commit.c:
997
#: builtin/commit.c:
1000
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:10
08
#: builtin/commit.c:10
11
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
#: builtin/commit.c:101
1
#: builtin/commit.c:101
4
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
#: builtin/commit.c:101
3
#: builtin/commit.c:101
6
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Du är i mitten av en cherry-pick -- kan inte utöka."
#: builtin/commit.c:101
6
#: builtin/commit.c:101
9
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
#: builtin/commit.c:102
6
#: builtin/commit.c:102
9
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:10
28
#: builtin/commit.c:10
31
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:103
6
#: builtin/commit.c:103
9
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:105
3
#: builtin/commit.c:105
6
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:105
5
#: builtin/commit.c:105
8
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:10
57
#: builtin/commit.c:10
60
msgid "Clever... amending the last one with dirty index."
msgstr "Smart... utöka den senaste med smutsigt index."
#: builtin/commit.c:10
59
#: builtin/commit.c:10
62
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
#: builtin/commit.c:10
69
builtin/tag.c:577
#: builtin/commit.c:10
72
builtin/tag.c:577
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
#: builtin/commit.c:107
4
#: builtin/commit.c:107
7
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
#: builtin/commit.c:12
57
#: builtin/commit.c:12
60
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
#: builtin/commit.c:12
59
#: builtin/commit.c:12
62
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
#: builtin/commit.c:130
0
#: builtin/commit.c:130
3
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
#: builtin/commit.c:130
2
#: builtin/commit.c:130
5
msgid " (root-commit)"
msgstr " (rotincheckning)"
#: builtin/commit.c:144
6
#: builtin/commit.c:144
9
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
#: builtin/commit.c:148
4
builtin/merge.c:509
#: builtin/commit.c:148
7
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:149
1
#: builtin/commit.c:149
4
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
#: builtin/commit.c:1
498
#: builtin/commit.c:1
501
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
#: builtin/commit.c:15
17
#: builtin/commit.c:15
20
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
#: builtin/commit.c:153
1
#: builtin/commit.c:153
4
#, c-format
msgid "Aborting commit; you did not edit the message.\n"
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
#: builtin/commit.c:153
6
#: builtin/commit.c:153
9
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
#: builtin/commit.c:155
1
builtin/merge.c:936 builtin/merge.c:961
#: builtin/commit.c:155
4
builtin/merge.c:936 builtin/merge.c:961
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
#: builtin/commit.c:157
2
#: builtin/commit.c:157
5
msgid "cannot lock HEAD ref"
msgstr "kunde inte låsa HEAD-referens"
#: builtin/commit.c:157
6
#: builtin/commit.c:157
9
msgid "cannot update HEAD ref"
msgstr "kunde inte uppdatera HEAD-referens"
#: builtin/commit.c:15
87
#: builtin/commit.c:15
90
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full or quota is\n"
...
...
@@ -2922,30 +3187,30 @@ msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
#: builtin/help.c:6
3
#: builtin/help.c:6
5
#, c-format
msgid "unrecognized help format '%s'"
msgstr "okänt hjälpformat: %s"
#: builtin/help.c:9
1
#: builtin/help.c:9
3
msgid "Failed to start emacsclient."
msgstr "Misslyckades starta emacsclient."
#: builtin/help.c:10
4
#: builtin/help.c:10
6
msgid "Failed to parse emacsclient version."
msgstr "Kunde inte tolka emacsclient-version."
#: builtin/help.c:11
2
#: builtin/help.c:11
4
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
#: builtin/help.c:13
0 builtin/help.c:158 builtin/help.c:167 builtin/help.c:175
#: builtin/help.c:13
2 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
#, c-format
msgid "failed to exec '%s': %s"
msgstr "exec misslyckades för \"%s\": %s"
#: builtin/help.c:21
5
#: builtin/help.c:21
7
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
...
...
@@ -2954,7 +3219,7 @@ msgstr ""
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
#: builtin/help.c:22
7
#: builtin/help.c:22
9
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
...
...
@@ -2963,34 +3228,29 @@ msgstr ""
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
#: builtin/help.c:29
1
#: builtin/help.c:29
9
msgid "The most commonly used git commands are:"
msgstr "De mest använda git-kommandona är:"
#: builtin/help.c:3
59
#: builtin/help.c:3
67
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
#: builtin/help.c:3
76
#: builtin/help.c:3
84
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
#: builtin/help.c:3
84
#: builtin/help.c:3
92
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
#: builtin/help.c:395
#, c-format
msgid "'%s': not a documentation directory."
msgstr "\"%s\": inte en dokumentationskatalog."
#: builtin/help.c:436 builtin/help.c:443
#: builtin/help.c:447 builtin/help.c:454
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
#: builtin/help.c:4
59
#: builtin/help.c:4
70
#, c-format
msgid "`git %s' is aliased to `%s'"
msgstr "\"git %s\" är ett alias för \"%s\""
...
...
@@ -3064,176 +3324,176 @@ msgstr "deltabasindex utanför gränsen"
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
#: builtin/index-pack.c:53
1
#: builtin/index-pack.c:53
0
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
#: builtin/index-pack.c:53
3
#: builtin/index-pack.c:53
2
#, c-format
msgid "premature end of pack file, %lu byte missing"
msgid_plural "premature end of pack file, %lu bytes missing"
msgstr[0] "för tidigt slut på paketfilen, %lu byte saknas"
msgstr[1] "för tidigt slut på paketfilen, %lu byte saknas"
#: builtin/index-pack.c:55
5
#: builtin/index-pack.c:55
8
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
#: builtin/index-pack.c:64
6 builtin/index-pack.c:652 builtin/index-pack.c:675
#: builtin/index-pack.c:7
09 builtin/index-pack.c:718
#: builtin/index-pack.c:64
9 builtin/index-pack.c:655 builtin/index-pack.c:678
#: builtin/index-pack.c:7
12 builtin/index-pack.c:721
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
#: builtin/index-pack.c:6
49
builtin/pack-objects.c:170
#: builtin/index-pack.c:6
52
builtin/pack-objects.c:170
#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
#: builtin/index-pack.c:71
5
#: builtin/index-pack.c:71
8
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
#: builtin/index-pack.c:7
29
#: builtin/index-pack.c:7
32
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
#: builtin/index-pack.c:74
4
#: builtin/index-pack.c:74
7
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
#: builtin/index-pack.c:74
6
#: builtin/index-pack.c:74
9
msgid "Error in object"
msgstr "Fel i objekt"
#: builtin/index-pack.c:7
48
#: builtin/index-pack.c:7
51
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Inte alla barnobjekt för %s kan nås"
#: builtin/index-pack.c:8
18 builtin/index-pack.c:844
#: builtin/index-pack.c:8
21 builtin/index-pack.c:847
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
#: builtin/index-pack.c:98
3
#: builtin/index-pack.c:98
6
msgid "Receiving objects"
msgstr "Tar bort objeckt"
#: builtin/index-pack.c:98
3
#: builtin/index-pack.c:98
6
msgid "Indexing objects"
msgstr "Skapar index för objekt"
#: builtin/index-pack.c:10
09
#: builtin/index-pack.c:10
12
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
#: builtin/index-pack.c:101
4
#: builtin/index-pack.c:101
7
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
#: builtin/index-pack.c:10
17
#: builtin/index-pack.c:10
20
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
#: builtin/index-pack.c:10
28
#: builtin/index-pack.c:10
31
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
#: builtin/index-pack.c:105
1
#: builtin/index-pack.c:105
4
msgid "Resolving deltas"
msgstr "Analyserar delta"
#: builtin/index-pack.c:110
2
#: builtin/index-pack.c:110
5
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
#: builtin/index-pack.c:112
1
#: builtin/index-pack.c:112
4
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "paketet har %d oanalyserat delta"
msgstr[1] "paketet har %d oanalyserade delta"
#: builtin/index-pack.c:114
6
#: builtin/index-pack.c:114
9
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
#: builtin/index-pack.c:122
5
#: builtin/index-pack.c:122
8
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
#: builtin/index-pack.c:12
49
#: builtin/index-pack.c:12
52
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
#: builtin/index-pack.c:126
2
#: builtin/index-pack.c:126
5
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
#: builtin/index-pack.c:127
0
#: builtin/index-pack.c:127
3
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
#: builtin/index-pack.c:128
3
#: builtin/index-pack.c:128
6
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
#: builtin/index-pack.c:129
4
#: builtin/index-pack.c:129
7
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
#: builtin/index-pack.c:139
5
#: builtin/index-pack.c:139
8
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
#: builtin/index-pack.c:1
397
#: builtin/index-pack.c:1
400
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""
#: builtin/index-pack.c:144
4
#: builtin/index-pack.c:144
7
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "icke-delta: %d objekt"
msgstr[1] "icke-delta: %d objekt"
#: builtin/index-pack.c:145
1
#: builtin/index-pack.c:145
4
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
#: builtin/index-pack.c:14
78
#: builtin/index-pack.c:14
81
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
#: builtin/index-pack.c:152
2 builtin/index-pack.c:1525
#: builtin/index-pack.c:15
37 builtin/index-pack.c:1541
#: builtin/index-pack.c:152
5 builtin/index-pack.c:1528
#: builtin/index-pack.c:15
40 builtin/index-pack.c:1544
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
#: builtin/index-pack.c:155
5
#: builtin/index-pack.c:155
8
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
#: builtin/index-pack.c:15
59 builtin/index-pack.c:1569
#: builtin/index-pack.c:15
62 builtin/index-pack.c:1572
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
#: builtin/index-pack.c:15
78
#: builtin/index-pack.c:15
81
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
...
...
@@ -3307,22 +3567,22 @@ msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
msgid "insane git directory %s"
msgstr "tokig git-katalog %s"
#: builtin/init-db.c:32
2 builtin/init-db.c:325
#: builtin/init-db.c:32
3 builtin/init-db.c:326
#, c-format
msgid "%s already exists"
msgstr "%s finns redan"
#: builtin/init-db.c:35
4
#: builtin/init-db.c:35
5
#, c-format
msgid "unable to handle file type %d"
msgstr "kan inte hantera filtyp %d"
#: builtin/init-db.c:35
7
#: builtin/init-db.c:35
8
#, c-format
msgid "unable to move %s to %s"
msgstr "kan inte flytta %s till %s"
#: builtin/init-db.c:36
2
#: builtin/init-db.c:36
3
#, c-format
msgid "Could not create git link %s"
msgstr "Kunde inte skapa gitlänk %s"
...
...
@@ -3332,38 +3592,38 @@ msgstr "Kunde inte skapa gitlänk %s"
#. * existing" or "Initialized empty", the second " shared" or
#. * "", and the last '%s%s' is the verbatim directory name.
#.
#: builtin/init-db.c:4
19
#: builtin/init-db.c:4
20
#, c-format
msgid "%s%s Git repository in %s%s\n"
msgstr "%s%s Git-arkiv i %s%s\n"
#: builtin/init-db.c:42
0
#: builtin/init-db.c:42
1
msgid "Reinitialized existing"
msgstr "Ominitierade befintligt"
#: builtin/init-db.c:42
0
#: builtin/init-db.c:42
1
msgid "Initialized empty"
msgstr "Initierade tomt"
#: builtin/init-db.c:42
1
#: builtin/init-db.c:42
2
msgid " shared"
msgstr " delat"
#: builtin/init-db.c:44
0
#: builtin/init-db.c:44
1
msgid "cannot tell cwd"
msgstr "kan inte läsa aktuell katalog (cwd)"
#: builtin/init-db.c:52
1 builtin/init-db.c:528
#: builtin/init-db.c:52
2 builtin/init-db.c:529
#, c-format
msgid "cannot mkdir %s"
msgstr "kan inte skapa katalogen (mkdir) %s"
#: builtin/init-db.c:53
2
#: builtin/init-db.c:53
3
#, c-format
msgid "cannot chdir to %s"
msgstr "kan inte byta katalog (chdir) till %s"
#: builtin/init-db.c:55
4
#: builtin/init-db.c:55
5
#, c-format
msgid ""
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
...
...
@@ -3372,11 +3632,11 @@ msgstr ""
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
"dir=<katalog>)"
#: builtin/init-db.c:57
8
#: builtin/init-db.c:57
9
msgid "Cannot access current working directory"
msgstr "Kan inte komma åt aktuell arbetskatalog"
#: builtin/init-db.c:58
5
#: builtin/init-db.c:58
6
#, c-format
msgid "Cannot access work tree '%s'"
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
...
...
@@ -3386,95 +3646,95 @@ msgstr "Kan inte komma åt arbetskatalogen \"%s\""
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
#: builtin/log.c:40
2 builtin/log.c:490
#: builtin/log.c:40
3 builtin/log.c:494
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
#: builtin/log.c:51
4
#: builtin/log.c:51
8
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
#: builtin/log.c:60
3
#: builtin/log.c:60
8
msgid "format.headers without value"
msgstr "format.headers utan värde"
#: builtin/log.c:6
77
#: builtin/log.c:6
82
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
#: builtin/log.c:6
88
#: builtin/log.c:6
93
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
#: builtin/log.c:70
2
#: builtin/log.c:70
7
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
#: builtin/log.c:71
0
#: builtin/log.c:71
5
msgid "Not a range."
msgstr "Inte ett intervall."
#: builtin/log.c:7
87
#: builtin/log.c:7
92
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
#: builtin/log.c:86
0
#: builtin/log.c:86
5
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
#: builtin/log.c:93
3
#: builtin/log.c:93
8
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
#: builtin/log.c:11
54
#: builtin/log.c:11
60
#, c-format
msgid "bogus committer info %s"
msgstr "felaktig incheckarinformation %s"
#: builtin/log.c:1
199
#: builtin/log.c:1
205
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
#: builtin/log.c:120
1
#: builtin/log.c:120
7
msgid "--subject-prefix and -k are mutually exclusive."
msgstr "--subject-prefix och -k kan inte användas samtidigt."
#: builtin/log.c:12
09
#: builtin/log.c:12
15
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
#: builtin/log.c:121
1
#: builtin/log.c:121
7
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
#: builtin/log.c:121
3
#: builtin/log.c:121
9
msgid "--check does not make sense"
msgstr "kan inte använda --check"
#: builtin/log.c:12
36
#: builtin/log.c:12
42
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
#: builtin/log.c:12
38
#: builtin/log.c:12
44
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
#: builtin/log.c:139
1
#: builtin/log.c:139
7
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
#: builtin/log.c:1
495
#: builtin/log.c:1
501
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n"
#: builtin/log.c:151
1 builtin/log.c:1513 builtin/log.c:1525
#: builtin/log.c:151
7 builtin/log.c:1519 builtin/log.c:1531
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
...
...
@@ -3555,10 +3815,6 @@ msgstr "git write-tree misslyckades skriva ett träd"
msgid "failed to read the cache"
msgstr "misslyckads läsa cachen"
#: builtin/merge.c:697
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
#: builtin/merge.c:710
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
...
...
@@ -4590,31 +4846,31 @@ msgstr "Oköade ändringar efter återställning:"
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:
297
#: builtin/reset.c:
303
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet \"%s\""
#: builtin/reset.c:30
2
#: builtin/reset.c:30
8
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
#: builtin/reset.c:31
1
#: builtin/reset.c:31
7
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"."
#: builtin/reset.c:31
3
#: builtin/reset.c:31
9
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
#: builtin/reset.c:3
25
#: builtin/reset.c:3
31
#, 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:34
1
#: builtin/reset.c:34
7
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
...
...
@@ -4953,9 +5209,9 @@ msgstr ""
#: git-am.sh:105
#, 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\"."
"When you have resolved this problem
,
run \"$cmdline --resolved\".\n"
"If you
prefer to skip this patch, run \"$cmdline --skip\" instead
.\n"
"To restore the original branch and stop patching
,
run \"$cmdline --abort\"."
msgstr ""
"När du har löst problemet kör du \"$cmdline --resolved\".\n"
"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
...
...
@@ -4971,6 +5227,10 @@ msgstr ""
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
#: git-am.sh:139
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att åteskapa ett basträd..."
#: git-am.sh:154
msgid ""
"Did you hand edit your patch?\n"
...
...
@@ -4984,42 +5244,50 @@ msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..."
#: git-am.sh:275
#: git-am.sh:179
msgid "Failed to merge in the changes."
msgstr "Misslyckads slå ihop ändringarna."
#: git-am.sh:274
msgid "Only one StGIT patch series can be applied at once"
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
#: git-am.sh:36
2
#: git-am.sh:36
1
#, sh-format
msgid "Patch format $patch_format is not supported."
msgstr "Patchformatet $patch_format stöds inte."
#: git-am.sh:36
4
#: git-am.sh:36
3
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
#: git-am.sh:418
msgid "-d option is no longer supported. Do not use."
msgstr "Flaggan -d stöds inte lägre. Använd inte."
#: git-am.sh:389
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr ""
"Flaggan -b/--binary har varit utan funktion länge, och\n"
"kommer tas bort. Vi ber dig att inte använda den längre."
#: git-am.sh:4
81
#: git-am.sh:4
77
#, sh-format
msgid "previous rebase directory $dotest still exists but mbox given."
msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."
#: git-am.sh:48
6
#: git-am.sh:48
2
msgid "Please make up your mind. --skip or --abort?"
msgstr "Bestäm dig. --skip eller --abort?"
#: git-am.sh:5
13
#: git-am.sh:5
09
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
#: git-am.sh:57
9
#: git-am.sh:57
5
#, sh-format
msgid "Dirty index: cannot apply patches (dirty: $files)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)"
#: git-am.sh:67
1
#: git-am.sh:67
9
#, sh-format
msgid ""
"Patch is empty. Was it split wrong?\n"
...
...
@@ -5030,32 +5298,32 @@ msgstr ""
"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:70
8
#: git-am.sh:70
6
msgid "Patch does not have a valid e-mail address."
msgstr "Patchen har inte någon giltig e-postadress."
#: git-am.sh:75
5
#: git-am.sh:75
3
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:75
9
#: git-am.sh:75
7
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:76
6
#: git-am.sh:76
4
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "
#: git-am.sh:80
2
#: git-am.sh:80
0
#, sh-format
msgid "Applying: $FIRSTLINE"
msgstr "Tillämpar: $FIRSTLINE"
#: git-am.sh:82
3
#: git-am.sh:82
1
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
...
...
@@ -5065,7 +5333,7 @@ msgstr ""
"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."
#: git-am.sh:8
31
#: git-am.sh:8
29
msgid ""
"You still have unmerged paths in your index\n"
"did you forget to use 'git add'?"
...
...
@@ -5073,16 +5341,16 @@ 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:84
7
#: git-am.sh:84
5
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
#: git-am.sh:85
7
#: git-am.sh:85
5
#, sh-format
msgid "Patch failed at $msgnum $FIRSTLINE"
msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
#: git-am.sh:87
3
#: git-am.sh:87
6
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
...
...
@@ -5285,6 +5553,126 @@ msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
msgid "Cannot rebase onto multiple branches"
msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"
#: git-rebase.sh:52
msgid ""
"When you have resolved this problem, run \"git rebase --continue\".\n"
"If you prefer to skip this patch, run \"git rebase --skip\" instead.\n"
"To check out the original branch and stop rebasing, run \"git rebase --abort"
"\"."
msgstr ""
"När du har löst problemet kör du \"git rebase --continue\".\n"
"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
#: git-rebase.sh:159
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
#: git-rebase.sh:164
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Det verkar som en git-am körs. Kan inte ombasera."
#: git-rebase.sh:295
msgid "The --exec option must be used with the --interactive option"
msgstr "Flaggan --exec måste användas tillsammans med flaggan --interactive"
#: git-rebase.sh:300
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
#: git-rebase.sh:313
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
#: git-rebase.sh:316
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
#: git-rebase.sh:334
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
#: git-rebase.sh:350
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
"I wonder if you are in the middle of another rebase. If that is the\n"
"case, please try\n"
"\t$cmd_live_rebase\n"
"If that is not the case, please\n"
"\t$cmd_clear_stale_rebase\n"
"and run me again. I am stopping in case you still have something\n"
"valuable there."
msgstr ""
"Det verkar som katalogen $state_dir_base redan existerar, och\n"
"jag undrar om du redan är mitt i en annan ombasering. Om så är\n"
"fallet, försök\n"
"\t$cmd_live_rebase\n"
"Om så inte är fallet, kör\n"
"\t$cmd_clear_stale_rebase\n"
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
#: git-rebase.sh:395
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "ogiltig uppström $upstream_name"
#: git-rebase.sh:419
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
#: git-rebase.sh:422 git-rebase.sh:426
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
#: git-rebase.sh:431
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
#: git-rebase.sh:454
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "ödesdigert: ingen sådan gren: $branch_name"
#: git-rebase.sh:474
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
#: git-rebase.sh:492
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
#: git-rebase.sh:495
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
#: git-rebase.sh:506
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
#. Detach HEAD and reset the tree
#: git-rebase.sh:515
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
#: git-rebase.sh:523
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
#: git-stash.sh:51
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
...
...
@@ -5425,27 +5813,27 @@ msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
msgstr ""
"Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
#: git-submodule.sh:18
6
#: git-submodule.sh:18
9
#, sh-format
msgid "Clone of '$url' into submodule path '$sm_path' failed"
msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
#: git-submodule.sh:
196
#: git-submodule.sh:
201
#, sh-format
msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa"
msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt"
#: git-submodule.sh:2
85
#: git-submodule.sh:2
90
#, 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:30
2
#: git-submodule.sh:30
7
#, sh-format
msgid "'$sm_path' already exists in the index"
msgstr "\"$sm_path\" finns redan i indexet"
#: git-submodule.sh:3
06
#: git-submodule.sh:3
11
#, sh-format
msgid ""
"The following path is ignored by one of your .gitignore files:\n"
...
...
@@ -5456,64 +5844,64 @@ msgstr ""
"$sm_path\n"
"Använd -f om du verkligen vill lägga till den"
#: git-submodule.sh:3
17
#: git-submodule.sh:3
22
#, sh-format
msgid "Adding existing repo at '$sm_path' to the index"
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
#: git-submodule.sh:3
19
#: git-submodule.sh:3
24
#, sh-format
msgid "'$sm_path' already exists and is not a valid git repo"
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
#: git-submodule.sh:33
3
#: git-submodule.sh:33
8
#, sh-format
msgid "Unable to checkout submodule '$sm_path'"
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
#: git-submodule.sh:3
38
#: git-submodule.sh:3
43
#, sh-format
msgid "Failed to add submodule '$sm_path'"
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
#: git-submodule.sh:34
3
#: git-submodule.sh:34
8
#, sh-format
msgid "Failed to register submodule '$sm_path'"
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
#: git-submodule.sh:3
85
#: git-submodule.sh:3
90
#, sh-format
msgid "Entering '$prefix$sm_path'"
msgstr "Går in i \"$prefix$sm_path\""
#: git-submodule.sh:
399
#: git-submodule.sh:
404
#, sh-format
msgid "Stopping at '$sm_path'; script returned non-zero status."
msgstr ""
"Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."
#: git-submodule.sh:44
2
#: git-submodule.sh:44
7
#, sh-format
msgid "No url found for submodule path '$sm_path' in .gitmodules"
msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"
#: git-submodule.sh:45
1
#: git-submodule.sh:45
6
#, sh-format
msgid "Failed to register url for submodule path '$sm_path'"
msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""
#: git-submodule.sh:45
3
#: git-submodule.sh:45
8
#, sh-format
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""
#: git-submodule.sh:46
1
#: git-submodule.sh:46
6
#, sh-format
msgid "Failed to register update mode for submodule path '$sm_path'"
msgstr ""
"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""
#: git-submodule.sh:56
0
#: git-submodule.sh:56
5
#, sh-format
msgid ""
"Submodule path '$sm_path' not initialized\n"
...
...
@@ -5522,97 +5910,102 @@ msgstr ""
"Undermodulen \"$sm_path\" har inte initierats\n"
"Kanske du vill köra \"update --init\"?"
#: git-submodule.sh:57
3
#: git-submodule.sh:57
8
#, sh-format
msgid "Unable to find current revision in submodule path '$sm_path'"
msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""
#: git-submodule.sh:59
2
#: git-submodule.sh:59
7
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
#: git-submodule.sh:6
06
#: git-submodule.sh:6
11
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""
#: git-submodule.sh:6
07
#: git-submodule.sh:6
12
#, sh-format
msgid "Submodule path '$sm_path': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""
#: git-submodule.sh:61
2
#: git-submodule.sh:61
7
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""
#: git-submodule.sh:61
3
#: git-submodule.sh:61
8
#, sh-format
msgid "Submodule path '$sm_path': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""
#: git-submodule.sh:6
18
#: git-submodule.sh:6
23
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""
#: git-submodule.sh:6
19
#: git-submodule.sh:6
24
#, sh-format
msgid "Submodule path '$sm_path': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""
#: git-submodule.sh:64
1 git-submodule.sh:964
#: git-submodule.sh:64
6 git-submodule.sh:969
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
#: git-submodule.sh:7
49
msgid "
--cached cannot be used with --files
"
msgstr "
--cached kan inte användas med
--files"
#: git-submodule.sh:7
54
msgid "
The --cached option cannot be used with the --files option
"
msgstr "
Flaggan --cached kan inte användas med flaggan
--files"
#. unexpected type
#: git-submodule.sh:7
89
#: git-submodule.sh:7
94
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
#: git-submodule.sh:8
07
#: git-submodule.sh:8
12
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_src"
msgstr " Varning: $name innehåller inte incheckning $sha1_src"
#: git-submodule.sh:81
0
#: git-submodule.sh:81
5
#, sh-format
msgid " Warn: $name doesn't contain commit $sha1_dst"
msgstr " Varning: $name innehåller inte incheckning $sha1_dst"
#: git-submodule.sh:81
3
#: git-submodule.sh:81
8
#, sh-format
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"
#: git-submodule.sh:8
38
#: git-submodule.sh:8
43
msgid "blob"
msgstr "blob"
#: git-submodule.sh:839
msgid "submodule"
msgstr "undermodul"
#: git-submodule.sh:876
#: git-submodule.sh:881
msgid "# Submodules changed but not updated:"
msgstr "# Undermoduler ändrade men inte uppdaterade:"
#: git-submodule.sh:8
78
#: git-submodule.sh:8
83
msgid "# Submodule changes to be committed:"
msgstr "# Undermodulers ändringar att checka in:"
#: git-submodule.sh:102
2
#: git-submodule.sh:102
7
#, sh-format
msgid "Synchronizing submodule url for '$name'"
msgstr "Synkroniserar undermodul-url för \"$name\""
#~ msgid "%s: has been deleted/renamed"
#~ msgstr "%s: har tagits bort/ändrat namn"
#~ msgid "'%s': not a documentation directory."
#~ msgstr "\"%s\": inte en dokumentationskatalog."
#~ msgid "-d option is no longer supported. Do not use."
#~ msgstr "Flaggan -d stöds inte lägre. Använd inte."
#~ msgid "cherry-pick"
#~ msgstr "cherry-pick"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录