Add po/git-gui.pot

diff --git a/lib/option.tcl b/lib/option.tcl
index ae19a8f9cf3901a808c85f0c028fbf44813d30b5..31c7d47f358c9821eb6ab991ec7bf1c25c62071e 100644 (file)
--- a/lib/option.tcl
+++ b/lib/option.tcl
@@ -62,7 +62,7 @@ proc do_about {} {
        toplevel $w
        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 
-       label $w.header -text "About [appname]" \
+       label $w.header -text [mc "About %s" [appname]] \
                -font font_uibold
        pack $w.header -side top -fill x
 
@@ -74,8 +74,7 @@ proc do_about {} {
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
        label $w.desc \
-               -text "git-gui - a graphical user interface for Git.
-$copyright" \
+               -text "[mc "git-gui - a graphical user interface for Git."]\n$copyright" \
                -padx 5 -pady 5 \
                -justify left \
                -anchor w \
@@ -95,6 +94,7 @@ $copyright" \
        }
 
        set d {}
+       append d "git wrapper: $::_git\n"
        append d "git exec dir: [gitexec]\n"
        append d "git-gui lib: $oguilib"
 
@@ -156,47 +156,48 @@ proc do_options {} {
        toplevel $w
        wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
 
-       label $w.header -text "Options" \
+       label $w.header -text [mc "Options"] \
                -font font_uibold
        pack $w.header -side top -fill x
 
        frame $w.buttons
-       button $w.buttons.restore -text {Restore Defaults} \
+       button $w.buttons.restore -text [mc "Restore Defaults"] \
                -default normal \
                -command do_restore_defaults
        pack $w.buttons.restore -side left
-       button $w.buttons.save -text Save \
+       button $w.buttons.save -text [mc Save] \
                -default active \
                -command [list do_save_config $w]
        pack $w.buttons.save -side right
-       button $w.buttons.cancel -text {Cancel} \
+       button $w.buttons.cancel -text [mc "Cancel"] \
                -default normal \
                -command [list destroy $w]
        pack $w.buttons.cancel -side right -padx 5
        pack $w.buttons -side bottom -fill x -pady 10 -padx 10
 
-       labelframe $w.repo -text "[reponame] Repository"
-       labelframe $w.global -text {Global (All Repositories)}
+       labelframe $w.repo -text [mc "%s Repository" [reponame]]
+       labelframe $w.global -text [mc "Global (All Repositories)"]
        pack $w.repo -side left -fill both -expand 1 -pady 5 -padx 5
        pack $w.global -side right -fill both -expand 1 -pady 5 -padx 5
 
        set optid 0
        foreach option {
-               {t user.name {User Name}}
-               {t user.email {Email Address}}
-
-               {b merge.summary {Summarize Merge Commits}}
-               {i-1..5 merge.verbosity {Merge Verbosity}}
-               {b merge.diffstat {Show Diffstat After Merge}}
-
-               {b gui.trustmtime  {Trust File Modification Timestamps}}
-               {b gui.pruneduringfetch {Prune Tracking Branches During Fetch}}
-               {i-0..99 gui.diffcontext {Number of Diff Context Lines}}
-               {t gui.newbranchtemplate {New Branch Name Template}}
+               {t user.name {mc "User Name"}}
+               {t user.email {mc "Email Address"}}
+
+               {b merge.summary {mc "Summarize Merge Commits"}}
+               {i-1..5 merge.verbosity {mc "Merge Verbosity"}}
+               {b merge.diffstat {mc "Show Diffstat After Merge"}}
+
+               {b gui.trustmtime  {mc "Trust File Modification Timestamps"}}
+               {b gui.pruneduringfetch {mc "Prune Tracking Branches During Fetch"}}
+               {b gui.matchtrackingbranch {mc "Match Tracking Branches"}}
+               {i-0..99 gui.diffcontext {mc "Number of Diff Context Lines"}}
+               {t gui.newbranchtemplate {mc "New Branch Name Template"}}
                } {
                set type [lindex $option 0]
                set name [lindex $option 1]
-               set text [lindex $option 2]
+               set text [eval [lindex $option 2]]
                incr optid
                foreach f {repo global} {
                        switch -glob -- $type {
@@ -244,7 +245,7 @@ proc do_options {} {
        foreach option $font_descs {
                set name [lindex $option 0]
                set font [lindex $option 1]
-               set text [lindex $option 2]
+               set text [eval [lindex $option 2]]
 
                set global_config_new(gui.$font^^family) \
                        [font configure $font -family]
@@ -270,7 +271,7 @@ proc do_options {} {
        bind $w <Visibility> "grab $w; focus $w.buttons.save"
        bind $w <Key-Escape> "destroy $w"
        bind $w <Key-Return> [list do_save_config $w]
-       wm title $w "[appname] ([reponame]): Options"
+       wm title $w [append "[appname] ([reponame]): " [mc "Options"]]
        tkwait window $w
 }
 
@@ -301,7 +302,7 @@ proc do_restore_defaults {} {
 
 proc do_save_config {w} {
        if {[catch {save_config} err]} {
-               error_popup "Failed to completely save options:\n\n$err"
+               error_popup [append [mc "Failed to completely save options:"] "\n\n$err"]
        }
        reshow_diff
        destroy $w