{"thread":{"id":"42260","subject":"[PATCH 2/5] git-gui i18n: internationalize use of colon punctuation","startedAt":"2016-05-08T10:52:54Z","lastAt":"2016-10-03T12:58:02Z","messageCount":8,"participants":["Vasco Almeida","Pat Thoyts"],"isPatch":true,"patchVersion":1,"patchTotal":5},"messages":[{"id":"285883","messageId":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","threadId":"42260","inReplyTo":null,"subject":"[PATCH 1/5] git-gui i18n: mark strings for translation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-05-08T10:52:54Z","receivedAt":"2016-05-08T10:52:54Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Mark strings for translation in lib/index.tcl that were seemingly\nleft behind by 700e560 (\"git-gui: Mark forgotten strings for\ntranslation.\", 2008-09-04) which marks string in do_revert_selection\nprocedure.\nThese strings are passed to unstage_help and add_helper procedures.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n lib/index.tcl | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)\n\ndiff --git a/lib/index.tcl b/lib/index.tcl\nindex 74a81a7..3a3e534 100644\n--- a/lib/index.tcl\n+++ b/lib/index.tcl\n@@ -291,7 +291,7 @@ proc do_unstage_selection {} {\n \n \tif {[array size selected_paths] > 0} {\n \t\tunstage_helper \\\n-\t\t\t{Unstaging selected files from commit} \\\n+\t\t\t[mc \"Unstaging selected files from commit\"] \\\n \t\t\t[array names selected_paths]\n \t} elseif {$current_diff_path ne {}} {\n \t\tunstage_helper \\\n@@ -343,7 +343,7 @@ proc do_add_selection {} {\n \n \tif {[array size selected_paths] > 0} {\n \t\tadd_helper \\\n-\t\t\t{Adding selected files} \\\n+\t\t\t[mc \"Adding selected files\"] \\\n \t\t\t[array names selected_paths]\n \t} elseif {$current_diff_path ne {}} {\n \t\tadd_helper \\\n@@ -385,7 +385,7 @@ proc do_add_all {} {\n \t\t\tset paths [concat $paths $untracked_paths]\n \t\t}\n \t}\n-\tadd_helper {Adding all changed files} $paths\n+\tadd_helper [mc \"Adding all changed files\"] $paths\n }\n \n proc revert_helper {txt paths} {\n-- \n2.7.3\n"},{"id":"285882","messageId":"1462704778-4722-2-git-send-email-vascomalmeida@sapo.pt","threadId":"42260","inReplyTo":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 2/5] git-gui i18n: internationalize use of colon punctuation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-05-08T10:52:55Z","receivedAt":"2016-05-08T10:52:55Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Internationalize use of colon punctuation ':' in options window, windows\ntitles, database statistics window. Some languages might use a different\nstyle, for instance French uses \"User Name :\" (space before colon).\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n lib/branch_delete.tcl | 2 +-\n lib/database.tcl      | 2 +-\n lib/error.tcl         | 2 +-\n lib/option.tcl        | 8 ++++----\n 4 files changed, 7 insertions(+), 7 deletions(-)\n\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex 867938e..9aef0c9 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -128,7 +128,7 @@ method _delete {} {\n \t\tset b [lindex $i 0]\n \t\tset o [lindex $i 1]\n \t\tif {[catch {git branch -D $b} err]} {\n-\t\t\tappend failed \" - $b: $err\\n\"\n+\t\t\tappend failed [mc \" - %s:\" $b] \" $err\\n\"\n \t\t}\n \t}\n \ndiff --git a/lib/database.tcl b/lib/database.tcl\nindex 1f187ed..8bd4b8e 100644\n--- a/lib/database.tcl\n+++ b/lib/database.tcl\n@@ -54,7 +54,7 @@ proc do_stats {} {\n \t\t\tset value \"$value[lindex $s 2]\"\n \t\t}\n \n-\t\t${NS}::label $w.stat.l_$name -text \"$label:\" -anchor w\n+\t\t${NS}::label $w.stat.l_$name -text [mc \"%s:\" $label] -anchor w\n \t\t${NS}::label $w.stat.v_$name -text $value -anchor w\n \t\tgrid $w.stat.l_$name $w.stat.v_$name -sticky we -padx {0 5}\n \t}\ndiff --git a/lib/error.tcl b/lib/error.tcl\nindex c0fa69a..9b7d229 100644\n--- a/lib/error.tcl\n+++ b/lib/error.tcl\n@@ -113,7 +113,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {\n \n \tbind $w <Visibility> \"grab $w; focus $w\"\n \tbind $w <Key-Return> \"destroy $w\"\n-\twm title $w [strcat \"[appname] ([reponame]): \" [mc \"error\"]]\n+\twm title $w [mc \"%s (%s): error\" [appname] [reponame]]\n \twm deiconify $w\n \ttkwait window $w\n }\ndiff --git a/lib/option.tcl b/lib/option.tcl\nindex b5b6b2f..e43971b 100644\n--- a/lib/option.tcl\n+++ b/lib/option.tcl\n@@ -179,7 +179,7 @@ proc do_options {} {\n \t\t\ti-* {\n \t\t\t\tregexp -- {-(\\d+)\\.\\.(\\d+)$} $type _junk min max\n \t\t\t\t${NS}::frame $w.$f.$optid\n-\t\t\t\t${NS}::label $w.$f.$optid.l -text \"$text:\"\n+\t\t\t\t${NS}::label $w.$f.$optid.l -text [mc \"%s:\" $text]\n \t\t\t\tpack $w.$f.$optid.l -side left -anchor w -fill x\n \t\t\t\ttspinbox $w.$f.$optid.v \\\n \t\t\t\t\t-textvariable ${f}_config_new($name) \\\n@@ -194,7 +194,7 @@ proc do_options {} {\n \t\t\tc -\n \t\t\tt {\n \t\t\t\t${NS}::frame $w.$f.$optid\n-\t\t\t\t${NS}::label $w.$f.$optid.l -text \"$text:\"\n+\t\t\t\t${NS}::label $w.$f.$optid.l -text [mc \"%s:\" $text]\n \t\t\t\t${NS}::entry $w.$f.$optid.v \\\n \t\t\t\t\t-width 20 \\\n \t\t\t\t\t-textvariable ${f}_config_new($name)\n@@ -217,7 +217,7 @@ proc do_options {} {\n \t\t\ts {\n \t\t\t\tset opts [eval [lindex $option 3]]\n \t\t\t\t${NS}::frame $w.$f.$optid\n-\t\t\t\t${NS}::label $w.$f.$optid.l -text \"$text:\"\n+\t\t\t\t${NS}::label $w.$f.$optid.l -text [mc \"%s:\" $text]\n \t\t\t\tif {$use_ttk} {\n \t\t\t\t\tttk::combobox $w.$f.$optid.v \\\n \t\t\t\t\t\t-textvariable ${f}_config_new($name) \\\n@@ -279,7 +279,7 @@ proc do_options {} {\n \t\t\t[font configure $font -size]\n \n \t\t${NS}::frame $w.global.$name\n-\t\t${NS}::label $w.global.$name.l -text \"$text:\"\n+\t\t${NS}::label $w.global.$name.l -text [mc \"%s:\" $text]\n \t\t${NS}::button $w.global.$name.b \\\n \t\t\t-text [mc \"Change Font\"] \\\n \t\t\t-command [list \\\n-- \n2.7.3\n"},{"id":"285884","messageId":"1462704778-4722-3-git-send-email-vascomalmeida@sapo.pt","threadId":"42260","inReplyTo":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 3/5] git-gui i18n: mark \"usage:\" strings for translation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-05-08T10:52:56Z","receivedAt":"2016-05-08T10:52:56Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Mark command-line \"usage:\" string for translation in git-gui.sh.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n git-gui.sh | 4 ++--\n 1 file changed, 2 insertions(+), 2 deletions(-)\n\ndiff --git a/git-gui.sh b/git-gui.sh\nindex 11048c7..4ae344f 100755\n--- a/git-gui.sh\n+++ b/git-gui.sh\n@@ -3007,7 +3007,7 @@ bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}\n \n set subcommand_args {}\n proc usage {} {\n-\tset s \"usage: $::argv0 $::subcommand $::subcommand_args\"\n+\tset s \"[mc usage:] $::argv0 $::subcommand $::subcommand_args\"\n \tif {[tk windowingsystem] eq \"win32\"} {\n \t\twm withdraw .\n \t\ttk_messageBox -icon info -message $s \\\n@@ -3139,7 +3139,7 @@ gui {\n \t# fall through to setup UI for commits\n }\n default {\n-\tset err \"usage: $argv0 \\[{blame|browser|citool}\\]\"\n+\tset err \"[mc usage:] $argv0 \\[{blame|browser|citool}\\]\"\n \tif {[tk windowingsystem] eq \"win32\"} {\n \t\twm withdraw .\n \t\ttk_messageBox -icon error -message $err \\\n-- \n2.7.3\n"},{"id":"285886","messageId":"1462704778-4722-4-git-send-email-vascomalmeida@sapo.pt","threadId":"42260","inReplyTo":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 4/5] git-gui: fix incorrect use of Tcl append command","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-05-08T10:52:57Z","receivedAt":"2016-05-08T10:52:57Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Fix wrong use of append command in strings marked for translation.\nAccording to Tcl/Tk Documentation [1],\n\tappend varName ?value value value ...?\nappends all value arguments to the current value of variable varName.\nThis means that\n\tappend \"[appname] ([reponame]): \" [mc \"File Viewer\"]\nis setting a variable named \"[appname] ([reponame]): \" to the output of\n[mc \"File Viewer\"], rather than returning the concatenation of both\nexpressions as one might expect.\n\nThe format for some strings enables, for instance, a French translator\nto translate like \"%s (%s) : Create Branch\" (space before colon).\nConversely, strings already translated will be marked as fuzzy and the\ntranslator must update them herself.\n\nFor some cases, use alternative way for concatenation instead of using\nstrcat procedure defined in git-gui.sh.\n\nReference: 31bb1d1 (\"git-gui: Paper bag fix missing translated strings\",\n2007-09-14) fixes the same issue slightly differently.\n\n[1] http://www.tcl.tk/man/tcl/TclCmd/append.htm\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n lib/blame.tcl                |  2 +-\n lib/branch_checkout.tcl      |  2 +-\n lib/branch_create.tcl        |  2 +-\n lib/branch_delete.tcl        |  2 +-\n lib/branch_rename.tcl        |  2 +-\n lib/browser.tcl              |  4 ++--\n lib/database.tcl             |  2 +-\n lib/diff.tcl                 | 11 +++++------\n lib/error.tcl                |  4 ++--\n lib/merge.tcl                |  2 +-\n lib/remote_add.tcl           |  2 +-\n lib/remote_branch_delete.tcl |  2 +-\n lib/shortcut.tcl             |  6 +++---\n lib/tools_dlg.tcl            |  6 +++---\n lib/transport.tcl            |  2 +-\n 15 files changed, 25 insertions(+), 26 deletions(-)\n\ndiff --git a/lib/blame.tcl b/lib/blame.tcl\nindex b1d15f4..a1aeb8b 100644\n--- a/lib/blame.tcl\n+++ b/lib/blame.tcl\n@@ -70,7 +70,7 @@ constructor new {i_commit i_path i_jump} {\n \tset path   $i_path\n \n \tmake_toplevel top w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Viewer\"]]\n+\twm title $top [mc \"%s (%s): File Viewer\" [appname] [reponame]]\n \n \tset font_w [font measure font_diff \"0\"]\n \ndiff --git a/lib/branch_checkout.tcl b/lib/branch_checkout.tcl\nindex 2e459a8..d06037d 100644\n--- a/lib/branch_checkout.tcl\n+++ b/lib/branch_checkout.tcl\n@@ -13,7 +13,7 @@ constructor dialog {} {\n \tglobal use_ttk NS\n \tmake_dialog top w\n \twm withdraw $w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Checkout Branch\"]]\n+\twm title $top [mc \"%s (%s): Checkout Branch\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/branch_create.tcl b/lib/branch_create.tcl\nindex 4bb9077..ba367d5 100644\n--- a/lib/branch_create.tcl\n+++ b/lib/branch_create.tcl\n@@ -20,7 +20,7 @@ constructor dialog {} {\n \n \tmake_dialog top w\n \twm withdraw $w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Create Branch\"]]\n+\twm title $top [mc \"%s (%s): Create Branch\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\nindex 9aef0c9..a505163 100644\n--- a/lib/branch_delete.tcl\n+++ b/lib/branch_delete.tcl\n@@ -13,7 +13,7 @@ constructor dialog {} {\n \n \tmake_dialog top w\n \twm withdraw $w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Branch\"]]\n+\twm title $top [mc \"%s (%s): Delete Branch\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/branch_rename.tcl b/lib/branch_rename.tcl\nindex 6e510ec..3a2d79a 100644\n--- a/lib/branch_rename.tcl\n+++ b/lib/branch_rename.tcl\n@@ -12,7 +12,7 @@ constructor dialog {} {\n \n \tmake_dialog top w\n \twm withdraw $w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Rename Branch\"]]\n+\twm title $top [mc \"%s (%s): Rename Branch\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/browser.tcl b/lib/browser.tcl\nindex 0328338..1580493 100644\n--- a/lib/browser.tcl\n+++ b/lib/browser.tcl\n@@ -24,7 +24,7 @@ constructor new {commit {path {}}} {\n \tglobal cursor_ptr M1B use_ttk NS\n \tmake_dialog top w\n \twm withdraw $top\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Browser\"]]\n+\twm title $top [mc \"%s (%s): File Browser\" [appname] [reponame]]\n \n \tif {$path ne {}} {\n \t\tif {[string index $path end] ne {/}} {\n@@ -272,7 +272,7 @@ constructor dialog {} {\n \tglobal use_ttk NS\n \tmake_dialog top w\n \twm withdraw $top\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Browse Branch Files\"]]\n+\twm title $top [mc \"%s (%s): Browse Branch Files\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t\twm transient $top .\ndiff --git a/lib/database.tcl b/lib/database.tcl\nindex 8bd4b8e..8578308 100644\n--- a/lib/database.tcl\n+++ b/lib/database.tcl\n@@ -63,7 +63,7 @@ proc do_stats {} {\n \tbind $w <Visibility> \"grab $w; focus $w.buttons.close\"\n \tbind $w <Key-Escape> [list destroy $w]\n \tbind $w <Key-Return> [list destroy $w]\n-\twm title $w [append \"[appname] ([reponame]): \" [mc \"Database Statistics\"]]\n+\twm title $w [mc \"%s (%s): Database Statistics\" [appname] [reponame]]\n \twm deiconify $w\n \ttkwait window $w\n }\ndiff --git a/lib/diff.tcl b/lib/diff.tcl\nindex 0d56986..1228ce2 100644\n--- a/lib/diff.tcl\n+++ b/lib/diff.tcl\n@@ -220,10 +220,9 @@ proc show_other_diff {path w m cont_info} {\n \t\t}\n \t\t$ui_diff conf -state normal\n \t\tif {$type eq {submodule}} {\n-\t\t\t$ui_diff insert end [append \\\n-\t\t\t\t\"* \" \\\n-\t\t\t\t[mc \"Git Repository (subproject)\"] \\\n-\t\t\t\t\"\\n\"] d_info\n+\t\t\t$ui_diff insert end \\\n+\t\t\t\t\"* [mc \"Git Repository (subproject)\"]\\n\" \\\n+\t\t\t\td_info\n \t\t} elseif {![catch {set type [exec file $path]}]} {\n \t\t\tset n [string length $path]\n \t\t\tif {[string equal -length $n $path $type]} {\n@@ -608,7 +607,7 @@ proc apply_hunk {x y} {\n \t\tputs -nonewline $p $current_diff_header\n \t\tputs -nonewline $p [$ui_diff get $s_lno $e_lno]\n \t\tclose $p} err]} {\n-\t\terror_popup [append $failed_msg \"\\n\\n$err\"]\n+\t\terror_popup \"$failed_msg\\n\\n$err\"\n \t\tunlock_index\n \t\treturn\n \t}\n@@ -826,7 +825,7 @@ proc apply_range_or_line {x y} {\n \t\tputs -nonewline $p $current_diff_header\n \t\tputs -nonewline $p $wholepatch\n \t\tclose $p} err]} {\n-\t\terror_popup [append $failed_msg \"\\n\\n$err\"]\n+\t\terror_popup \"$failed_msg\\n\\n$err\"\n \t}\n \n \tunlock_index\ndiff --git a/lib/error.tcl b/lib/error.tcl\nindex 9b7d229..71dc860 100644\n--- a/lib/error.tcl\n+++ b/lib/error.tcl\n@@ -17,7 +17,7 @@ proc error_popup {msg} {\n \tset cmd [list tk_messageBox \\\n \t\t-icon error \\\n \t\t-type ok \\\n-\t\t-title [append \"$title: \" [mc \"error\"]] \\\n+\t\t-title [mc \"%s: error\" $title] \\\n \t\t-message $msg]\n \tif {[winfo ismapped [_error_parent]]} {\n \t\tlappend cmd -parent [_error_parent]\n@@ -33,7 +33,7 @@ proc warn_popup {msg} {\n \tset cmd [list tk_messageBox \\\n \t\t-icon warning \\\n \t\t-type ok \\\n-\t\t-title [append \"$title: \" [mc \"warning\"]] \\\n+\t\t-title [mc \"%s: warning\" $title] \\\n \t\t-message $msg]\n \tif {[winfo ismapped [_error_parent]]} {\n \t\tlappend cmd -parent [_error_parent]\ndiff --git a/lib/merge.tcl b/lib/merge.tcl\nindex 460d32f..b2de109 100644\n--- a/lib/merge.tcl\n+++ b/lib/merge.tcl\n@@ -149,7 +149,7 @@ constructor dialog {} {\n \t}\n \n \tmake_dialog top w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Merge\"]]\n+\twm title $top [mc \"%s (%s): Merge\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/remote_add.tcl b/lib/remote_add.tcl\nindex 50029d0..480a6b3 100644\n--- a/lib/remote_add.tcl\n+++ b/lib/remote_add.tcl\n@@ -17,7 +17,7 @@ constructor dialog {} {\n \n \tmake_dialog top w\n \twm withdraw $top\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Add Remote\"]]\n+\twm title $top [mc \"%s (%s): Add Remote\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\nindex fcc06d0..5ba9fca 100644\n--- a/lib/remote_branch_delete.tcl\n+++ b/lib/remote_branch_delete.tcl\n@@ -26,7 +26,7 @@ constructor dialog {} {\n \tglobal all_remotes M1B use_ttk NS\n \n \tmake_dialog top w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Branch Remotely\"]]\n+\twm title $top [mc \"%s (%s): Delete Branch Remotely\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t}\ndiff --git a/lib/shortcut.tcl b/lib/shortcut.tcl\nindex 78878ef..135086b 100644\n--- a/lib/shortcut.tcl\n+++ b/lib/shortcut.tcl\n@@ -5,7 +5,7 @@ proc do_windows_shortcut {} {\n \tglobal _gitworktree\n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n \t\t-initialfile \"Git [reponame].lnk\"]\n \tif {$fn != {}} {\n \t\tif {[file extension $fn] ne {.lnk}} {\n@@ -37,7 +37,7 @@ proc do_cygwin_shortcut {} {\n \t}\n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n \t\t-initialdir $desktop \\\n \t\t-initialfile \"Git [reponame].lnk\"]\n \tif {$fn != {}} {\n@@ -69,7 +69,7 @@ proc do_macosx_app {} {\n \n \tset fn [tk_getSaveFile \\\n \t\t-parent . \\\n-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n \t\t-initialdir [file join $env(HOME) Desktop] \\\n \t\t-initialfile \"Git [reponame].app\"]\n \tif {$fn != {}} {\ndiff --git a/lib/tools_dlg.tcl b/lib/tools_dlg.tcl\nindex 7eeda9d..c05413c 100644\n--- a/lib/tools_dlg.tcl\n+++ b/lib/tools_dlg.tcl\n@@ -19,7 +19,7 @@ constructor dialog {} {\n \tglobal repo_config use_ttk NS\n \n \tmake_dialog top w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Add Tool\"]]\n+\twm title $top [mc \"%s (%s): Add Tool\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t\twm transient $top .\n@@ -184,7 +184,7 @@ constructor dialog {} {\n \tload_config 1\n \n \tmake_dialog top w\n-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Remove Tool\"]]\n+\twm title $top [mc \"%s (%s): Remove Tool\" [appname] [reponame]]\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t\twm transient $top .\n@@ -280,7 +280,7 @@ constructor dialog {fullname} {\n \t}\n \n \tmake_dialog top w -autodelete 0\n-\twm title $top [append \"[appname] ([reponame]): \" $title]\n+\twm title $top \"[mc \"%s (%s):\" [appname] [reponame]] $title\"\n \tif {$top ne {.}} {\n \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n \t\twm transient $top .\ndiff --git a/lib/transport.tcl b/lib/transport.tcl\nindex e5d211e..a1a424a 100644\n--- a/lib/transport.tcl\n+++ b/lib/transport.tcl\n@@ -226,7 +226,7 @@ proc do_push_anywhere {} {\n \tbind $w <Visibility> \"grab $w; focus $w.buttons.create\"\n \tbind $w <Key-Escape> \"destroy $w\"\n \tbind $w <Key-Return> [list start_push_anywhere_action $w]\n-\twm title $w [append \"[appname] ([reponame]): \" [mc \"Push\"]]\n+\twm title $w [mc \"%s (%s): Push\" [appname] [reponame]]\n \twm deiconify $w\n \ttkwait window $w\n }\n-- \n2.7.3\n"},{"id":"285885","messageId":"1462704778-4722-5-git-send-email-vascomalmeida@sapo.pt","threadId":"42260","inReplyTo":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","subject":"[PATCH 5/5] git-gui i18n: mark string in lib/error.tcl for translation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-05-08T10:52:58Z","receivedAt":"2016-05-08T10:52:58Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"Mark string \"$hook hook failed:\" in lib/error.tcl for translation.\n\nSigned-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n---\n lib/error.tcl | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/lib/error.tcl b/lib/error.tcl\nindex 71dc860..8968a57 100644\n--- a/lib/error.tcl\n+++ b/lib/error.tcl\n@@ -77,7 +77,7 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {\n \twm withdraw $w\n \n \t${NS}::frame $w.m\n-\t${NS}::label $w.m.l1 -text \"$hook hook failed:\" \\\n+\t${NS}::label $w.m.l1 -text [mc \"%s hook failed:\" $hook] \\\n \t\t-anchor w \\\n \t\t-justify left \\\n \t\t-font font_uibold\n-- \n2.7.3\n"},{"id":"303078","messageId":"87a8elwx1g.fsf@red.patthoyts.tk","threadId":"42260","inReplyTo":"1462704778-4722-4-git-send-email-vascomalmeida@sapo.pt","subject":"Re: [PATCH 4/5] git-gui: fix incorrect use of Tcl append command","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2016-10-03T10:23:55Z","receivedAt":"2016-10-03T10:24:06Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Vasco Almeida <vascomalmeida@sapo.pt> writes:\n\n>Fix wrong use of append command in strings marked for translation.\n>According to Tcl/Tk Documentation [1],\n>\tappend varName ?value value value ...?\n>appends all value arguments to the current value of variable varName.\n>This means that\n>\tappend \"[appname] ([reponame]): \" [mc \"File Viewer\"]\n>is setting a variable named \"[appname] ([reponame]): \" to the output of\n>[mc \"File Viewer\"], rather than returning the concatenation of both\n>expressions as one might expect.\n>\n>The format for some strings enables, for instance, a French translator\n>to translate like \"%s (%s) : Create Branch\" (space before colon).\n>Conversely, strings already translated will be marked as fuzzy and the\n>translator must update them herself.\n>\n>For some cases, use alternative way for concatenation instead of using\n>strcat procedure defined in git-gui.sh.\n>\n>Reference: 31bb1d1 (\"git-gui: Paper bag fix missing translated strings\",\n>2007-09-14) fixes the same issue slightly differently.\n>\n>[1] http://www.tcl.tk/man/tcl/TclCmd/append.htm\n>\n>Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n>---\n> lib/blame.tcl                |  2 +-\n> lib/branch_checkout.tcl      |  2 +-\n> lib/branch_create.tcl        |  2 +-\n> lib/branch_delete.tcl        |  2 +-\n> lib/branch_rename.tcl        |  2 +-\n> lib/browser.tcl              |  4 ++--\n> lib/database.tcl             |  2 +-\n> lib/diff.tcl                 | 11 +++++------\n> lib/error.tcl                |  4 ++--\n> lib/merge.tcl                |  2 +-\n> lib/remote_add.tcl           |  2 +-\n> lib/remote_branch_delete.tcl |  2 +-\n> lib/shortcut.tcl             |  6 +++---\n> lib/tools_dlg.tcl            |  6 +++---\n> lib/transport.tcl            |  2 +-\n> 15 files changed, 25 insertions(+), 26 deletions(-)\n>\n>diff --git a/lib/blame.tcl b/lib/blame.tcl\n>index b1d15f4..a1aeb8b 100644\n>--- a/lib/blame.tcl\n>+++ b/lib/blame.tcl\n>@@ -70,7 +70,7 @@ constructor new {i_commit i_path i_jump} {\n> \tset path   $i_path\n> \n> \tmake_toplevel top w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Viewer\"]]\n>+\twm title $top [mc \"%s (%s): File Viewer\" [appname] [reponame]]\n> \n> \tset font_w [font measure font_diff \"0\"]\n> \n>diff --git a/lib/branch_checkout.tcl b/lib/branch_checkout.tcl\n>index 2e459a8..d06037d 100644\n>--- a/lib/branch_checkout.tcl\n>+++ b/lib/branch_checkout.tcl\n>@@ -13,7 +13,7 @@ constructor dialog {} {\n> \tglobal use_ttk NS\n> \tmake_dialog top w\n> \twm withdraw $w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Checkout Branch\"]]\n>+\twm title $top [mc \"%s (%s): Checkout Branch\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/branch_create.tcl b/lib/branch_create.tcl\n>index 4bb9077..ba367d5 100644\n>--- a/lib/branch_create.tcl\n>+++ b/lib/branch_create.tcl\n>@@ -20,7 +20,7 @@ constructor dialog {} {\n> \n> \tmake_dialog top w\n> \twm withdraw $w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Create Branch\"]]\n>+\twm title $top [mc \"%s (%s): Create Branch\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/branch_delete.tcl b/lib/branch_delete.tcl\n>index 9aef0c9..a505163 100644\n>--- a/lib/branch_delete.tcl\n>+++ b/lib/branch_delete.tcl\n>@@ -13,7 +13,7 @@ constructor dialog {} {\n> \n> \tmake_dialog top w\n> \twm withdraw $w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Branch\"]]\n>+\twm title $top [mc \"%s (%s): Delete Branch\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/branch_rename.tcl b/lib/branch_rename.tcl\n>index 6e510ec..3a2d79a 100644\n>--- a/lib/branch_rename.tcl\n>+++ b/lib/branch_rename.tcl\n>@@ -12,7 +12,7 @@ constructor dialog {} {\n> \n> \tmake_dialog top w\n> \twm withdraw $w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Rename Branch\"]]\n>+\twm title $top [mc \"%s (%s): Rename Branch\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/browser.tcl b/lib/browser.tcl\n>index 0328338..1580493 100644\n>--- a/lib/browser.tcl\n>+++ b/lib/browser.tcl\n>@@ -24,7 +24,7 @@ constructor new {commit {path {}}} {\n> \tglobal cursor_ptr M1B use_ttk NS\n> \tmake_dialog top w\n> \twm withdraw $top\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"File Browser\"]]\n>+\twm title $top [mc \"%s (%s): File Browser\" [appname] [reponame]]\n> \n> \tif {$path ne {}} {\n> \t\tif {[string index $path end] ne {/}} {\n>@@ -272,7 +272,7 @@ constructor dialog {} {\n> \tglobal use_ttk NS\n> \tmake_dialog top w\n> \twm withdraw $top\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Browse Branch Files\"]]\n>+\twm title $top [mc \"%s (%s): Browse Branch Files\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t\twm transient $top .\n>diff --git a/lib/database.tcl b/lib/database.tcl\n>index 8bd4b8e..8578308 100644\n>--- a/lib/database.tcl\n>+++ b/lib/database.tcl\n>@@ -63,7 +63,7 @@ proc do_stats {} {\n> \tbind $w <Visibility> \"grab $w; focus $w.buttons.close\"\n> \tbind $w <Key-Escape> [list destroy $w]\n> \tbind $w <Key-Return> [list destroy $w]\n>-\twm title $w [append \"[appname] ([reponame]): \" [mc \"Database Statistics\"]]\n>+\twm title $w [mc \"%s (%s): Database Statistics\" [appname] [reponame]]\n> \twm deiconify $w\n> \ttkwait window $w\n> }\n>diff --git a/lib/diff.tcl b/lib/diff.tcl\n>index 0d56986..1228ce2 100644\n>--- a/lib/diff.tcl\n>+++ b/lib/diff.tcl\n>@@ -220,10 +220,9 @@ proc show_other_diff {path w m cont_info} {\n> \t\t}\n> \t\t$ui_diff conf -state normal\n> \t\tif {$type eq {submodule}} {\n>-\t\t\t$ui_diff insert end [append \\\n>-\t\t\t\t\"* \" \\\n>-\t\t\t\t[mc \"Git Repository (subproject)\"] \\\n>-\t\t\t\t\"\\n\"] d_info\n>+\t\t\t$ui_diff insert end \\\n>+\t\t\t\t\"* [mc \"Git Repository (subproject)\"]\\n\" \\\n>+\t\t\t\td_info\n> \t\t} elseif {![catch {set type [exec file $path]}]} {\n> \t\t\tset n [string length $path]\n> \t\t\tif {[string equal -length $n $path $type]} {\n>@@ -608,7 +607,7 @@ proc apply_hunk {x y} {\n> \t\tputs -nonewline $p $current_diff_header\n> \t\tputs -nonewline $p [$ui_diff get $s_lno $e_lno]\n> \t\tclose $p} err]} {\n>-\t\terror_popup [append $failed_msg \"\\n\\n$err\"]\n>+\t\terror_popup \"$failed_msg\\n\\n$err\"\n> \t\tunlock_index\n> \t\treturn\n> \t}\n>@@ -826,7 +825,7 @@ proc apply_range_or_line {x y} {\n> \t\tputs -nonewline $p $current_diff_header\n> \t\tputs -nonewline $p $wholepatch\n> \t\tclose $p} err]} {\n>-\t\terror_popup [append $failed_msg \"\\n\\n$err\"]\n>+\t\terror_popup \"$failed_msg\\n\\n$err\"\n> \t}\n> \n> \tunlock_index\n>diff --git a/lib/error.tcl b/lib/error.tcl\n>index 9b7d229..71dc860 100644\n>--- a/lib/error.tcl\n>+++ b/lib/error.tcl\n>@@ -17,7 +17,7 @@ proc error_popup {msg} {\n> \tset cmd [list tk_messageBox \\\n> \t\t-icon error \\\n> \t\t-type ok \\\n>-\t\t-title [append \"$title: \" [mc \"error\"]] \\\n>+\t\t-title [mc \"%s: error\" $title] \\\n> \t\t-message $msg]\n> \tif {[winfo ismapped [_error_parent]]} {\n> \t\tlappend cmd -parent [_error_parent]\n>@@ -33,7 +33,7 @@ proc warn_popup {msg} {\n> \tset cmd [list tk_messageBox \\\n> \t\t-icon warning \\\n> \t\t-type ok \\\n>-\t\t-title [append \"$title: \" [mc \"warning\"]] \\\n>+\t\t-title [mc \"%s: warning\" $title] \\\n> \t\t-message $msg]\n> \tif {[winfo ismapped [_error_parent]]} {\n> \t\tlappend cmd -parent [_error_parent]\n>diff --git a/lib/merge.tcl b/lib/merge.tcl\n>index 460d32f..b2de109 100644\n>--- a/lib/merge.tcl\n>+++ b/lib/merge.tcl\n>@@ -149,7 +149,7 @@ constructor dialog {} {\n> \t}\n> \n> \tmake_dialog top w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Merge\"]]\n>+\twm title $top [mc \"%s (%s): Merge\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/remote_add.tcl b/lib/remote_add.tcl\n>index 50029d0..480a6b3 100644\n>--- a/lib/remote_add.tcl\n>+++ b/lib/remote_add.tcl\n>@@ -17,7 +17,7 @@ constructor dialog {} {\n> \n> \tmake_dialog top w\n> \twm withdraw $top\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Add Remote\"]]\n>+\twm title $top [mc \"%s (%s): Add Remote\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl\n>index fcc06d0..5ba9fca 100644\n>--- a/lib/remote_branch_delete.tcl\n>+++ b/lib/remote_branch_delete.tcl\n>@@ -26,7 +26,7 @@ constructor dialog {} {\n> \tglobal all_remotes M1B use_ttk NS\n> \n> \tmake_dialog top w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Delete Branch Remotely\"]]\n>+\twm title $top [mc \"%s (%s): Delete Branch Remotely\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t}\n>diff --git a/lib/shortcut.tcl b/lib/shortcut.tcl\n>index 78878ef..135086b 100644\n>--- a/lib/shortcut.tcl\n>+++ b/lib/shortcut.tcl\n>@@ -5,7 +5,7 @@ proc do_windows_shortcut {} {\n> \tglobal _gitworktree\n> \tset fn [tk_getSaveFile \\\n> \t\t-parent . \\\n>-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n>+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n> \t\t-initialfile \"Git [reponame].lnk\"]\n> \tif {$fn != {}} {\n> \t\tif {[file extension $fn] ne {.lnk}} {\n>@@ -37,7 +37,7 @@ proc do_cygwin_shortcut {} {\n> \t}\n> \tset fn [tk_getSaveFile \\\n> \t\t-parent . \\\n>-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n>+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n> \t\t-initialdir $desktop \\\n> \t\t-initialfile \"Git [reponame].lnk\"]\n> \tif {$fn != {}} {\n>@@ -69,7 +69,7 @@ proc do_macosx_app {} {\n> \n> \tset fn [tk_getSaveFile \\\n> \t\t-parent . \\\n>-\t\t-title [append \"[appname] ([reponame]): \" [mc \"Create Desktop Icon\"]] \\\n>+\t\t-title [mc \"%s (%s): Create Desktop Icon\" [appname] [reponame]] \\\n> \t\t-initialdir [file join $env(HOME) Desktop] \\\n> \t\t-initialfile \"Git [reponame].app\"]\n> \tif {$fn != {}} {\n>diff --git a/lib/tools_dlg.tcl b/lib/tools_dlg.tcl\n>index 7eeda9d..c05413c 100644\n>--- a/lib/tools_dlg.tcl\n>+++ b/lib/tools_dlg.tcl\n>@@ -19,7 +19,7 @@ constructor dialog {} {\n> \tglobal repo_config use_ttk NS\n> \n> \tmake_dialog top w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Add Tool\"]]\n>+\twm title $top [mc \"%s (%s): Add Tool\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t\twm transient $top .\n>@@ -184,7 +184,7 @@ constructor dialog {} {\n> \tload_config 1\n> \n> \tmake_dialog top w\n>-\twm title $top [append \"[appname] ([reponame]): \" [mc \"Remove Tool\"]]\n>+\twm title $top [mc \"%s (%s): Remove Tool\" [appname] [reponame]]\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t\twm transient $top .\n>@@ -280,7 +280,7 @@ constructor dialog {fullname} {\n> \t}\n> \n> \tmake_dialog top w -autodelete 0\n>-\twm title $top [append \"[appname] ([reponame]): \" $title]\n>+\twm title $top \"[mc \"%s (%s):\" [appname] [reponame]] $title\"\n> \tif {$top ne {.}} {\n> \t\twm geometry $top \"+[winfo rootx .]+[winfo rooty .]\"\n> \t\twm transient $top .\n>diff --git a/lib/transport.tcl b/lib/transport.tcl\n>index e5d211e..a1a424a 100644\n>--- a/lib/transport.tcl\n>+++ b/lib/transport.tcl\n>@@ -226,7 +226,7 @@ proc do_push_anywhere {} {\n> \tbind $w <Visibility> \"grab $w; focus $w.buttons.create\"\n> \tbind $w <Key-Escape> \"destroy $w\"\n> \tbind $w <Key-Return> [list start_push_anywhere_action $w]\n>-\twm title $w [append \"[appname] ([reponame]): \" [mc \"Push\"]]\n>+\twm title $w [mc \"%s (%s): Push\" [appname] [reponame]]\n> \twm deiconify $w\n> \ttkwait window $w\n> }\n\nWell spotted!\n\n-- \nPat Thoyts                            http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD\n"},{"id":"303079","messageId":"8760p9wwr3.fsf@red.patthoyts.tk","threadId":"42260","inReplyTo":"1462704778-4722-1-git-send-email-vascomalmeida@sapo.pt","subject":"Re: [PATCH 1/5] git-gui i18n: mark strings for translation","fromName":"Pat Thoyts","fromEmail":"patthoyts@users.sourceforge.net","sentAt":"2016-10-03T10:30:08Z","receivedAt":"2016-10-03T10:30:15Z","isPatch":true,"sender":{"key":"patthoyts@users.sourceforge.net","avatar":"https://avatars.githubusercontent.com/u/30739?v=4"},"body":"Vasco Almeida <vascomalmeida@sapo.pt> writes:\n\n>Mark strings for translation in lib/index.tcl that were seemingly\n>left behind by 700e560 (\"git-gui: Mark forgotten strings for\n>translation.\", 2008-09-04) which marks string in do_revert_selection\n>procedure.\n>These strings are passed to unstage_help and add_helper procedures.\n>\n>Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n>---\n> lib/index.tcl | 6 +++---\n> 1 file changed, 3 insertions(+), 3 deletions(-)\n>\n>diff --git a/lib/index.tcl b/lib/index.tcl\n>index 74a81a7..3a3e534 100644\n>--- a/lib/index.tcl\n>+++ b/lib/index.tcl\n>@@ -291,7 +291,7 @@ proc do_unstage_selection {} {\n> \n> \tif {[array size selected_paths] > 0} {\n> \t\tunstage_helper \\\n>-\t\t\t{Unstaging selected files from commit} \\\n>+\t\t\t[mc \"Unstaging selected files from commit\"] \\\n> \t\t\t[array names selected_paths]\n> \t} elseif {$current_diff_path ne {}} {\n> \t\tunstage_helper \\\n>@@ -343,7 +343,7 @@ proc do_add_selection {} {\n> \n> \tif {[array size selected_paths] > 0} {\n> \t\tadd_helper \\\n>-\t\t\t{Adding selected files} \\\n>+\t\t\t[mc \"Adding selected files\"] \\\n> \t\t\t[array names selected_paths]\n> \t} elseif {$current_diff_path ne {}} {\n> \t\tadd_helper \\\n>@@ -385,7 +385,7 @@ proc do_add_all {} {\n> \t\t\tset paths [concat $paths $untracked_paths]\n> \t\t}\n> \t}\n>-\tadd_helper {Adding all changed files} $paths\n>+\tadd_helper [mc \"Adding all changed files\"] $paths\n> }\n> \n> proc revert_helper {txt paths} {\n\nThis series looks good. Especially noticing the misuse of the append\ncommand. Applied to my pu for now.\nThank you,\n\n-- \nPat Thoyts                            http://www.patthoyts.tk/\nPGP fingerprint 2C 6E 98 07 2C 59 C8 97  10 CE 11 E6 04 E0 B9 DD\n"},{"id":"303087","messageId":"1475499472.1776.26.camel@sapo.pt","threadId":"42260","inReplyTo":"8760p9wwr3.fsf@red.patthoyts.tk","subject":"Re: [PATCH 1/5] git-gui i18n: mark strings for translation","fromName":"Vasco Almeida","fromEmail":"vascomalmeida@sapo.pt","sentAt":"2016-10-03T12:57:52Z","receivedAt":"2016-10-03T12:58:02Z","isPatch":true,"sender":{"key":"vascomalmeida@sapo.pt","avatar":"https://avatars.githubusercontent.com/u/9001556?v=4"},"body":"A Seg, 03-10-2016 às 11:30 +0100, Pat Thoyts escreveu:\n> Vasco Almeida <vascomalmeida@sapo.pt> writes:\n> \n> > \n> > Mark strings for translation in lib/index.tcl that were seemingly\n> > left behind by 700e560 (\"git-gui: Mark forgotten strings for\n> > translation.\", 2008-09-04) which marks string in\n> > do_revert_selection\n> > procedure.\n> > These strings are passed to unstage_help and add_helper procedures.\n> > \n> > Signed-off-by: Vasco Almeida <vascomalmeida@sapo.pt>\n> > ---\n> > lib/index.tcl | 6 +++---\n> > 1 file changed, 3 insertions(+), 3 deletions(-)\n> > \n> > diff --git a/lib/index.tcl b/lib/index.tcl\n> > index 74a81a7..3a3e534 100644\n> > --- a/lib/index.tcl\n> > +++ b/lib/index.tcl\n> > @@ -291,7 +291,7 @@ proc do_unstage_selection {} {\n> > \n> > \tif {[array size selected_paths] > 0} {\n> > \t\tunstage_helper \\\n> > -\t\t\t{Unstaging selected files from commit} \\\n> > +\t\t\t[mc \"Unstaging selected files from\n> > commit\"] \\\n> > \t\t\t[array names selected_paths]\n> > \t} elseif {$current_diff_path ne {}} {\n> > \t\tunstage_helper \\\n> > @@ -343,7 +343,7 @@ proc do_add_selection {} {\n> > \n> > \tif {[array size selected_paths] > 0} {\n> > \t\tadd_helper \\\n> > -\t\t\t{Adding selected files} \\\n> > +\t\t\t[mc \"Adding selected files\"] \\\n> > \t\t\t[array names selected_paths]\n> > \t} elseif {$current_diff_path ne {}} {\n> > \t\tadd_helper \\\n> > @@ -385,7 +385,7 @@ proc do_add_all {} {\n> > \t\t\tset paths [concat $paths $untracked_paths]\n> > \t\t}\n> > \t}\n> > -\tadd_helper {Adding all changed files} $paths\n> > +\tadd_helper [mc \"Adding all changed files\"] $paths\n> > }\n> > \n> > proc revert_helper {txt paths} {\n> \n> This series looks good. Especially noticing the misuse of the append\n> command. Applied to my pu for now.\n> Thank you,\n\nI think Junio Hamano added PATCH 1/5 of this series to Git 'next'\nbranch and added the Portuguese translation of git-gui too.\n"}]}