development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

git-gui: I18n fix sentence parts into full sentences for translation again.

Browse source 
For translations, it is almost always impossible to correctly translate
parts of sentences in almost any other language. Hence, messages like this
must be re-organized into full sentences.

Signed-off-by: Christian Stimming <stimming@tuhh.de>
Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
Christian Stimming 2008-09-12 11:17:38 +02:00 committed by Shawn O. Pearce
parent 2fe5b2ee42
commit 8b56a18dea
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/mergetool.tcl
View file

@ -11,18 +11,18 @@ proc merge_resolve_one {stage} {
return
}
1 { set target [mc "the base version"] }
2 { set target [mc "this branch"] }
3 { set target [mc "the other branch"] }
1 { set targetquestion [mc "Force resolution to the base version?"] }
2 { set targetquestion [mc "Force resolution to this branch?"] }
3 { set targetquestion [mc "Force resolution to the other branch?"] }
}
set op_question [mc "Force resolution to %s?
Note that the diff shows only conflicting changes.
set op_question [strcat $targetquestion "\n" \
[mc "Note that the diff shows only conflicting changes.
%s will be overwritten.
This operation can be undone only by restarting the merge." \
$target [short_path $current_diff_path]]
[short_path $current_diff_path]]]
if {[ask_popup $op_question] eq {yes}} {
merge_load_stages $current_diff_path [list merge_force_stage $stage]