{ "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} ($1)", 2, { 0, 0 } },
- { "kicked", "{nick $0} has been kicked off channel {channel $1} ($2)", 3, { 0, 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 } },
/* WHOIS, WHOWAS and USERS (alias WHO) messages */
{ 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", "{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_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 } },
{ "key_agreement_request", "{nick $0} wants to perform key agreement", 1, { 0 } },
{ "key_agreement_request_host", "{nick $0} wants to perform key agreement on {nickhost $1} port {hilight $2}", 3, { 0, 0, 0 } },
{ "key_agreement_negotiate", "Starting key agreement with {nick $0}", 1, { 0 } },
- { "key_agreement_privmsg", "The private messages with the {nick $0} are now protected with the private key", 1, { 0 } },
+ { "key_agreement_privmsg", "The private messages with {nick $0} are now protected with private key", 1, { 0 } },
{ "key_agreement_ok", "Key agreement completed successfully with {nick $0}", 1, { 0 } },
{ "key_agreement_error", "Error occurred during key agreement with {nick $0}", 1, { 0 } },
{ "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 } },
{ "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 },
{ "pubkey_malformed", "Your local copy of the {hilight $0} key is malformed", 1, { 0 } },
{ "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 },
+ { "pubkey_mitm_attack", "It is also possible that someone is performing a 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 } },
{ "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 } },
- { "ke_bad_version", "You are running incompatible client version (it may be too old or too new) ", 0 },
+ { "ke_bad_version", "You are running an incompatible client version (it may be too old or too new) ", 0 },
{ "ke_unsupported_public_key", "Server does not support your public key type", 0 },
{ "ke_unknown_group", "Server does not support one of your proposed KE group", 0 },
{ "ke_unknown_cipher", "Server does not support one of your proposed cipher", 0 },
{ "ke_incorrect_signature", "Incorrect signature", 0 },
{ "ke_invalid_cookie", "Invalid cookie", 0 },
{ "auth_failed", "Authentication failed", 0 },
- { "set_away", "You have meen marked as being away (away message: {hilight $0})", 1, { 0 } },
+ { "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 },