From 3b681e255cd8577a77983958ef7f566b05806cd0 Mon Sep 17 00:00:00 2001
From: Peter Krefting <peter@softwolves.pp.se>
Date: Thu, 26 Oct 2023 21:47:18 +0100
Subject: [PATCH 1/8] gitk: sv.po: Update Swedish translation (323t)

Signed-off-by: Peter Krefting <peter@softwolves.pp.se>
---
 po/sv.po | 734 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 377 insertions(+), 357 deletions(-)

diff --git a/po/sv.po b/po/sv.po
index 2a06fe5bbc..5afbe6da1d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the gitk package.
 #
 # Mikael Magnusson <mikachu@gmail.com>, 2008.
-# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012, 2013, 2015.
+# Peter Krefting <peter@softwolves.pp.se>, 2008-2023.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-12-09 09:40+0100\n"
-"PO-Revision-Date: 2015-12-11 09:46+0100\n"
+"POT-Creation-Date: 2023-10-26 21:39+0100\n"
+"PO-Revision-Date: 2023-10-26 21:42+0100\n"
 "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -18,35 +18,35 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Gtranslator 2.91.6\n"
+"X-Generator: Gtranslator 3.38.0\n"
 
-#: gitk:140
+#: gitk:139
 msgid "Couldn't get list of unmerged files:"
 msgstr "Kunde inte hämta lista över ej sammanslagna filer:"
 
-#: gitk:212 gitk:2381
+#: gitk:211 gitk:2406
 msgid "Color words"
 msgstr "Färga ord"
 
-#: gitk:217 gitk:2381 gitk:8221 gitk:8254
+#: gitk:216 gitk:2406 gitk:8307 gitk:8340
 msgid "Markup words"
 msgstr "Märk upp ord"
 
-#: gitk:324
+#: gitk:323
 msgid "Error parsing revisions:"
 msgstr "Fel vid tolkning av revisioner:"
 
-#: gitk:380
+#: gitk:379
 msgid "Error executing --argscmd command:"
 msgstr "Fel vid körning av --argscmd-kommando:"
 
-#: gitk:393
+#: gitk:392
 msgid "No files selected: --merge specified but no files are unmerged."
 msgstr ""
 "Inga filer valdes: --merge angavs men det finns inga filer som inte har "
 "slagits samman."
 
-#: gitk:396
+#: gitk:395
 msgid ""
 "No files selected: --merge specified but no unmerged files are within file "
 "limit."
@@ -54,322 +54,326 @@ msgstr ""
 "Inga filer valdes: --merge angavs men det finns inga filer inom "
 "filbegränsningen."
 
-#: gitk:418 gitk:566
+#: gitk:417 gitk:565
 msgid "Error executing git log:"
 msgstr "Fel vid körning av git log:"
 
-#: gitk:436 gitk:582
+#: gitk:435 gitk:581
 msgid "Reading"
 msgstr "Läser"
 
-#: gitk:496 gitk:4526
+#: gitk:495 gitk:4572
 msgid "Reading commits..."
 msgstr "Läser incheckningar..."
 
-#: gitk:499 gitk:1637 gitk:4529
+#: gitk:498 gitk:1640 gitk:4575
 msgid "No commits selected"
 msgstr "Inga incheckningar markerade"
 
-#: gitk:1445 gitk:4046 gitk:12447
+#: gitk:1448 gitk:4092 gitk:12674
 msgid "Command line"
 msgstr "Kommandorad"
 
-#: gitk:1511
+#: gitk:1514
 msgid "Can't parse git log output:"
 msgstr "Kan inte tolka utdata från git log:"
 
-#: gitk:1740
+#: gitk:1743
 msgid "No commit information available"
 msgstr "Ingen incheckningsinformation är tillgänglig"
 
-#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536
+#: gitk:1910 gitk:1939 gitk:4362 gitk:9847 gitk:11451 gitk:11751
 msgid "OK"
 msgstr "OK"
 
-#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686
-#: gitk:11257 gitk:11537
+#: gitk:1941 gitk:4364 gitk:9283 gitk:9362 gitk:9492 gitk:9578 gitk:9849
+#: gitk:11452 gitk:11752
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: gitk:2069
+#: gitk:2090
 msgid "&Update"
 msgstr "&Uppdatera"
 
-#: gitk:2070
+#: gitk:2091
 msgid "&Reload"
 msgstr "Läs &om"
 
-#: gitk:2071
+#: gitk:2092
 msgid "Reread re&ferences"
 msgstr "Läs om &referenser"
 
-#: gitk:2072
+#: gitk:2093
 msgid "&List references"
 msgstr "&Visa referenser"
 
-#: gitk:2074
+#: gitk:2095
 msgid "Start git &gui"
 msgstr "Starta git &gui"
 
-#: gitk:2076
+#: gitk:2097
 msgid "&Quit"
 msgstr "&Avsluta"
 
-#: gitk:2068
+#: gitk:2089
 msgid "&File"
 msgstr "&Arkiv"
 
-#: gitk:2080
+#: gitk:2101
 msgid "&Preferences"
 msgstr "&Inställningar"
 
-#: gitk:2079
+#: gitk:2100
 msgid "&Edit"
 msgstr "&Redigera"
 
-#: gitk:2084
+#: gitk:2105
 msgid "&New view..."
 msgstr "&Ny vy..."
 
-#: gitk:2085
+#: gitk:2106
 msgid "&Edit view..."
 msgstr "&Ändra vy..."
 
-#: gitk:2086
+#: gitk:2107
 msgid "&Delete view"
 msgstr "&Ta bort vy"
 
-#: gitk:2088
+#: gitk:2109
 msgid "&All files"
 msgstr "&Alla filer"
 
-#: gitk:2083
+#: gitk:2104
 msgid "&View"
 msgstr "&Visa"
 
-#: gitk:2093 gitk:2103
+#: gitk:2114 gitk:2124
 msgid "&About gitk"
 msgstr "&Om gitk"
 
-#: gitk:2094 gitk:2108
+#: gitk:2115 gitk:2129
 msgid "&Key bindings"
 msgstr "&Tangentbordsbindningar"
 
-#: gitk:2092 gitk:2107
+#: gitk:2113 gitk:2128
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: gitk:2185 gitk:8653
+#: gitk:2206 gitk:8739
 msgid "SHA1 ID:"
 msgstr "SHA1-id:"
 
-#: gitk:2229
+#: gitk:2250
 msgid "Row"
 msgstr "Rad"
 
-#: gitk:2267
+#: gitk:2288
 msgid "Find"
 msgstr "Sök"
 
-#: gitk:2295
+#: gitk:2316
 msgid "commit"
 msgstr "incheckning"
 
-#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828
-#: gitk:6913
+#: gitk:2320 gitk:2322 gitk:4734 gitk:4757 gitk:4781 gitk:6802 gitk:6874
+#: gitk:6959
 msgid "containing:"
 msgstr "som innehåller:"
 
-#: gitk:2302 gitk:3527 gitk:3532 gitk:4764
+#: gitk:2323 gitk:3573 gitk:3578 gitk:4810
 msgid "touching paths:"
 msgstr "som rör sökväg:"
 
-#: gitk:2303 gitk:4778
+#: gitk:2324 gitk:4824
 msgid "adding/removing string:"
 msgstr "som lägger/till tar bort sträng:"
 
-#: gitk:2304 gitk:4780
+#: gitk:2325 gitk:4826
 msgid "changing lines matching:"
 msgstr "ändrar rader som matchar:"
 
-#: gitk:2313 gitk:2315 gitk:4767
+#: gitk:2334 gitk:2336 gitk:4813
 msgid "Exact"
 msgstr "Exakt"
 
-#: gitk:2315 gitk:4855 gitk:6724
+#: gitk:2336 gitk:4901 gitk:6770
 msgid "IgnCase"
 msgstr "IgnVersaler"
 
-#: gitk:2315 gitk:4737 gitk:4853 gitk:6720
+#: gitk:2336 gitk:4783 gitk:4899 gitk:6766
 msgid "Regexp"
 msgstr "Reg.uttr."
 
-#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917
+#: gitk:2338 gitk:2339 gitk:4921 gitk:4951 gitk:4958 gitk:6895 gitk:6963
 msgid "All fields"
 msgstr "Alla fält"
 
-#: gitk:2318 gitk:4872 gitk:4905 gitk:6787
+#: gitk:2339 gitk:4918 gitk:4951 gitk:6833
 msgid "Headline"
 msgstr "Rubrik"
 
-#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390
+#: gitk:2340 gitk:4918 gitk:6833 gitk:6963 gitk:7471
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831
-#: gitk:8846
+#: gitk:2340 gitk:4918 gitk:4923 gitk:4958 gitk:6833 gitk:7406 gitk:8917
+#: gitk:8932
 msgid "Author"
 msgstr "Författare"
 
