diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index 8d8bdd5b6..54abeb47c 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -247,14 +247,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     victory_saving_progress: "セーブ中"
     victory_go_home: "ホームに戻る"
     victory_review: "フィードバック"
-#    victory_review_placeholder: "How was the level?"
+    victory_review_placeholder: "どのレベルでしたか?"
     victory_hour_of_code_done: "完了してよろしいですか?"
     victory_hour_of_code_done_yes: "はい、構いません"
     victory_experience_gained: "XP獲得"
     victory_gems_gained: "ジェム獲得"
     victory_new_item: "ニューアイテム"
-#    victory_viking_code_school: "Holy smokes, that was a hard level you just beat! If you aren't already a software developer, you should be. You just got fast-tracked for acceptance with Viking Code School, where you can take your skills to the next level and become a professional web developer in 14 weeks."
-#    victory_become_a_viking: "Become a Viking"
+    victory_viking_code_school: "あなたはハードレベルのホーリー・スモークを打ち破りました! もしあなたが既にソフトウェア開発者でないなら, ぜひやってみましょう. あなたはちょうどViking Code Scoolで受け入れられるための出世街道にいます,そこでは次のレベルへのスキルを取得でき、14週間でプロのWeb開発者になれます。"
+    victory_become_a_viking: "バイキングになる"
     guide_title: "ガイド"
     tome_minion_spells: "操作できるキャラクターの呪文" # Only in old-style levels.
     tome_read_only_spells: "読込専用の呪文" # Only in old-style levels.
@@ -405,12 +405,12 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     feature4: "<strong>3500のジェム</strong>が毎月ボーナス!"
     feature5: "ビデオチュートリアル"
     feature6: "プレミアムメールサポート"
-#    feature7: "Private <strong>Clans</strong>"
+    feature7: "プライベート<strong>クラン</strong>"
     free: "無料"
     month: "月"
     subscribe_title: "課金"
     unsubscribe: "無課金"
-#    confirm_unsubscribe: "Confirm Unsubscribe"
+    confirm_unsubscribe: "課金の解約確認"
     never_mind: "気にしないでください, それでもあなたが好きです"
     thank_you_months_prefix: "私達を "
     thank_you_months_suffix: "ヶ月サポートしてくださりありがとうございます。"
@@ -492,14 +492,14 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     blocks: "ブロックパワー" # As in "this shield blocks this much damage"
     backstab: "バックスタブ" # As in "this dagger does this much backstab damage"
     skills: "スキル"
-#    attack_1: "Deals"
-#    attack_2: "of listed"
-#    attack_3: "weapon damage."
-#    health_1: "Gains"
-#    health_2: "of listed"
-#    health_3: "armor health."
-#    speed_1: "Moves at"
-#    speed_2: "meters per second."
+    attack_1: "取引"
+    attack_2: "リスト"
+    attack_3: "武器攻撃力"
+    health_1: "収益"
+    health_2: "リスト"
+    health_3: "防具防御力"
+    speed_1: "移動速度"
+    speed_2: "メートル/秒"
     available_for_purchase: "購入可能" # Shows up when you have unlocked, but not purchased, a hero in the hero store
     level_to_unlock: "アンロックレベル：" # Label for which level you have to beat to unlock a particular hero (click a locked hero in the store to see)
     restricted_to_certain_heroes: "特定のヒーローのみ、このレベルをプレイする事が出来ます。"
@@ -601,7 +601,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     sub_includes_4: "メールによるサポート"
     sub_includes_5: "10人の新しいヒーローとマスターのユニークなスキル"
     sub_includes_6: "3500のジェムが月々支給されます"
-#    sub_includes_7: "Private Clans"
+    sub_includes_7: "プライベートクラン"
 #    monitor_progress_title: "How do I monitor student progress?"
 #    monitor_progress_1: "Student progress can be monitored by creating a"
 #    monitor_progress_2: "for your class."
@@ -743,8 +743,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     shift: "シフト"
     run_code: "現在のコードを実行"
     run_real_time: "リアルタイムで実行"
-#    continue_script: "Continue past current script."
-#    skip_scripts: "Skip past all skippable scripts."
+    continue_script: "以前のスクリプトを続ける。"
+    skip_scripts: "過去のスキップできるスクリプトをスキップする。"
     toggle_playback: "トグル:プレイ/ポーズ"
 #    scrub_playback: "Scrub back and forward through time."
 #    single_scrub_playback: "Scrub back and forward through time by a single frame."
