From 0013251fe217b882bc4fd5a40b732baebfad02fb Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Thu, 2 Apr 2015 15:05:06 -0600 Subject: gitk: Fix bad English grammar "Matches none Commit Info" Signed-off-by: Alex Henrie Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 9a2daf3..30fcd30 100755 --- a/gitk +++ b/gitk @@ -4066,7 +4066,7 @@ set known_view_options { {committer t15 . "--committer=*" {mc "Committer:"}} {loginfo t15 .. "--grep=*" {mc "Commit Message:"}} {allmatch b .. "--all-match" {mc "Matches all Commit Info criteria"}} - {igrep b .. "--invert-grep" {mc "Matches none Commit Info criteria"}} + {igrep b .. "--invert-grep" {mc "Matches no Commit Info criteria"}} {changes_l l + {} {mc "Changes to Files:"}} {pickaxe_s r0 . {} {mc "Fixed String"}} {pickaxe_t r1 . "--pickaxe-regex" {mc "Regular Expression"}} -- cgit v0.10.2-6-g49f6 From c47f86c56a371cd8d439c10d19baf92e6e6d5545 Mon Sep 17 00:00:00 2001 From: Peter Krefting Date: Fri, 27 Mar 2015 10:32:36 +0100 Subject: gitk: sv.po: Update Swedish translation (305t0f0u) Signed-off-by: Peter Krefting Signed-off-by: Paul Mackerras diff --git a/po/sv.po b/po/sv.po index 0994d87..9dbb779 100644 --- a/po/sv.po +++ b/po/sv.po @@ -3,20 +3,22 @@ # This file is distributed under the same license as the gitk package. # # Mikael Magnusson , 2008. -# Peter Krefting , 2008, 2009, 2010, 2012, 2013. +# Peter Krefting , 2008, 2009, 2010, 2012, 2013, 2015. # msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-03-15 14:37+1100\n" -"PO-Revision-Date: 2013-05-16 08:12+0100\n" +"PO-Revision-Date: 2015-03-27 10:31+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "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" #: gitk:140 msgid "Couldn't get list of unmerged files:" @@ -352,7 +354,6 @@ msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" #: gitk:3011 -#, fuzzy msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -364,7 +365,23 @@ msgstr "" "\n" "Gitk - en incheckningsvisare för git\n" "\n" -"Copyright ©9 2005-2011 Paul Mackerras\n" +"Copyright © 2005-2014 Paul Mackerras\n" +"\n" +"Använd och vidareförmedla enligt villkoren i GNU General Public License" + +#: gitk:3011 +msgid "" +"\n" +"Gitk - a commit viewer for git\n" +"\n" +"Copyright © 2005-2015 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-2015 Paul Mackerras\n" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" @@ -417,7 +434,7 @@ msgstr ", x, l\tGå framåt i historiken" #: gitk:3053 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan" #: gitk:3054 msgid "\tMove up one page in commit list" @@ -653,9 +670,8 @@ msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" #: gitk:4069 -#, fuzzy msgid "Matches none Commit Info criteria" -msgstr "Motsvarar alla kriterier för incheckningsinfo" +msgstr "Motsvarar inga kriterier för incheckningsinfo" #: gitk:4070 msgid "Changes to Files:" -- cgit v0.10.2-6-g49f6 From 157c8e3ddfd3d44805bb5ed02805bc484edc8670 Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Mon, 23 Mar 2015 10:18:16 -0400 Subject: gitk: Rearrange window title to be more conventional Signed-off-by: Marc Branchaud Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 30fcd30..24b3c74 100755 --- a/gitk +++ b/gitk @@ -12393,7 +12393,7 @@ catch { } # wait for the window to become visible tkwait visibility . -wm title . "$appname: [reponame]" +wm title . "[reponame] - $appname" update readrefs -- cgit v0.10.2-6-g49f6 From 009409fe72e53ce5a3c7cf6802d7e068632e68e8 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sat, 2 May 2015 20:53:36 +1000 Subject: gitk: Replace catch {unset foo} with unset -nocomplain foo This generates better bytecode in Tcl 8.6 according to http://wiki.tcl.tk/1506. Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 24b3c74..07bdff6 100755 --- a/gitk +++ b/gitk @@ -600,18 +600,18 @@ proc reloadcommits {} { } resetvarcs $curview set selectedline {} - catch {unset currentid} - catch {unset thickerline} - catch {unset treediffs} + unset -nocomplain currentid + unset -nocomplain thickerline + unset -nocomplain treediffs readrefs changedrefs if {$showneartags} { getallcommits } clear_display - catch {unset commitinterest} - catch {unset cached_commitrow} - catch {unset targetid} + unset -nocomplain commitinterest + unset -nocomplain cached_commitrow + unset -nocomplain targetid setcanvscroll getcommits $selid return 0 @@ -673,7 +673,7 @@ proc resetvarcs {view} { foreach vd [array names vseedcount $view,*] { unset vseedcount($vd) } - catch {unset ordertok} + unset -nocomplain ordertok } # returns a list of the commits with no children @@ -966,7 +966,7 @@ proc insertrow {id p v} { set vp $v,$p if {[llength [lappend children($vp) $id]] > 1} { set children($vp) [lsort -command [list vtokcmp $v] $children($vp)] - catch {unset ordertok} + unset -nocomplain ordertok } fix_reversal $p $a $v incr commitidx($v) @@ -1136,7 +1136,7 @@ proc update_arcrows {v} { set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]] set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]] } - catch {unset cached_commitrow} + unset -nocomplain cached_commitrow } set narctot [expr {[llength $varctok($v)] - 1}] set a $varcmod($v) @@ -1579,7 +1579,7 @@ proc getcommitlines {fd inst view updating} { [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} { set children($vp) [lsort -command [list vtokcmp $view] \ $children($vp)] - catch {unset ordertok} + unset -nocomplain ordertok } if {[info exists varcid($view,$p)]} { fix_reversal $p $a $view @@ -1778,7 +1778,7 @@ proc readrefs {} { global hideremotes foreach v {tagids idtags headids idheads otherrefids idotherrefs} { - catch {unset $v} + unset -nocomplain $v } set refd [open [list | git show-ref -d] r] while {[gets $refd line] >= 0} { @@ -3389,7 +3389,7 @@ proc init_flist {first} { set cflist_top 1 $cflist tag add highlight 1.0 "1.0 lineend" } else { - catch {unset cflist_top} + unset -nocomplain cflist_top } $cflist conf -state disabled set difffilestart {} @@ -4438,15 +4438,15 @@ proc showview {n} { } unselectline normalline - catch {unset treediffs} + unset -nocomplain treediffs clear_display if {[info exists hlview] && $hlview == $n} { unset hlview set selectedhlview [mc "None"] } - catch {unset commitinterest} - catch {unset cached_commitrow} - catch {unset ordertok} + unset -nocomplain commitinterest + unset -nocomplain cached_commitrow + unset -nocomplain ordertok set curview $n set selectedview $n @@ -4466,8 +4466,8 @@ proc showview {n} { set rowfinal {} set numcommits $commitidx($n) - catch {unset colormap} - catch {unset rowtextx} + unset -nocomplain colormap + unset -nocomplain rowtextx set nextcolor 0 set canvxmax [$canv cget -width] set curview $n @@ -4601,7 +4601,7 @@ proc delvhighlight {} { if {![info exists hlview]} return unset hlview - catch {unset vhighlights} + unset -nocomplain vhighlights unbolden } @@ -4649,7 +4649,7 @@ proc hfiles_change {} { # delete previous highlights catch {close $filehighlight} unset filehighlight - catch {unset fhighlights} + unset -nocomplain fhighlights unbolden unhighlight_filelist } @@ -4710,7 +4710,7 @@ proc findcom_change args { bolden_name $id mainfont } set boldnameids {} - catch {unset nhighlights} + unset -nocomplain nhighlights unbolden unmarkmatches if {$gdttype ne [mc "containing:"] || $findstring eq {}} { @@ -4913,9 +4913,9 @@ proc rhighlight_sel {a} { global descendent desc_todo ancestor anc_todo global highlight_related - catch {unset descendent} + unset -nocomplain descendent set desc_todo [list $a] - catch {unset ancestor} + unset -nocomplain ancestor set anc_todo [list $a] if {$highlight_related ne [mc "None"]} { rhighlight_none @@ -4926,7 +4926,7 @@ proc rhighlight_sel {a} { proc rhighlight_none {} { global rhighlights - catch {unset rhighlights} + unset -nocomplain rhighlights unbolden } @@ -5134,8 +5134,8 @@ proc initlayout {} { set rowisopt {} set rowfinal {} set canvxmax [$canv cget -width] - catch {unset colormap} - catch {unset rowtextx} + unset -nocomplain colormap + unset -nocomplain rowtextx setcanvscroll } @@ -6368,17 +6368,17 @@ proc clear_display {} { global linehtag linentag linedtag boldids boldnameids allcanvs delete all - catch {unset iddrawn} - catch {unset linesegs} - catch {unset linehtag} - catch {unset linentag} - catch {unset linedtag} + unset -nocomplain iddrawn + unset -nocomplain linesegs + unset -nocomplain linehtag + unset -nocomplain linentag + unset -nocomplain linedtag set boldids {} set boldnameids {} - catch {unset vhighlights} - catch {unset fhighlights} - catch {unset nhighlights} - catch {unset rhighlights} + unset -nocomplain vhighlights + unset -nocomplain fhighlights + unset -nocomplain nhighlights + unset -nocomplain rhighlights set need_redisplay 0 set nrows_drawn 0 } @@ -7226,7 +7226,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} { global autoselect autosellen jump_to_here global vinlinediff - catch {unset pending_select} + unset -nocomplain pending_select $canv delete hover normalline unsel_reflist @@ -7424,7 +7424,7 @@ proc unselectline {} { global selectedline currentid set selectedline {} - catch {unset currentid} + unset -nocomplain currentid allcanvs delete secsel rhighlight_none } @@ -7480,7 +7480,7 @@ proc unset_posvars {} { if {[info exists last_posvars]} { foreach {var val} $last_posvars { global $var - catch {unset $var} + unset -nocomplain $var } unset last_posvars } @@ -7548,7 +7548,7 @@ proc gettree {id} { global nullid nullid2 set diffids $id - catch {unset diffmergeid} + unset -nocomplain diffmergeid if {![info exists treefilelist($id)]} { if {![info exists treepending]} { if {$id eq $nullid} { @@ -7704,7 +7704,7 @@ proc startdiff {ids} { settabs 1 set diffids $ids - catch {unset diffmergeid} + unset -nocomplain diffmergeid if {![info exists treediffs($ids)] || [lsearch -exact $ids $nullid] >= 0 || [lsearch -exact $ids $nullid2] >= 0} { @@ -8325,7 +8325,7 @@ proc clear_ctext {{first 1.0}} { } $ctext delete $first end if {$first eq "1.0"} { - catch {unset pendinglinks} + unset -nocomplain pendinglinks } set ctext_file_names {} set ctext_file_lines {} @@ -8501,7 +8501,7 @@ proc scrolltext {f0 f1} { highlightfile_for_scrollpos $topidx } - catch {unset suppress_highlighting_file_for_this_scrollpos} + unset -nocomplain suppress_highlighting_file_for_this_scrollpos .bleft.bottom.sb set $f0 $f1 if {$searchstring ne {}} { @@ -10103,9 +10103,9 @@ proc getallclines {fd} { } if {$nid > 0} { global cached_dheads cached_dtags cached_atags - catch {unset cached_dheads} - catch {unset cached_dtags} - catch {unset cached_atags} + unset -nocomplain cached_dheads + unset -nocomplain cached_dtags + unset -nocomplain cached_atags } if {![eof $fd]} { return [expr {$nid >= 1000? 2: 1}] @@ -10345,7 +10345,7 @@ proc dropcache {err} { foreach v {arcnos arcout arcids arcstart arcend growing \ arctags archeads allparents allchildren} { global $v - catch {unset $v} + unset -nocomplain $v } set allcwait 0 set nextarc 0 @@ -10996,8 +10996,8 @@ proc addedtag {id} { if {![info exists arcout($id)]} { recalcarc [lindex $arcnos($id) 0] } - catch {unset cached_dtags} - catch {unset cached_atags} + unset -nocomplain cached_dtags + unset -nocomplain cached_atags } proc addedhead {hid head} { @@ -11007,13 +11007,13 @@ proc addedhead {hid head} { if {![info exists arcout($hid)]} { recalcarc [lindex $arcnos($hid) 0] } - catch {unset cached_dheads} + unset -nocomplain cached_dheads } proc removedhead {hid head} { global cached_dheads - catch {unset cached_dheads} + unset -nocomplain cached_dheads } proc movedhead {hid head} { @@ -11023,7 +11023,7 @@ proc movedhead {hid head} { if {![info exists arcout($hid)]} { recalcarc [lindex $arcnos($hid) 0] } - catch {unset cached_dheads} + unset -nocomplain cached_dheads } proc changedrefs {} { @@ -11039,10 +11039,10 @@ proc changedrefs {} { } } } - catch {unset cached_tagcontent} - catch {unset cached_dtags} - catch {unset cached_atags} - catch {unset cached_dheads} + unset -nocomplain cached_tagcontent + unset -nocomplain cached_dtags + unset -nocomplain cached_atags + unset -nocomplain cached_dheads } proc rereadrefs {} { @@ -11628,7 +11628,7 @@ proc prefsok {} { ($perfile_attrs && !$oldprefs(perfile_attrs))} { # treediffs elements are limited by path; # won't have encodings cached if perfile_attrs was just turned on - catch {unset treediffs} + unset -nocomplain treediffs } if {$fontchanged || $maxwidth != $oldprefs(maxwidth) || $maxgraphpct != $oldprefs(maxgraphpct)} { -- cgit v0.10.2-6-g49f6 From eb859df85e480ae4aa76a0d8358054b10d91749c Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sun, 3 May 2015 15:11:29 +1000 Subject: gitk: Fix error when changing colors after closing "List references" window This fixes an error that manifests itself if the user opens the "List references" window and the closes it, and subsequently opens the Preferences window and changes one of the colors. When the user clicks OK, and error popup appears with the message: Error: invalid command name ".showrefs.list" This is because .showrefs.list was added to the list of windows to be notified on foreground/background color changes, but the window no longer exists. We fix the bug by checking whether the window exists before trying to change its colors. As an optimization, we also avoid adding the .showrefs.list window to the list a second time. Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 07bdff6..c186704 100755 --- a/gitk +++ b/gitk @@ -9819,8 +9819,10 @@ proc showrefs {} { -width 30 -height 20 -cursor $maincursor \ -spacing1 1 -spacing3 1 -state disabled $top.list tag configure highlight -background $selectbgcolor - lappend bglist $top.list - lappend fglist $top.list + if {![lsearch -exact $bglist $top.list]} { + lappend bglist $top.list + lappend fglist $top.list + } ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal grid $top.list $top.ysb -sticky nsew @@ -11532,7 +11534,9 @@ proc choosecolor {v vi w x cmd} { proc setselbg {c} { global bglist cflist foreach w $bglist { - $w configure -selectbackground $c + if {[winfo exists $w]} { + $w configure -selectbackground $c + } } $cflist tag configure highlight \ -background [$cflist cget -selectbackground] @@ -11558,7 +11562,9 @@ proc setbg {c} { global bglist foreach w $bglist { - $w conf -background $c + if {[winfo exists $w]} { + $w conf -background $c + } } } @@ -11566,7 +11572,9 @@ proc setfg {c} { global fglist canv foreach w $fglist { - $w conf -foreground $c + if {[winfo exists $w]} { + $w conf -foreground $c + } } allcanvs itemconf text -fill $c $canv itemconf circle -outline $c -- cgit v0.10.2-6-g49f6 From ef87a4801a8732bd60b4f96ce1f8d66ca2bdf2f1 Mon Sep 17 00:00:00 2001 From: Alex Henrie Date: Mon, 11 May 2015 13:26:41 -0600 Subject: gitk: Remove mc parameter from proc show_error This is a better fix for 8d849957d81fc0480a52570d66cc3c2a688ecb1b. This new fix makes the strings "Sorry, gitk cannot run..." and "OK" translatable and the string "mc" not translatable. It will take effect the next time `make update-po` is run. msgcat is now imported before the Tcl/Tk version check so that the mc function is available even if the version check fails. This should not be a problem because msgcat and ::msgcat::mc were officially added in Tcl 8.1 (released April 29, 1999) and we are not trying to support versions of Tcl older than that. Signed-off-by: Alex Henrie Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index c186704..78baeb5 100755 --- a/gitk +++ b/gitk @@ -1894,13 +1894,13 @@ proc make_transient {window origin} { } } -proc show_error {w top msg {mc mc}} { +proc show_error {w top msg} { global NS if {![info exists NS]} {set NS ""} if {[wm state $top] eq "withdrawn"} { wm deiconify $top } message $w.m -text $msg -justify center -aspect 400 pack $w.m -side top -fill x -padx 20 -pady 20 - ${NS}::button $w.ok -default active -text [$mc OK] -command "destroy $top" + ${NS}::button $w.ok -default active -text [mc OK] -command "destroy $top" pack $w.ok -side bottom -fill x bind $top "grab $top; focus $top" bind $top "destroy $top" @@ -12016,10 +12016,29 @@ proc get_path_encoding {path} { return $tcl_enc } +## For msgcat loading, first locate the installation location. +if { [info exists ::env(GITK_MSGSDIR)] } { + ## Msgsdir was manually set in the environment. + set gitk_msgsdir $::env(GITK_MSGSDIR) +} else { + ## Let's guess the prefix from argv0. + set gitk_prefix [file dirname [file dirname [file normalize $argv0]]] + set gitk_libdir [file join $gitk_prefix share gitk lib] + set gitk_msgsdir [file join $gitk_libdir msgs] + unset gitk_prefix +} + +## Internationalization (i18n) through msgcat and gettext. See +## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html +package require msgcat +namespace import ::msgcat::mc +## And eventually load the actual message catalog +::msgcat::mcload $gitk_msgsdir + # First check that Tcl/Tk is recent enough if {[catch {package require Tk 8.4} err]} { - show_error {} . "Sorry, gitk cannot run with this version of Tcl/Tk.\n\ - Gitk requires at least Tcl/Tk 8.4." list + show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\ + Gitk requires at least Tcl/Tk 8.4."] exit 1 } @@ -12169,25 +12188,6 @@ if {[tk windowingsystem] eq "aqua"} { set ctxbut } -## For msgcat loading, first locate the installation location. -if { [info exists ::env(GITK_MSGSDIR)] } { - ## Msgsdir was manually set in the environment. - set gitk_msgsdir $::env(GITK_MSGSDIR) -} else { - ## Let's guess the prefix from argv0. - set gitk_prefix [file dirname [file dirname [file normalize $argv0]]] - set gitk_libdir [file join $gitk_prefix share gitk lib] - set gitk_msgsdir [file join $gitk_libdir msgs] - unset gitk_prefix -} - -## Internationalization (i18n) through msgcat and gettext. See -## http://www.gnu.org/software/gettext/manual/html_node/Tcl.html -package require msgcat -namespace import ::msgcat::mc -## And eventually load the actual message catalog -::msgcat::mcload $gitk_msgsdir - catch { # follow the XDG base directory specification by default. See # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html -- cgit v0.10.2-6-g49f6 From 427cf16985c77b3c185b06bc8d6d3278ce177181 Mon Sep 17 00:00:00 2001 From: Michael Rappazzo Date: Thu, 7 May 2015 22:29:20 -0400 Subject: gitk: Add mouse right-click options to copy path and branch name This adds menu entries to two of the right-click menus: - 'Copy path' in the file list - 'Copy branch name' on a branch in the commit list Signed-off-by: Michael Rappazzo Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 78baeb5..dc1af41 100755 --- a/gitk +++ b/gitk @@ -2645,6 +2645,7 @@ proc makewindow {} { makemenu $headctxmenu { {mc "Check out this branch" command cobranch} {mc "Remove this branch" command rmbranch} + {mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}} } $headctxmenu configure -tearoff 0 @@ -2655,6 +2656,7 @@ proc makewindow {} { {mc "Highlight this only" command {flist_hl 1}} {mc "External diff" command {external_diff}} {mc "Blame parent commit" command {external_blame 1}} + {mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}} } $flist_menu configure -tearoff 0 -- cgit v0.10.2-6-g49f6 From 9922c5a3340e77c7a3b199f25a49af5fdd7a5ef1 Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Tue, 7 Apr 2015 11:51:51 -0400 Subject: gitk: Show the current view's name in the window title If the current view is the "Command line" view, show the command line arguments instead of the view name. Signed-off-by: Marc Branchaud Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index dc1af41..8c44e83 100755 --- a/gitk +++ b/gitk @@ -4036,6 +4036,19 @@ proc shellsplit {str} { return $l } +proc set_window_title {} { + global appname curview viewname vrevs + set rev [mc "All files"] + if {$curview ne 0} { + if {$viewname($curview) eq [mc "Command line"]} { + set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)] + } else { + set rev $viewname($curview) + } + } + wm title . "[reponame]: $rev - $appname" +} + # Code to implement multiple views proc newview {ishighlight} { @@ -4512,6 +4525,7 @@ proc showview {n} { } elseif {$numcommits == 0} { show_status [mc "No commits selected"] } + set_window_title } # Stuff relating to the highlighting facility @@ -6652,6 +6666,7 @@ proc show_status {msg} { global canv fgcolor clear_display + set_window_title $canv create text 3 3 -anchor nw -text $msg -font mainfont \ -tags text -fill $fgcolor } @@ -12403,7 +12418,7 @@ catch { } # wait for the window to become visible tkwait visibility . -wm title . "[reponame] - $appname" +set_window_title update readrefs -- cgit v0.10.2-6-g49f6 From 0deb5c97217b9d4695f3d09c081e39fee58ed60f Mon Sep 17 00:00:00 2001 From: Ismael Luceno Date: Wed, 15 Apr 2015 13:18:17 -0300 Subject: gitk: Make it easier to go quickly to a specific commit Binds "g" to focus and clear the sha1 entry box. Signed-off-by: Ismael Luceno Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 8c44e83..68c6e70 100755 --- a/gitk +++ b/gitk @@ -2568,6 +2568,7 @@ proc makewindow {} { bindkey b prevfile bindkey d "$ctext yview scroll 18 units" bindkey u "$ctext yview scroll -18 units" + bindkey g {$sha1entry delete 0 end; focus $sha1entry} bindkey / {focus $fstring} bindkey {focus $fstring} bindkey {dofind 1 1} @@ -3071,6 +3072,7 @@ proc keys {} { [mc "<%s-F> Find" $M1T] [mc "<%s-G> Move to next find hit" $M1T] [mc " Move to next find hit"] +[mc "g Go to commit"] [mc "/ Focus the search box"] [mc "? Move to previous find hit"] [mc "f Scroll diff view to next file"] -- cgit v0.10.2-6-g49f6 From 5ee1c99ad17357a2f8a4e0139b5b0e276d17e092 Mon Sep 17 00:00:00 2001 From: Marc Branchaud Date: Tue, 7 Apr 2015 11:53:37 -0400 Subject: gitk: Use translated version of "Command line" in getcommitlines This is needed for getcommitlines to work properly when a language translation is being used. Signed-off-by: Marc Branchaud Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 68c6e70..2cb12bd 100755 --- a/gitk +++ b/gitk @@ -1442,7 +1442,7 @@ proc getcommitlines {fd inst view updating} { if {[string range $err 0 4] == "usage"} { set err "Gitk: error reading commits$fv:\ bad arguments to git log." - if {$viewname($view) eq "Command line"} { + if {$viewname($view) eq [mc "Command line"]} { append err \ " (Note: arguments to gitk are passed to git log\ to allow selection of commits to be displayed.)" -- cgit v0.10.2-6-g49f6 From cbdf203f88075044ecd01affc5b5e37718be1a42 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Tue, 7 Apr 2015 18:33:58 +0300 Subject: gitk: Update Bulgarian translation (304t) Signed-off-by: Alexander Shopov Signed-off-by: Paul Mackerras diff --git a/po/bg.po b/po/bg.po index 1df0716..ddc8e73 100644 --- a/po/bg.po +++ b/po/bg.po @@ -1,15 +1,15 @@ # Bulgarian translation of gitk po-file. -# Copyright (C) 2014 Alexander Shopov . +# Copyright (C) 2014, 2015 Alexander Shopov . # This file is distributed under the same license as the git package. -# Alexander Shopov , 2014. +# Alexander Shopov , 2014, 2015. # # msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" -"PO-Revision-Date: 2014-07-28 07:32+0300\n" +"POT-Creation-Date: 2015-04-07 07:49+0300\n" +"PO-Revision-Date: 2015-04-07 07:54+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -415,7 +415,7 @@ msgstr ", x, l\tНапред в историята" #: gitk:3053 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" +msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята" #: gitk:3054 msgid "\tMove up one page in commit list" @@ -593,7 +593,7 @@ msgstr "Грешка при изпълнението на „git blame“: %s" #: gitk:3921 #, tcl-format msgid "That line comes from commit %s, which is not in this view" -msgstr "Този ред идва от подаването %s, което не е в изгледа" +msgstr "Този ред идва от подаването %s, което не е в изгледа" #: gitk:3935 msgid "External diff viewer failed:" @@ -649,12 +649,11 @@ msgstr "Съобщение при подаване:" #: gitk:4068 msgid "Matches all Commit Info criteria" -msgstr "Съвпадение по коя да е информация за подаването" +msgstr "Съвпадение по всички характеристики на подаването" #: gitk:4069 -#, fuzzy msgid "Matches none Commit Info criteria" -msgstr "Съвпадение по коя да е информация за подаването" +msgstr "Съвпадение по никоя от характеристиките на подаването" #: gitk:4070 msgid "Changes to Files:" -- cgit v0.10.2-6-g49f6 From 9c11578b00732e4cdb1398c49a3615fd187cfc40 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Sun, 17 May 2015 14:33:26 +1000 Subject: gitk: Update .po files Signed-off-by: Paul Mackerras diff --git a/po/bg.po b/po/bg.po index ddc8e73..c4246bf 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-04-07 07:49+0300\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-04-07 07:54+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" @@ -26,7 +26,7 @@ msgstr "Списъкът с неслети файлове не може да б msgid "Color words" msgstr "Оцветяване на думите" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Отбелязване на думите" @@ -59,14 +59,18 @@ msgstr "Грешка при изпълнение на „git log“:" msgid "Reading" msgstr "Прочитане" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Прочитане на подаванията…" -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Не са избрани подавания" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Команден ред" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Изходът от „git log“ не може да се анализира:" @@ -75,16 +79,12 @@ msgstr "Изходът от „git log“ не може да се анализи msgid "No commit information available" msgstr "Липсва информация за подавания" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Добре" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Отказ" @@ -136,15 +136,15 @@ msgstr "Редактиране на изгледа…" msgid "Delete view" msgstr "Изтриване на изгледа" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Всички файлове" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Изглед" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Относно gitk" @@ -156,7 +156,7 @@ msgstr "Клавишни комбинации" msgid "Help" msgstr "Помощ" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1:" @@ -172,53 +172,53 @@ msgstr "Търсене" msgid "commit" msgstr "подаване" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "съдържащо:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "засягащо пътищата:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "добавящо/премахващо низ" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "променящо редове напасващи:" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Точно" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Без регистър" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Рег. израз" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Всички полета" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Първи ред" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Коментари" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Автор" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Подаващ" @@ -246,7 +246,7 @@ msgstr "Контекст в редове" msgid "Ignore space change" msgstr "Празните знаци без значение" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Поредови разлики" @@ -258,99 +258,107 @@ msgstr "Кръпка" msgid "Tree" msgstr "Дърво" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Разлики между това и избраното" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Разлики между избраното и това" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Създаване на кръпка" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Създаване на етикет" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Запазване на подаването във файл" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Създаване на нов клон" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Отбиране на това подаване" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Привеждане на върха на клона към текущото подаване" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Отбелязване на това подаване" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Връщане към отбелязаното подаване" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Откриване и отбелязване на наследниците" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Сравнение с отбелязаното подаване" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "Разлики между това и отбелязаното" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "Разлики между отбелязаното и това" -#: gitk:2630 +#: gitk:2631 msgid "Revert this commit" msgstr "Отмяна на това подаване" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Изтегляне на този клон" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Изтриване на този клон" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Отбелязване и на това" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Отбелязване само на това" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Външна програма за разлики" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Анотиране на родителското подаване" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Показване на произхода на този ред" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Изпълнение на „git gui blame“ върху този ред" -#: gitk:3011 +#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -366,312 +374,318 @@ msgstr "" "\n" "Използвайте и разпространявайте при условията на ОПЛ на ГНУ" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Затваряне" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Клавишни комбинации" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Клавишни комбинации:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tСпиране на програмата" -#: gitk:3046 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tЗатваряне на прозореца" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tКъм първото подаване" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tКъм последното подаване" -#: gitk:3049 +#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tЕдно подаване нагоре" -#: gitk:3050 +#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tЕдно подаване надолу" -#: gitk:3051 +#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tНазад в историята" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tНапред в историята" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tКъм n-тия родител на текущото подаване в историята" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tСтраница нагоре в списъка с подаванията" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tСтраница надолу в списъка с подаванията" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tКъм началото на списъка с подаванията" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tКъм края на списъка с подаванията" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tРед нагоре в списъка с подавания" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tРед надолу в списъка с подавания" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tСтраница нагоре в списъка с подавания" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tСтраница надолу в списъка с подавания" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tТърсене назад (визуално нагоре, исторически — последващи)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "" "\tТърсене напред (визуално надолу, исторически — предхождащи)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tСтраница нагоре в изгледа за разлики" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tСтраница надолу в изгледа за разлики" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tСтраница надолу в изгледа за разлики" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 реда нагоре в изгледа за разлики" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 реда надолу в изгледа за разлики" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tТърсене" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tКъм следващата поява" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tКъм следващата поява" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tКъм последното подаване" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tФокус върху полето за търсене" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tКъм предишната поява" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tСледващ файл в изгледа за разлики" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tТърсене на следващата поява в изгледа за разлики" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tТърсене на предишната поява в изгледа за разлики" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tПо-голям размер на шрифта" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tПо-голям размер на шрифта" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tПо-малък размер на шрифта" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tПо-малък размер на шрифта" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tОбновяване" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Грешка при създаването на временната директория „%s“:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Грешка при получаването на „%s“ от %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "неуспешно изпълнение на команда:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Такова подаване няма" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "„git gui blame“: неуспешно изпълнение на команда:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Върхът за сливане не може да бъде прочетен: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Грешка при прочитане на индекса: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Командата „git blame“ не може да бъде стартирана: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Търсене" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Грешка при изпълнението на „git blame“: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Този ред идва от подаването %s, което не е в изгледа" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Неуспешно изпълнение на външната програма за разлики:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Дефиниция на изглед в Gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Запазване на този изглед" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Указатели (списък с разделител интервал):" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Клони и етикети:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Всички указатели" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Всички (локални) клони" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Всички етикети" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Всички следящи клони" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Информация за подаване (рег. изр.):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Автор:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Подал:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Съобщение при подаване:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Съвпадение по всички характеристики на подаването" -#: gitk:4069 -msgid "Matches none Commit Info criteria" +#: gitk:4086 +#, fuzzy +msgid "Matches no Commit Info criteria" msgstr "Съвпадение по никоя от характеристиките на подаването" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Промени по файловете:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Дословен низ" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Регулярен израз" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Низ за търсене:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -679,204 +693,204 @@ msgstr "" "Дата на подаване („2 weeks ago“ (преди 2 седмици), „2009-03-17 15:27:38“, " "„March 17, 2009 15:27:38“):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "От:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "До:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" "Ограничаване и/или прескачане на определен брой версии (неотрицателно цяло " "число):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Брой показани:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Брой прескочени:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Разни:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Подреждане по дата" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Отбелязване на страните по клона" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Само първия родител" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Опростена история" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Допълнителни аргументи към „git log“:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Въведете файловете и директориите за включване, по елемент на ред" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "" "Команда за генерирането на допълнителни подавания, които да бъдат включени:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: редактиране на изглед" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "— критерии за избор на версии" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Име на изглед" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Прилагане (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Грешка в аргументите за избор на подавания:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Няма" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Наследник" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Не е наследник" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Предшественик" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Не е предшественик" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Локални промени добавени към индекса, но неподадени" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Локални промени извън индекса" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "и още много" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "много" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Етикети:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Родител" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Дете" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Клон" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Следва" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Предшества" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Грешка при получаването на разликите: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Към ред:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Съкратената сума по SHA1 %s не е еднозначна" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Непозната версия %s" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Непозната сума по SHA1 %s" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Версия %s не е в текущия изглед" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Дата" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Деца" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Зануляване на клона „%s“ към текущото подаване" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Несвързан връх: невъзможно зануляване" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Пропускане на подаването на сливането" -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Грешка при получаването на идентификатора на " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " — спиране\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Подаване" -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -884,7 +898,7 @@ msgstr "" " е същата кръпка като\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -892,7 +906,7 @@ msgstr "" " се различава от\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -900,130 +914,130 @@ msgstr "" "Разлика между подаванията:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " има %s деца — спиране\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Грешка при запазването на подаването във файл: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Грешка при изчисляването на разликите между подаванията: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Най-горе" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "От" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "До" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Генериране на кръпка" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "От:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "До:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Обръщане" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Запазване във файла:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Генериране" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Грешка при създаването на кръпка:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "Идентификатор:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Име на етикет:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "Съобщението за етикет е незадължително" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Съобщение за етикет:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Създаване" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Липсва име на етикет" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Етикетът „%s“ вече съществува" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Грешка при създаването на етикет:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Команда:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Запазване" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Грешка при запазването на подаването:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Име:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Укажете име за новия клон" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Клонът „%s“ вече съществува. Да бъде ли презаписан?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Подаването „%s“ вече е включено в клона „%s“ — да бъде ли приложено отново?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Отбиране" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1032,7 +1046,7 @@ msgstr "" "Неуспешно отбиране, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1040,20 +1054,20 @@ msgstr "" "Неуспешно отбиране поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Не са подадени промени" -#: gitk:9574 +#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Подаването „%s“ не е включено в клона „%s“. Да бъде ли отменено?" -#: gitk:9579 +#: gitk:9598 msgid "Reverting" msgstr "Отмяна" -#: gitk:9587 +#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1062,7 +1076,7 @@ msgstr "" "Неуспешна отмяна, защото във файла „%s“ има локални промени.\n" "Подайте, занулете или ги скатайте и пробвайте отново.<" -#: gitk:9591 +#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1070,28 +1084,28 @@ msgstr "" "Неуспешно отмяна поради конфликти при сливане.\n" "Искате ли да ги коригирате чрез „git citool“?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Потвърждаване на зануляването" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Да се занули ли клонът „%s“ към „%s“?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Вид зануляване:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Слабо: работното дърво и индекса остават същите" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смесено: работното дърво остава същото, индексът се занулява" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1099,19 +1113,19 @@ msgstr "" "Силно: зануляване и на работното дърво, и на индекса\n" "(*ВСИЧКИ* локални промени ще бъдат безвъзвратно загубени)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Зануляване" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Изтегляне" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Текущо изтегленият клон не може да бъде изтрит" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1120,16 +1134,16 @@ msgstr "" "Подаванията на клона „%s“ не са на никой друг клон.\n" "Наистина ли да се изтрие клонът „%s“?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Етикети и върхове: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Филтриране" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1137,213 +1151,218 @@ msgstr "" "Грешка при прочитането на топологията на подаванията. Информацията за клона " "и предшестващите/следващите етикети ще е непълна." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Етикет" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Идентификатор" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Избор на шрифт за Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "Ч" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "К" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Настройки на списъка с подавания" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Максимална широчина на графа (в редове)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Максимална широчина на графа (% от панела)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Показване на локалните промени" -#: gitk:11340 +#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Автоматично избиране на SHA1 (дължина)" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Скриване на отдалечените указатели" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Настройки на показването на разликите" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Широчина на табулатора" -#: gitk:11353 +#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Извеждане на близките етикети и върхове" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Максимален брой етикети/върхове за показване" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Разлика само в избраните пътища" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Поддръжка на различни кодирания за всеки файл" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Външен инструмент за разлики" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Избор…" -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Общи настройки" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Използване на тема за графичните обекти" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(промяната изисква рестартиране на Gitk)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(в момента недостъпно)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Цветове: избира се с натискане" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Интерфейс" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "интерфейс" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Фон" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "фон" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Знаци" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "знаци" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Разлика: стари редове" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "разлика, стари редове" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Разлика: нови редове" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "разлика, нови редове" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Разлика: начало на парче" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "разлика, начало на парче" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Фон на отбелязан ред" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "фон на отбелязан ред" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Избор на фон" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Шрифтове: избира се с натискане" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Основен шрифт" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Шрифт за разликите" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Шрифт на интерфейса" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Настройки на Gitk" -#: gitk:11473 +#: gitk:11494 msgid "General" msgstr "Общи" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "Цветове" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "Шрифтове" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: избор на цвят на „%s“" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Тук липсва хранилище на Git." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Нееднозначен аргумент „%s“: има и такава версия, и такъв файл" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Неправилни аргументи на gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Команден ред" +#~ msgid "mc" +#~ msgstr "mc" diff --git a/po/ca.po b/po/ca.po index 2c1f606..976037a 100644 --- a/po/ca.po +++ b/po/ca.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-02-01 22:49-0700\n" "Last-Translator: Alex Henrie \n" "Language-Team: Catalan\n" @@ -27,7 +27,7 @@ msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:" msgid "Color words" msgstr "Colora les paraules" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Marca les paraules" @@ -61,14 +61,18 @@ msgstr "Error en executar git log:" msgid "Reading" msgstr "Llegint" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Llegint les revisions..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Cap comissió seleccionada" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Línia d'ordres" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "No es pot analitzar la sortida del git log:" @@ -77,16 +81,12 @@ msgstr "No es pot analitzar la sortida del git log:" msgid "No commit information available" msgstr "Cap informació de comissió disponible" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "D'acord" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancel·la" @@ -138,15 +138,15 @@ msgstr "Edita la vista..." msgid "Delete view" msgstr "Suprimeix vista" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Tots els fitxers" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Quant al gitk" @@ -158,7 +158,7 @@ msgstr "Associacions de tecles" msgid "Help" msgstr "Ajuda" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "ID SHA1:" @@ -174,53 +174,53 @@ msgstr "Cerca" msgid "commit" msgstr "comissió" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "que contingui:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "que toqui els camins:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "que afegeixi/elimini la cadena:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "que tingui línies canviades coincidents amb:" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exacte" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignora majúscula i minúscula" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tots els camps" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Titular" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Comentaris" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Comitent" @@ -248,7 +248,7 @@ msgstr "Línies de context" msgid "Ignore space change" msgstr "Ignora canvis d'espai" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Diferència de línies" @@ -260,99 +260,107 @@ msgstr "Pedaç" msgid "Tree" msgstr "Arbre" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diferencia aquesta -> la seleccionada" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diferencia la seleccionada -> aquesta" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Fes pedaç" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crea etiqueta" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Escriu la comissió a un fitxer" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crea una branca nova" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Recull aquesta comissió com a cirera" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Restableix la branca HEAD aquí" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Marca aquesta comissió" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Torna a la marca" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Troba la descendent d'aquesta i marca-la" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Compara amb la comissió marcada" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "Diferencia aquesta -> la comissió marcada" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "Diferencia la comissió seleccionada -> aquesta" -#: gitk:2630 +#: gitk:2631 msgid "Revert this commit" msgstr "Reverteix aquesta comissió" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Agafa aquesta branca" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Elimina aquesta branca" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Ressalta aquest també" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Ressalta només aquest" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Diferència externa" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Culpabilitat de la comissió mare" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Mostra l'origen d'aquesta línia" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Executa git gui blame en aquesta línia" -#: gitk:3011 +#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -368,314 +376,319 @@ msgstr "" "\n" "Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Tanca" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Associacions de tecles del Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Associacions de tecles del Gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSurt" -#: gitk:3046 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tTanca la finestra" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tVés a la primera comissió" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tVés a l'última comissió" -#: gitk:3049 +#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tMou-te una comissió amunt" -#: gitk:3050 +#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tMou-te una comissió avall" -#: gitk:3051 +#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tRetrocedeix en la llista d'història" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvança en la llista d'història" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" "<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tBaixa una pàgina en la llista de comissions" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tBaixa per una pàgina en la llista de comissions" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Amunt>\tDesplaça la llista de comissions una línia cap amunt" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Avall>\tDesplaça la llista de comissions una línia cap avall" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-RePàg>\tDesplaça la llista de comissions amunt per una pàgina" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-AvPàg>\tDesplaça la llista de comissions una pàgina cap avall" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tCerca cap enrere (amunt, les comissions més noves)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tCerca cap endavant (avall, les comissions més velles)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tDesplaça la vista de diferència una pàgina cap amunt" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tDesplaça la vista de diferència una pàgina cap amunt" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tDesplaça la vista de diferència una pàgina cap avall" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaça la vista de diferència 18 línies cap amunt" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaça la vista de diferència 18 línies cap avall " -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tCerca" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tMou-te a la propera coincidència de la cerca" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tVés a l'última comissió" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tPosa el focus a la caixa de cerca" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tMou a la coincidència prèvia de la cerca" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplaça la vista de diferència al proper fitxer" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenta la mida de lletra" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-més>\tAugmenta la mida de lletra" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminueix la mida de lletra" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-menys>\tDisminueix la mida de lletra" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tActualitza" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Error en crear el directori temporal %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Error en obtenir \"%s\" de %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "l'ordre ha fallat:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Cap comissió així" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: l'ordre ha fallat:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "No s'ha pogut llegir el cap de fusió: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Error en llegir l'índex: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "No s'ha pogut iniciar el git blame: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Cercant" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Error en executar el git blame: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Aquella línia ve de la comissió %s, la qual no és en aquesta visualització" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "El visualitzador de diferència extern ha fallat:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Definició de vista del Gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Recorda aquesta vista" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referències (llista separada per espais)" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Branques i etiquetes:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Totes les referències" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Totes les branques (locals)" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Totes les etiquetes" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Totes les branques amb seguiment remot" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informació de comissió (expressions regulars):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Comitent:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Missatge de comissió:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Coincideix amb tots els criteris d'informació de comissió" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Coincideix amb tots els criteris d'informació de comissió" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Canvis als fitxers:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Cadena fixa" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Expressió regular" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Cadena de cerca:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -683,201 +696,201 @@ msgstr "" "Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Des de:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Fins:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita o salta un nombre de revisions (nombre enter positiu)" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Nombre a mostrar:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Nombre a saltar:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Opcions miscel·lànies:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordena estrictament per data" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Marca els costats de les branques" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limita a la primera mare" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Història senzilla" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Paràmetres addicionals al git log:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Introduïu els fitxers i directoris a incloure, un per línia:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Ordre per a generar més comissions a incloure:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: vista d'edició" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- criteris per a seleccionar les revisions" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Nom de vista" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Aplica (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Error en els paràmetres de selecció de comissions:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Cap" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendent" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "No descendent" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Avantpassat" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "No avantpassat" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Canvis locals registrats en l'índex però no comesos" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Canvis locals sense cometre, no registrats en l'índex" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "i moltes més" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "moltes" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Etiquetes:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Mare" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Filla" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Branca" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Segueix" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Precedeix" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Error en obtenir les diferències: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Vés a:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "L'id SHA1 curta %s és ambigua" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "La revisió %s és desconeguda" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "L'id SHA1 %s és desconeguda" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisió %s no és en la vista actual" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Filles" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Restableix la branca %s aquí" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Cap separat: no es pot restablir" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Saltant la comissió de fusió " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Error en obtenir l'ID de pedaç de " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - aturant\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Comissió " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -885,7 +898,7 @@ msgstr "" " és el mateix pedaç que\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -893,7 +906,7 @@ msgstr "" " difereix de\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -901,131 +914,131 @@ msgstr "" "Diferència entre comissions:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " té %s filles - aturant\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Error en escriure la comissió al fitxer: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Error en diferenciar les comissions: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Part superior" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Genera pedaç" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "A:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Inverteix" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Fitxer de sortida:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Genera" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Error en crear el pedaç:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Nom d'etiqueta:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "El missatge d'etiqueta és opcional" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Missatge d'etiqueta:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crea" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "No s'ha especificat cap nom d'etiqueta" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etiqueta \"%s\" ja existeix" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Error en crear l'etiqueta:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Ordre:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Escriu" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Error en escriure la comissió:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Nom:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Si us plau, especifiqueu un nom per a la branca nova" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branca '%s' ja existeix. Voleu sobreescriure?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a " "aplicar-la?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Recollint cireres" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1035,7 +1048,7 @@ msgstr "" "Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a " "intentar." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1043,21 +1056,21 @@ msgstr "" "El recull de cireres ha fallat a causa d'un conflicte de fusió.\n" "Voleu executar el git citool per a resoldre'l?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Cap canvi comès" -#: gitk:9574 +#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?" -#: gitk:9579 +#: gitk:9598 msgid "Reverting" msgstr "Revertint" -#: gitk:9587 +#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1067,7 +1080,7 @@ msgstr "" "plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a " "intentar." -#: gitk:9591 +#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1075,28 +1088,28 @@ msgstr "" "La reversió ha fallat a causa d'un conflicte de fusió.\n" " Voleu executar el git citool per a resoldre'l?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Confirma el restabliment" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Voleu restablir la branca %s a %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Tipus de restabliment:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1104,19 +1117,19 @@ msgstr "" "Dur: Restableix l'arbre de treball i l'índex\n" "(descarta TOTS els canvis locals)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Restablint" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Agafant" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "No es pot suprimir la branca actualment agafada" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1125,16 +1138,16 @@ msgstr "" "Les comissions en la branca %s no són en cap altra branca.\n" "Realment voleu suprimir la branca %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetes i caps: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtre" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1142,213 +1155,218 @@ msgstr "" "Error en llegir la informació de topologia de comissió; la informació sobre " "branques i etiquetes precedents/següents serà incompleta." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Selector de tipus de lletra del Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Opcions de visualització de la llista de comissions" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Amplada màxima del gràfic (línies)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Amplada màxima del gràfic (% del panell)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Mostra els canvis locals" -#: gitk:11340 +#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Selecciona automàticament l'SHA1 (longitud)" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Amaga les referències remotes" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Opcions de visualització de diferència" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Espaiat de tabulació" -#: gitk:11353 +#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Mostra etiquetes/caps propers" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Nombre màxim d'etiquetes/caps a mostrar" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limita les diferències als camins llistats" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Admet codificacions específiques per a cada fitxer" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Eina de diferència externa" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Trieu..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Opcions generals" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Usa els ginys tematitzats" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(el canvi requereix reiniciar)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(actualment no disponible)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Colors: pressiona per a triar" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Interfície" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "interfície" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Fons" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "fons" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Primer pla" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "primer pla" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diferència: línies velles" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diferencia les línies velles" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diferència: línies noves" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "diferencia les línies noves" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diferència: capçalera de tros" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "diferencia la capçalera de tros" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Fons de la línia marcada" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "fons de la línia marcada" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "fons de la selecció" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Tipus de lletra: pressiona per a triar" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Tipus de lletra principal" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Tipus de lletra de visualització de diferència" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Tipus de lletra de la interfície d'usuari" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Preferències del Gitk" -#: gitk:11473 +#: gitk:11494 msgid "General" msgstr "General" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "Colors" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "Tipus de lletra" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: tria el color per a %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "No es pot trobar cap dipòsit de git aquí." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Paràmetres dolents al gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Línia d'ordres" +#~ msgid "mc" +#~ msgstr "mc" diff --git a/po/de.po b/po/de.po index dabd4ee..1a3264b 100644 --- a/po/de.po +++ b/po/de.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-01-27 20:27+0100\n" "Last-Translator: Christian Stimming \n" "Language-Team: German\n" @@ -25,7 +25,7 @@ msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -59,14 +59,18 @@ msgstr "Fehler beim Ausführen von »git log«:" msgid "Reading" msgstr "Lesen" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Kommandozeile" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Ausgabe von »git log« kann nicht erkannt werden:" @@ -75,16 +79,12 @@ msgstr "Ausgabe von »git log« kann nicht erkannt werden:" msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Abbrechen" @@ -136,15 +136,15 @@ msgstr "Ansicht bearbeiten ..." msgid "Delete view" msgstr "Ansicht entfernen" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Alle Dateien" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Ansicht" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Über gitk" @@ -156,7 +156,7 @@ msgstr "Tastenkürzel" msgid "Help" msgstr "Hilfe" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -172,53 +172,53 @@ msgstr "Suche" msgid "commit" msgstr "Version nach" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exakt" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Alle Felder" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Überschrift" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Beschreibung" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Eintragender" @@ -246,7 +246,7 @@ msgstr "Kontextzeilen" msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -258,102 +258,110 @@ msgstr "Patch" msgid "Tree" msgstr "Baum" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Vergleich: diese -> gewählte" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Lesezeichen setzen" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Auf diesen Zweig umstellen" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -371,517 +379,522 @@ msgstr "" "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " "License" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Schließen" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tSuchen" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tZur neuesten Version springen" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tZur ältesten Version springen" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tNächste neuere Version" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tNächste ältere Version" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tEine Version zurückgehen" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tEine Version weitergehen" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tEine Seite nach oben blättern" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tEine Seite nach unten blättern" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr " Suchen (nach unten; ältere Versionen)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\t\tVergleich eine Seite nach oben blättern" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tVergleich eine Seite nach oben blättern" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\tVergleich eine Seite nach unten blättern" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tWeitersuchen" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tZur ältesten Version springen" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tTastaturfokus ins Suchfeld" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAktualisieren" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fehler beim Holen von »%s« von »%s«:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Suchen" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Zweige/Markierungen:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Alle Markierungen und Zweige" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Alle (lokalen) Zweige" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Alle Markierungen" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Alle Übernahmezweige" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Versionsinformationen (reguläre Ausdrücke):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Eintragender:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Versionsbeschreibung:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Dateien:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Zeichenkette" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Regulärer Ausdruck" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Suchausdruck:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Von:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Bis:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Anzeigen:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Überspringen:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Sonstiges:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Streng nach Datum sortieren" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Zweig-Seiten markieren" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Einfache Historie" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Zusätzliche Argumente für »git log«:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Ansichtsname" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Abkömmling" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "viele" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Markierungen:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Kind" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Zweig" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Folgt auf" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Version »%s« ist unbekannt" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Datum" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Kinder" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Überspringe Zusammenführungs-Version " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Version " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -889,7 +902,7 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -897,7 +910,7 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -905,131 +918,131 @@ msgstr "" "Vergleich der Versionen:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fehler beim Schreiben der Version in Datei: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fehler beim Vergleichen der Versionen: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Oben" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "Von" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "bis" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "Von:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "bis:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Erzeugen" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "Eine Markierungsbeschreibung ist optional" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Markierungsbeschreibung:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Erstellen" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Kommando:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Schreiben" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Name:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " "eintragen?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1039,7 +1052,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1048,23 +1061,23 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " "eintragen?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Zurücksetzen" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1074,7 +1087,7 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1084,30 +1097,30 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Zurücksetzen bestätigen" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1115,21 +1128,21 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Umstellen" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "" "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " "gelöscht werden." -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1138,16 +1151,16 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtern" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1155,219 +1168,224 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Markierung" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "F" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "K" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "SHA1-Hashwert automatisch auswählen" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Entfernte Zweige/Markierungen ausblenden" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Naheliegende Markierungen anzeigen" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Wählen ..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Allgemeine Optionen" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(Änderungen werden erst nach Neustart wirksam)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(Momentan nicht verfügbar)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Benutzeroberfläche" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "Benutzeroberfläche" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Hintergrund" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "Hintergrund" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Vordergrund" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "Vordergrund" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Programmschriftart" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Gitk-Einstellungen" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Erzeugen" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: Farbe wählen für %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Kommandozeile" +#~ msgid "mc" +#~ msgstr "mc" #~ msgid "next" #~ msgstr "nächste" diff --git a/po/es.po b/po/es.po index cfc10e1..6402a41 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2008-03-25 11:20+0100\n" "Last-Translator: Santiago Gala \n" "Language-Team: Spanish\n" @@ -25,7 +25,7 @@ msgstr "Imposible obtener la lista de archivos pendientes de fusión:" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -61,14 +61,18 @@ msgstr "Error al crear la etiqueta:" msgid "Reading" msgstr "Leyendo" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Leyendo revisiones..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "No se seleccionaron revisiones" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Línea de comandos" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Error analizando la salida de git log:" @@ -77,16 +81,12 @@ msgstr "Error analizando la salida de git log:" msgid "No commit information available" msgstr "Falta información sobre las revisiones" -#: gitk:1897 -msgid "mc" -msgstr "" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Aceptar" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" @@ -138,15 +138,15 @@ msgstr "Modificar vista..." msgid "Delete view" msgstr "Eliminar vista" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Todos los archivos" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Acerca de gitk" @@ -158,7 +158,7 @@ msgstr "Combinaciones de teclas" msgid "Help" msgstr "Ayuda" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -174,53 +174,53 @@ msgstr "Buscar" msgid "commit" msgstr "revisión" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "que contiene:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "que modifica la ruta:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "que añade/elimina cadena:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exacto" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "NoMayús" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regex" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos los campos" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Título" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Comentarios" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "" @@ -248,7 +248,7 @@ msgstr "Líneas de contexto" msgid "Ignore space change" msgstr "Ignora cambios de espaciado" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -260,103 +260,111 @@ msgstr "Parche" msgid "Tree" msgstr "Árbol" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crear patch" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crear etiqueta" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Escribir revisiones a archivo" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crear nueva rama" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Traer la rama HEAD aquí" -#: gitk:2624 +#: gitk:2625 #, fuzzy msgid "Mark this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Cambiar a esta rama" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Eliminar esta rama" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Seleccionar también" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Seleccionar sólo" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -374,728 +382,733 @@ msgstr "" "Uso y redistribución permitidos según los términos de la Licencia Pública " "General de GNU (GNU GPL)" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Cerrar" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Combinaciones de tecla de Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Combinaciones de tecla de Gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSalir" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tBuscar" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tIr a la primera revisión" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tIr a la última revisión" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tSubir una revisión" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tBajar una revisión" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tRetroceder en la historia" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvanzar en la historia" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tSubir una página en la lista de revisiones" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tBajar una página en la lista de revisiones" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tBuscar hacia atrás (arriba, revisiones siguientes)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tBuscar hacia adelante (abajo, revisiones anteriores)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tDesplaza hacia abajo una página la vista de diferencias" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tBuscar" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tBuscar el siguiente" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tBuscar el siguiente" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tIr a la última revisión" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tBuscar el anterior" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamaño del texto" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamaño del texto" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminuir tamaño del texto" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDisminuir tamaño del texto" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tActualizar" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, fuzzy, tcl-format msgid "Error creating temporary directory %s:" msgstr "Error en la creación del parche:" -#: gitk:3568 +#: gitk:3572 #, fuzzy, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Error al leer las diferencias de fusión:" -#: gitk:3631 +#: gitk:3635 #, fuzzy msgid "command failed:" msgstr "Línea de comandos" -#: gitk:3780 +#: gitk:3784 #, fuzzy msgid "No such commit" msgstr "No se han guardado cambios" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "" -#: gitk:3833 +#: gitk:3837 #, fuzzy, tcl-format msgid "Error reading index: %s" msgstr "Error al crear la etiqueta:" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Buscando" -#: gitk:3893 +#: gitk:3897 #, fuzzy, tcl-format msgid "Error running git blame: %s" msgstr "Error al crear la etiqueta:" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" -#: gitk:3935 +#: gitk:3939 #, fuzzy msgid "External diff viewer failed:" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Definición de vistas de Gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "" -#: gitk:4060 +#: gitk:4077 #, fuzzy msgid "All refs" msgstr "Todos los archivos" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "" -#: gitk:4065 +#: gitk:4082 #, fuzzy msgid "Author:" msgstr "Autor" -#: gitk:4066 +#: gitk:4083 #, fuzzy msgid "Committer:" msgstr "revisión" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "" -#: gitk:4069 -msgid "Matches none Commit Info criteria" +#: gitk:4086 +msgid "Matches no Commit Info criteria" msgstr "" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "" -#: gitk:4073 +#: gitk:4090 #, fuzzy msgid "Search string:" msgstr "Buscando" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "" -#: gitk:4083 +#: gitk:4100 #, fuzzy msgid "Limit to first parent" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "" -#: gitk:4085 +#: gitk:4102 #, fuzzy msgid "Additional arguments to git log:" msgstr "Revisiones a incluir (argumentos a git log):" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Introducir archivos y directorios a incluir, uno por línea:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando que genera más revisiones a incluir:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "" -#: gitk:4224 +#: gitk:4241 #, fuzzy msgid "View Name" msgstr "Vista" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Error en los argumentos de selección de las revisiones:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Ninguno" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendiente" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "No descendiente" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antepasado" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "No antepasado" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Cambios locales añadidos al índice pero sin completar revisión" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Cambios locales sin añadir al índice" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Padre" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Hija" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Rama" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Sigue-a" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Precede-a" -#: gitk:7947 +#: gitk:7966 #, fuzzy, tcl-format msgid "Error getting diffs: %s" msgstr "Error al leer las diferencias de fusión:" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Ir a:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La id SHA1 abreviada %s es ambigua" -#: gitk:8659 +#: gitk:8678 #, fuzzy, tcl-format msgid "Revision %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Fecha" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Hijas" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Poner la rama %s en esta revisión" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "" -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 #, fuzzy msgid "Error getting patch ID for " msgstr "Error en la creación del parche:" -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 #, fuzzy msgid "Commit " msgstr "revisión" -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " msgstr "" -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " msgstr "" -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" msgstr "" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "" -#: gitk:9066 +#: gitk:9085 #, fuzzy, tcl-format msgid "Error writing commit to file: %s" msgstr "Error al escribir revisión:" -#: gitk:9072 +#: gitk:9091 #, fuzzy, tcl-format msgid "Error diffing commits: %s" msgstr "Error al escribir revisión:" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Origen" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Generar parche" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Invertir" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Escribir a archivo:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Generar" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Error en la creación del parche:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Nombre de etiqueta:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9251 +#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Nombre de etiqueta:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crear" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "No se ha especificado etiqueta" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Error al crear la etiqueta:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Escribir" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Error al escribir revisión:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Nombre:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Especifique un nombre para la nueva rama" -#: gitk:9444 +#: gitk:9463 #, fuzzy, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Eligiendo revisiones (cherry-picking)" -#: gitk:9525 +#: gitk:9544 #, 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 "" -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" msgstr "" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "No se han guardado cambios" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Reponiendo" -#: gitk:9587 +#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." msgstr "" -#: gitk:9591 +#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar git reset" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "¿Reponer la rama %s a %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo de reposición:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: No altera la copia de trabajo ni el índice" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1103,19 +1116,19 @@ msgstr "" "Dura: Actualiza el índice y la copia de trabajo\n" "(abandona TODAS las modificaciones locales)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Reponiendo" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Creando copia de trabajo" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "No se puede borrar la rama actual" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1124,16 +1137,16 @@ msgstr "" "Las revisiones de la rama %s no están presentes en otras ramas.\n" "¿Borrar la rama %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetas y ramas: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1141,228 +1154,232 @@ msgstr "" "Error al leer la topología de revisiones: la información sobre las ramas y " "etiquetas precedentes y siguientes será incompleta." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Selector de tipografías gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Opciones de visualización de la lista de revisiones" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Ancho máximo del gráfico (en líneas)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Ancho máximo del gráfico (en % del panel)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Mostrar cambios locales" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Seleccionar automáticamente SHA1 hash" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Opciones de visualización de diferencias" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Espaciado de tabulador" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Mostrar etiquetas cercanas" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "" -#: gitk:11374 +#: gitk:11395 #, fuzzy msgid "General options" msgstr "Generar parche" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Colores: pulse para seleccionar" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "" -#: gitk:11396 +#: gitk:11417 #, fuzzy msgid "interface" msgstr "Tipografía para interfaz de usuario" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Fondo" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 #, fuzzy msgid "background" msgstr "Fondo" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Primer plano" -#: gitk:11404 +#: gitk:11425 #, fuzzy msgid "foreground" msgstr "Primer plano" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: líneas viejas" -#: gitk:11408 +#: gitk:11429 #, fuzzy msgid "diff old lines" msgstr "Diff: líneas viejas" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: líneas nuevas" -#: gitk:11413 +#: gitk:11434 #, fuzzy msgid "diff new lines" msgstr "Diff: líneas nuevas" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:11419 +#: gitk:11440 #, fuzzy msgid "diff hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Color de fondo de la selección" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Tipografías: pulse para elegir" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Tipografía principal" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Tipografía para diferencias" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Tipografía para interfaz de usuario" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Preferencias de gitk" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Generar" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: elegir color para %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Esta versión de Tcl/Tk es demasiado antigua.\n" +" Gitk requiere Tcl/Tk versión 8.4 o superior." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "No hay un repositorio git aquí." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorrectos a Gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Línea de comandos" - #~ msgid "SHA1 ID: " #~ msgstr "SHA1 ID: " @@ -1384,12 +1401,5 @@ msgstr "Línea de comandos" #~ msgid "Tag/Head %s is not known" #~ msgstr "La etiqueta/rama %s es deconocida" -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Esta versión de Tcl/Tk es demasiado antigua.\n" -#~ " Gitk requiere Tcl/Tk versión 8.4 o superior." - #~ msgid "Cannot find the git directory \"%s\"." #~ msgstr "No hay directorio git \"%s\"." diff --git a/po/fr.po b/po/fr.po index 747ee19..6b1f05c 100644 --- a/po/fr.po +++ b/po/fr.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-11-19 22:13+0100\n" "Last-Translator: Emmanuel Trillaud \n" "Language-Team: git@vger.kernel.org\n" @@ -27,7 +27,7 @@ msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -63,14 +63,18 @@ msgstr "Erreur à l'exécution de git log :" msgid "Reading" msgstr "Lecture en cours" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lecture des commits..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Aucun commit sélectionné" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Ligne de commande" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossible de lire la sortie de git log :" @@ -79,16 +83,12 @@ msgstr "Impossible de lire la sortie de git log :" msgid "No commit information available" msgstr "Aucune information disponible sur le commit" -#: gitk:1897 -msgid "mc" -msgstr "" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Annuler" @@ -140,15 +140,15 @@ msgstr "Éditer la vue..." msgid "Delete view" msgstr "Supprimer la vue" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Tous les fichiers" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Vue" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "À propos de gitk" @@ -160,7 +160,7 @@ msgstr "Raccourcis clavier" msgid "Help" msgstr "Aide" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "Id SHA1 :" @@ -176,53 +176,53 @@ msgstr "Recherche" msgid "commit" msgstr "commit" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "contient :" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "chemins modifiés :" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "ajoute/supprime la chaîne :" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exact" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignorer la casse" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Expression régulière" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tous les champs" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Surligner" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Commentaires" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Auteur" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Auteur du commit" @@ -250,7 +250,7 @@ msgstr "Lignes de contexte" msgid "Ignore space change" msgstr "Ignorer les modifications d'espace" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -262,102 +262,110 @@ msgstr "Patch" msgid "Tree" msgstr "Arbre" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff entre ceci et la sélection" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff entre sélection et ceci" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Créer patch" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Créer tag" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Écrire le commit dans un fichier" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Créer une nouvelle branche" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cueillir (cherry-pick) ce commit" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Réinitialiser la branche HEAD vers cet état" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Marquer ce commit" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Retourner à la marque" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Chercher le descendant de ceci et le marquer" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Comparer avec le commit marqué" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diff entre ceci et la sélection" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diff entre sélection et ceci" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Marquer ce commit" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Récupérer cette branche" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Supprimer cette branche" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Surligner également ceci" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Surligner seulement ceci" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Diff externe" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Blâmer le commit parent" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Montrer l'origine de cette ligne" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Exécuter git gui blame sur cette ligne" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -375,317 +383,322 @@ msgstr "" "Utilisation et redistribution soumises aux termes de la GNU General Public " "License" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Fermer" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Raccourcis clavier de Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Raccourcis clavier de Gitk :" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tQuitter" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tRechercher" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tAller au premier commit" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tAller au dernier commit" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\t Aller au commit suivant" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\t Aller au commit précédent" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tReculer dans l'historique" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvancer dans l'historique" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tMonter d'une page dans la liste des commits" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tDescendre d'une page dans la liste des commits" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Début>\tAller en haut de la liste des commits" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tAller en bas de la liste des commits" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "" "\tRecherche en arrière (vers l'avant, commits les plus anciens)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "" "\tRecherche en avant (vers l'arrière, commit les plus récents)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tMonter d'une page dans la vue des diff" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tMonter d'une page dans la vue des diff" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tDescendre d'une page dans la vue des diff" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tMonter de 18 lignes dans la vue des diff" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tRechercher" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tAller au résultat de recherche suivant" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\t\tAller au résultat de recherche suivant" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tAller au dernier commit" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tFocus sur la zone de recherche" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tAller au résultat de recherche précédent" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tAller au prochain fichier dans la vue des diff" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenter la taille de la police" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAugmenter la taille de la police" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuer la taille de la police" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuer la taille de la police" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tMise à jour" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erreur lors de la création du répertoire temporaire %s :" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erreur en obtenant \"%s\" de %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "échec de la commande :" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Commit inexistant" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame : échec de la commande :" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossible de lire le head de la fusion : %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Erreur à la lecture de l'index : %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossible de démarrer git blame : %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Recherche en cours" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Erreur à l'exécution de git blame : %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Échec de l'outil externe de visualisation des diff" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Définition des vues de Gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Se souvenir de cette vue" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Références (liste d'éléments séparés par des espaces) :" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Branches & tags :" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Toutes les références" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Toutes les branches (locales)" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Tous les tags" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Toutes les branches de suivi à distance" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Info sur les commits (expressions régulières) :" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Auteur :" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Commiteur :" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Message de commit :" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Changements des fichiers :" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Chaîne Figée" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Expression Régulière" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Recherche de la chaîne :" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -693,204 +706,204 @@ msgstr "" "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\") :" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "De :" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Jusqu'au :" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Nombre à afficher :" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Nombre à sauter :" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Options diverses :" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Trier par date" # FIXME : traduction de "branch sides" -#: gitk:4082 +#: gitk:4099 #, fuzzy msgid "Mark branch sides" msgstr "Marquer les extrémités des branches" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limiter au premier ancêtre" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Historique simple" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Arguments supplémentaires de git log :" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Commande pour générer plus de commits à inclure :" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk : éditer la vue" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- critère pour la sélection des révisions" -#: gitk:4224 +#: gitk:4241 #, fuzzy msgid "View Name" msgstr "Nom de la vue :" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Appliquer (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Erreur dans les arguments de sélection des commits :" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Aucun" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendant" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Pas un descendant" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Ancêtre" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Pas un ancêtre" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Modifications locales enregistrées dans l'index mais non commitées" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifications locales non enregistrées dans l'index et non commitées" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "nombreux" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Tags :" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Parent" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Enfant" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Branche" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Suit" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Précède" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erreur lors de la récupération des diff : %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Aller à :" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Id SHA1 court %s est ambigu" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Id SHA1 %s est inconnu" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s est inconnu" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La révision %s n'est pas dans la vue courante" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Date" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Enfants" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Réinitialiser la branche %s vers cet état" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Head détaché : impossible de réinitialiser" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Éviter le commit de la fusion " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Erreur à l'obtention de l'ID du patch pour " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - arrêt en cours\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -898,7 +911,7 @@ msgstr "" "est le même patch que \n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -906,138 +919,138 @@ msgstr "" " diffère de\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" msgstr "" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "a %s enfants - arrêt en cours\n" -#: gitk:9066 +#: gitk:9085 #, fuzzy, tcl-format msgid "Error writing commit to file: %s" msgstr "Erreur à l'ecriture du commit :" -#: gitk:9072 +#: gitk:9091 #, fuzzy, tcl-format msgid "Error diffing commits: %s" msgstr "Erreur à l'ecriture du commit :" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Haut" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "À" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Générer le patch" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "De :" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "À :" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Inverser" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Fichier de sortie :" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Générer" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Erreur à la création du patch :" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID :" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Nom du Tag :" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9251 +#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Nom du Tag :" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Créer" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Aucun nom de tag spécifié" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Le tag \"%s\" existe déjà" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Erreur à la création du tag :" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Commande :" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Écrire" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Erreur à l'ecriture du commit :" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Nom :" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Veuillez spécifier un nom pour la nouvelle branche" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branche '%s' existe déjà. Écraser?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " "tout?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Cueillir (Cherry-picking)" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1048,7 +1061,7 @@ msgstr "" "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " "nouveau." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1057,23 +1070,23 @@ msgstr "" "fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Aucun changement commité" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " "tout?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Réinitialisation" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1084,7 +1097,7 @@ msgstr "" "Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " "nouveau." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1094,30 +1107,30 @@ msgstr "" "fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Confirmer la réinitialisation" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Réinitialiser la branche %s à %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Type de réinitialisation :" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Douce : Laisse le répertoire de travail et l'index intacts" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Hybride : Laisse le répertoire de travail dans son état courant, " "réinitialise l'index" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1125,21 +1138,21 @@ msgstr "" "Dure : Réinitialise le répertoire de travail et l'index\n" "(abandonne TOUS les changements locaux)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Réinitialisation" # Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:9724 +#: gitk:9743 #, fuzzy msgid "Checking out" msgstr "Récupération" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossible de supprimer la branche en cours" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1148,16 +1161,16 @@ msgstr "" "Les commits de la branche %s ne sont dans aucune autre branche.\n" "Voulez-vous vraiment supprimer cette branche %s ?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Tags et heads : %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtrer" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1166,223 +1179,227 @@ msgstr "" "informations sur les branches et les tags précédents/suivants seront " "incomplètes." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Tag" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Sélecteur de police de Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Options d'affichage de la liste des commits" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Longueur maximum du graphe (lignes)" # FIXME : Traduction standard de "pane"? -#: gitk:11334 +#: gitk:11355 #, fuzzy, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Longueur maximum du graphe (% du panneau)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Montrer les changements locaux" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Sélection auto. du SHA1" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Cacher les refs distantes" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Options d'affichage des diff" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Taille des tabulations" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Afficher les tags les plus proches" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limiter les différences aux chemins listés" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Support pour un encodage des caractères par fichier" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Outil diff externe" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Choisir..." -#: gitk:11374 +#: gitk:11395 #, fuzzy msgid "General options" msgstr "Générer le patch" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Couleurs : cliquer pour choisir" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "" -#: gitk:11396 +#: gitk:11417 #, fuzzy msgid "interface" msgstr "Police de l'interface utilisateur" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Arrière-plan" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "arrière-plan" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Premier plan" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "premier plan" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff : anciennes lignes" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diff anciennes lignes" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff : nouvelles lignes" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "diff nouvelles lignes" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff : entête du hunk" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "diff : entête du hunk" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Arrière-plan de la ligne marquée" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "Arrière-plan de la ligne marquée" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Sélectionner l'arrière-plan" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Polices : cliquer pour choisir" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Police principale" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Police d'affichage des diff" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Police de l'interface utilisateur" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Préférences de Gitk" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Générer" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk : choisir la couleur de %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" +" Gitk requiert Tcl/Tk version 8.4 ou supérieur." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Impossible de trouver un dépôt git ici." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Arguments invalides pour gitk :" -#: gitk:12405 -msgid "Command line" -msgstr "Ligne de commande" - #~ msgid "SHA1 ID: " #~ msgstr "ID SHA1 :" @@ -1398,12 +1415,5 @@ msgstr "Ligne de commande" #~ msgid "- stopping\n" #~ msgstr "- arrêt en cours\n" -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" -#~ " Gitk requiert Tcl/Tk version 8.4 ou supérieur." - #~ msgid "Cannot find the git directory \"%s\"." #~ msgstr "Impossible de trouver le répertoire git \"%s\"." diff --git a/po/hu.po b/po/hu.po index 5e3e946..00023f1 100644 --- a/po/hu.po +++ b/po/hu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: git-gui\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-12-14 14:04+0100\n" "Last-Translator: Laszlo Papp \n" "Language-Team: Hungarian\n" @@ -25,7 +25,7 @@ msgstr "Nem sikerült letölteni az unmerged fájl listát:" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -58,14 +58,18 @@ msgstr "Hiba történt a git log végrehajtása közben:" msgid "Reading" msgstr "Olvasás" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Commitok olvasása ..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nincsen commit kiválasztva" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Parancs sor" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Nem lehet értelmezni a git log kimenetét:" @@ -74,16 +78,12 @@ msgstr "Nem lehet értelmezni a git log kimenetét:" msgid "No commit information available" msgstr "Nincsen elérhető commit információ" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Visszavonás" @@ -135,15 +135,15 @@ msgstr "Nézet szerkesztése ..." msgid "Delete view" msgstr "Nézet törlése" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Minden fájl" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Nézet" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Gitk névjegy" @@ -155,7 +155,7 @@ msgstr "Billentyűkombináció" msgid "Help" msgstr "Segítség" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -171,53 +171,53 @@ msgstr "Keresés" msgid "commit" msgstr "commit" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "tartalmazás:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "érintendő útvonalak:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "string hozzáadása/törlése:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Pontos" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kis/nagy betű nem számít" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Minden mező" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Főcím" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Megjegyzések" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Szerző" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Commitoló" @@ -245,7 +245,7 @@ msgstr "Tartalmi sorok" msgid "Ignore space change" msgstr "Space váltás mellőzése" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -257,102 +257,110 @@ msgstr "Patch" msgid "Tree" msgstr "Tree" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch készítése" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Tag készítése" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Commit fáljba írása" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Új branch készítése" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cherry-pick erre a commitra" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD branch újraindítása ide" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Ezen commit megjelölése" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Visszatérés a megjelöléshez" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Találd meg ezen utódokat és jelöld meg" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Összehasonlítás a megjelölt commit-tal" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Ezen commit megjelölése" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Check out ezt a branchot" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Töröld ezt a branch-ot" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Emeld ki ezt is" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Csak ezt emeld ki" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Külső diff" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Blame szülő kommitra" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Mutasd meg ennek a sornak az eredetét" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Futtasd a git gui blame-t ezen a soron" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -369,316 +377,321 @@ msgstr "" "\n" "Használd és terjeszd a GNU General Public License feltételei mellett" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Bezárás" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-billentyű hozzárendelés" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-billentyű hozzaárendelés:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tKilépés" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tKeresés" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tElső commithoz" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tUtolsó commithoz" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tEgy committal feljebb" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tEgy committal lejjebb" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tVissza a history listába" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tElőre a history listába" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tEgy lappal feljebb a commit listába" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tEgy lappal lejjebb a commit listába" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tGörgetés a commit lista aljához" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tKeresés visszafele (felfele, utolsó commitok)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tKeresés előre (lefelé; korábbi commitok)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\t\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\tEgy lappal lejjebb görgetés a diff nézetben" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tKeresés" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tKövetkező találathoz" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tKövetkező találathoz" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tUtolsó commithoz" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tLépj a keresési mezőre" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tElőző találathoz" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tBetűméret növelése" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tBetűméret csökkentése" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tFrissítés" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "parancs hiba:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Nincs ilyen commit" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: parancs hiba:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Nem sikerült a Merge head olvasása: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Hiba történt az index olvasása közben: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Nem sikerült a git blame indítása: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Keresés" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Hiba történt a git blame futtatása közben: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "A %s commitból származik az a sor, amelyik nem található ebben a nézetben" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Külső diff nézegető hiba:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk nézet meghatározása" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Maradj ennél a nézetnél" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referenciák (szóközzel tagolt lista" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Branch-ek & tagek:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Minden ref" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Minden (helyi) branch" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Minden tag" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Minden távoli követő branch" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Commit Infó (reguláris kifejezés):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Szerző:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Commitoló:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Commit üzenet:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Fájl változások:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Fix String" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Reguláris kifejezés" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Keresés szöveg:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -686,203 +699,203 @@ msgstr "" "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Ettől:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Eddig:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Mutatandó szám:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Kihagyandó szám:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Különféle opciók:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Szigorú rendezás dátum alapján" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Jelölje meg az ágakat" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Korlátozás az első szülőre" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Egyszerű history" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "További argumentok a git log-hoz:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Parancs több tartalmazó commit generálására:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: szerkesztés nézet" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- kritériumok a revíziók kiválasztásához" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Nézet neve" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Alkalmaz (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Hiba történt a commit argumentumok kiválasztása közben:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Leszármazott" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Nem leszármazott" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Előd" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Nem előd" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "" "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " "commitolva" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "sok" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Tagek:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Gyerek" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Ág" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Következők" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Megelőzők" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Hiba történt a diff-ek letöltése közben: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Menj:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Rövid SHA1 id %s félreérthető" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "A(z) %s revízió nem ismert" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s nem ismert" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A(z) %s revízió nincs a jelenlegi nézetben" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Dátum" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Gyerekek" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Állítsd vissza a %s branch-ot ide" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Elkülönített head: nem lehet visszaállítani" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Merge commit kihagyása " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Hiba történt a patch ID megszerzése közben a következőnél " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - abbahagyás\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -890,7 +903,7 @@ msgstr "" " Ugyanaz a patch mint\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -898,7 +911,7 @@ msgstr "" " különbözik innentől\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -906,132 +919,132 @@ msgstr "" "A commitok diffje:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " %s gyereke van. abbahagyás\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Hiba történt a commit fájlba írása közben: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Hiba történt a commitok diffelése közben: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Teteje" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "Innen" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "Ide" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Patch generálása" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "Innen:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "Ide:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Visszafele" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Kimeneti fájl:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Generálás" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Hiba törtét a patch készítése közben:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Tag név:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9251 +#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Tag név:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Létrehozás" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "A tag neve nincsen megadva" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "%s Tag már létezik" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Hiba történt a tag létrehozása közben:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Parancs:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Írás" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Hiba történt a commit írása közben:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Név:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Kérem adja meg a nevét az új branchhoz" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "%s branch már létezik. Felülírja?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1041,7 +1054,7 @@ msgstr "" "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1049,23 +1062,23 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "Kívánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nincsen változás commitolva" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Újraindítás" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1075,7 +1088,7 @@ msgstr "" "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1084,28 +1097,28 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "Kívánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Újraindítás megerősítése" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Újraindítja a %s branchot %s-ig?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Újraindítás típusa:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1113,19 +1126,19 @@ msgstr "" "Hard: Indítsd újra a working tree-t és az indexet\n" "(MINDEN lokális változás eldobása)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Újraindítás" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Kivesz" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Nem lehet a jelenleg kivett branch-ot törölni" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1134,16 +1147,16 @@ msgstr "" "A %s branchon található commit nem található meg semelyik másik branchon.\n" "Tényleg törli a %s branchot?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Tagek és headek: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Szűrő" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1151,219 +1164,226 @@ msgstr "" "Hiba történt a commit topológiai információ olvasása közben; branch ésa " "megelőző/következő információ nem lesz teljes." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Tag" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-betű kiválasztó" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "F" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "K" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Commit lista kijelzési opciók" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximális grafikon szélesség (sorok)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximális grafikon szélesség (táble %-je)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Mutasd a lokális változtatásokat" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "SHA1 Automatikus kiválasztása" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "A távoli refek elrejtése" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Diff kijelző opciók" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Tab sorköz" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Szomszédos tagek kijelzése" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Korlátozott diffek a kilistázott útvonalakhoz" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Fájlonkénti kódolás támgatása" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Külső diff alkalmazás" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Válaszd ..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Általános opciók" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Témázott vezérlők használata" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(a változás újraindítást igényel)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(jelenleg nem elérhető)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Színek: nyomja meg a kiválasztáshoz" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Interfész" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "interfész" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Háttér" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "háttér" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Előtér" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "előtér" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: régi sorok" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diff régi sorok" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: új sorok" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "diff - új sorok" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: nagy headerök" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "diff - nagy headerök" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Megjelölt sor háttér" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "megjelölt sor háttér" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Válasszon hátteret" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Betű: nyomja meg a kiválasztáshoz" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Fő betű" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Diff kijelző betű" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Felhasználói interfész betű" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Gitk beállítások" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Generálás" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: válasszon színt a %s-ra" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" +"Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Nem találhatü git repository itt." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Rossz gitk argumentumok:" -#: gitk:12405 -msgid "Command line" -msgstr "Parancs sor" +#~ msgid "mc" +#~ msgstr "mc" #~ msgid "SHA1 ID: " #~ msgstr "SHA1 ID: " @@ -1397,10 +1417,3 @@ msgstr "Parancs sor" #~ msgid "- stopping\n" #~ msgstr "- abbahagyás.\n" - -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" -#~ "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." diff --git a/po/it.po b/po/it.po index d630bb0..b8212b1 100644 --- a/po/it.po +++ b/po/it.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-01-28 18:41+0100\n" "Last-Translator: Michele Ballabio \n" "Language-Team: Italian\n" @@ -25,7 +25,7 @@ msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -59,14 +59,18 @@ msgstr "Errore nell'esecuzione di git log:" msgid "Reading" msgstr "Lettura in corso" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nessuna revisione selezionata" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Linea di comando" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossibile elaborare i dati di git log:" @@ -75,16 +79,12 @@ msgstr "Impossibile elaborare i dati di git log:" msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1897 -msgid "mc" -msgstr "" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Annulla" @@ -136,15 +136,15 @@ msgstr "Modifica vista..." msgid "Delete view" msgstr "Elimina vista" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Tutti i file" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Informazioni su gitk" @@ -156,7 +156,7 @@ msgstr "Scorciatoie da tastiera" msgid "Help" msgstr "Aiuto" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -172,53 +172,53 @@ msgstr "Trova" msgid "commit" msgstr "revisione" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "contenente:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Esatto" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tutti i campi" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Titolo" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Commenti" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autore" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisione creata da" @@ -246,7 +246,7 @@ msgstr "Linee di contesto" msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -258,102 +258,110 @@ msgstr "Modifiche" msgid "Tree" msgstr "Directory" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crea patch" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Segna questa revisione" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Torna alla revisione segnata" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Trova il discendente di questa revisione e di quella segnata" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Confronta con la revisione segnata" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diff questo -> selezionato" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diff selezionato -> questo" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Segna questa revisione" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Attiva questo ramo" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Visualizza differenze in un altro programma" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Annota la revisione precedente" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Mostra la provenienza di questa riga" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Esegui git gui blame su questa riga" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -371,316 +379,321 @@ msgstr "" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Chiudi" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tTrova" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tVai alla prima revisione" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tVai all'ultima revisione" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tVai più in alto di una revisione" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tVai più in basso di una revisione" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tTorna indietro nella cronologia" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tVai avanti nella cronologia" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "" "\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tScorri la vista delle differenze in alto di una pagina" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tTrova in avanti" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tVai all'ultima revisione" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tCursore nel box di ricerca" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAggiorna" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Errore durante la creazione della directory temporanea %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Errore nella lettura di \"%s\" da %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "impossibile eseguire il comando:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Revisione inesistente" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: impossibile eseguire il comando:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossibile leggere merge head: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Errore nella lettura dell'indice: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossibile eseguire git blame: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Ricerca in corso" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Errore nell'esecuzione di git blame: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Impossibile eseguire il visualizzatore di differenze:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Rami ed etichette" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Tutti i riferimenti" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Tutti i rami (locali)" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Tutte le etichette" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Tutti i rami remoti" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informazioni sulla revisione (espressioni regolari):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Autore:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Revisione creata da:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Messaggio di revisione:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Modifiche ai file:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Stringa fissa" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Espressione regolare" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Cerca stringa:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -688,201 +701,201 @@ msgstr "" "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Da:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "A:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita e/o salta N revisioni (intero positivo):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Numero di revisioni da mostrare:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Numero di revisioni da saltare:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Altre opzioni:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordina solo per data" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Segna i lati del ramo" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limita al primo genitore" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Cronologia semplificata" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Ulteriori argomenti da passare a git log:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando che genera altre revisioni da visualizzare:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: modifica vista" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- criteri per la scelta delle revisioni" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Nome vista" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Applica (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nessuno" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Discendente" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Non discendente" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Ascendente" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "molti" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Etichette:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Genitore" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Figlio" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Errore nella lettura delle differenze:" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Vai a:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "La revisione %s è sconosciuta" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisione %s non è presente nella vista attuale" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Figli" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Nessun ramo attivo: reset impossibile" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Salto la revisione di fusione " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Errore nella identificazione della patch per " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - fine\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "La revisione " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -890,7 +903,7 @@ msgstr "" " ha le stesse differenze di\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -898,7 +911,7 @@ msgstr "" " è diversa da\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -906,129 +919,129 @@ msgstr "" "Differenze tra le revisioni:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " ha %s figli - fine\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Errore nella scrittura della revisione nel file: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Errore nelle differenze tra le revisioni: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Inizio" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "Da" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Genera patch" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "Da:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "A:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Inverti" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Genera" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "Il messaggio dell'etichetta è opzionale" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Messaggio dell'etichetta:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crea" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Scrivi" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Il ramo '%s' esiste già. Sovrascrivere?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1039,7 +1052,7 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1047,21 +1060,21 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "git reset in corso" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1072,7 +1085,7 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1081,28 +1094,28 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Conferma git reset" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1110,19 +1123,19 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "git reset in corso" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1131,16 +1144,16 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1148,220 +1161,222 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Etichetta" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Nascondi i riferimenti remoti" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Mostra etichette vicine" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limita le differenze ai percorsi elencati" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Attiva codifica file per file" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Visualizzatore di differenze" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Scegli..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Opzioni generali" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Utilizza interfaccia a tema" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(una modifica richiede il riavvio)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(momentaneamente non disponibile)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Interfaccia" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "interfaccia" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Sfondo" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "sfondo" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Primo piano" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "primo piano" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "vecchie linee" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "nuove linee" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "intestazione della sezione" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Sfondo riga selezionata" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "sfondo riga selezionata" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Sfondo" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Carattere principale" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Preferenze gitk" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Genera" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: scegliere un colore per %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" -#: gitk:12405 -msgid "Command line" -msgstr "Linea di comando" - #~ msgid "next" #~ msgstr "succ" diff --git a/po/ja.po b/po/ja.po index db47a4c..8bbc67f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-11-06 01:45+0900\n" "Last-Translator: Mizar \n" "Language-Team: Japanese\n" @@ -26,7 +26,7 @@ msgstr "マージされていないファイルのリストを取得できませ msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -60,14 +60,18 @@ msgstr "git log 実行エラー:" msgid "Reading" msgstr "読み込み中" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "コミット読み込み中..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "コミットが選択されていません" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "コマンド行" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "git log の出力を解析できません:" @@ -76,16 +80,12 @@ msgstr "git log の出力を解析できません:" msgid "No commit information available" msgstr "有効なコミットの情報がありません" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "キャンセル" @@ -137,15 +137,15 @@ msgstr "ビュー編集..." msgid "Delete view" msgstr "ビュー削除" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "全てのファイル" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "ビュー" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "gitk について" @@ -157,7 +157,7 @@ msgstr "キーバインディング" msgid "Help" msgstr "ヘルプ" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -173,53 +173,53 @@ msgstr "検索" msgid "commit" msgstr "コミット" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "含む:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "パスの一部:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "追加/除去する文字列:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "英字の大小を区別する" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "英字の大小を区別しない" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "正規表現" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "全ての項目" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "コメント" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "作者" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "コミット者" @@ -247,7 +247,7 @@ msgstr "文脈行数" msgid "Ignore space change" msgstr "空白の違いを無視" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -259,102 +259,110 @@ msgstr "パッチ" msgid "Tree" msgstr "ツリー" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "パッチ作成" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "タグ生成" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "コミットをファイルに書き出す" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "新規ブランチ生成" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "このコミットをチェリーピックする" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "ブランチのHEADをここにリセットする" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "このコミットにマークをつける" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "マークを付けた所に戻る" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "これとマークをつけた所との子孫を見つける" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "このコミットにマークをつける" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "このブランチをチェックアウトする" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "このブランチを除去する" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "これもハイライトさせる" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "これだけをハイライトさせる" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "外部diffツール" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "親コミットから blame をかける" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "この行の出自を表示する" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -371,315 +379,320 @@ msgstr "" "\n" "使用および再配布は GNU General Public License に従ってください" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "閉じる" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk キーバインディング" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk キーバインディング:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\t検索" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\t最初のコミットに移動" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\t最後のコミットに移動" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\t一つ上のコミットに移動" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\t一つ下のコミットに移動" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\t履歴の前に戻る" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\t履歴の次へ進む" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tコミットリストの一つ上のページに移動" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tコミットリストの一つ下のページに移動" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストの一番下にスクロールする" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\t後方を検索 (上方の・新しいコミット)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\t前方を検索（下方の・古いコミット）" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tdiff画面を上のページにスクロールする" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tdiff画面を上のページにスクロールする" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tdiff画面を下のページにスクロールする" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiff画面を上に18行スクロールする" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiff画面を下に18行スクロールする" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索して移動" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\t次を検索して移動" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\t最後のコミットに移動" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスにフォーカス" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\t前を検索して移動" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次のファイルにdiff画面をスクロールする" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiff画面の次を検索" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiff画面の前を検索" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t文字サイズを拡大" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t文字サイズを拡大" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t文字サイズを縮小" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t文字サイズを縮小" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\t更新" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生成時エラー:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" のエラーが %s に発生:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "そのようなコミットはありません" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージする HEAD を読み込めません: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "インデックス読み込みエラー: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始められません: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "検索中" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s に由来するその行は、このビューに表示されていません" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "このビューを記憶する" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りのリスト）:" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "ブランチ＆タグ:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "全てのリファレンス" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "全ての（ローカルな）ブランチ" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "全てのタグ" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "全てのリモート追跡ブランチ" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "コミット情報（正規表現）:" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "作者:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "コミット者:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "変更したファイル:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "固定文字列" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "正規表現" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "検索文字列:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -687,202 +700,202 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "期間の始め:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "期間の終わり:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制限・省略するリビジョンの数（正の整数）:" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "表示する数:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "省略する数:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "その他のオプション:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "厳密に日付順で並び替え" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "側枝マーク" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "最初の親に制限" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "簡易な履歴" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "git log への追加の引数:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "コミット追加コマンド:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" -#: gitk:4224 +#: gitk:4241 #, fuzzy msgid "View Name" msgstr "ビュー名:" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "適用 (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "コミット選択引数のエラー:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "無し" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "子孫" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "非子孫" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "祖先" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "非祖先" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "ステージされた、コミット前のローカルな変更" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージされていない、コミット前のローカルな変更" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "多数" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "タグ:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "親" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "子" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "ブランチ" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "下位" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "上位" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "diff取得エラー: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Goto:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s を含む SHA1 ID は複数存在します" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s は不明です" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s は不明です" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s は現在のビューにはありません" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "日付" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "子" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランチをここにリセットする" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "切り離されたHEAD: リセットできません" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "コミットマージをスキップ: " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "パッチ取得エラー: ID " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - 停止\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "コミット " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -890,7 +903,7 @@ msgstr "" " は下記のパッチと同等\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -898,7 +911,7 @@ msgstr "" " 下記からのdiff\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -906,131 +919,131 @@ msgstr "" "コミットのdiff:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " には %s の子があります - 停止\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルへのコミット書き出しエラー: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットのdiff実行エラー: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Top" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "From" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "To" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "パッチ生成" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "From:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "To:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "逆" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "生成" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "パッチ生成エラー:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "タグ名:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9251 +#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "タグ名:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "生成" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "タグの名称が指定されていません" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "タグ \"%s\" は既に存在します" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "タグ生成エラー:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "コマンド:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "書き出し" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "コミット書き出しエラー:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "名前:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "新しいブランチの名前を指定してください" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランチ '%s' は既に存在します。上書きしますか？" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "チェリーピック中" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1040,7 +1053,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1048,22 +1061,22 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "何の変更もコミットされていません" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "リセット中" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1073,7 +1086,7 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1082,28 +1095,28 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "確認を取り消す" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランチ %s を %s にリセットしますか？" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーもインデックスもそのままにする" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1111,19 +1124,19 @@ msgstr "" "Hard: 作業ツリーやインデックスをリセット\n" "（「全ての」ローカルな変更を破棄）" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "リセット中" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "チェックアウト" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "現在チェックアウトされているブランチを削除することはできません" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1132,16 +1145,16 @@ msgstr "" "ブランチ %s には他のブランチに存在しないコミットがあります。\n" "本当にブランチ %s を削除しますか？" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "タグとHEAD: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "フィルター" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1149,220 +1162,225 @@ msgstr "" "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" "ようです。" -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "タグ" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "ID" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk フォント選択" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線の本数）" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインに対する％）" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "ローカルな変更を表示" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "SHA1 の自動選択" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "リモートリファレンスを隠す" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "近くのタグを表示する" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "diff をリストのパスに制限" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "ファイルごとのエンコーディングのサポート" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "選択..." -#: gitk:11374 +#: gitk:11395 #, fuzzy msgid "General options" msgstr "パッチ生成" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "色: ボタンを押して選択" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "インターフェイス" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "インターフェイス" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "背景" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "背景" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "前景" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "前景" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: 旧バージョン" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diff 旧バージョン" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: 新バージョン" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "diff 新バージョン" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "マーク行の背景" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "マーク行の背景" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "選択の背景" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押して選択" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "主フォント" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "UI用フォント" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Gitk 設定" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "生成" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s」 の色を選択" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "ここにはgitリポジトリがありません。" -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" -#: gitk:12405 -msgid "Command line" -msgstr "コマンド行" +#~ msgid "mc" +#~ msgstr "mc" #~ msgid "SHA1 ID: " #~ msgstr "SHA1 ID: " diff --git a/po/pt_br.po b/po/pt_br.po index 80d24bc..07e5d63 100644 --- a/po/pt_br.po +++ b/po/pt_br.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-12-06 23:39-0200\n" "Last-Translator: Alexandre Erwin Ittner \n" "Language-Team: Brazilian Portuguese <>\n" @@ -26,7 +26,7 @@ msgstr "Não foi possível obter a lista dos arquivos não mesclados:" msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -60,14 +60,18 @@ msgstr "Erro ao executar git log:" msgid "Reading" msgstr "Lendo" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lendo revisões..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nenhuma revisão foi selecionada" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Linha de comando" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Não foi possível interpretar a saída do \"git log\":" @@ -76,16 +80,12 @@ msgstr "Não foi possível interpretar a saída do \"git log\":" msgid "No commit information available" msgstr "Não há informações disponíveis sobre a revisão" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" @@ -137,15 +137,15 @@ msgstr "Editar vista..." msgid "Delete view" msgstr "Apagar vista" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Todos os arquivos" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Exibir" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Sobre o gitk" @@ -157,7 +157,7 @@ msgstr "Atalhos de teclado" msgid "Help" msgstr "Ajuda" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -173,53 +173,53 @@ msgstr "Encontrar" msgid "commit" msgstr "Revisão" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "contendo:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "envolvendo os caminhos:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Adicionando/removendo texto:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exatamente" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignorar maiúsculas/minúsculas" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Expressão regular" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos os campos" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Assunto" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Descrição da revisão" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisor" @@ -247,7 +247,7 @@ msgstr "Número de linhas de contexto" msgid "Ignore space change" msgstr "Ignorar mudanças de caixa" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -259,102 +259,110 @@ msgstr "Diferenças" msgid "Tree" msgstr "Árvore" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Criar patch" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Criar etiqueta" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Salvar revisão para um arquivo" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Criar novo ramo" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Fazer cherry-pick desta revisão" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Redefinir HEAD para cá" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Marcar esta revisão" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Voltar à marca" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Encontrar descendente e marcar" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Comparar com a revisão marcada" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Marcar esta revisão" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Efetuar checkout deste ramo" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Excluir este ramo" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Marcar este também" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Marcar apenas este" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Diff externo" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Anotar revisão anterior" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Exibir origem desta linha" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Executar 'git blame' nesta linha" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -371,315 +379,320 @@ msgstr "" "\n" "Uso e distribuição segundo os termos da Licença Pública Geral GNU" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Fechar" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Atalhos de teclado" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Atalhos de teclado:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSair" -#: gitk:3046 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFechar janela" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tIr para a primeira revisão" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tIr para a última revisão" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tIr para uma revisão acima" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tIr para uma revisão abaixo" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tVoltar no histórico" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvançar no histórico" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tSubir uma página na lista de revisões" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tDescer uma página na lista de revisões" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRolar para o início da lista de revisões" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRolar para o final da lista de revisões" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tProcurar próxima (revisões mas recentes)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tProcurar anterior (revisões mais antigas)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tRola alterações uma página acima" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tRolar alterações uma página abaixo" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tRolar alterações uma página abaixo" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRolar alterações 18 linhas acima" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRolar alterações 18 linhas abaixo" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tProcurar" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tIr para a próxima ocorrência" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tIr para a próxima ocorrência" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tIr para a última revisão" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tPor foco na caixa de busca" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tIr para a ocorrência anterior" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRolar alterações para o próximo arquivo" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamanho da fonte" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamanho da fonte" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tReduzir tamanho da fonte" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tReduzir tamanho da fonte" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAtualizar" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erro ao criar o diretório temporário %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erro ao ler \"%s\" de %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "O comando falhou:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Revisão não encontrada" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "Comando 'git gui blame' falhou:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossível ler merge head: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Erro ao ler o índice: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Não foi possível inciar o 'git blame': %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Procurando" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Erro ao executar 'git blame': %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Esta linha vem da revisão %s, que não está nesta vista" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Erro do visualizador de alterações externo:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Definir vista" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Lembrar esta vista" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referências (separar a lista com um espaço):" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Ramos & etiquetas:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Todas as referências" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Todos os ramos locais" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Todas as etiquetas" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Todos os ramos de rastreio" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informações da revisão (expressões regulares):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Revisor:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Descrição da revisão:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Mudanças para os arquivos:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Texto fixo" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Expressão regular" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Texto de busca" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -687,201 +700,201 @@ msgstr "" "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Desde:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Até:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Número para mostrar:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Número para ignorar:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Opções diversas:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordenar estritamente pela data" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Marcar os dois lados do ramo" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Limitar ao primeiro antecessor" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Histórico simplificado" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Argumentos adicionais para o 'git log':" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Arquivos e diretórios para incluir, um por linha" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando para gerar mais revisões para incluir:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: editar vista" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- critérios para selecionar revisões" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Nome da vista" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Aplicar (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Erro nos argumentos de seleção de revisões:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nenhum" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendente de" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Não descendente de" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antecessor de" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Não antecessor de" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Mudanças locais marcadas, porém não salvas" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Mudanças locais não marcadas" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "muitas" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Antecessor" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Descendente" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erro ao obter diferenças: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Ir para:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "O id SHA1 %s é ambíguo" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Revisão %s desconhecida" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s desconhecido" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A revisão %s não está na vista atual" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Descendentes" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Redefinir ramo %s para este ponto" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Detached head: impossível redefinir" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Saltando revisão de mesclagem" -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Erro ao obter patch ID para" -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "- parando\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Revisão" -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -889,13 +902,13 @@ msgstr "" "é o mesmo patch que\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " msgstr "difere de" -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -903,129 +916,129 @@ msgstr "" "Diferença de revisões:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "possui %s descendentes - parando\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erro ao salvar revisão para o arquivo: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erro ao comparar revisões: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Início" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "Para" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Gerar patch" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Inverter" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Arquivo de saída:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Gerar" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Erro ao criar patch:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Nome da etiqueta:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "A descrição da etiqueta é opcional" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Descrição da etiqueta" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Criar" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Nome da etiqueta não indicado" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Etiqueta \"%s\" já existe" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Erro ao criar etiqueta:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Exportar" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Erro ao exportar revisão" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Indique um nome para o novo ramo" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "O ramo \"%s\" já existe. Sobrescrever?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1035,7 +1048,7 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1043,21 +1056,21 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nenhuma revisão foi salva" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Redefinindo" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1067,7 +1080,7 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1076,28 +1089,28 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar redefinição" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Você realmente deseja redefinir o ramo %s para %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Tipo de redefinição" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: deixa a árvore de trabalho e o índice intocados" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1105,19 +1118,19 @@ msgstr "" "Hard: Redefine a árvore de trabalho e o índice\n" "(descarta TODAS as mudanças locais)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Redefinindo" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Abrindo" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossível excluir o ramo atualmente aberto" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1126,16 +1139,16 @@ msgstr "" "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" "Você realmente deseja excluir ramo \"%s\"?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Referências: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1143,221 +1156,226 @@ msgstr "" "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " "antecessoras/sucessoras estarão incompletas" -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Selecionar fontes do Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Opções da lista de revisões" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Largura máxima do grafo (linhas)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largura máxima do grafo (% do painel)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Exibir mudanças locais" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Selecionar o SHA1 automaticamente" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Ocultar referências remotas" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Opções de exibição das alterações" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Espaços por tabulação" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Exibir etiquetas próximas" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar diferenças aos caminhos listados" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Usar codificações distintas por arquivo" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Ferramenta 'diff' externa" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Selecionar..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Opções gerais" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Usar temas para as janelas" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(exige reinicialização)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(atualmente indisponível)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Cores: clique para escolher" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Interface" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "interface" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Segundo plano" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "segundo plano" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Primeiro plano" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "primeiro plano" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: linhas excluídas" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "linhas excluídas" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: linhas adicionadas" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "linhas adicionadas" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabeçalho do bloco" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "cabeçalho do bloco" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "2º plano da linha marcada" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "segundo plano da linha marcada" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "2º plano da seleção" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Fontes: clique para escolher" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Fonte principal" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Fonte da lista de mudanças" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Fonte da interface" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Preferências do Gitk" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Gerar" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: selecionar cor para %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Não há nenhum repositório git aqui." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de " "arquivo)" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorretos para o gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Linha de comando" +#~ msgid "mc" +#~ msgstr "mc" #~ msgid "next" #~ msgstr "Próximo" diff --git a/po/ru.po b/po/ru.po index faba672..f1bac87 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-04-24 16:00+0200\n" "Last-Translator: Alex Riesen \n" "Language-Team: Russian\n" @@ -22,7 +22,7 @@ msgstr "Невозможно получить список файлов неза msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" @@ -56,14 +56,18 @@ msgstr "Ошибка запуска git log:" msgid "Reading" msgstr "Чтение" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Чтение версий..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Ничего не выбрано" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Командная строка" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Ошибка обработки вывода команды git log:" @@ -72,16 +76,12 @@ msgstr "Ошибка обработки вывода команды git log:" msgid "No commit information available" msgstr "Нет информации о состоянии" -#: gitk:1897 -msgid "mc" -msgstr "" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Отмена" @@ -133,15 +133,15 @@ msgstr "Редактировать представление..." msgid "Delete view" msgstr "Удалить представление" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Все файлы" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Представление" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "О gitk" @@ -153,7 +153,7 @@ msgstr "Назначения клавиатуры" msgid "Help" msgstr "Подсказка" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -169,53 +169,53 @@ msgstr "Поиск" msgid "commit" msgstr "состояние" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "содержащее:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "касательно файлов:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "добавив/удалив строку:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Точно" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Игнорировать большие/маленькие" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Регулярные выражения" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Во всех полях" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Заголовок" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Комментарии" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Автор" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Сохранивший состояние" @@ -243,7 +243,7 @@ msgstr "Строк контекста" msgid "Ignore space change" msgstr "Игнорировать пробелы" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" @@ -255,103 +255,111 @@ msgstr "Патч" msgid "Tree" msgstr "Файлы" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Сравнить это состояние с выделенным" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Сравнить выделенное с этим состоянием" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Создать патч" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Создать метку" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Сохранить изменения в файл" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Создать ветвь" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Скопировать это состояние" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Установить HEAD на это состояние" -#: gitk:2624 +#: gitk:2625 #, fuzzy msgid "Mark this commit" msgstr "Скопировать это состояние" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Сравнить это состояние с выделенным" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Сравнить выделенное с этим состоянием" -#: gitk:2630 +#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Скопировать это состояние" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Перейти на эту ветвь" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Удалить эту ветвь" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Подсветить этот тоже" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Подсветить только этот" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Программа сравнения" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Аннотировать родительское состояние" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Показать источник этой строки" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Запустить git gui blame для этой строки" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -368,667 +376,672 @@ msgstr "" "\n" "Использование и распространение согласно условиям GNU General Public License" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Закрыть" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Назначения клавиатуры в Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Назначения клавиатуры в Gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tЗавершить" -#: gitk:3046 +#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tПоиск" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tПерейти к первому состоянию" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tПерейти к последнему состоянию" -#: gitk:3049 +#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tПерейти к следующему состоянию" -#: gitk:3050 +#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tПерейти к предыдущему состоянию" -#: gitk:3051 +#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tПоказать ранее посещённое состояние" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tПоказать следующее посещённое состояние" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tПерейти на страницу выше в списке состояний" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tПерейти на страницу ниже в списке состояний" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tПоказать начало списка состояний" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tПоказать конец списка состояний" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tПровернуть список состояний вверх" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tПровернуть список состояний вниз" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tПровернуть список состояний на страницу вверх" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tПровернуть список состояний на страницу вниз" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tПоиск в обратном порядке (вверх, среди новых состояний)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tПоиск (вниз, среди старых состояний)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tПрокрутить список изменений на страницу выше" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tПрокрутить список изменений на страницу выше" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tПрокрутить список изменений на страницу ниже" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tПоиск" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tПерейти к следующему найденному состоянию" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tПерейти к следующему найденному состоянию" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tПерейти к последнему состоянию" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tПерейти к полю поиска" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tПерейти к предыдущему найденному состоянию" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tПрокрутить список изменений к следующему файлу" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tУвеличить размер шрифта" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tУвеличить размер шрифта" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tУменьшить размер шрифта" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tУменьшить размер шрифта" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tОбновить" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Ошибка создания временного каталога %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Ошибка получения \"%s\" из %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "ошибка выполнения команды:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Состояние не найдено" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: ошибка выполнения команды:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Ошибка чтения MERGE_HEAD: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Ошибка чтения индекса: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Ошибка запуска git blame: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Поиск" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Ошибка выполнения git blame: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Эта строка принадлежит состоянию %s, которое не показано в этом представлении" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Ошибка выполнения программы сравнения:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk определение представлений" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Запомнить представление" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "" -#: gitk:4060 +#: gitk:4077 #, fuzzy msgid "All refs" msgstr "Все файлы" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "" -#: gitk:4065 +#: gitk:4082 #, fuzzy msgid "Author:" msgstr "Автор" -#: gitk:4066 +#: gitk:4083 #, fuzzy msgid "Committer:" msgstr "Сохранивший состояние" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "" -#: gitk:4069 -msgid "Matches none Commit Info criteria" +#: gitk:4086 +msgid "Matches no Commit Info criteria" msgstr "" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "" -#: gitk:4073 +#: gitk:4090 #, fuzzy msgid "Search string:" msgstr "Поиск" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" -#: gitk:4075 +#: gitk:4092 #, fuzzy msgid "Since:" msgstr "С даты:" -#: gitk:4076 +#: gitk:4093 #, fuzzy msgid "Until:" msgstr "По дату:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Строгая сортировка по дате" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Отметить стороны ветвей" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Ограничить первым предком" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "" -#: gitk:4085 +#: gitk:4102 #, fuzzy msgid "Additional arguments to git log:" msgstr "Включить состояния (аргументы для git-log):" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Дополнительная команда для списка состояний:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "" -#: gitk:4219 +#: gitk:4236 #, fuzzy msgid "-- criteria for selecting revisions" msgstr "Ошибка в идентификаторе версии:" -#: gitk:4224 +#: gitk:4241 #, fuzzy msgid "View Name" msgstr "Представление" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Применить (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Ошибка в параметрах выбора состояний:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Ни одного" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Порождённое" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Не порождённое" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Предок" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Не предок" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Изменения зарегистрированные в индексе, но не сохранённые" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Изменения в рабочем каталоге, не зарегистрированные в индексе" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Таги:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Предок" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Потомок" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Ветвь" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Следует за" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Предшествует" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Ошибка получения изменений: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Перейти к:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" -#: gitk:8659 +#: gitk:8678 #, fuzzy, tcl-format msgid "Revision %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Дата" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Потомки" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Установить ветвь %s на это состояние" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Состояние не принадлежит ни одной ветви, переход невозможен" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "" -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 #, fuzzy msgid "Error getting patch ID for " msgstr "Ошибка создания патча:" -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 #, fuzzy msgid "Commit " msgstr "состояние" -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " msgstr "" -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " msgstr "" -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" msgstr "" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "" -#: gitk:9066 +#: gitk:9085 #, fuzzy, tcl-format msgid "Error writing commit to file: %s" msgstr "Ошибка сохранения состояния:" -#: gitk:9072 +#: gitk:9091 #, fuzzy, tcl-format msgid "Error diffing commits: %s" msgstr "Ошибка сохранения состояния:" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Верх" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "От" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "До" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Создать патч" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "От:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "До:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "В обратном порядке" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Файл для сохранения:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Создать" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Ошибка создания патча:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Имя метки:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9251 +#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Имя метки:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Создать" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Не задано имя метки" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Метка \"%s\" уже существует" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Ошибка создания метки:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Команда:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Запись" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Ошибка сохранения состояния:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Имя:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Укажите имя для новой ветви" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Ветвь '%s' уже существует. Переписать?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Копирование изменений" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1037,7 +1050,7 @@ msgstr "" "Копирование невозможно из-за изменений в файле '%s'.\n" "Сохраните или отмените изменения и повторите операцию." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1045,21 +1058,21 @@ msgstr "" "Копирование изменений невозможно из-за незавершённой операции слияния.\n" "Запустить git citool для завершения этой операции?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Изменения не сохранены" -#: gitk:9574 +#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Состояние %s уже принадлежит ветви %s. Продолжить операцию?" -#: gitk:9579 +#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Установка" -#: gitk:9587 +#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1068,7 +1081,7 @@ msgstr "" "Копирование невозможно из-за изменений в файле '%s'.\n" "Сохраните или отмените изменения и повторите операцию." -#: gitk:9591 +#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1077,28 +1090,28 @@ msgstr "" "Копирование изменений невозможно из-за незавершённой операции слияния.\n" "Запустить git citool для завершения этой операции?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Подтвердите операцию перехода" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Установить ветвь %s на состояние %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Тип операции перехода:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1106,19 +1119,19 @@ msgstr "" "Жесткий: переписать индекс и рабочий каталог\n" "(все изменения в рабочем каталоге будут потеряны)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Установка" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Переход" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Активная ветвь не может быть удалена" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1127,16 +1140,16 @@ msgstr "" "Состояния ветви %s больше не принадлежат никакой другой ветви.\n" "Действительно удалить ветвь %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Метки и ветви: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Фильтровать" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1144,222 +1157,226 @@ msgstr "" "Ошибка чтения истории проекта; информация о ветвях и состояниях вокруг меток " "(до/после) может быть неполной." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Метка" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Шрифт Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "Ж" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "К" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Параметры показа списка состояний" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Макс. ширина графа (строк)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Макс. ширина графа (% ширины панели)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Показывать изменения в рабочем каталоге" -#: gitk:11340 +#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Выделить SHA1" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Параметры показа изменений" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Ширина табуляции" -#: gitk:11353 +#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Показывать близкие метки" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Ограничить показ изменений выбранными файлами" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Поддержка кодировок в отдельных файлах" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Программа для показа изменений" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Выберите..." -#: gitk:11374 +#: gitk:11395 #, fuzzy msgid "General options" msgstr "Создать патч" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Цвета: нажмите для выбора" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "" -#: gitk:11396 +#: gitk:11417 #, fuzzy msgid "interface" msgstr "Шрифт интерфейса" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Фон" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "фон" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Передний план" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "передний план" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Изменения: старый текст" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "старый текст изменения" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Изменения: новый текст" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "новый текст изменения" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Изменения: заголовок блока" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "заголовок блока изменений" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Фон выбранной строки" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "фон выбранной строки" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Выберите фон" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Шрифт: нажмите для выбора" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Основной шрифт" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Шрифт показа изменений" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Шрифт интерфейса" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Настройки Gitk" -#: gitk:11473 +#: gitk:11494 #, fuzzy msgid "General" msgstr "Создать" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: выберите цвет для %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"К сожалению gitk не может работать с этой версий Tcl/Tk.\n" +"Требуется как минимум Tcl/Tk 8.4." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Git-репозитарий не найден в текущем каталоге." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Неоднозначный аргумент '%s': существует как версия и имя файла" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Неправильные аргументы для gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Командная строка" - #~ msgid "SHA1 ID: " #~ msgstr "SHA1:" @@ -1387,12 +1404,5 @@ msgstr "Командная строка" #~ msgid "Tag/Head %s is not known" #~ msgstr "Метка или ветвь %s не найдена" -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "К сожалению gitk не может работать с этой версий Tcl/Tk.\n" -#~ "Требуется как минимум Tcl/Tk 8.4." - #~ msgid "Cannot find the git directory \"%s\"." #~ msgstr "Git-репозитарий \"%s\" не найден." diff --git a/po/sv.po b/po/sv.po index 9dbb779..0bd46d7 100644 --- a/po/sv.po +++ b/po/sv.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-03-27 10:31+0100\n" "Last-Translator: Peter Krefting \n" "Language-Team: Swedish \n" @@ -28,7 +28,7 @@ msgstr "Kunde inte hämta lista över ej sammanslagna filer:" msgid "Color words" msgstr "Färga ord" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Märk upp ord" @@ -62,14 +62,18 @@ msgstr "Fel vid körning av git log:" msgid "Reading" msgstr "Läser" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Inga incheckningar markerade" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Kommandorad" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata från git log:" @@ -78,16 +82,12 @@ msgstr "Kan inte tolka utdata från git log:" msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Avbryt" @@ -139,15 +139,15 @@ msgstr "Ändra vy..." msgid "Delete view" msgstr "Ta bort vy" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Alla filer" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Visa" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Om gitk" @@ -159,7 +159,7 @@ msgstr "Tangentbordsbindningar" msgid "Help" msgstr "Hjälp" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1-id:" @@ -175,53 +175,53 @@ msgstr "Sök" msgid "commit" msgstr "incheckning" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "som innehåller:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "ändrar rader som matchar:" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exakt" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Alla fält" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Rubrik" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Kommentarer" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Författare" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Incheckare" @@ -249,7 +249,7 @@ msgstr "Rader sammanhang" msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Rad-diff" @@ -261,99 +261,107 @@ msgstr "Patch" msgid "Tree" msgstr "Träd" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "Diff denna -> markerad incheckning" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "Diff markerad incheckning -> denna" -#: gitk:2630 +#: gitk:2631 msgid "Revert this commit" msgstr "Ångra denna incheckning" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "Extern diff" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:3011 +#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -369,327 +377,317 @@ msgstr "" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:3011 -msgid "" -"\n" -"Gitk - a commit viewer for git\n" -"\n" -"Copyright © 2005-2015 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-2015 Paul Mackerras\n" -"\n" -"Använd och vidareförmedla enligt villkoren i GNU General Public License" - -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Stäng" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:3046 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tGå till första incheckning" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tGå till sista incheckning" -#: gitk:3049 +#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tGå en incheckning upp" -#: gitk:3050 +#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tGå en incheckning ned" -#: gitk:3051 +#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tGå bakåt i historiken" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tGå framåt i historiken" -#: gitk:3053 +#: gitk:3056 #, 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:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tGå upp en sida i incheckningslistan" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tGå ned en sida i incheckningslistan" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tRulla diffvisningen upp en sida" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tRulla diffvisningen upp en sida" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\tRulla diffvisningen ned en sida" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tGå till nästa sökträff" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\t\tGå till nästa sökträff" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tGå till sista incheckning" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:3075 +#: gitk:3079 #, 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:3076 +#: gitk:3080 #, 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:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tUppdatera" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av \"%s\" från %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Söker" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3921 +#: gitk:3925 #, 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:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Alla referenser" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Alla taggar" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Författare:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Incheckare:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:4069 -msgid "Matches none Commit Info criteria" +#: gitk:4086 +#, fuzzy +msgid "Matches no Commit Info criteria" msgstr "Motsvarar inga kriterier för incheckningsinfo" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Söksträng:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -697,201 +695,201 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Från:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Till:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Enkel historik" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Namn på vy" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Inget" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Avkomling" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Förfader" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "med många flera" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "många" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Taggar:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Förälder" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Barn" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Gren" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Följer" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Föregår" -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Gå till:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Datum" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Barn" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Incheckning " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -899,7 +897,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -907,7 +905,7 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -915,131 +913,131 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Topp" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "Från" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "Till" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Generera patch" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "Från:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "Till:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Vänd" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Generera" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "Id:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Skapa" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Kommando:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Skriv" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Namn:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:9511 +#: gitk:9530 #, 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:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1049,7 +1047,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1057,20 +1055,20 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9574 +#: gitk:9593 #, 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:9579 +#: gitk:9598 msgid "Reverting" msgstr "Ångrar" -#: gitk:9587 +#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1080,7 +1078,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9591 +#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1088,28 +1086,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:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1117,19 +1115,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Återställer" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Checkar ut" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1138,16 +1136,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Filter" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1155,216 +1153,238 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Tagg" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "F" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "K" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:11340 +#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:11353 +#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Visa närliggande taggar/huvuden" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Välj..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Använd tema på fönsterelement" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Gränssnitt" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "gränssnitt" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Bakgrund" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "bakgrund" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Förgrund" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "förgrund" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:11473 +#: gitk:11494 msgid "General" msgstr "Allmänt" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "Färger" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "Teckensnitt" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" +"Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" +" Gitk kräver åtminstone Tcl/Tk 8.4." + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Hittar inget git-arkiv här." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Kommandorad" +#~ msgid "mc" +#~ msgstr "mc" + +#~ msgid "" +#~ "\n" +#~ "Gitk - a commit viewer for git\n" +#~ "\n" +#~ "Copyright © 2005-2015 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-2015 Paul Mackerras\n" +#~ "\n" +#~ "Använd och vidareförmedla enligt villkoren i GNU General Public License" #~ msgid "next" #~ msgstr "nästa" @@ -1384,13 +1404,6 @@ msgstr "Kommandorad" #~ msgid "- stopping\n" #~ msgstr "- stannar\n" -#~ msgid "" -#~ "Sorry, gitk cannot run with this version of Tcl/Tk.\n" -#~ " Gitk requires at least Tcl/Tk 8.4." -#~ msgstr "" -#~ "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" -#~ " Gitk kräver åtminstone Tcl/Tk 8.4." - #~ msgid "Tag/Head %s is not known" #~ msgstr "Tagg/huvud %s är okänt" diff --git a/po/vi.po b/po/vi.po index ade9cb7..7133c42 100644 --- a/po/vi.po +++ b/po/vi.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gitk @@GIT_VERSION@@\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-03-15 14:37+1100\n" +"POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2013-12-14 14:40+0700\n" "Last-Translator: Trần Ngọc Quân \n" "Language-Team: Vietnamese \n" @@ -25,7 +25,7 @@ msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn: msgid "Color words" msgstr "Tô màu chữ" -#: gitk:217 gitk:2381 gitk:8201 gitk:8234 +#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Đánh dấu chữ" @@ -58,14 +58,18 @@ msgstr "Gặp lỗi khi thực hiện lệnh git log:" msgid "Reading" msgstr "Đang đọc" -#: gitk:496 gitk:4508 +#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Đang đọc các lần chuyển giao..." -#: gitk:499 gitk:1637 gitk:4511 +#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Chưa chọn các lần chuyển giao" +#: gitk:1445 gitk:4045 gitk:12432 +msgid "Command line" +msgstr "Dòng lệnh" + #: gitk:1511 msgid "Can't parse git log output:" msgstr "Không thể phân tích kết xuất từ lệnh git log:" @@ -74,16 +78,12 @@ msgstr "Không thể phân tích kết xuất từ lệnh git log:" msgid "No commit information available" msgstr "Không có thông tin về lần chuyển giao nào" -#: gitk:1897 -msgid "mc" -msgstr "mc" - -#: gitk:1932 gitk:4298 gitk:9650 gitk:11220 gitk:11500 +#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Đồng ý" -#: gitk:1934 gitk:4300 gitk:9177 gitk:9256 gitk:9372 gitk:9421 gitk:9652 -#: gitk:11221 gitk:11501 +#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 +#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Thôi" @@ -135,15 +135,15 @@ msgstr "Sửa cách trình bày..." msgid "Delete view" msgstr "Xóa cách trình bày" -#: gitk:2088 +#: gitk:2088 gitk:4043 msgid "All files" msgstr "Mọi tập tin" -#: gitk:2083 gitk:4050 +#: gitk:2083 gitk:4067 msgid "View" msgstr "Trình bày" -#: gitk:2093 gitk:2103 gitk:3009 +#: gitk:2093 gitk:2103 gitk:3012 msgid "About gitk" msgstr "Giới thiệu về gitk" @@ -155,7 +155,7 @@ msgstr "Tổ hợp phím" msgid "Help" msgstr "Trợ giúp" -#: gitk:2185 gitk:8633 +#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" @@ -171,53 +171,53 @@ msgstr "Tìm" msgid "commit" msgstr "lần chuyển giao" -#: gitk:2299 gitk:2301 gitk:4669 gitk:4692 gitk:4716 gitk:6736 gitk:6808 -#: gitk:6893 +#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 +#: gitk:6912 msgid "containing:" msgstr "có chứa:" -#: gitk:2302 gitk:3522 gitk:3527 gitk:4745 +#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "đang chạm đường dẫn:" -#: gitk:2303 gitk:4759 +#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "thêm/gỡ bỏ chuỗi:" -#: gitk:2304 gitk:4761 +#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "những dòng thay đổi khớp mẫu:" -#: gitk:2313 gitk:2315 gitk:4748 +#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Chính xác" -#: gitk:2315 gitk:4836 gitk:6704 +#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "BquaHt" -#: gitk:2315 gitk:4718 gitk:4834 gitk:6700 +#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "BTCQ" -#: gitk:2317 gitk:2318 gitk:4856 gitk:4886 gitk:4893 gitk:6829 gitk:6897 +#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Mọi trường" -#: gitk:2318 gitk:4853 gitk:4886 gitk:6767 +#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Nội dung chính" -#: gitk:2319 gitk:4853 gitk:6767 gitk:6897 gitk:7370 +#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Ghi chú" -#: gitk:2319 gitk:4853 gitk:4858 gitk:4893 gitk:6767 gitk:7305 gitk:8811 -#: gitk:8826 +#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 +#: gitk:8845 msgid "Author" msgstr "Tác giả" -#: gitk:2319 gitk:4853 gitk:6767 gitk:7307 +#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Người chuyển giao" @@ -245,7 +245,7 @@ msgstr "Các dòng của nội dung" msgid "Ignore space change" msgstr "Không xét đến thay đổi do khoảng trắng" -#: gitk:2378 gitk:2380 gitk:7940 gitk:8187 +#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Khác biệt theo dòng" @@ -257,99 +257,107 @@ msgstr "Vá" msgid "Tree" msgstr "Cây" -#: gitk:2616 gitk:2636 +#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "So sánh cái này -> cái đã chọn" -#: gitk:2617 gitk:2637 +#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "So sánh cái đã chọn -> cái này" -#: gitk:2618 gitk:2638 +#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Tạo miếng vá" -#: gitk:2619 gitk:9235 +#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Tạo thẻ" -#: gitk:2620 gitk:9352 +#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Ghi lần chuyển giao ra tập tin" -#: gitk:2621 gitk:9409 +#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Tạo nhánh mới" -#: gitk:2622 +#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cherry-pick lần chuyển giao này" -#: gitk:2623 +#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Đặt lại HEAD của nhánh vào đây" -#: gitk:2624 +#: gitk:2625 msgid "Mark this commit" msgstr "Đánh dấu lần chuyển giao này" -#: gitk:2625 +#: gitk:2626 msgid "Return to mark" msgstr "Quay lại vị trí dấu" -#: gitk:2626 +#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Tìm con cháu của cái này và cái đã đánh dấu" -#: gitk:2627 +#: gitk:2628 msgid "Compare with marked commit" msgstr "So sánh với lần chuyển giao đã đánh dấu" -#: gitk:2628 gitk:2639 +#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu" -#: gitk:2629 gitk:2640 +#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này" -#: gitk:2630 +#: gitk:2631 msgid "Revert this commit" msgstr "Hoàn lại lần chuyển giao này" -#: gitk:2646 +#: gitk:2647 msgid "Check out this branch" msgstr "Checkout nhánh này" -#: gitk:2647 +#: gitk:2648 msgid "Remove this branch" msgstr "Gỡ bỏ nhánh này" -#: gitk:2654 +#: gitk:2649 +msgid "Copy branch name" +msgstr "" + +#: gitk:2656 msgid "Highlight this too" msgstr "Cũng tô sáng nó" -#: gitk:2655 +#: gitk:2657 msgid "Highlight this only" msgstr "Chỉ tô sáng cái này" -#: gitk:2656 +#: gitk:2658 msgid "External diff" msgstr "diff từ bên ngoài" -#: gitk:2657 +#: gitk:2659 msgid "Blame parent commit" msgstr "Xem công trạng lần chuyển giao cha mẹ" -#: gitk:2664 +#: gitk:2660 +msgid "Copy path" +msgstr "" + +#: gitk:2667 msgid "Show origin of this line" msgstr "Hiển thị nguyên gốc của dòng này" -#: gitk:2665 +#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Chạy lệnh git gui blame cho dòng này" -#: gitk:3011 +#: gitk:3014 #, fuzzy msgid "" "\n" @@ -366,314 +374,319 @@ msgstr "" "\n" "Dùng và phân phối lại phần mềm này theo các điều khoản của Giấy Phép Công GNU" -#: gitk:3019 gitk:3085 gitk:9836 +#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Đóng" -#: gitk:3040 +#: gitk:3043 msgid "Gitk key bindings" msgstr "Tổ hợp phím gitk" -#: gitk:3043 +#: gitk:3046 msgid "Gitk key bindings:" msgstr "Tổ hợp phím gitk:" -#: gitk:3045 +#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tThoát" -#: gitk:3046 +#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tĐóng cửa sổ" -#: gitk:3047 +#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tChuyển đến lần chuyển giao đầu tiên" -#: gitk:3048 +#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tChuyển đến lần chuyển giao cuối" -#: gitk:3049 +#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tDi chuyển lên một lần chuyển giao" -#: gitk:3050 +#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tDi chuyển xuống một lần chuyển giao" -#: gitk:3051 +#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tQuay trở lại danh sách lịch sử" -#: gitk:3052 +#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tDi chuyển tiếp trong danh sách lịch sử" -#: gitk:3053 +#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3054 +#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tDi chuyển lên một trang trong danh sách lần chuyển giao" -#: gitk:3055 +#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tDi chuyển xuống một trang trong danh sách lần chuyển giao" -#: gitk:3056 +#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao" -#: gitk:3057 +#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao" -#: gitk:3058 +#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng" -#: gitk:3059 +#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng" -#: gitk:3060 +#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang" -#: gitk:3061 +#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang" -#: gitk:3062 +#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" -#: gitk:3063 +#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "" "\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" -#: gitk:3064 +#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tCuộn phần trình bày diff lên một trang" -#: gitk:3065 +#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tCuộn phần trình bày diff lên một trang" -#: gitk:3066 +#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tCuộn phần trình bày diff xuống một trang" -#: gitk:3067 +#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng" -#: gitk:3068 +#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng" -#: gitk:3069 +#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTìm kiếm" -#: gitk:3070 +#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp" -#: gitk:3071 +#: gitk:3074 msgid "\tMove to next find hit" msgstr "\t\tDi chuyển đến chỗ gặp kế tiếp" -#: gitk:3072 +#: gitk:3075 +#, fuzzy +msgid "g\t\tGo to commit" +msgstr "\t\tChuyển đến lần chuyển giao cuối" + +#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm" -#: gitk:3073 +#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tDi chuyển đến chỗ gặp kế trước" -#: gitk:3074 +#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế" -#: gitk:3075 +#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp" -#: gitk:3076 +#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước" -#: gitk:3077 +#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tTăng cỡ chữ" -#: gitk:3078 +#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tTăng cỡ chữ" -#: gitk:3079 +#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tGiảm cỡ chữ" -#: gitk:3080 +#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tGiảm cỡ chữ" -#: gitk:3081 +#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tCập nhật" -#: gitk:3546 gitk:3555 +#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Gặp lỗi khi tạo thư mục tạm %s:" -#: gitk:3568 +#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Lỗi chào hỏi \"%s\" từ %s:" -#: gitk:3631 +#: gitk:3635 msgid "command failed:" msgstr "lệnh gặp lỗi:" -#: gitk:3780 +#: gitk:3784 msgid "No such commit" msgstr "Không có lần chuyển giao như vậy" -#: gitk:3794 +#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: lệnh gặp lỗi:" -#: gitk:3825 +#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Không thể độc đầu của hòa trộn: %s" # tcl-format -#: gitk:3833 +#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Gặp lỗi khi đọc chỉ mục: %s" -#: gitk:3858 +#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Không thể khởi chạy git blame: %s" -#: gitk:3861 gitk:6735 +#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Đang tìm kiếm" -#: gitk:3893 +#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Gặp lỗi khi chạy git blame: %s" -#: gitk:3921 +#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này" -#: gitk:3935 +#: gitk:3939 msgid "External diff viewer failed:" msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:" -#: gitk:4053 +#: gitk:4070 msgid "Gitk view definition" msgstr "Định nghĩa cách trình bày gitk" -#: gitk:4057 +#: gitk:4074 msgid "Remember this view" msgstr "Nhớ cách trình bày này" -#: gitk:4058 +#: gitk:4075 msgid "References (space separated list):" msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):" -#: gitk:4059 +#: gitk:4076 msgid "Branches & tags:" msgstr "Nhánh & thẻ:" -#: gitk:4060 +#: gitk:4077 msgid "All refs" msgstr "Mọi tham chiếu" -#: gitk:4061 +#: gitk:4078 msgid "All (local) branches" msgstr "Mọi nhánh (nội bộ)" -#: gitk:4062 +#: gitk:4079 msgid "All tags" msgstr "Mọi thẻ" -#: gitk:4063 +#: gitk:4080 msgid "All remote-tracking branches" msgstr "Mọi nhánh remote-tracking" -#: gitk:4064 +#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Thông tin chuyển giao (biểu thức chính quy):" -#: gitk:4065 +#: gitk:4082 msgid "Author:" msgstr "Tác giả:" -#: gitk:4066 +#: gitk:4083 msgid "Committer:" msgstr "Người chuyển giao:" -#: gitk:4067 +#: gitk:4084 msgid "Commit Message:" msgstr "Chú thích của lần chuyển giao:" -#: gitk:4068 +#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" -#: gitk:4069 +#: gitk:4086 #, fuzzy -msgid "Matches none Commit Info criteria" +msgid "Matches no Commit Info criteria" msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" -#: gitk:4070 +#: gitk:4087 msgid "Changes to Files:" msgstr "Đổi thành Tập tin:" -#: gitk:4071 +#: gitk:4088 msgid "Fixed String" msgstr "Chuỗi cố định" -#: gitk:4072 +#: gitk:4089 msgid "Regular Expression" msgstr "Biểu thức chính quy" -#: gitk:4073 +#: gitk:4090 msgid "Search string:" msgstr "Chuỗi tìm kiếm:" -#: gitk:4074 +#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -681,203 +694,203 @@ msgstr "" "Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4075 +#: gitk:4092 msgid "Since:" msgstr "Kể từ:" -#: gitk:4076 +#: gitk:4093 msgid "Until:" msgstr "Đến:" -#: gitk:4077 +#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):" -#: gitk:4078 +#: gitk:4095 msgid "Number to show:" msgstr "Số lượng hiển thị:" -#: gitk:4079 +#: gitk:4096 msgid "Number to skip:" msgstr "Số lượng sẽ bỏ qua:" -#: gitk:4080 +#: gitk:4097 msgid "Miscellaneous options:" msgstr "Tuỳ chọn hỗn hợp:" -#: gitk:4081 +#: gitk:4098 msgid "Strictly sort by date" msgstr "Sắp xếp chặt chẽ theo ngày" -#: gitk:4082 +#: gitk:4099 msgid "Mark branch sides" msgstr "Đánh dấu các cạnh nhánh" -#: gitk:4083 +#: gitk:4100 msgid "Limit to first parent" msgstr "Giới hạn thành cha mẹ đầu tiên" -#: gitk:4084 +#: gitk:4101 msgid "Simple history" msgstr "Lịch sử dạng đơn giản" -#: gitk:4085 +#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Đối số bổ xung cho lệnh git log:" -#: gitk:4086 +#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Nhập vào các tập tin và thư mục bao gồm, mỗi dòng một cái:" -#: gitk:4087 +#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:" -#: gitk:4211 +#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: sửa cách trình bày" -#: gitk:4219 +#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- tiêu chuẩn chọn điểm xét duyệt" -#: gitk:4224 +#: gitk:4241 msgid "View Name" msgstr "Tên cách trình bày" -#: gitk:4299 +#: gitk:4316 msgid "Apply (F5)" msgstr "Áp dụng (F5)" -#: gitk:4337 +#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Lỗi trong các đối số chọn chuyển giao:" -#: gitk:4392 gitk:4445 gitk:4906 gitk:4920 gitk:6190 gitk:12346 gitk:12347 +#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Không" -#: gitk:5003 gitk:5008 +#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Con cháu" -#: gitk:5004 +#: gitk:5022 msgid "Not descendant" msgstr "Không có con cháu" -#: gitk:5011 gitk:5016 +#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Tổ tiên chung" -#: gitk:5012 +#: gitk:5030 msgid "Not ancestor" msgstr "Không có chung tổ tiên" -#: gitk:5306 +#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "" "Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao" -#: gitk:5342 +#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục" -#: gitk:7115 +#: gitk:7134 msgid "and many more" msgstr "và nhiều nữa" -#: gitk:7118 +#: gitk:7137 msgid "many" msgstr "nhiều" -#: gitk:7309 +#: gitk:7328 msgid "Tags:" msgstr "Thẻ:" -#: gitk:7326 gitk:7332 gitk:8806 +#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Cha" -#: gitk:7337 +#: gitk:7356 msgid "Child" msgstr "Con" -#: gitk:7346 +#: gitk:7365 msgid "Branch" msgstr "Nhánh" -#: gitk:7349 +#: gitk:7368 msgid "Follows" msgstr "Đứng sau" -#: gitk:7352 +#: gitk:7371 msgid "Precedes" msgstr "Đứng trước" # tcl-format -#: gitk:7947 +#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Lỗi lấy diff: %s" -#: gitk:8631 +#: gitk:8650 msgid "Goto:" msgstr "Nhảy tới:" -#: gitk:8652 +#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng" -#: gitk:8659 +#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Không hiểu điểm xét duyệt %s" -#: gitk:8669 +#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Không hiểu định danh SHA1 %s" -#: gitk:8671 +#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Điểm %s không ở trong phần hiển thị hiện tại" -#: gitk:8813 gitk:8828 +#: gitk:8832 gitk:8847 msgid "Date" msgstr "Ngày" -#: gitk:8816 +#: gitk:8835 msgid "Children" msgstr "Con cháu" -#: gitk:8879 +#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Đặt lại nhánh %s tại đây" -#: gitk:8881 +#: gitk:8900 msgid "Detached head: can't reset" msgstr "Head đã bị tách rời: không thể đặt lại" -#: gitk:8986 gitk:8992 +#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Bỏ qua lần chuyển giao hòa trộn " -#: gitk:9001 gitk:9006 +#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Gặp lỗi khi lấy ID miếng vá cho " -#: gitk:9002 gitk:9007 +#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - dừng\n" -#: gitk:9012 gitk:9015 gitk:9023 gitk:9037 gitk:9046 +#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:9016 +#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -885,7 +898,7 @@ msgstr "" " là cùng một miếng vá với\n" " " -#: gitk:9024 +#: gitk:9043 msgid "" " differs from\n" " " @@ -893,7 +906,7 @@ msgstr "" " khác biệt từ\n" " " -#: gitk:9026 +#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -901,131 +914,131 @@ msgstr "" "Khác biệt của lần chuyển giao (commit):\n" "\n" -#: gitk:9038 gitk:9047 +#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " có %s con - dừng\n" -#: gitk:9066 +#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s" -#: gitk:9072 +#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s" -#: gitk:9118 +#: gitk:9137 msgid "Top" msgstr "Đỉnh" -#: gitk:9119 +#: gitk:9138 msgid "From" msgstr "Từ" -#: gitk:9124 +#: gitk:9143 msgid "To" msgstr "Đến" -#: gitk:9148 +#: gitk:9167 msgid "Generate patch" msgstr "Tạo miếng vá" -#: gitk:9150 +#: gitk:9169 msgid "From:" msgstr "Từ:" -#: gitk:9159 +#: gitk:9178 msgid "To:" msgstr "Đến:" -#: gitk:9168 +#: gitk:9187 msgid "Reverse" msgstr "Đảo ngược" -#: gitk:9170 gitk:9366 +#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Tập tin kết xuất:" -#: gitk:9176 +#: gitk:9195 msgid "Generate" msgstr "Tạo" -#: gitk:9214 +#: gitk:9233 msgid "Error creating patch:" msgstr "Gặp lỗi khi tạo miếng vá:" -#: gitk:9237 gitk:9354 gitk:9411 +#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9246 +#: gitk:9265 msgid "Tag name:" msgstr "Tên thẻ:" -#: gitk:9249 +#: gitk:9268 msgid "Tag message is optional" msgstr "Ghi chú thẻ chỉ là tùy chọn" -#: gitk:9251 +#: gitk:9270 msgid "Tag message:" msgstr "Ghi chú cho thẻ:" -#: gitk:9255 gitk:9420 +#: gitk:9274 gitk:9439 msgid "Create" msgstr "Tạo" -#: gitk:9273 +#: gitk:9292 msgid "No tag name specified" msgstr "Chưa chỉ ra tên của thẻ" -#: gitk:9277 +#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Thẻ “%s” đã có sẵn rồi" -#: gitk:9287 +#: gitk:9306 msgid "Error creating tag:" msgstr "Gặp lỗi khi tạo thẻ:" -#: gitk:9363 +#: gitk:9382 msgid "Command:" msgstr "Lệnh:" -#: gitk:9371 +#: gitk:9390 msgid "Write" msgstr "Ghi" -#: gitk:9389 +#: gitk:9408 msgid "Error writing commit:" msgstr "Gặp lỗi trong quá trình ghi chuyển giao:" -#: gitk:9416 +#: gitk:9435 msgid "Name:" msgstr "Tên:" -#: gitk:9439 +#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Vui lòng chỉ định tên cho nhánh mới" -#: gitk:9444 +#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?" -#: gitk:9511 +#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn " "áp dụng lại nó không?" -#: gitk:9516 +#: gitk:9535 msgid "Cherry-picking" msgstr "Đang cherry-pick" -#: gitk:9525 +#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1034,7 +1047,7 @@ msgstr "" "Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n" "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại." -#: gitk:9531 +#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1042,22 +1055,22 @@ msgstr "" "Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n" "Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?" -#: gitk:9547 gitk:9605 +#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Không có thay đổi nào cần chuyển giao" -#: gitk:9574 +#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn " "“revert” nó không?" -#: gitk:9579 +#: gitk:9598 msgid "Reverting" msgstr "Đang hoàn tác" -#: gitk:9587 +#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1066,7 +1079,7 @@ msgstr "" "Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n" "Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại." -#: gitk:9591 +#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1074,29 +1087,29 @@ msgstr "" "Revert gặp lỗi bởi vì xung đột hòa trộn.\n" " Bạn có muốn chạy lệnh “git citool” để phân giải nó không?" -#: gitk:9634 +#: gitk:9653 msgid "Confirm reset" msgstr "Xác nhật đặt lại" -#: gitk:9636 +#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Đặt lại nhánh “%s” thành “%s”?" -#: gitk:9638 +#: gitk:9657 msgid "Reset type:" msgstr "Kiểu đặt lại:" -#: gitk:9641 +#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục" -#: gitk:9644 +#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Pha trộn: Không động chạm đến thư mục làm việc nhưng đặt lại bảng mục lục" -#: gitk:9647 +#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1104,19 +1117,19 @@ msgstr "" "Hard: Đặt lại cây làm việc và mục lục\n" "(hủy bỏ MỌI thay đổi nội bộ)" -#: gitk:9664 +#: gitk:9683 msgid "Resetting" msgstr "Đang đặt lại" -#: gitk:9724 +#: gitk:9743 msgid "Checking out" msgstr "Đang checkout" -#: gitk:9777 +#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Không thể xóa nhánh hiện tại đang được lấy ra" -#: gitk:9783 +#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1125,16 +1138,16 @@ msgstr "" "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n" "Thực sự muốn xóa nhánh %s?" -#: gitk:9814 +#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Thẻ và Đầu: %s" -#: gitk:9829 +#: gitk:9850 msgid "Filter" msgstr "Bộ lọc" -#: gitk:10125 +#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1142,216 +1155,221 @@ msgstr "" "Gặp lỗi khi đọc thông tin hình học lần chuyển giao; thông tin nhánh và thẻ " "trước/sau sẽ không hoàn thiện." -#: gitk:11102 +#: gitk:11123 msgid "Tag" msgstr "Thẻ" -#: gitk:11106 +#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11189 +#: gitk:11210 msgid "Gitk font chooser" msgstr "Hộp thoại chọn phông Gitk" -#: gitk:11206 +#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11209 +#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11327 +#: gitk:11348 msgid "Commit list display options" msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao" -#: gitk:11330 +#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Độ rộng biểu đồ tối đa (dòng)" -#: gitk:11334 +#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Độ rộng biểu đồ tối đa (% của bảng)" -#: gitk:11337 +#: gitk:11358 msgid "Show local changes" msgstr "Hiển thị các thay đổi nội bộ" -#: gitk:11340 +#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Tự chọn SHA1 (độ dài)" -#: gitk:11344 +#: gitk:11365 msgid "Hide remote refs" msgstr "Ẩn tham chiếu đến máy chủ" -#: gitk:11348 +#: gitk:11369 msgid "Diff display options" msgstr "Các tùy chọn trình bày các khác biệt" -#: gitk:11350 +#: gitk:11371 msgid "Tab spacing" msgstr "Khoảng cách tab" -#: gitk:11353 +#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Hiển thị các thẻ/đầu xung quanh" -#: gitk:11356 +#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị" -#: gitk:11359 +#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê" -#: gitk:11362 +#: gitk:11383 msgid "Support per-file encodings" msgstr "Hỗ trợ mã hóa mỗi-dòng" -#: gitk:11368 gitk:11515 +#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Công cụ so sánh từ bên ngoài" -#: gitk:11369 +#: gitk:11390 msgid "Choose..." msgstr "Chọn..." -#: gitk:11374 +#: gitk:11395 msgid "General options" msgstr "Các tùy chọn chung" -#: gitk:11377 +#: gitk:11398 msgid "Use themed widgets" msgstr "Dùng các widget chủ đề" -#: gitk:11379 +#: gitk:11400 msgid "(change requires restart)" msgstr "(để thay đổi cần khởi động lại)" -#: gitk:11381 +#: gitk:11402 msgid "(currently unavailable)" msgstr "(hiện tại không sẵn sàng)" -#: gitk:11392 +#: gitk:11413 msgid "Colors: press to choose" msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu" -#: gitk:11395 +#: gitk:11416 msgid "Interface" msgstr "Giao diện" -#: gitk:11396 +#: gitk:11417 msgid "interface" msgstr "giao diện" -#: gitk:11399 +#: gitk:11420 msgid "Background" msgstr "Nền" -#: gitk:11400 gitk:11430 +#: gitk:11421 gitk:11451 msgid "background" msgstr "nền" -#: gitk:11403 +#: gitk:11424 msgid "Foreground" msgstr "Tiền cảnh" -#: gitk:11404 +#: gitk:11425 msgid "foreground" msgstr "tiền cảnh" -#: gitk:11407 +#: gitk:11428 msgid "Diff: old lines" msgstr "So sánh: dòng cũ" -#: gitk:11408 +#: gitk:11429 msgid "diff old lines" msgstr "diff dòng cũ" -#: gitk:11412 +#: gitk:11433 msgid "Diff: new lines" msgstr "So sánh: dòng mới" -#: gitk:11413 +#: gitk:11434 msgid "diff new lines" msgstr "màu dòng mới" -#: gitk:11417 +#: gitk:11438 msgid "Diff: hunk header" msgstr "So sánh: phần đầu của đoạn" -#: gitk:11419 +#: gitk:11440 msgid "diff hunk header" msgstr "màu của phần đầu của đoạn khi so sánh" -#: gitk:11423 +#: gitk:11444 msgid "Marked line bg" msgstr "Nền dòng đánh dấu" -#: gitk:11425 +#: gitk:11446 msgid "marked line background" msgstr "nền dòng được đánh dấu" -#: gitk:11429 +#: gitk:11450 msgid "Select bg" msgstr "Màu nền" -#: gitk:11438 +#: gitk:11459 msgid "Fonts: press to choose" msgstr "Phông chữ: bấm vào các nút ở dưới để chọn" -#: gitk:11440 +#: gitk:11461 msgid "Main font" msgstr "Phông chữ chính" -#: gitk:11441 +#: gitk:11462 msgid "Diff display font" msgstr "Phông chữ dùng khi so sánh" -#: gitk:11442 +#: gitk:11463 msgid "User interface font" msgstr "Phông chữ giao diện" -#: gitk:11464 +#: gitk:11485 msgid "Gitk preferences" msgstr "Cá nhân hóa các cài đặt cho Gitk" -#: gitk:11473 +#: gitk:11494 msgid "General" msgstr "Chung" -#: gitk:11474 +#: gitk:11495 msgid "Colors" msgstr "Màu sắc" -#: gitk:11475 +#: gitk:11496 msgid "Fonts" msgstr "Phông chữ" -#: gitk:11525 +#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: chọn màu cho %s" -#: gitk:12242 +#: gitk:12059 +msgid "" +"Sorry, gitk cannot run with this version of Tcl/Tk.\n" +" Gitk requires at least Tcl/Tk 8.4." +msgstr "" + +#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Không thể tìm thấy kho git ở đây." -#: gitk:12289 +#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Đối số “%s” chưa rõ ràng: vừa là điểm xét duyệt vừa là tên tập tin" -#: gitk:12301 +#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Đối số không hợp lệ cho gitk:" -#: gitk:12405 -msgid "Command line" -msgstr "Dòng lệnh" +#~ msgid "mc" +#~ msgstr "mc" #~ msgid "next" #~ msgstr "tiếp" -- cgit v0.10.2-6-g49f6 From dfed7f917e54d09349a14dc2d6410815504a8266 Mon Sep 17 00:00:00 2001 From: Alexander Shopov Date: Sun, 28 Jun 2015 23:28:13 +0300 Subject: gitk: Update Bulgarian translation (307t) Signed-off-by: Alexander Shopov Signed-off-by: Paul Mackerras diff --git a/po/bg.po b/po/bg.po index c4246bf..61073eb 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitk master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-05-17 14:32+1000\n" -"PO-Revision-Date: 2015-04-07 07:54+0300\n" +"POT-Creation-Date: 2015-06-27 20:44+0300\n" +"PO-Revision-Date: 2015-06-27 20:46+0300\n" "Last-Translator: Alexander Shopov \n" "Language-Team: Bulgarian \n" "Language: bg\n" @@ -328,7 +328,7 @@ msgstr "Изтриване на този клон" #: gitk:2649 msgid "Copy branch name" -msgstr "" +msgstr "Копиране на името на клона" #: gitk:2656 msgid "Highlight this too" @@ -348,7 +348,7 @@ msgstr "Анотиране на родителското подаване" #: gitk:2660 msgid "Copy path" -msgstr "" +msgstr "Копиране на пътя" #: gitk:2667 msgid "Show origin of this line" @@ -507,9 +507,8 @@ msgid "\tMove to next find hit" msgstr "\tКъм следващата поява" #: gitk:3075 -#, fuzzy msgid "g\t\tGo to commit" -msgstr "\t\tКъм последното подаване" +msgstr "g\t\tКъм последното подаване" #: gitk:3076 msgid "/\t\tFocus the search box" @@ -665,9 +664,8 @@ msgid "Matches all Commit Info criteria" msgstr "Съвпадение по всички характеристики на подаването" #: gitk:4086 -#, fuzzy msgid "Matches no Commit Info criteria" -msgstr "Съвпадение по никоя от характеристиките на подаването" +msgstr "Не съвпада по никоя от характеристиките на подаването" #: gitk:4087 msgid "Changes to Files:" @@ -1350,6 +1348,8 @@ msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" +"Тази версия на Tcl/Tk не се поддържа от Gitk.\n" +" Необходима ви е поне Tcl/Tk 8.4." #: gitk:12269 msgid "Cannot find a git repository here." @@ -1363,6 +1363,3 @@ msgstr "Нееднозначен аргумент „%s“: има и такав #: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Неправилни аргументи на gitk:" - -#~ msgid "mc" -#~ msgstr "mc" -- cgit v0.10.2-6-g49f6 From d835dbb91fe246d123dc81f6a317d73518ecef46 Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Sat, 18 Jul 2015 13:15:39 +0200 Subject: gitk: Add a "Copy commit summary" command When referring to earlier commits in commit messages or other text, one of the established formats is ("", ) Add a "Copy commit summary" command to the context menu that puts this text for the currently selected commit on the clipboard. This makes it easy for our users to create well-formatted commit references. The is produced with the %h format specifier to make it unique. Its length can be controlled with the gitk preference "Auto-select SHA1 (length)", or, if this preference is set to its default value (40), with the Git config setting core.abbrev. Signed-off-by: Beat Bolli Cc: Paul Mackerras Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 2cb12bd..51520ef 100755 --- a/gitk +++ b/gitk @@ -2618,6 +2618,7 @@ proc makewindow {} { {mc "Diff selected -> this" command {diffvssel 1}} {mc "Make patch" command mkpatch} {mc "Create tag" command mktag} + {mc "Copy commit summary" command copysummary} {mc "Write commit to file" command writecommit} {mc "Create new branch" command mkbranch} {mc "Cherry-pick this commit" command cherrypick} @@ -9360,6 +9361,20 @@ proc mktaggo {} { mktagcan } +proc copysummary {} { + global rowmenuid autosellen + + set format "%h (\"%s\", %ad)" + set cmd [list git show -s --pretty=format:$format --date=short] + if {$autosellen < 40} { + lappend cmd --abbrev=$autosellen + } + set summary [eval exec $cmd $rowmenuid] + + clipboard clear + clipboard append $summary +} + proc writecommit {} { global rowmenuid wrcomtop commitinfo wrcomcmd NS -- cgit v0.10.2-6-g49f6 From b6f92a8563cedc67915a038e441b0440e692f5dc Mon Sep 17 00:00:00 2001 From: Beat Bolli Date: Tue, 8 Sep 2015 01:16:37 +0200 Subject: gitk: Adjust the menu line numbers to compensate for the new entry Commit d835dbb9 ("gitk: Add a "Copy commit summary" command", 2015-08-13) in the upstream gitk repo added a new context menu entry. Therefore, the line numbers of the entries below the new one need to be adjusted when their text or state is changed. Signed-off-by: Beat Bolli Cc: Paul Mackerras Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 51520ef..8e78f94 100755 --- a/gitk +++ b/gitk @@ -8896,13 +8896,13 @@ proc rowmenu {x y id} { if {$id ne $nullid && $id ne $nullid2} { set menu $rowctxmenu if {$mainhead ne {}} { - $menu entryconfigure 7 -label [mc "Reset %s branch to here" $mainhead] -state normal + $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal } else { - $menu entryconfigure 7 -label [mc "Detached head: can't reset" $mainhead] -state disabled + $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled } - $menu entryconfigure 9 -state $mstate $menu entryconfigure 10 -state $mstate $menu entryconfigure 11 -state $mstate + $menu entryconfigure 12 -state $mstate } else { set menu $fakerowmenu } -- cgit v0.10.2-6-g49f6 From d99b4b0de27a2bd654a40353b65883e368da6d06 Mon Sep 17 00:00:00 2001 From: Giuseppe Bilotta Date: Wed, 9 Sep 2015 15:20:53 +0200 Subject: gitk: Accelerators for the main menu This allows fast, keyboard-only usage of the menu (e.g. Alt+V, N to open a new view). Signed-off-by: Giuseppe Bilotta Signed-off-by: Paul Mackerras diff --git a/gitk b/gitk index 8e78f94..2028b55 100755 --- a/gitk +++ b/gitk @@ -2065,33 +2065,33 @@ proc makewindow {} { # The "mc" arguments here are purely so that xgettext # sees the following string as needing to be translated set file { - mc "File" cascade { - {mc "Update" command updatecommits -accelerator F5} - {mc "Reload" command reloadcommits -accelerator Shift-F5} - {mc "Reread references" command rereadrefs} - {mc "List references" command showrefs -accelerator F2} + mc "&File" cascade { + {mc "&Update" command updatecommits -accelerator F5} + {mc "&Reload" command reloadcommits -accelerator Shift-F5} + {mc "Reread re&ferences" command rereadrefs} + {mc "&List references" command showrefs -accelerator F2} {xx "" separator} - {mc "Start git gui" command {exec git gui &}} + {mc "Start git &gui" command {exec git gui &}} {xx "" separator} - {mc "Quit" command doquit -accelerator Meta1-Q} + {mc "&Quit" command doquit -accelerator Meta1-Q} }} set edit { - mc "Edit" cascade { - {mc "Preferences" command doprefs} + mc "&Edit" cascade { + {mc "&Preferences" command doprefs} }} set view { - mc "View" cascade { - {mc "New view..." command {newview 0} -accelerator Shift-F4} - {mc "Edit view..." command editview -state disabled -accelerator F4} - {mc "Delete view" command delview -state disabled} + mc "&View" cascade { + {mc "&New view..." command {newview 0} -accelerator Shift-F4} + {mc "&Edit view..." command editview -state disabled -accelerator F4} + {mc "&Delete view" command delview -state disabled} {xx "" separator} - {mc "All files" radiobutton {selectedview 0} -command {showview 0}} + {mc "&All files" radiobutton {selectedview 0} -command {showview 0}} }} if {[tk windowingsystem] ne "aqua"} { set help { - mc "Help" cascade { - {mc "About gitk" command about} - {mc "Key bindings" command keys} + mc "&Help" cascade { + {mc "&About gitk" command about} + {mc "&Key bindings" command keys} }} set bar [list $file $edit $view $help] } else { @@ -2099,13 +2099,13 @@ proc makewindow {} { proc ::tk::mac::Quit {} {doquit} lset file end [lreplace [lindex $file end] end-1 end] set apple { - xx "Apple" cascade { - {mc "About gitk" command about} + xx "&Apple" cascade { + {mc "&About gitk" command about} {xx "" separator} }} set help { - mc "Help" cascade { - {mc "Key bindings" command keys} + mc "&Help" cascade { + {mc "&Key bindings" command keys} }} set bar [list $apple $file $view $help] } @@ -4468,8 +4468,8 @@ proc showview {n} { set curview $n set selectedview $n - .bar.view entryconf [mca "Edit view..."] -state [expr {$n == 0? "disabled": "normal"}] - .bar.view entryconf [mca "Delete view"] -state [expr {$n == 0? "disabled": "normal"}] + .bar.view entryconf [mca "&Edit view..."] -state [expr {$n == 0? "disabled": "normal"}] + .bar.view entryconf [mca "&Delete view"] -state [expr {$n == 0? "disabled": "normal"}] run refill_reflist if {![info exists viewcomplete($n)]} { -- cgit v0.10.2-6-g49f6