-#: gitk:2319 gitk:4872 gitk:6787 gitk:7327
+#: gitk:2340 gitk:4918 gitk:6833 gitk:7408
 msgid "Committer"
 msgstr "Incheckare"
 
-#: gitk:2350
+#: gitk:2374
 msgid "Search"
 msgstr "Sök"
 
-#: gitk:2358
+#: gitk:2382
 msgid "Diff"
 msgstr "Diff"
 
-#: gitk:2360
+#: gitk:2384
 msgid "Old version"
 msgstr "Gammal version"
 
-#: gitk:2362
+#: gitk:2386
 msgid "New version"
 msgstr "Ny version"
 
-#: gitk:2364
+#: gitk:2389
 msgid "Lines of context"
 msgstr "Rader sammanhang"
 
-#: gitk:2374
+#: gitk:2399
 msgid "Ignore space change"
 msgstr "Ignorera ändringar i blanksteg"
 
-#: gitk:2378 gitk:2380 gitk:7960 gitk:8207
+#: gitk:2403 gitk:2405 gitk:8041 gitk:8293
 msgid "Line diff"
 msgstr "Rad-diff"
 
-#: gitk:2445
+#: gitk:2478
 msgid "Patch"
 msgstr "Patch"
 
-#: gitk:2447
+#: gitk:2480
 msgid "Tree"
 msgstr "Träd"
 
-#: gitk:2617 gitk:2638
+#: gitk:2650 gitk:2671
 msgid "Diff this -> selected"
 msgstr "Diff denna -> markerad"
 
-#: gitk:2618 gitk:2639
+#: gitk:2651 gitk:2672
 msgid "Diff selected -> this"
 msgstr "Diff markerad -> denna"
 
-#: gitk:2619 gitk:2640
+#: gitk:2652 gitk:2673
 msgid "Make patch"
 msgstr "Skapa patch"
 
-#: gitk:2620 gitk:9255
+#: gitk:2653 gitk:9341
 msgid "Create tag"
 msgstr "Skapa tagg"
 
-#: gitk:2621
-msgid "Copy commit summary"
-msgstr "Kopiera incheckningssammanfattning"
+#: gitk:2654
+msgid "Copy commit reference"
+msgstr "Kopiera incheckningsreferens"
 
-#: gitk:2622 gitk:9386
+#: gitk:2655 gitk:9472
 msgid "Write commit to file"
 msgstr "Skriv incheckning till fil"
 
-#: gitk:2623 gitk:9443
+#: gitk:2656
 msgid "Create new branch"
 msgstr "Skapa ny gren"
 
-#: gitk:2624
+#: gitk:2657
 msgid "Cherry-pick this commit"
 msgstr "Plocka denna incheckning"
 
-#: gitk:2625
+#: gitk:2658
 msgid "Reset HEAD branch to here"
 msgstr "Återställ HEAD-grenen hit"
 
-#: gitk:2626
+#: gitk:2659
 msgid "Mark this commit"
 msgstr "Markera denna incheckning"
 
-#: gitk:2627
+#: gitk:2660
 msgid "Return to mark"
 msgstr "Återgå till markering"
 
-#: gitk:2628
+#: gitk:2661
 msgid "Find descendant of this and mark"
 msgstr "Hitta efterföljare till denna och markera"
 
-#: gitk:2629
+#: gitk:2662
 msgid "Compare with marked commit"
 msgstr "Jämför med markerad incheckning"
 
-#: gitk:2630 gitk:2641
+#: gitk:2663 gitk:2674
 msgid "Diff this -> marked commit"
 msgstr "Diff denna -> markerad incheckning"
 
-#: gitk:2631 gitk:2642
+#: gitk:2664 gitk:2675
 msgid "Diff marked commit -> this"
 msgstr "Diff markerad incheckning -> denna"
 
-#: gitk:2632
+#: gitk:2665
 msgid "Revert this commit"
 msgstr "Ångra denna incheckning"
 
-#: gitk:2648
+#: gitk:2681
 msgid "Check out this branch"
 msgstr "Checka ut denna gren"
 
-#: gitk:2649
+#: gitk:2682
+msgid "Rename this branch"
+msgstr "Byt namn på denna gren"
+
+#: gitk:2683
 msgid "Remove this branch"
 msgstr "Ta bort denna gren"
 
-#: gitk:2650
+#: gitk:2684
 msgid "Copy branch name"
 msgstr "Kopiera namn på gren"
 
-#: gitk:2657
+#: gitk:2691
 msgid "Highlight this too"
 msgstr "Markera även detta"
 
-#: gitk:2658
+#: gitk:2692
 msgid "Highlight this only"
 msgstr "Markera bara detta"
 
-#: gitk:2659
+#: gitk:2693
 msgid "External diff"
 msgstr "Extern diff"
 
-#: gitk:2660
+#: gitk:2694
 msgid "Blame parent commit"
 msgstr "Klandra föräldraincheckning"
 
-#: gitk:2661
+#: gitk:2695
 msgid "Copy path"
 msgstr "Kopiera sökväg"
 
-#: gitk:2668
+#: gitk:2702
 msgid "Show origin of this line"
 msgstr "Visa ursprunget för den här raden"
 
-#: gitk:2669
+#: gitk:2703
 msgid "Run git gui blame on this line"
 msgstr "Kör git gui blame på den här raden"
 
-#: gitk:3013
+#: gitk:3057
 msgid "About gitk"
 msgstr "Om gitk"
 
-#: gitk:3015
+#: gitk:3059
 msgid ""
 "\n"
 "Gitk - a commit viewer for git\n"
@@ -385,525 +389,529 @@ msgstr ""
 "\n"
 "Använd och vidareförmedla enligt villkoren i GNU General Public License"
 
-#: gitk:3023 gitk:3090 gitk:9872
+#: gitk:3067 gitk:3134 gitk:10062
 msgid "Close"
 msgstr "Stäng"
 
-#: gitk:3044
+#: gitk:3088
 msgid "Gitk key bindings"
 msgstr "Tangentbordsbindningar för Gitk"
 
-#: gitk:3047
+#: gitk:3091
 msgid "Gitk key bindings:"
 msgstr "Tangentbordsbindningar för Gitk:"
 
-#: gitk:3049
+#: gitk:3093
 #, tcl-format
 msgid "<%s-Q>\t\tQuit"
 msgstr "<%s-Q>\t\tAvsluta"
 
-#: gitk:3050
+#: gitk:3094
 #, tcl-format
 msgid "<%s-W>\t\tClose window"
 msgstr "<%s-W>\t\tStäng fönster"
 
-#: gitk:3051
+#: gitk:3095
 msgid "<Home>\t\tMove to first commit"
 msgstr "<Home>\t\tGå till första incheckning"
 
-#: gitk:3052
+#: gitk:3096
 msgid "<End>\t\tMove to last commit"
 msgstr "<End>\t\tGå till sista incheckning"
 
-#: gitk:3053
+#: gitk:3097
 msgid "<Up>, p, k\tMove up one commit"
 msgstr "<Upp>, p, k\tGå en incheckning upp"
 
-#: gitk:3054
+#: gitk:3098
 msgid "<Down>, n, j\tMove down one commit"
 msgstr "<Ned>, n, j\tGå en incheckning ned"
 
-#: gitk:3055
+#: gitk:3099
 msgid "<Left>, z, h\tGo back in history list"
 msgstr "<Vänster>, z, h\tGå bakåt i historiken"
 
-#: gitk:3056
+#: gitk:3100
 msgid "<Right>, x, l\tGo forward in history list"
 msgstr "<Höger>, x, l\tGå framåt i historiken"
 
-#: gitk:3057
+#: gitk:3101
 #, tcl-format
 msgid "<%s-n>\tGo to n-th parent of current commit in history list"
 msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan"
 
-#: gitk:3058
+#: gitk:3102
 msgid "<PageUp>\tMove up one page in commit list"
 msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
 
-#: gitk:3059
+#: gitk:3103
 msgid "<PageDown>\tMove down one page in commit list"
 msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
 
-#: gitk:3060
+#: gitk:3104
 #, tcl-format
 msgid "<%s-Home>\tScroll to top of commit list"
 msgstr "<%s-Home>\tRulla till början av incheckningslistan"
 
-#: gitk:3061
+#: gitk:3105
 #, tcl-format
 msgid "<%s-End>\tScroll to bottom of commit list"
 msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
 
-#: gitk:3062
+#: gitk:3106
 #, tcl-format
 msgid "<%s-Up>\tScroll commit list up one line"
 msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
 
-#: gitk:3063
+#: gitk:3107
 #, tcl-format
 msgid "<%s-Down>\tScroll commit list down one line"
 msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
 
-#: gitk:3064
+#: gitk:3108
 #, tcl-format
 msgid "<%s-PageUp>\tScroll commit list up one page"
 msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
 
