Translated remaining JP strings in localization

Also merged in upstream master for easy application.