mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-05 00:37:55 +01:00
Code Activity

Merge branch 'va/i18n_2' into pu

Browse source
This commit is contained in:
Pat Thoyts 2016-10-03 23:40:50 +01:00
commit 52f2445d5c
17 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
git-gui.sh
View file

@ -3029,7 +3029,7 @@ bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
set subcommand_args {} set subcommand_args {}
proc usage {} { proc usage {} {
set s "usage: $::argv0 $::subcommand $::subcommand_args" set s "[mc usage:] $::argv0 $::subcommand $::subcommand_args"
if {[tk windowingsystem] eq "win32"} { if {[tk windowingsystem] eq "win32"} {
wm withdraw . wm withdraw .
tk_messageBox -icon info -message $s \ tk_messageBox -icon info -message $s \
@ -3161,7 +3161,7 @@ gui {
# fall through to setup UI for commits # fall through to setup UI for commits
} }
default { default {
set err "usage: $argv0 \[{blame|browser|citool}\]" set err "[mc usage:] $argv0 \[{blame|browser|citool}\]"
if {[tk windowingsystem] eq "win32"} { if {[tk windowingsystem] eq "win32"} {
wm withdraw . wm withdraw .
tk_messageBox -icon error -message $err \ tk_messageBox -icon error -message $err \

2
lib/blame.tcl
View file

@ -70,7 +70,7 @@ constructor new {i_commit i_path i_jump} {
set path $i_path set path $i_path
make_toplevel top w make_toplevel top w
wm title $top [append "[appname] ([reponame]): " [mc "File Viewer"]] wm title $top [mc "%s (%s): File Viewer" [appname] [reponame]]
set font_w [font measure font_diff "0"] set font_w [font measure font_diff "0"]

2
lib/branch_checkout.tcl
View file

@ -13,7 +13,7 @@ constructor dialog {} {
global use_ttk NS global use_ttk NS
make_dialog top w make_dialog top w
wm withdraw $w wm withdraw $w
wm title $top [append "[appname] ([reponame]): " [mc "Checkout Branch"]] wm title $top [mc "%s (%s): Checkout Branch" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

2
lib/branch_create.tcl
View file

@ -20,7 +20,7 @@ constructor dialog {} {
make_dialog top w make_dialog top w
wm withdraw $w wm withdraw $w
wm title $top [append "[appname] ([reponame]): " [mc "Create Branch"]] wm title $top [mc "%s (%s): Create Branch" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

4
lib/branch_delete.tcl
View file

@ -13,7 +13,7 @@ constructor dialog {} {
make_dialog top w make_dialog top w
wm withdraw $w wm withdraw $w
wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch"]] wm title $top [mc "%s (%s): Delete Branch" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }
@ -128,7 +128,7 @@ method _delete {} {
set b [lindex $i 0] set b [lindex $i 0]
set o [lindex $i 1] set o [lindex $i 1]
if {[catch {git branch -D $b} err]} { if {[catch {git branch -D $b} err]} {
append failed " - $b: $err\n" append failed [mc " - %s:" $b] " $err\n"
} }
} }

2
lib/branch_rename.tcl
View file

@ -12,7 +12,7 @@ constructor dialog {} {
make_dialog top w make_dialog top w
wm withdraw $w wm withdraw $w
wm title $top [append "[appname] ([reponame]): " [mc "Rename Branch"]] wm title $top [mc "%s (%s): Rename Branch" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

4
lib/browser.tcl
View file

@ -24,7 +24,7 @@ constructor new {commit {path {}}} {
global cursor_ptr M1B use_ttk NS global cursor_ptr M1B use_ttk NS
make_dialog top w make_dialog top w
wm withdraw $top wm withdraw $top
wm title $top [append "[appname] ([reponame]): " [mc "File Browser"]] wm title $top [mc "%s (%s): File Browser" [appname] [reponame]]
if {$path ne {}} { if {$path ne {}} {
if {[string index $path end] ne {/}} { if {[string index $path end] ne {/}} {
@ -272,7 +272,7 @@ constructor dialog {} {
global use_ttk NS global use_ttk NS
make_dialog top w make_dialog top w
wm withdraw $top wm withdraw $top
wm title $top [append "[appname] ([reponame]): " [mc "Browse Branch Files"]] wm title $top [mc "%s (%s): Browse Branch Files" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top . wm transient $top .

4
lib/database.tcl
View file

@ -54,7 +54,7 @@ proc do_stats {} {
set value "$value[lindex $s 2]" set value "$value[lindex $s 2]"
} }
${NS}::label $w.stat.l_$name -text "$label:" -anchor w ${NS}::label $w.stat.l_$name -text [mc "%s:" $label] -anchor w
${NS}::label $w.stat.v_$name -text $value -anchor w ${NS}::label $w.stat.v_$name -text $value -anchor w
grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5} grid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}
} }
@ -63,7 +63,7 @@ proc do_stats {} {
bind $w <Visibility> "grab $w; focus $w.buttons.close" bind $w <Visibility> "grab $w; focus $w.buttons.close"
bind $w <Key-Escape> [list destroy $w] bind $w <Key-Escape> [list destroy $w]
bind $w <Key-Return> [list destroy $w] bind $w <Key-Return> [list destroy $w]
wm title $w [append "[appname] ([reponame]): " [mc "Database Statistics"]] wm title $w [mc "%s (%s): Database Statistics" [appname] [reponame]]
wm deiconify $w wm deiconify $w
tkwait window $w tkwait window $w
} }

11
lib/diff.tcl
View file

@ -223,10 +223,9 @@ proc show_other_diff {path w m cont_info} {
} }
$ui_diff conf -state normal $ui_diff conf -state normal
if {$type eq {submodule}} { if {$type eq {submodule}} {
$ui_diff insert end [append \ $ui_diff insert end \
"* " \ "* [mc "Git Repository (subproject)"]\n" \
[mc "Git Repository (subproject)"] \ d_info
"\n"] d_info
} elseif {![catch {set type [exec file $path]}]} { } elseif {![catch {set type [exec file $path]}]} {
set n [string length $path] set n [string length $path]
if {[string equal -length $n $path $type]} { if {[string equal -length $n $path $type]} {
@ -611,7 +610,7 @@ proc apply_hunk {x y} {
puts -nonewline $p $current_diff_header puts -nonewline $p $current_diff_header
puts -nonewline $p [$ui_diff get $s_lno $e_lno] puts -nonewline $p [$ui_diff get $s_lno $e_lno]
close $p} err]} { close $p} err]} {
error_popup [append $failed_msg "\n\n$err"] error_popup "$failed_msg\n\n$err"
unlock_index unlock_index
return return
} }
@ -829,7 +828,7 @@ proc apply_range_or_line {x y} {
puts -nonewline $p $current_diff_header puts -nonewline $p $current_diff_header
puts -nonewline $p $wholepatch puts -nonewline $p $wholepatch
close $p} err]} { close $p} err]} {
error_popup [append $failed_msg "\n\n$err"] error_popup "$failed_msg\n\n$err"
} }
unlock_index unlock_index

8
lib/error.tcl
View file

@ -17,7 +17,7 @@ proc error_popup {msg} {
set cmd [list tk_messageBox \ set cmd [list tk_messageBox \
-icon error \ -icon error \
-type ok \ -type ok \
-title [append "$title: " [mc "error"]] \ -title [mc "%s: error" $title] \
-message $msg] -message $msg]
if {[winfo ismapped [_error_parent]]} { if {[winfo ismapped [_error_parent]]} {
lappend cmd -parent [_error_parent] lappend cmd -parent [_error_parent]
@ -33,7 +33,7 @@ proc warn_popup {msg} {
set cmd [list tk_messageBox \ set cmd [list tk_messageBox \
-icon warning \ -icon warning \
-type ok \ -type ok \
-title [append "$title: " [mc "warning"]] \ -title [mc "%s: warning" $title] \
-message $msg] -message $msg]
if {[winfo ismapped [_error_parent]]} { if {[winfo ismapped [_error_parent]]} {
lappend cmd -parent [_error_parent] lappend cmd -parent [_error_parent]
@ -77,7 +77,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
wm withdraw $w wm withdraw $w
${NS}::frame $w.m ${NS}::frame $w.m
${NS}::label $w.m.l1 -text "$hook hook failed:" \ ${NS}::label $w.m.l1 -text [mc "%s hook failed:" $hook] \
-anchor w \ -anchor w \
-justify left \ -justify left \
-font font_uibold -font font_uibold
@ -113,7 +113,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
bind $w <Visibility> "grab $w; focus $w" bind $w <Visibility> "grab $w; focus $w"
bind $w <Key-Return> "destroy $w" bind $w <Key-Return> "destroy $w"
wm title $w [strcat "[appname] ([reponame]): " [mc "error"]] wm title $w [mc "%s (%s): error" [appname] [reponame]]
wm deiconify $w wm deiconify $w
tkwait window $w tkwait window $w
} }

2
lib/merge.tcl
View file

@ -144,7 +144,7 @@ constructor dialog {} {
} }
make_dialog top w make_dialog top w
wm title $top [append "[appname] ([reponame]): " [mc "Merge"]] wm title $top [mc "%s (%s): Merge" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

8
lib/option.tcl
View file

@ -179,7 +179,7 @@ proc do_options {} {
i-* { i-* {
regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max regexp -- {-(\d+)\.\.(\d+)$} $type _junk min max
${NS}::frame $w.$f.$optid ${NS}::frame $w.$f.$optid
${NS}::label $w.$f.$optid.l -text "$text:" ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
pack $w.$f.$optid.l -side left -anchor w -fill x pack $w.$f.$optid.l -side left -anchor w -fill x
tspinbox $w.$f.$optid.v \ tspinbox $w.$f.$optid.v \
-textvariable ${f}_config_new($name) \ -textvariable ${f}_config_new($name) \
@ -194,7 +194,7 @@ proc do_options {} {
c - c -
t { t {
${NS}::frame $w.$f.$optid ${NS}::frame $w.$f.$optid
${NS}::label $w.$f.$optid.l -text "$text:" ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
${NS}::entry $w.$f.$optid.v \ ${NS}::entry $w.$f.$optid.v \
-width 20 \ -width 20 \
-textvariable ${f}_config_new($name) -textvariable ${f}_config_new($name)
@ -217,7 +217,7 @@ proc do_options {} {
s { s {
set opts [eval [lindex $option 3]] set opts [eval [lindex $option 3]]
${NS}::frame $w.$f.$optid ${NS}::frame $w.$f.$optid
${NS}::label $w.$f.$optid.l -text "$text:" ${NS}::label $w.$f.$optid.l -text [mc "%s:" $text]
if {$use_ttk} { if {$use_ttk} {
ttk::combobox $w.$f.$optid.v \ ttk::combobox $w.$f.$optid.v \
-textvariable ${f}_config_new($name) \ -textvariable ${f}_config_new($name) \
@ -279,7 +279,7 @@ proc do_options {} {
[font configure $font -size] [font configure $font -size]
${NS}::frame $w.global.$name ${NS}::frame $w.global.$name
${NS}::label $w.global.$name.l -text "$text:" ${NS}::label $w.global.$name.l -text [mc "%s:" $text]
${NS}::button $w.global.$name.b \ ${NS}::button $w.global.$name.b \
-text [mc "Change Font"] \ -text [mc "Change Font"] \
-command [list \ -command [list \

2
lib/remote_add.tcl
View file

@ -17,7 +17,7 @@ constructor dialog {} {
make_dialog top w make_dialog top w
wm withdraw $top wm withdraw $top
wm title $top [append "[appname] ([reponame]): " [mc "Add Remote"]] wm title $top [mc "%s (%s): Add Remote" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

2
lib/remote_branch_delete.tcl
View file

@ -26,7 +26,7 @@ constructor dialog {} {
global all_remotes M1B use_ttk NS global all_remotes M1B use_ttk NS
make_dialog top w make_dialog top w
wm title $top [append "[appname] ([reponame]): " [mc "Delete Branch Remotely"]] wm title $top [mc "%s (%s): Delete Branch Remotely" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
} }

6
lib/shortcut.tcl
View file

@ -5,7 +5,7 @@ proc do_windows_shortcut {} {
global _gitworktree global _gitworktree
set fn [tk_getSaveFile \ set fn [tk_getSaveFile \
-parent . \ -parent . \
-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \
-initialfile "Git [reponame].lnk"] -initialfile "Git [reponame].lnk"]
if {$fn != {}} { if {$fn != {}} {
if {[file extension $fn] ne {.lnk}} { if {[file extension $fn] ne {.lnk}} {
@ -40,7 +40,7 @@ proc do_cygwin_shortcut {} {
} }
set fn [tk_getSaveFile \ set fn [tk_getSaveFile \
-parent . \ -parent . \
-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \
-initialdir $desktop \ -initialdir $desktop \
-initialfile "Git [reponame].lnk"] -initialfile "Git [reponame].lnk"]
if {$fn != {}} { if {$fn != {}} {
@ -72,7 +72,7 @@ proc do_macosx_app {} {
set fn [tk_getSaveFile \ set fn [tk_getSaveFile \
-parent . \ -parent . \
-title [append "[appname] ([reponame]): " [mc "Create Desktop Icon"]] \ -title [mc "%s (%s): Create Desktop Icon" [appname] [reponame]] \
-initialdir [file join $env(HOME) Desktop] \ -initialdir [file join $env(HOME) Desktop] \
-initialfile "Git [reponame].app"] -initialfile "Git [reponame].app"]
if {$fn != {}} { if {$fn != {}} {

6
lib/tools_dlg.tcl
View file

@ -19,7 +19,7 @@ constructor dialog {} {
global repo_config use_ttk NS global repo_config use_ttk NS
make_dialog top w make_dialog top w
wm title $top [append "[appname] ([reponame]): " [mc "Add Tool"]] wm title $top [mc "%s (%s): Add Tool" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top . wm transient $top .
@ -184,7 +184,7 @@ constructor dialog {} {
load_config 1 load_config 1
make_dialog top w make_dialog top w
wm title $top [append "[appname] ([reponame]): " [mc "Remove Tool"]] wm title $top [mc "%s (%s): Remove Tool" [appname] [reponame]]
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top . wm transient $top .
@ -280,7 +280,7 @@ constructor dialog {fullname} {
} }
make_dialog top w -autodelete 0 make_dialog top w -autodelete 0
wm title $top [append "[appname] ([reponame]): " $title] wm title $top "[mc "%s (%s):" [appname] [reponame]] $title"
if {$top ne {.}} { if {$top ne {.}} {
wm geometry $top "+[winfo rootx .]+[winfo rooty .]" wm geometry $top "+[winfo rootx .]+[winfo rooty .]"
wm transient $top . wm transient $top .

2
lib/transport.tcl
View file

@ -226,7 +226,7 @@ proc do_push_anywhere {} {
bind $w <Visibility> "grab $w; focus $w.buttons.create" bind $w <Visibility> "grab $w; focus $w.buttons.create"
bind $w <Key-Escape> "destroy $w" bind $w <Key-Escape> "destroy $w"
bind $w <Key-Return> [list start_push_anywhere_action $w] bind $w <Key-Return> [list start_push_anywhere_action $w]
wm title $w [append "[appname] ([reponame]): " [mc "Push"]] wm title $w [mc "%s (%s): Push" [appname] [reponame]]
wm deiconify $w wm deiconify $w
tkwait window $w tkwait window $w
} }