Index: japanese.lang
===================================================================
--- japanese.lang	(revision 16783)
+++ japanese.lang	(working copy)
@@ -20,7 +20,7 @@
     *: "はい"
   </dest>
   <voice>
-    *: "Yes"
+    *: "はい"
   </voice>
 </phrase>
 <phrase>
@@ -34,7 +34,7 @@
     *: "いいえ"
   </dest>
   <voice>
-    *: "No"
+    *: "いいえ"
   </voice>
 </phrase>
 <phrase>
@@ -45,10 +45,10 @@
     *: "On"
   </source>
   <dest>
-    *: "On"
+    *: "オン"
   </dest>
   <voice>
-    *: "On"
+    *: "オン"
   </voice>
 </phrase>
 <phrase>
@@ -59,10 +59,10 @@
     *: "Off"
   </source>
   <dest>
-    *: "Off"
+    *: "オフ"
   </dest>
   <voice>
-    *: "Off"
+    *: "オフ"
   </voice>
 </phrase>
 <phrase>
@@ -76,7 +76,7 @@
     *: "逐次確認"
   </dest>
   <voice>
-    *: "Ask"
+    *: "逐次確認"
   </voice>
 </phrase>
 <phrase>
@@ -90,7 +90,7 @@
     *: "常時"
   </dest>
   <voice>
-    *: "Always"
+    *: "常時"
   </voice>
 </phrase>
 <phrase>
@@ -104,7 +104,7 @@
     *: "通常"
   </dest>
   <voice>
-    *: "Normal"
+    *: "通常"
   </voice>
 </phrase>
 <phrase>
@@ -118,7 +118,7 @@
     *: "ゲイン"
   </dest>
   <voice>
-    *: "Gain"
+    *: "ゲイン"
   </voice>
 </phrase>
 <phrase>
@@ -132,7 +132,7 @@
     *: "読み込み中..."
   </dest>
   <voice>
-    *: "Loading"
+    *: "読み込み中"
   </voice>
 </phrase>
 <phrase>
@@ -160,7 +160,7 @@
     *: "ディスクをスキャン中"
   </dest>
   <voice>
-    *: "Scanning disk"
+    *: "ディスクをスキャン中"
   </voice>
 </phrase>
 <phrase>
@@ -174,18 +174,18 @@
     *: "シャットダウン中..."
   </dest>
   <voice>
-    *: "Shutting down"
+    *: "シャットダウン中"
   </voice>
 </phrase>
 <phrase>
   id: LANG_PLAYLIST_SHUFFLE
-  desc: displayed on screen while shuffling a playlist
+  desc: DEPRECATED
   user:
   <source>
-    *: "Shuffling..."
+    *: ""
   </source>
   <dest>
-    *: "シャッフル中..."
+    *: ""
   </dest>
   <voice>
     *: ""
@@ -202,7 +202,7 @@
     *: "キャンセルしました"
   </dest>
   <voice>
-    *: "Cancelled"
+    *: "キャンセルしました"
   </voice>
 </phrase>
 <phrase>
@@ -216,7 +216,7 @@
     *: "失敗しました"
   </dest>
   <voice>
-    *: "Failed"
+    *: "失敗しました"
   </voice>
 </phrase>
 <phrase>
@@ -230,7 +230,7 @@
     *: "チャネルの設定"
   </dest>
   <voice>
-    *: "Channels"
+    *: "チャネルの設定"
   </voice>
 </phrase>
 <phrase>
@@ -244,7 +244,7 @@
     *: "よろしいですか?"
   </dest>
   <voice>
-    *: "Are You Sure?"
+    *: "よろしいですか?"
   </voice>
 </phrase>
 <phrase>
@@ -254,17 +254,20 @@
   <source>
     *: "PLAY = Yes"
     h100,h120,h300: "NAVI = Yes"
-    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb: "SELECT = Yes"
+    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = Yes"
     player: "(PLAY/STOP)"
   </source>
   <dest>
     *: "PLAY = はい"
     h100,h120,h300: "NAVI = はい"
-    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb: "SELECT = はい"
+    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: "SELECT = はい"
     player: "(PLAY/STOP)"
   </dest>
   <voice>
     *: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,gigabeatf,e200,c200,h10,h10_5gb,mrobe100: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -295,7 +298,7 @@
     *: "Rockbox"
   </dest>
   <voice>
-    *: "Rockbox"
+    *: "ロックボックス"
   </voice>
 </phrase>
 <phrase>
@@ -309,7 +312,7 @@
     *: "最近のブックマーク"
   </dest>
   <voice>
-    *: "Recent Bookmarks"
+    *: "最近のブックマーク"
   </voice>
 </phrase>
 <phrase>
@@ -323,7 +326,7 @@
     *: "ファイル"
   </dest>
   <voice>
-    *: "Files"
+    *: "ファイル"
   </voice>
 </phrase>
 <phrase>
@@ -536,7 +539,7 @@
     *: "Resume"
   </source>
   <dest>
-    *: "ブックマークをレジゅーム"
+    *: "ブックマークをレジューム"
   </dest>
   <voice>
     *: "Resume"
@@ -662,7 +665,7 @@
     *: "Treble"
   </source>
   <dest>
-    *: "中音域の音量"
+    *: "高音域の音量"
   </dest>
   <voice>
     *: "Treble"
@@ -821,7 +824,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Direct Gain"
+    swcodec: "ダイレクトゲイン"
   </dest>
   <voice>
     *: none
@@ -831,13 +834,14 @@
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "Cross Gain"
   </source>
   <dest>
     *: none
-    swcodec: "Cross Gain"
+    swcodec: "クロスゲイン"
   </dest>
   <voice>
     *: none
@@ -847,13 +851,14 @@
 <phrase>
   id: LANG_CROSSFEED_HF_ATTENUATION
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Attenuation"
   </source>
   <dest>
     *: none
-    swcodec: "High-Frequency Attenuation"
+    swcodec: "高周波アッテネーション"
   </dest>
   <voice>
     *: none
@@ -863,13 +868,14 @@
 <phrase>
   id: LANG_CROSSFEED_HF_CUTOFF
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Cutoff"
   </source>
   <dest>
     *: none
-    swcodec: "High-Frequency Cutoff"
+    swcodec: "高周波カットオフ"
   </dest>
   <voice>
     *: none
@@ -937,7 +943,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Precut"
+    swcodec: "プレカット"
   </dest>
   <voice>
     *: none
@@ -1150,87 +1156,87 @@
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_HARDWARE
-  desc: in the sound settings menu
+  desc: deprecated
   user:
   <source>
     *: none
-    ipodvideo: "Hardware Equalizer"
+    ipodvideo: ""
   </source>
   <dest>
     *: none
-    ipodvideo: "ハードウエアのEQ"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "Hardware equalizer"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_HARDWARE_ENABLED
-  desc: in the equalizer settings menu
+  desc: deprecated
   user:
   <source>
     *: none
-    ipodvideo: "Enable Hardware EQ"
+    ipodvideo: ""
   </source>
   <dest>
     *: none
-    ipodvideo: "ハードウエアのEQ有効"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "Enable hardware equalizer"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_BANDWIDTH
-  desc: in the equalizer settings menu
+  desc: deprecated
   user:
   <source>
     *: none
-    ipodvideo: "Bandwidth"
+    ipodvideo: ""
   </source>
   <dest>
     *: none
-    ipodvideo: "Bandwidth"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "Bandwidth"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_NARROW
-  desc: in the equalizer settings menu
+  desc: deprecated
   user:
   <source>
     *: none
-    ipodvideo: "Narrow"
+    ipodvideo: ""
   </source>
   <dest>
     *: none
