Merge from BRANCH_1_0.

1 files changed, 78 insertions, 15 deletions

diff --git a/i18n/zh_TW/today.ts b/i18n/zh_TW/today.ts
index 22cdc5a..eedc3a5 100644
--- a/i18n/zh_TW/today.ts
+++ b/i18n/zh_TW/today.ts
@@ -7,7 +7,7 @@
     </message>
     <message>
         <source>Owned by </source>
-        <translation>所有人</translation>
+        <translation type="unfinished">所有人</translation>
     </message>
     <message>
         <source>Please fill out the business card</source>
@@ -44,10 +44,6 @@
 <context>
     <name>TodayConfig</name>
     <message>
-        <source>Today config</source>
-        <translation>「今日」個人設定</translation>
-    </message>
-    <message>
         <source>Load which plugins in what order:</source>
         <translation>載入及順序設定</translation>
     </message>
@@ -67,13 +63,13 @@
         <source>autostart on 
 resume?
  (Opie only)</source>
-        <translation>Resume後
+        <translation type="obsolete">Resume後
         自動啟動？
         (OPie only)</translation>
     </message>
     <message>
         <source>minutes inactive</source>
-        <translation>休眠分鐘數</translation>
+        <translation type="obsolete">休眠分鐘數</translation>
     </message>
     <message>
         <source>Misc</source>
@@ -81,39 +77,106 @@ resume?
     </message>
     <message>
         <source>Check this if today should be autostarted on resume.</source>
-        <translation>打勾開啟喚醒時自動啟動「今日」功能</translation>
+        <translation type="obsolete">打勾開啟喚醒時自動啟動「今日」功能</translation>
     </message>
     <message>
         <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
-        <translation>休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
+        <translation type="obsolete">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
     </message>
     <message>
         <source>Icon size</source>
-        <translation>圖示大小</translation>
+        <translation type="obsolete">圖示大小</translation>
     </message>
     <message>
         <source>Set the icon size in pixel</source>
-        <translation>設定圖示的像素點數</translation>
+        <translation type="obsolete">設定圖示的像素點數</translation>
     </message>
     <message>
         <source>Refresh</source>
-        <translation>更新內容</translation>
+        <translation type="obsolete">更新內容</translation>
     </message>
     <message>
         <source>How often should Today refresh itself</source>
-        <translation>「今日」多久自動更新一次內容</translation>
+        <translation type="obsolete">「今日」多久自動更新一次內容</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>秒</translation>
+        <translation type="obsolete">秒</translation>
     </message>
     <message>
         <source>never</source>
-        <translation>永不</translation>
+        <translation type="obsolete">永不</translation>
     </message>
     <message>
         <source>Check a checkbox to activate/deactivate a plugin or use the arrow buttons on the right to change the appearance order</source>
         <translation>勾選要啟動的plugins，並用右側的上下箭頭來調整顯示順序</translation>
     </message>
+    <message>
+        <source>Today Config</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TodayConfigMiscBase</name>
+    <message>
+        <source>Form1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Check this if today should be autostarted on resume.</source>
+        <translation type="unfinished">打勾開啟喚醒時自動啟動「今日」功能</translation>
+    </message>
+    <message>
+        <source>autostart on resume?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>tiny banner</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Have small banner </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> min</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>How many minutes has the PDA been suspended before the autostart feature kicks in on resume</source>
+        <translation type="unfinished">休眠幾分鐘後才打開喚醒時自動啟動功能</translation>
+    </message>
+    <message>
+        <source>minutes inactive</source>
+        <translation type="unfinished">休眠分鐘數</translation>
+    </message>
+    <message>
+        <source> pixel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set the icon size in pixel</source>
+        <translation type="unfinished">設定圖示的像素點數</translation>
+    </message>
+    <message>
+        <source>icon size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <translation type="unfinished">秒</translation>
+    </message>
+    <message>
+        <source>never</source>
+        <translation type="unfinished">永不</translation>
+    </message>
+    <message>
+        <source>How often should Today refresh itself</source>
+        <translation type="unfinished">「今日」多久自動更新一次內容</translation>
+    </message>
+    <message>
+        <source>refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>