2010-09-13 04:10:21 +08:00
|
|
|
# Swedish translations for Git.
|
2012-03-08 17:56:37 +08:00
|
|
|
# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se>
|
2010-09-13 04:10:21 +08:00
|
|
|
# This file is distributed under the same license as the Git package.
|
2012-03-08 17:56:37 +08:00
|
|
|
# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012.
|
2010-09-13 04:10:21 +08:00
|
|
|
#
|
|
|
|
msgid ""
|
|
|
|
msgstr ""
|
2012-08-09 13:36:41 +08:00
|
|
|
"Project-Id-Version: git 1.7.12\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
|
2012-08-09 13:36:41 +08:00
|
|
|
"POT-Creation-Date: 2012-08-06 23:47+0800\n"
|
2012-08-14 16:58:14 +08:00
|
|
|
"PO-Revision-Date: 2012-08-14 09:58+0100\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
|
|
|
|
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
|
|
|
|
"Language: sv\n"
|
|
|
|
"MIME-Version: 1.0\n"
|
|
|
|
"Content-Type: text/plain; charset=UTF-8\n"
|
|
|
|
"Content-Transfer-Encoding: 8bit\n"
|
|
|
|
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: advice.c:40
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "hint: %.*s\n"
|
|
|
|
msgstr "tips: %.*s\n"
|
|
|
|
|
|
|
|
#.
|
|
|
|
#. * Message used both when 'git commit' fails and when
|
|
|
|
#. * other commands doing a merge do.
|
|
|
|
#.
|
2012-05-29 16:28:34 +08:00
|
|
|
#: advice.c:70
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"Fix them up in the work tree,\n"
|
|
|
|
"and then use 'git add/rm <file>' as\n"
|
|
|
|
"appropriate to mark resolution and make a commit,\n"
|
|
|
|
"or use 'git commit -a'."
|
|
|
|
msgstr ""
|
|
|
|
"Rätta dem i din arbetskatalog,\n"
|
|
|
|
"och använd sedan \"git add/rm <fil>\" som\n"
|
|
|
|
"lämpligt för att ange lösning och checka in,\n"
|
|
|
|
"eller använd \"git commit -a\"."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: bundle.c:36
|
|
|
|
#, c-format
|
|
|
|
msgid "'%s' does not look like a v2 bundle file"
|
|
|
|
msgstr "'%s' ser inte ut som en v2-bundle-fil"
|
|
|
|
|
|
|
|
#: bundle.c:63
|
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized header: %s%s (%d)"
|
|
|
|
msgstr "okänt huvud: %s%s (%d)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: bundle.c:89 builtin/commit.c:699
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not open '%s'"
|
|
|
|
msgstr "kunde inte öppna \"%s\""
|
|
|
|
|
|
|
|
#: bundle.c:140
|
|
|
|
msgid "Repository lacks these prerequisite commits:"
|
|
|
|
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:290
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:726 builtin/log.c:1316 builtin/log.c:1535 builtin/merge.c:347
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/shortlog.c:181
|
|
|
|
msgid "revision walk setup failed"
|
|
|
|
msgstr "misslyckades skapa revisionstraversering"
|
|
|
|
|
|
|
|
#: bundle.c:186
|
|
|
|
#, c-format
|
|
|
|
msgid "The bundle contains %d ref"
|
|
|
|
msgid_plural "The bundle contains %d refs"
|
|
|
|
msgstr[0] "Paketet (bundlen) innehåller %d referens"
|
|
|
|
msgstr[1] "Paketet (bundlen) innehåller %d referenser"
|
|
|
|
|
|
|
|
#: bundle.c:192
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "The bundle records a complete history."
|
|
|
|
msgstr "Paketet (bundlen) beskriver en komplett historik."
|
|
|
|
|
|
|
|
#: bundle.c:195
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "The bundle requires this ref"
|
|
|
|
msgid_plural "The bundle requires these %d refs"
|
|
|
|
msgstr[0] "Paketet (bundlen) kräver denna referens"
|
|
|
|
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:294
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "rev-list died"
|
|
|
|
msgstr "rev-list dog"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: bundle.c:300 builtin/log.c:1212 builtin/shortlog.c:284
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized argument: %s"
|
|
|
|
msgstr "okänt argument: %s"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:335
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "ref '%s' is excluded by the rev-list options"
|
|
|
|
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:380
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Refusing to create empty bundle."
|
|
|
|
msgstr "Vägrar skapa ett tomt paket (bundle)."
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:398
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Could not spawn pack-objects"
|
|
|
|
msgstr "Kunde inte starta pack-objects"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:416
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "pack-objects died"
|
|
|
|
msgstr "pack-objects misslyckades"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:419
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot create '%s'"
|
|
|
|
msgstr "kan inte skapa \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: bundle.c:441
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "index-pack died"
|
|
|
|
msgstr "index-pack dog"
|
|
|
|
|
|
|
|
#: commit.c:48
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not parse %s"
|
|
|
|
msgstr "kunde inte tolka %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: commit.c:50
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s %s is not a commit!"
|
|
|
|
msgstr "%s %s är inte en incheckning!"
|
|
|
|
|
|
|
|
#: compat/obstack.c:406 compat/obstack.c:408
|
|
|
|
msgid "memory exhausted"
|
|
|
|
msgstr "minnet slut"
|
|
|
|
|
|
|
|
#: connected.c:39
|
|
|
|
msgid "Could not run 'git rev-list'"
|
|
|
|
msgstr "Kunde inte köra \"git rev-list\""
|
|
|
|
|
|
|
|
#: connected.c:48
|
|
|
|
#, c-format
|
|
|
|
msgid "failed write to rev-list: %s"
|
|
|
|
msgstr "kunde inte skriva till rev-list: %s"
|
|
|
|
|
|
|
|
#: connected.c:56
|
|
|
|
#, c-format
|
|
|
|
msgid "failed to close rev-list's stdin: %s"
|
|
|
|
msgstr "kunde inte stänga rev-list:s standard in: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: date.c:95
|
|
|
|
msgid "in the future"
|
|
|
|
msgstr "i framtiden"
|
|
|
|
|
|
|
|
#: date.c:101
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu second ago"
|
|
|
|
msgid_plural "%lu seconds ago"
|
|
|
|
msgstr[0] "%lu sekund sedan"
|
|
|
|
msgstr[1] "%lu sekunder sedan"
|
|
|
|
|
|
|
|
#: date.c:108
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu minute ago"
|
|
|
|
msgid_plural "%lu minutes ago"
|
|
|
|
msgstr[0] "%lu minut sedan"
|
|
|
|
msgstr[1] "%lu minuter sedan"
|
|
|
|
|
|
|
|
#: date.c:115
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu hour ago"
|
|
|
|
msgid_plural "%lu hours ago"
|
|
|
|
msgstr[0] "%lu timme sedan"
|
|
|
|
msgstr[1] "%lu timmar sedan"
|
|
|
|
|
|
|
|
#: date.c:122
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu day ago"
|
|
|
|
msgid_plural "%lu days ago"
|
|
|
|
msgstr[0] "%lu dag sedan"
|
|
|
|
msgstr[1] "%lu dagar sedan"
|
|
|
|
|
|
|
|
#: date.c:128
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu week ago"
|
|
|
|
msgid_plural "%lu weeks ago"
|
|
|
|
msgstr[0] "%lu vecka sedan"
|
|
|
|
msgstr[1] "%lu veckor sedan"
|
|
|
|
|
|
|
|
#: date.c:135
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu month ago"
|
|
|
|
msgid_plural "%lu months ago"
|
|
|
|
msgstr[0] "%lu månad sedan"
|
|
|
|
msgstr[1] "%lu månader sedan"
|
|
|
|
|
|
|
|
#: date.c:146
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu year"
|
|
|
|
msgid_plural "%lu years"
|
|
|
|
msgstr[0] "%lu år"
|
|
|
|
msgstr[1] "%lu år"
|
|
|
|
|
|
|
|
#: date.c:149
|
|
|
|
#, c-format
|
|
|
|
msgid "%s, %lu month ago"
|
|
|
|
msgid_plural "%s, %lu months ago"
|
|
|
|
msgstr[0] "%s, %lu månad sedan"
|
|
|
|
msgstr[1] "%s, %lu månader sedan"
|
|
|
|
|
|
|
|
#: date.c:154 date.c:159
|
|
|
|
#, c-format
|
|
|
|
msgid "%lu year ago"
|
|
|
|
msgid_plural "%lu years ago"
|
|
|
|
msgstr[0] "%lu år sedan"
|
|
|
|
msgstr[1] "%lu år sedan"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: diff.c:105
|
|
|
|
#, c-format
|
|
|
|
msgid " Failed to parse dirstat cut-off percentage '%.*s'\n"
|
|
|
|
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%.*s\"\n"
|
|
|
|
|
|
|
|
#: diff.c:110
|
|
|
|
#, c-format
|
|
|
|
msgid " Unknown dirstat parameter '%.*s'\n"
|
|
|
|
msgstr " Okänd dirstat-parameter \"%.*s\"\n"
|
|
|
|
|
|
|
|
#: diff.c:210
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Found errors in 'diff.dirstat' config variable:\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
|
|
|
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
|
|
|
|
"%s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: diff.c:1400
|
2012-08-09 13:36:41 +08:00
|
|
|
msgid " 0 files changed"
|
|
|
|
msgstr " 0 filer ändrade"
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: diff.c:1404
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid " %d file changed"
|
|
|
|
msgid_plural " %d files changed"
|
|
|
|
msgstr[0] " %d fil ändrad"
|
|
|
|
msgstr[1] " %d filer ändrade"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: diff.c:1421
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ", %d insertion(+)"
|
|
|
|
msgid_plural ", %d insertions(+)"
|
|
|
|
msgstr[0] ", %d tillägg(+)"
|
|
|
|
msgstr[1] ", %d tillägg(+)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: diff.c:1432
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ", %d deletion(-)"
|
|
|
|
msgid_plural ", %d deletions(-)"
|
|
|
|
msgstr[0] ", %d borttagning(-)"
|
|
|
|
msgstr[1] ", %d borttagningar(-)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: diff.c:3461
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Failed to parse --dirstat/-X option parameter:\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
|
|
|
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
#: gpg-interface.c:59
|
|
|
|
msgid "could not run gpg."
|
|
|
|
msgstr "kunde inte köra gpg."
|
|
|
|
|
|
|
|
#: gpg-interface.c:71
|
|
|
|
msgid "gpg did not accept the data"
|
|
|
|
msgstr "gpg godtog inte data"
|
|
|
|
|
|
|
|
#: gpg-interface.c:82
|
|
|
|
msgid "gpg failed to sign the data"
|
|
|
|
msgstr "gpg misslyckades signera data"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: grep.c:1320
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': unable to read %s"
|
|
|
|
msgstr "\"%s\" kunde inte läsa %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: grep.c:1337
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': %s"
|
|
|
|
msgstr "\"%s\": %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: grep.c:1348
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': short read %s"
|
|
|
|
msgstr "\"%s\": kort läsning %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:212
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "available git commands in '%s'"
|
|
|
|
msgstr "git-kommandon tillgängliga i \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:219
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "git commands available from elsewhere on your $PATH"
|
|
|
|
msgstr "git-kommandon från andra platser i din $PATH"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:275
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"'%s' appears to be a git command, but we were not\n"
|
|
|
|
"able to execute it. Maybe git-%s is broken?"
|
|
|
|
msgstr ""
|
|
|
|
"\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
|
|
|
|
"köra det. Kanske git-%s är trasigt?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:332
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Uh oh. Your system reports no Git commands at all."
|
|
|
|
msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:354
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"WARNING: You called a Git command named '%s', which does not exist.\n"
|
|
|
|
"Continuing under the assumption that you meant '%s'"
|
|
|
|
msgstr ""
|
|
|
|
"VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n"
|
|
|
|
"Fortsätter under förutsättningen att du menade \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:359
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "in %0.1f seconds automatically..."
|
|
|
|
msgstr "automatiskt om %0.1f sekunder..."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:366
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "git: '%s' is not a git command. See 'git --help'."
|
|
|
|
msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: help.c:370
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"Did you mean this?"
|
|
|
|
msgid_plural ""
|
|
|
|
"\n"
|
|
|
|
"Did you mean one of these?"
|
|
|
|
msgstr[0] ""
|
|
|
|
"\n"
|
|
|
|
"Menade du detta?"
|
|
|
|
msgstr[1] ""
|
|
|
|
"\n"
|
|
|
|
"Menade du ett av dessa?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: 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
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "..."
|
|
|
|
msgstr "..."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: parse-options.c:512
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "usage: %s"
|
|
|
|
msgstr "användning: %s"
|
|
|
|
|
|
|
|
#. TRANSLATORS: the colon here should align with the
|
|
|
|
#. one in "usage: %s" translation
|
2012-08-09 13:36:41 +08:00
|
|
|
#: parse-options.c:516
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid " or: %s"
|
|
|
|
msgstr " eller: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: parse-options.c:519
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid " %s"
|
|
|
|
msgstr " %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: remote.c:1632
|
2012-03-08 17:56:37 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: remote.c:1638
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
|
|
|
|
msgid_plural ""
|
|
|
|
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
|
|
|
|
msgstr[0] ""
|
|
|
|
"Din gren ligger efter \"%s\" med %d incheckning, och kan snabbspolas.\n"
|
|
|
|
msgstr[1] ""
|
|
|
|
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: remote.c:1646
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
"and have %d and %d different commit each, respectively.\n"
|
|
|
|
msgid_plural ""
|
|
|
|
"Your branch and '%s' have diverged,\n"
|
|
|
|
"and have %d and %d different commits each, respectively.\n"
|
|
|
|
msgstr[0] ""
|
|
|
|
"Din gren och \"%s\" har divergerat,\n"
|
|
|
|
"och har %d respektive %d olika incheckning.\n"
|
|
|
|
msgstr[1] ""
|
|
|
|
"Din gren och \"%s\" har divergerat,\n"
|
|
|
|
"och har %d respektive %d olika incheckningar.\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1088 builtin/merge.c:1098
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not open '%s' for writing"
|
|
|
|
msgstr "Kunde inte öppna \"%s\" för skrivning"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1090 builtin/merge.c:1103
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not write to '%s'"
|
|
|
|
msgstr "Kunde inte skriva till \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:144
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'"
|
|
|
|
msgstr ""
|
|
|
|
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
|
|
|
|
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:147
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"after resolving the conflicts, mark the corrected paths\n"
|
|
|
|
"with 'git add <paths>' or 'git rm <paths>'\n"
|
|
|
|
"and commit the result with 'git commit'"
|
|
|
|
msgstr ""
|
|
|
|
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
|
|
|
|
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
|
|
|
|
"och checka in resultatet med \"git commit\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:160 sequencer.c:758 sequencer.c:841
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not write to %s"
|
|
|
|
msgstr "Kunde inte skriva till %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:163
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Error wrapping up %s"
|
|
|
|
msgstr "Fel vid ombrytning av %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:178
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Your local changes would be overwritten by cherry-pick."
|
|
|
|
msgstr "Dina lokala ändringar skulle skrivas över av \"cherry-pick\"."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:180
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Your local changes would be overwritten by revert."
|
|
|
|
msgstr "Dina lokala ändringar skulle skrivas över av \"revert\"."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:183
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Commit your changes or stash them to proceed."
|
|
|
|
msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta."
|
|
|
|
|
|
|
|
#. TRANSLATORS: %s will be "revert" or "cherry-pick"
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:233
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: Unable to write new index file"
|
|
|
|
msgstr "%s: Kunde inte skriva ny indexfil"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:261
|
|
|
|
msgid "Could not resolve HEAD commit\n"
|
|
|
|
msgstr "Kunde inte bestämma HEAD:s incheckning\n"
|
|
|
|
|
|
|
|
#: sequencer.c:282
|
|
|
|
msgid "Unable to update cache tree\n"
|
|
|
|
msgstr "Kan inte uppdatera cacheträd\n"
|
|
|
|
|
|
|
|
#: sequencer.c:324
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not parse commit %s\n"
|
|
|
|
msgstr "Kunde inte tolka incheckningen %s\n"
|
|
|
|
|
|
|
|
#: sequencer.c:329
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not parse parent commit %s\n"
|
|
|
|
msgstr "Kunde inte tolka föräldraincheckningen %s\n"
|
|
|
|
|
|
|
|
#: sequencer.c:395
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Your index file is unmerged."
|
|
|
|
msgstr "Din indexfil har inte slagits ihop."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:398
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "You do not have a valid HEAD"
|
|
|
|
msgstr "Du har ingen giltig HEAD"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:413
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s is a merge but no -m option was given."
|
|
|
|
msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:421
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Commit %s does not have parent %d"
|
|
|
|
msgstr "Incheckning %s har inte förälder %d"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:425
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Mainline was specified but commit %s is not a merge."
|
|
|
|
msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning"
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s will be "revert" or
|
|
|
|
#. "cherry-pick", the second %s a SHA1
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:436
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: cannot parse parent commit %s"
|
|
|
|
msgstr "%s: kan inte tolka föräldraincheckningen %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:440
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot get commit message for %s"
|
|
|
|
msgstr "Kan inte hämta incheckningsmeddelande för %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:524
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not revert %s... %s"
|
|
|
|
msgstr "kunde inte ångra %s... %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:525
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not apply %s... %s"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "kunde inte tillämpa %s... %s"
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:553
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "empty commit set passed"
|
|
|
|
msgstr "den angivna uppsättningen incheckningar är tom"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:561
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "git %s: failed to read the index"
|
|
|
|
msgstr "git %s: misslyckades läsa indexet"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:566
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "git %s: failed to refresh the index"
|
|
|
|
msgstr "git %s: misslyckades uppdatera indexet"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:624
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot %s during a %s"
|
|
|
|
msgstr "kan inte %s under en %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:646
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not parse line %d."
|
|
|
|
msgstr "Kan inte tolka rad %d."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:651
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No commits parsed."
|
|
|
|
msgstr "Inga incheckningar lästes."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:664
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not open %s"
|
|
|
|
msgstr "Kunde inte öppna %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:668
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not read %s."
|
|
|
|
msgstr "kunde inte läsa %s."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:675
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unusable instruction sheet: %s"
|
|
|
|
msgstr "Oanvändbart manus: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:703
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid key: %s"
|
|
|
|
msgstr "Felaktig nyckel: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:706
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid value for %s: %s"
|
|
|
|
msgstr "Felaktigt värde för %s: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:718
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Malformed options sheet: %s"
|
|
|
|
msgstr "Trasigt manus: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:739
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "a cherry-pick or revert is already in progress"
|
|
|
|
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:740
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:744
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not create sequencer directory %s"
|
|
|
|
msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:760 sequencer.c:845
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Error wrapping up %s."
|
|
|
|
msgstr "Fel vid ombrytning av %s."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:779 sequencer.c:913
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "no cherry-pick or revert in progress"
|
|
|
|
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:781
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "cannot resolve HEAD"
|
|
|
|
msgstr "kan inte bestämma HEAD"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:783
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "cannot abort from a branch yet to be born"
|
|
|
|
msgstr "kan inte avbryta från en gren som ännu inte är född"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: sequencer.c:805 builtin/apply.c:3988
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot open %s: %s"
|
|
|
|
msgstr "kan inte öppna %s: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:808
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read %s: %s"
|
|
|
|
msgstr "kan inte läsa %s: %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:809
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "unexpected end of file"
|
|
|
|
msgstr "oväntat filslut"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:815
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
|
|
|
|
msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:838
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not format %s."
|
|
|
|
msgstr "Kunde inte formatera %s."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:1000
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Can't revert as initial commit"
|
|
|
|
msgstr "Kan inte ångra som första incheckning"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: sequencer.c:1001
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Can't cherry-pick into empty head"
|
|
|
|
msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: sha1_name.c:1044
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "HEAD does not point to a branch"
|
|
|
|
msgstr "HEAD pekar inte på en gren"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: sha1_name.c:1047
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No such branch: '%s'"
|
|
|
|
msgstr "Okänd gren: \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: sha1_name.c:1049
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No upstream configured for branch '%s'"
|
|
|
|
msgstr "Ingen standarduppström angiven för grenen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: sha1_name.c:1052
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
|
|
|
#: wrapper.c:413
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to look up current user in the passwd file: %s"
|
|
|
|
msgstr "kan inte slå upp aktuell användare i passwd-filen: %s"
|
|
|
|
|
|
|
|
#: wrapper.c:414
|
|
|
|
msgid "no such user"
|
|
|
|
msgstr "okänd användare"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:140
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Unmerged paths:"
|
|
|
|
msgstr "Ej sammanslagna sökvägar:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:167 wt-status.c:194
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (use \"git reset %s <file>...\" to unstage)"
|
|
|
|
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:169 wt-status.c:196
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (use \"git rm --cached <file>...\" to unstage)"
|
|
|
|
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:173
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git add <file>...\" to mark resolution)"
|
|
|
|
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:175 wt-status.c:179
|
2012-03-08 17:56:37 +08:00
|
|
|
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)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:177
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git rm <file>...\" to mark resolution)"
|
|
|
|
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:188
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Changes to be committed:"
|
|
|
|
msgstr "Ändringar att checka in:"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:206
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Changes not staged for commit:"
|
|
|
|
msgstr "Ändringar ej i incheckningskön:"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:210
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (use \"git add <file>...\" to update what will be committed)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:212
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:213
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
2012-03-08 17:56:37 +08:00
|
|
|
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
|
2010-09-13 04:10:21 +08:00
|
|
|
"arbetskatalogen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:215
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (commit or discard the untracked or modified content in submodules)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-15 17:47:06 +08:00
|
|
|
# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:224
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "%s files:"
|
2012-03-15 17:47:06 +08:00
|
|
|
msgstr "%se filer:"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:227
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid " (use \"git %s <file>...\" to include in what will be committed)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-08-14 16:58:14 +08:00
|
|
|
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:244
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "bug"
|
|
|
|
msgstr "programfel"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:249
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "both deleted:"
|
|
|
|
msgstr "borttaget av bägge:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:250
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "added by us:"
|
|
|
|
msgstr "tillagt av oss:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:251
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "deleted by them:"
|
|
|
|
msgstr "borttaget av dem:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:252
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "added by them:"
|
|
|
|
msgstr "tillagt av dem:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:253
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "deleted by us:"
|
|
|
|
msgstr "borttaget av oss:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:254
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "both added:"
|
|
|
|
msgstr "tillagt av bägge:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:255
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "both modified:"
|
|
|
|
msgstr "ändrat av bägge:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:285
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "new commits, "
|
|
|
|
msgstr "nya incheckningar, "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:287
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "modified content, "
|
|
|
|
msgstr "ändrat innehåll, "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:289
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "untracked content, "
|
|
|
|
msgstr "ospårat innehåll, "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:303
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "new file: %s"
|
|
|
|
msgstr "ny fil: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:306
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "copied: %s -> %s"
|
|
|
|
msgstr "kopierad: %s -> %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:309
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "deleted: %s"
|
|
|
|
msgstr "borttagen: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:312
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "modified: %s"
|
|
|
|
msgstr "ändrad: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:315
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "renamed: %s -> %s"
|
|
|
|
msgstr "namnbyte: %s -> %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:318
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "typechange: %s"
|
|
|
|
msgstr "typbyte: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:321
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown: %s"
|
|
|
|
msgstr "okänd: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:324
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unmerged: %s"
|
|
|
|
msgstr "osammansl.: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:327
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "bug: unhandled diff status %c"
|
|
|
|
msgstr "programfel: diff-status %c ej hanterad"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:785
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You have unmerged paths."
|
|
|
|
msgstr "Du har ej sammanslagna sökvägar."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:788 wt-status.c:912
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (fix conflicts and run \"git commit\")"
|
|
|
|
msgstr " (rätta konflikter och kör \"git commit\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:791
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "All conflicts fixed but you are still merging."
|
|
|
|
msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:794
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git commit\" to conclude merge)"
|
|
|
|
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:804
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are in the middle of an am session."
|
|
|
|
msgstr "Du är i mitten av en körning av \"git am\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:807
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "The current patch is empty."
|
|
|
|
msgstr "Aktuell patch är tom."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:811
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (fix conflicts and then run \"git am --resolved\")"
|
|
|
|
msgstr " (rätta konflikter och kör sedan \"git am --resolved\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:813
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git am --skip\" to skip this patch)"
|
|
|
|
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:815
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git am --abort\" to restore the original branch)"
|
|
|
|
msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:873 wt-status.c:883
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are currently rebasing."
|
|
|
|
msgstr "Du håller på med en ombasering."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:876
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (fix conflicts and then run \"git rebase --continue\")"
|
|
|
|
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:878
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git rebase --skip\" to skip this patch)"
|
|
|
|
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:880
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (use \"git rebase --abort\" to check out the original branch)"
|
|
|
|
msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:886
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (all conflicts fixed: run \"git rebase --continue\")"
|
|
|
|
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:888
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are currently splitting a commit during a rebase."
|
|
|
|
msgstr "Du håller på att dela upp en incheckning i en ombasering."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:891
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
|
|
|
|
msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:893
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are currently editing a commit during a rebase."
|
|
|
|
msgstr "Du håller på att redigera en incheckning under en ombasering."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:896
|
2012-07-05 02:34:21 +08:00
|
|
|
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)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:898
|
2012-07-05 02:34:21 +08:00
|
|
|
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)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:908
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are currently cherry-picking."
|
|
|
|
msgstr "Du håller på med en \"cherry-pick\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:915
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid " (all conflicts fixed: run \"git commit\")"
|
|
|
|
msgstr " (alla konflikter har rättats: kör \"git commit\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:924
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "You are currently bisecting."
|
|
|
|
msgstr "Du håller på med en \"bisect\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:927
|
2012-07-05 02:34:21 +08:00
|
|
|
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)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:978
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "On branch "
|
|
|
|
msgstr "På grenen "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:985
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Not currently on any branch."
|
|
|
|
msgstr "Inte på någon gren för närvarande."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:997
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Initial commit"
|
|
|
|
msgstr "Första incheckning"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1011
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Untracked"
|
|
|
|
msgstr "Ospårad"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1013
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Ignored"
|
|
|
|
msgstr "Ignorerad"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
# %s är nästa sträng eller tom.
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1015
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Untracked files not listed%s"
|
|
|
|
msgstr "Ospårade filer visas ej%s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1017
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (use -u option to show untracked files)"
|
|
|
|
msgstr " (använd flaggan -u för att visa ospårade filer)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1023
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No changes"
|
|
|
|
msgstr "Inga ändringar"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1027
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "no changes added to commit%s\n"
|
|
|
|
msgstr "inga ändringar att checka in%s\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1029
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (use \"git add\" and/or \"git commit -a\")"
|
|
|
|
msgstr " (använd \"git add\" och/eller \"git commit -a\")"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1031
|
2010-09-13 04:10:21 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1033
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (use \"git add\" to track)"
|
2012-08-14 16:58:14 +08:00
|
|
|
msgstr " (spåra med \"git add\")"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1035 wt-status.c:1038 wt-status.c:1041
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "nothing to commit%s\n"
|
|
|
|
msgstr "inget att checka in%s\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1036
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (create/copy files and use \"git add\" to track)"
|
2012-08-14 16:58:14 +08:00
|
|
|
msgstr " (skapa/kopiera filer och spåra med \"git add\")"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1039
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (use -u to show untracked files)"
|
|
|
|
msgstr " (använd -u för att visa ospårade filer)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1042
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (working directory clean)"
|
|
|
|
msgstr " (arbetskatalogen ren)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1150
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "HEAD (no branch)"
|
|
|
|
msgstr "HEAD (ingen gren)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1156
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Initial commit on "
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Första incheckning på "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1171
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "behind "
|
|
|
|
msgstr "efter "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1174 wt-status.c:1177
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "ahead "
|
|
|
|
msgstr "före "
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: wt-status.c:1179
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ", behind "
|
|
|
|
msgstr ", efter "
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:62
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unexpected diff status %c"
|
|
|
|
msgstr "diff-status %c förväntades inte"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/add.c:67 builtin/commit.c:229
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "updating files failed"
|
|
|
|
msgstr "misslyckades uppdatera filer"
|
|
|
|
|
|
|
|
#: builtin/add.c:77
|
|
|
|
#, c-format
|
|
|
|
msgid "remove '%s'\n"
|
|
|
|
msgstr "ta bort \"%s\"\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:176
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Path '%s' is in submodule '%.*s'"
|
|
|
|
msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:192
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Unstaged changes after refreshing the index:"
|
|
|
|
msgstr "Ospårade ändringar efter att ha uppdaterat indexet:"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/add.c:195 builtin/add.c:459 builtin/rm.c:186
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "pathspec '%s' did not match any files"
|
|
|
|
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:209
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is beyond a symbolic link"
|
|
|
|
msgstr "\"%s\" är på andra sidan av en symbolisk länk"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:276
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Could not read the index"
|
|
|
|
msgstr "Kunde inte läsa indexet"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:286
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not open '%s' for writing."
|
|
|
|
msgstr "Kunde inte öppna \"%s\" för skrivning"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:290
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Could not write patch"
|
|
|
|
msgstr "Kunde inte skriva patch"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:295
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not stat '%s'"
|
|
|
|
msgstr "Kunde inte ta status på \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:297
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Empty patch. Aborted."
|
|
|
|
msgstr "Tom patch. Avbryter."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:303
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not apply '%s'"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Kunde inte tillämpa \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:312
|
|
|
|
msgid "The following paths are ignored by one of your .gitignore files:\n"
|
|
|
|
msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
|
|
|
|
|
|
|
#: builtin/add.c:352
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Use -f if you really want to add them.\n"
|
|
|
|
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:353
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "no files added"
|
|
|
|
msgstr "inga filer har lagts till"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:359
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "adding files failed"
|
|
|
|
msgstr "misslyckades lägga till filer"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:391
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "-A and -u are mutually incompatible"
|
|
|
|
msgstr "-A och -u är ömsesidigt inkompatibla"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:393
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Option --ignore-missing can only be used together with --dry-run"
|
|
|
|
msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:413
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Nothing specified, nothing added.\n"
|
|
|
|
msgstr "Inget angivet, inget tillagt.\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/add.c:414
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Maybe you wanted to say 'git add .'?\n"
|
|
|
|
msgstr "Kanske menade du att skriva \"git add .\"?\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:162
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "index file corrupt"
|
|
|
|
msgstr "indexfilen trasig"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/add.c:480 builtin/apply.c:4433 builtin/mv.c:229 builtin/rm.c:260
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Unable to write new index file"
|
|
|
|
msgstr "Kunde inte skriva ny indexfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:57
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "git apply [options] [<patch>...]"
|
|
|
|
msgstr "git apply [flaggor] [<patch>...]"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:110
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized whitespace option '%s'"
|
|
|
|
msgstr "okänt alternativ för whitespace: \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:125
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized whitespace ignore option '%s'"
|
|
|
|
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:824
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot prepare timestamp regexp %s"
|
|
|
|
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:833
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "regexec returned %d for input: %s"
|
|
|
|
msgstr "regexec returnerade %d för indata: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:914
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to find filename in patch at line %d"
|
|
|
|
msgstr "kan inte hitta filnamn i patchen på rad %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:946
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:950
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:951
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:958
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1403
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "recount: unexpected line: %.*s"
|
|
|
|
msgstr "recount: förväntade rad: %.*s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1460
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "patch fragment without header at line %d: %.*s"
|
|
|
|
msgstr "patch-fragment utan huvud på rad %d: %.*s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1477
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
"component (line %d)"
|
|
|
|
msgid_plural ""
|
|
|
|
"git diff header lacks filename information when removing %d leading pathname "
|
|
|
|
"components (line %d)"
|
|
|
|
msgstr[0] ""
|
|
|
|
"git-diff-huvudet saknar filnamnsinformation när %d ledande sökvägskomponent\n"
|
|
|
|
"tas bort (rad %d)"
|
|
|
|
msgstr[1] ""
|
|
|
|
"git-diff-huvudet saknar filnamnsinformation när %d ledande "
|
|
|
|
"sökvägskomponenter\n"
|
|
|
|
"tas bort (rad %d)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1637
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "new file depends on old contents"
|
|
|
|
msgstr "ny fil beror på gammalt innehåll"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1639
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "deleted file still has contents"
|
|
|
|
msgstr "borttagen fil har fortfarande innehåll"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1665
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "corrupt patch at line %d"
|
|
|
|
msgstr "trasig patch på rad %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1701
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "new file %s depends on old contents"
|
|
|
|
msgstr "nya filen %s beror på gammalt innehåll"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1703
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "deleted file %s still has contents"
|
|
|
|
msgstr "borttagna filen %s har fortfarande innehåll"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1706
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "** warning: file %s becomes empty but is not deleted"
|
|
|
|
msgstr "** varning: filen %s blir tom men har inte tagits bort"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1852
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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)
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1881
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized binary patch at line %d"
|
|
|
|
msgstr "binärpatchen på rad %d känns inte igen"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:1967
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "patch with only garbage at line %d"
|
|
|
|
msgstr "patch med bara skräp på rad %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2057
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to read symlink %s"
|
|
|
|
msgstr "kunde inte läsa symboliska länken %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2061
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to open or read %s"
|
|
|
|
msgstr "kunde inte öppna eller läsa %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2132
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "oops"
|
|
|
|
msgstr "hoppsan"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2654
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid start of line: '%c'"
|
|
|
|
msgstr "felaktig inledning på rad: \"%c\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2772
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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)."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2784
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2790
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"while searching for:\n"
|
|
|
|
"%.*s"
|
|
|
|
msgstr ""
|
|
|
|
"vid sökning efter:\n"
|
|
|
|
"%.*s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2809
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "missing binary patch data for '%s'"
|
|
|
|
msgstr "saknar binära patchdata för \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2912
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "binary patch does not apply to '%s'"
|
|
|
|
msgstr "binärpatchen kan inte tillämpas på \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2918
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:2939
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "patch failed: %s:%ld"
|
|
|
|
msgstr "patch misslyckades: %s:%ld"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3061
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
2012-08-09 13:36:41 +08:00
|
|
|
msgid "cannot checkout %s"
|
|
|
|
msgstr "kan inte checka ut %s"
|
2012-07-02 06:04:09 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3106 builtin/apply.c:3115 builtin/apply.c:3159
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "read of %s failed"
|
|
|
|
msgstr "misslyckades läsa %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3139 builtin/apply.c:3361
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
2012-08-09 13:36:41 +08:00
|
|
|
msgid "path %s has been renamed/deleted"
|
|
|
|
msgstr "sökvägen %s har ändrat namn/tagits bort"
|
2012-07-02 06:04:09 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3220 builtin/apply.c:3375
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
2012-08-09 13:36:41 +08:00
|
|
|
msgid "%s: does not exist in index"
|
|
|
|
msgstr "%s: finns inte i indexet"
|
2012-07-02 06:04:09 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3224 builtin/apply.c:3367 builtin/apply.c:3389
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: %s"
|
|
|
|
msgstr "%s: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3229 builtin/apply.c:3383
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: does not match index"
|
|
|
|
msgstr "%s: motsvarar inte indexet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3331
|
|
|
|
msgid "removal patch leaves file contents"
|
|
|
|
msgstr "patch för borttagning lämnar kvar filinnehåll"
|
|
|
|
|
|
|
|
#: builtin/apply.c:3400
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: wrong type"
|
|
|
|
msgstr "%s: fel typ"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3402
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s has type %o, expected %o"
|
|
|
|
msgstr "%s har typen %o, förväntade %o"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3503
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: already exists in index"
|
|
|
|
msgstr "%s: finns redan i indexet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3506
|
|
|
|
#, c-format
|
|
|
|
msgid "%s: already exists in working directory"
|
|
|
|
msgstr "%s: finns redan i arbetskatalogen"
|
|
|
|
|
|
|
|
#: builtin/apply.c:3526
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3531
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3539
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: patch does not apply"
|
|
|
|
msgstr "%s: patchen kan inte tillämpas"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3552
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Checking patch %s..."
|
|
|
|
msgstr "Kontrollerar patchen %s..."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3607 builtin/checkout.c:213 builtin/reset.c:158
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "make_cache_entry failed for path '%s'"
|
|
|
|
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3750
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to remove %s from index"
|
|
|
|
msgstr "kan inte ta bort %s från indexet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3778
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "corrupt patch for subproject %s"
|
|
|
|
msgstr "trasig patch för underprojektet %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3782
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to stat newly created file '%s'"
|
|
|
|
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3787
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3790 builtin/apply.c:3898
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to add cache entry for %s"
|
|
|
|
msgstr "kan inte lägga till cachepost för %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3823
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "closing file '%s'"
|
|
|
|
msgstr "stänger filen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3872
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to write file '%s' mode %o"
|
|
|
|
msgstr "kan inte skriva filen \"%s\" läge %o"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3959
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Applied patch %s cleanly."
|
|
|
|
msgstr "Tillämpade patchen %s rent."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3967
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "internal error"
|
|
|
|
msgstr "internt fel"
|
|
|
|
|
|
|
|
#. Say this even without --verbose
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3970
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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..."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:3980
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "truncating .rej filename to %.*s.rej"
|
|
|
|
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4001
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Hunk #%d applied cleanly."
|
|
|
|
msgstr "Stycke %d tillämpades rent."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4004
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Rejected hunk #%d."
|
|
|
|
msgstr "Refuserar stycke %d."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4154
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "unrecognized input"
|
|
|
|
msgstr "indata känns inte igen"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4165
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "unable to read index file"
|
|
|
|
msgstr "kan inte läsa indexfilen"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4284 builtin/apply.c:4287
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "path"
|
|
|
|
msgstr "sökväg"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4285
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "don't apply changes matching the given path"
|
|
|
|
msgstr "tillämpa inte ändringar som motsvarar given sökväg"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4288
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "apply changes matching the given path"
|
|
|
|
msgstr "tillämpa ändringar som motsvarar given sökväg"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4290
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "num"
|
|
|
|
msgstr "antal"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4291
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "remove <num> leading slashes from traditional diff paths"
|
|
|
|
msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4294
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "ignore additions made by the patch"
|
|
|
|
msgstr "ignorera tillägg gjorda av patchen"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4296
|
2012-07-02 06:04:09 +08:00
|
|
|
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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4300
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "shows number of added and deleted lines in decimal notation"
|
|
|
|
msgstr "visar antal tillagda och borttagna rader decimalt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4302
|
2012-07-02 06:04:09 +08:00
|
|
|
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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4304
|
2012-07-02 06:04:09 +08:00
|
|
|
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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4306
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "make sure the patch is applicable to the current index"
|
|
|
|
msgstr "se till att patchen kan tillämpas på aktuellt index"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4308
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "apply a patch without touching the working tree"
|
|
|
|
msgstr "tillämpa en patch utan att röra arbetskatalogen"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4310
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "also apply the patch (use with --stat/--summary/--check)"
|
|
|
|
msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: 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
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "build a temporary index based on embedded index information"
|
|
|
|
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4316
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "paths are separated with NUL character"
|
|
|
|
msgstr "sökvägar avdelas med NUL-tecken"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4319
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "ensure at least <n> lines of context match"
|
|
|
|
msgstr "se till att åtminstone <n> rader sammanhang är lika"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4320
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "action"
|
|
|
|
msgstr "åtgärd"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4321
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "detect new or modified lines that have whitespace errors"
|
|
|
|
msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4324 builtin/apply.c:4327
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "ignore changes in whitespace when finding context"
|
|
|
|
msgstr "ignorera ändringar i blanktecken för sammanhang"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4330
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "apply the patch in reverse"
|
|
|
|
msgstr "tillämpa patchen baklänges"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4332
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "don't expect at least one line of context"
|
|
|
|
msgstr "förvänta inte minst en rad sammanhang"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4334
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "leave the rejected hunks in corresponding *.rej files"
|
|
|
|
msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4336
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "allow overlapping hunks"
|
|
|
|
msgstr "tillåt överlappande stycken"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4337
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "be verbose"
|
|
|
|
msgstr "var pratsam"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4339
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "tolerate incorrectly detected missing new-line at the end of file"
|
|
|
|
msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4342
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "do not trust the line counts in the hunk headers"
|
|
|
|
msgstr "lite inte på antalet linjer i styckehuvuden"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4344
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "root"
|
|
|
|
msgstr "rot"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4345
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "prepend <root> to all filenames"
|
|
|
|
msgstr "lägg till <rot> i alla filnamn"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4367
|
|
|
|
msgid "--3way outside a repository"
|
|
|
|
msgstr "--3way utanför arkiv"
|
|
|
|
|
|
|
|
#: builtin/apply.c:4375
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "--index outside a repository"
|
|
|
|
msgstr "--index utanför arkiv"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4378
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "--cached outside a repository"
|
|
|
|
msgstr "--cached utanför arkiv"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4394
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "can't open patch '%s'"
|
|
|
|
msgstr "kan inte öppna patchen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4408
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/apply.c:4414 builtin/apply.c:4424
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%d line adds whitespace errors."
|
|
|
|
msgid_plural "%d lines add whitespace errors."
|
|
|
|
msgstr[0] "%d rad lägger till fel i blanksteg."
|
|
|
|
msgstr[1] "%d rader lägger till fel i blanksteg."
|
|
|
|
|
2010-09-13 04:10:21 +08:00
|
|
|
#: builtin/archive.c:17
|
|
|
|
#, c-format
|
|
|
|
msgid "could not create archive file '%s'"
|
|
|
|
msgstr "Kunde inte skapa arkivfilen \"%s\""
|
|
|
|
|
|
|
|
#: builtin/archive.c:20
|
|
|
|
msgid "could not redirect output"
|
|
|
|
msgstr "kunde inte omdirigera utdata"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/archive.c:37
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git archive: Remote with no URL"
|
|
|
|
msgstr "git archive: Fjärr utan URL"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/archive.c:58
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git archive: expected ACK/NAK, got EOF"
|
|
|
|
msgstr "git archive: förväntade ACK/NAK, fick EOF"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/archive.c:63
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "git archive: NACK %s"
|
|
|
|
msgstr "git archive: NACK %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/archive.c:65
|
|
|
|
#, c-format
|
|
|
|
msgid "remote error: %s"
|
|
|
|
msgstr "fjärrfel: %s"
|
|
|
|
|
|
|
|
#: builtin/archive.c:66
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git archive: protocol error"
|
|
|
|
msgstr "git archive: protokollfel"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/archive.c:71
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git archive: expected a flush"
|
|
|
|
msgstr "git archive: förväntade en tömning (flush)"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:144
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"deleting branch '%s' that has been merged to\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
" '%s', but not yet merged to HEAD."
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"tar bort grenen \"%s\" som har slagits ihop med\n"
|
|
|
|
" \"%s\", men ännu inte slagits ihop med HEAD."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:148
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"not deleting branch '%s' that is not yet merged to\n"
|
|
|
|
" '%s', even though it is merged to HEAD."
|
|
|
|
msgstr ""
|
|
|
|
"tar inte bort grenen \"%s\" som inte har slagits ihop med\n"
|
|
|
|
" \"%s\", trots att den har slagits ihop med HEAD."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:180
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot use -a with -d"
|
|
|
|
msgstr "kan inte ange -a med -d"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:186
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Couldn't look up commit object for HEAD"
|
|
|
|
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:191
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot delete the branch '%s' which you are currently on."
|
|
|
|
msgstr "Kan inte ta bort grenen \"%s\" som du befinner dig på för närvarande."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:202
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "remote branch '%s' not found."
|
|
|
|
msgstr "fjärrgrenen \"%s\" hittades inte."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:203
|
|
|
|
#, c-format
|
|
|
|
msgid "branch '%s' not found."
|
|
|
|
msgstr "grenen \"%s\" hittades inte."
|
|
|
|
|
|
|
|
#: builtin/branch.c:210
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Couldn't look up commit object for '%s'"
|
|
|
|
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:216
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The branch '%s' is not fully merged.\n"
|
|
|
|
"If you are sure you want to delete it, run 'git branch -D %s'."
|
|
|
|
msgstr ""
|
|
|
|
"Grenen \"%s\" har inte slagits samman i sin helhet.\n"
|
|
|
|
"Om du är säker på att du vill ta bort den, kör \"git branch -D %s\"."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:225
|
|
|
|
#, c-format
|
|
|
|
msgid "Error deleting remote branch '%s'"
|
|
|
|
msgstr "Fel vid borttagning av fjärrgrenen \"%s\""
|
|
|
|
|
|
|
|
#: builtin/branch.c:226
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Error deleting branch '%s'"
|
|
|
|
msgstr "Fel vid borttagning av grenen \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:233
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Deleted remote branch %s (was %s).\n"
|
|
|
|
msgstr "Tog bort fjärrgrenen %s (var %s).\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:234
|
|
|
|
#, c-format
|
|
|
|
msgid "Deleted branch %s (was %s).\n"
|
|
|
|
msgstr "Tog bort grenen %s (var %s).\n"
|
|
|
|
|
|
|
|
#: builtin/branch.c:239
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Update of config-file failed"
|
|
|
|
msgstr "Misslyckades uppdatera konfigurationsfil"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:337
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "branch '%s' does not point at a commit"
|
|
|
|
msgstr "grenen \"%s\" pekar inte på en incheckning"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:409
|
|
|
|
#, c-format
|
|
|
|
msgid "[%s: behind %d]"
|
|
|
|
msgstr "[%s: bakom %d] "
|
|
|
|
|
|
|
|
#: builtin/branch.c:411
|
|
|
|
#, c-format
|
|
|
|
msgid "[behind %d]"
|
|
|
|
msgstr "[bakom %d] "
|
|
|
|
|
|
|
|
#: builtin/branch.c:415
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "[%s: ahead %d]"
|
|
|
|
msgstr "[%s: före %d] "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:417
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "[ahead %d]"
|
|
|
|
msgstr "[före %d] "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:420
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "[%s: ahead %d, behind %d]"
|
|
|
|
msgstr "[%s: före %d, bakom %d] "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:423
|
|
|
|
#, c-format
|
|
|
|
msgid "[ahead %d, behind %d]"
|
|
|
|
msgstr "[före %d, bakom %d] "
|
|
|
|
|
|
|
|
#: builtin/branch.c:535
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "(no branch)"
|
|
|
|
msgstr "(ingen gren)"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:600
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "some refs could not be read"
|
|
|
|
msgstr "vissa referenser kunde inte läsas"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:613
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot rename the current branch while not on any."
|
|
|
|
msgstr ""
|
|
|
|
"kunde inte byta namn på aktuell gren när du inte befinner dig på någon."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:623
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid branch name: '%s'"
|
|
|
|
msgstr "Felaktigt namn på gren: \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:638
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Branch rename failed"
|
|
|
|
msgstr "Misslyckades byta namn på gren"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:642
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Renamed a misnamed branch '%s' away"
|
|
|
|
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:646
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Branch renamed to %s, but HEAD is not updated!"
|
|
|
|
msgstr "Grenen namnbytt till %s, men HEAD har inte uppdaterats!"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:653
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Branch is renamed, but update of config-file failed"
|
|
|
|
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:668
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed object name %s"
|
|
|
|
msgstr "felformat objektnamn %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:692
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "could not write branch description template: %s"
|
|
|
|
msgstr "kunde inte skriva grenbeskrivningsmall: %s"
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:783
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Failed to resolve HEAD as a valid ref."
|
|
|
|
msgstr "Misslyckades slå upp HEAD som giltig referens"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/branch.c:788 builtin/clone.c:561
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "HEAD not found below refs/heads!"
|
|
|
|
msgstr "HEAD hittades inte under refs/heads!"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/branch.c:808
|
|
|
|
msgid "--column and --verbose are incompatible"
|
|
|
|
msgstr "--column och --verbose är inkompatibla"
|
|
|
|
|
|
|
|
#: builtin/branch.c:857
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
|
|
|
|
msgstr ""
|
|
|
|
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
|
|
|
|
"grennamn"
|
|
|
|
|
|
|
|
#: builtin/bundle.c:47
|
|
|
|
#, c-format
|
|
|
|
msgid "%s is okay\n"
|
|
|
|
msgstr "%s är okej\n"
|
|
|
|
|
|
|
|
#: builtin/bundle.c:56
|
|
|
|
msgid "Need a repository to create a bundle."
|
|
|
|
msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
|
|
|
|
|
|
|
|
#: builtin/bundle.c:60
|
|
|
|
msgid "Need a repository to unbundle."
|
|
|
|
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:114 builtin/checkout.c:147
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have our version"
|
|
|
|
msgstr "sökvägen \"%s\" har inte vår version"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:116 builtin/checkout.c:149
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' does not have their version"
|
|
|
|
msgstr "sökvägen \"%s\" har inte deras version"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:132
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "path '%s' does not have all necessary versions"
|
|
|
|
msgstr "sökvägen \"%s\" innehåller inte alla nödvändiga versioner"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:176
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "path '%s' does not have necessary versions"
|
|
|
|
msgstr "sökvägen \"%s\" innehåller inte nödvändiga versioner"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:193
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s': cannot merge"
|
|
|
|
msgstr "sökväg \"%s\": kan inte slå ihop"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:210
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unable to add merge result for '%s'"
|
|
|
|
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:235 builtin/checkout.c:393
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "corrupt index file"
|
|
|
|
msgstr "indexfilen är trasig"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:265 builtin/checkout.c:272
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "path '%s' is unmerged"
|
|
|
|
msgstr "sökvägen \"%s\" har inte slagits ihop"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:303 builtin/checkout.c:499 builtin/clone.c:586
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:812
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to write new index file"
|
|
|
|
msgstr "kunde inte skriva ny indexfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:320 builtin/diff.c:302 builtin/merge.c:408
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "diff_setup_done failed"
|
|
|
|
msgstr "diff_setup_done misslyckades"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:415
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "you need to resolve your current index first"
|
|
|
|
msgstr "du måste lösa ditt befintliga index först"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:534
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Can not do reflog for '%s'\n"
|
|
|
|
msgstr "Kan inte skapa referenslog för \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:567
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "HEAD is now at"
|
|
|
|
msgstr "HEAD är nu på"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:574
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Reset branch '%s'\n"
|
|
|
|
msgstr "Återställ gren \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:577
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Already on '%s'\n"
|
|
|
|
msgstr "Redan på \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:581
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to and reset branch '%s'\n"
|
|
|
|
msgstr "Växlade till och nollställde grenen \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:583
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to a new branch '%s'\n"
|
|
|
|
msgstr "Växlade till en ny gren \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:585
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Switched to branch '%s'\n"
|
|
|
|
msgstr "Växlade till grenen \"%s\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:641
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid " ... and %d more.\n"
|
|
|
|
msgstr " ... och %d till.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#. The singular version
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:647
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Warning: you are leaving %d commit behind, not connected to\n"
|
|
|
|
"any of your branches:\n"
|
|
|
|
"\n"
|
|
|
|
"%s\n"
|
|
|
|
msgid_plural ""
|
|
|
|
"Warning: you are leaving %d commits behind, not connected to\n"
|
|
|
|
"any of your branches:\n"
|
|
|
|
"\n"
|
|
|
|
"%s\n"
|
|
|
|
msgstr[0] ""
|
|
|
|
"Varning: du lämnar %d incheckning bakom dig som inte är ansluten till\n"
|
|
|
|
"någon av dina grenar:\n"
|
|
|
|
"\n"
|
|
|
|
"%s\n"
|
|
|
|
msgstr[1] ""
|
|
|
|
"Varning: du lämnar %d incheckningar bakom dig som inte är ansluta till\n"
|
|
|
|
"någon av dina grenar:\n"
|
|
|
|
"\n"
|
|
|
|
"%s\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:665
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"If you want to keep them by creating a new branch, this may be a good time\n"
|
|
|
|
"to do so with:\n"
|
|
|
|
"\n"
|
|
|
|
" git branch new_branch_name %s\n"
|
|
|
|
"\n"
|
|
|
|
msgstr ""
|
|
|
|
"Om du vill behålla dem genom att skapa en ny gren är nu en bra tidpunkt\n"
|
|
|
|
"att göra så, med:\n"
|
|
|
|
"\n"
|
|
|
|
" git branch nytt_grennamn %s\n"
|
|
|
|
"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:695
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "internal error in revision walk"
|
|
|
|
msgstr "internt fel vid genomgång av revisioner (revision walk)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:699
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Previous HEAD position was"
|
|
|
|
msgstr "Tidigare position för HEAD var"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:725 builtin/checkout.c:920
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "You are on a branch yet to be born"
|
|
|
|
msgstr "Du är på en gren som ännu inte är född"
|
|
|
|
|
|
|
|
#. case (1)
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:856
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid reference: %s"
|
|
|
|
msgstr "felaktig referens: %s"
|
|
|
|
|
|
|
|
#. case (1): want a tree
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:895
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "reference is not a tree: %s"
|
|
|
|
msgstr "referensen är inte ett träd: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:977
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "-B cannot be used with -b"
|
|
|
|
msgstr "-B kan inte användas med -b"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:986
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--patch is incompatible with all other options"
|
|
|
|
msgstr "--patch är inkompatibel med alla andra flaggor"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:989
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "--detach cannot be used with -b/-B/--orphan"
|
|
|
|
msgstr "--detcah kan inte användas med -b/-B/--orphan"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:991
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "--detach cannot be used with -t"
|
|
|
|
msgstr "--detach kan inte användas med -t"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:997
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--track needs a branch name"
|
|
|
|
msgstr "--track behöver ett namn på en gren"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1004
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Missing branch name; try -b"
|
|
|
|
msgstr "Grennamn saknas; försök med -b"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1010
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--orphan and -b|-B are mutually exclusive"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "--orphan och -b|-B kan inte användas samtidigt"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1012
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--orphan cannot be used with -t"
|
|
|
|
msgstr "--orphan kan inte användas med -t"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1022
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git checkout: -f and -m are incompatible"
|
|
|
|
msgstr "git checkout: -f och -m är inkompatibla"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1056
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "invalid path specification"
|
|
|
|
msgstr "felaktig sökvägsangivelse"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1064
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"git checkout: updating paths is incompatible with switching branches.\n"
|
|
|
|
"Did you intend to checkout '%s' which can not be resolved as commit?"
|
|
|
|
msgstr ""
|
|
|
|
"git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n"
|
|
|
|
"Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1066
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git checkout: updating paths is incompatible with switching branches."
|
|
|
|
msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1071
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "git checkout: --detach does not take a path argument"
|
|
|
|
msgstr "git checkout: --detach tar inte en sökväg som argument"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1074
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
|
|
|
|
"checking out of the index."
|
|
|
|
msgstr ""
|
|
|
|
"git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
|
|
|
|
"du checkar ut från indexet."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1093
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot switch branch to a non-commit."
|
|
|
|
msgstr "Kan inte växla gren på en icke-incheckning."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/checkout.c:1096
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--ours/--theirs is incompatible with switching branches."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "--ours/--theirs är inkompatibla med att byta gren."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
|
|
|
#: builtin/clean.c:78
|
|
|
|
msgid "-x and -X cannot be used together"
|
|
|
|
msgstr "-x och -X kan inte användas samtidigt"
|
|
|
|
|
|
|
|
#: builtin/clean.c:82
|
|
|
|
msgid ""
|
|
|
|
"clean.requireForce set to true and neither -n nor -f given; refusing to clean"
|
|
|
|
msgstr ""
|
|
|
|
"clean.requireForce satt till true, men varken -n eller -f angavs; vägrar "
|
|
|
|
"städa"
|
|
|
|
|
|
|
|
#: builtin/clean.c:85
|
|
|
|
msgid ""
|
|
|
|
"clean.requireForce defaults to true and neither -n nor -f given; refusing to "
|
|
|
|
"clean"
|
|
|
|
msgstr ""
|
|
|
|
"clean.requireForce har standardvärdet true, men varken -n eller -f angavs; "
|
|
|
|
"vägrar städa"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clean.c:155 builtin/clean.c:176
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Would remove %s\n"
|
|
|
|
msgstr "Skulle ta bort %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clean.c:159 builtin/clean.c:179
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing %s\n"
|
|
|
|
msgstr "Tar bort %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clean.c:162 builtin/clean.c:182
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "failed to remove %s"
|
|
|
|
msgstr "misslyckades ta bort %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clean.c:166
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Would not remove %s\n"
|
|
|
|
msgstr "Skulle inte ta bort %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clean.c:168
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Not removing %s\n"
|
|
|
|
msgstr "Tar inte bort %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:243
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "reference repository '%s' is not a local directory."
|
|
|
|
msgstr "referensarkivet \"%s\" är inte en lokal katalog."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:306
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to create directory '%s'"
|
|
|
|
msgstr "misslyckades skapa katalogen \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:308 builtin/diff.c:75
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to stat '%s'"
|
|
|
|
msgstr "misslyckades ta status på \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:310
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s exists and is not a directory"
|
|
|
|
msgstr "%s finns och är ingen katalog"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:324
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to stat %s\n"
|
|
|
|
msgstr "misslyckades ta status på %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:341
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to unlink '%s'"
|
|
|
|
msgstr "misslyckades ta bort länken \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:346
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to create link '%s'"
|
|
|
|
msgstr "misslyckades skapa länken \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:350
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to copy file to '%s'"
|
|
|
|
msgstr "misslyckades kopiera filen till \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/clone.c:373
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "done.\n"
|
|
|
|
msgstr "klart.\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:443
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not find remote branch %s to clone."
|
|
|
|
msgstr "Kunde inte hitta fjärrgrenen %s för att klona."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:552
|
2012-03-08 17:56:37 +08:00
|
|
|
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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:642
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Too many arguments."
|
|
|
|
msgstr "För många argument."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:646
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You must specify a repository to clone."
|
|
|
|
msgstr "Du måste ange ett arkiv att klona."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:657
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "--bare and --origin %s options are incompatible."
|
|
|
|
msgstr "flaggorna --bare och --origin %s är inkompatibla."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:671
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "repository '%s' does not exist"
|
|
|
|
msgstr "arkivet \"%s\" finns inte"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:676
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "--depth is ignored in local clones; use file:// instead."
|
|
|
|
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:686
|
2010-09-13 04:10:21 +08:00
|
|
|
#, 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."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:696
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "working tree '%s' already exists."
|
|
|
|
msgstr "arbetsträdet \"%s\" finns redan."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:709 builtin/clone.c:723
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create leading directories of '%s'"
|
|
|
|
msgstr "kunde inte skapa inledande kataloger för \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:712
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create work tree dir '%s'."
|
|
|
|
msgstr "kunde inte skapa arbetskatalogen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:731
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Cloning into bare repository '%s'...\n"
|
|
|
|
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:733
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Cloning into '%s'...\n"
|
|
|
|
msgstr "Klonar till \"%s\"...\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:789
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Don't know how to clone %s"
|
|
|
|
msgstr "Vet inte hur man klonar %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:838
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Remote branch %s not found in upstream %s"
|
|
|
|
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/clone.c:845
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You appear to have cloned an empty repository."
|
|
|
|
msgstr "Du verkar ha klonat ett tomt arkiv."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/column.c:51
|
|
|
|
msgid "--command must be the first argument"
|
|
|
|
msgstr "--command måste vara första argument"
|
|
|
|
|
|
|
|
#: builtin/commit.c:43
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"Your name and email address were configured automatically based\n"
|
|
|
|
"on your username and hostname. Please check that they are accurate.\n"
|
|
|
|
"You can suppress this message by setting them explicitly:\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global user.name \"Your Name\"\n"
|
|
|
|
" git config --global user.email you@example.com\n"
|
|
|
|
"\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"After doing this, you may fix the identity used for this commit with:\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
" git commit --amend --reset-author\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
|
|
|
"Ditt namn och e-postadress konfigurerades automatiskt baserat på\n"
|
|
|
|
"ditt användar-id och värdnamn. Kontrollera att de är riktiga. Du\n"
|
|
|
|
"kan förhindra det här meddelandet genom att ställa dem explicit:\n"
|
|
|
|
"\n"
|
|
|
|
" git config --global user.name \"Ditt namn\"\n"
|
|
|
|
" git config --global user.email du@example.com\n"
|
|
|
|
"\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"När du gjort det kan du rätta identiteten som användes för den här\n"
|
|
|
|
"incheckningen med:\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
" git commit --amend --reset-author\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/commit.c:55
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"You asked to amend the most recent commit, but doing so would make\n"
|
|
|
|
"it empty. You can repeat your command with --allow-empty, or you can\n"
|
|
|
|
"remove the commit entirely with \"git reset HEAD^\".\n"
|
|
|
|
msgstr ""
|
|
|
|
"Du bad om att utöka den senaste incheckningen, men om du gör det\n"
|
|
|
|
"blir den tom. Du kan köra kommandot på nytt med --allow-empty, eller\n"
|
|
|
|
"så kan du ta bort incheckningen helt med \"git reset HEAD^\".\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/commit.c:60
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
|
|
|
|
"If you wish to commit it anyway, use:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
"\n"
|
|
|
|
"Otherwise, please use 'git reset'\n"
|
|
|
|
msgstr ""
|
|
|
|
"Den tidigare \"cherry-pick\":en är nu tom, kanske på grund av en löst\n"
|
|
|
|
"konflikt. Om du vill checka in den ändå använder du:\n"
|
|
|
|
"\n"
|
|
|
|
" git commit --allow-empty\n"
|
|
|
|
"\n"
|
|
|
|
"Annars använder du \"git reset\"\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:256
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "failed to unpack HEAD tree object"
|
|
|
|
msgstr "misslyckades packa upp HEAD:s trädobjekt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:298
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "unable to create temporary index"
|
|
|
|
msgstr "kunde inte skapa temporär indexfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:304
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "interactive add failed"
|
|
|
|
msgstr "interaktiv tilläggning misslyckades"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to write new_index file"
|
|
|
|
msgstr "kunde inte skriva filen new_index"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:389
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot do a partial commit during a merge."
|
|
|
|
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:391
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot do a partial commit during a cherry-pick."
|
|
|
|
msgstr "kan inte utföra en delvis incheckning under en cherry-pick."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:401
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot read the index"
|
|
|
|
msgstr "kan inte läsa indexet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:421
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to write temporary index file"
|
|
|
|
msgstr "kunde inte skriva temporär indexfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:496 builtin/commit.c:502
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid commit: %s"
|
|
|
|
msgstr "felaktig incheckning: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:525
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "malformed --author parameter"
|
|
|
|
msgstr "felformad \"--author\"-flagga"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:585
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Malformed ident string: '%s'"
|
|
|
|
msgstr "Felaktig indragningssträng: \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:623 builtin/commit.c:656 builtin/commit.c:970
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not lookup commit %s"
|
|
|
|
msgstr "kunde inte slå upp incheckningen %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:635 builtin/shortlog.c:296
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "(reading log message from standard input)\n"
|
|
|
|
msgstr "(läser loggmeddelande från standard in)\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:637
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not read log from standard input"
|
|
|
|
msgstr "kunde inte läsa logg från standard in"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:641
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read log file '%s'"
|
|
|
|
msgstr "kunde inte läsa loggfilen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:647
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "commit has empty message"
|
|
|
|
msgstr "incheckningen har ett tomt meddelande"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:663
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not read MERGE_MSG"
|
|
|
|
msgstr "kunde inte läsa MERGE_MSG"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:667
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not read SQUASH_MSG"
|
|
|
|
msgstr "kunde inte läsa SQUASH_MSG"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:671
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read '%s'"
|
|
|
|
msgstr "kunde inte läsa \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:723
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not write commit template"
|
|
|
|
msgstr "kunde inte skriva incheckningsmall"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:734
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
2012-07-02 06:04:09 +08:00
|
|
|
"It looks like you may be committing a merge.\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"and try again.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
|
|
|
"\n"
|
2012-07-02 06:04:09 +08:00
|
|
|
"Det verkar som du checkar in en sammanslagning.\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"Om det inte stämmer tar du bort filen\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"och försöker igen.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:739
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"It looks like you may be committing a cherry-pick.\n"
|
|
|
|
"If this is not correct, please remove the file\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"and try again.\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"Det verkar som du checkar in en cherry-pick.\n"
|
|
|
|
"Om det inte stämmer tar du bort filen\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"och försöker igen.\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:751
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"with '#' will be ignored, and an empty message aborts the commit.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:756
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Please enter the commit message for your changes. Lines starting\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"with '#' will be kept; you may remove them yourself if you want to.\n"
|
|
|
|
"An empty message aborts the commit.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n"
|
|
|
|
"Ett tomt meddelande avbryter incheckningen.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:769
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "%sAuthor: %s"
|
|
|
|
msgstr "%sFörfattare: %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:776
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "%sCommitter: %s"
|
|
|
|
msgstr "%sIncheckare: %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:796
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot read index"
|
|
|
|
msgstr "Kan inte läsa indexet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:833
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Error building trees"
|
|
|
|
msgstr "Fel vid byggande av träd"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:848 builtin/tag.c:361
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Please supply the message using either -m or -F option.\n"
|
|
|
|
msgstr "Ange meddelandet en av flaggorna -m eller -F.\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:945
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No existing author found with '%s'"
|
|
|
|
msgstr "Hittade ingen befintlig författare med \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:960 builtin/commit.c:1160
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid untracked files mode '%s'"
|
|
|
|
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1000
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Using both --reset-author and --author does not make sense"
|
|
|
|
msgstr "Kan inte använda både --reset-author och --author"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1011
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You have nothing to amend."
|
|
|
|
msgstr "Du har inget att utöka."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1014
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "You are in the middle of a merge -- cannot amend."
|
|
|
|
msgstr "Du är i mitten av en sammanslagning -- kan inte utöka."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1016
|
2012-07-02 06:04:09 +08:00
|
|
|
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."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1019
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Options --squash and --fixup cannot be used together"
|
|
|
|
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1029
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Only one of -c/-C/-F/--fixup can be used."
|
|
|
|
msgstr "Endast en av -c/-C/-F/--fixup kan användas."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1031
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
|
|
|
|
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1039
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--reset-author can be used only with -C, -c or --amend."
|
|
|
|
msgstr "--reset-author kan endast användas med -C, -c eller --amend."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1056
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
|
|
|
|
msgstr ""
|
|
|
|
"Endast en av --include/--only/--all/--interactive/--patch kan användas."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1058
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No paths with --include/--only does not make sense."
|
|
|
|
msgstr "Du måste ange sökvägar tillsammans med --include/--only."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1060
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Clever... amending the last one with dirty index."
|
|
|
|
msgstr "Smart... utöka den senaste med smutsigt index."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1062
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Explicit paths specified without -i nor -o; assuming --only paths..."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1072 builtin/tag.c:577
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Invalid cleanup mode %s"
|
|
|
|
msgstr "Felaktigt städningsläge %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1077
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Paths with -a does not make sense."
|
|
|
|
msgstr "Kan inte ange sökvägar med -a."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1260
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "couldn't look up newly created commit"
|
|
|
|
msgstr "kunde inte slå upp en precis skapad incheckning"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1262
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not parse newly created commit"
|
|
|
|
msgstr "kunde inte tolka en precis skapad incheckning"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1303
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "detached HEAD"
|
|
|
|
msgstr "frånkopplad HEAD"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1305
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (root-commit)"
|
|
|
|
msgstr " (rotincheckning)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1449
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "could not parse HEAD commit"
|
|
|
|
msgstr "kunde inte tolka HEAD:s incheckning"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1487 builtin/merge.c:509
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not open '%s' for reading"
|
|
|
|
msgstr "kunde inte öppna \"%s\" för läsning"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1494
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Corrupt MERGE_HEAD file (%s)"
|
|
|
|
msgstr "Trasig MERGE_HEAD-fil (%s)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1501
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not read MERGE_MODE"
|
|
|
|
msgstr "kunde inte läsa MERGE_MODE"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1520
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not read commit message: %s"
|
|
|
|
msgstr "kunde inte läsa incheckningsmeddelande: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1534
|
2012-05-29 16:28:34 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Aborting commit; you did not edit the message.\n"
|
|
|
|
msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1539
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Aborting commit due to empty commit message.\n"
|
|
|
|
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "failed to write commit object"
|
|
|
|
msgstr "kunde inte skriva incheckningsobjekt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1575
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot lock HEAD ref"
|
|
|
|
msgstr "kunde inte låsa HEAD-referens"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1579
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot update HEAD ref"
|
|
|
|
msgstr "kunde inte uppdatera HEAD-referens"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/commit.c:1590
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"Repository has been updated, but unable to write\n"
|
|
|
|
"new_index file. Check that disk is not full or quota is\n"
|
|
|
|
"not exceeded, and then \"git reset HEAD\" to recover."
|
|
|
|
msgstr ""
|
|
|
|
"Arkivet har uppdaterats, men kunde inte skriva filen\n"
|
|
|
|
"new_index. Kontrollera att disken inte är full och\n"
|
|
|
|
"att kvoten inte har överskridits, och kör sedan\n"
|
|
|
|
"\"git reset HEAD\" för att återställa."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:234
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "annotated tag %s not available"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "den annoterade taggen %s inte tillgänglig"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:238
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "annotated tag %s has no embedded name"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "den annoterade taggen %s har inget inbäddat namn"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:240
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' is really '%s' here"
|
|
|
|
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:267
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid object name %s"
|
|
|
|
msgstr "Objektnamnet är inte giltigt: %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:270
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s is not a valid '%s' object"
|
|
|
|
msgstr "%s är inte ett giltigt \"%s\"-objekt"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:287
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "no tag exactly matches '%s'"
|
|
|
|
msgstr "ingen tagg motsvarar \"%s\" exakt"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:289
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "searching to describe %s\n"
|
|
|
|
msgstr "söker för att beskriva %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:329
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "finished search at %s\n"
|
|
|
|
msgstr "avslutade sökning på %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:353
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"No annotated tags can describe '%s'.\n"
|
|
|
|
"However, there were unannotated tags: try --tags."
|
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Inga annoterade taggar kan beskriva \"%s\".\n"
|
|
|
|
"Det finns dock oannoterade taggar: testa --tags."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:357
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"No tags can describe '%s'.\n"
|
|
|
|
"Try --always, or create some tags."
|
|
|
|
msgstr ""
|
|
|
|
"Inga taggar kan beskriva \"%s\".\n"
|
|
|
|
"Testa --always, eller skapa några taggar."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:378
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "traversed %lu commits\n"
|
|
|
|
msgstr "traverserade %lu incheckningar\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:381
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"more than %i tags found; listed %i most recent\n"
|
|
|
|
"gave up search at %s\n"
|
|
|
|
msgstr ""
|
|
|
|
"mer än %i taggar hittades; listar de %i senaste\n"
|
|
|
|
"gav upp sökningen vid %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:436
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--long is incompatible with --abbrev=0"
|
|
|
|
msgstr "--long är inkompatibel med --abbrev=0"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:462
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No names found, cannot describe anything."
|
|
|
|
msgstr "Inga namn hittades, kan inte beskriva något."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/describe.c:482
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--dirty is incompatible with committishes"
|
|
|
|
msgstr "--dirty är inkompatibelt med \"committish\"-värden"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/diff.c:77
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': not a regular file or symlink"
|
|
|
|
msgstr "\"%s\": inte en normal fil eller symbolisk länk"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/diff.c:220
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid option: %s"
|
|
|
|
msgstr "ogiltig flagga: %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/diff.c:297
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Not a git repository"
|
|
|
|
msgstr "Inte ett git-arkiv"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/diff.c:341
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid object '%s' given."
|
|
|
|
msgstr "objektet \"%s\" som angavs är felaktigt."
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/diff.c:346
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "more than %d trees given: '%s'"
|
|
|
|
msgstr "mer än %d träd angavs: \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/diff.c:356
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "more than two blobs given: '%s'"
|
|
|
|
msgstr "mer än två blobbar angavs: \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/diff.c:364
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unhandled object '%s' given."
|
|
|
|
msgstr "ej hanterat objekt \"%s\" angavs."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/fetch.c:200
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Couldn't find remote ref HEAD"
|
|
|
|
msgstr "Kunde inte hitta fjärr-referensen HEAD"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:253
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "object %s not found"
|
|
|
|
msgstr "objektet %s hittades inte"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:259
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[up to date]"
|
|
|
|
msgstr "[àjour]"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:273
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "! %-*s %-*s -> %s (can't fetch in current branch)"
|
|
|
|
msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:274 builtin/fetch.c:360
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[rejected]"
|
|
|
|
msgstr "[refuserad]"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:285
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[tag update]"
|
|
|
|
msgstr "[uppdaterad tagg]"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (unable to update local ref)"
|
|
|
|
msgstr " (kunde inte uppdatera lokal ref)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:305
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[new tag]"
|
|
|
|
msgstr "[ny tagg]"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:308
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[new branch]"
|
|
|
|
msgstr "[ny gren]"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:311
|
|
|
|
msgid "[new ref]"
|
|
|
|
msgstr "[ny ref]"
|
|
|
|
|
|
|
|
#: builtin/fetch.c:356
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to update local ref"
|
|
|
|
msgstr "kunde inte uppdatera lokal ref"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:356
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "forced update"
|
|
|
|
msgstr "tvingad uppdatering"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:362
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "(non-fast-forward)"
|
|
|
|
msgstr "(ej snabbspolad)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:393 builtin/fetch.c:685
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot open %s: %s\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "kan inte öppna %s: %s\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:402
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s did not send all necessary objects\n"
|
|
|
|
msgstr "%s sände inte alla nödvändiga objekt\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:488
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "From %.*s\n"
|
|
|
|
msgstr "Från %.*s\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:499
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"some local refs could not be updated; try running\n"
|
|
|
|
" 'git remote prune %s' to remove any old, conflicting branches"
|
|
|
|
msgstr ""
|
2012-03-15 17:47:06 +08:00
|
|
|
"vissa lokala referenser kunde inte uppdateras; testa att köra\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
" \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:549
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " (%s will become dangling)"
|
|
|
|
msgstr " (%s kommer bli dinglande)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:550
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " (%s has become dangling)"
|
|
|
|
msgstr " (%s har blivit dinglande)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:557
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "[deleted]"
|
|
|
|
msgstr "[borttagen]"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/fetch.c:558 builtin/remote.c:1055
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "(none)"
|
|
|
|
msgstr "(ingen)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:675
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Refusing to fetch into current branch %s of non-bare repository"
|
|
|
|
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:709
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Don't know how to fetch from %s"
|
|
|
|
msgstr "Vet inte hur man hämtar från %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:786
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Option \"%s\" value \"%s\" is not valid for %s"
|
|
|
|
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:789
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Option \"%s\" is ignored for %s\n"
|
|
|
|
msgstr "Flaggan \"%s\" ignoreras för %s\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:888
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Fetching %s\n"
|
|
|
|
msgstr "Hämtar %s\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/fetch.c:890 builtin/remote.c:100
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not fetch %s"
|
|
|
|
msgstr "Kunde inte hämta %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:907
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"No remote repository specified. Please, specify either a URL or a\n"
|
|
|
|
"remote name from which new revisions should be fetched."
|
|
|
|
msgstr ""
|
|
|
|
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
|
|
|
|
"fjärrarkiv som nya incheckningar skall hämtas från."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:927
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You need to specify a tag name."
|
|
|
|
msgstr "Du måste ange namnet på en tagg."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:979
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "fetch --all does not take a repository argument"
|
|
|
|
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:981
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "fetch --all does not make sense with refspecs"
|
|
|
|
msgstr "fetch --all kan inte anges med referensspecifikationer"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:992
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No such remote or remote group: %s"
|
|
|
|
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/fetch.c:1000
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Fetching a group and specifying refspecs does not make sense"
|
|
|
|
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
|
|
|
|
|
|
|
|
#: builtin/gc.c:63
|
|
|
|
#, c-format
|
|
|
|
msgid "Invalid %s: '%s'"
|
|
|
|
msgstr "Felaktigt %s: \"%s\""
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/gc.c:90
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insanely long object directory %.*s"
|
|
|
|
msgstr "tokigt lång objektkatalog %.*s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/gc.c:221
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Auto packing the repository for optimum performance.\n"
|
|
|
|
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/gc.c:224
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Auto packing the repository for optimum performance. You may also\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"run \"git gc\" manually. See \"git help gc\" for more information.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
|
|
|
"Packar arkivet automatiskt för optimal prestanda. Du kan även\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/gc.c:251
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"There are too many unreachable loose objects; run 'git prune' to remove them."
|
|
|
|
msgstr ""
|
|
|
|
"Det finns för många onåbara lösa objekt; kör \"git prune\" för att ta bort "
|
|
|
|
"dem."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/grep.c:216
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "grep: failed to create thread: %s"
|
|
|
|
msgstr "grep: misslyckades skapa tråd. %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/grep.c:402
|
|
|
|
#, c-format
|
|
|
|
msgid "Failed to chdir: %s"
|
|
|
|
msgstr "Kunde inte byta katalog (chdir): %s"
|
|
|
|
|
|
|
|
#: builtin/grep.c:478 builtin/grep.c:512
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to read tree (%s)"
|
|
|
|
msgstr "kunde inte läsa träd (%s)"
|
|
|
|
|
|
|
|
#: builtin/grep.c:526
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to grep from object of type %s"
|
|
|
|
msgstr "Kunde inte \"grep\" från objekt av typen %s"
|
|
|
|
|
|
|
|
#: builtin/grep.c:584
|
|
|
|
#, c-format
|
|
|
|
msgid "switch `%c' expects a numerical value"
|
|
|
|
msgstr "flaggan \"%c\" antar ett numeriskt värde"
|
|
|
|
|
|
|
|
#: builtin/grep.c:601
|
|
|
|
#, c-format
|
|
|
|
msgid "cannot open '%s'"
|
|
|
|
msgstr "kan inte öppna \"%s\""
|
|
|
|
|
|
|
|
#: builtin/grep.c:885
|
|
|
|
msgid "no pattern given."
|
|
|
|
msgstr "inget mönster angavs."
|
|
|
|
|
|
|
|
#: builtin/grep.c:899
|
|
|
|
#, c-format
|
|
|
|
msgid "bad object %s"
|
|
|
|
msgstr "felaktigt objekt %s"
|
|
|
|
|
|
|
|
#: builtin/grep.c:940
|
|
|
|
msgid "--open-files-in-pager only works on the worktree"
|
|
|
|
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
|
|
|
|
|
|
|
|
#: builtin/grep.c:963
|
|
|
|
msgid "--cached or --untracked cannot be used with --no-index."
|
|
|
|
msgstr "--cached och --untracked kan inte användas med --no-index."
|
|
|
|
|
|
|
|
#: builtin/grep.c:968
|
|
|
|
msgid "--no-index or --untracked cannot be used with revs."
|
|
|
|
msgstr "--no-index och --untracked kan inte användas med revisioner."
|
|
|
|
|
|
|
|
#: builtin/grep.c:971
|
|
|
|
msgid "--[no-]exclude-standard cannot be used for tracked contents."
|
|
|
|
msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll."
|
|
|
|
|
|
|
|
#: builtin/grep.c:979
|
|
|
|
msgid "both --cached and trees are given."
|
|
|
|
msgstr "både --cached och träd angavs."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:65
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unrecognized help format '%s'"
|
|
|
|
msgstr "okänt hjälpformat: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:93
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to start emacsclient."
|
|
|
|
msgstr "Misslyckades starta emacsclient."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:106
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to parse emacsclient version."
|
|
|
|
msgstr "Kunde inte tolka emacsclient-version."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:114
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "emacsclient version '%d' too old (< 22)."
|
|
|
|
msgstr "emacsclient version \"%d\" för gammal (< 22)."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to exec '%s': %s"
|
|
|
|
msgstr "exec misslyckades för \"%s\": %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:217
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"'%s': path for unsupported man viewer.\n"
|
|
|
|
"Please consider using 'man.<tool>.cmd' instead."
|
|
|
|
msgstr ""
|
|
|
|
"\"%s\": sökväg för man-visare som ej stöds.\n"
|
|
|
|
"Använd \"man.<verktyg>.cmd\" istället."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:229
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"'%s': cmd for supported man viewer.\n"
|
|
|
|
"Please consider using 'man.<tool>.path' instead."
|
|
|
|
msgstr ""
|
|
|
|
"\"%s\": kommando för man-visare som stöds.\n"
|
|
|
|
"Använd \"man.<verktyg>.path\" istället."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:299
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "The most commonly used git commands are:"
|
|
|
|
msgstr "De mest använda git-kommandona är:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:367
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s': unknown man viewer."
|
|
|
|
msgstr "\"%s\": okänd man-visare."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:384
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "no man viewer handled the request"
|
|
|
|
msgstr "ingen man-visare hanterade förfrågan"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:392
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "no info viewer handled the request"
|
|
|
|
msgstr "ingen info-visare hanterade förfrågan"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:447 builtin/help.c:454
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "usage: %s%s"
|
|
|
|
msgstr "användning: %s%s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/help.c:470
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "`git %s' is aliased to `%s'"
|
|
|
|
msgstr "\"git %s\" är ett alias för \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:170
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "object type mismatch at %s"
|
|
|
|
msgstr "objekttyp stämmer inte överens vid %s"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:190
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "object of unexpected type"
|
|
|
|
msgstr "objekt av oväntad typ"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:227
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot fill %d byte"
|
|
|
|
msgid_plural "cannot fill %d bytes"
|
|
|
|
msgstr[0] "kan inte fylla %d byte"
|
|
|
|
msgstr[1] "kan inte fylla %d byte"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:237
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "early EOF"
|
|
|
|
msgstr "tidigt filslut"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:238
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "read error on input"
|
|
|
|
msgstr "indataläsfel"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:250
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "used more bytes than were available"
|
|
|
|
msgstr "använde fler byte än tillgängligt"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:257
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "pack too large for current definition of off_t"
|
|
|
|
msgstr "paket för stort för nuvarande definition av off_t"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:273
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to create '%s'"
|
|
|
|
msgstr "kunde inte skapa \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:278
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot open packfile '%s'"
|
|
|
|
msgstr "kan inte öppna paketfilen \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:292
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "pack signature mismatch"
|
|
|
|
msgstr "paketsignatur stämmer inte överens"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:312
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "pack has bad object at offset %lu: %s"
|
|
|
|
msgstr "paketet har felaktigt objekt vid index %lu: %s"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:434
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "inflate returned %d"
|
|
|
|
msgstr "inflate returnerade %d"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:483
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "offset value overflow for delta base object"
|
|
|
|
msgstr "indexvärdespill för deltabasobjekt"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:491
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "delta base offset is out of bound"
|
|
|
|
msgstr "deltabasindex utanför gränsen"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/index-pack.c:499
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unknown object type %d"
|
|
|
|
msgstr "okänd objekttyp %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:530
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot pread pack file"
|
|
|
|
msgstr "kan inte utföra \"pread\" på paketfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:532
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:558
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "serious inflate inconsistency"
|
|
|
|
msgstr "allvarlig inflate-inkonsekvens"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:649 builtin/index-pack.c:655 builtin/index-pack.c:678
|
|
|
|
#: builtin/index-pack.c:712 builtin/index-pack.c:721
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "SHA1 COLLISION FOUND WITH %s !"
|
|
|
|
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:652 builtin/pack-objects.c:170
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/pack-objects.c:262
|
|
|
|
#, c-format
|
|
|
|
msgid "unable to read %s"
|
|
|
|
msgstr "kunde inte läsa %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:718
|
2012-07-05 02:34:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read existing object %s"
|
|
|
|
msgstr "kan inte läsa befintligt objekt %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:732
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid blob object %s"
|
|
|
|
msgstr "ogiltigt blob-objekt %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:747
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "invalid %s"
|
|
|
|
msgstr "ogiltigt %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:749
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Error in object"
|
|
|
|
msgstr "Fel i objekt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:751
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Not all child objects of %s are reachable"
|
|
|
|
msgstr "Inte alla barnobjekt för %s kan nås"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:821 builtin/index-pack.c:847
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "failed to apply delta"
|
|
|
|
msgstr "misslyckades tillämpa delta"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:986
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Receiving objects"
|
2012-08-14 16:58:14 +08:00
|
|
|
msgstr "Tar bort objekt"
|
2012-07-02 06:04:09 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:986
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Indexing objects"
|
|
|
|
msgstr "Skapar index för objekt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1012
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "pack is corrupted (SHA1 mismatch)"
|
|
|
|
msgstr "paketet är trasigt (SHA1 stämmer inte)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1017
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot fstat packfile"
|
|
|
|
msgstr "kan inte utföra \"fstat\" på paketfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1020
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "pack has junk at the end"
|
|
|
|
msgstr "paket har skräp i slutet"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1031
|
2012-07-05 02:34:21 +08:00
|
|
|
msgid "confusion beyond insanity in parse_pack_objects()"
|
|
|
|
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1054
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Resolving deltas"
|
|
|
|
msgstr "Analyserar delta"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1105
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "confusion beyond insanity"
|
|
|
|
msgstr "förvirrad bortom vanvett"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1124
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1149
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to deflate appended object (%d)"
|
|
|
|
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1228
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "local object %s is corrupt"
|
|
|
|
msgstr "lokalt objekt %s är trasigt"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1252
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "error while closing pack file"
|
|
|
|
msgstr "fel vid stängning av paketfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1265
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot write keep file '%s'"
|
|
|
|
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1273
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot close written keep file '%s'"
|
|
|
|
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1286
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot store pack file"
|
|
|
|
msgstr "kan inte spara paketfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1297
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "cannot store index file"
|
|
|
|
msgstr "kan inte spara indexfil"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1398
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Cannot open existing pack file '%s'"
|
|
|
|
msgstr "Kan inte öppna befintlig paketfil \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1400
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Cannot open existing pack idx file for '%s'"
|
|
|
|
msgstr "Kan inte öppna befintligt paket-idx-fil för \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1447
|
2012-07-02 06:04:09 +08:00
|
|
|
#, 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"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1454
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
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"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1481
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Cannot come back to cwd"
|
|
|
|
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1525 builtin/index-pack.c:1528
|
|
|
|
#: builtin/index-pack.c:1540 builtin/index-pack.c:1544
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "bad %s"
|
|
|
|
msgstr "felaktig %s"
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1558
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "--fix-thin cannot be used without --stdin"
|
|
|
|
msgstr "--fix-thin kan inte användas med --stdin"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1562 builtin/index-pack.c:1572
|
2012-07-02 06:04:09 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "packfile name '%s' does not end with '.pack'"
|
|
|
|
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/index-pack.c:1581
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "--verify with no packfile name given"
|
|
|
|
msgstr "--verify angavs utan paketfilnamn"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:35
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not make %s writable by group"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kunde inte göra %s skrivbar för gruppen"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:62
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insanely long template name %s"
|
|
|
|
msgstr "tokigt långt namn på mallen %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:67
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot stat '%s'"
|
|
|
|
msgstr "kan inte ta status på \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:73
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot stat template '%s'"
|
|
|
|
msgstr "kan inte ta status på mallen \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:80
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot opendir '%s'"
|
|
|
|
msgstr "kan inte öppna katalogen (opendir) \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:97
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot readlink '%s'"
|
|
|
|
msgstr "kan inte läsa länk (readlink) \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:99
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insanely long symlink %s"
|
|
|
|
msgstr "tokigt lång symbolisk länk %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:102
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot symlink '%s' '%s'"
|
|
|
|
msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:106
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot copy '%s' to '%s'"
|
|
|
|
msgstr "kan inte kopiera \"%s\" till \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:110
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "ignoring template %s"
|
|
|
|
msgstr "ignorerar mallen %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:133
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insanely long template path %s"
|
|
|
|
msgstr "tokigt lång mallsökväg %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:141
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "templates not found %s"
|
|
|
|
msgstr "mallarna hittades inte %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:154
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "not copying templates of a wrong format version %d from '%s'"
|
|
|
|
msgstr "kopierade inte mallar från felaktig formatversion %d från \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/init-db.c:192
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insane git directory %s"
|
|
|
|
msgstr "tokig git-katalog %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:323 builtin/init-db.c:326
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s already exists"
|
|
|
|
msgstr "%s finns redan"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:355
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to handle file type %d"
|
|
|
|
msgstr "kan inte hantera filtyp %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:358
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to move %s to %s"
|
|
|
|
msgstr "kan inte flytta %s till %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:363
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not create git link %s"
|
|
|
|
msgstr "Kunde inte skapa gitlänk %s"
|
|
|
|
|
|
|
|
#.
|
|
|
|
#. * TRANSLATORS: The first '%s' is either "Reinitialized
|
|
|
|
#. * existing" or "Initialized empty", the second " shared" or
|
|
|
|
#. * "", and the last '%s%s' is the verbatim directory name.
|
|
|
|
#.
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:420
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s%s Git repository in %s%s\n"
|
|
|
|
msgstr "%s%s Git-arkiv i %s%s\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:421
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Reinitialized existing"
|
|
|
|
msgstr "Ominitierade befintligt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:421
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Initialized empty"
|
|
|
|
msgstr "Initierade tomt"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:422
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " shared"
|
|
|
|
msgstr " delat"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:441
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot tell cwd"
|
|
|
|
msgstr "kan inte läsa aktuell katalog (cwd)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:522 builtin/init-db.c:529
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot mkdir %s"
|
|
|
|
msgstr "kan inte skapa katalogen (mkdir) %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:533
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot chdir to %s"
|
|
|
|
msgstr "kan inte byta katalog (chdir) till %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:555
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
|
|
|
|
"dir=<directory>)"
|
|
|
|
msgstr ""
|
|
|
|
"%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
|
|
|
|
"dir=<katalog>)"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:579
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot access current working directory"
|
|
|
|
msgstr "Kan inte komma åt aktuell arbetskatalog"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/init-db.c:586
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot access work tree '%s'"
|
|
|
|
msgstr "Kan inte komma åt arbetskatalogen \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/log.c:189
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Final output: %d %s\n"
|
|
|
|
msgstr "Slututdata: %d %s\n"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:403 builtin/log.c:494
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not read object %s"
|
|
|
|
msgstr "Kunde inte läsa objektet %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:518
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown type: %d"
|
|
|
|
msgstr "Okänd typ: %d"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:608
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "format.headers without value"
|
|
|
|
msgstr "format.headers utan värde"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:682
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "name of output directory is too long"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "namnet på utdatakatalogen är för långt"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:693
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot open patch file %s"
|
|
|
|
msgstr "Kan inte öppna patchfilen %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:707
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Need exactly one range."
|
|
|
|
msgstr "Behöver precis ett intervall."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:715
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Not a range."
|
|
|
|
msgstr "Inte ett intervall."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:792
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cover letter needs email format"
|
|
|
|
msgstr "Omslagsbrevet behöver e-postformat"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:865
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "insane in-reply-to: %s"
|
|
|
|
msgstr "tokigt in-reply-to: %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:938
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Two output directories?"
|
|
|
|
msgstr "Två utdatakataloger?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1160
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "bogus committer info %s"
|
|
|
|
msgstr "felaktig incheckarinformation %s"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1205
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "-n and -k are mutually exclusive."
|
|
|
|
msgstr "-n och -k kan inte användas samtidigt."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1207
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--subject-prefix and -k are mutually exclusive."
|
|
|
|
msgstr "--subject-prefix och -k kan inte användas samtidigt."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1215
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--name-only does not make sense"
|
|
|
|
msgstr "kan inte använda --name-only"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1217
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--name-status does not make sense"
|
|
|
|
msgstr "kan inte använda --name-status"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1219
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--check does not make sense"
|
|
|
|
msgstr "kan inte använda --check"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1242
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "standard output, or directory, which one?"
|
|
|
|
msgstr "standard ut, eller katalog, vilken skall det vara?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1244
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not create directory '%s'"
|
|
|
|
msgstr "Kunde inte skapa katalogen \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1397
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Failed to create output files"
|
|
|
|
msgstr "Misslyckades skapa utdatafiler"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1501
|
2010-09-13 04:10:21 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown commit %s"
|
|
|
|
msgstr "Okänd incheckning %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:90
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "switch `m' requires a value"
|
|
|
|
msgstr "flaggan \"m\" behöver ett värde"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:127
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not find merge strategy '%s'.\n"
|
|
|
|
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:128
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Available strategies are:"
|
|
|
|
msgstr "Tillgängliga strategier är:"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:133
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Available custom strategies are:"
|
|
|
|
msgstr "Tillgängliga skräddarsydda strategier är:"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:240
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "could not run stash."
|
|
|
|
msgstr "kunde köra stash."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:245
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "stash failed"
|
|
|
|
msgstr "stash misslyckades"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:250
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "not a valid object: %s"
|
|
|
|
msgstr "inte ett giltigt objekt: %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:269 builtin/merge.c:286
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "read-tree failed"
|
|
|
|
msgstr "read-tree misslyckades"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:316
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid " (nothing to squash)"
|
|
|
|
msgstr " (inget att platta till)"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:329
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Squash commit -- not updating HEAD\n"
|
|
|
|
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:361
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Writing SQUASH_MSG"
|
|
|
|
msgstr "Skriver SQUASH_MSG"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:363
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Finishing SQUASH_MSG"
|
|
|
|
msgstr "Avslutar SQUASH_MSG"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/merge.c:386
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No merge message -- not updating HEAD\n"
|
|
|
|
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/merge.c:437
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' does not point to a commit"
|
|
|
|
msgstr "\"%s\" verkar inte peka på en incheckning"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/merge.c:536
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Bad branch.%s.mergeoptions string: %s"
|
|
|
|
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/merge.c:629
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git write-tree failed to write a tree"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "git write-tree misslyckades skriva ett träd"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/merge.c:679
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "failed to read the cache"
|
|
|
|
msgstr "misslyckads läsa cachen"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:710
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Not handling anything other than two heads merge."
|
|
|
|
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:724
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown option for merge-recursive: -X%s"
|
|
|
|
msgstr "Felaktig flagga för merge-recursive: -X%s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:738
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to write %s"
|
|
|
|
msgstr "kunde inte skriva %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:877
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Could not read from '%s'"
|
|
|
|
msgstr "Kunde inte läsa från \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:886
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Checkar inte in sammanslagningen; använd \"git commit\" för att slutföra "
|
|
|
|
"den.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:892
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"Please enter a commit message to explain why this merge is necessary,\n"
|
|
|
|
"especially if it merges an updated upstream into a topic branch.\n"
|
|
|
|
"\n"
|
|
|
|
"Lines starting with '#' will be ignored, and an empty message aborts\n"
|
|
|
|
"the commit.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n"
|
|
|
|
"är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n"
|
|
|
|
"temagren.\n"
|
|
|
|
"\n"
|
|
|
|
"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n"
|
|
|
|
"avbryter incheckningen.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:916
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Empty commit message."
|
|
|
|
msgstr "Tomt incheckningsmeddelande."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:928
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Wonderful.\n"
|
|
|
|
msgstr "Underbart.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:993
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Kunde inte slå ihop automatiskt; fixa konflikter och checka in resultatet.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1009
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a commit"
|
|
|
|
msgstr "\"%s\" är inte en incheckning"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1050
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No current branch."
|
|
|
|
msgstr "Inte på någon gren."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1052
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No remote for the current branch."
|
|
|
|
msgstr "Ingen fjärr för aktuell gren."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1054
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No default upstream defined for the current branch."
|
|
|
|
msgstr "Ingen standarduppström angiven för aktuell gren."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1059
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No remote tracking branch for %s from %s"
|
|
|
|
msgstr "Ingen fjärrspårande gren för %s från %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1146 builtin/merge.c:1303
|
|
|
|
#, c-format
|
|
|
|
msgid "%s - not something we can merge"
|
|
|
|
msgstr "%s - inte något vi kan slå ihop"
|
|
|
|
|
|
|
|
#: builtin/merge.c:1214
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "There is no merge to abort (MERGE_HEAD missing)."
|
|
|
|
msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1230 git-pull.sh:31
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"You have not concluded your merge (MERGE_HEAD exists).\n"
|
|
|
|
"Please, commit your changes before you can merge."
|
|
|
|
msgstr ""
|
|
|
|
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
|
|
|
|
"Checka in dina ändringar innan du kan slå ihop."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1233 git-pull.sh:34
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You have not concluded your merge (MERGE_HEAD exists)."
|
|
|
|
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1237
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
|
|
|
|
"Please, commit your changes before you can merge."
|
|
|
|
msgstr ""
|
|
|
|
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
|
|
|
|
"Checka in dina ändringar innan du kan slå ihop."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1240
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
|
|
|
|
msgstr "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns)."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1249
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You cannot combine --squash with --no-ff."
|
|
|
|
msgstr "Du kan inte kombinera --squash med --no-ff."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1254
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You cannot combine --no-ff with --ff-only."
|
|
|
|
msgstr "Du kan inte kombinera --no-ff med --ff-only."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1261
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "No commit specified and merge.defaultToUpstream not set."
|
|
|
|
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1293
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Can merge only exactly one commit into empty head"
|
|
|
|
msgstr "Kan endast slå ihop en enda incheckning i ett tomt huvud."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1296
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Squash commit into empty head not supported yet"
|
|
|
|
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1298
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Non-fast-forward commit does not make sense into an empty head"
|
|
|
|
msgstr "Icke-snabbspolad incheckning kan inte användas med ett tomt huvud"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1413
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Updating %s..%s\n"
|
|
|
|
msgstr "Uppdaterar %s..%s\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1451
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Trying really trivial in-index merge...\n"
|
|
|
|
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1458
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Nope.\n"
|
|
|
|
msgstr "Nej.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1490
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Not possible to fast-forward, aborting."
|
|
|
|
msgstr "Kan inte snabbspola, avbryter."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1513 builtin/merge.c:1592
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Rewinding the tree to pristine...\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Återspolar trädet till orört...\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1517
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Trying merge strategy %s...\n"
|
|
|
|
msgstr "Försöker sammanslagninsstrategin %s...\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1583
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No merge strategy handled the merge.\n"
|
|
|
|
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1585
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Merge with strategy %s failed.\n"
|
|
|
|
msgstr "Sammanslaning med strategin %s misslyckades.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1594
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Using the %s to prepare resolving by hand.\n"
|
|
|
|
msgstr "Använder %s för att förbereda lösning för hand.\n"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/merge.c:1606
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Automatic merge went well; stopped before committing as requested\n"
|
|
|
|
msgstr ""
|
|
|
|
"Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:108
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Checking rename of '%s' to '%s'\n"
|
|
|
|
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:112
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "bad source"
|
|
|
|
msgstr "felaktig källa"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:115
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "can not move directory into itself"
|
|
|
|
msgstr "kan inte flytta katalog till sig själv"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:118
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot move directory over file"
|
|
|
|
msgstr "kan inte flytta katalog över fil"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:128
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Huh? %.*s is in index?"
|
|
|
|
msgstr "Vad? %.*s är i indexet?"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:140
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "source directory is empty"
|
|
|
|
msgstr "källkatalogen är tom"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:171
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "not under version control"
|
|
|
|
msgstr "inte versionshanterad"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:173
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "destination exists"
|
|
|
|
msgstr "destinationen finns"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:181
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "overwriting '%s'"
|
|
|
|
msgstr "skriver över \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:184
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot overwrite"
|
|
|
|
msgstr "Kan inte skriva över"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:187
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "multiple sources for the same target"
|
|
|
|
msgstr "flera källor för samma mål"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:202
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s, source=%s, destination=%s"
|
|
|
|
msgstr "%s, källa=%s, mål=%s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/mv.c:212
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Renaming %s to %s\n"
|
|
|
|
msgstr "Byter namn på %s till %s\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/mv.c:215 builtin/remote.c:731
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "renaming '%s' failed"
|
|
|
|
msgstr "misslyckades byta namn på \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:139
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to start 'show' for object '%s'"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "kunde inte starta \"show\" för objektet \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:145
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "can't fdopen 'show' output fd"
|
|
|
|
msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:155
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to close pipe to 'show' for object '%s'"
|
|
|
|
msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:158
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "failed to finish 'show' for object '%s'"
|
|
|
|
msgstr "kunde inte avsluta \"show\" för objektet \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/notes.c:175 builtin/tag.c:347
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not create file '%s'"
|
|
|
|
msgstr "kunde inte skapa filen \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:189
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Please supply the note contents using either -m or -F option"
|
|
|
|
msgstr "Ange innehåll för anteckningen med antingen -m eller -F"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:210 builtin/notes.c:973
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Removing note for object %s\n"
|
|
|
|
msgstr "Tar bort anteckning för objektet %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:215
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to write note object"
|
|
|
|
msgstr "kunde inte skriva anteckningsobjekt"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:217
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "The note contents has been left in %s"
|
|
|
|
msgstr "Anteckningens innehåll har lämnats kvar i %s"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/notes.c:251 builtin/tag.c:542
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "cannot read '%s'"
|
|
|
|
msgstr "kunde inte läsa \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/notes.c:253 builtin/tag.c:545
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not open or read '%s'"
|
|
|
|
msgstr "kunde inte öppna eller läsa \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447
|
|
|
|
#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644
|
|
|
|
#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to resolve '%s' as a valid ref."
|
|
|
|
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:275
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to read object '%s'."
|
|
|
|
msgstr "Kunde inte läsa objektet \"%s\"."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:299
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot commit uninitialized/unreferenced notes tree"
|
|
|
|
msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:340
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Bad notes.rewriteMode value: '%s'"
|
|
|
|
msgstr "Felaktigt värde för notes.rewriteMode: '%s'"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:350
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
|
|
|
|
msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)"
|
|
|
|
|
|
|
|
#. TRANSLATORS: The first %s is the name of the
|
|
|
|
#. environment variable, the second %s is its value
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:377
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Bad %s value: '%s'"
|
|
|
|
msgstr "Felaktigt värde på %s: \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:441
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Malformed input line: '%s'."
|
|
|
|
msgstr "Felaktig indatarad: \"%s\"."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:456
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to copy notes from '%s' to '%s'"
|
|
|
|
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627
|
|
|
|
#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759
|
|
|
|
#: builtin/notes.c:1033
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "too many parameters"
|
|
|
|
msgstr "för många parametrar"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:513 builtin/notes.c:772
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "No note found for object %s."
|
|
|
|
msgstr "Inga anteckningar hittades för objektet %s."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:580
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
"existing notes"
|
|
|
|
msgstr ""
|
|
|
|
"Kan inte lägga till anteckningar. Hittade befintliga anteckningar för "
|
|
|
|
"objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:585 builtin/notes.c:662
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Overwriting existing notes for object %s\n"
|
|
|
|
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:635
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "too few parameters"
|
|
|
|
msgstr "för få parametrar"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:656
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
|
|
|
|
"existing notes"
|
|
|
|
msgstr ""
|
|
|
|
"Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet "
|
|
|
|
"%s. Använd \"-f\" för att skriva över befintliga anteckningar"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:668
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Missing notes on source object %s. Cannot copy."
|
|
|
|
msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:717
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
|
|
|
|
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
|
|
|
|
msgstr ""
|
|
|
|
"Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n"
|
|
|
|
"Använd \"git notes add -f -m/-F/-c/-C\" istället.\n"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/notes.c:971
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Object %s has no note\n"
|
|
|
|
msgstr "Objektet %s har ingen anteckning\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/notes.c:1103 builtin/remote.c:1598
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Unknown subcommand: %s"
|
|
|
|
msgstr "Okänt underkommando: %s"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/pack-objects.c:183 builtin/pack-objects.c:186
|
|
|
|
#, c-format
|
|
|
|
msgid "deflate error (%d)"
|
|
|
|
msgstr "fel i deflate (%d)"
|
|
|
|
|
|
|
|
#: builtin/pack-objects.c:2398
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unsupported index version %s"
|
|
|
|
msgstr "indexversionen %s stöds ej"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/pack-objects.c:2402
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "bad index version '%s'"
|
|
|
|
msgstr "felaktig indexversion \"%s\""
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/pack-objects.c:2425
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "option %s does not accept negative form"
|
|
|
|
msgstr "flaggan %s godtar inte negativ form"
|
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: builtin/pack-objects.c:2429
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "unable to parse value '%s' for option %s"
|
|
|
|
msgstr "kunde inte tolka värdet \"%s\" för flaggan %s"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/push.c:45
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "tag shorthand without <tag>"
|
|
|
|
msgstr "taggförkortning utan <tagg>"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/push.c:64
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--delete only accepts plain target ref names"
|
|
|
|
msgstr "--delete godtar endast enkla målreferensnamn"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/push.c:99
|
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"To choose either option permanently, see push.default in 'git help config'."
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"För att välja ett av alternativen permanent, se push.default i \"git help "
|
|
|
|
"config\"."
|
|
|
|
|
|
|
|
#: builtin/push.c:102
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The upstream branch of your current branch does not match\n"
|
|
|
|
"the name of your current branch. To push to the upstream branch\n"
|
|
|
|
"on the remote, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
"\n"
|
|
|
|
"To push to the branch of the same name on the remote, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s %s\n"
|
|
|
|
"%s"
|
|
|
|
msgstr ""
|
|
|
|
"Uppströmsgrenen för din nuvarande gren stämmer inte överens\n"
|
|
|
|
"med namnet på din aktuella gren. För att sända till uppströmsgrenen\n"
|
|
|
|
"i fjärrarkivet använder du\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:%s\n"
|
|
|
|
"\n"
|
|
|
|
"För att sända till grenen med samma namn i fjärrarkivet använder du\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s %s\n"
|
|
|
|
"%s"
|
|
|
|
|
|
|
|
#: builtin/push.c:121
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"You are not currently on a branch.\n"
|
|
|
|
"To push the history leading to the current (detached HEAD)\n"
|
|
|
|
"state now, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:<name-of-remote-branch>\n"
|
|
|
|
msgstr ""
|
|
|
|
"Du är inte på någon gren för närvarande.\n"
|
|
|
|
"För att sända in historiken som leder till den aktuella (frånkopplat\n"
|
|
|
|
"HEAD) situationen använder du\n"
|
|
|
|
"\n"
|
|
|
|
" git push %s HEAD:<namn-på-fjärrgren>\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/push.c:128
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"The current branch %s has no upstream branch.\n"
|
|
|
|
"To push the current branch and set the remote as upstream, use\n"
|
|
|
|
"\n"
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
msgstr ""
|
|
|
|
"Den aktuella grenen %s har ingen uppströmsgren.\n"
|
|
|
|
"För att sända aktuell gren och ange fjärrarkiv som uppström använder du\n"
|
|
|
|
"\n"
|
|
|
|
" git push --set-upstream %s %s\n"
|
|
|
|
|
|
|
|
#: builtin/push.c:136
|
|
|
|
#, c-format
|
|
|
|
msgid "The current branch %s has multiple upstream branches, refusing to push."
|
|
|
|
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
|
|
|
|
|
|
|
|
#: builtin/push.c:139
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"You are pushing to remote '%s', which is not the upstream of\n"
|
|
|
|
"your current branch '%s', without telling me what to push\n"
|
|
|
|
"to update which remote branch."
|
|
|
|
msgstr ""
|
|
|
|
"Du sänder till fjärren \"%s\", som inte är uppströms för den\n"
|
|
|
|
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
|
|
|
|
"skall sändas för att uppdatera fjärrgrenen."
|
|
|
|
|
|
|
|
#: builtin/push.c:174
|
|
|
|
msgid ""
|
|
|
|
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
|
|
|
|
msgstr ""
|
|
|
|
"Du angav inga referensspecifikationer att sända, och push.default är "
|
|
|
|
"\"nothing\"."
|
|
|
|
|
|
|
|
#: builtin/push.c:181
|
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because the tip of your current branch is behind\n"
|
|
|
|
"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n"
|
|
|
|
"before pushing again.\n"
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
msgstr ""
|
|
|
|
"Uppdateringar avvisades då änden på din befintliga gren är bakom\n"
|
|
|
|
"dess fjärrmotsvarighet. Slå ihop fjärrändringarna (t.ex. \"git pull\")\n"
|
|
|
|
"innan du sänder igen.\n"
|
|
|
|
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
|
|
|
|
|
|
|
#: builtin/push.c:187
|
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
"counterpart. If you did not intend to push that branch, you may want to\n"
|
|
|
|
"specify branches to push or set the 'push.default' configuration\n"
|
|
|
|
"variable to 'current' or 'upstream' to push only the current branch."
|
|
|
|
msgstr ""
|
|
|
|
"Uppdateringar avvisades då änden på en insänd gren är bakom dess\n"
|
|
|
|
"fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n"
|
|
|
|
"du specificera grenar att sända, eller ändra inställningsvariabeln\n"
|
|
|
|
"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n"
|
|
|
|
"aktuell gren."
|
|
|
|
|
|
|
|
#: builtin/push.c:193
|
|
|
|
msgid ""
|
|
|
|
"Updates were rejected because a pushed branch tip is behind its remote\n"
|
|
|
|
"counterpart. Check out this branch and merge the remote changes\n"
|
|
|
|
"(e.g. 'git pull') before pushing again.\n"
|
|
|
|
"See the 'Note about fast-forwards' in 'git push --help' for details."
|
|
|
|
msgstr ""
|
|
|
|
"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n"
|
|
|
|
"fjärrmotsvarighet. Checka ut grenen och slå ihop fjärrändringarna (t.ex.\n"
|
|
|
|
"\"git pull\") innan du sänder igen.\n"
|
|
|
|
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
|
|
|
|
|
|
|
|
#: builtin/push.c:233
|
|
|
|
#, c-format
|
|
|
|
msgid "Pushing to %s\n"
|
|
|
|
msgstr "Sänder till %s\n"
|
|
|
|
|
|
|
|
#: builtin/push.c:237
|
|
|
|
#, c-format
|
|
|
|
msgid "failed to push some refs to '%s'"
|
|
|
|
msgstr "misslyckades sända vissa referenser till \"%s\""
|
|
|
|
|
|
|
|
#: builtin/push.c:269
|
|
|
|
#, c-format
|
|
|
|
msgid "bad repository '%s'"
|
|
|
|
msgstr "felaktigt arkiv \"%s\""
|
|
|
|
|
|
|
|
#: builtin/push.c:270
|
|
|
|
msgid ""
|
|
|
|
"No configured push destination.\n"
|
|
|
|
"Either specify the URL from the command-line or configure a remote "
|
|
|
|
"repository using\n"
|
|
|
|
"\n"
|
|
|
|
" git remote add <name> <url>\n"
|
|
|
|
"\n"
|
|
|
|
"and then push using the remote name\n"
|
|
|
|
"\n"
|
|
|
|
" git push <name>\n"
|
|
|
|
msgstr ""
|
|
|
|
"Ingen destination har angivits.\n"
|
|
|
|
"Ange antingen URL:en på kommandoraden eller ställ in ett uppströmsarkiv med\n"
|
|
|
|
"\n"
|
|
|
|
" git remote add <namn> <url>\n"
|
|
|
|
"\n"
|
|
|
|
"och sänd sedan med hjälp av fjärrnamnet\n"
|
|
|
|
"\n"
|
|
|
|
" git push <namn>\n"
|
|
|
|
|
|
|
|
#: builtin/push.c:285
|
|
|
|
msgid "--all and --tags are incompatible"
|
|
|
|
msgstr "--all och --tags är inkompatibla"
|
|
|
|
|
|
|
|
#: builtin/push.c:286
|
|
|
|
msgid "--all can't be combined with refspecs"
|
|
|
|
msgstr "--all kan inte kombineras med referensspecifikationer"
|
|
|
|
|
|
|
|
#: builtin/push.c:291
|
|
|
|
msgid "--mirror and --tags are incompatible"
|
|
|
|
msgstr "--mirror och --tags är inkompatibla"
|
|
|
|
|
|
|
|
#: builtin/push.c:292
|
|
|
|
msgid "--mirror can't be combined with refspecs"
|
|
|
|
msgstr "--mirror kan inte kombineras med referensspecifikationer"
|
|
|
|
|
|
|
|
#: builtin/push.c:297
|
|
|
|
msgid "--all and --mirror are incompatible"
|
|
|
|
msgstr "--all och --mirror är inkompatibla"
|
|
|
|
|
|
|
|
#: builtin/push.c:385
|
|
|
|
msgid "--delete is incompatible with --all, --mirror and --tags"
|
|
|
|
msgstr "--delete är imkompatibel med --all, --mirror och --tags"
|
|
|
|
|
|
|
|
#: builtin/push.c:387
|
|
|
|
msgid "--delete doesn't make sense without any refs"
|
|
|
|
msgstr "--delete kan inte användas utan referenser"
|
|
|
|
|
|
|
|
#: builtin/remote.c:98
|
|
|
|
#, c-format
|
|
|
|
msgid "Updating %s"
|
|
|
|
msgstr "Uppdaterar %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:130
|
|
|
|
msgid ""
|
|
|
|
"--mirror is dangerous and deprecated; please\n"
|
|
|
|
"\t use --mirror=fetch or --mirror=push instead"
|
|
|
|
msgstr ""
|
|
|
|
"--mirror är farlig och föråldrad; använd\n"
|
|
|
|
"\t --mirror=fetch eller --mirror=push istället"
|
|
|
|
|
|
|
|
#: builtin/remote.c:147
|
|
|
|
#, c-format
|
|
|
|
msgid "unknown mirror argument: %s"
|
|
|
|
msgstr "okänt argument till mirror: %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:185
|
|
|
|
msgid "specifying a master branch makes no sense with --mirror"
|
|
|
|
msgstr "att ange en master-gren ger ingen mening med --mirror"
|
|
|
|
|
|
|
|
#: builtin/remote.c:187
|
|
|
|
msgid "specifying branches to track makes sense only with fetch mirrors"
|
|
|
|
msgstr "att ange grenar att spåra ger mening bara med hämtningsspeglar"
|
|
|
|
|
|
|
|
#: builtin/remote.c:195 builtin/remote.c:646
|
|
|
|
#, c-format
|
|
|
|
msgid "remote %s already exists."
|
|
|
|
msgstr "fjärrarkivet %s finns redan."
|
|
|
|
|
|
|
|
#: builtin/remote.c:199 builtin/remote.c:650
|
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid remote name"
|
|
|
|
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
|
|
|
|
|
|
|
|
#: builtin/remote.c:243
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not setup master '%s'"
|
|
|
|
msgstr "Kunde inte skapa master \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:299
|
|
|
|
#, c-format
|
|
|
|
msgid "more than one %s"
|
|
|
|
msgstr "mer än en %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:339
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not get fetch map for refspec %s"
|
|
|
|
msgstr "Kunde inte hämta mappning för referensspecifikation %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:440 builtin/remote.c:448
|
|
|
|
msgid "(matching)"
|
|
|
|
msgstr "(matchande)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:452
|
|
|
|
msgid "(delete)"
|
|
|
|
msgstr "(ta bort)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not append '%s' to '%s'"
|
|
|
|
msgstr "Kunde inte tillämpa \"%s\" på \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890
|
|
|
|
#, c-format
|
|
|
|
msgid "No such remote: %s"
|
|
|
|
msgstr "Inget sådant fjärrarkiv: %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:656
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not rename config section '%s' to '%s'"
|
|
|
|
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:662 builtin/remote.c:799
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not remove config section '%s'"
|
|
|
|
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:677
|
|
|
|
#, c-format
|
|
|
|
msgid ""
|
|
|
|
"Not updating non-default fetch refspec\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"\tPlease update the configuration manually if necessary."
|
|
|
|
msgstr ""
|
|
|
|
"Uppdaterar inte icke-standard hämtningsreferensspecifikation\n"
|
|
|
|
"\t%s\n"
|
|
|
|
"\tUppdatera konfigurationen manuellt om nödvändigt."
|
|
|
|
|
|
|
|
#: builtin/remote.c:683
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not append '%s'"
|
|
|
|
msgstr "Kunde inte lägga till på \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:694
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not set '%s'"
|
|
|
|
msgstr "Kunde inte sätta \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:716
|
|
|
|
#, c-format
|
|
|
|
msgid "deleting '%s' failed"
|
|
|
|
msgstr "misslyckades ta bort \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:750
|
|
|
|
#, c-format
|
|
|
|
msgid "creating '%s' failed"
|
|
|
|
msgstr "misslyckades skapa \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:764
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not remove branch %s"
|
|
|
|
msgstr "Kunde inte ta bort grenen %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:834
|
|
|
|
msgid ""
|
|
|
|
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
|
|
|
|
"to delete it, use:"
|
|
|
|
msgid_plural ""
|
|
|
|
"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
|
|
|
|
"to delete them, use:"
|
|
|
|
msgstr[0] ""
|
|
|
|
"Observera: En gren utanför hierarkin refs/remotes/ togs inte bort;\n"
|
|
|
|
"för att ta bort den, använd:"
|
|
|
|
msgstr[1] ""
|
|
|
|
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
|
|
|
|
"för att ta bort dem, använd:"
|
|
|
|
|
|
|
|
#: builtin/remote.c:943
|
|
|
|
#, c-format
|
|
|
|
msgid " new (next fetch will store in remotes/%s)"
|
|
|
|
msgstr " ny (nästa hämtning sparar i remotes/%s)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:946
|
|
|
|
msgid " tracked"
|
|
|
|
msgstr " spårad"
|
|
|
|
|
|
|
|
#: builtin/remote.c:948
|
|
|
|
msgid " stale (use 'git remote prune' to remove)"
|
|
|
|
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:950
|
|
|
|
msgid " ???"
|
|
|
|
msgstr " ???"
|
|
|
|
|
|
|
|
#: builtin/remote.c:991
|
|
|
|
#, c-format
|
|
|
|
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
|
|
|
|
msgstr "ogiltig branch.%s.merge; kan inte ombasera över > 1 gren"
|
|
|
|
|
|
|
|
#: builtin/remote.c:998
|
|
|
|
#, c-format
|
|
|
|
msgid "rebases onto remote %s"
|
|
|
|
msgstr "ombaseras på fjärren %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1001
|
|
|
|
#, c-format
|
|
|
|
msgid " merges with remote %s"
|
|
|
|
msgstr " sammanslås med fjärren %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1002
|
|
|
|
msgid " and with remote"
|
|
|
|
msgstr " och med fjärren"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1004
|
|
|
|
#, c-format
|
|
|
|
msgid "merges with remote %s"
|
|
|
|
msgstr "sammanslås med fjärren %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1005
|
|
|
|
msgid " and with remote"
|
|
|
|
msgstr " och med fjärren"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1051
|
|
|
|
msgid "create"
|
|
|
|
msgstr "skapa"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1054
|
|
|
|
msgid "delete"
|
|
|
|
msgstr "ta bort"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1058
|
|
|
|
msgid "up to date"
|
|
|
|
msgstr "àjour"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1061
|
|
|
|
msgid "fast-forwardable"
|
|
|
|
msgstr "kan snabbspolas"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1064
|
|
|
|
msgid "local out of date"
|
|
|
|
msgstr "lokal föråldrad"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1071
|
|
|
|
#, c-format
|
|
|
|
msgid " %-*s forces to %-*s (%s)"
|
|
|
|
msgstr " %-*s tvingar till %-*s (%s)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1074
|
|
|
|
#, c-format
|
|
|
|
msgid " %-*s pushes to %-*s (%s)"
|
|
|
|
msgstr " %-*s sänder till %-*s (%s)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1078
|
|
|
|
#, c-format
|
|
|
|
msgid " %-*s forces to %s"
|
|
|
|
msgstr " %-*s tvingar till %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1081
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " %-*s pushes to %s"
|
|
|
|
msgstr " %-*s sänder till %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1118
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "* remote %s"
|
|
|
|
msgstr "* fjärr %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1119
|
2012-05-29 16:28:34 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " Fetch URL: %s"
|
|
|
|
msgstr " Hämt-URL: %s"
|
2012-05-29 16:28:34 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1120 builtin/remote.c:1285
|
|
|
|
msgid "(no URL)"
|
|
|
|
msgstr "(ingen URL)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1129 builtin/remote.c:1131
|
|
|
|
#, c-format
|
|
|
|
msgid " Push URL: %s"
|
|
|
|
msgstr " Sänd-URL: %s"
|
2012-05-29 16:28:34 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137
|
|
|
|
#, c-format
|
|
|
|
msgid " HEAD branch: %s"
|
|
|
|
msgstr " HEAD-gren: %s"
|
2012-05-29 16:28:34 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1139
|
|
|
|
#, c-format
|
2012-05-29 16:28:34 +08:00
|
|
|
msgid ""
|
2012-07-02 06:04:09 +08:00
|
|
|
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
|
|
|
|
msgstr " HEAD-gren (HEAD på fjärr är tvetydig, kan vara en av följande):\n"
|
2012-05-29 16:28:34 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1151
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " Remote branch:%s"
|
|
|
|
msgid_plural " Remote branches:%s"
|
|
|
|
msgstr[0] " Fjärrgren:%s"
|
|
|
|
msgstr[1] " Fjärrgrenar:%s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1154 builtin/remote.c:1181
|
|
|
|
msgid " (status not queried)"
|
|
|
|
msgstr " (status inte förfrågad)"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1163
|
|
|
|
msgid " Local branch configured for 'git pull':"
|
|
|
|
msgid_plural " Local branches configured for 'git pull':"
|
|
|
|
msgstr[0] " Lokal gren konfigurerad för \"git pull\":"
|
|
|
|
msgstr[1] " Lokala grenar konfigurerade för \"git pull\":"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1171
|
|
|
|
msgid " Local refs will be mirrored by 'git push'"
|
|
|
|
msgstr " Lokala referenser speglas av \"git push\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:1178
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid " Local ref configured for 'git push'%s:"
|
|
|
|
msgid_plural " Local refs configured for 'git push'%s:"
|
|
|
|
msgstr[0] " Lokal referens konfigurerad för \"git push\"%s:"
|
|
|
|
msgstr[1] " Lokala referenser konfigurerade för \"git push\"%s:"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1216
|
|
|
|
msgid "Cannot determine remote HEAD"
|
|
|
|
msgstr "Kan inte bestämma HEAD på fjärren"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1218
|
|
|
|
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
|
|
|
|
msgstr "Flera HEAD-grenar på fjärren. Välj en explicit med:"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1228
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Could not delete %s"
|
|
|
|
msgstr "Kunde inte ta bort %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1236
|
|
|
|
#, c-format
|
|
|
|
msgid "Not a valid ref: %s"
|
|
|
|
msgstr "Inte en giltig referens: %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1238
|
|
|
|
#, c-format
|
|
|
|
msgid "Could not setup %s"
|
|
|
|
msgstr "Kunde inte ställa in %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1274
|
|
|
|
#, c-format
|
|
|
|
msgid " %s will become dangling!"
|
|
|
|
msgstr " %s kommer bli dinglande!"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1275
|
|
|
|
#, c-format
|
|
|
|
msgid " %s has become dangling!"
|
|
|
|
msgstr " %s har blivit dinglande!"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1281
|
|
|
|
#, c-format
|
|
|
|
msgid "Pruning %s"
|
|
|
|
msgstr "Rensar %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1282
|
|
|
|
#, c-format
|
|
|
|
msgid "URL: %s"
|
|
|
|
msgstr "URL: %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1295
|
|
|
|
#, c-format
|
|
|
|
msgid " * [would prune] %s"
|
|
|
|
msgstr " * [skulle rensa] %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/remote.c:1298
|
|
|
|
#, c-format
|
|
|
|
msgid " * [pruned] %s"
|
|
|
|
msgstr " * [rensad] %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1387 builtin/remote.c:1461
|
|
|
|
#, c-format
|
|
|
|
msgid "No such remote '%s'"
|
|
|
|
msgstr "Ingen sådan fjärr \"%s\""
|
|
|
|
|
|
|
|
#: builtin/remote.c:1414
|
|
|
|
msgid "no remote specified"
|
|
|
|
msgstr "ingen fjärr angavs"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1447
|
|
|
|
msgid "--add --delete doesn't make sense"
|
|
|
|
msgstr "--add --delete ger ingen mening"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1487
|
|
|
|
#, c-format
|
|
|
|
msgid "Invalid old URL pattern: %s"
|
|
|
|
msgstr "Felaktig gammalt URL-mönster: %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1495
|
|
|
|
#, c-format
|
|
|
|
msgid "No such URL found: %s"
|
|
|
|
msgstr "Ingen sådan URL hittades: %s"
|
|
|
|
|
|
|
|
#: builtin/remote.c:1497
|
|
|
|
msgid "Will not delete all non-push URLs"
|
|
|
|
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
msgid "mixed"
|
|
|
|
msgstr "blandad"
|
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
msgid "soft"
|
|
|
|
msgstr "mjuk"
|
|
|
|
|
|
|
|
#: builtin/reset.c:33
|
|
|
|
msgid "hard"
|
|
|
|
msgstr "hård"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/reset.c:33
|
|
|
|
msgid "merge"
|
|
|
|
msgstr "sammanslagning"
|
|
|
|
|
2010-09-13 04:10:21 +08:00
|
|
|
#: builtin/reset.c:33
|
|
|
|
msgid "keep"
|
|
|
|
msgstr "behåll"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:77
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You do not have a valid HEAD."
|
|
|
|
msgstr "Du har inte en giltig HEAD."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:79
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Failed to find tree of HEAD."
|
|
|
|
msgstr "Kunde inte hitta träder för HEAD."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:85
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Failed to find tree of %s."
|
|
|
|
msgstr "Kunde inte hitta träder för %s."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:96
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Could not write new index file."
|
|
|
|
msgstr "Kunde inte skriva ny indexfil."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:106
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "HEAD is now at %s"
|
|
|
|
msgstr "HEAD är nu på %s"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:130
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Could not read index"
|
|
|
|
msgstr "Kunde inte läsa indexet"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:133
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Unstaged changes after reset:"
|
|
|
|
msgstr "Oköade ändringar efter återställning:"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/reset.c:223
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot do a %s reset in the middle of a merge."
|
|
|
|
msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:303
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not parse object '%s'."
|
|
|
|
msgstr "Kan inte tolka objektet \"%s\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:308
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--patch is incompatible with --{hard,mixed,soft}"
|
|
|
|
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:317
|
2010-09-13 04:10:21 +08:00
|
|
|
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>\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:319
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Cannot do %s reset with paths."
|
|
|
|
msgstr "Kan inte göra %s återställning med sökvägar."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:331
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s reset is not allowed in a bare repository"
|
|
|
|
msgstr "%s återställning tillåts inte i ett naket arkiv"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: builtin/reset.c:347
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Could not reset index file to revision '%s'."
|
|
|
|
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#: builtin/revert.c:70 builtin/revert.c:92
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "%s: %s cannot be used with %s"
|
|
|
|
msgstr "%s: %s kan inte användas med %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/revert.c:131
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "program error"
|
|
|
|
msgstr "programfel"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/revert.c:221
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "revert failed"
|
|
|
|
msgstr "\"revert\" misslyckades"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/revert.c:236
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "cherry-pick failed"
|
|
|
|
msgstr "\"cherry-pick\" misslyckades"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:109
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"'%s' has staged content different from both the file and the HEAD\n"
|
|
|
|
"(use -f to force removal)"
|
|
|
|
msgstr ""
|
|
|
|
"\"%s\" har köat ändringar som skiljer sig både från filen och HEAD\n"
|
|
|
|
"(använd -f för att tvinga borttagning)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:115
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"'%s' has changes staged in the index\n"
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"\"%s\" har köade ändringar i indexet\n"
|
|
|
|
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:119
|
|
|
|
#, c-format
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"'%s' has local modifications\n"
|
|
|
|
"(use --cached to keep the file, or -f to force removal)"
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"\"%s\" har lokala ändringar\n"
|
|
|
|
"(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:194
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "not removing '%s' recursively without -r"
|
|
|
|
msgstr "tar inte bort \"%s\" rekursivt utan -r"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/rm.c:230
|
|
|
|
#, c-format
|
|
|
|
msgid "git rm: unable to remove %s"
|
|
|
|
msgstr "git rm: kan inte ta bort %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: builtin/shortlog.c:157
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Missing author: %s"
|
|
|
|
msgstr "Författare saknas: %s"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:60
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "malformed object at '%s'"
|
|
|
|
msgstr "felformat objekt vid \"%s\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:207
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "tag name too long: %.*s..."
|
|
|
|
msgstr "taggnamnet för långt: %.*s..."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:212
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' not found."
|
|
|
|
msgstr "taggen \"%s\" hittades inte."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:227
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Deleted tag '%s' (was %s)\n"
|
|
|
|
msgstr "Tog bort tagg \"%s\" (var %s)\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:239
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "could not verify the tag '%s'"
|
|
|
|
msgstr "kunde inte bekräfta taggen \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:249
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"#\n"
|
|
|
|
"# Write a tag message\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"# Lines starting with '#' will be ignored.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"#\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"#\n"
|
|
|
|
"# Skriv ett taggmeddelande\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"# Rader som inleds med \"#\" ignoreras.\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"#\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:256
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid ""
|
|
|
|
"\n"
|
|
|
|
"#\n"
|
|
|
|
"# Write a tag message\n"
|
|
|
|
"# Lines starting with '#' will be kept; you may remove them yourself if you "
|
|
|
|
"want to.\n"
|
|
|
|
"#\n"
|
|
|
|
msgstr ""
|
|
|
|
"\n"
|
|
|
|
"#\n"
|
|
|
|
"# Skriv ett taggmeddelande\n"
|
|
|
|
"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n"
|
|
|
|
"# du vill.\n"
|
|
|
|
"#\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:298
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to sign the tag"
|
|
|
|
msgstr "kunde inte signera taggen"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:300
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "unable to write tag file"
|
|
|
|
msgstr "kunde inte skriva tagg-filen"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:325
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "bad object type."
|
|
|
|
msgstr "felaktig objekttyp"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:338
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "tag header too big."
|
|
|
|
msgstr "tagghuvud för stort."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:370
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "no tag message?"
|
|
|
|
msgstr "inget taggmeddelande?"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:376
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "The tag message has been left in %s\n"
|
|
|
|
msgstr "Taggmeddelandet har lämnats i %s\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:425
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "switch 'points-at' requires an object"
|
|
|
|
msgstr "flaggan \"points-at\" behöver ett object"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:427
|
2012-03-08 17:56:37 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "malformed object name '%s'"
|
|
|
|
msgstr "felformat objektnamn \"%s\""
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:506
|
|
|
|
msgid "--column and -n are incompatible"
|
|
|
|
msgstr "--column och -n är inkompatibla"
|
|
|
|
|
|
|
|
#: builtin/tag.c:523
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "-n option is only allowed with -l."
|
|
|
|
msgstr "Flaggan -n är endast tillåten tillsammans med -l."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:525
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "--contains option is only allowed with -l."
|
|
|
|
msgstr "Flaggan --contains är endast tillåten tillsammans med -l"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:527
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "--points-at option is only allowed with -l."
|
|
|
|
msgstr "Flaggan --points-at är endast tillåten tillsammans med -l."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:535
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "only one -F or -m option is allowed."
|
|
|
|
msgstr "endast en av flaggorna -F eller -m tillåts."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:555
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "too many params"
|
|
|
|
msgstr "för många parametrar"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:561
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "'%s' is not a valid tag name."
|
|
|
|
msgstr "\"%s\" är inte ett giltigt taggnamn."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:566
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "tag '%s' already exists"
|
|
|
|
msgstr "taggen \"%s\" finns redan"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:584
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: cannot lock the ref"
|
|
|
|
msgstr "%s: kan inte låsa referensen"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:586
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "%s: cannot update the ref"
|
|
|
|
msgstr "%s: kan inte uppdatera referensen"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: builtin/tag.c:588
|
2010-09-13 04:10:21 +08:00
|
|
|
#, c-format
|
|
|
|
msgid "Updated tag '%s' (was %s)\n"
|
|
|
|
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git.c:16
|
|
|
|
msgid "See 'git help <command>' for more information on a specific command."
|
|
|
|
msgstr ""
|
|
|
|
"Se \"git help <kommando>\" för mer information om ett specifikt kommando."
|
|
|
|
|
|
|
|
#: parse-options.h:133 parse-options.h:235
|
|
|
|
msgid "n"
|
|
|
|
msgstr "n"
|
|
|
|
|
|
|
|
#: parse-options.h:141
|
|
|
|
msgid "time"
|
|
|
|
msgstr "tid"
|
|
|
|
|
|
|
|
# %s är ett verb ("Untracked"/"Ignored"); lägg till ett -e.
|
|
|
|
#: parse-options.h:149
|
|
|
|
msgid "file"
|
|
|
|
msgstr "fil"
|
|
|
|
|
|
|
|
#: parse-options.h:151
|
|
|
|
msgid "when"
|
|
|
|
msgstr "när"
|
|
|
|
|
|
|
|
#: parse-options.h:156
|
|
|
|
msgid "no-op (backward compatibility)"
|
|
|
|
msgstr "ingen funktion (bakåtkompatibilitet)"
|
|
|
|
|
|
|
|
#: parse-options.h:228
|
|
|
|
msgid "be more verbose"
|
|
|
|
msgstr "var mer pratsam"
|
|
|
|
|
|
|
|
#: parse-options.h:230
|
|
|
|
msgid "be more quiet"
|
|
|
|
msgstr "var mer tyst"
|
|
|
|
|
|
|
|
#: parse-options.h:236
|
|
|
|
msgid "use <n> digits to display SHA-1s"
|
|
|
|
msgstr "använd <n> siffror för att visa SHA-1:or"
|
|
|
|
|
|
|
|
#: common-cmds.h:8
|
|
|
|
msgid "Add file contents to the index"
|
|
|
|
msgstr "Lägg filinnehåll till indexet"
|
|
|
|
|
|
|
|
#: common-cmds.h:9
|
|
|
|
msgid "Find by binary search the change that introduced a bug"
|
|
|
|
msgstr "Binärsök för att hitta ändringen som introducerade ett fel"
|
|
|
|
|
|
|
|
#: common-cmds.h:10
|
|
|
|
msgid "List, create, or delete branches"
|
|
|
|
msgstr "Visa, skapa eller ta bort grenar"
|
|
|
|
|
|
|
|
#: common-cmds.h:11
|
|
|
|
msgid "Checkout a branch or paths to the working tree"
|
|
|
|
msgstr "Checka ut en gren eller filer i arbetskatalogen"
|
|
|
|
|
|
|
|
#: common-cmds.h:12
|
|
|
|
msgid "Clone a repository into a new directory"
|
|
|
|
msgstr "Klona ett arkiv till en ny katalog"
|
|
|
|
|
|
|
|
#: common-cmds.h:13
|
|
|
|
msgid "Record changes to the repository"
|
|
|
|
msgstr "Protokollför ändringar i arkivet"
|
|
|
|
|
|
|
|
#: common-cmds.h:14
|
|
|
|
msgid "Show changes between commits, commit and working tree, etc"
|
|
|
|
msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
|
|
|
|
|
|
|
|
#: common-cmds.h:15
|
|
|
|
msgid "Download objects and refs from another repository"
|
|
|
|
msgstr "Hämta objekt och referenser från annat arkiv"
|
|
|
|
|
|
|
|
#: common-cmds.h:16
|
|
|
|
msgid "Print lines matching a pattern"
|
|
|
|
msgstr "Visa rader som motsvarar mönster"
|
|
|
|
|
|
|
|
#: common-cmds.h:17
|
|
|
|
msgid "Create an empty git repository or reinitialize an existing one"
|
|
|
|
msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt"
|
|
|
|
|
|
|
|
#: common-cmds.h:18
|
|
|
|
msgid "Show commit logs"
|
|
|
|
msgstr "Visa incheckningsloggar"
|
|
|
|
|
|
|
|
#: common-cmds.h:19
|
|
|
|
msgid "Join two or more development histories together"
|
|
|
|
msgstr "Slå ihop två eller flera utvecklingshistorier"
|
|
|
|
|
|
|
|
#: common-cmds.h:20
|
|
|
|
msgid "Move or rename a file, a directory, or a symlink"
|
|
|
|
msgstr "Flytta eller byt namn på en fil, katalog eller symbolisk länk"
|
|
|
|
|
|
|
|
#: common-cmds.h:21
|
|
|
|
msgid "Fetch from and merge with another repository or a local branch"
|
|
|
|
msgstr "Hämta från och slå ihop med annat arkiv eller en lokal gren"
|
|
|
|
|
|
|
|
#: common-cmds.h:22
|
|
|
|
msgid "Update remote refs along with associated objects"
|
|
|
|
msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
|
|
|
|
|
|
|
|
#: common-cmds.h:23
|
|
|
|
msgid "Forward-port local commits to the updated upstream head"
|
|
|
|
msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
|
|
|
|
|
|
|
|
#: common-cmds.h:24
|
|
|
|
msgid "Reset current HEAD to the specified state"
|
|
|
|
msgstr "Återställ aktuell HEAD till angivet tillstånd"
|
|
|
|
|
|
|
|
#: common-cmds.h:25
|
|
|
|
msgid "Remove files from the working tree and from the index"
|
|
|
|
msgstr "Ta bort filer från arbetskatalogen och från indexet"
|
|
|
|
|
|
|
|
#: common-cmds.h:26
|
|
|
|
msgid "Show various types of objects"
|
|
|
|
msgstr "Visa olika sorters objekt"
|
|
|
|
|
|
|
|
#: common-cmds.h:27
|
|
|
|
msgid "Show the working tree status"
|
|
|
|
msgstr "Visa status för arbetskatalogen"
|
|
|
|
|
|
|
|
#: common-cmds.h:28
|
|
|
|
msgid "Create, list, delete or verify a tag object signed with GPG"
|
2012-08-14 16:58:14 +08:00
|
|
|
msgstr "Skapa, visa, ta bort eller verifiera GPG-signerat taggobjekt"
|
2012-07-02 06:04:09 +08:00
|
|
|
|
|
|
|
#: git-am.sh:50
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You need to set your committer info first"
|
|
|
|
msgstr "Du måste ställa in din incheckarinformation först"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-am.sh:95
|
|
|
|
msgid ""
|
|
|
|
"You seem to have moved HEAD since the last 'am' failure.\n"
|
|
|
|
"Not rewinding to ORIG_HEAD"
|
|
|
|
msgstr ""
|
|
|
|
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
|
|
|
|
"Återställer inte till ORIG_HEAD"
|
|
|
|
|
|
|
|
#: git-am.sh:105
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2012-08-09 13:36:41 +08:00
|
|
|
"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\"."
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr ""
|
|
|
|
"När du har löst problemet kör du \"$cmdline --resolved\".\n"
|
|
|
|
"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
|
|
|
|
"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
|
|
|
|
|
|
|
|
#: git-am.sh:121
|
|
|
|
msgid "Cannot fall back to three-way merge."
|
|
|
|
msgstr "Kan inte falla tillbaka på trevägssammanslagning."
|
|
|
|
|
|
|
|
#: git-am.sh:137
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
|
|
|
|
msgstr ""
|
|
|
|
"Arkivet saknar objekt som behövs för att falla tillbaka på 3-"
|
|
|
|
"vägssammanslagning."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:139
|
|
|
|
msgid "Using index info to reconstruct a base tree..."
|
|
|
|
msgstr "Använder indexinfo för att åteskapa ett basträd..."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-am.sh:154
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid ""
|
|
|
|
"Did you hand edit your patch?\n"
|
|
|
|
"It does not apply to blobs recorded in its index."
|
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Har du handredigerat din patch?\n"
|
2012-07-02 06:04:09 +08:00
|
|
|
"Den kan inte tillämpas på blobbar som antecknats i dess index."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-am.sh:163
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "Falling back to patching base and 3-way merge..."
|
|
|
|
msgstr ""
|
|
|
|
"Faller tillbaka på att pacha grundversionen och trevägssammanslagning..."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:179
|
|
|
|
msgid "Failed to merge in the changes."
|
|
|
|
msgstr "Misslyckads slå ihop ändringarna."
|
|
|
|
|
|
|
|
#: git-am.sh:274
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Only one StGIT patch series can be applied at once"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Endast en StGIT-patchserie kan tillämpas åt gången"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:361
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Patch format $patch_format is not supported."
|
|
|
|
msgstr "Patchformatet $patch_format stöds inte."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:363
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Patch format detection failed."
|
|
|
|
msgstr "Misslyckades detektera patchformat."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: 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."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:477
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "previous rebase directory $dotest still exists but mbox given."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "tidigare rebase-katalog $dotest finns fortfarande, men mbox angavs."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:482
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Please make up your mind. --skip or --abort?"
|
|
|
|
msgstr "Bestäm dig. --skip eller --abort?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:509
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Resolve operation not in progress, we are not resuming."
|
|
|
|
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:575
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Dirty index: cannot apply patches (dirty: $files)"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: $files)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:679
|
2012-07-02 06:04:09 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Patch is empty. Was it split wrong?\n"
|
|
|
|
"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n"
|
|
|
|
"To restore the original branch and stop patching run \"$cmdline --abort\"."
|
|
|
|
msgstr ""
|
|
|
|
"Patchen är tom. Delades den upp felaktigt?\n"
|
|
|
|
"Om du vill hoppa över patchen kör du istället \"$cmdline --skip\".\n"
|
|
|
|
"För att återställa originalgrenen och avbryta kör du \"$cmdline --abort\"."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:706
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Patch does not have a valid e-mail address."
|
|
|
|
msgstr "Patchen har inte någon giltig e-postadress."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:753
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "cannot be interactive without stdin connected to a terminal."
|
|
|
|
msgstr ""
|
|
|
|
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:757
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Commit Body is:"
|
|
|
|
msgstr "Incheckningskroppen är:"
|
|
|
|
|
2010-09-13 04:10:21 +08:00
|
|
|
#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
|
|
|
|
#. in your translation. The program will only accept English
|
|
|
|
#. input at this point.
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:764
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Tillämpa? Y=ja/N=nej/E=redigera/V=visa patch/A=godta alla "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:800
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Applying: $FIRSTLINE"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Tillämpar: $FIRSTLINE"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:821
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid ""
|
|
|
|
"No changes - did you forget to use 'git add'?\n"
|
|
|
|
"If there is nothing left to stage, chances are that something else\n"
|
|
|
|
"already introduced the same changes; you might want to skip this patch."
|
|
|
|
msgstr ""
|
|
|
|
"Inga ändringar - glömde du använda \"git add\"?\n"
|
|
|
|
"Om det inte är något kvar att köa kan det hända att något annat redan\n"
|
|
|
|
"introducerat samma ändringar; kanske du bör hoppa över patchen."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:829
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid ""
|
|
|
|
"You still have unmerged paths in your index\n"
|
|
|
|
"did you forget to use 'git add'?"
|
|
|
|
msgstr ""
|
|
|
|
"Du har fortfarande sökvägar som inte slagits samman i ditt index\n"
|
|
|
|
"glömde du använda \"git add\"?"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:845
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No changes -- Patch already applied."
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Inga ändringar -- Patchen har redan tillämpats."
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:855
|
2012-07-02 06:04:09 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Patch failed at $msgnum $FIRSTLINE"
|
|
|
|
msgstr "Patchen misslyckades vid $msgnum $FIRSTLINE"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-am.sh:876
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "applying to an empty history"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "tillämpar på en tom historik"
|
|
|
|
|
|
|
|
#: git-bisect.sh:48
|
|
|
|
msgid "You need to start by \"git bisect start\""
|
|
|
|
msgstr "Du måste starta med \"git bisect start\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:54
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Do you want me to do it for you [Y/n]? "
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]?"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:95
|
|
|
|
#, sh-format
|
|
|
|
msgid "unrecognised option: '$arg'"
|
|
|
|
msgstr "flaggan känns inte igen: \"$arg\""
|
|
|
|
|
|
|
|
#: git-bisect.sh:99
|
|
|
|
#, sh-format
|
|
|
|
msgid "'$arg' does not appear to be a valid revision"
|
|
|
|
msgstr "\"$arg\" verkar inte vara en giltig revision"
|
|
|
|
|
|
|
|
#: git-bisect.sh:117
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Bad HEAD - I need a HEAD"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Felaktigt HEAD - Jag behöver ett HEAD"
|
|
|
|
|
|
|
|
#: git-bisect.sh:130
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'."
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Misslyckades checka ut \"$start_head\". Försök \"git bisect reset "
|
|
|
|
"<giltiggren>\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
# cogito-relaterat
|
|
|
|
#: git-bisect.sh:140
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "won't bisect on seeked tree"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "kör inte \"bisect\" på ett \"seeked\"-träd"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:144
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Bad HEAD - strange symbolic ref"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Felaktigt HEAD - konstig symbolisk referens"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:189
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad bisect_write argument: $state"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Felaktigt argument till bisect_write: $state"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:218
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad rev input: $arg"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Felaktig rev-indata: $arg"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:232
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Please call 'bisect_state' with at least one argument."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Anropa \"bisect_state\" med minst ett argument."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:244
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Bad rev input: $rev"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Felaktig rev-indata: $rev"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:250
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "'git bisect bad' can take only one argument."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "\"git bisect bad\" kan bara ta ett argument."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#. have bad but not good. we could bisect although
|
|
|
|
#. this is less optimum.
|
|
|
|
#: git-bisect.sh:273
|
|
|
|
msgid "Warning: bisecting only with a bad commit."
|
|
|
|
msgstr "Varning: utför \"bisect\" med endast en dålig incheckning"
|
|
|
|
|
2010-09-13 04:10:21 +08:00
|
|
|
#. TRANSLATORS: Make sure to include [Y] and [n] in your
|
|
|
|
#. translation. The program will only accept English input
|
|
|
|
#. at this point.
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:279
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Are you sure [Y/n]? "
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Är du säker [Y=ja/N=nej]? "
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-bisect.sh:289
|
|
|
|
msgid ""
|
|
|
|
"You need to give me at least one good and one bad revisions.\n"
|
|
|
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
|
|
|
|
msgstr ""
|
|
|
|
"Du måste ange åtminstone en bra och en dålig version.\n"
|
|
|
|
"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"
|
|
|
|
|
|
|
|
#: git-bisect.sh:292
|
|
|
|
msgid ""
|
|
|
|
"You need to start by \"git bisect start\".\n"
|
|
|
|
"You then need to give me at least one good and one bad revisions.\n"
|
|
|
|
"(You can use \"git bisect bad\" and \"git bisect good\" for that.)"
|
|
|
|
msgstr ""
|
|
|
|
"Du måste starta med \"git bisect start\".\n"
|
|
|
|
"Du måste sedan ange åtminstone en bra och en dålig version.\n"
|
|
|
|
"(Du kan använda \"git bisect bad\" och \"git bisect good\" för detta.)"
|
|
|
|
|
|
|
|
#: git-bisect.sh:347 git-bisect.sh:474
|
|
|
|
msgid "We are not bisecting."
|
|
|
|
msgstr "Vi utför ingen bisect för tillfället."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:354
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "'$invalid' is not a valid commit"
|
|
|
|
msgstr "\"$invalid\" är inte en giltig incheckning"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:363
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Could not check out original HEAD '$branch'.\n"
|
|
|
|
"Try 'git bisect reset <commit>'."
|
2010-09-13 04:10:21 +08:00
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Kunde inte checka ut original-HEAD \"$branch\".\n"
|
|
|
|
"Försök \"git bisect reset <incheckning>\"."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:390
|
|
|
|
msgid "No logfile given"
|
|
|
|
msgstr "Ingen loggfil angiven"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:391
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "cannot read $file for replaying"
|
|
|
|
msgstr "kan inte läsa $file för uppspelning"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-bisect.sh:408
|
|
|
|
msgid "?? what are you talking about?"
|
|
|
|
msgstr "?? vad menar du?"
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-bisect.sh:420
|
|
|
|
#, sh-format
|
|
|
|
msgid "running $command"
|
|
|
|
msgstr "kör $command"
|
|
|
|
|
|
|
|
#: git-bisect.sh:427
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"bisect run failed:\n"
|
|
|
|
"exit code $res from '$command' is < 0 or >= 128"
|
|
|
|
msgstr ""
|
|
|
|
"\"bisect\"-körningen misslyckades:\n"
|
|
|
|
"felkod $res från \"$command\" är < 0 eller >= 128"
|
|
|
|
|
|
|
|
#: git-bisect.sh:453
|
|
|
|
msgid "bisect run cannot continue any more"
|
|
|
|
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
|
|
|
|
|
|
|
|
#: git-bisect.sh:459
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"bisect run failed:\n"
|
|
|
|
"'bisect_state $state' exited with error code $res"
|
|
|
|
msgstr ""
|
|
|
|
"\"bisect\"-körningen misslyckades:\n"
|
|
|
|
"\"bisect_state $state\" avslutades med felkoden $res"
|
|
|
|
|
|
|
|
#: git-bisect.sh:466
|
|
|
|
msgid "bisect run success"
|
|
|
|
msgstr "\"bisect\"-körningen lyckades"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
|
|
|
#: git-pull.sh:21
|
|
|
|
msgid ""
|
|
|
|
"Pull is not possible because you have unmerged files.\n"
|
|
|
|
"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n"
|
|
|
|
"as appropriate to mark resolution, or use 'git commit -a'."
|
|
|
|
msgstr ""
|
2012-03-08 17:56:37 +08:00
|
|
|
"Du kan inte göra en \"pull\" då du har ändringar som inte checkats in.\n"
|
|
|
|
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
|
|
|
|
"där det är lämpligt för att ange lösning, eller använd \"git commit -a\"."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
|
|
|
#: git-pull.sh:25
|
|
|
|
msgid "Pull is not possible because you have unmerged files."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Du kan inte göra en \"pull\" då du har ändringar som inte checkats in."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-pull.sh:197
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "updating an unborn branch with changes added to the index"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "uppdaterar en ofödd gren med ändringar som lagts till i indexet"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#. The fetch involved updating the current branch.
|
|
|
|
#. The working tree and the index file is still based on the
|
|
|
|
#. $orig_head commit, but we are merging into $curr_head.
|
|
|
|
#. First update the working tree to match $curr_head.
|
|
|
|
#: git-pull.sh:228
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"Warning: fetch updated the current branch head.\n"
|
|
|
|
"Warning: fast-forwarding your working tree from\n"
|
|
|
|
"Warning: commit $orig_head."
|
|
|
|
msgstr ""
|
|
|
|
"Varning: fetch uppdaterade huvudet för aktuell gren.\n"
|
|
|
|
"Varning: snabbspolar din arbetskatalog från\n"
|
|
|
|
"Varning: incheckningen $orig_head."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-pull.sh:253
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot merge multiple branches into empty head"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-pull.sh:257
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot rebase onto multiple branches"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte utföra en \"rebase\" ovanpå flera grenar"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: 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."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:51
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "git stash clear with parameters is unimplemented"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "\"git stash clear\" med parametrar har inte implementerats"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:74
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "You do not have the initial commit yet"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Du har inte den första incheckningen ännu"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:89
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot save the current index state"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte spara aktuellt tillstånd för indexet"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:123 git-stash.sh:136
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot save the current worktree state"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:140
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No changes selected"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Inga ändringar valda"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:143
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot remove temporary index (can't happen)"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:156
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot record working tree state"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte registrera tillstånd för arbetskatalog"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#. TRANSLATORS: $option is an invalid option, like
|
|
|
|
#. `--blah-blah'. The 7 spaces at the beginning of the
|
|
|
|
#. second line correspond to "error: ". So you should line
|
|
|
|
#. up the second line with however many characters the
|
|
|
|
#. translation of "error: " takes in your language. E.g. in
|
|
|
|
#. English this is:
|
|
|
|
#.
|
|
|
|
#. $ git stash save --blah-blah 2>&1 | head -n 2
|
|
|
|
#. error: unknown option for 'stash save': --blah-blah
|
|
|
|
#. To provide a message, use git stash save -- '--blah-blah'
|
|
|
|
#: git-stash.sh:202
|
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
|
|
|
"error: unknown option for 'stash save': $option\n"
|
|
|
|
" To provide a message, use git stash save -- '$option'"
|
|
|
|
msgstr ""
|
|
|
|
"fel: felaktig flagga för \"stash save\": $option\n"
|
|
|
|
" För att ange ett meddelande, använd git stash save -- \"$option\""
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:223
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No local changes to save"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Inga lokala ändringar att spara"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:227
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot initialize stash"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte initiera \"stash\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:235
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot save the current status"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte spara aktuell status"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:253
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot remove worktree changes"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:352
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No stash found."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Ingen \"stash\" hittades."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:359
|
|
|
|
#, sh-format
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Too many revisions specified: $REV"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "För många revisioner angivna: $REV"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:365
|
|
|
|
#, sh-format
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "$reference is not valid reference"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "$reference är inte en giltig referens."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:393
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$args' is not a stash-like commit"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:404
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "'$args' is not a stash reference"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "\"$args\" är inte en \"stash\"-referens"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:412
|
|
|
|
msgid "unable to refresh index"
|
|
|
|
msgstr "kan inte uppdatera indexet"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:416
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot apply a stash in the middle of a merge"
|
2012-07-02 06:04:09 +08:00
|
|
|
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:424
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Conflicts in index. Try without --index."
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Konflikter i indexet. Testa utan --index."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:426
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Could not save index tree"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kunde inte spara indexträd"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:460
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "Cannot unstage modified files"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kan inte ta bort ändrade filer ur kön"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#: git-stash.sh:474
|
|
|
|
msgid "Index was not unstashed."
|
|
|
|
msgstr "Indexet har inte tagits ur kön."
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:491
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Dropped ${REV} ($s)"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Kastade ${REV} ($s)"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:492
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "${REV}: Could not drop stash entry"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:499
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "No branch name specified"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "Inget grennamn angavs"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#: git-stash.sh:570
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "(To restore them type \"git stash apply\")"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "(För att återställa dem, skriv \"git stash apply\")"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: git-submodule.sh:88
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-03-08 17:56:37 +08:00
|
|
|
msgid "cannot strip one component off url '$remoteurl'"
|
|
|
|
msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-05 02:34:21 +08:00
|
|
|
#: git-submodule.sh:145
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "No submodule mapping found in .gitmodules for path '$sm_path'"
|
|
|
|
msgstr ""
|
|
|
|
"Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:189
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Clone of '$url' into submodule path '$sm_path' failed"
|
|
|
|
msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:201
|
2012-03-15 17:47:06 +08:00
|
|
|
#, 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"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:290
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "repo URL: '$repo' must be absolute or begin with ./|../"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:307
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "'$sm_path' already exists in the index"
|
|
|
|
msgstr "\"$sm_path\" finns redan i indexet"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:311
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid ""
|
|
|
|
"The following path is ignored by one of your .gitignore files:\n"
|
|
|
|
"$sm_path\n"
|
|
|
|
"Use -f if you really want to add it."
|
|
|
|
msgstr ""
|
|
|
|
"Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
|
|
|
|
"$sm_path\n"
|
|
|
|
"Använd -f om du verkligen vill lägga till den"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:322
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Adding existing repo at '$sm_path' to the index"
|
|
|
|
msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:324
|
2012-03-08 17:56:37 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "'$sm_path' already exists and is not a valid git repo"
|
|
|
|
msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:338
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to checkout submodule '$sm_path'"
|
|
|
|
msgstr "Kan inte checka ut undermodulen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:343
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to add submodule '$sm_path'"
|
|
|
|
msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:348
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to register submodule '$sm_path'"
|
|
|
|
msgstr "Misslyckades registrera undermodulen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:390
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Entering '$prefix$sm_path'"
|
|
|
|
msgstr "Går in i \"$prefix$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:404
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Stopping at '$sm_path'; script returned non-zero status."
|
|
|
|
msgstr ""
|
|
|
|
"Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll."
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:447
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "No url found for submodule path '$sm_path' in .gitmodules"
|
|
|
|
msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:456
|
2012-07-02 06:04:09 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Failed to register url for submodule path '$sm_path'"
|
|
|
|
msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:458
|
2012-07-02 06:04:09 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Submodule '$name' ($url) registered for path '$sm_path'"
|
|
|
|
msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:466
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to register update mode for submodule path '$sm_path'"
|
|
|
|
msgstr ""
|
|
|
|
"Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:565
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Submodule path '$sm_path' not initialized\n"
|
2010-09-13 04:10:21 +08:00
|
|
|
"Maybe you want to use 'update --init'?"
|
|
|
|
msgstr ""
|
2012-07-02 06:04:09 +08:00
|
|
|
"Undermodulen \"$sm_path\" har inte initierats\n"
|
2012-03-08 17:56:37 +08:00
|
|
|
"Kanske du vill köra \"update --init\"?"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:578
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to find current revision in submodule path '$sm_path'"
|
|
|
|
msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:597
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to fetch in submodule path '$sm_path'"
|
|
|
|
msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:611
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to rebase '$sha1' in submodule path '$sm_path'"
|
|
|
|
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:612
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Submodule path '$sm_path': rebased into '$sha1'"
|
|
|
|
msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:617
|
2012-03-08 17:56:37 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to merge '$sha1' in submodule path '$sm_path'"
|
|
|
|
msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\""
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:618
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Submodule path '$sm_path': merged in '$sha1'"
|
|
|
|
msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:623
|
2012-03-08 17:56:37 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Unable to checkout '$sha1' in submodule path '$sm_path'"
|
|
|
|
msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\""
|
2012-03-08 17:56:37 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:624
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Submodule path '$sm_path': checked out '$sha1'"
|
|
|
|
msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:646 git-submodule.sh:969
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "Failed to recurse into submodule path '$sm_path'"
|
|
|
|
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:754
|
|
|
|
msgid "The --cached option cannot be used with the --files option"
|
|
|
|
msgstr "Flaggan --cached kan inte användas med flaggan --files"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#. unexpected type
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:794
|
2012-07-02 06:04:09 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "unexpected mode $mod_dst"
|
|
|
|
msgstr "oväntat läge $mod_dst"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:812
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid " Warn: $name doesn't contain commit $sha1_src"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr " Varning: $name innehåller inte incheckning $sha1_src"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:815
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid " Warn: $name doesn't contain commit $sha1_dst"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr " Varning: $name innehåller inte incheckning $sha1_dst"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:818
|
2010-09-13 04:10:21 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:843
|
2010-09-13 04:10:21 +08:00
|
|
|
msgid "blob"
|
2012-03-08 17:56:37 +08:00
|
|
|
msgstr "blob"
|
2010-09-13 04:10:21 +08:00
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:881
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "# Submodules changed but not updated:"
|
|
|
|
msgstr "# Undermoduler ändrade men inte uppdaterade:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:883
|
2012-07-02 06:04:09 +08:00
|
|
|
msgid "# Submodule changes to be committed:"
|
|
|
|
msgstr "# Undermodulers ändringar att checka in:"
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#: git-submodule.sh:1027
|
2012-03-08 17:56:37 +08:00
|
|
|
#, sh-format
|
|
|
|
msgid "Synchronizing submodule url for '$name'"
|
|
|
|
msgstr "Synkroniserar undermodul-url för \"$name\""
|
|
|
|
|
2012-08-09 13:36:41 +08:00
|
|
|
#~ 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."
|
|
|
|
|
2012-07-02 06:04:09 +08:00
|
|
|
#~ msgid "cherry-pick"
|
|
|
|
#~ msgstr "cherry-pick"
|
|
|
|
|
|
|
|
#~ msgid "Please enter the commit message for your changes."
|
|
|
|
#~ msgstr "Ange ett incheckningsmeddelande för dina ändringar."
|
|
|
|
|
|
|
|
#~ msgid "Could not extract email from committer identity."
|
|
|
|
#~ msgstr "Kunde inte extrahera e-postadress från incheckarens identitet."
|
|
|
|
|
|
|
|
#~ msgid "--"
|
|
|
|
#~ msgstr "--"
|
|
|
|
|
2012-05-29 16:28:34 +08:00
|
|
|
#~ msgid "Too many options specified"
|
|
|
|
#~ msgstr "För många flaggor angavs"
|
|
|
|
|
2012-03-08 17:56:37 +08:00
|
|
|
#~ msgid "# Changed but not updated:"
|
|
|
|
#~ msgstr "# Ändrade men inte uppdaterade:"
|
|
|
|
|
|
|
|
#~ msgid "A branch named '%s' already exists."
|
|
|
|
#~ msgstr "Det finns redan en gren som heter \"%s\""
|
|
|
|
|
|
|
|
#~ msgid "path '%s' does not have all 3 versions"
|
|
|
|
#~ msgstr "sökvägen \"%s\" har inte alla 3 versionerna"
|
|
|
|
|
|
|
|
#~ msgid "git checkout: we do not like '%s' as a branch name."
|
|
|
|
#~ msgstr "git checkout: vi tycker inte om \"%s\" som namn på en gren."
|
|
|
|
|
|
|
|
#~ msgid "git checkout: branch %s already exists"
|
|
|
|
#~ msgstr "git checkout: grenen %s finns redan"
|
|
|
|
|
|
|
|
#~ msgid "Paths with --interactive does not make sense."
|
|
|
|
#~ msgstr "Kan inte ange sökvägar med --interactive."
|
|
|
|
|
|
|
|
#~ msgid "No HEAD commit to compare with (yet)"
|
|
|
|
#~ msgstr "Ingen HEAD-incheckning att jämföra med (ännu)"
|
|
|
|
|
|
|
|
#~ msgid "cannot mix --fixed-strings and regexp"
|
|
|
|
#~ msgstr "kan inte blanda --fixed-strings och reguljära uttryck"
|
|
|
|
|
|
|
|
#~ msgid "invalid --decorate option: %s"
|
|
|
|
#~ msgstr "felaktigt värde till --decorate: %s"
|
|
|
|
|
|
|
|
#~ msgid "%s; will overwrite!"
|
|
|
|
#~ msgstr "%s; kommer skriva över!"
|
|
|
|
|
|
|
|
#~ msgid "Failed to write current notes tree to database"
|
|
|
|
#~ msgstr "Kunde inte skriva aktuellt anteckningsträd till databasen"
|
|
|
|
|
|
|
|
#~ msgid "Failed to commit notes tree to database"
|
|
|
|
#~ msgstr "Kunde inte checka in anteckningsträd i databasen"
|
|
|
|
|
|
|
|
# FIXME: Untranslatable!
|
|
|
|
#
|
|
|
|
#~ msgid "Refusing to %s notes in %s (outside of refs/notes/)"
|
|
|
|
#~ msgstr "Vägrar %s anteckningar i %s (utanför refs/notes/)"
|
|
|
|
|
|
|
|
#~ msgid "list"
|
|
|
|
#~ msgstr "list"
|
|
|
|
|
|
|
|
#~ msgid "add"
|
|
|
|
#~ msgstr "add"
|
|
|
|
|
|
|
|
#~ msgid "copy"
|
|
|
|
#~ msgstr "copy"
|
|
|
|
|
|
|
|
#~ msgid "show"
|
|
|
|
#~ msgstr "show"
|
|
|
|
|
|
|
|
#~ msgid "remove"
|
|
|
|
#~ msgstr "remove"
|
|
|
|
|
|
|
|
#~ msgid "prune"
|
|
|
|
#~ msgstr "prune"
|
|
|
|
|
|
|
|
#~ msgid "The current branch %s is not tracking anything."
|
|
|
|
#~ msgstr "Den aktuella grenen %s spårar ingenting."
|
|
|
|
|
|
|
|
#~ msgid "No destination configured to push to."
|
|
|
|
#~ msgstr "Har inte ställt in någon destination att sända till."
|
|
|
|
|
|
|
|
#~ msgid "Reflog action message too long: %.*s..."
|
|
|
|
#~ msgstr "Reflog-händelsemeddelande för långt: %.*s..."
|
|
|
|
|
|
|
|
#~ msgid "Could not read commit message of %s"
|
|
|
|
#~ msgstr "Kunde inte läsa incheckningsmeddelandet för %s"
|
|
|
|
|
|
|
|
#~ msgid "Could not extract author email from %s"
|
|
|
|
#~ msgstr "Kunde inte hämta författarens e-postadress från %s"
|
|
|
|
|
|
|
|
#~ msgid "Could not extract author time from %s"
|
|
|
|
#~ msgstr "Kunde inte hämta författartid från %s"
|
|
|
|
|
|
|
|
#~ msgid "No author information found in %s"
|
|
|
|
#~ msgstr "Hittade ingen författarinformation i %s"
|
|
|
|
|
|
|
|
#~ msgid "cherry-pick --ff cannot be used with --signoff"
|
|
|
|
#~ msgstr "cherry-pick --ff kan inte användas med --signoff"
|
|
|
|
|
|
|
|
#~ msgid "cherry-pick --ff cannot be used with --no-commit"
|
|
|
|
#~ msgstr "cherry-pick --ff kan inte användas med --no-commit"
|
|
|
|
|
|
|
|
#~ msgid "cherry-pick --ff cannot be used with -x"
|
|
|
|
#~ msgstr "cherry-pick --ff kan inte användas med -x"
|
|
|
|
|
|
|
|
#~ msgid "cherry-pick --ff cannot be used with --edit"
|
|
|
|
#~ msgstr "cherry-pick --ff kan inte användas med --edit"
|
|
|
|
|
|
|
|
#~ msgid "committer info too long."
|
|
|
|
#~ msgstr "incheckarinformation för lång."
|
|
|
|
|
|
|
|
#~ msgid ""
|
|
|
|
#~ "\n"
|
|
|
|
#~ "#\n"
|
|
|
|
#~ "# Write a tag message\n"
|
|
|
|
#~ "#\n"
|
|
|
|
#~ msgstr ""
|
|
|
|
#~ "\n"
|
|
|
|
#~ "#\n"
|
|
|
|
#~ "# Skriv ett taggmeddelande\n"
|
|
|
|
#~ "#\n"
|
|
|
|
|
|
|
|
#~ msgid "signing key value too long (%.10s...)"
|
|
|
|
#~ msgstr "signeringsnyckelvärdet för långt (%.10s...)"
|