-    ipodvideo: "Narrow"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "Narrow"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_EQUALIZER_HARDWARE_BANDWIDTH_WIDE
-  desc: in the equalizer settings menu
+  desc: deprecated
   user:
   <source>
     *: none
-    ipodvideo: "Wide"
+    ipodvideo: ""
   </source>
   <dest>
     *: none
-    ipodvideo: "Wide"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "Wide"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
@@ -1243,7 +1249,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Dithering"
+    swcodec: "ディザリング"
   </dest>
   <voice>
     *: none
@@ -1290,11 +1296,11 @@
   user:
   <source>
     *: none
-    masf: "AVディケイ時間"
+    masf: "AV Decay Time"
   </source>
   <dest>
     *: none
-    masf: "AV Decay Time"
+    masf: "AVディケイ時間"
   </dest>
   <voice>
     *: none
@@ -1314,6 +1320,7 @@
     masf: "超低音"
   </dest>
   <voice>
+    *: ""
     masf: "Super Bass"
   </voice>
 </phrase>
@@ -1595,7 +1602,7 @@
     *: "Party Mode"
   </source>
   <dest>
-    *: "Party Mode"
+    *: "パーティ・モード"
   </dest>
   <voice>
     *: "Party Mode"
@@ -1645,7 +1652,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Track Skip Only"
+    swcodec: "スキップしたときだけ"
   </dest>
   <voice>
     *: none
@@ -1662,7 +1669,7 @@
   </source>
   <dest>
     *: none
-    swcodec: "Shuffle and Track Skip"
+    swcodec: "シャッフルとスキップしたとき"
   </dest>
   <voice>
     *: none
@@ -1973,44 +1980,44 @@
 </phrase>
 <phrase>
   id: LANG_ID3_ORDER
-  desc: in playback settings screen
+  desc: DEPRECATED
   user:
   <source>
-    *: "ID3 Tag Priority"
+    *: ""
   </source>
   <dest>
-    *: "ID3タグの優先度"
+    *: ""
   </dest>
   <voice>
-    *: "ID3 Tag Priority"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_ID3_V1_FIRST
-  desc: in playback settings screen
+  desc: DEPRECATED
   user:
   <source>
-    *: "V1 then V2"
+    *: ""
   </source>
   <dest>
-    *: "ID3V1を優先"
+    *: ""
   </dest>
   <voice>
-    *: "Version 1 then version 2"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_ID3_V2_FIRST
-  desc: in playback settings screen
+  desc: DEPRECATED
   user:
   <source>
-    *: "V2 then V1"
+    *: ""
   </source>
   <dest>
-    *: "ID3V2を優先"
+    *: ""
   </dest>
   <voice>
-    *: "Version 2 then version 1"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -2030,11 +2037,12 @@
 <phrase>
   id: LANG_RANDOM
   desc: random folder
+  user:
   <source>
     *: "Random"
   </source>
   <dest>
-    *: "Random"
+    *: "ランダム"
   </dest>
   <voice>
     *: "Random"
@@ -2048,7 +2056,7 @@
     *: "Last.fm Log"
   </source>
   <dest>
-    *: "Last.fm Log"
+    *: "Last.fm ログ"
   </dest>
   <voice>
     *: "Last.fm Log"
@@ -2062,7 +2070,7 @@
     *: "Cuesheet Support"
   </source>
   <dest>
-    *: "Cuesheet Support"
+    *: "キューシートの対応"
   </dest>
   <voice>
     *: "Cuesheet Support"
@@ -2078,7 +2086,7 @@
   </source>
   <dest>
     *: none
-    headphone_detection: "Pause on Headphone Unplug"
+    headphone_detection: "ヘッドホンを接続していないとき一時停止する"
   </dest>
   <voice>
     *: none
@@ -2095,7 +2103,7 @@
   </source>
   <dest>
     *: none
-    headphone_detection: "Pause and Resume"
+    headphone_detection: "一時停止とレジューム"
   </dest>
   <voice>
     *: none
@@ -2112,7 +2120,7 @@
   </source>
   <dest>
     *: none
-    headphone_detection: "Duration to Rewind"
+    headphone_detection: "巻き戻す時間"
   </dest>
   <voice>
     *: none
@@ -2312,7 +2320,7 @@
     *: "Show Path"
   </source>
   <dest>
-    *: "Show Path"
+    *: "パスの表示"
   </dest>
   <voice>
     *: "Show Path"
@@ -2326,7 +2334,7 @@
     *: "Current Directory Only"
   </source>
   <dest>
-    *: "Current Directory Only"
+    *: "カレントディレクトリのみ"
   </dest>
   <voice>
     *: "Current Directory Only"
@@ -2340,7 +2348,7 @@
     *: "Full Path"
   </source>
   <dest>
-    *: "Full Path"
+    *: "フルパス"
   </dest>
   <voice>
     *: "Full Path"
@@ -2353,19 +2361,23 @@
   <source>
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5,m5: "Building database... %d found (Left to return)"
+    ipod*: "Building database... %d found (PREV to return)"
+    x5,m5,gigabeatf,mrobe100: "Building database... %d found (LEFT to return)"
     h10,h10_5gb,e200,c200: "Building database... %d found (PREV to return)"
   </source>
   <dest>
-    *: "Building database... %d found (OFF to return)"
-    h100,h120,h300: "Building database... %d found (STOP to return)"
-    ipod*: "Building database... %d found (PLAY/PAUSE to return)"
-    x5,m5: "Building database... %d found (Left to return)"
-    h10,h10_5gb,e200,c200: "Building database... %d found (PREV to return)"
+    *: "データベース構築中... %d found (OFFで戻る)"
+    h100,h120,h300: "データベース構築中... %d found (STOPで戻る)"
+    ipod*: "データベース構築中... %d found (PLAY/PAUSEで戻る)"
+    x5,m5,gigabeatf,mrobe100: "データベース構築中... %d found (LEFTで戻る)"
+    h10,h10_5gb,e200,c200: "データベース構築中... %d found (PREVで戻る)"
   </dest>
   <voice>
     *: "entries found for database"
+    h100,h120,h300: ""
+    ipod*: ""
+    x5,m5,gigabeatf,mrobe100: ""
+    h10,h10_5gb,e200,c200: ""
   </voice>
 </phrase>
 <phrase>
@@ -2378,7 +2390,7 @@
   </source>
   <dest>
     *: none
-    tc_ramcache: "Load to RAM"
+    tc_ramcache: "RAMに読み込む"
   </dest>
   <voice>
     *: none
@@ -2393,7 +2405,7 @@
     *: "Auto Update"
   </source>
   <dest>
-    *: "Auto Update"
+    *: "自動更新"
   </dest>
   <voice>
     *: "Auto Update"
@@ -2407,7 +2419,7 @@
     *: "Initialize Now"
   </source>
   <dest>
-    *: "Initialize Now"
+    *: "初期化する"
   </dest>
   <voice>
     *: "Initialize Now"
@@ -2421,7 +2433,7 @@
     *: "Update Now"
   </source>
   <dest>
-    *: "Update Now"
+    *: "更新する"
   </dest>
   <voice>
     *: "Update Now"
@@ -2449,7 +2461,7 @@
     *: "Export Modifications"
   </source>
   <dest>
-    *: "Export Modifications"
+    *: "修正のエクスポート"
   </dest>
   <voice>
     *: "Export Modifications"
@@ -2463,7 +2475,7 @@
     *: "Import Modifications"
   </source>
   <dest>
-    *: "Import Modifications"
+    *: "修正のインポート"
   </dest>
   <voice>
     *: "Import Modifications"
