Merge git://ozlabs.org/~paulus/gitk

* 'master' of git://ozlabs.org/~paulus/gitk:
  gitk: Remove translated message from comments
  gitk: ru.po: Update Russian translation
  gitk: Update copyright notice to 2016
  gitk: Clear array 'commitinfo' on reload
  gitk: Remove closed file descriptors from $blobdifffd
  gitk: Turn off undo manager in the text widget
  gitk: Fix Japanese translation for "marked commit"
  gitk: Fix missing commits when using -S or -G
  gitk: Use explicit RGB green instead of "lime"
  gitk: Add Portuguese translation
  gitk: Makefile: create install bin directory
  gitk: Include commit title in branch dialog
  gitk: Allow checking out a remote branch
  gitk: Add a 'rename' option to the branch context menu
pull/321/head
Junio C Hamano 6 years ago
commit ffac48d093
  1. 1
      gitk-git/Makefile
  2. 166
      gitk-git/gitk
  3. 4
      gitk-git/po/bg.po
  4. 6
      gitk-git/po/ca.po
  5. 4
      gitk-git/po/de.po
  6. 4
      gitk-git/po/es.po
  7. 4
      gitk-git/po/fr.po
  8. 4
      gitk-git/po/hu.po
  9. 4
      gitk-git/po/it.po
  10. 13
      gitk-git/po/ja.po
  11. 4
      gitk-git/po/pt_br.po
  12. 1376
      gitk-git/po/pt_pt.po
  13. 670
      gitk-git/po/ru.po
  14. 19
      gitk-git/po/sv.po
  15. 4
      gitk-git/po/vi.po

@ -50,6 +50,7 @@ endif
all:: gitk-wish $(ALL_MSGFILES)
install:: all
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
$(INSTALL) -m 755 gitk-wish '$(DESTDIR_SQ)$(bindir_SQ)'/gitk
$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(msgsdir_SQ)'
$(foreach p,$(ALL_MSGFILES), $(INSTALL) -m 644 $p '$(DESTDIR_SQ)$(msgsdir_SQ)' &&) true

