Merge from BRANCH_1_0.

1 files changed, 60 insertions, 76 deletions

diff --git a/i18n/zh_TW/sysinfo.ts b/i18n/zh_TW/sysinfo.ts
index eebb241..97b71e0 100644
--- a/i18n/zh_TW/sysinfo.ts
+++ b/i18n/zh_TW/sysinfo.ts
@@ -1,6 +1,53 @@
 <!DOCTYPE TS><TS>
 <context>
+    <name>FileSysInfo</name>
+    <message>
+        <source>CF</source>
+        <translation type="unfinished">CF</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
+        <translation type="unfinished">本圖表顯示CF記憶卡上已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>Ha</source>
+        <translation type="unfinished">Ha</translation>
+    </message>
+    <message>
+        <source>This graph represents how much storage is currently used on this hard drive.</source>
+        <translation type="unfinished">本圖表顯示硬碟上已使用的儲存空間</translation>
+    </message>
+    <message>
+        <source>SD</source>
+        <translation type="unfinished">SD</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
+        <translation type="unfinished">本圖表顯示SD記憶卡上已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>SC</source>
+        <translation type="unfinished">SC</translation>
+    </message>
+    <message>
+        <source>In</source>
+        <translation type="unfinished">In</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
+        <translation type="unfinished">本圖表顯示內建記憶體中已使用的記憶體量</translation>
+    </message>
+    <message>
+        <source>RA</source>
+        <translation type="unfinished">RA</translation>
+    </message>
+    <message>
+        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
+        <translation type="unfinished">本圖表顯示RAM disk上已使用的記憶體量</translation>
+    </message>
+</context>
+<context>
     <name>LoadInfo</name>
     <message>
         <source>Application CPU usage (%)</source>
         <translation>應用程式CPU使用率 (%)</translation>
@@ -72,9 +119,9 @@ Memory is categorized as follows:
         <translation>Use#</translation>
     </message>
     <message>
         <source>Used By</source>
-        <translation>使用者</translation>
+        <translation type="obsolete">使用者</translation>
     </message>
     <message>
         <source>This is a list of all the kernel modules currently loaded on this handheld device.
 
@@ -101,9 +148,17 @@ Click and hold on a module to see additional information about the module, or to
     </message>
     <message>
         <source>You really want to execute
 </source>
-        <translation>您確定要執行？</translation>
+        <translation type="obsolete">您確定要執行？</translation>
+    </message>
+    <message>
+        <source>Used by</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You really want to execute %1 for this module?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MountInfo</name>
@@ -164,84 +219,13 @@ Click and hold on a process to see additional information about the process, or
     </message>
     <message>
         <source>You really want to send
 </source>
-        <translation>您確定要送出？</translation>
-    </message>
-</context>
-<context>
-    <name>StorageInfo</name>
-    <message>
-        <source>CF Card: </source>
-        <translation>CF卡：</translation>
+        <translation type="obsolete">您確定要送出？</translation>
     </message>
     <message>
-        <source>Hard Disk </source>
-        <translation>硬碟：</translation>
-    </message>
-    <message>
-        <source>SD Card </source>
-        <translation>SD卡：</translation>
-    </message>
-    <message>
-        <source>Hard Disk /dev/hd </source>
-        <translation>硬碟 /dev/hd：</translation>
-    </message>
-    <message>
-        <source>SCSI Hard Disk /dev/sd </source>
-        <translation>SCSI硬碟 /dev/sd：</translation>
-    </message>
-    <message>
-        <source>Int. Storage </source>
-        <translation>內部儲存空間：</translation>
-    </message>
-    <message>
-        <source>CF</source>
-        <translation>CF</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Compact Flash memory card.</source>
-        <translation>本圖表顯示CF記憶卡上已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>Ha</source>
-        <translation>Ha</translation>
-    </message>
-    <message>
-        <source>This graph represents how much storage is currently used on this hard drive.</source>
-        <translation>本圖表顯示硬碟上已使用的儲存空間</translation>
-    </message>
-    <message>
-        <source>SD</source>
-        <translation>SD</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used on this Secure Digital memory card.</source>
-        <translation>本圖表顯示SD記憶卡上已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>SC</source>
-        <translation>SC</translation>
-    </message>
-    <message>
-        <source>In</source>
-        <translation>In</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the built-in memory (i.e. Flash memory) on this handheld device.</source>
-        <translation>本圖表顯示內建記憶體中已使用的記憶體量</translation>
-    </message>
-    <message>
-        <source>RAM disk</source>
-        <translation>RAM disk</translation>
-    </message>
-    <message>
-        <source>RA</source>
-        <translation>RA</translation>
-    </message>
-    <message>
-        <source>This graph represents how much memory is currently used of the temporary RAM disk.</source>
-        <translation>本圖表顯示RAM disk上已使用的記憶體量</translation>
+        <source>You really want to send %1 to this process?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemInfo</name>