Change default text events

3 files changed, 276 insertions, 270 deletions

diff --git a/src/common/make-te.c b/src/common/make-te.c
index ed87df3d..aece6fbe 100644
--- a/src/common/make-te.c
+++ b/src/common/make-te.c
@@ -1,3 +1,9 @@
+/* process textevents.in with make-te < textevents.in > textevents.h 2> textenums.h
+ * textevents.in notes:
+ *  - the n prefix means the event text does not have to be translated thus
+ *    the N_() encapsulation will be omitted
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/common/textevents.h b/src/common/textevents.h
index 08a54da5..3fa1eedd 100644
--- a/src/common/textevents.h
+++ b/src/common/textevents.h
@@ -3,49 +3,49 @@
 const struct text_event te[] = {
 
 {"Add Notify", pevt_generic_nick_help, 1, 
-N_("%C22*%O$t$1 added to notify list.")},
+N_("%C18*%O$t%C18$1%O added to notify list.")},
 
 {"Ban List", pevt_banlist_help, 4, 
-N_("%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3")},
+N_("%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O")},
 
 {"Banned", pevt_generic_channel_help, 1, 
-N_("%C22*%O$tCannot join%C26 %B$1 %O(You are banned).")},
+N_("%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O).")},
 
 {"Beep", pevt_generic_none_help, 128, 
 ""},
 
 {"Change Nick", pevt_changenick_help, 2, 
-N_("%C22*%O$t$1 is now known as $2")},
+N_("%C24*%O$t%C28$1%O is now known as%C18 $2%O")},
 
 {"Channel Action", pevt_chanaction_help, 132, 
-"%C18*$t$1%O $2"},
+"%C18*$t%B$1%O $2"},
 
 {"Channel Action Hilight", pevt_chanaction_help, 132, 
-"%C21*%O$t%C21%B$1%O%C21 $2"},
+"%C19*$t%B$1%B $2%O"},
 
 {"Channel Ban", pevt_chanban_help, 2, 
-N_("%C22*%O$t$1 sets ban on $2")},
+N_("%C22*%O$t%C26$1%O sets ban on %C18$2%O")},
 
-{"Channel Creation", pevt_chandate_help, 2, 
-N_("%C22*%O$tChannel $1 created on $2")},
+{"Channel Creation", pevt_chandate_help, 1, 
+N_("%C22*%O$tChannel %C22$1%O created")},
 
 {"Channel DeHalfOp", pevt_chandehop_help, 2, 
-N_("%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2")},
+N_("%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O")},
 
 {"Channel DeOp", pevt_chandeop_help, 2, 
-N_("%C22*%O$t%C26$1%O removes channel operator status from%C26 $2")},
+N_("%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O")},
 
 {"Channel DeVoice", pevt_chandevoice_help, 2, 
-N_("%C22*%O$t%C26$1%O removes voice from%C26 $2")},
+N_("%C22*%O$t%C26$1%O removes voice from %C18$2%O")},
 
 {"Channel Exempt", pevt_chanexempt_help, 2, 
-N_("%C22*%O$t$1 sets exempt on $2")},
+N_("%C22*%O$t%C26 $1%C sets exempt on %C18$2%O")},
 
 {"Channel Half-Operator", pevt_chanhop_help, 2, 
-N_("%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2")},
+N_("%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O")},
 
 {"Channel INVITE", pevt_chaninvite_help, 2, 
-N_("%C22*%O$t$1 sets invite on $2")},
+N_("%C22*%O$t%C26 $1%C sets invite on %C18$2%O")},
 
 {"Channel List", pevt_generic_none_help, 0, 
 N_("%UChannel          Users   Topic")},
@@ -54,250 +54,250 @@ N_("%UChannel          Users   Topic")},
 "%C18%H<%H$4$1%H>%H%O$t$2"},
 
 {"Channel Mode Generic", pevt_chanmodegen_help, 4, 
-N_("%C22*%O$t$1 sets mode $2$3 $4")},
+N_("%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O")},
 
 {"Channel Modes", pevt_chanmodes_help, 2, 
-N_("%C22*%O$t%C22Channel $1 modes: $2")},
+N_("%C22*%O$tChannel %C22$1%O modes: %C24$2")},
 
 {"Channel Msg Hilight", pevt_chanmsg_help, 132, 
-"$4%C21%B%H<%H$1%H>%H%O%C21$t$2"},
+"%C19%H<%H$4%B$1%B%H>%H$t$2%O"},
 
 {"Channel Notice", pevt_channotice_help, 131, 
-"%C28-%C29$1/$2%C28-%O$t$3"},
+"-%C18$1%C/%C22$2%C-$t$3%O"},
 
 {"Channel Operator", pevt_chanop_help, 2, 
-N_("%C22*%O$t%C26$1%O gives channel operator status to%C26 $2")},
+N_("%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O")},
 
 {"Channel Remove Exempt", pevt_chanrmexempt_help, 2, 
-N_("%C22*%O$t$1 removes exempt on $2")},
+N_("%C22*%O$t%C26$1%O removes exempt on %C18$2%O")},
 
 {"Channel Remove Invite", pevt_chanrminvite_help, 2, 
-N_("%C22*%O$t$1 removes invite on $2")},
+N_("%C22*%O$t%C26 $1%O removes invite on %C18$2%O")},
 
 {"Channel Remove Keyword", pevt_chanrmkey_help, 1, 
-N_("%C22*%O$t$1 removes channel keyword")},
+N_("%C22*%O$t%C26$1%O removes channel keyword")},
 
 {"Channel Remove Limit", pevt_chanrmlimit_help, 1, 
-N_("%C22*%O$t$1 removes user limit")},
+N_("%C22*%O$t%C26$1%O removes user limit")},
 
 {"Channel Set Key", pevt_chansetkey_help, 2, 
-N_("%C22*%O$t$1 sets channel keyword to $2")},
+N_("%C22*%O$t$1 sets channel keyword to %C24$2%O")},
 
 {"Channel Set Limit", pevt_chansetlimit_help, 2, 
-N_("%C22*%O$t$1 sets channel limit to $2")},
+N_("%C22*%O$t%C26$1%O sets channel limit to %C24$2%O")},
 
 {"Channel UnBan", pevt_chanunban_help, 2, 
-N_("%C22*%O$t$1 removes ban on $2")},
+N_("%C22*%O$t%C26$1%O removes ban on %C24$2%O")},
 
 {"Channel Voice", pevt_chanvoice_help, 2, 
-N_("%C22*%O$t%C26$1%O gives voice to%C26 $2")},
+N_("%C22*%O$t%C26$1%O gives voice to %C18$2%O")},
 
 {"Connected", pevt_generic_none_help, 0, 
-N_("%C22*%O$t%C22Connected. Now logging in...")},
+N_("%C23*%O$tConnected. Now logging in.")},
 
 {"Connecting", pevt_connect_help, 3, 
-N_("%C22*%O$t%C22Connecting to $1 ($2) port $3%O...")},
+N_("%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)")},
 
 {"Connection Failed", pevt_connfail_help, 1, 
-N_("%C21*%O$t%C21Connection failed. Error: $1")},
+N_("%C20*%O$tConnection failed (%C20$1%O)")},
 
 {"CTCP Generic", pevt_ctcpgen_help, 2, 
-N_("%C22*%O$tReceived a CTCP $1 from $2")},
+N_("%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O")},
 
 {"CTCP Generic to Channel", pevt_ctcpgenc_help, 3, 
-N_("%C22*%O$tReceived a CTCP $1 from $2 (to $3)")},
+N_("%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O")},
 
 {"CTCP Send", pevt_ctcpsend_help, 2, 
-N_("%C19>%O$1%C19<%O$tCTCP $2")},
+N_(">%C18$1%C<$tCTCP %C24$2%O")},
 
 {"CTCP Sound", pevt_ctcpsnd_help, 2, 
-N_("%C22*%O$tReceived a CTCP Sound $1 from $2")},
+N_("%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O")},
 
 {"CTCP Sound to Channel", pevt_ctcpsnd_help, 3, 
-N_("%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)")},
+N_("%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)")},
 
 {"DCC CHAT Abort", pevt_dccchatabort_help, 1, 
-N_("%C22*%O$tDCC CHAT to %C26$1%O aborted.")},
+N_("%C23*%O$tDCC CHAT to %C18$1%O aborted.")},
 
 {"DCC CHAT Connect", pevt_dccchatcon_help, 2, 
-N_("%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]")},
+N_("%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O")},
 
 {"DCC CHAT Failed", pevt_dccchaterr_help, 4, 
-N_("%C22*%O$tDCC CHAT to %C26$1%O lost ($4).")},
+N_("%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)")},
 
 {"DCC CHAT Offer", pevt_generic_nick_help, 1, 
-N_("%C22*%O$tReceived a DCC CHAT offer from $1")},
+N_("%C24*%O$tReceived a DCC CHAT offer from %C18$1%O")},
 
 {"DCC CHAT Offering", pevt_generic_nick_help, 1, 
-N_("%C22*%O$tOffering DCC CHAT to $1")},
+N_("%C24*%O$tOffering DCC CHAT to %C18$1%O")},
 
 {"DCC CHAT Reoffer", pevt_generic_nick_help, 1, 
-N_("%C22*%O$tAlready offering CHAT to $1")},
+N_("%C24*%O$tAlready offering CHAT to %C18$1%O")},
 
 {"DCC Conection Failed", pevt_dccconfail_help, 3, 
-N_("%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3).")},
+N_("%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)")},
 
 {"DCC Generic Offer", pevt_dccgenericoffer_help, 2, 
-N_("%C22*%O$tReceived '$1%O' from $2")},
+N_("%C23*%O$tReceived '%C23$1%C' from %C18$2%O")},
 
 {"DCC Header", pevt_generic_none_help, 0, 
-N_("%C24,18 Type  To/From    Status  Size    Pos     File         ")},
+N_("%C16,17 Type  To/From      Status  Size    Pos     File              ")},
 
 {"DCC Malformed", pevt_malformed_help, 2, 
-N_("%C22*%O$tReceived a malformed DCC request from %C26$1%O.%010%C22*%O$tContents of packet: $2")},
+N_("%C20*%O$tReceived a malformed DCC request from %C18$1%O.%010%C23*%O$tContents of packet: %C23$2%O")},
 
 {"DCC Offer", pevt_dccoffer_help, 3, 
-N_("%C22*%O$tOffering%C26 $1%O to%C26 $2")},
+N_("%C24*%O$tOffering '%C24$1%O' to %C18$2%O")},
 
 {"DCC Offer Not Valid", pevt_generic_none_help, 0, 
-N_("%C22*%O$tNo such DCC offer.")},
+N_("%C23*%O$tNo such DCC offer.")},
 
 {"DCC RECV Abort", pevt_dccfileabort_help, 2, 
-N_("%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted.")},
+N_("%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted.")},
 
 {"DCC RECV Complete", pevt_dccrecvcomp_help, 4, 
-N_("%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O complete %C30[%C26$4%O cps%C30]%O.")},
+N_("%C24*%O$tDCC RECV '%C23$1%O' from %C18$3%O complete %C30[%C24$4%O cps%C30]%O")},
 
 {"DCC RECV Connect", pevt_dcccon_help, 3, 
-N_("%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]")},
+N_("%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O")},
 
 {"DCC RECV Failed", pevt_dccrecverr_help, 4, 
-N_("%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4).")},
+N_("%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)")},
 
 {"DCC RECV File Open Error", pevt_generic_file_help, 2, 
-N_("%C22*%O$tDCC RECV: Cannot open $1 for writing ($2).")},
+N_("%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)")},
 
 {"DCC Rename", pevt_dccrename_help, 2, 
-N_("%C22*%O$tThe file%C26 $1%C already exists, saving it as%C26 $2%O instead.")},
+N_("%C23*%O$tThe file '%C24$1%C' already exists, saving it as '%C23$2%O' instead.")},
 
 {"DCC RESUME Request", pevt_dccresumeoffer_help, 3, 
-N_("%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C.")},
+N_("%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O.")},
 
 {"DCC SEND Abort", pevt_dccfileabort_help, 2, 
-N_("%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted.")},
+N_("%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted.")},
 
 {"DCC SEND Complete", pevt_dccsendcomp_help, 3, 
-N_("%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O complete %C30[%C26$3%O cps%C30]%O.")},
+N_("%C24*%O$tDCC SEND '%C23$1%C' to %C18$2%C complete %C30[%C24$3%C cps%C30]%O")},
 
 {"DCC SEND Connect", pevt_dcccon_help, 3, 
-N_("%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]")},
+N_("%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O")},
 
 {"DCC SEND Failed", pevt_dccsendfail_help, 3, 
-N_("%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3")},
+N_("%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)")},
 
 {"DCC SEND Offer", pevt_dccsendoffer_help, 4, 
-N_("%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)")},
+N_("%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)")},
 
 {"DCC Stall", pevt_dccstall_help, 3, 
-N_("%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting.")},
+N_("%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting.")},
 
 {"DCC Timeout", pevt_dccstall_help, 3, 
-N_("%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting.")},
+N_("%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting.")},
 
 {"Delete Notify", pevt_generic_nick_help, 1, 
-N_("%C22*%O$t$1 deleted from notify list.")},
+N_("%C24*%O$t%C18$1%O deleted from notify list.")},
 
 {"Disconnected", pevt_discon_help, 1, 
-N_("%C22*%O$tDisconnected ($1).")},
+N_("%C20*%O$tDisconnected (%C20$1%O)")},
 
 {"Found IP", pevt_foundip_help, 1, 
-N_("%C22*%O$tFound your IP: [$1]")},
+N_("%C24*%O$tFound your IP: %C30[%C24$1%C30]%O")},
 
 {"Generic Message", pevt_genmsg_help, 130, 
 "$1$t$2"},
 
 {"Ignore Add", pevt_ignoreaddremove_help, 1, 
-N_("%O%C26$1%O added to ignore list.")},
+N_("%O%C18$1%O added to ignore list.")},
 
 {"Ignore Changed", pevt_ignoreaddremove_help, 1, 
-N_("Ignore on %C26$1%O changed.")},
+N_("%OIgnore on %C18$1%O changed.")},
 
 {"Ignore Footer", pevt_generic_none_help, 0, 
-N_("%C24,18                                                              ")},
+N_("%C16,17                                                              ")},
 
 {"Ignore Header", pevt_generic_none_help, 0, 
-N_("%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG ")},
+N_("%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG ")},
 
 {"Ignore Remove", pevt_ignoreaddremove_help, 1, 
-N_("%O%C26$1%O removed from ignore list.")},
+N_("%O%C18$1%O removed from ignore list.")},
 
 {"Ignorelist Empty", pevt_generic_none_help, 0, 
-N_("  Ignore list is empty.")},
+N_("%OIgnore list is empty.")},
 
 {"Invite", pevt_generic_channel_help, 1, 
-N_("%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only).")},
+N_("%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)")},
 
 {"Invited", pevt_invited_help, 3, 
-N_("%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)")},
+N_("%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)")},
 
-{"Join", pevt_join_help, 3, 
-N_("%C19*%O$t%C19%B$1 %B($3) has joined $2")},
+{"Join", pevt_join_help, 2, 
+N_("%C23*$t$1 ($3) has joined")},
 
 {"Keyword", pevt_generic_channel_help, 1, 
-N_("%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword).")},
+N_("%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)")},
 
 {"Kick", pevt_kick_help, 4, 
-N_("%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)")},
+N_("%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)")},
 
 {"Killed", pevt_kill_help, 2, 
-N_("%C22*%O$tYou have been killed by $1 ($2%O%C22)")},
+N_("%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)")},
 
 {"Message Send", pevt_ctcpsend_help, 130, 
-"%C19>%O$1%C19<%O$t$2"},
+"%O>%C18$1%C<%O$t$2"},
 
 {"Motd", pevt_servertext_help, 129, 
-"%C16*%O$t$1%O"},
+"%C29*%O$t%C29$1%O"},
 
 {"MOTD Skipped", pevt_generic_none_help, 0, 
-N_("%C22*%O$t%C22MOTD Skipped.")},
+N_("%C29*%O$t%C29MOTD Skipped%O")},
 
 {"Nick Clash", pevt_nickclash_help, 2, 
-N_("%C22*%O$t$1 already in use. Retrying with $2...")},
+N_("%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O...")},
 
 {"Nick Failed", pevt_generic_none_help, 0, 
-N_("%C22*%O$tNickname already in use. Use /NICK to try another.")},
+N_("%C20*%O$tNickname already in use. Use /NICK to try another.")},
 
 {"No DCC", pevt_generic_none_help, 0, 
-N_("%C22*%O$tNo such DCC.")},
+N_("%C20*%O$tNo such DCC.")},
 
 {"No Running Process", pevt_generic_none_help, 0, 
-N_("%C22*%O$tNo process is currently running")},
+N_("%C23*%O$tNo process is currently running")},
 
 {"Notice", pevt_notice_help, 130, 
-"%C28-%C29$1%C28-%O$t$2"},
+"%O-%C18$1%O-$t$2"},
 
 {"Notice Send", pevt_ctcpsend_help, 130, 
-"%C19>%O$1%C19<%O$t$2"},
+"%O->%C18$1%O<-$t$2"},
 
 {"Notify Empty", pevt_generic_none_help, 0, 
 N_("$tNotify list is empty.")},
 
 {"Notify Header", pevt_generic_none_help, 0, 
-N_("%C24,18 %B  Notify List                           ")},
+N_("%C16,17 Notify List                           ")},
 
 {"Notify Number", pevt_notifynumber_help, 1, 
-N_("%C22*%O$t$1 users in notify list.")},
+N_("%C23*%O$t%C23$1%O users in notify list.")},
 
 {"Notify Offline", pevt_generic_nick_help, 3, 
-N_("%C22*%O$tNotify: $1 is offline ($3).")},
+N_("%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)")},
 
 {"Notify Online", pevt_generic_nick_help, 3, 
-N_("%C22*%O$tNotify: $1 is online ($3).")},
+N_("%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)")},
 
 {"Open Dialog", pevt_generic_none_help, 128, 
 ""},
 
-{"Part", pevt_part_help, 3, 
-N_("%C23*%O$t%C23$1 (%O%C23$2) has left $3")},
+{"Part", pevt_part_help, 1, 
+N_("%C24*$t$1 has left")},
 
-{"Part with Reason", pevt_partreason_help, 4, 
-N_("%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)")},
+{"Part with Reason", pevt_partreason_help, 3, 
+N_("%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)")},
 
 {"Ping Reply", pevt_pingrep_help, 2, 
-N_("%C22*%O$tPing reply from $1: $2 second(s)")},
+N_("%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)")},
 
 {"Ping Timeout", pevt_pingtimeout_help, 1, 
-N_("%C22*%O$tNo ping reply for $1 seconds, disconnecting.")},
+N_("%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting.")},
 
 {"Private Action", pevt_privmsg_help, 131, 
 "%C18**$t$3$1%O $2 %C18**"},
@@ -306,119 +306,119 @@ N_("%C22*%O$tNo ping reply for $1 seconds, disconnecting.")},
 "%C18*$t$3$1%O $2"},
 
 {"Private Message", pevt_privmsg_help, 131, 
-"%C28*%C29$3$1%C28*$t%O$2"},
+"%C18*%C18$3$1*%O$t$2"},
 
 {"Private Message to Dialog", pevt_privmsg_help, 131, 
 "%C18%H<%H$3$1%H>%H%O$t$2"},
 
 {"Process Already Running", pevt_generic_none_help, 0, 
-N_("%C22*%O$tA process is already running")},
+N_("%C24*%O$tA process is already running")},
 
 {"Quit", pevt_quit_help, 3, 
-N_("%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)")},
+N_("%C24*$t$1 has quit ($2)")},
 
 {"Raw Modes", pevt_rawmodes_help, 2, 
-N_("%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]")},
+N_("%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O")},
 
 {"Receive Wallops", pevt_privmsg_help, 2, 
-N_("%C28-%C29$1/Wallops%C28-%O$t$2")},
+N_("%O-%C29$1/Wallops%O-$t$2")},
 
 {"Resolving User", pevt_resolvinguser_help, 2, 
-N_("%C22*%O$tLooking up IP number for%C26 $1%O...")},
+N_("%C24*%O$tLooking up IP number for %C18$1%O...")},
 
 {"Server Connected", pevt_generic_none_help, 0, 
-N_("%C22*%O$t%C22Connected.")},
+N_("%C29*%O$tConnected.")},
 
 {"Server Error", pevt_servererror_help, 129, 
-"%C22*%O$t$1"},
+"%C29*%O$t%C20$1%O"},
 
 {"Server Lookup", pevt_serverlookup_help, 1, 
-N_("%C22*%O$t%C22Looking up $1")},
+N_("%C29*%O$tLooking up %C29$1%O")},
 
 {"Server Notice", pevt_servertext_help, 130, 
-"%C22*%O$t$1"},
+"%C29*%O$t$1"},
 
 {"Server Text", pevt_servertext_help, 131, 
-"%C22*%O$t$1"},
+"%C29*%O$t$1"},
 
 {"SSL Message", pevt_sslmessage_help, 130, 
-"%C22*%O$t$1"},
+"%C29*%O$t$1"},
 
 {"Stop Connection", pevt_sconnect_help, 1, 
-N_("%C22*%O$tStopped previous connection attempt (pid=$1)")},
+N_("%C23*%O$tStopped previous connection attempt (%C24$1%O)")},
 
 {"Topic", pevt_topic_help, 2, 
-N_("%C29*%O$t%C29Topic for $1%C %C29is: $2")},
+N_("%C22*%O$tTopic for %C22$1%C is: $2%O")},
 
 {"Topic Change", pevt_newtopic_help, 3, 
-N_("%C22*%O$t$1 has changed the topic to: $2")},
+N_("%C22*%O$t%C26$1%C has changed the topic to: $2%O")},
 
 {"Topic Creation", pevt_topicdate_help, 3, 
-N_("%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3")},
+N_("%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)")},
 
 {"Unknown Host", pevt_generic_none_help, 0, 
-N_("%C22*%O$tUnknown host. Maybe you misspelled it?")},
+N_("%C20*%O$tUnknown host. Maybe you misspelled it?")},
 
 {"User Limit", pevt_generic_channel_help, 1, 
-N_("%C22*%O$tCannot join%C26 %B$1 %O(User limit reached).")},
+N_("%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)")},
 
 {"Users On Channel", pevt_usersonchan_help, 2, 
-N_("%C22*%O$t%C26Users on $1:%C $2")},
+N_("%C22*%O$tUsers on %C22$1%C: %C24$2%O")},
 
 {"WhoIs Authenticated", pevt_whoisauth_help, 3, 
-N_("%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O")},
 
 {"WhoIs Away Line", pevt_whois5_help, 2, 
-N_("%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)")},
+N_("%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O")},
 
 {"WhoIs Channel/Oper Line", pevt_whois2_help, 2, 
-N_("%C22*%O$t%C28[%O$1%C28]%O $2")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O $2")},
 
 {"WhoIs End", pevt_whois6_help, 1, 
-N_("%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list.")},
+N_("%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list.")},
 
 {"WhoIs Identified", pevt_whoisid_help, 2, 
-N_("%C22*%O$t%C28[%O$1%C28]%O $2")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O $2")},
 
 {"WhoIs Idle Line", pevt_whois4_help, 2, 
-N_("%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O")},
 
 {"WhoIs Idle Line with Signon", pevt_whois4t_help, 3, 
-N_("%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O")},
 
 {"WhoIs Name Line", pevt_whois1_help, 4, 
-N_("%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4")},
+N_("%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O")},
 
 {"WhoIs Real Host", pevt_whoisrealhost_help, 4, 
-N_("%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O")},
 
 {"WhoIs Server Line", pevt_whois3_help, 2, 
-N_("%C22*%O$t%C28[%O$1%C28]%O $2")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O")},
 
 {"WhoIs Special", pevt_whoisid_help, 3, 
-N_("%C22*%O$t%C28[%O$1%C28]%O $2")},
+N_("%C23*%O$t%C28[%C18$1%C28]%O $2")},
 
 {"You Join", pevt_join_help, 3, 
-N_("%C19*%O$t%C19Now talking on $2")},
+N_("%C19*%O$tNow talking on %C22$2%O")},
 
 {"You Kicked", pevt_ukick_help, 4, 
-N_("%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)")},
+N_("%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)")},
 
 {"You Part", pevt_part_help, 3, 
-N_("%C23*$tYou have left channel $3")},
+N_("%C19*%O$tYou have left channel %C22$3%O")},
 
 {"You Part with Reason", pevt_partreason_help, 4, 
-N_("%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)")},
+N_("%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)")},
 
 {"Your Action", pevt_chanaction_help, 131, 
-"%C18*$t$1%O $2"},
+"%C20*$t%B$1%B %C30$2%O"},
 
 {"Your Invitation", pevt_uinvite_help, 3, 
-N_("%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)")},
+N_("%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)")},
 
 {"Your Message", pevt_chanmsg_help, 132, 
-"%C31%H<%H$4$1%H>%H%O%C30$t$2"},
+"%C20%H<%H$4$1%H>%H%O%C30$t$2%O"},
 
 {"Your Nick Changing", pevt_uchangenick_help, 2, 
-N_("%C22*%O$tYou are now known as $2")},
+N_("%C20*%O$tYou are now known as %C18$2%O")},
 };
diff --git a/src/common/textevents.in b/src/common/textevents.in
index 5b4ce18c..2ad41a0d 100644
--- a/src/common/textevents.in
+++ b/src/common/textevents.in
@@ -1,19 +1,19 @@
 Add Notify
 XP_TE_ADDNOTIFY
 pevt_generic_nick_help
-%C22*%O$t$1 added to notify list.
+%C18*%O$t%C18$1%O added to notify list.
 1
 
 Ban List
 XP_TE_BANLIST
 pevt_banlist_help
-%C22*%O$t$1 Banlist:%C19 $4%C20 $2%C21 $3
+%C22*%O$t%C22$1%O Banlist:%C18 $2%O for%C24 $4%O by%C26 $3%O
 4
 
 Banned
 XP_TE_BANNED
 pevt_generic_channel_help
-%C22*%O$tCannot join%C26 %B$1 %O(You are banned).
+%C22*%O$tCannot join%C22 $1 %O(%C20You are banned%O).
 1
 
 Beep
@@ -25,67 +25,67 @@ n0
 Change Nick
 XP_TE_CHANGENICK
 pevt_changenick_help
-%C22*%O$t$1 is now known as $2
+%C24*%O$t%C28$1%O is now known as%C18 $2%O
 2
 
 Channel Action
 XP_TE_CHANACTION
 pevt_chanaction_help
-%C18*$t$1%O $2
+%C18*$t%B$1%O $2
 n4
 
 Channel Action Hilight
 XP_TE_HCHANACTION
 pevt_chanaction_help
-%C21*%O$t%C21%B$1%O%C21 $2
+%C19*$t%B$1%B $2%O
 n4
 
 Channel Ban
 XP_TE_CHANBAN
 pevt_chanban_help
-%C22*%O$t$1 sets ban on $2
+%C22*%O$t%C26$1%O sets ban on %C18$2%O
 2
 
 Channel Creation
 XP_TE_CHANDATE
 pevt_chandate_help
-%C22*%O$tChannel $1 created on $2
-2
+%C22*%O$tChannel %C22$1%O created
+1
 
 Channel DeHalfOp
 XP_TE_CHANDEHOP
 pevt_chandehop_help
-%C22*%O$t%C26$1%O removes channel half-operator status from%C26 $2
+%C22*%O$t%C26$1%O removes channel half-operator status from %C18$2%O
 2
 
 Channel DeOp
 XP_TE_CHANDEOP
 pevt_chandeop_help
-%C22*%O$t%C26$1%O removes channel operator status from%C26 $2
+%C22*%O$t%C26$1%O removes channel operator status from %C18$2%O
 2
 
 Channel DeVoice
 XP_TE_CHANDEVOICE
 pevt_chandevoice_help
-%C22*%O$t%C26$1%O removes voice from%C26 $2
+%C22*%O$t%C26$1%O removes voice from %C18$2%O
 2
 
 Channel Exempt
 XP_TE_CHANEXEMPT
 pevt_chanexempt_help
-%C22*%O$t$1 sets exempt on $2
+%C22*%O$t%C26 $1%C sets exempt on %C18$2%O
 2
 
 Channel Half-Operator
 XP_TE_CHANHOP
 pevt_chanhop_help
-%C22*%O$t%C26$1%O gives channel half-operator status to%C26 $2
+%C22*%O$t%C26$1%O gives channel half-operator status to %C18$2%O
 2
 
 Channel INVITE
 XP_TE_CHANINVITE
 pevt_chaninvite_help
-%C22*%O$t$1 sets invite on $2
+%C22*%O$t%C26 $1%C sets invite on %C18$2%O
 2
 
 Channel List
@@ -103,301 +103,301 @@ n4
 Channel Mode Generic
 XP_TE_CHANMODEGEN
 pevt_chanmodegen_help
-%C22*%O$t$1 sets mode $2$3 $4
+%C22*%O$t%C26$1%O sets mode %C24$2$3%O on %C22$4%O
 4
 
 Channel Modes
 XP_TE_CHANMODES
 pevt_chanmodes_help
-%C22*%O$t%C22Channel $1 modes: $2
+%C22*%O$tChannel %C22$1%O modes: %C24$2
 2
 
 Channel Msg Hilight
 XP_TE_HCHANMSG
 pevt_chanmsg_help
-$4%C21%B%H<%H$1%H>%H%O%C21$t$2
+%C19%H<%H$4%B$1%B%H>%H$t$2%O
 n4
 
 Channel Notice
 XP_TE_CHANNOTICE
 pevt_channotice_help
-%C28-%C29$1/$2%C28-%O$t$3
+-%C18$1%C/%C22$2%C-$t$3%O
 n3
 
 Channel Operator
 XP_TE_CHANOP
 pevt_chanop_help
-%C22*%O$t%C26$1%O gives channel operator status to%C26 $2
+%C22*%O$t%C26$1%O gives channel operator status to %C18$2%O
 2
 
 Channel Remove Exempt
 XP_TE_CHANRMEXEMPT
 pevt_chanrmexempt_help
-%C22*%O$t$1 removes exempt on $2
+%C22*%O$t%C26$1%O removes exempt on %C18$2%O
 2
 
 Channel Remove Invite
 XP_TE_CHANRMINVITE
 pevt_chanrminvite_help
-%C22*%O$t$1 removes invite on $2
+%C22*%O$t%C26 $1%O removes invite on %C18$2%O
 2
 
 Channel Remove Keyword
 XP_TE_CHANRMKEY
 pevt_chanrmkey_help
-%C22*%O$t$1 removes channel keyword
+%C22*%O$t%C26$1%O removes channel keyword
 1
 
 Channel Remove Limit
 XP_TE_CHANRMLIMIT
 pevt_chanrmlimit_help
-%C22*%O$t$1 removes user limit
+%C22*%O$t%C26$1%O removes user limit
 1
 
 Channel Set Key
 XP_TE_CHANSETKEY
 pevt_chansetkey_help
-%C22*%O$t$1 sets channel keyword to $2
+%C22*%O$t$1 sets channel keyword to %C24$2%O
 2
 
 Channel Set Limit
 XP_TE_CHANSETLIMIT
 pevt_chansetlimit_help
-%C22*%O$t$1 sets channel limit to $2
+%C22*%O$t%C26$1%O sets channel limit to %C24$2%O
 2
 
 Channel UnBan
 XP_TE_CHANUNBAN
 pevt_chanunban_help
-%C22*%O$t$1 removes ban on $2
+%C22*%O$t%C26$1%O removes ban on %C24$2%O
 2
 
 Channel Voice
 XP_TE_CHANVOICE
 pevt_chanvoice_help
-%C22*%O$t%C26$1%O gives voice to%C26 $2
+%C22*%O$t%C26$1%O gives voice to %C18$2%O
 2
 
 Connected
 XP_TE_CONNECTED
 pevt_generic_none_help
-%C22*%O$t%C22Connected. Now logging in...
+%C23*%O$tConnected. Now logging in.
 0
 
 Connecting
 XP_TE_CONNECT
 pevt_connect_help
-%C22*%O$t%C22Connecting to $1 ($2) port $3%O...
+%C23*%O$tConnecting to %C29$1%C (%C23$2:$3%O)
 3
 
 Connection Failed
 XP_TE_CONNFAIL
 pevt_connfail_help
-%C21*%O$t%C21Connection failed. Error: $1
+%C20*%O$tConnection failed (%C20$1%O)
 1
 
 CTCP Generic
 XP_TE_CTCPGEN
 pevt_ctcpgen_help
-%C22*%O$tReceived a CTCP $1 from $2
+%C24*%O$tReceived a CTCP %C24$1%C from %C18$2%O
 2
 
 CTCP Generic to Channel
 XP_TE_CTCPGENC
 pevt_ctcpgenc_help
-%C22*%O$tReceived a CTCP $1 from $2 (to $3)
+%C24*%C$tReceived a CTCP %C24$1%C from %C18$2%C (to %C22$3%C)%O
 3
 
 CTCP Send
 XP_TE_CTCPSEND
 pevt_ctcpsend_help
-%C19>%O$1%C19<%O$tCTCP $2
+>%C18$1%C<$tCTCP %C24$2%O
 2
 
 CTCP Sound
 XP_TE_CTCPSND
 pevt_ctcpsnd_help
-%C22*%O$tReceived a CTCP Sound $1 from $2
+%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%O
 2
 
 CTCP Sound to Channel
 XP_TE_CTCPSNDC
 pevt_ctcpsnd_help
-%C22*%O$tReceived a CTCP Sound $1 from $2 (to $3)
+%C24*%O$tReceived a CTCP Sound %C24$1%C from %C18$2%C (to %C22$3%O)
 3
 
 DCC CHAT Abort
 XP_TE_DCCCHATABORT
 pevt_dccchatabort_help
-%C22*%O$tDCC CHAT to %C26$1%O aborted.
+%C23*%O$tDCC CHAT to %C18$1%O aborted.
 1
 
 DCC CHAT Connect
 XP_TE_DCCCONCHAT
 pevt_dccchatcon_help
-%C22*%O$tDCC CHAT connection established to %C26$1 %C30[%O$2%C30]
+%C24*%O$tDCC CHAT connection established to %C18$1%C %C30[%C24$2%C30]%O
 2
 
 DCC CHAT Failed
 XP_TE_DCCCHATF
 pevt_dccchaterr_help
-%C22*%O$tDCC CHAT to %C26$1%O lost ($4).
+%C20*%O$tDCC CHAT to %C18$1%O lost (%C20$4%O)
 4
 
 DCC CHAT Offer
 XP_TE_DCCCHATOFFER
 pevt_generic_nick_help
-%C22*%O$tReceived a DCC CHAT offer from $1
+%C24*%O$tReceived a DCC CHAT offer from %C18$1%O
 1
 
 DCC CHAT Offering
 XP_TE_DCCCHATOFFERING
 pevt_generic_nick_help
-%C22*%O$tOffering DCC CHAT to $1
+%C24*%O$tOffering DCC CHAT to %C18$1%O
 1
 
 DCC CHAT Reoffer
 XP_TE_DCCCHATREOFFER
 pevt_generic_nick_help
-%C22*%O$tAlready offering CHAT to $1
+%C24*%O$tAlready offering CHAT to %C18$1%O
 1
 
 DCC Conection Failed
 XP_TE_DCCCONFAIL
 pevt_dccconfail_help
-%C22*%O$tDCC $1 connect attempt to%C26 $2%O failed (err=$3).
+%C20*%O$tDCC $1 connect attempt to %C18$2%O failed (%C20$3%O)
 3
 
 DCC Generic Offer
 XP_TE_DCCGENERICOFFER
 pevt_dccgenericoffer_help
-%C22*%O$tReceived '$1%O' from $2
+%C23*%O$tReceived '%C23$1%C' from %C18$2%O
 2
 
 DCC Header
 XP_TE_DCCHEAD
 pevt_generic_none_help
-%C24,18 Type  To/From    Status  Size    Pos     File         
+%C16,17 Type  To/From      Status  Size    Pos     File              
 0
 
 DCC Malformed
 XP_TE_MALFORMED
 pevt_malformed_help
-%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
 2
 
 DCC Offer
 XP_TE_DCCOFFER
 pevt_dccoffer_help
-%C22*%O$tOffering%C26 $1%O to%C26 $2
+%C24*%O$tOffering '%C24$1%O' to %C18$2%O
 3
 
 DCC Offer Not Valid
 XP_TE_DCCIVAL
 pevt_generic_none_help
-%C22*%O$tNo such DCC offer.
+%C23*%O$tNo such DCC offer.
 0
 
 DCC RECV Abort
 XP_TE_DCCRECVABORT
 pevt_dccfileabort_help
-%C22*%O$tDCC RECV%C26 $2%O to%C26 $1%O aborted.
+%C23*%O$tDCC RECV '%C23$2%O' to %C18$1%O aborted.
 2
 
 DCC RECV Complete
 XP_TE_DCCRECVCOMP
 pevt_dccrecvcomp_help
-%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
 4
 
 DCC RECV Connect
 XP_TE_DCCCONRECV
 pevt_dcccon_help
-%C22*%O$tDCC RECV connection established to%C26 $1 %C30[%O$2%C30]
+%C24*%O$tDCC RECV connection established to %C18$1 %C30[%O%C24$2%C30]%O
 3
 
 DCC RECV Failed
 XP_TE_DCCRECVERR
 pevt_dccrecverr_help
-%C22*%O$tDCC RECV%C26 $1%O from%C26 $3%O failed ($4).
+%C20*%O$tDCC RECV '%C23$1%O' from %C18$3%O failed (%C20$4%O)
 4
 
 DCC RECV File Open Error
 XP_TE_DCCFILEERR
 pevt_generic_file_help
-%C22*%O$tDCC RECV: Cannot open $1 for writing ($2).
+%C20*%O$tDCC RECV: Cannot open '%C23$1%C' for writing (%C20$2%O)
 2
 
 DCC Rename
 XP_TE_DCCRENAME
 pevt_dccrename_help
-%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.
 2
 
 DCC RESUME Request
 XP_TE_DCCRESUMEREQUEST
 pevt_dccresumeoffer_help
-%C22*%O$t%C26$1 %Ohas requested to resume%C26 $2 %Cfrom%C26 $3%C.
+%C24*%O$t%C18$1%C has requested to resume '%C23$2%C' from %C24$3%O.
 3
 
 DCC SEND Abort
 XP_TE_DCCSENDABORT
 pevt_dccfileabort_help
-%C22*%O$tDCC SEND%C26 $2%O to%C26 $1%O aborted.
+%C23*%O$tDCC SEND '%C23$2%C' to %C18$1%O aborted.
 2
 
 DCC SEND Complete
 XP_TE_DCCSENDCOMP
 pevt_dccsendcomp_help
-%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
 3
 
 DCC SEND Connect
 XP_TE_DCCCONSEND
 pevt_dcccon_help
-%C22*%O$tDCC SEND connection established to%C26 $1 %C30[%O$2%C30]
+%C24*%O$tDCC SEND connection established to %C18$1 %C30[%O%C24$2%C30]%O
 3
 
 DCC SEND Failed
 XP_TE_DCCSENDFAIL
 pevt_dccsendfail_help
-%C22*%O$tDCC SEND%C26 $1%O to%C26 $2%O failed. $3
+%C20*%O$tDCC SEND '%C23$1%C' to %C18$2%C failed (%C20$3%O)
 3
 
 DCC SEND Offer
 XP_TE_DCCSENDOFFER
 pevt_dccsendoffer_help
-%C22*%O$t%C26$1 %Ohas offered%C26 $2 %O(%C26$3 %Obytes)
+%C24*%O$t%C18$1%C has offered '%C23$2%C' (%C24$3%O bytes)
 4
 
 DCC Stall
 XP_TE_DCCSTALL
 pevt_dccstall_help
-%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Cstalled - aborting.
+%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O stalled, aborting.
 3
 
 DCC Timeout
 XP_TE_DCCTOUT
 pevt_dccstall_help
-%C22*%O$tDCC $1%C26 $2 %Oto%C26 $3 %Otimed out - aborting.
+%C20*%O$tDCC $1 '%C23$2%C' to %C18$3%O timed out, aborting.
 3
 
 Delete Notify
 XP_TE_DELNOTIFY
 pevt_generic_nick_help
-%C22*%O$t$1 deleted from notify list.
+%C24*%O$t%C18$1%O deleted from notify list.
 1
 
 Disconnected
 XP_TE_DISCON
 pevt_discon_help
-%C22*%O$tDisconnected ($1).
+%C20*%O$tDisconnected (%C20$1%O)
 1
 
 Found IP
 XP_TE_FOUNDIP
 pevt_foundip_help
-%C22*%O$tFound your IP: [$1]
+%C24*%O$tFound your IP: %C30[%C24$1%C30]%O
 1
 
 Generic Message
@@ -409,127 +409,127 @@ n2
 Ignore Add
 XP_TE_IGNOREADD
 pevt_ignoreaddremove_help
-%O%C26$1%O added to ignore list.
+%O%C18$1%O added to ignore list.
 1
 
 Ignore Changed
 XP_TE_IGNORECHANGE
 pevt_ignoreaddremove_help
-Ignore on %C26$1%O changed.
+%OIgnore on %C18$1%O changed.
 1
 
 Ignore Footer
 XP_TE_IGNOREFOOTER
 pevt_generic_none_help
-%C24,18                                                              
+%C16,17                                                              
 0
 
 Ignore Header
 XP_TE_IGNOREHEADER
 pevt_generic_none_help
-%C24,18 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG 
+%C16,17 Hostmask                  PRIV NOTI CHAN CTCP DCC  INVI UNIG 
 0
 
 Ignore Remove
 XP_TE_IGNOREREMOVE
 pevt_ignoreaddremove_help
-%O%C26$1%O removed from ignore list.
+%O%C18$1%O removed from ignore list.
 1
 
 Ignorelist Empty
 XP_TE_IGNOREEMPTY
 pevt_generic_none_help
-  Ignore list is empty.
+%OIgnore list is empty.
 0
 
 Invite
 XP_TE_INVITE
 pevt_generic_channel_help
-%C22*%O$tCannot join%C26 %B$1 %O(Channel is invite only).
+%C20*%O$tCannot join %C22$1%C (%C20Channel is invite only%O)
 1
 
 Invited
 XP_TE_INVITED
 pevt_invited_help
-%C22*%O$tYou have been invited to%C26 $1%O by%C26 $2%C (%C26$3%C)
+%C24*%O$tYou have been invited to %C22$1%O by %C18$2%O (%C29$3%O)
 3
 
 Join
 XP_TE_JOIN
 pevt_join_help
-%C19*%O$t%C19%B$1 %B($3) has joined $2
-3
+%C23*$t$1 ($3) has joined
+2
 
 Keyword
 XP_TE_KEYWORD
 pevt_generic_channel_help
-%C22*%O$tCannot join%C26 %B$1 %O(Requires keyword).
+%C20*%O$tCannot join %C22$1%C (%C20Requires keyword%O)
 1
 
 Kick
 XP_TE_KICK
 pevt_kick_help
-%C21*%O$t%C21$1 has kicked $2 from $3 ($4%O%C21)
+%C22*%O$t%C26$1%C has kicked %C18$2%C from %C22$3%C (%C24$4%O)
 4
 
 Killed
 XP_TE_KILL
 pevt_kill_help
-%C22*%O$tYou have been killed by $1 ($2%O%C22)
+%C19*%O$t%C19You have been killed by %C26$1%C (%C20$2%O)
 2
 
 Message Send
 XP_TE_MSGSEND
 pevt_ctcpsend_help
-%C19>%O$1%C19<%O$t$2
+%O>%C18$1%C<%O$t$2
 n2
 
 Motd
 XP_TE_MOTD
 pevt_servertext_help
-%C16*%O$t$1%O
+%C29*%O$t%C29$1%O
 n1
 
 MOTD Skipped
 XP_TE_MOTDSKIP
 pevt_generic_none_help
-%C22*%O$t%C22MOTD Skipped.
+%C29*%O$t%C29MOTD Skipped%O
 0
 
 Nick Clash
 XP_TE_NICKCLASH
 pevt_nickclash_help
-%C22*%O$t$1 already in use. Retrying with $2...
+%C23*%O$t%C28$1%C already in use. Retrying with %C18$2%O...
 2
 
 Nick Failed
 XP_TE_NICKFAIL
 pevt_generic_none_help
-%C22*%O$tNickname already in use. Use /NICK to try another.
+%C20*%O$tNickname already in use. Use /NICK to try another.
 0
 
 No DCC
 XP_TE_NODCC
 pevt_generic_none_help
-%C22*%O$tNo such DCC.
+%C20*%O$tNo such DCC.
 0
 
 No Running Process
 XP_TE_NOCHILD
 pevt_generic_none_help
-%C22*%O$tNo process is currently running
+%C23*%O$tNo process is currently running
 0
 
 Notice
 XP_TE_NOTICE
 pevt_notice_help
-%C28-%C29$1%C28-%O$t$2
+%O-%C18$1%O-$t$2
 n2
 
 Notice Send
 XP_TE_NOTICESEND
 pevt_ctcpsend_help
-%C19>%O$1%C19<%O$t$2
+%O->%C18$1%O<-$t$2
 n2
 
 Notify Empty
@@ -541,25 +541,25 @@ $tNotify list is empty.
 Notify Header
 XP_TE_NOTIFYHEAD
 pevt_generic_none_help
-%C24,18 %B  Notify List                           
+%C16,17 Notify List                           
 0
 
 Notify Number
 XP_TE_NOTIFYNUMBER
 pevt_notifynumber_help
-%C22*%O$t$1 users in notify list.
+%C23*%O$t%C23$1%O users in notify list.
 1
 
 Notify Offline
 XP_TE_NOTIFYOFFLINE
 pevt_generic_nick_help
-%C22*%O$tNotify: $1 is offline ($3).
+%C23*%O$tNotify: %C18$1%C is offline (%C29$3%O)
 3
 
 Notify Online
 XP_TE_NOTIFYONLINE
 pevt_generic_nick_help
-%C22*%O$tNotify: $1 is online ($3).
+%C23*%O$tNotify: %C18$1%C is online (%C29$3%O)
 3
 
 Open Dialog
@@ -571,25 +571,25 @@ n0
 Part
 XP_TE_PART
 pevt_part_help
-%C23*%O$t%C23$1 (%O%C23$2) has left $3
-3
+%C24*$t$1 has left
+1
 
 Part with Reason
 XP_TE_PARTREASON
 pevt_partreason_help
-%C23*%O$t%C23$1 (%O%C23$2) has left $3 (%O%C23%B%B$4%O%C23)
-4
+%C24*%O$t%C18$1%C ($2) has left (%C24$4%O)
+3
 
 Ping Reply
 XP_TE_PINGREP
 pevt_pingrep_help
-%C22*%O$tPing reply from $1: $2 second(s)
+%C24*%O$tPing reply from%C18 $1%C: %C24$2%O second(s)
 2
 
 Ping Timeout
 XP_TE_PINGTIMEOUT
 pevt_pingtimeout_help
-%C22*%O$tNo ping reply for $1 seconds, disconnecting.
+%C20*%O$tNo ping reply for %C24$1%O seconds, disconnecting.
 1
 
 Private Action
@@ -607,7 +607,7 @@ n3
 Private Message
 XP_TE_PRIVMSG
 pevt_privmsg_help
-%C28*%C29$3$1%C28*$t%O$2
+%C18*%C18$3$1*%O$t$2
 n3
 
 Private Message to Dialog
@@ -619,222 +619,222 @@ n3
 Process Already Running
 XP_TE_ALREADYPROCESS
 pevt_generic_none_help
-%C22*%O$tA process is already running
+%C24*%O$tA process is already running
 0
 
 Quit
 XP_TE_QUIT
 pevt_quit_help
-%C23*%O$t%C23$1 has quit (%O%C23%B%B$2%O%C23)
+%C24*$t$1 has quit ($2)
 3
 
 Raw Modes
 XP_TE_RAWMODES
 pevt_rawmodes_help
-%C22*%O$t$1 sets modes%B %C30[%O$2%B%C30]
+%C24*%O$t%C26$1%C sets modes %C30[%C24$2%C30]%O
 2
 
 Receive Wallops
 XP_TE_WALLOPS
 pevt_privmsg_help
-%C28-%C29$1/Wallops%C28-%O$t$2
+%O-%C29$1/Wallops%O-$t$2
 2
 
 Resolving User
 XP_TE_RESOLVINGUSER
 pevt_resolvinguser_help
-%C22*%O$tLooking up IP number for%C26 $1%O...
+%C24*%O$tLooking up IP number for %C18$1%O...
 2
 
 Server Connected
 XP_TE_SERVERCONNECTED
 pevt_generic_none_help
-%C22*%O$t%C22Connected.
+%C29*%O$tConnected.
 0
 
 Server Error
 XP_TE_SERVERERROR
 pevt_servererror_help
-%C22*%O$t$1
+%C29*%O$t%C20$1%O
 n1
 
 Server Lookup
 XP_TE_SERVERLOOKUP
 pevt_serverlookup_help
-%C22*%O$t%C22Looking up $1
+%C29*%O$tLooking up %C29$1%O
 1
 
 Server Notice
 XP_TE_SERVNOTICE
 pevt_servertext_help
-%C22*%O$t$1
+%C29*%O$t$1
 n2
 
 Server Text
 XP_TE_SERVTEXT
 pevt_servertext_help
-%C22*%O$t$1
+%C29*%O$t$1
 n3
 
 SSL Message
 XP_TE_SSLMESSAGE
 pevt_sslmessage_help
-%C22*%O$t$1
+%C29*%O$t$1
 n2
 
 Stop Connection
 XP_TE_STOPCONNECT
 pevt_sconnect_help
-%C22*%O$tStopped previous connection attempt (pid=$1)
+%C23*%O$tStopped previous connection attempt (%C24$1%O)
 1
 
 Topic
 XP_TE_TOPIC
 pevt_topic_help
-%C29*%O$t%C29Topic for $1%C %C29is: $2
+%C22*%O$tTopic for %C22$1%C is: $2%O
 2
 
 Topic Change
 XP_TE_NEWTOPIC
 pevt_newtopic_help
-%C22*%O$t$1 has changed the topic to: $2
+%C22*%O$t%C26$1%C has changed the topic to: $2%O
 3
 
 Topic Creation
 XP_TE_TOPICDATE
 pevt_topicdate_help
-%C29*%O$t%C29Topic for $1%C %C29set by $2%C %C29at $3
+%C22*%O$tTopic for %C22$1%C set by %C26$2%C (%C24$3%O)
 3
 
 Unknown Host
 XP_TE_UKNHOST
 pevt_generic_none_help
-%C22*%O$tUnknown host. Maybe you misspelled it?
+%C20*%O$tUnknown host. Maybe you misspelled it?
 0
 
 User Limit
 XP_TE_USERLIMIT
 pevt_generic_channel_help
-%C22*%O$tCannot join%C26 %B$1 %O(User limit reached).
+%C20*%O$tCannot join %C22$1%C (%C20User limit reached%O)
 1
 
 Users On Channel
 XP_TE_USERSONCHAN
 pevt_usersonchan_help
-%C22*%O$t%C26Users on $1:%C $2
+%C22*%O$tUsers on %C22$1%C: %C24$2%O
 2
 
 WhoIs Authenticated
 XP_TE_WHOIS_AUTH
 pevt_whoisauth_help
-%C22*%O$t%C28[%O$1%C28] %O$2%C27 $3
+%C23*%O$t%C28[%C18$1%C28]%O $2 %C18$3%O
 3
 
 WhoIs Away Line
 XP_TE_WHOIS5
 pevt_whois5_help
-%C22*%O$t%C28[%O$1%C28] %Cis away %C30(%O$2%O%C30)
+%C23*%O$t%C28[%C18$1%C28] %Cis away %C30(%C23$2%O%C30)%O
 2
 
 WhoIs Channel/Oper Line
 XP_TE_WHOIS2
 pevt_whois2_help
-%C22*%O$t%C28[%O$1%C28]%O $2
+%C23*%O$t%C28[%C18$1%C28]%O $2
 2
 
 WhoIs End
 XP_TE_WHOIS6
 pevt_whois6_help
-%C22*%O$t%C28[%O$1%C28] %OEnd of WHOIS list.
+%C23*%O$t%C28[%C18$1%C28] %OEnd of WHOIS list.
 1
 
 WhoIs Identified
 XP_TE_WHOIS_ID
 pevt_whoisid_help
-%C22*%O$t%C28[%O$1%C28]%O $2
+%C23*%O$t%C28[%C18$1%C28]%O $2
 2
 
 WhoIs Idle Line
 XP_TE_WHOIS4
 pevt_whois4_help
-%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2
+%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O
 2
 
 WhoIs Idle Line with Signon
 XP_TE_WHOIS4T
 pevt_whois4t_help
-%C22*%O$t%C28[%O$1%C28]%O idle%C26 $2%O, signon:%C26 $3
+%C23*%O$t%C28[%C18$1%C28]%O idle %C23$2%O, signon: %C23$3%O
 3
 
 WhoIs Name Line
 XP_TE_WHOIS1
 pevt_whois1_help
-%C22*%O$t%C28[%O$1%C28] %C30(%O$2@$3%C30)%O: $4
+%C23*%O$t%C28[%C18$1%C28] %C30(%C24$2@$3%C30)%O: %C18$4%O
 4
 
 WhoIs Real Host
 XP_TE_WHOIS_REALHOST
 pevt_whoisrealhost_help
-%C22*%O$t%C28[%O$1%C28] %Oreal user@host%C27 $2%O, real IP%C27 $3
+%C23*%O$t%C28[%C18$1%C28]%O Real Host: %C23$2%O, Real IP: %C30[%C23$3%C30]%O
 4
 
 WhoIs Server Line
 XP_TE_WHOIS3
 pevt_whois3_help
-%C22*%O$t%C28[%O$1%C28]%O $2
+%C23*%O$t%C28[%C18$1%C28]%O %C29$2%O
 2
 
 WhoIs Special
 XP_TE_WHOIS_SPECIAL
 pevt_whoisid_help
-%C22*%O$t%C28[%O$1%C28]%O $2
+%C23*%O$t%C28[%C18$1%C28]%O $2
 3
 
 You Join
 XP_TE_UJOIN
 pevt_join_help
-%C19*%O$t%C19Now talking on $2
+%C19*%O$tNow talking on %C22$2%O
 3
 
 You Kicked
 XP_TE_UKICK
 pevt_ukick_help
-%C23*$tYou have been kicked from $2 by $3 ($4%O%C23)
+%C19*%O$tYou have been kicked from %C22$2%C by %C26$3%O (%C20$4%O)
 4
 
 You Part
 XP_TE_UPART
 pevt_part_help
-%C23*$tYou have left channel $3
+%C19*%O$tYou have left channel %C22$3%O
 3
 
 You Part with Reason
 XP_TE_UPARTREASON
 pevt_partreason_help
-%C23*$tYou have left channel $3 (%O%C23%B%B$4%O%C23)
+%C19*%O$tYou have left channel %C22$3%C (%C24$4%O)
 4
 
 Your Action
 XP_TE_UACTION
 pevt_chanaction_help
-%C18*$t$1%O $2
+%C20*$t%B$1%B %C30$2%O
 n3
 
 Your Invitation
 XP_TE_UINVITE
 pevt_uinvite_help
-%C22*%O$tYou've invited%C26 $1%O to%C26 $2%O (%C26$3%O)
+%C20*%O$tYou've invited %C18$1%O to %C22$2%O (%C24$3%O)
 3
 
 Your Message
 XP_TE_UCHANMSG
 pevt_chanmsg_help
-%C31%H<%H$4$1%H>%H%O%C30$t$2
+%C20%H<%H$4$1%H>%H%O%C30$t$2%O
 n4
 
 Your Nick Changing
 XP_TE_UCHANGENICK
 pevt_uchangenick_help
-%C22*%O$tYou are now known as $2
+%C20*%O$tYou are now known as %C18$2%O
 2