diff --git a/apps/lang/japanese.lang b/apps/lang/japanese.lang
index 0e0b243465..7403f71e53 100644
--- a/apps/lang/japanese.lang
+++ b/apps/lang/japanese.lang
@@ -21,6 +21,7 @@
 # - Takumi Suzuki
 # - Shunsuke Shimizu
 # - Tadayuki Nishizono
+# - Yoshihisa Uchida
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -509,7 +510,7 @@
     *: ", シャッフル"
   </dest>
   <voice>
-    *: "シャッフル"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -778,6 +779,23 @@
     *: "モノラル 右"
   </voice>
 </phrase>
+<phrase>
+  id: LANG_CHANNEL_LEFTRIGHT
+  desc: in sound_settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono Left + Right"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "モノラル (左右)"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "モノラル 左右"
+  </voice>
+</phrase>
 <phrase>
   id: LANG_CHANNEL_KARAOKE
   desc: in sound_settings
@@ -843,6 +861,7 @@
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "Cross Gain"
@@ -859,6 +878,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_ATTENUATION
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Attenuation"
@@ -875,6 +895,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_CUTOFF
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Cutoff"
@@ -2043,6 +2064,7 @@
 <phrase>
   id: LANG_RANDOM
   desc: random folder
+  user:
   <source>
     *: "Random"
   </source>
@@ -2513,6 +2535,7 @@
 <phrase>
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
+  user:
   <source>
     *: "Database is not ready"
   </source>
@@ -3265,11 +3288,11 @@
     scrollwheel: none
   </source>
   <dest>
-    *: "List Acceleration Start Delay"
+    *: "加速するまでの時間"
     scrollwheel: none
   </dest>
   <voice>
-    *: "List Acceleration Start Delay"
+    *: "加速するまでの時間"
     scrollwheel: none
   </voice>
 </phrase>
@@ -3282,11 +3305,11 @@
     scrollwheel: none
   </source>
   <dest>
-    *: "List Acceleration Speed"
+    *: "加速度"
     scrollwheel: none
   </dest>
   <voice>
-    *: "List Acceleration Speed"
+    *: "加速度"
     scrollwheel: none
   </voice>
 </phrase>
@@ -4645,7 +4668,7 @@
   </dest>
   <voice>
     *: none
-    alarm: ""
+    alarm: "起床"
   </voice>
 </phrase>
 <phrase>
@@ -5386,7 +5409,7 @@
   </dest>
   <voice>
     *: none
-    radio: "スクリーン凍結"
+    radio: ""
   </voice>
 </phrase>
 <phrase>
@@ -5579,6 +5602,7 @@
 <phrase>
   id: LANG_FM_REGION
   desc: fm tuner region setting
+  user:
   <source>
     *: none
     radio: "Region"
@@ -5595,6 +5619,7 @@
 <phrase>
   id: LANG_FM_EUROPE
   desc: fm tuner region europe
+  user:
   <source>
     *: none
     radio: "Europe"
@@ -5611,6 +5636,7 @@
 <phrase>
   id: LANG_FM_US
   desc: fm region us / canada
+  user:
   <source>
     *: none
     radio: "US / Canada"
@@ -5627,6 +5653,7 @@
 <phrase>
   id: LANG_FM_JAPAN
   desc: fm region japan
+  user:
   <source>
     *: none
     radio: "Japan"
@@ -5643,6 +5670,7 @@
 <phrase>
   id: LANG_FM_KOREA
   desc: fm region korea
+  user:
   <source>
     *: none
     radio: "Korea"
@@ -5738,7 +5766,7 @@
   </dest>
   <voice>
     *: none
-    recording: "AIFF"
+    recording: "A I F F"
   </voice>
 </phrase>
 <phrase>
@@ -5951,6 +5979,7 @@
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Measure"
@@ -5967,6 +5996,7 @@
 <phrase>
   id: LANG_SPLIT_TYPE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "What to do when Splitting"
@@ -6017,6 +6047,7 @@
 <phrase>
   id: LANG_SPLIT_TIME
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Time"
@@ -6033,6 +6064,7 @@
 <phrase>
   id: LANG_SPLIT_SIZE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Filesize"
@@ -6270,6 +6302,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_TYPE
   desc: in recording trigger menu
