kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

git-gui: (i18n) Fix a bunch of still untranslated strings. 

Signed-off-by: Christian Stimming <stimming@tuhh.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
maint
Christian Stimming 17 years ago committed by Shawn O. Pearce
parent
3b8f19a02c
commit
5e6d7768e1
5 changed files with 73 additions and 38 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      lib/checkout_op.tcl
  2. 16
      lib/commit.tcl
  3. 2
      lib/index.tcl
  4. 5
      lib/merge.tcl
  5. 82
      po/git-gui.pot

6
lib/checkout_op.tcl
Unescape View File

@ -280,7 +280,7 @@ The rescan will be automatically started now.
} elseif {[is_config_true gui.trustmtime]} { } elseif {[is_config_true gui.trustmtime]} {
_readtree $this _readtree $this
} else { } else {
ui_status {Refreshing file status...} ui_status [mc "Refreshing file status..."]
set fd [git_read update-index \ set fd [git_read update-index \
-q \ -q \
--unmerged \ --unmerged \
@ -320,7 +320,7 @@ method _readtree {} {
set readtree_d {} set readtree_d {}
$::main_status start \ $::main_status start \
[mc "Updating working directory to '%s'..." [_name $this]] \ [mc "Updating working directory to '%s'..." [_name $this]] \
{files checked out} [mc "files checked out"]


set fd [git_read --stderr read-tree \ set fd [git_read --stderr read-tree \
-m \ -m \
@ -447,7 +447,7 @@ If you wanted to be on a branch, create one now starting from 'This Detached Che
} else { } else {
repository_state commit_type HEAD MERGE_HEAD repository_state commit_type HEAD MERGE_HEAD
set PARENT $HEAD set PARENT $HEAD
ui_status "Checked out '$name'." ui_status [mc "Checked out '%s'." $name]
} }
delete_this delete_this
} }

16
lib/commit.tcl
Unescape View File

@ -218,7 +218,7 @@ A good commit message has the following format:
return return
} }


