Merge from BRANCH_1_0.

1 files changed, 110 insertions, 14 deletions

diff --git a/i18n/zh_TW/drawpad.ts b/i18n/zh_TW/drawpad.ts
index 70557a9..588e80d 100644
--- a/i18n/zh_TW/drawpad.ts
+++ b/i18n/zh_TW/drawpad.ts
@@ -103,20 +103,12 @@
     </message>
     <message>
         <source>Fill Color</source>
         <translation>填滿顏色</translation>
     </message>
     <message>
-        <source>DrawPad</source>
-        <translation>DrawPad</translation>
-    </message>
-    <message>
-        <source>Page</source>
-        <translation>頁</translation>
-    </message>
-    <message>
         <source>Insert Text</source>
         <translation>插入文字</translation>
     </message>
     <message>
         <source>Thumbnail View</source>
         <translation>投影片</translation>
@@ -159,12 +151,88 @@ all the pages?</source>
 全部的分頁嗎?</translation>
     </message>
     <message>
         <source>Anti-Aliasing</source>
         <translation>Anti-Aliasing</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to undo the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to re-perform the last action.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the first page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the previous page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the next page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to view the last page.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw lines.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw rectangles.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select one of the available tools to draw ellipses.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the text drawing tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the fill tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the eraser tool.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the width of the drawing pen.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when drawing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to select the color used when filling in areas.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>DrawPad - Page %1/%2</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ExportDialog</name>
     <message>
         <source>Page Selection</source>
         <translation>選擇分頁</translation>
@@ -198,12 +266,16 @@ all the pages?</source>
         <translation>格式:</translation>
     </message>
     <message>
         <source>DrawPad - Export</source>
         <translation>小畫家 - Export</translation>
     </message>
+    <message>
+        <source>All Images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ImportDialog</name>
     <message>
         <source>Automatic preview</source>
         <translation>自動預覽</translation>
@@ -213,12 +285,16 @@ all the pages?</source>
         <translation>預覽</translation>
     </message>
     <message>
         <source>DrawPad - Import</source>
         <translation>小畫家 - Import</translation>
     </message>
+    <message>
+        <source>All images</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NewPageDialog</name>
     <message>
         <source>New Page</source>
         <translation>新分頁</translation>
@@ -291,22 +367,22 @@ all the pages?</source>
         <translation>高:</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <source>Title:</source>
-        <translation>抬頭:</translation>
+        <source>Title: %1</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Dimension:</source>
-        <translation>維度:</translation>
+        <source>Dimension: %1x%2</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Date:</source>
-        <translation>日期:</translation>
+        <source>Date: %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TextToolDialog</name>
     <message>
         <source>Insert Text</source>
@@ -342,8 +418,28 @@ the selected page?</source>
     </message>
     <message>
         <source>Do you want to delete
 the selected page?</source>
         <translation>確定刪除所選分頁?</translation>
     </message>
+    <message>
+        <source>Click here to add a new sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to erase the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to remove the current sheet.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet up one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Click here to move the current sheet down one position in the list.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 </TS>