@@ -774,49 +774,49 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     social_hipchat: "公開されている CodeCombat の HipChat ルームで私たちとチャットする"
     contribute_to_the_project: "プロジェクトに貢献する"
 
-#  clans:
-#    clan: "Clan"
-#    clans: "Clans"
-#    new_name: "New clan name"
-#    new_description: "New clan description"
-#    make_private: "Make clan private"
-#    subs_only: "subscribers only"
-#    create_clan: "Create New Clan"
-#    private_preview: "Preview"
-#    public_clans: "Public Clans"
-#    my_clans: "My Clans"
-#    clan_name: "Clan Name"
-#    name: "Name"
-#    chieftain: "Chieftain"
-#    type: "Type"
-#    edit_clan_name: "Edit Clan Name"
-#    edit_clan_description: "Edit Clan Description"
-#    edit_name: "edit name"
-#    edit_description: "edit description"
-#    private: "(private)"
-#    summary: "Summary"
-#    average_level: "Average Level"
-#    average_achievements: "Average Achievements"
-#    delete_clan: "Delete Clan"
-#    leave_clan: "Leave Clan"
-#    join_clan: "Join Clan"
-#    invite_1: "Invite:"
-#    invite_2: "*Invite players to this Clan by sending them this link."
-#    members: "Members"
-#    progress: "Progress"
-#    not_started_1: "not started"
-#    started_1: "started"
-#    complete_1: "complete"
-#    exp_levels: "Expand levels"
-#    rem_hero: "Remove Hero"
-#    status: "Status"
-#    complete_2: "Complete"
-#    started_2: "Started"
-#    not_started_2: "Not Started"
-#    view_solution: "Click to view solution."
-#    latest_achievement: "Latest Achievement"
-#    playtime: "Playtime"
-#    last_played: "Last played"
+  clans:
+    clan: "クラン"
+    clans: "クラン"
+    new_name: "新規クラン名"
+    new_description: "新規クラン紹介文"
+    make_private: "クランをプライベートにする"
+    subs_only: "課金者限定"
+    create_clan: "新規クラン作成"
+    private_preview: "プレビュー"
+    public_clans: "公開クラン"
+    my_clans: "マイ・クラン"
+    clan_name: "クラン名"
+    name: "名前"
+    chieftain: "リーダー"
+    type: "タイプ"
+    edit_clan_name: "クラン名の編集"
+    edit_clan_description: "クランの紹介文の編集"
+    edit_name: "名前の編集"
+    edit_description: "紹介文の編集"
+    private: "(プライベート)"
+    summary: "概要"
+    average_level: "平均レベル"
+    average_achievements: "平均業績"
+    delete_clan: "クランの削除"
+    leave_clan: "クランの脱退"
+    join_clan: "クランの参加"
+    invite_1: "招待:"
+    invite_2: "*このリンクを送信してクランに招待してください。"
+    members: "メンバー"
+    progress: "進捗"
+    not_started_1: "未着手"
+    started_1: "進行中"
+    complete_1: "完了"
+    exp_levels: "レベルの拡大"
+    rem_hero: "ヒーローの削除"
+    status: "状態"
+    complete_2: "完了"
+    started_2: "進行中"
+    not_started_2: "未着手"
+    view_solution: "クリックしてソリューションを見る。"
+    latest_achievement: "最新業績"
+    playtime: "プレイ時間"
+    last_played: "最終プレイ"
 
   classes:
     archmage_title: "アークメイジ"
@@ -1058,7 +1058,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     winners: "勝者"
 
   user:
-#    stats: "Stats"
+    stats: "ステータス"
     singleplayer_title: "シングルプレイヤーレベル"
     multiplayer_title: "マルチプレイヤーレベル"
     achievements_title: "アーカイブ"
@@ -1070,8 +1070,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     no_multiplayer: "まだマルチプレイヤーのゲームをプレイしていません。"
     no_achievements: "まだアーカイブはありません。"
     favorite_prefix: "お気に入りの言語は "
-#    favorite_postfix: "."
-#    not_member_of_clans: "Not a member of any clans yet."
+    favorite_postfix: "。"
+    not_member_of_clans: "まだどのクランにも所属していません。"
 
 #  achievements:
 #    last_earned: "Last Earned"