extra wrap strings
wrap more strings
add language choice in menu
clean up
merge for i18n