Merge branch 'master' into master_no_clickwait_fix

# Conflicts:
#	0.utf

0.utf

@@ -127181,10 +127181,10 @@ next
 
 br
 langjp　ベアトも、……ヱリカに銃を向ける。@
-langjp　そして戦人は、その手に自分の手を重ねる……。\
 langen^Beato also...raised her gun to point at Erika.^@
 csp -1
 bg new_cg__ep606,2
+langjp　そして戦人は、その手に自分の手を重ねる……。\
 langen^Then, Battler placed his hand on hers...^\
 
 bg new_wsan_2cw,0
@@ -248529,9 +248529,9 @@ se1 56
 
 print 99,3000,"whirl.dll/r"
 
-langjp:dwave_jp 0, "voice\11\62000576.ogg":「……………………。@……これで、ベアトは満足して、眠りについたってこと…？」\
+langjp「……………………。@:dwave_jp 0, "voice\11\62000576.ogg":……これで、ベアトは満足して、眠りについたってこと…？」\
 ;＜縁寿
-langen:dwave_eng 0, "voice\11\62000576.ogg":^"......^@^...So, this means Beato was satisfied and put to sleep...?"^\
+langen^"......^@:dwave_eng 0, "voice\11\62000576.ogg":^...So, this means Beato was satisfied and put to sleep...?"^\
 
 _ld l,":b;sprites\fea\1\fea_b11_def1.png",23