diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 5dcf20952..ec1091029 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -97,7 +97,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     adventurer_forum: "冒険者の掲示板"
 #    adventurer_suffix: "."
     campaign_beginner: "初心者のキャンペーン"
-#    campaign_beginner_description: "... in which you learn the wizardry of programming."
+    campaign_beginner_description: "プログラミングの魔法を学びましょう"
     campaign_dev: "いろんな難しいレベル"
 #    campaign_dev_description: "... in which you learn the interface while doing something a little harder."
     campaign_multiplayer: "マルチプレイ・アリーナ"
@@ -171,8 +171,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     error_saving: "セーブ中にエラーが発生しました"
     saved: "変更しました"
     password_mismatch: "パスワードが違います"
-#    job_profile: "Job Profile"
-#    job_profile_approved: "Your job profile has been approved by CodeCombat. Employers will be able to see it until you either mark it inactive or it has not been changed for four weeks."
+    job_profile: "求職情報"
+    job_profile_approved: "CodeCombatは、あなたの求職情報を承りました。無効にする、もしくは4週間の間変更をしなければ雇用者はあなたの求職情報を見ることができなくなります。"
 #    job_profile_explanation: "Hi! Fill this out, and we will get in touch about finding you a software developer job."
 #    sample_profile: "See a sample profile"
 #    view_profile: "View Your Profile"
@@ -181,13 +181,13 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     edit_settings: "設定"
 #    profile_for_prefix: "Profile for "
     profile_for_suffix: "のプロフィール"
-#    approved: "Approved"
-#    not_approved: "Not Approved"
+    approved: "承認"
+    not_approved: "非承認"
     looking_for: "検索:"
     last_updated: "最終更新:"
 #    contact: "Contact"
-#    work_experience: "Work Experience"
-#    education: "Education"
+    work_experience: "職務経験"
+    education: "学歴"
 #    our_notes: "Our Notes"
 #    projects: "Projects"
 
@@ -234,7 +234,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     victory_go_home: "ホームに戻る"
     victory_review: "フィードバック"
     victory_hour_of_code_done: "完了してよろしいですか?"
-#    victory_hour_of_code_done_yes: "Yes, I'm finished with my Hour of Code™!"
+    victory_hour_of_code_done_yes: "はい、構いません"
     multiplayer_title: "マルチプレイ設定"
     multiplayer_link_description: "このURLを一緒にプレイしたい人に教えてください。"
     multiplayer_hint_label: "ヒント:"
@@ -249,14 +249,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tome_cast_button_cast: "呪文をキャスト"
     tome_autocast_delay: "自動実行待機時間"
     tome_select_spell: "呪文を選択"
-#    tome_select_a_thang: "Select Someone for "
+    tome_select_a_thang: "誰かを選択: "
     tome_available_spells: "利用できる呪文"
     hud_continue: "続く　（Shift+Spaceキー）"
-#    spell_saved: "Spell Saved"
-#    skip_tutorial: "Skip (esc)"
-#    editor_config: "Editor Config"
-#    editor_config_title: "Editor Configuration"
-#    editor_config_language_label: "Programming Language"
+    spell_saved: "呪文を保存しました"
+    skip_tutorial: "スキップ (esc)"
+    editor_config: "エディター設定"
+    editor_config_title: "エディターの設定"
+    editor_config_language_label: "プログラミング言語"
 #    editor_config_language_description: "Define the programming language you want to code in."
 #    editor_config_keybindings_label: "Key Bindings"
 #    editor_config_keybindings_default: "Default (Ace)"
diff --git a/app/templates/contribute/diplomat.jade b/app/templates/contribute/diplomat.jade
index 1150bdda7..845da167d 100644
--- a/app/templates/contribute/diplomat.jade
+++ b/app/templates/contribute/diplomat.jade
@@ -65,7 +65,7 @@ block content
         li Spain Spanish - Matthew Burt, DanielRodriguezRivero, Anon, Pouyio
         li French - Xeonarno, Elfisen, Armaldio, MartinDelille, pstweb, veritable, jaybi, xavismeh, Anon, Feugy
         li Hungarian - ferpeter, csuvsaregal, atlantisguru, Anon
-        li Japanese - g1itch, kengos
+        li Japanese - g1itch, kengos, treby
         li Chinese - Adam23, spacepope, yangxuan8282, Cheng Zheng
         li Polish - Anon, Kacper Ciepielewski
         li Danish - Einar Rasmussen, sorsjen, Randi Hillerøe, Anon