diff --git a/intl/japanese.h b/intl/japanese.h
new file mode 100644
index 0000000000..afc46ac950
--- /dev/null
+++ b/intl/japanese.h
@@ -0,0 +1,82 @@
+/* RetroArch - A frontend for libretro.
+ * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
+ * Copyright (C) 2011-2016 - Daniel De Matteis
+ *
+ * RetroArch is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Found-
+ * ation, either version 3 of the License, or (at your option) any later version.
+ *
+ * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with RetroArch.
+ * If not, see .
+ */
+
+#ifndef __INTL_JAPANESE_H
+#define __INTL_JAPANESE_H
+
+#define RETRO_LBL_JOYPAD_B "レトロパッドのBボタン"
+#define RETRO_LBL_JOYPAD_Y "レトロパッドのYボタン"
+#define RETRO_LBL_JOYPAD_SELECT "レトロパッドのセレクトボタン"
+#define RETRO_LBL_JOYPAD_START "レトロパッドのスタートボタン"
+#define RETRO_LBL_JOYPAD_UP "レトロパッドの十字ボタンの上"
+#define RETRO_LBL_JOYPAD_DOWN "レトロパッドの十字ボタンの下"
+#define RETRO_LBL_JOYPAD_LEFT "レトロパッドの十字ボタンの左"
+#define RETRO_LBL_JOYPAD_RIGHT "レトロパッドの十字ボタンの右"
+#define RETRO_LBL_JOYPAD_A "レトロパッドのAボタン"
+#define RETRO_LBL_JOYPAD_X "レトロパッドのXボタン"
+#define RETRO_LBL_JOYPAD_L "レトロパッドのLボタン"
+#define RETRO_LBL_JOYPAD_R "レトロパッドのRボタン"
+#define RETRO_LBL_JOYPAD_L2 "レトロパッドのL2ボタン"
+#define RETRO_LBL_JOYPAD_R2 "レトロパッドのR2ボタン"
+#define RETRO_LBL_JOYPAD_L3 "レトロパッドのL3ボタン"
+#define RETRO_LBL_JOYPAD_R3 "レトロパッドのR3ボタン"
+#define RETRO_LBL_TURBO_ENABLE "ターボを有効"
+#define RETRO_LBL_ANALOG_LEFT_X "左のアナログのX"
+#define RETRO_LBL_ANALOG_LEFT_Y "左のアナログのY"
+#define RETRO_LBL_ANALOG_RIGHT_X "右のアナログのX"
+#define RETRO_LBL_ANALOG_RIGHT_Y "右のアナログのY"
+#define RETRO_LBL_ANALOG_LEFT_X_PLUS "左のアナログのX +"
+#define RETRO_LBL_ANALOG_LEFT_X_MINUS "左のアナログのX -"
+#define RETRO_LBL_ANALOG_LEFT_Y_PLUS "左のアナログのY +"
+#define RETRO_LBL_ANALOG_LEFT_Y_MINUS "左のアナログのY -"
+#define RETRO_LBL_ANALOG_RIGHT_X_PLUS "右のアナログのX +"
+#define RETRO_LBL_ANALOG_RIGHT_X_MINUS "右のアナログのX -"
+#define RETRO_LBL_ANALOG_RIGHT_Y_PLUS "右のアナログのY +"
+#define RETRO_LBL_ANALOG_RIGHT_Y_MINUS "右のアナログのY -"
+#define RETRO_LBL_FAST_FORWARD_KEY "早送り"
+#define RETRO_LBL_FAST_FORWARD_HOLD_KEY "早送りホールド"
+#define RETRO_LBL_LOAD_STATE_KEY "ステートをロード"
+#define RETRO_LBL_SAVE_STATE_KEY "ステートを保存"
+#define RETRO_LBL_FULLSCREEN_TOGGLE_KEY "フルスクリーンに切り替え"
+#define RETRO_LBL_QUIT_KEY "終了キー"
+#define RETRO_LBL_STATE_SLOT_PLUS "次のステートスロット"
+#define RETRO_LBL_STATE_SLOT_MINUS "前のステートスロット"
+#define RETRO_LBL_REWIND "巻き戻し"
+#define RETRO_LBL_MOVIE_RECORD_TOGGLE "録画"
+#define RETRO_LBL_PAUSE_TOGGLE "一時停止"
+#define RETRO_LBL_FRAMEADVANCE "コマ送り"
+#define RETRO_LBL_RESET "リセット"
+#define RETRO_LBL_SHADER_NEXT "次のシェーダー"
+#define RETRO_LBL_SHADER_PREV "前のシェーダー"
+#define RETRO_LBL_CHEAT_INDEX_PLUS "次のチートのインデックス"
+#define RETRO_LBL_CHEAT_INDEX_MINUS "前のチートのインデックス"
+#define RETRO_LBL_CHEAT_TOGGLE "チートを切り替え"
+#define RETRO_LBL_SCREENSHOT "スクリーンショット"
+#define RETRO_LBL_MUTE "消音"
+#define RETRO_LBL_OSK "ソフトウェアキーボードを有効"
+#define RETRO_LBL_NETPLAY_FLIP "ネットプレイのユーザ交換"
+#define RETRO_LBL_SLOWMOTION "スローモーション"
+#define RETRO_LBL_ENABLE_HOTKEY "ホットキーを有効"
+#define RETRO_LBL_VOLUME_UP "音量を上げる"
+#define RETRO_LBL_VOLUME_DOWN "音量を下げる"
+#define RETRO_LBL_OVERLAY_NEXT "次のオーバーレイ"
+#define RETRO_LBL_DISK_EJECT_TOGGLE "ディスクを取り出し"
+#define RETRO_LBL_DISK_NEXT "次のディスク切り替え"
+#define RETRO_LBL_DISK_PREV "前のディスク切り替え"
+#define RETRO_LBL_GRAB_MOUSE_TOGGLE "マウスグラブに切り替え"
+#define RETRO_LBL_MENU_TOGGLE "メニューに切り替え"
+
+#endif
diff --git a/intl/msg_hash_jp.c b/intl/msg_hash_jp.c
index 3b986145ad..72d158fa08 100644
--- a/intl/msg_hash_jp.c
+++ b/intl/msg_hash_jp.c
@@ -23,6 +23,10 @@
#include "../configuration.h"
#include "../verbosity.h"
+#ifdef HAVE_PSEUDOLOCALIZE
+#include "msg_hash_uspseudo.c"
+#else
+
int menu_hash_get_help_jp_enum(enum msg_hash_enums msg, char *s, size_t len)
{
uint32_t driver_hash = 0;
@@ -3390,13 +3394,13 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_CHEEVOS_LOCKED_ACHIEVEMENTS:
return "Locked Achievements:";
case MENU_ENUM_LABEL_VALUE_START_VIDEO_PROCESSOR:
- return "Start Video Processor";
+ return "ビデオプロセッサをスタート";
case MENU_ENUM_LABEL_VALUE_START_NET_RETROPAD:
- return "Start Remote RetroPad";
+ return "リモートレトロパッドをスタート";
case MENU_ENUM_LABEL_VALUE_THUMBNAILS_UPDATER_LIST:
- return "Thumbnails Updater";
+ return "サムネイルのアップデーター";
case MENU_ENUM_LABEL_VALUE_MENU_LINEAR_FILTER:
- return "Menu Linear Filter";
+ return "メニューのリニアフィルター";
case MENU_ENUM_LABEL_VALUE_MENU_ENUM_THROTTLE_FRAMERATE:
return "Throttle Menu Framerate";
case MENU_ENUM_LABEL_VALUE_CHEEVOS_HARDCORE_MODE_ENABLE:
@@ -3412,7 +3416,7 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_INPUT_SMALL_KEYBOARD_ENABLE:
return "Small Keyboard Enable";
case MENU_ENUM_LABEL_VALUE_SAVE_CURRENT_CONFIG:
- return "Save Current Config";
+ return "現在の設定を保存";
case MENU_ENUM_LABEL_VALUE_STATE_SLOT:
return "State Slot";
case MENU_ENUM_LABEL_VALUE_ACCOUNTS_CHEEVOS_SETTINGS:
@@ -3444,7 +3448,7 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_HELP_LOADING_CONTENT:
return "Loading Content";
case MENU_ENUM_LABEL_VALUE_HELP_LIST:
- return "Help";
+ return "ヘルプ";
case MENU_ENUM_LABEL_VALUE_HELP_CONTROLS:
return "Basic Menu Controls";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS:
@@ -3454,19 +3458,19 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_SCROLL_DOWN:
return "Scroll Down";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_CONFIRM:
- return "Confirm/OK";
+ return "確認/了承";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_BACK:
- return "Back";
+ return "前";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_START:
- return "Defaults";
+ return "デフォルト";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_INFO:
- return "Info";
+ return "情報";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_MENU:
- return "Toggle Menu";
+ return "メニューに切り替え";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_QUIT:
- return "Quit";
+ return "終了";
case MENU_ENUM_LABEL_VALUE_BASIC_MENU_ENUM_CONTROLS_TOGGLE_KEYBOARD:
- return "Toggle Keyboard";
+ return "キーボードに切り替え";
case MENU_ENUM_LABEL_VALUE_OPEN_ARCHIVE:
return "Open Archive As Folder";
case MENU_ENUM_LABEL_VALUE_LOAD_ARCHIVE:
@@ -3484,31 +3488,31 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_UPDATE_CORE_INFO_FILES:
return "Update Core Info Files";
case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE_CONTENT:
- return "Download Content";
+ return "コンテンツをダウンロード";
case MENU_ENUM_LABEL_VALUE_DOWNLOAD_CORE:
- return "Download Core...";
+ return "コアをダウンロード...";
case MENU_ENUM_LABEL_VALUE_SCAN_THIS_DIRECTORY:
- return "";
+ return "<このフォルダをスキャン>";
case MENU_ENUM_LABEL_VALUE_SCAN_FILE:
- return "Scan File";
+ return "ファイルをスキャン";
case MENU_ENUM_LABEL_VALUE_SCAN_DIRECTORY:
- return "Scan Directory";
+ return "フォルダをスキャン";
case MENU_ENUM_LABEL_VALUE_ADD_CONTENT_LIST:
- return "Add Content";
+ return "コンテンツを追加";
case MENU_ENUM_LABEL_VALUE_INFORMATION:
- return "Information";
+ return "情報";
case MENU_ENUM_LABEL_VALUE_INFORMATION_LIST:
- return "Information";
+ return "情報";
case MENU_ENUM_LABEL_VALUE_USE_BUILTIN_PLAYER:
return "Use Builtin Media Player";
case MENU_ENUM_LABEL_VALUE_CONTENT_SETTINGS:
- return "Quick Menu";
+ return "クイックメニュー";
case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_CRC32:
return "CRC32";
case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_MD5:
return "MD5";
case MENU_ENUM_LABEL_VALUE_LOAD_CONTENT_LIST:
- return "Load Content";
+ return "コンテンツをロード";
case MENU_ENUM_LABEL_VALUE_ASK_ARCHIVE:
return "Ask";
case MENU_ENUM_LABEL_VALUE_PRIVACY_SETTINGS:
@@ -3946,7 +3950,7 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_RDB_ENTRY_SHA1:
return "SHA1";
case MENU_ENUM_LABEL_VALUE_CONFIGURATIONS:
- return "Load Configuration";
+ return "設定をロード";
case MENU_ENUM_LABEL_VALUE_REWIND_GRANULARITY:
return "Rewind Granularity";
case MENU_ENUM_LABEL_VALUE_REMAP_FILE_LOAD:
@@ -3956,27 +3960,27 @@ const char *msg_hash_to_str_jp(enum msg_hash_enums msg)
case MENU_ENUM_LABEL_VALUE_USE_THIS_DIRECTORY:
return "