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 aef9af93f2dbbceb6b267daa40f73597468261aa..690ff07d3bd8deb13e96a344d68a4ed5e3b41ff7 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -52,10 +52,11 @@ FORMAT_REC fecommon_silc_formats[] = {
        { NULL, "Who Queries", 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 } },
+       { "whois_realname",    " realname    : $0", 1, { 0 } },
+       { "whois_channels",    " channels    : $0", 1, { 0 } },
+       { "whois_modes",       " modes       : $0", 1, { 0 } },
+       { "whois_idle",        " idle        : $0", 1, { 0 } },
+       { "whois_fingerprint", " fingerprint : $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@$3 {comment {hilight $4}}", 5, { 0, 0, 0, 0, 0 } },
@@ -79,7 +80,8 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "key_agreement_failure", "Key agreement failed with {nick $0}", 1, { 0 } },
        { "key_agreement_timeout", "Timeout during key agreement. The key agreement was not performed with {nick $0}", 1, { 0 } },
        { "pubkey_received", "Received {hilight $0} public key", 1, { 0 } },
-       { "pubkey_fingerprint", "Fingerprint for the {hilight $0} key is %: $1", 2, { 0, 0 } },
+       { "pubkey_fingerprint", "Fingerprint and babbleprint for the {hilight $0} key are %: $1", 2, { 0, 0 } },
+       { "pubkey_babbleprint", " $0", 1, { 0 } },
        { "pubkey_unsupported", "We don't support {hilight $0} public key type {hilight $1}", 2, { 0, 0 } },
        { "pubkey_discard", "Will not accept the {hilight $0} key", 1, { 0 } },
        { "pubkey_accept", "Would you like to accept the key (y/n)? ", 0 },
@@ -116,5 +118,26 @@ 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_error_no_such_file", "Error during file transfer with {nick $0}: $1: No such file", 2, { 0, 0 } },
+       { "file_error_permission_denied", "Error during file transfer with {nick $0}: Permission denied", 1, { 0 } },
+       { "file_close", "File transfer closed with {nick $0} - $1", 2, { 0, 0 } },
+
        { NULL, NULL, 0 }
 };