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

unified split

gitk-git

gitk

sv.po

+62 -24

gitk-git/gitk

··· 1969 1969 return $confirm_ok 1970 1970 } 1971 1971 1972 + proc haveselectionclipboard {} { 1973 + return [expr {[tk windowingsystem] eq "x11"}] 1974 + } 1975 + 1972 1976 proc setoptions {} { 1973 1977 global use_ttk 1974 1978 ··· 2089 2093 global diffcontextstring diffcontext 2090 2094 global ignorespace 2091 2095 global maincursor textcursor curtextcursor 2092 - global rowctxmenu fakerowmenu mergemax wrapcomment 2096 + global rowctxmenu fakerowmenu mergemax wrapcomment wrapdefault 2093 2097 global highlight_files gdttype 2094 2098 global searchstring sstring 2095 2099 global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor ··· 2223 2227 set sha1entry .tf.bar.sha1 2224 2228 set entries $sha1entry 2225 2229 set sha1but .tf.bar.sha1label 2226 - button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \ 2230 + button $sha1but -text "[mc "Commit ID:"] " -state disabled -relief flat \ 2227 2231 -command gotocommit -width 8 2228 2232 $sha1but conf -disabledforeground [$sha1but cget -foreground] 2229 2233 pack .tf.bar.sha1label -side left ··· 2431 2435 set ctext .bleft.bottom.ctext 2432 2436 text $ctext -background $bgcolor -foreground $fgcolor \ 2433 2437 -state disabled -undo 0 -font textfont \ 2434 - -yscrollcommand scrolltext -wrap none \ 2438 + -yscrollcommand scrolltext -wrap $wrapdefault \ 2435 2439 -xscrollcommand ".bleft.bottom.sbhorizontal set" 2436 2440 if {$have_tk85} { 2437 2441 $ctext conf -tabstyle wordprocessor ··· 7344 7348 global mergemax numcommits pending_select 7345 7349 global cmitmode showneartags allcommits 7346 7350 global targetrow targetid lastscrollrows 7347 - global autoselect autosellen jump_to_here 7351 + global autocopy autoselect autosellen jump_to_here 7348 7352 global vinlinediff 7349 7353 7350 7354 unset -nocomplain pending_select ··· 7410 7414 7411 7415 $sha1entry delete 0 end 7412 7416 $sha1entry insert 0 $id 7413 - if {$autoselect} { 7417 + if {$autoselect && [haveselectionclipboard]} { 7414 7418 $sha1entry selection range 0 $autosellen 7419 + } 7420 + if {$autocopy} { 7421 + clipboard clear 7422 + clipboard append [string range $id 0 [expr $autosellen - 1]] 7415 7423 } 7416 7424 rhighlight_sel $id 7417 7425 ··· 8756 8764 if {$state == "normal"} { 8757 8765 $sha1but conf -state normal -relief raised -text "[mc "Goto:"] " 8758 8766 } else { 8759 - $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] " 8767 + $sha1but conf -state disabled -relief flat -text "[mc "Commit ID:"] " 8760 8768 } 8761 8769 } 8762 8770 ··· 8775 8783 set matches [longid $id] 8776 8784 if {$matches ne {}} { 8777 8785 if {[llength $matches] > 1} { 8778 - error_popup [mc "Short SHA1 id %s is ambiguous" $id] 8786 + error_popup [mc "Short commit ID %s is ambiguous" $id] 8779 8787 return 8780 8788 } 8781 8789 set id [lindex $matches 0] ··· 8792 8800 return 8793 8801 } 8794 8802 if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} { 8795 - set msg [mc "SHA1 id %s is not known" $sha1string] 8803 + set msg [mc "Commit ID %s is not known" $sha1string] 8796 8804 } else { 8797 8805 set msg [mc "Revision %s is not in the current view" $sha1string] 8798 8806 } ··· 11576 11584 11577 11585 proc prefspage_general {notebook} { 11578 11586 global NS maxwidth maxgraphpct showneartags showlocalchanges 11579 - global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs 11587 + global tabstop wrapcomment wrapdefault limitdiffs 11588 + global autocopy autoselect autosellen extdifftool perfile_attrs 11580 11589 global hideremotes want_ttk have_ttk maxrefs web_browser 11581 11590 11582 11591 set page [create_prefs_page $notebook.general] 11583 11592 11584 - ${NS}::label $page.ldisp -text [mc "Commit list display options"] 11593 + ${NS}::label $page.ldisp -text [mc "Commit list display options"] -font mainfontbold 11585 11594 grid $page.ldisp - -sticky w -pady 10 11586 11595 ${NS}::label $page.spacer -text " " 11587 11596 ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"] ··· 11594 11603 ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \ 11595 11604 -variable showlocalchanges 11596 11605 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 11606 ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \ 11602 11607 -variable hideremotes 11603 11608 grid x $page.hideremotes -sticky w 11604 11609 11605 - ${NS}::label $page.ddisp -text [mc "Diff display options"] 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 11606 11623 grid $page.ddisp - -sticky w -pady 10 11607 11624 ${NS}::label $page.tabstopl -text [mc "Tab spacing"] 11608 11625 spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop 11609 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 + 11610 11638 ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ 11611 11639 -variable showneartags 11612 11640 grid x $page.ntag -sticky w ··· 11635 11663 pack configure $page.webbrowserf.l -padx 10 11636 11664 grid x $page.webbrowserf $page.webbrowser -sticky ew 11637 11665 11638 - ${NS}::label $page.lgen -text [mc "General options"] 11666 + ${NS}::label $page.lgen -text [mc "General options"] -font mainfontbold 11639 11667 grid $page.lgen - -sticky w -pady 10 11640 11668 ${NS}::checkbutton $page.want_ttk -variable want_ttk \ 11641 11669 -text [mc "Use themed widgets"] ··· 11654 11682 11655 11683 set page [create_prefs_page $notebook.colors] 11656 11684 11657 - ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] 11685 + ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] -font mainfontbold 11658 11686 grid $page.cdisp - -sticky w -pady 10 11659 11687 label $page.ui -padx 40 -relief sunk -background $uicolor 11660 11688 ${NS}::button $page.uibut -text [mc "Interface"] \ ··· 11712 11740 proc prefspage_fonts {notebook} { 11713 11741 global NS 11714 11742 set page [create_prefs_page $notebook.fonts] 11715 - ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] 11743 + ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] -font mainfontbold 11716 11744 grid $page.cfont - -sticky w -pady 10 11717 11745 mkfontdisp mainfont $page [mc "Main font"] 11718 11746 mkfontdisp textfont $page [mc "Diff display font"] ··· 11725 11753 global oldprefs prefstop showneartags showlocalchanges 11726 11754 global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor 11727 11755 global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs 11728 - global hideremotes want_ttk have_ttk 11756 + global hideremotes want_ttk have_ttk wrapcomment wrapdefault 11729 11757 11730 11758 set top .gitkprefs 11731 11759 set prefstop $top ··· 11734 11762 return 11735 11763 } 11736 11764 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11737 - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { 11765 + limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} { 11738 11766 set oldprefs($v) [set $v] 11739 11767 } 11740 11768 ttk_toplevel $top ··· 11860 11888 global oldprefs prefstop 11861 11889 11862 11890 foreach v {maxwidth maxgraphpct showneartags showlocalchanges \ 11863 - limitdiffs tabstop perfile_attrs hideremotes want_ttk} { 11891 + limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} { 11864 11892 global $v 11865 11893 set $v $oldprefs($v) 11866 11894 } ··· 11874 11902 global oldprefs prefstop showneartags showlocalchanges 11875 11903 global fontpref mainfont textfont uifont 11876 11904 global limitdiffs treediffs perfile_attrs 11877 - global hideremotes 11905 + global hideremotes wrapcomment wrapdefault 11906 + global ctext 11878 11907 11879 11908 catch {destroy $prefstop} 11880 11909 unset prefstop ··· 11923 11952 if {$hideremotes != $oldprefs(hideremotes)} { 11924 11953 rereadrefs 11925 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 + } 11926 11961 } 11927 11962 11928 11963 proc formatdate {d} { ··· 12392 12427 set mingaplen 100 12393 12428 set cmitmode "patch" 12394 12429 set wrapcomment "none" 12430 + set wrapdefault "none" 12395 12431 set showneartags 1 12396 12432 set hideremotes 0 12397 12433 set maxrefs 20 ··· 12400 12436 set showlocalchanges 1 12401 12437 set limitdiffs 1 12402 12438 set datetimeformat "%Y-%m-%d %H:%M:%S" 12439 + set autocopy 0 12403 12440 set autoselect 1 12404 12441 set autosellen 40 12405 12442 set perfile_attrs 0 ··· 12497 12534 12498 12535 set config_variables { 12499 12536 mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth 12500 - cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs 12537 + cmitmode wrapcomment wrapdefault autocopy autoselect autosellen 12538 + showneartags maxrefs visiblerefs 12501 12539 hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk 12502 12540 bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors 12503 12541 markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor ··· 12687 12725 wm iconphoto . -default gitlogo gitlogo32 12688 12726 } 12689 12727 # wait for the window to become visible 12690 - tkwait visibility . 12728 + if {![winfo viewable .]} {tkwait visibility .} 12691 12729 set_window_title 12692 12730 update 12693 12731 readrefs

+377 -357

gitk-git/po/sv.po

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