Merge from BRANCH_1_0.

1 files changed, 0 insertions, 435 deletions

diff --git a/i18n/zh_CN/drawpad.ts b/i18n/zh_CN/drawpad.ts
deleted file mode 100644
index 229dfbc..0000000
--- a/i18n/zh_CN/drawpad.ts
+++ b/dev/null
@@ -1,435 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>DrawPad</name>
-    <message>
-        <source>Delete All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Import...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Thumbnail View...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Information...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Anti-Aliasing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tools</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to add a new sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to erase the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to remove the current sheet.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Undo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to undo the last action.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Redo</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to re-perform the last action.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>First Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the first page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previous Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the previous page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to view the next page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Last 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>Draw Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Line</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>Draw Rectangle</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Rectangle</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>Draw Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Draw Filled Ellipse</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the text drawing tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Region</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the fill tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Erase Point</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Click here to select the eraser tool.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Width</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>Pen Color</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>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the current page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>DrawPad - Page %1/%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-all the pages?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ExportDialog</name>
-    <message>
-        <source>DrawPad - Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Page Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Current</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Range</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Export As</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Format:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ImportDialog</name>
-    <message>
-        <source>DrawPad - Import</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Automatic preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preview</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NewPageDialog</name>
-    <message>
-        <source>New Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>White</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Pen Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Fill Color</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PageInformationDialog</name>
-    <message>
-        <source>Page Information</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Width:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Height:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>Title: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Dimension: %1x%2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Date: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TextToolDialog</name>
-    <message>
-        <source>Insert Text</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ThumbnailView</name>
-    <message>
-        <source>DrawPad - Thumbnail View</source>
-        <translation type="unfinished"></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>
-    <message>
-        <source>Clear Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Yes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to delete
-the selected page?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>