@@ -2477,7 +2489,7 @@
     *: "Updating in background"
   </source>
   <dest>
-    *: "Updating in background"
+    *: "バックグラウンドで更新中"
   </dest>
   <voice>
     *: "Updating in background"
@@ -2491,7 +2503,7 @@
     *: "Committing database"
   </source>
   <dest>
-    *: "Committing database"
+    *: "データベースにコミット中"
   </dest>
   <voice>
     *: "Committing database"
@@ -2500,11 +2512,12 @@
 <phrase>
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
+  user:
   <source>
     *: "Database is not ready"
   </source>
   <dest>
-    *: "Database is not ready"
+    *: "データベースの用意ができていません"
   </dest>
   <voice>
     *: "Database is not ready"
@@ -2518,7 +2531,7 @@
     *: "<All tracks>"
   </source>
   <dest>
-    *: "<All tracks>"
+    *: "<すべてのトラック>"
   </dest>
   <voice>
     *: "All tracks"
@@ -2608,7 +2621,7 @@
     *: "Backlight"
   </source>
   <dest>
-    *: "バックライト持続時間 (バッテリ使用時)"
+    *: "バックライト持続時間 (バッテリー使用時)"
   </dest>
   <voice>
     *: "Backlight"
@@ -2637,11 +2650,11 @@
   user:
   <source>
     *: none
-    hold_button: "Backlight (On Hold Key)"
+    hold_button: "Backlight on Hold"
   </source>
   <dest>
     *: none
-    hold_button: "Backlight (On Hold Key)"
+    hold_button: "Hold時のバックライト"
   </dest>
   <voice>
     *: none
@@ -2701,10 +2714,10 @@
   desc: Backlight behaviour setting
   user:
   <source>
-    *: "First Keypress Enables Backlight Only"
+    *: "First Buttonpress Enables Backlight Only"
   </source>
   <dest>
-    *: "First Keypress Enables Backlight Only"
+    *: "最初のボタン押下でバックライト点灯のみ行う"
   </dest>
   <voice>
     *: "First Keypress Enables Backlight Only"
@@ -2720,7 +2733,7 @@
   </source>
   <dest>
     *: none
-    lcd_sleep: "Sleep (After Backlight Off)"
+    lcd_sleep: "スリープ (バックライト消灯後)"
   </dest>
   <voice>
     *: none
@@ -2737,7 +2750,7 @@
   </source>
   <dest>
     *: none
-    lcd_sleep: "Never"
+    lcd_sleep: "スリープしない"
   </dest>
   <voice>
     *: none
@@ -2832,7 +2845,7 @@
   user:
   <source>
     *: none
-    lcd_bitmap: "Line Selector"
+    lcd_bitmap: "Line Selector Type"
   </source>
   <dest>
     *: none
@@ -3066,7 +3079,7 @@
     *: "Scroll Speed Setting Example"
   </source>
   <dest>
-    *: "Scroll Speed Setting Example"
+    *: "スクロール速度設定の例"
   </dest>
   <voice>
     *: ""
@@ -3108,7 +3121,7 @@
     *: "Scroll Step Size"
   </source>
   <dest>
-    *: "スクロール開始までの時間"
+    *: "スクロールのステップ幅"
   </dest>
   <voice>
     *: "Scroll Step Size"
@@ -3122,7 +3135,7 @@
     *: "Scroll Step Size Setting Example Text"
   </source>
   <dest>
-    *: "Scroll Step Size Setting Example Text"
+    *: "スクロールのステップ幅設定の例"
   </dest>
   <voice>
     *: ""
@@ -3277,7 +3290,6 @@
     scrollwheel: none
   </voice>
 </phrase>
-
 <phrase>
   id: LANG_BARS_MENU
   desc: in the display sub menu
@@ -3501,19 +3513,16 @@
 </phrase>
 <phrase>
   id: LANG_PM_UNITS_PER_READ
-  desc: in the peak meter menu
+  desc: DEPRECATED
   user:
   <source>
-    *: "Units Per Read"
-    masd: none
+    *: ""
   </source>
   <dest>
-    *: "単位/目盛"
-    masd: none
+    *: ""
   </dest>
   <voice>
-    *: "Units Per Read"
-    masd: none
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -3623,7 +3632,7 @@
     *: "Latin1 (ISO-8859-1)"
   </source>
   <dest>
-    *: "Latin1 (ISO-8859-1)"
+    *: "西欧 (ISO-8859-1)"
   </dest>
   <voice>
     *: "Latin 1"
@@ -3637,7 +3646,7 @@
     *: "Greek (ISO-8859-7)"
   </source>
   <dest>
-    *: "Greek (ISO-8859-7)"
+    *: "ギリシャ文字 (ISO-8859-7)"
   </dest>
   <voice>
     *: "Greek"
@@ -3653,7 +3662,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Hebrew (ISO-8859-8)"
+    lcd_bitmap: "ヘブライ語 (ISO-8859-8)"
   </dest>
   <voice>
     *: none
@@ -3668,7 +3677,7 @@
     *: "Cyrillic (CP1251)"
   </source>
   <dest>
-    *: "Cyrillic (CP1251)"
+    *: "キリル言語 (CP1251)"
   </dest>
   <voice>
     *: "Cyrillic"
@@ -3684,7 +3693,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Thai (ISO-8859-11)"
+    lcd_bitmap: "タイ語 (ISO-8859-11)"
   </dest>
   <voice>
     *: none
@@ -3701,7 +3710,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Arabic (CP1256)"
+    lcd_bitmap: "アラビア語 (CP1256)"
   </dest>
   <voice>
     *: none
@@ -3716,7 +3725,7 @@
     *: "Turkish (ISO-8859-9)"
   </source>
   <dest>
-    *: "Turkish (ISO-8859-9)"
+    *: "トルコ語 (ISO-8859-9)"
   </dest>
   <voice>
     *: "Turkish"
@@ -3730,7 +3739,7 @@
     *: "Latin Extended (ISO-8859-2)"
   </source>
   <dest>
-    *: "Latin Extended (ISO-8859-2)"
+    *: "東欧 (ISO-8859-2)"
   </dest>
   <voice>
     *: "Latin extended"
@@ -3746,7 +3755,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Japanese (SJIS)"
+    lcd_bitmap: "日本語 (SJIS)"
   </dest>
   <voice>
     *: none
@@ -3763,7 +3772,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Simp. Chinese (GB2312)"
+    lcd_bitmap: "簡体字中国語 (GB2312)"
   </dest>
   <voice>
     *: none
@@ -3780,7 +3789,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Korean (KSX1001)"
+    lcd_bitmap: "韓国語 (KSX1001)"
   </dest>
   <voice>
     *: none
@@ -3797,7 +3806,7 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Trad. Chinese (BIG5)"
+    lcd_bitmap: "繁体字中国語 (BIG5)"
   </dest>
   <voice>
     *: none
@@ -3825,17 +3834,17 @@
   <source>
     *: none
     e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"
+    c200,gigabeatf,mrobe100: "Button Light Timeout"
   </source>
   <dest>
     *: none
-    e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"
+    e200: "ホイールLEDのタイムアウト"
+    c200,gigabeatf,mrobe100: "ボタンLEDのタイムアウト"
   </dest>
   <voice>
     *: none
     e200: "Wheel Light Timeout"
-    c200,gigabeatf: "Button Light Timeout"    
+    c200,gigabeatf,mrobe100: "Button Light Timeout"
   </voice>
 </phrase>
 <phrase>
@@ -3848,7 +3857,7 @@
   </source>
   <dest>
     *: none
