Merge from BRANCH_1_0.

1 files changed, 52 insertions, 48 deletions

diff --git a/i18n/de/opieirc.ts b/i18n/de/opieirc.ts
index 33ef781..063f42b 100644
--- a/i18n/de/opieirc.ts
+++ b/i18n/de/opieirc.ts
@@ -3,7 +3,7 @@
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
-        <translation type="unfinished"></translation>
+        <translation>Spreche auf Kanal</translation>
     </message>
     <message>
         <source>Channel discussion</source>
@@ -60,26 +60,10 @@
 <context>
     <name>IRCMessageParser</name>
     <message>
-        <source>Received unhandled numeric command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled ctcp command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Received unhandled literal command : </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nonexistant channel join - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> joined channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Person has already joined the channel - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -88,14 +72,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> left channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Parting person not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -108,30 +84,14 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Channel message with unknown channel </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Received PRIVMSG of unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You are now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> is now known as </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Nickname change of an unknown person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> has quit </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Unknown person quit - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -219,6 +179,46 @@
         <source>No such nickname</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Received unhandled numeric command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled ctcp command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Received unhandled literal command: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 joined channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You left channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 left channel %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Channel message with unknown channel %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You are now known as %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 is now known as %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has quit (%2)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCQueryTab</name>
@@ -460,6 +460,10 @@ comma separated list of channel
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished">Einstellungen</translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
@@ -480,31 +484,31 @@ comma separated list of channel
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC Klient</translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
-        <translation type="unfinished"></translation>
+        <translation>Serververbindungen, Kanäle, Gespräche und andere Sachen werden hier sein</translation>
     </message>
     <message>
         <source>IRC</source>
-        <translation type="unfinished"></translation>
+        <translation>IRC</translation>
     </message>
     <message>
         <source>New connection</source>
-        <translation type="unfinished"></translation>
+        <translation>Neue Verbindung</translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
-        <translation type="unfinished"></translation>
+        <translation>Erstelle eine neue Verbindung zu einem IRC-Server</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>Einstellungen</translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
-        <translation type="unfinished"></translation>
+        <translation>Konfiguriere OpieIRC&apos;s Verhalten und Aussehen</translation>
     </message>
 </context>
 </TS>