mirrors-c
/
git
mirror of https://github.com/git/git.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity Software Blog

Merge git://repo.or.cz/git-gui 

* 'master' of git://repo.or.cz/git-gui:
  git-gui 0.13
  git-gui: avoid mis-encoding the copyright message on Windows.
  git-gui: Update Swedish translation (521t).
  git-gui: ensure correct application termination in git-gui--askpass
  git-gui: handle textconv filter on Windows and in development
  git-gui: use shell to launch textconv filter in "blame"
  git-gui: display error launching blame as a message box.
  git-gui: Make usage statement visible on Windows.
This commit is contained in:
Junio C Hamano 2010-09-15 12:34:37 -07:00
parent 5879b6bbca 00e9de72c8
commit 12644fa99f
6 changed files with 597 additions and 554 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-gui/GIT-VERSION-GEN
View File

@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
DEF_VER=0.12.GITGUI
DEF_VER=0.13.GITGUI
LF='
'

1
git-gui/Makefile
View File

@ -215,6 +215,7 @@ endif
$(GITGUI_MAIN): git-gui.sh GIT-VERSION-FILE GIT-GUI-VARS
$(QUIET_GEN)rm -f $@ $@+ && \
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
-e 's|@@SHELL_PATH@@|$(SHELL_PATH_SQ)|' \
-e '1,30s|^ argv0=$$0| argv0=$(GITGUI_SCRIPT)|' \
-e '1,30s|^ exec wish | exec '\''$(TCLTK_PATH_SED)'\'' |' \
-e 's/@@GITGUI_VERSION@@/$(GITGUI_VERSION)/g' \

19
git-gui/git-gui--askpass
View File