ui_status {Calling pre-commit hook...} ui_status [mc "Calling pre-commit hook..."]
set pch_error {} set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable \ fileevent $fd_ph readable \
@ -233,7 +233,7 @@ proc commit_prehook_wait {fd_ph curHEAD msg_p} {
if {[eof $fd_ph]} { if {[eof $fd_ph]} {
if {[catch {close $fd_ph}]} { if {[catch {close $fd_ph}]} {
catch {file delete $msg_p} catch {file delete $msg_p}
ui_status {Commit declined by pre-commit hook.} ui_status [mc "Commit declined by pre-commit hook."]
hook_failed_popup pre-commit $pch_error hook_failed_popup pre-commit $pch_error
unlock_index unlock_index
} else { } else {
@ -256,7 +256,7 @@ proc commit_commitmsg {curHEAD msg_p} {
return return
} }


ui_status {Calling commit-msg hook...} ui_status [mc "Calling commit-msg hook..."]
set pch_error {} set pch_error {}
fconfigure $fd_ph -blocking 0 -translation binary -eofchar {} fconfigure $fd_ph -blocking 0 -translation binary -eofchar {}
fileevent $fd_ph readable \ fileevent $fd_ph readable \
@ -271,7 +271,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {
if {[eof $fd_ph]} { if {[eof $fd_ph]} {
if {[catch {close $fd_ph}]} { if {[catch {close $fd_ph}]} {
catch {file delete $msg_p} catch {file delete $msg_p}
ui_status {Commit declined by commit-msg hook.} ui_status [mc "Commit declined by commit-msg hook."]
hook_failed_popup commit-msg $pch_error hook_failed_popup commit-msg $pch_error
unlock_index unlock_index
} else { } else {
@ -284,7 +284,7 @@ proc commit_commitmsg_wait {fd_ph curHEAD msg_p} {
} }


proc commit_writetree {curHEAD msg_p} { proc commit_writetree {curHEAD msg_p} {
ui_status {Committing changes...} ui_status [mc "Committing changes..."]
set fd_wt [git_read write-tree] set fd_wt [git_read write-tree]
fileevent $fd_wt readable \ fileevent $fd_wt readable \
[list commit_committree $fd_wt $curHEAD $msg_p] [list commit_committree $fd_wt $curHEAD $msg_p]
@ -301,7 +301,7 @@ proc commit_committree {fd_wt curHEAD msg_p} {
if {[catch {close $fd_wt} err]} { if {[catch {close $fd_wt} err]} {
catch {file delete $msg_p} catch {file delete $msg_p}
error_popup [strcat [mc "write-tree failed:"] "\n\n$err"] error_popup [strcat [mc "write-tree failed:"] "\n\n$err"]
ui_status {Commit failed.} ui_status [mc "Commit failed."]
unlock_index unlock_index
return return
} }
@ -345,7 +345,7 @@ A rescan will be automatically started now.
if {[catch {set cmt_id [eval git $cmd]} err]} { if {[catch {set cmt_id [eval git $cmd]} err]} {
catch {file delete $msg_p} catch {file delete $msg_p}
error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"] error_popup [strcat [mc "commit-tree failed:"] "\n\n$err"]
ui_status {Commit failed.} ui_status [mc "Commit failed."]
unlock_index unlock_index
return return
} }
@ -365,7 +365,7 @@ A rescan will be automatically started now.
} err]} { } err]} {
catch {file delete $msg_p} catch {file delete $msg_p}
error_popup [strcat [mc "update-ref failed:"] "\n\n$err"] error_popup [strcat [mc "update-ref failed:"] "\n\n$err"]
ui_status {Commit failed.} ui_status [mc "Commit failed."]
unlock_index unlock_index
return return
} }

2
lib/index.tcl
Unescape View File

@ -310,7 +310,7 @@ proc add_helper {txt paths} {
update_index \ update_index \
$txt \ $txt \
$pathList \ $pathList \
[concat $after {ui_status {Ready to commit.}}] [concat $after {ui_status [mc "Ready to commit."]}]
} }
} }



5
lib/merge.tcl
Unescape View File

@ -116,8 +116,7 @@ method _start {} {
lappend cmd HEAD lappend cmd HEAD
lappend cmd $name lappend cmd $name


set msg [mc "Merging %s and %s" $current_branch $stitle] ui_status [mc "Merging %s and %s..." $current_branch $stitle]
ui_status "$msg..."
set cons [console::new [mc "Merge"] "merge $stitle"] set cons [console::new [mc "Merge"] "merge $stitle"]
console::exec $cons $cmd [cb _finish $cons] console::exec $cons $cmd [cb _finish $cons]


@ -236,7 +235,7 @@ Continue with resetting the current changes?"]
set fd [git_read --stderr read-tree --reset -u -v HEAD] set fd [git_read --stderr read-tree --reset -u -v HEAD]
fconfigure $fd -blocking 0 -translation binary fconfigure $fd -blocking 0 -translation binary
fileevent $fd readable [namespace code [list _reset_wait $fd]] fileevent $fd readable [namespace code [list _reset_wait $fd]]
$::main_status start [mc "Aborting"] {files reset} $::main_status start [mc "Aborting"] [mc "files reset"]
} else { } else {
unlock_index unlock_index
} }

82
po/git-gui.pot
Unescape View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-11-24 10:36+0100\n" "POT-Creation-Date: 2008-02-02 10:14+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -386,31 +386,31 @@ msgstr ""
msgid "File:" msgid "File:"
msgstr "" msgstr ""


#: git-gui.sh:2545 #: git-gui.sh:2573
msgid "Refresh" msgid "Apply/Reverse Hunk"
msgstr "" msgstr ""


#: git-gui.sh:2566 #: git-gui.sh:2579
msgid "Apply/Reverse Hunk" msgid "Show Less Context"
msgstr "" msgstr ""


#: git-gui.sh:2572 #: git-gui.sh:2586
msgid "Decrease Font Size" msgid "Show More Context"
msgstr "" msgstr ""


#: git-gui.sh:2576 #: git-gui.sh:2594
msgid "Increase Font Size" msgid "Refresh"
msgstr "" msgstr ""


#: git-gui.sh:2581 #: git-gui.sh:2615
msgid "Show Less Context" msgid "Decrease Font Size"
msgstr "" msgstr ""


#: git-gui.sh:2588 #: git-gui.sh:2619
msgid "Show More Context" msgid "Increase Font Size"
msgstr "" msgstr ""


#: git-gui.sh:2602 #: git-gui.sh:2630
msgid "Unstage Hunk From Commit" msgid "Unstage Hunk From Commit"
msgstr "" msgstr ""


@ -766,6 +766,10 @@ msgstr ""
msgid "Updating working directory to '%s'..." msgid "Updating working directory to '%s'..."
msgstr "" msgstr ""


#: lib/checkout_op.tcl:323
msgid "files checked out"
msgstr ""

#: lib/checkout_op.tcl:353 #: lib/checkout_op.tcl:353
#, tcl-format #, tcl-format
msgid "Aborted checkout of '%s' (file level merging is required)." msgid "Aborted checkout of '%s' (file level merging is required)."
@ -1182,11 +1186,40 @@ msgid ""
"- Remaining lines: Describe why this change is good.\n" "- Remaining lines: Describe why this change is good.\n"
msgstr "" msgstr ""


#: lib/commit.tcl:257 #: lib/commit.tcl:207
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr ""

#: lib/commit.tcl:221
msgid "Calling pre-commit hook..."
msgstr ""

#: lib/commit.tcl:236
msgid "Commit declined by pre-commit hook."
msgstr ""

#: lib/commit.tcl:259
msgid "Calling commit-msg hook..."
msgstr ""

#: lib/commit.tcl:274
msgid "Commit declined by commit-msg hook."
msgstr ""

#: lib/commit.tcl:287
msgid "Committing changes..."
msgstr ""

#: lib/commit.tcl:303
msgid "write-tree failed:" msgid "write-tree failed:"
msgstr "" msgstr ""


#: lib/commit.tcl:275 #: lib/commit.tcl:304 lib/commit.tcl:348 lib/commit.tcl:368
msgid "Commit failed."
msgstr ""

#: lib/commit.tcl:321
#, tcl-format #, tcl-format
msgid "Commit %s appears to be corrupt" msgid "Commit %s appears to be corrupt"
msgstr "" msgstr ""
@ -1204,12 +1237,7 @@ msgstr ""
msgid "No changes to commit." msgid "No changes to commit."
msgstr "" msgstr ""


#: lib/commit.tcl:303 #: lib/commit.tcl:347
#, tcl-format
msgid "warning: Tcl does not support encoding '%s'."
msgstr ""

#: lib/commit.tcl:317
msgid "commit-tree failed:" msgid "commit-tree failed:"
msgstr "" msgstr ""


@ -1373,6 +1401,10 @@ msgstr ""
msgid "Unstaging %s from commit" msgid "Unstaging %s from commit"
msgstr "" msgstr ""


#: lib/index.tcl:313
msgid "Ready to commit."
msgstr ""

#: lib/index.tcl:326 #: lib/index.tcl:326
#, tcl-format #, tcl-format
msgid "Adding %s" msgid "Adding %s"
@ -1491,7 +1523,11 @@ msgstr ""
msgid "Aborting" msgid "Aborting"
msgstr "" msgstr ""


#: lib/merge.tcl:266 #: lib/merge.tcl:238
msgid "files reset"
msgstr ""

#: lib/merge.tcl:265
msgid "Abort failed." msgid "Abort failed."
msgstr "" msgstr ""



Write Preview
Loading…
Cancel
Save