-#: gitk:3065
+#: gitk:3109
 #, tcl-format
 msgid "<%s-PageDown>\tScroll commit list down one page"
 msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
 
-#: gitk:3066
+#: gitk:3110
 msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
 msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
 
-#: gitk:3067
+#: gitk:3111
 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
 msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
 
-#: gitk:3068
+#: gitk:3112
 msgid "<Delete>, b\tScroll diff view up one page"
 msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
 
-#: gitk:3069
+#: gitk:3113
 msgid "<Backspace>\tScroll diff view up one page"
 msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
 
-#: gitk:3070
+#: gitk:3114
 msgid "<Space>\t\tScroll diff view down one page"
 msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
 
-#: gitk:3071
+#: gitk:3115
 msgid "u\t\tScroll diff view up 18 lines"
 msgstr "u\t\tRulla diffvisningen upp 18 rader"
 
-#: gitk:3072
+#: gitk:3116
 msgid "d\t\tScroll diff view down 18 lines"
 msgstr "d\t\tRulla diffvisningen ned 18 rader"
 
-#: gitk:3073
+#: gitk:3117
 #, tcl-format
 msgid "<%s-F>\t\tFind"
 msgstr "<%s-F>\t\tSök"
 
-#: gitk:3074
+#: gitk:3118
 #, tcl-format
 msgid "<%s-G>\t\tMove to next find hit"
 msgstr "<%s-G>\t\tGå till nästa sökträff"
 
-#: gitk:3075
+#: gitk:3119
 msgid "<Return>\tMove to next find hit"
 msgstr "<Return>\t\tGå till nästa sökträff"
 
-#: gitk:3076
+#: gitk:3120
 msgid "g\t\tGo to commit"
 msgstr "g\t\tGå till incheckning"
 
-#: gitk:3077
+#: gitk:3121
 msgid "/\t\tFocus the search box"
 msgstr "/\t\tFokusera sökrutan"
 
-#: gitk:3078
+#: gitk:3122
 msgid "?\t\tMove to previous find hit"
 msgstr "?\t\tGå till föregående sökträff"
 
-#: gitk:3079
+#: gitk:3123
 msgid "f\t\tScroll diff view to next file"
 msgstr "f\t\tRulla diffvisningen till nästa fil"
 
-#: gitk:3080
+#: gitk:3124
 #, tcl-format
 msgid "<%s-S>\t\tSearch for next hit in diff view"
 msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen"
 
-#: gitk:3081
+#: gitk:3125
 #, tcl-format
 msgid "<%s-R>\t\tSearch for previous hit in diff view"
 msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen"
 
-#: gitk:3082
+#: gitk:3126
 #, tcl-format
 msgid "<%s-KP+>\tIncrease font size"
 msgstr "<%s-Num+>\tÖka teckenstorlek"
 
-#: gitk:3083
+#: gitk:3127
 #, tcl-format
 msgid "<%s-plus>\tIncrease font size"
 msgstr "<%s-plus>\tÖka teckenstorlek"
 
-#: gitk:3084
+#: gitk:3128
 #, tcl-format
 msgid "<%s-KP->\tDecrease font size"
 msgstr "<%s-Num->\tMinska teckenstorlek"
 
-#: gitk:3085
+#: gitk:3129
 #, tcl-format
 msgid "<%s-minus>\tDecrease font size"
 msgstr "<%s-minus>\tMinska teckenstorlek"
 
-#: gitk:3086
+#: gitk:3130
 msgid "<F5>\t\tUpdate"
 msgstr "<F5>\t\tUppdatera"
 
-#: gitk:3551 gitk:3560
+#: gitk:3597 gitk:3606
 #, tcl-format
 msgid "Error creating temporary directory %s:"
 msgstr "Fel vid skapande av temporär katalog %s:"
 
-#: gitk:3573
+#: gitk:3619
 #, tcl-format
 msgid "Error getting \"%s\" from %s:"
-msgstr "Fel vid hämtning av  \"%s\" från %s:"
+msgstr "Fel vid hämtning av  ”%s” från %s:"
 
-#: gitk:3636
+#: gitk:3682
 msgid "command failed:"
 msgstr "kommando misslyckades:"
 
-#: gitk:3785
+#: gitk:3831
 msgid "No such commit"
 msgstr "Incheckning saknas"
 
-#: gitk:3799
+#: gitk:3845
 msgid "git gui blame: command failed:"
 msgstr "git gui blame: kommando misslyckades:"
 
-#: gitk:3830
+#: gitk:3876
 #, tcl-format
 msgid "Couldn't read merge head: %s"
 msgstr "Kunde inte läsa sammanslagningshuvud: %s"
 
-#: gitk:3838
+#: gitk:3884
 #, tcl-format
 msgid "Error reading index: %s"
 msgstr "Fel vid läsning av index: %s"
 
-#: gitk:3863
+#: gitk:3909
 #, tcl-format
 msgid "Couldn't start git blame: %s"
 msgstr "Kunde inte starta git blame: %s"
 
-#: gitk:3866 gitk:6755
+#: gitk:3912 gitk:6801
 msgid "Searching"
 msgstr "Söker"
 
-#: gitk:3898
+#: gitk:3944
 #, tcl-format
 msgid "Error running git blame: %s"
 msgstr "Fel vid körning av git blame: %s"
 
-#: gitk:3926
+#: gitk:3972
 #, tcl-format
 msgid "That line comes from commit %s,  which is not in this view"
 msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy"
 
-#: gitk:3940
+#: gitk:3986
 msgid "External diff viewer failed:"
 msgstr "Externt diff-verktyg misslyckades:"
 
-#: gitk:4044
+#: gitk:4090
 msgid "All files"
 msgstr "Alla filer"
 
-#: gitk:4068
+#: gitk:4114
 msgid "View"
 msgstr "Visa"
 
-#: gitk:4071
+#: gitk:4117
 msgid "Gitk view definition"
 msgstr "Definition av Gitk-vy"
 
-#: gitk:4075
+#: gitk:4121
 msgid "Remember this view"
 msgstr "Spara denna vy"
 
-#: gitk:4076
+#: gitk:4122
 msgid "References (space separated list):"
 msgstr "Referenser (blankstegsavdelad lista):"
 
-#: gitk:4077
+#: gitk:4123
 msgid "Branches & tags:"
 msgstr "Grenar & taggar:"
 
-#: gitk:4078
+#: gitk:4124
 msgid "All refs"
 msgstr "Alla referenser"
 
-#: gitk:4079
+#: gitk:4125
 msgid "All (local) branches"
 msgstr "Alla (lokala) grenar"
 
-#: gitk:4080
+#: gitk:4126
 msgid "All tags"
 msgstr "Alla taggar"
 
-#: gitk:4081
+#: gitk:4127
 msgid "All remote-tracking branches"
 msgstr "Alla fjärrspårande grenar"
 
-#: gitk:4082
+#: gitk:4128
 msgid "Commit Info (regular expressions):"
 msgstr "Incheckningsinfo (reguljära uttryck):"
 
-#: gitk:4083
+#: gitk:4129
 msgid "Author:"
 msgstr "Författare:"
 
-#: gitk:4084
+#: gitk:4130
 msgid "Committer:"
 msgstr "Incheckare:"
 
-#: gitk:4085
+#: gitk:4131
 msgid "Commit Message:"
 msgstr "Incheckningsmeddelande:"
 
-#: gitk:4086
+#: gitk:4132
 msgid "Matches all Commit Info criteria"
 msgstr "Motsvarar alla kriterier för incheckningsinfo"
 
-#: gitk:4087
+#: gitk:4133
 msgid "Matches no Commit Info criteria"
 msgstr "Motsvarar inga kriterier för incheckningsinfo"
 
-#: gitk:4088
+#: gitk:4134
 msgid "Changes to Files:"
 msgstr "Ändringar av filer:"
 
-#: gitk:4089
+#: gitk:4135
 msgid "Fixed String"
 msgstr "Fast sträng"
 
-#: gitk:4090
+#: gitk:4136
 msgid "Regular Expression"
 msgstr "Reguljärt uttryck"
 
-#: gitk:4091
+#: gitk:4137
 msgid "Search string:"
 msgstr "Söksträng:"
 
-#: gitk:4092
+#: gitk:4138
 msgid ""
 "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
 "15:27:38\"):"
 msgstr ""
-"Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
-"15:27:38\"):"
+"Incheckningsdatum (”2 weeks ago”, ”2009-03-17 15:27:38”, ”March 17, 2009 "
+"15:27:38”):"
 
-#: gitk:4093
+#: gitk:4139
 msgid "Since:"
 msgstr "Från:"
 
-#: gitk:4094
+#: gitk:4140
 msgid "Until:"
 msgstr "Till:"
 
-#: gitk:4095
+#: gitk:4141
 msgid "Limit and/or skip a number of revisions (positive integer):"
 msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):"
 