@ -2,7 +2,7 @@
# Tcl ignores the next line -*- tcl -*- \
exec wish "$0" -- "$@"
# Copyright © 2005-2014 Paul Mackerras. All rights reserved.
# Copyright © 2005-2016 Paul Mackerras. All rights reserved.
# This program is free software; it may be used, copied, modified
# and distributed under the terms of the GNU General Public Licence,
# either version 2, or (at your option) any later version.
@ -588,7 +588,7 @@ proc updatecommits {} {
proc reloadcommits {} {
global curview viewcomplete selectedline currentid thickerline
global showneartags treediffs commitinterest cached_commitrow
global targetid
global targetid commitinfo
set selid {}
if {$selectedline ne {}} {
@ -609,6 +609,7 @@ proc reloadcommits {} {
getallcommits
}
clear_display
unset -nocomplain commitinfo
unset -nocomplain commitinterest
unset -nocomplain cached_commitrow
unset -nocomplain targetid
@ -1315,7 +1316,7 @@ proc commitonrow {row} {
proc closevarcs {v} {
global varctok varccommits varcid parents children
global cmitlisted commitidx vtokmod
global cmitlisted commitidx vtokmod curview numcommits
set missing_parents 0
set scripts {}
@ -1340,6 +1341,9 @@ proc closevarcs {v} {
}
lappend varccommits($v,$b) $p
incr commitidx($v)
if {$v == $curview} {
set numcommits $commitidx($v)
}
set scripts [check_interest $p $scripts]
}
}
@ -2265,7 +2269,7 @@ proc makewindow {} {
set h [expr {[font metrics uifont -linespace] + 2}]
set progresscanv .tf.bar.progress
canvas $progresscanv -relief sunken -height $h -borderwidth 2
set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"]
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
}
@ -2403,7 +2407,7 @@ proc makewindow {} {
set ctext .bleft.bottom.ctext
text $ctext -background $bgcolor -foreground $fgcolor \
-state disabled -font textfont \
-state disabled -undo 0 -font textfont \
-yscrollcommand scrolltext -wrap none \
-xscrollcommand ".bleft.bottom.sbhorizontal set"
if {$have_tk85} {
@ -2664,6 +2668,7 @@ proc makewindow {} {
set headctxmenu .headctxmenu
makemenu $headctxmenu {
{mc "Check out this branch" command cobranch}
{mc "Rename this branch" command mvbranch}
{mc "Remove this branch" command rmbranch}
{mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}}
}
@ -3033,7 +3038,7 @@ proc about {} {
message $w.m -text [mc "
Gitk - a commit viewer for git
Copyright \u00a9 2005-2014 Paul Mackerras
Copyright \u00a9 2005-2016 Paul Mackerras
Use and redistribute under the terms of the GNU General Public License"] \
-justify center -aspect 400 -border 2 -bg $bgcolor -relief groove
@ -3397,7 +3402,7 @@ set rectmask {
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
}
image create bitmap reficon-H -background black -foreground lime \
image create bitmap reficon-H -background black -foreground "#00ff00" \
-data $rectdata -maskdata $rectmask
image create bitmap reficon-o -background black -foreground "#ddddff" \
-data $rectdata -maskdata $rectmask
@ -8069,7 +8074,11 @@ proc getblobdiffline {bdf ids} {
$ctext conf -state normal
while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
# Older diff read. Abort it.
catch {close $bdf}
if {$ids != $diffids} {
array unset blobdifffd $ids
}
return 0
}
parseblobdiffline $ids $line
@ -8078,6 +8087,7 @@ proc getblobdiffline {bdf ids} {
blobdiffmaybeseehere [eof $bdf]
if {[eof $bdf]} {
catch {close $bdf}
array unset blobdifffd $ids
return 0
}
return [expr {$nr >= 1000? 2: 1}]
@ -9452,26 +9462,63 @@ proc wrcomcan {} {
}
proc mkbranch {} {
global rowmenuid mkbrtop NS
global NS rowmenuid
set top .branchdialog
set val(name) ""
set val(id) $rowmenuid
set val(command) [list mkbrgo $top]
set ui(title) [mc "Create branch"]
set ui(accept) [mc "Create"]
branchdia $top val ui
}
proc mvbranch {} {
global NS
global headmenuid headmenuhead
set top .branchdialog
set val(name) $headmenuhead
set val(id) $headmenuid
set val(command) [list mvbrgo $top $headmenuhead]
set ui(title) [mc "Rename branch %s" $headmenuhead]
set ui(accept) [mc "Rename"]
branchdia $top val ui
}
proc branchdia {top valvar uivar} {
global NS commitinfo
upvar $valvar val $uivar ui
set top .makebranch
catch {destroy $top}
ttk_toplevel $top
make_transient $top .
${NS}::label $top.title -text [mc "Create new branch"]
${NS}::label $top.title -text $ui(title)
grid $top.title - -pady 10
${NS}::label $top.id -text [mc "ID:"]
${NS}::entry $top.sha1 -width 40
$top.sha1 insert 0 $rowmenuid
$top.sha1 insert 0 $val(id)
$top.sha1 conf -state readonly
grid $top.id $top.sha1 -sticky w
${NS}::entry $top.head -width 60
$top.head insert 0 [lindex $commitinfo($val(id)) 0]
$top.head conf -state readonly
grid x $top.head -sticky ew
grid columnconfigure $top 1 -weight 1
${NS}::label $top.nlab -text [mc "Name:"]
${NS}::entry $top.name -width 40
$top.name insert 0 $val(name)
grid $top.nlab $top.name -sticky w
${NS}::frame $top.buts
${NS}::button $top.buts.go -text [mc "Create"] -command [list mkbrgo $top]
${NS}::button $top.buts.go -text $ui(accept) -command $val(command)
${NS}::button $top.buts.can -text [mc "Cancel"] -command "catch {destroy $top}"
bind $top <Key-Return> [list mkbrgo $top]
bind $top <Key-Return> $val(command)
bind $top <Key-Escape> "catch {destroy $top}"
grid $top.buts.go $top.buts.can
grid columnconfigure $top.buts 0 -weight 1 -uniform a
@ -9526,6 +9573,46 @@ proc mkbrgo {top} {
}
}
proc mvbrgo {top prevname} {
global headids idheads mainhead mainheadid
set name [$top.name get]
set id [$top.sha1 get]
set cmdargs {}
if {$name eq $prevname} {
catch {destroy $top}
return
}
if {$name eq {}} {
error_popup [mc "Please specify a new name for the branch"] $top
return
}
catch {destroy $top}
lappend cmdargs -m $prevname $name
nowbusy renamebranch
update
if {[catch {
eval exec git branch $cmdargs
} err]} {
notbusy renamebranch
error_popup $err
} else {
notbusy renamebranch
removehead $id $prevname
removedhead $id $prevname
set headids($name) $id
lappend idheads($id) $name
addedhead $id $name
if {$prevname eq $mainhead} {
set mainhead $name
set mainheadid $id
}
redrawtags $id
dispneartags 0
run refill_reflist
}
}
proc exec_citool {tool_args {baseid {}}} {
global commitinfo env
@ -9751,20 +9838,25 @@ proc readresetstat {fd} {
# context menu for a head
proc headmenu {x y id head} {
global headmenuid headmenuhead headctxmenu mainhead
global headmenuid headmenuhead headctxmenu mainhead headids
stopfinding
set headmenuid $id
set headmenuhead $head
set state normal
array set state {0 normal 1 normal 2 normal}
if {[string match "remotes/*" $head]} {
set state disabled
set localhead [string range $head [expr [string last / $head] + 1] end]
if {[info exists headids($localhead)]} {
set state(0) disabled
}
array set state {1 disabled 2 disabled}
}
if {$head eq $mainhead} {
set state disabled
array set state {0 disabled 2 disabled}
}
foreach i {0 1 2} {
$headctxmenu entryconfigure $i -state $state($i)
}
$headctxmenu entryconfigure 0 -state $state
$headctxmenu entryconfigure 1 -state $state
tk_popup $headctxmenu $x $y
}
@ -9773,11 +9865,27 @@ proc cobranch {} {
global showlocalchanges
# check the tree is clean first??
set newhead $headmenuhead
set command [list | git checkout]
if {[string match "remotes/*" $newhead]} {
set remote $newhead
set newhead [string range $newhead [expr [string last / $newhead] + 1] end]
# The following check is redundant - the menu option should
# be disabled to begin with...
if {[info exists headids($newhead)]} {
error_popup [mc "A local branch named %s exists already" $newhead]
return
}
lappend command -b $newhead --track $remote
} else {
lappend command $newhead
}
lappend command 2>@1
nowbusy checkout [mc "Checking out"]
update
dohidelocalchanges
if {[catch {
set fd [open [list | git checkout $headmenuhead 2>@1] r]
set fd [open $command r]
} err]} {
notbusy checkout
error_popup $err
@ -9785,12 +9893,12 @@ proc cobranch {} {
dodiffindex
}
} else {
filerun $fd [list readcheckoutstat $fd $headmenuhead $headmenuid]
filerun $fd [list readcheckoutstat $fd $newhead $headmenuid]
}
}
proc readcheckoutstat {fd newhead newheadid} {
global mainhead mainheadid headids showlocalchanges progresscoords
global mainhead mainheadid headids idheads showlocalchanges progresscoords
global viewmainheadid curview
if {[gets $fd line] >= 0} {
@ -9805,8 +9913,14 @@ proc readcheckoutstat {fd newhead newheadid} {
notbusy checkout
if {[catch {close $fd} err]} {
error_popup $err
return
}
set oldmainid $mainheadid
if {! [info exists headids($newhead)]} {
set headids($newhead) $newheadid
lappend idheads($newheadid) $newhead
addedhead $newheadid $newhead
}
set mainhead $newhead
set mainheadid $newheadid
set viewmainheadid($curview) $newheadid
@ -12188,7 +12302,7 @@ if {[tk windowingsystem] eq "aqua"} {
set extdifftool "meld"
}
set colors {lime red blue magenta darkgrey brown orange}
set colors {"#00ff00" red blue magenta darkgrey brown orange}
if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace
set uifgcolor SystemButtonText
@ -12206,12 +12320,12 @@ if {[tk windowingsystem] eq "win32"} {
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
set ignorespace 0
set worddiff ""
set markbgcolor "#e0e0ff"
set headbgcolor lime
set headbgcolor "#00ff00"
set headfgcolor black
set headoutlinecolor black
set remotebgcolor #ffddaa
@ -12226,7 +12340,7 @@ set linehoverfgcolor black
set linehoveroutlinecolor black
set mainheadcirclecolor yellow
set workingfilescirclecolor red
set indexcirclecolor lime
set indexcirclecolor "#00ff00"
set circlecolors {white blue gray blue blue}
set linkfgcolor blue
set circleoutlinecolor $fgcolor

@ -371,14 +371,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk — визуализация на подаванията в Git\n"
"\n"
"Авторски права: © 2005-2014 Paul Mackerras\n"
"Авторски права: © 2005-2016 Paul Mackerras\n"
"\n"
"Използвайте и разпространявайте при условията на ОПЛ на ГНУ"

@ -1,5 +1,5 @@
# Translation of gitk
# Copyright (C) 2005-2014 Paul Mackerras
# Copyright (C) 2005-2016 Paul Mackerras
# This file is distributed under the same license as the gitk package.
# Alex Henrie <alexhenrie24@gmail.com>, 2015.
#
@ -365,14 +365,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - visualitzador de comissions per al git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU"

@ -363,14 +363,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - eine Visualisierung der Git-Historie\n"
"\n"
"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
"Copyright \\u00a9 2005-2016 Paul Mackerras\n"
"\n"
"Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public "
"License"

@ -370,14 +370,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - un visualizador de revisiones para git\n"
"\n"
"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
"Copyright \\u00a9 2005-2016 Paul Mackerras\n"
"\n"
"Uso y redistribución permitidos según los términos de la Licencia Pública "
"General de GNU (GNU GPL)"

@ -372,14 +372,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - visualisateur de commit pour git\n"
"\n"
"Copyright \\u00a9 2005-2014 Paul Mackerras\n"
"Copyright \\u00a9 2005-2016 Paul Mackerras\n"
"\n"
"Utilisation et redistribution soumises aux termes de la GNU General Public License"

@ -366,14 +366,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - commit nézegető a githez\n"
"\n"
"Szerzői jog \\u00a9 2005-2010 Paul Mackerras\n"
"Szerzői jog \\u00a9 2005-2016 Paul Mackerras\n"
"\n"
"Használd és terjeszd a GNU General Public License feltételei mellett"

@ -367,14 +367,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - un visualizzatore di revisioni per git\n"
"\n"
"Copyright \\u00a9 2005-2010 Paul Mackerras\n"
"Copyright \\u00a9 2005-2016 Paul Mackerras\n"
"\n"
"Utilizzo e redistribuzione permessi sotto i termini della GNU General Public "
"License"

@ -2,16 +2,17 @@
# Copyright (C) 2005-2015 Paul Mackerras
# This file is distributed under the same license as the gitk package.
#
# YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>, 2015.
# Mizar <mizar.jp@gmail.com>, 2009.
# Junio C Hamano <gitster@pobox.com>, 2009.
# YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>, 2015.
# Satoshi Yasushima <s.yasushima@gmail.com>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 14:32+1000\n"
"PO-Revision-Date: 2015-11-12 13:00+0900\n"
"Last-Translator: YOKOTA Hiroshi <yokota@netlab.cs.tsukuba.ac.jp>\n"
"Last-Translator: Satoshi Yasushima <s.yasushima@gmail.com>\n"
"Language-Team: Japanese\n"
"Language: ja\n"
"MIME-Version: 1.0\n"
@ -314,11 +315,11 @@ msgstr "マークを付けたコミットと比較する"
#: gitk:2630 gitk:2641
msgid "Diff this -> marked commit"
msgstr "これと選択したコミットのdiffを見る"
msgstr "これとマークを付けたコミットのdiffを見る"
#: gitk:2631 gitk:2642
msgid "Diff marked commit -> this"
msgstr "選択したコミットとこれのdiffを見る"
msgstr "マークを付けたコミットとこれのdiffを見る"
#: gitk:2632
msgid "Revert this commit"
@ -373,14 +374,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - gitコミットビューア\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"使用および再配布は GNU General Public License に従ってください"

@ -368,14 +368,14 @@ msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - um visualizador de revisões para o git \n"
"\n"
"Copyright ©9 2005-2010 Paul Mackerras\n"
"Copyright ©9 2005-2016 Paul Mackerras\n"
"\n"
"Uso e distribuição segundo os termos da Licença Pública Geral GNU"

@ -0,0 +1,1376 @@
# Portuguese translations for gitk package.
# Copyright (C) 2016 Paul Mackerras
# This file is distributed under the same license as the gitk package.
# Vasco Almeida <vascomalmeida@sapo.pt>, 2016.
msgid ""
msgstr ""
"Project-Id-Version: gitk\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2016-04-15 16:52+0000\n"
"PO-Revision-Date: 2016-05-06 15:35+0000\n"
"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
"Language-Team: Portuguese\n"
"Language: pt\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: Virtaal 0.7.1\n"
#: gitk:140
msgid "Couldn't get list of unmerged files:"
msgstr "Não foi possível obter lista de ficheiros não integrados:"
#: gitk:212 gitk:2399
msgid "Color words"
msgstr "Colorir palavras"
#: gitk:217 gitk:2399 gitk:8239 gitk:8272
msgid "Markup words"
msgstr "Marcar palavras"
#: gitk:324
msgid "Error parsing revisions:"
msgstr "Erro ao analisar revisões:"
#: gitk:380
msgid "Error executing --argscmd command:"
msgstr "Erro ao executar o comando de --argscmd:"
#: gitk:393
msgid "No files selected: --merge specified but no files are unmerged."
msgstr ""
"Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por "
"integrar."
#: gitk:396
msgid ""
"No files selected: --merge specified but no unmerged files are within file "
"limit."
msgstr ""
"Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por "
"integrar ao nível de ficheiro."
#: gitk:418 gitk:566
msgid "Error executing git log:"
msgstr "Erro ao executar git log:"
#: gitk:436 gitk:582
msgid "Reading"
msgstr "A ler"
#: gitk:496 gitk:4544
msgid "Reading commits..."
msgstr "A ler commits..."
#: gitk:499 gitk:1637 gitk:4547
msgid "No commits selected"
msgstr "Nenhum commit selecionado"
#: gitk:1445 gitk:4064 gitk:12469
msgid "Command line"
msgstr "Linha de comandos"
#: gitk:1511
msgid "Can't parse git log output:"
msgstr "Não é possível analisar a saída de git log:"
#: gitk:1740
msgid "No commit information available"
msgstr "Não há informação disponível sobre o commit"
#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554
msgid "OK"
msgstr "OK"
#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704
#: gitk:11275 gitk:11555
msgid "Cancel"
msgstr "Cancelar"
#: gitk:2083
msgid "&Update"
msgstr "At&ualizar"
#: gitk:2084
msgid "&Reload"
msgstr "&Recarregar"
#: gitk:2085
msgid "Reread re&ferences"
msgstr "Reler re&ferências"
#: gitk:2086
msgid "&List references"
msgstr "&Listar referências"
#: gitk:2088
msgid "Start git &gui"
msgstr "Iniciar git &gui"
#: gitk:2090
msgid "&Quit"
msgstr "&Sair"
#: gitk:2082
msgid "&File"
msgstr "&Ficheiro"
#: gitk:2094
msgid "&Preferences"
msgstr "&Preferências"
#: gitk:2093
msgid "&Edit"
msgstr "&Editar"
#: gitk:2098
msgid "&New view..."
msgstr "&Nova vista..."
#: gitk:2099
msgid "&Edit view..."
msgstr "&Editar vista..."
#: gitk:2100
msgid "&Delete view"
msgstr "Elimina&r vista"
#: gitk:2102
msgid "&All files"
msgstr "&Todos os ficheiros"
#: gitk:2097
msgid "&View"
msgstr "&Ver"
#: gitk:2107 gitk:2117
msgid "&About gitk"
msgstr "&Sobre gitk"
#: gitk:2108 gitk:2122
msgid "&Key bindings"
msgstr "&Atalhos"
#: gitk:2106 gitk:2121
msgid "&Help"
msgstr "&Ajuda"
#: gitk:2199 gitk:8671
msgid "SHA1 ID:"
msgstr "ID SHA1:"
#: gitk:2243
msgid "Row"
msgstr "Linha"
#: gitk:2281
msgid "Find"
msgstr "Procurar"
#: gitk:2309
msgid "commit"
msgstr "commit"
#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846
#: gitk:6931
msgid "containing:"
msgstr "contendo:"
#: gitk:2316 gitk:3545 gitk:3550 gitk:4782
msgid "touching paths:"
msgstr "altera os caminhos:"
#: gitk:2317 gitk:4796
msgid "adding/removing string:"
msgstr "adiciona/remove a cadeia:"
#: gitk:2318 gitk:4798
msgid "changing lines matching:"
msgstr "altera linhas com:"
#: gitk:2327 gitk:2329 gitk:4785
msgid "Exact"
msgstr "Exato"
#: gitk:2329 gitk:4873 gitk:6742
msgid "IgnCase"
msgstr "IgnMaiúsculas"
#: gitk:2329 gitk:4755 gitk:4871 gitk:6738
msgid "Regexp"
msgstr "Expr. regular"
#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935
msgid "All fields"
msgstr "Todos os campos"
#: gitk:2332 gitk:4890 gitk:4923 gitk:6805
msgid "Headline"
msgstr "Cabeçalho"
#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408
msgid "Comments"
msgstr "Comentários"
#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849
#: gitk:8864
msgid "Author"
msgstr "Autor"
#: gitk:2333 gitk:4890 gitk:6805 gitk:7345
msgid "Committer"
msgstr "Committer"
#: gitk:2367
msgid "Search"
msgstr "Pesquisar"
#: gitk:2375
msgid "Diff"
msgstr "Diff"
#: gitk:2377
msgid "Old version"
msgstr "Versão antiga"
#: gitk:2379
msgid "New version"
msgstr "Versão nova"
#: gitk:2382
msgid "Lines of context"
msgstr "Linhas de contexto"
#: gitk:2392
msgid "Ignore space change"
msgstr "Ignorar espaços"
#: gitk:2396 gitk:2398 gitk:7978 gitk:8225
msgid "Line diff"
msgstr "Diff de linha"
#: gitk:2463
msgid "Patch"
msgstr "Patch"
#: gitk:2465
msgid "Tree"
msgstr "Árvore"
#: gitk:2635 gitk:2656
msgid "Diff this -> selected"
msgstr "Diff este -> seleção"
#: gitk:2636 gitk:2657
msgid "Diff selected -> this"
msgstr "Diff seleção -> este"
#: gitk:2637 gitk:2658
msgid "Make patch"
msgstr "Gerar patch"
#: gitk:2638 gitk:9273
msgid "Create tag"
msgstr "Criar tag"
#: gitk:2639
msgid "Copy commit summary"
msgstr "Copiar sumário do commit"
#: gitk:2640 gitk:9404
msgid "Write commit to file"
msgstr "Escrever commit num ficheiro"
#: gitk:2641 gitk:9461
msgid "Create new branch"
msgstr "Criar novo ramo"
#: gitk:2642
msgid "Cherry-pick this commit"
msgstr "Efetuar cherry-pick deste commit"
#: gitk:2643
msgid "Reset HEAD branch to here"
msgstr "Repor ramo HEAD para aqui"
#: gitk:2644
msgid "Mark this commit"
msgstr "Marcar este commit"
#: gitk:2645
msgid "Return to mark"
msgstr "Voltar à marca"
#: gitk:2646
msgid "Find descendant of this and mark"
msgstr "Encontrar descendeste deste e da marca"
#: gitk:2647
msgid "Compare with marked commit"
msgstr "Comparar com o commit marcado"
#: gitk:2648 gitk:2659
msgid "Diff this -> marked commit"
msgstr "Diff este -> commit marcado"
#: gitk:2649 gitk:2660
msgid "Diff marked commit -> this"
msgstr "Diff commit marcado -> este"
#: gitk:2650
msgid "Revert this commit"
msgstr "Reverter este commit"
#: gitk:2666
msgid "Check out this branch"
msgstr "Extrair este ramo"
#: gitk:2667
msgid "Remove this branch"
msgstr "Remover este ramo"
#: gitk:2668
msgid "Copy branch name"
msgstr "Copiar nome do ramo"
#: gitk:2675
msgid "Highlight this too"
msgstr "Realçar este também"
#: gitk:2676
msgid "Highlight this only"
msgstr "Realçar apenas este"
#: gitk:2677
msgid "External diff"
msgstr "Diff externo"
#: gitk:2678
msgid "Blame parent commit"
msgstr "Culpar commit pai"
#: gitk:2679
msgid "Copy path"
msgstr "Copiar caminho"
#: gitk:2686
msgid "Show origin of this line"
msgstr "Mostrar origem deste ficheiro"
#: gitk:2687
msgid "Run git gui blame on this line"
msgstr "Executar git gui blame sobre esta linha"
#: gitk:3031
msgid "About gitk"
msgstr "Sobre gitk"
#: gitk:3033
msgid ""
"\n"
"Gitk - a commit viewer for git\n"
"\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use and redistribute under the terms of the GNU General Public License"
msgstr ""
"\n"
"Gitk - um visualizador de commits do git\n"
"\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Use e redistribua sob os termos da GNU General Public License"
#: gitk:3041 gitk:3108 gitk:9890
msgid "Close"
msgstr "Fechar"
#: gitk:3062
msgid "Gitk key bindings"
msgstr "Atalhos do gitk"
#: gitk:3065
msgid "Gitk key bindings:"
msgstr "Atalhos do gitk:"
#: gitk:3067
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tSair"
#: gitk:3068
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-W>\t\tFechar janela"
#: gitk:3069
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tMover para o primeiro commit"
#: gitk:3070
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tMover para o último commit"
#: gitk:3071
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Cima>, p, k\tMover para o commit acima"
#: gitk:3072
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Baixo>, n, j\tMover para o commit abaixo"
#: gitk:3073
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Esquerda>, z, h\tRecuar no histórico"
#: gitk:3074
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Direita>, x, l\tAvançar no histórico"
#: gitk:3075
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr "<%s-n>\tIr para o n-ésimo pai do commit atual no histórico"
#: gitk:3076
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tMover a lista de commits uma página para cima"
#: gitk:3077
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tMover a lista de commits uma página para baixo"
#: gitk:3078
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tDeslocar para o topo da lista"
#: gitk:3079
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tDeslocar para o fim da lista"
#: gitk:3080
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Cima>\tDeslocar a lista de commits uma linha para cima"
#: gitk:3081
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Baixo>\tDeslocar a lista de commits uma linha para baixo"
#: gitk:3082
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tDeslocar a lista de commits uma página para cima"
#: gitk:3083
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tDeslocar a lista de commits uma página para baixo"
#: gitk:3084
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Cima>\tProcurar para trás (para cima, commits posteriores)"
#: gitk:3085
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Shift-Baixo>\tProcurar para a frente (para baixo, commits anteriores)"
#: gitk:3086
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tDeslocar vista diff uma página para cima"
#: gitk:3087
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Retrocesso>\tDeslocar vista diff uma página para cima"
#: gitk:3088
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Espaço>\tDeslocar vista diff uma página para baixo"
#: gitk:3089
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tDeslocar vista diff 18 linhas para cima"
#: gitk:3090
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tDeslocar vista diff 18 linhas para baixo"
#: gitk:3091
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tProcurar"
#: gitk:3092
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tMover para a ocorrência seguinte"
#: gitk:3093
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tMover para a ocorrência seguinte"
#: gitk:3094
msgid "g\t\tGo to commit"
msgstr "g\t\tIr para o commit"
#: gitk:3095
msgid "/\t\tFocus the search box"
msgstr "/\t\tFocar a caixa de pesquisa"
#: gitk:3096
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tMover para a ocorrência anterior"
#: gitk:3097
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tDeslocar vista diff para o ficheiro seguinte"
#: gitk:3098
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tProcurar pela ocorrência seguinte na vista diff"
#: gitk:3099
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tProcurar pela ocorrência anterior na vista diff"
#: gitk:3100
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tAumentar o tamanho da letra"
#: gitk:3101
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-mais>\tAumentar o tamanho da letra"
#: gitk:3102
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tDiminuir o tamanho da letra"
#: gitk:3103
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-menos>\tDiminuir o tamanho da letra"
#: gitk:3104
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tAtualizar"
#: gitk:3569 gitk:3578
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Erro ao criar ficheiro temporário %s:"
#: gitk:3591
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Erro ao obter \"%s\" de %s:"
#: gitk:3654
msgid "command failed:"
msgstr "o comando falhou:"
#: gitk:3803
msgid "No such commit"
msgstr "Commit inexistente"
#: gitk:3817
msgid "git gui blame: command failed:"
msgstr "git gui blame: o comando falhou:"
#: gitk:3848
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Não foi possível ler a cabeça de integração: %s"
#: gitk:3856
#, tcl-format
msgid "Error reading index: %s"
msgstr "Erro ao ler o índice: %s"
#: gitk:3881
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Não foi possível iniciar git blame: %s"
#: gitk:3884 gitk:6773
msgid "Searching"
msgstr "A procurar"
#: gitk:3916
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Erro ao executar git blame: %s"
#: gitk:3944
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Essa linha provém do commit %s, que não está nesta vista"
#: gitk:3958
msgid "External diff viewer failed:"
msgstr "Visualizador diff externo falhou:"
#: gitk:4062
msgid "All files"
msgstr "Todos os ficheiros"
#: gitk:4086
msgid "View"
msgstr "Vista"
#: gitk:4089
msgid "Gitk view definition"
msgstr "Definição de vistas do gitk"
#: gitk:4093
msgid "Remember this view"
msgstr "Recordar esta vista"
#: gitk:4094
msgid "References (space separated list):"
msgstr "Referências (lista separada por espaço):"
#: gitk:4095
msgid "Branches & tags:"
msgstr "Ramos e tags:"
#: gitk:4096
msgid "All refs"
msgstr "Todas as referências"
#: gitk:4097
msgid "All (local) branches"
msgstr "Todos os ramos (locais)"
#: gitk:4098
msgid "All tags"
msgstr "Todas as tags"
#: gitk:4099
msgid "All remote-tracking branches"
msgstr "Todos os ramos remotos de monitorização"
#: gitk:4100
msgid "Commit Info (regular expressions):"
msgstr "Informação Sobre o Commit (expressões regulares):"
#: gitk:4101
msgid "Author:"
msgstr "Autor:"
#: gitk:4102
msgid "Committer:"
msgstr "Committer:"
#: gitk:4103
msgid "Commit Message:"
msgstr "Mensagem de Commit:"
#: gitk:4104
msgid "Matches all Commit Info criteria"
msgstr "Corresponde a todos os critérios da Informação Sobre o Commit"
#: gitk:4105
msgid "Matches no Commit Info criteria"
msgstr "Não corresponde a nenhum critério da Informação Sobre o Commit"
#: gitk:4106
msgid "Changes to Files:"
msgstr "Alterações nos Ficheiros:"
#: gitk:4107
msgid "Fixed String"
msgstr "Cadeia Fixa"
#: gitk:4108
msgid "Regular Expression"
msgstr "Expressão Regular"
#: gitk:4109
msgid "Search string:"
msgstr "Procurar pela cadeia:"
#: gitk:4110
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
msgstr ""
"Datas de Commit (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
#: gitk:4111
msgid "Since:"
msgstr "Desde:"
#: gitk:4112
msgid "Until:"
msgstr "Até:"
#: gitk:4113
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:4114
msgid "Number to show:"
msgstr "Número a mostrar:"
#: gitk:4115
msgid "Number to skip:"
msgstr "Número a ignorar:"
#: gitk:4116
msgid "Miscellaneous options:"
msgstr "Opções diversas:"
#: gitk:4117
msgid "Strictly sort by date"
msgstr "Ordenar estritamente pela data"
#: gitk:4118
msgid "Mark branch sides"
msgstr "Marcar lado dos ramos"
#: gitk:4119
msgid "Limit to first parent"
msgstr "Restringir ao primeiro pai"
#: gitk:4120
msgid "Simple history"
msgstr "Histórico simples"
#: gitk:4121
msgid "Additional arguments to git log:"
msgstr "Argumentos adicionais ao git log:"
#: gitk:4122
msgid "Enter files and directories to include, one per line:"
msgstr "Introduza ficheiros e diretórios para incluir, um por linha:"
#: gitk:4123
msgid "Command to generate more commits to include:"
msgstr "Comando para gerar mais commits para incluir:"
#: gitk:4247
msgid "Gitk: edit view"
msgstr "Gitk: editar vista"
#: gitk:4255
msgid "-- criteria for selecting revisions"
msgstr "-- critério para selecionar revisões"
#: gitk:4260
msgid "View Name"
msgstr "Nome da Vista"
#: gitk:4335
msgid "Apply (F5)"
msgstr "Aplicar (F5)"
#: gitk:4373
msgid "Error in commit selection arguments:"
msgstr "Erro nos argumentos de seleção de commits:"
#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411
msgid "None"
msgstr "Nenhum"
#: gitk:5040 gitk:5045
msgid "Descendant"
msgstr "Descendente"
#: gitk:5041
msgid "Not descendant"
msgstr "Não descendente"
#: gitk:5048 gitk:5053
msgid "Ancestor"
msgstr "Antecessor"
#: gitk:5049
msgid "Not ancestor"
msgstr "Não antecessor"
#: gitk:5343
msgid "Local changes checked in to index but not committed"
msgstr "Alterações locais preparadas no índice mas não submetidas"
#: gitk:5379
msgid "Local uncommitted changes, not checked in to index"
msgstr "Alterações locais não submetidas, não preparadas no índice"
#: gitk:7153
msgid "and many more"
msgstr "e muitos mais"
#: gitk:7156
msgid "many"
msgstr "muitos"
#: gitk:7347
msgid "Tags:"
msgstr "Tags:"
#: gitk:7364 gitk:7370 gitk:8844
msgid "Parent"
msgstr "Pai"
#: gitk:7375
msgid "Child"
msgstr "Filho"
#: gitk:7384
msgid "Branch"
msgstr "Ramo"
#: gitk:7387
msgid "Follows"
msgstr "Sucede"
#: gitk:7390
msgid "Precedes"
msgstr "Precede"
#: gitk:7985
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Erro ao obter diferenças: %s"
#: gitk:8669
msgid "Goto:"
msgstr "Ir para:"
#: gitk:8690
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "O id SHA1 abreviado %s é ambíguo"
#: gitk:8697
#, tcl-format
msgid "Revision %s is not known"
msgstr "A revisão %s não é conhecida"
#: gitk:8707
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "O id SHA1 %s não é conhecido"
#: gitk:8709
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "A revisão %s não se encontra na vista atual"
#: gitk:8851 gitk:8866
msgid "Date"
msgstr "Data"
#: gitk:8854
msgid "Children"
msgstr "Filhos"
#: gitk:8917
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Repor o ramo %s para aqui"
#: gitk:8919
msgid "Detached head: can't reset"
msgstr "Cabeça destacada: não é possível repor"
#: gitk:9024 gitk:9030
msgid "Skipping merge commit "
msgstr "A ignorar commit de integração "
#: gitk:9039 gitk:9044
msgid "Error getting patch ID for "
msgstr "Erro ao obter ID de patch de "
#: gitk:9040 gitk:9045
msgid " - stopping\n"
msgstr " - a interromper\n"
#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084
msgid "Commit "
msgstr "Commit "
#: gitk:9054
msgid ""
" is the same patch as\n"
" "
msgstr ""
" é o mesmo patch que\n"
" "
#: gitk:9062
msgid ""
" differs from\n"
" "
msgstr ""
" difere de\n"
" "
#: gitk:9064
msgid ""
"Diff of commits:\n"
"\n"
msgstr ""
"Diferença dos commits:\n"
"\n"
#: gitk:9076 gitk:9085
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " tem %s filhos - a interromper\n"
#: gitk:9104
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Erro ao escrever commit no ficheiro: %s"
#: gitk:9110
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Erro ao calcular as diferenças dos commits: %s"
#: gitk:9156
msgid "Top"
msgstr "Topo"
#: gitk:9157
msgid "From"
msgstr "De"
#: gitk:9162
msgid "To"
msgstr "Para"
#: gitk:9186
msgid "Generate patch"
msgstr "Gerar patch"
#: gitk:9188
msgid "From:"
msgstr "De:"
#: gitk:9197
msgid "To:"
msgstr "Para:"
#: gitk:9206
msgid "Reverse"
msgstr "Reverter"
#: gitk:9208 gitk:9418
msgid "Output file:"
msgstr "Ficheiro de saída:"
#: gitk:9214
msgid "Generate"
msgstr "Gerar"
#: gitk:9252
msgid "Error creating patch:"
msgstr "Erro ao criar patch:"
#: gitk:9275 gitk:9406 gitk:9463
msgid "ID:"
msgstr "ID:"
#: gitk:9284
msgid "Tag name:"
msgstr "Nome da tag:"
#: gitk:9287
msgid "Tag message is optional"
msgstr "A mensagem da tag é opcional"
#: gitk:9289
msgid "Tag message:"
msgstr "Mensagem da tag:"
#: gitk:9293 gitk:9472
msgid "Create"
msgstr "Criar"
#: gitk:9311
msgid "No tag name specified"
msgstr "Nenhum nome de tag especificado"
#: gitk:9315
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "A tag \"%s\" já existe"
#: gitk:9325
msgid "Error creating tag:"
msgstr "Erro ao criar tag:"