ISSUE-11 has been completed. ISSUE-10 add some translations