-    gigabeatf: "Button Light Brightness"
+    gigabeatf: "ボタンLEDの明るさ"
   </dest>
   <voice>
     *: none
@@ -3863,7 +3872,7 @@
     *: "Start Screen"
   </source>
   <dest>
-    *: "Start Screen"
+    *: "スタート画面"
   </dest>
   <voice>
     *: "Start Screen"
@@ -3877,7 +3886,7 @@
     *: "Main Menu"
   </source>
   <dest>
-    *: "メニュ"
+    *: "メニュー"
   </dest>
   <voice>
     *: "Main Menu"
@@ -3891,7 +3900,7 @@
     *: "Previous Screen"
   </source>
   <dest>
-    *: "Previous Screen"
+    *: "直前の画面"
   </dest>
   <voice>
     *: "Previous Screen"
@@ -3905,7 +3914,7 @@
     *: "Battery"
   </source>
   <dest>
-    *: "バッテリ"
+    *: "バッテリー"
   </dest>
   <voice>
     *: "Battery"
@@ -3919,7 +3928,7 @@
     *: "Battery Capacity"
   </source>
   <dest>
-    *: "バッテリの容量"
+    *: "バッテリーの容量"
   </dest>
   <voice>
     *: "Battery Capacity"
@@ -4117,17 +4126,19 @@
     *: none
     rtc: "ON = Set"
     h100,h120,h300: "NAVI = Set"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf: "SELECT = Set"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: "SELECT = Set"
   </source>
   <dest>
     *: none
     rtc: "ON = 設定"
     h100,h120,h300: "NAVI = 設定"
-    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf: "SELECT = 設定"
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: "SELECT = 設定"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,h10,h10_5gb,x5,m5,ipod*,e200,c200,gigabeatf: ""
+    rtc: ""
+    h100,h120,h300: ""
+    ipod*,x5,m5,h10,h10_5gb,e200,c200,gigabeatf,mrobe100: ""
   </voice>
 </phrase>
 <phrase>
@@ -4142,6 +4153,7 @@
     x5,m5: "RECORD = Revert"
     h10,h10_5gb: "PREV = Revert"
     gigabeatf: "A = Revert"
+    mrobe100: "DISPLAY = Revert"
   </source>
   <dest>
     *: none
@@ -4151,10 +4163,17 @@
     x5,m5: "RECORD = 元に戻す"
     h10,h10_5gb: "PREV = 元に戻す"
     gigabeatf: "A = 元に戻す"
+    mrobe100: "DISPLAY = 元に戻す"
   </dest>
   <voice>
     *: none
-    rtc,h100,h120,h300,ipod*,e200,c200,x5,m5,h10,h10_gb,gigabeatf: ""
+    rtc: ""
+    h100,h120,h300: ""
+    ipod*,e200,c200: ""
+    x5,m5: ""
+    h10,h10_5gb: ""
+    gigabeatf: ""
+    mrobe100: ""
   </voice>
 </phrase>
 <phrase>
@@ -4286,7 +4305,7 @@
   </source>
   <dest>
     *: none
-    rtc: "１月"
+    rtc: "1月"
   </dest>
   <voice>
     *: none
@@ -4303,7 +4322,7 @@
   </source>
   <dest>
     *: none
-    rtc: "２月"
+    rtc: "2月"
   </dest>
   <voice>
     *: none
@@ -4316,11 +4335,11 @@
   user:
   <source>
     *: none
-    rtc: "３月"
+    rtc: "Mar"
   </source>
   <dest>
     *: none
-    rtc: "Mar"
+    rtc: "3月"
   </dest>
   <voice>
     *: none
@@ -4337,7 +4356,7 @@
   </source>
   <dest>
     *: none
-    rtc: "４月"
+    rtc: "4月"
   </dest>
   <voice>
     *: none
@@ -4354,7 +4373,7 @@
   </source>
   <dest>
     *: none
-    rtc: "５月"
+    rtc: "5月"
   </dest>
   <voice>
     *: none
@@ -4371,7 +4390,7 @@
   </source>
   <dest>
     *: none
-    rtc: "６月"
+    rtc: "6月"
   </dest>
   <voice>
     *: none
@@ -4388,7 +4407,7 @@
   </source>
   <dest>
     *: none
-    rtc: "７月"
+    rtc: "7月"
   </dest>
   <voice>
     *: none
@@ -4405,7 +4424,7 @@
   </source>
   <dest>
     *: none
-    rtc: "８月"
+    rtc: "8月"
   </dest>
   <voice>
     *: none
@@ -4422,7 +4441,7 @@
   </source>
   <dest>
     *: none
-    rtc: "９月"
+    rtc: "9月"
   </dest>
   <voice>
     *: none
@@ -4439,7 +4458,7 @@
   </source>
   <dest>
     *: none
-    rtc: "１０月"
+    rtc: "10月"
   </dest>
   <voice>
     *: none
@@ -4456,7 +4475,7 @@
   </source>
   <dest>
     *: none
-    rtc: "１１月"
+    rtc: "11月"
   </dest>
   <voice>
     *: none
@@ -4473,7 +4492,7 @@
   </source>
   <dest>
     *: none
-    rtc: "１２月"
+    rtc: "12月"
   </dest>
   <voice>
     *: none
@@ -4677,15 +4696,19 @@
     *: none
     alarm: "PLAY=Set OFF=Cancel"
     ipod*: "SELECT=Set MENU=Cancel"
+    h10,h10_5gb: "SELECT=Set PREV=Cancel"
   </source>
   <dest>
     *: none
     alarm: "PLAY=セット OFF=キャンセル"
     ipod*: "SELECT=セット MENU=キャンセル"
+    h10,h10_5gb: "SELECT=セット PREV=キャンセル"
   </dest>
   <voice>
     *: none
-    alarm,ipod*: ""
+    alarm: ""
+    ipod*: ""
+    h10,h10_5gb: ""
   </voice>
 </phrase>
 <phrase>
@@ -4993,7 +5016,7 @@
     *: "Settings Loaded"
   </source>
   <dest>
-    *: "設定 ロードしました"
+    *: "設定をロードしました"
   </dest>
   <voice>
     *: "Settings Loaded"
@@ -5049,7 +5072,7 @@
     *: "Settings Saved"
   </source>
   <dest>
-    *: "設定 保存しました"
+    *: "設定を保存しました"
   </dest>
   <voice>
     *: "Settings Saved"
@@ -5063,7 +5086,7 @@
     *: "Save Theme Settings"
   </source>
   <dest>
-    *: "Save Theme Settings"
+    *: "テーマ設定の保存"
   </dest>
   <voice>
     *: "Save Theme Settings"
@@ -5093,7 +5116,7 @@
   </source>
   <dest>
     *: none
-    recording: "Recording Settings"
+    recording: "録音の設定"
   </dest>
   <voice>
     *: none
@@ -5110,7 +5133,7 @@
   </source>
   <dest>
     *: none
-    radio: "FM Radio Menu"
+    radio: "FMラジオ メニュー"
   </dest>
   <voice>
     *: none
@@ -5127,7 +5150,7 @@
   </source>
   <dest>
     *: none
-    radio: "Station: %d.%02d MHz"
+    radio: "局: %d.%02d MHz"
   </dest>
   <voice>
     *: none
@@ -5535,7 +5558,7 @@
   </source>
   <dest>
     *: none
-    radio: "プリセットが空ので自動スキャンしますか？"
+    radio: "プリセットが空なので自動スキャンしますか？"
   </dest>
   <voice>
     *: none
@@ -5562,13 +5585,14 @@
 <phrase>
   id: LANG_FM_REGION
   desc: fm tuner region setting
