Most of these changes were suggested by Shawn Pearce in an answer
to Johannes Schindelin.
Some strings for the blame module were added too.
Signed-off-by: Michele Ballabio <barra_cuda@xxxxxxxxxxxx>
---
On Thursday 13 September 2007, Shawn O. Pearce wrote:
> The way these three hunks work is they create two different messages
> that are supposed to say:
>
> Loading copy/move tracking annotations...
> Loading original location annotations...
>
> With your changes above they now read:
>
> Loading annotations: copy/move tracking...
> Loading annotations: original location...
>
> I think this doesn't read very well in English and I would not be
> surprised if translators found it also awkward to read in other
> languages. We probably should just break down and make these two
> completely different strings so they can be translated independently
> of each other.
Done.
> The formatting character of \t (and \n in a few other hunks later
> on in the file) shouldn't be part of the translation. The fact
> that git-gui uses a tab or an LF here to position text for display
> is not of concern to the translator when they are supplying their
> translation.
>
> So the change here probably should be more like:
>
> - $w_cviewer insert end "Author:\t" header_key
> + $w_cviewer insert end [append [mc "Author:"] "\t"] header_key
Done.
> > - $tooltip_t insert end "In File: " section_header
> > + $tooltip_t insert end [mc "In File: "] section_header
>
> Likewise I don't think the trailing space should be of concern to
> the translator.
I added the trailing space to the next string:
+ $tooltip_t insert end [mc "In File:"] section_header
+ $tooltip_t insert end " $file\n"
instead of appending it. It just seemed easier to read. Do you
prefer using [append ...] here too?
git-gui.sh | 30 +++++++++++++++---------------
lib/blame.tcl | 26 +++++++++++++-------------
lib/checkout_op.tcl | 6 +++---
lib/commit.tcl | 4 ++--
lib/database.tcl | 6 +++---
lib/diff.tcl | 8 ++++----
lib/index.tcl | 4 ++--
lib/remote_branch_delete.tcl | 4 ++--
8 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/git-gui.sh b/git-gui.sh
index afee777..5b2e1c6 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -37,7 +37,7 @@ if {[catch {package require Tcl 8.4} err]
tk_messageBox \
-icon error \
-type ok \
- -title "git-gui: fatal error" \
+ -title [mc "git-gui: fatal error"] \
-message $err
exit 1
}
@@ -517,7 +517,7 @@ if {[catch {set _git_version [git --version]} err]} {
tk_messageBox \
-icon error \
-type ok \
- -title "git-gui: fatal error" \
+ -title [mc "git-gui: fatal error"] \
-message "Cannot determine Git version:
$err
@@ -530,7 +530,7 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
tk_messageBox \
-icon error \
-type ok \
- -title "git-gui: fatal error" \
+ -title [mc "git-gui: fatal error"] \
-message [append [mc "Cannot parse Git version string:"] "\n\n$_git_version"]
exit 1
}
@@ -612,7 +612,7 @@ if {[git-version < 1.5]} {
tk_messageBox \
-icon error \
-type ok \
- -title "git-gui: fatal error" \
+ -title [mc "git-gui: fatal error"] \
-message "[appname] requires Git 1.5.0 or later.
You are using [git-version]:
@@ -631,7 +631,7 @@ if {[catch {set fd [open $idx r]} err]} {
tk_messageBox \
-icon error \
-type ok \
- -title "git-gui: fatal error" \
+ -title [mc "git-gui: fatal error"] \
-message $err
exit 1
}
@@ -728,7 +728,7 @@ if {$_prefix ne {}} {
regsub -all {[^/]+/} $_prefix ../ cdup
if {[catch {cd $cdup} err]} {
catch {wm withdraw .}
- error_popup "Cannot move to top of working directory:\n\n$err"
+ error_popup [append [mc "Cannot move to top of working directory:"] "\n\n$err"]
exit 1
}
unset cdup
@@ -2068,7 +2068,7 @@ blame {
}
blame {
if {$head eq {} && ![file exists $path]} {
- puts stderr "fatal: cannot stat path $path: No such file or directory"
+ puts stderr [mc "fatal: cannot stat path %s: No such file or directory" $path]
exit 1
}
blame::new $head $path
@@ -2579,13 +2579,13 @@ focus -force $ui_comm
if {[is_Cygwin]} {
set ignored_env 0
set suggest_user {}
- set msg "Possible environment issues exist.
+ set msg [mc "Possible environment issues exist.
The following environment variables are probably
going to be ignored by any Git subprocess run
-by [appname]:
+by %s:
-"
+" [appname]]
foreach name [array names env] {
switch -regexp -- $name {
{^GIT_INDEX_FILE$} -
@@ -2609,18 +2609,18 @@ by [appname]:
}
}
if {$ignored_env > 0} {
- append msg "
+ append msg [mc "
This is due to a known issue with the
-Tcl binary distributed by Cygwin."
+Tcl binary distributed by Cygwin."]
if {$suggest_user ne {}} {
- append msg "
+ append msg [mc "
-A good replacement for $suggest_user
+A good replacement for %s
is placing values for the user.name and
user.email settings into your personal
~/.gitconfig file.
-"
+" $suggest_user]
}
warn_popup $msg
}
diff --git a/lib/blame.tcl b/lib/blame.tcl
index 352aa19..83883ab 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -470,7 +470,7 @@ method _read_file {fd jump} {
_exec_blame $this $w_asim @asim_data \
[list] \
- { copy/move tracking}
+ [mc "Loading copy/move tracking annotations..."]
}
} ifdeleted { catch {close $fd} }
@@ -489,8 +489,8 @@ method _exec_blame {cur_w cur_d options cur_s} {
set blame_lines 0
$status start \
- "Loading$cur_s annotations..." \
- {lines annotated}
+ "$cur_s" \
+ [mc "lines annotated"]
}
method _read_blame {fd cur_w cur_d} {
@@ -671,10 +671,10 @@ method _read_blame {fd cur_w cur_d} {
if {$cur_w eq $w_asim} {
_exec_blame $this $w_amov @amov_data \
$original_options \
- { original location}
+ [mc "Loading original location annotations..."]
} else {
set current_fd {}
- $status stop {Annotation complete.}
+ $status stop [mc "Annotation complete."]
}
} else {
$status update $blame_lines $total_lines
@@ -728,7 +728,7 @@ method _showcommit {cur_w lno} {
if {$dat eq {}} {
set cmit {}
- $w_cviewer insert end "Loading annotation..." still_loading
+ $w_cviewer insert end [mc "Loading annotation..."] still_loading
} else {
set cmit [lindex $dat 0]
set file [lindex $dat 1]
@@ -784,16 +784,16 @@ method _showcommit {cur_w lno} {
}
$w_cviewer insert end "commit $cmit\n" header_key
- $w_cviewer insert end "Author:\t" header_key
+ $w_cviewer insert end [append [mc "Author:"] "\t"] header_key
$w_cviewer insert end "$author_name $author_email" header_val
$w_cviewer insert end " $author_time\n" header_val
- $w_cviewer insert end "Committer:\t" header_key
+ $w_cviewer insert end [append [mc "Committer:"] "\t"] header_key
$w_cviewer insert end "$committer_name $committer_email" header_val
$w_cviewer insert end " $committer_time\n" header_val
if {$file ne $path} {
- $w_cviewer insert end "Original File:\t" header_key
+ $w_cviewer insert end [append [mc "Original File:"] "\t"] header_key
$w_cviewer insert end "[escape_path $file]\n" header_val
}
@@ -907,18 +907,18 @@ method _open_tooltip {cur_w} {
catch {set summary $header($cmit,summary)}
catch {set author_time [foramt_date $header($cmit,author-time)]}
- $tooltip_t insert end "Originally By:\n" section_header
+ $tooltip_t insert end [append [mc "Originally By:"] "\n"] section_header
$tooltip_t insert end "commit $cmit\n"
$tooltip_t insert end "$author_name $author_time\n"
$tooltip_t insert end "$summary\n"
if {$file ne $path} {
- $tooltip_t insert end "In File: " section_header
- $tooltip_t insert end "$file\n"
+ $tooltip_t insert end [mc "In File:"] section_header
+ $tooltip_t insert end " $file\n"
}
$tooltip_t insert end "\n"
- $tooltip_t insert end "Copied Or Moved Here By:\n" section_header
+ $tooltip_t insert end [append [mc "Copied Or Moved Here By:"] "\n"] section_header
$tooltip_t insert end $save
}
diff --git a/lib/checkout_op.tcl b/lib/checkout_op.tcl
index f07262c..a011044 100644
--- a/lib/checkout_op.tcl
+++ b/lib/checkout_op.tcl
@@ -124,7 +124,7 @@ method _finish_fetch {ok} {
}
if {[catch {set new_hash [git rev-parse --verify "$l_trck^0"]} err]} {
set ok 0
- $w_cons insert "fatal: Cannot resolve $l_trck"
+ $w_cons insert [mc "fatal: Cannot resolve %s" $l_trck]
$w_cons insert $err
}
}
@@ -319,7 +319,7 @@ method _readtree {} {
set readtree_d {}
$::main_status start \
- "Updating working directory to '[_name $this]'..." \
+ [mc "Updating working directory to '%s'..." [_name $this]] \
{files checked out}
set fd [git_read --stderr read-tree \
@@ -443,7 +443,7 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che
$ui_comm delete 0.0 end
$ui_comm edit reset
$ui_comm edit modified false
- rescan [list ui_status "Checked out '$name'."]
+ rescan [list ui_status [mc "Checked out '%s'." $name]]
} else {
repository_state commit_type HEAD MERGE_HEAD
set PARENT $HEAD
diff --git a/lib/commit.tcl b/lib/commit.tcl
index 15489c6..a037c4f 100644
--- a/lib/commit.tcl
+++ b/lib/commit.tcl
@@ -272,7 +272,7 @@ proc commit_committree {fd_wt curHEAD msg} {
&& [string length $old_tree] == 45} {
set old_tree [string range $old_tree 5 end]
} else {
- error "Commit $PARENT appears to be corrupt"
+ error [mc "Commit %s appears to be corrupt" $PARENT]
}
if {$tree_id eq $old_tree} {
@@ -300,7 +300,7 @@ A rescan will be automatically started now.
if {$use_enc ne {}} {
fconfigure $msg_wt -encoding $use_enc
} else {
- puts stderr "warning: Tcl does not support encoding '$enc'."
+ puts stderr [mc "warning: Tcl does not support encoding '%s'." $enc]
fconfigure $msg_wt -encoding utf-8
}
puts -nonewline $msg_wt $msg
diff --git a/lib/database.tcl b/lib/database.tcl
index 118b1b2..d66aa3f 100644
--- a/lib/database.tcl
+++ b/lib/database.tcl
@@ -105,11 +105,11 @@ proc hint_gc {} {
set objects_current [expr {$objects_current * 256}]
set object_limit [expr {$object_limit * 256}]
if {[ask_popup \
- "This repository currently has approximately $objects_current loose objects.
+ [mc "This repository currently has approximately %i loose objects.
-To maintain optimal performance it is strongly recommended that you compress the database when more than $object_limit loose objects exist.
+To maintain optimal performance it is strongly recommended that you compress the database when more than %i loose objects exist.
-Compress the database now?"] eq yes} {
+Compress the database now?" $objects_current $object_limit]] eq yes} {
do_gc
}
}
diff --git a/lib/diff.tcl b/lib/diff.tcl
index d013409..c2ae455 100644
--- a/lib/diff.tcl
+++ b/lib/diff.tcl
@@ -78,7 +78,7 @@ proc show_diff {path w {lno {}}} {
set current_diff_path $path
set current_diff_side $w
set current_diff_header {}
- ui_status "Loading diff of [escape_path $path]..."
+ ui_status [mc "Loading diff of %s..." [escape_path $path]]
# - Git won't give us the diff, there's nothing to compare to!
#
@@ -111,7 +111,7 @@ proc show_diff {path w {lno {}}} {
} err ]} {
set diff_active 0
unlock_index
- ui_status "Unable to display [escape_path $path]"
+ ui_status [mc "Unable to display %s" [escape_path $path]]
error_popup [append [mc "Error loading file:"] "\n\n$err"]
return
}
@@ -131,7 +131,7 @@ proc show_diff {path w {lno {}}} {
}
if {[string first "\0" $content] != -1} {
$ui_diff insert end \
- "* Binary file (not showing content)." \
+ [mc "* Binary file (not showing content)."] \
d_@
} else {
if {$sz > $max_sz} {
@@ -181,7 +181,7 @@ proc show_diff {path w {lno {}}} {
if {[catch {set fd [eval git_read --nice $cmd]} err]} {
set diff_active 0
unlock_index
- ui_status "Unable to display [escape_path $path]"
+ ui_status [mc "Unable to display %s" [escape_path $path]]
error_popup [append [mc "Error loading diff:"] "\n\n$err"]
return
}
diff --git a/lib/index.tcl b/lib/index.tcl
index 78e2101..b5f8207 100644
--- a/lib/index.tcl
+++ b/lib/index.tcl
@@ -268,7 +268,7 @@ proc do_unstage_selection {} {
[array names selected_paths]
} elseif {$current_diff_path ne {}} {
unstage_helper \
- "Unstaging [short_path $current_diff_path] from commit" \
+ [mc "Unstaging %s from commit" [short_path $current_diff_path]] \
[list $current_diff_path]
}
}
@@ -312,7 +312,7 @@ proc do_add_selection {} {
[array names selected_paths]
} elseif {$current_diff_path ne {}} {
add_helper \
- "Adding [short_path $current_diff_path]" \
+ [mc "Adding %s" [short_path $current_diff_path]] \
[list $current_diff_path]
}
}
diff --git a/lib/remote_branch_delete.tcl b/lib/remote_branch_delete.tcl
index 06b5eab..c7b8148 100644
--- a/lib/remote_branch_delete.tcl
+++ b/lib/remote_branch_delete.tcl
@@ -181,9 +181,9 @@ method _delete {} {
}
if {$not_merged ne {}} {
- set msg "The following branches are not completely merged into $check_head:
+ set msg [mc "The following branches are not completely merged into %s:
- - [join $not_merged "\n - "]"
+ - %s" $check_head [join $not_merged "\n - "]]
if {$need_fetch} {
append msg "\n\n" [mc "One or more of the merge tests failed because you have not fetched the necessary commits. Try fetching from %s first." $uri]
--
1.5.3
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
