updates.

[silc.git] / apps / irssi / src / fe-common / silc / module-formats.c

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 138ad2303158529d0453ef856d6964f15c36e15a..6ccbbe88bcb69e2d0fd1ce2596d05ce649a0d7d4 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -51,13 +51,14 @@ FORMAT_REC fecommon_silc_formats[] = {
        /* WHOIS, WHOWAS and USERS (alias WHO) messages */
        { NULL, "Who Queries", 0 },
 
-       { "whois", "{nick $0} {nickhost $1}%: realname : $2", 3, { 0, 0, 0 } },
+       { "whois", "{nick $0} {nickhost $1@$2}%: nickname : $3 ($4)", 5, { 0, 0, 0, 0, 0 } },
+       { "whois_realname", " realname : $0", 1, { 0 } },
        { "whois_channels", " channels : $0", 1, { 0 } },
        { "whois_modes", " modes    : $0", 1, { 0 } },
        { "whois_idle", " idle     : $0", 1, { 0 } },
        { "whowas", "{nick $0} was {nickhost $1} ($2)", 3, { 0, 0, 0 } },
        { "users_header", "Users on {channelhilight $0}", 1, { 0 } },
-       { "users", " %|{nick $[!20]0} $[!5]1 $2 {comment {hilight $3}}", 4, { 0, 0, 0, 0 } },
+       { "users", " %|{nick $[!20]0} $[!5]1 $2@$3 {comment {hilight $4}}", 5, { 0, 0, 0, 0, 0 } },
 
        /* Key management and key agreement */
        { NULL, "Key Management And Key Agreement", 0 },
@@ -88,6 +89,9 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "pubkey_no_match", "{hilight $0} key does not match with your local copy", 1, { 0 } },
        { "pubkey_maybe_expired", "It is possible that the key has expired or changed", 0 },
        { "pubkey_mitm_attach", "It is also possible that someone is performing man-in-the-middle attack", 0 },
+       { "getkey_notkey", "Server did not return any public key", 0 },
+       { "getkey_verified", "Verified successfully $0 {hilight $1}'s cached public key", 2, { 0, 0 } },
+       { "getkey_discard", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } },
 
        /* Misc messages */
        { NULL, "Misc", 0 },
@@ -112,5 +116,24 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "unset_away", "You are no longer marked as being away", 0 },
        { "auth_meth_unresolved", "Could not resolve authentication method to use, assume no authentication", 0 },
 
+       /* File transfer messages */
+       { NULL, "FileTransfer", 0 },
+
+       { "file_send", "File transfer request sent to {nick $0} for $1", 2, { 0, 0 } },
+       { "file_transmit", "Transmitting file {hilight $0} [$1kB] to {nick $2}", 3, { 0, 0, 0 } },
+       { "file_transmitted", "Transmitted file {hilight $0} [$1kB] to {nick $2} [{hilight $3kB/s}]", 4, { 0, 0, 0, 3 } },
+       { "file_receive", "Receiving file {hilight $0} [$1kB] from {nick $2}", 3, { 0, 0 } },
+       { "file_received", "Received file {hilight $0} [$1kB] from {nick $2} [{hilight $3kB/s}]", 4, { 0, 0, 0, 3 } },
+       { "file_request", "File transfer request from {nick $0}", 1, { 0 } },
+       { "file_request_host", "File transfer request from {nick $0} [$1 port $2]", 3, { 0, 0, 0 } },
+       { "file_key_exchange", "Negotiating keys for file transfer with {nick $0}", 1, { 0 } },
+       { "file_na", "No file transfers available", 0 },
+       { "file_client_na", "No file transfer offered by {nick $0}", 1, { 0 } },
+       { "file_show_header", "File transfers", 0 },
+       { "file_show_line", "  $0 $1: $2kB of $3kB ($4%%) - $5kB/s - $6", 7, { 0, 0, 1, 1, 1, 3, 0 } },
+       { "file_already_started", "File transfer already started with {nick $0}", 1, { 0  } },
+       { "file_error", "Error during file transfer with {nick $0}", 1, { 0  } },
+       { "file_close", "File transfer closed with {nick $0}", 1, { 0  } },
+
        { NULL, NULL, 0 }
 };