+  user:
   <source>
     *: none
     radio: "Region"
   </source>
   <dest>
     *: none
-    radio: "Region"
+    radio: "地域"
   </dest>
   <voice>
     *: none
@@ -5578,6 +5602,7 @@
 <phrase>
   id: LANG_FM_EUROPE
   desc: fm tuner region europe
+  user:
   <source>
     *: none
     radio: "Europe"
@@ -5594,6 +5619,7 @@
 <phrase>
   id: LANG_FM_US
   desc: fm region us / canada
+  user:
   <source>
     *: none
     radio: "US / Canada"
@@ -5610,6 +5636,7 @@
 <phrase>
   id: LANG_FM_JAPAN
   desc: fm region japan
+  user:
   <source>
     *: none
     radio: "Japan"
@@ -5626,6 +5653,7 @@
 <phrase>
   id: LANG_FM_KOREA
   desc: fm region korea
+  user:
   <source>
     *: none
     radio: "Korea"
@@ -5683,7 +5711,7 @@
   </source>
   <dest>
     *: none
-    recording: "PCM ウエーブ"
+    recording: "PCM Wave"
   </dest>
   <voice>
     *: none
@@ -5734,7 +5762,7 @@
   </source>
   <dest>
     *: none
-    recording: "Encoder Settings"
+    recording: "エンコーダの設定"
   </dest>
   <voice>
     *: none
@@ -5751,7 +5779,7 @@
   </source>
   <dest>
     *: none
-    recording_swcodec: "Bitrate"
+    recording_swcodec: "ビットレート"
   </dest>
   <voice>
     *: none
@@ -5924,7 +5952,7 @@
   </source>
   <dest>
     *: none
-    recording: "File Split Options"
+    recording: "ファイル分割の設定"
   </dest>
   <voice>
     *: none
@@ -5934,13 +5962,14 @@
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Measure"
   </source>
   <dest>
     *: none
-    recording: "Split Measure"
+    recording: "分割する単位"
   </dest>
   <voice>
     *: none
@@ -5950,13 +5979,14 @@
 <phrase>
   id: LANG_SPLIT_TYPE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "What to do when Splitting"
   </source>
   <dest>
     *: none
-    recording: "What to do when Splitting"
+    recording: "分割したときの動作"
   </dest>
   <voice>
     *: none
@@ -5973,7 +6003,7 @@
   </source>
   <dest>
     *: none
-    recording: "Start new file"
+    recording: "新しいファイルに録音する"
   </dest>
   <voice>
     *: none
@@ -5990,7 +6020,7 @@
   </source>
   <dest>
     *: none
-    recording: "録音を止まります"
+    recording: "録音を停止する"
   </dest>
   <voice>
     *: none
@@ -6000,6 +6030,7 @@
 <phrase>
   id: LANG_SPLIT_TIME
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Time"
@@ -6016,13 +6047,14 @@
 <phrase>
   id: LANG_SPLIT_SIZE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Filesize"
   </source>
   <dest>
     *: none
-    recording: "Split Filesize"
+    recording: "分割ファイルサイズ"
   </dest>
   <voice>
     *: none
@@ -6039,7 +6071,7 @@
   </source>
   <dest>
     *: none
-    recording: "Filesize"
+    recording: "ファイルサイズ"
   </dest>
   <voice>
     *: none
@@ -6056,7 +6088,7 @@
   </source>
   <dest>
     *: none
-    recording: "遡り録音時間"
+    recording: "さかのぼり録音時間"
   </dest>
   <voice>
     *: none
@@ -6082,19 +6114,19 @@
 </phrase>
 <phrase>
   id: LANG_RECORD_CURRENT_DIR
-  desc: in recording directory options
+  desc: DEPRECATED
   user:
   <source>
     *: none
-    recording: "Current Directory"
+    recording: ""
   </source>
   <dest>
     *: none
-    recording: "現在のディレクトリ"
+    recording: "deprecated"
   </dest>
   <voice>
     *: none
-    recording: "Current directory"
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -6107,7 +6139,7 @@
   </source>
   <dest>
     *: none
-    recording: "Set As Recording Directory"
+    recording: "録音ディレクトリに設定する"
   </dest>
   <voice>
     *: none
@@ -6124,7 +6156,7 @@
   </source>
   <dest>
     *: none
-    recording: "Clear Recording Directory"
+    recording: "録音ディレクトリのクリア"
   </dest>
   <voice>
     *: none
@@ -6141,14 +6173,13 @@
   </source>
   <dest>
     *: none
-    recording: "Can't write to recording directory"
+    recording: "録音ディレクトリに書きこめません"
   </dest>
   <voice>
     *: none
     recording: "Can't write to recording directory"
   </voice>
 </phrase>
-
 <phrase>
   id: LANG_CLIP_LIGHT
   desc: in record settings menu.
@@ -6227,7 +6258,7 @@
   </source>
   <dest>
     *: none
-    recording: "Trigger"
+    recording: "トリガー"
   </dest>
   <voice>
     *: none
@@ -6254,13 +6285,14 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_TYPE
   desc: in recording trigger menu
+  user:
   <source>
     *: none
     recording: "Trigtype"
   </source>
   <dest>
     *: none
-    recording: "Trigtype"
+    recording: "トリガータイプ"
   </dest>
   <voice>
     *: none
@@ -6270,13 +6302,14 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_NEWFILESTP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "New file"
   </source>
   <dest>
     *: none
-    recording: "New file"
+    recording: "新しいファイル"
   </dest>
   <voice>
     *: none
@@ -6286,13 +6319,14 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_STOP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "Stop"
   </source>
   <dest>
     *: none
-    recording: "Stop"
+    recording: "停止"
   </dest>
   <voice>
     *: none
@@ -6309,7 +6343,7 @@
   </source>
   <dest>
     *: none
-    recording: "Start Above"
+    recording: "録音開始レベル"
   </dest>
   <voice>
     *: none
@@ -6343,7 +6377,7 @@
   </source>
   <dest>
     *: none
-    recording: "Stop Below"
+    recording: "録音停止レベル"
   </dest>
   <voice>
     *: none
@@ -6377,7 +6411,7 @@
   </source>
   <dest>
     *: none
-    recording: "遡り録音"
+    recording: "さかのぼり録音"
   </dest>
   <voice>
     *: none
@@ -6418,7 +6452,6 @@
     recording: ""
   </voice>
 </phrase>
-
 <phrase>
   id: LANG_CREATE_PLAYLIST
   desc: Menu option for creating a playlist
@@ -6553,7 +6586,7 @@
     *: "Playlist Catalog"
   </source>
   <dest>
-    *: "Playlist Catalog"
+    *: "プレイリスト カタログ"
   </dest>
   <voice>
     *: "Playlist Catalog"
@@ -6609,7 +6642,7 @@
     *: "Erase dynamic playlist?"
   </source>
   <dest>
-    *: "ダイナミックリストを削除しましか?"
+    *: "ダイナミックリストを削除しますか?"
   </dest>
   <voice>
     *: "Erase dynamic playlist?"
@@ -6767,7 +6800,7 @@
     *: "Running Time"
   </source>
   <dest>
-    *: "Running Time"
+    *: "稼働時間"
   </dest>
   <voice>
     *: "Running Time"
@@ -6775,16 +6808,16 @@
 </phrase>
 <phrase>
   id: LANG_CURRENT_TIME
-  desc: in run time screen
+  desc: deprecated
   user:
   <source>
-    *: "Current Time"
+    *: ""
   </source>
   <dest>
-    *: "Current Time"
+    *: ""
   </dest>
   <voice>
