summaryrefslogtreecommitdiff
path: root/git-gui.sh
diff options
context:
space:
mode:
authorMichele Ballabio <barra_cuda@katamail.com>2007-09-13 13:19:05 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-14 00:43:26 (GMT)
commitc8c4854bec30b03b8e3a56a9b5e52ff358210140 (patch)
treef55d0740b2c4cdbe15cef7454a74cbbf99cc4c36 /git-gui.sh
parent4baba57f8d7bfee85ca1e521e1f6069923504799 (diff)
downloadgit-c8c4854bec30b03b8e3a56a9b5e52ff358210140.zip
git-c8c4854bec30b03b8e3a56a9b5e52ff358210140.tar.gz
git-c8c4854bec30b03b8e3a56a9b5e52ff358210140.tar.bz2
git-gui: add some strings to translation
Most of these changes were suggested by Shawn Pearce in an answer to Johannes Schindelin. Some strings for the blame module were added too. [sp: Minor edits in blame module formatting] Signed-off-by: Michele Ballabio <barra_cuda@katamail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'git-gui.sh')
-rwxr-xr-xgit-gui.sh30
1 files changed, 15 insertions, 15 deletions
diff --git a/git-gui.sh b/git-gui.sh
index a4e2ad2..2d7a2a8 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
}
@@ -526,7 +526,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
@@ -539,7 +539,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
}
@@ -621,7 +621,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]:
@@ -640,7 +640,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
}
@@ -737,7 +737,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
@@ -2077,7 +2077,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
@@ -2588,13 +2588,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$} -
@@ -2618,18 +2618,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
}