Merge branch 'master' of https://github.com/codecombat/codecombat

app/locale/ja.coffee

@@ -262,7 +262,7 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     victory_hour_of_code_done_yes: "はい、構いません"
     victory_experience_gained: "XP獲得"
     victory_gems_gained: "ジェム獲得"
-#    victory_new_item: "New Item"
+    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"
     guide_title: "ガイド"
@@ -292,11 +292,11 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     time_current: "今："
     time_total: "最大："
     time_goto: "行く："
-#    non_user_code_problem_title: "Unable to Load Level"
-#    infinite_loop_title: "Infinite Loop Detected"
-#    infinite_loop_description: "The initial code to build the world never finished running. It's probably either really slow or has an infinite loop. Or there might be a bug. You can either try running this code again or reset the code to the default state. If that doesn't fix it, please let us know."
-#    check_dev_console: "You can also open the developer console to see what might be going wrong."
-#    check_dev_console_link: "(instructions)"
+    non_user_code_problem_title: "レベルをロードできません"
+    infinite_loop_title: "無限ループが見つかりました"
+    infinite_loop_description: "最初のワールドを作るコードが終わりません。単に遅いか、無限ループになっているかでしょう。バグがあるのかもしれません。再試行してみたり、リセットしてデフォルトに戻すこともできます。もし直せないなら私たちに報告してください。"
+    check_dev_console: "開発者コンソールをみてなにが間違っているか見ることもできます。"
+    check_dev_console_link: "(説明書)"
     infinite_loop_try_again: "再試行する"
     infinite_loop_reset_level: "レベルをリセット"
     infinite_loop_comment_out: "マイコードをコメントアウト"
@@ -345,8 +345,8 @@ module.exports = nativeDescription: "日本語", englishDescription: "Japanese",
     tip_hate_computers: "コンピュータを憎む人が本当に嫌いなのは下手なプログラマーだ。- ラリー・ニーヴン"
     tip_open_source_contribute: "あなたは CodeCombat をより良くすることができます！"
     tip_recurse: "繰り返しは人間、再帰は神。 - L・ピーター・ドイツ"
-#    tip_free_your_mind: "You have to let it all go, Neo. Fear, doubt, and disbelief. Free your mind. - Morpheus"
-#    tip_strong_opponents: "Even the strongest of opponents always has a weakness. - Itachi Uchiha"
+    tip_free_your_mind: "全ての雑念を捨てろ、恐怖、疑いも不信も 心を解き放つんだ - モーフィアス"
+    tip_strong_opponents: "どんな強者にも弱点というものはあるんだ… - うちは　イタチ"
 
   game_menu:
     inventory_tab: "インベントリー"