-    *: "Current Time"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -6795,7 +6828,7 @@
     *: "Top Time"
   </source>
   <dest>
-    *: "Top Time"
+    *: "最長稼働時間"
   </dest>
   <voice>
     *: "Top Time"
@@ -6809,7 +6842,7 @@
     *: "Clear Time?"
   </source>
   <dest>
-    *: "Clear Time?"
+    *: "稼働時間をクリアしますか?"
   </dest>
   <voice>
     *: "Clear Time?"
@@ -7061,7 +7094,7 @@
     *: "View Catalog"
   </source>
   <dest>
-    *: "View Catalog"
+    *: "カタログの閲覧"
   </dest>
   <voice>
     *: "View Catalog"
@@ -7075,7 +7108,7 @@
     *: "Add to Playlist"
   </source>
   <dest>
-    *: "Add to Playlist"
+    *: "プレイリストに追加"
   </dest>
   <voice>
     *: "Add to Playlist"
@@ -7089,7 +7122,7 @@
     *: "Add to New Playlist"
   </source>
   <dest>
-    *: "Add to New Playlist"
+    *: "新しいプレイリストに追加"
   </dest>
   <voice>
     *: "Add to New Playlist"
@@ -7103,7 +7136,7 @@
     *: "%s doesn't exist"
   </source>
   <dest>
-    *: "%s doesn't exist"
+    *: "%s は存在しません"
   </dest>
   <voice>
     *: ""
@@ -7117,7 +7150,7 @@
     *: "No Playlists"
   </source>
   <dest>
-    *: "No Playlists"
+    *: "プレイリストがありません"
   </dest>
   <voice>
     *: ""
@@ -7173,7 +7206,7 @@
     *: "Context Menu"
   </source>
   <dest>
-    *: "Context Menu"
+    *: "コンテキストメニュー"
   </dest>
   <voice>
     *: "Context Menu"
@@ -7201,7 +7234,7 @@
     *: "Browse Cuesheet"
   </source>
   <dest>
-    *: "Browse Cuesheet"
+    *: "キューシートの閲覧"
   </dest>
   <voice>
     *: "Browse Cuesheet"
@@ -7212,10 +7245,10 @@
   desc: Menu option to start tag viewer
   user:
   <source>
-    *: "Show ID3 Info"
+    *: "Show Track Info"
   </source>
   <dest>
-    *: "ID3情報の表示"
+    *: "タグ情報の表示"
   </dest>
   <voice>
     *: "Show ID3 Info"
@@ -7313,7 +7346,7 @@
     *: "[Length]"
   </source>
   <dest>
-    *: "[Length]"
+    *: "[長さ]"
   </dest>
   <voice>
     *: ""
@@ -7327,7 +7360,7 @@
     *: "[Playlist]"
   </source>
   <dest>
-    *: "[Playlist]"
+    *: "[プレイリスト]"
   </dest>
   <voice>
     *: ""
@@ -7341,7 +7374,7 @@
     *: "[Bitrate]"
   </source>
   <dest>
-    *: "[Bitrate]"
+    *: "[ビットレート]"
   </dest>
   <voice>
     *: ""
@@ -7383,7 +7416,7 @@
     *: "[Comment]"
   </source>
   <dest>
-    *: "[Comment]"
+    *: "[コメント]"
   </dest>
   <voice>
     *: ""
@@ -7411,7 +7444,7 @@
     *: "[Frequency]"
   </source>
   <dest>
-    *: "[Frequency]"
+    *: "[周波数]"
   </dest>
   <voice>
     *: ""
@@ -7453,7 +7486,7 @@
     *: "[Path]"
   </source>
   <dest>
-    *: "[Path]"
+    *: "[パス]"
   </dest>
   <voice>
     *: ""
@@ -7495,7 +7528,7 @@
     *: "Cut"
   </source>
   <dest>
-    *: "Cut"
+    *: "切り取り"
   </dest>
   <voice>
     *: "Cut"
@@ -7509,7 +7542,7 @@
     *: "Copy"
   </source>
   <dest>
-    *: "Copy"
+    *: "コピー"
   </dest>
   <voice>
     *: "Copy"
@@ -7523,7 +7556,7 @@
     *: "Paste"
   </source>
   <dest>
-    *: "Paste"
+    *: "貼り付け"
   </dest>
   <voice>
     *: "Paste"
@@ -7537,7 +7570,7 @@
     *: "File/directory exists. Overwrite?"
   </source>
   <dest>
-    *: "File/directory exists. Overwrite?"
+    *: "ファイル/ディレクトリを上書きしますか?"
   </dest>
   <voice>
     *: "File or directory exists. Overwrite?"
@@ -7593,7 +7626,7 @@
     *: "Copying..."
   </source>
   <dest>
-    *: "Copying..."
+    *: "コピー中..."
   </dest>
   <voice>
     *: "Copying"
@@ -7728,7 +7761,7 @@
     *: "Properties"
   </source>
   <dest>
-    *: "Properties"
+    *: "プロパティ"
   </dest>
   <voice>
     *: "Properties"
@@ -7742,7 +7775,7 @@
     *: "Add to Shortcuts"
   </source>
   <dest>
-    *: "Add to Shortcuts"
+    *: "ショートカットに追加"
   </dest>
   <voice>
     *: "Add to Shortcuts"
@@ -7758,7 +7791,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Pitch"
+    pitchscreen: "ピッチ"
   </dest>
   <voice>
     *: none
@@ -7775,7 +7808,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Pitch Up"
+    pitchscreen: "ピッチを上げる"
   </dest>
   <voice>
     *: none
@@ -7792,7 +7825,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Pitch Down"
+    pitchscreen: "ピッチを下げる"
   </dest>
   <voice>
     *: none
@@ -7809,7 +7842,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Semitone Up"
+    pitchscreen: "半音上げる"
   </dest>
   <voice>
     *: none
@@ -7826,7 +7859,7 @@
   </source>
   <dest>
     *: none
-    pitchscreen: "Semitone Down"
+    pitchscreen: "半音下げる"
   </dest>
   <voice>
     *: none
@@ -7964,29 +7997,28 @@
 </phrase>
 <phrase>
   id: LANG_SETTINGS_SAVE_FAILED
-  desc: displayed if save settings has failed
+  desc: DEPRECATED
   user:
   <source>
-    *: "Save Failed"
+    *: ""
   </source>
   <dest>
-    *: "設定の保存に失敗しました"
+    *: ""
   </dest>
   <voice>
-    *: "Save Failed"
+    *: ""
   </voice>
 </phrase>
 <phrase>
   id: LANG_SETTINGS_PARTITION
-  desc: if save settings has failed
+  desc: DEPRECATED
   user:
   <source>
-    *: "No partition?"
-    player: "Partition?"
+    *: ""
   </source>
   <dest>
-    *: "パーティションが存在しない!?"
-    player: "パーティション?"
+    *: ""
+    player: ""
   </dest>
   <voice>
     *: ""
@@ -8044,7 +8076,7 @@
   </source>
   <dest>
     *: none
-    usb_charging: "Charge During USB Connection"
+    usb_charging: "USB接続時に充電する"
   </dest>
   <voice>
     *: none
@@ -8056,12 +8088,10 @@
   desc: displayed when key lock is on
   user:
   <source>
-    *: "Keylock is ON"
-    player: "Key Lock ON"
+    *: "Buttons Locked"
   </source>
   <dest>
     *: "キーロックが設定されています"
-    player: "キーロックを設定しました"
   </dest>
   <voice>
     *: ""
