aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-06 13:32:12 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-06 13:32:12 -0700
commit847d10f56d7853cd0e139a7c2e6ad0ad2de5c464 (patch)
tree0bdc0287ceb6faf0695995b0a7a13a4f76c1c599
parent65ac5530abcc3699ebc27126d8389f35baa8cafe (diff)
parent8eacbc1b03da401fbeaf67c4e2db8392692af88d (diff)
downloadgit-847d10f56d7853cd0e139a7c2e6ad0ad2de5c464.tar.gz
git-847d10f56d7853cd0e139a7c2e6ad0ad2de5c464.tar.xz
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk: gitk: Update swedish translation. gitk: Updated German translation gitk: Fallback to selecting the head commit upon load gitk: Fixed automatic row selection during load gitk: Fixed broken exception handling in diff gitk: On Windows, use a Cygwin-specific flag for kill gitk: Arrange to kill diff-files & diff-index on quit gitk: Kill back-end processes on window close
-rw-r--r--gitk-git/gitk148
-rw-r--r--gitk-git/po/de.po106
-rw-r--r--gitk-git/po/sv.po492
3 files changed, 422 insertions, 324 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index fddcb4581..d093a3950 100644
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -90,6 +90,15 @@ proc dorunq {} {
}
}
+proc reg_instance {fd} {
+ global commfd leftover loginstance
+
+ set i [incr loginstance]
+ set commfd($i) $fd
+ set leftover($i) {}
+ return $i
+}
+
proc unmerged_files {files} {
global nr_unmerged
@@ -294,11 +303,11 @@ proc parseviewrevs {view revs} {
# Start off a git log process and arrange to read its output
proc start_rev_list {view} {
global startmsecs commitidx viewcomplete curview
- global commfd leftover tclencoding
+ global tclencoding
global viewargs viewargscmd viewfiles vfilelimit
global showlocalchanges commitinterest
- global viewactive loginstance viewinstances vmergeonly
- global pending_select mainheadid
+ global viewactive viewinstances vmergeonly
+ global mainheadid
global vcanopt vflags vrevs vorigargs
set startmsecs [clock clicks -milliseconds]
@@ -354,10 +363,8 @@ proc start_rev_list {view} {
error_popup "[mc "Error executing git log:"] $err"
return 0
}
- set i [incr loginstance]
+ set i [reg_instance $fd]
set viewinstances($view) [list $i]
- set commfd($i) $fd
- set leftover($i) {}
if {$showlocalchanges && $mainheadid ne {}} {
lappend commitinterest($mainheadid) {dodiffindex}
}
@@ -367,36 +374,63 @@ proc start_rev_list {view} {
}
filerun $fd [list getcommitlines $fd $i $view 0]
nowbusy $view [mc "Reading"]
- if {$view == $curview} {
- set pending_select $mainheadid
- }
set viewcomplete($view) 0
set viewactive($view) 1
return 1
}
-proc stop_rev_list {view} {
- global commfd viewinstances leftover
+proc stop_instance {inst} {
+ global commfd leftover
- foreach inst $viewinstances($view) {
- set fd $commfd($inst)
- catch {
- set pid [pid $fd]
+ set fd $commfd($inst)
+ catch {
+ set pid [pid $fd]
+
+ if {$::tcl_platform(platform) eq {windows}} {
+ exec kill -f $pid
+ } else {
exec kill $pid
}
- catch {close $fd}
- nukefile $fd
- unset commfd($inst)
- unset leftover($inst)
+ }
+ catch {close $fd}
+ nukefile $fd
+ unset commfd($inst)
+ unset leftover($inst)
+}
+
+proc stop_backends {} {
+ global commfd
+
+ foreach inst [array names commfd] {
+ stop_instance $inst
+ }
+}
+
+proc stop_rev_list {view} {
+ global viewinstances
+
+ foreach inst $viewinstances($view) {
+ stop_instance $inst
}
set viewinstances($view) {}
}
-proc getcommits {} {
+proc reset_pending_select {selid} {
+ global pending_select mainheadid
+
+ if {$selid ne {}} {
+ set pending_select $selid
+ } else {
+ set pending_select $mainheadid
+ }
+}
+
+proc getcommits {selid} {
global canv curview need_redisplay viewactive
initlayout
if {[start_rev_list $curview]} {
+ reset_pending_select $selid
show_status [mc "Reading commits..."]
set need_redisplay 1
} else {
@@ -406,8 +440,8 @@ proc getcommits {} {
proc updatecommits {} {
global curview vcanopt vorigargs vfilelimit viewinstances
- global viewactive viewcomplete loginstance tclencoding
- global startmsecs commfd showneartags showlocalchanges leftover
+ global viewactive viewcomplete tclencoding
+ global startmsecs showneartags showlocalchanges
global mainheadid pending_select
global isworktree
global varcid vposids vnegids vflags vrevs
@@ -468,10 +502,8 @@ proc updatecommits {} {
if {$viewactive($view) == 0} {
set startmsecs [clock clicks -milliseconds]
}
- set i [incr loginstance]
+ set i [reg_instance $fd]
lappend viewinstances($view) $i
- set commfd($i) $fd
- set leftover($i) {}
fconfigure $fd -blocking 0 -translation lf -eofchar {}
if {$tclencoding != {}} {
fconfigure $fd -encoding $tclencoding
@@ -479,7 +511,7 @@ proc updatecommits {} {
filerun $fd [list getcommitlines $fd $i $view 1]
incr viewactive($view)
set viewcomplete($view) 0
- set pending_select $mainheadid
+ reset_pending_select {}
nowbusy $view "Reading"
if {$showneartags} {
getallcommits
@@ -491,6 +523,11 @@ proc reloadcommits {} {
global showneartags treediffs commitinterest cached_commitrow
global targetid
+ set selid {}
+ if {$selectedline ne {}} {
+ set selid $currentid
+ }
+
if {!$viewcomplete($curview)} {
stop_rev_list $curview
}
@@ -509,7 +546,7 @@ proc reloadcommits {} {
catch {unset cached_commitrow}
catch {unset targetid}
setcanvscroll
- getcommits
+ getcommits $selid
return 0
}
@@ -1469,8 +1506,15 @@ proc chewcommits {} {
global numcommits startmsecs
if {[info exists pending_select]} {
- set row [first_real_row]
- selectline $row 1
+ update
+ reset_pending_select {}
+
+ if {[commitinview $pending_select $curview]} {
+ selectline [rowofcommit $pending_select] 1
+ } else {
+ set row [first_real_row]
+ selectline $row 1
+ }
}
if {$commitidx($curview) > 0} {
#set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
@@ -2103,6 +2147,7 @@ proc makewindow {} {
bind . <$M1B-minus> {incrfont -1}
bind . <$M1B-KP_Subtract> {incrfont -1}
wm protocol . WM_DELETE_WINDOW doquit
+ bind . <Destroy> {stop_backends}
bind . <Button-1> "click %W"
bind $fstring <Key-Return> {dofind 1 1}
bind $sha1entry <Key-Return> gotocommit
@@ -3300,10 +3345,7 @@ proc showview {n} {
run refill_reflist
if {![info exists viewcomplete($n)]} {
- if {$selid ne {}} {
- set pending_select $selid
- }
- getcommits
+ getcommits $selid
return
}
@@ -3337,18 +3379,18 @@ proc showview {n} {
drawvisible
if {$row ne {}} {
selectline $row 0
- } elseif {$mainheadid ne {} && [commitinview $mainheadid $curview]} {
- selectline [rowofcommit $mainheadid] 1
} elseif {!$viewcomplete($n)} {
- if {$selid ne {}} {
- set pending_select $selid
- } else {
- set pending_select $mainheadid
- }
+ reset_pending_select $selid
} else {
- set row [first_real_row]
- if {$row < $numcommits} {
- selectline $row 0
+ reset_pending_select {}
+
+ if {[commitinview $pending_select $curview]} {
+ selectline [rowofcommit $pending_select] 1
+ } else {
+ set row [first_real_row]
+ if {$row < $numcommits} {
+ selectline $row 0
+ }
}
}
if {!$viewcomplete($n)} {
@@ -4011,6 +4053,7 @@ proc layoutmore {} {
}
if {[info exists pending_select] &&
[commitinview $pending_select $curview]} {
+ update
selectline [rowofcommit $pending_select] 1
}
drawvisible
@@ -4048,10 +4091,11 @@ proc dodiffindex {} {
incr lserial
set fd [open "|git diff-index --cached HEAD" r]
fconfigure $fd -blocking 0
- filerun $fd [list readdiffindex $fd $lserial]
+ set i [reg_instance $fd]
+ filerun $fd [list readdiffindex $fd $lserial $i]
}
-proc readdiffindex {fd serial} {
+proc readdiffindex {fd serial inst} {
global mainheadid nullid nullid2 curview commitinfo commitdata lserial
set isdiff 1
@@ -4062,7 +4106,7 @@ proc readdiffindex {fd serial} {
set isdiff 0
}
# we only need to see one line and we don't really care what it says...
- close $fd
+ stop_instance $inst
if {$serial != $lserial} {
return 0
@@ -4071,7 +4115,8 @@ proc readdiffindex {fd serial} {
# now see if there are any local changes not checked in to the index
set fd [open "|git diff-files" r]
fconfigure $fd -blocking 0
- filerun $fd [list readdifffiles $fd $serial]
+ set i [reg_instance $fd]
+ filerun $fd [list readdifffiles $fd $serial $i]
if {$isdiff && ![commitinview $nullid2 $curview]} {
# add the line for the changes in the index to the graph
@@ -4088,7 +4133,7 @@ proc readdiffindex {fd serial} {
return 0
}
-proc readdifffiles {fd serial} {
+proc readdifffiles {fd serial inst} {
global mainheadid nullid nullid2 curview
global commitinfo commitdata lserial
@@ -4100,7 +4145,7 @@ proc readdifffiles {fd serial} {
set isdiff 0
}
# we only need to see one line and we don't really care what it says...
- close $fd
+ stop_instance $inst
if {$serial != $lserial} {
return 0
@@ -6430,9 +6475,10 @@ proc diffcmd {ids flags} {
proc gettreediffs {ids} {
global treediff treepending
+ if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
+
set treepending $ids
set treediff {}
- if {[catch {set gdtf [open [diffcmd $ids {--no-commit-id}] r]}]} return
fconfigure $gdtf -blocking 0
filerun $gdtf [list gettreediffline $gdtf $ids]
}
@@ -9945,4 +9991,4 @@ if {[info exists permviews]} {
addviewmenu $n
}
}
-getcommits
+getcommits {}
diff --git a/gitk-git/po/de.po b/gitk-git/po/de.po
index b9867bf8e..04ee57099 100644
--- a/gitk-git/po/de.po
+++ b/gitk-git/po/de.po
@@ -7,19 +7,37 @@ msgid ""
msgstr ""
"Project-Id-Version: git-gui\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-01 11:54+0200\n"
-"PO-Revision-Date: 2008-05-02 21:12+0200\n"
+"POT-Creation-Date: 2008-05-24 22:32+0200\n"
+"PO-Revision-Date: 2008-05-24 22:40+0200\n"
"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: gitk:111
-msgid "Error executing git rev-list:"
-msgstr "Fehler beim Ausführen von git-rev-list:"
+#: gitk:102
+msgid "Couldn't get list of unmerged files:"
+msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
+
+#: gitk:329
+msgid "No files selected: --merge specified but no files are unmerged."
+msgstr ""
+"Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-"
+"zusammengeführten Dateien."
+
+#: gitk:332
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-"
+"zusammengeführten Dateien sind in der Dateiauswahl."
-#: gitk:124
+#: gitk:354
+msgid "Error executing git log:"
+msgstr "Fehler beim Ausführen von git-log:"
+
+#: gitk:369
msgid "Reading"
msgstr "Lesen"
@@ -56,7 +74,11 @@ msgstr "Datei"
msgid "Update"
msgstr "Aktualisieren"
-#: gitk:664
+#: gitk:1722
+msgid "Reload"
+msgstr "Neu laden"
+
+#: gitk:1723
msgid "Reread references"
msgstr "Zweige neu laden"
@@ -112,7 +134,11 @@ msgstr "Tastenkürzel"
msgid "SHA1 ID: "
msgstr "SHA1:"
-#: gitk:791
+#: gitk:1831
+msgid "Row"
+msgstr "Zeile"
+
+#: gitk:1862
msgid "Find"
msgstr "Suche"
@@ -126,19 +152,19 @@ msgstr "vorige"
#: gitk:794
msgid "commit"
-msgstr "Version"
+msgstr "Version nach"
#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
msgid "containing:"
-msgstr "enthaltend:"
+msgstr "Beschreibung:"
#: gitk:800 gitk:1778 gitk:1783 gitk:2431
msgid "touching paths:"
-msgstr "Pfad betreffend:"
+msgstr "Dateien:"
#: gitk:801 gitk:2436
msgid "adding/removing string:"
-msgstr "Zeichenkette ändernd:"
+msgstr "Änderungen:"
#: gitk:810 gitk:812
msgid "Exact"
@@ -253,23 +279,25 @@ msgstr "Diesen auch hervorheben"
msgid "Highlight this only"
msgstr "Nur diesen hervorheben"
-#: gitk:1318
+#: gitk:2162
+msgid "External diff"
+msgstr "Externer Vergleich"
+
+#: gitk:2403
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
-"Copyright © 2005-2006 Paul Mackerras\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - eine Visualisierung der Git Historie\n"
"\n"
-"Copyright © 2005-2006 Paul Mackerras\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
-"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
-"License\n"
-" "
+"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public License"
#: gitk:1326 gitk:1387 gitk:6582
msgid "Close"
@@ -450,11 +478,11 @@ msgstr "Name"
msgid "Remember this view"
msgstr "Diese Ansicht speichern"
-#: gitk:1928
-msgid "Commits to include (arguments to git rev-list):"
-msgstr "Versionen anzeigen (Argumente von git-rev-list):"
+#: gitk:3126
+msgid "Commits to include (arguments to git log):"
+msgstr "Versionen anzeigen (Argumente von git-log):"
-#: gitk:1935
+#: gitk:3133
msgid "Command to generate more commits to include:"
msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:"
@@ -566,7 +594,11 @@ msgstr "Kinder"
msgid "Reset %s branch to here"
msgstr "Zweig »%s« hierher zurücksetzen"
-#: gitk:6050
+#: gitk:7204
+msgid "Detached head: can't reset"
+msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich"
+
+#: gitk:7236
msgid "Top"
msgstr "Oben"
@@ -798,7 +830,15 @@ msgstr "Naheliegende Überschriften anzeigen"
msgid "Limit diffs to listed paths"
msgstr "Vergleich nur für angezeigte Pfade"
-#: gitk:8045
+#: gitk:9264
+msgid "External diff tool"
+msgstr "Externes Vergleich-(Diff-)Programm"
+
+#: gitk:9266
+msgid "Choose..."
+msgstr "Wählen..."
+
+#: gitk:9271
msgid "Colors: press to choose"
msgstr "Farben: Klicken zum Wählen"
@@ -873,22 +913,6 @@ msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert."
msgid "Bad arguments to gitk:"
msgstr "Falsche Kommandozeilen-Parameter für gitk:"
-#: gitk:8637
-msgid "Couldn't get list of unmerged files:"
-msgstr "Liste der nicht-zusammengeführten Dateien nicht gefunden:"
-
-#: gitk:8653
-msgid "No files selected: --merge specified but no files are unmerged."
-msgstr "Keine Dateien ausgewählt: --merge angegeben, es existieren aber keine nicht-zusammengeführten Dateien."
-
-#: gitk:8656
-msgid ""
-"No files selected: --merge specified but no unmerged files are within file "
-"limit."
-msgstr ""
-"Keine Dateien ausgewähle: --merge angegeben, aber keine nicht-"
-"zusammengeführten Dateien sind in der Dateiauswahl."
-
-#: gitk:8717
+#: gitk:9915
msgid "Command line"
msgstr "Kommandozeile"
diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po
index f6b080df4..e1ecfb758 100644
--- a/gitk-git/po/sv.po
+++ b/gitk-git/po/sv.po
@@ -3,687 +3,724 @@
# This file is distributed under the same license as the gitk package.
#
# Peter Karlsson <peter@softwolves.pp.se>, 2008.
+# Mikael Magnusson <mikachu@gmail.com>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-14 15:03+0100\n"
-"PO-Revision-Date: 2008-03-14 16:06CET-1\n"
-"Last-Translator: Peter Karlsson <peter@softwolves.pp.se>\n"
+"POT-Creation-Date: 2008-08-03 18:58+0200\n"
+"PO-Revision-Date: 2008-08-03 19:03+0200\n"
+"Last-Translator: Mikael Magnusson <mikachu@gmail.com>\n"
"Language-Team: Swedish <sv@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit"
+"Content-Transfer-Encoding: 8bit\n"
-#: gitk:111
-msgid "Error executing git rev-list:"
-msgstr "Fel vid körning av git rev-list:"
+#: gitk:102
+msgid "Couldn't get list of unmerged files:"
+msgstr "Kunde inta hämta lista över ej sammanslagna filer:"
+
+#: gitk:329
+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:332
+msgid ""
+"No files selected: --merge specified but no unmerged files are within file "
+"limit."
+msgstr ""
+"Inga filer valdes: --merge angavs men det finns inga filer inom "
+"filbegränsningen."
+
+#: gitk:354
+msgid "Error executing git log:"
+msgstr "Fel vid körning av git log:"
-#: gitk:124
+#: gitk:369
msgid "Reading"
msgstr "Läser"
-#: gitk:151 gitk:2191
+#: gitk:400 gitk:3356
msgid "Reading commits..."
msgstr "Läser incheckningar..."
-#: gitk:275
-msgid "Can't parse git log output:"
-msgstr "Kan inte tolka utdata från git log:"
-
-#: gitk:386 gitk:2195
+#: gitk:403 gitk:1480 gitk:3359
msgid "No commits selected"
msgstr "Inga incheckningar markerade"
-#: gitk:500
+#: gitk:1358
+msgid "Can't parse git log output:"
+msgstr "Kan inte tolka utdata från git log:"
+
+#: gitk:1557
msgid "No commit information available"
msgstr "Ingen incheckningsinformation är tillgänglig"
-#: gitk:599 gitk:621 gitk:1955 gitk:6423 gitk:7923 gitk:8082
+#: gitk:1654 gitk:1676 gitk:3150 gitk:7620 gitk:9149 gitk:9317
msgid "OK"
msgstr "OK"
-#: gitk:623 gitk:1956 gitk:6107 gitk:6178 gitk:6275 gitk:6321 gitk:6425
-#: gitk:7924 gitk:8083
+#: gitk:1678 gitk:3151 gitk:7296 gitk:7367 gitk:7470 gitk:7516 gitk:7622
+#: gitk:9150 gitk:9318
msgid "Cancel"
msgstr "Avbryt"
-#: gitk:661
+#: gitk:1716
msgid "File"
msgstr "Arkiv"
-#: gitk:663
+#: gitk:1718
msgid "Update"
msgstr "Uppdatera"
-#: gitk:664
+#: gitk:1719
+msgid "Reload"
+msgstr "Ladda om"
+
+#: gitk:1720
msgid "Reread references"
msgstr "Läs om referenser"
-#: gitk:665
+#: gitk:1721
msgid "List references"
msgstr "Visa referenser"
-#: gitk:666
+#: gitk:1722
msgid "Quit"
msgstr "Avsluta"
-#: gitk:668
+#: gitk:1724
msgid "Edit"
msgstr "Redigera"
-#: gitk:669
+#: gitk:1725
msgid "Preferences"
msgstr "Inställningar"
-#: gitk:672 gitk:1892
+#: gitk:1728 gitk:3087
msgid "View"
msgstr "Visa"
-#: gitk:673
+#: gitk:1729
msgid "New view..."
msgstr "Ny vy..."
-#: gitk:674 gitk:2133 gitk:8722
+#: gitk:1730 gitk:3298 gitk:9932
msgid "Edit view..."
msgstr "Ändra vy..."
-#: gitk:676 gitk:2134 gitk:8723
+#: gitk:1732 gitk:3299 gitk:9933
msgid "Delete view"
msgstr "Ta bort vy"
-#: gitk:678
+#: gitk:1734
msgid "All files"
msgstr "Alla filer"
-#: gitk:682
+#: gitk:1738
msgid "Help"
msgstr "Hjälp"
-#: gitk:683 gitk:1317
+#: gitk:1739 gitk:2399
msgid "About gitk"
msgstr "Om gitk"
-#: gitk:684
+#: gitk:1740
msgid "Key bindings"
msgstr "Tangentbordsbindningar"
-#: gitk:741
+#: gitk:1797
msgid "SHA1 ID: "
msgstr "SHA1-id: "
-#: gitk:791
+#: gitk:1828
+msgid "Row"
+msgstr "Rad"
+
+#: gitk:1859
msgid "Find"
msgstr "Sök"
-#: gitk:792
+#: gitk:1860
msgid "next"
msgstr "nästa"
-#: gitk:793
+#: gitk:1861
msgid "prev"
msgstr "föreg"
-#: gitk:794
+#: gitk:1862
msgid "commit"
msgstr "incheckning"
-#: gitk:797 gitk:799 gitk:2356 gitk:2379 gitk:2403 gitk:4306 gitk:4369
+#: gitk:1865 gitk:1867 gitk:3511 gitk:3534 gitk:3558 gitk:5441 gitk:5512
msgid "containing:"
msgstr "som innehåller:"
-#: gitk:800 gitk:1778 gitk:1783 gitk:2431
+#: gitk:1868 gitk:2866 gitk:2871 gitk:3586
msgid "touching paths:"
msgstr "som rör sökväg:"
-#: gitk:801 gitk:2436
+#: gitk:1869 gitk:3591
msgid "adding/removing string:"
msgstr "som lägger/till tar bort sträng:"
-#: gitk:810 gitk:812
+#: gitk:1878 gitk:1880
msgid "Exact"
msgstr "Exakt"
-#: gitk:812 gitk:2514 gitk:4274
+#: gitk:1880 gitk:3667 gitk:5409
msgid "IgnCase"
msgstr "IgnVersaler"
-#: gitk:812 gitk:2405 gitk:2512 gitk:4270
+#: gitk:1880 gitk:3560 gitk:3665 gitk:5405
msgid "Regexp"
msgstr "Reg.uttr."
-#: gitk:814 gitk:815 gitk:2533 gitk:2563 gitk:2570 gitk:4380 gitk:4436
+#: gitk:1882 gitk:1883 gitk:3686 gitk:3716 gitk:3723 gitk:5532 gitk:5599
msgid "All fields"
msgstr "Alla fält"
-#: gitk:815 gitk:2531 gitk:2563 gitk:4336
+#: gitk:1883 gitk:3684 gitk:3716 gitk:5471
msgid "Headline"
msgstr "Rubrik"
-#: gitk:816 gitk:2531 gitk:4336 gitk:4436 gitk:4827
+#: gitk:1884 gitk:3684 gitk:5471 gitk:5599 gitk:6000
msgid "Comments"
msgstr "Kommentarer"
-#: gitk:816 gitk:2531 gitk:2535 gitk:2570 gitk:4336 gitk:4763 gitk:5956
-#: gitk:5971
+#: gitk:1884 gitk:3684 gitk:3688 gitk:3723 gitk:5471 gitk:5936 gitk:7142
+#: gitk:7157
msgid "Author"
msgstr "Författare"
-#: gitk:816 gitk:2531 gitk:4336 gitk:4765
+#: gitk:1884 gitk:3684 gitk:5471 gitk:5938
msgid "Committer"
msgstr "Incheckare"
-#: gitk:845
+#: gitk:1913
msgid "Search"
msgstr "Sök"
-#: gitk:852
+#: gitk:1920
msgid "Diff"
msgstr "Diff"
-#: gitk:854
+#: gitk:1922
msgid "Old version"
msgstr "Gammal version"
-#: gitk:856
+#: gitk:1924
msgid "New version"
msgstr "Ny version"
-#: gitk:858
+#: gitk:1926
msgid "Lines of context"
msgstr "Rader sammanhang"
-#: gitk:868
+#: gitk:1936
msgid "Ignore space change"
msgstr "Ignorera ändringar i blanksteg"
-#: gitk:926
+#: gitk:1994
msgid "Patch"
msgstr "Patch"
-#: gitk:928
+#: gitk:1996
msgid "Tree"
msgstr "Träd"
-#: gitk:1053 gitk:1068 gitk:6022
+#: gitk:2121 gitk:2136 gitk:7211
msgid "Diff this -> selected"
msgstr "Diff denna -> markerad"
-#: gitk:1055 gitk:1070 gitk:6023
+#: gitk:2123 gitk:2138 gitk:7212
msgid "Diff selected -> this"
msgstr "Diff markerad -> denna"
-#: gitk:1057 gitk:1072 gitk:6024
+#: gitk:2125 gitk:2140 gitk:7213
msgid "Make patch"
msgstr "Skapa patch"
-#: gitk:1058 gitk:6162
+#: gitk:2126 gitk:7351
msgid "Create tag"
msgstr "Skapa tagg"
-#: gitk:1059 gitk:6255
+#: gitk:2127 gitk:7450
msgid "Write commit to file"
msgstr "Skriv incheckning till fil"
-#: gitk:1060 gitk:6309
+#: gitk:2128 gitk:7504
msgid "Create new branch"
msgstr "Skapa ny gren"
-#: gitk:1061
+#: gitk:2129
msgid "Cherry-pick this commit"
msgstr "Plocka denna incheckning"
-#: gitk:1063
+#: gitk:2131
msgid "Reset HEAD branch to here"
msgstr "Återställ HEAD-grenen hit"
-#: gitk:1079
+#: gitk:2147
msgid "Check out this branch"
msgstr "Checka ut denna gren"
-#: gitk:1081
+#: gitk:2149
msgid "Remove this branch"
msgstr "Ta bort denna gren"
-#: gitk:1087
+#: gitk:2155
msgid "Highlight this too"
msgstr "Markera även detta"
-#: gitk:1089
+#: gitk:2157
msgid "Highlight this only"
msgstr "Markera bara detta"
-#: gitk:1318
+#: gitk:2159
+msgid "External diff"
+msgstr "Extern diff"
+
+#: gitk:2400
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
-"Copyright © 2005-2006 Paul Mackerras\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - en incheckningsvisare för git\n"
"\n"
-"Copyright © 2005-2006 Paul Mackerras\n"
+"Copyright © 2005-2008 Paul Mackerras\n"
"\n"
"Använd och vidareförmedla enligt villkoren i GNU General Public License"
-#: gitk:1326 gitk:1387 gitk:6581
+#: gitk:2408 gitk:2469 gitk:7799
msgid "Close"
msgstr "Stäng"
-#: gitk:1345
+#: gitk:2427
msgid "Gitk key bindings"
msgstr "Tangentbordsbindningar för Gitk"
-#: gitk:1347
+#: gitk:2429
msgid "Gitk key bindings:"
msgstr "Tangentbordsbindningar för Gitk:"
-#: gitk:1349
+#: gitk:2431
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tAvsluta"
-#: gitk:1350
+#: gitk:2432
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tGå till första incheckning"
-#: gitk:1351
+#: gitk:2433
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tGå till sista incheckning"
-#: gitk:1352
+#: gitk:2434
msgid "<Up>, p, i\tMove up one commit"
msgstr "<Upp>, p, i\tGå en incheckning upp"
-#: gitk:1353
+#: gitk:2435
msgid "<Down>, n, k\tMove down one commit"
msgstr "<Ned>, n, k\tGå en incheckning ned"
-#: gitk:1354
+#: gitk:2436
msgid "<Left>, z, j\tGo back in history list"
msgstr "<Vänster>, z, j\tGå bakåt i historiken"
-#: gitk:1355
+#: gitk:2437
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Höger>, x, l\tGå framåt i historiken"
-#: gitk:1356
+#: gitk:2438
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tGå upp en sida i incheckningslistan"
-#: gitk:1357
+#: gitk:2439
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tGå ned en sida i incheckningslistan"
-#: gitk:1358
+#: gitk:2440
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tRulla till början av incheckningslistan"
-#: gitk:1359
+#: gitk:2441
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tRulla till slutet av incheckningslistan"
-#: gitk:1360
+#: gitk:2442
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg"
-#: gitk:1361
+#: gitk:2443
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg"
-#: gitk:1362
+#: gitk:2444
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida"
-#: gitk:1363
+#: gitk:2445
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida"
-#: gitk:1364
+#: gitk:2446
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)"
-#: gitk:1365
+#: gitk:2447
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)"
-#: gitk:1366
+#: gitk:2448
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tRulla diffvisningen upp en sida"
-#: gitk:1367
+#: gitk:2449
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Baksteg>\tRulla diffvisningen upp en sida"
-#: gitk:1368
+#: gitk:2450
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Blanksteg>\tRulla diffvisningen ned en sida"
-#: gitk:1369
+#: gitk:2451
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tRulla diffvisningen upp 18 rader"
-#: gitk:1370
+#: gitk:2452
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tRulla diffvisningen ned 18 rader"
-#: gitk:1371
+#: gitk:2453
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tSök"
-#: gitk:1372
+#: gitk:2454
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tGå till nästa sökträff"
-#: gitk:1373
+#: gitk:2455
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\t\tGå till nästa sökträff"
-#: gitk:1374
+#: gitk:2456
msgid "/\t\tMove to next find hit, or redo find"
msgstr "/\t\tGå till nästa sökträff, eller sök på nytt"
-#: gitk:1375
+#: gitk:2457
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tGå till föregående sökträff"
-#: gitk:1376
+#: gitk:2458
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tRulla diffvisningen till nästa fil"
-#: gitk:1377
+#: gitk:2459
#, 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:1378
+#: gitk:2460
#, 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:1379
+#: gitk:2461
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-Num+>\tÖka teckenstorlek"
-#: gitk:1380
+#: gitk:2462
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tÖka teckenstorlek"
-#: gitk:1381
+#: gitk:2463
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-Num->\tMinska teckenstorlek"
-#: gitk:1382
+#: gitk:2464
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tMinska teckenstorlek"
-#: gitk:1383
+#: gitk:2465
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tUppdatera"
-#: gitk:1896
+#: gitk:3091
msgid "Gitk view definition"
msgstr "Definition av Gitk-vy"
-#: gitk:1921
+#: gitk:3116
msgid "Name"
msgstr "Namn"
-#: gitk:1924
+#: gitk:3119
msgid "Remember this view"
msgstr "Spara denna vy"
-#: gitk:1928
-msgid "Commits to include (arguments to git rev-list):"
-msgstr "Incheckningar att ta med (argument till git rev-list):"
+#: gitk:3123
+msgid "Commits to include (arguments to git log):"
+msgstr "Incheckningar att ta med (argument till git log):"
-#: gitk:1935
+#: gitk:3130
msgid "Command to generate more commits to include:"
msgstr "Kommando för att generera fler incheckningar att ta med:"
-#: gitk:1942
+#: gitk:3137
msgid "Enter files and directories to include, one per line:"
msgstr "Ange filer och kataloger att ta med, en per rad:"
-#: gitk:1989
+#: gitk:3184
msgid "Error in commit selection arguments:"
msgstr "Fel i argument för val av incheckningar:"
-#: gitk:2043 gitk:2127 gitk:2583 gitk:2597 gitk:3781 gitk:8688 gitk:8689
+#: gitk:3238 gitk:3290 gitk:3736 gitk:3750 gitk:4951 gitk:9896 gitk:9897
msgid "None"
msgstr "Inget"
-#: gitk:2531 gitk:4336 gitk:5958 gitk:5973
+#: gitk:3684 gitk:5471 gitk:7144 gitk:7159
msgid "Date"
msgstr "Datum"
-#: gitk:2531 gitk:4336
+#: gitk:3684 gitk:5471
msgid "CDate"
msgstr "Skapat datum"
-#: gitk:2680 gitk:2685
+#: gitk:3833 gitk:3838
msgid "Descendant"
msgstr "Avkomling"
-#: gitk:2681
+#: gitk:3834
msgid "Not descendant"
msgstr "Inte avkomling"
-#: gitk:2688 gitk:2693
+#: gitk:3841 gitk:3846
msgid "Ancestor"
msgstr "Förfader"
-#: gitk:2689
+#: gitk:3842
msgid "Not ancestor"
msgstr "Inte förfader"
-#: gitk:2924
+#: gitk:4078
msgid "Local changes checked in to index but not committed"
msgstr "Lokala ändringar sparade i indexet men inte incheckade"
-#: gitk:2954
+#: gitk:4111
msgid "Local uncommitted changes, not checked in to index"
msgstr "Lokala ändringar, ej sparade i indexet"
-#: gitk:4305
+#: gitk:5440
msgid "Searching"
msgstr "Söker"
-#: gitk:4767
+#: gitk:5940
msgid "Tags:"
msgstr "Taggar:"
-#: gitk:4784 gitk:4790 gitk:5951
+#: gitk:5957 gitk:5963 gitk:7137
msgid "Parent"
msgstr "Förälder"
-#: gitk:4795
+#: gitk:5968
msgid "Child"
msgstr "Barn"
-#: gitk:4804
+#: gitk:5977
msgid "Branch"
msgstr "Gren"
-#: gitk:4807
+#: gitk:5980
msgid "Follows"
msgstr "Följer"
-#: gitk:4810
+#: gitk:5983
msgid "Precedes"
msgstr "Föregår"
-#: gitk:5093
+#: gitk:6267
msgid "Error getting merge diffs:"
msgstr "Fel vid hämtning av sammanslagningsdiff:"
-#: gitk:5778
+#: gitk:6970
msgid "Goto:"
msgstr "Gå till:"
-#: gitk:5780
+#: gitk:6972
msgid "SHA1 ID:"
msgstr "SHA1-id:"
-#: gitk:5805
+#: gitk:6991
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Förkortat SHA1-id %s är tvetydigt"
-#: gitk:5817
+#: gitk:7003
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA-id:t %s är inte känt"
-#: gitk:5819
+#: gitk:7005
#, tcl-format
msgid "Tag/Head %s is not known"
msgstr "Tagg/huvud %s är okänt"
-#: gitk:5961
+#: gitk:7147
msgid "Children"
msgstr "Barn"
-#: gitk:6018
+#: gitk:7204
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Återställ grenen %s hit"
-#: gitk:6049
+#: gitk:7206
+msgid "Detached head: can't reset"
+msgstr "Frånkopplad head: kan inte återställa"
+
+#: gitk:7238
msgid "Top"
msgstr "Topp"
-#: gitk:6050
+#: gitk:7239
msgid "From"
msgstr "Från"
-#: gitk:6055
+#: gitk:7244
msgid "To"
msgstr "Till"
-#: gitk:6078
+#: gitk:7267
msgid "Generate patch"
msgstr "Generera patch"
-#: gitk:6080
+#: gitk:7269
msgid "From:"
msgstr "Från:"
-#: gitk:6089
+#: gitk:7278
msgid "To:"
msgstr "Till:"
-#: gitk:6098
+#: gitk:7287
msgid "Reverse"
msgstr "Vänd"
-#: gitk:6100 gitk:6269
+#: gitk:7289 gitk:7464
msgid "Output file:"
msgstr "Utdatafil:"
-#: gitk:6106
+#: gitk:7295
msgid "Generate"
msgstr "Generera"
-#: gitk:6142
+#: gitk:7331
msgid "Error creating patch:"
msgstr "Fel vid generering av patch:"
-#: gitk:6164 gitk:6257 gitk:6311
+#: gitk:7353 gitk:7452 gitk:7506
msgid "ID:"
msgstr "Id:"
-#: gitk:6173
+#: gitk:7362
msgid "Tag name:"
msgstr "Taggnamn:"
-#: gitk:6177 gitk:6320
+#: gitk:7366 gitk:7515
msgid "Create"
msgstr "Skapa"
-#: gitk:6192
+#: gitk:7381
msgid "No tag name specified"
msgstr "Inget taggnamn angavs"
-#: gitk:6196
+#: gitk:7385
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Taggen \"%s\" finns redan"
-#: gitk:6202
+#: gitk:7391
msgid "Error creating tag:"
msgstr "Fel vid skapande av tagg:"
-#: gitk:6266
+#: gitk:7461
msgid "Command:"
msgstr "Kommando:"
-#: gitk:6274
+#: gitk:7469
msgid "Write"
msgstr "Skriv"
-#: gitk:6290
+#: gitk:7485
msgid "Error writing commit:"
msgstr "Fel vid skrivning av incheckning:"
-#: gitk:6316
+#: gitk:7511
msgid "Name:"
msgstr "Namn:"
-#: gitk:6335
+#: gitk:7530
msgid "Please specify a name for the new branch"
msgstr "Ange ett namn för den nya grenen"
-#: gitk:6364
+#: gitk:7559
#, 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?"
+msgstr ""
+"Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras "
+"på nytt?"
-#: gitk:6369
+#: gitk:7564
msgid "Cherry-picking"
msgstr "Plockar"
-#: gitk:6381
+#: gitk:7576
msgid "No changes committed"
msgstr "Inga ändringar incheckade"
-#: gitk:6404
+#: gitk:7601
msgid "Confirm reset"
msgstr "Bekräfta återställning"
-#: gitk:6406
+#: gitk:7603
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Återställa grenen %s till %s?"
-#: gitk:6410
+#: gitk:7607
msgid "Reset type:"
msgstr "Typ av återställning:"
-#: gitk:6414
+#: gitk:7611
msgid "Soft: Leave working tree and index untouched"
msgstr "Mjuk: Rör inte utcheckning och index"
-#: gitk:6417
+#: gitk:7614
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Blandad: Rör inte utcheckning, återställ index"
-#: gitk:6420
+#: gitk:7617
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
@@ -691,19 +728,19 @@ msgstr ""
"Hård: Återställ utcheckning och index\n"
"(förkastar ALLA lokala ändringar)"
-#: gitk:6436
+#: gitk:7633
msgid "Resetting"
msgstr "Återställer"
-#: gitk:6493
+#: gitk:7690
msgid "Checking out"
msgstr "Checkar ut"
-#: gitk:6523
+#: gitk:7741
msgid "Cannot delete the currently checked-out branch"
msgstr "Kan inte ta bort den just nu utcheckade grenen"
-#: gitk:6529
+#: gitk:7747
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
@@ -712,16 +749,16 @@ msgstr ""
"Incheckningarna på grenen %s existerar inte på någon annan gren.\n"
"Vill du verkligen ta bort grenen %s?"
-#: gitk:6560
+#: gitk:7778
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Taggar och huvuden: %s"
-#: gitk:6574
+#: gitk:7792
msgid "Filter"
msgstr "Filter"
-#: gitk:6868
+#: gitk:8086
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
@@ -729,117 +766,125 @@ msgstr ""
"Fel vid läsning av information om incheckningstopologi; information om "
"grenar och föregående/senare taggar kommer inte vara komplett."
-#: gitk:7852
+#: gitk:9072
msgid "Tag"
msgstr "Tagg"
-#: gitk:7852
+#: gitk:9072
msgid "Id"
msgstr "Id"
-#: gitk:7892
+#: gitk:9118
msgid "Gitk font chooser"
msgstr "Teckensnittsväljare för Gitk"
-#: gitk:7909
+#: gitk:9135
msgid "B"
msgstr "F"
-#: gitk:7912
+#: gitk:9138
msgid "I"
msgstr "K"
-#: gitk:8005
+#: gitk:9231
msgid "Gitk preferences"
msgstr "Inställningar för Gitk"
-#: gitk:8006
+#: gitk:9232
msgid "Commit list display options"
msgstr "Alternativ för incheckningslistvy"
-#: gitk:8009
+#: gitk:9235
msgid "Maximum graph width (lines)"
msgstr "Maximal grafbredd (rader)"
-#: gitk:8013
+#: gitk:9239
#, tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Maximal grafbredd (% av ruta)"
-#: gitk:8018
+#: gitk:9244
msgid "Show local changes"
msgstr "Visa lokala ändringar"
-#: gitk:8023
+#: gitk:9249
msgid "Auto-select SHA1"
msgstr "Välj SHA1 automatiskt"
-#: gitk:8028
+#: gitk:9254
msgid "Diff display options"
msgstr "Alternativ för diffvy"
-#: gitk:8030
+#: gitk:9256
msgid "Tab spacing"
msgstr "Blanksteg för tabulatortecken"
-#: gitk:8034
+#: gitk:9260
msgid "Display nearby tags"
msgstr "Visa närliggande taggar"
-#: gitk:8039
+#: gitk:9265
msgid "Limit diffs to listed paths"
msgstr "Begränsa diff till listade sökvägar"
-#: gitk:8044
+#: gitk:9272
+msgid "External diff tool"
+msgstr "Externt diff-verktyg"
+
+#: gitk:9274
+msgid "Choose..."
+msgstr "Välj..."
+
+#: gitk:9279
msgid "Colors: press to choose"
msgstr "Färger: tryck för att välja"
-#: gitk:8047
+#: gitk:9282
msgid "Background"
msgstr "Bakgrund"
-#: gitk:8051
+#: gitk:9286
msgid "Foreground"
msgstr "Förgrund"
-#: gitk:8055
+#: gitk:9290
msgid "Diff: old lines"
msgstr "Diff: gamla rader"
-#: gitk:8060
+#: gitk:9295
msgid "Diff: new lines"
msgstr "Diff: nya rader"
-#: gitk:8065
+#: gitk:9300
msgid "Diff: hunk header"
msgstr "Diff: delhuvud"
-#: gitk:8071
+#: gitk:9306
msgid "Select bg"
msgstr "Markerad bakgrund"
-#: gitk:8075
+#: gitk:9310
msgid "Fonts: press to choose"
msgstr "Teckensnitt: tryck för att välja"
-#: gitk:8077
+#: gitk:9312
msgid "Main font"
msgstr "Huvudteckensnitt"
-#: gitk:8078
+#: gitk:9313
msgid "Diff display font"
msgstr "Teckensnitt för diffvisning"
-#: gitk:8079
+#: gitk:9314
msgid "User interface font"
msgstr "Teckensnitt för användargränssnitt"
-#: gitk:8095
+#: gitk:9339
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: välj färg för %s"
-#: gitk:8476
+#: gitk:9720
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
@@ -847,41 +892,24 @@ msgstr ""
"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n"
" Gitk kräver åtminstone Tcl/Tk 8.4."
-#: gitk:8565
+#: gitk:9812
msgid "Cannot find a git repository here."
msgstr "Hittar inget gitk-arkiv här."
-#: gitk:8569
+#: gitk:9816
#, tcl-format
msgid "Cannot find the git directory \"%s\"."
msgstr "Hittar inte git-katalogen \"%s\"."
-#: gitk:8612
+#: gitk:9853
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Tvetydigt argument \"%s\": både revision och filnamn"
-#: gitk:8624
+#: gitk:9865
msgid "Bad arguments to gitk:"
msgstr "Felaktiga argument till gitk:"
-#: gitk:8636
-msgid "Couldn't get list of unmerged files:"
-msgstr "Kunde inta hämta lista över ej sammanslagna filer:"
-
-#: gitk:8652
-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:8655
-msgid ""
-"No files selected: --merge specified but no unmerged files are within file "
-"limit."
-msgstr ""
-"Inga filer valdes: --merge angavs men det finns inga filer inom "
-"filbegränsningen."
-
-#: gitk:8716
+#: gitk:9925
msgid "Command line"
msgstr "Kommandorad"
-