+  user:
   <source>
     *: none
     recording: "Trigtype"
@@ -6286,6 +6319,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_NEWFILESTP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "New file"
@@ -6302,6 +6336,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_STOP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "Stop"
@@ -6437,6 +6472,7 @@
 <phrase>
   id: LANG_RECORD_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -6453,6 +6489,7 @@
 <phrase>
   id: LANG_AGC_SAFETY
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Safety (clip)"
@@ -6469,6 +6506,7 @@
 <phrase>
   id: LANG_AGC_LIVE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Live (slow)"
@@ -6485,6 +6523,7 @@
 <phrase>
   id: LANG_AGC_DJSET
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "DJ-Set (slow)"
@@ -6501,6 +6540,7 @@
 <phrase>
   id: LANG_AGC_MEDIUM
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Medium"
@@ -6517,6 +6557,7 @@
 <phrase>
   id: LANG_AGC_VOICE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Voice (fast)"
@@ -6533,6 +6574,7 @@
 <phrase>
   id: LANG_RECORD_AGC_CLIPTIME
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -6906,16 +6948,19 @@
   user:
   <source>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </source>
   <dest>
     *: none
+    multivolume: "HD1"
     e200*,c200: "mSD:"
     ondio*: "MMC:"
   </dest>
   <voice>
     *: none
+    multivolume: "H D 1"
     e200*,c200: "マイクロSD"
     ondio*: "マルチメディアカード"
   </voice>
@@ -8207,6 +8252,8 @@
     *: "時間"
   </voice>
 </phrase>
+/* TODO: cleanup LANG_USB_CHARGING unless HAVE_USB_CHARGING_ENABLE defined,
+ * the selector should probably be usb_charging_enable as well. */
 <phrase>
   id: LANG_USB_CHARGING
   desc: in Battery menu
@@ -8306,7 +8353,7 @@
   </dest>
   <voice>
     *: none
-    recording: ""
+    recording: "マイナス無限大"
   </voice>
 </phrase>
 <phrase>
@@ -8381,6 +8428,8 @@
     ipod*: "PLAY/PAUSE to abort"
     x5,m5: "Long PLAY to abort"
     h10,h10_5gb,e200*,c200: "PREV to abort"
+    gigabeats: "BACK to abort"
+    gigabeatf: "POWER to abort"
   </source>
   <dest>
     *: "OFF： キャンセル"
@@ -8388,6 +8437,8 @@
     ipod*: "PLAY/PAUSE： キャンセル"
     x5,m5: "Long PLAY： キャンセル"
     h10,h10_5gb,e200*,c200: "PREV： キャンセル"
+    gigabeats: "BACK： キャンセル"
+    gigabeatf: "POWER： キャンセル"
   </dest>
   <voice>
     *: ""
@@ -8488,7 +8539,7 @@
     *: "プラグインがエラーを返しました"
   </dest>
   <voice>
-    *: "プラグインがエラーを返しました"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -8563,15 +8614,15 @@
 </phrase>
 <phrase>
   id: LANG_RESTARTING_PLAYBACK
-  desc: splash screen displayed when pcm buffer size is changed
+  desc: deprecated
   user:
   <source>
     *: none
-    swcodec: "Restarting playback..."
+    swcodec: ""
   </source>
   <dest>
     *: none
-    swcodec: "再生を再開しています..."
+    swcodec: ""
   </dest>
   <voice>
     *: none
@@ -8682,7 +8733,7 @@
     *: "B"
   </dest>
   <voice>
-    *: "バイト"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10109,11 +10160,11 @@
   user:
   <source>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "Edit mode: %s %s"
   </source>
   <dest>
     *: none
-    swcodec: "Edit mode: %s"
+    swcodec: "調整項目: %s %s"
   </dest>
   <voice>
     *: none
@@ -10126,15 +10177,15 @@
   user:
   <source>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "カットオフ周波数"
   </dest>
   <voice>
     *: none
-    swcodec: "Cutoff Frequency"
+    swcodec: "カットオフ周波数"
   </voice>
 </phrase>
 <phrase>
@@ -10147,11 +10198,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Gain"
+    lcd_bitmap: "ゲイン"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Gain"
+    lcd_bitmap: "ゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -10368,7 +10419,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Mode:"
+    lcd_bitmap: "項目:"
   </dest>
   <voice>
     *: none
