Add Japanese translation
Add missing pieces for Japanese translation
fix merge conflict, move italian in alphabetial order
Merge branch 'doughdemon-trans-ja'