fixes for the Chinese and Japanese language files by Harry Tu. Closes FS#8716 and FS#8576.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16683 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 48 insertions, 47 deletions

diff --git a/apps/lang/chinese-simp.lang b/apps/lang/chinese-simp.lang
index 8307901e60..c054720eb7 100644
--- a/apps/lang/chinese-simp.lang
+++ b/apps/lang/chinese-simp.lang
@@ -1,13 +1,3 @@
-#             __________               __   ___.
-#   Open      \______   \ ____   ____ |  | _\_ |__   _______  ___
-#   Source     |       _//  _ \_/ ___\|  |/ /| __ \ /  _ \  \/  /
-#   Jukebox    |    |   (  <_> )  \___|    < | \_\ (  <_> > <  <
-#   Firmware   |____|_  /\____/ \___  >__|_ \|___  /\____/__/\_ \
-#                     \/            \/     \/    \/            \/
-# $Id$
-#
-# Simplified Chinese language file
-# 
 <phrase>
   id: LANG_SET_BOOL_YES
   desc: bool true representation
@@ -2542,10 +2532,12 @@
     recording: ""
   </source>
   <dest>
-    *: ""
+    *: none
+    recording: "deprecated"
   </dest>
   <voice>
-    *: ""
+    *: none
+    recording: ""
   </voice>
 </phrase>
 <phrase>
@@ -4578,15 +4570,17 @@
     x5,m5: "RECORD = Revert"
     h10,h10_5gb: "PREV = Revert"
     gigabeatf: "A = Revert"
+    mrobe100: "DISPLAY = Revert"
   </source>
   <dest>
     *: none
-    rtc: "OFF = 恢复"
-    h100,h120,h300: "STOP = 恢复"
-    ipod*,e200,c200: "MENU = 恢复"
-    x5,m5: "RECORD = 恢复"
-    h10,h10_5gb: "PREV = 恢复"
-    gigabeatf: "A = 恢复"
+    rtc: "OFF = 回去"
+    h100,h120,h300: "STOP = 回去"
+    ipod*,e200,c200: "MENU = 回去"
+    x5,m5: "RECORD = 回去"
+    h10,h10_5gb: "PREV = 回去"
+    gigabeatf: "A = 回去"
+    mrobe100: "display=回去"
   </dest>
   <voice>
     *: none
@@ -4596,6 +4590,7 @@
     x5,m5: "RECORD  恢复"
     h10,h10_5gb: "PREV  恢复"
     gigabeatf: "A  恢复"
+    mrobe100: ""
   </voice>
 </phrase>
 <phrase>
@@ -6680,7 +6675,7 @@
     *: ""
   </source>
   <dest>
-    *: ""
+    *: "deprecated"
   </dest>
   <voice>
     *: ""
@@ -7941,11 +7936,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Yes"
+    lcd_bitmap: "x4"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Yes"
+    lcd_bitmap: "x4"
   </voice>
 </phrase>
 <phrase>
@@ -7958,11 +7953,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "No"
+    lcd_bitmap: "bu2"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "No"
+    lcd_bitmap: "bu"
   </voice>
 </phrase>
 <phrase>
@@ -7975,11 +7970,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "On"
+    lcd_bitmap: "kai"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "On"
+    lcd_bitmap: "kai"
   </voice>
 </phrase>
 <phrase>
@@ -7992,11 +7987,11 @@
   </source>
   <dest>
     *: none
-    lcd_bitmap: "Off"
+    lcd_bitmap: "guan"
   </dest>
   <voice>
     *: none
-    lcd_bitmap: "Off"
+    lcd_bitmap: "guan"
   </voice>
 </phrase>
 <phrase>
@@ -8661,11 +8656,11 @@
   </source>
   <dest>
     *: none
-    ipodvideo: "窄"
+    ipodvideo: ""
   </dest>
   <voice>
     *: none
-    ipodvideo: "窄"
+    ipodvideo: ""
   </voice>
 </phrase>
 <phrase>
@@ -8772,18 +8767,22 @@
     *: "Building database... %d found (OFF to return)"
     h100,h120,h300: "Building database... %d found (STOP to return)"
     ipod*: "Building database... %d found (PREV to return)"
-    x5,m5: "Building database... %d found (LEFT 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>
     *: "更新资料库... 找到 %d  (按 OFF 退回)"
     h100,h120,h300: "更新资料库... 找到 %d  (按 STOP 退回)"
     ipod*: "更新资料库... 找到 %d  (按 PREV 退回)"
-    x5,m5: "更新资料库... 找到 %d  (按 LEFT 退回)"
+    x5,m5,gigabeatf,mrobe100: "更新资料库... 找到 %d  (按 LEFT 退回)"
     h10,h10_5gb,e200,c200: "更新资料库... 找到 %d  (按 PREV 退回)"
   </dest>
   <voice>
     *: "正在给资料库添加项目"
+    h100,h120,h300: ""
+    ipod*: ""
+    x5,m5,gigabeatf,mrobe100: ""
+    h10,h10_5gb,e200,c200: ""
   </voice>
 </phrase>
 <phrase>
@@ -9039,19 +9038,18 @@
 </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>
-    *: "没分区吗"
-    player: "分区吗"
+    *: ""
+    player: ""
   </voice>
 </phrase>
 <phrase>
@@ -9183,16 +9181,16 @@
 </phrase>
 <phrase>
   id: LANG_SETTINGS_SAVE_FAILED
-  desc: displayed if save settings has failed
+  desc: DEPRECATED
   user: 
   <source>
-    *: "Save Failed"
+    *: ""
   </source>
   <dest>
-    *: "储存失败"
+    *: ""
   </dest>
   <voice>
-    *: "储存失败"
+    *: ""
   </voice>
 </phrase>
 <phrase>
@@ -9345,17 +9343,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>
@@ -9366,19 +9367,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: "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: ""
   </voice>
 </phrase>
 <phrase>