"Use left file except marked blocks" -> "Leave only marked blocks"
commit04e863c8dd3af3ea429f9ca449fd413f1257c57d
authorSup Yut Sum <ch3cooli@gmail.com>
Wed, 12 Nov 2014 17:13:19 +0000 (13 01:13 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Wed, 12 Nov 2014 17:13:19 +0000 (13 01:13 +0800)
tree004fd33d7694462501cf270b881cfd414d98fa8a
parent039f5e187a4aae4f0ab3f6f8f64990aba93928a0
"Use left file except marked blocks" -> "Leave only marked blocks"

Based on TortoiseSVN revision 25294

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Languages/Tortoise.pot
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/BaseView.cpp
src/TortoiseMerge/BaseView.h
src/TortoiseMerge/RightView.cpp
src/TortoiseMerge/RightView.h
src/TortoiseMerge/resource.h