Index: apps/lang/japanese.lang
===================================================================
--- apps/lang/japanese.lang		(r18307)
+++ apps/lang/japanese.lang		(working copy)
@@ -843,6 +843,7 @@
 <phrase>
   id: LANG_CROSSFEED_CROSS_GAIN
   desc: in crossfeed settings
+  user:	
   <source>
     *: none
     swcodec: "Cross Gain"
@@ -859,6 +860,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_ATTENUATION
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Attenuation"
@@ -875,6 +877,7 @@
 <phrase>
   id: LANG_CROSSFEED_HF_CUTOFF
   desc: in crossfeed settings
+  user:
   <source>
     *: none
     swcodec: "High-Frequency Cutoff"
@@ -1340,11 +1343,11 @@
   </source>
   <dest>
     *: none
-    masf: "MDB有効"
+    masf: "MDBの有効化"
   </dest>
   <voice>
     *: none
-    masf: "MDB有効"
+    masf: "MDBの有効化"
   </voice>
 </phrase>
 <phrase>
@@ -2043,6 +2046,7 @@
 <phrase>
   id: LANG_RANDOM
   desc: random folder
+  user:
   <source>
     *: "Random"
   </source>
@@ -2513,6 +2517,7 @@
 <phrase>
   id: LANG_TAGCACHE_BUSY
   desc: when trying to shutdown and tagcache is committing
+  user:
   <source>
     *: "Database is not ready"
   </source>
@@ -2815,11 +2820,11 @@
   </source>
   <dest>
     *: none
-    lcd_invert,remote_lcd_invert:"反転"
+    lcd_invert,remote_lcd_invert: "反転"
   </dest>
   <voice>
     *: none
-    lcd_invert,remote_lcd_invert:"反転"
+    lcd_invert,remote_lcd_invert: "反転"
   </voice>
 </phrase>
 <phrase>
@@ -5579,6 +5584,7 @@
 <phrase>
   id: LANG_FM_REGION
   desc: fm tuner region setting
+  user:
   <source>
     *: none
     radio: "Region"
@@ -5595,6 +5601,7 @@
 <phrase>
   id: LANG_FM_EUROPE
   desc: fm tuner region europe
+  user:
   <source>
     *: none
     radio: "Europe"
@@ -5611,6 +5618,7 @@
 <phrase>
   id: LANG_FM_US
   desc: fm region us / canada
+  user:
   <source>
     *: none
     radio: "US / Canada"
@@ -5627,6 +5635,7 @@
 <phrase>
   id: LANG_FM_JAPAN
   desc: fm region japan
+  user:
   <source>
     *: none
     radio: "Japan"
@@ -5643,6 +5652,7 @@
 <phrase>
   id: LANG_FM_KOREA
   desc: fm region korea
+  user:
   <source>
     *: none
     radio: "Korea"
@@ -5951,6 +5961,7 @@
 <phrase>
   id: LANG_SPLIT_MEASURE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Measure"
@@ -5967,6 +5978,7 @@
 <phrase>
   id: LANG_SPLIT_TYPE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "What to do when Splitting"
@@ -6017,6 +6029,7 @@
 <phrase>
   id: LANG_SPLIT_TIME
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Time"
@@ -6033,6 +6046,7 @@
 <phrase>
   id: LANG_SPLIT_SIZE
   desc: in record timesplit options
+  user:
   <source>
     *: none
     recording: "Split Filesize"
@@ -6270,6 +6284,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_TYPE
   desc: in recording trigger menu
+  user:
   <source>
     *: none
     recording: "Trigtype"
@@ -6286,6 +6301,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_NEWFILESTP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "New file"
@@ -6302,6 +6318,7 @@
 <phrase>
   id: LANG_RECORD_TRIGGER_STOP
   desc: trigger types
+  user:
   <source>
     *: none
     recording: "Stop"
@@ -6437,6 +6454,7 @@
 <phrase>
   id: LANG_RECORD_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -6453,6 +6471,7 @@
 <phrase>
   id: LANG_AGC_SAFETY
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Safety (clip)"
@@ -6469,6 +6488,7 @@
 <phrase>
   id: LANG_AGC_LIVE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Live (slow)"
@@ -6485,6 +6505,7 @@
 <phrase>
   id: LANG_AGC_DJSET
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "DJ-Set (slow)"
@@ -6501,6 +6522,7 @@
 <phrase>
   id: LANG_AGC_MEDIUM
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Medium"
@@ -6517,6 +6539,7 @@
 <phrase>
   id: LANG_AGC_VOICE
   desc: AGC preset
+  user:
   <source>
     *: none
     agc: "Voice (fast)"
@@ -6533,6 +6556,7 @@
 <phrase>
   id: LANG_RECORD_AGC_CLIPTIME
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -7715,7 +7739,7 @@
     *: "ファイル/ディレクトリを上書きしますか?"
   </dest>
   <voice>
-    *: "ファイル/ディレクトリを上書きしますか?"
+    *: "ファイル、ディレクトリを上書きしますか?"
   </voice>
 </phrase>
 <phrase>
@@ -10769,6 +10793,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_PRESET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10785,6 +10810,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_SAFETY
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10801,6 +10827,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_LIVE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10817,6 +10844,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_DJSET
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10833,6 +10861,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_MEDIUM
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10849,6 +10878,7 @@
 <phrase>
   id: LANG_SYSFONT_AGC_VOICE
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -10865,6 +10895,7 @@
 <phrase>
   id: LANG_SYSFONT_RECORDING_AGC_MAXGAIN
   desc: deprecated
+  user:
   <source>
     *: none
     agc: ""
@@ -11639,7 +11670,7 @@
 <phrase>
   id: LANG_STOP_RECORDING_AND_SHUTDOWN
   desc: in record timesplit options
-  user: 
+  user:
   <source>
     *: none
     recording: "Stop Recording And Shutdown"
@@ -11656,7 +11687,7 @@
 <phrase>
   id: LANG_TOUCHPAD_SENSITIVITY
   desc: touchpad sensitivity setting
-  user: 
+  user:
   <source>
     *: none
     gigabeatf: "Touchpad Sensitivity"
@@ -11822,6 +11853,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_PRESET
   desc: automatic gain control in record settings and screen
+  user:
   <source>
     *: none
     agc: "AGC"
@@ -11838,6 +11870,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_CLIPTIME
   desc: in record settings
+  user:
   <source>
     *: none
     agc: "AGC clip time"
@@ -11854,6 +11887,7 @@
 <phrase>
   id: LANG_RECORDING_AGC_MAXGAIN
   desc: AGC maximum gain in recording screen
+  user:
   <source>
     *: none
     agc: "AGC max. gain"