Reorganize and retranslate some strings