Fixes for disappeared texts. (Mostly "yes" and "no")

Replace yes/no button text missed in earlier commit.
Change text ids for joined texts like "Cancel".
Should fix complaint about 5843c40c125646e2fa.