diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-12-18 15:07:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-18 15:07:10 -0800 |
| commit | f4d8e191230b3d233005720085092b97e9bf32f1 (patch) | |
| tree | 6b93153c3b0665a48f44a0991937da8edb910e8b /git-gui | |
| parent | ba2aa15129e59f248d8cdd30404bc78b5178f61d (diff) | |
| parent | 7b0cfe156e1f1fbb77ab35d55d48eef41625944d (diff) | |
| download | git-f4d8e191230b3d233005720085092b97e9bf32f1.tar.gz | |
Merge https://github.com/prati0100/git-gui
* https://github.com/prati0100/git-gui:
git-gui: use gray background for inactive text widgets
git-gui: Fix selected text colors
Makefile: conditionally include GIT-VERSION-FILE
git-gui: fix colored label backgrounds when using themed widgets
git-gui: ssh-askpass: add a checkbox to show the input text
git-gui: update Russian translation
git-gui: use commit message template
git-gui: Only touch GITGUI_MSG when needed
Diffstat (limited to 'git-gui')
| -rw-r--r-- | git-gui/Makefile | 2 | ||||
| -rwxr-xr-x | git-gui/git-gui--askpass | 15 | ||||
| -rwxr-xr-x | git-gui/git-gui.sh | 30 | ||||
| -rw-r--r-- | git-gui/lib/commit.tcl | 1 | ||||
| -rw-r--r-- | git-gui/lib/themed.tcl | 41 | ||||
| -rw-r--r-- | git-gui/po/ru.po | 3019 |
6 files changed, 1711 insertions, 1397 deletions
diff --git a/git-gui/Makefile b/git-gui/Makefile index f10caedaa7..56c85a85c1 100644 --- a/git-gui/Makefile +++ b/git-gui/Makefile @@ -9,7 +9,9 @@ all:: GIT-VERSION-FILE: FORCE @$(SHELL_PATH) ./GIT-VERSION-GEN +ifneq ($(MAKECMDGOALS),clean) -include GIT-VERSION-FILE +endif uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') diff --git a/git-gui/git-gui--askpass b/git-gui/git-gui--askpass index 1c99ee8ca2..71a536d232 100755 --- a/git-gui/git-gui--askpass +++ b/git-gui/git-gui--askpass @@ -26,8 +26,21 @@ pack .m -side top -fill x -padx 20 -pady 20 -expand 1 entry .e -textvariable answer -width 50 pack .e -side top -fill x -padx 10 -pady 10 +proc on_show_input_changed {args} { + global show_input + if {$show_input} { + .e configure -show "" + } else { + .e configure -show "*" + } +} +trace add variable show_input write "on_show_input_changed" + +set show_input 0 + if {!$yesno} { - .e configure -show "*" + checkbutton .cb_show -text "Show input" -variable show_input + pack .cb_show -side top -anchor nw } frame .b diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 867b8cea46..201524c34e 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -720,9 +720,6 @@ proc rmsel_tag {text} { -background [$text cget -background] \ -foreground [$text cget -foreground] \ -borderwidth 0 - $text tag conf in_sel\ - -background $color::select_bg \ - -foreground $color::select_fg bind $text <Motion> break return $text } @@ -1482,6 +1479,7 @@ proc rescan {after {honor_trustmtime 1}} { } elseif {[run_prepare_commit_msg_hook]} { } elseif {[load_message MERGE_MSG]} { } elseif {[load_message SQUASH_MSG]} { + } elseif {[load_message [get_config commit.template]]} { } $ui_comm edit reset $ui_comm edit modified false @@ -1616,6 +1614,12 @@ proc run_prepare_commit_msg_hook {} { fconfigure $fd_sm -encoding utf-8 puts -nonewline $fd_pcm [read $fd_sm] close $fd_sm + } elseif {[file isfile [get_config commit.template]]} { + set pcm_source "template" + set fd_sm [open [get_config commit.template] r] + fconfigure $fd_sm -encoding utf-8 + puts -nonewline $fd_pcm [read $fd_sm] + close $fd_sm } else { set pcm_source "" } @@ -2305,11 +2309,10 @@ proc do_quit {{rc {1}}} { if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} { file rename -force [gitdir GITGUI_BCK] $save set GITGUI_BCK_exists 0 - } else { + } elseif {[$ui_comm edit modified]} { set msg [string trim [$ui_comm get 0.0 end]] regsub -all -line {[ \r\t]+$} $msg {} msg - if {(![string match amend* $commit_type] - || [$ui_comm edit modified]) + if {![string match amend* $commit_type] && $msg ne {}} { catch { set fd [open $save w] @@ -3322,11 +3325,20 @@ if {!$use_ttk} { .vpane.files paneconfigure .vpane.files.index -sticky news } +proc set_selection_colors {w has_focus} { + foreach tag [list in_diff in_sel] { + $w tag conf $tag \ + -background [expr {$has_focus ? $color::select_bg : $color::inactive_select_bg}] \ + -foreground [expr {$has_focus ? $color::select_fg : $color::inactive_select_fg}] + } +} + foreach i [list $ui_index $ui_workdir] { rmsel_tag $i - $i tag conf in_diff \ - -background $color::select_bg \ - -foreground $color::select_fg + + set_selection_colors $i 0 + bind $i <FocusIn> { set_selection_colors %W 1 } + bind $i <FocusOut> { set_selection_colors %W 0 } } unset i diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl index b516aa2990..11379f8ad3 100644 --- a/git-gui/lib/commit.tcl +++ b/git-gui/lib/commit.tcl @@ -456,6 +456,7 @@ A rescan will be automatically started now. } $ui_comm delete 0.0 end + load_message [get_config commit.template] $ui_comm edit reset $ui_comm edit modified false if {$::GITGUI_BCK_exists} { diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl index 83e3ac795f..f43d84e54f 100644 --- a/git-gui/lib/themed.tcl +++ b/git-gui/lib/themed.tcl @@ -6,19 +6,25 @@ namespace eval color { # Variable colors # Preffered way to set widget colors is using add_option. # In some cases, like with tags in_diff/in_sel, we use these colors. - variable select_bg lightgray - variable select_fg black + variable select_bg lightgray + variable select_fg black + variable inactive_select_bg lightgray + variable inactive_select_fg black proc sync_with_theme {} { - set base_bg [ttk::style lookup . -background] - set base_fg [ttk::style lookup . -foreground] - set text_bg [ttk::style lookup Treeview -background] - set text_fg [ttk::style lookup Treeview -foreground] - set select_bg [ttk::style lookup Default -selectbackground] - set select_fg [ttk::style lookup Default -selectforeground] + set base_bg [ttk::style lookup . -background] + set base_fg [ttk::style lookup . -foreground] + set text_bg [ttk::style lookup Treeview -background] + set text_fg [ttk::style lookup Treeview -foreground] + set select_bg [ttk::style lookup Default -selectbackground] + set select_fg [ttk::style lookup Default -selectforeground] + set inactive_select_bg [convert_rgb_to_gray $select_bg] + set inactive_select_fg $select_fg set color::select_bg $select_bg set color::select_fg $select_fg + set color::inactive_select_bg $inactive_select_bg + set color::inactive_select_fg $inactive_select_fg proc add_option {key val} { option add $key $val widgetDefault @@ -34,11 +40,22 @@ namespace eval color { } add_option *Text.Background $text_bg add_option *Text.Foreground $text_fg - add_option *Text.HighlightBackground $base_bg - add_option *Text.HighlightColor $select_bg + add_option *Text.selectBackground $select_bg + add_option *Text.selectForeground $select_fg + add_option *Text.inactiveSelectBackground $inactive_select_bg + add_option *Text.inactiveSelectForeground $inactive_select_fg } } +proc convert_rgb_to_gray {rgb} { + # Simply take the average of red, green and blue. This wouldn't be good + # enough for, say, converting a photo to grayscale, but for this simple + # purpose of approximating the brightness of a color it's good enough. + lassign [winfo rgb . $rgb] r g b + set gray [expr {($r / 256 + $g / 256 + $b / 256) / 3}] + return [format "#%2.2X%2.2X%2.2X" $gray $gray $gray] +} + proc ttk_get_current_theme {} { # Handle either current Tk or older versions of 8.5 if {[catch {set theme [ttk::style theme use]}]} { @@ -174,7 +191,7 @@ proc InitEntryFrame {} { proc gold_frame {w args} { global use_ttk - if {$use_ttk} { + if {$use_ttk && ![is_MacOSX]} { eval [linsert $args 0 ttk::frame $w -style Gold.TFrame] } else { eval [linsert $args 0 frame $w -background gold] @@ -183,7 +200,7 @@ proc gold_frame {w args} { proc tlabel {w args} { global use_ttk - if {$use_ttk} { + if {$use_ttk && ![is_MacOSX]} { set cmd [list ttk::label $w -style Color.TLabel] foreach {k v} $args { switch -glob -- $k { diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po index 9f5305c43e..161ee1ac8c 100644 --- a/git-gui/po/ru.po +++ b/git-gui/po/ru.po @@ -2,14 +2,14 @@ # Copyright (C) 2007 Shawn Pearce # This file is distributed under the same license as the git-gui package. # Translators: -# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016 +# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016,2020 # Irina Riesen <irina.riesen@gmail.com>, 2007 msgid "" msgstr "" "Project-Id-Version: Git Russian Localization Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-26 15:47-0800\n" -"PO-Revision-Date: 2016-06-30 12:39+0000\n" +"POT-Creation-Date: 2020-02-08 22:54+0100\n" +"PO-Revision-Date: 2020-11-05 11:20+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" @@ -18,33 +18,33 @@ msgstr "" "Language: ru\n" "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903 -#: git-gui.sh:922 -msgid "git-gui: fatal error" -msgstr "git-gui: ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°" - -#: git-gui.sh:743 +#: git-gui.sh:847 #, tcl-format msgid "Invalid font specified in %s:" msgstr "Π %s ΡΡΡΠ°Π½ΠΎΠ²Π»Π΅Π½ Π½Π΅Π²Π΅ΡΠ½ΡΠΉ ΡΡΠΈΡΡ:" -#: git-gui.sh:779 +#: git-gui.sh:901 msgid "Main Font" msgstr "Π¨ΡΠΈΡΡ ΠΈΠ½ΡΠ΅ΡΡΠ΅ΠΉΡΠ°" -#: git-gui.sh:780 +#: git-gui.sh:902 msgid "Diff/Console Font" msgstr "Π¨ΡΠΈΡΡ ΠΊΠΎΠ½ΡΠΎΠ»ΠΈ ΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ (diff)" -#: git-gui.sh:794 +#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 +#: git-gui.sh:1053 git-gui.sh:3212 +msgid "git-gui: fatal error" +msgstr "git-gui: ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°" + +#: git-gui.sh:918 msgid "Cannot find git in PATH." msgstr "git Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² PATH." -#: git-gui.sh:821 +#: git-gui.sh:945 msgid "Cannot parse Git version string:" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ ΡΡΡΠΎΠΊΡ Π²Π΅ΡΡΠΈΠΈ Git: " -#: git-gui.sh:839 +#: git-gui.sh:970 #, tcl-format msgid "" "Git version cannot be determined.\n" @@ -56,473 +56,519 @@ msgid "" "Assume '%s' is version 1.5.0?\n" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ Π²Π΅ΡΡΠΈΡ Git\n\n%s ΡΠΊΠ°Π·ΡΠ²Π°Π΅Ρ Π½Π° Π²Π΅ΡΡΠΈΡ Β«%sΒ».\n\nΠ΄Π»Ρ %s ΡΡΠ΅Π±ΡΠ΅ΡΡΡ Π²Π΅ΡΡΠΈΡ Git, Π½Π°ΡΠΈΠ½Π°Ρ Ρ 1.5.0\n\nΠΡΠ΅Π΄ΠΏΠΎΠ»ΠΎΠΆΠΈΡΡ, ΡΡΠΎ Β«%sΒ» ΠΈ Π΅ΡΡΡ Π²Π΅ΡΡΠΈΡ 1.5.0?\n" -#: git-gui.sh:1128 +#: git-gui.sh:1267 msgid "Git directory not found:" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ Git Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½:" -#: git-gui.sh:1146 +#: git-gui.sh:1301 msgid "Cannot move to top of working directory:" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠ΅ΡΠ΅ΠΉΡΠΈ ΠΊ ΠΊΠΎΡΠ½Ρ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ: " -#: git-gui.sh:1154 +#: git-gui.sh:1309 msgid "Cannot use bare repository:" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π±Π΅Π· ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°:" -#: git-gui.sh:1162 +#: git-gui.sh:1317 msgid "No working directory" msgstr "ΠΡΡΡΡΡΡΠ²ΡΠ΅Ρ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: git-gui.sh:1334 lib/checkout_op.tcl:306 +#: git-gui.sh:1491 lib/checkout_op.tcl:306 msgid "Refreshing file status..." msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΠΈ ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²β¦" -#: git-gui.sh:1390 +#: git-gui.sh:1551 msgid "Scanning for modified files ..." msgstr "ΠΠΎΠΈΡΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²β¦" -#: git-gui.sh:1454 +#: git-gui.sh:1629 msgid "Calling prepare-commit-msg hook..." msgstr "ΠΡΠ·ΠΎΠ² ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° prepare-commit-msgβ¦" -#: git-gui.sh:1471 +#: git-gui.sh:1646 msgid "Commit declined by prepare-commit-msg hook." msgstr "ΠΠΎΠΌΠΌΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π½ ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠΎΠΌ prepare-commit-msg." -#: git-gui.sh:1629 lib/browser.tcl:246 +#: git-gui.sh:1804 lib/browser.tcl:252 msgid "Ready." msgstr "ΠΠΎΡΠΎΠ²ΠΎ." -#: git-gui.sh:1787 +#: git-gui.sh:1968 #, tcl-format -msgid "Displaying only %s of %s files." -msgstr "ΠΠΎΠΊΠ°Π·Π°Π½ΠΎ %s ΠΈΠ· %s ΡΠ°ΠΉΠ»ΠΎΠ²." +msgid "" +"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s " +"files." +msgstr "ΠΠΈΠΌΠΈΡ ΠΎΡΠΎΠ±ΡΠ°ΠΆΠ°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Π΄ΠΎΡΡΠΈΠ³Π½ΡΡ (gui.maxfilesdisplayed = %s), Π½Π΅ Π²ΡΠ΅ %s ΡΠ°ΠΉΠ»Ρ ΠΏΠΎΠΊΠ°Π·Π°Π½Ρ." -#: git-gui.sh:1913 +#: git-gui.sh:2091 msgid "Unmodified" msgstr "ΠΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ" -#: git-gui.sh:1915 +#: git-gui.sh:2093 msgid "Modified, not staged" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ, Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-gui.sh:1916 git-gui.sh:1924 +#: git-gui.sh:2094 git-gui.sh:2106 msgid "Staged for commit" msgstr "Π ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: git-gui.sh:1917 git-gui.sh:1925 +#: git-gui.sh:2095 git-gui.sh:2107 msgid "Portions staged for commit" msgstr "Π§Π°ΡΡΠΈ, Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°" -#: git-gui.sh:1918 git-gui.sh:1926 +#: git-gui.sh:2096 git-gui.sh:2108 msgid "Staged for commit, missing" msgstr "Π ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°, ΠΎΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -#: git-gui.sh:1920 +#: git-gui.sh:2098 msgid "File type changed, not staged" msgstr "Π’ΠΈΠΏ ΡΠ°ΠΉΠ»Π° ΠΈΠ·ΠΌΠ΅Π½ΡΠ½, Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-gui.sh:1921 +#: git-gui.sh:2099 git-gui.sh:2100 +msgid "File type changed, old type staged for commit" +msgstr "Π’ΠΈΠΏ ΡΠ°ΠΉΠ»Π° ΠΈΠ·ΠΌΠ΅Π½ΡΠ½, ΡΡΠ°ΡΡΠΉ ΡΠΈΠΏ ΡΠ°ΠΉΠ»Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: git-gui.sh:2101 msgid "File type changed, staged" msgstr "Π’ΠΈΠΏ ΡΠ°ΠΉΠ»Π° ΠΈΠ·ΠΌΠ΅Π½ΡΠ½, Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-gui.sh:1923 +#: git-gui.sh:2102 +msgid "File type change staged, modification not staged" +msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΡΠΈΠΏΠ° ΡΠ°ΠΉΠ»Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: git-gui.sh:2103 +msgid "File type change staged, file missing" +msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅ ΡΠΈΠΏΠ° ΡΠ°ΠΉΠ»Π° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅, ΡΠ°ΠΉΠ» Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½" + +#: git-gui.sh:2105 msgid "Untracked, not staged" msgstr "ΠΠ΅ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΡΡΡ, Π½Π΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" -#: git-gui.sh:1928 +#: git-gui.sh:2110 msgid "Missing" msgstr "ΠΡΡΡΡΡΡΠ²ΡΠ΅Ρ" -#: git-gui.sh:1929 +#: git-gui.sh:2111 msgid "Staged for removal" msgstr "Π ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ" -#: git-gui.sh:1930 +#: git-gui.sh:2112 msgid "Staged for removal, still present" msgstr "Π ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ Π΄Π»Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ, Π΅ΡΠ΅ Π½Π΅ ΡΠ΄Π°Π»Π΅Π½ΠΎ" -#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935 -#: git-gui.sh:1936 git-gui.sh:1937 +#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117 +#: git-gui.sh:2118 git-gui.sh:2119 msgid "Requires merge resolution" msgstr "Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ° ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" -#: git-gui.sh:1972 -msgid "Starting gitk... please wait..." -msgstr "ΠΠ°ΠΏΡΡΠΊΠ°Π΅ΡΡΡ gitkβ¦ ΠΠΎΠ΄ΠΎΠΆΠ΄ΠΈΡΠ΅, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°β¦" - -#: git-gui.sh:1984 +#: git-gui.sh:2164 msgid "Couldn't find gitk in PATH" msgstr "gitk Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² PATH." -#: git-gui.sh:2043 +#: git-gui.sh:2210 git-gui.sh:2245 +#, tcl-format +msgid "Starting %s... please wait..." +msgstr "ΠΠ°ΠΏΡΡΠΊΠ°Π΅ΡΡΡ %sβ¦ ΠΠΎΠ΄ΠΎΠΆΠ΄ΠΈΡΠ΅, ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°β¦" + +#: git-gui.sh:2224 msgid "Couldn't find git gui in PATH" msgstr "git gui Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ Π² PATH." -#: git-gui.sh:2455 lib/choose_repository.tcl:36 +#: git-gui.sh:2726 lib/choose_repository.tcl:53 msgid "Repository" msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: git-gui.sh:2456 +#: git-gui.sh:2727 msgid "Edit" -msgstr "Π Π΅Π΄Π°ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ" +msgstr "ΠΡΠ°Π²ΠΊΠ°" -#: git-gui.sh:2458 lib/choose_rev.tcl:561 +#: git-gui.sh:2729 lib/choose_rev.tcl:567 msgid "Branch" msgstr "ΠΠ΅ΡΠΊΠ°" -#: git-gui.sh:2461 lib/choose_rev.tcl:548 +#: git-gui.sh:2732 lib/choose_rev.tcl:554 msgid "Commit@@noun" msgstr "ΠΠΎΠΌΠΌΠΈΡ" -#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168 +#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174 msgid "Merge" msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅" -#: git-gui.sh:2465 lib/choose_rev.tcl:557 +#: git-gui.sh:2736 lib/choose_rev.tcl:563 msgid "Remote" msgstr "ΠΠ½Π΅ΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: git-gui.sh:2468 +#: git-gui.sh:2739 msgid "Tools" msgstr "ΠΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΠ΅ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ" -#: git-gui.sh:2477 +#: git-gui.sh:2748 msgid "Explore Working Copy" msgstr "ΠΡΠΎΡΠΌΠΎΡΡ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-gui.sh:2483 +#: git-gui.sh:2763 +msgid "Git Bash" +msgstr "Git Bash" + +#: git-gui.sh:2772 msgid "Browse Current Branch's Files" msgstr "ΠΡΠΎΡΠΌΠΎΡΡΠ΅ΡΡ ΡΠ°ΠΉΠ»Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ" -#: git-gui.sh:2487 +#: git-gui.sh:2776 msgid "Browse Branch Files..." msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π²Π΅ΡΠΊΠΈβ¦" -#: git-gui.sh:2492 +#: git-gui.sh:2781 msgid "Visualize Current Branch's History" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ" -#: git-gui.sh:2496 +#: git-gui.sh:2785 msgid "Visualize All Branch History" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡ Π²ΡΠ΅Ρ
Π²Π΅ΡΠΎΠΊ" -#: git-gui.sh:2503 +#: git-gui.sh:2792 #, tcl-format msgid "Browse %s's Files" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π²Π΅ΡΠΊΠΈ %s" -#: git-gui.sh:2505 +#: git-gui.sh:2794 #, tcl-format msgid "Visualize %s's History" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡ Π²Π΅ΡΠΊΠΈ %s" -#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67 +#: git-gui.sh:2799 lib/database.tcl:40 msgid "Database Statistics" msgstr "Π‘ΡΠ°ΡΠΈΡΡΠΈΠΊΠ° Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
" -#: git-gui.sh:2513 lib/database.tcl:34 +#: git-gui.sh:2802 lib/database.tcl:33 msgid "Compress Database" msgstr "Π‘ΠΆΠ°ΡΡ Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
" -#: git-gui.sh:2516 +#: git-gui.sh:2805 msgid "Verify Database" msgstr "ΠΡΠΎΠ²Π΅ΡΠΈΡΡ Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
" -#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8 -#: lib/shortcut.tcl:40 lib/shortcut.tcl:72 +#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820 msgid "Create Desktop Icon" msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΡΡΠ»ΡΠΊ Π½Π° ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΡΡΠΎΠ»Π΅" -#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191 +#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217 msgid "Quit" msgstr "ΠΡΡ
ΠΎΠ΄" -#: git-gui.sh:2547 +#: git-gui.sh:2836 msgid "Undo" msgstr "ΠΡΠΌΠ΅Π½ΠΈΡΡ" -#: git-gui.sh:2550 +#: git-gui.sh:2839 msgid "Redo" msgstr "ΠΠΎΠ²ΡΠΎΡΠΈΡΡ" -#: git-gui.sh:2554 git-gui.sh:3109 +#: git-gui.sh:2843 git-gui.sh:3461 msgid "Cut" msgstr "ΠΡΡΠ΅Π·Π°ΡΡ" -#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259 +#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633 #: lib/console.tcl:69 msgid "Copy" msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ" -#: git-gui.sh:2560 git-gui.sh:3115 +#: git-gui.sh:2849 git-gui.sh:3467 msgid "Paste" msgstr "ΠΡΡΠ°Π²ΠΈΡΡ" -#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26 -#: lib/remote_branch_delete.tcl:38 +#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39 +#: lib/branch_delete.tcl:28 msgid "Delete" msgstr "Π£Π΄Π°Π»ΠΈΡΡ" -#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71 +#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71 msgid "Select All" -msgstr "ΠΡΠ΄Π΅Π»ΠΈΡΡ Π²ΡΠ΅" +msgstr "ΠΡΠ΄Π΅Π»ΠΈΡΡ Π²ΡΡ" -#: git-gui.sh:2576 +#: git-gui.sh:2865 msgid "Create..." msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡβ¦" -#: git-gui.sh:2582 +#: git-gui.sh:2871 msgid "Checkout..." msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈβ¦" -#: git-gui.sh:2588 +#: git-gui.sh:2877 msgid "Rename..." msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡβ¦" -#: git-gui.sh:2593 +#: git-gui.sh:2882 msgid "Delete..." msgstr "Π£Π΄Π°Π»ΠΈΡΡβ¦" -#: git-gui.sh:2598 +#: git-gui.sh:2887 msgid "Reset..." msgstr "Π‘Π±ΡΠΎΡΠΈΡΡβ¦" -#: git-gui.sh:2608 +#: git-gui.sh:2897 msgid "Done" msgstr "ΠΠ°Π²Π΅ΡΡΠ΅Π½ΠΎ" -#: git-gui.sh:2610 +#: git-gui.sh:2899 msgid "Commit@@verb" msgstr "ΠΠ°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ" -#: git-gui.sh:2619 git-gui.sh:3050 -msgid "New Commit" -msgstr "ΠΠΎΠ²ΡΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" - -#: git-gui.sh:2627 git-gui.sh:3057 +#: git-gui.sh:2908 git-gui.sh:3400 msgid "Amend Last Commit" msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ" -#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99 +#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101 msgid "Rescan" msgstr "ΠΠ΅ΡΠ΅ΡΠΈΡΠ°ΡΡ" -#: git-gui.sh:2643 +#: git-gui.sh:2924 msgid "Stage To Commit" msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-gui.sh:2649 +#: git-gui.sh:2930 msgid "Stage Changed Files To Commit" msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½ΡΠ½Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-gui.sh:2655 +#: git-gui.sh:2936 msgid "Unstage From Commit" msgstr "Π£Π±ΡΠ°ΡΡ ΠΈΠ· ΠΈΠ·Π΄Π΅ΠΊΡΠ°" -#: git-gui.sh:2661 lib/index.tcl:412 +#: git-gui.sh:2942 lib/index.tcl:521 msgid "Revert Changes" msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341 +#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731 msgid "Show Less Context" msgstr "ΠΠ΅Π½ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" -#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345 +#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735 msgid "Show More Context" msgstr "ΠΠΎΠ»ΡΡΠ΅ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ°" -#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133 +#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485 msgid "Sign Off" msgstr "ΠΡΡΠ°Π²ΠΈΡΡ Signed-off-by" -#: git-gui.sh:2696 +#: git-gui.sh:2977 msgid "Local Merge..." msgstr "ΠΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅β¦" -#: git-gui.sh:2701 +#: git-gui.sh:2982 msgid "Abort Merge..." msgstr "ΠΡΠ΅ΡΠ²Π°ΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅β¦" -#: git-gui.sh:2713 git-gui.sh:2741 +#: git-gui.sh:2994 git-gui.sh:3022 msgid "Add..." msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡβ¦" -#: git-gui.sh:2717 +#: git-gui.sh:2998 msgid "Push..." msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡβ¦" -#: git-gui.sh:2721 +#: git-gui.sh:3002 msgid "Delete Branch..." msgstr "Π£Π΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΡβ¦" -#: git-gui.sh:2731 git-gui.sh:3292 +#: git-gui.sh:3012 git-gui.sh:3666 msgid "Options..." msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈβ¦" -#: git-gui.sh:2742 +#: git-gui.sh:3023 msgid "Remove..." msgstr "Π£Π΄Π°Π»ΠΈΡΡβ¦" -#: git-gui.sh:2751 lib/choose_repository.tcl:50 +#: git-gui.sh:3032 lib/choose_repository.tcl:67 msgid "Help" -msgstr "ΠΠΎΠΌΠΎΡΡ" +msgstr "Π‘ΠΏΡΠ°Π²ΠΊΠ°" -#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14 -#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53 +#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61 +#: lib/choose_repository.tcl:70 lib/about.tcl:14 #, tcl-format msgid "About %s" msgstr "Π %s" -#: git-gui.sh:2783 +#: git-gui.sh:3064 msgid "Online Documentation" msgstr "ΠΠΎΠΊΡΠΌΠ΅Π½ΡΠ°ΡΠΈΡ Π² ΠΈΠ½ΡΠ΅ΡΠ½Π΅ΡΠ΅" -#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56 +#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73 msgid "Show SSH Key" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΊΠ»ΡΡ SSH" -#: git-gui.sh:2893 +#: git-gui.sh:3097 git-gui.sh:3229 +msgid "usage:" +msgstr "ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅:" + +#: git-gui.sh:3101 git-gui.sh:3233 +msgid "Usage" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΠ΅" + +#: git-gui.sh:3182 lib/blame.tcl:575 +msgid "Error" +msgstr "ΠΡΠΈΠ±ΠΊΠ°" + +#: git-gui.sh:3213 #, tcl-format msgid "fatal: cannot stat path %s: No such file or directory" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: %s: Π½Π΅Ρ ΡΠ°ΠΊΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° ΠΈΠ»ΠΈ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π°" -#: git-gui.sh:2926 +#: git-gui.sh:3246 msgid "Current Branch:" msgstr "Π’Π΅ΠΊΡΡΠ°Ρ Π²Π΅ΡΠΊΠ°:" -#: git-gui.sh:2947 -msgid "Staged Changes (Will Commit)" -msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ (Π±ΡΠ΄ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Ρ)" - -#: git-gui.sh:2967 +#: git-gui.sh:3271 msgid "Unstaged Changes" msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΎ (Π½Π΅ Π±ΡΠ΄Π΅Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΎ)" -#: git-gui.sh:3017 +#: git-gui.sh:3293 +msgid "Staged Changes (Will Commit)" +msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅ (Π±ΡΠ΄ΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½Ρ)" + +#: git-gui.sh:3367 msgid "Stage Changed" msgstr "ΠΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΡ" -#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193 +#: git-gui.sh:3386 lib/transport.tcl:137 msgid "Push" msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ" -#: git-gui.sh:3071 +#: git-gui.sh:3413 msgid "Initial Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: git-gui.sh:3072 +#: git-gui.sh:3414 msgid "Amended Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: git-gui.sh:3073 +#: git-gui.sh:3415 msgid "Amended Initial Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΠΎΠ³ΠΎ ΠΏΠ΅ΡΠ²ΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: git-gui.sh:3074 +#: git-gui.sh:3416 msgid "Amended Merge Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½Π½ΠΎΠ³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ:" -#: git-gui.sh:3075 +#: git-gui.sh:3417 msgid "Merge Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΡΠ»ΠΈΡΠ½ΠΈΡ:" -#: git-gui.sh:3076 +#: git-gui.sh:3418 msgid "Commit Message:" msgstr "Π‘ΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73 +#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73 msgid "Copy All" msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ΅" -#: git-gui.sh:3149 lib/blame.tcl:104 +#: git-gui.sh:3501 lib/blame.tcl:106 msgid "File:" msgstr "Π€Π°ΠΉΠ»:" -#: git-gui.sh:3255 +#: git-gui.sh:3549 lib/choose_repository.tcl:1100 +msgid "Open" +msgstr "ΠΡΠΊΡΡΡΡ" + +#: git-gui.sh:3629 msgid "Refresh" msgstr "ΠΠ±Π½ΠΎΠ²ΠΈΡΡ" -#: git-gui.sh:3276 +#: git-gui.sh:3650 msgid "Decrease Font Size" msgstr "Π£ΠΌΠ΅Π½ΡΡΠΈΡΡ ΡΠ°Π·ΠΌΠ΅Ρ ΡΡΠΈΡΡΠ°" -#: git-gui.sh:3280 +#: git-gui.sh:3654 msgid "Increase Font Size" msgstr "Π£Π²Π΅Π»ΠΈΡΠΈΡΡ ΡΠ°Π·ΠΌΠ΅Ρ ΡΡΠΈΡΡΠ°" -#: git-gui.sh:3288 lib/blame.tcl:281 +#: git-gui.sh:3662 lib/blame.tcl:296 msgid "Encoding" msgstr "ΠΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ°" -#: git-gui.sh:3299 +#: git-gui.sh:3673 msgid "Apply/Reverse Hunk" msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ/Π£Π±ΡΠ°ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠ΅" -#: git-gui.sh:3304 +#: git-gui.sh:3678 msgid "Apply/Reverse Line" msgstr "ΠΡΠΈΠΌΠ΅Π½ΠΈΡΡ/Π£Π±ΡΠ°ΡΡ ΡΡΡΠΎΠΊΡ" -#: git-gui.sh:3323 +#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805 +msgid "Revert Hunk" +msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π±Π»ΠΎΠΊΠ°" + +#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812 +msgid "Revert Line" +msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΡΡΠΎΠΊΠΈ" + +#: git-gui.sh:3694 git-gui.sh:3791 +msgid "Undo Last Revert" +msgstr "ΠΡΠΌΠ΅Π½ΠΈΡΡ ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅Π΅ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: git-gui.sh:3713 msgid "Run Merge Tool" msgstr "ΠΠ°ΠΏΡΡΡΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ" -#: git-gui.sh:3328 +#: git-gui.sh:3718 msgid "Use Remote Version" msgstr "ΠΠ·ΡΡΡ Π²Π½Π΅ΡΠ½ΡΡ Π²Π΅ΡΡΠΈΡ" -#: git-gui.sh:3332 +#: git-gui.sh:3722 msgid "Use Local Version" msgstr "ΠΠ·ΡΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΡΠΈΡ" -#: git-gui.sh:3336 +#: git-gui.sh:3726 msgid "Revert To Base" msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" -#: git-gui.sh:3354 +#: git-gui.sh:3744 msgid "Visualize These Changes In The Submodule" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: git-gui.sh:3358 +#: git-gui.sh:3748 msgid "Visualize Current Branch History In The Submodule" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡ ΡΠ΅ΠΊΡΡΠ΅ΠΉ Π²Π΅ΡΠΊΠΈ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: git-gui.sh:3362 +#: git-gui.sh:3752 msgid "Visualize All Branch History In The Submodule" msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡ Π²ΡΠ΅Ρ
Π²Π΅ΡΠΎΠΊ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Ρ" -#: git-gui.sh:3367 +#: git-gui.sh:3757 msgid "Start git gui In The Submodule" msgstr "ΠΠ°ΠΏΡΡΡΠΈΡΡ git gui Π² ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅" -#: git-gui.sh:3389 +#: git-gui.sh:3793 msgid "Unstage Hunk From Commit" msgstr "Π£Π±ΡΠ°ΡΡ Π±Π»ΠΎΠΊ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-gui.sh:3391 +#: git-gui.sh:3797 msgid "Unstage Lines From Commit" msgstr "Π£Π±ΡΠ°ΡΡ ΡΡΡΠΎΠΊΠΈ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-gui.sh:3393 +#: git-gui.sh:3798 git-gui.sh:3809 +msgid "Revert Lines" +msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΡΡΠΎΠΊ" + +#: git-gui.sh:3800 msgid "Unstage Line From Commit" msgstr "Π£Π±ΡΠ°ΡΡ ΡΡΡΠΎΠΊΡ ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" -#: git-gui.sh:3396 +#: git-gui.sh:3804 msgid "Stage Hunk For Commit" msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π±Π»ΠΎΠΊ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-gui.sh:3398 +#: git-gui.sh:3808 msgid "Stage Lines For Commit" msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΡΠΎΠΊΠΈ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-gui.sh:3400 +#: git-gui.sh:3811 msgid "Stage Line For Commit" msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ ΡΡΡΠΎΠΊΡ Π² ΠΈΠ½Π΄Π΅ΠΊΡ" -#: git-gui.sh:3424 +#: git-gui.sh:3861 msgid "Initializing..." msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·Π°ΡΠΈΡβ¦" -#: git-gui.sh:3541 +#: git-gui.sh:4017 #, tcl-format msgid "" "Possible environment issues exist.\n" @@ -533,14 +579,14 @@ msgid "" "\n" msgstr "ΠΠΎΠ·ΠΌΠΎΠΆΠ½Ρ ΠΎΡΠΈΠ±ΠΊΠΈ Π² ΠΏΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΡ
ΠΎΠΊΡΡΠΆΠ΅Π½ΠΈΡ.\n\nΠΠ΅ΡΠ΅ΠΌΠ΅Π½Π½ΡΠ΅ ΠΎΠΊΡΡΠΆΠ΅Π½ΠΈΡ, ΠΊΠΎΡΠΎΡΡΠ΅ Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ\nΠ±ΡΠ΄ΡΡ ΠΏΡΠΎΠΈΠ³Π½ΠΎΡΠΈΡΠΎΠ²Π°Π½Ρ ΠΊΠΎΠΌΠ°Π½Π΄Π°ΠΌΠΈ Git,\nΠ·Π°ΠΏΡΡΠ΅Π½Π½ΡΠΌΠΈ ΠΈΠ· %s\n\n" -#: git-gui.sh:3570 +#: git-gui.sh:4046 msgid "" "\n" "This is due to a known issue with the\n" "Tcl binary distributed by Cygwin." msgstr "\nΠΡΠΎ ΠΈΠ·Π²Π΅ΡΡΠ½Π°Ρ ΠΏΡΠΎΠ±Π»Π΅ΠΌΠ° Ρ Tcl,\nΡΠ°ΡΠΏΡΠΎΡΡΡΠ°Π½ΡΠ΅ΠΌΡΠΌ Cygwin." -#: git-gui.sh:3575 +#: git-gui.sh:4051 #, tcl-format msgid "" "\n" @@ -551,309 +597,148 @@ msgid "" "~/.gitconfig file.\n" msgstr "\n\nΠΠΌΠ΅ΡΡΠΎ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΈΡ %s ΠΌΠΎΠΆΠ½ΠΎ\nΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π·Π½Π°ΡΠ΅Π½ΠΈΡ user.name ΠΈ\nuser.email Π² ΠΠ°ΡΠ΅ΠΌ ΠΏΠ΅ΡΡΠΎΠ½Π°Π»ΡΠ½ΠΎΠΌ\nΡΠ°ΠΉΠ»Π΅ ~/.gitconfig.\n" -#: lib/about.tcl:26 -msgid "git-gui - a graphical user interface for Git." -msgstr "git-gui - Π³ΡΠ°ΡΠΈΡΠ΅ΡΠΊΠΈΠΉ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΈΠ½ΡΠ΅ΡΡΠ΅ΠΉΡ ΠΊ Git." - -#: lib/blame.tcl:72 -msgid "File Viewer" -msgstr "ΠΡΠΎΡΠΌΠΎΡΡ ΡΠ°ΠΉΠ»Π°" - -#: lib/blame.tcl:78 -msgid "Commit:" -msgstr "ΠΠΎΠΌΠΌΠΈΡ:" - -#: lib/blame.tcl:271 -msgid "Copy Commit" -msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ SHA-1" - -#: lib/blame.tcl:275 -msgid "Find Text..." -msgstr "ΠΠ°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡβ¦" - -#: lib/blame.tcl:284 -msgid "Do Full Copy Detection" -msgstr "ΠΡΠΎΠ²Π΅ΡΡΠΈ ΠΏΠΎΠ»Π½ΡΠΉ ΠΏΠΎΠΈΡΠΊ ΠΊΠΎΠΏΠΈΠΉ" +#: lib/spellcheck.tcl:57 +msgid "Unsupported spell checker" +msgstr "ΠΠ΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" -#: lib/blame.tcl:288 -msgid "Show History Context" -msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠΈΠΉ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡ" +#: lib/spellcheck.tcl:65 +msgid "Spell checking is unavailable" +msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π½Π΅ Π΄ΠΎΡΡΡΠΏΠ½Π°" -#: lib/blame.tcl:291 -msgid "Blame Parent Commit" -msgstr "ΠΠ²ΡΠΎΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" +#: lib/spellcheck.tcl:68 +msgid "Invalid spell checking configuration" +msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" -#: lib/blame.tcl:450 +#: lib/spellcheck.tcl:70 #, tcl-format -msgid "Reading %s..." -msgstr "Π§ΡΠ΅Π½ΠΈΠ΅ %sβ¦" - -#: lib/blame.tcl:557 -msgid "Loading copy/move tracking annotations..." -msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΉ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΉβ¦" - -#: lib/blame.tcl:577 -msgid "lines annotated" -msgstr "ΡΡΡΠΎΠΊ ΠΏΡΠΎΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½ΠΎ" - -#: lib/blame.tcl:769 -msgid "Loading original location annotations..." -msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΉ ΠΏΠ΅ΡΠ²ΠΎΠ½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°β¦" - -#: lib/blame.tcl:772 -msgid "Annotation complete." -msgstr "ΠΠ½Π½ΠΎΡΠ°ΡΠΈΡ Π·Π°Π²Π΅ΡΡΠ΅Π½Π°." - -#: lib/blame.tcl:802 -msgid "Busy" -msgstr "ΠΠ°Π½ΡΡ" - -#: lib/blame.tcl:803 -msgid "Annotation process is already running." -msgstr "ΠΠ½Π½ΠΎΡΠ°ΡΠΈΡ ΡΠΆΠ΅ Π·Π°ΠΏΡΡΠ΅Π½Π°" - -#: lib/blame.tcl:842 -msgid "Running thorough copy detection..." -msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ° ΠΊΠΎΠΏΠΈΠΉβ¦" - -#: lib/blame.tcl:910 -msgid "Loading annotation..." -msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΈβ¦" - -#: lib/blame.tcl:963 -msgid "Author:" -msgstr "ΠΠ²ΡΠΎΡ:" - -#: lib/blame.tcl:967 -msgid "Committer:" -msgstr "ΠΠΎΠΌΠΌΠΈΡΠ΅Ρ:" - -#: lib/blame.tcl:972 -msgid "Original File:" -msgstr "ΠΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ°ΠΉΠ»:" - -#: lib/blame.tcl:1020 -msgid "Cannot find HEAD commit:" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:" - -#: lib/blame.tcl:1075 -msgid "Cannot find parent commit:" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:" - -#: lib/blame.tcl:1090 -msgid "Unable to display parent" -msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠ΅Π΄ΠΊΠ°" - -#: lib/blame.tcl:1091 lib/diff.tcl:320 -msgid "Error loading diff:" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°Π³ΡΡΠ·ΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ:" - -#: lib/blame.tcl:1231 -msgid "Originally By:" -msgstr "ΠΡΡΠΎΡΠ½ΠΈΠΊ:" - -#: lib/blame.tcl:1237 -msgid "In File:" -msgstr "Π€Π°ΠΉΠ»:" - -#: lib/blame.tcl:1242 -msgid "Copied Or Moved Here By:" -msgstr "Π‘ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΎ/ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΎ Π²:" - -#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19 -msgid "Checkout Branch" -msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΠΊΡ" - -#: lib/branch_checkout.tcl:23 -msgid "Checkout" -msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ" - -#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35 -#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282 -#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172 -#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42 -#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352 -#: lib/transport.tcl:108 -msgid "Cancel" -msgstr "ΠΡΠΌΠ΅Π½Π°" - -#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328 -msgid "Revision" -msgstr "ΠΠ΅ΡΡΠΈΡ" - -#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280 -msgid "Options" -msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ" - -#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92 -msgid "Fetch Tracking Branch" -msgstr "ΠΠ·Π²Π»Π΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ" - -#: lib/branch_checkout.tcl:44 -msgid "Detach From Local Branch" -msgstr "ΠΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ ΠΎΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" - -#: lib/branch_create.tcl:22 -msgid "Create Branch" -msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ Π²Π΅ΡΠΊΡ" - -#: lib/branch_create.tcl:27 -msgid "Create New Branch" -msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" - -#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381 -msgid "Create" -msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ" - -#: lib/branch_create.tcl:40 -msgid "Branch Name" -msgstr "ΠΠΌΡ Π²Π΅ΡΠΊΠΈ" - -#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50 -msgid "Name:" -msgstr "ΠΠ°Π·Π²Π°Π½ΠΈΠ΅:" - -#: lib/branch_create.tcl:58 -msgid "Match Tracking Branch Name" -msgstr "Π‘ΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΎΠ²Π°ΡΡ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" - -#: lib/branch_create.tcl:66 -msgid "Starting Revision" -msgstr "ΠΠ°ΡΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΡΠΈΡ" - -#: lib/branch_create.tcl:72 -msgid "Update Existing Branch:" -msgstr "ΠΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠΌΠ΅ΡΡΡΡΡΡ Π²Π΅ΡΠΊΡ:" +msgid "Reverting dictionary to %s." +msgstr "Π‘Π»ΠΎΠ²Π°ΡΡ Π²Π΅ΡΠ½ΡΡ ΠΊ %s." -#: lib/branch_create.tcl:75 -msgid "No" -msgstr "ΠΠ΅Ρ" +#: lib/spellcheck.tcl:73 +msgid "Spell checker silently failed on startup" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π½Π΅ ΡΠΌΠΎΠ³Π»Π° Π·Π°ΠΏΡΡΡΠΈΡΡΡΡ" -#: lib/branch_create.tcl:80 -msgid "Fast Forward Only" -msgstr "Π’ΠΎΠ»ΡΠΊΠΎ Fast Forward" +#: lib/spellcheck.tcl:80 +msgid "Unrecognized spell checker" +msgstr "ΠΠ΅ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" -#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571 -msgid "Reset" -msgstr "Π‘Π±ΡΠΎΡ" +#: lib/spellcheck.tcl:186 +msgid "No Suggestions" +msgstr "ΠΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠΉ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ" -#: lib/branch_create.tcl:97 -msgid "Checkout After Creation" -msgstr "ΠΠΎΡΠ»Π΅ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ΅ΠΊΡΡΠ΅ΠΉ" +#: lib/spellcheck.tcl:388 +msgid "Unexpected EOF from spell checker" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π»Π° ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ Π΄Π°Π½Π½ΡΡ
" -#: lib/branch_create.tcl:131 -msgid "Please select a tracking branch." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΎΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ Π²Π΅ΡΠΊΡ." +#: lib/spellcheck.tcl:392 +msgid "Spell Checker Failed" +msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" -#: lib/branch_create.tcl:140 +#: lib/transport.tcl:6 lib/remote_add.tcl:132 #, tcl-format -msgid "Tracking branch %s is not a branch in the remote repository." -msgstr "ΠΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π²Π΅ΡΠΊΠΎΠΉ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ." +msgid "fetch %s" +msgstr "ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ %s" -#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86 -msgid "Please supply a branch name." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ." +#: lib/transport.tcl:7 +#, tcl-format +msgid "Fetching new changes from %s" +msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΈΠ· %s " -#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106 +#: lib/transport.tcl:18 #, tcl-format -msgid "'%s' is not an acceptable branch name." -msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»." +msgid "remote prune %s" +msgstr "ΡΠΈΡΡΠΊΠ° Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ %s" -#: lib/branch_delete.tcl:15 -msgid "Delete Branch" -msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" +#: lib/transport.tcl:19 +#, tcl-format +msgid "Pruning tracking branches deleted from %s" +msgstr "Π§ΠΈΡΡΠΊΠ° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ, ΡΠ΄Π°Π»ΡΠ½Π½ΡΡ
ΠΈΠ· %s" -#: lib/branch_delete.tcl:20 -msgid "Delete Local Branch" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ" +#: lib/transport.tcl:25 +msgid "fetch all remotes" +msgstr "ΠΈΠ·Π²Π»Π΅ΡΡ ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: lib/branch_delete.tcl:37 -msgid "Local Branches" -msgstr "ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ" +#: lib/transport.tcl:26 +msgid "Fetching new changes from all remotes" +msgstr "ΠΠΎΠ»ΡΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: lib/branch_delete.tcl:52 -msgid "Delete Only If Merged Into" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ»ΡΡΠ°Π΅, Π΅ΡΠ»ΠΈ Π±ΡΠ»ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ" +#: lib/transport.tcl:40 +msgid "remote prune all remotes" +msgstr "ΡΠΈΡΡΠΊΠ° Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119 -msgid "Always (Do not perform merge checks)" -msgstr "ΠΡΠ΅Π³Π΄Π° (Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΡ Π½Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅)" +#: lib/transport.tcl:41 +msgid "Pruning tracking branches deleted from all remotes" +msgstr "Π§ΠΈΡΡΠΊΠ° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ, ΡΠ΄Π°Π»ΡΠ½Π½ΡΡ
ΡΠΎ Π²ΡΠ΅Ρ
Π²Π½Π΅ΡΠ½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" -#: lib/branch_delete.tcl:103 +#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110 +#: lib/remote_add.tcl:162 #, tcl-format -msgid "The following branches are not completely merged into %s:" -msgstr "ΠΠ΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ ΡΠ»ΠΈΠ²Π°ΡΡΡΡ Ρ %s:" - -#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217 -msgid "" -"Recovering deleted branches is difficult.\n" -"\n" -"Delete the selected branches?" -msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ Π²Π΅ΡΠΊΠΈ ΡΠ»ΠΎΠΆΠ½ΠΎ.\n\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ?" +msgid "push %s" +msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ %s" -#: lib/branch_delete.tcl:141 +#: lib/transport.tcl:55 #, tcl-format -msgid "" -"Failed to delete branches:\n" -"%s" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΠΈ:\n%s" +msgid "Pushing changes to %s" +msgstr "ΠΡΠΏΡΠ°Π²ΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² %s " -#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22 -msgid "Rename Branch" -msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" +#: lib/transport.tcl:93 +#, tcl-format +msgid "Mirroring to %s" +msgstr "Π’ΠΎΡΠ½ΠΎΠ΅ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² %s" -#: lib/branch_rename.tcl:26 -msgid "Rename" -msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ" +#: lib/transport.tcl:111 +#, tcl-format +msgid "Pushing %s %s to %s" +msgstr "ΠΡΠΏΡΠ°Π²ΠΊΠ° %s %s Π² %s" -#: lib/branch_rename.tcl:36 -msgid "Branch:" -msgstr "ΠΠ΅ΡΠΊΠ°:" +#: lib/transport.tcl:132 +msgid "Push Branches" +msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ Π²Π΅ΡΠΊΠΈ" -#: lib/branch_rename.tcl:39 -msgid "New Name:" -msgstr "ΠΠΎΠ²ΠΎΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅:" +#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34 +#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32 +#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41 +#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43 +#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178 +msgid "Cancel" +msgstr "ΠΡΠΌΠ΅Π½Π°" -#: lib/branch_rename.tcl:75 -msgid "Please select a branch to rename." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π²Π΅ΡΠΊΡ Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ." +#: lib/transport.tcl:147 +msgid "Source Branches" +msgstr "ΠΡΡ
ΠΎΠ΄Π½ΡΠ΅ Π²Π΅ΡΠΊΠΈ" -#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202 -#, tcl-format -msgid "Branch '%s' already exists." -msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." +#: lib/transport.tcl:162 +msgid "Destination Repository" +msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ" -#: lib/branch_rename.tcl:117 -#, tcl-format -msgid "Failed to rename '%s'." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Β«%sΒ». " +#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51 +msgid "Remote:" +msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ:" -#: lib/browser.tcl:17 -msgid "Starting..." -msgstr "ΠΠ°ΠΏΡΡΠΊβ¦" +#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72 +msgid "Arbitrary Location:" +msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΠΎΠ΅ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:" -#: lib/browser.tcl:26 -msgid "File Browser" -msgstr "ΠΡΠΎΡΠΌΠΎΡΡ ΡΠΏΠΈΡΠΊΠ° ΡΠ°ΠΉΠ»ΠΎΠ²" +#: lib/transport.tcl:205 +msgid "Transfer Options" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" -#: lib/browser.tcl:126 lib/browser.tcl:143 -#, tcl-format -msgid "Loading %s..." -msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° %sβ¦" +#: lib/transport.tcl:207 +msgid "Force overwrite existing branch (may discard changes)" +msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ Π²Π΅ΡΠΊΡ (Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π° ΠΏΠΎΡΠ΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ)" -#: lib/browser.tcl:187 -msgid "[Up To Parent]" -msgstr "[ΠΠ° ΡΡΠΎΠ²Π΅Π½Ρ Π²ΡΡΠ΅]" +#: lib/transport.tcl:211 +msgid "Use thin pack (for slow network connections)" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ thin pack (Π΄Π»Ρ ΠΌΠ΅Π΄Π»Π΅Π½Π½ΡΡ
ΡΠ΅ΡΠ΅Π²ΡΡ
ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΉ)" -#: lib/browser.tcl:267 lib/browser.tcl:273 -msgid "Browse Branch Files" -msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π²Π΅ΡΠΊΠΈ" +#: lib/transport.tcl:215 +msgid "Include tags" +msgstr "ΠΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΌΠ΅ΡΠΊΠΈ" -#: lib/browser.tcl:278 lib/choose_repository.tcl:398 -#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497 -#: lib/choose_repository.tcl:1028 -msgid "Browse" -msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ" +#: lib/transport.tcl:229 +#, tcl-format +msgid "%s (%s): Push" +msgstr "%s (%s): ΠΡΠΏΡΠ°Π²ΠΊΠ°" #: lib/checkout_op.tcl:85 #, tcl-format @@ -865,8 +750,8 @@ msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ %s ΠΈΠ· %s " msgid "fatal: Cannot resolve %s" msgstr "ΠΊΡΠΈΡΠΈΡΠ΅ΡΠΊΠ°Ρ ΠΎΡΠΈΠ±ΠΊΠ°: Π½Π΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΡΠ°Π·ΡΠ΅ΡΠΈΡΡ %s" -#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31 -#: lib/sshkey.tcl:53 +#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81 +#: lib/database.tcl:30 msgid "Close" msgstr "ΠΠ°ΠΊΡΡΡΡ" @@ -880,6 +765,11 @@ msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." msgid "Failed to configure simplified git-pull for '%s'." msgstr "ΠΡΠΈΠ±ΠΊΠ° ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΡΠΏΡΠΎΡΡΠ½Π½ΠΎΠΉ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΠΈ git pull Π΄Π»Ρ Β«%sΒ»." +#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102 +#, tcl-format +msgid "Branch '%s' already exists." +msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." + #: lib/checkout_op.tcl:229 #, tcl-format msgid "" @@ -921,51 +811,55 @@ msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΈΠ΅ ΡΠ°Π±ΠΎΡΠ΅Π³ΠΎ ΠΊΠ°ΡΠ°Π»ΠΎΠ³Π° ΠΈΠ· Β«%sΒ»β¦" msgid "files checked out" msgstr "ΡΠ°ΠΉΠ»Ρ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½Ρ" -#: lib/checkout_op.tcl:376 +#: lib/checkout_op.tcl:377 #, tcl-format msgid "Aborted checkout of '%s' (file level merging is required)." msgstr "ΠΡΠ΅ΡΠ²Π°Π½ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° Β«%sΒ» (ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»ΠΎΠ²)" -#: lib/checkout_op.tcl:377 +#: lib/checkout_op.tcl:378 msgid "File level merge required." msgstr "Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ ΡΠΎΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ ΡΠ°ΠΉΠ»ΠΎΠ²." -#: lib/checkout_op.tcl:381 +#: lib/checkout_op.tcl:382 #, tcl-format msgid "Staying on branch '%s'." msgstr "ΠΠ΅ΡΠΊΠ° Β«%sΒ» ΠΎΡΡΠ°ΡΡΡΡ ΡΠ΅ΠΊΡΡΠ΅ΠΉ." -#: lib/checkout_op.tcl:452 +#: lib/checkout_op.tcl:453 msgid "" "You are no longer on a local branch.\n" "\n" "If you wanted to be on a branch, create one now starting from 'This Detached Checkout'." msgstr "ΠΡ Π±ΠΎΠ»Π΅Π΅ Π½Π΅ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π½Π° Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠ΅.\n\nΠΡΠ»ΠΈ Π²Ρ Ρ
ΠΎΡΠΈΡΠ΅ ΡΠ½ΠΎΠ²Π° Π²Π΅ΡΠ½ΡΡΡΡΡ ΠΊ ΠΊΠ°ΠΊΠΎΠΉ-Π½ΠΈΠ±ΡΠ΄Ρ Π²Π΅ΡΠΊΠ΅, ΡΠΎΠ·Π΄Π°ΠΉΡΠ΅ Π΅Ρ ΡΠ΅ΠΉΡΠ°Ρ, Π½Π°ΡΠΈΠ½Π°Ρ Ρ Β«Π’Π΅ΠΊΡΡΠ΅Π³ΠΎ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠ³ΠΎ ΡΠΎΡΡΠΎΡΠ½ΠΈΡΒ»." -#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507 +#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508 #, tcl-format msgid "Checked out '%s'." msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ ΠΏΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° Β«%sΒ»." -#: lib/checkout_op.tcl:535 +#: lib/checkout_op.tcl:536 #, tcl-format msgid "Resetting '%s' to '%s' will lose the following commits:" msgstr "Π‘Π±ΡΠΎΡ Β«%sΒ» Π½Π° Β«%sΒ» ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΠΎΡΠ΅ΡΠ΅ ΡΠ»Π΅Π΄ΡΡΡΠΈΡ
ΠΊΠΎΠΌΠΌΠΈΡΠΎΠ²:" -#: lib/checkout_op.tcl:557 +#: lib/checkout_op.tcl:558 msgid "Recovering lost commits may not be easy." msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΠΏΠΎΡΠ΅ΡΡΠ½Π½ΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ Π±ΡΠ΄Π΅Ρ ΡΠ»ΠΎΠΆΠ½ΠΎ." -#: lib/checkout_op.tcl:562 +#: lib/checkout_op.tcl:563 #, tcl-format msgid "Reset '%s'?" msgstr "Π‘Π±ΡΠΎΡΠΈΡΡ Β«%sΒ»?" -#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343 +#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170 msgid "Visualize" msgstr "ΠΠ°Π³Π»ΡΠ΄Π½ΠΎ" -#: lib/checkout_op.tcl:635 +#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85 +msgid "Reset" +msgstr "Π‘Π±ΡΠΎΡ" + +#: lib/checkout_op.tcl:636 #, tcl-format msgid "" "Failed to set current branch.\n" @@ -975,256 +869,1384 @@ msgid "" "This should not have occurred. %s will now close and give up." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠΊΡ.\n\nΠΠ°Ρ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³ ΠΎΠ±Π½ΠΎΠ²Π»ΡΠ½ ΡΠΎΠ»ΡΠΊΠΎ ΡΠ°ΡΡΠΈΡΠ½ΠΎ. ΠΡΠ»ΠΈ ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Ρ Π²ΡΠ΅ ΡΠ°ΠΉΠ»Ρ ΠΊΡΠΎΠΌΠ΅ ΡΠ»ΡΠΆΠ΅Π±Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² Git. \n\nΠΡΠΎΠ³ΠΎ Π½Π΅ Π΄ΠΎΠ»ΠΆΠ½ΠΎ Π±ΡΠ»ΠΎ ΠΏΡΠΎΠΈΠ·ΠΎΠΉΡΠΈ. %s Π·Π°Π²Π΅ΡΡΠ°Π΅ΡΡΡ." -#: lib/choose_font.tcl:39 +#: lib/remote_add.tcl:20 +#, tcl-format +msgid "%s (%s): Add Remote" +msgstr "%s (%s): ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" + +#: lib/remote_add.tcl:25 +msgid "Add New Remote" +msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" + +#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37 +msgid "Add" +msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ" + +#: lib/remote_add.tcl:39 +msgid "Remote Details" +msgstr "ΠΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" + +#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44 +msgid "Name:" +msgstr "ΠΠ°Π·Π²Π°Π½ΠΈΠ΅:" + +#: lib/remote_add.tcl:50 +msgid "Location:" +msgstr "ΠΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:" + +#: lib/remote_add.tcl:60 +msgid "Further Action" +msgstr "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ" + +#: lib/remote_add.tcl:63 +msgid "Fetch Immediately" +msgstr "Π‘ΡΠ°Π·Ρ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" + +#: lib/remote_add.tcl:69 +msgid "Initialize Remote Repository and Push" +msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈ ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ" + +#: lib/remote_add.tcl:75 +msgid "Do Nothing Else Now" +msgstr "ΠΠΎΠ»ΡΡΠ΅ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°ΡΡ" + +#: lib/remote_add.tcl:100 +msgid "Please supply a remote name." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." + +#: lib/remote_add.tcl:113 +#, tcl-format +msgid "'%s' is not an acceptable remote name." +msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌ ΠΈΠΌΠ΅Π½Π΅ΠΌ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." + +#: lib/remote_add.tcl:124 +#, tcl-format +msgid "Failed to add remote '%s' of location '%s'." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Β«%sΒ» ΠΈΠ· Β«%sΒ». " + +#: lib/remote_add.tcl:133 +#, tcl-format +msgid "Fetching the %s" +msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ %s" + +#: lib/remote_add.tcl:156 +#, tcl-format +msgid "Do not know how to initialize repository at location '%s'." +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π² Β«%sΒ»." + +#: lib/remote_add.tcl:163 +#, tcl-format +msgid "Setting up the %s (at %s)" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠ° %s (Π² %s)" + +#: lib/browser.tcl:17 +msgid "Starting..." +msgstr "ΠΠ°ΠΏΡΡΠΊβ¦" + +#: lib/browser.tcl:27 +#, tcl-format +msgid "%s (%s): File Browser" +msgstr "%s (%s): ΠΡΠΎΡΠΌΠΎΡΡ ΡΠΏΠΈΡΠΊΠ° ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: lib/browser.tcl:132 lib/browser.tcl:149 +#, tcl-format +msgid "Loading %s..." +msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° %sβ¦" + +#: lib/browser.tcl:193 +msgid "[Up To Parent]" +msgstr "[ΠΠ° ΡΡΠΎΠ²Π΅Π½Ρ Π²ΡΡΠ΅]" + +#: lib/browser.tcl:275 +#, tcl-format +msgid "%s (%s): Browse Branch Files" +msgstr "%s (%s): ΠΡΠΎΡΠΌΠΎΡΡ ΡΠ°ΠΉΠ»ΠΎΠ² Π²Π΅ΡΠΊΠΈ" + +#: lib/browser.tcl:282 +msgid "Browse Branch Files" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΡΠ°ΠΉΠ»Ρ Π²Π΅ΡΠΊΠΈ" + +#: lib/browser.tcl:288 lib/choose_repository.tcl:437 +#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533 +#: lib/choose_repository.tcl:1115 +msgid "Browse" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ" + +#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321 +msgid "Revision" +msgstr "ΠΠ΅ΡΡΠΈΡ" + +#: lib/index.tcl:6 +msgid "Unable to unlock the index." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" + +#: lib/index.tcl:30 +msgid "Index Error" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" + +#: lib/index.tcl:32 +msgid "" +"Updating the Git index failed. A rescan will be automatically started to " +"resynchronize git-gui." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Git. Π‘ΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π±ΡΠ΄Π΅Ρ ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ°Π½ΠΎ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ." + +#: lib/index.tcl:43 +msgid "Continue" +msgstr "ΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ" + +#: lib/index.tcl:46 +msgid "Unlock Index" +msgstr "Π Π°Π·Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" + +#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587 +#: lib/choose_repository.tcl:999 +msgid "files" +msgstr "ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: lib/index.tcl:326 +msgid "Unstaging selected files from commit" +msgstr "Π£Π±ΠΎΡΠΊΠ° Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ² ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: lib/index.tcl:330 +#, tcl-format +msgid "Unstaging %s from commit" +msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" + +#: lib/index.tcl:369 +msgid "Ready to commit." +msgstr "ΠΠΎΡΠΎΠ² Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°." + +#: lib/index.tcl:378 +msgid "Adding selected files" +msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: lib/index.tcl:382 +#, tcl-format +msgid "Adding %s" +msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ %sβ¦" + +#: lib/index.tcl:412 +#, tcl-format +msgid "Stage %d untracked files?" +msgstr "ΠΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ %d Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Π°?" + +#: lib/index.tcl:420 +msgid "Adding all changed files" +msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ Π²ΡΠ΅Ρ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½Π½ΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: lib/index.tcl:503 +#, tcl-format +msgid "Revert changes in file %s?" +msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°ΠΉΠ»Π΅ %s?" + +#: lib/index.tcl:508 +#, tcl-format +msgid "Revert changes in these %i files?" +msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² %i ΡΠ°ΠΉΠ»Π΅(-Π°Ρ
)?" + +#: lib/index.tcl:517 +msgid "Any unstaged changes will be permanently lost by the revert." +msgstr "ΠΡΠ±ΡΠ΅ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, Π±ΡΠ΄ΡΡ ΠΏΠΎΡΠ΅ΡΡΠ½Ρ ΠΏΡΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." + +#: lib/index.tcl:520 lib/index.tcl:563 +msgid "Do Nothing" +msgstr "ΠΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°ΡΡ" + +#: lib/index.tcl:545 +#, tcl-format +msgid "Delete untracked file %s?" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠΉ ΡΠ°ΠΉΠ» %s?" + +#: lib/index.tcl:550 +#, tcl-format +msgid "Delete these %i untracked files?" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ %i Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Π°?" + +#: lib/index.tcl:560 +msgid "Files will be permanently deleted." +msgstr "Π€Π°ΠΉΠ»Ρ Π±ΡΠ΄ΡΡ ΡΠ΄Π°Π»Π΅Π½Ρ Π½Π°Π²ΡΠ΅Π³Π΄Π°." + +#: lib/index.tcl:564 +msgid "Delete Files" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΠ°ΠΉΠ»Ρ" + +#: lib/index.tcl:586 +msgid "Deleting" +msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅" + +#: lib/index.tcl:665 +msgid "Encountered errors deleting files:\n" +msgstr "ΠΠΎΠ·Π½ΠΈΠΊΡΠΈΠ΅ ΠΎΡΠΈΠ±ΠΊΠΈ ΠΏΡΠΈ ΡΠ΄Π°Π»Π΅Π½ΠΈΠΈ ΡΠ°ΠΉΠ»ΠΎΠ²:\n" + +#: lib/index.tcl:674 +#, tcl-format +msgid "None of the %d selected files could be deleted." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π½ΠΈ ΠΎΠ΄ΠΈΠ½ ΠΈΠ· Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
%d ΡΠ°ΠΉΠ»ΠΎΠ²." + +#: lib/index.tcl:679 +#, tcl-format +msgid "%d of the %d selected files could not be deleted." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ %d ΠΈΠ· Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
%d ΡΠ°ΠΉΠ»ΠΎΠ²." + +#: lib/index.tcl:726 +msgid "Reverting selected files" +msgstr "ΠΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" + +#: lib/index.tcl:730 +#, tcl-format +msgid "Reverting %s" +msgstr "ΠΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² %s" + +#: lib/branch_checkout.tcl:16 +#, tcl-format +msgid "%s (%s): Checkout Branch" +msgstr "%s (%s): ΠΠ΅ΡΠ΅Ρ
ΠΎΠ΄ Π½Π° Π²Π΅ΡΠΊΡ" + +#: lib/branch_checkout.tcl:21 +msgid "Checkout Branch" +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° Π²Π΅ΡΠΊΡ" + +#: lib/branch_checkout.tcl:26 +msgid "Checkout" +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ" + +#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69 +msgid "Options" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ" + +#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92 +msgid "Fetch Tracking Branch" +msgstr "ΠΠ·Π²Π»Π΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈΠ· Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/branch_checkout.tcl:47 +msgid "Detach From Local Branch" +msgstr "ΠΡΡΠΎΠ΅Π΄ΠΈΠ½ΠΈΡΡ ΠΎΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/status_bar.tcl:263 +#, tcl-format +msgid "%s ... %*i of %*i %s (%3i%%)" +msgstr "%s β¦ %*i ΠΈΠ· %*i %s (%3i%%)" + +#: lib/remote.tcl:200 +msgid "Push to" +msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ" + +#: lib/remote.tcl:218 +msgid "Remove Remote" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" + +#: lib/remote.tcl:223 +msgid "Prune from" +msgstr "Π§ΠΈΡΡΠΊΠ°" + +#: lib/remote.tcl:228 +msgid "Fetch from" +msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·" + +#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264 +msgid "All" +msgstr "ΠΡΠ΅" + +#: lib/branch_rename.tcl:15 +#, tcl-format +msgid "%s (%s): Rename Branch" +msgstr "%s (%s): ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Π²Π΅ΡΠΊΡ" + +#: lib/branch_rename.tcl:23 +msgid "Rename Branch" +msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" + +#: lib/branch_rename.tcl:28 +msgid "Rename" +msgstr "ΠΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ" + +#: lib/branch_rename.tcl:38 +msgid "Branch:" +msgstr "ΠΠ΅ΡΠΊΠ°:" + +#: lib/branch_rename.tcl:46 +msgid "New Name:" +msgstr "ΠΠΎΠ²ΠΎΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅:" + +#: lib/branch_rename.tcl:81 +msgid "Please select a branch to rename." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π²Π΅ΡΠΊΡ Π΄Π»Ρ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΡ." + +#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154 +msgid "Please supply a branch name." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ." + +#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165 +#, tcl-format +msgid "'%s' is not an acceptable branch name." +msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΠΎΠ΅ ΠΈΠΌΡ Π²Π΅ΡΠΊΠΈ Β«%sΒ»." + +#: lib/branch_rename.tcl:123 +#, tcl-format +msgid "Failed to rename '%s'." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°ΡΡ Β«%sΒ». " + +#: lib/choose_font.tcl:41 msgid "Select" msgstr "ΠΡΠ±ΡΠ°ΡΡ" -#: lib/choose_font.tcl:53 +#: lib/choose_font.tcl:55 msgid "Font Family" msgstr "Π¨ΡΠΈΡΡ" -#: lib/choose_font.tcl:74 +#: lib/choose_font.tcl:76 msgid "Font Size" msgstr "Π Π°Π·ΠΌΠ΅Ρ ΡΡΠΈΡΡΠ°" -#: lib/choose_font.tcl:91 +#: lib/choose_font.tcl:93 msgid "Font Example" msgstr "ΠΡΠΈΠΌΠ΅Ρ ΡΠ΅ΠΊΡΡΠ°" -#: lib/choose_font.tcl:103 +#: lib/choose_font.tcl:105 msgid "" "This is example text.\n" "If you like this text, it can be your font." msgstr "ΠΡΠΎ ΠΏΡΠΈΠΌΠ΅Ρ ΡΠ΅ΠΊΡΡΠ°.\nΠΡΠ»ΠΈ ΠΠ°ΠΌ Π½ΡΠ°Π²ΠΈΡΡΡ ΡΡΠΎΡ ΡΠ΅ΠΊΡΡ, ΡΡΠΎ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ ΠΠ°Ρ ΡΡΠΈΡΡ." -#: lib/choose_repository.tcl:28 +#: lib/option.tcl:11 +#, tcl-format +msgid "Invalid global encoding '%s'" +msgstr "ΠΠ΅Π²Π΅ΡΠ½Π°Ρ Π³Π»ΠΎΠ±Π°Π»ΡΠ½Π°Ρ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° Β«%sΒ»" + +#: lib/option.tcl:19 +#, tcl-format +msgid "Invalid repo encoding '%s'" +msgstr "ΠΠ΅Π²Π΅ΡΠ½Π°Ρ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" + +#: lib/option.tcl:119 +msgid "Restore Defaults" +msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" + +#: lib/option.tcl:123 +msgid "Save" +msgstr "Π‘ΠΎΡ
ΡΠ°Π½ΠΈΡΡ" + +#: lib/option.tcl:133 +#, tcl-format +msgid "%s Repository" +msgstr "ΠΠ»Ρ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ %s" + +#: lib/option.tcl:134 +msgid "Global (All Repositories)" +msgstr "ΠΠ±ΡΠΈΠ΅ (Π΄Π»Ρ Π²ΡΠ΅Ρ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²)" + +#: lib/option.tcl:140 +msgid "User Name" +msgstr "ΠΠΌΡ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ" + +#: lib/option.tcl:141 +msgid "Email Address" +msgstr "ΠΠ΄ΡΠ΅Ρ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΠΎΠΉ ΠΏΠΎΡΡΡ" + +#: lib/option.tcl:143 +msgid "Summarize Merge Commits" +msgstr "Π‘ΡΠΌΠΌΠ°ΡΠ½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" + +#: lib/option.tcl:144 +msgid "Merge Verbosity" +msgstr "Π£ΡΠΎΠ²Π΅Π½Ρ Π΄Π΅ΡΠ°Π»ΡΠ½ΠΎΡΡΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" + +#: lib/option.tcl:145 +msgid "Show Diffstat After Merge" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΡΠ΅Ρ ΠΎΠ± ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΡ
ΠΏΠΎΡΠ»Π΅ ΡΠ»ΠΈΡΠ½ΠΈΡ" + +#: lib/option.tcl:146 +msgid "Use Merge Tool" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ" + +#: lib/option.tcl:148 +msgid "Trust File Modification Timestamps" +msgstr "ΠΠΎΠ²Π΅ΡΡΡΡ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΡΠ°ΠΉΠ»Π°" + +#: lib/option.tcl:149 +msgid "Prune Tracking Branches During Fetch" +msgstr "Π§ΠΈΡΡΠΊΠ° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ ΠΏΡΠΈ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" + +#: lib/option.tcl:150 +msgid "Match Tracking Branches" +msgstr "Π’Π°ΠΊΠΎΠ΅ ΠΆΠ΅ ΠΈΠΌΡ, ΠΊΠ°ΠΊ ΠΈ Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/option.tcl:151 +msgid "Use Textconv For Diffs and Blames" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Textconv Π΄Π»Ρ ΠΏΡΠΎΡΠΌΠΎΡΡΠ° ΡΠ°Π·Π»ΠΈΡΠΈΠΉ ΠΈ Π°Π²ΡΠΎΡΡΡΠ²Π°" + +#: lib/option.tcl:152 +msgid "Blame Copy Only On Changed Files" +msgstr "ΠΠΎΠΈΡΠΊ ΠΊΠΎΠΏΠΈΠΉ ΡΠΎΠ»ΡΠΊΠΎ Π² ΠΈΠ·ΠΌΠ΅Π½ΡΠ½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" + +#: lib/option.tcl:153 +msgid "Maximum Length of Recent Repositories List" +msgstr "ΠΠ°ΠΊΡΠΈΠΌΠ°Π»ΡΠ½Π°Ρ Π΄Π»ΠΈΠ½Π½Π° ΡΠΏΠΈΡΠΊΠ° Π½Π΅Π΄Π°Π²Π½ΠΈΡ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" + +#: lib/option.tcl:154 +msgid "Minimum Letters To Blame Copy On" +msgstr "ΠΠΈΠ½ΠΈΠΌΠ°Π»ΡΠ½ΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠ² Π΄Π»Ρ ΠΏΠΎΠΈΡΠΊΠ° ΠΊΠΎΠΏΠΈΠΉ" + +#: lib/option.tcl:155 +msgid "Blame History Context Radius (days)" +msgstr "Π Π°Π΄ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠΎΠ³ΠΎ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° (Π² Π΄Π½ΡΡ
)" + +#: lib/option.tcl:156 +msgid "Number of Diff Context Lines" +msgstr "Π§ΠΈΡΠ»ΠΎ ΡΡΡΠΎΠΊ Π² ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ΅ diff" + +#: lib/option.tcl:157 +msgid "Additional Diff Parameters" +msgstr "ΠΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΡΠ΅ ΠΏΠ°ΡΠ°ΠΌΠ΅ΡΡΡ Π΄Π»Ρ diff" + +#: lib/option.tcl:158 +msgid "Commit Message Text Width" +msgstr "Π¨ΠΈΡΠΈΠ½Π° ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" + +#: lib/option.tcl:159 +msgid "New Branch Name Template" +msgstr "Π¨Π°Π±Π»ΠΎΠ½ Π΄Π»Ρ ΠΈΠΌΠ΅Π½ΠΈ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/option.tcl:160 +msgid "Default File Contents Encoding" +msgstr "ΠΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° ΡΠΎΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" + +#: lib/option.tcl:161 +msgid "Warn before committing to a detached head" +msgstr "ΠΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π°ΡΡ ΠΏΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ Π² ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠΉ HEAD" + +#: lib/option.tcl:162 +msgid "Staging of untracked files" +msgstr "ΠΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
ΡΠ°ΠΉΠ»ΠΎΠ²" + +#: lib/option.tcl:163 +msgid "Show untracked files" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠ΅ ΡΠ°ΠΉΠ»Ρ" + +#: lib/option.tcl:164 +msgid "Tab spacing" +msgstr "Π¨ΠΈΡΠΈΠ½Π° ΡΠ°Π±ΡΠ»ΡΡΠΈΠΈ" + +#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282 +#: lib/database.tcl:57 +#, tcl-format +msgid "%s:" +msgstr "%s:" + +#: lib/option.tcl:210 +msgid "Change" +msgstr "ΠΠ·ΠΌΠ΅Π½ΠΈΡΡ" + +#: lib/option.tcl:254 +msgid "Spelling Dictionary:" +msgstr "Π‘Π»ΠΎΠ²Π°ΡΡ Π΄Π»Ρ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ:" + +#: lib/option.tcl:284 +msgid "Change Font" +msgstr "ΠΠ·ΠΌΠ΅Π½ΠΈΡΡ" + +#: lib/option.tcl:288 +#, tcl-format +msgid "Choose %s" +msgstr "ΠΡΠ±Π΅ΡΠΈΡΠ΅ %s" + +#: lib/option.tcl:294 +msgid "pt." +msgstr "ΠΏ." + +#: lib/option.tcl:308 +msgid "Preferences" +msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ" + +#: lib/option.tcl:345 +msgid "Failed to completely save options:" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ:" + +#: lib/encoding.tcl:443 +msgid "Default" +msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" + +#: lib/encoding.tcl:448 +#, tcl-format +msgid "System (%s)" +msgstr "Π‘ΠΈΡΡΠ΅ΠΌΠ½Π°Ρ (%s)" + +#: lib/encoding.tcl:459 lib/encoding.tcl:465 +msgid "Other" +msgstr "ΠΡΡΠ³Π°Ρ" + +#: lib/tools.tcl:76 +#, tcl-format +msgid "Running %s requires a selected file." +msgstr "ΠΠ°ΠΏΡΡΠΊ %s ΡΡΠ΅Π±ΡΠ΅Ρ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π°." + +#: lib/tools.tcl:92 +#, tcl-format +msgid "Are you sure you want to run %1$s on file \"%2$s\"?" +msgstr "ΠΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ %1$s Π½Π° Β«%2$sΒ»?" + +#: lib/tools.tcl:96 +#, tcl-format +msgid "Are you sure you want to run %s?" +msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π·Π°ΠΏΡΡΡΠΈΡΡ %s?" + +#: lib/tools.tcl:118 +#, tcl-format +msgid "Tool: %s" +msgstr "ΠΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ: %s" + +#: lib/tools.tcl:119 +#, tcl-format +msgid "Running: %s" +msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: %s" + +#: lib/tools.tcl:158 +#, tcl-format +msgid "Tool completed successfully: %s" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° %s Π·Π°Π²Π΅ΡΡΠΈΠ»Π°ΡΡ ΡΡΠΏΠ΅ΡΠ½ΠΎ." + +#: lib/tools.tcl:160 +#, tcl-format +msgid "Tool failed: %s" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ: %s" + +#: lib/mergetool.tcl:8 +msgid "Force resolution to the base version?" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" + +#: lib/mergetool.tcl:9 +msgid "Force resolution to this branch?" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²Π΅ΡΡΠΈΡ ΠΈΠ· ΡΡΠΎΠΉ Π²Π΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" + +#: lib/mergetool.tcl:10 +msgid "Force resolution to the other branch?" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²Π΅ΡΡΠΈΡ ΠΈΠ· Π΄ΡΡΠ³ΠΎΠΉ Π²Π΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" + +#: lib/mergetool.tcl:14 +#, tcl-format +msgid "" +"Note that the diff shows only conflicting changes.\n" +"\n" +"%s will be overwritten.\n" +"\n" +"This operation can be undone only by restarting the merge." +msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅! Π‘ΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°Π΅Ρ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠ΅ ΠΎΡΠ»ΠΈΡΠΈΡ.\n\n%s Π±ΡΠ΄Π΅Ρ ΠΏΠ΅ΡΠ΅ΠΏΠΈΡΠ°Π½.\n\nΠΡΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΡΡΠΊΠΎΠΌ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ." + +#: lib/mergetool.tcl:45 +#, tcl-format +msgid "File %s seems to have unresolved conflicts, still stage?" +msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ. ΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°ΡΠΈΡ?" + +#: lib/mergetool.tcl:60 +#, tcl-format +msgid "Adding resolution for %s" +msgstr "ΠΠΎΠ±Π°Π²Π»ΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ %s" + +#: lib/mergetool.tcl:141 +msgid "Cannot resolve deletion or link conflicts using a tool" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Π΅Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ΠΌ ΠΈΠ»ΠΈ ΡΡΠ°ΡΡΠΈΠ΅ΠΌ ΡΡΡΠ»ΠΎΠΊ" + +#: lib/mergetool.tcl:146 +msgid "Conflict file does not exist" +msgstr "ΠΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" + +#: lib/mergetool.tcl:246 +#, tcl-format +msgid "Not a GUI merge tool: '%s'" +msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ ΡΠ»ΠΈΡΠ½ΠΈΡ" + +#: lib/mergetool.tcl:275 +#, tcl-format +msgid "Unsupported merge tool '%s'" +msgstr "ΠΠ΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Β«%sΒ»" + +#: lib/mergetool.tcl:310 +msgid "Merge tool is already running, terminate it?" +msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ ΡΠΆΠ΅ ΡΠ°Π±ΠΎΡΠ°Π΅Ρ. ΠΡΠ΅ΡΠ²Π°ΡΡ?" + +#: lib/mergetool.tcl:330 +#, tcl-format +msgid "" +"Error retrieving versions:\n" +"%s" +msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ Π²Π΅ΡΡΠΈΠΉ:\n%s" + +#: lib/mergetool.tcl:350 +#, tcl-format +msgid "" +"Could not start the merge tool:\n" +"\n" +"%s" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°ΠΏΡΡΠΊΠ° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ:\n\n%s" + +#: lib/mergetool.tcl:354 +msgid "Running merge tool..." +msgstr "ΠΠ°ΠΏΡΡΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦" + +#: lib/mergetool.tcl:382 lib/mergetool.tcl:390 +msgid "Merge tool failed." +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." + +#: lib/tools_dlg.tcl:22 +#, tcl-format +msgid "%s (%s): Add Tool" +msgstr "%s (%s): ΠΠΎΠ±Π°Π²ΠΈΡΡ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½Ρ" + +#: lib/tools_dlg.tcl:28 +msgid "Add New Tool Command" +msgstr "ΠΠΎΠ²Π°Ρ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ" + +#: lib/tools_dlg.tcl:34 +msgid "Add globally" +msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π΄Π»Ρ Π²ΡΠ΅Ρ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" + +#: lib/tools_dlg.tcl:46 +msgid "Tool Details" +msgstr "ΠΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ" + +#: lib/tools_dlg.tcl:49 +msgid "Use '/' separators to create a submenu tree:" +msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«/Β» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠ΅Π½Ρ" + +#: lib/tools_dlg.tcl:60 +msgid "Command:" +msgstr "ΠΠΎΠΌΠ°Π½Π΄Π°:" + +#: lib/tools_dlg.tcl:71 +msgid "Show a dialog before running" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π΄ΠΈΠ°Π»ΠΎΠ³ ΠΏΠ΅ΡΠ΅Π΄ Π·Π°ΠΏΡΡΠΊΠΎΠΌ" + +#: lib/tools_dlg.tcl:77 +msgid "Ask the user to select a revision (sets $REVISION)" +msgstr "ΠΠ°ΠΏΡΠΎΡ Π½Π° Π²ΡΠ±ΠΎΡ Π²Π΅ΡΡΠΈΠΈ (ΡΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅Ρ $REVISION)" + +#: lib/tools_dlg.tcl:82 +msgid "Ask the user for additional arguments (sets $ARGS)" +msgstr "ΠΠ°ΠΏΡΠΎΡ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΡΡ
Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠ² (ΡΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅Ρ $ARGS)" + +#: lib/tools_dlg.tcl:89 +msgid "Don't show the command output window" +msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΎΠΊΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄Π° ΠΊΠΎΠΌΠ°Π½Π΄Ρ" + +#: lib/tools_dlg.tcl:94 +msgid "Run only if a diff is selected ($FILENAME not empty)" +msgstr "ΠΠ°ΠΏΡΡΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π΅ΡΠ»ΠΈ ΠΏΠΎΠΊΠ°Π·Π°Π½ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ($FILENAME Π½Π΅ ΠΏΡΡΡΠΎ)" + +#: lib/tools_dlg.tcl:118 +msgid "Please supply a name for the tool." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ." + +#: lib/tools_dlg.tcl:126 +#, tcl-format +msgid "Tool '%s' already exists." +msgstr "ΠΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." + +#: lib/tools_dlg.tcl:148 +#, tcl-format +msgid "" +"Could not add tool:\n" +"%s" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ:\n%s" + +#: lib/tools_dlg.tcl:187 +#, tcl-format +msgid "%s (%s): Remove Tool" +msgstr "%s (%s): Π£Π΄Π°Π»ΠΈΡΡ ΠΈΠ½ΡΡΡΡΠΌΠ΅Π½Ρ" + +#: lib/tools_dlg.tcl:193 +msgid "Remove Tool Commands" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ" + +#: lib/tools_dlg.tcl:198 +msgid "Remove" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ" + +#: lib/tools_dlg.tcl:231 +msgid "(Blue denotes repository-local tools)" +msgstr "(Π‘ΠΈΠ½ΠΈΠΌ Π²ΡΠ΄Π΅Π»Π΅Π½Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ)" + +#: lib/tools_dlg.tcl:283 +#, tcl-format +msgid "%s (%s):" +msgstr "%s (%s):" + +#: lib/tools_dlg.tcl:292 +#, tcl-format +msgid "Run Command: %s" +msgstr "ΠΠ°ΠΏΡΡΠΊ ΠΊΠΎΠΌΠ°Π½Π΄Ρ: %s" + +#: lib/tools_dlg.tcl:306 +msgid "Arguments" +msgstr "ΠΡΠ³ΡΠΌΠ΅Π½ΡΡ" + +#: lib/tools_dlg.tcl:341 +msgid "OK" +msgstr "OK" + +#: lib/search.tcl:48 +msgid "Find:" +msgstr "ΠΠΎΠΈΡΠΊ:" + +#: lib/search.tcl:50 +msgid "Next" +msgstr "ΠΠ°Π»ΡΡΠ΅" + +#: lib/search.tcl:51 +msgid "Prev" +msgstr "ΠΠ±ΡΠ°ΡΠ½ΠΎ" + +#: lib/search.tcl:52 +msgid "RegExp" +msgstr "Π Π΅Π³ΡΠ»ΡΡΠ½ΡΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΡ" + +#: lib/search.tcl:54 +msgid "Case" +msgstr "Π£ΡΡΡ ΡΠ΅Π³ΠΈΡΡΡΠ°" + +#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75 +#, tcl-format +msgid "%s (%s): Create Desktop Icon" +msgstr "%s (%s): Π‘ΠΎΠ·Π΄Π°ΡΡ ΡΡΠ»ΡΠΊ Π½Π° ΡΠ°Π±ΠΎΡΠ΅ΠΌ ΡΡΠΎΠ»Π΅" + +#: lib/shortcut.tcl:24 lib/shortcut.tcl:65 +msgid "Cannot write shortcut:" +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ:" + +#: lib/shortcut.tcl:140 +msgid "Cannot write icon:" +msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π·Π½Π°ΡΠΎΠΊ:" + +#: lib/remote_branch_delete.tcl:29 +#, tcl-format +msgid "%s (%s): Delete Branch Remotely" +msgstr "%s (%s): Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π½Π΅ΡΠ½Π΅ΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/remote_branch_delete.tcl:34 +msgid "Delete Branch Remotely" +msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" + +#: lib/remote_branch_delete.tcl:48 +msgid "From Repository" +msgstr "ΠΠ· ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" + +#: lib/remote_branch_delete.tcl:88 +msgid "Branches" +msgstr "ΠΠ΅ΡΠΊΠΈ" + +#: lib/remote_branch_delete.tcl:110 +msgid "Delete Only If" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ»ΡΡΠ°Π΅, Π΅ΡΠ»ΠΈ" + +#: lib/remote_branch_delete.tcl:112 +msgid "Merged Into:" +msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Ρ:" + +#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53 +msgid "Always (Do not perform merge checks)" +msgstr "ΠΡΠ΅Π³Π΄Π° (Π½Π΅ Π²ΡΠΏΠΎΠ»Π½ΡΡΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΡ Π½Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅)" + +#: lib/remote_branch_delete.tcl:153 +msgid "A branch is required for 'Merged Into'." +msgstr "ΠΠ»Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ Β«Π‘Π»ΠΈΡΠ½ΠΈΠ΅ ΡΒ» ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΠΊΡ." + +#: lib/remote_branch_delete.tcl:185 +#, tcl-format +msgid "" +"The following branches are not completely merged into %s:\n" +"\n" +" - %s" +msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ Π²Π΅ΡΠΊΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½Ρ Ρ %s ΠΏΡΠΈ ΠΏΠΎΠΌΠΎΡΠΈ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ:\n\n - %s" + +#: lib/remote_branch_delete.tcl:190 +#, tcl-format +msgid "" +"One or more of the merge tests failed because you have not fetched the " +"necessary commits. Try fetching from %s first." +msgstr "ΠΠ΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΠ΅ΡΡΡ Π½Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ ΠΏΡΠΎΡΠ»ΠΈ, ΠΏΠΎΡΠΎΠΌΡ ΡΡΠΎ Π²Ρ Π½Π΅ ΠΈΠ·Π²Π»Π΅ΠΊΠ»ΠΈ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ. ΠΠΎΠΏΡΡΠ°ΠΉΡΠ΅ΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΈΡ
ΠΈΠ· %s." + +#: lib/remote_branch_delete.tcl:208 +msgid "Please select one or more branches to delete." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΎΠ΄Π½Ρ ΠΈΠ»ΠΈ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ Π΄Π»Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ." + +#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115 +msgid "" +"Recovering deleted branches is difficult.\n" +"\n" +"Delete the selected branches?" +msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ ΡΠ΄Π°Π»Π΅Π½Π½ΡΠ΅ Π²Π΅ΡΠΊΠΈ ΡΠ»ΠΎΠΆΠ½ΠΎ.\n\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ?" + +#: lib/remote_branch_delete.tcl:227 +#, tcl-format +msgid "Deleting branches from %s" +msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΎΠΊ ΠΈΠ· %s" + +#: lib/remote_branch_delete.tcl:300 +msgid "No repository selected." +msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ." + +#: lib/remote_branch_delete.tcl:305 +#, tcl-format +msgid "Scanning %s..." +msgstr "ΠΠ΅ΡΠ΅ΡΠΈΡΡΠ²Π°Π½ΠΈΠ΅ %sβ¦" + +#: lib/choose_repository.tcl:45 msgid "Git Gui" msgstr "Git Gui" -#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386 +#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427 msgid "Create New Repository" msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:93 +#: lib/choose_repository.tcl:110 msgid "New..." msgstr "ΠΠΎΠ²ΡΠΉβ¦" -#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471 +#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511 msgid "Clone Existing Repository" msgstr "Π‘ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:106 +#: lib/choose_repository.tcl:128 msgid "Clone..." msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡβ¦" -#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016 +#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105 msgid "Open Existing Repository" msgstr "ΠΡΠ±ΡΠ°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:119 +#: lib/choose_repository.tcl:141 msgid "Open..." msgstr "ΠΡΠΊΡΡΡΡβ¦" -#: lib/choose_repository.tcl:132 +#: lib/choose_repository.tcl:154 msgid "Recent Repositories" msgstr "ΠΠ΅Π΄Π°Π²Π½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" -#: lib/choose_repository.tcl:138 +#: lib/choose_repository.tcl:164 msgid "Open Recent Repository:" msgstr "ΠΡΠΊΡΡΡΡ ΠΏΠΎΡΠ»Π΅Π΄Π½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313 -#: lib/choose_repository.tcl:320 +#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338 +#: lib/choose_repository.tcl:345 #, tcl-format msgid "Failed to create repository %s:" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΎΠ·Π΄Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ %s:" -#: lib/choose_repository.tcl:391 +#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33 +msgid "Create" +msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ" + +#: lib/choose_repository.tcl:432 msgid "Directory:" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³:" -#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550 -#: lib/choose_repository.tcl:1052 +#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588 +#: lib/choose_repository.tcl:1139 msgid "Git Repository" msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:448 +#: lib/choose_repository.tcl:487 #, tcl-format msgid "Directory %s already exists." msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ '%s' ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." -#: lib/choose_repository.tcl:452 +#: lib/choose_repository.tcl:491 #, tcl-format msgid "File %s already exists." msgstr "Π€Π°ΠΉΠ» '%s' ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." -#: lib/choose_repository.tcl:466 +#: lib/choose_repository.tcl:506 msgid "Clone" msgstr "Π‘ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ" -#: lib/choose_repository.tcl:479 +#: lib/choose_repository.tcl:519 msgid "Source Location:" msgstr "ΠΡΡ
ΠΎΠ΄Π½ΠΎΠ΅ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:" -#: lib/choose_repository.tcl:490 +#: lib/choose_repository.tcl:528 msgid "Target Directory:" msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ:" -#: lib/choose_repository.tcl:502 +#: lib/choose_repository.tcl:538 msgid "Clone Type:" msgstr "Π’ΠΈΠΏ ΠΊΠ»ΠΎΠ½Π°:" -#: lib/choose_repository.tcl:508 +#: lib/choose_repository.tcl:543 msgid "Standard (Fast, Semi-Redundant, Hardlinks)" msgstr "Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ (ΠΡΡΡΡΡΠΉ, ΠΏΠΎΠ»ΡΠΈΠ·Π±ΡΡΠΎΡΠ½ΡΠΉ, Β«ΠΆΠ΅ΡΡΠΊΠΈΠ΅Β» ΡΡΡΠ»ΠΊΠΈ)" -#: lib/choose_repository.tcl:514 +#: lib/choose_repository.tcl:548 msgid "Full Copy (Slower, Redundant Backup)" msgstr "ΠΠΎΠ»Π½Π°Ρ ΠΊΠΎΠΏΠΈΡ (ΠΠ΅Π΄Π»Π΅Π½Π½ΡΠΉ, ΡΠΎΠ·Π΄Π°Π΅Ρ ΡΠ΅Π·Π΅ΡΠ²Π½ΡΡ ΠΊΠΎΠΏΠΈΡ)" -#: lib/choose_repository.tcl:520 +#: lib/choose_repository.tcl:553 msgid "Shared (Fastest, Not Recommended, No Backup)" msgstr "ΠΠ±ΡΠΈΠΉ (Π‘Π°ΠΌΡΠΉ Π±ΡΡΡΡΡΠΉ, Π½Π΅ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΡΡΡ, Π±Π΅Π· ΡΠ΅Π·Π΅ΡΠ²Π½ΠΎΠΉ ΠΊΠΎΠΏΠΈΠΈ)" -#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603 -#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819 -#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066 +#: lib/choose_repository.tcl:560 +msgid "Recursively clone submodules too" +msgstr "Π’Π°ΠΊΠΆΠ΅ ΡΠ΅ΠΊΡΡΡΠΈΠ²Π½ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ" + +#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864 +#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153 #, tcl-format msgid "Not a Git repository: %s" -msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ: %s" +msgstr "ΠΠ°ΡΠ°Π»ΠΎΠ³ Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅ΠΌ Git: %s" -#: lib/choose_repository.tcl:592 +#: lib/choose_repository.tcl:630 msgid "Standard only available for local repository." msgstr "Π‘ΡΠ°Π½Π΄Π°ΡΡΠ½ΡΠΉ ΠΊΠ»ΠΎΠ½ Π²ΠΎΠ·ΠΌΠΎΠΆΠ΅Π½ ΡΠΎΠ»ΡΠΊΠΎ Π΄Π»Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." -#: lib/choose_repository.tcl:596 +#: lib/choose_repository.tcl:634 msgid "Shared only available for local repository." msgstr "ΠΠ±ΡΠΈΠΉ ΠΊΠ»ΠΎΠ½ Π²ΠΎΠ·ΠΌΠΎΠΆΠ΅Π½ ΡΠΎΠ»ΡΠΊΠΎ Π΄Π»Ρ Π»ΠΎΠΊΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." -#: lib/choose_repository.tcl:617 +#: lib/choose_repository.tcl:655 #, tcl-format msgid "Location %s already exists." -msgstr "ΠΡΡΡ '%s' ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." +msgstr "ΠΡΡΡ %s ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." -#: lib/choose_repository.tcl:628 +#: lib/choose_repository.tcl:666 msgid "Failed to configure origin" -msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΡΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠΈΡΠΎΠ²Π°ΡΡ ΠΈΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" -#: lib/choose_repository.tcl:640 +#: lib/choose_repository.tcl:678 msgid "Counting objects" -msgstr "Π‘ΡΠΈΡΠ°Ρ ΠΎΠ±ΡΠ΅ΠΊΡΡ" +msgstr "ΠΠΎΠ΄ΡΡΡΡ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: lib/choose_repository.tcl:641 +#: lib/choose_repository.tcl:679 msgid "buckets" msgstr "Π±Π»ΠΎΠΊΠΈ" -#: lib/choose_repository.tcl:665 +#: lib/choose_repository.tcl:703 #, tcl-format msgid "Unable to copy objects/info/alternates: %s" -msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ objects/info/alternates: %s" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ objects/info/alternates: %s" -#: lib/choose_repository.tcl:701 +#: lib/choose_repository.tcl:740 #, tcl-format msgid "Nothing to clone from %s." msgstr "ΠΠ΅ΡΠ΅Π³ΠΎ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ Ρ %s." -#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917 -#: lib/choose_repository.tcl:929 +#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962 +#: lib/choose_repository.tcl:974 msgid "The 'master' branch has not been initialized." -msgstr "ΠΠ΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½Π° Π²Π΅ΡΠ²Ρ Β«masterΒ»." +msgstr "ΠΠ΅ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°Π½Π° Π²Π΅ΡΠΊΠ° Β«masterΒ»." -#: lib/choose_repository.tcl:716 +#: lib/choose_repository.tcl:755 msgid "Hardlinks are unavailable. Falling back to copying." -msgstr "Β«ΠΠ΅ΡΡΠΊΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈΒ» Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½Ρ. ΠΡΠ΄Π΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΎ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅." +msgstr "ΠΠ΅ΡΡΠΊΠΈΠ΅ ΡΡΡΠ»ΠΊΠΈ Π½Π΅Π΄ΠΎΡΡΡΠΏΠ½Ρ. ΠΡΠ΄Π΅Ρ ΠΈΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°Π½ΠΎ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅." -#: lib/choose_repository.tcl:728 +#: lib/choose_repository.tcl:769 #, tcl-format msgid "Cloning from %s" -msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ %s" +msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΈΠ· %s" -#: lib/choose_repository.tcl:759 +#: lib/choose_repository.tcl:800 msgid "Copying objects" -msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ objects" +msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: lib/choose_repository.tcl:760 +#: lib/choose_repository.tcl:801 msgid "KiB" msgstr "ΠΠ" -#: lib/choose_repository.tcl:784 +#: lib/choose_repository.tcl:825 #, tcl-format msgid "Unable to copy object: %s" msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΡΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ ΠΎΠ±ΡΠ΅ΠΊΡ: %s" -#: lib/choose_repository.tcl:794 +#: lib/choose_repository.tcl:837 msgid "Linking objects" msgstr "Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ ΡΡΡΠ»ΠΎΠΊ Π½Π° objects" -#: lib/choose_repository.tcl:795 +#: lib/choose_repository.tcl:838 msgid "objects" msgstr "ΠΎΠ±ΡΠ΅ΠΊΡΡ" -#: lib/choose_repository.tcl:803 +#: lib/choose_repository.tcl:846 #, tcl-format msgid "Unable to hardlink object: %s" msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΡΠΎΠ·Π΄Π°ΡΡ Β«ΠΆΠ΅ΡΡΠΊΡΡ ΡΡΡΠ»ΠΊΡΒ» Π½Π° ΠΎΠ±ΡΠ΅ΠΊΡ: %s" -#: lib/choose_repository.tcl:858 +#: lib/choose_repository.tcl:903 msgid "Cannot fetch branches and objects. See console output for details." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ Π²Π΅ΡΠΊΠΈ ΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΡ. ΠΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π½Π° ΠΊΠΎΠ½ΡΠΎΠ»ΠΈ." -#: lib/choose_repository.tcl:869 +#: lib/choose_repository.tcl:914 msgid "Cannot fetch tags. See console output for details." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΌΠ΅ΡΠΊΠΈ. ΠΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π½Π° ΠΊΠΎΠ½ΡΠΎΠ»ΠΈ." -#: lib/choose_repository.tcl:893 +#: lib/choose_repository.tcl:938 msgid "Cannot determine HEAD. See console output for details." msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΎΠΏΡΠ΅Π΄Π΅Π»ΠΈΡΡ HEAD. ΠΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½Π°Ρ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ Π½Π° ΠΊΠΎΠ½ΡΠΎΠ»ΠΈ." -#: lib/choose_repository.tcl:902 +#: lib/choose_repository.tcl:947 #, tcl-format msgid "Unable to cleanup %s" msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΎΡΠΈΡΡΠΈΡΡ %s" -#: lib/choose_repository.tcl:908 +#: lib/choose_repository.tcl:953 msgid "Clone failed." msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ." -#: lib/choose_repository.tcl:915 +#: lib/choose_repository.tcl:960 msgid "No default branch obtained." msgstr "ΠΠ΅ΡΠΊΠ° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ Π½Π΅ Π±ΡΠ»Π° ΠΏΠΎΠ»ΡΡΠ΅Π½Π°." -#: lib/choose_repository.tcl:926 +#: lib/choose_repository.tcl:971 #, tcl-format msgid "Cannot resolve %s as a commit." msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΡΠ°ΡΠΏΠΎΠ·Π½Π°ΡΡ %s ΠΊΠ°ΠΊ ΠΊΠΎΠΌΠΌΠΈΡ." -#: lib/choose_repository.tcl:938 +#: lib/choose_repository.tcl:998 msgid "Creating working directory" msgstr "Π‘ΠΎΠ·Π΄Π°Ρ ΡΠ°Π±ΠΎΡΠΈΠΉ ΠΊΠ°ΡΠ°Π»ΠΎΠ³" -#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130 -#: lib/index.tcl:198 -msgid "files" -msgstr "ΡΠ°ΠΉΠ»ΠΎΠ²" - -#: lib/choose_repository.tcl:968 +#: lib/choose_repository.tcl:1028 msgid "Initial file checkout failed." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»ΡΡΠΈΡΡ Π½Π°ΡΠ°Π»ΡΠ½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°ΠΉΠ»ΠΎΠ² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." -#: lib/choose_repository.tcl:1011 -msgid "Open" -msgstr "ΠΡΠΊΡΡΡΡ" +#: lib/choose_repository.tcl:1072 +msgid "Cloning submodules" +msgstr "ΠΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»Π΅ΠΉ" -#: lib/choose_repository.tcl:1021 +#: lib/choose_repository.tcl:1087 +msgid "Cannot clone submodules." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΊΠ»ΠΎΠ½ΠΈΡΠΎΠ²Π°ΡΡ ΠΏΠΎΠ΄ΠΌΠΎΠ΄ΡΠ»ΠΈ." + +#: lib/choose_repository.tcl:1110 msgid "Repository:" msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ:" -#: lib/choose_repository.tcl:1072 +#: lib/choose_repository.tcl:1159 #, tcl-format msgid "Failed to open repository %s:" msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΊΡΡΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ %s:" -#: lib/choose_rev.tcl:53 +#: lib/about.tcl:26 +msgid "git-gui - a graphical user interface for Git." +msgstr "git-gui - Π³ΡΠ°ΡΠΈΡΠ΅ΡΠΊΠΈΠΉ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»ΡΡΠΊΠΈΠΉ ΠΈΠ½ΡΠ΅ΡΡΠ΅ΠΉΡ ΠΊ Git." + +#: lib/blame.tcl:74 +#, tcl-format +msgid "%s (%s): File Viewer" +msgstr "%s (%s): ΠΡΠΎΡΠΌΠΎΡΡ ΡΠ°ΠΉΠ»Π°" + +#: lib/blame.tcl:80 +msgid "Commit:" +msgstr "ΠΠΎΠΌΠΌΠΈΡ:" + +#: lib/blame.tcl:282 +msgid "Copy Commit" +msgstr "ΠΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ SHA-1" + +#: lib/blame.tcl:286 +msgid "Find Text..." +msgstr "ΠΠ°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡβ¦" + +#: lib/blame.tcl:290 +msgid "Goto Line..." +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΡΡΡΠΎΠΊΡβ¦" + +#: lib/blame.tcl:299 +msgid "Do Full Copy Detection" +msgstr "ΠΡΠΎΠ²Π΅ΡΡΠΈ ΠΏΠΎΠ»Π½ΡΠΉ ΠΏΠΎΠΈΡΠΊ ΠΊΠΎΠΏΠΈΠΉ" + +#: lib/blame.tcl:303 +msgid "Show History Context" +msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠΈΠΉ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡ" + +#: lib/blame.tcl:306 +msgid "Blame Parent Commit" +msgstr "ΠΠ²ΡΠΎΡΡ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ³ΠΎ ΠΊΠΎΠΌΠΌΠΈΡΠ°" + +#: lib/blame.tcl:468 +#, tcl-format +msgid "Reading %s..." +msgstr "Π§ΡΠ΅Π½ΠΈΠ΅ %sβ¦" + +#: lib/blame.tcl:596 +msgid "Loading copy/move tracking annotations..." +msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΈ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠΉ/ΠΏΠ΅ΡΠ΅ΠΈΠΌΠ΅Π½ΠΎΠ²Π°Π½ΠΈΠΉβ¦" + +#: lib/blame.tcl:613 +msgid "lines annotated" +msgstr "ΡΡΡΠΎΠΊ ΠΏΡΠΎΠΊΠΎΠΌΠΌΠ΅Π½ΡΠΈΡΠΎΠ²Π°Π½ΠΎ" + +#: lib/blame.tcl:815 +msgid "Loading original location annotations..." +msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΉ ΠΏΠ΅ΡΠ²ΠΎΠ½Π°ΡΠ°Π»ΡΠ½ΠΎΠ³ΠΎ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΡ ΠΎΠ±ΡΠ΅ΠΊΡΠ°β¦" + +#: lib/blame.tcl:818 +msgid "Annotation complete." +msgstr "ΠΠ½Π½ΠΎΡΠ°ΡΠΈΡ Π·Π°Π²Π΅ΡΡΠ΅Π½Π°." + +#: lib/blame.tcl:849 +msgid "Busy" +msgstr "ΠΠ°Π½ΡΡ" + +#: lib/blame.tcl:850 +msgid "Annotation process is already running." +msgstr "ΠΠ½Π½ΠΎΡΠ°ΡΠΈΡ ΡΠΆΠ΅ Π·Π°ΠΏΡΡΠ΅Π½Π°" + +#: lib/blame.tcl:889 +msgid "Running thorough copy detection..." +msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ ΠΏΠΎΠ»Π½ΠΎΠ³ΠΎ ΠΏΠΎΠΈΡΠΊΠ° ΠΊΠΎΠΏΠΈΠΉβ¦" + +#: lib/blame.tcl:957 +msgid "Loading annotation..." +msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° Π°Π½Π½ΠΎΡΠ°ΡΠΈΠΈβ¦" + +#: lib/blame.tcl:1010 +msgid "Author:" +msgstr "ΠΠ²ΡΠΎΡ:" + +#: lib/blame.tcl:1014 +msgid "Committer:" +msgstr "ΠΠΎΠΌΠΌΠΈΡΠ΅Ρ:" + +#: lib/blame.tcl:1019 +msgid "Original File:" +msgstr "ΠΡΡ
ΠΎΠ΄Π½ΡΠΉ ΡΠ°ΠΉΠ»:" + +#: lib/blame.tcl:1067 +msgid "Cannot find HEAD commit:" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:" + +#: lib/blame.tcl:1122 +msgid "Cannot find parent commit:" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π½Π°ΠΉΡΠΈ ΡΠΎΠ΄ΠΈΡΠ΅Π»ΡΡΠΊΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅:" + +#: lib/blame.tcl:1137 +msgid "Unable to display parent" +msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ ΠΏΡΠ΅Π΄ΠΊΠ°" + +#: lib/blame.tcl:1138 lib/diff.tcl:345 +msgid "Error loading diff:" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°Π³ΡΡΠ·ΠΊΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ:" + +#: lib/blame.tcl:1279 +msgid "Originally By:" +msgstr "ΠΡΡΠΎΡΠ½ΠΈΠΊ:" + +#: lib/blame.tcl:1285 +msgid "In File:" +msgstr "Π€Π°ΠΉΠ»:" + +#: lib/blame.tcl:1290 +msgid "Copied Or Moved Here By:" +msgstr "Π‘ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΎ/ΠΏΠ΅ΡΠ΅ΠΌΠ΅ΡΠ΅Π½ΠΎ Π²:" + +#: lib/diff.tcl:77 +#, tcl-format +msgid "" +"No differences detected.\n" +"\n" +"%s has no changes.\n" +"\n" +"The modification date of this file was updated by another application, but the content within the file was not changed.\n" +"\n" +"A rescan will be automatically started to find other files which may have the same state." +msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π΅ ΠΎΠ±Π½Π°ΡΡΠΆΠ΅Π½ΠΎ.\n\nΠ² %s ΠΎΡΡΡΡΡΡΠ²ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ.\n\nΠΠ°ΡΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° Π±ΡΠ»Π° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° Π΄ΡΡΠ³ΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ, Π½ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π° ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠ΅ΠΆΠ½ΠΈΠΌ.\n\nΠ‘Π΅ΠΉΡΠ°Ρ Π±ΡΠ΄Π΅Ρ Π·Π°ΠΏΡΡΠ΅Π½ΠΎ ΠΏΠ΅ΡΠ΅ΡΠΈΡΡΠ²Π°Π½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ, ΡΡΠΎΠ±Ρ Π½Π°ΠΉΡΠΈ ΠΏΠΎΠ΄ΠΎΠ±Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ." + +#: lib/diff.tcl:117 +#, tcl-format +msgid "Loading diff of %s..." +msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %sβ¦" + +#: lib/diff.tcl:143 +msgid "" +"LOCAL: deleted\n" +"REMOTE:\n" +msgstr "ΠΠΠΠΠΠ¬ΠΠ: ΡΠ΄Π°Π»ΡΠ½\nΠΠΠΠ¨ΠΠΠ:\n" + +#: lib/diff.tcl:148 +msgid "" +"REMOTE: deleted\n" +"LOCAL:\n" +msgstr "ΠΠΠΠ¨ΠΠΠ: ΡΠ΄Π°Π»ΡΠ½\nΠΠΠΠΠΠ¬ΠΠ:\n" + +#: lib/diff.tcl:155 +msgid "LOCAL:\n" +msgstr "ΠΠΠΠΠΠ¬ΠΠ:\n" + +#: lib/diff.tcl:158 +msgid "REMOTE:\n" +msgstr "ΠΠΠΠ¨ΠΠΠ:\n" + +#: lib/diff.tcl:220 lib/diff.tcl:344 +#, tcl-format +msgid "Unable to display %s" +msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ %s" + +#: lib/diff.tcl:221 +msgid "Error loading file:" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°Π³ΡΡΠ·ΠΊΠΈ ΡΠ°ΠΉΠ»Π°:" + +#: lib/diff.tcl:227 +msgid "Git Repository (subproject)" +msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git (ΠΏΠΎΠ΄ΠΏΡΠΎΠ΅ΠΊΡ)" + +#: lib/diff.tcl:239 +msgid "* Binary file (not showing content)." +msgstr "* ΠΠ²ΠΎΠΈΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» (ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π½Π΅ ΠΏΠΎΠΊΠ°Π·Π°Π½ΠΎ)" + +#: lib/diff.tcl:244 +#, tcl-format +msgid "" +"* Untracked file is %d bytes.\n" +"* Showing only first %d bytes.\n" +msgstr "* Π Π°Π·ΠΌΠ΅Ρ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %d Π±Π°ΠΉΡ.\n* ΠΠΎΠΊΠ°Π·Π°Π½ΠΎ ΠΏΠ΅ΡΠ²ΡΡ
%d Π±Π°ΠΉΡ.\n" + +#: lib/diff.tcl:250 +#, tcl-format +msgid "" +"\n" +"* Untracked file clipped here by %s.\n" +"* To see the entire file, use an external editor.\n" +msgstr "\n* ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠΉ ΡΠ°ΠΉΠ» ΠΎΠ±ΡΠ΅Π·Π°Π½: %s.\n* Π§ΡΠΎΠ±Ρ ΡΠ²ΠΈΠ΄Π΅ΡΡ Π²Π΅ΡΡ ΡΠ°ΠΉΠ», ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅Π΄Π°ΠΊΡΠΎΡ.\n" + +#: lib/diff.tcl:583 +msgid "Failed to unstage selected hunk." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΊΠ»ΡΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΠ°ΡΡΡ." + +#: lib/diff.tcl:591 +msgid "Failed to revert selected hunk." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠ³ΠΎ Π±Π»ΠΎΠΊΠ°." + +#: lib/diff.tcl:594 +msgid "Failed to stage selected hunk." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΠΉ Π±Π»ΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." + +#: lib/diff.tcl:687 +msgid "Failed to unstage selected line." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΊΠ»ΡΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΡΡΠΎΠΊΡ." + +#: lib/diff.tcl:696 +msgid "Failed to revert selected line." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π²ΡΠ±ΡΠ°Π½ΠΎΠΉ ΡΡΡΠΎΠΊΠΈ." + +#: lib/diff.tcl:700 +msgid "Failed to stage selected line." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΡΡΠΎΠΊΡ." + +#: lib/diff.tcl:889 +msgid "Failed to undo last revert." +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΠΏΠΎΡΠ»Π΅Π½Π΄Π½Π΅Π΅ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." + +#: lib/sshkey.tcl:34 +msgid "No keys found." +msgstr "ΠΠ»ΡΡ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½" + +#: lib/sshkey.tcl:37 +#, tcl-format +msgid "Found a public key in: %s" +msgstr "ΠΡΠ±Π»ΠΈΡΠ½ΡΠΉ ΠΊΠ»ΡΡ ΠΈΠ· %s" + +#: lib/sshkey.tcl:43 +msgid "Generate Key" +msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΠΊΠ»ΡΡ" + +#: lib/sshkey.tcl:61 +msgid "Copy To Clipboard" +msgstr "Π‘ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π² Π±ΡΡΠ΅Ρ ΠΎΠ±ΠΌΠ΅Π½Π°" + +#: lib/sshkey.tcl:75 +msgid "Your OpenSSH Public Key" +msgstr "ΠΠ°Ρ ΠΏΡΠ±Π»ΠΈΡΠ½ΡΠΉ ΠΊΠ»ΡΡ OpenSSH" + +#: lib/sshkey.tcl:83 +msgid "Generating..." +msgstr "Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅β¦" + +#: lib/sshkey.tcl:89 +#, tcl-format +msgid "" +"Could not start ssh-keygen:\n" +"\n" +"%s" +msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°ΠΏΡΡΠΊΠ° ssh-keygen:\n\n%s" + +#: lib/sshkey.tcl:116 +msgid "Generation failed." +msgstr "ΠΠ»ΡΡ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½." + +#: lib/sshkey.tcl:123 +msgid "Generation succeeded, but no keys found." +msgstr "Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ ΠΊΠ»ΡΡΠ° Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΎΡΡ, Π½ΠΎ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ Π½Π΅ Π±ΡΠ» Π½Π°ΠΉΠ΄Π΅Π½" + +#: lib/sshkey.tcl:126 +#, tcl-format +msgid "Your key is in: %s" +msgstr "ΠΠ°Ρ ΠΊΠ»ΡΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π²: %s" + +#: lib/branch_create.tcl:23 +#, tcl-format +msgid "%s (%s): Create Branch" +msgstr "%s (%s): Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" + +#: lib/branch_create.tcl:28 +msgid "Create New Branch" +msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ" + +#: lib/branch_create.tcl:42 +msgid "Branch Name" +msgstr "ΠΠΌΡ Π²Π΅ΡΠΊΠΈ" + +#: lib/branch_create.tcl:57 +msgid "Match Tracking Branch Name" +msgstr "Π‘ΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΠΎΠ²Π°ΡΡ ΠΈΠΌΠ΅Π½ΠΈ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" + +#: lib/branch_create.tcl:66 +msgid "Starting Revision" +msgstr "ΠΠ°ΡΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΡΠΈΡ" + +#: lib/branch_create.tcl:72 +msgid "Update Existing Branch:" +msgstr "ΠΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠΌΠ΅ΡΡΡΡΡΡ Π²Π΅ΡΠΊΡ:" + +#: lib/branch_create.tcl:75 +msgid "No" +msgstr "ΠΠ΅Ρ" + +#: lib/branch_create.tcl:80 +msgid "Fast Forward Only" +msgstr "Π’ΠΎΠ»ΡΠΊΠΎ Fast Forward" + +#: lib/branch_create.tcl:97 +msgid "Checkout After Creation" +msgstr "ΠΠΎΡΠ»Π΅ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΡΠ΄Π΅Π»Π°ΡΡ ΡΠ΅ΠΊΡΡΠ΅ΠΉ" + +#: lib/branch_create.tcl:132 +msgid "Please select a tracking branch." +msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΎΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ Π²Π΅ΡΠΊΡ." + +#: lib/branch_create.tcl:141 +#, tcl-format +msgid "Tracking branch %s is not a branch in the remote repository." +msgstr "ΠΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ° %s Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π²Π΅ΡΠΊΠΎΠΉ Π½Π° Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ." + +#: lib/console.tcl:59 +msgid "Working... please wait..." +msgstr "Π ΠΏΡΠΎΡΠ΅ΡΡΠ΅β¦ ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΠΆΠ΄ΠΈΡΠ΅β¦" + +#: lib/console.tcl:186 +msgid "Success" +msgstr "ΠΡΠΎΡΠ΅ΡΡ ΡΡΠΏΠ΅ΡΠ½ΠΎ Π·Π°Π²Π΅ΡΡΠ΅Π½" + +#: lib/console.tcl:200 +msgid "Error: Command Failed" +msgstr "ΠΡΠΈΠ±ΠΊΠ°: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ" + +#: lib/line.tcl:17 +msgid "Goto Line:" +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ Π½Π° ΡΡΡΠΎΠΊΡ:" + +#: lib/line.tcl:23 +msgid "Go" +msgstr "ΠΠ΅ΡΠ΅ΠΉΡΠΈ" + +#: lib/choose_rev.tcl:52 msgid "This Detached Checkout" msgstr "Π’Π΅ΠΊΡΡΠ΅Π΅ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅" @@ -1232,36 +2254,36 @@ msgstr "Π’Π΅ΠΊΡΡΠ΅Π΅ ΠΎΡΡΠΎΠ΅Π΄ΠΈΠ½Π΅Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅" msgid "Revision Expression:" msgstr "ΠΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ Π²Π΅ΡΡΠΈΠΈ:" -#: lib/choose_rev.tcl:74 +#: lib/choose_rev.tcl:72 msgid "Local Branch" msgstr "ΠΠΎΠΊΠ°Π»ΡΠ½Π°Ρ Π²Π΅ΡΠΊΠ°:" -#: lib/choose_rev.tcl:79 +#: lib/choose_rev.tcl:77 msgid "Tracking Branch" msgstr "ΠΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ Π²Π΅ΡΠΊΠ°" -#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538 +#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544 msgid "Tag" msgstr "ΠΠ΅ΡΠΊΠ°" -#: lib/choose_rev.tcl:317 +#: lib/choose_rev.tcl:321 #, tcl-format msgid "Invalid revision: %s" msgstr "ΠΠ΅Π²Π΅ΡΠ½Π°Ρ Π²Π΅ΡΡΠΈΡ: %s" -#: lib/choose_rev.tcl:338 +#: lib/choose_rev.tcl:342 msgid "No revision selected." msgstr "ΠΠ΅ΡΡΠΈΡ Π½Π΅ ΡΠΊΠ°Π·Π°Π½Π°." -#: lib/choose_rev.tcl:346 +#: lib/choose_rev.tcl:350 msgid "Revision expression is empty." msgstr "ΠΡΡΡΠΎΠ΅ Π²ΡΡΠ°ΠΆΠ΅Π½ΠΈΠ΅ Π΄Π»Ρ ΠΎΠΏΡΠ΅Π΄Π΅Π»Π΅Π½ΠΈΡ Π²Π΅ΡΡΠΈΠΈ." -#: lib/choose_rev.tcl:531 +#: lib/choose_rev.tcl:537 msgid "Updated" msgstr "ΠΠ±Π½ΠΎΠ²Π»Π΅Π½ΠΎ" -#: lib/choose_rev.tcl:559 +#: lib/choose_rev.tcl:565 msgid "URL" msgstr "Π‘ΡΡΠ»ΠΊΠ°" @@ -1279,24 +2301,24 @@ msgid "" "You are currently in the middle of a merge that has not been fully completed. You cannot amend the prior commit unless you first abort the current merge activity.\n" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π²ΠΎ Π²ΡΠ΅ΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n\nΠ’Π΅ΠΊΡΡΠ΅Π΅ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ. ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΈΡΠΏΡΠ°Π²ΠΈΡΡ ΠΏΡΠ΅Π΄ΡΠ΄ΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ, Π½Π΅ ΠΏΡΠ΅ΡΡΠ²Π°Ρ ΡΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ.\n" -#: lib/commit.tcl:48 +#: lib/commit.tcl:56 msgid "Error loading commit data for amend:" msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΈ Π·Π°Π³ΡΡΠ·ΠΊΠ΅ Π΄Π°Π½Π½ΡΡ
Π΄Π»Ρ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°:" -#: lib/commit.tcl:75 +#: lib/commit.tcl:83 msgid "Unable to obtain your identity:" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΠΎΠ»ΡΡΠΈΡΡ ΠΈΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎΠ± Π°Π²ΡΠΎΡΡΡΠ²Π΅:" -#: lib/commit.tcl:80 +#: lib/commit.tcl:88 msgid "Invalid GIT_COMMITTER_IDENT:" msgstr "ΠΠ΅Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΉ GIT_COMMITTER_IDENT:" -#: lib/commit.tcl:129 +#: lib/commit.tcl:138 #, tcl-format msgid "warning: Tcl does not support encoding '%s'." msgstr "ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅: Tcl Π½Π΅ ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅Ρ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΡ Β«%sΒ»." -#: lib/commit.tcl:149 +#: lib/commit.tcl:158 msgid "" "Last scanned state does not match repository state.\n" "\n" @@ -1305,7 +2327,7 @@ msgid "" "The rescan will be automatically started now.\n" msgstr "ΠΠΎΡΠ»Π΅Π΄Π½Π΅Π΅ ΠΏΡΠΎΡΠΈΡΠ°Π½Π½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π½Π΅ ΡΠΎΠΎΡΠ²Π΅ΡΡΡΠ²ΡΠ΅Ρ ΡΠ΅ΠΊΡΡΠ΅ΠΌΡ.\n\nΠ‘ ΠΌΠΎΠΌΠ΅Π½ΡΠ° ΠΏΠΎΡΠ»Π΅Π΄Π½Π΅ΠΉ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π±ΡΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ Π΄ΡΡΠ³ΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ Git. ΠΠ΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎ ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ, ΠΏΡΠ΅ΠΆΠ΄Π΅ ΡΠ΅ΠΌ ΠΈΠ·ΠΌΠ΅Π½ΡΡΡ ΡΠ΅ΠΊΡΡΡΡ Π²Π΅ΡΠ²Ρ. \n\nΠΡΠΎ Π±ΡΠ΄Π΅Ρ ΡΠ΄Π΅Π»Π°Π½ΠΎ ΡΠ΅ΠΉΡΠ°Ρ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ.\n" -#: lib/commit.tcl:172 +#: lib/commit.tcl:182 #, tcl-format msgid "" "Unmerged files cannot be committed.\n" @@ -1313,7 +2335,7 @@ msgid "" "File %s has merge conflicts. You must resolve them and stage the file before committing.\n" msgstr "ΠΠ΅Π»ΡΠ·Ρ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Ρ Π½Π΅Π·Π°Π²Π΅ΡΡΡΠ½Π½ΠΎΠΉ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠ΅ΠΉ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n\nΠΠ»Ρ ΡΠ°ΠΉΠ»Π° %s Π²ΠΎΠ·Π½ΠΈΠΊ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ ΡΠ»ΠΈΡΠ½ΠΈΡ. Π Π°Π·ΡΠ΅ΡΠΈΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡ ΠΈ Π΄ΠΎΠ±Π°Π²ΡΡΠ΅ ΠΈΡ
Π² ΠΈΠ½Π΄Π΅ΠΊΡ ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: lib/commit.tcl:180 +#: lib/commit.tcl:190 #, tcl-format msgid "" "Unknown file state %s detected.\n" @@ -1321,14 +2343,14 @@ msgid "" "File %s cannot be committed by this program.\n" msgstr "ΠΠ±Π½Π°ΡΡΠΆΠ΅Π½ΠΎ Π½Π΅ΠΈΠ·Π²Π΅ΡΡΠ½ΠΎΠ΅ ΡΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ°ΠΉΠ»Π° %s.\n\nΠ€Π°ΠΉΠ» %s Π½Π΅ ΠΌΠΎΠΆΠ΅Ρ Π±ΡΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠ΅Π½ ΡΡΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ.\n" -#: lib/commit.tcl:188 +#: lib/commit.tcl:198 msgid "" "No changes to commit.\n" "\n" "You must stage at least 1 file before you can commit.\n" msgstr "ΠΡΡΡΡΡΡΠ²ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π»Ρ ΡΠΎΡ
ΡΠ°Π½Π΅Π½ΠΈΡ.\n\nΠΠΎΠ±Π°Π²ΡΡΠ΅ Π² ΠΈΠ½Π΄Π΅ΠΊΡ Ρ
ΠΎΡΡ Π±Ρ ΠΎΠ΄ΠΈΠ½ ΡΠ°ΠΉΠ» ΠΏΠ΅ΡΠ΅Π΄ Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅ΠΌ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: lib/commit.tcl:203 +#: lib/commit.tcl:213 msgid "" "Please supply a commit message.\n" "\n" @@ -1339,40 +2361,47 @@ msgid "" "- Remaining lines: Describe why this change is good.\n" msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n\nΠ Π΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΡΡΡ ΡΠ»Π΅Π΄ΡΡΡΠΈΠΉ ΡΠΎΡΠΌΠ°Ρ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ:\n\n- Π² ΠΏΠ΅ΡΠ²ΠΎΠΉ ΡΡΡΠΎΠΊΠ΅ ΠΊΡΠ°ΡΠΊΠΎΠ΅ ΠΎΠΏΠΈΡΠ°Π½ΠΈΠ΅ ΡΠ΄Π΅Π»Π°Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ\n- Π²ΡΠΎΡΠ°Ρ ΡΡΡΠΎΠΊΠ° ΠΏΡΡΡΠ°Ρ\n- Π² ΠΎΡΡΠ°Π²ΡΠΈΡ
ΡΡ ΡΡΡΠΎΠΊΠ°Ρ
ΠΎΠΏΠΈΡΠΈΡΠ΅, ΡΡΠΎ Π΄Π°ΡΡ Π²Π°ΡΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ\n" -#: lib/commit.tcl:234 +#: lib/commit.tcl:244 msgid "Calling pre-commit hook..." msgstr "ΠΡΠ·ΠΎΠ² ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° pre-commitβ¦" -#: lib/commit.tcl:249 +#: lib/commit.tcl:259 msgid "Commit declined by pre-commit hook." msgstr "ΠΠΎΠΌΠΌΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π½ ΠΏΠ΅ΡΠ΅Π²Π°ΡΡΠΈΠΊΠΎΠΌ pre-commit." -#: lib/commit.tcl:272 +#: lib/commit.tcl:278 +msgid "" +"You are about to commit on a detached head. This is a potentially dangerous thing to do because if you switch to another branch you will lose your changes and it can be difficult to retrieve them later from the reflog. You should probably cancel this commit and create a new branch to continue.\n" +" \n" +" Do you really want to proceed with your Commit?" +msgstr "ΠΡ ΡΠΎΠ±ΠΈΡΠ°Π΅ΡΠ΅ΡΡ ΡΠ΄Π΅Π»Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ Π² ΠΎΡΠ΄Π΅Π»ΡΠ½Π½ΡΠΉ HEAD. ΠΡΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ ΠΏΠΎΡΠ΅Π½ΡΠΈΠ°Π»ΡΠ½ΠΎ ΠΎΠΏΠ°ΡΠ½ΠΎ, ΡΠ°ΠΊ ΠΊΠ°ΠΊ Π΅ΡΠ»ΠΈ Π²Ρ ΠΏΠ΅ΡΠ΅ΠΊΠ»ΡΡΠΈΡΠ΅ΡΡ Π½Π° Π΄ΡΡΠ³ΡΡ Π²Π΅ΡΠΊΡ ΠΏΠΎΡΠ»Π΅ ΡΡΠΎΠ³ΠΎ, ΡΠΎ Π²Ρ ΠΏΠΎΡΠ΅ΡΡΠ΅ΡΠ΅ ΡΠ²ΠΎΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΠΈ ΠΈΡ
ΡΠ»ΠΎΠΆΠ½ΠΎ Π±ΡΠ΄Π΅Ρ ΠΏΠΎΡΠΎΠΌ Π½Π°ΠΉΡΠΈ Ρ ΠΏΠΎΠΌΠΎΡΡΡ ΠΆΡΡΠ½Π°Π»Π° ΡΡΡΠ»ΠΎΠΊ (reflog). ΠΠ°ΠΌ ΡΠΊΠΎΡΠ΅Π΅ Π²ΡΠ΅Π³ΠΎ ΡΠ»Π΅Π΄ΡΠ΅Ρ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΡΠΎΡ ΠΊΠΎΠΌΠΌΠΈΡ ΠΈ ΡΠΎΠ·Π΄Π°ΡΡ Π½ΠΎΠ²ΡΡ Π²Π΅ΡΠΊΡ Π΄ΠΎ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠ΅Π½ΠΈΡ.\n \n ΠΡ Π΄Π΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Ρ
ΠΎΡΠΈΡΠ΅ ΠΏΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΈ ΡΠΎΠ·Π΄Π°ΡΡ ΠΊΠΎΠΌΠΌΠΈΡ?" + +#: lib/commit.tcl:299 msgid "Calling commit-msg hook..." msgstr "ΠΡΠ·ΠΎΠ² ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° commit-msgβ¦" -#: lib/commit.tcl:287 +#: lib/commit.tcl:314 msgid "Commit declined by commit-msg hook." msgstr "ΠΠΎΠΌΠΌΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π½ ΠΏΠ΅ΡΠ΅Π²Π°ΡΡΠΈΠΊΠΎΠΌ commit-msg" -#: lib/commit.tcl:300 +#: lib/commit.tcl:327 msgid "Committing changes..." msgstr "ΠΠΎΠΌΠΌΠΈΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉβ¦" -#: lib/commit.tcl:316 +#: lib/commit.tcl:344 msgid "write-tree failed:" msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° write-tree Π·Π°Π²Π΅ΡΡΠΈΠ»Π°ΡΡ Ρ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ:" -#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382 +#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422 msgid "Commit failed." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°ΠΊΠΎΠΌΠΌΠΈΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ." -#: lib/commit.tcl:334 +#: lib/commit.tcl:362 #, tcl-format msgid "Commit %s appears to be corrupt" msgstr "ΠΠΎΠΌΠΌΠΈΡ %s ΠΏΠΎΡ
ΠΎΠΆΠ΅ ΠΏΠΎΠ²ΡΠ΅ΠΆΠ΄Π΅Π½" -#: lib/commit.tcl:339 +#: lib/commit.tcl:367 msgid "" "No changes to commit.\n" "\n" @@ -1381,63 +2410,95 @@ msgid "" "A rescan will be automatically started now.\n" msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n\nΠΠΈ ΠΎΠ΄ΠΈΠ½ ΡΠ°ΠΉΠ» Π½Π΅ Π±ΡΠ» ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ ΠΈ Π½Π΅ Π±ΡΠ»ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n\nΠ‘Π΅ΠΉΡΠ°Ρ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ Π·Π°ΠΏΡΡΡΠΈΡΡΡ ΠΏΠ΅ΡΠ΅ΡΠΈΡΡΠ²Π°Π½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ.\n" -#: lib/commit.tcl:346 +#: lib/commit.tcl:374 msgid "No changes to commit." msgstr "ΠΠ΅Ρ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°." -#: lib/commit.tcl:360 +#: lib/commit.tcl:394 msgid "commit-tree failed:" msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° commit-tree Π·Π°Π²Π΅ΡΡΠΈΠ»Π°ΡΡ Ρ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ:" -#: lib/commit.tcl:381 +#: lib/commit.tcl:421 msgid "update-ref failed:" msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° update-ref Π·Π°Π²Π΅ΡΡΠΈΠ»Π°ΡΡ Ρ ΠΎΡΠΈΠ±ΠΊΠΎΠΉ:" -#: lib/commit.tcl:469 +#: lib/commit.tcl:514 #, tcl-format msgid "Created commit %s: %s" msgstr "Π‘ΠΎΠ·Π΄Π°Π½ ΠΊΠΎΠΌΠΌΠΈΡ %s: %s " -#: lib/console.tcl:59 -msgid "Working... please wait..." -msgstr "Π ΠΏΡΠΎΡΠ΅ΡΡΠ΅β¦ ΠΏΠΎΠΆΠ°Π»ΡΠΉΡΡΠ°, ΠΆΠ΄ΠΈΡΠ΅β¦" +#: lib/branch_delete.tcl:16 +#, tcl-format +msgid "%s (%s): Delete Branch" +msgstr "%s (%s): Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ" -#: lib/console.tcl:186 -msgid "Success" -msgstr "ΠΡΠΎΡΠ΅ΡΡ ΡΡΠΏΠ΅ΡΠ½ΠΎ Π·Π°Π²Π΅ΡΡΠ΅Π½" +#: lib/branch_delete.tcl:21 +msgid "Delete Local Branch" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΡ Π²Π΅ΡΠΊΡ" -#: lib/console.tcl:200 -msgid "Error: Command Failed" -msgstr "ΠΡΠΈΠ±ΠΊΠ°: Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ Π²ΡΠΏΠΎΠ»Π½ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ" +#: lib/branch_delete.tcl:39 +msgid "Local Branches" +msgstr "ΠΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ Π²Π΅ΡΠΊΠΈ" -#: lib/database.tcl:43 +#: lib/branch_delete.tcl:51 +msgid "Delete Only If Merged Into" +msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ»ΡΡΠ°Π΅, Π΅ΡΠ»ΠΈ Π±ΡΠ»ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Ρ" + +#: lib/branch_delete.tcl:103 +#, tcl-format +msgid "The following branches are not completely merged into %s:" +msgstr "ΠΠ΅ΡΠΊΠΈ, ΠΊΠΎΡΠΎΡΡΠ΅ Π½Π΅ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ ΡΠ»ΠΈΠ²Π°ΡΡΡΡ Ρ %s:" + +#: lib/branch_delete.tcl:131 +#, tcl-format +msgid " - %s:" +msgstr " β %s:" + +#: lib/branch_delete.tcl:141 +#, tcl-format +msgid "" +"Failed to delete branches:\n" +"%s" +msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ΄Π°Π»ΠΈΡΡ Π²Π΅ΡΠΊΠΈ:\n%s" + +#: lib/date.tcl:25 +#, tcl-format +msgid "Invalid date from Git: %s" +msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ Π΄Π°ΡΠ° Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ: %s" + +#: lib/database.tcl:42 msgid "Number of loose objects" msgstr "ΠΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: lib/database.tcl:44 +#: lib/database.tcl:43 msgid "Disk space used by loose objects" msgstr "ΠΠ±ΡΠ΅ΠΌ Π΄ΠΈΡΠΊΠΎΠ²ΠΎΠ³ΠΎ ΠΏΡΠΎΡΡΡΠ°Π½ΡΡΠ²Π°, Π·Π°Π½ΡΡΡΠΉ Π½Π΅ΡΠ²ΡΠ·Π°Π½Π½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" -#: lib/database.tcl:45 +#: lib/database.tcl:44 msgid "Number of packed objects" msgstr "ΠΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" -#: lib/database.tcl:46 +#: lib/database.tcl:45 msgid "Number of packs" msgstr "ΠΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ pack-ΡΠ°ΠΉΠ»ΠΎΠ²" -#: lib/database.tcl:47 +#: lib/database.tcl:46 msgid "Disk space used by packed objects" msgstr "ΠΠ±ΡΠ΅ΠΌ Π΄ΠΈΡΠΊΠΎΠ²ΠΎΠ³ΠΎ ΠΏΡΠΎΡΡΡΠ°Π½ΡΡΠ²Π°, Π·Π°Π½ΡΡΡΠΉ ΡΠΏΠ°ΠΊΠΎΠ²Π°Π½Π½ΡΠΌΠΈ ΠΎΠ±ΡΠ΅ΠΊΡΠ°ΠΌΠΈ" -#: lib/database.tcl:48 +#: lib/database.tcl:47 msgid "Packed objects waiting for pruning" msgstr "ΠΠ΅ΡΠ²ΡΠ·Π°Π½Π½ΡΠ΅ ΠΎΠ±ΡΠ΅ΠΊΡΡ, ΠΊΠΎΡΠΎΡΡΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΡΠ΄Π°Π»ΠΈΡΡ" -#: lib/database.tcl:49 +#: lib/database.tcl:48 msgid "Garbage files" msgstr "ΠΡΡΠΎΡ" +#: lib/database.tcl:66 +#, tcl-format +msgid "%s (%s): Database Statistics" +msgstr "%s (%s): Π‘ΡΠ°ΡΠΈΡΡΠΈΠΊΠ° Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
" + #: lib/database.tcl:72 msgid "Compressing the object database" msgstr "Π‘ΠΆΠ°ΡΠΈΠ΅ Π±Π°Π·Ρ ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²" @@ -1456,183 +2517,29 @@ msgid "" "Compress the database now?" msgstr "ΠΡΠΎΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΡΠ΅ΠΉΡΠ°Ρ ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ ΠΏΡΠΈΠΌΠ΅ΡΠ½ΠΎ %i ΡΠ²ΠΎΠ±ΠΎΠ΄Π½ΡΡ
ΠΎΠ±ΡΠ΅ΠΊΡΠΎΠ²\n\nΠΠ»Ρ Π»ΡΡΡΠ΅ΠΉ ΠΏΡΠΎΠΈΠ·Π²ΠΎΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎΡΡΠΈ ΡΠ΅ΠΊΠΎΠΌΠ΅Π½Π΄ΡΠ΅ΡΡΡ ΡΠΆΠ°ΡΡ Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
.\n\nΠ‘ΠΆΠ°ΡΡ Π±Π°Π·Ρ Π΄Π°Π½Π½ΡΡ
ΡΠ΅ΠΉΡΠ°Ρ?" -#: lib/date.tcl:25 -#, tcl-format -msgid "Invalid date from Git: %s" -msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ Π΄Π°ΡΠ° Π² ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ: %s" - -#: lib/diff.tcl:64 -#, tcl-format -msgid "" -"No differences detected.\n" -"\n" -"%s has no changes.\n" -"\n" -"The modification date of this file was updated by another application, but the content within the file was not changed.\n" -"\n" -"A rescan will be automatically started to find other files which may have the same state." -msgstr "ΠΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π½Π΅ ΠΎΠ±Π½Π°ΡΡΠΆΠ΅Π½ΠΎ.\n\nΠ² %s ΠΎΡΡΡΡΡΡΠ²ΡΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ.\n\nΠΠ°ΡΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° Π±ΡΠ»Π° ΠΎΠ±Π½ΠΎΠ²Π»Π΅Π½Π° Π΄ΡΡΠ³ΠΎΠΉ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ, Π½ΠΎ ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ ΡΠ°ΠΉΠ»Π° ΠΎΡΡΠ°Π»ΠΎΡΡ ΠΏΡΠ΅ΠΆΠ½ΠΈΠΌ.\n\nΠ‘Π΅ΠΉΡΠ°Ρ Π±ΡΠ΄Π΅Ρ Π·Π°ΠΏΡΡΠ΅Π½ΠΎ ΠΏΠ΅ΡΠ΅ΡΠΈΡΡΠ²Π°Π½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ, ΡΡΠΎΠ±Ρ Π½Π°ΠΉΡΠΈ ΠΏΠΎΠ΄ΠΎΠ±Π½ΡΠ΅ ΡΠ°ΠΉΠ»Ρ." - -#: lib/diff.tcl:104 -#, tcl-format -msgid "Loading diff of %s..." -msgstr "ΠΠ°Π³ΡΡΠ·ΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ %sβ¦" - -#: lib/diff.tcl:125 -msgid "" -"LOCAL: deleted\n" -"REMOTE:\n" -msgstr "ΠΠΠΠΠΠ¬ΠΠ: ΡΠ΄Π°Π»ΡΠ½\nΠΠΠΠ¨ΠΠΠ:\n" - -#: lib/diff.tcl:130 -msgid "" -"REMOTE: deleted\n" -"LOCAL:\n" -msgstr "ΠΠΠΠ¨ΠΠΠ: ΡΠ΄Π°Π»ΡΠ½\nΠΠΠΠΠΠ¬ΠΠ:\n" - -#: lib/diff.tcl:137 -msgid "LOCAL:\n" -msgstr "ΠΠΠΠΠΠ¬ΠΠ:\n" - -#: lib/diff.tcl:140 -msgid "REMOTE:\n" -msgstr "ΠΠΠΠ¨ΠΠΠ:\n" - -#: lib/diff.tcl:202 lib/diff.tcl:319 +#: lib/error.tcl:20 #, tcl-format -msgid "Unable to display %s" -msgstr "ΠΠ΅ ΠΌΠΎΠ³Ρ ΠΏΠΎΠΊΠ°Π·Π°ΡΡ %s" +msgid "%s: error" +msgstr "%s: ΠΎΡΠΈΠ±ΠΊΠ°" -#: lib/diff.tcl:203 -msgid "Error loading file:" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°Π³ΡΡΠ·ΠΊΠΈ ΡΠ°ΠΉΠ»Π°:" - -#: lib/diff.tcl:210 -msgid "Git Repository (subproject)" -msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Git (ΠΏΠΎΠ΄ΠΏΡΠΎΠ΅ΠΊΡ)" - -#: lib/diff.tcl:222 -msgid "* Binary file (not showing content)." -msgstr "* ΠΠ²ΠΎΠΈΡΠ½ΡΠΉ ΡΠ°ΠΉΠ» (ΡΠΎΠ΄Π΅ΡΠΆΠΈΠΌΠΎΠ΅ Π½Π΅ ΠΏΠΎΠΊΠ°Π·Π°Π½ΠΎ)" - -#: lib/diff.tcl:227 -#, tcl-format -msgid "" -"* Untracked file is %d bytes.\n" -"* Showing only first %d bytes.\n" -msgstr "* Π Π°Π·ΠΌΠ΅Ρ Π½Π΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π° %d Π±Π°ΠΉΡ.\n* ΠΠΎΠΊΠ°Π·Π°Π½ΠΎ ΠΏΠ΅ΡΠ²ΡΡ
%d Π±Π°ΠΉΡ.\n" - -#: lib/diff.tcl:233 +#: lib/error.tcl:36 #, tcl-format -msgid "" -"\n" -"* Untracked file clipped here by %s.\n" -"* To see the entire file, use an external editor.\n" -msgstr "\n* ΠΠ΅ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΠΉ ΡΠ°ΠΉΠ» ΠΎΠ±ΡΠ΅Π·Π°Π½: %s.\n* Π§ΡΠΎΠ±Ρ ΡΠ²ΠΈΠ΄Π΅ΡΡ Π²Π΅ΡΡ ΡΠ°ΠΉΠ», ΠΈΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅Π΄Π°ΠΊΡΠΎΡ.\n" +msgid "%s: warning" +msgstr "%s: ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅" -#: lib/diff.tcl:482 -msgid "Failed to unstage selected hunk." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΊΠ»ΡΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΠ°ΡΡΡ." - -#: lib/diff.tcl:489 -msgid "Failed to stage selected hunk." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΠΉ Π±Π»ΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." - -#: lib/diff.tcl:568 -msgid "Failed to unstage selected line." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΈΡΠΊΠ»ΡΡΠΈΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΡΡΠΎΠΊΡ." - -#: lib/diff.tcl:576 -msgid "Failed to stage selected line." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°ΡΡ Π²ΡΠ±ΡΠ°Π½Π½ΡΡ ΡΡΡΠΎΠΊΡ." - -#: lib/encoding.tcl:443 -msgid "Default" -msgstr "ΠΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" - -#: lib/encoding.tcl:448 +#: lib/error.tcl:80 #, tcl-format -msgid "System (%s)" -msgstr "Π‘ΠΈΡΡΠ΅ΠΌΠ½Π°Ρ (%s)" - -#: lib/encoding.tcl:459 lib/encoding.tcl:465 -msgid "Other" -msgstr "ΠΡΡΠ³Π°Ρ" - -#: lib/error.tcl:20 lib/error.tcl:114 -msgid "error" -msgstr "ΠΎΡΠΈΠ±ΠΊΠ°" - -#: lib/error.tcl:36 -msgid "warning" -msgstr "ΠΏΡΠ΅Π΄ΡΠΏΡΠ΅ΠΆΠ΄Π΅Π½ΠΈΠ΅" +msgid "%s hook failed:" +msgstr "ΠΎΡΠΈΠ±ΠΊΠ° ΠΏΠ΅ΡΠ΅Ρ
Π²Π°ΡΡΠΈΠΊΠ° %s:" -#: lib/error.tcl:94 +#: lib/error.tcl:96 msgid "You must correct the above errors before committing." msgstr "ΠΠ΅ΡΠ΅Π΄ ΠΊΠΎΠΌΠΌΠΈΡΠΎΠΌ, ΠΈΡΠΏΡΠ°Π²ΡΡΠ΅ Π²ΡΡΠ΅ΡΠΊΠ°Π·Π°Π½Π½ΡΠ΅ ΠΎΡΠΈΠ±ΠΊΠΈ." -#: lib/index.tcl:6 -msgid "Unable to unlock the index." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΡΠ°Π·Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" - -#: lib/index.tcl:15 -msgid "Index Error" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π² ΠΈΠ½Π΄Π΅ΠΊΡΠ΅" - -#: lib/index.tcl:17 -msgid "" -"Updating the Git index failed. A rescan will be automatically started to " -"resynchronize git-gui." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΎΠ±Π½ΠΎΠ²ΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ Git. Π‘ΠΎΡΡΠΎΡΠ½ΠΈΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Π±ΡΠ΄Π΅Ρ ΠΏΠ΅ΡΠ΅ΡΠΈΡΠ°Π½ΠΎ Π°Π²ΡΠΎΠΌΠ°ΡΠΈΡΠ΅ΡΠΊΠΈ." - -#: lib/index.tcl:28 -msgid "Continue" -msgstr "ΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ" - -#: lib/index.tcl:31 -msgid "Unlock Index" -msgstr "Π Π°Π·Π±Π»ΠΎΠΊΠΈΡΠΎΠ²Π°ΡΡ ΠΈΠ½Π΄Π΅ΠΊΡ" - -#: lib/index.tcl:289 -#, tcl-format -msgid "Unstaging %s from commit" -msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ %s ΠΈΠ· ΠΈΠ½Π΄Π΅ΠΊΡΠ°" - -#: lib/index.tcl:328 -msgid "Ready to commit." -msgstr "ΠΠΎΡΠΎΠ² Π΄Π»Ρ ΠΊΠΎΠΌΠΌΠΈΡΠ°." - -#: lib/index.tcl:341 -#, tcl-format -msgid "Adding %s" -msgstr "ΠΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΠ΅ %sβ¦" - -#: lib/index.tcl:398 -#, tcl-format -msgid "Revert changes in file %s?" -msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°ΠΉΠ»Π΅ %s?" - -#: lib/index.tcl:400 +#: lib/error.tcl:116 #, tcl-format -msgid "Revert changes in these %i files?" -msgstr "ΠΠ±ΡΠ°ΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² %i ΡΠ°ΠΉΠ»Π΅(-Π°Ρ
)?" - -#: lib/index.tcl:408 -msgid "Any unstaged changes will be permanently lost by the revert." -msgstr "ΠΡΠ±ΡΠ΅ Π½Π΅ΠΏΡΠΎΠΈΠ½Π΄Π΅ΠΊΡΠΈΡΠΎΠ²Π°Π½Π½ΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ, Π±ΡΠ΄ΡΡ ΠΏΠΎΡΠ΅ΡΡΠ½Ρ ΠΏΡΠΈ ΠΎΠ±ΡΠ°ΡΠ΅Π½ΠΈΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ." - -#: lib/index.tcl:411 -msgid "Do Nothing" -msgstr "ΠΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°ΡΡ" - -#: lib/index.tcl:429 -msgid "Reverting selected files" -msgstr "ΠΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² Π²ΡΠ±ΡΠ°Π½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" - -#: lib/index.tcl:433 -#, tcl-format -msgid "Reverting %s" -msgstr "ΠΠ±ΡΠ°ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² %s" +msgid "%s (%s): error" +msgstr "%s (%s): ΠΎΡΠΈΠ±ΠΊΠ°" #: lib/merge.tcl:13 msgid "" @@ -1670,41 +2577,46 @@ msgid "" "You should complete the current commit before starting a merge. Doing so will help you abort a failed merge, should the need arise.\n" msgstr "ΠΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΠ΅ΡΡ Π² ΠΏΡΠΎΡΠ΅ΡΡΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ.\n\nΠ€Π°ΠΉΠ» %s ΠΈΠ·ΠΌΠ΅Π½ΡΠ½.\n\nΠΡ Π΄ΠΎΠ»ΠΆΠ½Ρ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ΅ΠΊΡΡΠΈΠΉ ΠΊΠΎΠΌΠΌΠΈΡ ΠΏΠ΅ΡΠ΅Π΄ Π½Π°ΡΠ°Π»ΠΎΠΌ ΡΠ»ΠΈΡΠ½ΠΈΡ. Π ΡΠ»ΡΡΠ°Π΅ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΠΎΡΡΠΈ, ΡΡΠΎ ΠΏΠΎΠ·Π²ΠΎΠ»ΠΈΡ ΠΏΡΠ΅ΡΠ²Π°ΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ.\n" -#: lib/merge.tcl:107 +#: lib/merge.tcl:108 #, tcl-format msgid "%s of %s" msgstr "%s ΠΈΠ· %s" -#: lib/merge.tcl:120 +#: lib/merge.tcl:126 #, tcl-format msgid "Merging %s and %s..." msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ %s ΠΈ %sβ¦" -#: lib/merge.tcl:131 +#: lib/merge.tcl:137 msgid "Merge completed successfully." msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ ΡΡΠΏΠ΅ΡΠ½ΠΎ Π·Π°Π²Π΅ΡΡΠ΅Π½ΠΎ." -#: lib/merge.tcl:133 +#: lib/merge.tcl:139 msgid "Merge failed. Conflict resolution is required." msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π·Π°Π²Π΅ΡΡΠΈΡΡ ΡΠ»ΠΈΡΠ½ΠΈΠ΅. Π’ΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°." -#: lib/merge.tcl:158 +#: lib/merge.tcl:156 +#, tcl-format +msgid "%s (%s): Merge" +msgstr "%s (%s): Π‘Π»ΠΈΡΠ½ΠΈΠ΅" + +#: lib/merge.tcl:164 #, tcl-format msgid "Merge Into %s" msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Ρ %s" -#: lib/merge.tcl:177 +#: lib/merge.tcl:183 msgid "Revision To Merge" msgstr "ΠΠ΅ΡΡΠΈΡ, Ρ ΠΊΠΎΡΠΎΡΠΎΠΉ ΠΏΡΠΎΠ²Π΅ΡΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠ΅" -#: lib/merge.tcl:212 +#: lib/merge.tcl:218 msgid "" "Cannot abort while amending.\n" "\n" "You must finish amending this commit.\n" msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΏΡΠ΅ΡΠ²Π°ΡΡ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅.\n\nΠΠ°Π²Π΅ΡΡΠΈΡΠ΅ ΡΠ΅ΠΊΡΡΠ΅Π΅ ΠΈΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΠ°.\n" -#: lib/merge.tcl:222 +#: lib/merge.tcl:228 msgid "" "Abort merge?\n" "\n" @@ -1713,7 +2625,7 @@ msgid "" "Continue with aborting the current merge?" msgstr "ΠΡΠ΅ΡΠ²Π°ΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ ΡΠ»ΠΈΡΠ½ΠΈΡ?\n\nΠΡΠ΅ΡΡΠ²Π°Π½ΠΈΠ΅ ΡΠ΅ΠΊΡΡΠ΅Π³ΠΎ ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΠΎΡΠ΅ΡΠ΅ *ΠΠ‘ΠΠ₯* Π½Π΅ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ.\n\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ?" -#: lib/merge.tcl:228 +#: lib/merge.tcl:234 msgid "" "Reset changes?\n" "\n" @@ -1722,661 +2634,18 @@ msgid "" "Continue with resetting the current changes?" msgstr "Π‘Π±ΡΠΎΡΠΈΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ?\n\nΠ‘Π±ΡΠΎΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΡΠΈΠ²Π΅Π΄Π΅Ρ ΠΊ ΠΏΠΎΡΠ΅ΡΠ΅ *ΠΠ‘ΠΠ₯* Π½Π΅ΡΠΎΡ
ΡΠ°Π½Π΅Π½Π½ΡΡ
ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ.\n\nΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ?" -#: lib/merge.tcl:239 +#: lib/merge.tcl:246 msgid "Aborting" msgstr "ΠΡΠ΅ΡΡΠ²Π°Ρ" -#: lib/merge.tcl:239 +#: lib/merge.tcl:247 msgid "files reset" msgstr "ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ Π² ΡΠ°ΠΉΠ»Π°Ρ
ΠΎΡΠΌΠ΅Π½Π΅Π½Ρ" -#: lib/merge.tcl:267 +#: lib/merge.tcl:277 msgid "Abort failed." msgstr "ΠΡΠ΅ΡΠ²Π°ΡΡ Π½Π΅ ΡΠ΄Π°Π»ΠΎΡΡ." -#: lib/merge.tcl:269 +#: lib/merge.tcl:279 msgid "Abort completed. Ready." msgstr "ΠΡΠ΅ΡΠ²Π°Π½ΠΎ." - -#: lib/mergetool.tcl:8 -msgid "Force resolution to the base version?" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π±Π°Π·ΠΎΠ²ΡΡ Π²Π΅ΡΡΠΈΡ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" - -#: lib/mergetool.tcl:9 -msgid "Force resolution to this branch?" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²Π΅ΡΡΠΈΡ ΠΈΠ· ΡΡΠΎΠΉ Π²Π΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" - -#: lib/mergetool.tcl:10 -msgid "Force resolution to the other branch?" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π²Π΅ΡΡΠΈΡ ΠΈΠ· Π΄ΡΡΠ³ΠΎΠΉ Π²Π΅ΡΠΊΠΈ Π΄Π»Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΠ°?" - -#: lib/mergetool.tcl:14 -#, tcl-format -msgid "" -"Note that the diff shows only conflicting changes.\n" -"\n" -"%s will be overwritten.\n" -"\n" -"This operation can be undone only by restarting the merge." -msgstr "ΠΠ½ΠΈΠΌΠ°Π½ΠΈΠ΅! Π‘ΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°Π΅Ρ ΡΠΎΠ»ΡΠΊΠΎ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠ΅ ΠΎΡΠ»ΠΈΡΠΈΡ.\n\n%s Π±ΡΠ΄Π΅Ρ ΠΏΠ΅ΡΠ΅ΠΏΠΈΡΠ°Π½.\n\nΠΡΠΎ Π΄Π΅ΠΉΡΡΠ²ΠΈΠ΅ ΠΌΠΎΠΆΠ½ΠΎ ΠΎΡΠΌΠ΅Π½ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΡΡΠΊΠΎΠΌ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ." - -#: lib/mergetool.tcl:45 -#, tcl-format -msgid "File %s seems to have unresolved conflicts, still stage?" -msgstr "ΠΠΎΡ
ΠΎΠΆΠ΅, ΡΡΠΎ ΡΠ°ΠΉΠ» %s ΡΠΎΠ΄Π΅ΡΠΆΠΈΡ Π½Π΅ΡΠ°Π·ΡΠ΅ΡΠ΅Π½Π½ΡΠ΅ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ. ΠΡΠΎΠ΄ΠΎΠ»ΠΆΠΈΡΡ ΠΈΠ½Π΄Π΅ΠΊΡΠ°ΡΠΈΡ?" - -#: lib/mergetool.tcl:60 -#, tcl-format -msgid "Adding resolution for %s" -msgstr "ΠΠΎΠ±Π°Π²Π»ΡΡ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ ΡΠ°Π·ΡΠ΅ΡΠ΅Π½ΠΈΡ Π΄Π»Ρ %s" - -#: lib/mergetool.tcl:141 -msgid "Cannot resolve deletion or link conflicts using a tool" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Π½Π΅ ΠΎΠ±ΡΠ°Π±Π°ΡΡΠ²Π°Π΅Ρ ΠΊΠΎΠ½ΡΠ»ΠΈΠΊΡΡ Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΠ΅ΠΌ ΠΈΠ»ΠΈ ΡΡΠ°ΡΡΠΈΠ΅ΠΌ ΡΡΡΠ»ΠΎΠΊ" - -#: lib/mergetool.tcl:146 -msgid "Conflict file does not exist" -msgstr "ΠΠΎΠ½ΡΠ»ΠΈΠΊΡΡΡΡΠΈΠΉ ΡΠ°ΠΉΠ» Π½Π΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ" - -#: lib/mergetool.tcl:264 -#, tcl-format -msgid "Not a GUI merge tool: '%s'" -msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠΎΠΉ ΡΠ»ΠΈΡΠ½ΠΈΡ" - -#: lib/mergetool.tcl:268 -#, tcl-format -msgid "Unsupported merge tool '%s'" -msgstr "ΠΠ΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ Β«%sΒ»" - -#: lib/mergetool.tcl:303 -msgid "Merge tool is already running, terminate it?" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΡΠ»ΠΈΡΠ½ΠΈΡ ΡΠΆΠ΅ ΡΠ°Π±ΠΎΡΠ°Π΅Ρ. ΠΡΠ΅ΡΠ²Π°ΡΡ?" - -#: lib/mergetool.tcl:323 -#, tcl-format -msgid "" -"Error retrieving versions:\n" -"%s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΠΎΠ»ΡΡΠ΅Π½ΠΈΡ Π²Π΅ΡΡΠΈΠΉ:\n%s" - -#: lib/mergetool.tcl:343 -#, tcl-format -msgid "" -"Could not start the merge tool:\n" -"\n" -"%s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°ΠΏΡΡΠΊΠ° ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ:\n\n%s" - -#: lib/mergetool.tcl:347 -msgid "Running merge tool..." -msgstr "ΠΠ°ΠΏΡΡΠΊ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡβ¦" - -#: lib/mergetool.tcl:375 lib/mergetool.tcl:383 -msgid "Merge tool failed." -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΡΠ»ΠΈΡΠ½ΠΈΡ." - -#: lib/option.tcl:11 -#, tcl-format -msgid "Invalid global encoding '%s'" -msgstr "ΠΠ΅Π²Π΅ΡΠ½Π°Ρ Π³Π»ΠΎΠ±Π°Π»ΡΠ½Π°Ρ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° Β«%sΒ»" - -#: lib/option.tcl:19 -#, tcl-format -msgid "Invalid repo encoding '%s'" -msgstr "ΠΠ΅Π²Π΅ΡΠ½Π°Ρ ΠΊΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ Β«%sΒ»" - -#: lib/option.tcl:117 -msgid "Restore Defaults" -msgstr "ΠΠΎΡΡΡΠ°Π½ΠΎΠ²ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" - -#: lib/option.tcl:121 -msgid "Save" -msgstr "Π‘ΠΎΡ
ΡΠ°Π½ΠΈΡΡ" - -#: lib/option.tcl:131 -#, tcl-format -msgid "%s Repository" -msgstr "ΠΠ»Ρ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ %s" - -#: lib/option.tcl:132 -msgid "Global (All Repositories)" -msgstr "ΠΠ±ΡΠΈΠ΅ (Π΄Π»Ρ Π²ΡΠ΅Ρ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²)" - -#: lib/option.tcl:138 -msgid "User Name" -msgstr "ΠΠΌΡ ΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΠ΅Π»Ρ" - -#: lib/option.tcl:139 -msgid "Email Address" -msgstr "ΠΠ΄ΡΠ΅Ρ ΡΠ»Π΅ΠΊΡΡΠΎΠ½Π½ΠΎΠΉ ΠΏΠΎΡΡΡ" - -#: lib/option.tcl:141 -msgid "Summarize Merge Commits" -msgstr "Π‘ΡΠΌΠΌΠ°ΡΠ½ΠΎΠ΅ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠ΅ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" - -#: lib/option.tcl:142 -msgid "Merge Verbosity" -msgstr "Π£ΡΠΎΠ²Π΅Π½Ρ Π΄Π΅ΡΠ°Π»ΡΠ½ΠΎΡΡΠΈ ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΠΉ ΠΏΡΠΈ ΡΠ»ΠΈΡΠ½ΠΈΠΈ" - -#: lib/option.tcl:143 -msgid "Show Diffstat After Merge" -msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ ΠΎΡΡΠ΅Ρ ΠΎΠ± ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡΡ
ΠΏΠΎΡΠ»Π΅ ΡΠ»ΠΈΡΠ½ΠΈΡ" - -#: lib/option.tcl:144 -msgid "Use Merge Tool" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ Π΄Π»Ρ ΡΠ»ΠΈΡΠ½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ" - -#: lib/option.tcl:146 -msgid "Trust File Modification Timestamps" -msgstr "ΠΠΎΠ²Π΅ΡΡΡΡ Π²ΡΠ΅ΠΌΠ΅Π½ΠΈ ΠΌΠΎΠ΄ΠΈΡΠΈΠΊΠ°ΡΠΈΠΈ ΡΠ°ΠΉΠ»Π°" - -#: lib/option.tcl:147 -msgid "Prune Tracking Branches During Fetch" -msgstr "Π§ΠΈΡΡΠΊΠ° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ ΠΏΡΠΈ ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠΈ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ" - -#: lib/option.tcl:148 -msgid "Match Tracking Branches" -msgstr "Π’Π°ΠΊΠΎΠ΅ ΠΆΠ΅ ΠΈΠΌΡ, ΠΊΠ°ΠΊ ΠΈ Ρ ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΠΎΠΉ Π²Π΅ΡΠΊΠΈ" - -#: lib/option.tcl:149 -msgid "Blame Copy Only On Changed Files" -msgstr "ΠΠΎΠΈΡΠΊ ΠΊΠΎΠΏΠΈΠΉ ΡΠΎΠ»ΡΠΊΠΎ Π² ΠΈΠ·ΠΌΠ΅Π½ΡΠ½Π½ΡΡ
ΡΠ°ΠΉΠ»Π°Ρ
" - -#: lib/option.tcl:150 -msgid "Minimum Letters To Blame Copy On" -msgstr "ΠΠΈΠ½ΠΈΠΌΠ°Π»ΡΠ½ΠΎΠ΅ ΠΊΠΎΠ»ΠΈΡΠ΅ΡΡΠ²ΠΎ ΡΠΈΠΌΠ²ΠΎΠ»ΠΎΠ² Π΄Π»Ρ ΠΏΠΎΠΈΡΠΊΠ° ΠΊΠΎΠΏΠΈΠΉ" - -#: lib/option.tcl:151 -msgid "Blame History Context Radius (days)" -msgstr "Π Π°Π΄ΠΈΡΡ ΠΈΡΡΠΎΡΠΈΡΠ΅ΡΠΊΠΎΠ³ΠΎ ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ° (Π² Π΄Π½ΡΡ
)" - -#: lib/option.tcl:152 -msgid "Number of Diff Context Lines" -msgstr "Π§ΠΈΡΠ»ΠΎ ΡΡΡΠΎΠΊ Π² ΠΊΠΎΠ½ΡΠ΅ΠΊΡΡΠ΅ diff" - -#: lib/option.tcl:153 -msgid "Commit Message Text Width" -msgstr "Π¨ΠΈΡΠΈΠ½Π° ΡΠ΅ΠΊΡΡΠ° ΡΠΎΠΎΠ±ΡΠ΅Π½ΠΈΡ ΠΊΠΎΠΌΠΌΠΈΡΠ°" - -#: lib/option.tcl:154 -msgid "New Branch Name Template" -msgstr "Π¨Π°Π±Π»ΠΎΠ½ Π΄Π»Ρ ΠΈΠΌΠ΅Π½ΠΈ Π½ΠΎΠ²ΠΎΠΉ Π²Π΅ΡΠΊΠΈ" - -#: lib/option.tcl:155 -msgid "Default File Contents Encoding" -msgstr "ΠΠΎΠ΄ΠΈΡΠΎΠ²ΠΊΠ° ΡΠΎΠ΄Π΅ΡΠΆΠ°Π½ΠΈΡ ΡΠ°ΠΉΠ»Π° ΠΏΠΎ ΡΠΌΠΎΠ»ΡΠ°Π½ΠΈΡ" - -#: lib/option.tcl:203 -msgid "Change" -msgstr "ΠΠ·ΠΌΠ΅Π½ΠΈΡΡ" - -#: lib/option.tcl:230 -msgid "Spelling Dictionary:" -msgstr "Π‘Π»ΠΎΠ²Π°ΡΡ Π΄Π»Ρ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ:" - -#: lib/option.tcl:254 -msgid "Change Font" -msgstr "ΠΠ·ΠΌΠ΅Π½ΠΈΡΡ" - -#: lib/option.tcl:258 -#, tcl-format -msgid "Choose %s" -msgstr "ΠΡΠ±Π΅ΡΠΈΡΠ΅ %s" - -#: lib/option.tcl:264 -msgid "pt." -msgstr "pt." - -#: lib/option.tcl:278 -msgid "Preferences" -msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ" - -#: lib/option.tcl:314 -msgid "Failed to completely save options:" -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ ΠΏΠΎΠ»Π½ΠΎΡΡΡΡ ΡΠΎΡ
ΡΠ°Π½ΠΈΡΡ Π½Π°ΡΡΡΠΎΠΉΠΊΠΈ:" - -#: lib/remote.tcl:163 -msgid "Remove Remote" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΡΡΠ»ΠΊΡ Π½Π° Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" - -#: lib/remote.tcl:168 -msgid "Prune from" -msgstr "Π§ΠΈΡΡΠΊΠ°" - -#: lib/remote.tcl:173 -msgid "Fetch from" -msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·" - -#: lib/remote.tcl:215 -msgid "Push to" -msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ" - -#: lib/remote_add.tcl:19 -msgid "Add Remote" -msgstr "ΠΠ°ΡΠ΅Π³ΠΈΡΡΡΠΈΡΠΎΠ²Π°ΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" - -#: lib/remote_add.tcl:24 -msgid "Add New Remote" -msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ" - -#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36 -msgid "Add" -msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ" - -#: lib/remote_add.tcl:37 -msgid "Remote Details" -msgstr "ΠΠ½ΡΠΎΡΠΌΠ°ΡΠΈΡ ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" - -#: lib/remote_add.tcl:50 -msgid "Location:" -msgstr "ΠΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:" - -#: lib/remote_add.tcl:62 -msgid "Further Action" -msgstr "Π‘Π»Π΅Π΄ΡΡΡΠ°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ" - -#: lib/remote_add.tcl:65 -msgid "Fetch Immediately" -msgstr "Π‘ΡΠ°Π·Ρ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΡ" - -#: lib/remote_add.tcl:71 -msgid "Initialize Remote Repository and Push" -msgstr "ΠΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ Π²Π½Π΅ΡΠ½ΠΈΠΉ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ ΠΈ ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ" - -#: lib/remote_add.tcl:77 -msgid "Do Nothing Else Now" -msgstr "ΠΠΎΠ»ΡΡΠ΅ Π½ΠΈΡΠ΅Π³ΠΎ Π½Π΅ Π΄Π΅Π»Π°ΡΡ" - -#: lib/remote_add.tcl:101 -msgid "Please supply a remote name." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." - -#: lib/remote_add.tcl:114 -#, tcl-format -msgid "'%s' is not an acceptable remote name." -msgstr "Β«%sΒ» Π½Π΅ ΡΠ²Π»ΡΠ΅ΡΡΡ Π΄ΠΎΠΏΡΡΡΠΈΠΌΡΠΌ ΠΈΠΌΠ΅Π½Π΅ΠΌ Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ." - -#: lib/remote_add.tcl:125 -#, tcl-format -msgid "Failed to add remote '%s' of location '%s'." -msgstr "ΠΠ΅ ΡΠ΄Π°Π»ΠΎΡΡ Π΄ΠΎΠ±Π°Π²ΠΈΡΡ Β«%sΒ» ΠΈΠ· Β«%sΒ». " - -#: lib/remote_add.tcl:133 lib/transport.tcl:6 -#, tcl-format -msgid "fetch %s" -msgstr "ΠΈΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ %s" - -#: lib/remote_add.tcl:134 -#, tcl-format -msgid "Fetching the %s" -msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ %s" - -#: lib/remote_add.tcl:157 -#, tcl-format -msgid "Do not know how to initialize repository at location '%s'." -msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ ΠΈΠ½ΠΈΡΠΈΠ°Π»ΠΈΠ·ΠΈΡΠΎΠ²Π°ΡΡ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π² Β«%sΒ»." - -#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63 -#: lib/transport.tcl:81 -#, tcl-format -msgid "push %s" -msgstr "ΠΎΡΠΏΡΠ°Π²ΠΈΡΡ %s" - -#: lib/remote_add.tcl:164 -#, tcl-format -msgid "Setting up the %s (at %s)" -msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠ° %s (Π² %s)" - -#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34 -msgid "Delete Branch Remotely" -msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΊΠΈ Π²ΠΎ Π²Π½Π΅ΡΠ½Π΅ΠΌ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΈ" - -#: lib/remote_branch_delete.tcl:47 -msgid "From Repository" -msgstr "ΠΠ· ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ" - -#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134 -msgid "Remote:" -msgstr "Π²Π½Π΅ΡΠ½ΠΈΠΉ:" - -#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149 -msgid "Arbitrary Location:" -msgstr "Π£ΠΊΠ°Π·Π°Π½Π½ΠΎΠ΅ ΠΏΠΎΠ»ΠΎΠΆΠ΅Π½ΠΈΠ΅:" - -#: lib/remote_branch_delete.tcl:84 -msgid "Branches" -msgstr "ΠΠ΅ΡΠΊΠΈ" - -#: lib/remote_branch_delete.tcl:109 -msgid "Delete Only If" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΡΠΎΠ»ΡΠΊΠΎ Π² ΡΠ»ΡΡΠ°Π΅, Π΅ΡΠ»ΠΈ" - -#: lib/remote_branch_delete.tcl:111 -msgid "Merged Into:" -msgstr "Π‘Π»ΠΈΡΠ½ΠΈΠ΅ Ρ:" - -#: lib/remote_branch_delete.tcl:152 -msgid "A branch is required for 'Merged Into'." -msgstr "ΠΠ»Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ Β«Π‘Π»ΠΈΡΠ½ΠΈΠ΅ ΡΒ» ΡΡΠ΅Π±ΡΠ΅ΡΡΡ ΡΠΊΠ°Π·Π°ΡΡ Π²Π΅ΡΠΊΡ." - -#: lib/remote_branch_delete.tcl:184 -#, tcl-format -msgid "" -"The following branches are not completely merged into %s:\n" -"\n" -" - %s" -msgstr "Π‘Π»Π΅Π΄ΡΡΡΠΈΠ΅ Π²Π΅ΡΠΊΠΈ ΠΌΠΎΠ³ΡΡ Π±ΡΡΡ ΠΎΠ±ΡΠ΅Π΄ΠΈΠ½Π΅Π½Ρ Ρ %s ΠΏΡΠΈ ΠΏΠΎΠΌΠΎΡΠΈ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ ΡΠ»ΠΈΡΠ½ΠΈΡ:\n\n - %s" - -#: lib/remote_branch_delete.tcl:189 -#, tcl-format -msgid "" -"One or more of the merge tests failed because you have not fetched the " -"necessary commits. Try fetching from %s first." -msgstr "ΠΠ΅ΠΊΠΎΡΠΎΡΡΠ΅ ΡΠ΅ΡΡΡ Π½Π° ΡΠ»ΠΈΡΠ½ΠΈΠ΅ Π½Π΅ ΠΏΡΠΎΡΠ»ΠΈ, ΠΏΠΎΡΠΎΠΌΡ ΡΡΠΎ Π²Ρ Π½Π΅ ΠΈΠ·Π²Π»Π΅ΠΊΠ»ΠΈ Π½Π΅ΠΎΠ±Ρ
ΠΎΠ΄ΠΈΠΌΡΠ΅ ΠΊΠΎΠΌΠΌΠΈΡΡ. ΠΠΎΠΏΡΡΠ°ΠΉΡΠ΅ΡΡ ΠΈΠ·Π²Π»Π΅ΡΡ ΠΈΡ
ΠΈΠ· %s." - -#: lib/remote_branch_delete.tcl:207 -msgid "Please select one or more branches to delete." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ ΠΎΠ΄Π½Ρ ΠΈΠ»ΠΈ Π½Π΅ΡΠΊΠΎΠ»ΡΠΊΠΎ Π²Π΅ΡΠΎΠΊ Π΄Π»Ρ ΡΠ΄Π°Π»Π΅Π½ΠΈΡ." - -#: lib/remote_branch_delete.tcl:226 -#, tcl-format -msgid "Deleting branches from %s" -msgstr "Π£Π΄Π°Π»Π΅Π½ΠΈΠ΅ Π²Π΅ΡΠΎΠΊ ΠΈΠ· %s" - -#: lib/remote_branch_delete.tcl:292 -msgid "No repository selected." -msgstr "ΠΠ΅ ΡΠΊΠ°Π·Π°Π½ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ." - -#: lib/remote_branch_delete.tcl:297 -#, tcl-format -msgid "Scanning %s..." -msgstr "ΠΠ΅ΡΠ΅ΡΠΈΡΡΠ²Π°Π½ΠΈΠ΅ %sβ¦" - -#: lib/search.tcl:21 -msgid "Find:" -msgstr "ΠΠΎΠΈΡΠΊ:" - -#: lib/search.tcl:23 -msgid "Next" -msgstr "ΠΠ°Π»ΡΡΠ΅" - -#: lib/search.tcl:24 -msgid "Prev" -msgstr "ΠΠ±ΡΠ°ΡΠ½ΠΎ" - -#: lib/search.tcl:25 -msgid "Case-Sensitive" -msgstr "ΠΠ³Π½. Π±ΠΎΠ»ΡΡΠΈΠ΅/ΠΌΠ°Π»Π΅Π½ΡΠΊΠΈΠ΅" - -#: lib/shortcut.tcl:21 lib/shortcut.tcl:62 -msgid "Cannot write shortcut:" -msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΡΡΠ»ΠΊΡ:" - -#: lib/shortcut.tcl:137 -msgid "Cannot write icon:" -msgstr "ΠΠ΅Π²ΠΎΠ·ΠΌΠΎΠΆΠ½ΠΎ Π·Π°ΠΏΠΈΡΠ°ΡΡ Π·Π½Π°ΡΠΎΠΊ:" - -#: lib/spellcheck.tcl:57 -msgid "Unsupported spell checker" -msgstr "ΠΠ΅ΠΏΠΎΠ΄Π΄Π΅ΡΠΆΠΈΠ²Π°Π΅ΠΌΠ°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" - -#: lib/spellcheck.tcl:65 -msgid "Spell checking is unavailable" -msgstr "ΠΡΠΎΠ²Π΅ΡΠΊΠ° ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π½Π΅ Π΄ΠΎΡΡΡΠΏΠ½Π°" - -#: lib/spellcheck.tcl:68 -msgid "Invalid spell checking configuration" -msgstr "ΠΠ΅ΠΏΡΠ°Π²ΠΈΠ»ΡΠ½Π°Ρ ΠΊΠΎΠ½ΡΠΈΠ³ΡΡΠ°ΡΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" - -#: lib/spellcheck.tcl:70 -#, tcl-format -msgid "Reverting dictionary to %s." -msgstr "Π‘Π»ΠΎΠ²Π°ΡΡ Π²Π΅ΡΠ½ΡΡ ΠΊ %s." - -#: lib/spellcheck.tcl:73 -msgid "Spell checker silently failed on startup" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ Π½Π΅ ΡΠΌΠΎΠ³Π»Π° Π·Π°ΠΏΡΡΡΠΈΡΡΡΡ" - -#: lib/spellcheck.tcl:80 -msgid "Unrecognized spell checker" -msgstr "ΠΠ΅ΡΠ°ΡΠΏΠΎΠ·Π½Π°Π½Π½Π°Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" - -#: lib/spellcheck.tcl:186 -msgid "No Suggestions" -msgstr "ΠΡΠΏΡΠ°Π²Π»Π΅Π½ΠΈΠΉ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½ΠΎ" - -#: lib/spellcheck.tcl:388 -msgid "Unexpected EOF from spell checker" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ ΠΏΡΠ΅ΡΠ²Π°Π»Π° ΠΏΠ΅ΡΠ΅Π΄Π°ΡΡ Π΄Π°Π½Π½ΡΡ
" - -#: lib/spellcheck.tcl:392 -msgid "Spell Checker Failed" -msgstr "ΠΡΠΈΠ±ΠΊΠ° ΠΏΡΠΎΠ²Π΅ΡΠΊΠΈ ΠΏΡΠ°Π²ΠΎΠΏΠΈΡΠ°Π½ΠΈΡ" - -#: lib/sshkey.tcl:31 -msgid "No keys found." -msgstr "ΠΠ»ΡΡ Π½Π΅ Π½Π°ΠΉΠ΄Π΅Π½" - -#: lib/sshkey.tcl:34 -#, tcl-format -msgid "Found a public key in: %s" -msgstr "ΠΡΠ±Π»ΠΈΡΠ½ΡΠΉ ΠΊΠ»ΡΡ ΠΈΠ· %s" - -#: lib/sshkey.tcl:40 -msgid "Generate Key" -msgstr "Π‘ΠΎΠ·Π΄Π°ΡΡ ΠΊΠ»ΡΡ" - -#: lib/sshkey.tcl:56 -msgid "Copy To Clipboard" -msgstr "Π‘ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°ΡΡ Π² Π±ΡΡΠ΅Ρ ΠΎΠ±ΠΌΠ΅Π½Π°" - -#: lib/sshkey.tcl:70 -msgid "Your OpenSSH Public Key" -msgstr "ΠΠ°Ρ ΠΏΡΠ±Π»ΠΈΡΠ½ΡΠΉ ΠΊΠ»ΡΡ OpenSSH" - -#: lib/sshkey.tcl:78 -msgid "Generating..." -msgstr "Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅β¦" - -#: lib/sshkey.tcl:84 -#, tcl-format -msgid "" -"Could not start ssh-keygen:\n" -"\n" -"%s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π·Π°ΠΏΡΡΠΊΠ° ssh-keygen:\n\n%s" - -#: lib/sshkey.tcl:111 -msgid "Generation failed." -msgstr "ΠΠ»ΡΡ Π½Π΅ ΡΠΎΠ·Π΄Π°Π½." - -#: lib/sshkey.tcl:118 -msgid "Generation succeeded, but no keys found." -msgstr "Π‘ΠΎΠ·Π΄Π°Π½ΠΈΠ΅ ΠΊΠ»ΡΡΠ° Π·Π°Π²Π΅ΡΡΠΈΠ»ΠΎΡΡ, Π½ΠΎ ΡΠ΅Π·ΡΠ»ΡΡΠ°Ρ Π½Π΅ Π±ΡΠ» Π½Π°ΠΉΠ΄Π΅Π½" - -#: lib/sshkey.tcl:121 -#, tcl-format -msgid "Your key is in: %s" -msgstr "ΠΠ°Ρ ΠΊΠ»ΡΡ Π½Π°Ρ
ΠΎΠ΄ΠΈΡΡΡ Π²: %s" - -#: lib/status_bar.tcl:83 -#, tcl-format -msgid "%s ... %*i of %*i %s (%3i%%)" -msgstr "%s β¦ %*i ΠΈΠ· %*i %s (%3i%%)" - -#: lib/tools.tcl:75 -#, tcl-format -msgid "Running %s requires a selected file." -msgstr "ΠΠ°ΠΏΡΡΠΊ %s ΡΡΠ΅Π±ΡΠ΅Ρ Π²ΡΠ±ΡΠ°Π½Π½ΠΎΠ³ΠΎ ΡΠ°ΠΉΠ»Π°." - -#: lib/tools.tcl:90 -#, tcl-format -msgid "Are you sure you want to run %s?" -msgstr "ΠΠ΅ΠΉΡΡΠ²ΠΈΡΠ΅Π»ΡΠ½ΠΎ Π·Π°ΠΏΡΡΡΠΈΡΡ %s?" - -#: lib/tools.tcl:110 -#, tcl-format -msgid "Tool: %s" -msgstr "ΠΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ: %s" - -#: lib/tools.tcl:111 -#, tcl-format -msgid "Running: %s" -msgstr "ΠΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΠ΅: %s" - -#: lib/tools.tcl:149 -#, tcl-format -msgid "Tool completed successfully: %s" -msgstr "ΠΡΠΎΠ³ΡΠ°ΠΌΠΌΠ° %s Π·Π°Π²Π΅ΡΡΠΈΠ»Π°ΡΡ ΡΡΠΏΠ΅ΡΠ½ΠΎ." - -#: lib/tools.tcl:151 -#, tcl-format -msgid "Tool failed: %s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π²ΡΠΏΠΎΠ»Π½Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ: %s" - -#: lib/tools_dlg.tcl:22 -msgid "Add Tool" -msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΡΡ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ" - -#: lib/tools_dlg.tcl:28 -msgid "Add New Tool Command" -msgstr "ΠΠΎΠ²Π°Ρ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ" - -#: lib/tools_dlg.tcl:33 -msgid "Add globally" -msgstr "ΠΠΎΠ±Π°Π²ΠΈΡΡ Π΄Π»Ρ Π²ΡΠ΅Ρ
ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠ΅Π²" - -#: lib/tools_dlg.tcl:45 -msgid "Tool Details" -msgstr "ΠΠΏΠΈΡΠ°Π½ΠΈΠ΅ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ" - -#: lib/tools_dlg.tcl:48 -msgid "Use '/' separators to create a submenu tree:" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΡΠΉΡΠ΅ Β«/Β» Π΄Π»Ρ ΡΠΎΠ·Π΄Π°Π½ΠΈΡ ΠΏΠΎΠ΄ΠΌΠ΅Π½Ρ" - -#: lib/tools_dlg.tcl:61 -msgid "Command:" -msgstr "ΠΠΎΠΌΠ°Π½Π΄Π°:" - -#: lib/tools_dlg.tcl:74 -msgid "Show a dialog before running" -msgstr "ΠΠΎΠΊΠ°Π·Π°ΡΡ Π΄ΠΈΠ°Π»ΠΎΠ³ ΠΏΠ΅ΡΠ΅Π΄ Π·Π°ΠΏΡΡΠΊΠΎΠΌ" - -#: lib/tools_dlg.tcl:80 -msgid "Ask the user to select a revision (sets $REVISION)" -msgstr "ΠΠ°ΠΏΡΠΎΡ Π½Π° Π²ΡΠ±ΠΎΡ Π²Π΅ΡΡΠΈΠΈ (ΡΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅Ρ $REVISION)" - -#: lib/tools_dlg.tcl:85 -msgid "Ask the user for additional arguments (sets $ARGS)" -msgstr "ΠΠ°ΠΏΡΠΎΡ Π΄ΠΎΠΏΠΎΠ»Π½ΠΈΡΠ΅Π»ΡΠ½ΡΡ
Π°ΡΠ³ΡΠΌΠ΅Π½ΡΠΎΠ² (ΡΡΡΠ°Π½Π°Π²Π»ΠΈΠ²Π°Π΅Ρ $ARGS)" - -#: lib/tools_dlg.tcl:92 -msgid "Don't show the command output window" -msgstr "ΠΠ΅ ΠΏΠΎΠΊΠ°Π·ΡΠ²Π°ΡΡ ΠΎΠΊΠ½ΠΎ Π²ΡΠ²ΠΎΠ΄Π° ΠΊΠΎΠΌΠ°Π½Π΄Ρ" - -#: lib/tools_dlg.tcl:97 -msgid "Run only if a diff is selected ($FILENAME not empty)" -msgstr "ΠΠ°ΠΏΡΡΠΊ ΡΠΎΠ»ΡΠΊΠΎ Π΅ΡΠ»ΠΈ ΠΏΠΎΠΊΠ°Π·Π°Π½ ΡΠΏΠΈΡΠΎΠΊ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ($FILENAME Π½Π΅ ΠΏΡΡΡΠΎ)" - -#: lib/tools_dlg.tcl:121 -msgid "Please supply a name for the tool." -msgstr "Π£ΠΊΠ°ΠΆΠΈΡΠ΅ Π½Π°Π·Π²Π°Π½ΠΈΠ΅ Π²ΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½ΠΎΠΉ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΠΈ." - -#: lib/tools_dlg.tcl:129 -#, tcl-format -msgid "Tool '%s' already exists." -msgstr "ΠΡΠΏΠΎΠΌΠΎΠ³Π°ΡΠ΅Π»ΡΠ½Π°Ρ ΠΎΠΏΠ΅ΡΠ°ΡΠΈΡ Β«%sΒ» ΡΠΆΠ΅ ΡΡΡΠ΅ΡΡΠ²ΡΠ΅Ρ." - -#: lib/tools_dlg.tcl:151 -#, tcl-format -msgid "" -"Could not add tool:\n" -"%s" -msgstr "ΠΡΠΈΠ±ΠΊΠ° Π΄ΠΎΠ±Π°Π²Π»Π΅Π½ΠΈΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ:\n%s" - -#: lib/tools_dlg.tcl:190 -msgid "Remove Tool" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ" - -#: lib/tools_dlg.tcl:196 -msgid "Remove Tool Commands" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ ΠΊΠΎΠΌΠ°Π½Π΄Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ" - -#: lib/tools_dlg.tcl:200 -msgid "Remove" -msgstr "Π£Π΄Π°Π»ΠΈΡΡ" - -#: lib/tools_dlg.tcl:236 -msgid "(Blue denotes repository-local tools)" -msgstr "(Π‘ΠΈΠ½ΠΈΠΌ Π²ΡΠ΄Π΅Π»Π΅Π½Ρ ΠΏΡΠΎΠ³ΡΠ°ΠΌΠΌΡ Π»ΠΎΠΊΠ°Π»ΡΠ½ΡΠ΅ ΡΠ΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΡ)" - -#: lib/tools_dlg.tcl:297 -#, tcl-format -msgid "Run Command: %s" -msgstr "ΠΠ°ΠΏΡΡΠΊ ΠΊΠΎΠΌΠ°Π½Π΄Ρ: %s" - -#: lib/tools_dlg.tcl:311 -msgid "Arguments" -msgstr "ΠΡΠ³ΡΠΌΠ΅Π½ΡΡ" - -#: lib/tools_dlg.tcl:348 -msgid "OK" -msgstr "OK" - -#: lib/transport.tcl:7 -#, tcl-format -msgid "Fetching new changes from %s" -msgstr "ΠΠ·Π²Π»Π΅ΡΠ΅Π½ΠΈΠ΅ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ ΠΈΠ· %s " - -#: lib/transport.tcl:18 -#, tcl-format -msgid "remote prune %s" -msgstr "ΡΠΈΡΡΠΊΠ° Π²Π½Π΅ΡΠ½Π΅Π³ΠΎ %s" - -#: lib/transport.tcl:19 -#, tcl-format -msgid "Pruning tracking branches deleted from %s" -msgstr "Π§ΠΈΡΡΠΊΠ° ΠΎΡΡΠ»Π΅ΠΆΠΈΠ²Π°Π΅ΠΌΡΡ
Π²Π΅ΡΠΎΠΊ, ΡΠ΄Π°Π»ΡΠ½Π½ΡΡ
ΠΈΠ· %s" - -#: lib/transport.tcl:26 -#, tcl-format -msgid "Pushing changes to %s" -msgstr "ΠΡΠΏΡΠ°Π²ΠΊΠ° ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ Π² %s " - -#: lib/transport.tcl:64 -#, tcl-format -msgid "Mirroring to %s" -msgstr "Π’ΠΎΡΠ½ΠΎΠ΅ ΠΊΠΎΠΏΠΈΡΠΎΠ²Π°Π½ΠΈΠ΅ Π² %s" - -#: lib/transport.tcl:82 -#, tcl-format -msgid "Pushing %s %s to %s" -msgstr "ΠΡΠΏΡΠ°Π²ΠΊΠ° %s %s Π² %s" - -#: lib/transport.tcl:100 -msgid "Push Branches" -msgstr "ΠΡΠΏΡΠ°Π²ΠΈΡΡ Π²Π΅ΡΠΊΠΈ" - -#: lib/transport.tcl:114 -msgid "Source Branches" -msgstr "ΠΡΡ
ΠΎΠ΄Π½ΡΠ΅ Π²Π΅ΡΠΊΠΈ" - -#: lib/transport.tcl:131 -msgid "Destination Repository" -msgstr "Π Π΅ΠΏΠΎΠ·ΠΈΡΠΎΡΠΈΠΉ Π½Π°Π·Π½Π°ΡΠ΅Π½ΠΈΡ" - -#: lib/transport.tcl:169 -msgid "Transfer Options" -msgstr "ΠΠ°ΡΡΡΠΎΠΉΠΊΠΈ ΠΎΡΠΏΡΠ°Π²ΠΊΠΈ" - -#: lib/transport.tcl:171 -msgid "Force overwrite existing branch (may discard changes)" -msgstr "ΠΡΠΈΠ½ΡΠ΄ΠΈΡΠ΅Π»ΡΠ½ΠΎ ΠΏΠ΅ΡΠ΅Π·Π°ΠΏΠΈΡΠ°ΡΡ ΡΡΡΠ΅ΡΡΠ²ΡΡΡΡΡ Π²Π΅ΡΠΊΡ (Π²ΠΎΠ·ΠΌΠΎΠΆΠ½Π° ΠΏΠΎΡΠ΅ΡΡ ΠΈΠ·ΠΌΠ΅Π½Π΅Π½ΠΈΠΉ)" - -#: lib/transport.tcl:175 -msgid "Use thin pack (for slow network connections)" -msgstr "ΠΡΠΏΠΎΠ»ΡΠ·ΠΎΠ²Π°ΡΡ thin pack (Π΄Π»Ρ ΠΌΠ΅Π΄Π»Π΅Π½Π½ΡΡ
ΡΠ΅ΡΠ΅Π²ΡΡ
ΠΏΠΎΠ΄ΠΊΠ»ΡΡΠ΅Π½ΠΈΠΉ)" - -#: lib/transport.tcl:179 -msgid "Include tags" -msgstr "ΠΠ΅ΡΠ΅Π΄Π°ΡΡ ΠΌΠ΅ΡΠΊΠΈ" |