Implemented CHANNEL_UMODE_QUEIT mode. Fixed fatal bugs in server.

[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 3a259fd0d6edcdee5fd98fbfd435ff10c8ad02aa..108f96e8c84e1a1d14889a012fc3ec149ea124e8 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -43,10 +43,11 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "ban_list", "channel {channel $0} ban list: $1", 2, { 0, 0 } },
        { "no_ban_list", "channel {channel $0} ban list not set", 1, { 0 } },
        { "inviting", "Inviting {nick $0} to channel {channel $1}", 2, { 0, 0 } },
-       { "kicked_you", "You have been kicked off channel {channel $0} by {nick $1} ($2)", 3, { 0, 0 } },
-       { "kicked", "{nick $0} has been kicked off channel {channel $1} by {nick $2} ($3)", 4, { 0, 0, 0 } },
-       { "killed_you", "You have been killed from the SILC Network", 0 },
-       { "killed", "{nick $0} has been killed from the SILC Network ($1)", 2, { 0, 0 } },
+       { "kicked_you", "You have been kicked off channel {channel $0} by {nick $1} ($2)", 3, { 0, 0, 0 } },
+       { "kicked", "{nick $0} has been kicked off channel {channel $1} by {nick $2} ($3)", 4, { 0, 0, 0, 0 } },
+       { "killed_you", "You have been killed from the SILC Network by {nick $0} ($1)", 2, { 0, 0 } },
+       { "killed", "{nick $0} has been killed from the SILC Network by {nick $1} ($2)", 3, { 0, 0, 0 } },
+       { "quieted", "You have been queited and cannot talk on {channel $0}", 1, { 0 } },
 
        /* WHOIS, WHOWAS and USERS (alias WHO) messages */
        { NULL, "Who Queries", 0 },
@@ -68,6 +69,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "channel_private_key_nomode", "Private key mode is not set on channel {channel $0}", 1, { 0 } },
        { "channel_private_key_error", "Could not add private key to channel {channel $0}", 1, { 0 } },
        { "channel_private_key_list", "Channel {channel $0} private keys%:  Cipher           Hmac             Key", 1, { 0 } },
+       { "channel_private_change", "You are using private key n:o $0 on {channel $1}", 2, { 1, 0 } },
        { "private_key_list", "Private message keys%:  Client                         Cipher         Key", 0 },
        { "private_key_list_nick", "Private message keys with {nick $0}%:  Client                         Cipher         Key", 1, { 0 } },
        { "key_agreement", "Requesting key agreement with {nick $0}", 1, { 0 } },
@@ -80,6 +82,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 } },
        { "key_agreement_aborted", "Key agreement was aborted with {nick $0}", 1, { 0 } },
+       { "key_agreement_started", "Key agreement is already started with {nick $0}", 1, { 0 } },
+       { "key_agreement_denied", "Key agreement cannot be started with yourself", 0 },
        { "pubkey_received", "Received {hilight $0} public key", 1, { 0 } },
        { "pubkey_fingerprint", "Fingerprint and babbleprint for the {hilight $0} key are %: $1", 2, { 0, 0 } },
        { "pubkey_babbleprint", " $0", 1, { 0 } },
@@ -104,7 +108,7 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "list_header", "  Channel                              Users   Topic", 0 },
        { "list", "  %|{channelhilight $[36]0} {hilight $[7]1} $2", 3, { 0, 0, 0 } },
        { "bad_nick", "Bad nickname {hilight $0}", 1, { 0 } },
-       { "unknown_notify", "Unknown notify type {hilight $0}", 1, { 0 } },
+       { "unknown_notify", "Unknown notify type {hilight $0}", 1, { 1 } },
        { "ke_bad_version", "You are running an incompatible client version (it may be too old or too new) ", 0 },
        { "ke_unsupported_public_key", "Remote does not trust/support your public key", 0 },
        { "ke_unknown_group", "Remote does not support one of your proposed KE group", 0 },
@@ -118,6 +122,12 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "set_away", "You have been marked as being away (away message: {hilight $0})", 1, { 0 } },
        { "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 },
+       { "watch_present", "Watch: {nick $0} is now present in the network", 1, { 0 } },
+       { "watch_signoff", "Watch: {nick $0} left the network", 1, { 0 } },
+       { "watch_killed", "Watch: {nick $0} was killed from the network", 1, { 0 } },
+       { "watch_umode_change", "Watch: {nick $0} is now {hilight $1}", 2, { 0, 0 } },
+       { "watch_nick_change", "Watch: {nick $0} changed nickname to {nick $1}", 2, { 0, 0 } },
+       { "message_data", "{nick $0} sent \"{hilight $1}\" data message: cannot display", 2, { 0, 0 } },
 
        /* File transfer messages */
        { NULL, "FileTransfer", 0 },