-#: gitk:4096
+#: gitk:4142
 msgid "Number to show:"
 msgstr "Antal att visa:"
 
-#: gitk:4097
+#: gitk:4143
 msgid "Number to skip:"
 msgstr "Antal att hoppa över:"
 
-#: gitk:4098
+#: gitk:4144
 msgid "Miscellaneous options:"
 msgstr "Diverse alternativ:"
 
-#: gitk:4099
+#: gitk:4145
 msgid "Strictly sort by date"
 msgstr "Strikt datumsortering"
 
-#: gitk:4100
+#: gitk:4146
 msgid "Mark branch sides"
 msgstr "Markera sidogrenar"
 
-#: gitk:4101
+#: gitk:4147
 msgid "Limit to first parent"
 msgstr "Begränsa till första förälder"
 
-#: gitk:4102
+#: gitk:4148
 msgid "Simple history"
 msgstr "Enkel historik"
 
-#: gitk:4103
+#: gitk:4149
 msgid "Additional arguments to git log:"
 msgstr "Ytterligare argument till git log:"
 
-#: gitk:4104
+#: gitk:4150
 msgid "Enter files and directories to include, one per line:"
 msgstr "Ange filer och kataloger att ta med, en per rad:"
 
-#: gitk:4105
+#: gitk:4151
 msgid "Command to generate more commits to include:"
 msgstr "Kommando för att generera fler incheckningar att ta med:"
 
-#: gitk:4229
+#: gitk:4275
 msgid "Gitk: edit view"
 msgstr "Gitk: redigera vy"
 
-#: gitk:4237
+#: gitk:4283
 msgid "-- criteria for selecting revisions"
 msgstr " - kriterier för val av revisioner"
 
-#: gitk:4242
+#: gitk:4288
 msgid "View Name"
 msgstr "Namn på vy"
 
-#: gitk:4317
+#: gitk:4363
 msgid "Apply (F5)"
 msgstr "Använd (F5)"
 
-#: gitk:4355
+#: gitk:4401
 msgid "Error in commit selection arguments:"
 msgstr "Fel i argument för val av incheckningar:"
 
-#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389
+#: gitk:4456 gitk:4509 gitk:4971 gitk:4985 gitk:6255 gitk:12615 gitk:12616
 msgid "None"
 msgstr "Inget"
 
-#: gitk:5022 gitk:5027
+#: gitk:5068 gitk:5073
 msgid "Descendant"
 msgstr "Avkomling"
 
-#: gitk:5023
+#: gitk:5069
 msgid "Not descendant"
 msgstr "Inte avkomling"
 
-#: gitk:5030 gitk:5035
+#: gitk:5076 gitk:5081
 msgid "Ancestor"
 msgstr "Förfader"
 
-#: gitk:5031
+#: gitk:5077
 msgid "Not ancestor"
 msgstr "Inte förfader"
 
-#: gitk:5325
+#: gitk:5371
 msgid "Local changes checked in to index but not committed"
 msgstr "Lokala ändringar sparade i indexet men inte incheckade"
 
-#: gitk:5361
+#: gitk:5407
 msgid "Local uncommitted changes, not checked in to index"
 msgstr "Lokala ändringar, ej sparade i indexet"
 
-#: gitk:7135
+#: gitk:7155
+msgid "Error starting web browser:"
+msgstr "Fel när webbläsaren skulle startas:"
+
+#: gitk:7216
 msgid "and many more"
 msgstr "med många flera"
 
-#: gitk:7138
+#: gitk:7219
 msgid "many"
 msgstr "många"
 
-#: gitk:7329
+#: gitk:7410
 msgid "Tags:"
 msgstr "Taggar:"
 
-#: gitk:7346 gitk:7352 gitk:8826
+#: gitk:7427 gitk:7433 gitk:8912
 msgid "Parent"
 msgstr "Förälder"
 
-#: gitk:7357
+#: gitk:7438
 msgid "Child"
 msgstr "Barn"
 
-#: gitk:7366
+#: gitk:7447
 msgid "Branch"
 msgstr "Gren"
 
-#: gitk:7369
+#: gitk:7450
 msgid "Follows"
 msgstr "Följer"
 
-#: gitk:7372
+#: gitk:7453
 msgid "Precedes"
 msgstr "Föregår"
 
-#: gitk:7967
+#: gitk:8048
 #, tcl-format
 msgid "Error getting diffs: %s"
 msgstr "Fel vid hämtning av diff: %s"
 
-#: gitk:8651
+#: gitk:8737
 msgid "Goto:"
 msgstr "Gå till:"
 
-#: gitk:8672
+#: gitk:8758
 #, tcl-format
 msgid "Short SHA1 id %s is ambiguous"
 msgstr "Förkortat SHA1-id %s är tvetydigt"
 
-#: gitk:8679
+#: gitk:8765
 #, tcl-format
 msgid "Revision %s is not known"
 msgstr "Revisionen %s är inte känd"
 
-#: gitk:8689
+#: gitk:8775
 #, tcl-format
 msgid "SHA1 id %s is not known"
 msgstr "SHA-id:t %s är inte känt"
 
-#: gitk:8691
+#: gitk:8777
 #, tcl-format
 msgid "Revision %s is not in the current view"
 msgstr "Revisionen %s finns inte i den nuvarande vyn"
 
-#: gitk:8833 gitk:8848
+#: gitk:8919 gitk:8934
 msgid "Date"
 msgstr "Datum"
 
-#: gitk:8836
+#: gitk:8922
 msgid "Children"
 msgstr "Barn"
 
-#: gitk:8899
+#: gitk:8985
 #, tcl-format
 msgid "Reset %s branch to here"
 msgstr "Återställ grenen %s hit"
 
-#: gitk:8901
+#: gitk:8987
 msgid "Detached head: can't reset"
 msgstr "Frånkopplad head: kan inte återställa"
 
-#: gitk:9006 gitk:9012
+#: gitk:9092 gitk:9098
 msgid "Skipping merge commit "
 msgstr "Hoppar över sammanslagningsincheckning "
 
-#: gitk:9021 gitk:9026
+#: gitk:9107 gitk:9112
 msgid "Error getting patch ID for "
 msgstr "Fel vid hämtning av patch-id för "
 
-#: gitk:9022 gitk:9027
+#: gitk:9108 gitk:9113
 msgid " - stopping\n"
 msgstr " - stannar\n"
 
-#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066
+#: gitk:9118 gitk:9121 gitk:9129 gitk:9143 gitk:9152
 msgid "Commit "
 msgstr "Incheckning "
 
-#: gitk:9036
+#: gitk:9122
 msgid ""
 " is the same patch as\n"
 "       "
@@ -911,7 +919,7 @@ msgstr ""
 " är samma patch som\n"
 "       "
 
-#: gitk:9044
+#: gitk:9130
 msgid ""
 " differs from\n"
 "       "
@@ -919,7 +927,7 @@ msgstr ""
 " skiljer sig från\n"
 "       "
 
-#: gitk:9046
+#: gitk:9132
 msgid ""
 "Diff of commits:\n"
 "\n"
@@ -927,141 +935,158 @@ msgstr ""
 "Skillnad mellan incheckningar:\n"
 "\n"
 
-#: gitk:9058 gitk:9067
+#: gitk:9144 gitk:9153
 #, tcl-format
 msgid " has %s children - stopping\n"
 msgstr " har %s barn - stannar\n"
 
-#: gitk:9086
+#: gitk:9172
 #, tcl-format
 msgid "Error writing commit to file: %s"
 msgstr "Fel vid skrivning av incheckning till fil: %s"
 
-#: gitk:9092
+#: gitk:9178
 #, tcl-format
 msgid "Error diffing commits: %s"
 msgstr "Fel vid jämförelse av incheckningar: %s"
 
-#: gitk:9138
+#: gitk:9224
 msgid "Top"
 msgstr "Topp"
 
-#: gitk:9139
+#: gitk:9225
 msgid "From"
 msgstr "Från"
 
-#: gitk:9144
+#: gitk:9230
 msgid "To"
 msgstr "Till"
 
-#: gitk:9168
+#: gitk:9254
 msgid "Generate patch"
 msgstr "Generera patch"
 
-#: gitk:9170
+#: gitk:9256
 msgid "From:"
 msgstr "Från:"
 
-#: gitk:9179
+#: gitk:9265
 msgid "To:"
 msgstr "Till:"
 
-#: gitk:9188
+#: gitk:9274
 msgid "Reverse"
 msgstr "Vänd"
 
-#: gitk:9190 gitk:9400
+#: gitk:9276 gitk:9486
 msgid "Output file:"
 msgstr "Utdatafil:"
 
-#: gitk:9196
+#: gitk:9282
 msgid "Generate"
 msgstr "Generera"
 
-#: gitk:9234
+#: gitk:9320
 msgid "Error creating patch:"
 msgstr "Fel vid generering av patch:"
 