@@ -8072,12 +8102,10 @@
   desc: displayed when key lock is turned off
   user:
   <source>
-    *: "Keylock is OFF"
-    player: "Key Lock OFF"
+    *: "Buttons Unlocked"
   </source>
   <dest>
     *: "キーロックを解除しました"
-    player: "キーロックを解除しました"
   </dest>
   <voice>
     *: ""
@@ -8106,15 +8134,24 @@
   user:
   <source>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5: "The disk is full. Press POWER to continue."
+    e200,c200: "The disk is full. Press UP to continue."
   </source>
   <dest>
     *: none
     recording: "ディスクが一杯です．停止ボタンを押してください"
+    h100,h120,h300: "ディスクが一杯です．停止ボタンを押してください"
+    m5,x5: "ディスクが一杯です．電源ボタンを押してください"
+    e200,c200: "ディスクが一杯です．上ボタンを押してください"
   </dest>
   <voice>
     *: none
     recording: ""
+    h100,h120,h300: ""
+    m5,x5: ""
+    e200,c200: ""
   </voice>
 </phrase>
 <phrase>
@@ -8338,7 +8375,7 @@
     *: "Filetype array full"
   </source>
   <dest>
-    *: "ファイル形式配列が一杯です
+    *: "ファイル形式配列が一杯です"
   </dest>
   <voice>
     *: "Filetype array full"
@@ -8366,7 +8403,7 @@
     *: "Invalid Filename!"
   </source>
   <dest>
-    *: "無効なファイルネーム!"
+    *: "無効なファイル名!"
   </dest>
   <voice>
     *: "Invalid Filename"
@@ -8427,7 +8464,7 @@
   </source>
   <dest>
     *: none
-    charging: "バッテリ: 充電中"
+    charging: "バッテリー: 充電中"
   </dest>
   <voice>
     *: none
@@ -8444,7 +8481,7 @@
   </source>
   <dest>
     *: none
-    recorder: "バッテリ: 最終充電"
+    recorder: "バッテリー: 最終充電"
   </dest>
   <voice>
     *: none
@@ -8461,7 +8498,7 @@
   </source>
   <dest>
     *: none
-    charging: "バッテリ: 維持充電"
+    charging: "バッテリー: 維持充電"
   </dest>
   <voice>
     *: none
@@ -8469,7 +8506,6 @@
   </voice>
 </phrase>
 <phrase>
-<phrase>
   id: LANG_WARNING_BATTERY_LOW
   desc: general warning
   user:
@@ -8477,7 +8513,7 @@
     *: "WARNING! Low Battery!"
   </source>
   <dest>
-    *: "WARNING! Low Battery!"
+    *: "警告! バッテリー低下!"
   </dest>
   <voice>
     *: "WARNING! Low Battery!"
@@ -8491,7 +8527,7 @@
     *: "Battery empty! RECHARGE!"
   </source>
   <dest>
-    *: "Battery empty! RECHARGE!"
+    *: "バッテリーが空です! 充電してください!"
   </dest>
   <voice>
     *: "Battery empty! RECHARGE!"
@@ -9717,16 +9753,16 @@
 </phrase>
 <phrase>
   id: VOICE_EXT_TXT
-  desc: spoken only, for file extension
+  desc: DEPRECATED
   user:
   <source>
     *: ""
   </source>
   <dest>
-    *: ""
+    *: "deprecated"
   </dest>
   <voice>
-    *: "text"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -10258,15 +10294,21 @@
   user:
   <source>
     *: none
-    recording: "The disk is full. Press STOP to continue."
+    recording: "The disk is full. Press OFF to continue."
+    h100,h120,h300: "The disk is full. Press STOP to continue."
+    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200,c200: "The disk is full. Press LEFT to continue."
   </source>
   <dest>
     *: none
     recording: "ディスクが一杯です．停止ボタンを押してください"
+    h100,h120,h300: "ディスクが一杯です．停止ボタンを押してください"
+    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200,c200: "ディスクが一杯です．左ボタンを押してください"
   </dest>
   <voice>
     *: none
     recording: ""
+    h100,h120,h300: ""
+    m5,x5,ipod4g,ipodcolor,ipodnano,ipodvideo,e200,c200: ""
   </voice>
 </phrase>
 <phrase>
@@ -10449,7 +10491,7 @@
   </source>
   <dest>
     *: none
-    recording: "Trigger"
+    recording: "トリガー"
   </dest>
   <voice>
     *: none
@@ -10496,7 +10538,7 @@
   user:
   <source>
     *: none
-    recording: "Size:"
+    recording: "Size:"	
   </source>
   <dest>
     *: none
@@ -10517,7 +10559,7 @@
   </source>
   <dest>
     *: none
-    recording: "遡り録音"
+    recording: "さかのぼり録音"
   </dest>
   <voice>
     *: none
@@ -10561,13 +10603,14 @@
 <phrase>
   id: LANG_SYSFONT_SPLIT_SIZE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Filesize"
   </source>
   <dest>
     *: none
-    recording: "Split Filesize"
+    recording: "分割するファイルサイズ"
   </dest>
   <voice>
     *: none
@@ -10584,7 +10627,7 @@
   </source>
   <dest>
     *: none
-    recording: "Filename:"
+    recording: "ファイル名:"
   </dest>
   <voice>
     *: none
@@ -10594,6 +10637,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_PRESET
   desc: automatic gain control in recording screen
+  user:
   <source>
     *: none
     agc: "AGC"
@@ -10610,6 +10654,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_SAFETY
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Safety (clip)"
@@ -10626,6 +10671,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_LIVE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Live (slow)"
@@ -10642,6 +10688,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_DJSET
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "DJ-Set (slow)"
@@ -10658,6 +10705,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_MEDIUM
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Medium"
@@ -10674,6 +10722,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_VOICE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Voice (fast)"
@@ -10690,6 +10739,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
+  user:
   <source>
     *: none
     agc: "AGC max. gain"
@@ -10759,3 +10809,559 @@
     *: "Demos"
   </voice>
 </phrase>
