Add missing strings and reorganize some strings

(sync up to english files)