-#: gitk:9257 gitk:9388 gitk:9445
+#: gitk:9343 gitk:9474 gitk:9562
 msgid "ID:"
 msgstr "Id:"
 
-#: gitk:9266
+#: gitk:9352
 msgid "Tag name:"
 msgstr "Taggnamn:"
 
-#: gitk:9269
+#: gitk:9355
 msgid "Tag message is optional"
 msgstr "Taggmeddelandet är valfritt"
 
-#: gitk:9271
+#: gitk:9357
 msgid "Tag message:"
 msgstr "Taggmeddelande:"
 
-#: gitk:9275 gitk:9454
+#: gitk:9361 gitk:9532
 msgid "Create"
 msgstr "Skapa"
 
-#: gitk:9293
+#: gitk:9379
 msgid "No tag name specified"
 msgstr "Inget taggnamn angavs"
 
-#: gitk:9297
+#: gitk:9383
 #, tcl-format
 msgid "Tag \"%s\" already exists"
-msgstr "Taggen \"%s\" finns redan"
+msgstr "Taggen ”%s” finns redan"
 
-#: gitk:9307
+#: gitk:9393
 msgid "Error creating tag:"
 msgstr "Fel vid skapande av tagg:"
 
-#: gitk:9397
+#: gitk:9483
 msgid "Command:"
 msgstr "Kommando:"
 
-#: gitk:9405
+#: gitk:9491
 msgid "Write"
 msgstr "Skriv"
 
-#: gitk:9423
+#: gitk:9509
 msgid "Error writing commit:"
 msgstr "Fel vid skrivning av incheckning:"
 
-#: gitk:9450
+#: gitk:9531
+msgid "Create branch"
+msgstr "Skapa gren"
+
+#: gitk:9547
+#, tcl-format
+msgid "Rename branch %s"
+msgstr "Byt namn på grenen %s"
+
+#: gitk:9548
+msgid "Rename"
+msgstr "Byt namn"
+
+#: gitk:9572
 msgid "Name:"
 msgstr "Namn:"
 
-#: gitk:9473
+#: gitk:9596
 msgid "Please specify a name for the new branch"
 msgstr "Ange ett namn för den nya grenen"
 
-#: gitk:9478
+#: gitk:9601
 #, tcl-format
 msgid "Branch '%s' already exists. Overwrite?"
-msgstr "Grenen \"%s\" finns redan. Skriva över?"
+msgstr "Grenen ”%s” finns redan. Skriva över?"
 
-#: gitk:9545
+#: gitk:9645
+msgid "Please specify a new name for the branch"
+msgstr "Ange ett nytt namn för grenen"
+
+#: gitk:9708
 #, tcl-format
 msgid "Commit %s is already included in branch %s -- really re-apply it?"
 msgstr ""
 "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
 "på nytt?"
 
-#: gitk:9550
+#: gitk:9713
 msgid "Cherry-picking"
 msgstr "Plockar"
 
-#: gitk:9559
+#: gitk:9722
 #, tcl-format
 msgid ""
 "Cherry-pick failed because of local changes to file '%s'.\n"
 "Please commit, reset or stash your changes and try again."
 msgstr ""
-"Cherry-pick misslyckades på grund av lokala ändringar i filen \"%s\".\n"
+"Cherry-pick misslyckades på grund av lokala ändringar i filen ”%s”.\n"
 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
 "igen."
 
-#: gitk:9565
+#: gitk:9728
 msgid ""
 "Cherry-pick failed because of merge conflict.\n"
 "Do you wish to run git citool to resolve it?"
@@ -1069,20 +1094,20 @@ msgstr ""
 "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n"
 "Vill du köra git citool för att lösa den?"
 
-#: gitk:9581 gitk:9639
+#: gitk:9744 gitk:9802
 msgid "No changes committed"
 msgstr "Inga ändringar incheckade"
 
-#: gitk:9608
+#: gitk:9771
 #, tcl-format
 msgid "Commit %s is not included in branch %s -- really revert it?"
 msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?"
 
-#: gitk:9613
+#: gitk:9776
 msgid "Reverting"
 msgstr "Ångrar"
 
-#: gitk:9621
+#: gitk:9784
 #, tcl-format
 msgid ""
 "Revert failed because of local changes to the following files:%s Please "
@@ -1092,7 +1117,7 @@ msgstr ""
 "Checka in, återställ eller spara undan (stash) dina ändringar och försök "
 "igen."
 
-#: gitk:9625
+#: gitk:9788
 msgid ""
 "Revert failed because of merge conflict.\n"
 " Do you wish to run git citool to resolve it?"
@@ -1100,28 +1125,28 @@ msgstr ""
 "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n"
 " Vill du köra git citool för att lösa den?"
 
-#: gitk:9668
+#: gitk:9831
 msgid "Confirm reset"
 msgstr "Bekräfta återställning"
 
-#: gitk:9670
+#: gitk:9833
 #, tcl-format
 msgid "Reset branch %s to %s?"
 msgstr "Återställa grenen %s till %s?"
 
-#: gitk:9672
+#: gitk:9835
 msgid "Reset type:"
 msgstr "Typ av återställning:"
 
-#: gitk:9675
+#: gitk:9838
 msgid "Soft: Leave working tree and index untouched"
 msgstr "Mjuk: Rör inte utcheckning och index"
 
-#: gitk:9678
+#: gitk:9841
 msgid "Mixed: Leave working tree untouched, reset index"
 msgstr "Blandad: Rör inte utcheckning, återställ index"
 
-#: gitk:9681
+#: gitk:9844
 msgid ""
 "Hard: Reset working tree and index\n"
 "(discard ALL local changes)"
@@ -1129,19 +1154,24 @@ msgstr ""
 "Hård: Återställ utcheckning och index\n"
 "(förkastar ALLA lokala ändringar)"
 
-#: gitk:9698
+#: gitk:9861
 msgid "Resetting"
 msgstr "Återställer"
 
-#: gitk:9758
+#: gitk:9934
+#, tcl-format
+msgid "A local branch named %s exists already"
+msgstr "Det finns redan en lokal gren som heter %s"
+
+#: gitk:9942
 msgid "Checking out"
 msgstr "Checkar ut"
 
-#: gitk:9811
+#: gitk:10001
 msgid "Cannot delete the currently checked-out branch"
 msgstr "Kan inte ta bort den just nu utcheckade grenen"
 
-#: gitk:9817
+#: gitk:10007
 #, tcl-format
 msgid ""
 "The commits on branch %s aren't on any other branch.\n"
@@ -1150,16 +1180,16 @@ msgstr ""
 "Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
 "Vill du verkligen ta bort grenen %s?"
 
-#: gitk:9848
+#: gitk:10038
 #, tcl-format
 msgid "Tags and heads: %s"
 msgstr "Taggar och huvuden: %s"
 
-#: gitk:9865
+#: gitk:10055
 msgid "Filter"
 msgstr "Filter"
 
-#: gitk:10161
+#: gitk:10356
 msgid ""
 "Error reading commit topology information; branch and preceding/following "
 "tag information will be incomplete."
@@ -1167,201 +1197,221 @@ msgstr ""
 "Fel vid läsning av information om incheckningstopologi; information om "
 "grenar och föregående/senare taggar kommer inte vara komplett."
 
-#: gitk:11138
+#: gitk:11333
 msgid "Tag"
 msgstr "Tagg"
 
-#: gitk:11142
+#: gitk:11337
 msgid "Id"
 msgstr "Id"
 
-#: gitk:11225
+#: gitk:11420
 msgid "Gitk font chooser"
 msgstr "Teckensnittsväljare för Gitk"
 
-#: gitk:11242
+#: gitk:11437
 msgid "B"
 msgstr "F"
 
-#: gitk:11245
+#: gitk:11440
 msgid "I"
 msgstr "K"
 
-#: gitk:11363
+#: gitk:11558
 msgid "Commit list display options"
 msgstr "Alternativ för incheckningslistvy"
 
-#: gitk:11366
+#: gitk:11561
 msgid "Maximum graph width (lines)"
 msgstr "Maximal grafbredd (rader)"
 
-#: gitk:11370
+#: gitk:11565
 #, no-tcl-format
 msgid "Maximum graph width (% of pane)"
 msgstr "Maximal grafbredd (% av ruta)"
 
-#: gitk:11373
+#: gitk:11568
 msgid "Show local changes"
 msgstr "Visa lokala ändringar"
 
-#: gitk:11376
+#: gitk:11571
 msgid "Auto-select SHA1 (length)"
 msgstr "Välj SHA1 (längd) automatiskt"
 
-#: gitk:11380
+#: gitk:11575
 msgid "Hide remote refs"
 msgstr "Dölj fjärr-referenser"
 
-#: gitk:11384
+#: gitk:11579
 msgid "Diff display options"
 msgstr "Alternativ för diffvy"
 
