Merge https://github.com/j6t/gitk · freshlybakedca.ke/git@d882f38

Git fork

Merge https://github.com/j6t/gitk

* 'master' of https://github.com/j6t/gitk:
gitk: offer "Copy commit ID to X11 selection" only on X11
gitk: support auto-copy comit ID to primary clipboard
gitk: prefs dialog: refine Auto-select UI
gitk: UI text: change "SHA1 ID" to "Commit ID"
gitk: add text wrapping preferences
gitk: make headings of preferences bold
gitk: check main window visibility before waiting for it to show
gitk: sv.po: Update Swedish translation (323t)

Junio C Hamano 1 year ago d882f382 063bcebf

+439 -381

2 changed files

expand all

gitk-git

gitk

sv.po

+62 -24

gitk-git/gitk

··· 1969 return $confirm_ok 1970 } 1971 1972 proc setoptions {} { 1973 global use_ttk 1974 ··· 2089 global diffcontextstring diffcontext 2090 global ignorespace 2091 global maincursor textcursor curtextcursor 2092 - global rowctxmenu fakerowmenu mergemax wrapcomment 2093 global highlight_files gdttype 2094 global searchstring sstring 2095 global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor ··· 2223 set sha1entry .tf.bar.sha1 2224 set entries $sha1entry 2225 set sha1but .tf.bar.sha1label 2226 - button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \ 2227 -command gotocommit -width 8 2228 $sha1but conf -disabledforeground [$sha1but cget -foreground] 2229 pack .tf.bar.sha1label -side left ··· 2431 set ctext .bleft.bottom.ctext 2432 text $ctext -background $bgcolor -foreground $fgcolor \ 2433 -state disabled -undo 0 -font textfont \ 2434 - -yscrollcommand scrolltext -wrap none \ 2435 -xscrollcommand ".bleft.bottom.sbhorizontal set" 2436 if {$have_tk85} { 2437 $ctext conf -tabstyle wordprocessor ··· 7344 global mergemax numcommits pending_select 7345 global cmitmode showneartags allcommits 7346 global targetrow targetid lastscrollrows 7347 - global autoselect autosellen jump_to_here 7348 global vinlinediff 7349 7350 unset -nocomplain pending_select ··· 7410 7411 $sha1entry delete 0 end 7412 $sha1entry insert 0 $id 7413 - if {$autoselect} { 7414 $sha1entry selection range 0 $autosellen 7415 } 7416 rhighlight_sel $id 7417 ··· 8756 if {$state == "normal"} { 8757 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " 8758 } else { 8759 - $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " 8760 } 8761 } 8762 ··· 8775 set matches [longid $id] 8776 if {$matches ne {}} { 8777 if {[llength $matches] > 1} { 8778 - error_popup [mc "Short SHA1 id %s is ambiguous" $id] 8779 return 8780 } 8781 set id [lindex $matches 0] ··· 8792 return 8793 } 8794 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { 8795 - set msg [mc "SHA1 id %s is not known" $sha1string] 8796 } else { 8797 set msg [mc "Revision %s is not in the current view" $sha1string] 8798 } ··· 11576 11577 proc prefspage_general {notebook} { 11578 global NS maxwidth maxgraphpct showneartags showlocalchanges 11579 - global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs 11580 global hideremotes want_ttk have_ttk maxrefs web_browser 11581 11582 set page [create_prefs_page $notebook.general] 11583 11584 - ${NS}::label $page.ldisp -text [mc "Commit list display options"] 11585 grid $page.ldisp - -sticky w -pady 10 11586 ${NS}::label $page.spacer -text " " 11587 ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"] ··· 11594 ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \ 11595 -variable showlocalchanges 11596 grid x $page.showlocal -sticky w 11597 - ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \ 11598 - -variable autoselect 11599 - spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen 11600 - grid x $page.autoselect $page.autosellen -sticky w 11601 ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ 11602 -variable hideremotes 11603 grid x $page.hideremotes -sticky w 11604 11605 - ${NS}::label $page.ddisp -text [mc "Diff display options"] 11606 grid $page.ddisp - -sticky w -pady 10 11607 ${NS}::label $page.tabstopl -text [mc "Tab spacing"] 11608 spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop 11609 grid x $page.tabstopl $page.tabstop -sticky w 11610 ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ 11611 -variable showneartags 11612 grid x $page.ntag -sticky w ··· 11635 pack configure $page.webbrowserf.l -padx 10 11636 grid x $page.webbrowserf $page.webbrowser -sticky ew 11637 11638 - ${NS}::label $page.lgen -text [mc "General options"] 11639 grid $page.lgen - -sticky w -pady 10 11640 ${NS}::checkbutton $page.want_ttk -variable want_ttk \ 11641 -text [mc "Use themed widgets"] ··· 11654 11655 set page [create_prefs_page $notebook.colors] 11656 11657 - ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] 11658 grid $page.cdisp - -sticky w -pady 10 11659 label $page.ui -padx 40 -relief sunk -background $uicolor 11660 ${NS}::button $page.uibut -text [mc "Interface"] \ ··· 11712 proc prefspage_fonts {notebook} { 11713 global NS 11714 set page [create_prefs_page $notebook.fonts] 11715 - ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] 11716 grid $page.cfont - -sticky w -pady 10 11717 mkfontdisp mainfont $page [mc "Main font"] 11718 mkfontdisp textfont $page [mc "Diff display font"] ··· 11725 global oldprefs prefstop showneartags showlocalchanges 11726 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor 11727 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs 11728 - global hideremotes want_ttk have_ttk 11729 11730 set top .gitkprefs 11731 set prefstop $top ··· 11734 return 11735 } 11736 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11737 - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { 11738 set oldprefs($v) [set $v] 11739 } 11740 ttk_toplevel $top ··· 11860 global oldprefs prefstop 11861 11862 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11863 - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { 11864 global $v 11865 set $v $oldprefs($v) 11866 } ··· 11874 global oldprefs prefstop showneartags showlocalchanges 11875 global fontpref mainfont textfont uifont 11876 global limitdiffs treediffs perfile_attrs 11877 - global hideremotes 11878 11879 catch {destroy $prefstop} 11880 unset prefstop ··· 11923 if {$hideremotes != $oldprefs(hideremotes)} { 11924 rereadrefs 11925 } 11926 } 11927 11928 proc formatdate {d} { ··· 12392 set mingaplen 100 12393 set cmitmode "patch" 12394 set wrapcomment "none" 12395 set showneartags 1 12396 set hideremotes 0 12397 set maxrefs 20 ··· 12400 set showlocalchanges 1 12401 set limitdiffs 1 12402 set datetimeformat "%Y-%m-%d %H:%M:%S" 12403 set autoselect 1 12404 set autosellen 40 12405 set perfile_attrs 0 ··· 12497 12498 set config_variables { 12499 mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth 12500 - cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs 12501 hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk 12502 bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors 12503 markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor ··· 12687 wm iconphoto . -default gitlogo gitlogo32 12688 } 12689 # wait for the window to become visible 12690 - tkwait visibility . 12691 set_window_title 12692 update 12693 readrefs

··· 1969 return $confirm_ok 1970 } 1971 1972 + proc haveselectionclipboard {} { 1973 + return [expr {[tk windowingsystem] eq "x11"}] 1974 + } 1975 + 1976 proc setoptions {} { 1977 global use_ttk 1978 ··· 2093 global diffcontextstring diffcontext 2094 global ignorespace 2095 global maincursor textcursor curtextcursor 2096 + global rowctxmenu fakerowmenu mergemax wrapcomment wrapdefault 2097 global highlight_files gdttype 2098 global searchstring sstring 2099 global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor ··· 2227 set sha1entry .tf.bar.sha1 2228 set entries $sha1entry 2229 set sha1but .tf.bar.sha1label 2230 + button $sha1but -text "[mc "Commit ID:"] " -state disabled -relief flat \ 2231 -command gotocommit -width 8 2232 $sha1but conf -disabledforeground [$sha1but cget -foreground] 2233 pack .tf.bar.sha1label -side left ··· 2435 set ctext .bleft.bottom.ctext 2436 text $ctext -background $bgcolor -foreground $fgcolor \ 2437 -state disabled -undo 0 -font textfont \ 2438 + -yscrollcommand scrolltext -wrap $wrapdefault \ 2439 -xscrollcommand ".bleft.bottom.sbhorizontal set" 2440 if {$have_tk85} { 2441 $ctext conf -tabstyle wordprocessor ··· 7348 global mergemax numcommits pending_select 7349 global cmitmode showneartags allcommits 7350 global targetrow targetid lastscrollrows 7351 + global autocopy autoselect autosellen jump_to_here 7352 global vinlinediff 7353 7354 unset -nocomplain pending_select ··· 7414 7415 $sha1entry delete 0 end 7416 $sha1entry insert 0 $id 7417 + if {$autoselect && [haveselectionclipboard]} { 7418 $sha1entry selection range 0 $autosellen 7419 + } 7420 + if {$autocopy} { 7421 + clipboard clear 7422 + clipboard append [string range $id 0 [expr $autosellen - 1]] 7423 } 7424 rhighlight_sel $id 7425 ··· 8764 if {$state == "normal"} { 8765 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " 8766 } else { 8767 + $sha1but conf -state disabled -relief flat -text "[mc "Commit ID:"] " 8768 } 8769 } 8770 ··· 8783 set matches [longid $id] 8784 if {$matches ne {}} { 8785 if {[llength $matches] > 1} { 8786 + error_popup [mc "Short commit ID %s is ambiguous" $id] 8787 return 8788 } 8789 set id [lindex $matches 0] ··· 8800 return 8801 } 8802 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { 8803 + set msg [mc "Commit ID %s is not known" $sha1string] 8804 } else { 8805 set msg [mc "Revision %s is not in the current view" $sha1string] 8806 } ··· 11584 11585 proc prefspage_general {notebook} { 11586 global NS maxwidth maxgraphpct showneartags showlocalchanges 11587 + global tabstop wrapcomment wrapdefault limitdiffs 11588 + global autocopy autoselect autosellen extdifftool perfile_attrs 11589 global hideremotes want_ttk have_ttk maxrefs web_browser 11590 11591 set page [create_prefs_page $notebook.general] 11592 11593 + ${NS}::label $page.ldisp -text [mc "Commit list display options"] -font mainfontbold 11594 grid $page.ldisp - -sticky w -pady 10 11595 ${NS}::label $page.spacer -text " " 11596 ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"] ··· 11603 ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \ 11604 -variable showlocalchanges 11605 grid x $page.showlocal -sticky w 11606 ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ 11607 -variable hideremotes 11608 grid x $page.hideremotes -sticky w 11609 11610 + ${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \ 11611 + -variable autocopy 11612 + grid x $page.autocopy -sticky w 11613 + if {[haveselectionclipboard]} { 11614 + ${NS}::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \ 11615 + -variable autoselect 11616 + grid x $page.autoselect -sticky w 11617 + } 11618 + spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen 11619 + ${NS}::label $page.autosellenl -text [mc "Length of commit ID to copy"] 11620 + grid x $page.autosellenl $page.autosellen -sticky w 11621 + 11622 + ${NS}::label $page.ddisp -text [mc "Diff display options"] -font mainfontbold 11623 grid $page.ddisp - -sticky w -pady 10 11624 ${NS}::label $page.tabstopl -text [mc "Tab spacing"] 11625 spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop 11626 grid x $page.tabstopl $page.tabstop -sticky w 11627 + 11628 + ${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"] 11629 + ${NS}::combobox $page.wrapcomment -values {none char word} -state readonly \ 11630 + -textvariable wrapcomment 11631 + grid x $page.wrapcommentl $page.wrapcomment -sticky w 11632 + 11633 + ${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"] 11634 + ${NS}::combobox $page.wrapdefault -values {none char word} -state readonly \ 11635 + -textvariable wrapdefault 11636 + grid x $page.wrapdefaultl $page.wrapdefault -sticky w 11637 + 11638 ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ 11639 -variable showneartags 11640 grid x $page.ntag -sticky w ··· 11663 pack configure $page.webbrowserf.l -padx 10 11664 grid x $page.webbrowserf $page.webbrowser -sticky ew 11665 11666 + ${NS}::label $page.lgen -text [mc "General options"] -font mainfontbold 11667 grid $page.lgen - -sticky w -pady 10 11668 ${NS}::checkbutton $page.want_ttk -variable want_ttk \ 11669 -text [mc "Use themed widgets"] ··· 11682 11683 set page [create_prefs_page $notebook.colors] 11684 11685 + ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] -font mainfontbold 11686 grid $page.cdisp - -sticky w -pady 10 11687 label $page.ui -padx 40 -relief sunk -background $uicolor 11688 ${NS}::button $page.uibut -text [mc "Interface"] \ ··· 11740 proc prefspage_fonts {notebook} { 11741 global NS 11742 set page [create_prefs_page $notebook.fonts] 11743 + ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] -font mainfontbold 11744 grid $page.cfont - -sticky w -pady 10 11745 mkfontdisp mainfont $page [mc "Main font"] 11746 mkfontdisp textfont $page [mc "Diff display font"] ··· 11753 global oldprefs prefstop showneartags showlocalchanges 11754 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor 11755 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs 11756 + global hideremotes want_ttk have_ttk wrapcomment wrapdefault 11757 11758 set top .gitkprefs 11759 set prefstop $top ··· 11762 return 11763 } 11764 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11765 + limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} { 11766 set oldprefs($v) [set $v] 11767 } 11768 ttk_toplevel $top ··· 11888 global oldprefs prefstop 11889 11890 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11891 + limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} { 11892 global $v 11893 set $v $oldprefs($v) 11894 } ··· 11902 global oldprefs prefstop showneartags showlocalchanges 11903 global fontpref mainfont textfont uifont 11904 global limitdiffs treediffs perfile_attrs 11905 + global hideremotes wrapcomment wrapdefault 11906 + global ctext 11907 11908 catch {destroy $prefstop} 11909 unset prefstop ··· 11952 if {$hideremotes != $oldprefs(hideremotes)} { 11953 rereadrefs 11954 } 11955 + if {$wrapcomment != $oldprefs(wrapcomment)} { 11956 + $ctext tag conf comment -wrap $wrapcomment 11957 + } 11958 + if {$wrapdefault != $oldprefs(wrapdefault)} { 11959 + $ctext configure -wrap $wrapdefault 11960 + } 11961 } 11962 11963 proc formatdate {d} { ··· 12427 set mingaplen 100 12428 set cmitmode "patch" 12429 set wrapcomment "none" 12430 + set wrapdefault "none" 12431 set showneartags 1 12432 set hideremotes 0 12433 set maxrefs 20 ··· 12436 set showlocalchanges 1 12437 set limitdiffs 1 12438 set datetimeformat "%Y-%m-%d %H:%M:%S" 12439 + set autocopy 0 12440 set autoselect 1 12441 set autosellen 40 12442 set perfile_attrs 0 ··· 12534 12535 set config_variables { 12536 mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth 12537 + cmitmode wrapcomment wrapdefault autocopy autoselect autosellen 12538 + showneartags maxrefs visiblerefs 12539 hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk 12540 bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors 12541 markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor ··· 12725 wm iconphoto . -default gitlogo gitlogo32 12726 } 12727 # wait for the window to become visible 12728 + if {![winfo viewable .]} {tkwait visibility .} 12729 set_window_title 12730 update 12731 readrefs

+377 -357

gitk-git/po/sv.po

··· 3 # This file is distributed under the same license as the gitk package. 4 # 5 # Mikael Magnusson <mikachu@gmail.com>, 2008. 6 - # Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013, 2015. 7 # 8 msgid "" 9 msgstr "" 10 "Project-Id-Version: sv\n" 11 "Report-Msgid-Bugs-To: \n" 12 - "POT-Creation-Date: 2015-12-09 09:40+0100\n" 13 - "PO-Revision-Date: 2015-12-11 09:46+0100\n" 14 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" 15 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 16 "Language: sv\n" ··· 18 "Content-Type: text/plain; charset=UTF-8\n" 19 "Content-Transfer-Encoding: 8bit\n" 20 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 21 - "X-Generator: Gtranslator 2.91.6\n" 22 23 - #: gitk:140 24 msgid "Couldn't get list of unmerged files:" 25 msgstr "Kunde inte hämta lista över ej sammanslagna filer:" 26 27 - #: gitk:212 gitk:2381 28 msgid "Color words" 29 msgstr "Färga ord" 30 31 - #: gitk:217 gitk:2381 gitk:8221 gitk:8254 32 msgid "Markup words" 33 msgstr "Märk upp ord" 34 35 - #: gitk:324 36 msgid "Error parsing revisions:" 37 msgstr "Fel vid tolkning av revisioner:" 38 39 - #: gitk:380 40 msgid "Error executing --argscmd command:" 41 msgstr "Fel vid körning av --argscmd-kommando:" 42 43 - #: gitk:393 44 msgid "No files selected: --merge specified but no files are unmerged." 45 msgstr "" 46 "Inga filer valdes: --merge angavs men det finns inga filer som inte har " 47 "slagits samman." 48 49 - #: gitk:396 50 msgid "" 51 "No files selected: --merge specified but no unmerged files are within file " 52 "limit." ··· 54 "Inga filer valdes: --merge angavs men det finns inga filer inom " 55 "filbegränsningen." 56 57 - #: gitk:418 gitk:566 58 msgid "Error executing git log:" 59 msgstr "Fel vid körning av git log:" 60 61 - #: gitk:436 gitk:582 62 msgid "Reading" 63 msgstr "Läser" 64 65 - #: gitk:496 gitk:4526 66 msgid "Reading commits..." 67 msgstr "Läser incheckningar..." 68 69 - #: gitk:499 gitk:1637 gitk:4529 70 msgid "No commits selected" 71 msgstr "Inga incheckningar markerade" 72 73 - #: gitk:1445 gitk:4046 gitk:12447 74 msgid "Command line" 75 msgstr "Kommandorad" 76 77 - #: gitk:1511 78 msgid "Can't parse git log output:" 79 msgstr "Kan inte tolka utdata från git log:" 80 81 - #: gitk:1740 82 msgid "No commit information available" 83 msgstr "Ingen incheckningsinformation är tillgänglig" 84 85 - #: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 86 msgid "OK" 87 msgstr "OK" 88 89 - #: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 90 - #: gitk:11257 gitk:11537 91 msgid "Cancel" 92 msgstr "Avbryt" 93 94 - #: gitk:2069 95 msgid "&Update" 96 msgstr "&Uppdatera" 97 98 - #: gitk:2070 99 msgid "&Reload" 100 msgstr "Läs &om" 101 102 - #: gitk:2071 103 msgid "Reread re&ferences" 104 msgstr "Läs om &referenser" 105 106 - #: gitk:2072 107 msgid "&List references" 108 msgstr "&Visa referenser" 109 110 - #: gitk:2074 111 msgid "Start git &gui" 112 msgstr "Starta git &gui" 113 114 - #: gitk:2076 115 msgid "&Quit" 116 msgstr "&Avsluta" 117 118 - #: gitk:2068 119 msgid "&File" 120 msgstr "&Arkiv" 121 122 - #: gitk:2080 123 msgid "&Preferences" 124 msgstr "&Inställningar" 125 126 - #: gitk:2079 127 msgid "&Edit" 128 msgstr "&Redigera" 129 130 - #: gitk:2084 131 msgid "&New view..." 132 msgstr "&Ny vy..." 133 134 - #: gitk:2085 135 msgid "&Edit view..." 136 msgstr "&Ändra vy..." 137 138 - #: gitk:2086 139 msgid "&Delete view" 140 msgstr "&Ta bort vy" 141 142 - #: gitk:2088 143 msgid "&All files" 144 msgstr "&Alla filer" 145 146 - #: gitk:2083 147 msgid "&View" 148 msgstr "&Visa" 149 150 - #: gitk:2093 gitk:2103 151 msgid "&About gitk" 152 msgstr "&Om gitk" 153 154 - #: gitk:2094 gitk:2108 155 msgid "&Key bindings" 156 msgstr "&Tangentbordsbindningar" 157 158 - #: gitk:2092 gitk:2107 159 msgid "&Help" 160 msgstr "&Hjälp" 161 162 - #: gitk:2185 gitk:8653 163 msgid "SHA1 ID:" 164 msgstr "SHA1-id:" 165 166 - #: gitk:2229 167 msgid "Row" 168 msgstr "Rad" 169 170 - #: gitk:2267 171 msgid "Find" 172 msgstr "Sök" 173 174 - #: gitk:2295 175 msgid "commit" 176 msgstr "incheckning" 177 178 - #: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 179 - #: gitk:6913 180 msgid "containing:" 181 msgstr "som innehåller:" 182 183 - #: gitk:2302 gitk:3527 gitk:3532 gitk:4764 184 msgid "touching paths:" 185 msgstr "som rör sökväg:" 186 187 - #: gitk:2303 gitk:4778 188 msgid "adding/removing string:" 189 msgstr "som lägger/till tar bort sträng:" 190 191 - #: gitk:2304 gitk:4780 192 msgid "changing lines matching:" 193 msgstr "ändrar rader som matchar:" 194 195 - #: gitk:2313 gitk:2315 gitk:4767 196 msgid "Exact" 197 msgstr "Exakt" 198 199 - #: gitk:2315 gitk:4855 gitk:6724 200 msgid "IgnCase" 201 msgstr "IgnVersaler" 202 203 - #: gitk:2315 gitk:4737 gitk:4853 gitk:6720 204 msgid "Regexp" 205 msgstr "Reg.uttr." 206 207 - #: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 208 msgid "All fields" 209 msgstr "Alla fält" 210 211 - #: gitk:2318 gitk:4872 gitk:4905 gitk:6787 212 msgid "Headline" 213 msgstr "Rubrik" 214 215 - #: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 216 msgid "Comments" 217 msgstr "Kommentarer" 218 219 - #: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 220 - #: gitk:8846 221 msgid "Author" 222 msgstr "Författare" 223 224 - #: gitk:2319 gitk:4872 gitk:6787 gitk:7327 225 msgid "Committer" 226 msgstr "Incheckare" 227 228 - #: gitk:2350 229 msgid "Search" 230 msgstr "Sök" 231 232 - #: gitk:2358 233 msgid "Diff" 234 msgstr "Diff" 235 236 - #: gitk:2360 237 msgid "Old version" 238 msgstr "Gammal version" 239 240 - #: gitk:2362 241 msgid "New version" 242 msgstr "Ny version" 243 244 - #: gitk:2364 245 msgid "Lines of context" 246 msgstr "Rader sammanhang" 247 248 - #: gitk:2374 249 msgid "Ignore space change" 250 msgstr "Ignorera ändringar i blanksteg" 251 252 - #: gitk:2378 gitk:2380 gitk:7960 gitk:8207 253 msgid "Line diff" 254 msgstr "Rad-diff" 255 256 - #: gitk:2445 257 msgid "Patch" 258 msgstr "Patch" 259 260 - #: gitk:2447 261 msgid "Tree" 262 msgstr "Träd" 263 264 - #: gitk:2617 gitk:2638 265 msgid "Diff this -> selected" 266 msgstr "Diff denna -> markerad" 267 268 - #: gitk:2618 gitk:2639 269 msgid "Diff selected -> this" 270 msgstr "Diff markerad -> denna" 271 272 - #: gitk:2619 gitk:2640 273 msgid "Make patch" 274 msgstr "Skapa patch" 275 276 - #: gitk:2620 gitk:9255 277 msgid "Create tag" 278 msgstr "Skapa tagg" 279 280 - #: gitk:2621 281 - msgid "Copy commit summary" 282 - msgstr "Kopiera incheckningssammanfattning" 283 284 - #: gitk:2622 gitk:9386 285 msgid "Write commit to file" 286 msgstr "Skriv incheckning till fil" 287 288 - #: gitk:2623 gitk:9443 289 msgid "Create new branch" 290 msgstr "Skapa ny gren" 291 292 - #: gitk:2624 293 msgid "Cherry-pick this commit" 294 msgstr "Plocka denna incheckning" 295 296 - #: gitk:2625 297 msgid "Reset HEAD branch to here" 298 msgstr "Återställ HEAD-grenen hit" 299 300 - #: gitk:2626 301 msgid "Mark this commit" 302 msgstr "Markera denna incheckning" 303 304 - #: gitk:2627 305 msgid "Return to mark" 306 msgstr "Återgå till markering" 307 308 - #: gitk:2628 309 msgid "Find descendant of this and mark" 310 msgstr "Hitta efterföljare till denna och markera" 311 312 - #: gitk:2629 313 msgid "Compare with marked commit" 314 msgstr "Jämför med markerad incheckning" 315 316 - #: gitk:2630 gitk:2641 317 msgid "Diff this -> marked commit" 318 msgstr "Diff denna -> markerad incheckning" 319 320 - #: gitk:2631 gitk:2642 321 msgid "Diff marked commit -> this" 322 msgstr "Diff markerad incheckning -> denna" 323 324 - #: gitk:2632 325 msgid "Revert this commit" 326 msgstr "Ångra denna incheckning" 327 328 - #: gitk:2648 329 msgid "Check out this branch" 330 msgstr "Checka ut denna gren" 331 332 - #: gitk:2649 333 msgid "Remove this branch" 334 msgstr "Ta bort denna gren" 335 336 - #: gitk:2650 337 msgid "Copy branch name" 338 msgstr "Kopiera namn på gren" 339 340 - #: gitk:2657 341 msgid "Highlight this too" 342 msgstr "Markera även detta" 343 344 - #: gitk:2658 345 msgid "Highlight this only" 346 msgstr "Markera bara detta" 347 348 - #: gitk:2659 349 msgid "External diff" 350 msgstr "Extern diff" 351 352 - #: gitk:2660 353 msgid "Blame parent commit" 354 msgstr "Klandra föräldraincheckning" 355 356 - #: gitk:2661 357 msgid "Copy path" 358 msgstr "Kopiera sökväg" 359 360 - #: gitk:2668 361 msgid "Show origin of this line" 362 msgstr "Visa ursprunget för den här raden" 363 364 - #: gitk:2669 365 msgid "Run git gui blame on this line" 366 msgstr "Kör git gui blame på den här raden" 367 368 - #: gitk:3013 369 msgid "About gitk" 370 msgstr "Om gitk" 371 372 - #: gitk:3015 373 msgid "" 374 "\n" 375 "Gitk - a commit viewer for git\n" ··· 385 "\n" 386 "Använd och vidareförmedla enligt villkoren i GNU General Public License" 387 388 - #: gitk:3023 gitk:3090 gitk:9872 389 msgid "Close" 390 msgstr "Stäng" 391 392 - #: gitk:3044 393 msgid "Gitk key bindings" 394 msgstr "Tangentbordsbindningar för Gitk" 395 396 - #: gitk:3047 397 msgid "Gitk key bindings:" 398 msgstr "Tangentbordsbindningar för Gitk:" 399 400 - #: gitk:3049 401 #, tcl-format 402 msgid "<%s-Q>\t\tQuit" 403 msgstr "<%s-Q>\t\tAvsluta" 404 405 - #: gitk:3050 406 #, tcl-format 407 msgid "<%s-W>\t\tClose window" 408 msgstr "<%s-W>\t\tStäng fönster" 409 410 - #: gitk:3051 411 msgid "<Home>\t\tMove to first commit" 412 msgstr "<Home>\t\tGå till första incheckning" 413 414 - #: gitk:3052 415 msgid "<End>\t\tMove to last commit" 416 msgstr "<End>\t\tGå till sista incheckning" 417 418 - #: gitk:3053 419 msgid "<Up>, p, k\tMove up one commit" 420 msgstr "<Upp>, p, k\tGå en incheckning upp" 421 422 - #: gitk:3054 423 msgid "<Down>, n, j\tMove down one commit" 424 msgstr "<Ned>, n, j\tGå en incheckning ned" 425 426 - #: gitk:3055 427 msgid "<Left>, z, h\tGo back in history list" 428 msgstr "<Vänster>, z, h\tGå bakåt i historiken" 429 430 - #: gitk:3056 431 msgid "<Right>, x, l\tGo forward in history list" 432 msgstr "<Höger>, x, l\tGå framåt i historiken" 433 434 - #: gitk:3057 435 #, tcl-format 436 msgid "<%s-n>\tGo to n-th parent of current commit in history list" 437 msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan" 438 439 - #: gitk:3058 440 msgid "<PageUp>\tMove up one page in commit list" 441 msgstr "<PageUp>\tGå upp en sida i incheckningslistan" 442 443 - #: gitk:3059 444 msgid "<PageDown>\tMove down one page in commit list" 445 msgstr "<PageDown>\tGå ned en sida i incheckningslistan" 446 447 - #: gitk:3060 448 #, tcl-format 449 msgid "<%s-Home>\tScroll to top of commit list" 450 msgstr "<%s-Home>\tRulla till början av incheckningslistan" 451 452 - #: gitk:3061 453 #, tcl-format 454 msgid "<%s-End>\tScroll to bottom of commit list" 455 msgstr "<%s-End>\tRulla till slutet av incheckningslistan" 456 457 - #: gitk:3062 458 #, tcl-format 459 msgid "<%s-Up>\tScroll commit list up one line" 460 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" 461 462 - #: gitk:3063 463 #, tcl-format 464 msgid "<%s-Down>\tScroll commit list down one line" 465 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" 466 467 - #: gitk:3064 468 #, tcl-format 469 msgid "<%s-PageUp>\tScroll commit list up one page" 470 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" 471 472 - #: gitk:3065 473 #, tcl-format 474 msgid "<%s-PageDown>\tScroll commit list down one page" 475 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" 476 477 - #: gitk:3066 478 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" 479 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" 480 481 - #: gitk:3067 482 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" 483 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" 484 485 - #: gitk:3068 486 msgid "<Delete>, b\tScroll diff view up one page" 487 msgstr "<Delete>, b\tRulla diffvisningen upp en sida" 488 489 - #: gitk:3069 490 msgid "<Backspace>\tScroll diff view up one page" 491 msgstr "<Baksteg>\tRulla diffvisningen upp en sida" 492 493 - #: gitk:3070 494 msgid "<Space>\t\tScroll diff view down one page" 495 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" 496 497 - #: gitk:3071 498 msgid "u\t\tScroll diff view up 18 lines" 499 msgstr "u\t\tRulla diffvisningen upp 18 rader" 500 501 - #: gitk:3072 502 msgid "d\t\tScroll diff view down 18 lines" 503 msgstr "d\t\tRulla diffvisningen ned 18 rader" 504 505 - #: gitk:3073 506 #, tcl-format 507 msgid "<%s-F>\t\tFind" 508 msgstr "<%s-F>\t\tSök" 509 510 - #: gitk:3074 511 #, tcl-format 512 msgid "<%s-G>\t\tMove to next find hit" 513 msgstr "<%s-G>\t\tGå till nästa sökträff" 514 515 - #: gitk:3075 516 msgid "<Return>\tMove to next find hit" 517 msgstr "<Return>\t\tGå till nästa sökträff" 518 519 - #: gitk:3076 520 msgid "g\t\tGo to commit" 521 msgstr "g\t\tGå till incheckning" 522 523 - #: gitk:3077 524 msgid "/\t\tFocus the search box" 525 msgstr "/\t\tFokusera sökrutan" 526 527 - #: gitk:3078 528 msgid "?\t\tMove to previous find hit" 529 msgstr "?\t\tGå till föregående sökträff" 530 531 - #: gitk:3079 532 msgid "f\t\tScroll diff view to next file" 533 msgstr "f\t\tRulla diffvisningen till nästa fil" 534 535 - #: gitk:3080 536 #, tcl-format 537 msgid "<%s-S>\t\tSearch for next hit in diff view" 538 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen" 539 540 - #: gitk:3081 541 #, tcl-format 542 msgid "<%s-R>\t\tSearch for previous hit in diff view" 543 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen" 544 545 - #: gitk:3082 546 #, tcl-format 547 msgid "<%s-KP+>\tIncrease font size" 548 msgstr "<%s-Num+>\tÖka teckenstorlek" 549 550 - #: gitk:3083 551 #, tcl-format 552 msgid "<%s-plus>\tIncrease font size" 553 msgstr "<%s-plus>\tÖka teckenstorlek" 554 555 - #: gitk:3084 556 #, tcl-format 557 msgid "<%s-KP->\tDecrease font size" 558 msgstr "<%s-Num->\tMinska teckenstorlek" 559 560 - #: gitk:3085 561 #, tcl-format 562 msgid "<%s-minus>\tDecrease font size" 563 msgstr "<%s-minus>\tMinska teckenstorlek" 564 565 - #: gitk:3086 566 msgid "<F5>\t\tUpdate" 567 msgstr "<F5>\t\tUppdatera" 568 569 - #: gitk:3551 gitk:3560 570 #, tcl-format 571 msgid "Error creating temporary directory %s:" 572 msgstr "Fel vid skapande av temporär katalog %s:" 573 574 - #: gitk:3573 575 #, tcl-format 576 msgid "Error getting \"%s\" from %s:" 577 - msgstr "Fel vid hämtning av \"%s\" från %s:" 578 579 - #: gitk:3636 580 msgid "command failed:" 581 msgstr "kommando misslyckades:" 582 583 - #: gitk:3785 584 msgid "No such commit" 585 msgstr "Incheckning saknas" 586 587 - #: gitk:3799 588 msgid "git gui blame: command failed:" 589 msgstr "git gui blame: kommando misslyckades:" 590 591 - #: gitk:3830 592 #, tcl-format 593 msgid "Couldn't read merge head: %s" 594 msgstr "Kunde inte läsa sammanslagningshuvud: %s" 595 596 - #: gitk:3838 597 #, tcl-format 598 msgid "Error reading index: %s" 599 msgstr "Fel vid läsning av index: %s" 600 601 - #: gitk:3863 602 #, tcl-format 603 msgid "Couldn't start git blame: %s" 604 msgstr "Kunde inte starta git blame: %s" 605 606 - #: gitk:3866 gitk:6755 607 msgid "Searching" 608 msgstr "Söker" 609 610 - #: gitk:3898 611 #, tcl-format 612 msgid "Error running git blame: %s" 613 msgstr "Fel vid körning av git blame: %s" 614 615 - #: gitk:3926 616 #, tcl-format 617 msgid "That line comes from commit %s, which is not in this view" 618 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy" 619 620 - #: gitk:3940 621 msgid "External diff viewer failed:" 622 msgstr "Externt diff-verktyg misslyckades:" 623 624 - #: gitk:4044 625 msgid "All files" 626 msgstr "Alla filer" 627 628 - #: gitk:4068 629 msgid "View" 630 msgstr "Visa" 631 632 - #: gitk:4071 633 msgid "Gitk view definition" 634 msgstr "Definition av Gitk-vy" 635 636 - #: gitk:4075 637 msgid "Remember this view" 638 msgstr "Spara denna vy" 639 640 - #: gitk:4076 641 msgid "References (space separated list):" 642 msgstr "Referenser (blankstegsavdelad lista):" 643 644 - #: gitk:4077 645 msgid "Branches & tags:" 646 msgstr "Grenar & taggar:" 647 648 - #: gitk:4078 649 msgid "All refs" 650 msgstr "Alla referenser" 651 652 - #: gitk:4079 653 msgid "All (local) branches" 654 msgstr "Alla (lokala) grenar" 655 656 - #: gitk:4080 657 msgid "All tags" 658 msgstr "Alla taggar" 659 660 - #: gitk:4081 661 msgid "All remote-tracking branches" 662 msgstr "Alla fjärrspårande grenar" 663 664 - #: gitk:4082 665 msgid "Commit Info (regular expressions):" 666 msgstr "Incheckningsinfo (reguljära uttryck):" 667 668 - #: gitk:4083 669 msgid "Author:" 670 msgstr "Författare:" 671 672 - #: gitk:4084 673 msgid "Committer:" 674 msgstr "Incheckare:" 675 676 - #: gitk:4085 677 msgid "Commit Message:" 678 msgstr "Incheckningsmeddelande:" 679 680 - #: gitk:4086 681 msgid "Matches all Commit Info criteria" 682 msgstr "Motsvarar alla kriterier för incheckningsinfo" 683 684 - #: gitk:4087 685 msgid "Matches no Commit Info criteria" 686 msgstr "Motsvarar inga kriterier för incheckningsinfo" 687 688 - #: gitk:4088 689 msgid "Changes to Files:" 690 msgstr "Ändringar av filer:" 691 692 - #: gitk:4089 693 msgid "Fixed String" 694 msgstr "Fast sträng" 695 696 - #: gitk:4090 697 msgid "Regular Expression" 698 msgstr "Reguljärt uttryck" 699 700 - #: gitk:4091 701 msgid "Search string:" 702 msgstr "Söksträng:" 703 704 - #: gitk:4092 705 msgid "" 706 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " 707 "15:27:38\"):" 708 msgstr "" 709 - "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " 710 - "15:27:38\"):" 711 712 - #: gitk:4093 713 msgid "Since:" 714 msgstr "Från:" 715 716 - #: gitk:4094 717 msgid "Until:" 718 msgstr "Till:" 719 720 - #: gitk:4095 721 msgid "Limit and/or skip a number of revisions (positive integer):" 722 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" 723 724 - #: gitk:4096 725 msgid "Number to show:" 726 msgstr "Antal att visa:" 727 728 - #: gitk:4097 729 msgid "Number to skip:" 730 msgstr "Antal att hoppa över:" 731 732 - #: gitk:4098 733 msgid "Miscellaneous options:" 734 msgstr "Diverse alternativ:" 735 736 - #: gitk:4099 737 msgid "Strictly sort by date" 738 msgstr "Strikt datumsortering" 739 740 - #: gitk:4100 741 msgid "Mark branch sides" 742 msgstr "Markera sidogrenar" 743 744 - #: gitk:4101 745 msgid "Limit to first parent" 746 msgstr "Begränsa till första förälder" 747 748 - #: gitk:4102 749 msgid "Simple history" 750 msgstr "Enkel historik" 751 752 - #: gitk:4103 753 msgid "Additional arguments to git log:" 754 msgstr "Ytterligare argument till git log:" 755 756 - #: gitk:4104 757 msgid "Enter files and directories to include, one per line:" 758 msgstr "Ange filer och kataloger att ta med, en per rad:" 759 760 - #: gitk:4105 761 msgid "Command to generate more commits to include:" 762 msgstr "Kommando för att generera fler incheckningar att ta med:" 763 764 - #: gitk:4229 765 msgid "Gitk: edit view" 766 msgstr "Gitk: redigera vy" 767 768 - #: gitk:4237 769 msgid "-- criteria for selecting revisions" 770 msgstr " - kriterier för val av revisioner" 771 772 - #: gitk:4242 773 msgid "View Name" 774 msgstr "Namn på vy" 775 776 - #: gitk:4317 777 msgid "Apply (F5)" 778 msgstr "Använd (F5)" 779 780 - #: gitk:4355 781 msgid "Error in commit selection arguments:" 782 msgstr "Fel i argument för val av incheckningar:" 783 784 - #: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 785 msgid "None" 786 msgstr "Inget" 787 788 - #: gitk:5022 gitk:5027 789 msgid "Descendant" 790 msgstr "Avkomling" 791 792 - #: gitk:5023 793 msgid "Not descendant" 794 msgstr "Inte avkomling" 795 796 - #: gitk:5030 gitk:5035 797 msgid "Ancestor" 798 msgstr "Förfader" 799 800 - #: gitk:5031 801 msgid "Not ancestor" 802 msgstr "Inte förfader" 803 804 - #: gitk:5325 805 msgid "Local changes checked in to index but not committed" 806 msgstr "Lokala ändringar sparade i indexet men inte incheckade" 807 808 - #: gitk:5361 809 msgid "Local uncommitted changes, not checked in to index" 810 msgstr "Lokala ändringar, ej sparade i indexet" 811 812 - #: gitk:7135 813 msgid "and many more" 814 msgstr "med många flera" 815 816 - #: gitk:7138 817 msgid "many" 818 msgstr "många" 819 820 - #: gitk:7329 821 msgid "Tags:" 822 msgstr "Taggar:" 823 824 - #: gitk:7346 gitk:7352 gitk:8826 825 msgid "Parent" 826 msgstr "Förälder" 827 828 - #: gitk:7357 829 msgid "Child" 830 msgstr "Barn" 831 832 - #: gitk:7366 833 msgid "Branch" 834 msgstr "Gren" 835 836 - #: gitk:7369 837 msgid "Follows" 838 msgstr "Följer" 839 840 - #: gitk:7372 841 msgid "Precedes" 842 msgstr "Föregår" 843 844 - #: gitk:7967 845 #, tcl-format 846 msgid "Error getting diffs: %s" 847 msgstr "Fel vid hämtning av diff: %s" 848 849 - #: gitk:8651 850 msgid "Goto:" 851 msgstr "Gå till:" 852 853 - #: gitk:8672 854 #, tcl-format 855 msgid "Short SHA1 id %s is ambiguous" 856 msgstr "Förkortat SHA1-id %s är tvetydigt" 857 858 - #: gitk:8679 859 #, tcl-format 860 msgid "Revision %s is not known" 861 msgstr "Revisionen %s är inte känd" 862 863 - #: gitk:8689 864 #, tcl-format 865 msgid "SHA1 id %s is not known" 866 msgstr "SHA-id:t %s är inte känt" 867 868 - #: gitk:8691 869 #, tcl-format 870 msgid "Revision %s is not in the current view" 871 msgstr "Revisionen %s finns inte i den nuvarande vyn" 872 873 - #: gitk:8833 gitk:8848 874 msgid "Date" 875 msgstr "Datum" 876 877 - #: gitk:8836 878 msgid "Children" 879 msgstr "Barn" 880 881 - #: gitk:8899 882 #, tcl-format 883 msgid "Reset %s branch to here" 884 msgstr "Återställ grenen %s hit" 885 886 - #: gitk:8901 887 msgid "Detached head: can't reset" 888 msgstr "Frånkopplad head: kan inte återställa" 889 890 - #: gitk:9006 gitk:9012 891 msgid "Skipping merge commit " 892 msgstr "Hoppar över sammanslagningsincheckning " 893 894 - #: gitk:9021 gitk:9026 895 msgid "Error getting patch ID for " 896 msgstr "Fel vid hämtning av patch-id för " 897 898 - #: gitk:9022 gitk:9027 899 msgid " - stopping\n" 900 msgstr " - stannar\n" 901 902 - #: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 903 msgid "Commit " 904 msgstr "Incheckning " 905 906 - #: gitk:9036 907 msgid "" 908 " is the same patch as\n" 909 " " ··· 911 " är samma patch som\n" 912 " " 913 914 - #: gitk:9044 915 msgid "" 916 " differs from\n" 917 " " ··· 919 " skiljer sig från\n" 920 " " 921 922 - #: gitk:9046 923 msgid "" 924 "Diff of commits:\n" 925 "\n" ··· 927 "Skillnad mellan incheckningar:\n" 928 "\n" 929 930 - #: gitk:9058 gitk:9067 931 #, tcl-format 932 msgid " has %s children - stopping\n" 933 msgstr " har %s barn - stannar\n" 934 935 - #: gitk:9086 936 #, tcl-format 937 msgid "Error writing commit to file: %s" 938 msgstr "Fel vid skrivning av incheckning till fil: %s" 939 940 - #: gitk:9092 941 #, tcl-format 942 msgid "Error diffing commits: %s" 943 msgstr "Fel vid jämförelse av incheckningar: %s" 944 945 - #: gitk:9138 946 msgid "Top" 947 msgstr "Topp" 948 949 - #: gitk:9139 950 msgid "From" 951 msgstr "Från" 952 953 - #: gitk:9144 954 msgid "To" 955 msgstr "Till" 956 957 - #: gitk:9168 958 msgid "Generate patch" 959 msgstr "Generera patch" 960 961 - #: gitk:9170 962 msgid "From:" 963 msgstr "Från:" 964 965 - #: gitk:9179 966 msgid "To:" 967 msgstr "Till:" 968 969 - #: gitk:9188 970 msgid "Reverse" 971 msgstr "Vänd" 972 973 - #: gitk:9190 gitk:9400 974 msgid "Output file:" 975 msgstr "Utdatafil:" 976 977 - #: gitk:9196 978 msgid "Generate" 979 msgstr "Generera" 980 981 - #: gitk:9234 982 msgid "Error creating patch:" 983 msgstr "Fel vid generering av patch:" 984 985 - #: gitk:9257 gitk:9388 gitk:9445 986 msgid "ID:" 987 msgstr "Id:" 988 989 - #: gitk:9266 990 msgid "Tag name:" 991 msgstr "Taggnamn:" 992 993 - #: gitk:9269 994 msgid "Tag message is optional" 995 msgstr "Taggmeddelandet är valfritt" 996 997 - #: gitk:9271 998 msgid "Tag message:" 999 msgstr "Taggmeddelande:" 1000 1001 - #: gitk:9275 gitk:9454 1002 msgid "Create" 1003 msgstr "Skapa" 1004 1005 - #: gitk:9293 1006 msgid "No tag name specified" 1007 msgstr "Inget taggnamn angavs" 1008 1009 - #: gitk:9297 1010 #, tcl-format 1011 msgid "Tag \"%s\" already exists" 1012 - msgstr "Taggen \"%s\" finns redan" 1013 1014 - #: gitk:9307 1015 msgid "Error creating tag:" 1016 msgstr "Fel vid skapande av tagg:" 1017 1018 - #: gitk:9397 1019 msgid "Command:" 1020 msgstr "Kommando:" 1021 1022 - #: gitk:9405 1023 msgid "Write" 1024 msgstr "Skriv" 1025 1026 - #: gitk:9423 1027 msgid "Error writing commit:" 1028 msgstr "Fel vid skrivning av incheckning:" 1029 1030 - #: gitk:9450 1031 msgid "Name:" 1032 msgstr "Namn:" 1033 1034 - #: gitk:9473 1035 msgid "Please specify a name for the new branch" 1036 msgstr "Ange ett namn för den nya grenen" 1037 1038 - #: gitk:9478 1039 #, tcl-format 1040 msgid "Branch '%s' already exists. Overwrite?" 1041 - msgstr "Grenen \"%s\" finns redan. Skriva över?" 1042 1043 - #: gitk:9545 1044 #, tcl-format 1045 msgid "Commit %s is already included in branch %s -- really re-apply it?" 1046 msgstr "" 1047 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " 1048 "på nytt?" 1049 1050 - #: gitk:9550 1051 msgid "Cherry-picking" 1052 msgstr "Plockar" 1053 1054 - #: gitk:9559 1055 #, tcl-format 1056 msgid "" 1057 "Cherry-pick failed because of local changes to file '%s'.\n" 1058 "Please commit, reset or stash your changes and try again." 1059 msgstr "" 1060 - "Cherry-pick misslyckades på grund av lokala ändringar i filen \"%s\".\n" 1061 "Checka in, återställ eller spara undan (stash) dina ändringar och försök " 1062 "igen." 1063 1064 - #: gitk:9565 1065 msgid "" 1066 "Cherry-pick failed because of merge conflict.\n" 1067 "Do you wish to run git citool to resolve it?" ··· 1069 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" 1070 "Vill du köra git citool för att lösa den?" 1071 1072 - #: gitk:9581 gitk:9639 1073 msgid "No changes committed" 1074 msgstr "Inga ändringar incheckade" 1075 1076 - #: gitk:9608 1077 #, tcl-format 1078 msgid "Commit %s is not included in branch %s -- really revert it?" 1079 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?" 1080 1081 - #: gitk:9613 1082 msgid "Reverting" 1083 msgstr "Ångrar" 1084 1085 - #: gitk:9621 1086 #, tcl-format 1087 msgid "" 1088 "Revert failed because of local changes to the following files:%s Please " ··· 1092 "Checka in, återställ eller spara undan (stash) dina ändringar och försök " 1093 "igen." 1094 1095 - #: gitk:9625 1096 msgid "" 1097 "Revert failed because of merge conflict.\n" 1098 " Do you wish to run git citool to resolve it?" ··· 1100 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n" 1101 " Vill du köra git citool för att lösa den?" 1102 1103 - #: gitk:9668 1104 msgid "Confirm reset" 1105 msgstr "Bekräfta återställning" 1106 1107 - #: gitk:9670 1108 #, tcl-format 1109 msgid "Reset branch %s to %s?" 1110 msgstr "Återställa grenen %s till %s?" 1111 1112 - #: gitk:9672 1113 msgid "Reset type:" 1114 msgstr "Typ av återställning:" 1115 1116 - #: gitk:9675 1117 msgid "Soft: Leave working tree and index untouched" 1118 msgstr "Mjuk: Rör inte utcheckning och index" 1119 1120 - #: gitk:9678 1121 msgid "Mixed: Leave working tree untouched, reset index" 1122 msgstr "Blandad: Rör inte utcheckning, återställ index" 1123 1124 - #: gitk:9681 1125 msgid "" 1126 "Hard: Reset working tree and index\n" 1127 "(discard ALL local changes)" ··· 1129 "Hård: Återställ utcheckning och index\n" 1130 "(förkastar ALLA lokala ändringar)" 1131 1132 - #: gitk:9698 1133 msgid "Resetting" 1134 msgstr "Återställer" 1135 1136 - #: gitk:9758 1137 msgid "Checking out" 1138 msgstr "Checkar ut" 1139 1140 - #: gitk:9811 1141 msgid "Cannot delete the currently checked-out branch" 1142 msgstr "Kan inte ta bort den just nu utcheckade grenen" 1143 1144 - #: gitk:9817 1145 #, tcl-format 1146 msgid "" 1147 "The commits on branch %s aren't on any other branch.\n" ··· 1150 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" 1151 "Vill du verkligen ta bort grenen %s?" 1152 1153 - #: gitk:9848 1154 #, tcl-format 1155 msgid "Tags and heads: %s" 1156 msgstr "Taggar och huvuden: %s" 1157 1158 - #: gitk:9865 1159 msgid "Filter" 1160 msgstr "Filter" 1161 1162 - #: gitk:10161 1163 msgid "" 1164 "Error reading commit topology information; branch and preceding/following " 1165 "tag information will be incomplete." ··· 1167 "Fel vid läsning av information om incheckningstopologi; information om " 1168 "grenar och föregående/senare taggar kommer inte vara komplett." 1169 1170 - #: gitk:11138 1171 msgid "Tag" 1172 msgstr "Tagg" 1173 1174 - #: gitk:11142 1175 msgid "Id" 1176 msgstr "Id" 1177 1178 - #: gitk:11225 1179 msgid "Gitk font chooser" 1180 msgstr "Teckensnittsväljare för Gitk" 1181 1182 - #: gitk:11242 1183 msgid "B" 1184 msgstr "F" 1185 1186 - #: gitk:11245 1187 msgid "I" 1188 msgstr "K" 1189 1190 - #: gitk:11363 1191 msgid "Commit list display options" 1192 msgstr "Alternativ för incheckningslistvy" 1193 1194 - #: gitk:11366 1195 msgid "Maximum graph width (lines)" 1196 msgstr "Maximal grafbredd (rader)" 1197 1198 - #: gitk:11370 1199 #, no-tcl-format 1200 msgid "Maximum graph width (% of pane)" 1201 msgstr "Maximal grafbredd (% av ruta)" 1202 1203 - #: gitk:11373 1204 msgid "Show local changes" 1205 msgstr "Visa lokala ändringar" 1206 1207 - #: gitk:11376 1208 msgid "Auto-select SHA1 (length)" 1209 msgstr "Välj SHA1 (längd) automatiskt" 1210 1211 - #: gitk:11380 1212 msgid "Hide remote refs" 1213 msgstr "Dölj fjärr-referenser" 1214 1215 - #: gitk:11384 1216 msgid "Diff display options" 1217 msgstr "Alternativ för diffvy" 1218 1219 - #: gitk:11386 1220 msgid "Tab spacing" 1221 msgstr "Blanksteg för tabulatortecken" 1222 1223 - #: gitk:11389 1224 msgid "Display nearby tags/heads" 1225 msgstr "Visa närliggande taggar/huvuden" 1226 1227 - #: gitk:11392 1228 msgid "Maximum # tags/heads to show" 1229 msgstr "Maximalt antal taggar/huvuden att visa" 1230 1231 - #: gitk:11395 1232 msgid "Limit diffs to listed paths" 1233 msgstr "Begränsa diff till listade sökvägar" 1234 1235 - #: gitk:11398 1236 msgid "Support per-file encodings" 1237 msgstr "Stöd för filspecifika teckenkodningar" 1238 1239 - #: gitk:11404 gitk:11551 1240 msgid "External diff tool" 1241 msgstr "Externt diff-verktyg" 1242 1243 - #: gitk:11405 1244 msgid "Choose..." 1245 msgstr "Välj..." 1246 1247 - #: gitk:11410 1248 msgid "General options" 1249 msgstr "Allmänna inställningar" 1250 1251 - #: gitk:11413 1252 msgid "Use themed widgets" 1253 msgstr "Använd tema på fönsterelement" 1254 1255 - #: gitk:11415 1256 msgid "(change requires restart)" 1257 msgstr "(ändringen kräver omstart)" 1258 1259 - #: gitk:11417 1260 msgid "(currently unavailable)" 1261 msgstr "(för närvarande inte tillgängligt)" 1262 1263 - #: gitk:11428 1264 msgid "Colors: press to choose" 1265 msgstr "Färger: tryck för att välja" 1266 1267 - #: gitk:11431 1268 msgid "Interface" 1269 msgstr "Gränssnitt" 1270 1271 - #: gitk:11432 1272 msgid "interface" 1273 msgstr "gränssnitt" 1274 1275 - #: gitk:11435 1276 msgid "Background" 1277 msgstr "Bakgrund" 1278 1279 - #: gitk:11436 gitk:11466 1280 msgid "background" 1281 msgstr "bakgrund" 1282 1283 - #: gitk:11439 1284 msgid "Foreground" 1285 msgstr "Förgrund" 1286 1287 - #: gitk:11440 1288 msgid "foreground" 1289 msgstr "förgrund" 1290 1291 - #: gitk:11443 1292 msgid "Diff: old lines" 1293 msgstr "Diff: gamla rader" 1294 1295 - #: gitk:11444 1296 msgid "diff old lines" 1297 msgstr "diff gamla rader" 1298 1299 - #: gitk:11448 1300 msgid "Diff: new lines" 1301 msgstr "Diff: nya rader" 1302 1303 - #: gitk:11449 1304 msgid "diff new lines" 1305 msgstr "diff nya rader" 1306 1307 - #: gitk:11453 1308 msgid "Diff: hunk header" 1309 msgstr "Diff: delhuvud" 1310 1311 - #: gitk:11455 1312 msgid "diff hunk header" 1313 msgstr "diff delhuvud" 1314 1315 - #: gitk:11459 1316 msgid "Marked line bg" 1317 msgstr "Markerad rad bakgrund" 1318 1319 - #: gitk:11461 1320 msgid "marked line background" 1321 msgstr "markerad rad bakgrund" 1322 1323 - #: gitk:11465 1324 msgid "Select bg" 1325 msgstr "Markerad bakgrund" 1326 1327 - #: gitk:11474 1328 msgid "Fonts: press to choose" 1329 msgstr "Teckensnitt: tryck för att välja" 1330 1331 - #: gitk:11476 1332 msgid "Main font" 1333 msgstr "Huvudteckensnitt" 1334 1335 - #: gitk:11477 1336 msgid "Diff display font" 1337 msgstr "Teckensnitt för diffvisning" 1338 1339 - #: gitk:11478 1340 msgid "User interface font" 1341 msgstr "Teckensnitt för användargränssnitt" 1342 1343 - #: gitk:11500 1344 msgid "Gitk preferences" 1345 msgstr "Inställningar för Gitk" 1346 1347 - #: gitk:11509 1348 msgid "General" 1349 msgstr "Allmänt" 1350 1351 - #: gitk:11510 1352 msgid "Colors" 1353 msgstr "Färger" 1354 1355 - #: gitk:11511 1356 msgid "Fonts" 1357 msgstr "Teckensnitt" 1358 1359 - #: gitk:11561 1360 #, tcl-format 1361 msgid "Gitk: choose color for %s" 1362 msgstr "Gitk: välj färg för %s" 1363 1364 - #: gitk:12074 1365 msgid "" 1366 "Sorry, gitk cannot run with this version of Tcl/Tk.\n" 1367 " Gitk requires at least Tcl/Tk 8.4." ··· 1369 "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" 1370 " Gitk kräver åtminstone Tcl/Tk 8.4." 1371 1372 - #: gitk:12284 1373 msgid "Cannot find a git repository here." 1374 msgstr "Hittar inget git-arkiv här." 1375 1376 - #: gitk:12331 1377 #, tcl-format 1378 msgid "Ambiguous argument '%s': both revision and filename" 1379 - msgstr "Tvetydigt argument \"%s\": både revision och filnamn" 1380 1381 - #: gitk:12343 1382 msgid "Bad arguments to gitk:" 1383 msgstr "Felaktiga argument till gitk:" 1384 - 1385 - #~ msgid "mc" 1386 - #~ msgstr "mc" 1387 - 1388 - #~ msgid "next" 1389 - #~ msgstr "nästa" 1390 - 1391 - #~ msgid "prev" 1392 - #~ msgstr "föreg" 1393 - 1394 - #~ msgid "CDate" 1395 - #~ msgstr "Skapat datum" 1396 - 1397 - #~ msgid "Cannot find the git directory \"%s\"." 1398 - #~ msgstr "Hittar inte git-katalogen \"%s\"." 1399 - 1400 - #~ msgid "SHA1 ID: " 1401 - #~ msgstr "SHA1-id: " 1402 - 1403 - #~ msgid "- stopping\n" 1404 - #~ msgstr "- stannar\n" 1405 - 1406 - #~ msgid "Tag/Head %s is not known" 1407 - #~ msgstr "Tagg/huvud %s är okänt" 1408 - 1409 - #~ msgid "/\t\tMove to next find hit, or redo find" 1410 - #~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt" 1411 - 1412 - #~ msgid "Name" 1413 - #~ msgstr "Namn"

··· 3 # This file is distributed under the same license as the gitk package. 4 # 5 # Mikael Magnusson <mikachu@gmail.com>, 2008. 6 + # Peter Krefting <peter@softwolves.pp.se>, 2008-2023. 7 # 8 msgid "" 9 msgstr "" 10 "Project-Id-Version: sv\n" 11 "Report-Msgid-Bugs-To: \n" 12 + "POT-Creation-Date: 2023-10-26 21:39+0100\n" 13 + "PO-Revision-Date: 2023-10-26 21:42+0100\n" 14 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" 15 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" 16 "Language: sv\n" ··· 18 "Content-Type: text/plain; charset=UTF-8\n" 19 "Content-Transfer-Encoding: 8bit\n" 20 "Plural-Forms: nplurals=2; plural=(n != 1);\n" 21 + "X-Generator: Gtranslator 3.38.0\n" 22 23 + #: gitk:139 24 msgid "Couldn't get list of unmerged files:" 25 msgstr "Kunde inte hämta lista över ej sammanslagna filer:" 26 27 + #: gitk:211 gitk:2406 28 msgid "Color words" 29 msgstr "Färga ord" 30 31 + #: gitk:216 gitk:2406 gitk:8307 gitk:8340 32 msgid "Markup words" 33 msgstr "Märk upp ord" 34 35 + #: gitk:323 36 msgid "Error parsing revisions:" 37 msgstr "Fel vid tolkning av revisioner:" 38 39 + #: gitk:379 40 msgid "Error executing --argscmd command:" 41 msgstr "Fel vid körning av --argscmd-kommando:" 42 43 + #: gitk:392 44 msgid "No files selected: --merge specified but no files are unmerged." 45 msgstr "" 46 "Inga filer valdes: --merge angavs men det finns inga filer som inte har " 47 "slagits samman." 48 49 + #: gitk:395 50 msgid "" 51 "No files selected: --merge specified but no unmerged files are within file " 52 "limit." ··· 54 "Inga filer valdes: --merge angavs men det finns inga filer inom " 55 "filbegränsningen." 56 57 + #: gitk:417 gitk:565 58 msgid "Error executing git log:" 59 msgstr "Fel vid körning av git log:" 60 61 + #: gitk:435 gitk:581 62 msgid "Reading" 63 msgstr "Läser" 64 65 + #: gitk:495 gitk:4572 66 msgid "Reading commits..." 67 msgstr "Läser incheckningar..." 68 69 + #: gitk:498 gitk:1640 gitk:4575 70 msgid "No commits selected" 71 msgstr "Inga incheckningar markerade" 72 73 + #: gitk:1448 gitk:4092 gitk:12674 74 msgid "Command line" 75 msgstr "Kommandorad" 76 77 + #: gitk:1514 78 msgid "Can't parse git log output:" 79 msgstr "Kan inte tolka utdata från git log:" 80 81 + #: gitk:1743 82 msgid "No commit information available" 83 msgstr "Ingen incheckningsinformation är tillgänglig" 84 85 + #: gitk:1910 gitk:1939 gitk:4362 gitk:9847 gitk:11451 gitk:11751 86 msgid "OK" 87 msgstr "OK" 88 89 + #: gitk:1941 gitk:4364 gitk:9283 gitk:9362 gitk:9492 gitk:9578 gitk:9849 90 + #: gitk:11452 gitk:11752 91 msgid "Cancel" 92 msgstr "Avbryt" 93 94 + #: gitk:2090 95 msgid "&Update" 96 msgstr "&Uppdatera" 97 98 + #: gitk:2091 99 msgid "&Reload" 100 msgstr "Läs &om" 101 102 + #: gitk:2092 103 msgid "Reread re&ferences" 104 msgstr "Läs om &referenser" 105 106 + #: gitk:2093 107 msgid "&List references" 108 msgstr "&Visa referenser" 109 110 + #: gitk:2095 111 msgid "Start git &gui" 112 msgstr "Starta git &gui" 113 114 + #: gitk:2097 115 msgid "&Quit" 116 msgstr "&Avsluta" 117 118 + #: gitk:2089 119 msgid "&File" 120 msgstr "&Arkiv" 121 122 + #: gitk:2101 123 msgid "&Preferences" 124 msgstr "&Inställningar" 125 126 + #: gitk:2100 127 msgid "&Edit" 128 msgstr "&Redigera" 129 130 + #: gitk:2105 131 msgid "&New view..." 132 msgstr "&Ny vy..." 133 134 + #: gitk:2106 135 msgid "&Edit view..." 136 msgstr "&Ändra vy..." 137 138 + #: gitk:2107 139 msgid "&Delete view" 140 msgstr "&Ta bort vy" 141 142 + #: gitk:2109 143 msgid "&All files" 144 msgstr "&Alla filer" 145 146 + #: gitk:2104 147 msgid "&View" 148 msgstr "&Visa" 149 150 + #: gitk:2114 gitk:2124 151 msgid "&About gitk" 152 msgstr "&Om gitk" 153 154 + #: gitk:2115 gitk:2129 155 msgid "&Key bindings" 156 msgstr "&Tangentbordsbindningar" 157 158 + #: gitk:2113 gitk:2128 159 msgid "&Help" 160 msgstr "&Hjälp" 161 162 + #: gitk:2206 gitk:8739 163 msgid "SHA1 ID:" 164 msgstr "SHA1-id:" 165 166 + #: gitk:2250 167 msgid "Row" 168 msgstr "Rad" 169 170 + #: gitk:2288 171 msgid "Find" 172 msgstr "Sök" 173 174 + #: gitk:2316 175 msgid "commit" 176 msgstr "incheckning" 177 178 + #: gitk:2320 gitk:2322 gitk:4734 gitk:4757 gitk:4781 gitk:6802 gitk:6874 179 + #: gitk:6959 180 msgid "containing:" 181 msgstr "som innehåller:" 182 183 + #: gitk:2323 gitk:3573 gitk:3578 gitk:4810 184 msgid "touching paths:" 185 msgstr "som rör sökväg:" 186 187 + #: gitk:2324 gitk:4824 188 msgid "adding/removing string:" 189 msgstr "som lägger/till tar bort sträng:" 190 191 + #: gitk:2325 gitk:4826 192 msgid "changing lines matching:" 193 msgstr "ändrar rader som matchar:" 194 195 + #: gitk:2334 gitk:2336 gitk:4813 196 msgid "Exact" 197 msgstr "Exakt" 198 199 + #: gitk:2336 gitk:4901 gitk:6770 200 msgid "IgnCase" 201 msgstr "IgnVersaler" 202 203 + #: gitk:2336 gitk:4783 gitk:4899 gitk:6766 204 msgid "Regexp" 205 msgstr "Reg.uttr." 206 207 + #: gitk:2338 gitk:2339 gitk:4921 gitk:4951 gitk:4958 gitk:6895 gitk:6963 208 msgid "All fields" 209 msgstr "Alla fält" 210 211 + #: gitk:2339 gitk:4918 gitk:4951 gitk:6833 212 msgid "Headline" 213 msgstr "Rubrik" 214 215 + #: gitk:2340 gitk:4918 gitk:6833 gitk:6963 gitk:7471 216 msgid "Comments" 217 msgstr "Kommentarer" 218 219 + #: gitk:2340 gitk:4918 gitk:4923 gitk:4958 gitk:6833 gitk:7406 gitk:8917 220 + #: gitk:8932 221 msgid "Author" 222 msgstr "Författare" 223 224 + #: gitk:2340 gitk:4918 gitk:6833 gitk:7408 225 msgid "Committer" 226 msgstr "Incheckare" 227 228 + #: gitk:2374 229 msgid "Search" 230 msgstr "Sök" 231 232 + #: gitk:2382 233 msgid "Diff" 234 msgstr "Diff" 235 236 + #: gitk:2384 237 msgid "Old version" 238 msgstr "Gammal version" 239 240 + #: gitk:2386 241 msgid "New version" 242 msgstr "Ny version" 243 244 + #: gitk:2389 245 msgid "Lines of context" 246 msgstr "Rader sammanhang" 247 248 + #: gitk:2399 249 msgid "Ignore space change" 250 msgstr "Ignorera ändringar i blanksteg" 251 252 + #: gitk:2403 gitk:2405 gitk:8041 gitk:8293 253 msgid "Line diff" 254 msgstr "Rad-diff" 255 256 + #: gitk:2478 257 msgid "Patch" 258 msgstr "Patch" 259 260 + #: gitk:2480 261 msgid "Tree" 262 msgstr "Träd" 263 264 + #: gitk:2650 gitk:2671 265 msgid "Diff this -> selected" 266 msgstr "Diff denna -> markerad" 267 268 + #: gitk:2651 gitk:2672 269 msgid "Diff selected -> this" 270 msgstr "Diff markerad -> denna" 271 272 + #: gitk:2652 gitk:2673 273 msgid "Make patch" 274 msgstr "Skapa patch" 275 276 + #: gitk:2653 gitk:9341 277 msgid "Create tag" 278 msgstr "Skapa tagg" 279 280 + #: gitk:2654 281 + msgid "Copy commit reference" 282 + msgstr "Kopiera incheckningsreferens" 283 284 + #: gitk:2655 gitk:9472 285 msgid "Write commit to file" 286 msgstr "Skriv incheckning till fil" 287 288 + #: gitk:2656 289 msgid "Create new branch" 290 msgstr "Skapa ny gren" 291 292 + #: gitk:2657 293 msgid "Cherry-pick this commit" 294 msgstr "Plocka denna incheckning" 295 296 + #: gitk:2658 297 msgid "Reset HEAD branch to here" 298 msgstr "Återställ HEAD-grenen hit" 299 300 + #: gitk:2659 301 msgid "Mark this commit" 302 msgstr "Markera denna incheckning" 303 304 + #: gitk:2660 305 msgid "Return to mark" 306 msgstr "Återgå till markering" 307 308 + #: gitk:2661 309 msgid "Find descendant of this and mark" 310 msgstr "Hitta efterföljare till denna och markera" 311 312 + #: gitk:2662 313 msgid "Compare with marked commit" 314 msgstr "Jämför med markerad incheckning" 315 316 + #: gitk:2663 gitk:2674 317 msgid "Diff this -> marked commit" 318 msgstr "Diff denna -> markerad incheckning" 319 320 + #: gitk:2664 gitk:2675 321 msgid "Diff marked commit -> this" 322 msgstr "Diff markerad incheckning -> denna" 323 324 + #: gitk:2665 325 msgid "Revert this commit" 326 msgstr "Ångra denna incheckning" 327 328 + #: gitk:2681 329 msgid "Check out this branch" 330 msgstr "Checka ut denna gren" 331 332 + #: gitk:2682 333 + msgid "Rename this branch" 334 + msgstr "Byt namn på denna gren" 335 + 336 + #: gitk:2683 337 msgid "Remove this branch" 338 msgstr "Ta bort denna gren" 339 340 + #: gitk:2684 341 msgid "Copy branch name" 342 msgstr "Kopiera namn på gren" 343 344 + #: gitk:2691 345 msgid "Highlight this too" 346 msgstr "Markera även detta" 347 348 + #: gitk:2692 349 msgid "Highlight this only" 350 msgstr "Markera bara detta" 351 352 + #: gitk:2693 353 msgid "External diff" 354 msgstr "Extern diff" 355 356 + #: gitk:2694 357 msgid "Blame parent commit" 358 msgstr "Klandra föräldraincheckning" 359 360 + #: gitk:2695 361 msgid "Copy path" 362 msgstr "Kopiera sökväg" 363 364 + #: gitk:2702 365 msgid "Show origin of this line" 366 msgstr "Visa ursprunget för den här raden" 367 368 + #: gitk:2703 369 msgid "Run git gui blame on this line" 370 msgstr "Kör git gui blame på den här raden" 371 372 + #: gitk:3057 373 msgid "About gitk" 374 msgstr "Om gitk" 375 376 + #: gitk:3059 377 msgid "" 378 "\n" 379 "Gitk - a commit viewer for git\n" ··· 389 "\n" 390 "Använd och vidareförmedla enligt villkoren i GNU General Public License" 391 392 + #: gitk:3067 gitk:3134 gitk:10062 393 msgid "Close" 394 msgstr "Stäng" 395 396 + #: gitk:3088 397 msgid "Gitk key bindings" 398 msgstr "Tangentbordsbindningar för Gitk" 399 400 + #: gitk:3091 401 msgid "Gitk key bindings:" 402 msgstr "Tangentbordsbindningar för Gitk:" 403 404 + #: gitk:3093 405 #, tcl-format 406 msgid "<%s-Q>\t\tQuit" 407 msgstr "<%s-Q>\t\tAvsluta" 408 409 + #: gitk:3094 410 #, tcl-format 411 msgid "<%s-W>\t\tClose window" 412 msgstr "<%s-W>\t\tStäng fönster" 413 414 + #: gitk:3095 415 msgid "<Home>\t\tMove to first commit" 416 msgstr "<Home>\t\tGå till första incheckning" 417 418 + #: gitk:3096 419 msgid "<End>\t\tMove to last commit" 420 msgstr "<End>\t\tGå till sista incheckning" 421 422 + #: gitk:3097 423 msgid "<Up>, p, k\tMove up one commit" 424 msgstr "<Upp>, p, k\tGå en incheckning upp" 425 426 + #: gitk:3098 427 msgid "<Down>, n, j\tMove down one commit" 428 msgstr "<Ned>, n, j\tGå en incheckning ned" 429 430 + #: gitk:3099 431 msgid "<Left>, z, h\tGo back in history list" 432 msgstr "<Vänster>, z, h\tGå bakåt i historiken" 433 434 + #: gitk:3100 435 msgid "<Right>, x, l\tGo forward in history list" 436 msgstr "<Höger>, x, l\tGå framåt i historiken" 437 438 + #: gitk:3101 439 #, tcl-format 440 msgid "<%s-n>\tGo to n-th parent of current commit in history list" 441 msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan" 442 443 + #: gitk:3102 444 msgid "<PageUp>\tMove up one page in commit list" 445 msgstr "<PageUp>\tGå upp en sida i incheckningslistan" 446 447 + #: gitk:3103 448 msgid "<PageDown>\tMove down one page in commit list" 449 msgstr "<PageDown>\tGå ned en sida i incheckningslistan" 450 451 + #: gitk:3104 452 #, tcl-format 453 msgid "<%s-Home>\tScroll to top of commit list" 454 msgstr "<%s-Home>\tRulla till början av incheckningslistan" 455 456 + #: gitk:3105 457 #, tcl-format 458 msgid "<%s-End>\tScroll to bottom of commit list" 459 msgstr "<%s-End>\tRulla till slutet av incheckningslistan" 460 461 + #: gitk:3106 462 #, tcl-format 463 msgid "<%s-Up>\tScroll commit list up one line" 464 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" 465 466 + #: gitk:3107 467 #, tcl-format 468 msgid "<%s-Down>\tScroll commit list down one line" 469 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" 470 471 + #: gitk:3108 472 #, tcl-format 473 msgid "<%s-PageUp>\tScroll commit list up one page" 474 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" 475 476 + #: gitk:3109 477 #, tcl-format 478 msgid "<%s-PageDown>\tScroll commit list down one page" 479 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" 480 481 + #: gitk:3110 482 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" 483 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" 484 485 + #: gitk:3111 486 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" 487 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" 488 489 + #: gitk:3112 490 msgid "<Delete>, b\tScroll diff view up one page" 491 msgstr "<Delete>, b\tRulla diffvisningen upp en sida" 492 493 + #: gitk:3113 494 msgid "<Backspace>\tScroll diff view up one page" 495 msgstr "<Baksteg>\tRulla diffvisningen upp en sida" 496 497 + #: gitk:3114 498 msgid "<Space>\t\tScroll diff view down one page" 499 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" 500 501 + #: gitk:3115 502 msgid "u\t\tScroll diff view up 18 lines" 503 msgstr "u\t\tRulla diffvisningen upp 18 rader" 504 505 + #: gitk:3116 506 msgid "d\t\tScroll diff view down 18 lines" 507 msgstr "d\t\tRulla diffvisningen ned 18 rader" 508 509 + #: gitk:3117 510 #, tcl-format 511 msgid "<%s-F>\t\tFind" 512 msgstr "<%s-F>\t\tSök" 513 514 + #: gitk:3118 515 #, tcl-format 516 msgid "<%s-G>\t\tMove to next find hit" 517 msgstr "<%s-G>\t\tGå till nästa sökträff" 518 519 + #: gitk:3119 520 msgid "<Return>\tMove to next find hit" 521 msgstr "<Return>\t\tGå till nästa sökträff" 522 523 + #: gitk:3120 524 msgid "g\t\tGo to commit" 525 msgstr "g\t\tGå till incheckning" 526 527 + #: gitk:3121 528 msgid "/\t\tFocus the search box" 529 msgstr "/\t\tFokusera sökrutan" 530 531 + #: gitk:3122 532 msgid "?\t\tMove to previous find hit" 533 msgstr "?\t\tGå till föregående sökträff" 534 535 + #: gitk:3123 536 msgid "f\t\tScroll diff view to next file" 537 msgstr "f\t\tRulla diffvisningen till nästa fil" 538 539 + #: gitk:3124 540 #, tcl-format 541 msgid "<%s-S>\t\tSearch for next hit in diff view" 542 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen" 543 544 + #: gitk:3125 545 #, tcl-format 546 msgid "<%s-R>\t\tSearch for previous hit in diff view" 547 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen" 548 549 + #: gitk:3126 550 #, tcl-format 551 msgid "<%s-KP+>\tIncrease font size" 552 msgstr "<%s-Num+>\tÖka teckenstorlek" 553 554 + #: gitk:3127 555 #, tcl-format 556 msgid "<%s-plus>\tIncrease font size" 557 msgstr "<%s-plus>\tÖka teckenstorlek" 558 559 + #: gitk:3128 560 #, tcl-format 561 msgid "<%s-KP->\tDecrease font size" 562 msgstr "<%s-Num->\tMinska teckenstorlek" 563 564 + #: gitk:3129 565 #, tcl-format 566 msgid "<%s-minus>\tDecrease font size" 567 msgstr "<%s-minus>\tMinska teckenstorlek" 568 569 + #: gitk:3130 570 msgid "<F5>\t\tUpdate" 571 msgstr "<F5>\t\tUppdatera" 572 573 + #: gitk:3597 gitk:3606 574 #, tcl-format 575 msgid "Error creating temporary directory %s:" 576 msgstr "Fel vid skapande av temporär katalog %s:" 577 578 + #: gitk:3619 579 #, tcl-format 580 msgid "Error getting \"%s\" from %s:" 581 + msgstr "Fel vid hämtning av ”%s” från %s:" 582 583 + #: gitk:3682 584 msgid "command failed:" 585 msgstr "kommando misslyckades:" 586 587 + #: gitk:3831 588 msgid "No such commit" 589 msgstr "Incheckning saknas" 590 591 + #: gitk:3845 592 msgid "git gui blame: command failed:" 593 msgstr "git gui blame: kommando misslyckades:" 594 595 + #: gitk:3876 596 #, tcl-format 597 msgid "Couldn't read merge head: %s" 598 msgstr "Kunde inte läsa sammanslagningshuvud: %s" 599 600 + #: gitk:3884 601 #, tcl-format 602 msgid "Error reading index: %s" 603 msgstr "Fel vid läsning av index: %s" 604 605 + #: gitk:3909 606 #, tcl-format 607 msgid "Couldn't start git blame: %s" 608 msgstr "Kunde inte starta git blame: %s" 609 610 + #: gitk:3912 gitk:6801 611 msgid "Searching" 612 msgstr "Söker" 613 614 + #: gitk:3944 615 #, tcl-format 616 msgid "Error running git blame: %s" 617 msgstr "Fel vid körning av git blame: %s" 618 619 + #: gitk:3972 620 #, tcl-format 621 msgid "That line comes from commit %s, which is not in this view" 622 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy" 623 624 + #: gitk:3986 625 msgid "External diff viewer failed:" 626 msgstr "Externt diff-verktyg misslyckades:" 627 628 + #: gitk:4090 629 msgid "All files" 630 msgstr "Alla filer" 631 632 + #: gitk:4114 633 msgid "View" 634 msgstr "Visa" 635 636 + #: gitk:4117 637 msgid "Gitk view definition" 638 msgstr "Definition av Gitk-vy" 639 640 + #: gitk:4121 641 msgid "Remember this view" 642 msgstr "Spara denna vy" 643 644 + #: gitk:4122 645 msgid "References (space separated list):" 646 msgstr "Referenser (blankstegsavdelad lista):" 647 648 + #: gitk:4123 649 msgid "Branches & tags:" 650 msgstr "Grenar & taggar:" 651 652 + #: gitk:4124 653 msgid "All refs" 654 msgstr "Alla referenser" 655 656 + #: gitk:4125 657 msgid "All (local) branches" 658 msgstr "Alla (lokala) grenar" 659 660 + #: gitk:4126 661 msgid "All tags" 662 msgstr "Alla taggar" 663 664 + #: gitk:4127 665 msgid "All remote-tracking branches" 666 msgstr "Alla fjärrspårande grenar" 667 668 + #: gitk:4128 669 msgid "Commit Info (regular expressions):" 670 msgstr "Incheckningsinfo (reguljära uttryck):" 671 672 + #: gitk:4129 673 msgid "Author:" 674 msgstr "Författare:" 675 676 + #: gitk:4130 677 msgid "Committer:" 678 msgstr "Incheckare:" 679 680 + #: gitk:4131 681 msgid "Commit Message:" 682 msgstr "Incheckningsmeddelande:" 683 684 + #: gitk:4132 685 msgid "Matches all Commit Info criteria" 686 msgstr "Motsvarar alla kriterier för incheckningsinfo" 687 688 + #: gitk:4133 689 msgid "Matches no Commit Info criteria" 690 msgstr "Motsvarar inga kriterier för incheckningsinfo" 691 692 + #: gitk:4134 693 msgid "Changes to Files:" 694 msgstr "Ändringar av filer:" 695 696 + #: gitk:4135 697 msgid "Fixed String" 698 msgstr "Fast sträng" 699 700 + #: gitk:4136 701 msgid "Regular Expression" 702 msgstr "Reguljärt uttryck" 703 704 + #: gitk:4137 705 msgid "Search string:" 706 msgstr "Söksträng:" 707 708 + #: gitk:4138 709 msgid "" 710 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " 711 "15:27:38\"):" 712 msgstr "" 713 + "Incheckningsdatum (”2 weeks ago”, ”2009-03-17 15:27:38”, ”March 17, 2009 " 714 + "15:27:38”):" 715 716 + #: gitk:4139 717 msgid "Since:" 718 msgstr "Från:" 719 720 + #: gitk:4140 721 msgid "Until:" 722 msgstr "Till:" 723 724 + #: gitk:4141 725 msgid "Limit and/or skip a number of revisions (positive integer):" 726 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" 727 728 + #: gitk:4142 729 msgid "Number to show:" 730 msgstr "Antal att visa:" 731 732 + #: gitk:4143 733 msgid "Number to skip:" 734 msgstr "Antal att hoppa över:" 735 736 + #: gitk:4144 737 msgid "Miscellaneous options:" 738 msgstr "Diverse alternativ:" 739 740 + #: gitk:4145 741 msgid "Strictly sort by date" 742 msgstr "Strikt datumsortering" 743 744 + #: gitk:4146 745 msgid "Mark branch sides" 746 msgstr "Markera sidogrenar" 747 748 + #: gitk:4147 749 msgid "Limit to first parent" 750 msgstr "Begränsa till första förälder" 751 752 + #: gitk:4148 753 msgid "Simple history" 754 msgstr "Enkel historik" 755 756 + #: gitk:4149 757 msgid "Additional arguments to git log:" 758 msgstr "Ytterligare argument till git log:" 759 760 + #: gitk:4150 761 msgid "Enter files and directories to include, one per line:" 762 msgstr "Ange filer och kataloger att ta med, en per rad:" 763 764 + #: gitk:4151 765 msgid "Command to generate more commits to include:" 766 msgstr "Kommando för att generera fler incheckningar att ta med:" 767 768 + #: gitk:4275 769 msgid "Gitk: edit view" 770 msgstr "Gitk: redigera vy" 771 772 + #: gitk:4283 773 msgid "-- criteria for selecting revisions" 774 msgstr " - kriterier för val av revisioner" 775 776 + #: gitk:4288 777 msgid "View Name" 778 msgstr "Namn på vy" 779 780 + #: gitk:4363 781 msgid "Apply (F5)" 782 msgstr "Använd (F5)" 783 784 + #: gitk:4401 785 msgid "Error in commit selection arguments:" 786 msgstr "Fel i argument för val av incheckningar:" 787 788 + #: gitk:4456 gitk:4509 gitk:4971 gitk:4985 gitk:6255 gitk:12615 gitk:12616 789 msgid "None" 790 msgstr "Inget" 791 792 + #: gitk:5068 gitk:5073 793 msgid "Descendant" 794 msgstr "Avkomling" 795 796 + #: gitk:5069 797 msgid "Not descendant" 798 msgstr "Inte avkomling" 799 800 + #: gitk:5076 gitk:5081 801 msgid "Ancestor" 802 msgstr "Förfader" 803 804 + #: gitk:5077 805 msgid "Not ancestor" 806 msgstr "Inte förfader" 807 808 + #: gitk:5371 809 msgid "Local changes checked in to index but not committed" 810 msgstr "Lokala ändringar sparade i indexet men inte incheckade" 811 812 + #: gitk:5407 813 msgid "Local uncommitted changes, not checked in to index" 814 msgstr "Lokala ändringar, ej sparade i indexet" 815 816 + #: gitk:7155 817 + msgid "Error starting web browser:" 818 + msgstr "Fel när webbläsaren skulle startas:" 819 + 820 + #: gitk:7216 821 msgid "and many more" 822 msgstr "med många flera" 823 824 + #: gitk:7219 825 msgid "many" 826 msgstr "många" 827 828 + #: gitk:7410 829 msgid "Tags:" 830 msgstr "Taggar:" 831 832 + #: gitk:7427 gitk:7433 gitk:8912 833 msgid "Parent" 834 msgstr "Förälder" 835 836 + #: gitk:7438 837 msgid "Child" 838 msgstr "Barn" 839 840 + #: gitk:7447 841 msgid "Branch" 842 msgstr "Gren" 843 844 + #: gitk:7450 845 msgid "Follows" 846 msgstr "Följer" 847 848 + #: gitk:7453 849 msgid "Precedes" 850 msgstr "Föregår" 851 852 + #: gitk:8048 853 #, tcl-format 854 msgid "Error getting diffs: %s" 855 msgstr "Fel vid hämtning av diff: %s" 856 857 + #: gitk:8737 858 msgid "Goto:" 859 msgstr "Gå till:" 860 861 + #: gitk:8758 862 #, tcl-format 863 msgid "Short SHA1 id %s is ambiguous" 864 msgstr "Förkortat SHA1-id %s är tvetydigt" 865 866 + #: gitk:8765 867 #, tcl-format 868 msgid "Revision %s is not known" 869 msgstr "Revisionen %s är inte känd" 870 871 + #: gitk:8775 872 #, tcl-format 873 msgid "SHA1 id %s is not known" 874 msgstr "SHA-id:t %s är inte känt" 875 876 + #: gitk:8777 877 #, tcl-format 878 msgid "Revision %s is not in the current view" 879 msgstr "Revisionen %s finns inte i den nuvarande vyn" 880 881 + #: gitk:8919 gitk:8934 882 msgid "Date" 883 msgstr "Datum" 884 885 + #: gitk:8922 886 msgid "Children" 887 msgstr "Barn" 888 889 + #: gitk:8985 890 #, tcl-format 891 msgid "Reset %s branch to here" 892 msgstr "Återställ grenen %s hit" 893 894 + #: gitk:8987 895 msgid "Detached head: can't reset" 896 msgstr "Frånkopplad head: kan inte återställa" 897 898 + #: gitk:9092 gitk:9098 899 msgid "Skipping merge commit " 900 msgstr "Hoppar över sammanslagningsincheckning " 901 902 + #: gitk:9107 gitk:9112 903 msgid "Error getting patch ID for " 904 msgstr "Fel vid hämtning av patch-id för " 905 906 + #: gitk:9108 gitk:9113 907 msgid " - stopping\n" 908 msgstr " - stannar\n" 909 910 + #: gitk:9118 gitk:9121 gitk:9129 gitk:9143 gitk:9152 911 msgid "Commit " 912 msgstr "Incheckning " 913 914 + #: gitk:9122 915 msgid "" 916 " is the same patch as\n" 917 " " ··· 919 " är samma patch som\n" 920 " " 921 922 + #: gitk:9130 923 msgid "" 924 " differs from\n" 925 " " ··· 927 " skiljer sig från\n" 928 " " 929 930 + #: gitk:9132 931 msgid "" 932 "Diff of commits:\n" 933 "\n" ··· 935 "Skillnad mellan incheckningar:\n" 936 "\n" 937 938 + #: gitk:9144 gitk:9153 939 #, tcl-format 940 msgid " has %s children - stopping\n" 941 msgstr " har %s barn - stannar\n" 942 943 + #: gitk:9172 944 #, tcl-format 945 msgid "Error writing commit to file: %s" 946 msgstr "Fel vid skrivning av incheckning till fil: %s" 947 948 + #: gitk:9178 949 #, tcl-format 950 msgid "Error diffing commits: %s" 951 msgstr "Fel vid jämförelse av incheckningar: %s" 952 953 + #: gitk:9224 954 msgid "Top" 955 msgstr "Topp" 956 957 + #: gitk:9225 958 msgid "From" 959 msgstr "Från" 960 961 + #: gitk:9230 962 msgid "To" 963 msgstr "Till" 964 965 + #: gitk:9254 966 msgid "Generate patch" 967 msgstr "Generera patch" 968 969 + #: gitk:9256 970 msgid "From:" 971 msgstr "Från:" 972 973 + #: gitk:9265 974 msgid "To:" 975 msgstr "Till:" 976 977 + #: gitk:9274 978 msgid "Reverse" 979 msgstr "Vänd" 980 981 + #: gitk:9276 gitk:9486 982 msgid "Output file:" 983 msgstr "Utdatafil:" 984 985 + #: gitk:9282 986 msgid "Generate" 987 msgstr "Generera" 988 989 + #: gitk:9320 990 msgid "Error creating patch:" 991 msgstr "Fel vid generering av patch:" 992 993 + #: gitk:9343 gitk:9474 gitk:9562 994 msgid "ID:" 995 msgstr "Id:" 996 997 + #: gitk:9352 998 msgid "Tag name:" 999 msgstr "Taggnamn:" 1000 1001 + #: gitk:9355 1002 msgid "Tag message is optional" 1003 msgstr "Taggmeddelandet är valfritt" 1004 1005 + #: gitk:9357 1006 msgid "Tag message:" 1007 msgstr "Taggmeddelande:" 1008 1009 + #: gitk:9361 gitk:9532 1010 msgid "Create" 1011 msgstr "Skapa" 1012 1013 + #: gitk:9379 1014 msgid "No tag name specified" 1015 msgstr "Inget taggnamn angavs" 1016 1017 + #: gitk:9383 1018 #, tcl-format 1019 msgid "Tag \"%s\" already exists" 1020 + msgstr "Taggen ”%s” finns redan" 1021 1022 + #: gitk:9393 1023 msgid "Error creating tag:" 1024 msgstr "Fel vid skapande av tagg:" 1025 1026 + #: gitk:9483 1027 msgid "Command:" 1028 msgstr "Kommando:" 1029 1030 + #: gitk:9491 1031 msgid "Write" 1032 msgstr "Skriv" 1033 1034 + #: gitk:9509 1035 msgid "Error writing commit:" 1036 msgstr "Fel vid skrivning av incheckning:" 1037 1038 + #: gitk:9531 1039 + msgid "Create branch" 1040 + msgstr "Skapa gren" 1041 + 1042 + #: gitk:9547 1043 + #, tcl-format 1044 + msgid "Rename branch %s" 1045 + msgstr "Byt namn på grenen %s" 1046 + 1047 + #: gitk:9548 1048 + msgid "Rename" 1049 + msgstr "Byt namn" 1050 + 1051 + #: gitk:9572 1052 msgid "Name:" 1053 msgstr "Namn:" 1054 1055 + #: gitk:9596 1056 msgid "Please specify a name for the new branch" 1057 msgstr "Ange ett namn för den nya grenen" 1058 1059 + #: gitk:9601 1060 #, tcl-format 1061 msgid "Branch '%s' already exists. Overwrite?" 1062 + msgstr "Grenen ”%s” finns redan. Skriva över?" 1063 + 1064 + #: gitk:9645 1065 + msgid "Please specify a new name for the branch" 1066 + msgstr "Ange ett nytt namn för grenen" 1067 1068 + #: gitk:9708 1069 #, tcl-format 1070 msgid "Commit %s is already included in branch %s -- really re-apply it?" 1071 msgstr "" 1072 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " 1073 "på nytt?" 1074 1075 + #: gitk:9713 1076 msgid "Cherry-picking" 1077 msgstr "Plockar" 1078 1079 + #: gitk:9722 1080 #, tcl-format 1081 msgid "" 1082 "Cherry-pick failed because of local changes to file '%s'.\n" 1083 "Please commit, reset or stash your changes and try again." 1084 msgstr "" 1085 + "Cherry-pick misslyckades på grund av lokala ändringar i filen ”%s”.\n" 1086 "Checka in, återställ eller spara undan (stash) dina ändringar och försök " 1087 "igen." 1088 1089 + #: gitk:9728 1090 msgid "" 1091 "Cherry-pick failed because of merge conflict.\n" 1092 "Do you wish to run git citool to resolve it?" ··· 1094 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" 1095 "Vill du köra git citool för att lösa den?" 1096 1097 + #: gitk:9744 gitk:9802 1098 msgid "No changes committed" 1099 msgstr "Inga ändringar incheckade" 1100 1101 + #: gitk:9771 1102 #, tcl-format 1103 msgid "Commit %s is not included in branch %s -- really revert it?" 1104 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?" 1105 1106 + #: gitk:9776 1107 msgid "Reverting" 1108 msgstr "Ångrar" 1109 1110 + #: gitk:9784 1111 #, tcl-format 1112 msgid "" 1113 "Revert failed because of local changes to the following files:%s Please " ··· 1117 "Checka in, återställ eller spara undan (stash) dina ändringar och försök " 1118 "igen." 1119 1120 + #: gitk:9788 1121 msgid "" 1122 "Revert failed because of merge conflict.\n" 1123 " Do you wish to run git citool to resolve it?" ··· 1125 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n" 1126 " Vill du köra git citool för att lösa den?" 1127 1128 + #: gitk:9831 1129 msgid "Confirm reset" 1130 msgstr "Bekräfta återställning" 1131 1132 + #: gitk:9833 1133 #, tcl-format 1134 msgid "Reset branch %s to %s?" 1135 msgstr "Återställa grenen %s till %s?" 1136 1137 + #: gitk:9835 1138 msgid "Reset type:" 1139 msgstr "Typ av återställning:" 1140 1141 + #: gitk:9838 1142 msgid "Soft: Leave working tree and index untouched" 1143 msgstr "Mjuk: Rör inte utcheckning och index" 1144 1145 + #: gitk:9841 1146 msgid "Mixed: Leave working tree untouched, reset index" 1147 msgstr "Blandad: Rör inte utcheckning, återställ index" 1148 1149 + #: gitk:9844 1150 msgid "" 1151 "Hard: Reset working tree and index\n" 1152 "(discard ALL local changes)" ··· 1154 "Hård: Återställ utcheckning och index\n" 1155 "(förkastar ALLA lokala ändringar)" 1156 1157 + #: gitk:9861 1158 msgid "Resetting" 1159 msgstr "Återställer" 1160 1161 + #: gitk:9934 1162 + #, tcl-format 1163 + msgid "A local branch named %s exists already" 1164 + msgstr "Det finns redan en lokal gren som heter %s" 1165 + 1166 + #: gitk:9942 1167 msgid "Checking out" 1168 msgstr "Checkar ut" 1169 1170 + #: gitk:10001 1171 msgid "Cannot delete the currently checked-out branch" 1172 msgstr "Kan inte ta bort den just nu utcheckade grenen" 1173 1174 + #: gitk:10007 1175 #, tcl-format 1176 msgid "" 1177 "The commits on branch %s aren't on any other branch.\n" ··· 1180 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" 1181 "Vill du verkligen ta bort grenen %s?" 1182 1183 + #: gitk:10038 1184 #, tcl-format 1185 msgid "Tags and heads: %s" 1186 msgstr "Taggar och huvuden: %s" 1187 1188 + #: gitk:10055 1189 msgid "Filter" 1190 msgstr "Filter" 1191 1192 + #: gitk:10356 1193 msgid "" 1194 "Error reading commit topology information; branch and preceding/following " 1195 "tag information will be incomplete." ··· 1197 "Fel vid läsning av information om incheckningstopologi; information om " 1198 "grenar och föregående/senare taggar kommer inte vara komplett." 1199 1200 + #: gitk:11333 1201 msgid "Tag" 1202 msgstr "Tagg" 1203 1204 + #: gitk:11337 1205 msgid "Id" 1206 msgstr "Id" 1207 1208 + #: gitk:11420 1209 msgid "Gitk font chooser" 1210 msgstr "Teckensnittsväljare för Gitk" 1211 1212 + #: gitk:11437 1213 msgid "B" 1214 msgstr "F" 1215 1216 + #: gitk:11440 1217 msgid "I" 1218 msgstr "K" 1219 1220 + #: gitk:11558 1221 msgid "Commit list display options" 1222 msgstr "Alternativ för incheckningslistvy" 1223 1224 + #: gitk:11561 1225 msgid "Maximum graph width (lines)" 1226 msgstr "Maximal grafbredd (rader)" 1227 1228 + #: gitk:11565 1229 #, no-tcl-format 1230 msgid "Maximum graph width (% of pane)" 1231 msgstr "Maximal grafbredd (% av ruta)" 1232 1233 + #: gitk:11568 1234 msgid "Show local changes" 1235 msgstr "Visa lokala ändringar" 1236 1237 + #: gitk:11571 1238 msgid "Auto-select SHA1 (length)" 1239 msgstr "Välj SHA1 (längd) automatiskt" 1240 1241 + #: gitk:11575 1242 msgid "Hide remote refs" 1243 msgstr "Dölj fjärr-referenser" 1244 1245 + #: gitk:11579 1246 msgid "Diff display options" 1247 msgstr "Alternativ för diffvy" 1248 1249 + #: gitk:11581 1250 msgid "Tab spacing" 1251 msgstr "Blanksteg för tabulatortecken" 1252 1253 + #: gitk:11584 1254 msgid "Display nearby tags/heads" 1255 msgstr "Visa närliggande taggar/huvuden" 1256 1257 + #: gitk:11587 1258 msgid "Maximum # tags/heads to show" 1259 msgstr "Maximalt antal taggar/huvuden att visa" 1260 1261 + #: gitk:11590 1262 msgid "Limit diffs to listed paths" 1263 msgstr "Begränsa diff till listade sökvägar" 1264 1265 + #: gitk:11593 1266 msgid "Support per-file encodings" 1267 msgstr "Stöd för filspecifika teckenkodningar" 1268 1269 + #: gitk:11599 gitk:11766 1270 msgid "External diff tool" 1271 msgstr "Externt diff-verktyg" 1272 1273 + #: gitk:11600 1274 msgid "Choose..." 1275 msgstr "Välj..." 1276 1277 + #: gitk:11607 1278 + msgid "Web browser" 1279 + msgstr "Webbläsare" 1280 + 1281 + #: gitk:11612 1282 msgid "General options" 1283 msgstr "Allmänna inställningar" 1284 1285 + #: gitk:11615 1286 msgid "Use themed widgets" 1287 msgstr "Använd tema på fönsterelement" 1288 1289 + #: gitk:11617 1290 msgid "(change requires restart)" 1291 msgstr "(ändringen kräver omstart)" 1292 1293 + #: gitk:11619 1294 msgid "(currently unavailable)" 1295 msgstr "(för närvarande inte tillgängligt)" 1296 1297 + #: gitk:11631 1298 msgid "Colors: press to choose" 1299 msgstr "Färger: tryck för att välja" 1300 1301 + #: gitk:11634 1302 msgid "Interface" 1303 msgstr "Gränssnitt" 1304 1305 + #: gitk:11635 1306 msgid "interface" 1307 msgstr "gränssnitt" 1308 1309 + #: gitk:11638 1310 msgid "Background" 1311 msgstr "Bakgrund" 1312 1313 + #: gitk:11639 gitk:11681 1314 msgid "background" 1315 msgstr "bakgrund" 1316 1317 + #: gitk:11642 1318 msgid "Foreground" 1319 msgstr "Förgrund" 1320 1321 + #: gitk:11643 1322 msgid "foreground" 1323 msgstr "förgrund" 1324 1325 + #: gitk:11646 1326 msgid "Diff: old lines" 1327 msgstr "Diff: gamla rader" 1328 1329 + #: gitk:11647 1330 msgid "diff old lines" 1331 msgstr "diff gamla rader" 1332 1333 + #: gitk:11651 1334 + msgid "Diff: old lines bg" 1335 + msgstr "Diff: gamla rader bg" 1336 + 1337 + #: gitk:11653 1338 + msgid "diff old lines bg" 1339 + msgstr "diff gamla rader bg" 1340 + 1341 + #: gitk:11657 1342 msgid "Diff: new lines" 1343 msgstr "Diff: nya rader" 1344 1345 + #: gitk:11658 1346 msgid "diff new lines" 1347 msgstr "diff nya rader" 1348 1349 + #: gitk:11662 1350 + msgid "Diff: new lines bg" 1351 + msgstr "Diff: nya rader bg" 1352 + 1353 + #: gitk:11664 1354 + msgid "diff new lines bg" 1355 + msgstr "diff nya rader bg" 1356 + 1357 + #: gitk:11668 1358 msgid "Diff: hunk header" 1359 msgstr "Diff: delhuvud" 1360 1361 + #: gitk:11670 1362 msgid "diff hunk header" 1363 msgstr "diff delhuvud" 1364 1365 + #: gitk:11674 1366 msgid "Marked line bg" 1367 msgstr "Markerad rad bakgrund" 1368 1369 + #: gitk:11676 1370 msgid "marked line background" 1371 msgstr "markerad rad bakgrund" 1372 1373 + #: gitk:11680 1374 msgid "Select bg" 1375 msgstr "Markerad bakgrund" 1376 1377 + #: gitk:11689 1378 msgid "Fonts: press to choose" 1379 msgstr "Teckensnitt: tryck för att välja" 1380 1381 + #: gitk:11691 1382 msgid "Main font" 1383 msgstr "Huvudteckensnitt" 1384 1385 + #: gitk:11692 1386 msgid "Diff display font" 1387 msgstr "Teckensnitt för diffvisning" 1388 1389 + #: gitk:11693 1390 msgid "User interface font" 1391 msgstr "Teckensnitt för användargränssnitt" 1392 1393 + #: gitk:11715 1394 msgid "Gitk preferences" 1395 msgstr "Inställningar för Gitk" 1396 1397 + #: gitk:11724 1398 msgid "General" 1399 msgstr "Allmänt" 1400 1401 + #: gitk:11725 1402 msgid "Colors" 1403 msgstr "Färger" 1404 1405 + #: gitk:11726 1406 msgid "Fonts" 1407 msgstr "Teckensnitt" 1408 1409 + #: gitk:11776 1410 #, tcl-format 1411 msgid "Gitk: choose color for %s" 1412 msgstr "Gitk: välj färg för %s" 1413 1414 + #: gitk:12289 1415 msgid "" 1416 "Sorry, gitk cannot run with this version of Tcl/Tk.\n" 1417 " Gitk requires at least Tcl/Tk 8.4." ··· 1419 "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" 1420 " Gitk kräver åtminstone Tcl/Tk 8.4." 1421 1422 + #: gitk:12507 1423 msgid "Cannot find a git repository here." 1424 msgstr "Hittar inget git-arkiv här." 1425 1426 + #: gitk:12554 1427 #, tcl-format 1428 msgid "Ambiguous argument '%s': both revision and filename" 1429 + msgstr "Tvetydigt argument ”%s”: både revision och filnamn" 1430 1431 + #: gitk:12566 1432 msgid "Bad arguments to gitk:" 1433 msgstr "Felaktiga argument till gitk:"