Made more strings translateable
Fix merge conflict