Translations:Manual:Edit conflict/2/ja