-#: gitk:11386
+#: gitk:11581
 msgid "Tab spacing"
 msgstr "Blanksteg för tabulatortecken"
 
-#: gitk:11389
+#: gitk:11584
 msgid "Display nearby tags/heads"
 msgstr "Visa närliggande taggar/huvuden"
 
-#: gitk:11392
+#: gitk:11587
 msgid "Maximum # tags/heads to show"
 msgstr "Maximalt antal taggar/huvuden att visa"
 
-#: gitk:11395
+#: gitk:11590
 msgid "Limit diffs to listed paths"
 msgstr "Begränsa diff till listade sökvägar"
 
-#: gitk:11398
+#: gitk:11593
 msgid "Support per-file encodings"
 msgstr "Stöd för filspecifika teckenkodningar"
 
-#: gitk:11404 gitk:11551
+#: gitk:11599 gitk:11766
 msgid "External diff tool"
 msgstr "Externt diff-verktyg"
 
-#: gitk:11405
+#: gitk:11600
 msgid "Choose..."
 msgstr "Välj..."
 
-#: gitk:11410
+#: gitk:11607
+msgid "Web browser"
+msgstr "Webbläsare"
+
+#: gitk:11612
 msgid "General options"
 msgstr "Allmänna inställningar"
 
-#: gitk:11413
+#: gitk:11615
 msgid "Use themed widgets"
 msgstr "Använd tema på fönsterelement"
 
-#: gitk:11415
+#: gitk:11617
 msgid "(change requires restart)"
 msgstr "(ändringen kräver omstart)"
 
-#: gitk:11417
+#: gitk:11619
 msgid "(currently unavailable)"
 msgstr "(för närvarande inte tillgängligt)"
 
-#: gitk:11428
+#: gitk:11631
 msgid "Colors: press to choose"
 msgstr "Färger: tryck för att välja"
 
-#: gitk:11431
+#: gitk:11634
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: gitk:11432
+#: gitk:11635
 msgid "interface"
 msgstr "gränssnitt"
 
-#: gitk:11435
+#: gitk:11638
 msgid "Background"
 msgstr "Bakgrund"
 
-#: gitk:11436 gitk:11466
+#: gitk:11639 gitk:11681
 msgid "background"
 msgstr "bakgrund"
 
-#: gitk:11439
+#: gitk:11642
 msgid "Foreground"
 msgstr "Förgrund"
 
-#: gitk:11440
+#: gitk:11643
 msgid "foreground"
 msgstr "förgrund"
 
-#: gitk:11443
+#: gitk:11646
 msgid "Diff: old lines"
 msgstr "Diff: gamla rader"
 
-#: gitk:11444
+#: gitk:11647
 msgid "diff old lines"
 msgstr "diff gamla rader"
 
-#: gitk:11448
+#: gitk:11651
+msgid "Diff: old lines bg"
+msgstr "Diff: gamla rader bg"
+
+#: gitk:11653
+msgid "diff old lines bg"
+msgstr "diff gamla rader bg"
+
+#: gitk:11657
 msgid "Diff: new lines"
 msgstr "Diff: nya rader"
 
-#: gitk:11449
+#: gitk:11658
 msgid "diff new lines"
 msgstr "diff nya rader"
 
-#: gitk:11453
+#: gitk:11662
+msgid "Diff: new lines bg"
+msgstr "Diff: nya rader bg"
+
+#: gitk:11664
+msgid "diff new lines bg"
+msgstr "diff nya rader bg"
+
+#: gitk:11668
 msgid "Diff: hunk header"
 msgstr "Diff: delhuvud"
 
-#: gitk:11455
+#: gitk:11670
 msgid "diff hunk header"
 msgstr "diff delhuvud"
 
-#: gitk:11459
+#: gitk:11674
 msgid "Marked line bg"
 msgstr "Markerad rad bakgrund"
 
-#: gitk:11461
+#: gitk:11676
 msgid "marked line background"
 msgstr "markerad rad bakgrund"
 
-#: gitk:11465
+#: gitk:11680
 msgid "Select bg"
 msgstr "Markerad bakgrund"
 
-#: gitk:11474
+#: gitk:11689
 msgid "Fonts: press to choose"
 msgstr "Teckensnitt: tryck för att välja"
 
-#: gitk:11476
+#: gitk:11691
 msgid "Main font"
 msgstr "Huvudteckensnitt"
 
-#: gitk:11477
+#: gitk:11692
 msgid "Diff display font"
 msgstr "Teckensnitt för diffvisning"
 
-#: gitk:11478
+#: gitk:11693
 msgid "User interface font"
 msgstr "Teckensnitt för användargränssnitt"
 
-#: gitk:11500
+#: gitk:11715
 msgid "Gitk preferences"
 msgstr "Inställningar för Gitk"
 
-#: gitk:11509
+#: gitk:11724
 msgid "General"
 msgstr "Allmänt"
 
-#: gitk:11510
+#: gitk:11725
 msgid "Colors"
 msgstr "Färger"
 
-#: gitk:11511
+#: gitk:11726
 msgid "Fonts"
 msgstr "Teckensnitt"
 
-#: gitk:11561
+#: gitk:11776
 #, tcl-format
 msgid "Gitk: choose color for %s"
 msgstr "Gitk: välj färg för %s"
 
-#: gitk:12074
+#: gitk:12289
 msgid ""
 "Sorry, gitk cannot run with this version of Tcl/Tk.\n"
 " Gitk requires at least Tcl/Tk 8.4."
@@ -1369,45 +1419,15 @@ msgstr ""
 "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
 " Gitk kräver åtminstone Tcl/Tk 8.4."
 
-#: gitk:12284
+#: gitk:12507
 msgid "Cannot find a git repository here."
 msgstr "Hittar inget git-arkiv här."
 
-#: gitk:12331
+#: gitk:12554
 #, tcl-format
 msgid "Ambiguous argument '%s': both revision and filename"
-msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
+msgstr "Tvetydigt argument ”%s”: både revision och filnamn"
 
-#: gitk:12343
+#: gitk:12566
 msgid "Bad arguments to gitk:"
 msgstr "Felaktiga argument till gitk:"
-
-#~ msgid "mc"
-#~ msgstr "mc"
-
-#~ msgid "next"
-#~ msgstr "nästa"
-
-#~ msgid "prev"
-#~ msgstr "föreg"
-
-#~ msgid "CDate"
-#~ msgstr "Skapat datum"
-
-#~ msgid "Cannot find the git directory \"%s\"."
-#~ msgstr "Hittar inte git-katalogen \"%s\"."
-
-#~ msgid "SHA1 ID: "
-#~ msgstr "SHA1-id: "
-
-#~ msgid "- stopping\n"
-#~ msgstr "- stannar\n"
-
-#~ msgid "Tag/Head %s is not known"
-#~ msgstr "Tagg/huvud %s är okänt"
-
-#~ msgid "/\t\tMove to next find hit, or redo find"
-#~ msgstr "/\t\tGå till nästa sökträff, eller sök på nytt"
-
-#~ msgid "Name"
-#~ msgstr "Namn"

From 2afd8996aec692a26c3cdb039a47c18809148c56 Mon Sep 17 00:00:00 2001
From: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
Date: Sat, 9 Jan 2021 23:14:08 +0100
Subject: [PATCH 2/8] gitk: check main window visibility before waiting for it
 to show

If the main window is already visible when gitk waits for it to
become visible, gitk hangs forever.
This commit adds a check whether the window is already visible.
See https://wiki.tcl-lang.org/page/tkwait+visibility

Signed-off-by: Tobias Pietzsch <pietzsch@mycroft.speedport.ip>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gitk b/gitk
index 7a087f123d..de278557b3 100755
--- a/gitk
+++ b/gitk
@@ -12687,7 +12687,7 @@ catch {
     wm iconphoto . -default gitlogo gitlogo32
 }
 # wait for the window to become visible
-tkwait visibility .
+if {![winfo viewable .]} {tkwait visibility .}
 set_window_title
 update
 readrefs

From b2490ae42f00f6a40b8fd83d2b2069eb15ef84e2 Mon Sep 17 00:00:00 2001
From: Christoph Sommer <sommer@cms-labs.org>
Date: Thu, 5 Dec 2024 20:29:39 +0100
Subject: [PATCH 3/8] gitk: make headings of preferences bold

Make preference groups like "Diff display options" stand out more.

