diff --git a/app/locale/ja.coffee b/app/locale/ja.coffee
index beb9a4ba5..a20e6a5ff 100644
--- a/app/locale/ja.coffee
+++ b/app/locale/ja.coffee
@@ -102,7 +102,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     blog: "ブログ"
     forum: "掲示板"
     account: "アカウント"
-#    my_account: "My Account"
+    my_account: "マイアカウント"
     profile: "プロフィール"
     stats: "ステータス"
     code: "コード"
@@ -182,55 +182,55 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     campaign_old_multiplayer: "(非推奨)旧マルチプレイ・アリーナ"
     campaign_old_multiplayer_description: "より文化的だった時代の遺跡。 シュミレーションは古いため実行されなく, ヒーローもいないマルチプレイ・アリーナです。"
 
-#  code:
-#    if: "if" # Keywords--these translations show up on hover, so please translate them all, even if it's kind of long. (In the code editor, they will still be in English.)
-#    else: "else"
-#    elif: "else if"
-#    while: "while"
-#    loop: "loop"
-#    for: "for"
-#    break: "break"
-#    continue: "continue"
-#    pass: "pass"
-#    return: "return"
-#    then: "then"
-#    do: "do"
-#    end: "end"
-#    function: "function"
-#    def: "define"
-#    var: "variable"
-#    self: "self"
-#    hero: "hero"
-#    this: "this"
-#    or: "or"
-#    "||": "or"
-#    and: "and"
-#    "&&": "and"
-#    not: "not"
-#    "!": "not"
-#    "=": "assign"
-#    "==": "equals"
-#    "===": "strictly equals"
-#    "!=": "does not equal"
-#    "!==": "does not strictly equal"
-#    ">": "is greater than"
-#    ">=": "is greater than or equal"
-#    "<": "is less than"
-#    "<=": "is less than or equal"
-#    "*": "multiplied by"
-#    "/": "divided by"
-#    "+": "plus"
-#    "-": "minus"
-#    "+=": "add and assign"
-#    "-=": "subtract and assign"
-#    True: "True"
-#    true: "true"
-#    False: "False"
-#    false: "false"
-#    undefined: "undefined"
-#    null: "null"
-#    nil: "nil"
-#    None: "None"
+  code:
+    if: "もし" # Keywords--these translations show up on hover, so please translate them all, even if it's kind of long. (In the code editor, they will still be in English.)
+    else: "でなければ"
+    elif: "でなければ もし"
+    while: "まで繰り返す"
+    loop: "ずっと"
+    for: "まで繰り返す"
+    break: "繰り返しを終わる"
+    continue: "次の繰り返しに続ける"
+    pass: "パス"
+    return: "返す"
+    then: "なら"
+    do: "実行する"
+    end: "終わり"
+    function: "関数"
+    def: "宣言"
+    var: "変数"
+    self: "自分自身"
+    hero: "ヒーロー"
+    this: "この"
+    or: "または"
+    "||": "または"
+    and: "かつ"
+    "&&": "かつ"
+    not: "ではなく"
+    "!": "ではなく"
+    "=": "代入"
+    "==": "等しい"
+    "===": "完全に等しい"
+    "!=": "等しくない"
+    "!==": "完全には等しくない"
+    ">": "より大きい"
+    ">=": "以上"
+    "<": "より小さい"
+    "<=": "以下"
+    "*": "掛ける"
+    "/": "割る"
+    "+": "足す"
+    "-": "引く"
+    "+=": "足して代入"
+    "-=": "引いて代入"
+    True: "真"
+    true: "真"
+    False: "偽"
+    false: "偽"
+    undefined: "定義されていない"
+    null: "空"
+    nil: "空"
+    None: "空"
 
   share_progress_modal:
     blurb: "あなたは進歩している！ CodeCombatでどんなに学んだかについて、誰かに伝えてください。"
@@ -648,7 +648,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     clojure_blurb: "現代の Lisp。"
     lua_blurb: "ゲーム専用のスクリプト言語。"
     io_blurb: "シンプルだがあいまい。"
-#    java_blurb: "(Subscriber Only) Android and enterprise."
+    java_blurb: "(サブスクリプション限定) Androidや企業."
     status: "ステータス"
     hero_type: "タイプ"
     weapons: "武器"