Update translations

51 files changed, 11700 insertions, 11088 deletions

diff --git a/po/af.po b/po/af.po
index 7b8048ef..00cd6657 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Ek is besig"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Verlaat..."
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Kan nie toegang verkry na %s nie\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr ""
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/am.po b/po/am.po
index 665ec07f..84ba0966 100644
--- a/po/am.po
+++ b/po/am.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr ""
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr ""
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "ስህተት"
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/ast.po b/po/ast.po
index 62e2b0d3..b71dae60 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: ast\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Toi ocupáu"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Abandonando"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Nun pue accedese a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Fallu"
 
@@ -750,7 +750,7 @@ msgstr "Falló'l proxy traversal.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Intentando nel siguiente sirvidor en %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Avisu: el conxuntu de caráuteres \"%s\" desconozse. Nun s'aplicará conversión pa la rede %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 amestáu a la llista de notificaciones."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Llista de bans:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNun pues entrar%C26 %B$1 %O(Tas baneáu)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ye agora: $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 banea a $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanal $1 creáu en $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita semi-OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita OP de a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 afita a $2 como exentu"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da estáu de semi-OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 invita a $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UTema de los usuarios de la canal"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 afita mou $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Canal $1 moos: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 quita la exención a $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 quita invitación a $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 quita contraseña de la canal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 quita llímite d'usuarios"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 afita contraseña de la canal como $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 afita llímite de la canal a $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 quita vetu a $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da-y voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Coneutáu. Agora rexistrándose en.."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Coneutando a $1 ($2) puertu $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Fallu na conexón. Fallu: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tRecibisti un CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecibisti un CTCP $1 de $2 (a $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tRecibisti un soníu CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecibióse un soníu CTCP $1 de $2 (a $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tCharra DCC pa %C26$1%O albortada."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexón pa charra DCC afitada con %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tCharra DCC con %C26$1%O perdía. ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tRecibisti una ufierta de charra DCC de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tUfiertando charra DCC a $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tYá ta ufriéndose una charra a $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tL'intentu de conexón DCC $1 con%C26 $2%O falló (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tRecibisti '$1%O' dende $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Triba  A/De        Estáu  Tamañu Pos    Ficheru         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tRecibiste una petición DCC errónea de %C26$1%O.%010%C22*%O$tConteníos del paquete: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tUfierta%C26 $1%O a%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNun esiste tal ufierta DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O a%C26 $1%O albortáu."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tReceición DCC %C26 $1%O de%C26 $3%O completada %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexón pa recepción DCC afitada con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tReceición DCC %C26 $1%O de%C26 $3%O falló ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tReceición DCC: Nun pudo abrise $1 pa escritura ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tEl ficheru%C26 $1%C yá esiste, guardándolu como%C26 $2%O ."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Operdiste retomar %C26 $2 %Cde%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tUnviu DCC%C26 $2%O pa%C26 $1%O albortáu."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tUnviu DCC%C26 $1%O pa%C26 $2%O completáu %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexón pa unviu DCC afitada con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tL'unviu DCC%C26 $1%O pa%C26 $2%O falló. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oufiertó%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opa%C26 $3 %Cparóse - albortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opara%C26 $3 %escosó'l tiempu d'espera - albortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 desaniciáu de la llista de notificaciones."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDesconeutáu ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tAlcontró la to IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O amestáu a la llista d'inoraos."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Inorar a %C26$1%O camudó"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Mázcara                    PRIV  NOTI CAN   CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O quitáu de la llista d'inoraos."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  La llista d'inorados ta erma."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNun pudo entrar a%C26 %B$1 %O(La canal ye namái pa invitaos)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tFuisti invitáu a%C26 $1%O por%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) entró en $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNun pudo entrar%C26 %B$1 %O(Requier pallabra contraseña)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 echó a $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tFuisti desaniciáu por $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Saltáu."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 yá ta n'usu. Reintentando con $2.."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tEl nomatu yá ta usándose. Usa /NICK pa intentar con otru."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNun esiste esi DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNun tas executando dengún procesu anguaño"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLa llista de notificaciones ta erma."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B Llista d'avisos                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 usuarios na llista de notificaciones."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotificación: $1 ta desconeutáu ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotificación: $1 coneutóse ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) abandonó $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) abandonó $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tRempuesta al Ping de $1 : $2 segundu(os)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNun hebo rempuesta al ping en $1 segundos, desconeutando."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tYá ta executándose un procesu"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 dexó la sala (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 afita modos%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Mensaxes de los operadores%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tGuetando númberu d'IP pa%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Coneutáu."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Guetando $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tParóse l'anterior intentu de conexón (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29El tema pa $1%C %C29ye $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 camudó'l tema a: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Tema pa $1%C %C29afitáu por $2%C %C29el $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tEquipu desconocíu. ¿Seique lu escribisti mal?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNun pues entrar a%C26 %B$1 %O(Aportóse al llímite d'usuarios)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Usuarios en $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %CTas ausente %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFinal de la llista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivu%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivu%C26 $2%O, entró:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Obraeru usuariu@equipu%C27 $2%O, braera IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Entrasti en $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tEchóte de $2 por $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tAbandonó la canal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tAbandonó la canal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tTas invitando%C26 $1%O  a%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tAgora conocíu como: $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Nun puede lleese'l ficheru de soníu:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Puertu zarráu nel agospiador remotu"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Conexón refugada"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ensin camín fasta l'agospiador"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Espiró la conexón"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nun pue asignase esa direición"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Conexón reaniciada pol par"
 
@@ -2876,13 +2888,13 @@ msgstr "Nun pudo coneutase al bus de la sesión: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Fallu al alquirir %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "_Tocante a"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Un veceru d'IRC multiplataforma."
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/az.po b/po/az.po
index f70898b3..29fe47d5 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: az\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Məşğulam"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Gedirəm"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "%s ünvanına yetişilə bilmir\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Xəta"
 
@@ -750,7 +750,7 @@ msgstr "Vəkil traversalı bacarılmadı.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "%s üstündəki növbəti vericiyə keçilir...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Rədd siyahısı boşdur."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Uzaq qovşaq soketi bağladı"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Bağlantı rədd edildi"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Uzaq qovşaq yoxdur"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Bağlantı vaxtı doldu"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Bu ünvan verilə bilməz"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Bağlantı düyün tərəfindən sıfırlandı"
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Çox Platformlu IRC Alıcısı"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/be.po b/po/be.po
index 6a67a161..9d623bfd 100644
--- a/po/be.po
+++ b/po/be.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: be\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Я заняты"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Выходжу"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Няма доступу да %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Памылка"
 
@@ -749,7 +749,7 @@ msgstr "Не атрымліваецца злучыцца з проксі.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Спрабую іншы сервер %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "Увага: \"%s\" знаказбор невядомы. Ніякага пераўтварэння знакаў для сеціва %s не будзе."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 дададзены ў спіс абвяшчэнняў."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Спіс забароненых:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНемагчыма ўвайсці на%C26 %B$1 %O(Вы пад забаронаю)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 вядомы як $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 выставіў забарону на $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tКанал $1 створаны на $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O адабраў статус паў-аператара канала ў%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O адабраў статус аператара канала ў%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O адабраў голас у%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 усталяваў выключэнне на $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O даў статус паў-аператара канала%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 усталяваў запрашэнне на $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UКанал            Карыст.  Тэма"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 усталяваў рэжым $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Рэжымы канала $1: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O даў статус аператара канала %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 выдаліў выключэнне на $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 выдаліў запрашэнне на $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 выдаліў ключавое слова канала"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 выдаліў абмежаванне карыстальніка"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 усталяваў ключавое слова канала: $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 усталяваў абмежаванне канала ў $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 выдаліў забарону на $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O даў голас%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Злучана. Уваход..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Злучэнне з $1 ($2), порт $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "Злучэнне не атрымалася. Памылка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tАтрымана CTCP $1 ад $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tАтрымана CTCP $1 ад $2 (да $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tАтрыманы CTCP-гук $1 ад $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tАтрыманы CTCP-гук $1 ад $2 (да $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT з %C26$1%O перарвана."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT злучэнне ўсталявана з %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT з %C26$1%O страчана ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tАтрымана прапанова DCC CHAT ад $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tПрапануецца DCC CHAT $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tУжо прапануецца CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 спроба злучэння з%C26 $2%O не ўдалася (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tАтрымана '$1%O' ад $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Тып   Да/Ад      Статус  Памер   Паз     Файл         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tАтрыманы няправільны DCC запыт ад %C26$1%O.%010%C22*%O$tЗмест пакета: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tПрапанова%C26 $1%O да%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tНяма гэткай прапановы DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O да%C26 $1%O перарвана."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O ад%C26 $3%O завершана %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV злучэнне ўсталявана з%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O з%C26 $3%O не атрымалася ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Немагчыма адкрыць $1 для запісу ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tФайл%C26 $1%C ужо існуе, захоўваю як %C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oзапытаў працяг%C26 $2 %Cз%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O да%C26 $1%O перарвана."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O з%C26 $2%O завершана %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND злучэнне ўсталявана з %C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O да%C26 $2%O не атрымалася. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oпрапанаваў%C26 $2 %O(%C26$3 %Oбайтаў)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oда%C26 $3 %C перарвана: страчана хуткасць."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oда%C26 $3 %O перарвана: выйшаў час."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 выдалены са спіса абвяшчэнняў"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tЗлучэнне страчана ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tЗнойдзены ваш IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O дададзены ў спіс ігнараванняў."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ігнараванне %C26$1%O зменена."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Маска вузла               PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O выдалены са спісу ігнараванняў."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Спіс ігнараванняў пусты."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНемагчыма ўвайсці на%C26 %B$1 %O(Уваход толькі па запрашэннях)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tВы былі запрошаны на%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) увайшоў на $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tНемагчыма увайсці на%C26 %B$1 %O(Патрэбна ключавое слова)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 выпхнуў $2 з $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t $1 выпхнуў вас ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22\"Паведамленне дня\" прапушчана."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ужо выкарыстоўваецца. Спрабую $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tМянушка ўжо кімсьці выкарыстоўваецца. Паспрабуйце каманду /NICK для выбару іншай."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tНяма гэткага DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tЗараз няма працуючых працэсаў"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tСпіс абвяшчэнняў пусты."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Спіс абвяшчэнняў                       "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 карыстальнікаў у спісе абвяшчэнняў."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tАбвяшчэнне: $1 адключыўся ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tАбвяшчэнне: $1 падключыўся ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) выйшаў з $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) выйшаў з $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tАдказ на пінг ад $1: $2 сек"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tНе атрымана адказаў на пінг на працягу $1 сек, разлучаемся."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tПрацэс ужо запушчаны"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 зыйшоў (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 усталяваў рэжым%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tШукаецца нумар IP %C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Злучана."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Шукаецца $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tСпынена папярэдняя спроба злучэння (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Тэма для $1%C %C29: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 змяніў тэму на: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Тэма для $1%C %C29усталявана $2%C %C29у $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНевядомы хост. Магчыма, вы памыліліся?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНемагчыма ўвасці на %C26 %B$1 %O(Дасягнута карыстальніцкае абмежаванне)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Карыстальнікі на $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cадыйшоў %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКанец спіса WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O без дзеянняў%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O бяздзейны%C26 $2%O, увайшоў:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oсапраўдны user@host%C27 $2%O, сапраўдны IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Размаўляем на $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3 выпхнуў вас з $2 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tВы выйшлі з канала $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tВы выйшлі з канала $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tВы запрошаны %C26 $1%O на %C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tЦяпер вы вядомы як $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Немагчыма прачытаць гукавы файл:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Аддалены вузел закрыў сокет"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "У злучэнні адмоўлена"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Няма шляху да вузла"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Час злучэння выйшаў"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Немагчыма ўжыць гэта адрас"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Злучэнне пераўсталяваны тым бокам"
 
@@ -2875,13 +2887,13 @@ msgstr "Немагчыма злучыцца з шынай сесій : %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Немагчыма дасягнуць %s : %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Шматплатформенны кліент IRC"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/bg.po b/po/bg.po
index 42b3f760..460da5b1 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Bulgarian (http://www.transifex.com/projects/p/hexchat/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Зает съм"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Напускам"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -63,7 +63,7 @@ msgstr "Няма достъп до %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Грешка"
 
@@ -751,7 +751,7 @@ msgstr "Пренасянето към проксито пропадна.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Минава се към следващия сървър в %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -759,474 +759,486 @@ msgid ""
 msgstr "Внимание: Кодовата таблица \"%s\" е непозната. Няма да има преобразуване за мрежата %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "-%C10-%C11-%O$t$1 е добавен/а към списъка с приятели."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Списък със забраните:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНе можете да влезнете в%C26 %B$1 %O(Забранен ви е достъпа)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 прякора му/й сега е $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 поставя забрана на $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tСтаята $1 е създадена на $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O·маха·полу-операторския·статус·на%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O·маха·операторския·статус·от·%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O премахва поканите от%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 слага покани за $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава полу-операторски статус на %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 слага покани за $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UСтая     Потребители   Тема"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 поставя режим $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Стая $1 режими: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава статус на оператор за стаята на%C26 $"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 маха exempt от $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 премахва поканите от $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 маха ключовата дума на стаята"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 маха потребителския лимит"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 настройва ключовата дума на стаята на $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 настройва лимита на стаята на $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 маха забраната за $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава статус \"Voice\" на%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Връзката е осъществена. Сега се влиза..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Свързване с $1 ($2) порт $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Връзката пропадна. Грешка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tПолучен CTCP $1 от $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tПолучен CTCP $1 от $2 (до $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tПолучен CTCP звук $1 от $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tПолучен звук CTCP $1 от $2 (до $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC разговор с %C26$1%O прекъснат."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC разговор осъществи връзка с %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC разговор с %C26$1%O е изгубен ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tПолучено предложение за DCC разговор от $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tПредлагане на DCC разговор на $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tВече се предлага разговор на $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 опит за връзка към %C26·$2%O·пропадна (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tПолучено '$1%O' от $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Вид  До/От    Статус  Размер    Позиция     Файл         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tПолучи грешно DCC искане от %C26$1%O.%010%C22*%O$tСъдържание на пакета: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tПредлага се%C26 $1%O на%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tНяма такова DCC предложение."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC Получаване %C26·$2%O до %C26·$1%O е прекъснато."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC получаване %C26·$1%O от %C26·$3%O завърши %C30[%C26$4%O·cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC получаване осъществи връзка с %C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC получаване %C26·$1%O от %C26·$3%O пропадна. ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC Получаване: Не може да отвори $1 за запис ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tФайлът %C26·$1%C вече съществува, вместо това се записва като %C26·$2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oпоиска да продължи %C26·$2·%Cот %C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC изпращане %C26·$2%O·до %C26·$1%O е прекъснато."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC изпращане %C26·$1%O до %C26 $2%O завърши %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC изпращане осъществи връзка с %C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC изпращане %C26·$1%O до %C26·$2%O пропадна. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1·%Oе предложил %C26·$2·%O(%C26$3·%Oбайта)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26·$2·%Oдо %C26·$3·%Cе спряло - прекъсва."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26·$2·%Oдо %C26·$3·%Oе спряло - прекъсва."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 е изтрит/а от списъка с приятелчетата."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t$1Връзката е прекъсната ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tВашето IP е намерено: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O е добавен/а в списъка с игнорираните"
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Игнорирането на %C26$1%O беше променено."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O е махнат/а от списъка с игнорираните."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Списъка с игнорираните е празен."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНе може да се влезне в%C26·%B$1·%O(Стаята е само с покани)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tБяхте поканени в %C26·$1%O от %C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) влезна в $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tНе може да се влезне в%C26 %B$1 %O(Нужна е ключова дума)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 изхвърли $2 от $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tБяхте убит/а от $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22Съобщението за деня е пропуснато."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 вече е зает. Опитва се отново с $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tПрякора е вече зает. Използвайте /NICK ,за да опитате с друг."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tНяма такова DCC"
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tНяма текущ вървящ процес"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tСписъка с приятелчета е празен."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Списък с приятелчета                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 потребителя в списъка с приятелчета."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) излезна от $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tПинг отговор от $1 : $2 секунда/и"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tНямаше отговор от пинга за $1 секунди, прекъсване на връзката"
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tA - процеса вече върви"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 поставя режими%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallop съобщения%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tТърсене на IP номера заr%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Връзката е осъществена."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Търсене... $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tПредишния опит за връзка спрян (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Темата на $1%C %C29е: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 смени темата на: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Темата на $1%C %C29е настроена от $2%C %C29на $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНепознат хост. Може би сте направили грешка при изписването?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНе може да се влезне в%C26 %B$1 %O(Достигнат е потребителският лимит)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Потребителя в $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cотсъства %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКрай на \"Кой е...?\" информацията."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O неактивност%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O неактивност%C26 $2%O, включил/а се на:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oистински потребител@хост%C27 $2%O, реално IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Сега говорите в $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tБяхте изхвърлени от стаята $2 от $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tНапуснахте стаята $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tПоканихте%C26 $1%O в%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "-%C10-%C11-%O$tНовият ви прякор е $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1715,27 +1727,27 @@ msgid ""
 "%s"
 msgstr "Звуковият файл не може да бъде прочетен:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Връзката отказана"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Няма път то хоста"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Връзката се разпадна (Connection timed out)"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Не може да се назначи този адрес"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2877,13 +2889,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Мултиплатформен IRC клиент"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/ca.po b/po/ca.po
index 0954ce9d..44c6c243 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,15 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Ara estic ocupat"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Me'n vaig"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -65,7 +65,7 @@ msgstr "No es pot accedir a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Error"
 
@@ -753,7 +753,7 @@ msgstr "Ha fallat la connexió amb el servidor intermediari.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Passant al següent servidor de %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -761,474 +761,486 @@ msgid ""
 msgstr "Atenció: El joc de caràcters «%s» és desconegut. No es farà cap conversió per la xarxa %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 ha estat afegit a la llista de notificació."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Llista de bandejats: %C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNo podeu entrar a%C26 %B$1 %O(heu estat bandejat)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ara és conegut com a $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ha bandejat $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanal $1 creat el $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O treu l'estatus de semi-operador del canal a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O treu l'estatus d'operador del canal a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O treu l'estatus de veu a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 dóna l'estatus d'exempt a $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dóna l'estatus de semi-operador del canal a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 dóna l'estatus de convidat a $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCanal            Usuaris Tema"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 assigna el mode $2$3 a $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Canal $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dóna l'estatus d'operador del canal%C26 a $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 treu l'estatus d'exempt a $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 treu l'estatus de convidat a $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 elimina la contrasenya del canal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 elimina el límit d'usuaris"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 defineix la contrasenya del canal com a $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 estableix el límit d'usuaris del canal en $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 treu l'estatus de bandejat a $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dóna l'estatus de veu a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Connectat. S'està iniciant la sessió..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Connectant amb $1 ($2) al port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Ha fallat la connexió. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tS'ha rebut un CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tS'ha rebut una connexió CTCP $1 de $2 (per a $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tS'ha rebut un so CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tS'ha rebut un so CTCP $1 de $2 (per a $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tXat DCC amb %C26$1%O avortat."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tS'ha establert una connexió de xat DCC amb %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tS'ha interromput el xat directe (DCC Chat) amb %C26$1%O. ($4)"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tS'ha rebut una oferta de xat directe (DCC CHAT) de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tS'ha ofert un xat directe (DCC CHAT) a $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tJa s'ha ofert un xat directe (DCC CHAT) a $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tL'intent de connexió DCC $1 amb%C26 $2%O ha fallat (error=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tS'ha rebut un «$1%O» de $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipus Per a/De   Estat   Mida    Pos     Fitxer       "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tS'ha rebut una petició DCC mal formada de %C26$1%O.%010%C22*%O$tContingut del paquet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tS'està oferint%C26 $1%O a%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNo existeix tal oferta DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tS'ha avortat la recepció del fitxer %C26 $2%O a %C26 $1%O."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tS'ha completat la recepció del fitxer%C26 $1%O de%C26 $3%O %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConnexió DCC RECV establerta amb%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tLa recepció del fitxer%C26 $1%O de%C26 $3%O ha fallat ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tRecepció DCC: No s'ha pogut obrir $1 amb permís d'escriptura ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tEl fitxer%C26 $1%C ja existeix, es desarà com a%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oha demanat reprendre la recepció de%C26 $2 %Cdes de %C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tL'enviament DCC%C26 $2%O a%C26 $1%O ha estat avortat."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tL'enviament DCC%C26 $1%O a%C26 $2%O s'ha completat %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tS'ha establert una connexió DCC SEND amb%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tL'enviament DCC%C26 $1%O a%C26 $2%O ha fallat. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ous ha ofert el fitxer%C26 $2 %O(%C26$3 %Coctets)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cencallat - avortant."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Oha excedit el temps d'espera - avortant."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 ha estat eliminat de la llista de notificació."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDesconnectat ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tS'ha trobat la vostra IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O s'ha afegit a la llista d'usuaris ignorats."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "L'estatus d'usuari ignorat de %C26$1%O ha canviat."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Màquina                   PRIV NOTI CAN  CTCP DCC  CONV NOIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O ha estat eliminat de la llista d'usuaris ignorats."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  La llista d'usuaris ignorats és buida."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNo podeu entrar a%C26 %B$1 %O(És un canal només per a convidats)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tHeu estat convidat a%C26 $1%O per %C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) ha entrat a $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNo podeu entrar a%C26 %B$1 %O(Necessiteu una contrasenya)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ha fet fora a $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tUs ha matat $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22S'ha omès el missatge del dia."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ja està agafat. S'està reintentant amb $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tEl sobrenom ja està agafat. Useu l'ordre /NICK per a provar-ho amb un altre."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNo existeix tal connexió DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNo hi ha cap procés executant-se en aquests moments"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLa llista de notificació està buida."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Llista de notificació                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 usuari(s) a la llista de notificació."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ha deixat $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tResposta al ping des de $1: $2 segon(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tPing sense resposta després de $1 seconds, desconnectant."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tJa hi ha un procés en execució"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 estableix els modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Missatge als operadors%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tS'està cercant l'adreça IP de%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Connectat."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22S'està resolent $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tS'ha aturat l'anterior intent de connexió (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29El tema de $1%C %C29és: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ha canviat el tema a: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29El tema de $1%C %C29ha estat establert per $2%C %C29el $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tMàquina desconeguda. Potser l'heu escrita malament?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNo podeu entrar a%C26 %B$1 %O(S'ha assolit el límit d'usuaris)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Usuaris a $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ces troba absent %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFinal de la llista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactiu%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, entrada:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ousuari@màquina real%C27 $2%O, IP real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Ara esteu parlant a $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tHeu estat expulsat de $2 per $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tHeu deixat el canal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tHeu convidat%C26 $1%O a%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tAra sou conegut com a $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1717,27 +1729,27 @@ msgid ""
 "%s"
 msgstr "No s'ha pogut llegir el fitxer de so:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "La màquina remota ha tancat la connexió"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Connexió refusada"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "No hi ha cap ruta cap a la màquina"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "S'ha excedit el temps d'espera"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "No s'ha pogut assignar aquesta adreça"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Connexió reiniciada des de l'altre costat"
 
@@ -2879,13 +2891,13 @@ msgstr "No s'ha pogut establir connexió amb el bus de la sessió: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "No s'ha pogut adquirir %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Un client d'IRC multiplataforma"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/cs.po b/po/cs.po
index f094acfa..2438f1e9 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Pracuji"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Odcházím"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Nemohu přistoupit k %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Chyba"
 
@@ -750,7 +750,7 @@ msgstr "Překlad proxy selhal.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Zkouším další server v %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Čekám: symbol \"%s\" je neznámý. Pro síť %s nebude použita žádná konverze."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 přidán do seznamu oznámení"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNemohu připojit%C26 %B$1 %O(Byl jste vypovězen)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 je nyní znám jako $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 nastavil ban na $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanál $1 vytvořen na $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstranil práva half-operator z%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstranil práva operator z%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstranil hlas z%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 osvobodil $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal právo half-operator%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 vás pozval na $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanál          Uživatelé   Téma"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 nastavil mód $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanál $1 módy: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal právo operator%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 zrušil osvobození na $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 zrušil pozvání na $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 zrušil klíčové slovo kanálu"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 zrušil limit uživatele"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 nastavil klíčové slovo kanálu na $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 nastavil limit kanálu na $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 zrušil ban na $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal hlas%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Připojen. Přihlašuji se..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Přihlašuji se k $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Přihlášení selhalo. Chyba: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tObdržen CTCP $1 od $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tObdržen CTCP $1 od $2 (na $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tObdržel sondu CTCP $1 od $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tObdržel sondu CTCP $1 od $2 (na $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT s %C26$1%O zrušen."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tPřipojení DCC CHAT navázáno s %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT s %C26$1%O ztraceno ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tPřijata nabídka DCC CHAT od $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tNabízí DCC CHAT $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tJiž nabízí CHAT $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tPožadavek $1 na DCC připojení k%C26 $2%O selhal (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tPřišel '$1%O' od $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Typ  Do/Od    Stav  Velikost    Poz     Soubor         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tPřišel zkomolený požadavek DCC od %C26$1%O.%010%C22*%O"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tNabízí%C26 $1%O k%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTakový požadavek DCC neexistuje."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O k%C26 $1%O zrušen."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O od%C26 $3%O hotovo %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tPřipojení DCC RECV vytvořeno s%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O od%C26 $3%O selhalo ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Nemohu otevřít $1 pro zápis ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tThe file%C26 $1%C již existuje, ukládám jako%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Opožádal o zopakování%C26 $2 %Cz%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O s%C26 $1%O zrušen."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O s%C26 $2%O hotovo %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tPřipojení DCC SEND vytvořeno s%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O s%C26 $2%O selhalo. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Onabídl%C26 $2 %O(%C26$3 %Obytů)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Os%C26 $3 %Czastaveno - ruším."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Os%C26 $3 %Ovypršelo - ruším."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 smazán ze seznamu upozornění."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tOdpojen ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tNalezena vaše IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O přidán do seznamu ignorovaných."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorování %C26$1%O změněno."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                             "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Maska                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O odstraněn ze seznamu ignorovaných."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Seznam ignorovaných je prázdný."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNemohu se připojit%C26 %B$1 %O(Kanál je pouze pro zvané)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tByl jste pozván do%C26 $1%O od%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) přišel do $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNemohu se připojit%C26 %B$1 %O(Vyžaduje klíčové slovo)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 vykopl $2 z $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tByl jste zabit $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD přeskočena."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 se již používá. Zkouším s $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tPřezdívka se již používá. Použijte /NICK a zkuste jinou."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTakový DCC neexistuje."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tŽádný proces v současné době neběží"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tSeznam upozornění je prázdný."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Seznam upozornění                    "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1  uživatelů v seznamu upozornění."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tUpozornění: $1 je offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tUpozornění: $1 je online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) opustil $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) opustil $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tOdpověď ping od $1: $2 sekund"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tŽádná odpověď na ping po $1 sekund, odpojuji."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tA proces již běží"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 odešel (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 nastavil módy%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tHledám IP adresu pro%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Připojen."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Hledá $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tUkončen předchozí pokus o připojení (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Téma pro $1%C %C29je: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 změnil téma na: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Téma pro $1%C %C29nastavil $2%C %C29v $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tNeznámý počítač. Možná špatně napsán?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNemohu se připojit k%C26 %B$1 %O(Uživatelský limit překročen)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Uživatelů na $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cje pryč %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OKonec seznamu WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nečinnost%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nečinnost%C26 $2%O, přihlášen:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ouživatel@počítač%C27 $2%O, IP adresa%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Nyní hovoříte na $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tByl jste vykopnut z $2 od $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tOpustil jste kanál $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tOpustil jste kanál $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tByl jste pozván%C26 $1%O na%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tJste znám jako $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Nemůžu přečíst zvkukový soubor:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Vzdálený počítač zavřel soket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Připojení odmítnuto"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Není cesta k počítači"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Připojení vypršelo"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nemohu přiřadit tuto adresu"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Připojení resetováno hostitelem"
 
@@ -2876,13 +2888,13 @@ msgstr "Nemohu se připojit k sezení: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Chyba při získání %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Multiplatformní klient IRC"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/da.po b/po/da.po
index a85881fd..3e78d608 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/hexchat/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -23,15 +23,15 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jeg har travlt"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Smutter"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -68,7 +68,7 @@ msgstr "Kan ikke tilgå %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Fejl"
 
@@ -83,7 +83,7 @@ msgstr "Ingen aktive DCC'er\n"
 
 #: src/common/hexchat.c:741
 msgid "_Open Dialog Window"
-msgstr "_Ĺbning af dialogvinduer"
+msgstr "_Åbning af dialogvinduer"
 
 #: src/common/hexchat.c:742
 msgid "_Send a File"
@@ -95,7 +95,7 @@ msgstr ""
 
 #: src/common/hexchat.c:744
 msgid "_Add to Friends List"
-msgstr "_Tilfřj i venneliste"
+msgstr "_Tilføj til Venneliste"
 
 #: src/common/hexchat.c:745
 msgid "_Ignore"
@@ -103,27 +103,27 @@ msgstr "_Ignorer"
 
 #: src/common/hexchat.c:746
 msgid "O_perator Actions"
-msgstr "O_peratřrhandlinger"
+msgstr "O_peratørhandlinger"
 
 #: src/common/hexchat.c:748
 msgid "Give Ops"
-msgstr "Giv kanaloperatřrstatus"
+msgstr "Giv Kanaloperatørstatus"
 
 #: src/common/hexchat.c:749
 msgid "Take Ops"
-msgstr "Tag kanaloperatřrstatus"
+msgstr "Fjern Kanaloperatørstatus"
 
 #: src/common/hexchat.c:750
 msgid "Give Voice"
-msgstr ""
+msgstr "Giv Tale"
 
 #: src/common/hexchat.c:751
 msgid "Take Voice"
-msgstr ""
+msgstr "Fjern Tale"
 
 #: src/common/hexchat.c:753
 msgid "Kick/Ban"
-msgstr ""
+msgstr "Kick/Ban"
 
 #: src/common/hexchat.c:754 src/common/hexchat.c:791
 msgid "Kick"
@@ -132,12 +132,12 @@ msgstr "Kick"
 #: src/common/hexchat.c:755 src/common/hexchat.c:756 src/common/hexchat.c:757
 #: src/common/hexchat.c:758 src/common/hexchat.c:759 src/common/hexchat.c:790
 msgid "Ban"
-msgstr "Udeluk"
+msgstr "Ban"
 
 #: src/common/hexchat.c:760 src/common/hexchat.c:761 src/common/hexchat.c:762
 #: src/common/hexchat.c:763
 msgid "KickBan"
-msgstr ""
+msgstr "KickBan"
 
 #: src/common/hexchat.c:773
 msgid "Leave Channel"
@@ -149,7 +149,7 @@ msgstr "Join kanal..."
 
 #: src/common/hexchat.c:775 src/fe-gtk/menu.c:1337
 msgid "Enter Channel to Join:"
-msgstr ""
+msgstr "Skriv kanal, der skal tilsluttes:"
 
 #: src/common/hexchat.c:776
 msgid "Server Links"
@@ -295,15 +295,15 @@ msgstr "Ukendt argument '%s' ignoreret."
 
 #: src/common/outbound.c:3280
 msgid "No such plugin found.\n"
-msgstr "Intet sĺdant udvidelsesmodul fundet.\n"
+msgstr "Intet sådant udvidelsesmodul fundet.\n"
 
 #: src/common/outbound.c:3285 src/fe-gtk/plugingui.c:207
 msgid "That plugin is refusing to unload.\n"
-msgstr "Udvidelsesmodulet nćgter at blive udlćst.\n"
+msgstr "Udvidelsesmodulet nægter at blive fjernet.\n"
 
 #: src/common/outbound.c:3554
 msgid "ADDBUTTON <name> <action>, adds a button under the user-list"
-msgstr "ADDBUTTON <navn> <handling>, tilfřj en knap under brugerlisten"
+msgstr "ADDBUTTON <navn> <handling>, tilføj en knap under brugerlisten"
 
 #: src/common/outbound.c:3555
 msgid ""
@@ -313,7 +313,7 @@ msgstr "ADDSERVER <Nyt Netværk> <nyserver/6667>, tilføjer et nyt netværk med
 
 #: src/common/outbound.c:3557
 msgid "ALLCHAN <cmd>, sends a command to all channels you're in"
-msgstr "ALLCHAN <kmd>, sender en kommando til alle kanalerne du er i"
+msgstr "ALLCHAN <cmd>, sender en kommando til alle kanalerne, du er i"
 
 #: src/common/outbound.c:3559
 msgid "ALLCHANL <cmd>, sends a command to all channels on the current server"
@@ -321,26 +321,26 @@ msgstr "ALLCHANL <cmd>, sender en kommando til alle kanaler på den nuværende s
 
 #: src/common/outbound.c:3561
 msgid "ALLSERV <cmd>, sends a command to all servers you're in"
-msgstr "ALLSERV <kmd>, sender en kommando til alle serverene du er pĺ"
+msgstr "ALLSERV <cmd>, sender en kommando til alle serverene, du er på"
 
 #: src/common/outbound.c:3562
 msgid "AWAY [<reason>], sets you away"
-msgstr "AWAY [<grund>], sćtter dig som fravćrende"
+msgstr "AWAY [<grund>], sætter dig som fraværende"
 
 #: src/common/outbound.c:3563
 msgid "BACK, sets you back (not away)"
-msgstr "BACK, sćtter dig som tilbage (ikke fravćrande)"
+msgstr "BACK, sætter dig som tilbage (ikke fraværende)"
 
 #: src/common/outbound.c:3565
 msgid ""
 "BAN <mask> [<bantype>], bans everyone matching the mask from the current "
 "channel. If they are already on the channel this doesn't kick them (needs "
 "chanop)"
-msgstr "BAN <mask> [<bandlysningstype>], bandlyser alle som matcher masken fra den aktuelle kanal. Hvis de allerede er pĺ kanalen vil dette ikke sparke dem ud (krćver kanaloperatřrsstatus)"
+msgstr "BAN <mask> [<bandlysningstype>], bandlyser alle som matcher masken fra den aktuelle kanal. Hvis de allerede er på kanalen vil dette ikke sparke dem ud (kræver kanaloperatorstatus)"
 
 #: src/common/outbound.c:3566
 msgid "CHANOPT [-quiet] <variable> [<value>]"
-msgstr "CHANOPT [-quiet] <variabel> [<vćrdi>]"
+msgstr "CHANOPT [-quiet] <variabel> [<værdi>]"
 
 #: src/common/outbound.c:3567
 msgid ""
@@ -350,27 +350,27 @@ msgstr "CHARSET [<encoding>], få vist eller sæt encodingen, der bruges til den
 
 #: src/common/outbound.c:3568
 msgid "CLEAR [ALL|HISTORY], Clears the current text window or command history"
-msgstr "CLEAR [ALL|HISTORY], rydder det nuvćrende tekstvindue eller kommandohistorik"
+msgstr "CLEAR [ALL|HISTORY], rydder det nuværende tekstvindue eller kommandohistorik"
 
 #: src/common/outbound.c:3569
 msgid "CLOSE, Closes the current window/tab"
-msgstr "CLOSE, lukker det nuvćrende vindue/faneblad"
+msgstr "CLOSE, lukker det nuværende vindue/faneblad"
 
 #: src/common/outbound.c:3572
 msgid "COUNTRY [-s] <code|wildcard>, finds a country code, eg: au = australia"
-msgstr "COUNTRY [-s] <kode|jokertegn>, finder en landekode, ex. da = danmark"
+msgstr "COUNTRY [-s] <kode|wildcard>, finder en landekode, ex. da = danmark"
 
 #: src/common/outbound.c:3574
 msgid ""
 "CTCP <nick> <message>, send the CTCP message to nick, common messages are "
 "VERSION and USERINFO"
-msgstr "CTCP <kaldenavn> <meddelelse>, sender CTCP-meddelelsen til kaldenavn, almindelige meddelelser er VERSION og USERINFO"
+msgstr "CTCP <kaldenavn> <meddelelse>, sender CTCP-meddelelsen til kaldenavnet, typiske meddelelser er VERSION og USERINFO"
 
 #: src/common/outbound.c:3576
 msgid ""
 "CYCLE [<channel>], parts the current or given channel and immediately "
 "rejoins"
-msgstr "CYCLE [<kanal>], forlader aktuel eller angiven kanal og gĺr med det samme ind i den igen"
+msgstr "CYCLE [<kanal>], forlader aktuelle eller angiven kanal og går med det samme ind i den igen"
 
 #: src/common/outbound.c:3578
 msgid ""
@@ -383,13 +383,13 @@ msgid ""
 "DCC PCHAT <nick>                    - offer DCC CHAT using passive mode\n"
 "DCC CLOSE <type> <nick> <file>         example:\n"
 "         /dcc close send johnsmith file.tar.gz"
-msgstr ""
+msgstr "\nDCC GET <kaldenavn>                  - accepter en tilbudt fil\nDCC SEND [-maxcps=#] <nick> [fil]   - sender en fil til nogen\nDCC PSEND [-maxcps=#] <nick> [fil]  - sender en fil ved at bruge passiv tilstand\nDCC LIST                            - vis DCC list\nDCC CHAT <nick>                     - tilbyd DCC CHAT til nogen\nDCC PCHAT <nick>                    - tilbyder DCC CHAT ved at bruge passiv tilstand\nDCC CLOSE <type> <nick> <fil>          eksempel:\n         /dcc close send johnsmith fil.tar.gz"
 
 #: src/common/outbound.c:3590
 msgid ""
 "DEHOP <nick>, removes chanhalf-op status from the nick on the current "
 "channel (needs chanop)"
-msgstr "DEHOP <kaldenavn>, fjerner halvkanaloperatřrsstatus fra kaldenavnet pĺ den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "DEHOP <kaldenavn>, fjerner halvkanaloperatørstatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørstatus)"
 
 #: src/common/outbound.c:3592
 msgid "DELBUTTON <name>, deletes a button from under the user-list"
@@ -399,13 +399,13 @@ msgstr "DELBUTTON <navn>, fjerner en knap under brugerlisten"
 msgid ""
 "DEOP <nick>, removes chanop status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEOP <kaldenavn>, fjerner kanaloperatřrsstatus fra kaldenavnet pĺ den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "DEOP <kaldenavn>, fjerner kanaloperatørsstatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3596
 msgid ""
 "DEVOICE <nick>, removes voice status from the nick on the current channel "
 "(needs chanop)"
-msgstr "DEVOICE <kaldenavn>, fjerner talestatus fra kaldenavnet pĺ den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "DEVOICE <kaldenavn>, fjerner talestatus fra kaldenavnet på den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3597
 msgid "DISCON, Disconnects from server"
@@ -413,7 +413,7 @@ msgstr "DISCON, hopper af server"
 
 #: src/common/outbound.c:3598
 msgid "DNS <nick|host|ip>, Finds a users IP number"
-msgstr "DNS <kaldenavn|vćrt|ip>, finder en brugers IP-nummer"
+msgstr "DNS <kaldenavn|vært|ip>, finder en brugers IP-nummer"
 
 #: src/common/outbound.c:3599
 msgid "ECHO <text>, Prints text locally"
@@ -423,7 +423,7 @@ msgstr "ECHO <tekst>, udskriver tekst lokalt"
 msgid ""
 "EXEC [-o] <command>, runs the command. If -o flag is used then output is "
 "sent to current channel, else is printed to current text box"
-msgstr "EXEC [-o] <kommando>, křr kommandoen. Hvis flaget -o er brugt sendes uddata til den aktuelle kanal, ellers skrivs den ud i det aktuelle tekstfelt"
+msgstr "EXEC [-o] <kommando>, kør kommandoen. Hvis flaget -o er brugt sendes uddata til den aktuelle kanal, ellers skrivs den ud i det aktuelle tekstfelt"
 
 #: src/common/outbound.c:3604
 msgid "EXECCONT, sends the process SIGCONT"
@@ -433,7 +433,7 @@ msgstr "EXECCONT, sender SIGCONT til processen"
 msgid ""
 "EXECKILL [-9], kills a running exec in the current session. If -9 is given "
 "the process is SIGKILL'ed"
-msgstr "EXECKILL [-9], drćber en křrende eksekvering i den aktuelle session. Hvis -9 angives bliver processen SIGKILL'et"
+msgstr "EXECKILL [-9], dræber en kørende eksekvering i den aktuelle session. Hvis -9 angives bliver processen SIGKILL'et"
 
 #: src/common/outbound.c:3609
 msgid "EXECSTOP, sends the process SIGSTOP"
@@ -445,19 +445,19 @@ msgstr "EXECWRITE, sender data til processens standard ind"
 
 #: src/common/outbound.c:3614
 msgid "FLUSHQ, flushes the current server's send queue"
-msgstr "FLUSHQ, třmmer den aktuelle servers sendekř"
+msgstr "FLUSHQ, tømmer den aktuelle servers sendekø"
 
 #: src/common/outbound.c:3616
 msgid "GATE <host> [<port>], proxies through a host, port defaults to 23"
-msgstr "GATE <vćrt> [<port>], tunnellerer via en vćrt, standardvćrdi pĺ port er 23"
+msgstr "GATE <vært> [<port>], tunnellerer via en vært, standardværdi på port er 23"
 
 #: src/common/outbound.c:3620
 msgid "GHOST <nick> [password], Kills a ghosted nickname"
-msgstr "GHOST <kaldenavn> [adgangskode], Drćber et kaldenavnsspřgelse"
+msgstr "GHOST <kaldenavn> [adgangskode], Dræber et kaldenavnsspøgelse"
 
 #: src/common/outbound.c:3625
 msgid "HOP <nick>, gives chanhalf-op status to the nick (needs chanop)"
-msgstr "HOP <kaldenavn>, giver halvkanaloperatřrsstatus til kaldenavn (krćver kanaloperatřrsstatus)"
+msgstr "HOP <kaldenavn>, giver halvkanaloperatørsstatus til kaldenavn (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3626
 msgid "ID <password>, identifies yourself to nickserv"
@@ -476,21 +476,21 @@ msgstr ""
 msgid ""
 "INVITE <nick> [<channel>], invites someone to a channel, by default the "
 "current channel (needs chanop)"
-msgstr "INVITE <kaldenavn> [<kanal>], indbyder nogen til en kanal, standardalternativet er den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "INVITE <kaldenavn> [<kanal>], indbyder nogen til en kanal, standardalternativet er den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3636
 msgid "JOIN <channel>, joins the channel"
-msgstr "JOIN <kanal>, gĺr ind i kanalen"
+msgstr "JOIN <kanal>, går ind i kanalen"
 
 #: src/common/outbound.c:3638
 msgid "KICK <nick>, kicks the nick from the current channel (needs chanop)"
-msgstr "KICK <kaldenavn>, sparker kaldenavn ud fra den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "KICK <kaldenavn>, sparker kaldenavn ud fra den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3640
 msgid ""
 "KICKBAN <nick>, bans then kicks the nick from the current channel (needs "
 "chanop)"
-msgstr "KICKBAN <kaldenavn>, bandlyser og sparker derefter kaldenavn ud fra den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "KICKBAN <kaldenavn>, bandlyser og sparker derefter kaldenavn ud fra den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3643
 msgid "LAGCHECK, forces a new lag check"
@@ -507,7 +507,7 @@ msgstr ""
 
 #: src/common/outbound.c:3651
 msgid "LOAD [-e] <file>, loads a plugin or script"
-msgstr "LOAD [-e] <fil>, indlćser et indstiksmodul eller et skript"
+msgstr "LOAD [-e] <fil>, indlæser et indstiksmodul eller et skript"
 
 #: src/common/outbound.c:3654
 msgid ""
@@ -527,7 +527,7 @@ msgstr ""
 #: src/common/outbound.c:3662
 msgid ""
 "MKICK, Mass kicks everyone except you in the current channel (needs chanop)"
-msgstr "MKICK, sparker alle undtagen dig selv ud af den aktuelle kanal (krćver kanaloperatřrsstatus)"
+msgstr "MKICK, sparker alle undtagen dig selv ud af den aktuelle kanal (kræver kanaloperatørsstatus)"
 
 #: src/common/outbound.c:3665
 msgid "MOP, Mass op's all users in the current channel (needs chanop)"
@@ -584,31 +584,31 @@ msgstr "QUERY [-nofocus] <nick>, åbner en ny privat chat med nogen"
 
 #: src/common/outbound.c:3688
 msgid "QUIT [<reason>], disconnects from the current server"
-msgstr "QUIT [<ĺrsag>], kobler fra den aktuelle server"
+msgstr "QUIT [<årsag>], kobler fra den aktuelle server"
 
 #: src/common/outbound.c:3690
 msgid "QUOTE <text>, sends the text in raw form to the server"
-msgstr "QUOTE <text>, sender teksten i rĺ form til serveren"
+msgstr "QUOTE <text>, sender teksten i rå form til serveren"
 
 #: src/common/outbound.c:3693
 msgid ""
 "RECONNECT [-ssl] [<host>] [<port>] [<password>], Can be called just as "
 "/RECONNECT to reconnect to the current server or with /RECONNECT ALL to "
 "reconnect to all the open servers"
-msgstr "RECONNECT [-ssl] [<vćrt>] [<port>] [<adgangskode>], kan kaldes blot som /RECONNECT for at genopkoble til den aktuelle server eller med /RECONNECT ALL for at genopkoble til alle de ĺbne servere"
+msgstr "RECONNECT [-ssl] [<vært>] [<port>] [<adgangskode>], kan kaldes blot som /RECONNECT for at genopkoble til den aktuelle server eller med /RECONNECT ALL for at genopkoble til alle de åbne servere"
 
 #: src/common/outbound.c:3696
 msgid ""
 "RECONNECT [<host>] [<port>] [<password>], Can be called just as /RECONNECT "
 "to reconnect to the current server or with /RECONNECT ALL to reconnect to "
 "all the open servers"
-msgstr "RECONNECT [<vćrt>] [<port>] [<adgangskode>] [<ssl>] [<acceptér_ugyldig_cert>], kan kaldes blot som /RECONNECT for at genopkoble til den aktuelle server eller med /RECONNECT ALL for at genopkoble til alle de ĺbne servere"
+msgstr "RECONNECT [<vært>] [<port>] [<adgangskode>] [<ssl>] [<acceptér_ugyldig_cert>], kan kaldes blot som /RECONNECT for at genopkoble til den aktuelle server eller med /RECONNECT ALL for at genopkoble til alle de åbne servere"
 
 #: src/common/outbound.c:3698
 msgid ""
 "RECV <text>, send raw data to xchat, as if it was received from the irc "
 "server"
-msgstr "RECV <text>, send rĺ data til xchat pĺ samme mĺde som det blev modtaget fra irc-serveren"
+msgstr "RECV <text>, send rå data til xchat på samme måde som det blev modtaget fra irc-serveren"
 
 #: src/common/outbound.c:3701
 msgid "SAY <text>, sends the text to the object in the current window"
@@ -714,7 +714,7 @@ msgstr "Brug: %s\n"
 msgid ""
 "\n"
 "No help available on that command.\n"
-msgstr "\nIngen hjćlp tilgćngelig om den kommando.\n"
+msgstr "\nIngen hjælp tilgængelig om den kommando.\n"
 
 #: src/common/outbound.c:3788
 msgid "No such command.\n"
@@ -730,7 +730,7 @@ msgstr "For mange rekursive brugerkommandoer, afbryder."
 
 #: src/common/outbound.c:4362
 msgid "Unknown Command. Try /help\n"
-msgstr "Ukendt Kommando. Prřv /help\n"
+msgstr "Ukendt Kommando. Prøv /help\n"
 
 #: src/common/plugin.c:382 src/common/plugin.c:423
 msgid "No xchat_plugin_init symbol; is this really an xchat plugin?"
@@ -749,14 +749,14 @@ msgstr ""
 
 #: src/common/server.c:1038
 msgid "Proxy traversal failed.\n"
-msgstr "Proxy-gennemlřb fejlede.\n"
+msgstr "Proxy-gennemløb fejlede.\n"
 
 #: src/common/servlist.c:747
 #, c-format
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -764,51 +764,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -816,426 +816,438 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O fra%C26 $3%O klar %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV-tilslutning etableret til%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O fra%C26 $3%O mislykkedes ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Kan ikke ĺbne $1 for skrivning ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tFilen%C26 $1%C findes allerede, gemmer den som%C26 $2%O i stedet."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O til%C26 $2%O klar %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND-tilslutning etableret til%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O til%C26 $2%O mislykkedes. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ohar tilbudt%C26 $2 %O(%C26$3 %Obyte)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Otil%C26 $3 %Cstoppede - afbryder."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Otil%C26 $3 %Olavede timeout - afbryder."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorering pĺ %C26$1%O ćndredes."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O fjernet fra ignoreringslisten."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Ignoreringslisten er tom."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD oversprunget."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDer findes ingen sĺdan DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tIngen sĺdan process křrer i řjeblikket"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 brugere pĺ notificeringslisten."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
-msgstr "Indlćs log fra"
+msgstr "Indlæs log fra"
 
 #: src/common/text.c:437
 #, c-format
@@ -1272,7 +1284,7 @@ msgstr "Kanalen der bliver joinet"
 
 #: src/common/text.c:1148 src/common/text.c:1196 src/common/text.c:1247
 msgid "The host of the person"
-msgstr "Personens vćrt"
+msgstr "Personens vært"
 
 #: src/common/text.c:1152 src/common/text.c:1159 src/common/text.c:1166
 #: src/common/text.c:1354 src/common/text.c:1361 src/common/text.c:1366
@@ -1318,7 +1330,7 @@ msgstr "Nyt kaldenavn"
 
 #: src/common/text.c:1177
 msgid "Nick of person who changed the topic"
-msgstr "Kaldenavnet pĺ personen der ćndrede topic"
+msgstr "Kaldenavnet på personen der ændrede topic"
 
 #: src/common/text.c:1178 src/common/text.c:1184 src/fe-gtk/chanlist.c:788
 #: src/fe-gtk/chanlist.c:891 src/fe-gtk/setup.c:356
@@ -1371,7 +1383,7 @@ msgstr "Grund"
 
 #: src/common/text.c:1214 src/common/text.c:1356 src/common/text.c:1445
 msgid "Host"
-msgstr "Vćrtsnavn"
+msgstr "Værtsnavn"
 
 #: src/common/text.c:1218 src/common/text.c:1223 src/common/text.c:1228
 msgid "Who it's from"
@@ -1383,7 +1395,7 @@ msgstr "Tiden i x.x format (se nedenfor)"
 
 #: src/common/text.c:1229 src/common/text.c:1266
 msgid "The Channel it's going to"
-msgstr "Kanalen det gĺr til"
+msgstr "Kanalen det går til"
 
 #: src/common/text.c:1253
 msgid "The sound"
@@ -1391,19 +1403,19 @@ msgstr "Lyden"
 
 #: src/common/text.c:1254 src/common/text.c:1260 src/common/text.c:1265
 msgid "The nick of the person"
-msgstr "Kaldenavnet pĺ personen"
+msgstr "Kaldenavnet på personen"
 
 #: src/common/text.c:1259 src/common/text.c:1264
 msgid "The CTCP event"
-msgstr "CTCP-hćndelelsen"
+msgstr "CTCP-hændelelsen"
 
 #: src/common/text.c:1270
 msgid "The nick of the person who set the key"
-msgstr "Kaldenavnet pĺ personen som satte nřglen"
+msgstr "Kaldenavnet på personen som satte nøglen"
 
 #: src/common/text.c:1271
 msgid "The key"
-msgstr "Nřglen"
+msgstr "Nøglen"
 
 #: src/common/text.c:1275
 msgid "The nick of the person who set the limit"
@@ -1411,7 +1423,7 @@ msgstr ""
 
 #: src/common/text.c:1276
 msgid "The limit"
-msgstr "Grćnsevćrdien"
+msgstr "Grænseværdien"
 
 #: src/common/text.c:1280
 msgid "The nick of the person who did the op'ing"
@@ -1547,7 +1559,7 @@ msgstr "Tilsluttet-tid"
 
 #: src/common/text.c:1383
 msgid "Away reason"
-msgstr "Fravćrs-grund"
+msgstr "Fraværs-grund"
 
 #: src/common/text.c:1392 src/common/text.c:1398 src/common/text.c:1406
 #: src/common/text.c:1592
@@ -1588,7 +1600,7 @@ msgstr ""
 
 #: src/common/text.c:1426
 msgid "Nick of person who invited you"
-msgstr "Kaldenavn pĺ personen som inviterede dig"
+msgstr "Kaldenavn på personen som inviterede dig"
 
 #: src/common/text.c:1432 src/fe-gtk/chanlist.c:787
 msgid "Users"
@@ -1600,7 +1612,7 @@ msgstr "Kaldenavn i brug"
 
 #: src/common/text.c:1437
 msgid "Nick being tried"
-msgstr "Afprřver kaldenavn"
+msgstr "Afprøver kaldenavn"
 
 #: src/common/text.c:1446 src/common/text.c:1582
 msgid "IP"
@@ -1636,7 +1648,7 @@ msgstr "Filnavn"
 
 #: src/common/text.c:1495 src/common/text.c:1502
 msgid "Destination filename"
-msgstr "Filnavn pĺ mĺl"
+msgstr "Filnavn på mål"
 
 #: src/common/text.c:1504 src/common/text.c:1533
 msgid "CPS"
@@ -1652,7 +1664,7 @@ msgstr "Vinduesplacering"
 
 #: src/common/text.c:1560 src/fe-gtk/dccgui.c:763
 msgid "Size"
-msgstr "Střrrelse"
+msgstr "Størrelse"
 
 #: src/common/text.c:1565
 msgid "DCC String"
@@ -1676,11 +1688,11 @@ msgstr "Modtager"
 
 #: src/common/text.c:1596
 msgid "Hostmask"
-msgstr "Vćrtsmaske"
+msgstr "Værtsmaske"
 
 #: src/common/text.c:1601
 msgid "Hostname"
-msgstr "Vćrtsnavn"
+msgstr "Værtsnavn"
 
 #: src/common/text.c:1606
 msgid "The Packet"
@@ -1718,29 +1730,29 @@ msgstr ""
 msgid ""
 "Cannot read sound file:\n"
 "%s"
-msgstr "Kan ikke lćse lydfil.%s"
+msgstr "Kan ikke læse lydfil.%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
-msgstr "Forbindelse nćgtet"
+msgstr "Forbindelse nægtet"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
-msgstr "Ingen rute til vćrten"
+msgstr "Ingen rute til værten"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
-msgstr "Forbindelsestidsgrćnse udlřbet"
+msgstr "Forbindelsestidsgrænse udløbet"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Forbindelse nulstillet af ligemand"
 
@@ -1826,7 +1838,7 @@ msgstr "Aruba"
 
 #: src/common/util.c:979
 msgid "Aland Islands"
-msgstr "Ĺland"
+msgstr "Åland"
 
 #: src/common/util.c:980
 msgid "Azerbaijan"
@@ -1898,7 +1910,7 @@ msgstr "Bhutan"
 
 #: src/common/util.c:997
 msgid "Bouvet Island"
-msgstr "Bouvetřen"
+msgstr "Bouvetøen"
 
 #: src/common/util.c:998
 msgid "Botswana"
@@ -1922,7 +1934,7 @@ msgstr ""
 
 #: src/common/util.c:1003
 msgid "Cocos Islands"
-msgstr "Kokosřerne"
+msgstr "Kokosøerne"
 
 #: src/common/util.c:1004
 msgid "Democratic Republic of Congo"
@@ -1946,7 +1958,7 @@ msgstr "Elfenbenskysten"
 
 #: src/common/util.c:1009
 msgid "Cook Islands"
-msgstr "Cook-řerne"
+msgstr "Cook-øerne"
 
 #: src/common/util.c:1010
 msgid "Chile"
@@ -1990,7 +2002,7 @@ msgstr "Kap Verde"
 
 #: src/common/util.c:1020
 msgid "Christmas Island"
-msgstr "Juleřen"
+msgstr "Juleøen"
 
 #: src/common/util.c:1021
 msgid "Cyprus"
@@ -2042,7 +2054,7 @@ msgstr "Estland"
 
 #: src/common/util.c:1033
 msgid "Egypt"
-msgstr "Ćgypten"
+msgstr "ægypten"
 
 #: src/common/util.c:1034
 msgid "Western Sahara"
@@ -2062,7 +2074,7 @@ msgstr "Etiopien"
 
 #: src/common/util.c:1038
 msgid "European Union"
-msgstr "Europćiske Union"
+msgstr "Europæiske Union"
 
 #: src/common/util.c:1039
 msgid "Finland"
@@ -2074,7 +2086,7 @@ msgstr "Fiji"
 
 #: src/common/util.c:1041
 msgid "Falkland Islands"
-msgstr "Falklandsřerne"
+msgstr "Falklandsøerne"
 
 #: src/common/util.c:1042
 msgid "Micronesia"
@@ -2082,7 +2094,7 @@ msgstr "Mikronesien"
 
 #: src/common/util.c:1043
 msgid "Faroe Islands"
-msgstr "Fćrřerne"
+msgstr "Færøerne"
 
 #: src/common/util.c:1044
 msgid "France"
@@ -2110,7 +2122,7 @@ msgstr "Fransk Guyana"
 
 #: src/common/util.c:1050
 msgid "British Channel Isles"
-msgstr "Britiske kanalřer"
+msgstr "Britiske kanaløer"
 
 #: src/common/util.c:1051
 msgid "Ghana"
@@ -2122,7 +2134,7 @@ msgstr "Gibraltar"
 
 #: src/common/util.c:1053
 msgid "Greenland"
-msgstr "Grřnland"
+msgstr "Grønland"
 
 #: src/common/util.c:1054
 msgid "Gambia"
@@ -2142,15 +2154,15 @@ msgstr "Guadeloupe"
 
 #: src/common/util.c:1058
 msgid "Equatorial Guinea"
-msgstr "Ćkvatorialguinea"
+msgstr "ækvatorialguinea"
 
 #: src/common/util.c:1059
 msgid "Greece"
-msgstr "Grćkenland"
+msgstr "Grækenland"
 
 #: src/common/util.c:1060
 msgid "S. Georgia and S. Sandwich Isles"
-msgstr "Sydgeorgien og Sřdre Sandwichřer"
+msgstr "Sydgeorgien og Sødre Sandwichøer"
 
 #: src/common/util.c:1061
 msgid "Guatemala"
@@ -2174,7 +2186,7 @@ msgstr "Hong Kong"
 
 #: src/common/util.c:1066
 msgid "Heard and McDonald Islands"
-msgstr "Heard- og McDonald-řerne"
+msgstr "Heard- og McDonald-øerne"
 
 #: src/common/util.c:1067
 msgid "Honduras"
@@ -2298,7 +2310,7 @@ msgstr "Kuwait"
 
 #: src/common/util.c:1097
 msgid "Cayman Islands"
-msgstr "Caymanřerne"
+msgstr "Caymanøerne"
 
 #: src/common/util.c:1098
 msgid "Kazakhstan"
@@ -2374,11 +2386,11 @@ msgstr "Madagaskar"
 
 #: src/common/util.c:1116
 msgid "Marshall Islands"
-msgstr "Marshallřerne"
+msgstr "Marshalløerne"
 
 #: src/common/util.c:1117
 msgid "Military"
-msgstr "Militćr"
+msgstr "Militær"
 
 #: src/common/util.c:1118
 msgid "Macedonia"
@@ -2406,7 +2418,7 @@ msgstr ""
 
 #: src/common/util.c:1124
 msgid "Northern Mariana Islands"
-msgstr "Nordlige Marianerřerne"
+msgstr "Nordlige Marianerøerne"
 
 #: src/common/util.c:1125
 msgid "Martinique"
@@ -2470,11 +2482,11 @@ msgstr "Nigeria"
 
 #: src/common/util.c:1140
 msgid "Internic Network"
-msgstr "Internic, netvćrk"
+msgstr "Internic, netværk"
 
 #: src/common/util.c:1141
 msgid "Norfolk Island"
-msgstr "Norfolkřerne"
+msgstr "Norfolkøerne"
 
 #: src/common/util.c:1142
 msgid "Nigeria"
@@ -2586,7 +2598,7 @@ msgstr "Réunion"
 
 #: src/common/util.c:1169
 msgid "Romania"
-msgstr "Rumćnien"
+msgstr "Rumænien"
 
 #: src/common/util.c:1170
 msgid "Old School ARPAnet"
@@ -2598,7 +2610,7 @@ msgstr ""
 
 #: src/common/util.c:1172
 msgid "Russian Federation"
-msgstr "Russiske Fřderation"
+msgstr "Russiske Føderation"
 
 #: src/common/util.c:1173
 msgid "Rwanda"
@@ -2610,7 +2622,7 @@ msgstr "Saudiarabien"
 
 #: src/common/util.c:1175
 msgid "Solomon Islands"
-msgstr "Solomonřerne"
+msgstr "Solomonøerne"
 
 #: src/common/util.c:1176
 msgid "Seychelles"
@@ -2638,7 +2650,7 @@ msgstr "Slovenien"
 
 #: src/common/util.c:1182
 msgid "Svalbard and Jan Mayen Islands"
-msgstr "Svalbard og Jan Mayen-řerne"
+msgstr "Svalbard og Jan Mayen-øerne"
 
 #: src/common/util.c:1183
 msgid "Slovak Republic"
@@ -2690,7 +2702,7 @@ msgstr "Swaziland"
 
 #: src/common/util.c:1195
 msgid "Turks and Caicos Islands"
-msgstr "Turks- og Caicos-řerne"
+msgstr "Turks- og Caicos-øerne"
 
 #: src/common/util.c:1196
 msgid "Chad"
@@ -2798,11 +2810,11 @@ msgstr "Venezuela"
 
 #: src/common/util.c:1223
 msgid "British Virgin Islands"
-msgstr "Britiske Jomfruřer"
+msgstr "Britiske Jomfruøer"
 
 #: src/common/util.c:1224
 msgid "US Virgin Islands"
-msgstr "Jomfruřerne (USA)"
+msgstr "Jomfruøerne (USA)"
 
 #: src/common/util.c:1225
 msgid "Vietnam"
@@ -2814,7 +2826,7 @@ msgstr "Vanuatu"
 
 #: src/common/util.c:1227
 msgid "Wallis and Futuna Islands"
-msgstr "Wallis- og Futuna-řerne"
+msgstr "Wallis- og Futuna-øerne"
 
 #: src/common/util.c:1228
 msgid "Samoa"
@@ -2858,11 +2870,11 @@ msgstr "Kunne ikke tilslutte til sessionsbus"
 
 #: src/common/dbus/dbus-client.c:86
 msgid "Failed to complete NameHasOwner"
-msgstr "Mislykkedes med at fćrdiggřre NameHasOwner"
+msgstr "Mislykkedes med at færdiggøre NameHasOwner"
 
 #: src/common/dbus/dbus-client.c:112
 msgid "Failed to complete Command"
-msgstr "Mislykkedes med at fćrdiggřre kommando"
+msgstr "Mislykkedes med at færdiggøre kommando"
 
 #: src/common/dbus/dbus-plugin.c:30
 msgid "remote access"
@@ -2882,13 +2894,13 @@ msgstr "Kunne ikke tilslutte til sessionsbus: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Mislykkedes med at overtage %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Om "
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "En IRC-klient for flere platforme"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
@@ -2901,12 +2913,12 @@ msgstr "Ikke tilsluttet."
 
 #: src/fe-gtk/banlist.c:247 src/fe-gtk/banlist.c:327
 msgid "You must select some bans."
-msgstr "Du skal vćlge nogen bandlysninger."
+msgstr "Du skal vælge nogen bandlysninger."
 
 #: src/fe-gtk/banlist.c:276
 #, c-format
 msgid "Are you sure you want to remove all bans in %s?"
-msgstr "Er du sikker pĺ at du vil fjerne alle bandlysninger i %s?"
+msgstr "Er du sikker på at du vil fjerne alle bandlysninger i %s?"
 
 #: src/fe-gtk/banlist.c:342 src/fe-gtk/ignoregui.c:173
 msgid "Mask"
@@ -2922,7 +2934,7 @@ msgstr "Dato"
 
 #: src/fe-gtk/banlist.c:387
 msgid "You can only open the Ban List window while in a channel tab."
-msgstr "Du kan kun ĺbne bandlysningslisten inde i kanalfanebladet."
+msgstr "Du kan kun åbne bandlysningslisten inde i kanalfanebladet."
 
 #: src/fe-gtk/banlist.c:391
 #, c-format
@@ -2935,7 +2947,7 @@ msgstr "Fjern"
 
 #: src/fe-gtk/banlist.c:409
 msgid "Crop"
-msgstr "Beskćr"
+msgstr "Beskær"
 
 #: src/fe-gtk/banlist.c:413
 msgid "Refresh"
@@ -2944,11 +2956,11 @@ msgstr "Genopfrisk"
 #: src/fe-gtk/chanlist.c:117
 #, c-format
 msgid "Displaying %d/%d users on %d/%d channels."
-msgstr "Viser %d/%d brugere pĺ %d/%d kanaler"
+msgstr "Viser %d/%d brugere på %d/%d kanaler"
 
 #: src/fe-gtk/chanlist.c:532 src/fe-gtk/menu.c:1273 src/fe-gtk/urlgrab.c:149
 msgid "Select an output filename"
-msgstr "Vćlg et uddatafilnavn"
+msgstr "Vælg et uddatafilnavn"
 
 #: src/fe-gtk/chanlist.c:639 src/fe-gtk/chanlist.c:821
 msgid "_Join Channel"
@@ -2969,7 +2981,7 @@ msgstr ""
 
 #: src/fe-gtk/chanlist.c:803
 msgid "_Search"
-msgstr "_Sřg"
+msgstr "_Søg"
 
 #: src/fe-gtk/chanlist.c:809
 msgid "_Download List"
@@ -3005,19 +3017,19 @@ msgstr "Kanalnavn"
 
 #: src/fe-gtk/chanlist.c:904
 msgid "Search type:"
-msgstr "Sřgetype."
+msgstr "Søgetype."
 
 #: src/fe-gtk/chanlist.c:911
 msgid "Simple Search"
-msgstr "Simpel sřgning"
+msgstr "Simpel søgning"
 
 #: src/fe-gtk/chanlist.c:912
 msgid "Pattern Match (Wildcards)"
-msgstr "Mřnstermatchning (jokertegn)"
+msgstr "Mønstermatchning (jokertegn)"
 
 #: src/fe-gtk/chanlist.c:914
 msgid "Regular Expression"
-msgstr "Regulćrt udtryk"
+msgstr "Regulært udtryk"
 
 #: src/fe-gtk/chanlist.c:925
 msgid "Find:"
@@ -3038,13 +3050,13 @@ msgid ""
 "Cannot access file: %s\n"
 "%s.\n"
 "Resuming not possible."
-msgstr "Kan ikke fĺ adgang til fil: %s\n%s.\nGenoptagelse ikke mulig."
+msgstr "Kan ikke få adgang til fil: %s\n%s.\nGenoptagelse ikke mulig."
 
 #: src/fe-gtk/dccgui.c:508
 msgid ""
 "File in download directory is larger than file offered. Resuming not "
 "possible."
-msgstr "Filen i hentningskataloget er střrre end den fil som blev tilbudt. Genoptagelse ikke mulig."
+msgstr "Filen i hentningskataloget er større end den fil som blev tilbudt. Genoptagelse ikke mulig."
 
 #: src/fe-gtk/dccgui.c:512
 msgid "Cannot resume the same file from two people."
@@ -3072,7 +3084,7 @@ msgstr "Begge"
 
 #: src/fe-gtk/dccgui.c:798
 msgid "Uploads"
-msgstr "Oplćgninger"
+msgstr "Oplægninger"
 
 #: src/fe-gtk/dccgui.c:804
 msgid "Downloads"
@@ -3104,7 +3116,7 @@ msgstr "Genoptag"
 
 #: src/fe-gtk/dccgui.c:830
 msgid "Open Folder..."
-msgstr "Ĺbn mappe..."
+msgstr "Åbn mappe..."
 
 #: src/fe-gtk/dccgui.c:990
 msgid ": DCC Chat List"
@@ -3157,7 +3169,7 @@ msgstr "Gem"
 
 #: src/fe-gtk/editlist.c:369 src/fe-gtk/fkeys.c:767
 msgid "Add New"
-msgstr "Tilfřj ny"
+msgstr "Tilføj ny"
 
 #: src/fe-gtk/editlist.c:373 src/fe-gtk/fkeys.c:772 src/fe-gtk/ignoregui.c:381
 msgid "Delete"
@@ -3169,7 +3181,7 @@ msgstr "Sortér"
 
 #: src/fe-gtk/editlist.c:385
 msgid "Help"
-msgstr "Hjćlp"
+msgstr "Hjælp"
 
 #: src/fe-gtk/fe-gtk.c:132
 msgid "Don't auto connect to servers"
@@ -3181,11 +3193,11 @@ msgstr "Brug et andet konfigurationskatalog"
 
 #: src/fe-gtk/fe-gtk.c:134
 msgid "Don't auto load any plugins"
-msgstr "Indlćs ikke automatisk nogen indstiksmoduler"
+msgstr "Indlæs ikke automatisk nogen indstiksmoduler"
 
 #: src/fe-gtk/fe-gtk.c:135
 msgid "Show plugin auto-load directory"
-msgstr "Vis katalog for automatisk indlćsning af indstiksmoduler"
+msgstr "Vis katalog for automatisk indlæsning af indstiksmoduler"
 
 #: src/fe-gtk/fe-gtk.c:136
 msgid "Show user config directory"
@@ -3193,15 +3205,15 @@ msgstr "Vis katalog for brugerkonfiguration"
 
 #: src/fe-gtk/fe-gtk.c:137
 msgid "Open an irc://server:port/channel URL"
-msgstr "Ĺbn en irc://server:port/kanal URL"
+msgstr "Åbn en irc://server:port/kanal URL"
 
 #: src/fe-gtk/fe-gtk.c:139 src/fe-gtk/setup.c:297
 msgid "Execute command:"
-msgstr "Udfřrelseskommando:"
+msgstr "Udførelseskommando:"
 
 #: src/fe-gtk/fe-gtk.c:140
 msgid "Open URL or execute command in an existing XChat"
-msgstr "Ĺbn url eller křr kommando i en eksisterende XChat"
+msgstr "Åbn url eller kør kommando i en eksisterende XChat"
 
 #: src/fe-gtk/fe-gtk.c:142
 msgid "Begin minimized. Level 0=Normal 1=Iconified 2=Tray"
@@ -3221,11 +3233,11 @@ msgid ""
 "Failed to open font:\n"
 "\n"
 "%s"
-msgstr "Mislykkedes med at ĺbne skrifttype:\n\n%s"
+msgstr "Mislykkedes med at åbne skrifttype:\n\n%s"
 
 #: src/fe-gtk/fe-gtk.c:732
 msgid "Search buffer is empty.\n"
-msgstr "Sřgebuffer er tom.\n"
+msgstr "Søgebuffer er tom.\n"
 
 #: src/fe-gtk/fe-gtk.c:841
 #, c-format
@@ -3235,7 +3247,7 @@ msgstr "%d byte"
 #: src/fe-gtk/fe-gtk.c:842
 #, c-format
 msgid "Network send queue: %d bytes"
-msgstr "Sendekř for netvćrket: %d byte"
+msgstr "Sendekø for netværket: %d byte"
 
 #: src/fe-gtk/fkeys.c:161
 msgid ""
@@ -3258,13 +3270,13 @@ msgstr ""
 msgid ""
 "The Insert in Buffer command will insert the contents of Data 1 into the "
 "entry where the key sequence was pressed at the current cursor position"
-msgstr "Kommandoen Indsćt i buffer vil indsćtte indeholdet af Data 1 i feltet hvor tastkombinationen tryktes ved nuvćrende markřrposition"
+msgstr "Kommandoen Indsæt i buffer vil indsætte indeholdet af Data 1 i feltet hvor tastkombinationen tryktes ved nuværende markørposition"
 
 #: src/fe-gtk/fkeys.c:167
 msgid ""
 "The Scroll Page command scrolls the text widget up or down one page or one"
 " line. Set Data 1 to either Up, Down, +1 or -1."
-msgstr "Kommandoen Rul side ruller tekstwidgeten en side eller en linje op eller ned. Sćt Data 1 til enten Up, Down, +1 eller -1."
+msgstr "Kommandoen Rul side ruller tekstwidgeten en side eller en linje op eller ned. Sæt Data 1 til enten Up, Down, +1 eller -1."
 
 #: src/fe-gtk/fkeys.c:169
 msgid ""
@@ -3276,13 +3288,13 @@ msgstr ""
 msgid ""
 "The Last Command command sets the entry to contain the last command "
 "entered - the same as pressing up in a shell"
-msgstr "Kommandoen Seneste kommando gřr at feltet indeholder den senest angivne kommando - samme som at trykke opadpil i skallen"
+msgstr "Kommandoen Seneste kommando gør at feltet indeholder den senest angivne kommando - samme som at trykke opadpil i skallen"
 
 #: src/fe-gtk/fkeys.c:173
 msgid ""
 "The Next Command command sets the entry to contain the next command "
 "entered - the same as pressing down in a shell"
-msgstr "Kommandoen Nćste kommando gřr at feltet indeholder nćste kommando som blev angivet - samme som at trykkke nedadpil i skallen"
+msgstr "Kommandoen Næste kommando gør at feltet indeholder næste kommando som blev angivet - samme som at trykkke nedadpil i skallen"
 
 #: src/fe-gtk/fkeys.c:175
 msgid ""
@@ -3301,7 +3313,7 @@ msgstr "Denne kommando ruller op og ned i listen med kaldenavne. Hvis Data 1 er
 msgid ""
 "This command checks the last word entered in the entry against the replace "
 "list and replaces it if it finds a match"
-msgstr "Denne kommando kontrollerer det senest angivne ord i feltet op mod erstatningslisten og erstatter det hvis det finder en trćffer"
+msgstr "Denne kommando kontrollerer det senest angivne ord i feltet op mod erstatningslisten og erstatter det hvis det finder en træffer"
 
 #: src/fe-gtk/fkeys.c:181
 msgid "This command moves the front tab left by one"
@@ -3309,7 +3321,7 @@ msgstr "Denne kommando flytter det forreste faneblad et trin til venstre"
 
 #: src/fe-gtk/fkeys.c:183
 msgid "This command moves the front tab right by one"
-msgstr "Denne kommando flytter det forreste faneblad et trin til hřjre"
+msgstr "Denne kommando flytter det forreste faneblad et trin til højre"
 
 #: src/fe-gtk/fkeys.c:185
 msgid "This command moves the current tab family to the left"
@@ -3317,7 +3329,7 @@ msgstr "Denne kommando flytter det aktuelle faneblad et trin til venstre"
 
 #: src/fe-gtk/fkeys.c:187
 msgid "This command moves the current tab family to the right"
-msgstr "Denne kommando flytter det aktuelle faneblad et trin til hřjre"
+msgstr "Denne kommando flytter det aktuelle faneblad et trin til højre"
 
 #: src/fe-gtk/fkeys.c:189
 msgid "Push input line into history but doesn't send to server"
@@ -3325,7 +3337,7 @@ msgstr "Gem inddatalinjen i historikken men send den ikke til serveren"
 
 #: src/fe-gtk/fkeys.c:200
 msgid "There was an error loading key bindings configuration"
-msgstr "Der var en fejl ved indlćsning af tastbindningskonfigurationen"
+msgstr "Der var en fejl ved indlæsning af tastbindningskonfigurationen"
 
 #: src/fe-gtk/fkeys.c:452 src/fe-gtk/fkeys.c:453 src/fe-gtk/fkeys.c:454
 #: src/fe-gtk/fkeys.c:455 src/fe-gtk/fkeys.c:745 src/fe-gtk/fkeys.c:751
@@ -3340,7 +3352,7 @@ msgstr "Mod"
 
 #: src/fe-gtk/fkeys.c:710 src/fe-gtk/fkeys.c:805
 msgid "Key"
-msgstr "Nřgle"
+msgstr "Nøgle"
 
 #: src/fe-gtk/fkeys.c:711
 msgid "Action"
@@ -3372,21 +3384,21 @@ msgstr "Data 2"
 
 #: src/fe-gtk/fkeys.c:854
 msgid "Error opening keys config file\n"
-msgstr "Fejl ved ĺbning af nřglekonfigfil\n"
+msgstr "Fejl ved åbning af nøglekonfigfil\n"
 
 #: src/fe-gtk/fkeys.c:1021
 #, c-format
 msgid ""
 "Unknown keyname %s in key bindings config file\n"
 "Load aborted, please fix %s/keybindings.conf\n"
-msgstr "Ukendt tastenavn %s i konfigurationsfilen for tastebindninger\nIndlćsningen blev afbrudt, ćndr gerne %s/keybindings.conf\n"
+msgstr "Ukendt tastenavn %s i konfigurationsfilen for tastebindninger\nIndlæsningen blev afbrudt, ændr gerne %s/keybindings.conf\n"
 
 #: src/fe-gtk/fkeys.c:1059
 #, c-format
 msgid ""
 "Unknown action %s in key bindings config file\n"
 "Load aborted, Please fix %s/keybindings\n"
-msgstr "Ukendt handling %s i konfigurationsfilen for tastebindninger\nIndlćsningen blev afbrudt, ćndr gerne %s/keybindings.conf\n"
+msgstr "Ukendt handling %s i konfigurationsfilen for tastebindninger\nIndlæsningen blev afbrudt, ændr gerne %s/keybindings.conf\n"
 
 #: src/fe-gtk/fkeys.c:1080
 #, c-format
@@ -3410,7 +3422,7 @@ msgstr "Kan ikke skrive til dén fil."
 
 #: src/fe-gtk/gtkutil.c:140
 msgid "Cannot read that file."
-msgstr "Kan ikke lćse dén fil."
+msgstr "Kan ikke læse dén fil."
 
 #: src/fe-gtk/ignoregui.c:115 src/fe-gtk/ignoregui.c:258
 msgid "That mask already exists."
@@ -3422,7 +3434,7 @@ msgstr "Privat"
 
 #: src/fe-gtk/ignoregui.c:176
 msgid "Notice"
-msgstr "Bemćrk"
+msgstr "Bemærk"
 
 #: src/fe-gtk/ignoregui.c:177
 msgid "CTCP"
@@ -3462,7 +3474,7 @@ msgstr "Privat:"
 
 #: src/fe-gtk/ignoregui.c:366
 msgid "Notice:"
-msgstr "Bemćrk:"
+msgstr "Bemærk:"
 
 #: src/fe-gtk/ignoregui.c:367
 msgid "CTCP:"
@@ -3474,7 +3486,7 @@ msgstr "Invitér:"
 
 #: src/fe-gtk/ignoregui.c:379 src/fe-gtk/notifygui.c:427
 msgid "Add..."
-msgstr "Tilfřj..."
+msgstr "Tilføj..."
 
 #: src/fe-gtk/joind.c:87
 msgid "Channel name too short, try again."
@@ -3487,7 +3499,7 @@ msgstr ""
 #: src/fe-gtk/joind.c:154
 #, c-format
 msgid "Connection to %s complete."
-msgstr "Forbindelse til %s fćrdig"
+msgstr "Forbindelse til %s færdig"
 
 #: src/fe-gtk/joind.c:163
 msgid ""
@@ -3501,7 +3513,7 @@ msgstr ""
 
 #: src/fe-gtk/joind.c:174
 msgid "_Nothing, I'll join a channel later."
-msgstr "_Ingenting, jeg gĺr ind i en kanal senere."
+msgstr "_Ingenting, jeg går ind i en kanal senere."
 
 #: src/fe-gtk/joind.c:183
 msgid "_Join this channel:"
@@ -3509,11 +3521,11 @@ msgstr "Join denne kanal."
 
 #: src/fe-gtk/joind.c:195
 msgid "If you know the name of the channel you want to join, enter it here."
-msgstr "Hvis du véd navnet pĺ kanalen du vil gĺ ind i, sĺ angiv denne."
+msgstr "Hvis du véd navnet på kanalen du vil gå ind i, så angiv denne."
 
 #: src/fe-gtk/joind.c:202
 msgid "O_pen the Channel-List window."
-msgstr "_Ĺbn kanallistevinduet."
+msgstr "_Åbn kanallistevinduet."
 
 #: src/fe-gtk/joind.c:209
 msgid "Retrieving the Channel-List may take a minute or two."
@@ -3549,20 +3561,20 @@ msgstr ""
 
 #: src/fe-gtk/maingui.c:1273
 msgid "Don't ask next time."
-msgstr "Spřrg ikke nćste gang."
+msgstr "Spørg ikke næste gang."
 
 #: src/fe-gtk/maingui.c:1279
 #, c-format
 msgid "You are connected to %i IRC networks."
-msgstr "Du er tilsluttet til %i IRC-netvćrk."
+msgstr "Du er tilsluttet til %i IRC-netværk."
 
 #: src/fe-gtk/maingui.c:1281
 msgid "Are you sure you want to quit?"
-msgstr "Er du sikker pĺ at du vil afslutte?"
+msgstr "Er du sikker på at du vil afslutte?"
 
 #: src/fe-gtk/maingui.c:1283
 msgid "Some file transfers are still active."
-msgstr "En del filoverfřringer er stadigvćk aktive."
+msgstr "En del filoverføringer er stadigvæk aktive."
 
 #: src/fe-gtk/maingui.c:1301
 msgid "_Minimize to Tray"
@@ -3570,7 +3582,7 @@ msgstr "_Minimér til aktivitetsfelt"
 
 #: src/fe-gtk/maingui.c:1521
 msgid "Insert Attribute or Color Code"
-msgstr "Indsćt attribut eller farvekode"
+msgstr "Indsæt attribut eller farvekode"
 
 #: src/fe-gtk/maingui.c:1523
 msgid "<b>Bold</b>"
@@ -3594,7 +3606,7 @@ msgstr "Farverne 8-15"
 
 #: src/fe-gtk/maingui.c:1581
 msgid "_Settings"
-msgstr "Ops_ćtning"
+msgstr "Ops_ætning"
 
 #: src/fe-gtk/maingui.c:1583
 msgid "_Log to Disk"
@@ -3602,7 +3614,7 @@ msgstr "_Log til disk"
 
 #: src/fe-gtk/maingui.c:1584
 msgid "_Reload Scrollback"
-msgstr "_Genindćs historik"
+msgstr "_Genindæs historik"
 
 #: src/fe-gtk/maingui.c:1586
 msgid "_Hide Join/Part Messages"
@@ -3622,11 +3634,11 @@ msgstr "Blink felt_ikonen"
 
 #: src/fe-gtk/maingui.c:1603
 msgid "Blink Task _Bar"
-msgstr "Blink _vćrktřjslinjen"
+msgstr "Blink _værktøjslinjen"
 
 #: src/fe-gtk/maingui.c:1641 src/fe-gtk/menu.c:2182
 msgid "_Detach"
-msgstr "_Frigřr"
+msgstr "_Frigør"
 
 #: src/fe-gtk/maingui.c:1643 src/fe-gtk/menu.c:2183 src/fe-gtk/menu.c:2188
 #: src/fe-gtk/plugingui.c:257 src/fe-gtk/search.c:234
@@ -3635,7 +3647,7 @@ msgstr "_Luk"
 
 #: src/fe-gtk/maingui.c:1981 src/fe-gtk/maingui.c:2087
 msgid "User limit must be a number!\n"
-msgstr "Brugergrćnse skal vćre et nummer!\n"
+msgstr "Brugergrænse skal være et nummer!\n"
 
 #: src/fe-gtk/maingui.c:2109
 msgid "Topic Protection"
@@ -3663,11 +3675,11 @@ msgstr "Udelukkelsesliste"
 
 #: src/fe-gtk/maingui.c:2117
 msgid "Keyword"
-msgstr "Nřgleord"
+msgstr "Nøgleord"
 
 #: src/fe-gtk/maingui.c:2129
 msgid "User Limit"
-msgstr "Brugergrćnse"
+msgstr "Brugergrænse"
 
 #: src/fe-gtk/maingui.c:2238
 msgid "Show/Hide userlist"
@@ -3687,7 +3699,7 @@ msgstr "Indtast nyt kaldenavn:"
 
 #: src/fe-gtk/menu.c:127
 msgid "Host unknown"
-msgstr "Ukendt vćrt"
+msgstr "Ukendt vært"
 
 #: src/fe-gtk/menu.c:616
 #, c-format
@@ -3768,7 +3780,7 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1080
 msgid "Edit This Menu..."
-msgstr "Ćndr denne menu..."
+msgstr "ændr denne menu..."
 
 #: src/fe-gtk/menu.c:1210 src/fe-gtk/menu.c:1223 src/fe-gtk/search.c:78
 msgid "Search hit end, not found."
@@ -3842,7 +3854,7 @@ msgid ""
 "&2  =  word 2 to the end of line\n"
 "&3  =  word 3 to the end of line\n"
 "\n"
-msgstr "CTCP-svar - specialkoder:\n\n%d  =  data (hele ctcp-kommandoen)\n%e  =  aktuelt netvćrksnavn\n%m  =  maskininformation\n%s  =  kaldenavnet som sendte ctcp-kommandoen\n%t  =  tid/dato\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til slutningen pĺ linjen\n&3  =  ord 3 til slutningen pĺ linjen\n\n"
+msgstr "CTCP-svar - specialkoder:\n\n%d  =  data (hele ctcp-kommandoen)\n%e  =  aktuelt netværksnavn\n%m  =  maskininformation\n%s  =  kaldenavnet som sendte ctcp-kommandoen\n%t  =  tid/dato\n%2  =  ord 2\n%3  =  ord 3\n&2  =  ord 2 til slutningen på linjen\n&3  =  ord 3 til slutningen på linjen\n\n"
 
 #: src/fe-gtk/menu.c:1437
 #, c-format
@@ -3918,7 +3930,7 @@ msgstr "Kanalvindue..."
 
 #: src/fe-gtk/menu.c:1619 src/fe-gtk/menu.c:1621
 msgid "_Load Plugin or Script..."
-msgstr "Indlćs modul eller skriot..."
+msgstr "Indlæs modul eller skriot..."
 
 #: src/fe-gtk/menu.c:1629 src/fe-gtk/plugin-tray.c:540
 msgid "_Quit"
@@ -3962,7 +3974,7 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1644
 msgid "_Network Meters"
-msgstr "_Netvćrksmĺlere"
+msgstr "_Netværksmålere"
 
 #: src/fe-gtk/menu.c:1646 src/fe-gtk/setup.c:243
 msgid "Off"
@@ -3994,7 +4006,7 @@ msgstr "Liste med kanaler..."
 
 #: src/fe-gtk/menu.c:1659
 msgid "Marked Away"
-msgstr "Markeret fravćrende"
+msgstr "Markeret fraværende"
 
 #: src/fe-gtk/menu.c:1661
 msgid "_Usermenu"
@@ -4002,7 +4014,7 @@ msgstr "_Brugermenu"
 
 #: src/fe-gtk/menu.c:1663
 msgid "S_ettings"
-msgstr "Ops_ćtning"
+msgstr "Ops_ætning"
 
 #: src/fe-gtk/menu.c:1664
 msgid "_Preferences"
@@ -4062,7 +4074,7 @@ msgstr "Direkte chat..."
 
 #: src/fe-gtk/menu.c:1680
 msgid "File Transfers..."
-msgstr "Filoverfřrsler..."
+msgstr "Filoverførsler..."
 
 #: src/fe-gtk/menu.c:1681
 msgid "Friends List..."
@@ -4078,7 +4090,7 @@ msgstr "Moduler og skripter..."
 
 #: src/fe-gtk/menu.c:1684
 msgid "Raw Log..."
-msgstr "Rĺ log..."
+msgstr "Rå log..."
 
 #: src/fe-gtk/menu.c:1685
 msgid "URL Grabber..."
@@ -4106,7 +4118,7 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1693
 msgid "Search Text..."
-msgstr "Sřg i tekst..."
+msgstr "Søg i tekst..."
 
 #: src/fe-gtk/menu.c:1694
 msgid "Reset Search"
@@ -4122,7 +4134,7 @@ msgstr ""
 
 #: src/fe-gtk/menu.c:1699 src/fe-gtk/menu.c:2174
 msgid "_Help"
-msgstr "_Hjćlp"
+msgstr "_Hjælp"
 
 #: src/fe-gtk/menu.c:1701
 msgid "_Contents"
@@ -4179,7 +4191,7 @@ msgstr ""
 
 #: src/fe-gtk/notifygui.c:435
 msgid "Open Dialog"
-msgstr "Ĺbning af dialog"
+msgstr "Åbning af dialog"
 
 #: src/fe-gtk/plugin-tray.c:226
 #, c-format
@@ -4208,11 +4220,11 @@ msgstr "Privat besked"
 
 #: src/fe-gtk/plugin-tray.c:525 src/fe-gtk/setup.c:656
 msgid "Highlighted Message"
-msgstr "Fremhćvet besked"
+msgstr "Fremhævet besked"
 
 #: src/fe-gtk/plugin-tray.c:528
 msgid "_Change status"
-msgstr "_Ćndr status"
+msgstr "_ændr status"
 
 #: src/fe-gtk/plugin-tray.c:530
 msgid "_Away"
@@ -4272,7 +4284,7 @@ msgstr "Beskrivelse"
 
 #: src/fe-gtk/plugingui.c:159
 msgid "Select a Plugin or Script to load"
-msgstr "Vćlg et modul eller skript som skal indlćses"
+msgstr "Vælg et modul eller skript som skal indlæses"
 
 #: src/fe-gtk/plugingui.c:244
 msgid ": Plugins and Scripts"
@@ -4280,11 +4292,11 @@ msgstr ""
 
 #: src/fe-gtk/plugingui.c:250
 msgid "_Load..."
-msgstr "Ind_lćs..."
+msgstr "Ind_læs..."
 
 #: src/fe-gtk/plugingui.c:253
 msgid "_UnLoad"
-msgstr "_Udlćs"
+msgstr "_Udlæs"
 
 #: src/fe-gtk/rawlog.c:84 src/fe-gtk/rawlog.c:133 src/fe-gtk/textgui.c:438
 #: src/fe-gtk/urlgrab.c:216
@@ -4298,7 +4310,7 @@ msgstr ""
 
 #: src/fe-gtk/rawlog.c:130
 msgid "Clear rawlog"
-msgstr "Ryd rĺ log"
+msgstr "Ryd rå log"
 
 #: src/fe-gtk/search.c:61
 msgid "The window you opened this Search for doesn't exist anymore."
@@ -4334,12 +4346,12 @@ msgstr ""
 
 #: src/fe-gtk/servlistgui.c:174 src/fe-gtk/servlistgui.c:283
 msgid "New Network"
-msgstr "Nyt netvćrk"
+msgstr "Nyt netværk"
 
 #: src/fe-gtk/servlistgui.c:556
 #, c-format
 msgid "Really remove network \"%s\" and all its servers?"
-msgstr "Vil du virkelig fjerne netvćrket \"%s\" og alle dets servere?"
+msgstr "Vil du virkelig fjerne netværket \"%s\" og alle dets servere?"
 
 #: src/fe-gtk/servlistgui.c:738
 msgid "#channel"
@@ -4356,7 +4368,7 @@ msgstr ""
 
 #: src/fe-gtk/servlistgui.c:904
 msgid "Key (Password)"
-msgstr "Nřgleord (adgangskode)"
+msgstr "Nøgleord (adgangskode)"
 
 #: src/fe-gtk/servlistgui.c:935 src/fe-gtk/servlistgui.c:1581
 msgid "_Edit"
@@ -4424,11 +4436,11 @@ msgstr "Forbinder"
 
 #: src/fe-gtk/servlistgui.c:1469
 msgid "Auto connect to this network at startup"
-msgstr "Forbind automatisk til dette netvćrk ved opstart"
+msgstr "Forbind automatisk til dette netværk ved opstart"
 
 #: src/fe-gtk/servlistgui.c:1471
 msgid "Bypass proxy server"
-msgstr "Forbigĺ proxyserver"
+msgstr "Forbigå proxyserver"
 
 #: src/fe-gtk/servlistgui.c:1473
 msgid "Use SSL for all the servers on this network"
@@ -4485,7 +4497,7 @@ msgstr ""
 
 #: src/fe-gtk/servlistgui.c:1511
 msgid "Character set:"
-msgstr "Tegnsćt:"
+msgstr "Tegnsæt:"
 
 #: src/fe-gtk/servlistgui.c:1666
 msgid ": Network List"
@@ -4501,11 +4513,11 @@ msgstr "Tredje valg:"
 
 #: src/fe-gtk/servlistgui.c:1762
 msgid "Networks"
-msgstr "Netvćrk"
+msgstr "Netværk"
 
 #: src/fe-gtk/servlistgui.c:1810
 msgid "Skip network list on startup"
-msgstr "Ingen netvćrksliste ved opstart"
+msgstr "Ingen netværksliste ved opstart"
 
 #: src/fe-gtk/servlistgui.c:1819
 msgid "Show favorites only"
@@ -4799,15 +4811,15 @@ msgstr "Indstillinger for gennemsigtighed"
 
 #: src/fe-gtk/setup.c:181
 msgid "Red:"
-msgstr "Rřd:"
+msgstr "Rød:"
 
 #: src/fe-gtk/setup.c:182
 msgid "Green:"
-msgstr "Grřn:"
+msgstr "Grøn:"
 
 #: src/fe-gtk/setup.c:183
 msgid "Blue:"
-msgstr "Blĺ:"
+msgstr "Blå:"
 
 #: src/fe-gtk/setup.c:188 src/fe-gtk/setup.c:554
 msgid "Time Stamps"
@@ -4843,7 +4855,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:206 src/fe-gtk/setup.c:253
 msgid "A-Z"
-msgstr "A-Ĺ"
+msgstr "A-Å"
 
 #: src/fe-gtk/setup.c:207
 msgid "Last-spoke order"
@@ -4885,7 +4897,7 @@ msgstr "Kaldenavnudfyldelse"
 
 #: src/fe-gtk/setup.c:227
 msgid "Automatic nick completion (without TAB key)"
-msgstr "Automatisk kaldenavnsfuldfřrsel (uden TAB-tast)"
+msgstr "Automatisk kaldenavnsfuldførsel (uden TAB-tast)"
 
 #: src/fe-gtk/setup.c:229
 msgid "Nick completion suffix:"
@@ -4902,7 +4914,7 @@ msgstr ""
 #: src/fe-gtk/setup.c:234
 #, c-format
 msgid "Interpret %nnn as an ASCII value"
-msgstr "Fortolk %nnn som en ASCII-vćrdi"
+msgstr "Fortolk %nnn som en ASCII-værdi"
 
 #: src/fe-gtk/setup.c:235
 msgid "Interpret %C, %B as Color, Bold etc"
@@ -4914,15 +4926,15 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:252
 msgid "A-Z, Ops first"
-msgstr "A-Ĺ, Op'er fřrst"
+msgstr "A-Å, Op'er først"
 
 #: src/fe-gtk/setup.c:254
 msgid "Z-A, Ops last"
-msgstr "Ĺ-A, Op'er sidst"
+msgstr "Å-A, Op'er sidst"
 
 #: src/fe-gtk/setup.c:255
 msgid "Z-A"
-msgstr "Ĺ-A"
+msgstr "Å-A"
 
 #: src/fe-gtk/setup.c:256
 msgid "Unsorted"
@@ -4930,7 +4942,7 @@ msgstr "Usorteret"
 
 #: src/fe-gtk/setup.c:262 src/fe-gtk/setup.c:274
 msgid "Left (Upper)"
-msgstr "Venstre (řvre)"
+msgstr "Venstre (øvre)"
 
 #: src/fe-gtk/setup.c:263 src/fe-gtk/setup.c:275
 msgid "Left (Lower)"
@@ -4938,11 +4950,11 @@ msgstr "Venstre (nedre)"
 
 #: src/fe-gtk/setup.c:264 src/fe-gtk/setup.c:276
 msgid "Right (Upper)"
-msgstr "Hřjre (řvre)"
+msgstr "Højre (øvre)"
 
 #: src/fe-gtk/setup.c:265 src/fe-gtk/setup.c:277
 msgid "Right (Lower)"
-msgstr "Hřjre (nedre)"
+msgstr "Højre (nedre)"
 
 #: src/fe-gtk/setup.c:266
 msgid "Top"
@@ -4962,7 +4974,7 @@ msgstr "Brugerliste"
 
 #: src/fe-gtk/setup.c:284
 msgid "Show hostnames in user list"
-msgstr "Vis vćrtsnavne i brugerlisten"
+msgstr "Vis værtsnavne i brugerlisten"
 
 #: src/fe-gtk/setup.c:286
 msgid "Show icons for user modes"
@@ -4982,7 +4994,7 @@ msgstr "Brugerliste sorteret efter:"
 
 #: src/fe-gtk/setup.c:290
 msgid "Show user list at:"
-msgstr "Vis brugerliste pĺ "
+msgstr "Vis brugerliste på "
 
 #: src/fe-gtk/setup.c:292
 msgid "Away Tracking"
@@ -4990,11 +5002,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:293
 msgid "Track the Away status of users and mark them in a different color"
-msgstr "Spor fravćrstatus for brugere og markér dem i en anden farve"
+msgstr "Spor fraværstatus for brugere og markér dem i en anden farve"
 
 #: src/fe-gtk/setup.c:294
 msgid "On channels smaller than:"
-msgstr "Pĺ kanaler mindre end:"
+msgstr "På kanaler mindre end:"
 
 #: src/fe-gtk/setup.c:296
 msgid "Action Upon Double Click"
@@ -5026,11 +5038,11 @@ msgstr "Altid"
 
 #: src/fe-gtk/setup.c:317
 msgid "Only requested tabs"
-msgstr "Kun řnskede faneblade"
+msgstr "Kun ønskede faneblade"
 
 #: src/fe-gtk/setup.c:325
 msgid "Tree"
-msgstr "Trć"
+msgstr "Træ"
 
 #: src/fe-gtk/setup.c:332
 msgid "Switcher type:"
@@ -5038,15 +5050,15 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:333
 msgid "Open an extra tab for server messages"
-msgstr "Ĺbn et ekstra faneblad til server-beskeder"
+msgstr "Åbn et ekstra faneblad til server-beskeder"
 
 #: src/fe-gtk/setup.c:334
 msgid "Open an extra tab for server notices"
-msgstr "Ĺbn et ekstra faneblad til server-underretninger"
+msgstr "Åbn et ekstra faneblad til server-underretninger"
 
 #: src/fe-gtk/setup.c:335
 msgid "Open a new tab when you receive a private message"
-msgstr "Ĺbn et nyt faneblad nĺr du modtager en privat meddelelse"
+msgstr "Åbn et nyt faneblad når du modtager en privat meddelelse"
 
 #: src/fe-gtk/setup.c:336
 msgid "Sort tabs in alphabetical order"
@@ -5086,19 +5098,19 @@ msgstr "Faneblade eller vinduer"
 
 #: src/fe-gtk/setup.c:345
 msgid "Open channels in:"
-msgstr "Ĺbn kanaler i:"
+msgstr "Åbn kanaler i:"
 
 #: src/fe-gtk/setup.c:346
 msgid "Open dialogs in:"
-msgstr "Ĺbn dialogvinduer i "
+msgstr "Åbn dialogvinduer i "
 
 #: src/fe-gtk/setup.c:347
 msgid "Open utilities in:"
-msgstr "Ĺbn vćrktřjer i:"
+msgstr "Åbn værktøjer i:"
 
 #: src/fe-gtk/setup.c:347
 msgid "Open DCC, Ignore, Notify etc, in tabs or windows?"
-msgstr "Ĺbn DCC-, ignorerings-, notificeringsvindue osv. i faneblade eller vinduer?"
+msgstr "Åbn DCC-, ignorerings-, notificeringsvindue osv. i faneblade eller vinduer?"
 
 #: src/fe-gtk/setup.c:354
 msgid "Messages"
@@ -5126,7 +5138,7 @@ msgstr "Filer og kataloger"
 
 #: src/fe-gtk/setup.c:372
 msgid "Auto accept file offers:"
-msgstr "Acceptér tilbud pĺ filer automatisk"
+msgstr "Acceptér tilbud på filer automatisk"
 
 #: src/fe-gtk/setup.c:373
 msgid "Download files to:"
@@ -5134,7 +5146,7 @@ msgstr "Hent filer til:"
 
 #: src/fe-gtk/setup.c:374
 msgid "Move completed files to:"
-msgstr "Flyt fćrdige filer til %s"
+msgstr "Flyt færdige filer til %s"
 
 #: src/fe-gtk/setup.c:375
 msgid "Save nick name in filenames"
@@ -5142,17 +5154,17 @@ msgstr "Gem kaldenavn i filnavne"
 
 #: src/fe-gtk/setup.c:377
 msgid "Network Settings"
-msgstr "Opsćtning af netvćrk"
+msgstr "Opsætning af netværk"
 
 #: src/fe-gtk/setup.c:378
 msgid "Get my address from the IRC server"
-msgstr "Fĺ min IP-adresse fra IRC-serveren"
+msgstr "Få min IP-adresse fra IRC-serveren"
 
 #: src/fe-gtk/setup.c:379
 msgid ""
 "Asks the IRC server for your real address. Use this if you have a "
 "192.168.*.* address!"
-msgstr "Spřrger IRC-serveren om din virkelige adresse. Brug dette hvis du har en adresse af typen 192.168.*.*!"
+msgstr "Spørger IRC-serveren om din virkelige adresse. Brug dette, hvis du har en adresse af typen 192.168.*.*!"
 
 #: src/fe-gtk/setup.c:380
 msgid "DCC IP address:"
@@ -5160,11 +5172,11 @@ msgstr "DCC-IP-adresse:"
 
 #: src/fe-gtk/setup.c:381
 msgid "Claim you are at this address when offering files."
-msgstr "Udgiv dig for at vćre pĺ denne adresse nĺr du tilbyder filer."
+msgstr "Udgiv dig for at være på denne adresse, når du tilbyder filer."
 
 #: src/fe-gtk/setup.c:382
 msgid "First DCC send port:"
-msgstr "Fřrste DCC-sendeport:"
+msgstr "Første DCC-sendeport:"
 
 #: src/fe-gtk/setup.c:383
 msgid "Last DCC send port:"
@@ -5172,19 +5184,19 @@ msgstr "Sidste DCC-sendeport:"
 
 #: src/fe-gtk/setup.c:384
 msgid "!Leave ports at zero for full range."
-msgstr "!Opgiv vćrdien af porte til nul for fuldstćndigt interval."
+msgstr "!Opgiv værdien af porte til nul for fuldstændigt interval."
 
 #: src/fe-gtk/setup.c:386
 msgid "Maximum File Transfer Speeds (bytes per second)"
-msgstr "Maksimal hastighed for filoverfřrsler (byte per sekund)"
+msgstr "Maksimal hastighed for filoverførsler (byte per sekund)"
 
 #: src/fe-gtk/setup.c:387
 msgid "One upload:"
-msgstr "En oplćgning:"
+msgstr "En oplægning:"
 
 #: src/fe-gtk/setup.c:388 src/fe-gtk/setup.c:390
 msgid "Maximum speed for one transfer"
-msgstr "Max. hastighed for en overfřrsel"
+msgstr "Maximal hastighed for en overførsel"
 
 #: src/fe-gtk/setup.c:389
 msgid "One download:"
@@ -5192,11 +5204,11 @@ msgstr "En hentning:"
 
 #: src/fe-gtk/setup.c:391
 msgid "All uploads combined:"
-msgstr "Alle oplćgninger kombinerede:"
+msgstr "Alle oplægninger kombinerede:"
 
 #: src/fe-gtk/setup.c:392 src/fe-gtk/setup.c:394
 msgid "Maximum speed for all files"
-msgstr "Max. hastighed for alle filer"
+msgstr "Maximal hastighed for alle filer"
 
 #: src/fe-gtk/setup.c:393
 msgid "All downloads combined:"
@@ -5208,7 +5220,7 @@ msgstr "Alarmer"
 
 #: src/fe-gtk/setup.c:425
 msgid "Show tray balloons on:"
-msgstr ""
+msgstr "Vis systembakke-meddelelser ved:"
 
 #: src/fe-gtk/setup.c:427
 msgid "Blink tray icon on:"
@@ -5216,11 +5228,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:428 src/fe-gtk/setup.c:450
 msgid "Blink task bar on:"
-msgstr "Blink vćrktřjslinjen ved:"
+msgstr "Blink værktøjslinjen ved:"
 
 #: src/fe-gtk/setup.c:429 src/fe-gtk/setup.c:451
 msgid "Make a beep sound on:"
-msgstr ""
+msgstr "Lav en biplyd ved:"
 
 #: src/fe-gtk/setup.c:431
 msgid "Enable system tray icon"
@@ -5232,7 +5244,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:434 src/fe-gtk/setup.c:455
 msgid "Highlighted Messages"
-msgstr "Fremhćvede beskeder"
+msgstr "Fremhævede beskeder"
 
 #: src/fe-gtk/setup.c:435 src/fe-gtk/setup.c:456
 msgid ""
@@ -5241,15 +5253,15 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:437 src/fe-gtk/setup.c:458
 msgid "Extra words to highlight:"
-msgstr "Ekstra ord som skal fremhćves:"
+msgstr "Ekstra ord som skal fremhæves:"
 
 #: src/fe-gtk/setup.c:438 src/fe-gtk/setup.c:459
 msgid "Nick names not to highlight:"
-msgstr "Kaldenavne som ikke skal fremhćves:"
+msgstr "Kaldenavne som ikke skal fremhæves:"
 
 #: src/fe-gtk/setup.c:439 src/fe-gtk/setup.c:460
 msgid "Nick names to always highlight:"
-msgstr "Kaldenavne som altid skal fremhćves:"
+msgstr "Kaldenavne som altid skal fremhæves:"
 
 #: src/fe-gtk/setup.c:440 src/fe-gtk/setup.c:461
 msgid ""
@@ -5271,23 +5283,23 @@ msgstr "Forlad kanal:"
 
 #: src/fe-gtk/setup.c:471
 msgid "Away:"
-msgstr "Væk:"
+msgstr "Fraværende:"
 
 #: src/fe-gtk/setup.c:473
 msgid "Away"
-msgstr "Væk"
+msgstr "Fraværende"
 
 #: src/fe-gtk/setup.c:474
 msgid "Announce away messages"
-msgstr ""
+msgstr "Annoncer fraværende-beskeder"
 
 #: src/fe-gtk/setup.c:475
 msgid "Announce your away messages to all channels."
-msgstr ""
+msgstr "Annoncer din fraværende-besked til alle kanaler."
 
 #: src/fe-gtk/setup.c:476
 msgid "Show away once"
-msgstr "Vis væk en gang"
+msgstr "Vis fraværende én gang"
 
 #: src/fe-gtk/setup.c:476
 msgid "Show identical away messages only once."
@@ -5303,11 +5315,11 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:484 src/fe-gtk/setup.c:516
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Avancerede indstillinger"
 
 #: src/fe-gtk/setup.c:486 src/fe-gtk/setup.c:517
 msgid "Alternative fonts:"
-msgstr ""
+msgstr "Alternative skrifttyper:"
 
 #: src/fe-gtk/setup.c:488 src/fe-gtk/setup.c:518
 msgid "Auto reconnect delay:"
@@ -5315,19 +5327,19 @@ msgstr "Autogentilslutningsforsinkelse:"
 
 #: src/fe-gtk/setup.c:489 src/fe-gtk/setup.c:519
 msgid "Display MODEs in raw form"
-msgstr "Vis MODE'er i rĺ form"
+msgstr "Vis MODE i rå form"
 
 #: src/fe-gtk/setup.c:490 src/fe-gtk/setup.c:520
 msgid "Whois on notify"
-msgstr ""
+msgstr "Whois ved notify"
 
 #: src/fe-gtk/setup.c:490 src/fe-gtk/setup.c:520
 msgid "Sends a /WHOIS when a user comes online in your notify list."
-msgstr ""
+msgstr "Sender et /WHOIS, når en bruger kommer online fra din notify-liste."
 
 #: src/fe-gtk/setup.c:491 src/fe-gtk/setup.c:521
 msgid "Hide join and part messages"
-msgstr "Skjul join/part-beskeder"
+msgstr "Skjul tilslutter/forlader-beskeder"
 
 #: src/fe-gtk/setup.c:491 src/fe-gtk/setup.c:521
 msgid "Hide channel join/part messages by default."
@@ -5339,15 +5351,15 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:492 src/fe-gtk/setup.c:523
 msgid "Use less spacing between user list/channel tree rows."
-msgstr ""
+msgstr "Brug mindre mellemrum mellem brugerliste/kanaltræ-rækker"
 
 #: src/fe-gtk/setup.c:493 src/fe-gtk/setup.c:524
 msgid "Auto Open DCC Windows"
-msgstr ""
+msgstr "Automatisk Åben DCC-Vinduer"
 
 #: src/fe-gtk/setup.c:494 src/fe-gtk/setup.c:525
 msgid "Send window"
-msgstr ""
+msgstr "Send-vindue"
 
 #: src/fe-gtk/setup.c:495 src/fe-gtk/setup.c:526
 msgid "Receive window"
@@ -5363,17 +5375,17 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:498 src/fe-gtk/setup.c:529
 msgid "Automatically copy selected text"
-msgstr ""
+msgstr "Kopier automatisk den valgte tekst"
 
 #: src/fe-gtk/setup.c:499 src/fe-gtk/setup.c:530
 msgid ""
 "Copy selected text to clipboard when left mouse button is released. "
 "Otherwise, CONTROL-SHIFT-C will copy the selected text to the clipboard."
-msgstr ""
+msgstr "Kopier den valgte tekst til udklipsholder, når der ikke længere trykkes på venstre museknap. Ellers vil CONTROL-SHIFT-C kopiere den valgte tekst til udklipsholderen."
 
 #: src/fe-gtk/setup.c:502 src/fe-gtk/setup.c:533
 msgid "Automatically include time stamps"
-msgstr ""
+msgstr "Inkluder automatisk tidsstempel"
 
 #: src/fe-gtk/setup.c:503 src/fe-gtk/setup.c:534
 msgid ""
@@ -5383,7 +5395,7 @@ msgstr ""
 
 #: src/fe-gtk/setup.c:505 src/fe-gtk/setup.c:536
 msgid "Automatically include color information"
-msgstr ""
+msgstr "Inkluder automatisk farve information"
 
 #: src/fe-gtk/setup.c:506 src/fe-gtk/setup.c:537
 msgid ""
@@ -5409,20 +5421,20 @@ msgstr "Tilbagerulning:"
 
 #: src/fe-gtk/setup.c:550
 msgid "Enable logging of conversations to disk"
-msgstr "Aktivér samtalelogning pĺ disk"
+msgstr "Aktivér samtalelogning på disk"
 
 #: src/fe-gtk/setup.c:551
 msgid "Log filename:"
-msgstr "Logfilnavn:"
+msgstr "Logfilens navn:"
 
 #: src/fe-gtk/setup.c:552
 #, c-format
 msgid "%s=Server %c=Channel %n=Network."
-msgstr "%s=Server %c=Kanal %n=Netvćrk."
+msgstr "%s=Server %c=Kanal %n=Netværk."
 
 #: src/fe-gtk/setup.c:555
 msgid "Insert timestamps in logs"
-msgstr "Indsćt tidsstempeler i logger"
+msgstr "Indsæt tidsstempler i logfiler"
 
 #: src/fe-gtk/setup.c:556
 msgid "Log timestamp format:"
@@ -5494,7 +5506,7 @@ msgstr "Bind til:"
 
 #: src/fe-gtk/setup.c:599
 msgid "Only useful for computers with multiple addresses."
-msgstr ""
+msgstr "Kun nyttig til computere med flere adresser"
 
 #: src/fe-gtk/setup.c:601
 msgid "Proxy Server"
@@ -5502,7 +5514,7 @@ msgstr "Proxyserver"
 
 #: src/fe-gtk/setup.c:602
 msgid "Hostname:"
-msgstr "Vćrtsnavn:"
+msgstr "Værtsnavn:"
 
 #: src/fe-gtk/setup.c:603
 msgid "Port:"
@@ -5538,19 +5550,19 @@ msgstr "Adgangskode:"
 
 #: src/fe-gtk/setup.c:1045
 msgid "Select an Image File"
-msgstr "Vćlg billedfil"
+msgstr "Vælg billedfil"
 
 #: src/fe-gtk/setup.c:1080
 msgid "Select Download Folder"
-msgstr "Vćlg mappe til hentede filer"
+msgstr "Vælg mappe til hentede filer"
 
 #: src/fe-gtk/setup.c:1089
 msgid "Select font"
-msgstr "Vćlg skrifttype"
+msgstr "Vælg skrifttype"
 
 #: src/fe-gtk/setup.c:1189
 msgid "Browse..."
-msgstr "Gennemsé..."
+msgstr "Gennemse..."
 
 #: src/fe-gtk/setup.c:1327
 msgid "Mark identified users with:"
@@ -5562,11 +5574,11 @@ msgstr "Marker ikke-identificerede brugere med:"
 
 #: src/fe-gtk/setup.c:1336
 msgid "Open Data Folder"
-msgstr "Ĺbn datamappe"
+msgstr "Åbn datamappe"
 
 #: src/fe-gtk/setup.c:1390
 msgid "Select color"
-msgstr "Vćlg farve"
+msgstr "Vælg farve"
 
 #: src/fe-gtk/setup.c:1470
 msgid "Text Colors"
@@ -5610,23 +5622,23 @@ msgstr "Ny besked:"
 
 #: src/fe-gtk/setup.c:1501
 msgid "Away user:"
-msgstr ""
+msgstr "Fraværende bruger:"
 
 #: src/fe-gtk/setup.c:1502
 msgid "Highlight:"
-msgstr "Fremhćvning:"
+msgstr "Fremhævning:"
 
 #: src/fe-gtk/setup.c:1504
 msgid "Spell checker:"
-msgstr ""
+msgstr "Stavekontrol:"
 
 #: src/fe-gtk/setup.c:1507
 msgid "Color Stripping"
-msgstr ""
+msgstr "Strip Farver"
 
 #: src/fe-gtk/setup.c:1613 src/fe-gtk/textgui.c:389
 msgid "Event"
-msgstr "Hćndelse"
+msgstr "Hændelse"
 
 #: src/fe-gtk/setup.c:1619
 msgid "Sound file"
@@ -5634,27 +5646,27 @@ msgstr "Lydfil"
 
 #: src/fe-gtk/setup.c:1654
 msgid "Select a sound file"
-msgstr "Vćlg en lydfil"
+msgstr "Vælg en lydfil"
 
 #: src/fe-gtk/setup.c:1726
 msgid "Sound playing method:"
-msgstr ""
+msgstr "Lydafspilningsmetode"
 
 #: src/fe-gtk/setup.c:1734
 msgid "External sound playing _program:"
-msgstr ""
+msgstr "Ekstern lydafspilning _program:"
 
 #: src/fe-gtk/setup.c:1752
 msgid "_External program"
-msgstr ""
+msgstr "_Externt program"
 
 #: src/fe-gtk/setup.c:1762
 msgid "_Automatic"
-msgstr ""
+msgstr "_Automatisk"
 
 #: src/fe-gtk/setup.c:1775
 msgid "Sound files _directory:"
-msgstr ""
+msgstr "Lydfiler _mappe:"
 
 #: src/fe-gtk/setup.c:1814
 msgid "Sound file:"
@@ -5662,11 +5674,11 @@ msgstr "Lydfil:"
 
 #: src/fe-gtk/setup.c:1829
 msgid "_Browse..."
-msgstr "_Gennemsé..."
+msgstr "_Gennemse..."
 
 #: src/fe-gtk/setup.c:1840
 msgid "_Play"
-msgstr ""
+msgstr "_Afspil"
 
 #: src/fe-gtk/setup.c:1889
 msgid "Interface"
@@ -5674,7 +5686,7 @@ msgstr "Brugerflade"
 
 #: src/fe-gtk/setup.c:1890
 msgid "Appearance"
-msgstr ""
+msgstr "Udseende"
 
 #: src/fe-gtk/setup.c:1891
 msgid "Input box"
@@ -5702,7 +5714,7 @@ msgstr "Lyd"
 
 #: src/fe-gtk/setup.c:1901
 msgid "Advanced"
-msgstr ""
+msgstr "Avanceret"
 
 #: src/fe-gtk/setup.c:1904
 msgid "Network setup"
@@ -5710,7 +5722,7 @@ msgstr "Netværksopsætning"
 
 #: src/fe-gtk/setup.c:1905
 msgid "File transfers"
-msgstr "Filoverfřrsler"
+msgstr "Filoverførsler"
 
 #: src/fe-gtk/setup.c:2036
 msgid "Categories"
@@ -5720,15 +5732,15 @@ msgstr "Kategorier"
 msgid ""
 "You cannot place the tree on the top or bottom!\n"
 "Please change to the <b>Tabs</b> layout in the <b>View</b> menu first."
-msgstr ""
+msgstr "Du kan ikke placere træet i toppen eller i bunden!Skift venligst til <b>Fane</b> visning i <b>Vis</b>-menuen først."
 
 #: src/fe-gtk/setup.c:2270
 msgid "Invalid time stamp format! See the strftime MSDN article for details."
-msgstr ""
+msgstr "Ugyldigt tidsstempelsformat! Se strftime MSDN artiklen for detajler."
 
 #: src/fe-gtk/setup.c:2277
 msgid "Some settings were changed that require a restart to take full effect."
-msgstr ""
+msgstr "Nogle ændrede indstillinger kræver en genstart, før de træder i kraft."
 
 #: src/fe-gtk/setup.c:2285
 msgid ""
@@ -5736,7 +5748,7 @@ msgid ""
 "Auto accepting DCC to your home directory\n"
 "can be dangerous and is exploitable. Eg:\n"
 "Someone could send you a .bash_profile"
-msgstr ""
+msgstr "*ADVARSEL*At auto-acceptere DCC til din hjemmemappekan være farligt og kan udnyttes. Eks:Nogen kunne sende dig en .bash_profile"
 
 #: src/fe-gtk/setup.c:2318
 msgid ": Preferences"
@@ -5744,12 +5756,12 @@ msgstr ": Indstillinger"
 
 #: src/fe-gtk/textgui.c:180
 msgid "There was an error parsing the string"
-msgstr "Der var en fejl da strengen skulle fortolkes"
+msgstr "Der var en fejl, da strengen skulle fortolkes"
 
 #: src/fe-gtk/textgui.c:188
 #, c-format
 msgid "This signal is only passed %d args, $%d is invalid"
-msgstr ""
+msgstr "Dette signal videregiver kun %d argumenter, $%d er ugyldig"
 
 #: src/fe-gtk/textgui.c:304 src/fe-gtk/textgui.c:327
 msgid "Print Texts File"
@@ -5757,7 +5769,7 @@ msgstr "Udskriv tekstfil"
 
 #: src/fe-gtk/textgui.c:372
 msgid "Edit Events"
-msgstr "Redigér hćndelser"
+msgstr "Redigér hændelser"
 
 #: src/fe-gtk/textgui.c:423
 msgid "$ Number"
@@ -5765,11 +5777,11 @@ msgstr "$ tal"
 
 #: src/fe-gtk/textgui.c:440
 msgid "Load From..."
-msgstr "Indlćs fra..."
+msgstr "Indlæs fra..."
 
 #: src/fe-gtk/textgui.c:441
 msgid "Test All"
-msgstr "Afprřv alle"
+msgstr "Afprøv alle"
 
 #: src/fe-gtk/urlgrab.c:97
 msgid "URL"
@@ -5789,7 +5801,7 @@ msgstr "Kopier valgte URL"
 
 #: src/fe-gtk/urlgrab.c:214
 msgid "Copy"
-msgstr "opier"
+msgstr "Kopier"
 
 #: src/fe-gtk/urlgrab.c:216
 msgid "Save list to a file"
diff --git a/po/de.po b/po/de.po
index 085f5f6d..8864f4e6 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -22,15 +22,15 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Ich bin beschäftigt"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Verlassend"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -67,7 +67,7 @@ msgstr "Kann nicht auf %s zugreifen\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Fehler"
 
@@ -755,7 +755,7 @@ msgstr "Durchlaufen der Proxys gescheitert.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Zum nächsten Server wird gesprungen in %s …\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -763,474 +763,486 @@ msgid ""
 msgstr "Warnung: Zeichensatz »%s« ist unbekannt. Es wird keine Konvertierung für Netzwerk %s vorgenommen."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 zur Benachrichtigungsliste hinzugefügt."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Bannliste:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tKann%C26 %B$1%O$t nicht betreten %O(Sie sind gebannt)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ist jetzt bekannt als $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 setzt einen Bann auf $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tChannel $1 erzeugt am $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O entfernt Halb-Op-Status bei%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O entfernt Op-Status bei%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O entfernt Voice-Status bei%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 setzt Ausnahme auf $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O gibt Halb-Op-Status an%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 setzt Einladung für $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UChannel          Nutzer  Thema%O"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 setzt Modus $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Channel $1 Modi: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O gibt Op-Status an%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 entfernt Ausnahme von $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 entfernt Einladung für $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 entfernt das Channel-Schlüsselwort"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 entfernt die Benutzerobergrenze"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 setzt das Channel-Schlüsselwort auf $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 setzt die Benutzerobergrenze auf $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 entfernt den Bann auf $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O gibt Voice-Status an%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Verbunden. Anmeldevorgang läuft …"
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Baue Verbindung mit $1 ($2) Port $3 auf%O …"
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Verbindung gescheitert. Fehler: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tCTCP $1 von $2 empfangen"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tCTCP $1 von $2 empfangen (An $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tCTCP-Sound $1 von $2 empfangen"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tCTCP Sound $1 empfangen von $2 (an $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT mit %C26$1%O abgebrochen."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC-CHAT-Verbindung mit %C26$1 %C30[%O$2%C30]%O aufgebaut%O"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT mit %C26$1%O verloren. ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tDCC-CHAT-Angebot von $1 empfangen"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tDCC-CHAT an $1 angeboten"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tBiete $1 bereits einen DCC-CHAT an"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 Verbindung mit%C26 $2%O gescheitert (Fehler=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t '$1%O' von $2 empfangen"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Typ   Zu/Von     Status  Größe   Pos     Datei"
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tFehlformatierte DCC Anforderung von %C26$1%O.%010%C22*%O$tInhalt des Pakets: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tBiete%C26 $2%O %C26 $1 %O$tan"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tKein solches DCC-Angebot."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O von%C26 $1%O abgebrochen."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O von%C26 $3%O vollständig %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV Verbindung aufgebaut mit%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O von%C26 $3%O gescheitert. ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Kann $1 nicht schreiben ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tDie Datei%C26 $1%C existiert bereits, speichere stattdessen als%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Ohat angefordert,%C26 $2 %Cvon%C26 $3%C an fortzusetzen."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O an%C26 $1%O abgebrochen."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O an%C26 $2%O vollständig %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND Verbindung aufgebaut mit%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O an%C26 $2%O gescheitert. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ohat uns%C26 $2 %Oangeboten (%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oan%C26 $3 %Chängt - Abbruch."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oan%C26 $3%O: Zeitüberschreitung - Abbruch."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 von der Benachrichtigungsliste gelöscht."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tGetrennt ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tIhre IP wurde gefunden: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O wird jetzt ignoriert."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorierung von %C26$1%O geändert."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmaske                 DIAL NOTI CHAN CTCP DCC  EINL UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O wird nicht mehr ignoriert."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Niemand wird ignoriert."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tKann%C26 %B$1 %O$tnicht betreten %O(Channel ist nur auf Einladung zu betreten)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tSie wurden von%C26 $2%C nach %C26 $1%O eingeladen (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) hat $2 betreten"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tKann%C26 %B$1 %Onicht betreten (Erfordert ein Schlüsselwort)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 hat $2 aus $3 gekickt ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tSie sind von $1 gekillt worden ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD übersprungen."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 bereits in Benutzung. Erneuter Versuch mit $2 …"
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tNickname bereits in Benutzung, benutze /NICK um einen anderen zu probieren."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tKein solcher DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tKein solcher Prozess läuft derzeit"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tDie Benachrichtigungsliste ist leer."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Benachrichtigungsliste        "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 Nutzer in der Benachrichtigungsliste."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tBenachrichtigung: $1 ist offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tBenachrichtigung: $1 ist online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) hat $3 verlassen"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) hat $3 verlassen (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing-Antwort von $1: $2 Sekunde(n)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tKeine Ping-Antwort seit $1 Sekunden, trenne."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tEin Prozess läuft bereits"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 hat die Verbindung getrennt (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 setzt die Modi%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tSuche nach IP für%C26 $1%O …"
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Verbunden."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Suche nach $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tVorhergehender Verbindungsversuch (PID=$1) abgebrochen"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Das Thema für $1%C %C29ist: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 hat das Thema geändert zu: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Das Thema für $1%C %C29wurde gesetzt durch $2%C %C29um $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tUnbekannter Host. Vielleicht haben Sie ihn falsch geschrieben?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tKann%C26 %B$1 %Onicht betreten (Benutzerobergrenze erreicht)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Benutzer in $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cist abwesend %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OEnde der WHOIS-Liste."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O untätig%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O untätig%C26 $2%O, Online seit:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Owahrer Nutzer@Host%C27 $2%O, wahre IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Sie sprechen jetzt in $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tSie wurden durch $3 aus $2 gekickt ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tSie haben den Channel $3 verlassen"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tSie haben den Channel $3 verlassen (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tSie haben %C26 $1%O nach%C26 $2%O$t eingeladen %O(%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tSie sind jetzt als $2 bekannt"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1719,27 +1731,27 @@ msgid ""
 "%s"
 msgstr "Kann diese Sounddatei nicht lesen:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Gegenseite hat den Socket geschlossen"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Verbindung verweigert"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Keine Route zum Host"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Verbindung wegen Zeitüberschreitung geschlossen"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Kann diese Adresse nicht zuteilen"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Verbindung von der Gegenseite zurückgesetzt"
 
@@ -2881,13 +2893,13 @@ msgstr "Fehler beim Verbinden zum Session-Bus: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Ermittlung von %s scheiterte: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Über  "
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Ein portabler IRC-Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/el.po b/po/el.po
index 120b4f3e..ab9f6d91 100644
--- a/po/el.po
+++ b/po/el.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Είμαι απασχολημένος/η"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Αποχώρησε"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Αδυναμία πρόσβασης στο %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -750,7 +750,7 @@ msgstr "Απέτυχε η διάβαση από το proxy\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Μετάβαση στον επόμενο διακομιστή σε %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Προειδοποίηση: Το σύνολο χαρακτήρων \"%s\" είναι άγνωστο. Δεν θα γίνει καμία μετατροπή για το δίκτυο %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 προστέθηκε στη λίστα ειδοποίησης."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Λίστα Ban:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tΔεν ήταν δυνατή η σύνδεση στο%C26 %B$1 %O(Έχετε ban)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 λέγεται τώρα $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 βάζει ban στον/στην $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tΤο κανάλι $1 δημιουργήθηκε την $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O αφαιρεί το voice από%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 θέτει εξαίρεση στο $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 προσκαλεί τον/την $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UΚανάλι           Χρήστες Θέμα"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ορίζει κατάσταση $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Καταστάσεις καναλιού $1: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 αφαιρεί την εξαίρεση στο $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 αφαιρεί την πρόσκληση από $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 αφαιρεί το συνθηματικό του καναλιού"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 αφαιρεί το όριο χρηστών"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ορίζει το $2 σαν συνθηματικό καναλιού"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ορίζει το όριο χρηστών στο κανάλι σε $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 αφαιρεί το ban από $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O δίνει voice στον/στην%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Αποκαταστάθηκε επαφή. Γίνεται σύνδεση..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Γίνεται σύνδεση στο $1 ($2) θύρα $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Η Σύνδεση απέτυχε. Σφάλμα: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tΕλήφθη ένα CTCP $1 από $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tΕλήφθη ένα CTCP $1 από $2 (προς $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tΕλήφθη ένα CTCP Ήχος $1 από $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tΕλήφθη ένα CTCP Ήχος $1 από $2 (προς $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tΗ συνομιλία DCC με τον/την %C26$1%O ακυρώθηκε."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tαποκαταστάθηκε συνομιλία DCC με%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tΑκυρώθηκε η συνομιλία DCC με %C26$1%O."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tΕλήφθη αίτημα DCC CHAT από $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tΠροσφέρεται DCC CHAT προς $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tΠροσφέρεται ήδη CHAT προς $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tΗ προσπάθεια σύνδεσης DCC $1 στο%C26 $2%O απέτυχε (σφάλμα=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tΠαρελήφθη '$1%O' από τον/την$2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Τύπος  Προς/Από    Κατάσταση  Μέγεθος    Θεσ     Αρχείο         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tΛήφθηκε μια εσφαλμένη αίτηση DCC από %C26$1%O.%010%C22*%O$tΠεριεχόμενα πακέτου: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tΠροσφέρεται%C26 $1%O στον/στην%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tΔεν υπάρχει τέτοια προσφορά DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O προς%C26 $1%O ακυρώθηκε."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tαποκαταστάθηκε σύνδεση DCC RECV με%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O από%C26 $3%O απέτυχε ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tΛήψη DCC: Δεν ήταν δυνατό το άνοιγμα του $1 για εγγραφή ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tΤο αρχείο%C26 $1%C υπάρχει ήδη, γίνεται αποθήκευση σαν%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oζήτησε να συνεχίσει%C26 $2 %Cαπό%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tΑκυρώθηκε το DCC SEND%C26 $2%O με %C26 $1%O."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tαποκαταστάθηκε σύνδεση DCC SEND με%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oπροσέφερε%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tΤο χρονικό όριο για τη DCC $1%C26 $2 %Oπρος%C26 $3 %Oέληξε - ακύρωση."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 διαγράφτηκε από τη λίστα επισήμανσης."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tΑποσυνδεθήκατε ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tΒρέθηκε η διεύθυνση IP σας: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O προστέθηκε στην λίστα αγνόησης."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Αγνόηση στο %C26$1%O άλλαξε."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O αφαιρέθηκε από τη λίστα αγνοημένων."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Η λίστα αγνοημένων είναι άδεια."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tΔεν ήταν δυνατή η σύνδεση στο%C26 %B$1 %O(Μόνο με πρόσκληση)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tΠροσκληθήκατε στο%C26 $1%O από τον/την%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) συνδέθηκε στο $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tΔεν ήταν δυνατή η σύνδεση στο%C26 %B$1 %O(Απαιτεί συνθηματικό)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 πέταξε έξω τον/την $2 από το $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tΣας έκανε kill ο/η $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22Το μήνυμα της ημέρας παραλείφθηκε."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 χρησιμοποιείται ήδη. Προσπάθεια με $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tΤο ψευδώνυμο χρησιμοποιείται ήδη. Χρησιμοποιήστε την εντολή /NICK για να δοκιμάσετε ένα άλλο."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tΔεν υπάρχει τέτοιο DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tΔεν τρέχει καμία διεργασία"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tΗ λίστα ειδοποίησης είναι άδεια."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Λίστα ειδοποίησης"
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 χρήστες στη λίστα ειδοποίησης."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tΕπισήμανση: ο/η $1 αποσυνδέθηκε ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tΕπισήμανση: ο/η $1 είναι συνδεδεμένος ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) αποχώρησε από $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) αποχώρησε από $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tΑπάντηση ping από $1: $2 δευτερόλεπτο(α)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tΔεν υπάρχει απάντηση ping για $1 δευτερόλεπτα, αποσύνδεση."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tΕκτελείται ήδη μια διεργασία"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 αποχώρησε (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tΕύρεση διεύθυνσης IP για %C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Έγινε σύνδεση."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Αναζήτηση $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tΣταμάτησε η προηγούμενη προσπάθεια σύνδεσης (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Το θέμα για το $1%C %C29είναι: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 άλλαξε το θέμα σε: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Το θέμα για το $1%C %C29ορίστηκε από $2%C %C29στις $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tΆγνωστος διακομιστής. Μήπως το γράψατε λάθος;"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tΑδυναμία σύνδεσης στο%C26 %B$1 %O(Έχει εξαντληθεί το όριο χρηστών)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Χρήστες στο $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cαπουσιάζει %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OΤέλος λίστας WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O αδρανής%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O αδρανής%C26 $2%O, συνδέθηκε:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oπραγματικός χρήστης@διακομιστή%C27 $2%O, πραγματική IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Μιλάτε στο $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tΑποβληθήκατε από το $2 από τον/την $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tΕγκαταλείψατε το κανάλι $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tΕγκαταλείψατε το κανάλι $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tΠροσκαλέσατε τον/την %C26 $1%O στο%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tΑπο τώρα ονομάζεστε $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Αδυναμία ανάγνωσης του αρχείου ήχου:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Ο απομακρυσμένος διακομιστής έκλεισε το socket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Άρνηση σύνδεσης"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Δεν υπάρχει διαδρομή προς το διακομιστή"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Αδυναμία παραχώρησης αυτής της διεύθυνσης"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Κλείσιμο της σύνδεσης από το ταίρι"
 
@@ -2876,13 +2888,13 @@ msgstr "Δεν ήταν δυνατή η σύνδεση στο δίαυλο μη�
 msgid "Failed to acquire %s: %s\n"
 msgstr "Η λήψη του %s απέτυχε: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Πελάτης IRC πολλαπλών πλατφόρμων"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/en_GB.po b/po/en_GB.po
index b3ddeb88..fb526015 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/hexchat/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "I'm busy"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Leaving"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -63,7 +63,7 @@ msgstr "Cannot access %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Error"
 
@@ -751,7 +751,7 @@ msgstr "Proxy traversal failed.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Cycling to next server in %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -759,51 +759,51 @@ msgid ""
 msgstr "Warning: \"%s\" character set is unknown. No conversion will be applied for network %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -811,271 +811,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Ignore list is empty."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1083,149 +1088,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1715,27 +1727,27 @@ msgid ""
 "%s"
 msgstr "Cannot read sound file:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Remote host closed socket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Connection refused"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "No route to host"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Connection timed out"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Cannot assign that address"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Connection reset by peer"
 
@@ -2877,13 +2889,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/es.po b/po/es.po
index d1f59a5c..d6f0b214 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/hexchat/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Estoy ocupado"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Saliendo"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -63,7 +63,7 @@ msgstr "No se puede acceder a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Error"
 
@@ -751,7 +751,7 @@ msgstr "Ha fallado el proxy traversal.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Ciclando al siguiente servidor en %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -759,474 +759,486 @@ msgid ""
 msgstr "Atención: el conjunto de caracteres \"%s\" es desconocido. No se\naplicará conversión para la red %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 añadido a la lista de notificaciones."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Lista de bans:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNo puede entrar%C26 %B$1 %O(Estás baneado)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 es ahora conocido como $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 banea a $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanal $1 creado en $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita semi-OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita OP de a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 establece a $2 como exento"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da estado de semi-OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 invita a $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UTema de los usuarios del canal"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 establece modo $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Canal $1 modos: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da OP a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 quita la exención a $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 quita invitación a $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 quita contraseña del canal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 quita límite de usuarios"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 establece contraseña del canal del canal como $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 establece límite del canal a $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 quita veto a $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Conectado. Iniciando sesión..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Conectando a $1 ($2) puerto $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Fallo en la conexión. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tSe ha recibido un CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tSe ha recibido un CTCP $1 de $2 (a $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tSe ha recibido un sonido CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tSe ha recibido un CTCP $1 de $2 (a $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tCharla DCC para %C26$1%O abortada."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para charla DCC establecida con %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tCharla DCC con %C26$1%O perdida. $4."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tSe ha recibido una oferta de charla DCC de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tOfreciendo charla DCC a $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tYa se está ofreciendo una charla a $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tEl intento de conexión DCC $1 con%C26 $2%O falló (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tSe ha recibido '$1%O' de $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipo De/Para Estado Tamaño Pos Archivo         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tSe ha recibido una petición DCC errónea de %C26$1%O.%010%C22*%O$tContenidos del paquete: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tOfrece%C26 $1%O a%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNo existe tal oferta DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "-%C10-%C11-%O$tRecepción DCC %C11$2%O para %C11$1%O abortado."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tRecepción DCC %C26 $1%O de%C26 $3%O completada %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para recepción DCC establecida con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tRecepción DCC %C26 $1%O de%C26 $3%O falló ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tRecepción DCC: No se pudo abrir $1 para escritura ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tEl archivo%C26 $1%C ya existe, guardándolo como%C26 $2%O en su lugar."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oha pedido retomar %C26 $2 %Cde%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tEnvío DCC%C26 $2%O para%C26 $1%O abortado."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tEnvío DCC%C26 $1%O para%C26 $2%O completado %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para envío DCC establecida con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tEl envío DCC%C26 $1%O para%C26 $2%O falló. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oha ofrecido%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opara%C26 $3 %Cse paró - abortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opara%C26 $3 %Oagotó el tiempo de espera - abortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 borrado de la lista de notificaciones."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDesconectado ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tEncontró su IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O añadido a la lista de ignorados."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorar a %C26$1%O cambió"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Máscara                  PRIV NOTI CAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O se quitó de la lista de ignorados."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  La lista de ignorados está vacía."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNo pudo entrar a%C26 %B$1 %O(El canal es sólo para invitados)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tHa sido invitado a%C26 $1%O por%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) ha entrado en $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNo pudo entrar%C26 %B$1 %O(Requiere palabra clave)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ha echado a $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tHa sido eliminado por $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22Se saltó el mensaje del día (MOTD)."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ya está en uso. Reintentando con $2.."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tEl apodo ya está siendo usado. Use /NICK para intentar con otro."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNo existe ese DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNo se está ejecutando ningún proceso actualmente"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLa lista de notificaciones está vacía."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Lista de notificación                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 usuarios en la lista de notificaciones."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotificación: $1 está desconectado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotificación: $1 está conectado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ha abandonado $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ha abandonado $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tRespuesta al Ping de $1 : $2 segundo(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNo hubo respuesta al ping en $1 segundos, desconectando."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tYa se está ejecutando un proceso"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 se ha marchado (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 establece modos%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Mensajes de los operadores%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tBuscando número de IP para%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Conectado."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Buscando $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tSe paró el anterior intento de conexión (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29El topic para $1%C %C29es $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ha cambiado el topic a: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Topic para $1%C %C29definido por $2%C %C29en $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tEquipo desconocido. ¿Quizá se ha equivocado?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNo puede entrar a%C26 %B$1 %O(Se llegó al límite de usuarios)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Usuarios en $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cestá ausente %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFinal de la lista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2%O, entró:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Overdadero usuario@equipo%C27 $2%O, verdadera IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Has entrado en $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tSe le ha echado de $2 por $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tHa abandonado el canal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tHa abandonado el canal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tEstá invitando%C26 $1%O  a%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tUsted es ahora conocido como $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1715,27 +1727,27 @@ msgid ""
 "%s"
 msgstr "No se puede leer el archivo de sonido:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Puerto cerrado en el equipo remoto"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Conexión rechazada"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "No hay ruta hacia el equipo"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Tiempo de espera de la conexión agotado"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "No se puede asignar esa dirección"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Conexión reiniciada por el par"
 
@@ -2877,13 +2889,13 @@ msgstr "No se pudo conectar la conexión al bus: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Imposible adquirir %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Acerca de"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Un cliente de IRC multiplataforma."
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
@@ -4472,11 +4484,11 @@ msgstr "Contraseña para el servidor. En caso de duda, dejar en blanco."
 
 #: src/fe-gtk/servlistgui.c:1506
 msgid "SASL password:"
-msgstr ""
+msgstr "Contraseña SASL:"
 
 #: src/fe-gtk/servlistgui.c:1508
 msgid "Password for SASL authentication, if in doubt, leave blank."
-msgstr ""
+msgstr "Contraseña para autenticar SASL, si hay dudas, déjalo en blanco."
 
 #: src/fe-gtk/servlistgui.c:1511
 msgid "Character set:"
diff --git a/po/et.po b/po/et.po
index 74942a2c..4678b2d8 100644
--- a/po/et.po
+++ b/po/et.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "On tegemist"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Lahkun"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -63,7 +63,7 @@ msgstr "Puudub ligipääs failile %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Viga"
 
@@ -751,7 +751,7 @@ msgstr "Proksi kaudu ühendumine ebaõnnestus.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Lähen võrgu %s järgmise serveri juurde...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -759,474 +759,486 @@ msgid ""
 msgstr "Hoiatus: Tundmatu kooditabel \"%s\". Võrgu %s sõnumeid ei kodeerita ümber."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 lisatud märguande nimekirja."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 kanalis bännitute nimekiri:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tEi saa liituda kanaliga%C26 %B$1 %O(keelatud)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 kannab nüüd nime $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 pani keelu maskile $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanal $1 loodi $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O võttis kanali pool-operaatori võimu kasutajalt%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O võttis kanali operaatori võimu kasutajalt%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O võttis hääle kasutajalt%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 tegi erandi kasutajale $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O andis kasutajale%C26 $2%O kanali pool-operaatori võimu"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 määras kutsumise $2 peale"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanal            Liikmeid     Teema"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 seadis kanalile $4 võtme $2$3"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanali $1 seaded: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O andis operaatori staatuse kasutajale%C26 $2 "
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 eemaldab erandi kasutajalt $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 eemaldas kutsumise $2 pealt"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 eemaldas kanalilt märksõna"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 eemaldas kasutajalimiidi"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 seadis kanali märksõnaks $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 seadis kanali piiranguks $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 eemaldas keelu maskilt $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O andis hääle kasutajale%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Ühendatud. Login sisse.."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Ühendan serveri $1 ($2) porti $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Ühendamine ebaõnnestus. Viga: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tVõtsin vastu CTCP $1 kasutajalt $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tVõtsin vastu CTCP $1 kasutajalt $2 ($3-le)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tVõtsin vastu CTCP heli $1 kasutajalt $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tVõtsin vastu CTCP $1 kasutajalt $2 ($3-le)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC vestlus kasutajaga %C26$1%O katkestatud."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC vestlusühendus loodud kasutajaga %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC vestlus kasutajaga %C26$1%O katkes ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tVõtsin vastu DCC CHAT pakkumise kasutajalt $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tPakun DCC vestlust kasutajale to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tJuba pakun DCC vestlust kasutajale $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 ühenduse loomine kasutajaga%C26 $2%O nurjus (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tVõtsin vastu '$1%O' kasutajalt $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tüüp  Kust/Kuhu  Staatus Suurus  Posits. Fail         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tVõtsin vastu vigase DCC päringu kasutajalt: %C26$1%O.%010%C22*%O$tPaketi sisu: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tPakun kasutajale%C26 $2%O faili%C26 $1"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTundmatu DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O kasutajale%C26 $1%O katkestatud."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O kasutajalt%C26 $3%O lõpetatud %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV ühendus loodud kasutajaga%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O kasutajalt%C26 $3%O nurjus ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Ei suuda avada faili $1 kirjutamiseks ($2) - katkestan."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tFail%C26 $1%C on juba olemas. Salvestan nimega%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Osoovib jätkata faili%C26 $2 %Ctõmbamist kohalt%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O kasutajale%C26 $1%O katkestatud."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O kasutajale%C26 $2%O lõpetatud %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND ühendus loodud kasutajaga%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O kasutajale%C26 $2%O nurjus. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Opakkus%C26 $2 %O(%C26$3 %Obaiti)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Okasutajale%C26 $3 %Cviibis - katkestan."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Okasutajale%C26 $3 %Caegus - katkestan."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 kustutatud märguande nimekirjast."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tÜhendus katkestatud ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tLeidsin su IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O lisatud ignoreeritavate nimekirja."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignoreerimine muudetud: %C26$1%O"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O eemaldatud ignoreeritavate nimekirjast."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "   Ignonreeritavate nimekiri on tühi."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tEi saa liituda kanaliga%C26 %B$1 %O(liitumine ainult kutsetega)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C11$2%C kutsus sind kanalisse %C11$1%C (%C11$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) liitus kanaliga $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tEi saa liituda kanaliga%C26 %B$1 %O(kanal nõuab salasõna)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 viskas kasutaja $2 välja kanalist $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t$1 ($2%O%C22) tappis su."
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD vahele jäetud."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 on juba kasutuses. Proovin nime $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tSinu hüüdnimi on juba kasutuses. Proovi teist nime käsuga /NICK."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTundmatu DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tPraegul ei tööta ükski protsess"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tMärguandenimekiri on tühi."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Märguandenimekiri           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 kasutajat märguandenimekirjas."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tMärguanne: $1 ei ole enam online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tMärguanne: $1 on online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) lahkus kanalist $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) lahkus kanalist $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPingi vastus kasutajalt $1: $2 sekund(it)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tPingile pole $1 sekundi jooksul vastatud, katkestan ühenduse."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 lahkus (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 määrab %B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Ühendatud."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Lahendan hosti $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tKatkestasin eelmise ühendamiskatse (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Kanali $1%C %C29teema on: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 seadis kanalile uue teema: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Kanali $1%C %C29teema määras $3 kasutaja $2"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tTundmatu server. Kontrolli kas kirjutasid serveri nime õigesti."
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tEi saa liituda kanaliga%C26 %B$1 %O(Kasutajalimiit saavutatud)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Kasutajad kanalis $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Con eemal %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OWHOIS nimekirja lõpp."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O jõude%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O jõude%C26 $2%O, liitus:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Vestled nüüd kanalis $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3 viskas sind välja kanalist $2 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tSa lahkusid kanalist $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tSa lahkusid kanalist $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tSa kutsusid%C26 $1%O kanalisse%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tSa kannad nüüd nime $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1715,27 +1727,27 @@ msgid ""
 "%s"
 msgstr "Helifaili lugemine nurjus:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Kaugmasin katkestas ühenduse"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Ühendusest keelduti"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ei leia teed hostini"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Ühendus aegus"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Ei saa määrata seda aadressi"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Peer katkestas ühenduse"
 
@@ -2877,13 +2889,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Multiplatvormne IRC klient"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/eu.po b/po/eu.po
index c8b593dd..08414488 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/hexchat/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Lanpetuta nabil"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Irteten"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Ezin da %s-ra sartu\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Errorea"
 
@@ -750,7 +750,7 @@ msgstr "Proxy trasbersalak huts egin du.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Hurrengo zerbitzarira %s-n ziklatzen...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr "Oharra: \"%s\" karaktere-jokoa ezezaguna da. Ez da konbertsiorik aplikatu %s sarearentzat."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%O%C11$1%O notifikazio zerrendara gehitua."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Debekatu zerrenda:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 orain $2 bezala ezaguna"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr "%UKanala          Erabiltzaileak   Gaia"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1-k gonbidapena kentzen dio $2(r)i"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1-k debekua kentzen dio honi $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Konektatua. Orain saioa hasten..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Hona konektatzen $1 ($2) ataka $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Konexioak huts egin du. Errorea: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O honengandik%C26 $3%O huts egin du ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%O%C11$1%O notifikazio zerrendatik kendua."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDeskonektatua ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tZure IPa aurkitu da: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ezikusien zerrendara gehitua."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr " %C26$1%O -ri ignoraketa egoera aldatu da."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 ostalariaren maskara          PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C11$1%O notifikazio zerrendatik kendua."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Ezikuzien zerrenda hutsik dago."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) gehitu da $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 -(e)k $2 kaleratu du hemendik $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tHonek hil zaitu $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD saltatua."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 une hontan erabilia. $2-(r)ekin saiatzen..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr "$tNotifikazio zerrenda hutsik dago."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Konektatua."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1-k gaia honakora aldatu du: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Orain hemen hitz egiten $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tHau gonbidatu duzu%C26 $1%O hona%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Ezin da soinu fitxategia irakurri:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Ostalari urrunak socket-a itxi du"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Konexio ukatua"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ez dago biderik ostalariraino"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Konexioa denboraz kanpo"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Ezin da helbide hori eman"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Konexioa bikoteak berrezarria"
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Plataforma anitzentzat IRC bezeroa"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/fi.po b/po/fi.po
index 51b4dd7a..8fdce93b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Olen kiireinen"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Lähdössä"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Tiedostoa %s ei voi käyttää\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Virhe"
 
@@ -749,7 +749,7 @@ msgstr "Välipalvelimen kauttakulku epäonnistui.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Siirrytään seuraavalle %s-verkon palvelimelle...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "Varoitus: merkistö \"%s\" on tuntematon. Verkossa %s ei käytetä mitään muunnosta."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 lisättiin ilmoitusluetteloon."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Banniluettelo: %C19$4 %C20$2 %C21$3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tEi voi liittyä kanavalle %C26%B$1%O (sinut on bannattu)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t%C26$1%O tunnetaan nyt nimellä %C26$2%O."
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 asettaa bannin $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanava $1 luotu $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O poistaa puolioperaattorin oikeudet käyttäjältä %C26$2%O."
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O poistaa kanavaoperaattorin oikeudet käyttäjältä %C26$2%O."
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O poistaa puheoikeuden käyttäjältä %C26$2%O."
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 asettaa erivapauden $2."
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O antaa puolioperaattorin oikeudet käyttäjälle %C26$2%O."
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t%C26$1%O asettaa kutsun käyttäjälle %C26$2%O."
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanava           Käyttäjät Aihe%O"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t%C26$1%O asettaa tilan $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanavan $1 tilat: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O antaa kanavaoperaattorin oikeudet käyttäjälle %C26$2%O."
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t%C26$1%O poistaa erivapauden $2."
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t%C26$1%O poistaa kutsun $2."
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t%C26$1%O poistaa kanavan tunnussanan."
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t%C26$1%O poistaa käyttäjärajan."
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t%C26$1%O asettaa kanavan tunnussanaksi %C26$2%O."
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t%C26$1%O asettaa kanavan käyttäjärajaksi $2."
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t%C26$1%O poistaa bannin $2."
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O antaa puheoikeuden käyttäjälle %C26$2%O."
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Yhdistetty. Kirjaudutaan sisään..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Yhdistetään palvelimelle $1 ($2) porttiin $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Yhdistäminen epäonnistui. Virhe: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tVastaanotettiin CTCP $1 käyttäjältä $2."
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tVastaanotettiin CTCP $1 käyttäjältä $2 (kanavalle $3)."
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tVastaanotettiin CTCP-ääni $1 käyttäjältä $2."
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tVastaanotettiin CTCP-ääni $1 käyttäjältä $2 (kanavalle $3)."
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC-keskustelu käyttäjän %C26$1%O kanssa keskeytetty."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC-keskustelu avattu käyttäjän %C26$1%O kanssa. %C14[%O$2%C14]%O"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC-keskustelu käyttäjän %C26$1%O kanssa katkesi. ($4.)"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tKäyttäjä %C26$1%O ehdottaa DCC-keskustelua."
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tEhdotetaan DCC-keskustelua käyttäjälle %C26$1%O."
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tDCC-keskustelua on jo ehdotettu käyttäjälle %C26$1%O."
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 -yhteyttä ei saatu käyttäjään %C26$2%O (virhe=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tVastaanotettiin \"$1%O\" käyttäjältä %C26$2%O."
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18Tyyppi Vastapää   Tila    Koko    Paikka  Tiedosto     "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tKäyttäjä %C26$1%O lähetti epäkelvon DCC-pyynnön.%010%C22*%O$tPaketin sisältö: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tTarjotaan tiedostoa %C26$1%O käyttäjälle %C26$2%O."
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTuollaista DCC-lähetystä ei ole tarjottu."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV %C26$2%O käyttäjältä %C26$1%O keskeytetty."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV %C26$1%O käyttäjältä %C26$3%O valmis %C30[%C26$4%O t/s%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV -yhteys muodostettu käyttäjään %C26$1 %C30[%O$2%C30]%O."
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV %C26$1%O käyttäjältä %C26$3%O epäonnistui. ($4.)"
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Tiedostoon %C26$1%O ei voi kirjoittaa ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tTiedosto %C26$1%O on jo olemassa, joten tallenetaan nimellä %C26$2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1%O pyytää jatkamaan tiedoston %C26$2%O siirtoa kohdasta %C26$3%O."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND %C26$2%O käyttäjälle %C26$1%O keskeytetty."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND %C26$1%O käyttäjälle %C26$2%O valmis %C30[%C26$3%O t/s%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND -yhteys muodostettu käyttäjään %C26$1 %C30[%O$2%C30]%O."
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND %C26$1%O käyttäjälle %C26$2%O epäonnistui. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1%O tarjoaa tiedostoa %C26$2%O (%C26$3%O tavua)."
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1 %C26$2%O käyttäjälle %C26$3%O pysähtynyt - keskeytetään."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1 %C26$2%O käyttäjälle %C26$3%O aikakatkaistu - keskeytetään."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 poistettu ilmoitusluettelosta."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tYhteys katkaistu ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tOma IP löytyi: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O lisätty huomioimattomuusluetteloon."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Huomioimattomuutta %C26$1%O muutettu."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,28                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Isännän peite             PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O poistettu huomioimattomuusluettelosta."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Huomioimattomuusluettelo on tyhjä."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tKanavalle %C26%B$1%O ei voi liittyä (vain kutsutuille)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C26$2%O kutsuu sinut kanavalle %C26$1%O (%C26$3%O)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1%B ($3) liittyi kanavalle $2."
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tKanavalle %C26%B$1%O ei voi liittyä (vaatii tunnussanan)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 potkaisi käyttäjän $2 kanavalta $3 ($4%O%C21)."
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t$1 ($2%O) tappoi sinut."
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD ohitettu."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 on jo käytössä. Kokeillaan kutsumanimeä $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tKutsumanimi on jo käytössä. Kokeile jotain muuta komennolla /NICK."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTuollaista DCC:tä ei ole."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tProsesseja ei ole käynnissä."
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tIlmoitusluettelo on tyhjä."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Ilmoitusluettelo                      "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$tIlmoitusluettelossa on $1 käyttäjä(ä)."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tIlmoitus: $1 on tavoittamattomissa ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tIlmoitus: $1 on tavoitettavissa ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 ($2) poistui kanavalta $3."
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1%O%C23 ($2) poistui kanavalta $3%O%C23 (%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing-vastaus käyttäjältä $1: $2 sekunti(a)."
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tPingiin ei ole vastattu $1 sekuntiin, katkaistaan yhteys."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tProsessi on jo käynnissä."
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 lopetti ($2%O%C23)."
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 asettaa tilat %B%C30[%O$2%B%C30]."
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tEtsitään IP-osoitetta nimelle %C26$1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$tYhdistetty."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$tEtsitään osoitetta %C26$1%C..."
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tPysäytettiin edellinen yhteysyritys (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Kanavan $1%C %C29aihe on: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 vaihtoi aiheeksi: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Aiheen kanavalle $1%C %C29on asettanut $2%C %C29$3."
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tTuntematon isäntä. Onkohan se kirjoitettu väärin?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tKanavalle %C26%B$1%O ei voi liittyä (Käyttäjäraja saavutettu)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Käyttäjät kanavalla $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2 %C27$3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28]%C on poissa %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28]%O WHOIS-luettelon loppu."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O jouten %C26$2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O jouten %C26$2%O, kirjautunut: %C26$3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O todellinen käyttäjä@isäntä %C27$2%O, todellinen IP %C27$3."
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Puhut nyt kanavalla $2."
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3 potkaisi sinut kanavalta $2 ($4%O%C23)."
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tPoistuit kanavalta $3."
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tPoistuit kanavalta $3%O%C23 ($4%O%C23)."
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tKutsut käyttäjää %C26$1%O kanavalle %C26$2%O (%C26$3%O)."
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tKutsumanimesi on nyt $2."
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Äänitiedostoa ei voi lukea:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Vastapää sulki pistokkeen"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Yhteys torjuttu"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ei reititystä isäntään"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistu"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Osoitetta ei voi asettaa"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Vastapää katkaisi yhteyden"
 
@@ -2875,13 +2887,13 @@ msgstr "Istuntoväylään ei saatu yhteyttä: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Virhe palvelussa %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Usealla alustalla toimiva IRC-asiakasohjelma"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/fr.po b/po/fr.po
index 2bd1d726..88fbb60b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/hexchat/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Je suis occupé"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Quitte"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Impossible d'accéder à %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Erreur"
 
@@ -750,7 +750,7 @@ msgstr "La traversée du serveur mandataire (proxy) a échoué.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Passage au serveur suivant dans %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Attention : le jeu de caractères « %s » est inconnu. Aucune conversion ne sera effectuée pour le réseau %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 a été ajouté à la liste de notification."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Liste de bannissement : %C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tImpossible de rejoindre%C26 %B$1 %O(Vous êtes banni)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 s'appelle maintenant $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 met un ban sur $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanal $1 créé le $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%Oi enlève son état de demi-opérateur « half-operator » de canal à%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O enlève son état d'opérateur de canal à%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O enlève la parole à%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$t définit « l'exempt » sur $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O donne l'état de demi-opérateur à%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 définit l'invite sur $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCanal          Utilisateurs   Sujet"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 active le mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Modes du canal $1 : $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O donne l'état d'opérateur de canal à%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 supprime l'exempt sur $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 supprime l'invite sur $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 enlève le mot-clé du canal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 enlève la limite d'utilisateurs"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 définit le mot-clé du canal à $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 définit la limite du canal à $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 supprime l'état de bannissement de $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O donne la parole à%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Connecté. Identification en cours..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Connexion à $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21La connexion a échoué. Erreur : $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tUn CTCP $1 de $2 a été reçu"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tUn CTCP $1 de $2 (pour $3) a été reçu"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tUn son CTCP $1 a été reçu de $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tUn son CTCP $1 de $2 (pour $3) a été reçu"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT à %C26$1%O interrompu."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConnexion DCC CHAT établie à %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tPerte du DCC CHAT avec %C26$1%O ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tRéception d'une offre de DCC CHAT de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tProposition de DCC CHAT à $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tUn CHAT est déjà proposé à $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 tentative de connexion à%C26 $2%O échouée (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t« $1%O » reçu de $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Type  À/De       État    Taille  Pos     Fichier         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tReçu une requête DCC mal formée de %C26$1%O.%010%C22*%O$tContenu du paquet : $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tProposition de%C26 $1%O à%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tPas d'offre DCC correspondante."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O vers%C26 $1%O interrompu."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O de%C26 $3%O terminé %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV connexion établie avec%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O de%C26 $3%O échoué ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV : ouverture de $1 en écriture impossible ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tLe fichier%C26 $1%C existe déjà, enregistré sous%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oa demandé à reprendre%C26 $2 %Cdepuis%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O vers%C26 $1%O interrompu."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O à%C26 $2%O terminé %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND connexion établie vers%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O vers%C26 $2%O échoué. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oa proposé%C26 $2 %O(%C26$3 %Ooctets)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oà%C26 $3 %Cfigé - abandon."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oà%C26 $3 %Odélai dépassé - abandon."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 supprimé de la liste de notification."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDéconnecté ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tVotre IP a été trouvée : [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ajouté à la liste d'exclusion."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Exclusion sur %C26$1%O modifiée."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Masque d'hôte             PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O enlevé de la liste d'exclusion."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  La liste d'ignorance est vide."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNe peut rejoindre%C26 %B$1 %O(Canal en invite seulement)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tVous êtes invité sur%C26 $1%O par%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) a rejoint $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNe peut rejoindre%C26 %B$1 %O(Requiert le mot-clé)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 a expulsé $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tVous avez été tué par $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD sauté."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 est déjà utilisé. Réessai avec $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tPseudonyme déjà utilisé. Utilisez /NICK pour en essayer un autre."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tAucun DCC correspondant."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tAucun processus ne tourne actuellement"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLa liste de notification est vide."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Liste de notification                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 utilisateurs dans la liste de notification."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotify: $1 est hors-ligne ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotify: $1 est en ligne ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) a quitté $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) a quitté $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tRéponse de $1 à la requête ping : $2 seconde(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tAucune réponse à la requête ping depuis $1 secondes, déconnexion."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tUn processus tourne déjà"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 est parti (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 définit les modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tRecherche de l'adresse IP de%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Connecté."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Recherche de $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tArrêt de la tentative de connexion précédente (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Le sujet de $1%C %C29est : $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 a changé le sujet en : $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Sujet de $1%C %C29défini par $2%C %C29le $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tHôte inconnu. Peut-être avez vous fait une faute de frappe ?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tImpossible de rejoindre%C26 %B$1 %O(limite d'utilisateurs atteinte)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Utilisateurs sur $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cest absent %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFin de la liste WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactif %C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactif %C26 $2%O, ouverture de session :%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Outilisateur réel@hôte%C27 $2%O, IP réelle%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Vous parlez maintenant sur $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tVous avez été expulsé de $2 par $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tVous avez quitté le canal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tVous avez quitté le canal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tVous avez invité%C26 $1%O à%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tVous vous appelez maintenant $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Impossible de lire le fichier audio :\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "L'hôte distant a fermé la socket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Connexion refusée"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Pas de route vers l'hôte"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Expiration du délai de connexion"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Ne peut assigner cette adresse"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Connexion réinitialisée à l'autre extrémité"
 
@@ -2876,13 +2888,13 @@ msgstr "Impossible de se connecter au bus: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Échec de l'acquisition de %s : %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "À propos "
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Client IRC multiplateformes"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/gl.po b/po/gl.po
index a81b0a27..3c3ba71b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Estou ocupado"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Abandonando"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Non se pode acceder a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Erro"
 
@@ -749,7 +749,7 @@ msgstr "Fallou o proxy traversal.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Ciclando ao seguinte servidor en %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "Aviso: O conxunto de caracteres \"%s\" é descoñecido. Non se aplicará conversión para a rede %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 engadido á lista de notificacións."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Lista de vetados:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNon se pode entrar%C26 %B$1 %O(Está vetado)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 é agora coñecido como $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 veta a $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanle $1 creada en $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita o estado de semi-operador da canle a %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita o estado de operador da canle a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O quita voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 establece a $2 como exento"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da estado de semi-operador da canle a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 invita a $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCanle          Usuarios   Tópico"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 establece modo $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Canle $1 modos: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O da estado de operador de canle a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 quita a exención a $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 quieta a invitación a $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 quita a palabra clave da canle"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 quita o límite de usuarios"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 establece palabra clave da canle como $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 establece límite da canle a $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 quita o veto a $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dalle voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Conectado. Agora rexistrándose..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Conectando a $1 ($2) porto $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Conexión fallida. Erro: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tRecibiuse un CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecibiuse un CTCP $1 de $2 (a $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tRecibiuse un son CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecibiuse un son CTCP $1 de $2 (a $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT a %C26$1%O abortada."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para CHAT DCC establecida con %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tCHAT DCC a %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tRecibiuse unha oferta de CHAT DCC de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tOfrecendo CHAT DCC a $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tXa está ofrecendo un CHAT a $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tO intento de conexión DCC $1 con%C26 $2%O fallou (erro=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tRecibiu '$1%O' de $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipo  A/De    Estado  Tamaño    Pos     Ficheiro         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tRecibiu unha petición DCC errónea de %C26$1%O.%010%C22*%O$tContidos do paquete: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tOfrece%C26 $1%O a%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNon existe tal ofrecemento DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tRecepción DCC%C26 $2%O para%C26 $1%O abortado."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tRecepción DCC%C26 $1%O de%C26 $3%O completada %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para recepción DCC establecida con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tRecepción DCC%C26 $1%O de%C26 $3%O fallou ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tRecepción DCC: Non se pode abrir $1 para escritura ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tO ficheiro%C26 $1%C xa existe, gardándoo como%C26 $2%O no seu lugar."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Opuido retomar%C26 $2 %Cde%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tEnvío DCC%C26 $2%O a%C26 $1%O abortado."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tEnvío DCC%C26 $1%O a%C26 $2%O completado %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConexión para envío DCC establecida con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tO envío DCC%C26 $1%O a%C26 $2%O fallou. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oofreceu%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oa%C26 $3 %Cparouse - abortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opara%C26 $3 %Oagotou o tempo de espera - abortando."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 borrado da lista de notificacións."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDesconectado ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tAtopouse súa IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O engadido á lista de ignorados."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorar a %C26$1%O cambiou."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Máscara                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O quitouse da lista de ignorados."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  A lista de ignorados está baleira."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNon pode entrar%C26 %B$1 %O(Canle só para invitados)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tFoi invitado a%C26 $1%O por%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) entrou en $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNon pode entrar%C26 %B$1 %O(Requírese contrasinal)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 botou fora a $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tFoi eliminado por  $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22Saltou a mensaxe do día (MOTD)."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 xa está en uso. Reintentando con $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tO alcume xa está en uso. Use /NICK para tentalo con outro."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNon existe ese DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNon hai ningún proceso en execución actualmente"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tA lista de notificacións está baleira."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Lista de notificacións                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 usuarios na lista de notificacións."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotificación: $1 está desconectado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotificación: $1 está conectado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) abandonou $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) abandonou $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tResposta ao ping de $1: $2 segundo(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNon houbo resposta ao ping en $1 seconds, desconectando."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tXa hai un proceso en execución"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 marchouse (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 establece modos%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Mensaxes dos operadores%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tBuscando número de IP para%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Conectado."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Buscando $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tDeteuse o anterior intento de conexión (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29O tópico para $1%C %C29é: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 cambiou o tópico a: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Tópico para $1%C %C29establecido por $2%C %C29en $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tEquipo descoñecido. Equivocouse?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNon pode entrar%C26 %B$1 %O(Chegouse ao límite de usuarios)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Usuarios en $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cestá ausente %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFin da lista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2%O, entrou:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Overdadeiro usuario@equipo%C27 $2%O, verdadeira IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Falando agora a $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tBotouselle de $2 por $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tAbandonou a canle $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tAbandonaste a canle $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tEstá invitado%C26 $1%O a%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tEres coñecido agora como $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Non se pode ler o ficheiro de son:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Porto pechado no equipo remoto"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Conexión rechazada"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Non hai ruta hacia o equipo"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Tempo de espera da conexión agotado"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Non se pode asignar ese enderezo"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Conexión reiniciada polo par"
 
@@ -2875,13 +2887,13 @@ msgstr "Non se puido conectar ao bus de sesión: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Fallou ao adquirir %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Un cliente de IRC multiplataforma"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/gu.po b/po/gu.po
index 307541f3..7411386b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "હું વ્યસ્ત છું"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "છોડી રહ્યા છીએ"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "%s વાપરી શકતા નથી\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "ભૂલ"
 
@@ -749,7 +749,7 @@ msgstr "પ્રોક્સી પરિવહન નિષ્ફળ.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "%s માં આગળના સર્વર સુધી ફેરવી રહ્યા છીએ...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "ચેતવણી: \"%s\" અક્ષર સમૂહ અજ્ઞાત છે. નેટવર્ક %s માટે કોઈ રૂપાંતરણ લાગુ પડશે નહિં."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 એ સૂચન યાદીમાં ઉમેરાઈ ગયું."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 બેનયાદી:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tજોડાઈ શકાતા નથી%C26 %B$1 %O(તમે બેન થયેલ છો)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 એ $2 તરીકે ઓળખાય છે"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 એ $2 પર બેન સુયોજિત કર્યું છે"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tચેનલ $1 એ $2 પર બનેલી છે"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 માંથી અડધી-કારક ચેનલ સ્થિતિ દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 માંથી ચેનલ ચાલક સ્થિતિ દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 માંથી અવાજ દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 એ $2 પર એક્ઝેમ્પ્ટ સુયોજિત કરે છે"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 ને અડધી-કારક ચેનલ સ્થિતિ આપે છે"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 એ $2 પર આમંત્રણ સુયોજિત કરે છે"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%Uચેનલ          વપરાશકર્તાઓ   મુદ્દો"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 એ સ્થિતિ $2$3 $4 સુયોજિત કરે છે"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22ચેનલ $1 સ્થિતિ: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 ને ચેનલ ચાલક સ્થિતિ આપે છે"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 એ $2 પરથી એક્ઝેમ્પ્ટ દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 એ $2 પરથી આમંત્રણ દૂર કરે છે"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 એ ચેનલ મુખ્ય શબ્દ દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 વપરાશકર્તા મર્યાદા દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 એ $2 માટે ચેનલ મુખ્ય શબ્દ સુયોજિત કરે છે"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 એ $2 માટે ચેનલ મર્યાદા સુયોજિત કરે છે"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 એ $2 પરથી બેન દૂર કરે છે"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O એ %C26 $2 ને અવાજ આપે છે"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22 જોડાયેલ છે. હવે પ્રવેશી રહ્યા છીએ..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22 એ $1 ($2) પોર્ટ $3%O સાથે જોડાઈ રહ્યા છીએ..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21જોડાણ નિષ્ફળ. ભૂલ: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$t એ CTCP $1 ને $2 માંથી મેળવ્યું"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$t એ CTCP $1 ને $2 માંથી ($3 માટે) મેળવ્યું"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$t એ CTCP ધ્વનિ $1 ને $2 માંથી મેળવ્યો"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$t CTCP ધ્વનિ $1 ને $2 માંથી મેળવ્યો ($3 પ્રતિ)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT એ %C26$1%O અડધેથી બંધ થઈ ગઈ."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT જોડાણ %C26$1 %C30[%O$2%C30] માટે અધિષ્ઠાપિત થઈ ગયું"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT એ %C26$1%O ગુમ થયેલ ($4) પ્રતિ."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t DCC CHAT તક $1 માંથી મળી"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t $1 ને DCC CHAT તક આપી રહ્યા છીએ"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t $1 ને પહેલાથી જ CHAT ની તક આપી રહ્યા છીએ"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 નું %C26 $2%O સાથેનું જોડાણ નિષ્ફળ (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t $2 માંથી '$1%O' મેળવી રહ્યા છીએ"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 પ્રકાર  પ્રતિ/તરફથી    સ્થિતિ  માપ    સ્થાન     ફાઈલ         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$t %C26$1%O માંથી મલીન DCC અરજી મેળવી.%010%C22*%O$tપેકેટના સમાવિષ્ટો: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$t %C26 $2 ને %C26 $1%O ની તક આપી રહ્યા છીએ"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tઆવી કોઈ DCC તક નથી."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O એ %C26 $1%O પ્રતિ અડધેથી બંધ થઈ ગયું."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O એ %C26 $3%O તરફથી %C30[%C26$4%O cps%C30]%O પૂર્ણ કર્યું."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV %C26 $1 %C30[%O$2%C30] પ્રતિ જોડાણ અધિષ્ઠાપિત થઈ ગયું"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O એ %C26 $3%O માંથી નિષ્ફળ ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: લખવા માટે $1 ખોલી શકતા નથી ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$t ફાઈલ %C26 $1%C પહેલાથી જ હાજર છે, તેની જગ્યાએ તેને %C26 $2%O રીતે સંગ્રહી રહ્યા છીએ."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %O એ %C26 $2 %C ને %C26 $3%C માંથી અટકાવવા માટે અરજી કરી છે."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O એ %C26 $1%O પ્રતિ અડધેથી બંધ થઈ ગઈ."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O એ %C26 $2%O પ્રતિ %C30[%C26$3%O cps%C30]%O સમાપ્ત."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND જોડાણ %C26 $1 %C30[%O$2%C30] પ્રતિ અધિષ્ઠાપિત થયું"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O ને %C26 $2%O પ્રતિ નિષ્ફળ. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %O એ %C26 $2 %O(%C26$3 %O બાઈટો) ની તક આપી છે"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O એ %C26 $3 %C પ્રતિ અટકાવી રાખ્યું છે - અડધેથી બંધ થયેલ છે."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O નો %C26 $3 %O પ્રતિ સમય સમાપ્ત - અડધેથી બંધ કરી રહ્યા છીએ."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 એ સૂચન યાદીમાંથી કાઢી નંખાયેલ છે."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t જોડાણ તૂટી ગયેલ છે ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$t તમારું IP મળ્યું: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O એ અવગણવાની યાદીમાં ઉમેરાઈ ગયું."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O પર બદલાયેલ અવગણો."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 યજમાનમાસ્ક                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O એ અવગણો યાદીમાંથી દૂર થઈ ગયેલ છે."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  અવગણો યાદી ખાલી છે."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t %C26 %B$1 %O(ચેનલ એ માત્ર આમંત્રિત સ્થિતિમાં જ છે) માં જોડાઈ શકતા નથી."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t તમે %C26 $1%O by%C26 $2%C (%C26$3%C) માં આમંત્રિત થયા છો"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) એ $2 માં જોડાયા"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t %C26 %B$1 %O(મુખ્ય શબ્દ જરૂરી છે) માં જોડાઈ શકતા નથી."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 એ $2 ને $3 ($4%O%C21) માંથી કિક કર્યું છે"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t તમે $1 ($2%O%C22) દ્વારા મારી નંખાયેલ છો"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD રદ થયેલ છે."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 પહેલાથી જ વપરાશમાં છે. $2 સાથે પુનઃપ્રયાસ કરી રહ્યા છીએ..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$t નામ પહેલાથી જ વપરાશમાં છે. બીજું વાપરવા માટે /NICK વાપરો."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$t આવું કોઈ DCC નથી."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$t વર્તમાનમાં કોઈ પ્રક્રિયા ચાલી રહી નથી"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$t સૂચન યાદી ખાલી છે."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  સૂચન યાદી                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 વપરાશકર્તાઓ સૂચન યાદીમાં."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) એ $3 છોડી મૂક્યું છે"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) એ $3 છોડી મૂકી (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing પ્રત્યુત્તર $1 તરફથી: $2 સેકન્ડ(ો)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t કોઈ ping પ્રત્યુત્તર $1 સેકન્ડો માટે નથી, જોડાણ તોડી રહ્યા છીએ."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$t એક પ્રક્રિયા પહેલાથી ચાલી રહેલ છે"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 એ (%O%C23%B%B$2%O%C23) માંથી બહાર નીકળી ગયા"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 એ %B %C30[%O$2%B%C30] સ્થિતિઓ સુયોજિત કરી"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$t IP નંબર માટે %C26 $1%O માટે જોઈ રહ્યા છીએ..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22 જોડાઈ ગયા."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22 $1 જોઈ રહ્યા છીએ"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$t પહેલાંના જોડાણ અટકાવાયેલ છે (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29 $1%C %C29 માટેનો મુદ્દો છે: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 એ મુદ્દાને આમાં બદલ્યો: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29 $1%C %C29 માટેનો મુદ્દો $2%C %C29 દ્વારા $3 આગળ સુયોજિત થયેલ છે"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$t અજ્ઞાત યજમાન. કદાચ તમે તેની જોડણી ખોટી લખી હશે?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t %C26 %B$1 %O (વપરાશકર્તા મર્યાદાએ પહોંચી ગયો) માં જોડાઈ શકતા નથી."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26 $1 પરના વપરાશકર્તાઓ:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C એ દૂર છે %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %O WHOIS યાદીનો અંત."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ફાજલ %C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ફાજલ %C26 $2%O, પ્રવેશ કરો:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19 હવે $2 પર વાત કરી રહ્યા છો"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t તમે $2 માંથી $3 ($4%O%C23) દ્વારા કિક થઈ ગયેલ છો"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$t તમે ચેનલ $3 છોડી દીધી છે"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tતમે ચેનલ $3 છોડી મૂકી છે (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$t તમે %C26 $1%O to%C26 $2%O (%C26$3%O) ને આમંત્રિત કર્યો છે"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$t તમે હવે $2 તરીકે ઓળખીતા છો"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "સાઉન્ડ ફાઈલ વાંચી શકતા નથી:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "દૂરસ્થ યજમાને સોકેટ બંધ કરેલ છે"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "જોડાણ તૂટી ગયું"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "યજમાનનો કોઈ રુટ નથી"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "જોડાણ સમય સમાપ્તિ"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "તે સરનામું સોંપી શકતા નથી"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "પીયર દ્વારા જોડાણ પુનઃસુયોજિત થયેલ છે"
 
@@ -2875,13 +2887,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "મલ્ટીપ્લેટફોર્મ IRC ક્લાઈન્ટ"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/hi.po b/po/hi.po
index f53f3d94..aeab5be9 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "मैं व्यस्त हूँ"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "छोड़ रहा है"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "%s का अभिगम नहीं कर सकता\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "त्रुटि"
 
@@ -750,7 +750,7 @@ msgstr "प्रॉक्सी लेनदेन विफल.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "%s में अगला सर्वर में चक्रीय कर रहा है...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "चेतावनी: \"%s\" संप्रतीक सेट अज्ञात है. %s संजाल के लिये कोई वार्तालाप लागू नहीं होगी."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 सूची को सूचित करने के लिये जोड़ा गया"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 प्रतिबंध सूची:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t %C26 %B$1 %O से जुड़ नहीं सकता है (आप पर प्रतिबंध हैं)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 अब $2 के रूप में जाना जाता है"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 $2 पर प्रतिबंध सेट करता है"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tचैनल $1 $2 पर बनाया गया"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O आधा चैनल ऑपरेटर स्थिति %C26 $2 से हटाता है"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O चैनल ऑपरेटर स्थिति %C26 $2 से हटाता है"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ध्वनि%C26 $2 से हटाता है"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O आधा चैनल ऑपरेटर स्थिति%C26 $2 को देता है"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 $2 पर आमंत्रण सेट करता है"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UChannel          उपयोक्ता    विषय"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 $2$3 $4 मोड सेट करता है"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22चैनल $1 मोड: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O चैनल ऑपरेटर स्थिति %C26 $2 को देता है"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 $2 पर आमंत्रण हटाता है"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 चैनल कुंजी पटल हटाता है"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 उपयोक्ता सीमा हटाता है"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 $2 में चैनल कुंजीवर्ड सेट करता है"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 $2 में चैनल सीमा सेट करता है"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 $2 पर से प्रतिबंध हटाता है"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O %C26 $2 में ध्वनि देता है"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22संबंधित. अब लॉगिन कर रहा है..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22 $1 ($2) पोर्ट $3%O में संबंधन पा रहा है..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21संबंधन विफल. त्रुटि: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tएक CTCP $1 $2 से प्राप्त करता है"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tएक CTCP $1 $2 (to $3) से प्राप्त करता है"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tएक CTCP ध्वनि $1 $2 से पाता है"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC %C26$1%O में बातचीत विफल रही."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC %C26$1 %C30[%O$2%C30] में चैट संबंधन स्थापित किया"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tएक DCC CHAT प्रस्ताव $1 से प्राप्त करता है"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t $1 को चैट का प्रस्ताव पहले ही भेज चुका है"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$t %C26$1%O से अपरूप DCC आग्रह प्राप्त करता है.%010%C22*%O$tपैकेट की सामग्री: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tऐसा कोई DCC प्रस्ताव नहीं."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O विफल रहा."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV %C26 $1 %C30[%O$2%C30] में संबंधन स्थापित किया"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV:  $1 को ($2) के लिखने के लिये नहीं खोल सकता."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tफाइल%C26 $1%C पहले से मौजूद है, इसे%C26 $2%O रूप में सहेज रहा है."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O विफल."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND संबंधन%C26 $1 %C30[%O$2%C30] से स्थापित"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - विफल कर रहा है."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - विफल कर रहा है."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 को सूचना सूची से विलोपित किया गया."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tविसंबंधित ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tआपका IP पाया: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O अनदेखे सूची में जोड़ा."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O पर अनदेखा बदला गया."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O को हटाया गया अनदेखे सूची से."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  अनदेखा सूची खाली है."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tCannot join%C26 %B$1 %O(चैनल सिर्फ आमंत्रण के लिये है)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tआप इसमें आमंत्रण किये गये हैं%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) $2 में शामिल हुआ/हुई है"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tCannot join%C26 %B$1 %O(कीबोर्ड आवश्यक)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ने $2 को $3 से किक कर दिया है($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tआप इसके द्वारा किल किये गये हैं $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD छोड़ आगे बढा."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 पहले से उपयोग में है. $2 के साथ फिर कोशिस कर रहा है..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tउपनाम पहले से प्रयोग में है. /NICK का प्रयोग दूसरे के लिये कोशिश हेतु करें."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tऐसा कोई DCC नहीं."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tकोई प्रक्रिया अभी चल नहीं रही है"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tसूचना सूची खाली है."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  सूचना सूची                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 सूचना सूची में उपयोक्ता."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ने $3 को छोड़ दिया"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t $1 से पिंग जवाब: $2 सेकेंड"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tकोई पिंग जबाव $1 सेकेंड के लिये नहीं, विसंबंधित हो रहा है."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tA प्रक्रिया पहले से चल रहा है"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 मोड %B %C30[%O$2%B%C30] सेट करता है"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tIP संख्या इसके लिये देख रहा है %C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22 $1 को देख रहा है"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tपहले के संबंधन प्रयास को रोका (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29इसके लिये $1%C %C29टापिक है: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ने टॉपिक बदल दिया है: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29 $1%C %C29 के लिये टॉपिक $2%C %C29 के द्वारा $3 को सेट"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tअनजान मेजबान. शायद आपने इसे वर्तनी अशुद्ध लिख दिया है?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tCannot join%C26 %B$1 %O(उपयोक्ता सीमा समाप्त)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19अब $2 पर बात कर रहे हैं"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tआपको $2 से $3 ($4%O%C23) के द्वारा किक किया गया"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tआपने चैनल छोड़ा है $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tआपने आमंत्रित किया है%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tआप अब $2 के रूप में जाने जायेंगे"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "ध्वनि फाइल नहीं पढ़ सकता है:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "दूरस्थ मेजबान बंद सॉकेट"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "कनेक्शन अस्वीकृत"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "मेजबान में कोई रूट नहीं"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "कनेक्शन टाइम आउट हो गया"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "वह पता नियत नहीं कर सकता है"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "संबंधी द्वारा संबंधन फिर सेट"
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "मल्टीप्लेटफॉर्म IRC क्लाइंट"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/hu.po b/po/hu.po
index ff425299..07b0aee3 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:22+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:45+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Hungarian (http://www.transifex.com/projects/p/hexchat/language/hu/)\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,15 @@ msgstr ""
 "Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Elfoglalt vagyok"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Távozom"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -65,7 +65,7 @@ msgstr "%s nem érhető el\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Hiba"
 
@@ -753,7 +753,7 @@ msgstr "Nem sikerült átjutni a proxyn.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Ugrás a következő kiszolgálóra %s múlva...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -761,474 +761,486 @@ msgid ""
 msgstr "Figyelem: a \"%s\" karakterkészlet ismeretlen. Nem lesz konverzió a(z) %s hálózaton."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 hozzáadva az értesítési listához."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr "%C18*%O$t%C18$1%O az értesítési listához adva."
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Tiltólista:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNem lehet csatlakozni ehhez:%C26 %B$1 %O(Ki van tiltva)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 mostantól $2-ként ismert"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 kitiltja $2-t"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tA(z) $1 csatorna létrehozva ekkor: $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O elvette a fél-operátori státuszt ettől:%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O elvette az operátori státuszt ettől:%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O elvette a voice jogot ettől:%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 kivételt állít be erre: $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O fél-operátor jogot ad ennek:%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 meghívja $2-t"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCsatorna          Felhasználók   Téma"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 beállítja a(z) $2$3 $4 módot"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22 $1 csatorna módjai: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O operátorjogot ad ennek:%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 elveszi a kivételezést erről: $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 visszavonja a meghívást ettől: $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 eltávolítja a csatorna kulcsszót"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 eltávolítja a felhasználói limitet"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 a csatorna kulcsszót beállítja erre: $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 a csatorna limitet beállítja erre: $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 eltávolítja a kitiltást erről: $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O voice jogot ad ennek:%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Kapcsolódás megtörtént. Belépés folyamatban..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Kapcsolódás ehhez: $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Kapcsolódás sikertelen. A hiba: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tCTCP $1 érkezett ettől: $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tCTCP $1 érkezett ettől: $2 ($3 számára)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tCTCP Sound $1 érkezett ettől: $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tCTCP $1 érkezett ettől: $2 ($3 számára)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT megszakadt ezzel:%C26$1%O."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT kapcsolat létrejött ezzel: %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT %C26$1%O felé megszakadt ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tDCC CHAT ajánlat érkezett ettől: $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t $1 DCC CHAT meghívása"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tMár zajlik $1 CHAT meghívása"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 kapcsolódási kísérlet %C26 $2%O felé sikertelen (Hiba=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t\"$1%O\" érkezett ettől: $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Típus  Kinek/Kitől    Állapot  Méret    Pos     Fájl         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tHibás formátumú DCC kérés érkezett ettől: %C26$1%O.%010%C22*%O$tA csomag tartalma: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tFelkínálva ez: %C26 $1%O ennek: %C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNincs ilyen DCC ajánlat."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O megszakítva ehhez: %C26 $1%O."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O ettől: %C26 $3%O befejeződött %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV kapcsolat létrejött ezzel:%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O ettől:%C26 $3%O sikertelen ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Nem lehet megnyitni $1-t írásra ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tA %C26 $1%C fájl már létezik, helyette %C26 $2%O-ként mentem."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Okéri %C26 $2 %C folytatását innen:%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O ennek:%C26 $1%O megszakítva."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O ennek:%C26 $2%O befejeződött %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND kapcsolat létrejött ezzel:%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O %C26 $2%O felé sikertelen. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ofelkínálta ezt:%C26 $2 %O(%C26$3 %Obájt)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oehhez:%C26 $3 %Celakadt - megszakítom."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oehhez:%C26 $3 %O túllépte az időkorlátot - megszakítom."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 törölve az értesítési listáról."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tKapcsolat bontva ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tAz IP címe: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O hozzáadva a mellőzési listához."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O mellőzése megváltoztatva."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Kiszolgálómaszk            PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O eltávolítva a mellőzési listából."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "A figyelmen kívül hagyási lista üres."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNem lehet csatlakozni ehhez: %C26 %B$1 %O(A csatornára csak meghívással lehet belépni)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tMeghívást kapott ide:%C26 $1%O ettől:%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) csatlakozott ide: $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNem lehet csatlakozni ehhez:%C26 %B$1 %O(Kulcsszó szükséges)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 kirúgta $2-t innen: $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t$1 kill-t küldött Önre ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD átugorva."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1-t már használja valaki. Újra próbálom ezzel: $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tEz a becenév már használatban van. A /NICK segítségével próbálhat ki másikat."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNincs ilyen DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tJelenleg nem fut semmilyen folyamat"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tAz értesítési lista üres."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Értesítési lista                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 felhasználó van az értesítési listán."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tÉrtesítés: $1 offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tÉrtesítés: $1 online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) kilépett innen: $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) kilépett innen: $3 (%O%C23$4)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing válasz innen: $1: $2 másodperc"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNincs ping válasz $1 másodperc óta, kapcsolat bontva."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tMár fut egy folyamat"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 kilépett (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 beállítja a módokat %B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallop-ok%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tKeresem a következő IP címét:%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Kapcsolódva."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Keresem ezt: $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tAz előző kapcsolódási kísérlet leállítva(pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29A(z) $1%C %C29 témája ez: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 megváltoztatta a témát erre: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29$1%C %C29 témáját $2%C %C29 beállította ekkor: $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tIsmeretlen gépnév. Talán elgépelte?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNem lehet csatlakozni ehhez:%C26 %B$1 %O(Felhasználói limit elérve)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Felhasználók ezen: $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ctávol van %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OWHOIS lista vége."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O tétlen%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O tétlen%C26 $2%O, bejelentkezett:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ovalós user@host%C27 $2%O, valós IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Most itt beszélget: $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tKi lett rúgva innen: $2, $3 által($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tKilépett a(z) $3 csatornáról"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tKilépett a(z) $3 csatornáról (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tMeghívta %C26 $1%O-t erre: %C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tMostantól ezen a néven ismert: $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1717,27 +1729,27 @@ msgid ""
 "%s"
 msgstr "Nem lehet olvasni ezt a hangfájlt:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "A távoli gép lezárta a foglalatot"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Kapcsolódás elutasítva"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Nincs útvonal a kiszolgálóhoz"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Időtúllépés miatt a kapcsolat megszakadt"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Ezt a címet nem lehet kiosztani"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "A kapcsolatot a túloldali gép visszaállította"
 
@@ -2879,13 +2891,13 @@ msgstr "Nem lehet csatlakozni a munkamenetbuszhoz: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "A(z) %s lekérése nem sikerült: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Névjegy"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Többplatformos IRC-kliens"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/id.po b/po/id.po
index 28a37711..0b9f13f3 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Saya sibuk"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Meninggalkan"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Tak dapat mengakses %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Galat"
 
@@ -750,7 +750,7 @@ msgstr "Transversi proxy gagal.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Daur ke server selanjutnya di %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Peringatan: set karakter \"%s\" tak diketahui. Tak ada konversi yang akan diterapkan untuk jaringan %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 ditambah ke senarai pemberitahuan."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Senarai larang:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tTak dapat bergabung%C26 %B$1 %O(Anda dilarang)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 sekarang dikenal sebagai $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 menerapkan larangan pada $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanal $1 dibuat pada $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O menghapus status setengah operator kanal dari%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O menghapus status operator kanal dari%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O menghapus suara dari%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 mengatur pembebasan pada $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O memberikan status setengah operator kanal ke%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 mengatur undangan pada $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanal          Pengguna   Topik"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 mengatur mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanal $1 mode: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O memberikan status operator kanal ke%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 menghapus pembebasan pada $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 menghapus undangan pada $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 menghapus kata kunci kanal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 menghapus batas pengguna"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 mengatur kata kunci kanal ke $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 mengatur batas kanal ke $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 menghapus larangan pada $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O memberikan suara ke%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Tersambung. Sekarang log masuk..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Menyambung ke $1 ($2) pangkalan $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Koneksi gagal. Galat: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tMenerima CTCP $1 dari $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tMenerima CTCP $1 dari $2 (ke $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tMenerima Suara CTCP $1 dari $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tMenerima Suara CTCP $1 dari $2 (ke $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT ke %C26$1%O dibatalkan."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tKoneksi DCC CHAT tersambung ke %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT ke %C26$1%O hilang ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tMenerima tawaran DCC CHAT dari $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tMenawarkan DCC CHAT ke $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tTelah menawarkan CHAT ke $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tPercobaan sambungan DCC $1 ke%C26 $2%O gagal (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tMenerima '$1%O' dari $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipe  Ke/Dari    Status  Ukuran    Posisi     Berkas         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tMenerima permintaan DCC salah bentuk dari %C26$1%O.%010%C22*%O$tIsi paket: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tMenawarkan%C26 $1%O ke%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTak ada tawaran DCC seperti itu."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O ke%C26 $1%O dibatalkan."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O dari%C26 $3%O selesai %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tKoneksi DCC RECV tersambung ke%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O dari%C26 $3%O gagal ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Tak dapat membuka $1 untuk menulis ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tBerkas%C26 $1%C telah ada, akan menyimpannya sebagai%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Otelah meminta untuk melanjutkan%C26 $2 %Cdari%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O ke%C26 $1%O dibatalkan."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O ke%C26 $2%O selesai %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tKoneksi DCC SEND tersambung ke%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O ke%C26 $2%O gagal. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Otelah menawarkan%C26 $2 %O(%C26$3 %Obita)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oke%C26 $3 %Cberhenti - membatalkan."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oke%C26 $3 %Owaktunya habis - membatalkan."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 dihapus dari senarai pemberitahuan."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tTerputus ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tMenemukan IP anda: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ditambah ke senarai abaikan."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Pengabaian pada %C26$1%O diubah."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Topenghost                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O dihapus dari senarai abaikan."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Senarai abaikan kosong."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tTak dapat bergabung%C26 %B$1 %O(Kanal hanya untuk undangan)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tAnda telah diundang ke%C26 $1%O oleh%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) telah bergabung $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tTak dapat bergabung%C26 %B$1 %O(Memerlukan kata kunci)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 telah ditendang $2 dari $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tAnda telah dimatikan oleh $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Dilewati."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 telah terpakai. Coba dengan $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tNama pengguna telah terpakai. Gunakan /NICK untuk mencoba lainnya."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTak ada DCC seperti itu."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tTak ada proses yang saat ini berjalan"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tSenarai pemberitahuan kosong."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Senarai Pemberitahuan                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 pengguna di senarai pemberitahuan."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tPemberitahuan: $1 terputus ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tPemberitahuan: $1 terhubung ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) telah pergi $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) telah pergi $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tBalasan ping dari $1: $2 detik"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tTak ada balasan ping selama $1 detik, putuskan sambungan."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tProses telah berjalan"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 telah berhenti (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 mengatur mode%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tMencari nomor IP untuk%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Tersambung."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Mencari $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tMenghentikan percobaan koneksi sebelumnya (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Topik untuk $1%C %C29adalah: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 telah mengganti topik ke: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Topik untuk $1%C %C29diatur oleh $2%C %C29pada $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tHost tak diketahui. Mungkin anda salah mengejanya?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tTak dapat bergabung%C26 %B$1 %O(Batas pengguna telah tercapai)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Pengguna di $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Csekarang pergi %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OAkhir dari senarai WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O diam%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O diam%C26 $2%O, masuk pada:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Opengguna asli@host%C27 $2%O, IP asli%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Sekarang berbicara di $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tAnda telah ditendang dari $2 oleh $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tAnda telah meninggalkan kanal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tAnda telah meninggalkan kanal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tAnda telah diundang%C26 $1%O ke%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tSekarang anda dikenal sebagai $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Tak dapat membaca berkas suara:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Host jarang jauh menutup soket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Koneksi ditolak"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Tak ada rute ke host"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Waktu koneksi habis"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Tak dapat menugaskan alamat tersebut"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Koneksi ditata ulang oleh peer"
 
@@ -2876,13 +2888,13 @@ msgstr "Tak dapat menyambung ke bus sesi: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Gagal mendapatkan %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Tentang "
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Klien IRC multiplatform"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/it.po b/po/it.po
index 6db638c3..72ccfe6e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Sono occupato"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Sto andando via"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Impossibile accedere a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Errore"
 
@@ -750,7 +750,7 @@ msgstr "Attraversamento del proxy fallito.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Nuovo tentativo con il server successivo di %s in corso...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Attenzione: il set di caratteri \"%s\" è sconosciuto. Non verrà effettuata alcuna conversione per il network %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 aggiunto alla lista di notifica."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Lista ban:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tImpossibile entrare in%C26 %B$1 %O(Sei bannato)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 è ora conosciuto come $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ha impostato un ban su $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanale $1 creato su $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha tolto lo stato di semi-operatore del canale a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha tolto lo stato di operatore del canale da%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha tolto la parola a%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 ha impostato l'exempt su $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha dato lo stato di semi-operatore del canale a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ha impostato l'invito su $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCanale Utenti Argomento"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ha impostato la modalità $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Canale $1 modalità: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha dato lo stato di operatore del canale a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 ha rimosso l'exempt su $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 ha rimosso l'invito su $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 ha rimosso la parola chiave del canale"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 ha rimosso il limite di utenti"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ha impostato come parola chiave del canale $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ha impostato il limite utenti del canale a $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 ha rimosso il ban da $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ha dato la parola a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Connesso. Login in corso.."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Connessione a $1 ($2) porta $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Connessione fallita. Errore: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tRicevuto un CTCP $1 da $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tRicevuto un CTCP $1 da $2 (per $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tRicevuto un suono CTCP $1 da $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tRicevuto un suono CTCP $1 da $2 (per $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT con %C26$1%O interrotta."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConnessione DCC CHAT stabilita con %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT con %C26$1%O perduta ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tRicevuta una richiesta di CHAT DCC da $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tInvito a una CHAT DCC per $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tInvito alla CHAT per $1 già effettuato"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC Tentativo di connessione DCC $1 a %C26 $2%O fallito (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tRicevuto '$1%O' da $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipo  Per/Da    Stato  Dimensione    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tRicevuta una richiesta DCC mal formata da %C26$1%O.%010%C22*%O$tContenuto del pacchetto: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tOfferta di %C26 $1%O per%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tOfferta DCC inesistente."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV di%C26 $2%O da%C26 $1%O interrotto."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV di%C26 $1%O da%C26 $3%O completato %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConnessione DCC RECV stabilita con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV di%C26 $1%O da%C26 $3%O fallito ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Impossibile aprire $1 in scrittura ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tIl file%C26 $1%C esiste già, verrà salvato come %C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oha richiesto di continuare%C26 $2 %Cda%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O per%C26 $1%O interrotto."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O per%C26 $2%O completato %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND connessione stabilita con%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O con%C26 $2%O fallito. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oha offerto%C26 $2 %O(%C26$3 %Obyte)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oper%C26 $3 %Cbloccato - interruzione in corso."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oper%C26 $3 %Oscaduto - interruzione in corso."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 rimosso dalla lista di notifica."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDisconnesso ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tTrovato il tuo IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O aggiunto alla lista utenti ignorati."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Lo stato degli utenti ignorati su %C26$1%O è cambiato."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O rimosso dalla lista utenti ignorati."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  La lista utenti ignorati è vuota."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tImpossibile entrare in%C26 %B$1 %O(L'accesso al canale è solamente su invito)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tSei stato invitato su%C26 $1%O da%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) è entrato in $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tImpossibile entrare in%C26 %B$1 %O(Richiesta parola chiave)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ha espulso $2 da $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tSei stato ucciso (kill) da $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Saltato."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 è gia in uso. Ritento con $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tNickname già in uso. Utilizza /NICK per sceglierne un altro."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDCC non esistente."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNessun processo attualmente in esecuzione"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLa lista di notifica è vuota."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Lista di notifica                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 utenti nella lista di notifica."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotifica: $1 non è connesso ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotifica: $1 è connesso ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ha abbandonato $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ha abbandonato $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tRisposta al ping da $1: $2 secondi"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNessuna risposta al ping per $1 secondi, disconnessione in corso."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tUn processo è già in esecuzione"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 è uscito (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 ha impostato le modalità%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tRicerca dell'indirizzo IP per%C26 $1%O in corso..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Connesso."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Ricerca di $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tIl tentativo di connessione precedente è stato interrotto (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29L'argomento di $1%C %C29è: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ha scelto come argomento: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Argomento per $1%C %C29impostato da $2%C %C29a $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tHost sconosciuto. Forse è scritto male?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tImpossibile entrare in%C26 %B$1 %O(Raggiunto il limite di utenti)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Utenti in $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cè assente %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFine della lista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inattivo%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inattivo%C26 $2%O, connesso:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oreale user@host%C27 $2%O, reale IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Ora parla su $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tSei stato espulso (kick) da $2 da $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tSei uscito dal canale $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tSei uscito dal canale $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tHai invitato%C26 $1%O in%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tSei ora conosciuto come $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Impossibile leggere il file audio:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "L'host remoto ha chiuso il socket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Connessione rifiutata"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Nessun instradamento per l'host"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Connessione scaduta"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Impossibile assegnare l'indirizzo"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Connessione interrotta dall'host remoto"
 
@@ -2876,13 +2888,13 @@ msgstr "Impossibile collegarsi al bus di sessione: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Fallita acquisizione %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Client IRC multipiattaforma"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/ja.po b/po/ja.po
index c00f1d0f..2564a1a7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "多忙"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "さようなら"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -64,7 +64,7 @@ msgstr "%s へアクセスできません。\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "エラー"
 
@@ -752,7 +752,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -760,51 +760,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 を通知リストへ追加しました。"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 バン一覧:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 は $2 にニックを変更しました。"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 は $2 をバンしました。"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "-%C10-%C11-%O$t$2 にチャンネル $1 が作成されました。"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O は %C26$2 からハーフなるとを剥奪しました。"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O は $2 からなるとを剥奪しました。"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -812,422 +812,434 @@ msgid "%UChannel          Users   Topic"
 msgstr "%Uチャンネル       ユーザー  トピック"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "-%C10-%C11-%O$t$1 はモードを $2$3 $4 に設定しました。"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22$t チャンネル $1 モード: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 は INVITE マスクを削除しました: $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 はチャンネルキーワードを削除しました。"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 はユーザー数制限を削除しました。"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 はチャンネルにキーワード $2 を設定しました。"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 はチャンネルを $2 に制限しました。"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22接続しました。直ちにログインします..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22サーバー $1($2) の、ポート$3 へ接続中%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tCTCP サウンド $1 を $2 から受け取りました。"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$t %C26$1%O との DCC CHAT を失いました ($4)"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t$1 から DCC チャット提案を受け取りました。"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t既に $1 へのチャットは提案しています。"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t$2 から 「$1%O」を受け取りました。"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 種類  To/From    状態    容量    Pos     ファイル       "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$t $2%O から  $1%O への DCC を中断しました。"
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O から %C26 $2%O への送信に失敗しました。 $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O から %C26 $3 %Oタイムアウト - 中断します。"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 通知一覧から削除しました。"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t 接続を切断しました ($1)。"
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$t 自分のIPを見付けました: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O 無視リストへ追加しました。"
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O の無視設定を変更しました。"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 ホストマスク              PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O 無視リストから削除しました。"
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  無視リストの内容が空です。"
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) は $2 へ参加しました。"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22 MOTD を飛ばしました。"
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 は既に使用されています。$2 で再試行します..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$t そのような DCC はありません。"
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$t現在は実行プロセスがありません。"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$t通知リストの内容が空です。"
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  通知一覧                              "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 ユーザーが通知リストにいます。"
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) は $3 から離れました。"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) はチャンネル $3 から離れました(%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t$1 からの Ping 応答 : $2 秒"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tPing 応答が $1 秒間ありません, 切断。"
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tプロセスは既に実行しています。"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 は IRC から離れました (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 はモードを %B %C30[%O$2%B%C30] へ設定しました"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22接続しました。"
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$t不明なホストです。スペルミスしていませんか?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C は離席中です %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %O以上が WhoIs 情報です。"
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O アイドル%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19今 $2 で会話中です。"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$t チャンネル $3 から離れました。"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$t あなたは $2 にニックを変更しました。"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1716,27 +1728,27 @@ msgid ""
 "%s"
 msgstr "サウンドファイルの読み込みができません:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "リモートホストがソケットを閉じました。"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "接続が拒否されました。"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "ホストへの経路がありません。"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "接続時間アウト"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "そのアドレスは予約できません。"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "peerによって接続がリセットされました。"
 
@@ -2878,13 +2890,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr "%s の取得に失敗しました: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "マルチプラットフォーム IRC クライアント"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/kn.po b/po/kn.po
index 37198c0e..921e739c 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: kn\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "ನಾನು ಕಾರ್ಯನಿರತವಾಗಿದ್ದೇನೆ"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "ಹೊರಹೋಗಲಾಗುತ್ತಿದೆ"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "%s ಅನ್ನು ನಿಲುಕಿಸಕೊಳ್ಳಲು ಸಾಧ�
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "ದೋಷ"
 
@@ -750,7 +750,7 @@ msgstr "ಪ್ರಾಕ್ಸಿ ಚಲನೆಯು ವಿಫಲಗೊಂಡಿ�
 msgid "Cycling to next server in %s...\n"
 msgstr "%s ನಲ್ಲಿ ಮುಂದಿನ ಪರಿಚಾರಕಕ್ಕೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತದೆ...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "ಎಚ್ಚರಿಕೆ: \"%s\" ಅಕ್ಷರದ ಸೆಟ್‌ ತಿಳಿದಿಲ್ಲ. %s ಎಂಬ ಜಾಲಬಂಧಕ್ಕೆ ಯಾವುದೆ ಮಾತುಕತೆಯನ್ನು ಅನ್ವಯಿಸಲಾಗಿಲ್ಲ."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 ಅನ್ನು ಸೂಚನೆಯ ಪಟ್ಟಿಗೆ ಸೇರಿಸಲಾಗಿದೆ."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 ನಿಷೇಧ ಪಟ್ಟಿ:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t%C26 %B$1 %O ಅನ್ನು ಸೇರಲು ಸಾಧ್ಯವಿಲ್ಲ(ನಿಮ್ಮನ್ನು ನಿರ್ಬಂಧಿಸಲಾಗಿದೆ)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ಎಂದು ಕರೆಯಲ್ಪಡುತ್ತಾರೆ"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ನಲ್ಲಿ ನಿಶೇಧಿಸಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tಚಾನಲ್ $1 ಅನ್ನು $2 ನಲ್ಲಿ ನಿರ್ಮಿಸಲಾಗಿದೆ"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ರವರು ಚಾನಲ್ ಅರೆ-ಕಾರ್ಯನಿರ್ವಾಹಕ(half-operator) ಸ್ಥಿತಿಯನ್ನು %C26 $2 ಇಂದ ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ರವರು ಚಾನಲ್ ಕಾರ್ಯನಿರ್ವಾಹಕ(half-operator) ಸ್ಥಿತಿಯನ್ನು %C26 $2 ಇಂದ ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ರವರು %C26 $2 ಇಂದ ಧ್ವನಿಯನ್ನು ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ನಲ್ಲಿ ವಿನಾಯಿತಿಯನ್ನು ಹೊಂದಿಸಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O  ರವರು %C26 $2 ಗೆ ಅರೆ-ಕಾರ್ಯನಿರ್ವಾಹಕ(half-operator) ಸ್ಥಿತಿಯನ್ನು ನೀಡಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ನಲ್ಲಿ ಆಮಂತ್ರಿಸಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%Uಚಾನಲ್          ಬಳಕೆದಾರರ   ವಿಷಯ"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ರವರು $2$3 $4 ಗೆ ಕ್ರಮವನ್ನು ಹೊಂದಿಸುತ್ತಾರೆ"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22 $1 ವಾಹಿನಿಯ ಕ್ರಮಗಳು: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O  ರವರು %C26 $2 ಗೆ ಕಾರ್ಯನಿರ್ವಾಹಕ(half-operator) ಸ್ಥಿತಿಯನ್ನು ನೀಡಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1ರವರು $2 ನ ಮೇಲೆ ವಿನಾಯಿತಿಯನ್ನು ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ನಲ್ಲಿ ಆಮಂತ್ರಣವನ್ನು ತೆಗೆದುಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 ರವರು ಚಾನಲ್ ಕೀಲಿಪದವನ್ನು ತೆಗೆದುಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 ರವರು ಬಳಕೆದಾರ ಮಿತಿಯನ್ನು ತೆಗೆದುಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ರವರು ಚಾನಲ್ ಕೀಲಿಪದವನ್ನು $2 ಗೆ ಹೊಂದಿಸಿದ್ದಾರೆ"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ರವರು ಬಳಕೆದಾರ ಮಿತಿಯನ್ನು $2 ಗೆ ಹೊಂದಿಸಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 ರವರು $2 ನಲ್ಲಿ ನಿಶೇಧವನ್ನು ತೆಗೆದುಹಾಕಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ರವರು %C26 $2 ಗೆ ಧ್ವನಿಯನ್ನು ನೀಡಿದ್ದಾರೆ"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22ಸಂಪರ್ಕಿತಗೊಂಡಿದೆ. ಈಗ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22ರವರು $1 ($2) ಸಂಪರ್ಕಸಾಧನ $3%O ದೊಂದಿಗೆ ಸಂಪರ್ಕಸಾಧಿಸಿದ್ದಾರೆ..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21ಸಂಪರ್ಕವು ವಿಫಲಗೊಂಡಿದೆ. ದೋಷ: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tರವರು $2 ಇಂದ CTCP $1 ಅನ್ನು ಪಡೆದಿದ್ದಾರೆ"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tರವರು $2 ಇಂದ CTCP $1 ಅನ್ನು ಪಡೆದಿದ್ದಾರೆ ($3 ಕ್ಕೆ)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tರವರು $2 ಇಂದ CTCP $ ಶಬ್ಧವನ್ನು ಪಡೆದಿದ್ದಾರೆ"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tರವರು $2 ಇಂದ CTCP $ ಶಬ್ಧವನ್ನು ಪಡೆದಿದ್ದಾರೆ ($3ಕ್ಕೆ)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$t %C26$1%O ನೊಂದಿಗಿನ DCC CHAT ಅನ್ನು ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT ಸಂಪರ್ಕವು %C26$1 %C30ದೊಂದಿಗೆ ಸಾಧಿಸಲಾಗಿದೆ[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC %C26$1%O ಗಾಗಿನ CHAT ಇಲ್ಲವಾಗಿದೆ ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t ರವರಿಗೆ $1 ಇಂದ ಒಂದು DCC CHAT ಬಂದಿದೆ"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tರವರು $1 ಗೆ DCC CHAT ಅನ್ನು ನೀಡಲು ಬಯಸಿದ್ದಾರೆ"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tಈಗಾಗಲೆ $1 ಗೆ CHAT ಗಾಗಿ ಬಯಸಿದ್ದಾರೆ"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$t%C26 $2%O ಯೊಂದಿಗೆ DCC $1 ಸಂಪರ್ಕದ ಪ್ರಯತ್ನವು ವಿಫಲಗೊಂಡಿದೆ (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tರವರು $2 ಇಂದ '$1%O' ಅನ್ನು ಸ್ವೀಕರಿಸಿದ್ದಾರೆ"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 ಪ್ರಕಾರ  ಗೆ/ಇಂದ    ಸ್ಥಿತಿ  ಗಾತ್ರ    ಸ್ಥಳ     ಕಡತ         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$t %C26$1%O ಇಂದ ಒಂದು ಸರಿಯಲ್ಲದ DCC ಮನವಿಯನ್ನು ಪಡೆದುಕೊಂಡಿದೆ.%010%C22*%O$tಪ್ಯಾಕೆಟ್‌ನಲ್ಲಿನ ಅಂಶಗಳು: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$t%C26 $1%O ಅನ್ನು %C26 $2 ಗೆ ನೀಡಲಾಗುತ್ತಿದೆ"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tಅಂತಹ ಯಾವುದೆ DCC ನೀಡಿಕೆ ಇಲ್ಲ."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O ಗೆ%C26 $1%O ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O %C26 $3%O ಇಮದ ಪೂರ್ಣಗೊಂಡಿದೆ %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV ಸಂಪರ್ಕವು %C26 ಗೆ ಸಾಧಿಸಲಾಗಿದೆ $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O %C26 $3%O ಇಂದ ವಿಫಲಗೊಂಡಿದೆ ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: $1 ಅನ್ನು ಬರೆಯುವ ಸಲುವಾಗಿ ತೆರೆಯಲಾಗಿಲ್ಲ ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$t%C26 $1%C ಎಂಬ ಕಡತವು ಈಗಾಗಲೆ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ, ಬದಲಿಗೆ ಅದನ್ನು%C26 $2%O ಉಳಿಸಲಾಗುತ್ತಿದೆ."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oರವರು%C26 $2 ಅನ್ನು %Cಇಂದ%C26 $3%C ಮರಳಿ ಆರಂಭಿಸುವಂತೆ ಮನವಿ ಸಲ್ಲಿಸಿದ್ದಾರೆ."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O ಗೆ%C26 $1%O ಸ್ಥಗಿತಗೊಳಿಸಲಾಗಿದೆ."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O ಪೂರ್ಣಗೊಂಡಿದೆ %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t%C26 $1 %C30[%O$2%C30] ನೊಂದಿಗೆ DCC SEND ಸಂಪರ್ಕವನ್ನು ಸಾಧಿಸಲಾಗಿದೆ"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O ವಿಫಲಗೊಂಡಿದೆ. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oರವರು%C26 $2 %O(%C26$3 %Obytes) ಅನ್ನು ನೀಡಬಯಸಿದ್ದಾರೆ"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O%C26 $3 %Cಗೆ ನಿಲ್ಲಿಸಲಾಗಿದೆ - ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O%C26 $3 %Oಗೆ ಕಾಲಾವಧಿ ತೀರಿದೆ - ಸ್ಥಗಿತಗೊಳಿಸಲಾಗುತ್ತಿದೆ."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 ಅನ್ನು ಸೂಚನಾ ಪಟ್ಟಿಯಿಂದ ಅಳಿಸಿಹಾಕಲಾಗುತ್ತಿದೆ."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tಸಂಪರ್ಕ ಕಡಿದುಹೋಗಿದೆ ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tನಿಮ್ಮ IP ಅನ್ನು ತಿಳಿದುಕೊಂಡಿದ್ದಾರೆ: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ನಿಮ್ಮನ್ನು ಕಡೆಗಣಿಸುವ ಪಟ್ಟಿಗೆ ಸೇರಿಸಿದ್ದಾರೆ."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O ನಲ್ಲಿ ಆಲಕ್ಷಿಸುವುದು ವಿಫಲಗೊಂಡಿದೆ."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O ಕಡೆಗಣಿಸಬೇಕಿರುವ ಪಟ್ಟಿಯಿಂದ ತೆಗೆದು ಹಾಕಿದ್ದಾರೆ."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr " ಕಡೆಗಣಿಸುವ ಪಟ್ಟಿಯು ಖಾಲಿ ಇದೆ."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t%C26 %B$1 %O ಅನ್ನು ಸೇರಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ(ಈ ಚಾನಲ್‌ಗೆ ಕೇವಲ ಆಮಂತ್ರಣದ ಮೇರೆಗೆ ಸೇರಬಹುದು)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tನಿಮ್ಮನ್ನು%C26 $1%O by%C26 $2%C ಗೆ ಆಮಂತ್ರಿಸಲಾಗಿದೆ (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) ರವರು $2 ಗೆ ಸೇರಿದ್ದಾರೆ"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t%C26 %B$1 %O ಅನ್ನು ಸೇರಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ(ಕೀಲಿಪದದ ಅಗತ್ಯವಿದೆ)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ರವರು $2 ಅನ್ನು $3 ಇಂದ ಹೊರಹಾಕಿದ್ದಾರೆ ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t $1 ರವರು ನಿಮ್ಮನ್ನು ಅಂತ್ಯಗೊಳಿಸಿದ್ದಾರೆ ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD ಅನ್ನು ಉಪೇಕ್ಷಿಸಲಾಗಿದೆ."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ಈಗಾಗಲೆ ಬಳಕೆಯಲ್ಲಿದೆ. $2 ದೊಂದಿಗೆ ಪ್ರಯತ್ನಿಸಲಾಗುತ್ತಿದೆ..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tಎಂಬ ಅಡ್ಡಹೆಸರು ಈಗಾಗಲೆ ಬಳಕೆಯಲ್ಲಿದೆ. ಬೇರೊಂದು ಅಡ್ಡಹೆಸರಿಗಾಗಿ /NICK ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tಅಂತಹ ಯಾವುದೆ DCC ಇಲ್ಲ."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tಯಾವುದೆ ಪ್ರಕ್ರಿಯೆ ಚಾಲನೆಯಲ್ಲಿಲ್ಲ"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tಸೂಚನಾ ಪಟ್ಟಿ ಖಾಲಿ ಇದೆ."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  ಸೂಚನಾ ಪಟ್ಟಿ                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 ಬಳಕೆದಾರರ ಸೂಚನಾ ಪಟ್ಟಿ."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tಸೂಚನೆ: $1 ರವರು ಆಫ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tಸೂಚನೆ: $1 ರವರು ಆನ್‌ಲೈನಿನಲ್ಲಿದ್ದಾರೆ ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ರವರು $3 ಅನ್ನು ಬಿಟ್ಟು ಹೋಗಿದ್ದಾರೆ"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ರವರು $3 ಅನ್ನು ಬಿಟ್ಟು ಹೋಗಿದ್ದಾರೆ (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t$1 ಇಂದ ಪಿಂಗ್ ಪ್ರತ್ಯುತ್ತರ: $2 ಸೆಕೆಂಡು(ಗಳು)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t$1 ಸೆಕೆಂಡುಗಳಿಗೆ ಯಾವುದೆ ಪಿಂಗ್ ಪ್ರತ್ಯುತ್ತರವಿಲ್ಲ, ಸಂಪರ್ಕ ಕಡಿದುಹಾಕಲಾಗುತ್ತಿದೆ."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tA ಪ್ರಕ್ರಿಯೆಯು ಈಗಾಗಲೆ ಚಾಲನೆಯಲ್ಲಿದೆ"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 ರವರು ನಿರ್ಗಮಿಸಿದ್ದಾರೆ (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 %B %C30ಕ್ರಮಗಳನ್ನು ಹೊಂದಿಸುತ್ತದೆ[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/ಭಾರಿ ಹೊಡೆತಗಳು%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$%C26 $1%O ನ IP ಸಂಖ್ಯೆಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22ಸಂಪರ್ಕಿತಗೊಂಡಿದ್ದಾರೆ."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22 $1 ಗಾಗಿ ಹುಡುಕಲಾಗುತ್ತಿದೆ"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tಹಿಂದಿನ ಸಂಪರ್ಕದ ಪ್ರಯತ್ನವನ್ನು ನಿಲ್ಲಿಸಲಾಗಿದೆ (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29$1%C %C29ಗಾಗಿನ ವಿಷಯವು ಹೀಗಿದೆ: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ರವರು ವಿಷಯವನ್ನು ಇದಕ್ಕೆ ಬದಲಾಯಿಸಿದ್ದಾರೆ: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29 $1%C %C29 ಗಾಗಿನ ವಿಷಯವನ್ನು $2%C %C29 ಎಂಬುದಕ್ಕೆ $3 ಇಂದ ಹೊಂದಿಸಲಾಗಿದೆ"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tಗೊತ್ತಿರದ ಆತಿಥೇಯ. ಸರಿಯಾಗಿ ನಮೂದಿಸಿದ್ದೀರೆ?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t%C26 %B$1 %O ಅನ್ನು ಸೇರಲು ಸಾಧ್ಯವಿಲ್ಲ(ಬಳಕೆದಾರ ಮಿತಿಯನ್ನು ತಲುಪಿದೆ)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26$1:%C $2 ನಲ್ಲಿನ ಬಳಕೆದಾರರು"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cರವರು ಆಚೆಹೋಗಿದ್ದಾರೆ %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %O WHOIS ಪಟ್ಟಿಯ ಕೊನೆ."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O %C26 ನಿಶ್ಚಲ $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O %C26 ನಿಶ್ಚಲ $2%O, ಪ್ರವೇಶಿಸಿದ್ದು:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oನಿಜವಾದ ಬಳಕೆದಾರ@ಆತಿಥೇಯ%C27 $2%O, ನಿಜವಾದ IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19ಈಗ $2 ನಲ್ಲಿ ಮಾತನಾಡುತ್ತಿದ್ದಾರೆ"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tನಿಮ್ಮನ್ನು $2 ಇಂದ $3 ರವರು ಹೊರಗಟ್ಟಿದ್ದಾರೆ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tನೀವು $3 ಎಂಬ ಚಾನಲ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿದ್ದೀರಿ"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tನೀವು $3 ಎಂಬ ಚಾನಲ್‌ನಿಂದ ನಿರ್ಗಮಿಸಿದ್ದೀರಿ (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tನೀವು%C26 $1%O ಅನ್ನು %C26 $2%O ಗೆ ಆಹ್ವಾನಿಸಿದ್ದೀರಿ (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tನಿಮ್ಮನ್ನು $2 ಎಂದು ಗುರುತಿಸಲಾಗುತ್ತಿದೆ"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "ಧ್ವನಿ ಕಡತವನ್ನು ಓದಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "ದೂರಸ್ಥ ಅತಿಥೇಯವು ಸಾಕೆಟ್ ಅನ್ನು ಮುಚ್ಚಿದೆ"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "ಸಂಪರ್ಕವನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "ಅತಿಥೇಯಕ್ಕೆ ಯಾವುದೆ ಮಾರ್ಗವಿಲ್ಲ"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "ಸಂಪರ್ಕದ ಸಮಯ ಮೀರಿದೆ"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "ಆ ವಿಳಾಸವನ್ನು ನಿಯೋಜಿಸಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "ಪೀರ್ ಇಂದ ಸಂಪರ್ಕವನ್ನು ಮರಳಿ ಹೊಂದಿಸಲಾಗಿದೆ"
 
@@ -2876,13 +2888,13 @@ msgstr "ಅಧಿವೇಶನದ ಬಸ್‌ನೊಂದಿಗೆ ಸಂಪರ�
 msgid "Failed to acquire %s: %s\n"
 msgstr "%s ಅನ್ನು ಪಡೆಯಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "ಇದರ ಕುರಿತು "
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "ಮಲ್ಟಿಪ್ಲಾಟ್‌ಫಾರ್ಮ್ IRC ಕ್ಲೈಂಟ್"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/ko.po b/po/ko.po
index 9966965f..005f3d00 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "바빠요~"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "전 이만 갑니다."
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "%s에 접근할 수 없습니다.\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "오류"
 
@@ -749,7 +749,7 @@ msgstr "Proxy 연결 실패.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "%s의 다음 서버로 진행....\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "경고: \"%s\" 알 수 없는 문자셋입니다. %s 네트워크에서는 문자열 변환이 적용되지 않습니다."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1님을 알림 목록에 추가했습니다."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1의 입장 금지 목록:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t참여할 수 없음%C26 %B$1 %O(당신은 입장 금지당했습니다)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1님의 대화명은 이제 $2입니다."
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1님이 $2에 입장 금지했습니다."
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$t대화방 $1은(는) $2에 만들어졌습니다."
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26$2%C님에게 대화방 관리 권한을 박탈했습니다."
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26$2%C님에게 대화방 관리 권한을 박탈했습니다."
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26 $2님의 발언권을 박탈했습니다."
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1님이 $2(을)를 제거했습니다."
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26$2%C님에게 대화방 관리 권한을 부여했습니다."
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1의 초대 상태는 $2에 설정되었습니다."
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%U대화방           사용자   제목"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1님이 설정 $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22대화방 $1의 상태: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26$2님에게 대화방 관리 권한을 부여했습니다."
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1님이 대화방에서 $2을(를) 해제했습니다."
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1님이 $2 대화방의 초대 가능 상태를 해제했습니다."
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1님이 대화방 암호를 제거했습니다."
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1님이 사용자 제한을 해제했습니다."
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1님이 대화방 암호를 \"$2\"로 설정했습니다."
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1님이 대화방의 참여자 수를 $2명으로 제한했습니다."
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1님이 대화방 $2의 입장 금지 목록을 제거했습니다."
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O님이 %C26 $2님에게 발언권을 부여했습니다."
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22접속되었습니다. 로그인 중입니다...."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22 $1($2)의 포트 $3%O으로 접속 중입니다..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21접속 실패. 오류: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$t$2님으로부터 CTCP $1을(를) 받았습니다"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$t$2님으로부터 CTCP $1을(를) 받았습니다.($3에게)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$t$2님으로부터 CTCP Sound $1을(를) 받았습니다"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$t$2님으로부터 CTCP Sound $1을(를) 받았습니다.($3에게)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$t%C26$1님과 %ODCC CHAT이 취소되었습니다."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t%C26$1님과 DCC CHAT 접속되었습니다 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$t%C26$1님과%O DCC CHAT의 접속이 끊김($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t$1님으로부터 DCC CHAT 요청을 받았습니다."
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t$1님에게 DCC CHAT 요청 중입니다"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t이미 $1님에게 요청 중입니다."
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 %C26 $2%O에 접속 실패 (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t$2님으로부터 '$1%O'을(를) 받았습니다."
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 형태  송/수신    상태  크기    위치    파일         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tDCC 요청을 %C26$1%O로부터 받았습니다.%010%C22*%O$t패킷의 내용: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$t%C26$2%O님에게  %C26$1%O을(를) 전송합니다."
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tDCC 제공자를 찾을 수 없습니다."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC 받기%C26 $1%O님으로부터 %C26$2%O 받기가 취소되었습니다."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC 받기%C26$3%O님으로부터 %C26$1%O받기 완료 %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC 받기%C26 $1%O님과 접속됨 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC 받기%C26$3%O님에게 %C26$1%O 받기 실패 ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC 받기: $1을 쓸 수 없습니다.($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$t파일%C26 $1%C은(는) 이미 있습니다. 이름에 %C26$2%O(을)를 추가합니다."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1%O님이 파일 %C26$2%C을(를) %C26$3%C부터 이어 받기를 요청했습니다."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC 보내기%C26$1%O님에게 %C26$2%O 보내기 취소됨."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC 보내기%C26$2%O님에게 파일 %C26$1%O 보내기 완료 %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC 보내기 %C26$1%C님과 접속됨.%C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC 보내기%C26 $1%O을(를) %C26$2%O님에게 보내기 실패. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1%O님이 %C26$2%O를 보내셨습니다.(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %C지연됨 - 취소됨."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %O시간제한 - 취소됨."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1님은 알림 목록에서 삭제되었습니다."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t접속 종료됨($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$t당신의 IP를 찾았습니다: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O님을 무시 목록에 추가했습니다."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "무시 목록의 %C26$1%O이(가) 변경됨."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 호스트 매스크              귓말 알림 대화 CTCP 연결 초대 무시안함 "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O님을 무시 목록에서 했습니다."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  무시 목록이 비어 있습니다."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t대화방%C26 %B$1에 참여할 수 없습니다. %O(대화방이 초대만 가능한 상태입니다)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C26$2%O님이 당신을 대화방 %C26$1%O로 초대하고 계십니다.(%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3)님이 대화방 $2에 참여했습니다."
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t대화방%C26 %B$1에 참여할 수 없습니다. %O(암호가 필요합니다)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1님이 $3에서 $2님을 강제 퇴장시켰습니다.(이유:$4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t당신은 $1님으로부터 킬 당했습니다.(이유:$2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22공지사항 무시됨."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t대화명 \"$1\"이 이미 사용 중입니다. \"$2\"로 재시도합니다..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$t대화명이 이미 사용 중입니다. /NICK 명령으로 다른 대화명으로 변경하십시오."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$t요청된 DCC가 없습니다."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$t현재 실행 중인 프로세스가 없습니다."
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$t알림 목록은 비어 있습니다."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  알림 목록"
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1명의 사용자가 알림 목록에 있습니다."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$t알림: $1 오프라인입니다.($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$t알림: $1 온라인입니다.($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1님(%O%C23$2)께서 대화방 $3에서 퇴장했습니다."
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1님(%O%C23$2)께서 대화방 $3에서 퇴장했습니다.(%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t$1으로부터 핑 회신: $2초"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t$1초 동안 핑의 회신이 없으므로, 접속이 종료되었습니다."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$t프로세스가 이미 실행 중입니다."
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1님 끝내셨습니다.(%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1님이 상태를 설정했습니다.%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tIP 주소 %C26 $1을(를) 찾는 중%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22접속되었습니다."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22찾는 중 $1.."
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$t이전 접속이 중지됨 (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29 대화방 $1%C %C29의 주제는 $2입니다."
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1님이 주제를 $2(으)로 변경했습니다."
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29대화방 $1%C %C29의 주제는 $2%C %C29님이 설정했습니다.(위치: $3)"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$t알 수 없는 호스트. 입력 내용을 확인하십시오."
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t대화방 %C26%B$1%C에 참여할 수 없습니다 %O(참여인원수 제한)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26대화방 $1의 사용자:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C님이 자리를 비우셨습니다 %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OWHOIS 목록의 끝."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 잠수%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 잠수%C26 $2%O, 접속:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O실제사용자@호스트%C27 $2%O, 실제 IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19당신은 대화방 $2에 참여합니다"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t당신은 $3님으로부터 $2 대화방에서 강제 퇴장당했습니다.(이유:$4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$t당신은 $3에서 퇴장했습니다"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$t당신은 $3에서 퇴장했습니다  (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$t당신은 대화방 %C26$2%O로 %C26$1%O님을 초대했습니다.(%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$t당신의 대화명은 $2입니다"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "소리 파일을 읽지 못함:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "원격 호스트에서 소켓이 닫힘"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "접속이 거부됨"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "호스트로 갈 경로가 없음"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "접속 시간 제한"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "해당 주소로 접근할 수 없음"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "접속이 초기화됨"
 
@@ -2875,13 +2887,13 @@ msgstr "세션 버스에 접속하 수 없습니다: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "%s 얻기 실패: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "정보"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "다중 환경의 IRC 클라이언트"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/lt.po b/po/lt.po
index 084d45ff..6847d8cc 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,15 @@ msgstr ""
 "Language: lt\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Užsiėmęs"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Išeinu"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -65,7 +65,7 @@ msgstr "Negaliu pasiekti %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Klaida"
 
@@ -753,7 +753,7 @@ msgstr "Proxy jungimasis nepavyko.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Bandomas kitas tinklo „%s“ serveris...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -761,51 +761,51 @@ msgid ""
 msgstr "Dėmesio: „%s“ koduotė nežinoma. Konvertavimas tinkle „%s“ nebus vykdomas."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -813,271 +813,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tGautas CTCP „Sound“ $1 iš $2 (į $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipas Į/Iš       Būklą—   Dydis  Pozicija Failas         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Formatas                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Ignoravimo s"
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1085,149 +1090,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Stebyklą—                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1717,27 +1729,27 @@ msgid ""
 "%s"
 msgstr "Nepavyko perskaityti garso failo:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Serveris nutraukė ryšį"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Jungimasis atmestas"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Maršrutas nerastas"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nepavyko priskirti šio adreso"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Jungimasis nutrūko"
 
@@ -2879,12 +2891,12 @@ msgstr "Nepavyko prisijungti prie sesijos magistralės: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Nepavyko gauti %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/lv.po b/po/lv.po
index f5536280..8ae07647 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Esmu aizņemts"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Nevar piekļūt %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Kļūda"
 
@@ -750,7 +750,7 @@ msgstr "Starpservera šķērsošana neizdevās.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Attālinātais hostdators aizvēra ligzdu"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Savienojums atteikts"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Nav maršruta uz resursdatoru"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Savinojuma taimauts"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nevaru piešķirt to adresi"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Savienojuma pārtraukums"
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/mk.po b/po/mk.po
index a5170f36..25a58c65 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Зафатен сум"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Си одам"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Не можам да пристапам на %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Грешка"
 
@@ -750,7 +750,7 @@ msgstr "Proxy traversal откажа.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Ќе пробам на следниот сервер за %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Предупредување: \"%s\" дадениот карактер е непознат. Нема да биде применет разговор за мрежата %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 е додаден/а во вашата листа за известување."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Бан листа:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНе можете да влезете на%C26 %B$1 %O(Банирани сте)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 е познат како $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tChannel $1 создаден на $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O одзема полу-операторски статус на%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O одзема операторски статус на%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O отстранува глас од%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 поставува exempt на $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава полу-операторски статус на%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 поставува само со покани $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UКанал          Корисници   Наслов"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 поставува режим $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Канал $1 режими: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава операторски статус на%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 отстранува exempt од $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 отстранува само со покани $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 го отстранува клучниот збор за каналот"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 го отстранува ограничувањето за корисници"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 го поставува клучниот збор за каналот: $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 поставува ограничување на каналот на $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 го отстранува банот на $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дава глас на%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Се врзав. Сега се најавувам..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Се врзувам на $1 ($2) порта $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Врската е неуспешна. Грешка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tДоби CTCP $1 од $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tДоби CTCP $1 од $2 (до $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tДоби CTCP звук $1 од1 $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tДоби CTCP $1 од $2 (до $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT до %C26$1%O прекина."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tвоспоставена е DCC CHAT DCC CHAT врска со %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT со %C26$1%O се загуби ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tДоби DCC CHAT понуда од $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tНудам DCC CHAT на $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tВеќе нудам CHAT на $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 обидот за врзување со%C26 $2%O е неуспешен (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tДоби '$1%O' од $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Тип  До/Од    Статус  Големина    Позиција     Датотека         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tдоби погрешно барање за DCC од %C26$1%O.%010%C22*%O$tСодржина на пакетот: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tНудам%C26 $1%O на%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tНе постои таква DCC понуда."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O до%C26 $1%O прекина"
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O од%C26 $3%O заврши %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV врската е воспоставена со%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O од%C26 $3%O не успеа ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Не можам да ја отворам $1 за запишување ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tThe file%C26 $1%C веќе постои, пробај да ја зачуваш како%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Ohas побара продолжување%C26 $2 %Cод%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O до%C26 $1%O прекина."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O до%C26 $2%O заврши %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tвоспоставена е DCC SEND врска до%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O до%C26 $2%O не успеа. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oпонуди%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oдо%C26 $3 %Cзапре - прекинувам."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oдо%C26 $3 %Oистече - прекинувам."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 е избришан од листата со известувања."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tИсклучен ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tЈа најдов вашата IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O е додаден на листата за игнорирање."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Игнорирањето за %C26$1%O e променето."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Маска на host-от                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%Oе отстранет од листата за игнорирање."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Листата за игнорирање е празна."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНе можам да се приклучам на%C26 %B$1 %O(Каналот е само со покани)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tПоканет/а си на%C26 $1%O од%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) се приклучи на $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tНе можам да се приклучам на%C26 %B$1 %O(бара клучен збор)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 го исфрли $2 од $3 ($4%O)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tТебе те уби $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD прескокнато."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 веќе е искористен. Пробувам пак со $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tПрекарот веќе се користи. Користи /NICK да пробаш друг."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tне постои такво DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tМоментално нема процеси што работат"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$Листата за известување е празна."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Листа за известување                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 корисници во листата за известување."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tИзвестување: $1 е offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$ttИзвестување: $1 е присутен ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) го напушти $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) го напушти $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tПинг одговор од $1 : $2 секунди"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tНема пинг одговори веќе $1 секунди, ја прекинувам врската."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tПроцесот веќе работи"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 се исклучи (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 поставува режими%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tБарам IP број за%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Се поврзав."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Барам $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tСтопиран е претходниот обид за поврзување (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Насловот на  $1%C %C29е: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 го промени насловот во: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Насловот за $1%C %C29е поставен од $2%C %C29на $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНепознат host. Можеби го згрешивте во пишувањето?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНе можам да се приклучам%C26 %B$1 %O(Ограничувањето за корисници е достигнато)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Корисници на $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cе отсутен %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКрај на WHOIS листата."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O не реагира%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O %C26 $2%O, најава:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oвистински корисник@host%C27 $2%O, вистинска IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Сега зборувам на $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tТи си исфрлен од $2 од $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tГо напушти каналот $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tГо напушти каналот $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tГо поканивте%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tСега си познат како $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Неможам да ја прочитам звучната датотека:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Затворен socket на мрежниот host"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Врската е одбиена"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Нема рута до host-от"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Конекцијата истече"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Не можам да ја назначам таа адреса"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Конекцијата е ресетирана од peer"
 
@@ -2876,13 +2888,13 @@ msgstr "Не можев да се порвзам со магистралата �
 msgid "Failed to acquire %s: %s\n"
 msgstr "Не успеав да го добијам %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Мултиплатформски клиент за IRC"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/ml.po b/po/ml.po
index ac679800..ab8ad733 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Malayalam (http://www.transifex.com/projects/p/hexchat/language/ml/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: ml\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Test"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr ""
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr ""
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/ms.po b/po/ms.po
index aa6d3c1d..c4c0f340 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: ms\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Saya sibuk"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Tak dapat mengakses %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Ralat"
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Senarai abai kosong."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Sambungan ditolak"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Tiada route ke hos"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Sambungan melebihi hadmasa "
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Tak dapat mengumpukkan alamat"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/nb.po b/po/nb.po
index e0e65c72..aabac38f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jeg er opptatt"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Forlater kanalen"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Kan ikke aksessere %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Feil"
 
@@ -749,7 +749,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,51 +757,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -809,271 +809,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1081,149 +1086,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Kan ikke lese lydfil:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Ekstern vert lukket pluggen"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Tilkobling nektet"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ingen rute til verten"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Tidsavbrudd for tilkobling"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Kan ikke tildele den adressen"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Tilkobling nullstillt av vert"
 
@@ -2875,13 +2887,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "En IRC-klient for flere plattformer"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/nl.po b/po/nl.po
index c22ae0c3..b91a80f5 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,15 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Ik ben bezig"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Ik ga weg"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -65,7 +65,7 @@ msgstr "Kan %s niet benaderen\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Fout"
 
@@ -753,7 +753,7 @@ msgstr "Proxy doorkruising mislukt.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Overschakelen naar volgende server in %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -761,474 +761,486 @@ msgid ""
 msgstr "Waarschuwing: tekenset \"%s\" is onbekend. Er zal geen conversie worden toegepast voor netwerk %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 toegevoegd aan waarschuwingslijst."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Verbanlijst:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tKan niet binnengaan%C26 %B$1 %O(U bent verbannen)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 is nu bekend als $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 verbant $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanaal $1 gemaakt op $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O verwijdert kanaal-half-operator status van%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O verwijdert kanaal-operator status van%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O verwijdert stem van%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 zet vrijstelling op $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O geeft kanaal-half-operator status aan%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 zet uitnodigen op $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanaal           Gebruikers  Onderwerp"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 zet modus op $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanaal $1 modi: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O geeft kanaal-operator status aan%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 verwijdert vrijstelling van $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 verwijdert uitnodigen van $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 verwijdert kanaalsleutelwoord"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 verwijdert gebruikersgrens"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 zet kanaalsleutelwoord op $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 zet kanaalgrens op $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 verwijdert verbanning van $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O geeft stem aan%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Verbonden. Nu bezig met aanmelden..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Bezig met verbinden met $1 ($2) poort $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Verbinden mislukt. Fout: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tEr is een CTCP $1 ontvangen van $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tEr is een CTCP $1 ontvangen van $2 (aan $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tEr is een CTCP-geluid $1 ontvangen van $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tEr is een CTCP-geluid $1 ontvangen van $2 (aan $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT met %C26$1%O afgebroken."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT-verbinding tot stand gebracht met %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT met %C26$1%O verloren ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tEr is een DCC CHAT-aanbod ontvangen van $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tBezig met aanbieden DCC CHAT aan $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tEr wordt al een CHAT aangeboden aan $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 verbindingspoging met%C26 $2%O mislukt (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tOntvangen '$1%O' van $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Soort  Naar/Van  Status  Grootte Pos     Bestand      "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tEr is een misvormd DCC-verzoek ontvangen van %C26$1%O.%010%C22*%O$tInhoud van pakket: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tBezig met aanbieden%C26 $1%O aan%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tDCC-aanbod niet gevonden."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O afgebroken."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O van%C26 $3%O voltooid %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV-verbinding tot stand gebracht met%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O van%C26 $3%O mislukt ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Kan $1 niet openen om te schrijven ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tHet bestand%C26 $1%C bestaat al; wordt opgeslagen als%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oheeft verzocht om%C26 $2 %Cvan%C26 $3%C te pauzeren."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O naar%C26 $1%O afgebroken."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O naar%C26 $2%O voltooid %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND-verbinding tot stand gebracht met%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O naar%C26 $2%O mislukt. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oheeft%C26 $2 %O aangeboden (%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Omet%C26 $3 %Cis opgehouden - afbreken."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Omet%C26 $3 %Oheeft time-out - afbreken."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 verwijderd uit waarschuwingslijst."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tVerbinding verbroken ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tUw IP is gevonden: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O toegevoegd aan negeerlijst."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Negeren van %C26$1%O gewijzigd."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmasker                PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O verwijderd uit negeerlijst."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Negeerlijst is leeg."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tKan niet binnengaan%C26 %B$1 %O(Kanaal is alleen-uitnodigen)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tU bent uitgenodigd bij%C26 $1%O door%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) is binnengekomen bij $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tKan niet binnengaan bij%C26 %B$1 %O(Sleutelwoord vereist)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 heeft $2 uit $3 geschopt ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tU bent gedood door $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Overgeslagen."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 al in gebruik. Opnieuw proberen met $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tBijnaam al in gebruik. Gebruik /NICK om een andere te proberen."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDCC niet gevonden."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tEr loopt op dit moment geen proces"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tWaarschuwingslijst is leeg."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Waarschuwingslijst                    "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 gebruikers in waarschuwingslijst."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) heeft $3 verlaten"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) heeft $3 verlaten (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing-antwoord van $1: $2 second(en)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tGeen ping-antwoord gedurende $1 seconden, verbinding verbroken."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tEr loopt al een proces"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 heeft verlaten (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 zet modi%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tBezig met opzoeken IP-nummer voor%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Verbonden."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Bezig met opzoeken $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tVorige verbindingspoging gestopt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Onderwerp voor $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 heeft het onderwerp gewijzigd naar: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Onderwerp voor $1%C %C29is ingesteld door $2%C %C29op $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tOnbekende host. Heeft u het goed gespeld?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tKan%C26 niet binnengaan %B$1 %O(Gebruikersgrens bereikt)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Gebruikers op $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cis weg %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OEinde van WHOIS-lijst."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactief%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactief%C26 $2%O, aangemeld:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oechte gebruiker@host%C27 $2%O, echte IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19U praat nu op $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tU bent door $3 van $2 geschopt ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tU heeft kanaal $3 verlaten"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tU heeft kanaal $3 verlaten (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tU heeft%C26 $1%O uitgenodigd bij%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tU bent nu bekend als $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1717,27 +1729,27 @@ msgid ""
 "%s"
 msgstr "Kan geluidsbestand niet lezen:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Host op afstand heeft socket gesloten"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Verbinding geweigerd"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Geen route naar host"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Verbinding kreeg een timeout"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Kan dat adres niet toewijzen"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Verbinding verbroken door peer"
 
@@ -2879,13 +2891,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr "Faalde bij het ophalen van %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Een multiplatform IRC-client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/no.po b/po/no.po
index 2721adcc..a5774ab4 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: no\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jeg er opptatt"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Kan ikke aksessere %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Feil"
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Tidsavbrudd for tilkobling"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,12 +2888,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/pa.po b/po/pa.po
index 778a3ab8..3bb3a155 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -18,15 +18,15 @@ msgstr ""
 "Language: pa\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "ਮੈਂ ਰੁੱਝਿਆ ਹਾਂ"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "ਹਟ ਪਿੱਛੇ ਫੇਰ ਮਿਲਾਗੇਂ"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -63,7 +63,7 @@ msgstr "%s ਨੂੰ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ ਹ�
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
@@ -751,7 +751,7 @@ msgstr "ਪਰਾਕਸੀ ਸੰਚਾਰ ਅਸਫਲ।\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "%s ਵਿੱਚ ਅਗਲੇ ਸਰਵਰ ਨਾਲ ਕੋਸ਼ਿਸ ਜਾਰੀ...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -759,474 +759,486 @@ msgid ""
 msgstr "ਚੇਤਾਵਨੀ: \"%s\" ਅੱਖਰ ਸਮੂਹ ਅਣਜਾਣ ਹੈ। ਨੈੱਟਵਰਕ %s ਲਈ ਅਨੁਵਾਦ ਲਾਗੂ ਨਹੀਂ ਹੈ।"
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 ਨੂੰ ਸੂਚਨਾ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ।"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 ਪਾਬੰਦੀ ਲਿਸਟ:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t %C26 %B$1 %O ਵਿੱਚ ਦਾਖਲ ਨਹੀ ਹੋ ਸਕਦੇ (ਤੁਹਾਡੇ ਉੱਤੇ ਪਾਬੰਦੀ ਹੈ)।"
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ਨੂੰ ਹੁਣ $2 ਦੇ ਤੌਰ ਉੱਤੇ ਜਾਣਿਆ ਜਾਵੇਗਾ"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ਨੇ $2 ਉੱਤੇ ਪਾਬੰਦੀ ਲਗਾਈ"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tਚੈਨਲ $1 ਨੂੰ $2 ਤੇ ਬਣਾਇਆ ਗਿਆ ਹੈ"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ%C26 $2 ਤੋਂ ਚੈਨਲ ਅਰਧ-ਮੁੱਖੀ ਅਹੁਦਾ ਹਟਾਇਆ"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ%C26 $2 ਤੋਂ ਚੈਨਲ ਮੁੱਖੀ ਅਹੁਦਾ ਹਟਾਇਆ"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ %C26 $2 ਤੋਂ ਆਵਾਜ਼ ਹਟਾਈ"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ %C26 $2 ਨੂੰ ਅੱਧੇ-ਮੁੱਖੀ ਦਾ ਅਹੁਦਾ ਦਿੱਤਾ"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ਨੇ $2 ਤੇ ਸੱਦਾ ਲਗਾਇਆ"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%Uਚੈਨਲ          ਯੂਜ਼ਰ   ਵਿਸ਼ਾ"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ਢੰਗ $2$3 $4 ਦਿੱਤਾ"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "C22*%O$t%C22ਚੈਨਲ $1 ਮੋਡ: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ %C26 $2 ਨੂੰ ਚੈਨਲ ਮੁੱਖੀ ਦਾ ਦਰਜਾ ਦਿੱਤਾ"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 ਨੇ $2 ਤੋਂ ਸੱਦਾ ਹਟਾਇਆ"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 ਨੇ ਚੈਨਲ ਸ਼ਬਦ ਹਟਾਇਆ"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 ਨੇ ਯੂਜ਼ਰ ਸੀਮਾ ਹਟਾਈ"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ਨੇ $2 ਲਈ ਚੈਨਲ ਸ਼ਬਦ ਲਗਾਇਆ"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ਨੇ ਚੈਨਲ ਸੀਮਾ $2 ਕੀਤੀ"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 ਨੇ $2 ਤੋਂ ਪਾਬੰਦੀ ਹਟਾਈ"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ਨੇ %C26 $2 ਲਈ ਆਵਾਜ਼ ਦਿੱਤੀ"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22ਕੁਨੈਕਟ ਹੈ। ਹੁਣ ਲਾਗਇਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22($2) ਨਾਲ ਪੋਰਟ $3%O ਉੱਤੇ ਕੁਨੈਕਟ ਕੀਤਾ ਜਾਂਦਾ ਹੈ..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21ਕੁਨੈਕੁਸ਼ਨ ਅਸਫਲ ਹੈ। ਗਲਤੀ: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tਇੱਕ CTCP $1 $2 ਵੱਲੋਂ ਪ੍ਰਾਪਤ ਹੋਈ"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tਇੱਕ CTCP $1 $2 ਵੱਲੋਂ ਪ੍ਰਾਪਤ ਹੋਈ ($3 ਲਈ)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tCTCP ਆਵਾਜ਼ $1 $2 ਵੱਲੋਂ ਆਈ ਹੈ"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tਇੱਕ CTCP $1 ਧੁਨੀ $2 (to $3) ਵਲੋਂ ਮਿਲੀ"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$t%C26$1%O ਨਾਲ DCC ਗੱਲਬਾਤ ਅਧੂਰੀ ਰਹੀ।"
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t%C26$1 %C30[%O$2%C30] ਨਾਲ DCC ਗੱਲਬਾਤ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਗਿਆ"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$t %C26$1%O ਨਾਲ DCC ਗੱਲਬਾਤ ਖਤਮ ($4)।"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t $1 ਵਲੋਂ DCC ਗੱਲਬਾਤ ਲਈ ਸੱਦਾ ਆਇਆ ਹੈ"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t $1 ਨੂੰ DCC ਗੱਲਬਾਤ ਲਈ ਸੱਦਾ ਦੇ ਰਿਹਾ ਹੈ"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t $1 ਨਾਲ ਪਹਿਲਾਂ ਹੀ ਗੱਲਬਾਤ ਲਈ ਸੱਦਾ ਦਿੱਤਾ ਗਿਆ ਹੈ"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 %C26 $2%O ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਅਸਫਲ (ਗਲਤੀ=$3)"
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t $2 ਵਲੋਂ '$1%O' ਪ੍ਰਾਪਤ"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 ਕਿਸਮ  ਵੱਲ/ਵੱਲੋਂ    ਸਥਿਤੀ  ਅਕਾਰ    Pos     ਫਾਇਲ         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tਨੇ%C26 $1%O %C26 $2 ਨੂੰ ਪੇਸ਼ ਕੀਤੀ"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tਏਦਾਂ ਦਾ ਕੋਈ DCC ਸੱਦਾ ਨਹੀਂ ਹੈ।"
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O ਅਧੂਰਾ ਛੱਡਿਆ।"
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O, %C26 $3%O ਤੋਂ ਮੁਕੰਮਲ %C30[%C26$4%O cps%C30]%O"
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV%C26 $1 %C30[%O$2%C30] ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਿਆ"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O ਤੋਂ%C26 $3%O ਤੋਂ ਪ੍ਰਾਪਤੀ ਅਸਫਲ($4)"
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: $1ਨੂੰ ($2) ਲਿਖਣ ਲਈ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ।"
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tਫਾਇਲ%C26 $1%C ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ, %C26 $2%O ਦੇ ਤੌਰ ਤੇ ਸੰਭਾਲੀ ਜਾ ਰਹੀ ਹੈ।"
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oਨੇ%C26 $2 %Cਨੂੰ%C26 $3%C ਤੋਂ ਮੁੜ-ਪ੍ਰਾਪਤੀ ਦੀ ਮੰਗ ਰੱਖੀ।"
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O ਅਧੂਰਾ ਛੱਡਿਆ।"
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O ਮੁਕੰਮਲ %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND %C26 $1 %C30[%O$2%C30] ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਿਆ"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O ਅਸਫਲ $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oਨੇ %C26 $2 %O(%C26$3 %Oਬਾਇਟ) ਫਾਇਲ ਭੇਜੀ"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cਸਥਿਰ - ਅਧੂਰਾ ਛੱਡਿਆ"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Oਸਮਾਂ ਸਮਾਪਤ - ਅਧੂਰਾ ਛੱਡਿਆ।"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 ਨੂੰ ਸੂਚਨਾ ਤੋਂ ਹਟਾਇਆ।"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t ($1) ਬੰਦ ਹੋਇਆ ਹੈ।"
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tਤੁਹਾਡਾ IP ਖੋਜਿਆ: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ਨੂੰ ਅਣਡਿੱਠੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕੀਤਾ।"
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "%C26$1%O ਤਬਦੀਲੀ ਅਣਡਿੱਠਾ।"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 ਹੋਸਟ ਮਾਸਕ                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O ਨੂੰ ਅਣਡਿੱਠਾ ਲਿਸਟ ਵਿੱਚੋਂ ਹਟਾਇਆ।"
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr " ਅਣਡਿੱਠਾ ਲਿਸਟ ਖਾਲੀ ਹੈ।"
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t%C26 %B$1 %O ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋ ਸਕਦੇ (ਚੈਨਲ ਹੀ ਸੱਦ ਸਕਦਾ ਏ)।"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tਤੁਹਾਨੂੰ%C26 $1%O by%C26 $2%C (%C26$3%C) ਲਈ ਸੱਦਾ ਹੈ"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) $2 ਵਿੱਚ ਦਾਖਲ"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t%C26 %B$1 %O ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋ ਸਕਦੇ(ਸ਼ਬਦ ਲੋੜੀਦਾ ਹੈ)।"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ਨੇ $2 ਨੂੰ $3 ($4%O%C21) ਤੋਂ ਬਾਹਰ ਸੁੱਟ ਦਿੱਤਾ"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tਤੁਹਾਨੂੰ $1 ($2%O%C22) ਨੇ ਚੈਨਲ ਵਿੱਚੋਂ ਬਾਹਰ ਸੁੱਟ ਦਿੱਤਾ"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD ਅਧੂਰਾ ਛੱਡਿਆ ਹੈ।"
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। $2 ਨਾਲ ਮੁੜ ਕੋਸ਼ਿਸ ਜਾਰੀ..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ ਅਧੀਨ ਹੈ। ਹੋਰ ਵਰਤਣ ਲਈ /NICK ਦੀ ਵਰਤੋਂ ਕਰੋ।"
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tਏਦਾਂ ਦਾ ਕੋਈ DCC ਨਹੀਂ ਹੈ।"
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tਇਸ ਸਮੇਂ ਕੋਈ ਕਾਰਜ ਨਹੀਂ ਚੱਲ ਨਹੀਂ ਰਿਹਾ ਹੈ।"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tਸੂਚਨਾ ਲਿਸਟ ਖਾਲੀ ਹੈ।"
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  ਸੂਚਨਾ ਲਿਸਟ                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 ਯੂਜ਼ਰ ਸੂਚਨਾ ਲਿਸਟ ਵਿੱਚ ਹੈ।"
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tਸੂਚਨਾ: $1 ਆਫਲਾਈਨ ਹੈ ($3)।"
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tਸੂਚਨਾ: $1 ਆਨਲਾਈਨ ਹੈ ($3)।"
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ਛੱਡ ਗਿਆ ਹੈ $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ਨੇ $3 (%O%C23%B%B$4%O%C23) ਛੱਡਿਆ"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t$1ਤੋਂ ਪਿੰਗ ਜਵਾਬ: $2 ਸਕਿੰਟ"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t$1 ਸਕਿੰਟਾਂ ਤੋਂ ਕੋਈ ਜਵਾਬ ਨਹੀ, ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਹੈ।"
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tਇੱਕ ਕਾਰਜ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 ਨੇ ਬੰਦ ਕੀਤਾ ਹੈ (%O%C23$2)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 ਨੇ ਢੰਗ%B %C30[%O$2%B%C30] ਦਿੱਤਾ"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$t%C26 $1%O ਲਈ IP ਨੰਬਰ ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22ਜੁੜਿਆ ਹੈ।"
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22 $1 ਦੀ ਖੋਜ ਜਾਰੀ ਹੈ"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tਪੁਰਾਣੀ ਕੁਨੈਕਸ਼ਨ ਕੋਸ਼ਿਸ ਰੋਕੀ (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29 $1%C %C29 ਲਈ ਵਿਸ਼ਾ ਹੈ: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ਨੇ ਵਿਸ਼ਾ ਤਬਦੀਲ ਕੀਤਾ: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29$1%C %C29 ਲਈ ਵਿਸ਼ਾ $2%C %C29 ਨੇ $3 ਵਜੇ ਦਿੱਤਾ"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tਅਣਜਾਣ ਹੋਸਟ, ਸ਼ਾਇਦ ਤੁਸੀਂ ਨਾਂ ਗਲਤ ਲਿਖਿਆ ਹੈ?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t%C26 %B$1 %O ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋ ਸਕਦੇ (ਯੂਜ਼ਰ ਸੀਮਾ ਟੱਪੀ)।"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26$1 ਉੱਤੇ ਯੂਜ਼ਰ:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cਦੂਰ %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OWHOIS ਲਿਸਟ ਖਤਮ।"
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ਵਿਹਲਾ%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ਵਿਹਲਾ%C26 $2%O, ਦਾਖਲ:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oਅਸਲੀ user@host%C27 $2%O, ਅਸਲੀ IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19ਹੁਣ $2 'ਤੇ ਗੱਲਬਾਤ ਕਰ ਰਹੇ ਹੋ"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tਤੁਹਾਨੂੰ $2 ਤੋਂ $3 ($4%O%C23) ਨੇ ਬਾਹਰ ਸੁੱਟ ਦਿੱਤਾ"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tਤੁਸੀਂ $3 ਚੈਨਲ ਛੱਡਿਆ"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tਤੁਸੀਂ $3 (%O%C23%B%B$4%O%C23) ਚੈਨਲ ਛੱਡਿਆ"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tਤੁਹਾਨੂੰ%C26 $1%O ਤੋਂ%C26 $2%O (%C26$3%O) ਤੇ ਸੱਦਿਆ ਗਿਆ"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tਹੁਣ ਤੁਸੀਂ ਜਾਣੇ ਜਾਓਗੇ $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1715,27 +1727,27 @@ msgid ""
 "%s"
 msgstr "ਸਾਊਂਡ ਫਾਇਲ ਪੜ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "ਰਿਮੋਟ ਹੋਸਟ ਬੰਦ ਸਾਕਟ"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤੋਂ ਇਨਕਾਰ"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "ਹੋਸਟ ਲਈ ਮਾਰਗ ਨਹੀਂ"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਲਈ ਸਮਾਂ ਸਮਾਪਤ"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "ਇਹ ਸਿਰਨਾਵਾਂ ਦਿੱਤਾ ਨਹੀਂ ਜਾ ਸਕਦਾ"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "ਪੀਅਰ ਨੇ ਕੁਨੈਕਸ਼ਨ ਮੁੜ ਬਣਾਇਆ"
 
@@ -2877,13 +2889,13 @@ msgstr "ਸ਼ੈਸ਼ਨ ਬਸ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫ਼ਲ:
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "ਇਸ ਬਾਰੇ"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "ਇੱਕ ਅੰਤਰ ਪਲੇਟਫਾਰਮ IRC ਕਲਾਂਇਟ"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/pl.po b/po/pl.po
index 1ef3a82b..da347799 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jestem zajęty"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Wychodzi"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Nie jestem w stanie odczytać %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Błąd"
 
@@ -750,7 +750,7 @@ msgstr "Nieudane połączenie z serwerem pośredniczącym.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Skocz do następnego serwera w %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Uwaga: nieznane kodowanie \"%s\". Nie będzie stosowanej konwersji dla sieci %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 dodano do listy powiadomień."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Lista banów:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNie możesz wejść do pokoju%C26 %B$1 %O(Jesteś zbanowany)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 zmienia pseudonim na $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 nakłada BAN na $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tPokój $1 został utworzony $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odbiera status Półoperatora Pokoju użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odbiera status Operatora Pokoju użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odbiera prawo głosu użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 ustawia wyjątek na $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O nadaje status Półoperatora Pokoju użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ustawia zaproszenie dla $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UPokój            Użyt.   Temat"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ustawia opcje $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Opcje Pokoju $1: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O nadaje status Operatora Pokoju użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 usuwa wyjątek na $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 usuwa zaproszenie dla $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 usuwa hasło dostępu do pokoju"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 usuwa limit użytkowników"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ustawia hasło dostępu do pokoju na $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ustawia limit pokoju na $2 użytkowników"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 usuwa BANA z $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O daje głos użytkownikowi%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Połączenie nawiązane. Teraz się loguję..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Łączenie z $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Połączenie nieudane. Błąd: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tNadeszło żądanie CTCP $1 od użytkownika $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tNadeszło żądanie CTCP $1 od użytkownika $2 (do $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tNadeszło żądanie CTCP Sound $1 od użytkownika $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tNadeszło żądanie CTCP Sound $1 od użytkownika $2 (do $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tOdbieranie Czat Bezpośredni z użytkownikiem %C26$1%O zakończony."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tCzat Bezpośredni rozpoczęty z użytkownikiem %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tCzat Bezpośredni z użytkownikiem %C26$1%O przerwany ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tNadeszło zaproszenie na Czat Bezpośredni od użytkownika $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tWysyłam zaproszenie na Czat Bezpośredni do użytkownika $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tZaproszenie na Czat do użytkownika $1 już wcześniej zostało wysłane"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tPróba nawiązania Połączenia Bezpośredniego $1 z użytkownikiem%C26 $2%O nie powiodła się (błąd=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tOdebrałem '$1%O' od użytkownika $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Typ  do/z    Stan  Rozmiar    Poz     Plik         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tNadszedł nieprawidłowy wniosek Czatu Bezpośredniego od %C26$1%O.%010%C22*%O$tZawartość pakietu: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tOferuję%C26 $1%O użytkownikowi%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNie ma takiej oferty Czatu Bezpośredniego."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tOdbieranie%C26 $2%O Czatu Bezpośredniego od użytkownika%C26 $1%O zakończone."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tOdbieranie%C26 $1%O Czatu Bezpośredniego z%C26 $3%O gotowe %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tPołączenie odbierania Czatu Bezpośredniego zrealizowane do%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tOdbieranie Czatu Bezpośredniego%C26 $1%O z%C26 $3%O nie powiodło się ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tOdbieranie Czatu Bezpośredniego: Nie można otworzyć $1 do pisania ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tPlik%C26 $1%C już istnieje, zapisuje go w zamian jako%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Owystąpił z wnioskiem o wznowienie%C26 $2 %Cz%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tWysyłanie%C26 $2%O Czatu Bezpośredniego do użytkownika%C26 $1%O zakończone."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tWysyłanie%C26 $1%O Czatu Bezpośredniego do%C26 $2%O gotowe %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tPołączenie wysyłania Czatu Bezpośredniego zrealizowane z%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tWysyłanie Czatu Bezpośredniego%C26 $1%O do%C26 $2%O nie powiodło się. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ozaoferował%C26 $2 %O(%C26$3 %Obajtów)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oprzy%C26 $3 %Czawieszony - przerywam."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oprzy%C26 $3 %Oprzekroczył czas - przerywam."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 usunięty z listy powiadomień."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tRozłączony ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tTwój adres IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O dodano do listy ignorowanych."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Sposób ignorowania użytkownika %C26$1%O został zmieniony."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Maska hosta                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O usunięty z listy ignorowanych."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "Lista ignorowanych jest pusta."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNie możesz wejść do pokoju%C26 %B$1 %O(Wymagane jest zaproszenie)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tOtrzymałeś/aś zaproszenie do pokoju%C26 $1%O od użytkownika%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) wchodzi do pokoju $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNie możesz wejść do pokoju%C26 %B$1 %O(Wymagane jest podanie hasła)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 wyprosił/a użytkownika $2 z pokoju $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tZostałeś/aś rozłączona przez Operatora o pseudonimie $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Odpuszczony."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 jest obecnie używany. Próbuję ponownie z $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tPseudonim jest obecnie używany przez kogoś innego. Użyj polecenia /NICK aby wybrać inny."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNie ma takiego Czatu Bezpośredniego."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tAktualnie nie ma uruchomionego procesu"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLista powiadomień jest pusta."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Lista Powiadomień                     "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 użytkowników na liście powiadomień."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tPowiadomienie: $1 właśnie opuścił/a czat ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tPowiadomienie: $1 właśnie się pojawił/a ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) opuścił/a pokój $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) opuścił/a pokój $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tOdpowiedź na ping $1: $2 sekund(y)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tBrak odpowiedzi na ping przez $1 sekund, rozłączanie."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tProces jest już uruchomiony"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 opuścił/a czat (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 ustawia opcje%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Operatorzy%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tSzukam numeru IP dla%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Połączony."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Szukam $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tZatrzymano poprzednie próby połączenia (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Temat rozmowy w pokoju $1%C %C29to: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 zmienia temat rozmowy na: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Temat w pokoju $1%C %C29został ustawiony przez $2%C %C29, dnia: $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tNieznany host. Może jest błąd w pisowni?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNie możesz wejść do pokoju%C26 %B$1 %O(Limit użytkowników został wyczerpany)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Użytkownicy w pokoju $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cjest nieobecny %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OKoniec listy WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nieaktywny%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nieaktywny%C26 $2%O, zalogowany od:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oprawdziwy user@host%C27 $2%O, prawdziwy adres IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Teraz rozmawiasz w pokoju $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tZostałeś/aś wyproszony/a z pokoju $2 przez $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tOpuszczasz pokój $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tOpuszczasz pokój $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tZaprosiłeś%C26 $1%O do%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tZmieniasz pseudonim na $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Nie można odczytać pliku dźwiękowego:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Odległy host zamknął połączenie"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Odmowa połączenia"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Brak drogi do hosta"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Połączenie wygasło"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nie można przypisać tego adresu"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Połączenie zerwane przez drugą stronę"
 
@@ -2876,13 +2888,13 @@ msgstr "Nie można połączyć się z busem sesji: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Nie można nabyć %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "O programie"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Wieloplatformowy Program do Czatowania"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/pt.po b/po/pt.po
index da74a4e4..d24d0637 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Estou ocupado"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Saindo"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Não é possível aceder a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Erro"
 
@@ -750,7 +750,7 @@ msgstr "Transferência pelo proxy falhou.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "A alternar para o servidor seguinte em %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Aviso: o carácter \"%s\" é desconhecido. Não vai ser aplicada conversão à rede %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 adicionado à lista de notificações."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Lista de Interditos:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNão pode entrar%C26 %B$1 %O(Está interdito)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 agora chama-se $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 interditou $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tCanal $1 criado em $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O retirou o estatuto semi-operador de%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O retirou o estatuto de operador de%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O retirou voz de%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 torna isento $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O coloca o modo de semi-operador a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 oferece convite a $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UCanal         Utilizadores   Topico"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 coloca o modo $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Channel $1 modos: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O coloca o modo de operador a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 retira isenção a $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 retira convite a $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 retira a palavra-chave do canal"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 retira o limite de utilizadores"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 coloca a palavra-chave do canal para $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 limite o canal a $2 utilizadores"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 retira a interdição a $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O oferece voz a%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Ligado. A iniciar sessão..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22A ligar a $1 ($2) porto $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Ligação falhou. Erro: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tRecebeu um CTCP $1 de $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecebeu um CTCP $1 de $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tRecebeu um Som CTCP $1 de $2 (para $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tConversa DCC com %C26$1%O cancelada."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tConversa DCC estabelecida com %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tConversa DCC com %C26$1%O perdida ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tRecebeu uma conversa DCC de $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tOferecendo conversa DCC a $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tConversa DCC já oferecida a $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tRecebeu '$1%O' de $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Tipo  De/Para    Estado  Tamanho    Pos     Ficheiro     "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tRecebeu um pedido DCC inválido de %C26$1%O.%010%C22*%O$tConteúdo do pacote: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tA oferecer%C26 $1%O a%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tOferta DCC inexistente."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O a%C26 $1%O cancelado."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O de%C26 $3%O completo %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV ligação estabelecida com%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O de%C26 $3%O falhou ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Não foi possível abrir $1 para escrita ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tO ficheiro%C26 $1%C já existe, a gravar como%C26 $2%O"
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Opediu para continuar%C26 $2 %Cde%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O para%C26 $2%O completo %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND ligação estabelecida com%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O para%C26 $2%O falhou. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oofereceu%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Opara%C26 $3 %Cparado - a cancelar."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Oesgotou o tempo - a cancelar"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 removido da lista de notificações."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tDesligou ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tO seu IP foi encontrado: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O adicionado à lista de ignorados."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Entrada %C26$1%O da lista de ignorados foi alterada."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O retirado da lista de ignorados."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Lista de ignorados vazia."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNão pode entrar em %C26 %B$1 %O(Canal exclusivo a convidados)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tFoi convidado para%C26 $1%O por%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) entrou em $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNão pode entrar em%C26 %B$1 %O(Palavra-chave necessária)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 expulsou $2 de $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tFoi morto por $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Ignorado."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 já está a ser usado. A tentar com $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tNick já em utlização. Use /NICK para tentar outro."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDCC inexistente."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tNão está nenhum processo a correr"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLista de notificações vazia."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Lista de Notificações                 "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 utilizadores na lista de notificações."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotificação: $1 está desligado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotificação: $1 está ligado ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) saiu de $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) saiu de $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tResposta Ping de $1: $2 segundo(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tSem resposta ping durante $1 segundos, a desligar."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tUm processo já está a correr"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 saiu (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 activa modos%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tÀ procura do IP de%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Ligado."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22A procurar $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tTentativa anterior de ligação terminada (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Tópico para $1%C %C29é: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 mudou o tópico para: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Tópico para $1%C %C29colocado por $2%C %C29a $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tEndereço desconhecido. Enganou-se no endereço?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNão pode entrar em%C26 %B$1 %O(Limite de utilizadores atingido)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Utilizadores em $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cestá ausente %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFim da lista WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inactivo%C26 $2%O, ligou-se:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19A conversar em $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tFoste expulso de $2 por $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tSaíste do canal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tSaíste do canal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tConvidaste%C26 $1%O para%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tAgora chama-se $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Não foi possível ler ficheiro de som:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Cliente remoto desligou"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Ligação recusada"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Não existe caminho para o endereço"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Ligação excedeu o tempo limite"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Não é possível atribuir o endereço"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Ligação terminada no destino"
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Cliente de IRC multiplataforma"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 62e976ba..0e66f86f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/hexchat/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Estou ocupado"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Sair"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -64,7 +64,7 @@ msgstr "Impossível acessar %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Erro"
 
@@ -752,7 +752,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -760,51 +760,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -812,271 +812,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1084,149 +1089,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1716,27 +1728,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Tempo esgotado para conexão"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2878,12 +2890,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Sobre."
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/ru.po b/po/ru.po
index a4f15fba..9276ca3f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Я занят"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Ухожу я от вас"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -64,7 +64,7 @@ msgstr "Нет доступа к %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Ошибка"
 
@@ -752,7 +752,7 @@ msgstr "Ошибка прохождения через прокси.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Переключаемся к следующему серверу %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -760,474 +760,486 @@ msgid ""
 msgstr "Предупреждение: кодировка \"%s\" неизвестна. Трансляции для %s сети не будет."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 добавлен в список извещений."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 список банов:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНе получается войти на%C26 %B$1 %O(Вы забанены)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 теперь известен как $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 забанил некоего $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tКанал $1 создан в $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O убрал права полуоператора с%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O убрал права оператора канала с%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O забрал голос у%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 установил исключение на $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O установил права полуоператора канала для%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 приглашает на $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UКанал          Пользователи   Тема"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 установил режим $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Канал $1 режимы: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дал статус оператора канала %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 убрал освобождение с $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 снял приглашение для $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 убрал ключевые слова канала"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 убрал лимит пользователей"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 установил следующие ключевые слова канала $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 установил лимит канала в $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 убрал бан с $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O дал голос%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Соединение установлено. Входим в сеть..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Соединение с $1 ($2) порт $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Соединение невозможно. Ошибка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tПолучен CTCP $1 от $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tПолучен CTCP $1 от $2 (для $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2 "
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tПолучен CTCP звук $1 от $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tПолучен CTCP Звук $1 от $2 (для $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT с %C26$1%O прерван."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT соединение установлено с %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT с %C26$1%O потеряно ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tПринят запрос на DCC CHAT от $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tПредлагаем DCC CHAT для $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tУже предложен CHAT с $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 попытка соединения с%C26 $2%O неудачна (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tПринято '$1%O' от $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Type  В/От    Состояние  Размер    Позиция     Файл         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tПринят неверный DCC-запрос от %C26$1%O.%010%C22*%O$tСодержимое пакета: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tПредлагаем%C26 $1%O для%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tНет такого предложения DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O с%C26 $1%O прервано."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O от%C26 $3%O завершено %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV соединение установлено с%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O от%C26 $3%O сбой ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Не могу открыть $1 для записи ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tФайл%C26 $1%C уже существует, сохраняем его как%C26 $2%O вместо этого."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oзапрос на продолжение%C26 $2 %Cот%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O к%C26 $1%O прервано."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O к%C26 $2%O завершено %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND соединение установлено с%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O для%C26 $2%O провален. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oпредложил(а)%C26 $2 %O(%C26$3 %Oбайт)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cнет данных - прервано."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oс%C26 $3 %Oпрерывание по таймауту."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 удалено из списка уведомлений."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tСоединение разорвано ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tНайти ваш IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O добавлен в список игнорирования."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Игнорирование %C26$1%O изменено."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                               "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG"
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O удален из списка игнорирования."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Список игнорирований пуст."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНевозможно подключиться%C26 %B$1 %O(Канал только по приглашениям)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tВы приглашены на %C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) зашел на канал $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22-*%O$tНевозможно подключится %C26 %B$1 %O(Требуется ключевое слово)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 выкинул $2 с $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t$1 изгнал вас с канала ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Пропущен."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 уже используется. Пытаемся как $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tНик уже используется. Используйте /NICK, чтобы попробовать другой."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tНет такого DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tНет запущенного процесса"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tСписок уведомлений пуст."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Список уведомлений                        "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 пользователей в списке уведомлений."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tУведомление: $1 отключен ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tУведомление: $1 подключен ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) покинул $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) покинул $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing ответ от $1 : $2 секунд(ы)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tНе получено ответов в течении $1 секунд.Отсоединение."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tПроцесс уже запущен"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 ушел (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 установил режимы%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2 "
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tПоиск IP-адреса для%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Соединение установлено."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Ищу $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tОстановлена предыдущая попытка соединения (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Тема для $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 изменил тему на: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Тема для $1%C %C29 установлена $2%C %C29в $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНеизвестный хост. Возможно, вы ошиблись?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНевозможно зайти%C26 %B$1 %O(Лимит пользователей исчерпан)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26пользователей на $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3 "
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cнедоступен %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2 "
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКонец списка WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O не работает %C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O не работает%C26 $2%O, подписан:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oнастоящие пользователь@машина%C27 $2%O, настоящий IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Сейчас общаетесь на $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3 изгнал вас из канала $2 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tВы ушли с канала $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tВы ушли из канала $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tВы пришласили%C26 $1%O на канал%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tТеперь вы известны как $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1716,27 +1728,27 @@ msgid ""
 "%s"
 msgstr "Невозможно прочитать звуковой файл:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Удаленная машина закрыла сокет"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Соединение отвергнуто"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Нет маршрута к хосту"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Истечение времени ожидания соединения"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Не могу назначить этот адрес"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Соединение оборвано"
 
@@ -2878,13 +2890,13 @@ msgstr "Не удалось подключиться к сеансовой ши�
 msgid "Failed to acquire %s: %s\n"
 msgstr "Не удалось получить %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "О программе"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Многоплатформенный IRC-клиент"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/rw.po b/po/rw.po
index 857936b8..381ca01e 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -25,15 +25,15 @@ msgstr ""
 "Language: rw\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr ""
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr ""
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -70,7 +70,7 @@ msgstr ""
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Ikosa"
 
@@ -758,7 +758,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -766,51 +766,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -818,271 +818,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1090,149 +1095,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1722,27 +1734,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2884,12 +2896,12 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
 msgstr ""
 
 #: src/fe-gtk/ascii.c:133
diff --git a/po/sk.po b/po/sk.po
index 7d91431c..b817c2d3 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Pracujem"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Odchádzam"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -64,7 +64,7 @@ msgstr "Nepodaril sa prístup k %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Chyba"
 
@@ -752,7 +752,7 @@ msgstr "Spojenie cez proxy zlyhalo.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Skúšam ďalší server v %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -760,474 +760,486 @@ msgid ""
 msgstr "Pozor: kódová stránka \"%s\" je neznáma. Na sieť %s nebude aplikovaná žiadna konverzia."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 pridané do zoznamu upozornení."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "-%C22*%O$t$1 Zoznam zákazov: %C19·$4%C20·$2%C21·$3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNemôžem vstúpiť na%C26·%B$1·%O(Ste v zozname zákazov)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 sa premenoval na $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 nastavil zákaz pre $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanál $1 vytvorený $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstránil stav half-operator kanálu pre %C26·$2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstránil stav operator kanálu pre %C26·$2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstránil voice používateľovi %C26·$2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 nastavil výnimku pre $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal stav half-operator kanálu používateľovi%C26·$2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 nastavil kanál $2 len pre pozvaných"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanál           Používatelia   Téma"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 nastavil mód $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanál $1 módy: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal stav half-operator kanálu používateľovi%C26·$2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 odstránil výnimku pre $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 odstránil pozvanie pre $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 odstránil heslo kanálu"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 odstránil limit používateľov"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 nastavil heslo kanálu na $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 nastavil limit kanálu na $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 odstránil zákaz pre $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dal voice používateľovi%C26·$2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Pripojený. Teraz sa prihlasujem..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Pripájam sa k $1·($2)·port·$3%O.."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Spojenie zlyhalo. Chyba: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tPrijatý CTCP $1 od $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tPrijatý CTCP $1 od $2 (do $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP·$2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tPrijatý CTCP Sound $1 od $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT k %C26$1%O ukončený."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tBolo vytvorené DCC CHAT spojenie k %C26$1·%C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT s %C26$1%O zrušený ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tPrijatá ponuka na DCC CHAT od $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tPonúkam DCC CHAT používateľovi $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tUž existuje ponuka CHAT pre $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 pokus o spojenie s%C26·$2%O zlyhalo (chyba=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tPrijaté '$1%O' od $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18·Typ··Komu/Od····Stav··Veľkosť····Poz·····Súbor·········"
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tPrijatá neplatná požiadavka DCC od %C26$1%O.%010%C22*%O$tObsah paketu: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tPonuka%C26·$1%O pre%C26·$2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTaká ponuka DCC neexistuje."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC·RECV%C26·$2%O·pre%C26·$1%O·ukončené."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC·RECV%C26·$1%O·od%C26·$3%O·dokončené·%C30[%C26$4%O·cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC·RECV·vytvorené spojenie k%C26·$1·%C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O·od%C26·$3%O·zlyhalo·($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Nepodarilo sa otvoriť $1 pre zápis ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tSúbor%C26·$1%C už existuje, namiesto neho ukladám ako%C26·$2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1·%Opožaduje obnoviť%C26·$2·%Cod%C26·$3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC·SEND%C26·$2%O·k%C26·$1%O ukončené."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC·SEND%C26·$1%O·k%C26·$2%O dokončené %C30[%C26$3%O·cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND vytvorené spojenie k%C26·$1·%C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26·$1%O·k%C26·$2%O·zlyhalo.·$3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1·%Oponúka%C26·$2·%O(%C26$3·%Obajtov)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC·$1%C26·$2·%Ok%C26·$3·%Czastavené - končím."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC·$1%C26·$2·%Ok%C26·$3·%Očas vypršal - končím."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 odstránený zo zoznamu upozornení."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tOdpojený ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tNájdená vaša IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O pridaný do zoznamu ignorovaných."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "ignorácia pre %C26$1%O zmenená."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18······························································"
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Maska hostiteľa          SÚKR UPOZ KAN CTCP DCC POZV ODIGN "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O odstránené zo zoznamu ignorovaných."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Zoznam ignorovaných je prázdny."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNemôžem vstúpiť na%C26·%B$1·%O(Kanál iba pre pozvaných)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tBoli ste pozvaný na%C26·$1%O od používateľa %C26·$2%C·(%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1·%B($3) vstúpil na $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNemôžem vstúpiť na%C26·%B$1·%O(Je potrebné heslo)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1·vykopol $2 z $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tZabil vás $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD preskočená."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 sa už používa. Nový pokus s $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tPrezývka je už použitá. Použite /NICK pre inú prezývku."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTaké DCC neexistuje."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tMomentálne nebeží žiadny proces"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tZoznam upozornení prázdny."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18·%B··Zoznam upozornení···························"
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 používateľov na zozname upozornení."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1·(%O%C23$2) opustil $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tOdpoveď ping od $1: $2 sekúnd"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNeprišla ping odpoveď za $1 sekúnd, odpájam."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tA proces už beží"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 nastavil módy%B·%C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tHľadám IP adresu pre%C26·$1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Pripojený."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Zisťujem $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tZastavený predchádzajúci pokus o spojenie (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Téma pre $1%C·%C29je: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 zmenil tému na: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Téma pre $1%C·%C29, nastavil $2%C·%C29 $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tNeznámy hostiteľ. Je správne zadaný?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNemôžem vstúpiť na%C26·%B$1·%O(Dosiahnutý maximálny počet používateľov)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Používatelia na $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]·%O$2%C27·$3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28]·%Cje neprítomný %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O·$2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28]·%OKoniec zoznamu WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nečinný%C26·$2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O·nečinný%C26·$2%O, prihlásenie:%C26·$3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]·%Oskutočný user@host%C27·$2%O, skutočná IP%C27·$3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Teraz hovoríte na $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tBoli ste vykopnutý z $2 používateľom $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tOpustili ste kanál $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tBoli ste pozvaný%C26·$1%O·na%C26·$2%O·(%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tTeraz ste známy ako $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1716,27 +1728,27 @@ msgid ""
 "%s"
 msgstr "Nemôžem prečítať zvukový súbor:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Vzdialený hostiteľ zatvoril soket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Spojenie odmietnuté"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Cesta k hostiteľovi neexistuje"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Časový limit pre spojenie vypršal"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nepodarilo sa priradiť adresu"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Spojenie zrušené druhou stranou"
 
@@ -2878,13 +2890,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Multiplatformný IRC klient"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/sl.po b/po/sl.po
index d51a40a1..ed1f9630 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,15 +20,15 @@ msgstr ""
 "Language: sl\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Ne utegnem"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Odhajam"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -65,7 +65,7 @@ msgstr "Ne morem dostopati do %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Napaka"
 
@@ -753,7 +753,7 @@ msgstr "Prečkanje proxyja neuspešno.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Povezujem se z naslednjim strežnikom v %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -761,474 +761,486 @@ msgid ""
 msgstr "Pozor: \"%s\" je neznan kodni nabor. Za omrežje %s ne bo uporabljena nobena pretvorba."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 dodan na seznam za obveščanje."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Seznam prepovedi:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNe morem se pridružiti%C26 %B$1 %O(Imate prepoved)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 se odslej imenuje $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 je nastavil prepoved na $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanal $1 ustvarjen $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstrani status polovični-op vzdevku%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstrani status op vzdevku%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O odstrani glasovni privilegij vzdevku %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 je nastavil izjemo za $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dodeli status polovični-op vzdevku%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 je povabil za $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanal         Uporabnikov   Tema"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 je nastavil izbiro na $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Možnosti kanala $1 : $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dodeli status op vzdevku%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 je odstranil izjemo za $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 je odstranil povabilo za $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 je odstranil ključ na kanalu"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 je odstranil omejitev uporabnikov"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 je nastavil ključ na $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 je nastavil omejitev uporabnikov na $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 je odstranil prepoved za $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O dodeli glasovni privilegij vzdevku %C11$2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Povezan. Prijava poteka..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Povezujem se z $1 ($2), vrata $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Povezava spodletela. Napaka: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tPrejet CTCP $1 od $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tprejet CTCP $1 od $2 (za $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tPrejet CTCP zvok $1 od $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tPrejet CTCP zvok $1 od $2 (za $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT za %C26$1%O opuščen."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT povezava z %C26$1 %C30[%O$2%C30] vzpostavljena"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT za %C26$1%O izgubljen. $4."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t$1 pošilja ponudbo za DCC POGOVOR"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tPonujam DCC POGOVOR $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tŽe ponujam DCC POGOVOR $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 poskus povezave z %C26 $2%O  ni uspel (napaka=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tPrejet '$1%O' od $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Vrsta Od/Za      Stanje  Velikost Prenešeno Datoteka         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tPrejet pomanjkljiv zahtevek DCC od %C26$1%O.%010%C22*%O$tVsebina paketa: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tPonujam %C26 $1%O%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tTak ponujen DCC ne obstaja."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O za%C26 $1%O opuščen."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O od%C26 $3%O je končano %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV povezava vzspostavljena z %C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV %C11$1%O od %C26 $3%O ni uspel. $4."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "-%C10-%C11-%O$tDCC PREJEMANJE:  Ne morem odpreti $1 za pisanje ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tDatoteka%C26 $1%C že obstaja, zato jo shranjujem kot %C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %O zahteva nadaljevanje%C26 $2 %Cod%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND %C26 $2%O za%C26 $1%O opuščen."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC PRENAŠANJE%C26 $1%O za%C26 $2%O končano %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND povezava vzspostavljena z %C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O za%C26 $2%O ni uspel. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oponuja%C26 $2 %O(%C26$3 %Obajtov)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "-%C22*%O$tDCC $1%C26 $2 %Oza%C26 $3 %Cje obstal - opuščam."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oza%C26 $3 %Očas se je iztekel - opuščam."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 izbrisan iz seznama za obveščanje."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tPovezava prekinjena ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tVaš IP najden: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O dodan na seznam za spregledovanje."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Spregledovanje na %C26$1%O spremenjeno."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Maska gostitelja                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O odstranjen iz seznama za spregledovanje."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Seznam za spregledovanje je prazen."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tNe morem se pridružiti%C26 %B$1 %O(Pridružite se lahko samo na povabilo)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C26 $2%C vas je povabil na %C26 $1%O"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) se je pridružil $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNe morem se pridružiti%C26 %B$1 %O(Zahtevana je skrivna beseda)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 je brcnil $2 iz $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t$1ˇ($2%O%C22) vas je ubil"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD preskočen."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 je že v uporabi. Poskušam z $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tVzdevek že v uporabi. Uporabite /NICK, da si izberete drugega."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tTa DCCja ne obstaja."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tTrenutno ni tekočih procesov"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "Seznam za obveščanje je prazen."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Seznam za obveščanje                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 uporabniki v seznamu za obveščanje."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) je zapustil $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) je zapustil $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing odgovor od $1 : $2 sekund"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tNi ping odgovora že $1 sekund, prekinjam povezavo."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tProces že teče"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 je odšel (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 je nastavil možnosti%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tIščem IP številko za%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Povezan."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Iščem $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tZadnji poskus povezovanja je ustavljen (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Tema za $1%C %C29 je $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 je spremenil temo v: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Temo za $1%C %C29 je nastavil $2%C %C29obˇ$3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tNeznan gostitelj. Mogoče je črkovanje napačno?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNe morem se pridružiti%C26 %B$1 %O(Omejitev uporabnikov presežena)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Uporabniki na $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cje odsoten %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OKonec WHOIS seznama."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O neaktiven%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O neaktiven %C26 $2%O, prijava: %C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Opravi uporabnik@gostitelj%C27 $2%O, pravi IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Zdaj govorite na $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3ˇ ($4%O%C23) vas je brcnil iz $2"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tZapustili ste kanal $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tZapustili ste kanal $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tPovabili ste%C26 $1%O na%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tOdslej ste znani kot $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1717,27 +1729,27 @@ msgid ""
 "%s"
 msgstr "Ne morem prebrati zvočne datoteke:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Oddaljeni gostitelj je zaprl povezavo"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Povezava je bila zavrnjena"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ni poti do gostitelja"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Čas za povezavo se je iztekel"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Ne morem prijaviti tega naslova"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Povezava je bila prekinjena"
 
@@ -2879,13 +2891,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "IRC odjemalec za več platform"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/sq.po b/po/sq.po
index d56fc444..928f0f8e 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/hexchat/language/sq/)\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jam i zënë"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Po iki"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "S'mund të futem në %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Gabim"
 
@@ -750,7 +750,7 @@ msgstr "\"Proxy traversal\" dështoi.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Po ciklhet te shërbyesi pasues në %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Kujdes: Gërmat \"%s\" janë të panjohura. Nuk do të zbatohet ndonjë shndërrim për rrjetin %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 u shtua te lista njofto."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Listë ndalimesh:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tNuk bashkohet dot me%C26 %B$1 %O(Ju është ndaluar)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 njihet si $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 vendos ndalim mbi $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanal $1 krijuar në $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i heq%C26 $2 gjendjen gjysmë-operator kanali"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i heq%C26 $2 gjendjen operator kanali"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i heq%C26 $2 zërin"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 vendos përjashtim ndaj $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i jep%C26 $2 gjendjen gjysmë-operator kanali"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 cakton ftesë në $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanal          Përdoruesa   Temë"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 cakton mënyrë $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanal $1 mënyra: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i jep%C26 $2 gjendjen operator kanali"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 heq përjashtim ndaj $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 heq ftesë nga $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 heq fjalëkyça kanali"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 heq kufi përdoruesi"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 cakton si fjalëkyç kanali $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 vendos kufi kanali në $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 heq ndalim për $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O i jep zë%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22I lidhur. Tani po futem.."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Po lidhem me $1 ($2) porta $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Lidhja dështoi. Gabim: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tErdhi një CTCP $1 prej $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tErdhi një CTCP $1 prej $2 (te $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tErdhi një Tingull CTCP $1 prej $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tErdhi një Tingull CTCP $1 prej $2 (te $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tFJALOSJA DCC te %C26$1%O dështoi."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tLidhje FJALOSJEJE DCC me %C26$1 %C30[%O$2%C30] e vendosur"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tFjalosje DCC me %C26$1%O e humbur ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tErdhi një ofertë FJALOSJEJE DCC prej $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tPo ofrohet FJALOSJE DCC për $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tKeni ofruar një herë FJALOSJE për $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 dështoi përpjekja për lidhje me%C26 $2%O (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tMora '$1%O' prej $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Lloj  Prej/Për    Gjendje  Madhësi    Pos     Kartelë         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tErdhi prej %C26$1%O një kërkesë DCC e keqformuar.%010%C22*%O$tPërmbajtje pakete: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tPo ofroj%C26 $1%O te%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tNuk ka një ofertë DCC të tillë."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O për%C26 $1%O dështoi."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O prej%C26 $3%O e plotësuar %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tLidhje DCC RECV me%C26 $1 %C30[%O$2%C30] e vendosur"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O prej%C26 $3%O dështoi ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Nuk hap dot $1 për shkrim ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tKa tashmë një kartelë%C26 $1%C, ndaj po e ruaj te%C26 $2%O ndryshe."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oka kërkuar të rimarrë%C26 $2 %Cprej%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O te%C26 $1%O u ndërpre."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O te%C26 $2%O i plotësuar %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tLidhje DCC SEND me%C26 $1 %C30[%O$2%C30]e vendosur"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O te%C26 $2%O dështoi. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oka ofruar%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Ote%C26 $3 %Cu bajatos - po e ndërpres."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC-s $1%C26 $2 %Ote%C26 $3 %Oi mbaroi koha - po e ndërpres."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 u hoq prej liste njoftimesh."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tI shkëputur ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tU gjet IP-ja juaj: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ju shtua listës së shpërfilljeve."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "U ndryshua shpërfill mbi %C26$1%O."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Strehëmaskë                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O hequr prej liste shpërfill."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "Lista shpërfill është e zbrazët."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tnuk mund t'i bashkangjitet%C26 %B$1 %O(Kanali është vetëm me ftesa)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tJeni ftuar te%C26 $1%O prej%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) i është bashkuar $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tNuk mund të bashkohet me%C26 %B$1 %O(Lipset fjalëkyç)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ka përzënë $2 prej $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tJeni asgjësuar prej $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD Anashkaluar."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 tashmë i përdorur. Po provohet $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tNofkë tashmë në përdorim. Përdorni /NICK për të provuar një tjetër."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tNuk ka DCC të tillë."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tPër çastin nuk ka proces në xhirim"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tLista njofto është e zbrazët."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Listë Njoftimesh                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 përdoruesë në listë njoftimesh."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotify: $1 është i palidhur ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotify: $1 është i lidhur ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ka ikur $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ka ikur $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPërgjigje ping prej $1 : $2 sekonda"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tPa përgjigje ping për $1 sekonda, po shkëputem."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tKa një proces në xhirim e sipër"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 ka lënë (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 cakton mënyra%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tPo kërkohen numra IP për%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22I lidhur."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Po kërkohet $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tU ndalua përpjekja e mëparshme për lidhje (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Temë për $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ka ndryshuar temën në: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Temë për $1%C %C29e caktuar prej $2%C %C29më $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tStrehë e panjohur. Mundet e shkruajtët keq?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tNuk mund të bashkoheni me%C26 %B$1 %O(Është arritur kufi përdoruesish)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Përdoruesa në $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cka dalë %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OFund i listës WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O pa ngarkesë%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O p ngarkesë%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Opërdorues real@host%C27 $2%O, IP reale%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Tani po flisni tek $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tJeni përzënë prej $2 nga $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tKeni lënë kanalin $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tKeni lënë kanalin $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tKeni ftuar%C26 $1%O te%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tTani njiheni si $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "S'lexohet dot kartelë tingulli:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Streha e largët mbylli \"socket\"-in"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Ndërlidhje e papranuar"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "S'ka udhë për te strehë"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Mbaroi koha e ndërlidhjes"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Nuk mund të caktohet ajo vendndodhje"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Lidhje e rivendosur nga tjetri"
 
@@ -2876,13 +2888,13 @@ msgstr "S'u lidh dot me busin e sesionit: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Dështoi në pasjen e %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Rreth"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Një Klient IRC shumëplatformësh"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/sr.po b/po/sr.po
index 6ffcb633..778ad4b8 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: sr\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Заузет сам"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Одлазим"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Нема приступа %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Грешка"
 
@@ -750,7 +750,7 @@ msgstr "Неуспео контакт са заступником.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Покушавам везу са следећим сервером у %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "Упозорење: Скуп знакова „%s‟ није познат. За мрежу %s се зато неће користити конверзија."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 додат на списак посматраних."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Забране:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНе успева прикључење%C26 %B$1 %O(имате забрану)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "Име %C22*%O$t$1 је промењено у $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 поставља забрану на $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tНаправљен је нови канал $1 на $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O укида звање полу-оператора за %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O укида звање оператора за %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O одузима реч од %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 поставља изузеће за $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O додељује звање полу оператора за %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 позива на прикључење на $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UКанал            Бр.кор. Тема"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 поставља приступну ознаку на $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Канал $1 приступне ознаке: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O додељује звање оператора за%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 уклања изузеће за $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 уклања позив за прикључење на $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 уклања кључну реч за канал"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 укида највећи дозвољени број корисника на каналу"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 поставља кључну реч за канал на $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 поставља највећи дозвољени број корисника на $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 уклања забрану за $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O даје реч за %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Повезивање је успело. Пријава у току..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22У току је повезивање на $1 ($2) порт $3%O.."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Повезивање није успело. Јављена је грешка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tПримљен је CTCP захтев $1 од $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tПримљен је CTCP захтев $1 од $2 (за $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tПримљен је CTCP звук $1 од $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tПримљен је CTCP звук $1 од $2 (за $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tПрекинут је DCC разговор са %C26$1%O."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tУспостављен је разговор путем DCC са %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tРазговор путем DCC са %C26$1%O је прекинут услед грешке. $4."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tПримљена је понуда за разговор путем DCC од $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tНудим разговор путем DCC за $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t$1 већ има понуду за разговор одавде"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 повезивање са%C26 $2%O неуспело (грешка=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tПреузета датотека '$1%O' од $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Врста  Од/за     Стање   Вел.    Место   Датотека    "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tПримљен је неисправан DCC захтев од %C26$1%O.%010%C22*%O$tСадржај пакета: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tНудимо %C26$1 %O за %C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tОва DCC понуда не постоји."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV %C126$2%O за%C26 $1%O прекинут."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O од%C26 $3%O обављено %C30[%C26$4%O зн./сек.%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV веза успостављена са%C26 $1 %C30[%O$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O од%C26 $3%O неуспела. $4."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Не може се писати у $1 ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tДатотека%C26 $1%C већ постоји, снимам под именом%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Cтражи да се настави%C26 $2 %Cод%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O за%C26 $1%O је прекинут."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O за%C26 $2%O обављен %C30[%C26$3%O зн./сек.%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND веза успостављена са%C26 $1 %C30[%O$2%C30]%O"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND веза%C26 $1%O са%C26 $2%O није успела. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Cје понудио%C26 $2 %C(%C26$3 %Cбајт((ов)а))"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Cза%C26 $3 %Cзаостаје - прекидам."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Cка%C26 $3 %Cје истекао - прекидам."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 избрисан са списка посматраних."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tИскључен ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tВаш IP број је: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O додат у списак ућутканих."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Занемари кад се промени%C26 $1%O."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Образац за име хоста      PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O избрисан са списка ућутканих."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Списак ућутканих је празан."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНије могуће прикључити се на%C26 %B$1 %O без позива."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tПозвани сте на канал%C26 $1%C, позвао је%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) дошао на $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tНије могуће прокључити се на%C26 %B$1 %O без знања кључне речи."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 је избацио $2 са $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tОдстранио вас је $1 ($2%O)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22Прескочили смо вести дана."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$tИме $1 неко већ користи. Пробам да користим $2.."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tНеко већ користи ово име. Можете користити команду /NICK да пробате неко друго име."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDCC захтев не постоји."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tНиједан процес није покренут."
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tСписак посматраних је празан."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Списак посматраних                    "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 корисници на списку посматраних."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) оде $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) оде са $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tВреме одзива за $1 у секундама: $2"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tОдзив је изостао за $1 сек., искључујем се."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tПроцес је већ покренут"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 оде (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 поставља приступ%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tТражим IP број за%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Повезан."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Тражим%C26 $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tПретходно успостављање везе је прекинуто (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Тема за%C29 $1%C %C29је: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 променио је тему у: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Тему за $1%C %C29поставио је $2%C %C29у $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНепознато име рачунара. Можда је погрешно откуцано?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНије могуће ући на%C26 %B$1 %O јер је достигнут највећи дозвољени број корисника."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Корисници на $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cје одсутан %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКрај списка за WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O неактиван%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O неактиван%C26 $2%O, пријављен:%C26 $3%O"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30) %O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oправи user@host%C27 $2%O, прави IP%C27 $3%O"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Сада причате на $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t вас је избацио са канала $2 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tНапустили сте канал $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tНапустили сте канал $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tЗовете%C26 $1%C на%C26 $2%C (%C26$3%C)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tПроменили сте име у $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "Датотека са звучним записом „%s‟ се не може очитати."
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Удаљени рачунар је прекинуо везу"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Веза одбијена"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Нема путање до рачунара"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Време за повезивање је истекло"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Не може се доделити та адреса"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Веза прекинута на другом крају"
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr "Не може се добавити %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Преносиви клијент за IRC"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/sv.po b/po/sv.po
index e3cec7aa..d81ea6ff 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Jag är upptagen"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Lämnar"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Kan inte komma åt %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Fel"
 
@@ -749,7 +749,7 @@ msgstr "Proxytraversering misslyckades.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Byter till nästa server i %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "Varning: Teckentabellen \"%s\" är okänd. Ingen konvertering kommer att tillämpas för nätverket %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 lades till i notifieringslistan."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Bannlysningslista:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tKan inte gå in i%C26 %B$1 %O(Du är bannlyst)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 är nu känd som $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ställer in bannlysning på $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKanalen $1 skapad på $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O tar bort halvkanaloperatörsstatusen från%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O tar bort kanaloperatörsstatus från%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O tar bort röststatus från%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 ställer in undantag på $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ger halvkanaloperatörsstatus till%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ställer in inbjudan på $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKanal          Användare Ämne"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ställer in läget $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kanal $1 lägen: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ger kanaloperatörsstatus till%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 tar bort undantag på $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 tar bort inbjudan på $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 tar bort kanallösenordet"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 tar bort användargräns"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ställer in kanallösenordet till $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ställer in kanalgränsen till $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 tar bort bannlysning av $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ger röststatus till%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Ansluten. Loggar in nu..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Ansluter till $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Anslutningen misslyckades. Fel: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tMottog ett CTCP $1 från $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tMottog ett CTCP $1 från $2 (till $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tMottog ett CTCP Sound $1 från $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tMottog ett CTCP Sound $1 från $2 (till $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT till %C26$1%O avbruten."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT-anslutning etablerad till %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT till %C26$1%O avbruten ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tMottog ett DCC CHAT-erbjudande från $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tErbjuder DCC CHAT till $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tErbjuder redan CHAT till $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 anslutningsförsök till%C26 $2%O misslyckades (fel=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tMottog \"$1%O\" från $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Typ   Till/Från  Status  Storlek Pos     Fil          "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tMottog en felaktigt utformad DCC-begäran från %C26$1%O.%010%C22*%O$tPaketets innehåll: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tErbjuder%C26 $1%O till%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tDet finns inget sådant DCC-erbjudande."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O till%C26 $1%O avbruten."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O från%C26 $3%O klar %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV-anslutning etablerad till%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O från%C26 $3%O misslyckades ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Kan inte öppna $1 för skrivning ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tFilen%C26 $1%C finns redan, sparar den som%C26 $2%O istället."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Ohar begärt att återuppta%C26 $2 %Cfrån%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O till%C26 $1%O avbruten."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O till%C26 $2%O klar %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND-anslutning etablerad till%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O till%C26 $2%O misslyckades. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ohar erbjudit%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Otill%C26 $3 %Cstannade - avbryter."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Otill%C26 $3 %Ogjorde timeout - avbryter."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 borttagen från notifieringslistan."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tKopplade från ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tHittade ditt IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O lades till i ignoreringslistan."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ignorering på %C26$1%O ändrades."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Värdmask                  PRIV NOTI KANA CTCP DCC  INBJ AVIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O togs bort från ignoreringslistan."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Ignoreringslistan är tom."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tKan inte gå in i%C26 %B$1 %O(Kanalen kräver inbjudan)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tDu har bjudits in till%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) gick in i $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tKan inte gå in i%C26 %B$1 %O(Kräver lösenord)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 har sparkat ut $2 från $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tDu har dödats av $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD hoppades över."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 används redan. Försöker igen med $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tSmeknamnet används redan. Använd /NICK för att försöka med ett annat."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tDet finns ingen sådan DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tIngen sådan process körs för tillfället"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tNotifieringslistan är tom."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Notifieringslista                     "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 användare på notifieringslistan."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tNotifiering: $1 är frånkopplad ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tNotifiering: $1 är ansluten ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) har lämnat $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) har lämnat $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPingsvar från $1: $2 sekund(er)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tInget pingsvar under $1 sekunder, kopplar från."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tEn process kör redan"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 har avslutat (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 ställer in lägena%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tSlår upp IP-numret för%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Ansluten."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Slår upp $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tStoppade föregående anslutningsförsök (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Ämnet för $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 har bytt ämne till: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Ämnet för $1%C %C29satt av $2%C %C29den $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tOkänd värd. Du kanske har stavat den fel?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tKan inte gå in i%C26 %B$1 %O(Användargränsen nådd)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Användare på $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cär frånvarande %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OSlut på WHOIS-lista."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inaktiv%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O inaktiv%C26 $2%O, påloggning:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Overklig användare@värd%C27 $2%O, riktig IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Pratar nu på $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tDu har sparkats ut från $2 av $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tDu har lämnat kanalen $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tDu har lämnat kanalen $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tDu bjuder in%C26 $1%O till%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tDu är nu känd som $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Kan inte läsa ljudfilen:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Fjärrvärden stängde uttaget (socket)"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Uppkoppling nekas"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Ingen väg till värden"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Anslutningen gjorde time-out"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Kan inte tilldela den adressen"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Anslutningen nollställdes av motparten"
 
@@ -2875,13 +2887,13 @@ msgstr "Kunde inte ansluta till sessionsbuss: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Misslyckades med att ta över %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "Om"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "En IRC-klient för flera plattformar"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/th.po b/po/th.po
index 1b5d582b..6cb51788 100644
--- a/po/th.po
+++ b/po/th.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "ฉันไม่ว่าง"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "กำลังออก"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "ไม่สามารถเข้าถึง %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "ข้อผิดพลาด"
 
@@ -750,7 +750,7 @@ msgstr "Proxy traversal ล้มเหลว.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "วนไปยังเซิร์ฟเวอร์ถัดไปใน %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,474 +758,486 @@ msgid ""
 msgstr "คำเตือน: ไม่รู้จักชุดอักขระ \"%s\". ไม่มีการสนทนาที่จะถูกนำมาใช้กับเครือข่าย %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 ถูกเพิ่มไปยังรายการแจ้งเตือน."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 รายชื่อแบน:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tไม่สามารถเข้าร่วม%C26 %B$1 %O(คุณถูกแบนไว้)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 ขณะนี้ได้ถูกรู้จักเป็น $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 ตั้งค่าการแบนบน $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tแชนแนล $1 สร้างเมื่อ $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ลบสถานะ half-operator ของแชนแนล จาก%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ลบสถานะผู้ควบคุมแชนแนลจาก%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ลบการประกาศจาก%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 ตั้งค่า exempt บน $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ให้สถานะ half-operator กับ%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 ตั้งค่าเชิญชวนบน $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%Uแชนแนล          ผู้ใช้   หัวข้อ"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 ตั้งค่าโหมด $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22แชนแนล $1 โหมด: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ให้สถานะผู้ควบคุมแชนแนลกับ%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 ลบ exempt บน $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 ลบการเชิญชวนบน $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 ลบคีย์เวิร์ดของแชนแนล"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 ลบขอบเขตของผู้ใช้"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 ตั้งค่าคีย์เวิร์ดไปเป็น $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 ตั้งค่าขีดจำกัดของแชนแนลเป็น $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 ลบการแบนบน $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O ให้การประกาศกับ%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22เชื่อมด่อแล้ว. ขณะนี้กำลังเข้าสู่ระบบ..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22เชื่อมต่อไปยัง $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21การเชื่อมต่อล้มเหลว. ข้อผิดพลาด: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tได้รับ CTCP $1 จาก $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tได้รับ CTCP $1 จาก $2 (ไปยัง $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tได้รับเสียง CTCP $1 จาก $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tได้รับเสียง CTCP $1 จาก $2 (ไปยัง $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT ไปยัง %C26$1%O ถูกยกเลิกกลางคัน."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT การเชื่อมต่อถูกสร้างไปยัง %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT ไปยัง %C26$1%O เสียหาย ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tได้รับการเสนอ DCC CHAT จาก $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tทำการเสนอ DCC CHAT ไปยัง $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tได้ทำการเสนอ CHAT ไปยัง $1 แล้ว"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 พยายามเชื่อมต่อไปยัง%C26 $2%O ล้มเหลว (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tได้รับ '$1%O' จาก $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 ชนิด  ไปยัง/จาก    สถานะ  ขนาด    ตำแหน่ง     ไฟล์         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tได้รับการร้องขอ DCC ที่ผิดรูปแบบจาก %C26$1%O.%010%C22*%O$tเนื้อหาของแพ็กเก็ต: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tทำการเสนอ%C26 $1%O ไปยัง%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tไม่มีการเสนอ DCC."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV%C26 $2%O ไปยัง%C26 $1%O ถูกยกเลิกกลางคัน."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O จาก%C26 $3%O เสร็จสิ้น %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV การเชื่อมต่อถูกสร้างขึ้นไปยัง%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O จาก%C26 $3%O ล้มเหลว ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: ไม่สามารถเปิด $1 เพื่อการเขียนได้ ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tไฟล์%C26 $1%C ได้มีอยู่ก่อนแล้ว, บันทีกเป็น%C26 $2%O แทน."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oได้ร้องขอเพื่อที่จะเริ่มใหม่%C26 $2 %Cจาก%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND%C26 $2%O ไปยัง%C26 $1%O ถูกยกเลิกก่อนสำเร็จ."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O เสร็จสิ้น %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND การเชื่อมต่อถูกสร้างขึ้นไปยัง%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND%C26 $1%O ไปยัง%C26 $2%O ล้มเหลว. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oได้เสนอ%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oไปยัง%C26 $3 %Cถูกหยุดกลางคัน - ทำการยกเลิกกลางคัน."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oไปยัง%C26 $3 %Oหมดเวลา - ทำการยกเลิกกลางคัน."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 ลบจากรายการแจ้งเตือนแล้ว"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tตัดการเชื่อมต่อ ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tพบไอพีของคุณ: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O ถูกเพิ่มไปยังรายการเพิกเฉย."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "การเพิกเฉยบน %C26$1%O เปลี่ยนไป."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 มาสก์ของโฮสต์                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O ลบจากรายการเพิกเฉยแล้ว."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  รายการเพิกเฉยว่างเปล่า."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tไมาสามารถเข้าร่วม%C26 %B$1 %O(แชนแนลนี้ต้องได้รับเชิญเท่านั้น)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tคุณได้ได้รับเชิญไปยัง%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) ได้เข้าร่วม $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tไม่สามารถเข้าร่วม%C26 %B$1 %O(ต้องการคีย์เวิร์ด)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 ได้เตะ $2 จาก $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tคุณได้ถูก kill โดย $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD ถูกข้ามไป."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 ได้ถูกใช้งานอยู่แล้ว. กำลังลองใหม่ด้วย $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tชื่อเล่นได้ถูกใช้งานอยู่แล้ว. ใช้ /NICK เพื่อที่จะลองอย่างอื่น."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tไม่มี DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tไม่มีโปรเซสที่กำลังทำงานอยู่"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tรายการแจ้งเตือนว่างเปล่า."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  รายการแจ้งเตือน                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 ผู้ใช้ในรายการแจ้งเตือน."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tแจ้งเตือน: $1 ออฟไลน์ ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tแจ้งเตือน: $1 ออนไลน์ ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ได้ออกจาก $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) ได้ออกจาก $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tการตอบรับการ ping จาก $1: $2 วินาที(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tไม่มีการตอบรับการ ping  เป็นเวลา $1 วินาที, กำลังตัดการเชื่อมต่อ."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tโปรเซสหนึ่งได้ทำงานอยู่แล้ว"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 ได้ออกจาก (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 ตั้งค่าโหมด%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tค้นหาหมายเลขไอพีสำหรับ%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22เชื่อมต่อแล้ว."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22ค้นหา $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tหยุดการพยายามเชื่อมต่อก่อนหน้า (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29หัวข้อสำหรับ $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 ได้เปลี่ยนหัวข้อไปเป็น: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29หัวข้อสำหรับ $1%C %C29ตั้งโดย $2%C %C29ที่ $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tไม่รู้จักโฮสต์. บางทีคุณอาจสะกดผิดหรือเปล่า?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tไม่สามาระเข้าร่วม%C26 %B$1 %O(ถึงขีดจำกัดจำนวนผู้ใช้)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26ผู้ใช้ บน $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cไม่อยู่ %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oสิ้นสุดของรายการ WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ว่างอยู่%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O ว่างอยู่%C26 $2%O, เข้าระบบ:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oผู้ใช้จริง@โฮสต์%C27 $2%O, ไอพีจริง%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19กำลังพูดคุยบน $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tคุณได้ถูกเตะออกจาก $2 โดย $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tคุณได้ออกจากแชนแนล $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tคุณได้ออกจากแชนแนล $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tคุณได้เชิญชวน%C26 $1%O ไปยัง%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tตอนนี้คุณได้รับการรู้จักเป็น $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr "ไม่สามารถอ่านไฟล์เสียง:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "โฮสต์ปลายทางปิดแชนแนลเชื่อมต่อ"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "การเชื่อมต่อถูกปฏิเสธ"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "ไม่มีเส้นทางไปยังโฮต์"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "การเชื่อมต่อหมดเวลา"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "ไม่สามารถกำหนดค่าที่อยู่นั้น"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "การเชื่อมต่อถูกตั้งใหม่โดยผู้เชื่อมต่อ"
 
@@ -2876,13 +2888,13 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง se
 msgid "Failed to acquire %s: %s\n"
 msgstr "ผิดพลาดในการร้องขอ %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "โปรแกรมลูกข่าย IRC หลายแพลตฟอร์ม "
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/uk.po b/po/uk.po
index 7c2c6d95..ed140602 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,15 +19,15 @@ msgstr ""
 "Language: uk\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Я зайнятий"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Залишаю"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -64,7 +64,7 @@ msgstr "Немає доступу до %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Помилка"
 
@@ -752,7 +752,7 @@ msgstr "Не вдалося зв'язатися через проксі.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Перемикання на наступний сервер %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -760,474 +760,486 @@ msgid ""
 msgstr "Попередження: невідоме кодування \"%s\". Перекодування для мережі %s не відбуватиметься."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 доданий у список сповіщень."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 список забанених:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tНе вдалося зайти%C26 %B$1 %O(Вас забанено)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 тепер називається $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 встановив бан на $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tКанал $1 створений у $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O видалив права напівоператора у %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O видалив права оператора каналу у %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O забрав голос у %C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 встановив звільнення на $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O надав права напівоператора %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 запрошує на $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UКанал          Користувачі   Тема"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 встановив режим $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Канал $1 режими: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O надав права оператора каналу %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 забрав звільнення у $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 зняв запрошення до $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 прибрав ключові слова каналу"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 зняв обмеження користувачів"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 встановив ключові слова каналу: $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 встановив ліміт каналу у $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 зняв бан з $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O надав голос %C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22З'єднання встановлено. Вхід у мережу.."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22З'єднання з $1 ($2) порт $3%O.."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%CЗ'єднання неможливе. Помилка: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tОтримано CTCP $1 від $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tОтримано CTCP $1 від $2 (для $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tОтримано CTCP звук $1 від $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tОтримано звук CTCP $1 від $2 (для $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tDCC CHAT з %C26$1%O перервано."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC CHAT з'єднання встановлено з %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tDCC CHAT з %C26$1%O розірвано. ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tОтримано запит на DCC CHAT від $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tПропонується DCC CHAT з $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tВже запропоновано CHAT з $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 спроба з'єднання з %C26 $2%O невдала (помилка=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tОтримано '$1%O' від $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Тип  Кому/Від кого  Статус  Розмір  Позиція   Файл    "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tОтримано неправильний DCC запит від %C26$1%O.%010%C22*%O$tВміст пакета: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tПропонується%C26 $1 для%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tНемає такої DCC пропозиції."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC RECV %C26$2%O для %C26$1%O перервано."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O від%C26 $3%O завершено %C30[%C26$4%O б/с%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC RECV з'єднання встановлено з%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tDCC RECV%C26 $1%O від%C26 $3%O - помилка. ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV: Не вдалося відкрити $1 для запису ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tФайл%C26 $1%C вже існує, натомість зберігається як%C26 $2%O."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Oзапит на продовження розмови%C26 $2%C від%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tDCC SEND %C26$2%O до %C26$1%O перервано."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tDCC SEND %C26$1%O до %C26$2%O завершено %C30[%C26$3%O б/с%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tDCC SEND з'єднання встановлено з %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tDCC SEND %C26$1%O до %C26$2%O - помилка. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Oзапропоновано%C26 $2 %O(%C26$3 %OCбайт)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cзупинилось - переривання."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Oдо %C26$3 %Oвийшов час - переривання."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 видалено зі списку сповіщення."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tЗ'єднання розірвано ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tЗнайдено ваш IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O додано до списку ігнорованих."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Ігнорування %C26$1%O змінено."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 маска вузлів              PRIV NOTI CHAN CTCP DCC  INVI UNIG"
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O видалений зі списку ігнорування."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Список ігнорованих порожній."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tНе вдалося зайти%C26 %B$1 %O(Канал лише для запрошених)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tОтримано запрошення на%C26 $1%O від%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) зайшов на канал $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tНе вдалося зайти%C26 %B$1 %O(Потрібне ключове слово)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 викинув $2 з $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tвикинув вас з каналу $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD пропущено."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 вже використовується. Повторна спроба з $2.."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tНікнейм вже використовується. Скористайтеся /NICK щоб спробувати інше."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tНемає такого DCC."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tНемає запущених процесів"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tСписок сповіщень порожній."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Список сповіщень                      "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 користувачів у списку сповіщень."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tСповіщення: $1 від'єднаний ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tСповіщення: $1 під'єднаний ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) залишив $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) залишив $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing відповідь від $1 : $2 сек."
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tНе отримано відповідей протягом $1 сек., від'єднання."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tПроцес вже запущений"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 вийшов (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 встановив режими%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tПошук IP-адреси для%C26 $1%O.."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22З'єднання встановлено."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Триває пошук $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tЗупинена попередня спроба з'єднання (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Тема для $1%C: %C26$2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 змінив тему на: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Тема для $1%C %C29встановлена $2%C %C29у $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tНевідомий вузол. Можливо ви помилились?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tНе вдалося зайти на%C26 %B$1 %O(Вичерпано ліміт користувачів)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Користувачі на $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cнедоступний %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OКінець списку WHOIS."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O бездіяльний %C26$2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O бездіяльний %C26$2%O, зайшов: %C26$3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Oсправжній користувач@вузол %C27$2%O, справжній IP %C27$3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Ви зараз спілкуєтесь на $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t$3 викинув вас із каналу $2 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tВи залишили канал $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tВи залишили канал $3 $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tВи запрошуєте%C26 $1%O  до%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tТепер ви відомі як $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1716,27 +1728,27 @@ msgid ""
 "%s"
 msgstr "Не вдалося прочитати звуковий файл:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Віддалений вузол закрив сокет"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Відмовлено у з'єднанні"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Не знайдено шлях до вузла"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Таймаут з'єднання"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Не вдалося призначити цю адресу"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "З'єднання обірване"
 
@@ -2878,13 +2890,13 @@ msgstr "Не вдалося зв'язатись з шиною сеансів: %s
 msgid "Failed to acquire %s: %s\n"
 msgstr "Не вдалося здобути %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "_Про програму"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Багатоплатформний IRC клієнт"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/vi.po b/po/vi.po
index ae84c5b7..5f18d67b 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,15 +16,15 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Tôi đang bận"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Tôi đi"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -61,7 +61,7 @@ msgstr "Không thể truy cập %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Lỗi"
 
@@ -749,7 +749,7 @@ msgstr "Việc đi qua máy phục vụ ủy nhiệm bị lỗi.\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "Đang quay lại đến mấy phục vụ kế tiếp trong %s...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -757,474 +757,486 @@ msgid ""
 msgstr "Cảnh báo : không biết bộ ký tự « %s » nên không chuyển đổi cho mạng %s."
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 đã được thêm vào danh sách thông báo."
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 Danh sách đuổi ra:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$tKhông thể vào%C26 %B$1 %O(vì bạn bị đuổi ra)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 lúc bây giờ được biết như là $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 đuổi $2 ra"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$tKênh$1 được tạo vào $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O bỏ trạng thái quản trị kênh nửa ra%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O bỏ trạng thái quản trị kênh ra%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O bỏ trạng thái « Tiếng nói » ra%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 đặt trạng thái miễn cho $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O đưa ra%C26 $2 trạng thái quản trị kênh nửa"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 đặt trạng thái mời cho $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%UKênh      \t     Người  Chủ đề"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 đặt chế độ $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22Kênh $1 chế độ : $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O đưa ra%C26 $2 trạng thái quản trị kênh"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 bỏ trạng thái miễn ra $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 bỏ trạng thái mời ra $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 bỏ từ khoá kênh"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 bỏ giới hạn người dùng"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 đặt từ khoá kênh thành $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 đặt giới hạn kênh thành $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 bỏ trạng thái bị đuổi ra $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O đưa ra %C26 $2 trạng thái « Tiếng nói »"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22Mới kết nối. Đang đăng nhập..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22Đang kết nối đến $1 ($2) trên cổng $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21Kết nối bị lỗi: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$tMới nhận CTCP $1 từ $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$tMới nhận CTCP $1 từ $2 (cho $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$tMới nhận âm thanh CTCP $1 từ $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$tMới nhận âm thanh CTCP $1 từ $2 (cho $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$tTrò chuyện trực tiếp (DCC) với %C26$1%O bị hủy bỏ."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tMới kết nối được để trò chuyện trực tiếp (DCC) với %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$tTrò chuyện trực tiếp (DCC) cho %C26$1%O bị mất ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$tMới nhận lời mời trò chuyện trực tiếp (DCC) từ $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$tĐang mời $1 tro chuyện trực tiếp (DCC)"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$tĐã mời $1 trò chuyện"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$tDCC $1 việc cố kết nối đến%C26 $2%O bị lỗi (lỗi=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$tMới nhận « $1%O » từ $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 Kiểu    Đến/Từ    TrThái  Cỡ     Vị trí    Tệp         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$tMới nhận yêu cầu dạng sai trò chuyện trực tiếp (DCC) từ %C26$1%O.%010%C22*%O$tNội dung gói tin: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$tĐang đưa ra%C26 $1%O cho%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$tKhông có lời mời trò chuyện trực tiếp (DCC) như vậy."
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tNHẬN DCC%C26 $2%O cho%C26 $1%O bị hủy bỏ."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$tNHẬN DCC%C26 $1%O từ%C26 $3%O hoàn thành %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tMới kết nối kiểu NHẬN DCC đếnC26 $1 %C30[%O$2%C30]."
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$tNHẬN DCC%C26 $1%O từ%C26 $3%O bị lỗi ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tNHẬN DCC: không thể mở $1 để ghi ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$tTập tin%C26 $1%C đã có : đang lưu nó dạng %C26 $2%O thay thế."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %Ođã yêu cầu tiếp tục%C26 $2 %Ctừ%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$tGỞI DCC%C26 $2%O cho%C26 $1%O bị hủy bỏ."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$tGỞI DCC%C26 $1%O cho%C26 $2%O hoàn thành %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$tMới kết nối DCC GỞI đến%C26 $1 %C30[%O$2%C30]."
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$tViệc kết nối DCC GỞI%C26 $1%O đến%C26 $2%O bị lỗi. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %Ođã mời%C26 $2 %O(%C26$3 %Obyte)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Ođến%C26 $3 %Cbị ngừng nên hủy bỏ."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %Ođến%C26 $3 %Oquá giờ nên hủy bỏ."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1 đã được xoá bỏ ra danh sách thông báo."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$tBị ngắt kết nối ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$tTìm thấy địa chỉ IP của bạn: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O đã được thêm vào danh sách bỏ qua."
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "Trang thái bỏ qua về %C26$1%O bị thay đổi."
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 Bộ lọc máy                  PRIV NOTI CHAN CTCP DCC  INVI UNIG\n\n[PRIVate\t\triêng\nNOTIfy\t\tthông báo\nCHANnel\t\tkênh\nClient To Client Protocol\tgiao thức ứng dụng khách đến ứng dụng khách\nDirect Chat Channel\t\tkênh trò chuyện trực tiếp\nINVIte\t\tmời\nUNIGnore\t\thủy bỏ qua]"
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O được gỡ bỏ ra danh sách bỏ qua."
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  Danh sách bỏ qua la trống."
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$tKhông thể vào%C26 %B$1 %O(Phải có lời mời)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$tBạn mới được mời vào%C26 $1%O bởi%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) mới vao $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$tKhông thể vào%C26 %B$1 %O(Cần đến từ khoá)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 mới đá $2 ra $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$tBạn mới bị buộc kết thúc bởi $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD bị nhảy qua.\n[Message Of The Day (thông điệp của hôm nay)]"
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 đang dùng nên thử lái vơi $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*%O$tTên hiệu đang được dùng nên hay sử dụng lệnh « /NICK » để chọn tên hiệu khác."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$tKhông có DCC như vậy."
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$tKhông có tiến trình nào đang chạy"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$tDanh sách thông báo la trống."
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  Danh sách thông báo                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1 người dùng trong danh sách thông báo."
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$tThông báo : $1 ngoại tuyến ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$tThông báo : $1 trực tuyến ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) đã rời $3 đi"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) đa rời $3 đi (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tTrả lời ping từ $1: $2 giây"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$tChưa nhận trả lời ping sau $1 giây nên ngắt kết nối."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$tCó một tiến trình đang chạy"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 đã thoát (%O%C23%B%B$2%O%C23)."
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 đặt chế độ%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Gởi tin nhẳn cho mọi quan trị%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$tĐang tra cứu số IP cho%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22Đã kết nối."
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22Đang tra cứu $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$tĐã thôi việc cố kết nối trước (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29Chủ đề cho $1%C %C29là: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 mới thay đổi chủ đề thành: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29Chủ đề cho $1%C %C29 được đặt bởi $2%C %C29vào $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$tKhông biết máy: chính tả sai không?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$tKhông thể vào%C26 %B$1 %O(Đã tới giới hạn số người dùng)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26Người dùng trên $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Cvắng mặt %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OKết thúc danh sách WHOIS.\n[WHO IS (là ai)]"
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nhàn rỗi%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O nghỉ%C26 $2%O, đăng nhập:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %Ongười dùng thật@máy%C27 $2%O, địa chỉ IP thật%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19Đang nói chuyện trên $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$tBạn đã bị đá ra $2 bởi $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$tBạn mới rời kênh $3 đi"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$tBạn mới rời kênh $3 đi (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$tBạn đã mời%C26 $1%O vào%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$tBạn lúc bây giờ được biết như là $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1713,27 +1725,27 @@ msgid ""
 "%s"
 msgstr "Không thể đọc tập tin âm thanh:\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "Máy ở xa đã đóng ổ cắm"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "Kết nối bị từ chối"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "Không có đường dẫ đến máy"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "Kết nối đã quá giờ"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "Không thể gán địa chỉ đó"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "Kết nối bị đặt lại bởi ngang hàng"
 
@@ -2875,13 +2887,13 @@ msgstr "Không thể kết nối đến bộ nối phiên chạy: %s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "Lỗi lấy %s: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "Ứng dụng khách IRC đa nền"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/wa.po b/po/wa.po
index 82053fc0..5f20d8ce 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,15 +17,15 @@ msgstr ""
 "Language: wa\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "Dji so-st ocupé"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "Cwitant"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -62,7 +62,7 @@ msgstr "Dji n' sai acceder a %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "Aroke"
 
@@ -750,7 +750,7 @@ msgstr ""
 msgid "Cycling to next server in %s...\n"
 msgstr ""
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -758,51 +758,51 @@ msgid ""
 msgstr ""
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
+msgid "%C18*%O$t%C18$1%O added to notify list."
 msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
 msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
 msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
 msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
 msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:51
@@ -810,271 +810,276 @@ msgid "%UChannel          Users   Topic"
 msgstr ""
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
 msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
 msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
 msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
+msgid "%C22*%O$t%C26$1%O removes user limit"
 msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
+msgid "%C23*%O$tConnected. Now logging in."
 msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
 msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
 msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
 msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
 msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
+msgid "%C23*%O$tNo such DCC offer."
 msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
 msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
 msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
 msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
 msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
 msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
 msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
 msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
+msgid "%O%C18$1%O added to ignore list."
 msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
+msgid "%OIgnore on %C18$1%O changed."
 msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
+msgid "%C16,17                                                              "
 msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
 msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
+msgid "%O%C18$1%O removed from ignore list."
 msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
+msgid "%OIgnore list is empty."
 msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
 msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
 msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
 msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
 msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
+msgid "%C29*%O$t%C29MOTD Skipped%O"
 msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
 msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
 msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
+msgid "%C20*%O$tNo such DCC."
 msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
+msgid "%C23*%O$tNo process is currently running"
 msgstr ""
 
 #: src/common/textevents.h:273
@@ -1082,149 +1087,156 @@ msgid "$tNotify list is empty."
 msgstr ""
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
+#, c-format
+msgid "%C16,17  Notify List                           "
 msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
+msgid "%C23*%O$t%C23$1%O users in notify list."
 msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
+#, c-format
+msgid "%C24*$t$1 has left"
 msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
 msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
 msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
+msgid "%C24*%O$tA process is already running"
 msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
 msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
 msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
 msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
 msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
+msgid "%C29*%O$tConnected."
 msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
 msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
 msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
 msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
 msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
 msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
 msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
 msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
 msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
 msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
 msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
 msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
 msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
 msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
 msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
+msgid "%C19*%O$tNow talking on %C22$2%O"
 msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
 msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
 msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
 msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
@@ -1714,27 +1726,27 @@ msgid ""
 "%s"
 msgstr ""
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr ""
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr ""
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr ""
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr ""
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr ""
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr ""
 
@@ -2876,13 +2888,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr ""
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "On cliyint IRC multi-platfômes"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7a508a78..915d831e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,15 +26,15 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "我很忙"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "离开"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -71,7 +71,7 @@ msgstr "无法获取 %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "错误"
 
@@ -759,7 +759,7 @@ msgstr "代理传送失败。\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "跳转至 %s 的下一个服务器...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -767,474 +767,486 @@ msgid ""
 msgstr "警告:未知的字符设置“%s”。对网络 %s 将不应用字符转换。"
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 已增加到通知列表。"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 屏蔽列表：%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t不能进入%C26 %B$1 %O(您被屏蔽了)。"
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 改名为 $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 屏蔽了 $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$t频道 $1 建立于 $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了%C26 $2 的频道副管理员权限"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了%C26 $2 的频道管理员权限"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了%C26 $2 的发言权"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 给 $2 设置了免封权"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 委任%C26 $2 为频道副管理员"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 邀请了 $2"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%U频道          用户     主题"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 设置 $2$3 $4 模式"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22频道 $1 模式：$2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 委任%C26$2 为频道管理员"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 取消了 $2 的免封权"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 取消了 $2 的邀请权"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 取消了频道密码"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 取消了用户限制"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 设置频道密码为 $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 设置频道限制为 $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 解除了对 $2 的屏蔽"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 给了%C26$2 发言权"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "%C22*%O$t%C22已连接。正在登录..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22正在连接到 $1 ($2) 端口 $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21连接失败。错误：$1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$t收到来自 $2 的CTCP $1"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$t收到来自 $2 (到 $3)的 CTCP $1"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$t收到来自 $2 的 CTCP 声音 $1"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$t收到来自 $2 (到 $3)的 CTCP 声音 $1"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$t中止了与 %C26$1%O 的 DCC 直连聊天。"
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t已与 %C26$1 %C30[%O$2%C30] 建立了 DCC 直连聊天连接"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$$t 与 %C26$1%O 的 DCC 直连聊天连接丢失($4)。"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t收到来自 $1 的 DCC 直连聊天请求"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t向 $1 发送 DCC 直连聊天请求"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t已发送 DCC 直连聊天请求给 $1"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$t尝试到 %C26$2%O 的 DCC $1 连接失败(err=$3)。"
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t收到来自 $2 的“$1%O”"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 类型   到/来自       状态    大小    位置     文件         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$t收到来自 %C26$1%O 的有错的 DCC 请求。%010%C22*%O$t数据包内容:$2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$t 发送 %C26 $1%O 给%C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$t无此 DCC 请求。"
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$t到%C26 $1%O 的 DCC RECV%C26 $2%O 中止。"
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$t从%C26 $3%O DCC RECV%C26 $1%O 已完成 %C30[%C26$4%O cps%C30]%O。"
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t建立与%C26$1 的 DCC RECV 连接 %C30[%0$2%C30]"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$t从%C26 $3%O DCC RECV%C26 $1%O 失败($4)。"
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV：无法打开 $1 进行写入($2)。 "
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$t文件%C11 $1%C 已存在，请另存为%C26 $2%O。"
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %O请求续传来自%C26 $3%C的%C26 $2 %C 。"
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$t到%C26$1%O的 DCC SEND%C26$2%O 已中止。"
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$t到%C26$2%O 的 DCC SEND%C26$1%O 已完成 %C30[%C26$3%O cps%C30]%O。"
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t已建立到%C26 $1%C30[%O$2%C30] 的 DCC SEND 连接"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$t到%C26$2%O 的 DCC SEND%C26$1%O 失败。$3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1%O已发送%C26 $2%O(%C26$3%O 字节)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2%O到 %C26$3%C 没有响应 - 中止。"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2%O到%C26 $3%O超时 - 中止。"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1已从通知列表中删除。"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t已断开连接($1)。"
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$t找到您的 IP：[$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O已添加到忽略列表。"
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "对 %C26$1%O 的忽略已变更。"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 主机掩码                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O 已从忽略列表中删除。"
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  您的忽略列表是空的。"
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t无法进入%C26 %B$1 %O(该频道只能邀请进入)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C26 $2%C (%C26$3%C)邀请您进入%C26 $1%O"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) 进入了 $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t无法进入%C26 %B$1 %O(需要密码)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 把 $2 踢出了 $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t您被 $1 从服务器上踢出($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD 被跳过。"
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 已被占用。正在使用 $2 重试..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*z%O$t该昵称已被占用。请用 /NICK 尝试使用另一个昵称。"
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$t没有此 DCC。"
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$t当前没有任何进程在执行"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$t 通知列表是空的。"
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  通知列表                             "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1通知列表中有 $1 位用户。"
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
-msgstr "%C22*%O$t通知：$1 下线了($3)。"
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
-msgstr "%C22*%O$t通知：$1 上线了($3)。"
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) 离开了 $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) 离开了 $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$t从 $1 处得到 Ping 回应时间：$2 秒"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t在 %1 秒内没有收到 Ping 回应，正在断开连接。"
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$t已有一进程正在运行"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 已退出(%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 设置模式%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$t查寻 %C26 $1%O 的 IP 地址..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22已连接。"
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22正在查询 $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$t前次连接尝试停止(pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29 $1%C %C29的主题是：$2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 已将主题更改为：$2"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29$1%C %C29的主题由 $2%C %C29于 $3 设置"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$t未知主机。也许您把它拼写错了？"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t无法进入%C26 %B$1 %O(达到了用户限制)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26 $1 中的用户：%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C暂时离开了 %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %OWHOIS 列表结束。"
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 发呆%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 发呆%C26 $2%O，登录时间：%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O：$4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O真实 user@host%C27 $2%O，真实 IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19您正在 $2 频道里聊天"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t您被 $3 从 $2 中踢出($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$t您已离开频道 $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$t您已离开频道 $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$t您已邀请%C26 $1%O 进入%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$t您已改名为 $2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1723,27 +1735,27 @@ msgid ""
 "%s"
 msgstr "无法读取声音文件：\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "远端主机已关闭套接字"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "连接被拒绝"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "没有到主机的路由"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "无法分配该地址"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "连接被重置"
 
@@ -2885,13 +2897,13 @@ msgstr "无法连接到会话总线：%s\n"
 msgid "Failed to acquire %s: %s\n"
 msgstr "获取 %s 失败：%s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr "关于"
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "跨平台的 IRC 客户端"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b32e550..08357ba9 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: HexChat\n"
 "Report-Msgid-Bugs-To: www.hexchat.org\n"
-"POT-Creation-Date: 2012-10-25 21:18+0200\n"
-"PO-Revision-Date: 2012-10-25 19:21+0000\n"
+"POT-Creation-Date: 2012-10-28 01:41+0200\n"
+"PO-Revision-Date: 2012-10-27 23:43+0000\n"
 "Last-Translator: bviktor <bviktor@hexchat.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,15 +24,15 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/common/cfgfiles.c:756
+#: src/common/cfgfiles.c:757
 msgid "I'm busy"
 msgstr "我很忙"
 
-#: src/common/cfgfiles.c:780
+#: src/common/cfgfiles.c:781
 msgid "Leaving"
 msgstr "暫離"
 
-#: src/common/cfgfiles.c:840
+#: src/common/cfgfiles.c:841
 msgid ""
 "* Running IRC as root is stupid! You should\n"
 "  create a User Account and use that to login.\n"
@@ -69,7 +69,7 @@ msgstr "無法存取 %s\n"
 
 #: src/common/dcc.c:1899 src/common/text.c:1441 src/common/text.c:1479
 #: src/common/text.c:1490 src/common/text.c:1497 src/common/text.c:1510
-#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:356
+#: src/common/text.c:1527 src/common/text.c:1627 src/common/util.c:357
 msgid "Error"
 msgstr "錯誤"
 
@@ -757,7 +757,7 @@ msgstr "代理傳送失敗。\n"
 msgid "Cycling to next server in %s...\n"
 msgstr "輪跳至 %s 的下一個伺服器中...\n"
 
-#: src/common/servlist.c:1206
+#: src/common/servlist.c:1213
 #, c-format
 msgid ""
 "Warning: \"%s\" character set is unknown. No conversion will be applied for "
@@ -765,474 +765,486 @@ msgid ""
 msgstr "警告：未知的字元設定「%s」。對網路 %s 將不應用字元轉換。"
 
 #: src/common/textevents.h:6
-msgid "%C22*%O$t$1 added to notify list."
-msgstr "%C22*%O$t$1 已增加到通知清單。"
+msgid "%C18*%O$t%C18$1%O added to notify list."
+msgstr ""
 
 #: src/common/textevents.h:9
-msgid "%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3"
-msgstr "%C22*%O$t$1 封禁清單：%C19 $4%C20 $2%C21 $3"
+msgid "%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O"
+msgstr ""
 
 #: src/common/textevents.h:12
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(You are banned)."
-msgstr "%C22*%O$t不能加入%C26 %B$1 %O(您被封禁了)。"
+msgid "%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O)."
+msgstr ""
 
 #: src/common/textevents.h:18
-msgid "%C22*%O$t$1 is now known as $2"
-msgstr "%C22*%O$t$1 改名為 $2"
+msgid "%C24*%O$t%C28$1%O is now known as%C18 $2%O"
+msgstr ""
 
 #: src/common/textevents.h:27
-msgid "%C22*%O$t$1 sets ban on $2"
-msgstr "%C22*%O$t$1 封禁了 $2"
+msgid "%C22*%O$t%C26$1%O sets ban on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:30
-msgid "%C22*%O$tChannel $1 created on $2"
-msgstr "%C22*%O$t 聊天室 $1 建立於 $2"
+msgid "%C22*%O$tChannel %C22$1%O created"
+msgstr ""
 
 #: src/common/textevents.h:33
-msgid "%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了 %C26 $2 的聊天室准管理員權限"
+msgid "%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:36
-msgid "%C22*%O$t%C26$1%O removes channel operator status from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了 %C26 $2 的聊天室管理員權限"
+msgid "%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:39
-msgid "%C22*%O$t%C26$1%O removes voice from%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 取消了 %C26 $2 的發言權"
+msgid "%C22*%O$t%C26$1%O removes voice from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:42
-msgid "%C22*%O$t$1 sets exempt on $2"
-msgstr "%C22*%O$t$1 給 $2 設定了免封權"
+msgid "%C22*%O$t%C26 $1%C sets exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:45
-msgid "%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 委任 %C26 $2 為聊天室准管理員"
+msgid "%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:48
-msgid "%C22*%O$t$1 sets invite on $2"
-msgstr "%C22*%O$t$1 給 $2 設定了邀請權"
+msgid "%C22*%O$t%C26 $1%C sets invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:51
 msgid "%UChannel          Users   Topic"
 msgstr "%U 聊天室          使用者     話題"
 
 #: src/common/textevents.h:57
-msgid "%C22*%O$t$1 sets mode $2$3 $4"
-msgstr "%C22*%O$t$1 設定 $2$3 $4 模式"
+msgid "%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O"
+msgstr ""
 
 #: src/common/textevents.h:60
-msgid "%C22*%O$t%C22Channel $1 modes: $2"
-msgstr "%C22*%O$t%C22聊天室 $1 模式：$2"
+msgid "%C22*%O$tChannel %C22$1%O modes: %C24$2"
+msgstr ""
 
 #: src/common/textevents.h:69
-msgid "%C22*%O$t%C26$1%O gives channel operator status to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 委任 %C26$2 為聊天室管理員"
+msgid "%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:72
-msgid "%C22*%O$t$1 removes exempt on $2"
-msgstr "%C22*%O$t$1 取消了 $2 的免封權"
+msgid "%C22*%O$t%C26$1%O removes exempt on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:75
-msgid "%C22*%O$t$1 removes invite on $2"
-msgstr "%C22*%O$t$1 取消了 $2 的邀請權"
+msgid "%C22*%O$t%C26 $1%O removes invite on %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:78
-msgid "%C22*%O$t$1 removes channel keyword"
-msgstr "%C22*%O$t$1 取消了聊天室密碼"
+msgid "%C22*%O$t%C26$1%O removes channel keyword"
+msgstr ""
 
 #: src/common/textevents.h:81
-msgid "%C22*%O$t$1 removes user limit"
-msgstr "%C22*%O$t$1 取消了使用者限額"
+msgid "%C22*%O$t%C26$1%O removes user limit"
+msgstr ""
 
 #: src/common/textevents.h:84
-msgid "%C22*%O$t$1 sets channel keyword to $2"
-msgstr "%C22*%O$t$1 設定聊天室密碼為 $2"
+msgid "%C22*%O$t$1 sets channel keyword to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:87
-msgid "%C22*%O$t$1 sets channel limit to $2"
-msgstr "%C22*%O$t$1 設定聊天室限額為 $2"
+msgid "%C22*%O$t%C26$1%O sets channel limit to %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:90
-msgid "%C22*%O$t$1 removes ban on $2"
-msgstr "%C22*%O$t$1 解除了對 $2 的封禁"
+msgid "%C22*%O$t%C26$1%O removes ban on %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:93
-msgid "%C22*%O$t%C26$1%O gives voice to%C26 $2"
-msgstr "%C22*%O$t%C26$1%O 給了 %C26$2 發言權"
+msgid "%C22*%O$t%C26$1%O gives voice to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:96
-msgid "%C22*%O$t%C22Connected. Now logging in..."
-msgstr "已連接到 %C22*%O$t%C22。正在登入..."
+msgid "%C23*%O$tConnected. Now logging in."
+msgstr ""
 
 #: src/common/textevents.h:99
-msgid "%C22*%O$t%C22Connecting to $1 ($2) port $3%O..."
-msgstr "%C22*%O$t%C22 正在連接到 $1 ($2) 輸出入埠 $3%O..."
+msgid "%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:102
-msgid "%C21*%O$t%C21Connection failed. Error: $1"
-msgstr "%C21*%O$t%C21連線失敗。錯誤：$1"
+msgid "%C20*%O$tConnection failed (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:105
-msgid "%C22*%O$tReceived a CTCP $1 from $2"
-msgstr "%C22*%O$t收到來自 $2 的CTCP $1"
+msgid "%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:108
-msgid "%C22*%O$tReceived a CTCP $1 from $2 (to $3)"
-msgstr "%C22*%O$t從 $2 處接收到一個(到 $3 的)CTCP $1"
+msgid "%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O"
+msgstr ""
 
 #: src/common/textevents.h:111
-msgid "%C19>%O$1%C19<%O$tCTCP $2"
-msgstr "%C19>%O$1%C19<%O$tCTCP $2"
+msgid ">%C18$1%C<$tCTCP %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:114
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2"
-msgstr "%C22*%O$t收到來自 $2 的 CTCP 聲音 $1"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:117
-msgid "%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)"
-msgstr "%C22*%O$t從 $2 處接收到一個(到 $3 的)CTCP 聲音 $1"
+msgid "%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:120
-msgid "%C22*%O$tDCC CHAT to %C26$1%O aborted."
-msgstr "%C22*%O$t和 %C26$1%O 的密談中止。"
+msgid "%C23*%O$tDCC CHAT to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:123
-msgid "%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t和 %C26$1 %C30[%O$2%C30] 開始密談了"
+msgid ""
+"%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:126
-msgid "%C22*%O$tDCC CHAT to %C26$1%O lost ($4)."
-msgstr "%C22*%O$$t和 %C26$1%O 的密談丟失($4)。"
+msgid "%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:129
-msgid "%C22*%O$tReceived a DCC CHAT offer from $1"
-msgstr "%C22*%O$t收到來自 $1 的密談請求"
+msgid "%C24*%O$tReceived a DCC CHAT offer from %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:132
-msgid "%C22*%O$tOffering DCC CHAT to $1"
-msgstr "%C22*%O$t向 $1 發送密談請求"
+msgid "%C24*%O$tOffering DCC CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:135
-msgid "%C22*%O$tAlready offering CHAT to $1"
-msgstr "%C22*%O$t對 $1 已發送密談請求"
+msgid "%C24*%O$tAlready offering CHAT to %C18$1%O"
+msgstr ""
 
 #: src/common/textevents.h:138
-msgid "%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3)."
-msgstr "%C22*%O$t到 %C26$2%O 的 DCC $1 連接失敗 (err=$3)。"
+msgid "%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:141
-msgid "%C22*%O$tReceived '$1%O' from $2"
-msgstr "%C22*%O$t收到來自 $2 的「$1%O」"
+msgid "%C23*%O$tReceived '%C23$1%C' from %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:144
 #, c-format
-msgid "%C24,18 Type  To/From    Status  Size    Pos     File         "
-msgstr "%C24,18 類型   到/來自       狀態    大小    位置     檔案         "
+msgid "%C16,17 Type  To/From    Status  Size    Pos     File         "
+msgstr ""
 
 #: src/common/textevents.h:147
 msgid ""
-"%C22*%O$tReceived a malformed DCC request from "
-"%C26$1%O.%010%C22*%O$tContents of packet: $2"
-msgstr "%C22*%O$t收到來自 %C26$1%O 的有錯的 DCC 請求。%010%C22*%O$t資料包內容：$2"
+"%C20*%O$tReceived a malformed DCC request from "
+"%C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:150
-msgid "%C22*%O$tOffering%C26 $1%O to%C26 $2"
-msgstr "%C22*%O$t提供 %C26$1%O給 %C26 $2"
+msgid "%C24*%O$tOffering '%C24$1%O' to %C18$2%O"
+msgstr ""
 
 #: src/common/textevents.h:153
-msgid "%C22*%O$tNo such DCC offer."
-msgstr "%C22*%O$t無此 DCC 請求。"
+msgid "%C23*%O$tNo such DCC offer."
+msgstr ""
 
 #: src/common/textevents.h:156
-msgid "%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$t到 %C26$1%O 的 DCC RECV %C26 $2%O 中止。"
+msgid "%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:159
 msgid ""
-"%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O."
-msgstr "%C22*%O$t從 %C26$3%O DCC RECV %C26$1%O 已完成 %C30[%C26$4%O cps%C30]%O。"
+"%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:162
-msgid "%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t建立和 %C26$1 %C30[%O$2%C30] 的 DCC RECV 連線"
+msgid ""
+"%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:165
-msgid "%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4)."
-msgstr "%C22*%O$t從 %C26$3%O DCC RECV %C26$1%O 失敗($4)。"
+msgid "%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:168
-msgid "%C22*%O$tDCC RECV: Cannot open $1 for writing ($2)."
-msgstr "%C22*%O$tDCC RECV：不能打開 $1 進行寫入操作($2)。 "
+msgid "%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:171
 msgid ""
-"%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead."
-msgstr "%C22*%O$t檔案 %C11$1%C 已存在，請另存為 %C26$2%O。"
+"%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' "
+"instead."
+msgstr ""
 
 #: src/common/textevents.h:174
-msgid "%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C."
-msgstr "%C22*%O$t%C26$1 %O請求續傳來自 %C26$3%C 的 %C26$2 %C 。"
+msgid "%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O."
+msgstr ""
 
 #: src/common/textevents.h:177
-msgid "%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted."
-msgstr "%C22*%O$t到 %C26$1%O 的 DCC SEND %C26$2%O 中止。"
+msgid "%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted."
+msgstr ""
 
 #: src/common/textevents.h:180
 msgid ""
-"%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O."
-msgstr "%C22*%O$t到 %C26$2%O 的 DCC SEND %C26$1%O  已完成  %C30[%C26$3%O cps%C30]%O。"
+"%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:183
-msgid "%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]"
-msgstr "%C22*%O$t建立和 %C26 $1 %C30[%O$2%C30] 的 DCC SEND 連線"
+msgid ""
+"%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:186
-msgid "%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3"
-msgstr "%C22*%O$t到 %C26$2%O 的 DCC SEND %C26$1%O 失敗。$3"
+msgid "%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:189
-msgid "%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)"
-msgstr "%C22*%O$t%C26$1 %O已發送%C26 $2 %O(%C26$3 %O位元組)"
+msgid "%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)"
+msgstr ""
 
 #: src/common/textevents.h:192
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O到 %C26$3 %C 沒有響應 - 中止。"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting."
+msgstr ""
 
 #: src/common/textevents.h:195
-msgid "%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting."
-msgstr "%C22*%O$tDCC $1%C26 $2 %O到%C26 $3 %O已超時 - 中止。"
+msgid "%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting."
+msgstr ""
 
 #: src/common/textevents.h:198
-msgid "%C22*%O$t$1 deleted from notify list."
-msgstr "%C22*%O$t$1已從通知清單中刪除。"
+msgid "%C24*%O$t%C18$1%O deleted from notify list."
+msgstr ""
 
 #: src/common/textevents.h:201
-msgid "%C22*%O$tDisconnected ($1)."
-msgstr "%C22*%O$t已切斷連接 ($1)。"
+msgid "%C20*%O$tDisconnected (%C20$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:204
-msgid "%C22*%O$tFound your IP: [$1]"
-msgstr "%C22*%O$t找到您的 IP：[$1]"
+msgid "%C24*%O$tFound your IP: %C30[%C24$1%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:210
-msgid "%O%C26$1%O added to ignore list."
-msgstr "%O%C26$1%O 添加到忽略清單。"
+msgid "%O%C18$1%O added to ignore list."
+msgstr ""
 
 #: src/common/textevents.h:213
-msgid "Ignore on %C26$1%O changed."
-msgstr "對 %C26$1%O 的忽略已改變。"
+msgid "%OIgnore on %C18$1%O changed."
+msgstr ""
 
 #: src/common/textevents.h:216
 #, c-format
-msgid "%C24,18                                                              "
-msgstr "%C24,18                                                              "
+msgid "%C16,17                                                              "
+msgstr ""
 
 #: src/common/textevents.h:219
 #, c-format
-msgid "%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
-msgstr "%C24,18 主機遮罩                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgid "%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG "
+msgstr ""
 
 #: src/common/textevents.h:222
-msgid "%O%C26$1%O removed from ignore list."
-msgstr "%O%C26$1%O 已從忽略清單中刪除。"
+msgid "%O%C18$1%O removed from ignore list."
+msgstr ""
 
 #: src/common/textevents.h:225
-msgid "  Ignore list is empty."
-msgstr "  您的忽略清單還是空的。"
+msgid "%OIgnore list is empty."
+msgstr ""
 
 #: src/common/textevents.h:228
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only)."
-msgstr "%C22*%O$t無法加入%C26 %B$1 %O(該聊天室只有被邀請才能加入)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)"
+msgstr ""
 
 #: src/common/textevents.h:231
-msgid "%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)"
-msgstr "%C22*%O$t%C26 $2%C (%C26$3%C)邀請您加入%C26 $1%O"
+msgid "%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:234
-msgid "%C19*%O$t%C19%B$1 %B($3) has joined $2"
-msgstr "%C19*%O$t%C19%B$1 %B($3) 加入了 $2"
+#, c-format
+msgid "%C23*$t$1 ($3) has joined"
+msgstr ""
 
 #: src/common/textevents.h:237
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword)."
-msgstr "%C22*%O$t無法加入%C26 %B$1 %O(需要密碼)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)"
+msgstr ""
 
 #: src/common/textevents.h:240
-msgid "%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)"
-msgstr "%C21*%O$t%C21$1 把 $2 踢出了 $3 ($4%O%C21)"
+msgid "%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:243
-msgid "%C22*%O$tYou have been killed by $1 ($2%O%C22)"
-msgstr "%C22*%O$t您被 $1 踢出了聊天室 ($2%O%C22)"
+msgid "%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)"
+msgstr ""
 
 #: src/common/textevents.h:252
-msgid "%C22*%O$t%C22MOTD Skipped."
-msgstr "%C22*%O$t%C22MOTD 被跳過。"
+msgid "%C29*%O$t%C29MOTD Skipped%O"
+msgstr ""
 
 #: src/common/textevents.h:255
-msgid "%C22*%O$t$1 already in use. Retrying with $2..."
-msgstr "%C22*%O$t$1 已被佔用。正在使用 $2 重試..."
+msgid "%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O..."
+msgstr ""
 
 #: src/common/textevents.h:258
-msgid "%C22*%O$tNickname already in use. Use /NICK to try another."
-msgstr "%C22*z%O$t該暱稱已被佔用。請用 /NICK 嘗試使用另一個暱稱。"
+msgid "%C20*%O$tNickname already in use. Use /NICK to try another."
+msgstr ""
 
 #: src/common/textevents.h:261
-msgid "%C22*%O$tNo such DCC."
-msgstr "%C22*%O$t沒有此 DCC。"
+msgid "%C20*%O$tNo such DCC."
+msgstr ""
 
 #: src/common/textevents.h:264
-msgid "%C22*%O$tNo process is currently running"
-msgstr "%C22*%O$t目前沒有任何行程在執行"
+msgid "%C23*%O$tNo process is currently running"
+msgstr ""
 
 #: src/common/textevents.h:273
 msgid "$tNotify list is empty."
 msgstr "$t上線通知清單是空的。"
 
 #: src/common/textevents.h:276
-msgid "%C24,18 %B  Notify List                           "
-msgstr "%C24,18 %B  通知清單                             "
+#, c-format
+msgid "%C16,17  Notify List                           "
+msgstr ""
 
 #: src/common/textevents.h:279
-msgid "%C22*%O$t$1 users in notify list."
-msgstr "%C22*%O$t$1通知清單中有 $1 名使用者。"
+msgid "%C23*%O$t%C23$1%O users in notify list."
+msgstr ""
 
 #: src/common/textevents.h:282
-msgid "%C22*%O$tNotify: $1 is offline ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:285
-msgid "%C22*%O$tNotify: $1 is online ($3)."
+msgid "%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)"
 msgstr ""
 
 #: src/common/textevents.h:291
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) 離開了 $3"
+#, c-format
+msgid "%C24*$t$1 has left"
+msgstr ""
 
 #: src/common/textevents.h:294
-msgid "%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*%O$t%C23$1 (%O%C23$2) 離開了 $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:297
-msgid "%C22*%O$tPing reply from $1: $2 second(s)"
-msgstr "%C22*%O$tPing 回應從 $1 處返回：$2 秒"
+msgid "%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)"
+msgstr ""
 
 #: src/common/textevents.h:300
-msgid "%C22*%O$tNo ping reply for $1 seconds, disconnecting."
-msgstr "%C22*%O$t在 %1 秒內沒有收到 ping 回應，正在切斷連接。"
+msgid "%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting."
+msgstr ""
 
 #: src/common/textevents.h:315
-msgid "%C22*%O$tA process is already running"
-msgstr "%C22*%O$t一個行程已在執行"
+msgid "%C24*%O$tA process is already running"
+msgstr ""
 
 #: src/common/textevents.h:318
-msgid "%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)"
-msgstr "%C23*%O$t%C23$1 已結束 (%O%C23%B%B$2%O%C23)"
+#, c-format
+msgid "%C24*$t$1 has quit ($2)"
+msgstr ""
 
 #: src/common/textevents.h:321
-msgid "%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]"
-msgstr "%C22*%O$t$1 設定模式%B %C30[%O$2%B%C30]"
+msgid "%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O"
+msgstr ""
 
 #: src/common/textevents.h:324
-msgid "%C28-%C29$1/Wallops%C28-%O$t$2"
-msgstr "%C28-%C29$1/Wallops%C28-%O$t$2"
+msgid "%O-%C29$1/Wallops%O-$t$2"
+msgstr ""
 
 #: src/common/textevents.h:327
-msgid "%C22*%O$tLooking up IP number for%C26 $1%O..."
-msgstr "%C22*%O$t查尋 %C26 $1%O 的 IP 位址..."
+msgid "%C24*%O$tLooking up IP number for %C18$1%O..."
+msgstr ""
 
 #: src/common/textevents.h:330
-msgid "%C22*%O$t%C22Connected."
-msgstr "%C22*%O$t%C22已連接。"
+msgid "%C29*%O$tConnected."
+msgstr ""
 
 #: src/common/textevents.h:336
-msgid "%C22*%O$t%C22Looking up $1"
-msgstr "%C22*%O$t%C22正在查詢 $1"
+msgid "%C29*%O$tLooking up %C29$1%O"
+msgstr ""
 
 #: src/common/textevents.h:348
-msgid "%C22*%O$tStopped previous connection attempt (pid=$1)"
-msgstr "%C22*%O$t前次連線嘗試停止 (pid=$1)"
+msgid "%C23*%O$tStopped previous connection attempt (%C24$1%O)"
+msgstr ""
 
 #: src/common/textevents.h:351
-msgid "%C29*%O$t%C29Topic for $1%C %C29is: $2"
-msgstr "%C29*%O$t%C29$1%C %C29的話題是：$2"
+msgid "%C22*%O$tTopic for %C22$1%C is: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:354
-msgid "%C22*%O$t$1 has changed the topic to: $2"
-msgstr "%C22*%O$t$1 已將話題改變為： $2%O"
+msgid "%C22*%O$t%C26$1%C has changed the topic to: $2%O"
+msgstr ""
 
 #: src/common/textevents.h:357
-msgid "%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3"
-msgstr "%C29*%O$t%C29$1%C %C29的話題由 $2%C %C29於 $3 設定"
+msgid "%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:360
-msgid "%C22*%O$tUnknown host. Maybe you misspelled it?"
-msgstr "%C22*%O$t未知主機。也許您把它拼寫錯了？"
+msgid "%C20*%O$tUnknown host. Maybe you misspelled it?"
+msgstr ""
 
 #: src/common/textevents.h:363
-msgid "%C22*%O$tCannot join%C26 %B$1 %O(User limit reached)."
-msgstr "%C22*%O$t無法加入%C26 %B$1 %O(達到了使用者限額)。"
+msgid "%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)"
+msgstr ""
 
 #: src/common/textevents.h:366
-msgid "%C22*%O$t%C26Users on $1:%C $2"
-msgstr "%C22*%O$t%C26 $1 中的使用者：%C $2"
+msgid "%C22*%O$tUsers on %C22$1%C: %C24$2%O"
+msgstr ""
 
 #: src/common/textevents.h:369
-msgid "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O"
+msgstr ""
 
 #: src/common/textevents.h:372
-msgid "%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C 暫時離開了 %C30(%O$2%O%C30)"
+msgid "%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O"
+msgstr ""
 
 #: src/common/textevents.h:375 src/common/textevents.h:381
-#: src/common/textevents.h:396 src/common/textevents.h:399
-msgid "%C22*%O$t%C28[%O$1%C28]%O $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O $2"
+#: src/common/textevents.h:399
+msgid "%C23*%O$t%C28[%C18$1%C28]%O $2"
+msgstr ""
 
 #: src/common/textevents.h:378
-msgid "%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list."
-msgstr "%C22*%O$t%C28[%O$1%C28] %O WHOIS 清單結束。"
+msgid "%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list."
+msgstr ""
 
 #: src/common/textevents.h:384
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 發呆%C26 $2"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O"
+msgstr ""
 
 #: src/common/textevents.h:387
-msgid "%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28]%O 發呆%C26 $2%O, 登入時間：%C26 $3"
+msgid "%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O"
+msgstr ""
 
 #: src/common/textevents.h:390
-msgid "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
-msgstr "%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4"
+msgid "%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O"
+msgstr ""
 
 #: src/common/textevents.h:393
-msgid "%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3"
-msgstr "%C22*%O$t%C28[%O$1%C28] %O 真實使用者@主機%C27 $2%O, 真實IP%C27 $3"
+msgid ""
+"%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O"
+msgstr ""
+
+#: src/common/textevents.h:396
+msgid "%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O"
+msgstr ""
 
 #: src/common/textevents.h:402
-msgid "%C19*%O$t%C19Now talking on $2"
-msgstr "%C19*%O$t%C19您現在在 $2 裡聊天"
+msgid "%C19*%O$tNow talking on %C22$2%O"
+msgstr ""
 
 #: src/common/textevents.h:405
-msgid "%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)"
-msgstr "%C23*$t您被 $3 從 $2 中踢出 ($4%O%C23)"
+msgid "%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:408
-#, c-format
-msgid "%C23*$tYou have left channel $3"
-msgstr "%C23*$t您已離開聊天室 $3"
+msgid "%C19*%O$tYou have left channel %C22$3%O"
+msgstr ""
 
 #: src/common/textevents.h:411
-msgid "%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)"
-msgstr "%C23*$t您已離開聊天室 $3 (%O%C23%B%B$4%O%C23)"
+msgid "%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)"
+msgstr ""
 
 #: src/common/textevents.h:417
-msgid "%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)"
-msgstr "%C22*%O$t您已邀請%C26 $1%O 加入%C26 $2%O (%C26$3%O)"
+msgid "%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)"
+msgstr ""
 
 #: src/common/textevents.h:423
-msgid "%C22*%O$tYou are now known as $2"
-msgstr "%C22*%O$t您已改名為$2"
+msgid "%C20*%O$tYou are now known as %C18$2%O"
+msgstr ""
 
 #: src/common/text.c:367 src/common/text.c:418
 msgid "Loaded log from"
@@ -1721,27 +1733,27 @@ msgid ""
 "%s"
 msgstr "無法讀取聲音檔案：\n%s"
 
-#: src/common/util.c:300
+#: src/common/util.c:301
 msgid "Remote host closed socket"
 msgstr "遠端主機已關閉 socket"
 
-#: src/common/util.c:305
+#: src/common/util.c:306
 msgid "Connection refused"
 msgstr "連線被拒絕"
 
-#: src/common/util.c:308
+#: src/common/util.c:309
 msgid "No route to host"
 msgstr "沒有到主機的路由"
 
-#: src/common/util.c:310
+#: src/common/util.c:311
 msgid "Connection timed out"
 msgstr "連線超時"
 
-#: src/common/util.c:312
+#: src/common/util.c:313
 msgid "Cannot assign that address"
 msgstr "無法分配該位址"
 
-#: src/common/util.c:314
+#: src/common/util.c:315
 msgid "Connection reset by peer"
 msgstr "連線被對方重設"
 
@@ -2883,13 +2895,13 @@ msgstr ""
 msgid "Failed to acquire %s: %s\n"
 msgstr "取得 %s 失敗: %s\n"
 
-#: src/fe-gtk/about.c:101
+#: src/fe-gtk/about.c:83
 msgid "About "
 msgstr ""
 
-#: src/fe-gtk/about.c:134
-msgid "A multiplatform IRC Client"
-msgstr "跨平台的 IRC 客戶端軟體"
+#: src/fe-gtk/about.c:111
+msgid "<b>A multiplatform IRC Client</b>"
+msgstr ""
 
 #: src/fe-gtk/ascii.c:133
 msgid "Character Chart"