X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-common%2Fsilc%2Fmodule-formats.c;h=8ad3fcdd0483a4f96486d37f68e4c2a916198bf5;hb=eb772dc02cf885a82ab9c829127e0c94d629b591;hp=ce7c5012cf3c5dda9a4deefc9d2bcb2e694108ea;hpb=6ce316e741339532a2d150b7a5e24f4e1686c9ff;p=crypto.git

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index ce7c5012..8ad3fcdd 100644
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -4,7 +4,7 @@
 
   Author: Pekka Riikonen <priikone@silcnet.org>
 
-  Copyright (C) 2001 - 2006 Pekka Riikonen
+  Copyright (C) 2001 - 2007 Pekka Riikonen
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,6 +29,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 
 	{ "channel_founder_you", "You are channel founder on {channel $0}", 1, { 0 } },
 	{ "channel_founder", "channel founder on {channel $0} is: {channick_hilight $1}", 2, { 0, 0 } },
+	{ "channel_founder_changed", "Channel founder public key changed on {channel $0}", 1, { 0 } },
 	{ "channel_topic", "Topic for {channel $0} is: $1", 2, { 0, 0 } },
 	{ "channel_topic_not_set", "Topic for {channel $0} not set", 1, { 0 } },
 	{ "cmode", "channel mode/{channel $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
@@ -108,6 +109,9 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "notice_private_signed", "{notice {flag_signed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
 	{ "notice_private_unknown", "{notice {flag_unknown}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
 	{ "notice_private_failed", "{notice {flag_failed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
+	{ "many", "There are now $0 {channick_hilight $1}s on this channel", 2, { 0, 0 } },
+	{ "user_appears", "{channick_hilight $0} will appear as {channick_hilight $1}", 2, { 0, 0 } },
+
 
 	/* WHOIS, WHOWAS and USERS (alias WHO) messages */
 	{ NULL, "Who Queries", 0 },
@@ -145,6 +149,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "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_received_client", "Client {hilight $0} ($1 $2)", 3, { 0, 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 } },
@@ -157,7 +162,8 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "pubkey_maybe_expired", "It is possible that the key has expired or changed", 0 },
 	{ "pubkey_mitm_attack", "It is also possible that someone is performing a man-in-the-middle attack", 0 },
 	{ "pubkey_notkey", "Server did not return any public key", 0 },
-	{ "pubkey_verified", "Verified successfully $0 {hilight $1}'s cached public key", 2, { 0, 0 } },
+	{ "pubkey_verified", "Verified successfully server {hilight $0} cached public key", 1, { 0 } },
+	{ "pubkey_verified_client", "Verified successfully user {hilight $0}'s ($1 $2) cached public key", 3, { 0, 0, 0 } },
 	{ "pubkey_notverified", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } },
 
 	/* Misc messages */
@@ -231,7 +237,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "attr_geolocation",    " Geolocation        : $0", 1, { 0 } },
 	{ "attr_device_info",    " Device Info        : $0", 1, { 0 } },
 	{ "attr_public_keys",    " Public keys        : $0", 1, { 0 } },
-	{ "attr_timezone",       " Timezone           : $0", 1, { 0 } },
+	{ "attr_timezone",       " Timezone (GMT)     : $0", 1, { 0 } },
 	{ "attr_timezone_allow", " Sending timezone   : $0", 1, { 0 } },
 	{ "attr_user_sign_verified",  " User's signature   : verified successfully", 0 },
 	{ "attr_user_sign_failed",    " User's signature   : {hilight signature failed}", 0 },
@@ -246,6 +252,7 @@ FORMAT_REC fecommon_silc_formats[] = {
 
         { "lstkey_file", "Public key file    : $0", 1, { 0 } },
         { "lstkey_alg", "Algorithm          : $0", 1, { 0 } },
+        { "lstkey_ver", "Version            : $0", 1, { 0 } },
         { "lstkey_bits", "Key length (bits)  : $0", 1, { 1 } },
         { "lstkey_rn", "Real name          : $0", 1, { 0 } },
         { "lstkey_un", "Username           : $0", 1, { 0 } },
@@ -268,5 +275,25 @@ FORMAT_REC fecommon_silc_formats[] = {
 	{ "silcnet_line", "%#$0: $1", 2, { 0, 0 } },
 	{ "silcnet_footer", "", 0 },
 
+#ifdef SILC_PLUGIN
+	/* command line option handling */
+	{ NULL, "Command Line Option Handling", 0 },
+
+	{ "config_debug", "Run-time debugging is {hilight $0}", 1, { 0 } },
+	{ "config_nodebug", "Run-time debugging is {hilight disabled}. To enable it recompile the client with {hilight --enable-debug} configuration option.", 0 },
+	{ "config_unknown", "Unknown option: $0", 1, { 0 } },
+	{ "config_list", " - $0", 1, { 0 } },
+	{ "config_algos", "Supported {hilight $0} algorithms:", 1, { 0 } },
+	{ "config_nexttime", "{hilight NOTE:} You need to reload the plugin for these changes to take effect!", 0 },
+	{ "config_pass_ask1", "Current Passphrase:", 0 },
+	{ "config_pass_ask2", "New Passphrase:", 0 },
+	{ "config_pass_ask3", "Retype new Passphrasse:", 0 },
+	{ "config_passmismatch", "The passphrases do not match!", 0 },
+	{ "config_passchange", "Changed the private key passphrase sucessfully", 0, { 0 } },
+	{ "config_passchange_fail", "Failed to change the passphrase!", 0, { 0 } },
+	{ "config_create", "Created a new key pair successfully", 0, { 0 } },
+	{ "config_create_fail", "Failed to create a new key pair", 0, { 0 } },
+#endif
+
 	{ NULL, NULL, 0 }
 };