Merge from BRANCH_1_0.

1 files changed, 44 insertions, 40 deletions

diff --git a/i18n/pl/opieirc.ts b/i18n/pl/opieirc.ts
index 33ef781..04e0e56 100644
--- a/i18n/pl/opieirc.ts
+++ b/i18n/pl/opieirc.ts
@@ -1,510 +1,514 @@
 <!DOCTYPE TS><TS>
 <context>
     <name>IRCChannelTab</name>
     <message>
         <source>Talking on channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your message here to participate in the channel discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Query</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ping</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Whois</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCConnection</name>
     <message>
         <source>Connected, logging in ..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Successfully logged in.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socket error : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection closed</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <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>
     <message>
         <source>You already joined the channel - desynchronized?</source>
         <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>
     <message>
         <source>Channel for part not found - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channel message with unknown sender</source>
         <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>
     <message>
         <source> changed topic to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel topic - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP PING from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Received a CTCP VERSION from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with unknown channel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>CTCP ACTION with bad recipient</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change has unknown type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown person - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown flag</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mode change with unknown kannel - Desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User modes not supported yet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You were kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> by </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> was kicked from </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown person kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown channel kick - desynchronized?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server message with unknown channel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You joined channel </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname is in use, please reconnect with a different nickname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <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>
     <message>
         <source>Talking to </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Private discussion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type your text here in order to send a message to the other person</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Disconnected</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerEditor</name>
     <message>
         <source>Profile name :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The name of this server profile in the overview</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server to connect to - can be any valid host name or IP address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The server port to connect to. Usually 6667</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your nick name on the IRC network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your real name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password to connect to the server (if required)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Channels :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Comma-Separated list of all channels you would like to join automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit server information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Profile name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host name required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Nickname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Realname required</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The channel list needs to contain a
 comma separated list of channel
  names which start with either &apos;#&apos; or &apos;+&apos;</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerList</name>
     <message>
         <source>Serverlist Browser</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Please choose a server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select a server profile from this list and then tap on OK in the upper-right corner</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit the currently selected server profile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add a new server profile</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCServerTab</name>
     <message>
         <source>Connection to</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type commands here. A list of available commands can be found inside the OpieIRC help</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IRCSettings</name>
     <message>
         <source>Lines displayed :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Amount of lines to be displayed in chats before old lines get deleted - this is necessary to restrain memory consumption. Set to 0 if you don&apos;t need this</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Background color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Normal text color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used in chats</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error color :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display errors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by yourself :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by yourself</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by others :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text written by the server :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to identify text written by the server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Notifications :</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text color to be used to display notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Colors</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>IRCTab</name>
     <message>
         <source>Missing description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description of the tab&apos;s content</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close this tab</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
         <source>IRC Client</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Server connections, channels, queries and other things will be placed here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>IRC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New connection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Create a new connection to an IRC server</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Configure OpieIRC&apos;s behavior and appearance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 </TS>