merged from protocol-3; removed a merge conflict in the japanese string file
merged from protocol-3; removed a merge conflict in the japanese string file

--HG--
branch : protocol-4

runeh/dragonfly-stp-1,runeh/dragonfly-stp-1,runeh/dragonfly-stp-1