Signed-off-by: Christoph Sommer <sommer@cms-labs.org>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitk b/gitk
index de278557b3..2ef01bf5c6 100755
--- a/gitk
+++ b/gitk
@@ -11581,7 +11581,7 @@ proc prefspage_general {notebook} {
 
     set page [create_prefs_page $notebook.general]
 
-    ${NS}::label $page.ldisp -text [mc "Commit list display options"]
+    ${NS}::label $page.ldisp -text [mc "Commit list display options"] -font mainfontbold
     grid $page.ldisp - -sticky w -pady 10
     ${NS}::label $page.spacer -text " "
     ${NS}::label $page.maxwidthl -text [mc "Maximum graph width (lines)"]
@@ -11602,7 +11602,7 @@ proc prefspage_general {notebook} {
         -variable hideremotes
     grid x $page.hideremotes -sticky w
 
-    ${NS}::label $page.ddisp -text [mc "Diff display options"]
+    ${NS}::label $page.ddisp -text [mc "Diff display options"] -font mainfontbold
     grid $page.ddisp - -sticky w -pady 10
     ${NS}::label $page.tabstopl -text [mc "Tab spacing"]
     spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
@@ -11635,7 +11635,7 @@ proc prefspage_general {notebook} {
     pack configure $page.webbrowserf.l -padx 10
     grid x $page.webbrowserf $page.webbrowser -sticky ew
 
-    ${NS}::label $page.lgen -text [mc "General options"]
+    ${NS}::label $page.lgen -text [mc "General options"] -font mainfontbold
     grid $page.lgen - -sticky w -pady 10
     ${NS}::checkbutton $page.want_ttk -variable want_ttk \
         -text [mc "Use themed widgets"]
@@ -11654,7 +11654,7 @@ proc prefspage_colors {notebook} {
 
     set page [create_prefs_page $notebook.colors]
 
-    ${NS}::label $page.cdisp -text [mc "Colors: press to choose"]
+    ${NS}::label $page.cdisp -text [mc "Colors: press to choose"] -font mainfontbold
     grid $page.cdisp - -sticky w -pady 10
     label $page.ui -padx 40 -relief sunk -background $uicolor
     ${NS}::button $page.uibut -text [mc "Interface"] \
@@ -11712,7 +11712,7 @@ proc prefspage_colors {notebook} {
 proc prefspage_fonts {notebook} {
     global NS
     set page [create_prefs_page $notebook.fonts]
-    ${NS}::label $page.cfont -text [mc "Fonts: press to choose"]
+    ${NS}::label $page.cfont -text [mc "Fonts: press to choose"] -font mainfontbold
     grid $page.cfont - -sticky w -pady 10
     mkfontdisp mainfont $page [mc "Main font"]
     mkfontdisp textfont $page [mc "Diff display font"]

From 904b36b815ff174ad6abc37b8aa5b8b0f4cedc32 Mon Sep 17 00:00:00 2001
From: Christoph Sommer <sommer@cms-labs.org>
Date: Thu, 5 Dec 2024 20:33:44 +0100
Subject: [PATCH 4/8] gitk: add text wrapping preferences

Add a new preference "wrapdefault" which allows enabling char/word wrap.
Impacts all text in the ctext widget for which no other preference exists.

Also make the (existing) preference "wrapcomment" configurable graphically.
Its setting impacts only the "comment" part of the ctext widget.

Signed-off-by: Christoph Sommer <sommer@cms-labs.org>
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk | 35 +++++++++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/gitk b/gitk
index 2ef01bf5c6..9012a6951a 100755
--- a/gitk
+++ b/gitk
@@ -2089,7 +2089,7 @@ proc makewindow {} {
     global diffcontextstring diffcontext
     global ignorespace
     global maincursor textcursor curtextcursor
-    global rowctxmenu fakerowmenu mergemax wrapcomment
+    global rowctxmenu fakerowmenu mergemax wrapcomment wrapdefault
     global highlight_files gdttype
     global searchstring sstring
     global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor
@@ -2431,7 +2431,7 @@ proc makewindow {} {
     set ctext .bleft.bottom.ctext
     text $ctext -background $bgcolor -foreground $fgcolor \
         -state disabled -undo 0 -font textfont \
-        -yscrollcommand scrolltext -wrap none \
+        -yscrollcommand scrolltext -wrap $wrapdefault \
         -xscrollcommand ".bleft.bottom.sbhorizontal set"
     if {$have_tk85} {
         $ctext conf -tabstyle wordprocessor
@@ -11576,7 +11576,7 @@ proc create_prefs_page {w} {
 
 proc prefspage_general {notebook} {
     global NS maxwidth maxgraphpct showneartags showlocalchanges
-    global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
+    global tabstop wrapcomment wrapdefault limitdiffs autoselect autosellen extdifftool perfile_attrs
     global hideremotes want_ttk have_ttk maxrefs web_browser
 
     set page [create_prefs_page $notebook.general]
@@ -11607,6 +11607,17 @@ proc prefspage_general {notebook} {
     ${NS}::label $page.tabstopl -text [mc "Tab spacing"]
     spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
     grid x $page.tabstopl $page.tabstop -sticky w
+
+    ${NS}::label $page.wrapcommentl -text [mc "Wrap comment text"]
+    ${NS}::combobox $page.wrapcomment -values {none char word} -state readonly \
+        -textvariable wrapcomment
+    grid x $page.wrapcommentl $page.wrapcomment -sticky w
+
+    ${NS}::label $page.wrapdefaultl -text [mc "Wrap other text"]
+    ${NS}::combobox $page.wrapdefault -values {none char word} -state readonly \
+        -textvariable wrapdefault
+    grid x $page.wrapdefaultl $page.wrapdefault -sticky w
+
     ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
         -variable showneartags
     grid x $page.ntag -sticky w
@@ -11725,7 +11736,7 @@ proc doprefs {} {
     global oldprefs prefstop showneartags showlocalchanges
     global uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
     global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
-    global hideremotes want_ttk have_ttk
+    global hideremotes want_ttk have_ttk wrapcomment wrapdefault
 
     set top .gitkprefs
     set prefstop $top
@@ -11734,7 +11745,7 @@ proc doprefs {} {
         return
     }
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-                   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
+                   limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
         set oldprefs($v) [set $v]
     }
     ttk_toplevel $top
@@ -11860,7 +11871,7 @@ proc prefscan {} {
     global oldprefs prefstop
 
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-                   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
+                   limitdiffs tabstop perfile_attrs hideremotes want_ttk wrapcomment wrapdefault} {
         global $v
         set $v $oldprefs($v)
     }
@@ -11874,7 +11885,8 @@ proc prefsok {} {
     global oldprefs prefstop showneartags showlocalchanges
     global fontpref mainfont textfont uifont
     global limitdiffs treediffs perfile_attrs
-    global hideremotes
+    global hideremotes wrapcomment wrapdefault
+    global ctext
 
     catch {destroy $prefstop}
     unset prefstop
@@ -11923,6 +11935,12 @@ proc prefsok {} {
     if {$hideremotes != $oldprefs(hideremotes)} {
         rereadrefs
     }
+    if {$wrapcomment != $oldprefs(wrapcomment)} {
+        $ctext tag conf comment -wrap $wrapcomment
+    }
+    if {$wrapdefault != $oldprefs(wrapdefault)} {
+        $ctext configure -wrap $wrapdefault
+    }
 }
 
 proc formatdate {d} {
@@ -12392,6 +12410,7 @@ set downarrowlen 5
 set mingaplen 100
 set cmitmode "patch"
 set wrapcomment "none"
+set wrapdefault "none"
 set showneartags 1
 set hideremotes 0
 set maxrefs 20
@@ -12497,7 +12516,7 @@ config_check_tmp_exists 50
 
 set config_variables {
     mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
-    cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs
+    cmitmode wrapcomment wrapdefault autoselect autosellen showneartags maxrefs visiblerefs
     hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
     bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
     markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor

From 66496dabd4fe26e8b2093ab923c7dea30e0fe7e4 Mon Sep 17 00:00:00 2001
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
Date: Wed, 11 Dec 2024 10:07:54 +0200
Subject: [PATCH 5/8] gitk: UI text: change "SHA1 ID" to "Commit ID"

SHA1 might not stay forever, and plans to use SHA256 already exist,
so use the official name for it - "Commit ID".

Only visible UI texts are modified to reduce the noise when using
git-blame, while comments and variable names still contain SHA1/sha1.

Signed-off-by: Avi Halachmi (:avih) <avihpit@yahoo.com>
---
 gitk | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gitk b/gitk
index de278557b3..7d1da05256 100755
--- a/gitk
+++ b/gitk
@@ -2223,7 +2223,7 @@ proc makewindow {} {
     set sha1entry .tf.bar.sha1
     set entries $sha1entry
     set sha1but .tf.bar.sha1label
-    button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
+    button $sha1but -text "[mc "Commit ID:"] " -state disabled -relief flat \
         -command gotocommit -width 8
     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .tf.bar.sha1label -side left
@@ -8756,7 +8756,7 @@ proc sha1change {n1 n2 op} {
     if {$state == "normal"} {
         $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
     } else {
-        $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
+        $sha1but conf -state disabled -relief flat -text "[mc "Commit ID:"] "
     }
 }
 
@@ -8775,7 +8775,7 @@ proc gotocommit {} {
             set matches [longid $id]
             if {$matches ne {}} {
                 if {[llength $matches] > 1} {
-                    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
+                    error_popup [mc "Short commit ID %s is ambiguous" $id]
                     return
                 }
                 set id [lindex $matches 0]
@@ -8792,7 +8792,7 @@ proc gotocommit {} {
         return
     }
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
-        set msg [mc "SHA1 id %s is not known" $sha1string]
+        set msg [mc "Commit ID %s is not known" $sha1string]
     } else {
         set msg [mc "Revision %s is not in the current view" $sha1string]
     }
@@ -11594,7 +11594,7 @@ proc prefspage_general {notebook} {
     ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
         -variable showlocalchanges
     grid x $page.showlocal -sticky w
-    ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
+    ${NS}::checkbutton $page.autoselect -text [mc "Auto-select commit ID (length)"] \
         -variable autoselect
     spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
     grid x $page.autoselect $page.autosellen -sticky w

From 92d911a531e905ec730fa527d55d1622e948d83a Mon Sep 17 00:00:00 2001
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
Date: Wed, 11 Dec 2024 10:18:31 +0200
Subject: [PATCH 6/8] gitk: prefs dialog: refine Auto-select UI

Tl;DR: change Auto-select text, move the length input to a new line.

The Auto-select preference auto-selects [part of] the commit ID text
at the respective widget on startup, and when the current commit at
the graph changes.

Its real premise, however, is to populate the selection clipboard
with the commit ID. Consider, for instance, how meaningless it is on
platforms without a selection clipboard - like Windows or macOS (on
Windows the selection is not even visible with the default Tk theme,
because it's only visible in focused widgets - which the commit ID
widget is not during normal application of this selection).

So rename the Auto-select label to "Copy commit ID to X11 selection",
to reflect better the ultimate outcome of its application

Note that there exists other, non-X11 platforms with a selection
clipboard, like Wayland, and if a native Tk client exists on such
platforms, then the description will not be accurate, but hopefully
it's not too misleading either.

Additionally, move the length input widget to a new line, because:
- This length applies to both Auto-select and "Copy commit reference"
  context menu item, so it's not exclusive to the selection length.
- The next commit will add support for primary clipboard as well,
  where this length will also be used.

Also, move the "Hide remotes" item above these selection prefs, to
keep the selection prefs semi-grouped before the spacing of the
following title "Diff display options".

Signed-off-by: Avi Halachmi (:avih) <avihpit@yahoo.com>
---
 gitk | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/gitk b/gitk
index 7d1da05256..322236d361 100755
--- a/gitk
+++ b/gitk
@@ -11594,14 +11594,17 @@ proc prefspage_general {notebook} {
     ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
         -variable showlocalchanges
     grid x $page.showlocal -sticky w
-    ${NS}::checkbutton $page.autoselect -text [mc "Auto-select commit ID (length)"] \
-        -variable autoselect
-    spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
-    grid x $page.autoselect $page.autosellen -sticky w
     ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
         -variable hideremotes
     grid x $page.hideremotes -sticky w
 
+    ${NS}::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \
+        -variable autoselect
+    grid x $page.autoselect -sticky w
+    spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
+    ${NS}::label $page.autosellenl -text [mc "Length of commit ID to copy"]
+    grid x $page.autosellenl $page.autosellen -sticky w
+
     ${NS}::label $page.ddisp -text [mc "Diff display options"]
     grid $page.ddisp - -sticky w -pady 10
     ${NS}::label $page.tabstopl -text [mc "Tab spacing"]

From d77c3e35bbca78a0cee6f0eacecccd9aac957c8b Mon Sep 17 00:00:00 2001
From: "Avi Halachmi (:avih)" <avihpit@yahoo.com>
Date: Wed, 11 Dec 2024 11:22:03 +0200
Subject: [PATCH 7/8] gitk: support auto-copy comit ID to primary clipboard

Auto-select ("Copy commit ID to X11 selection") is useful when a
selection cliboard exists, but otherwise generally meaningless, for
instance on Windows.

Add a similar pref and behavior which copies the commit ID to the
primary clipboard - for platforms without a selection clipboard, but
which can also be useful additionally on platforms with selection.

Note that while autoselect is enabled by default, autocopy isn't.

That's because the selection clipboard is typically dispensable, while
the primary clipboard can be considered a more precious resource,
which we don't want to (clear and) overwrite by default.

Signed-off-by: Avi Halachmi (:avih) <avihpit@yahoo.com>
---
 gitk | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/gitk b/gitk
index 322236d361..38baf20b95 100755
--- a/gitk
+++ b/gitk
@@ -7344,7 +7344,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     global mergemax numcommits pending_select
     global cmitmode showneartags allcommits
     global targetrow targetid lastscrollrows
-    global autoselect autosellen jump_to_here
+    global autocopy autoselect autosellen jump_to_here
     global vinlinediff
 
     unset -nocomplain pending_select
@@ -7413,6 +7413,10 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     if {$autoselect} {
         $sha1entry selection range 0 $autosellen
     }
+    if {$autocopy} {
+        clipboard clear
+        clipboard append [string range $id 0 [expr $autosellen - 1]]
+    }
     rhighlight_sel $id
 
     $ctext conf -state normal
@@ -11576,7 +11580,7 @@ proc create_prefs_page {w} {
 
 proc prefspage_general {notebook} {
     global NS maxwidth maxgraphpct showneartags showlocalchanges
-    global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs
+    global tabstop limitdiffs autocopy autoselect autosellen extdifftool perfile_attrs
     global hideremotes want_ttk have_ttk maxrefs web_browser
 
     set page [create_prefs_page $notebook.general]
@@ -11598,6 +11602,9 @@ proc prefspage_general {notebook} {
         -variable hideremotes
     grid x $page.hideremotes -sticky w
 
+    ${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
+        -variable autocopy
+    grid x $page.autocopy -sticky w
     ${NS}::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \
         -variable autoselect
     grid x $page.autoselect -sticky w
@@ -12403,6 +12410,7 @@ set maxlinelen 200
 set showlocalchanges 1
 set limitdiffs 1
 set datetimeformat "%Y-%m-%d %H:%M:%S"
+set autocopy 0
 set autoselect 1
 set autosellen 40
 set perfile_attrs 0
@@ -12500,7 +12508,7 @@ config_check_tmp_exists 50
 
 set config_variables {
     mainfont textfont uifont tabstop findmergefiles maxgraphpct maxwidth
-    cmitmode wrapcomment autoselect autosellen showneartags maxrefs visiblerefs
+    cmitmode wrapcomment autocopy autoselect autosellen showneartags maxrefs visiblerefs
     hideremotes showlocalchanges datetimeformat limitdiffs uicolor want_ttk
     bgcolor fgcolor uifgcolor uifgdisabledcolor colors diffcolors mergecolors
     markbgcolor diffcontext selectbgcolor foundbgcolor currentsearchhitbgcolor

From 36625a6974156fbc56bbb97c983b09ae303a06ff Mon Sep 17 00:00:00 2001
From: Johannes Sixt <j6t@kdbg.org>
Date: Sat, 14 Dec 2024 15:53:35 +0100
Subject: [PATCH 8/8] gitk: offer "Copy commit ID to X11 selection" only on X11

This option is only useful where a selection clipboard is available, which
is only the case on X11. Do not clutter the UI in other environments.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
---
 gitk | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gitk b/gitk
index 38baf20b95..12c0dc401e 100755
--- a/gitk
+++ b/gitk
@@ -1969,6 +1969,10 @@ proc confirm_popup {msg {owner .}} {
     return $confirm_ok
 }
 
+proc haveselectionclipboard {} {
+    return [expr {[tk windowingsystem] eq "x11"}]
+}
+
 proc setoptions {} {
     global use_ttk
 
@@ -7410,7 +7414,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
 
     $sha1entry delete 0 end
     $sha1entry insert 0 $id
-    if {$autoselect} {
+    if {$autoselect && [haveselectionclipboard]} {
         $sha1entry selection range 0 $autosellen
     }
     if {$autocopy} {
@@ -11605,9 +11609,11 @@ proc prefspage_general {notebook} {
     ${NS}::checkbutton $page.autocopy -text [mc "Copy commit ID to clipboard"] \
         -variable autocopy
     grid x $page.autocopy -sticky w
-    ${NS}::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \
-        -variable autoselect
-    grid x $page.autoselect -sticky w
+    if {[haveselectionclipboard]} {
+        ${NS}::checkbutton $page.autoselect -text [mc "Copy commit ID to X11 selection"] \
+            -variable autoselect
+        grid x $page.autoselect -sticky w
+    }
     spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
     ${NS}::label $page.autosellenl -text [mc "Length of commit ID to copy"]
     grid x $page.autosellenl $page.autosellen -sticky w