@@ -10385,7 +10436,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Menu"
+    recorder_pad: "メニュー"
   </dest>
   <voice>
     *: none
@@ -10402,7 +10453,7 @@
   </source>
   <dest>
     *: none
-    recorder_pad: "Option"
+    recorder_pad: "オプション"
   </dest>
   <voice>
     *: none
@@ -10470,11 +10521,11 @@
   </source>
   <dest>
     *: none
-    recording: "Stereo"
+    recording: "ステレオ"
   </dest>
   <voice>
     *: none
-    recording: "Stereo"
+    recording: "ステレオ"
   </voice>
 </phrase>
 <phrase>
@@ -10487,11 +10538,11 @@
   </source>
   <dest>
     *: none
-    recording: "Mono"
+    recording: "モノラル"
   </dest>
   <voice>
     *: none
-    recording: "Mono"
+    recording: "モノラル"
   </voice>
 </phrase>
 <phrase>
@@ -10504,11 +10555,11 @@
   </source>
   <dest>
     *: none
-    recording_hwcodec: "Quality"
+    recording_hwcodec: "品質"
   </dest>
   <voice>
     *: none
-    recording_hwcodec: "Quality"
+    recording_hwcodec: "品質"
   </voice>
 </phrase>
 <phrase>
@@ -10521,11 +10572,11 @@
   </source>
   <dest>
     *: none
-    recording: "Frequency"
+    recording: "周波数"
   </dest>
   <voice>
     *: none
-    recording: "Frequency"
+    recording: "周波数"
   </voice>
 </phrase>
 <phrase>
@@ -10538,11 +10589,11 @@
   </source>
   <dest>
     *: none
-    recording: "Source"
+    recording: "ソース"
   </dest>
   <voice>
     *: none
-    recording: "Source"
+    recording: "ソース"
   </voice>
 </phrase>
 <phrase>
@@ -10555,11 +10606,11 @@
   </source>
   <dest>
     *: none
-    recording: "Int. Mic"
+    recording: "内蔵のマイク"
   </dest>
   <voice>
     *: none
-    recording: "Internal Microphone"
+    recording: "内蔵のマイク"
   </voice>
 </phrase>
 <phrase>
@@ -10572,11 +10623,11 @@
   </source>
   <dest>
     *: none
-    recording: "Line In"
+    recording: "ライン入力"
   </dest>
   <voice>
     *: none
-    recording: "Line In"
+    recording: "ライン入力"
   </voice>
 </phrase>
 <phrase>
@@ -10589,11 +10640,11 @@
   </source>
   <dest>
     *: none
-    recording: "Digital"
+    recording: "デジタル"
   </dest>
   <voice>
     *: none
-    recording: "Digital"
+    recording: "デジタル"
   </voice>
 </phrase>
 <phrase>
@@ -10606,11 +10657,11 @@
   </source>
   <dest>
     *: none
-    recording: "Channels"
+    recording: "チャンネルの設定"
   </dest>
   <voice>
     *: none
-    recording: "Channels"
+    recording: "チャンネルの設定"
   </voice>
 </phrase>
 <phrase>
@@ -10623,11 +10674,11 @@
   </source>
   <dest>
     *: none
-    recording: "Trigger"
+    recording: "トリガ"
   </dest>
   <voice>
     *: none
-    recording: "Trigger"
+    recording: "トリガ"
   </voice>
 </phrase>
 <phrase>
@@ -10708,7 +10759,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Left"
+    recording: "左ゲイン"
   </dest>
   <voice>
     *: none
@@ -10725,7 +10776,7 @@
   </source>
   <dest>
     *: none
-    recording: "Gain Right"
+    recording: "右ゲイン"
   </dest>
   <voice>
     *: none
@@ -10769,6 +10820,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10785,6 +10837,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_SAFETY
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10801,6 +10854,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_LIVE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10817,6 +10871,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_DJSET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10833,6 +10888,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_MEDIUM
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10849,6 +10905,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_VOICE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10865,6 +10922,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -11397,7 +11455,7 @@
     multivolume: "なし"
   </voice>
 </phrase>
