1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-22 00:26:08 +02:00
* '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
This commit is contained in:
Junio C Hamano 2017-01-18 10:27:59 -08:00
commit ffac48d093
15 changed files with 1901 additions and 382 deletions

View File

@ -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

View File

@ -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

View File

@ -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"
"Използвайте и разпространявайте при условията на ОПЛ на ГНУ"

View File

@ -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"

View File

@ -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"

View File

@ -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)"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -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 に従ってください"

View File

@ -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"

1376
gitk-git/po/pt_pt.po Normal file
View File

@ -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:"
#: gitk:9415
msgid "Command:"
msgstr "Comando:"
#: gitk:9423
msgid "Write"
msgstr "Escrever"
#: gitk:9441
msgid "Error writing commit:"
msgstr "Erro ao escrever commit:"
#: gitk:9468
msgid "Name:"
msgstr "Nome:"
#: gitk:9491
msgid "Please specify a name for the new branch"
msgstr "Especifique um nome para o novo ramo"
#: gitk:9496
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "O ramo '%s' já existe. Substituí-lo?"
#: gitk:9563
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr "O commit %s já está incluído no ramo %s -- reaplicá-lo mesmo assim?"
#: gitk:9568
msgid "Cherry-picking"
msgstr "A efetuar cherry-pick"
#: gitk:9577
#, 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 ""
"Falha ao efetuar cherry-pick devido a alterações locais no ficheiro '%s'.\n"
"Submeta, empilhe ou reponha as alterações e tente de novo."
#: gitk:9583
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
msgstr ""
"Falha ao efetuar cherry-pick devido a conflito de integração.\n"
"Deseja executar git citool para resolvê-lo?"
#: gitk:9599 gitk:9657
msgid "No changes committed"
msgstr "Não foi submetida nenhum alteração"
#: gitk:9626
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr "O commit %s não está incluído no ramo %s -- revertê-lo mesmo assim?"
#: gitk:9631
msgid "Reverting"
msgstr "A reverter"
#: gitk:9639
#, 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 ""
"Falha ao reverter devido a alterações locais nos seguintes ficheiros:%s "
"Submeta, empilhe ou reponha as alterações e tente de novo."
#: gitk:9643
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr ""
"Falha ao reverter devido a conflito de integração.\n"
"Deseja executar git citool para resolvê-lo?"
#: gitk:9686
msgid "Confirm reset"
msgstr "Confirmar reposição"
#: gitk:9688
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Repor o ramo %s para %s?"
#: gitk:9690
msgid "Reset type:"
msgstr "Tipo de reposição:"
#: gitk:9693
msgid "Soft: Leave working tree and index untouched"
msgstr "Suave: Deixar a árvore de trabalho e o índice intactos"
#: gitk:9696
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Misto: Deixar a árvore de trabalho intacta, repor índice"
#: gitk:9699
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr ""
"Forte: Repor árvore de trabalho e índice\n"
"(descartar TODAS as alterações locais)"
#: gitk:9716
msgid "Resetting"
msgstr "A repor"
#: gitk:9776
msgid "Checking out"
msgstr "A extrair"
#: gitk:9829
msgid "Cannot delete the currently checked-out branch"
msgstr "Não é possível eliminar o ramo atual extraído"
#: gitk:9835
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Really delete branch %s?"
msgstr ""
"Os commits no ramo %s não estão presentes em mais nenhum ramo.\n"
"Eliminar o ramo %s mesmo assim?"
#: gitk:9866
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Tags e cabeças: %s"
#: gitk:9883
msgid "Filter"
msgstr "Filtrar"
#: gitk:10179
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
msgstr ""
"Erro ao ler informação de topologia do commit; a informação do ramo e da tag "
"precedente/seguinte ficará incompleta."
#: gitk:11156
msgid "Tag"
msgstr "Tag"
#: gitk:11160
msgid "Id"
msgstr "Id"
#: gitk:11243
msgid "Gitk font chooser"
msgstr "Escolha de tipo de letra do gitk"
#: gitk:11260
msgid "B"
msgstr "B"
#: gitk:11263
msgid "I"
msgstr "I"
#: gitk:11381
msgid "Commit list display options"
msgstr "Opções de visualização da lista de commits"
#: gitk:11384
msgid "Maximum graph width (lines)"
msgstr "Largura máxima do gráfico (linhas)"
#: gitk:11388
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Largura máxima do gráfico (% do painel)"
#: gitk:11391
msgid "Show local changes"
msgstr "Mostrar alterações locais"
#: gitk:11394
msgid "Auto-select SHA1 (length)"
msgstr "Selecionar automaticamente SHA1 (largura)"
#: gitk:11398
msgid "Hide remote refs"
msgstr "Ocultar referências remotas"
#: gitk:11402
msgid "Diff display options"
msgstr "Opções de visualização de diferenças"
#: gitk:11404
msgid "Tab spacing"
msgstr "Espaçamento da tabulação"
#: gitk:11407
msgid "Display nearby tags/heads"
msgstr "Mostrar tags/cabeças próximas"
#: gitk:11410
msgid "Maximum # tags/heads to show"
msgstr "Nº máximo de tags/cabeças a mostrar"
#: gitk:11413
msgid "Limit diffs to listed paths"
msgstr "Limitar diferenças aos caminhos listados"
#: gitk:11416
msgid "Support per-file encodings"
msgstr "Suportar codificação por cada ficheiro"
#: gitk:11422 gitk:11569
msgid "External diff tool"
msgstr "Ferramenta diff externa"
#: gitk:11423
msgid "Choose..."
msgstr "Escolher..."
#: gitk:11428
msgid "General options"
msgstr "Opções gerais"
#: gitk:11431
msgid "Use themed widgets"
msgstr "Usar widgets com estilo"
#: gitk:11433
msgid "(change requires restart)"
msgstr "(alteração exige reiniciar)"
#: gitk:11435
msgid "(currently unavailable)"
msgstr "(não disponível de momento)"
#: gitk:11446
msgid "Colors: press to choose"
msgstr "Cores: pressione para escolher"
#: gitk:11449
msgid "Interface"
msgstr "Interface"
#: gitk:11450
msgid "interface"
msgstr "interface"
#: gitk:11453
msgid "Background"
msgstr "Fundo"
#: gitk:11454 gitk:11484
msgid "background"
msgstr "fundo"
#: gitk:11457
msgid "Foreground"
msgstr "Primeiro plano"
#: gitk:11458
msgid "foreground"
msgstr "primeiro plano"
#: gitk:11461
msgid "Diff: old lines"
msgstr "Diff: linhas antigas"
#: gitk:11462
msgid "diff old lines"
msgstr "diff linhas antigas"
#: gitk:11466
msgid "Diff: new lines"
msgstr "Diff: linhas novas"
#: gitk:11467
msgid "diff new lines"
msgstr "diff linhas novas"
#: gitk:11471
msgid "Diff: hunk header"
msgstr "Diff: cabeçalho do excerto"
#: gitk:11473
msgid "diff hunk header"
msgstr "diff cabeçalho do excerto"
#: gitk:11477
msgid "Marked line bg"
msgstr "Fundo da linha marcada"
#: gitk:11479
msgid "marked line background"
msgstr "fundo da linha marcada"
#: gitk:11483
msgid "Select bg"
msgstr "Selecionar fundo"
#: gitk:11492
msgid "Fonts: press to choose"
msgstr "Tipo de letra: pressione para escolher"
#: gitk:11494
msgid "Main font"
msgstr "Tipo de letra principal"
#: gitk:11495
msgid "Diff display font"
msgstr "Tipo de letra ao mostrar diferenças"
#: gitk:11496
msgid "User interface font"
msgstr "Tipo de letra da interface de utilizador"
#: gitk:11518
msgid "Gitk preferences"
msgstr "Preferências do gitk"
#: gitk:11527
msgid "General"
msgstr "Geral"
#: gitk:11528
msgid "Colors"
msgstr "Cores"
#: gitk:11529
msgid "Fonts"
msgstr "Tipos de letra"
#: gitk:11579
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: escolher cor de %s"
#: gitk:12092
msgid ""
"Sorry, gitk cannot run with this version of Tcl/Tk.\n"
" Gitk requires at least Tcl/Tk 8.4."
msgstr ""
"Não é possível executar o gitk com esta versão do Tcl/Tk.\n"
"O gitk requer pelo menos Tcl/Tk 8.4."
#: gitk:12302
msgid "Cannot find a git repository here."
msgstr "Não foi encontrado nenhum repositório git aqui."
#: gitk:12349
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Argumento '%s' ambíguo: pode ser uma revisão ou um ficheiro"
#: gitk:12361
msgid "Bad arguments to gitk:"
msgstr "Argumentos do gitk incorretos:"

