Merge from BRANCH_1_0.

1 files changed, 0 insertions, 288 deletions

diff --git a/i18n/unmaintained/ja/keypebble.ts b/i18n/unmaintained/ja/keypebble.ts
deleted file mode 100644
index 3da72e1..0000000
--- a/i18n/unmaintained/ja/keypebble.ts
+++ b/dev/null
@@ -1,288 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>KRFBConnection</name>
-    <message>
-        <source>Connected</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Refused</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host not found</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Read Error: QSocket reported an error reading
-data, the remote host has probably dropped the
-connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QSocket reported an invalid error code</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBDecoder</name>
-    <message>
-        <source>Waiting for server initialisation...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Waiting for desktop name...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: Message Id %1 was found when expecting an update message.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Protocol Error: An unknown encoding was used by the server %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KRFBLogin</name>
-    <message>
-        <source>Waiting for server version...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Invalid server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Unsupported server version, %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: This server requires a password, but none has been specified.
-</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: The password you specified was incorrect.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error: Too many invalid login attempts have been made
-to this account, please try later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Login Failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Too many failures</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNC</name>
-    <message>
-        <source>VNC Viewer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disconnect</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop Full Screen</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connected to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Logged in to remote host</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>New Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delete Bookmark</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Send Contrl-Alt-Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Double Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Next Click is Right Click</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCBookmarkDlgBase</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose a bookmark that you would like to open</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>KVNCConnDlgBase</name>
-    <message>
-        <source>VNC Viewer Connection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bookmark Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Host Name:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Display Number:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check for screen updates every:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Milliseconds</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request 8-bit session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Raise on bell</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request shared session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale Factor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Encodings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hextile encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>CoRRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>RRE encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy rectangle encoding</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The password of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Toggle obscuring the password</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The host name of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The display number of the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Delay between requesting updates from the server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Request that the VNC server transfer 8 bit color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Allow other users to connect to the VNC server</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Scale the remote display to fit on the PDA (Slow)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable transmiting identical rectangles as references to existing data</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>