@ -5,6 +5,8 @@ exec wish "$0" -- "$@"
# This is a trivial implementation of an SSH_ASKPASS handler.
# Git-gui uses this script if none are already configured.
package require Tk
set answer {}
set yesno 0
set rc 255
@ -30,16 +32,20 @@ if {!$yesno} {
frame .b
button .b.ok -text OK -command finish
button .b.cancel -text Cancel -command {destroy .}
button .b.cancel -text Cancel -command cancel
pack .b.ok -side left -expand 1
pack .b.cancel -side right -expand 1
pack .b -side bottom -fill x -padx 10 -pady 10
bind . <Visibility> {focus -force .e}
bind . <Key-Return> finish
bind . <Key-Escape> {destroy .}
bind . <Destroy> {exit $rc}
bind . <Key-Return> [list .b.ok invoke]
bind . <Key-Escape> [list .b.cancel invoke]
bind . <Destroy> {set rc $rc}
proc cancel {} {
set ::rc 255
}
proc finish {} {
if {$::yesno} {
@ -50,10 +56,11 @@ proc finish {} {
}
}
set ::rc 0
puts $::answer
destroy .
set ::rc 0
}
wm title . "OpenSSH"
tk::PlaceWindow .
vwait rc
exit $rc

32
git-gui/git-gui.sh
View File

@ -10,8 +10,8 @@
exec wish "$argv0" -- "$@"
set appvers {@@GITGUI_VERSION@@}
set copyright [encoding convertfrom utf-8 {
Copyright © 2006, 2007 Shawn Pearce, et. al.
set copyright [string map [list (c) \u00a9] {
Copyright (c) 2006-2010 Shawn Pearce, et. al.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -128,6 +128,7 @@ set _githtmldir {}
set _reponame {}
set _iscygwin {}
set _search_path {}
set _shellpath {@@SHELL_PATH@@}
set _trace [lsearch -exact $argv --trace]
if {$_trace >= 0} {
@ -137,6 +138,18 @@ if {$_trace >= 0} {
set _trace 0
}
proc shellpath {} {
global _shellpath env
if {[string match @@* $_shellpath]} {
if {[info exists env(SHELL)]} {
return $env(SHELL)
} else {
return /bin/sh
}
}
return $_shellpath
}
proc appname {} {
global _appname
return $_appname
@ -2845,7 +2858,13 @@ bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
set subcommand_args {}
proc usage {} {
puts stderr "usage: $::argv0 $::subcommand $::subcommand_args"
set s "usage: $::argv0 $::subcommand $::subcommand_args"
if {[tk windowingsystem] eq "win32"} {
wm withdraw .
tk_messageBox -icon info -title "Usage" -message $s
} else {
puts stderr $s
}
exit 1
}
@ -2938,7 +2957,12 @@ blame {
}
blame {
if {$head eq {} && ![file exists $path]} {
puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
catch {wm withdraw .}
tk_messageBox \
-icon error \
-type ok \
-title [mc "git-gui: fatal error"] \
-message [mc "fatal: cannot stat path %s: No such file or directory" $path]
exit 1
}
blame::new $head $path $jump_spec

9
git-gui/lib/blame.tcl
View File

@ -460,7 +460,14 @@ method _load {jump} {
}
if {$commit eq {}} {
if {$do_textconv ne 0} {
set fd [open |[list $textconv $path] r]
# Run textconv with sh -c "..." to allow it to
# contain command + arguments. On windows, just
# call the filter command.
if {![file executable [shellpath]]} {
set fd [open |[linsert $textconv end $path] r]
} else {
set fd [open |[list [shellpath] -c "$textconv \"\$0\"" $path] r]
}
} else {
set fd [open $path r]
}

1088
git-gui/po/sv.po
View File

@ -8,41 +8,41 @@ msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-26 15:47-0800\n"
"PO-Revision-Date: 2010-01-28 13:57+0100\n"
"POT-Creation-Date: 2010-09-12 21:11+0100\n"
"PO-Revision-Date: 2010-09-12 21:12+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit"
#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
#: git-gui.sh:922
msgid "git-gui: fatal error"
msgstr "git-gui: ödesdigert fel"
#: git-gui.sh:743
#: git-gui.sh:781
#, tcl-format
msgid "Invalid font specified in %s:"
msgstr "Ogiltigt teckensnitt angivet i %s:"
#: git-gui.sh:779
#: git-gui.sh:831
msgid "Main Font"
msgstr "Huvudteckensnitt"
#: git-gui.sh:780
#: git-gui.sh:832
msgid "Diff/Console Font"
msgstr "Diff/konsolteckensnitt"
#: git-gui.sh:794
#: git-gui.sh:845 git-gui.sh:859 git-gui.sh:872 git-gui.sh:955 git-gui.sh:974
#: git-gui.sh:2964
msgid "git-gui: fatal error"
msgstr "git-gui: ödesdigert fel"
#: git-gui.sh:846
msgid "Cannot find git in PATH."
msgstr "Hittar inte git i PATH."
#: git-gui.sh:821
#: git-gui.sh:873
msgid "Cannot parse Git version string:"
msgstr "Kan inte tolka versionssträng från Git:"
#: git-gui.sh:839
#: git-gui.sh:891
#, tcl-format
msgid ""
"Git version cannot be determined.\n"
@ -61,478 +61,478 @@ msgstr ""
"\n"
"Anta att \"%s\" är version 1.5.0?\n"
#: git-gui.sh:1128
#: git-gui.sh:1180
msgid "Git directory not found:"
msgstr "Git-katalogen hittades inte:"
#: git-gui.sh:1146
#: git-gui.sh:1201
msgid "Cannot move to top of working directory:"
msgstr "Kan inte gå till början på arbetskatalogen:"
#: git-gui.sh:1154
#: git-gui.sh:1209
msgid "Cannot use bare repository:"
msgstr "Kan inte använda naket arkiv:"
#: git-gui.sh:1162
#: git-gui.sh:1217
msgid "No working directory"
msgstr "Ingen arbetskatalog"
#: git-gui.sh:1334 lib/checkout_op.tcl:306
#: git-gui.sh:1389 lib/checkout_op.tcl:306
msgid "Refreshing file status..."
msgstr "Uppdaterar filstatus..."
#: git-gui.sh:1390
#: git-gui.sh:1445
msgid "Scanning for modified files ..."
msgstr "Söker efter ändrade filer..."
#: git-gui.sh:1454
#: git-gui.sh:1509
msgid "Calling prepare-commit-msg hook..."
msgstr ""
"Anropar kroken för förberedelse av incheckningsmeddelande (prepare-commit-"
"msg)..."
#: git-gui.sh:1471
#: git-gui.sh:1526
msgid "Commit declined by prepare-commit-msg hook."
msgstr ""
"Incheckningen avvisades av kroken för förberedelse av incheckningsmeddelande "
"(prepare-commit-msg)."
#: git-gui.sh:1629 lib/browser.tcl:246
#: git-gui.sh:1684 lib/browser.tcl:246
msgid "Ready."
msgstr "Klar."
#: git-gui.sh:1787
#: git-gui.sh:1842
#, tcl-format
msgid "Displaying only %s of %s files."
msgstr "Visar endast %s av %s filer."
#: git-gui.sh:1913
#: git-gui.sh:1968
msgid "Unmodified"
msgstr "Oförändrade"
#: git-gui.sh:1915
#: git-gui.sh:1970
msgid "Modified, not staged"
msgstr "Förändrade, ej köade"
#: git-gui.sh:1916 git-gui.sh:1924
#: git-gui.sh:1971 git-gui.sh:1979
msgid "Staged for commit"
msgstr "Köade för incheckning"
#: git-gui.sh:1917 git-gui.sh:1925
#: git-gui.sh:1972 git-gui.sh:1980
msgid "Portions staged for commit"
msgstr "Delar köade för incheckning"
#: git-gui.sh:1918 git-gui.sh:1926
#: git-gui.sh:1973 git-gui.sh:1981
msgid "Staged for commit, missing"
msgstr "Köade för incheckning, saknade"
#: git-gui.sh:1920
#: git-gui.sh:1975
msgid "File type changed, not staged"
msgstr "Filtyp ändrad, ej köade"
#: git-gui.sh:1921
#: git-gui.sh:1976
msgid "File type changed, staged"
msgstr "Filtyp ändrad, köade"
#: git-gui.sh:1923
#: git-gui.sh:1978
msgid "Untracked, not staged"
msgstr "Ej spårade, ej köade"
#: git-gui.sh:1928
#: git-gui.sh:1983
msgid "Missing"
msgstr "Saknade"
#: git-gui.sh:1929
#: git-gui.sh:1984
msgid "Staged for removal"
msgstr "Köade för borttagning"
#: git-gui.sh:1930
#: git-gui.sh:1985
msgid "Staged for removal, still present"
msgstr "Köade för borttagning, fortfarande närvarande"
#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
#: git-gui.sh:1936 git-gui.sh:1937
#: git-gui.sh:1987 git-gui.sh:1988 git-gui.sh:1989 git-gui.sh:1990
#: git-gui.sh:1991 git-gui.sh:1992
msgid "Requires merge resolution"
msgstr "Kräver konflikthantering efter sammanslagning"
#: git-gui.sh:1972
#: git-gui.sh:2027
msgid "Starting gitk... please wait..."
msgstr "Startar gitk... vänta..."
#: git-gui.sh:1984
#: git-gui.sh:2039
msgid "Couldn't find gitk in PATH"
msgstr "Hittade inte gitk i PATH."
#: git-gui.sh:2043
#: git-gui.sh:2098
msgid "Couldn't find git gui in PATH"
msgstr "Hittade inte git gui i PATH."
#: git-gui.sh:2455 lib/choose_repository.tcl:36
#: git-gui.sh:2515 lib/choose_repository.tcl:36
msgid "Repository"
msgstr "Arkiv"
#: git-gui.sh:2456
#: git-gui.sh:2516
msgid "Edit"
msgstr "Redigera"
#: git-gui.sh:2458 lib/choose_rev.tcl:561
#: git-gui.sh:2518 lib/choose_rev.tcl:566
msgid "Branch"
msgstr "Gren"
#: git-gui.sh:2461 lib/choose_rev.tcl:548
#: git-gui.sh:2521 lib/choose_rev.tcl:553
msgid "Commit@@noun"
msgstr "Incheckning"
#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
#: git-gui.sh:2524 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
msgid "Merge"
msgstr "Slå ihop"
#: git-gui.sh:2465 lib/choose_rev.tcl:557
#: git-gui.sh:2525 lib/choose_rev.tcl:562
msgid "Remote"
msgstr "Fjärrarkiv"
#: git-gui.sh:2468
#: git-gui.sh:2528
msgid "Tools"
msgstr "Verktyg"
#: git-gui.sh:2477
#: git-gui.sh:2537
msgid "Explore Working Copy"
msgstr "Utforska arbetskopia"
#: git-gui.sh:2483
#: git-gui.sh:2543
msgid "Browse Current Branch's Files"
msgstr "Bläddra i grenens filer"
#: git-gui.sh:2487
#: git-gui.sh:2547
msgid "Browse Branch Files..."
msgstr "Bläddra filer på gren..."
#: git-gui.sh:2492
#: git-gui.sh:2552
msgid "Visualize Current Branch's History"
msgstr "Visualisera grenens historik"
#: git-gui.sh:2496
#: git-gui.sh:2556
msgid "Visualize All Branch History"
msgstr "Visualisera alla grenars historik"
#: git-gui.sh:2503
#: git-gui.sh:2563
#, tcl-format
msgid "Browse %s's Files"
msgstr "Bläddra i filer för %s"
#: git-gui.sh:2505
#: git-gui.sh:2565
#, tcl-format
msgid "Visualize %s's History"
msgstr "Visualisera historik för %s"
#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
#: git-gui.sh:2570 lib/database.tcl:40 lib/database.tcl:66
msgid "Database Statistics"
msgstr "Databasstatistik"
#: git-gui.sh:2513 lib/database.tcl:34
#: git-gui.sh:2573 lib/database.tcl:33
msgid "Compress Database"
msgstr "Komprimera databas"
#: git-gui.sh:2516
#: git-gui.sh:2576
msgid "Verify Database"
msgstr "Verifiera databas"
#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
#: git-gui.sh:2583 git-gui.sh:2587 git-gui.sh:2591 lib/shortcut.tcl:8
#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
msgid "Create Desktop Icon"
msgstr "Skapa skrivbordsikon"
#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
#: git-gui.sh:2599 lib/choose_repository.tcl:188 lib/choose_repository.tcl:196
msgid "Quit"
msgstr "Avsluta"
#: git-gui.sh:2547
#: git-gui.sh:2607
msgid "Undo"
msgstr "Ångra"
#: git-gui.sh:2550
#: git-gui.sh:2610
msgid "Redo"
msgstr "Gör om"
#: git-gui.sh:2554 git-gui.sh:3109
#: git-gui.sh:2614 git-gui.sh:3190
msgid "Cut"
msgstr "Klipp ut"
#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
#: git-gui.sh:2617 git-gui.sh:3193 git-gui.sh:3267 git-gui.sh:3340
#: lib/console.tcl:69
msgid "Copy"
msgstr "Kopiera"
#: git-gui.sh:2560 git-gui.sh:3115
#: git-gui.sh:2620 git-gui.sh:3196
msgid "Paste"
msgstr "Klistra in"
#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
#: lib/remote_branch_delete.tcl:38
#: git-gui.sh:2623 git-gui.sh:3199 lib/branch_delete.tcl:28
#: lib/remote_branch_delete.tcl:39
msgid "Delete"
msgstr "Ta bort"
#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
#: git-gui.sh:2627 git-gui.sh:3203 git-gui.sh:3344 lib/console.tcl:71
msgid "Select All"
msgstr "Markera alla"
#: git-gui.sh:2576
#: git-gui.sh:2636
msgid "Create..."
msgstr "Skapa..."
#: git-gui.sh:2582
#: git-gui.sh:2642
msgid "Checkout..."
msgstr "Checka ut..."
#: git-gui.sh:2588
#: git-gui.sh:2648
msgid "Rename..."
msgstr "Byt namn..."
#: git-gui.sh:2593
#: git-gui.sh:2653
msgid "Delete..."
msgstr "Ta bort..."
#: git-gui.sh:2598
#: git-gui.sh:2658
msgid "Reset..."
msgstr "Återställ..."
#: git-gui.sh:2608
#: git-gui.sh:2668
msgid "Done"
msgstr "Färdig"
#: git-gui.sh:2610
#: git-gui.sh:2670
msgid "Commit@@verb"
msgstr "Checka in"
#: git-gui.sh:2619 git-gui.sh:3050
#: git-gui.sh:2679 git-gui.sh:3131
msgid "New Commit"
msgstr "Ny incheckning"
#: git-gui.sh:2627 git-gui.sh:3057
#: git-gui.sh:2687 git-gui.sh:3138
msgid "Amend Last Commit"
msgstr "Lägg till föregående incheckning"
#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
#: git-gui.sh:2697 git-gui.sh:3092 lib/remote_branch_delete.tcl:101
msgid "Rescan"
msgstr "Sök på nytt"
#: git-gui.sh:2643
#: git-gui.sh:2703
msgid "Stage To Commit"
msgstr "Köa för incheckning"
#: git-gui.sh:2649
#: git-gui.sh:2709
msgid "Stage Changed Files To Commit"
msgstr "Köa ändrade filer för incheckning"
#: git-gui.sh:2655
#: git-gui.sh:2715
msgid "Unstage From Commit"
msgstr "Ta bort från incheckningskö"
#: git-gui.sh:2661 lib/index.tcl:412
#: git-gui.sh:2721 lib/index.tcl:415
msgid "Revert Changes"
msgstr "Återställ ändringar"
#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
#: git-gui.sh:2729 git-gui.sh:3391 git-gui.sh:3422
msgid "Show Less Context"
msgstr "Visa mindre sammanhang"
#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
#: git-gui.sh:2733 git-gui.sh:3395 git-gui.sh:3426
msgid "Show More Context"
msgstr "Visa mer sammanhang"
#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
#: git-gui.sh:2740 git-gui.sh:3105 git-gui.sh:3214
msgid "Sign Off"
msgstr "Skriv under"
#: git-gui.sh:2696
#: git-gui.sh:2756
msgid "Local Merge..."
msgstr "Lokal sammanslagning..."
#: git-gui.sh:2701
#: git-gui.sh:2761
msgid "Abort Merge..."
msgstr "Avbryt sammanslagning..."
#: git-gui.sh:2713 git-gui.sh:2741
#: git-gui.sh:2773 git-gui.sh:2801
msgid "Add..."
msgstr "Lägg till..."
#: git-gui.sh:2717
#: git-gui.sh:2777
msgid "Push..."
msgstr "Sänd..."
#: git-gui.sh:2721
#: git-gui.sh:2781
msgid "Delete Branch..."
msgstr "Ta bort gren..."
#: git-gui.sh:2731 git-gui.sh:3292
#: git-gui.sh:2791 git-gui.sh:3373
msgid "Options..."
msgstr "Alternativ..."
#: git-gui.sh:2742
#: git-gui.sh:2802
msgid "Remove..."
msgstr "Ta bort..."
#: git-gui.sh:2751 lib/choose_repository.tcl:50
#: git-gui.sh:2811 lib/choose_repository.tcl:50
msgid "Help"
msgstr "Hjälp"
#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
#: git-gui.sh:2815 git-gui.sh:2819 lib/about.tcl:14
#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
#, tcl-format
msgid "About %s"
msgstr "Om %s"
#: git-gui.sh:2783
#: git-gui.sh:2843
msgid "Online Documentation"
msgstr "Webbdokumentation"
#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
#: git-gui.sh:2846 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
msgid "Show SSH Key"
msgstr "Visa SSH-nyckel"
#: git-gui.sh:2893
#: git-gui.sh:2965
#, tcl-format
msgid "fatal: cannot stat path %s: No such file or directory"
msgstr ""
"ödesdigert: kunde inte ta status på sökvägen %s: Fil eller katalog saknas"
#: git-gui.sh:2926
#: git-gui.sh:2997
msgid "Current Branch:"
msgstr "Aktuell gren:"
#: git-gui.sh:2947
#: git-gui.sh:3023
msgid "Staged Changes (Will Commit)"
msgstr "Köade ändringar (kommer att checkas in)"
#: git-gui.sh:2967
#: git-gui.sh:3043
msgid "Unstaged Changes"
msgstr "Oköade ändringar"
#: git-gui.sh:3017
#: git-gui.sh:3098
msgid "Stage Changed"
msgstr "Köa ändrade"
#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
#: git-gui.sh:3117 lib/transport.tcl:107 lib/transport.tcl:196
msgid "Push"
msgstr "Sänd"
#: git-gui.sh:3071
#: git-gui.sh:3152
msgid "Initial Commit Message:"
msgstr "Inledande incheckningsmeddelande:"
#: git-gui.sh:3072
#: git-gui.sh:3153
msgid "Amended Commit Message:"
msgstr "Utökat incheckningsmeddelande:"
#: git-gui.sh:3073
#: git-gui.sh:3154
msgid "Amended Initial Commit Message:"
msgstr "Utökat inledande incheckningsmeddelande:"
#: git-gui.sh:3074
#: git-gui.sh:3155
msgid "Amended Merge Commit Message:"
msgstr "Utökat incheckningsmeddelande för sammanslagning:"
#: git-gui.sh:3075
#: git-gui.sh:3156
msgid "Merge Commit Message:"
msgstr "Incheckningsmeddelande för sammanslagning:"
#: git-gui.sh:3076
#: git-gui.sh:3157
msgid "Commit Message:"
msgstr "Incheckningsmeddelande:"
#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
#: git-gui.sh:3206 git-gui.sh:3348 lib/console.tcl:73
msgid "Copy All"
msgstr "Kopiera alla"
#: git-gui.sh:3149 lib/blame.tcl:104
#: git-gui.sh:3230 lib/blame.tcl:104
msgid "File:"
msgstr "Fil:"
#: git-gui.sh:3255
#: git-gui.sh:3336
msgid "Refresh"
msgstr "Uppdatera"
#: git-gui.sh:3276
#: git-gui.sh:3357
msgid "Decrease Font Size"
msgstr "Minska teckensnittsstorlek"
#: git-gui.sh:3280
#: git-gui.sh:3361
msgid "Increase Font Size"
msgstr "Öka teckensnittsstorlek"
#: git-gui.sh:3288 lib/blame.tcl:281
#: git-gui.sh:3369 lib/blame.tcl:281
msgid "Encoding"
msgstr "Teckenkodning"
#: git-gui.sh:3299
#: git-gui.sh:3380
msgid "Apply/Reverse Hunk"
msgstr "Använd/återställ del"
#: git-gui.sh:3304
#: git-gui.sh:3385
msgid "Apply/Reverse Line"
msgstr "Använd/återställ rad"
#: git-gui.sh:3323
#: git-gui.sh:3404
msgid "Run Merge Tool"
msgstr "Starta verktyg för sammanslagning"
#: git-gui.sh:3328
#: git-gui.sh:3409
msgid "Use Remote Version"
msgstr "Använd versionen från fjärrarkivet"
#: git-gui.sh:3332
#: git-gui.sh:3413
msgid "Use Local Version"
msgstr "Använd lokala versionen"
#: git-gui.sh:3336
#: git-gui.sh:3417
msgid "Revert To Base"
msgstr "Återställ till basversionen"
#: git-gui.sh:3354
#: git-gui.sh:3435
msgid "Visualize These Changes In The Submodule"
msgstr "Visualisera ändringarna i undermodulen"
#: git-gui.sh:3358
#: git-gui.sh:3439
msgid "Visualize Current Branch History In The Submodule"
msgstr "Visualisera grenens historik i undermodulen"
#: git-gui.sh:3362
#: git-gui.sh:3443
msgid "Visualize All Branch History In The Submodule"
msgstr "Visualisera alla grenars historik i undermodulen"
#: git-gui.sh:3367
#: git-gui.sh:3448
msgid "Start git gui In The Submodule"
msgstr "Starta git gui i undermodulen"
#: git-gui.sh:3389
#: git-gui.sh:3483
msgid "Unstage Hunk From Commit"
msgstr "Ta bort del ur incheckningskö"
#: git-gui.sh:3391
#: git-gui.sh:3485
msgid "Unstage Lines From Commit"
msgstr "Ta bort rader ur incheckningskö"
#: git-gui.sh:3393
#: git-gui.sh:3487
msgid "Unstage Line From Commit"
msgstr "Ta bort rad ur incheckningskö"
#: git-gui.sh:3396
#: git-gui.sh:3490
msgid "Stage Hunk For Commit"
msgstr "Ställ del i incheckningskö"
#: git-gui.sh:3398
#: git-gui.sh:3492
msgid "Stage Lines For Commit"
msgstr "Ställ rader i incheckningskö"
#: git-gui.sh:3400
#: git-gui.sh:3494
msgid "Stage Line For Commit"
msgstr "Ställ rad i incheckningskö"
#: git-gui.sh:3424
#: git-gui.sh:3519
msgid "Initializing..."
msgstr "Initierar..."
#: git-gui.sh:3541
#: git-gui.sh:3658
#, tcl-format
msgid ""
"Possible environment issues exist.\n"
@ -549,7 +549,7 @@ msgstr ""
"av %s:\n"
"\n"
#: git-gui.sh:3570
#: git-gui.sh:3687
msgid ""
"\n"
"This is due to a known issue with the\n"
@ -559,7 +559,7 @@ msgstr ""
"Detta beror på ett känt problem med\n"
"Tcl-binären som följer med Cygwin."
#: git-gui.sh:3575
#: git-gui.sh:3692
#, tcl-format
msgid ""
"\n"
@ -613,132 +613,132 @@ msgstr "Klandra föräldraincheckning"
msgid "Reading %s..."
msgstr "Läser %s..."
#: lib/blame.tcl:557
#: lib/blame.tcl:581
msgid "Loading copy/move tracking annotations..."
msgstr "Läser annoteringar för kopiering/flyttning..."
#: lib/blame.tcl:577
#: lib/blame.tcl:601
msgid "lines annotated"
msgstr "rader annoterade"
#: lib/blame.tcl:769
#: lib/blame.tcl:793
msgid "Loading original location annotations..."
msgstr "Läser in annotering av originalplacering..."
#: lib/blame.tcl:772
#: lib/blame.tcl:796
msgid "Annotation complete."
msgstr "Annotering fullbordad."
#: lib/blame.tcl:802
#: lib/blame.tcl:826
msgid "Busy"
msgstr "Upptagen"
#: lib/blame.tcl:803
#: lib/blame.tcl:827
msgid "Annotation process is already running."
msgstr "Annoteringsprocess körs redan."
#: lib/blame.tcl:842
#: lib/blame.tcl:866
msgid "Running thorough copy detection..."
msgstr "Kör grundlig kopieringsigenkänning..."
#: lib/blame.tcl:910
#: lib/blame.tcl:934
msgid "Loading annotation..."
msgstr "Läser in annotering..."
#: lib/blame.tcl:963
#: lib/blame.tcl:987
msgid "Author:"
msgstr "Författare:"
#: lib/blame.tcl:967
#: lib/blame.tcl:991
msgid "Committer:"
msgstr "Incheckare:"
#: lib/blame.tcl:972
#: lib/blame.tcl:996
msgid "Original File:"
msgstr "Ursprunglig fil:"
#: lib/blame.tcl:1020
#: lib/blame.tcl:1044
msgid "Cannot find HEAD commit:"
msgstr "Hittar inte incheckning för HEAD:"
#: lib/blame.tcl:1075
#: lib/blame.tcl:1099
msgid "Cannot find parent commit:"
msgstr "Hittar inte föräldraincheckning:"
#: lib/blame.tcl:1090
#: lib/blame.tcl:1114
msgid "Unable to display parent"
msgstr "Kan inte visa förälder"
#: lib/blame.tcl:1091 lib/diff.tcl:320
#: lib/blame.tcl:1115 lib/diff.tcl:323
msgid "Error loading diff:"
msgstr "Fel vid inläsning av differens:"
#: lib/blame.tcl:1231
#: lib/blame.tcl:1255
msgid "Originally By:"
msgstr "Ursprungligen av:"
#: lib/blame.tcl:1237
#: lib/blame.tcl:1261
msgid "In File:"
msgstr "I filen:"
#: lib/blame.tcl:1242
#: lib/blame.tcl:1266
msgid "Copied Or Moved Here By:"
msgstr "Kopierad eller flyttad hit av:"
#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
#: lib/branch_checkout.tcl:16 lib/branch_checkout.tcl:21
msgid "Checkout Branch"
msgstr "Checka ut gren"
#: lib/branch_checkout.tcl:23
#: lib/branch_checkout.tcl:26
msgid "Checkout"
msgstr "Checka ut"
#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
#: lib/transport.tcl:108
#: lib/branch_checkout.tcl:30 lib/branch_create.tcl:37
#: lib/branch_delete.tcl:34 lib/branch_rename.tcl:32 lib/browser.tcl:286
#: lib/checkout_op.tcl:579 lib/choose_font.tcl:45 lib/merge.tcl:172
#: lib/option.tcl:127 lib/remote_add.tcl:34 lib/remote_branch_delete.tcl:43
#: lib/tools_dlg.tcl:41 lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345
#: lib/transport.tcl:111
msgid "Cancel"
msgstr "Avbryt"
#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
#: lib/branch_checkout.tcl:35 lib/browser.tcl:291 lib/tools_dlg.tcl:321
msgid "Revision"
msgstr "Revision"
#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:69 lib/option.tcl:287
msgid "Options"
msgstr "Alternativ"
#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
msgid "Fetch Tracking Branch"
msgstr "Hämta spårande gren"
#: lib/branch_checkout.tcl:44
#: lib/branch_checkout.tcl:47
msgid "Detach From Local Branch"
msgstr "Koppla bort från lokal gren"
#: lib/branch_create.tcl:22
#: lib/branch_create.tcl:23
msgid "Create Branch"
msgstr "Skapa gren"
#: lib/branch_create.tcl:27
#: lib/branch_create.tcl:28
msgid "Create New Branch"
msgstr "Skapa ny gren"
#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
#: lib/branch_create.tcl:33 lib/choose_repository.tcl:389
msgid "Create"
msgstr "Skapa"
#: lib/branch_create.tcl:40
#: lib/branch_create.tcl:42
msgid "Branch Name"
msgstr "Namn på gren"
#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
#: lib/branch_create.tcl:44 lib/remote_add.tcl:41 lib/tools_dlg.tcl:51
msgid "Name:"
msgstr "Namn:"
#: lib/branch_create.tcl:58
#: lib/branch_create.tcl:57
msgid "Match Tracking Branch Name"
msgstr "Använd namn på spårad gren"
@ -766,41 +766,41 @@ msgstr "Återställ"
msgid "Checkout After Creation"
msgstr "Checka ut när skapad"
#: lib/branch_create.tcl:131
#: lib/branch_create.tcl:132
msgid "Please select a tracking branch."
msgstr "Välj en gren att spåra."
#: lib/branch_create.tcl:140
#: lib/branch_create.tcl:141
#, tcl-format
msgid "Tracking branch %s is not a branch in the remote repository."
msgstr "Den spårade grenen %s är inte en gren i fjärrarkivet."
#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
#: lib/branch_create.tcl:154 lib/branch_rename.tcl:92
msgid "Please supply a branch name."
msgstr "Ange ett namn för grenen."
#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
#: lib/branch_create.tcl:165 lib/branch_rename.tcl:112
#, tcl-format
msgid "'%s' is not an acceptable branch name."
msgstr "\"%s\" kan inte användas som namn på grenen."
#: lib/branch_delete.tcl:15
#: lib/branch_delete.tcl:16
msgid "Delete Branch"
msgstr "Ta bort gren"
#: lib/branch_delete.tcl:20
#: lib/branch_delete.tcl:21
msgid "Delete Local Branch"
msgstr "Ta bort lokal gren"
#: lib/branch_delete.tcl:37
#: lib/branch_delete.tcl:39
msgid "Local Branches"
msgstr "Lokala grenar"
#: lib/branch_delete.tcl:52
#: lib/branch_delete.tcl:51
msgid "Delete Only If Merged Into"
msgstr "Ta bara bort om sammanslagen med"
#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
#: lib/branch_delete.tcl:53 lib/remote_branch_delete.tcl:120
msgid "Always (Do not perform merge checks)"
msgstr "Alltid (utför inte sammanslagningstest)"
@ -809,7 +809,7 @@ msgstr "Alltid (utför inte sammanslagningstest)"
msgid "The following branches are not completely merged into %s:"
msgstr "Följande grenar är inte till fullo sammanslagna med %s:"
#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:218
msgid ""
"Recovering deleted branches is difficult.\n"
"\n"
@ -828,32 +828,32 @@ msgstr ""
"Kunde inte ta bort grenar:\n"
"%s"
#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
#: lib/branch_rename.tcl:15 lib/branch_rename.tcl:23
msgid "Rename Branch"
msgstr "Byt namn på gren"
#: lib/branch_rename.tcl:26
#: lib/branch_rename.tcl:28
msgid "Rename"
msgstr "Byt namn"
#: lib/branch_rename.tcl:36
#: lib/branch_rename.tcl:38
msgid "Branch:"
msgstr "Gren:"
#: lib/branch_rename.tcl:39
#: lib/branch_rename.tcl:46
msgid "New Name:"
msgstr "Nytt namn:"
#: lib/branch_rename.tcl:75
#: lib/branch_rename.tcl:81
msgid "Please select a branch to rename."
msgstr "Välj en gren att byta namn på."
#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
#: lib/branch_rename.tcl:102 lib/checkout_op.tcl:202
#, tcl-format
msgid "Branch '%s' already exists."
msgstr "Grenen \"%s\" finns redan."
#: lib/branch_rename.tcl:117
#: lib/branch_rename.tcl:123
#, tcl-format
msgid "Failed to rename '%s'."
msgstr "Kunde inte byta namn på \"%s\"."
@ -862,7 +862,7 @@ msgstr "Kunde inte byta namn på \"%s\"."
msgid "Starting..."
msgstr "Startar..."
#: lib/browser.tcl:26
#: lib/browser.tcl:27
msgid "File Browser"
msgstr "Filbläddrare"
@ -875,13 +875,13 @@ msgstr "Läser %s..."
msgid "[Up To Parent]"
msgstr "[Upp till förälder]"
#: lib/browser.tcl:267 lib/browser.tcl:273
#: lib/browser.tcl:269 lib/browser.tcl:276
msgid "Browse Branch Files"
msgstr "Bläddra filer på grenen"
#: lib/browser.tcl:278 lib/choose_repository.tcl:398
#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
#: lib/choose_repository.tcl:1028
#: lib/browser.tcl:282 lib/choose_repository.tcl:404
#: lib/choose_repository.tcl:491 lib/choose_repository.tcl:500
#: lib/choose_repository.tcl:1027
msgid "Browse"
msgstr "Bläddra"
@ -895,8 +895,8 @@ msgstr "Hämtar %s från %s"
msgid "fatal: Cannot resolve %s"
msgstr "ödesdigert: Kunde inte slå upp %s"
#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
#: lib/sshkey.tcl:53
#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:30
#: lib/sshkey.tcl:55
msgid "Close"
msgstr "Stäng"
@ -1008,7 +1008,7 @@ msgstr "Det kanske inte är så enkelt att återskapa förlorade incheckningar."
msgid "Reset '%s'?"
msgstr "Återställa \"%s\"?"
#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:336
msgid "Visualize"
msgstr "Visualisera"
@ -1029,23 +1029,23 @@ msgstr ""
"\n"
"Detta skulle inte ha hänt. %s kommer nu stängas och ge upp."
#: lib/choose_font.tcl:39
#: lib/choose_font.tcl:41
msgid "Select"
msgstr "Välj"
#: lib/choose_font.tcl:53
#: lib/choose_font.tcl:55
msgid "Font Family"
msgstr "Teckensnittsfamilj"
#: lib/choose_font.tcl:74
#: lib/choose_font.tcl:76
msgid "Font Size"
msgstr "Storlek"
#: lib/choose_font.tcl:91
#: lib/choose_font.tcl:93
msgid "Font Example"
msgstr "Exempel"
#: lib/choose_font.tcl:103
#: lib/choose_font.tcl:105
msgid ""
"This is example text.\n"
"If you like this text, it can be your font."
@ -1057,7 +1057,7 @@ msgstr ""
msgid "Git Gui"
msgstr "Git Gui"
#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:394
msgid "Create New Repository"
msgstr "Skapa nytt arkiv"
@ -1065,76 +1065,76 @@ msgstr "Skapa nytt arkiv"
msgid "New..."
msgstr "Nytt..."
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:478
msgid "Clone Existing Repository"
msgstr "Klona befintligt arkiv"
#: lib/choose_repository.tcl:106
#: lib/choose_repository.tcl:111
msgid "Clone..."
msgstr "Klona..."
#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
#: lib/choose_repository.tcl:118 lib/choose_repository.tcl:1017
msgid "Open Existing Repository"
msgstr "Öppna befintligt arkiv"
#: lib/choose_repository.tcl:119
#: lib/choose_repository.tcl:124
msgid "Open..."
msgstr "Öppna..."
#: lib/choose_repository.tcl:132
#: lib/choose_repository.tcl:137
msgid "Recent Repositories"
msgstr "Senaste arkiven"
#: lib/choose_repository.tcl:138
#: lib/choose_repository.tcl:143
msgid "Open Recent Repository:"
msgstr "Öppna tidigare arkiv:"
#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
#: lib/choose_repository.tcl:320
#: lib/choose_repository.tcl:313 lib/choose_repository.tcl:320
#: lib/choose_repository.tcl:327
#, tcl-format
msgid "Failed to create repository %s:"
msgstr "Kunde inte skapa arkivet %s:"
#: lib/choose_repository.tcl:391
#: lib/choose_repository.tcl:399
msgid "Directory:"
msgstr "Katalog:"
#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
#: lib/choose_repository.tcl:1052
#: lib/choose_repository.tcl:429 lib/choose_repository.tcl:550
#: lib/choose_repository.tcl:1051
msgid "Git Repository"
msgstr "Gitarkiv"
#: lib/choose_repository.tcl:448
#: lib/choose_repository.tcl:454
#, tcl-format
msgid "Directory %s already exists."
msgstr "Katalogen %s finns redan."
#: lib/choose_repository.tcl:452
#: lib/choose_repository.tcl:458
#, tcl-format
msgid "File %s already exists."
msgstr "Filen %s finns redan."
#: lib/choose_repository.tcl:466
#: lib/choose_repository.tcl:473
msgid "Clone"
msgstr "Klona"
#: lib/choose_repository.tcl:479
#: lib/choose_repository.tcl:486
msgid "Source Location:"
msgstr "Plats för källkod:"
#: lib/choose_repository.tcl:490
#: lib/choose_repository.tcl:495
msgid "Target Directory:"
msgstr "Målkatalog:"
#: lib/choose_repository.tcl:502
#: lib/choose_repository.tcl:505
msgid "Clone Type:"
msgstr "Typ av klon:"
#: lib/choose_repository.tcl:508
#: lib/choose_repository.tcl:510
msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
msgstr "Standard (snabb, semiredundant, hårda länkar)"
#: lib/choose_repository.tcl:514
#: lib/choose_repository.tcl:515
msgid "Full Copy (Slower, Redundant Backup)"
msgstr "Full kopia (långsammare, redundant säkerhetskopia)"
@ -1144,7 +1144,7 @@ msgstr "Delad (snabbast, rekommenderas ej, ingen säkerhetskopia)"
#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
#: lib/choose_repository.tcl:1057 lib/choose_repository.tcl:1065
#, tcl-format
msgid "Not a Git repository: %s"
msgstr "Inte ett Gitarkiv: %s"
@ -1258,8 +1258,8 @@ msgstr "Kunde inte slå upp %s till någon incheckning."
msgid "Creating working directory"
msgstr "Skapar arbetskatalog"
#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
#: lib/index.tcl:198
#: lib/choose_repository.tcl:939 lib/index.tcl:70 lib/index.tcl:133
#: lib/index.tcl:201
msgid "files"
msgstr "filer"
@ -1267,20 +1267,20 @@ msgstr "filer"
msgid "Initial file checkout failed."
msgstr "Inledande filutcheckning misslyckades."
#: lib/choose_repository.tcl:1011
#: lib/choose_repository.tcl:1012
msgid "Open"
msgstr "Öppna"
#: lib/choose_repository.tcl:1021
#: lib/choose_repository.tcl:1022
msgid "Repository:"
msgstr "Arkiv:"
#: lib/choose_repository.tcl:1072
#: lib/choose_repository.tcl:1071
#, tcl-format
msgid "Failed to open repository %s:"
msgstr "Kunde inte öppna arkivet %s:"
#: lib/choose_rev.tcl:53
#: lib/choose_rev.tcl:52
msgid "This Detached Checkout"
msgstr "Denna frånkopplade utcheckning"
@ -1288,36 +1288,36 @@ msgstr "Denna frånkopplade utcheckning"
msgid "Revision Expression:"
msgstr "Revisionsuttryck:"
#: lib/choose_rev.tcl:74
#: lib/choose_rev.tcl:72
msgid "Local Branch"
msgstr "Lokal gren"
#: lib/choose_rev.tcl:79
#: lib/choose_rev.tcl:77
msgid "Tracking Branch"
msgstr "Spårande gren"
#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:543
msgid "Tag"
msgstr "Tagg"
#: lib/choose_rev.tcl:317
#: lib/choose_rev.tcl:321
#, tcl-format
msgid "Invalid revision: %s"
msgstr "Ogiltig revision: %s"
#: lib/choose_rev.tcl:338
#: lib/choose_rev.tcl:342
msgid "No revision selected."
msgstr "Ingen revision vald."
#: lib/choose_rev.tcl:346
#: lib/choose_rev.tcl:350
msgid "Revision expression is empty."
msgstr "Revisionsuttrycket är tomt."
#: lib/choose_rev.tcl:531
#: lib/choose_rev.tcl:536
msgid "Updated"
msgstr "Uppdaterad"
#: lib/choose_rev.tcl:559
#: lib/choose_rev.tcl:564
msgid "URL"
msgstr "Webbadress"
@ -1508,31 +1508,31 @@ msgstr "Lyckades"
msgid "Error: Command Failed"
msgstr "Fel: Kommando misslyckades"
#: lib/database.tcl:43
#: lib/database.tcl:42
msgid "Number of loose objects"
msgstr "Antal lösa objekt"
#: lib/database.tcl:44
#: lib/database.tcl:43
msgid "Disk space used by loose objects"
msgstr "Diskutrymme använt av lösa objekt"
#: lib/database.tcl:45
#: lib/database.tcl:44
msgid "Number of packed objects"
msgstr "Antal packade objekt"
#: lib/database.tcl:46
#: lib/database.tcl:45
msgid "Number of packs"
msgstr "Antal paket"
#: lib/database.tcl:47
#: lib/database.tcl:46
msgid "Disk space used by packed objects"
msgstr "Diskutrymme använt av packade objekt"
#: lib/database.tcl:48
#: lib/database.tcl:47
msgid "Packed objects waiting for pruning"
msgstr "Packade objekt som väntar på städning"
#: lib/database.tcl:49
#: lib/database.tcl:48
msgid "Garbage files"
msgstr "Skräpfiler"
@ -1618,7 +1618,7 @@ msgstr "LOKAL:\n"
msgid "REMOTE:\n"
msgstr "FJÄRR:\n"
#: lib/diff.tcl:202 lib/diff.tcl:319
#: lib/diff.tcl:202 lib/diff.tcl:322
#, tcl-format
msgid "Unable to display %s"
msgstr "Kan inte visa %s"
@ -1655,19 +1655,19 @@ msgstr ""
"* Den ospårade filen klipptes här av %s.\n"
"* För att se hela filen, använd ett externt redigeringsprogram.\n"
#: lib/diff.tcl:482
#: lib/diff.tcl:485
msgid "Failed to unstage selected hunk."
msgstr "Kunde inte ta bort den valda delen från kön."
#: lib/diff.tcl:489
#: lib/diff.tcl:492
msgid "Failed to stage selected hunk."
msgstr "Kunde inte lägga till den valda delen till kön."
#: lib/diff.tcl:568
#: lib/diff.tcl:571
msgid "Failed to unstage selected line."
msgstr "Kunde inte ta bort den valda raden från kön."
#: lib/diff.tcl:576
#: lib/diff.tcl:579
msgid "Failed to stage selected line."
msgstr "Kunde inte lägga till den valda raden till kön."
@ -1684,7 +1684,7 @@ msgstr "Systemets (%s)"
msgid "Other"
msgstr "Annan"
#: lib/error.tcl:20 lib/error.tcl:114
#: lib/error.tcl:20 lib/error.tcl:116
msgid "error"
msgstr "fel"
@ -1692,7 +1692,7 @@ msgstr "fel"
msgid "warning"
msgstr "varning"
#: lib/error.tcl:94
#: lib/error.tcl:96
msgid "You must correct the above errors before committing."
msgstr "Du måste rätta till felen ovan innan du checkar in."
@ -1700,11 +1700,11 @@ msgstr "Du måste rätta till felen ovan innan du checkar in."
msgid "Unable to unlock the index."
msgstr "Kunde inte låsa upp indexet."
#: lib/index.tcl:15
#: lib/index.tcl:17
msgid "Index Error"
msgstr "Indexfel"
#: lib/index.tcl:17
#: lib/index.tcl:19
msgid ""
"Updating the Git index failed. A rescan will be automatically started to "
"resynchronize git-gui."
@ -1712,52 +1712,52 @@ msgstr ""
"Misslyckades med att uppdatera Gitindexet. En omsökning kommer att startas "
"automatiskt för att synkronisera om git-gui."
#: lib/index.tcl:28
#: lib/index.tcl:30
msgid "Continue"
msgstr "Forstätt"
#: lib/index.tcl:31
#: lib/index.tcl:33
msgid "Unlock Index"
msgstr "Lås upp index"
#: lib/index.tcl:289
#: lib/index.tcl:292
#, tcl-format
msgid "Unstaging %s from commit"
msgstr "Tar bort %s för incheckningskön"
#: lib/index.tcl:328
#: lib/index.tcl:331
msgid "Ready to commit."
msgstr "Redo att checka in."
#: lib/index.tcl:341
#: lib/index.tcl:344
#, tcl-format
msgid "Adding %s"
msgstr "Lägger till %s"
#: lib/index.tcl:398
#: lib/index.tcl:401
#, tcl-format
msgid "Revert changes in file %s?"
msgstr "Återställ ändringarna i filen %s?"
#: lib/index.tcl:400
#: lib/index.tcl:403
#, tcl-format
msgid "Revert changes in these %i files?"
msgstr "Återställ ändringarna i dessa %i filer?"
#: lib/index.tcl:408
#: lib/index.tcl:411
msgid "Any unstaged changes will be permanently lost by the revert."
msgstr ""
"Alla oköade ändringar kommer permanent gå förlorade vid återställningen."
#: lib/index.tcl:411
#: lib/index.tcl:414
msgid "Do Nothing"
msgstr "Gör ingenting"
#: lib/index.tcl:429
#: lib/index.tcl:432
msgid "Reverting selected files"
msgstr "Återställer valda filer"
#: lib/index.tcl:433
#: lib/index.tcl:436
#, tcl-format
msgid "Reverting %s"
msgstr "Återställer %s"
@ -2004,116 +2004,266 @@ msgstr "Den globala teckenkodningen \"%s\" är ogiltig"
msgid "Invalid repo encoding '%s'"
msgstr "Arkivets teckenkodning \"%s\" är ogiltig"
#: lib/option.tcl:117
#: lib/option.tcl:119
msgid "Restore Defaults"
msgstr "Återställ standardvärden"
#: lib/option.tcl:121
#: lib/option.tcl:123
msgid "Save"
msgstr "Spara"
#: lib/option.tcl:131
#: lib/option.tcl:133
#, tcl-format
msgid "%s Repository"
msgstr "Arkivet %s"
#: lib/option.tcl:132
#: lib/option.tcl:134
msgid "Global (All Repositories)"
msgstr "Globalt (alla arkiv)"
#: lib/option.tcl:138
#: lib/option.tcl:140
msgid "User Name"
msgstr "Användarnamn"
#: lib/option.tcl:139
#: lib/option.tcl:141
msgid "Email Address"
msgstr "E-postadress"
#: lib/option.tcl:141
#: lib/option.tcl:143
msgid "Summarize Merge Commits"
msgstr "Summera sammanslagningsincheckningar"
#: lib/option.tcl:142
#: lib/option.tcl:144
msgid "Merge Verbosity"
msgstr "Pratsamhet för sammanslagningar"
#: lib/option.tcl:143
#: lib/option.tcl:145
msgid "Show Diffstat After Merge"
msgstr "Visa diffstatistik efter sammanslagning"
#: lib/option.tcl:144
#: lib/option.tcl:146
msgid "Use Merge Tool"
msgstr "Använd verktyg för sammanslagning"
#: lib/option.tcl:146
#: lib/option.tcl:148
msgid "Trust File Modification Timestamps"
msgstr "Lita på filändringstidsstämplar"
#: lib/option.tcl:147
#: lib/option.tcl:149
msgid "Prune Tracking Branches During Fetch"
msgstr "Städa spårade grenar vid hämtning"
#: lib/option.tcl:148
#: lib/option.tcl:150
msgid "Match Tracking Branches"
msgstr "Matcha spårade grenar"
#: lib/option.tcl:149
#: lib/option.tcl:151
msgid "Use Textconv For Diffs and Blames"
msgstr "Använd Textconv för diff och klandring"
#: lib/option.tcl:152
msgid "Blame Copy Only On Changed Files"
msgstr "Klandra kopiering bara i ändrade filer"
#: lib/option.tcl:150
#: lib/option.tcl:153
msgid "Minimum Letters To Blame Copy On"
msgstr "Minsta antal tecken att klandra kopiering för"
#: lib/option.tcl:151
#: lib/option.tcl:154
msgid "Blame History Context Radius (days)"
msgstr "Historikradie för klandring (dagar)"
#: lib/option.tcl:152
#: lib/option.tcl:155
msgid "Number of Diff Context Lines"
msgstr "Antal rader sammanhang i differenser"
#: lib/option.tcl:153
#: lib/option.tcl:156
msgid "Commit Message Text Width"
msgstr "Textbredd för incheckningsmeddelande"
#: lib/option.tcl:154
#: lib/option.tcl:157
msgid "New Branch Name Template"
msgstr "Mall för namn på nya grenar"
#: lib/option.tcl:155
#: lib/option.tcl:158
msgid "Default File Contents Encoding"
msgstr "Standardteckenkodning för filinnehåll"
#: lib/option.tcl:203
#: lib/option.tcl:204
msgid "Change"
msgstr "Ändra"