Merge from BRANCH_1_0.

1 files changed, 0 insertions, 208 deletions

diff --git a/i18n/zh_CN/launchersettings.ts b/i18n/zh_CN/launchersettings.ts
deleted file mode 100644
index d6ee0ff..0000000
--- a/i18n/zh_CN/launchersettings.ts
+++ b/dev/null
@@ -1,208 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>LauncherSettings</name>
-    <message>
-        <source>Launcher Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Taskbar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>O-Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>MenuSettings</name>
-    <message>
-        <source>Load applets in O-Menu:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Launcher tabs in O-Menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the applets that you want to have included in the O-Menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adds the contents of the Launcher Tabs as menus in the O-Menu.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SampleView</name>
-    <message>
-        <source>Sample 1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample 2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Sample 3</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabDialog</name>
-    <message>
-        <source>Edit Tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Background</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Icons</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Previewing %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>This is a rough preview of what the currently selected Tab will look like.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use a custom font</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Ruled</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Solid color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Small</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Large</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Color:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TabsSettings</name>
-    <message>
-        <source>Launcher Tabs:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>foobar</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable big busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable blinking busy indicator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select the Launcher Tab you want to edit or delete.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adds a new Tab to the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opens a new dialog to customize the select Tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Deletes a Tab from the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Activate this, if you want a big busy indicator in the middle of the screen instead of the one in taskbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Activate this, if you want a blinking busy indicator for starting applications in the Launcher.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>All Tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Documents</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not implemented yet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>TaskbarSettings</name>
-    <message>
-        <source>Load applets in Taskbar:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the applets that you want displayed in the Taskbar.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>