View File

@ -3,15 +3,15 @@
# Translators:
# 0xAX <kuleshovmail@gmail.com>, 2014
# Alex Riesen <raa.lkml@gmail.com>, 2015
# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015
# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016
# Dmitry Potapov <dpotapov@gmail.com>, 2009
# Skip <bsvskip@rambler.ru>, 2011
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-17 14:32+1000\n"
"PO-Revision-Date: 2015-10-12 10:14+0000\n"
"POT-Creation-Date: 2016-12-15 00:18+0200\n"
"PO-Revision-Date: 2016-12-14 22:23+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@ -24,11 +24,11 @@ msgstr ""
msgid "Couldn't get list of unmerged files:"
msgstr "Невозможно получить список файлов незавершённой операции слияния:"
#: gitk:212 gitk:2381
#: gitk:212 gitk:2403
msgid "Color words"
msgstr "Цветные слова"
#: gitk:217 gitk:2381 gitk:8220 gitk:8253
#: gitk:217 gitk:2403 gitk:8249 gitk:8282
msgid "Markup words"
msgstr "Помеченые слова"
@ -58,1272 +58,1314 @@ msgstr "Ошибка запуска git log:"
msgid "Reading"
msgstr "Чтение"
#: gitk:496 gitk:4525
#: gitk:496 gitk:4549
msgid "Reading commits..."
msgstr "Чтение коммитов..."
#: gitk:499 gitk:1637 gitk:4528
#: gitk:499 gitk:1641 gitk:4552
msgid "No commits selected"
msgstr "Ничего не выбрано"
#: gitk:1445 gitk:4045 gitk:12432
#: gitk:1449 gitk:4069 gitk:12583
msgid "Command line"
msgstr "Командная строка"
#: gitk:1511
#: gitk:1515
msgid "Can't parse git log output:"
msgstr "Ошибка обработки вывода команды git log:"
#: gitk:1740
#: gitk:1744
msgid "No commit information available"
msgstr "Нет информации о коммите"
#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521
#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668
msgid "OK"
msgstr "Ok"
#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671
#: gitk:11242 gitk:11522
#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791
#: gitk:11389 gitk:11669
msgid "Cancel"
msgstr "Отмена"
#: gitk:2069
#: gitk:2087
msgid "&Update"
msgstr "Обновить"
#: gitk:2070
#: gitk:2088
msgid "&Reload"
msgstr "Перечитать"
#: gitk:2071
#: gitk:2089
msgid "Reread re&ferences"
msgstr "Обновить список ссылок"
#: gitk:2072
#: gitk:2090
msgid "&List references"
msgstr "Список ссылок"
#: gitk:2074
#: gitk:2092
msgid "Start git &gui"
msgstr "Запустить git gui"
#: gitk:2076
#: gitk:2094
msgid "&Quit"
msgstr "Завершить"
#: gitk:2068
#: gitk:2086
msgid "&File"
msgstr "Файл"
#: gitk:2080
#: gitk:2098
msgid "&Preferences"
msgstr "Настройки"
#: gitk:2079
#: gitk:2097
msgid "&Edit"
msgstr "Редактировать"
#: gitk:2084
#: gitk:2102
msgid "&New view..."
msgstr "Новое представление..."
#: gitk:2085
#: gitk:2103
msgid "&Edit view..."
msgstr "Редактировать представление..."
#: gitk:2086
#: gitk:2104
msgid "&Delete view"
msgstr "Удалить представление"
#: gitk:2088 gitk:4043
#: gitk:2106
msgid "&All files"
msgstr "Все файлы"
#: gitk:2083 gitk:4067
#: gitk:2101
msgid "&View"
msgstr "Представление"
#: gitk:2093 gitk:2103 gitk:3012
#: gitk:2111 gitk:2121
msgid "&About gitk"
msgstr "О gitk"
#: gitk:2094 gitk:2108
#: gitk:2112 gitk:2126
msgid "&Key bindings"
msgstr "Назначения клавиатуры"
#: gitk:2092 gitk:2107
#: gitk:2110 gitk:2125
msgid "&Help"
msgstr "Подсказка"
#: gitk:2185 gitk:8652
#: gitk:2203 gitk:8681
msgid "SHA1 ID:"
msgstr "SHA1 ID:"
#: gitk:2229
#: gitk:2247
msgid "Row"
msgstr "Строка"
#: gitk:2267
#: gitk:2285
msgid "Find"
msgstr "Поиск"
#: gitk:2295
#: gitk:2313
msgid "commit"
msgstr "коммит"
#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827
#: gitk:6912
#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851
#: gitk:6936
msgid "containing:"
msgstr "содержащее:"
#: gitk:2302 gitk:3526 gitk:3531 gitk:4763
#: gitk:2320 gitk:3550 gitk:3555 gitk:4787
msgid "touching paths:"
msgstr "касательно файлов:"
#: gitk:2303 gitk:4777
#: gitk:2321 gitk:4801
msgid "adding/removing string:"
msgstr "добавив/удалив строку:"
#: gitk:2304 gitk:4779
#: gitk:2322 gitk:4803
msgid "changing lines matching:"
msgstr "изменяя совпадающие строки:"
#: gitk:2313 gitk:2315 gitk:4766
#: gitk:2331 gitk:2333 gitk:4790
msgid "Exact"
msgstr "Точно"
#: gitk:2315 gitk:4854 gitk:6723
#: gitk:2333 gitk:4878 gitk:6747
msgid "IgnCase"
msgstr "Игнорировать большие/маленькие"
#: gitk:2315 gitk:4736 gitk:4852 gitk:6719
#: gitk:2333 gitk:4760 gitk:4876 gitk:6743
msgid "Regexp"
msgstr "Регулярные выражения"
#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916
#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940
msgid "All fields"
msgstr "Во всех полях"
#: gitk:2318 gitk:4871 gitk:4904 gitk:6786
#: gitk:2336 gitk:4895 gitk:4928 gitk:6810
msgid "Headline"
msgstr "Заголовок"
#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389
#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413
msgid "Comments"
msgstr "Комментарии"
#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830
#: gitk:8845
#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859
#: gitk:8874
msgid "Author"
msgstr "Автор"
#: gitk:2319 gitk:4871 gitk:6786 gitk:7326
#: gitk:2337 gitk:4895 gitk:6810 gitk:7350
msgid "Committer"
msgstr "Коммитер"
#: gitk:2350
#: gitk:2371
msgid "Search"
msgstr "Найти"
#: gitk:2358
#: gitk:2379
msgid "Diff"
msgstr "Сравнить"
#: gitk:2360
#: gitk:2381
msgid "Old version"
msgstr "Старая версия"
#: gitk:2362
#: gitk:2383
msgid "New version"
msgstr "Новая версия"
#: gitk:2364
#: gitk:2386
msgid "Lines of context"
msgstr "Строк контекста"
#: gitk:2374
#: gitk:2396
msgid "Ignore space change"
msgstr "Игнорировать пробелы"
#: gitk:2378 gitk:2380 gitk:7959 gitk:8206
#: gitk:2400 gitk:2402 gitk:7983 gitk:8235
msgid "Line diff"
msgstr "Изменения строк"
#: gitk:2445
#: gitk:2467
msgid "Patch"
msgstr "Патч"
#: gitk:2447
#: gitk:2469
msgid "Tree"
msgstr "Файлы"
#: gitk:2617 gitk:2637
#: gitk:2639 gitk:2660
msgid "Diff this -> selected"
msgstr "Сравнить этот коммит с выделенным"
#: gitk:2618 gitk:2638
#: gitk:2640 gitk:2661
msgid "Diff selected -> this"
msgstr "Сравнить выделенный с этим коммитом"
#: gitk:2619 gitk:2639
#: gitk:2641 gitk:2662
msgid "Make patch"
msgstr "Создать патч"
#: gitk:2620 gitk:9254
#: gitk:2642 gitk:9283
msgid "Create tag"
msgstr "Создать метку"
#: gitk:2621 gitk:9371
#: gitk:2643
msgid "Copy commit summary"
msgstr "Копировать информацию о коммите"
#: gitk:2644 gitk:9414
msgid "Write commit to file"
msgstr "Сохранить коммит в файл"
#: gitk:2622 gitk:9428
#: gitk:2645
msgid "Create new branch"
msgstr "Создать ветку"
#: gitk:2623
#: gitk:2646
msgid "Cherry-pick this commit"
msgstr "Отбор лучшего для этого коммита"
msgstr "Копировать этот коммит в текущую ветку"
#: gitk:2624
#: gitk:2647
msgid "Reset HEAD branch to here"
msgstr "Установить HEAD на этот коммит"
#: gitk:2625
#: gitk:2648
msgid "Mark this commit"
msgstr "Пометить этот коммит"
#: gitk:2626
#: gitk:2649
msgid "Return to mark"
msgstr "Вернуться на пометку"
#: gitk:2627
#: gitk:2650
msgid "Find descendant of this and mark"
msgstr "Найти и пометить потомка этого коммита"
#: gitk:2628
#: gitk:2651
msgid "Compare with marked commit"
msgstr "Сравнить с помеченным коммитом"
#: gitk:2629 gitk:2640
#: gitk:2652 gitk:2663
msgid "Diff this -> marked commit"
msgstr "Сравнить выделенное с помеченным коммитом"
#: gitk:2630 gitk:2641
#: gitk:2653 gitk:2664
msgid "Diff marked commit -> this"
msgstr "Сравнить помеченный с этим коммитом"
#: gitk:2631
#: gitk:2654
msgid "Revert this commit"
msgstr "Возврат этого коммита"
msgstr "Обратить изменения этого коммита"
#: gitk:2647
#: gitk:2670
msgid "Check out this branch"
msgstr "Перейти на эту ветку"
#: gitk:2648
#: gitk:2671
msgid "Rename this branch"
msgstr "Переименовать эту ветку"
#: gitk:2672
msgid "Remove this branch"
msgstr "Удалить эту ветку"
#: gitk:2649
#: gitk:2673
msgid "Copy branch name"
msgstr "Копировать имя ветки"
#: gitk:2656
#: gitk:2680
msgid "Highlight this too"
msgstr "Подсветить этот тоже"
#: gitk:2657
#: gitk:2681
msgid "Highlight this only"
msgstr "Подсветить только этот"
#: gitk:2658
#: gitk:2682
msgid "External diff"
msgstr "Программа сравнения"
#: gitk:2659
#: gitk:2683
msgid "Blame parent commit"
msgstr "Авторы изменений родительского коммита"
#: gitk:2660
#: gitk:2684
msgid "Copy path"
msgstr "Копировать путь"
#: gitk:2667
#: gitk:2691
msgid "Show origin of this line"
msgstr "Показать источник этой строки"
#: gitk:2668
#: gitk:2692
msgid "Run git gui blame on this line"
msgstr "Запустить git gui blame для этой строки"
#: gitk:3014
#: gitk:3036
msgid "About gitk"
msgstr "О gitk"
#: gitk:3038
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 "\nGitk - программа просмотра истории репозиториев git\n\n© 2005-2014 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License"
msgstr "\nGitk — программа просмотра истории репозиториев git\n\n© 2005-2016 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License"
#: gitk:3022 gitk:3089 gitk:9857
#: gitk:3046 gitk:3113 gitk:10004
msgid "Close"
msgstr "Закрыть"
#: gitk:3043
#: gitk:3067
msgid "Gitk key bindings"
msgstr "Назначения клавиатуры в Gitk"
#: gitk:3046
#: gitk:3070
msgid "Gitk key bindings:"
msgstr "Назначения клавиатуры в Gitk:"
#: gitk:3048
#: gitk:3072
#, tcl-format
msgid "<%s-Q>\t\tQuit"
msgstr "<%s-Q>\t\tЗавершить"
#: gitk:3049
#: gitk:3073
#, tcl-format
msgid "<%s-W>\t\tClose window"
msgstr "<%s-W>\t\tЗакрыть окно"
#: gitk:3050
#: gitk:3074
msgid "<Home>\t\tMove to first commit"
msgstr "<Home>\t\tПерейти к первому коммиту"
#: gitk:3051
#: gitk:3075
msgid "<End>\t\tMove to last commit"
msgstr "<End>\t\tПерейти к последнему коммиту"
#: gitk:3052
#: gitk:3076
msgid "<Up>, p, k\tMove up one commit"
msgstr "<Up>, p, k\tПерейти на один коммит вверх"
#: gitk:3053
#: gitk:3077
msgid "<Down>, n, j\tMove down one commit"
msgstr "<Down>, n, j\tПерейти на один коммит вниз"
#: gitk:3054
#: gitk:3078
msgid "<Left>, z, h\tGo back in history list"
msgstr "<Left>, z, h\tПоказать ранее посещённое состояние"
#: gitk:3055
#: gitk:3079
msgid "<Right>, x, l\tGo forward in history list"
msgstr "<Right>, x, l\tПоказать следующий посещённый коммит"
#: gitk:3056
#: gitk:3080
#, tcl-format
msgid "<%s-n>\tGo to n-th parent of current commit in history list"
msgstr "<%s-n>\tПерейти на n родителя от текущего коммита"
#: gitk:3057
#: gitk:3081
msgid "<PageUp>\tMove up one page in commit list"
msgstr "<PageUp>\tПерейти на страницу выше в списке коммитов"
#: gitk:3058
#: gitk:3082
msgid "<PageDown>\tMove down one page in commit list"
msgstr "<PageDown>\tПерейти на страницу ниже в списке коммитов"
#: gitk:3059
#: gitk:3083
#, tcl-format
msgid "<%s-Home>\tScroll to top of commit list"
msgstr "<%s-Home>\tПерейти на начало списка коммитов"
#: gitk:3060
#: gitk:3084
#, tcl-format
msgid "<%s-End>\tScroll to bottom of commit list"
msgstr "<%s-End>\tПерейти на конец списка коммитов"
#: gitk:3061
#: gitk:3085
#, tcl-format
msgid "<%s-Up>\tScroll commit list up one line"
msgstr "<%s-Up>\tПровернуть список коммитов вверх"
#: gitk:3062
#: gitk:3086
#, tcl-format
msgid "<%s-Down>\tScroll commit list down one line"
msgstr "<%s-Down>\tПровернуть список коммитов вниз"
#: gitk:3063
#: gitk:3087
#, tcl-format
msgid "<%s-PageUp>\tScroll commit list up one page"
msgstr "<%s-PageUp>\tПровернуть список коммитов на страницу вверх"
#: gitk:3064
#: gitk:3088
#, tcl-format
msgid "<%s-PageDown>\tScroll commit list down one page"
msgstr "<%s-PageDown>\tПровернуть список коммитов на страницу вниз"
#: gitk:3065
#: gitk:3089
msgid "<Shift-Up>\tFind backwards (upwards, later commits)"
msgstr "<Shift-Up>\tПоиск в обратном порядке (вверх, среди новых коммитов)"
#: gitk:3066
#: gitk:3090
msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)"
msgstr "<Shift-Down>\tПоиск (вниз, среди старых коммитов)"
#: gitk:3067
#: gitk:3091
msgid "<Delete>, b\tScroll diff view up one page"
msgstr "<Delete>, b\tПрокрутить список изменений на страницу выше"
#: gitk:3068
#: gitk:3092
msgid "<Backspace>\tScroll diff view up one page"
msgstr "<Backspace>\tПрокрутить список изменений на страницу выше"
#: gitk:3069
#: gitk:3093
msgid "<Space>\t\tScroll diff view down one page"
msgstr "<Leertaste>\t\tПрокрутить список изменений на страницу ниже"
#: gitk:3070
#: gitk:3094
msgid "u\t\tScroll diff view up 18 lines"
msgstr "u\t\tПрокрутить список изменений на 18 строк вверх"
#: gitk:3071
#: gitk:3095
msgid "d\t\tScroll diff view down 18 lines"
msgstr "d\t\tПрокрутить список изменений на 18 строк вниз"
#: gitk:3072
#: gitk:3096
#, tcl-format
msgid "<%s-F>\t\tFind"
msgstr "<%s-F>\t\tПоиск"
#: gitk:3073
#: gitk:3097
#, tcl-format
msgid "<%s-G>\t\tMove to next find hit"
msgstr "<%s-G>\t\tПерейти к следующему найденному коммиту"
#: gitk:3074
#: gitk:3098
msgid "<Return>\tMove to next find hit"
msgstr "<Return>\tПерейти к следующему найденному коммиту"
#: gitk:3075
#: gitk:3099
msgid "g\t\tGo to commit"
msgstr "g\t\tПерейти на коммит"
#: gitk:3076
#: gitk:3100
msgid "/\t\tFocus the search box"
msgstr "/\t\tПерейти к полю поиска"
#: gitk:3077
#: gitk:3101
msgid "?\t\tMove to previous find hit"
msgstr "?\t\tПерейти к предыдущему найденному коммиту"
#: gitk:3078
#: gitk:3102
msgid "f\t\tScroll diff view to next file"
msgstr "f\t\tПрокрутить список изменений к следующему файлу"
#: gitk:3079
#: gitk:3103
#, tcl-format
msgid "<%s-S>\t\tSearch for next hit in diff view"
msgstr "<%s-S>\t\tПродолжить поиск в списке изменений"
#: gitk:3080
#: gitk:3104
#, tcl-format
msgid "<%s-R>\t\tSearch for previous hit in diff view"
msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений"
#: gitk:3081
#: gitk:3105
#, tcl-format
msgid "<%s-KP+>\tIncrease font size"
msgstr "<%s-KP+>\tУвеличить размер шрифта"
#: gitk:3082
#: gitk:3106
#, tcl-format
msgid "<%s-plus>\tIncrease font size"
msgstr "<%s-plus>\tУвеличить размер шрифта"
#: gitk:3083
#: gitk:3107
#, tcl-format
msgid "<%s-KP->\tDecrease font size"
msgstr "<%s-KP->\tУменьшить размер шрифта"
#: gitk:3084
#: gitk:3108
#, tcl-format
msgid "<%s-minus>\tDecrease font size"
msgstr "<%s-minus>\tУменьшить размер шрифта"
#: gitk:3085
#: gitk:3109
msgid "<F5>\t\tUpdate"
msgstr "<F5>\t\tОбновить"
#: gitk:3550 gitk:3559
#: gitk:3574 gitk:3583
#, tcl-format
msgid "Error creating temporary directory %s:"
msgstr "Ошибка создания временного каталога %s:"
#: gitk:3572
#: gitk:3596
#, tcl-format
msgid "Error getting \"%s\" from %s:"
msgstr "Ошибка получения «%s» из %s:"
#: gitk:3635
#: gitk:3659
msgid "command failed:"
msgstr "ошибка выполнения команды:"
#: gitk:3784
#: gitk:3808
msgid "No such commit"
msgstr "Коммит не найден"
#: gitk:3798
#: gitk:3822
msgid "git gui blame: command failed:"
msgstr "git gui blame: ошибка выполнения команды:"
#: gitk:3829
#: gitk:3853
#, tcl-format
msgid "Couldn't read merge head: %s"
msgstr "Ошибка чтения MERGE_HEAD: %s"
#: gitk:3837
#: gitk:3861
#, tcl-format
msgid "Error reading index: %s"
msgstr "Ошибка чтения индекса: %s"
#: gitk:3862
#: gitk:3886
#, tcl-format
msgid "Couldn't start git blame: %s"
msgstr "Ошибка запуска git blame: %s"
#: gitk:3865 gitk:6754
#: gitk:3889 gitk:6778
msgid "Searching"
msgstr "Поиск"
#: gitk:3897
#: gitk:3921
#, tcl-format
msgid "Error running git blame: %s"
msgstr "Ошибка выполнения git blame: %s"
#: gitk:3925
#: gitk:3949
#, tcl-format
msgid "That line comes from commit %s, which is not in this view"
msgstr "Эта строка принадлежит коммиту %s, который не показан в этом представлении"
#: gitk:3939
#: gitk:3963
msgid "External diff viewer failed:"
msgstr "Ошибка выполнения программы сравнения:"
#: gitk:4070
#: gitk:4067
msgid "All files"
msgstr "Все файлы"
#: gitk:4091
msgid "View"
msgstr "Представление"
#: gitk:4094
msgid "Gitk view definition"
msgstr "Gitk определение представлений"
#: gitk:4074
#: gitk:4098
msgid "Remember this view"
msgstr "Запомнить представление"
#: gitk:4075
#: gitk:4099
msgid "References (space separated list):"
msgstr "Ссылки (разделённые пробелом):"
#: gitk:4076
#: gitk:4100
msgid "Branches & tags:"
msgstr "Ветки и метки"
#: gitk:4077
#: gitk:4101
msgid "All refs"
msgstr "Все ссылки"
#: gitk:4078
#: gitk:4102
msgid "All (local) branches"
msgstr "Все (локальные) ветки"
#: gitk:4079
#: gitk:4103
msgid "All tags"
msgstr "Все метки"
#: gitk:4080
#: gitk:4104
msgid "All remote-tracking branches"
msgstr "Все внешние отслеживаемые ветки"
#: gitk:4081
#: gitk:4105
msgid "Commit Info (regular expressions):"
msgstr "Информация о коммите (регулярные выражения):"
#: gitk:4082
#: gitk:4106
msgid "Author:"
msgstr "Автор:"
#: gitk:4083
#: gitk:4107
msgid "Committer:"
msgstr "Коммитер:"
#: gitk:4084
#: gitk:4108
msgid "Commit Message:"
msgstr "Сообщение коммита:"
#: gitk:4085
#: gitk:4109
msgid "Matches all Commit Info criteria"
msgstr "Совпадает со всеми условиями информации о коммите"
#: gitk:4086
#: gitk:4110
msgid "Matches no Commit Info criteria"
msgstr "Не совпадает с условиями информации о коммите"
#: gitk:4087
#: gitk:4111
msgid "Changes to Files:"
msgstr "Изменения файлов:"
#: gitk:4088
#: gitk:4112
msgid "Fixed String"
msgstr "Обычная строка"
#: gitk:4089
#: gitk:4113
msgid "Regular Expression"
msgstr "Регулярное выражение:"
#: gitk:4090
#: gitk:4114
msgid "Search string:"
msgstr "Строка для поиска:"
#: gitk:4091
#: gitk:4115
msgid ""
"Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 "
"15:27:38\"):"
msgstr "Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 15:27:38»):"
#: gitk:4092
#: gitk:4116
msgid "Since:"
msgstr "С даты:"
#: gitk:4093
#: gitk:4117
msgid "Until:"
msgstr "По дату:"
#: gitk:4094
#: gitk:4118
msgid "Limit and/or skip a number of revisions (positive integer):"
msgstr "Ограничить и/или пропустить количество редакций (положительное число):"
#: gitk:4095
#: gitk:4119
msgid "Number to show:"
msgstr "Показать количество:"
#: gitk:4096
#: gitk:4120
msgid "Number to skip:"
msgstr "Пропустить количество:"
#: gitk:4097
#: gitk:4121
msgid "Miscellaneous options:"
msgstr "Различные опции:"
#: gitk:4098
#: gitk:4122
msgid "Strictly sort by date"
msgstr "Строгая сортировка по дате"
#: gitk:4099
#: gitk:4123
msgid "Mark branch sides"
msgstr "Отметить стороны веток"
#: gitk:4100
#: gitk:4124
msgid "Limit to first parent"
msgstr "Ограничить первым предком"
#: gitk:4101
#: gitk:4125
msgid "Simple history"
msgstr "Упрощенная история"
#: gitk:4102
#: gitk:4126
msgid "Additional arguments to git log:"
msgstr "Дополнительные аргументы для git log:"
#: gitk:4103
#: gitk:4127
msgid "Enter files and directories to include, one per line:"
msgstr "Файлы и каталоги для ограничения истории, по одному на строку:"
#: gitk:4104
#: gitk:4128
msgid "Command to generate more commits to include:"
msgstr "Дополнительная команда для списка коммитов:"
#: gitk:4228
#: gitk:4252
msgid "Gitk: edit view"
msgstr "Gitk: изменить представление"
#: gitk:4236
#: gitk:4260
msgid "-- criteria for selecting revisions"
msgstr "— критерий поиска редакций"
#: gitk:4241
#: gitk:4265
msgid "View Name"
msgstr "Имя представления"
#: gitk:4316
#: gitk:4340
msgid "Apply (F5)"
msgstr "Применить (F5)"
#: gitk:4354
#: gitk:4378
msgid "Error in commit selection arguments:"
msgstr "Ошибка в параметрах выбора коммитов:"
#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374
#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525
msgid "None"
msgstr "Ни одного"
#: gitk:5021 gitk:5026
#: gitk:5045 gitk:5050
msgid "Descendant"
msgstr "Порождённое"
#: gitk:5022
#: gitk:5046
msgid "Not descendant"
msgstr "Не порождённое"
#: gitk:5029 gitk:5034
#: gitk:5053 gitk:5058
msgid "Ancestor"
msgstr "Предок"
#: gitk:5030
#: gitk:5054
msgid "Not ancestor"
msgstr "Не предок"
#: gitk:5324
#: gitk:5348
msgid "Local changes checked in to index but not committed"
msgstr "Проиндексированные изменения"
#: gitk:5360
#: gitk:5384
msgid "Local uncommitted changes, not checked in to index"
msgstr "Непроиндексированные изменения"
#: gitk:7134
#: gitk:7158
msgid "and many more"
msgstr "и многое другое"
#: gitk:7137
#: gitk:7161
msgid "many"
msgstr "много"
#: gitk:7328
#: gitk:7352
msgid "Tags:"
msgstr "Метки:"
#: gitk:7345 gitk:7351 gitk:8825
#: gitk:7369 gitk:7375 gitk:8854
msgid "Parent"
msgstr "Предок"
#: gitk:7356
#: gitk:7380
msgid "Child"
msgstr "Потомок"
#: gitk:7365
#: gitk:7389
msgid "Branch"
msgstr "Ветка"
#: gitk:7368
#: gitk:7392
msgid "Follows"
msgstr "Следует за"
#: gitk:7371
#: gitk:7395
msgid "Precedes"
msgstr "Предшествует"
#: gitk:7966
#: gitk:7990
#, tcl-format
msgid "Error getting diffs: %s"
msgstr "Ошибка получения изменений: %s"
#: gitk:8650
#: gitk:8679
msgid "Goto:"
msgstr "Перейти к:"
#: gitk:8671
#: gitk:8700
#, tcl-format
msgid "Short SHA1 id %s is ambiguous"
msgstr "Сокращённый SHA1 идентификатор %s неоднозначен"
#: gitk:8678
#: gitk:8707
#, tcl-format
msgid "Revision %s is not known"
msgstr "Редакция %s не найдена"
#: gitk:8688
#: gitk:8717
#, tcl-format
msgid "SHA1 id %s is not known"
msgstr "SHA1 идентификатор %s не найден"
#: gitk:8690
#: gitk:8719
#, tcl-format
msgid "Revision %s is not in the current view"
msgstr "Редакция %s не найдена в текущем представлении"
#: gitk:8832 gitk:8847
#: gitk:8861 gitk:8876
msgid "Date"
msgstr "Дата"
#: gitk:8835
#: gitk:8864
msgid "Children"
msgstr "Потомки"
#: gitk:8898
#: gitk:8927
#, tcl-format
msgid "Reset %s branch to here"
msgstr "Сбросить ветку %s на этот коммит"
#: gitk:8900
#: gitk:8929
msgid "Detached head: can't reset"
msgstr "Коммит не принадлежит ни одной ветке, сбросить невозможно"
#: gitk:9005 gitk:9011
#: gitk:9034 gitk:9040
msgid "Skipping merge commit "
msgstr "Пропускаю коммит-слияние"
#: gitk:9020 gitk:9025
#: gitk:9049 gitk:9054
msgid "Error getting patch ID for "
msgstr "Не удалось получить идентификатор патча для "
#: gitk:9021 gitk:9026
#: gitk:9050 gitk:9055
msgid " - stopping\n"
msgstr " — останов\n"
#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065
#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094
msgid "Commit "
msgstr "Коммит"
#: gitk:9035
#: gitk:9064
msgid ""
" is the same patch as\n"
" "
msgstr " такой же патч, как и\n "
#: gitk:9043
#: gitk:9072
msgid ""
" differs from\n"
" "
msgstr " отличается от\n "
#: gitk:9045
#: gitk:9074
msgid ""
"Diff of commits:\n"
"\n"
msgstr "Различия коммитов:\n\n"
#: gitk:9057 gitk:9066
#: gitk:9086 gitk:9095
#, tcl-format
msgid " has %s children - stopping\n"
msgstr " является %s потомком — останов\n"
#: gitk:9085
#: gitk:9114
#, tcl-format
msgid "Error writing commit to file: %s"
msgstr "Произошла ошибка при записи коммита в файл: %s"
#: gitk:9091
#: gitk:9120
#, tcl-format
msgid "Error diffing commits: %s"
msgstr "Произошла ошибка при выводе различий коммитов: %s"
#: gitk:9137
#: gitk:9166
msgid "Top"
msgstr "Верх"
#: gitk:9138
#: gitk:9167
msgid "From"
msgstr "От"
#: gitk:9143
#: gitk:9172
msgid "To"
msgstr "До"
#: gitk:9167
#: gitk:9196
msgid "Generate patch"
msgstr "Создать патч"
#: gitk:9169
#: gitk:9198
msgid "From:"
msgstr "От:"
#: gitk:9178
#: gitk:9207
msgid "To:"
msgstr "До:"
#: gitk:9187
#: gitk:9216
msgid "Reverse"
msgstr "В обратном порядке"
#: gitk:9189 gitk:9385
#: gitk:9218 gitk:9428
msgid "Output file:"
msgstr "Файл для сохранения:"
#: gitk:9195
#: gitk:9224
msgid "Generate"
msgstr "Создать"
#: gitk:9233
#: gitk:9262
msgid "Error creating patch:"
msgstr "Ошибка создания патча:"
#: gitk:9256 gitk:9373 gitk:9430
#: gitk:9285 gitk:9416 gitk:9504
msgid "ID:"
msgstr "ID:"
#: gitk:9265
#: gitk:9294
msgid "Tag name:"
msgstr "Имя метки:"
#: gitk:9268
#: gitk:9297
msgid "Tag message is optional"
msgstr "Описание метки указывать не обязательно"
#: gitk:9270
#: gitk:9299
msgid "Tag message:"
msgstr "Описание метки:"
#: gitk:9274 gitk:9439
#: gitk:9303 gitk:9474
msgid "Create"
msgstr "Создать"
#: gitk:9292
#: gitk:9321
msgid "No tag name specified"
msgstr "Не задано имя метки"
#: gitk:9296
#: gitk:9325
#, tcl-format
msgid "Tag \"%s\" already exists"
msgstr "Метка «%s» уже существует"
#: gitk:9306
#: gitk:9335
msgid "Error creating tag:"
msgstr "Ошибка создания метки:"
#: gitk:9382
#: gitk:9425
msgid "Command:"
msgstr "Команда:"
#: gitk:9390
#: gitk:9433
msgid "Write"
msgstr "Запись"
#: gitk:9408
#: gitk:9451
msgid "Error writing commit:"
msgstr "Произошла ошибка при записи коммита:"
#: gitk:9435
#: gitk:9473
msgid "Create branch"
msgstr "Создать ветку"
#: gitk:9489
#, tcl-format
msgid "Rename branch %s"
msgstr "Переименовать ветку %s"
#: gitk:9490
msgid "Rename"
msgstr "Переименовать"
#: gitk:9514
msgid "Name:"
msgstr "Имя:"
#: gitk:9458
#: gitk:9538
msgid "Please specify a name for the new branch"
msgstr "Укажите имя для новой ветки"
#: gitk:9463
#: gitk:9543
#, tcl-format
msgid "Branch '%s' already exists. Overwrite?"
msgstr "Ветка «%s» уже существует. Переписать?"
#: gitk:9530
#: gitk:9587
msgid "Please specify a new name for the branch"
msgstr "Укажите имя для новой ветки"
#: gitk:9650
#, tcl-format
msgid "Commit %s is already included in branch %s -- really re-apply it?"
msgstr "Коммит %s уже включён в ветку %s. Продолжить операцию?"
#: gitk:9535
#: gitk:9655
msgid "Cherry-picking"
msgstr "Копирование изменений"
msgstr "Копирование коммита"
#: gitk:9544
#: gitk:9664
#, 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 "Отбор лучшего невозможен из-за изменений в файле «%s».\nЗакомитьте, сбросьте или спрячьте изменения и повторите операцию."
msgstr "Копирование коммита невозможно из-за изменений в файле «%s».\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию."
#: gitk:9550
#: gitk:9670
msgid ""
"Cherry-pick failed because of merge conflict.\n"
"Do you wish to run git citool to resolve it?"
msgstr "Копирование изменений невозможно из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?"
#: gitk:9566 gitk:9624
#: gitk:9686 gitk:9744
msgid "No changes committed"
msgstr "Изменения не закоммичены"
#: gitk:9593
#: gitk:9713
#, tcl-format
msgid "Commit %s is not included in branch %s -- really revert it?"
msgstr "Коммит %s не включён в ветку %s. Продолжить операцию?"
#: gitk:9598
#: gitk:9718
msgid "Reverting"
msgstr "Возврат изменений"
msgstr "Обращение изменений"
#: gitk:9606
#: gitk:9726
#, 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 "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакомитьте, сбросьте или спрячьте изменения и повторите операцию."
msgstr "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию."
#: gitk:9610
#: gitk:9730
msgid ""
"Revert failed because of merge conflict.\n"
" Do you wish to run git citool to resolve it?"
msgstr "Возврат изменений невозможен из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?"
#: gitk:9653
#: gitk:9773
msgid "Confirm reset"
msgstr "Подтвердите операцию перехода"
#: gitk:9655
#: gitk:9775
#, tcl-format
msgid "Reset branch %s to %s?"
msgstr "Сбросить ветку %s на коммит %s?"
#: gitk:9657
#: gitk:9777
msgid "Reset type:"
msgstr "Тип операции перехода:"
#: gitk:9660
#: gitk:9780
msgid "Soft: Leave working tree and index untouched"
msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными"
#: gitk:9663
#: gitk:9783
msgid "Mixed: Leave working tree untouched, reset index"
msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс"
#: gitk:9666
#: gitk:9786
msgid ""
"Hard: Reset working tree and index\n"
"(discard ALL local changes)"
msgstr "Жесткий: переписать индекс и рабочий каталог\n(все изменения в рабочем каталоге будут потеряны)"
#: gitk:9683
#: gitk:9803
msgid "Resetting"
msgstr "Сброс"
#: gitk:9743
#: gitk:9876
#, tcl-format
msgid "A local branch named %s exists already"
msgstr "Локальная ветка с именем %s уже существует"
#: gitk:9884
msgid "Checking out"
msgstr "Переход"
#: gitk:9796
#: gitk:9943
msgid "Cannot delete the currently checked-out branch"
msgstr "Активная ветка не может быть удалена"
#: gitk:9802
#: gitk:9949
#, tcl-format
msgid ""
"The commits on branch %s aren't on any other branch.\n"
"Really delete branch %s?"
msgstr "Коммиты из ветки %s не принадлежат больше никакой другой ветке.\nДействительно удалить ветку %s?"
#: gitk:9833
#: gitk:9980
#, tcl-format
msgid "Tags and heads: %s"
msgstr "Метки и ветки: %s"
#: gitk:9850
#: gitk:9997
msgid "Filter"
msgstr "Фильтровать"
#: gitk:10146
#: gitk:10293
msgid ""
"Error reading commit topology information; branch and preceding/following "
"tag information will be incomplete."
msgstr "Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток (до/после) может быть неполной."
#: gitk:11123
#: gitk:11270
msgid "Tag"
msgstr "Метка"
#: gitk:11127
#: gitk:11274
msgid "Id"
msgstr "Id"
#: gitk:11210
#: gitk:11357
msgid "Gitk font chooser"
msgstr "Шрифт Gitk"
#: gitk:11227
#: gitk:11374
msgid "B"
msgstr "Ж"
#: gitk:11230
#: gitk:11377
msgid "I"
msgstr "К"
#: gitk:11348
#: gitk:11495
msgid "Commit list display options"
msgstr "Параметры показа списка коммитов"
#: gitk:11351
#: gitk:11498
msgid "Maximum graph width (lines)"
msgstr "Макс. ширина графа (строк)"
#: gitk:11355
#: gitk:11502
#, no-tcl-format
msgid "Maximum graph width (% of pane)"
msgstr "Макс. ширина графа (% ширины панели)"
#: gitk:11358
#: gitk:11505
msgid "Show local changes"
msgstr "Показывать изменения в рабочем каталоге"
#: gitk:11361
#: gitk:11508
msgid "Auto-select SHA1 (length)"
msgstr "Автоматически выделить SHA1 (длинна)"
#: gitk:11365
#: gitk:11512
msgid "Hide remote refs"
msgstr "Скрыть внешние ссылки"
#: gitk:11369
#: gitk:11516
msgid "Diff display options"
msgstr "Параметры показа изменений"
#: gitk:11371
#: gitk:11518
msgid "Tab spacing"
msgstr "Ширина табуляции"
#: gitk:11374
#: gitk:11521
msgid "Display nearby tags/heads"
msgstr "Показывать близкие метки/ветки"
#: gitk:11377
#: gitk:11524
msgid "Maximum # tags/heads to show"
msgstr "Показывать максимальное количество меток/веток"
#: gitk:11380
#: gitk:11527
msgid "Limit diffs to listed paths"
msgstr "Ограничить показ изменений выбранными файлами"
#: gitk:11383
#: gitk:11530
msgid "Support per-file encodings"
msgstr "Поддержка кодировок в отдельных файлах"
#: gitk:11389 gitk:11536
#: gitk:11536 gitk:11683
msgid "External diff tool"
msgstr "Программа для показа изменений"
#: gitk:11390
#: gitk:11537
msgid "Choose..."
msgstr "Выберите..."
#: gitk:11395
#: gitk:11542
msgid "General options"
msgstr "Общие опции"
#: gitk:11398
#: gitk:11545
msgid "Use themed widgets"
msgstr "Использовать стили виджетов"
#: gitk:11400
#: gitk:11547
msgid "(change requires restart)"
msgstr "(изменение потребует перезапуск)"
#: gitk:11402
#: gitk:11549
msgid "(currently unavailable)"
msgstr "(недоступно в данный момент)"
#: gitk:11413
#: gitk:11560
msgid "Colors: press to choose"
msgstr "Цвета: нажмите для выбора"
#: gitk:11416
#: gitk:11563
msgid "Interface"
msgstr "Интерфейс"
#: gitk:11417
#: gitk:11564
msgid "interface"
msgstr "интерфейс"
#: gitk:11420
#: gitk:11567
msgid "Background"
msgstr "Фон"
#: gitk:11421 gitk:11451
#: gitk:11568 gitk:11598
msgid "background"
msgstr "фон"
#: gitk:11424
#: gitk:11571
msgid "Foreground"
msgstr "Передний план"
#: gitk:11425
#: gitk:11572
msgid "foreground"
msgstr "передний план"
#: gitk:11428
#: gitk:11575
msgid "Diff: old lines"
msgstr "Изменения: старый текст"
#: gitk:11429
#: gitk:11576
msgid "diff old lines"
msgstr "старый текст изменения"
#: gitk:11433
#: gitk:11580
msgid "Diff: new lines"
msgstr "Изменения: новый текст"
#: gitk:11434
#: gitk:11581
msgid "diff new lines"
msgstr "новый текст изменения"
#: gitk:11438
#: gitk:11585
msgid "Diff: hunk header"
msgstr "Изменения: заголовок блока"
#: gitk:11440
#: gitk:11587
msgid "diff hunk header"
msgstr "заголовок блока изменений"
#: gitk:11444
#: gitk:11591
msgid "Marked line bg"
msgstr "Фон выбранной строки"
#: gitk:11446
#: gitk:11593
msgid "marked line background"
msgstr "фон выбранной строки"
#: gitk:11450
#: gitk:11597
msgid "Select bg"
msgstr "Выберите фон"
#: gitk:11459
#: gitk:11606
msgid "Fonts: press to choose"
msgstr "Шрифт: нажмите для выбора"
#: gitk:11461
#: gitk:11608
msgid "Main font"
msgstr "Основной шрифт"
#: gitk:11462
#: gitk:11609
msgid "Diff display font"
msgstr "Шрифт показа изменений"
#: gitk:11463
#: gitk:11610
msgid "User interface font"
msgstr "Шрифт интерфейса"
#: gitk:11485
#: gitk:11632
msgid "Gitk preferences"
msgstr "Настройки Gitk"
#: gitk:11494
#: gitk:11641
msgid "General"
msgstr "Общие"
#: gitk:11495
#: gitk:11642
msgid "Colors"
msgstr "Цвета"
#: gitk:11496
#: gitk:11643
msgid "Fonts"
msgstr "Шрифты"
#: gitk:11546
#: gitk:11693
#, tcl-format
msgid "Gitk: choose color for %s"
msgstr "Gitk: выберите цвет для %s"
#: gitk:12059
#: gitk:12206
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
#: gitk:12416
msgid "Cannot find a git repository here."
msgstr "Git-репозитарий не найден в текущем каталоге."
#: gitk:12316
#: gitk:12463
#, tcl-format
msgid "Ambiguous argument '%s': both revision and filename"
msgstr "Неоднозначный аргумент «%s»: существует как редакция и как имя файла"
#: gitk:12328
#: gitk:12475
msgid "Bad arguments to gitk:"
msgstr "Неправильные аргументы для gitk:"

View File

@ -374,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 - en incheckningsvisare för git\n"
"\n"
"Copyright © 2005-2014 Paul Mackerras\n"
"Copyright © 2005-2016 Paul Mackerras\n"
"\n"
"Använd och vidareförmedla enligt villkoren i GNU General Public License"
@ -1385,21 +1385,6 @@ msgstr "Felaktiga argument till gitk:"
#~ 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"

View File

@ -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 - ứng dụng để xem các lần chuyển giao dành cho git\n"
"\n"
"Bản quyền © 2005-2014 Paul Mackerras\n"
"Bản quyền © 2005-2016 Paul Mackerras\n"
"\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"