+  <phrase>
+  id: LANG_SHOW_FILENAME_EXT
+  desc: in settings_menu
+  user:
+  <source>
+    *: "Show Filename Extensions"
+  </source>
+  <dest>
+    *: "拡張子を表示する"
+  </dest>
+  <voice>
+    *: "Show filename extensions"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_UNKNOWN_TYPES
+  desc: in settings_menu
+  user:
+  <source>
+    *: "Only Unknown Types"
+  </source>
+  <dest>
+    *: "不明なタイプのみ"
+  </dest>
+  <voice>
+    *: "Only unknown types"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_EXT_ONLY_VIEW_ALL
+  desc: in settings_menu
+  user:
+  <source>
+    *: "Only When Viewing All Types"
+  </source>
+  <dest>
+    *: "すべてのタイプを表示しているときのみ"
+  </dest>
+  <voice>
+    *: "Only when viewing all types"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_VOICE_FILETYPE
+  desc: voice settings menu
+  user: 
+  <source>
+    *: "Say File Type"
+  </source>
+  <dest>
+    *: "ファイルタイプを音読"
+  </dest>
+  <voice>
+    *: "Say File Type"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PM_UNITS_PER_TICK
+  desc: spoken only, peak meter release unit
+  user: 
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "units per tick"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_NOT_PRESENT
+  desc: when external memory is not present
+  user: 
+  <source>
+    *: none
+    multivolume: "Not present"
+  </source>
+  <dest>
+    *: none
+    multivolume: "提供されません"
+  </dest>
+  <voice>
+    *: none
+    multivolume: "Not present"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK
+  desc: in settings_menu
+  user: 
+  <source>
+    *: none
+    usbstack: "USB Stack"
+  </source>
+  <dest>
+    *: none
+    usbstack: "USBスタック"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "USB Stack"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_BASS_CUTOFF
+  desc: Bass setting cut-off frequency
+  user: 
+  <source>
+    *: none
+    ipodvideo: "Bass Cutoff"
+  </source>
+  <dest>
+    *: none
+    ipodvideo: "低音域カットオフ"
+  </dest>
+  <voice>
+    *: none
+    ipodvideo: "Bass Cutoff"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECTOR_START_COLOR
+  desc: line selector color option
+  user: 
+  <source>
+    *: none
+    lcd_color: "Primary Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "プライマリ色"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Primary Colour"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_BLANK
+  desc: keyboard
+  user: 
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Blank"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_PM_CLIPCOUNTER
+  desc: in settings, for recording peak meter
+  user: 
+  <source>
+    *: none
+    recording: "Clip Counter"
+  </source>
+  <dest>
+    *: none
+    recording: "クリップカウンター"
+  </dest>
+  <voice>
+    *: none
+    recording: "Clip Counter"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TALK_BATTERY_LEVEL
+  desc: Setting for spontaneous battery level announcement
+  user: 
+  <source>
+    *: "Announce Battery Level"
+  </source>
+  <dest>
+    *: "バッテリーレベルのアナウンス"
+  </dest>
+  <voice>
+    *: "Announce Battery Level"
+  </voice>
+</phrase>
+  <phrase>
+  id: VOICE_EMPTY_LIST
+  desc: spoken only, when a list dialog contains no elements
+  user: 
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Empty list"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_AM
+  desc: spoken only, for wall clock announce
+  user: 
+  <source>
+    *: none
+    rtc: ""
+  </source>
+  <dest>
+    *: none
+    rtc: ""
+  </dest>
+  <voice>
+    *: none
+    rtc: "A M"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_HOST
+  desc: in usbstack settings
+  user: 
+  <source>
+    *: none
+    usbstack: "Host"
+  </source>
+  <dest>
+    *: none
+    usbstack: "ホスト"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "Host"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TAGNAVI_RANDOM
+  desc: "<Random>" entry in tag browser
+  user: 
+  <source>
+    *: "<Random>"
+  </source>
+  <dest>
+    *: "<ランダム>"
+  </dest>
+  <voice>
+    *: "Random"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECTOR_TEXT_COLOR
+  desc: line selector text color option
+  user: 
+  <source>
+    *: none
+    lcd_color: "Text Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "文字色"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Text Colour"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_THEME_MENU
+  desc: in the settings menu
+  user: 
+  <source>
+    *: "Theme Settings"
+  </source>
+  <dest>
+    *: "テーマ設定"
+  </dest>
+  <voice>
+    *: "Theme Settings"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OH
+  desc: spoken only, for wall clock announce
+  user: 
+  <source>
+    *: none
+    rtc: ""
+  </source>
+  <dest>
+    *: none
+    rtc: ""
+  </dest>
+  <voice>
+    *: none
+    rtc: "oh"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_MODE
+  desc: in usbstack settings
+  user: 
+  <source>
+    *: none
+    usbstack: "USB Stack Mode"
+  </source>
+  <dest>
+    *: none
+    usbstack: "USBスタックモード"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "USB Stack Mode"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_DEVICE
+  desc: in usbstack settings
+  user: 
+  <source>
+    *: none
+    usbstack: "Device"
+  </source>
+  <dest>
+    *: none
+    usbstack: "デバイス"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "Device"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_PM
+  desc: spoken only, for wall clock announce
+  user: 
+  <source>
+    *: none
+    rtc: ""
+  </source>
+  <dest>
+    *: none
+    rtc: ""
+  </dest>
+  <voice>
+    *: none
+    rtc: "P M"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SAVE_SOUND
+  desc: save a sound config file
+  user: 
+  <source>
+    *: "Save Sound Settings"
+  </source>
+  <dest>
+    *: "サウンド設定の保存"
+  </dest>
+  <voice>
+    *: "Save Sound Settings"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SYSFONT_PM_CLIPCOUNT
+  desc: in recording GUI, for recording peak meter. MAX 5 characters!
+  user: 
+  <source>
+    *: none
+    recording: "CLIP:"
+  </source>
+  <dest>
+    *: none
+    recording: "クリップ:"
+  </dest>
+  <voice>
+    *: none
+    recording: ""
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_EDIT
+  desc: keyboard
+  user: 
+  <source>
+    *: ""
+  </source>
+  <dest>
+    *: ""
+  </dest>
+  <voice>
+    *: "Edit"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_USBSTACK_DEVICE_DRIVER
+  desc: in usbstack settings
+  user: 
+  <source>
+    *: none
+    usbstack: "Device Driver"
+  </source>
+  <dest>
+    *: none
+    usbstack: "デバイスドライバー"
+  </dest>
+  <voice>
+    *: none
+    usbstack: "Device Driver"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYCLICK
+  desc: in keyclick settings menu
+  user: 
+  <source>
+    *: none
+    swcodec: "Keyclick"
+  </source>
+  <dest>
+    *: none
+    swcodec: "キークリック"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Keyclick"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR_GRADIENT
+  desc: in settings_menu
+  user: 
+  <source>
+    *: none
+    lcd_color: "Bar (Gradient Colour)"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "バー (グラデーション)"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Bar (Gradient Colour)"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_INVERT_CURSOR_COLOR
+  desc: in settings_menu
+  user: 
+  <source>
+    *: none
+    lcd_color: "Bar (Solid Colour)"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "バー (単一の色)"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Bar (Solid Colour)"
+  </voice>
+</phrase>
+<phrase>
+  id: VOICE_OCLOCK
+  desc: spoken only, for wall clock announce
+  user: 
+  <source>
+    *: none
+    rtc: ""
+  </source>
+  <dest>
+    *: none
+    rtc: ""
+  </dest>
+  <voice>
+    *: none
+    rtc: "o'clock"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_COLORS_MENU
+  desc: colours menu under theme settings
+  user: 
+  <source>
+    *: none
+    lcd_color: "Colours"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "色"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Colours"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_SELECTOR_END_COLOR
+  desc: line selector color option
+  user: 
+  <source>
+    *: none
+    lcd_color: "Secondary Colour"
+  </source>
+  <dest>
+    *: none
+    lcd_color: "セカンダリ色"
+  </dest>
+  <voice>
+    *: none
+    lcd_color: "Secondary Colour"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_TREBLE_CUTOFF
+  desc: Treble setting cut-off frequency
+  user: 
+  <source>
+    *: none
+    ipodvideo: "Treble Cutoff"
+  </source>
+  <dest>
+    *: none
+    ipodvideo: "高音域カットオフ"
+  </dest>
+  <voice>
+    *: none
+    ipodvideo: "Treble Cutoff"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_CODEPAGE_CENTRAL_EUROPEAN
+  desc: in codepage setting menu
+  user: 
+  <source>
+    *: "Central European (CP1250)"
+  </source>
+  <dest>
+    *: "中央ヨーロッパ (CP1250)"
+  </dest>
+  <voice>
+    *: "Central European"
+  </voice>
+</phrase>
+<phrase>
+  id: LANG_KEYCLICK_REPEATS
+  desc: in keyclick settings menu
+  user: 
+  <source>
+    *: none
+    swcodec: "Keyclick Repeats"
+  </source>
+  <dest>
+    *: none
+    swcodec: "キークリックのリピート"
+  </dest>
+  <voice>
+    *: none
+    swcodec: "Keyclick Repeats"
+  </voice>
+</phrase>