-<phrase>
+<phrase>  
   id: LANG_TALK_BATTERY_LEVEL
   desc: Setting for spontaneous battery level announcement
   user:
@@ -11530,11 +11588,11 @@
     accessory_supply: "Accessory Power Supply"
   </source>
   <dest>
-    *: "アクセサリへの電源供給"
+    *: none
     accessory_supply: "アクセサリへの電源供給"
   </dest>
   <voice>
-    *: "アクセサリへの電源供給"
+    *: none
     accessory_supply: "アクセサリへの電源供給"
   </voice>
 </phrase>
@@ -11639,7 +11697,7 @@
 <phrase>
   id: LANG_STOP_RECORDING_AND_SHUTDOWN
   desc: in record timesplit options
-  user: 
+  user:
   <source>
     *: none
     recording: "Stop Recording And Shutdown"
@@ -11656,7 +11714,7 @@
 <phrase>
   id: LANG_TOUCHPAD_SENSITIVITY
   desc: touchpad sensitivity setting
-  user: 
+  user:
   <source>
     *: none
     gigabeatf: "Touchpad Sensitivity"
@@ -11822,6 +11880,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_PRESET
   desc: automatic gain control in record settings and screen
+  user:
   <source>
     *: none
     agc: "AGC"
@@ -11838,6 +11897,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_CLIPTIME
   desc: in record settings
+  user:
   <source>
     *: none
     agc: "AGC clip time"
@@ -11854,6 +11914,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
+  user:
   <source>
     *: none
     agc: "AGC max. gain"
@@ -11894,7 +11955,7 @@
   </source>
   <dest>
     *: none
-    recording: "CLIP:"
+    recording: "クリップ:"
   </dest>
   <voice>
     *: none
@@ -11935,3 +11996,184 @@
     recording: ""
   </voice>
 </phrase>
+<phrase>
+  id: LANG_ALBUMART
+  desc: Display the expected AA size
+  user:
+  <source>
+    *: none
+    albumart: "Album Art:"
+  </source>
+  <dest>
+    *: none
+    albumart: "アルバムアート:"
+  </dest>
+  <voice>
+    *: none
+    albumart: "アルバムアート:"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RECORDING_MONO_MODE
+  desc: in the recording settings
+  user:
+  <source>
+    *: none
+    recording_swcodec: "Mono mode"
+  </source>
+  <dest>
+    *: none
+    recording_swcodec: "モノラル"
+  </dest>
+  <voice>
+    *: none
+    recording_swcodec: "モノラル"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SEARCH_RESULTS
+  desc: title for the list of results displayed after searching in a playlist
+  user:
+  <source>
+    *: "Search Results"
+  </source>
+  <dest>
+    *: "検索結果"
+  </dest>
+  <voice>
+    *: "検索結果"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_QS_ITEMS
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM
+  desc: DEPRECATED
+  user:
+  <source>
+    *: none
+    quickscreen: ""
+  </source>
+  <dest>
+    *: none
+    quickscreen: ""
+  </dest>
+  <voice>
+    *: none
+    quickscreen: ""
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RESET_SETTING
+  desc: used in the settings context menu
+  user:
+  <source>
+    *: "Reset Setting"
+  </source>
+  <dest>
+    *: "設定を初期状態に戻す"
+  </dest>
+  <voice>
+    *: "設定を初期状態に戻す"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_LEFT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Left Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "左クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "左クイック画面の項目として設定"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_RIGHT_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Right Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "右クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "右クイック画面の項目として設定"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BOTTOM_QS_ITEM
+  desc: used for the submenu name for the quickscreen items
+  user:
+  <source>
+    *: none
+    quickscreen: "Set as Bottom Quickscreen Item"
+  </source>
+  <dest>
+    *: none
+    quickscreen: "下クイック画面の項目として設定"
+  </dest>
+  <voice>
+    *: none
+    quickscreen: "下クイック画面の項目として設定"
+  </voice>
+</phrase>
diff --git a/docs/CREDITS b/docs/CREDITS
index 0fdcd27dbe..0b37b922ce 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -440,6 +440,7 @@ Vicente Ibarra
 Rui Araújo
 Brian Cloutier
 Olivier Barbut
+Yoshihisa Uchida
 
 
 The libmad team