added the feature to save SSL peer certificate and always accept it.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1952 ee746299-78ed-0310-b773-934348b2243d

34 files changed, 1114 insertions, 648 deletions

diff --git a/ChangeLog b/ChangeLog
index 582b2bf0..200524df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-15
+
+	* libsylph/ssl.c
+	  src/sslmanager.c: added the feature to save SSL peer certificate
+	  and always accept it.
+
 2008-01-08
 
 	* src/quick_search.c: quick_search_create(): fixed crash on menu
diff --git a/ChangeLog.ja b/ChangeLog.ja
index e2463bad..c4abc19f 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,8 @@
+2008-02-15
+
+	* libsylph/ssl.c
+	  src/sslmanager.c: SSL 証明書を保存し、常に受け入れる機能を追加。
+
 2008-01-08
 
 	* src/quick_search.c: quick_search_create(): メニュー変更時の
diff --git a/libsylph/ssl.c b/libsylph/ssl.c
index d3f7dff4..e9ac2f24 100644
--- a/libsylph/ssl.c
+++ b/libsylph/ssl.c
@@ -1,6 +1,6 @@
 /*
  * LibSylph -- E-Mail client library
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -35,6 +35,7 @@ static SSL_CTX *ssl_ctx_SSLv23 = NULL;
 static SSL_CTX *ssl_ctx_TLSv1 = NULL;
 
 static GSList *trust_list = NULL;
+static GSList *tmp_trust_list = NULL;
 static GSList *reject_list = NULL;
 
 static SSLVerifyFunc verify_ui_func = NULL;
@@ -66,7 +67,8 @@ static gchar *find_certs_file(const gchar *certs_dir)
 
 void ssl_init(void)
 {
-	gchar *certs_file = NULL, *certs_dir;
+	gchar *certs_file, *certs_dir;
+	FILE *fp;
 
 	SSL_library_init();
 	SSL_load_error_strings();
@@ -146,16 +148,49 @@ void ssl_init(void)
 	}
 
 	g_free(certs_dir);
+	g_free(certs_file);
+
+	certs_file = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, "trust.crt",
+				 NULL);
+	if ((fp = g_fopen(certs_file, "rb")) != NULL) {
+		X509 *cert;
+
+		debug_print("ssl_init(): reading trust.crt\n");
+
+		while ((cert = PEM_read_X509(fp, NULL, NULL, NULL)) != NULL)
+			trust_list = g_slist_append(trust_list, cert);
+		fclose(fp);
+	}
+	g_free(certs_file);
 }
 
 void ssl_done(void)
 {
+	gchar *trust_file;
 	GSList *cur;
+	FILE *fp;
 
-	for (cur = trust_list; cur != NULL; cur = cur->next)
+	if (trust_list) {
+		trust_file = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S,
+					 "trust.crt", NULL);
+		if ((fp = g_fopen(trust_file, "wb")) == NULL) {
+			FILE_OP_ERROR(trust_file, "fopen");
+		}
+		for (cur = trust_list; cur != NULL; cur = cur->next) {
+			if (fp && !PEM_write_X509(fp, (X509 *)cur->data))
+				g_warning("can't write X509 to PEM file: %s",
+					  trust_file);
+			X509_free((X509 *)cur->data);
+		}
+		fclose(fp);
+		g_free(trust_file);
+		g_slist_free(trust_list);
+		trust_list = NULL;
+	}
+	for (cur = tmp_trust_list; cur != NULL; cur = cur->next)
 		X509_free((X509 *)cur->data);
-	g_slist_free(trust_list);
-	trust_list = NULL;
+	g_slist_free(tmp_trust_list);
+	tmp_trust_list = NULL;
 	for (cur = reject_list; cur != NULL; cur = cur->next)
 		X509_free((X509 *)cur->data);
 	g_slist_free(reject_list);
@@ -258,7 +293,9 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 			X509_free(server_cert);
 			return TRUE;
 		} else if (g_slist_find_custom(trust_list, server_cert,
-					     x509_cmp_func)) {
+					       x509_cmp_func) ||
+			   g_slist_find_custom(tmp_trust_list, server_cert,
+					       x509_cmp_func)) {
 			log_message("SSL certificate of %s previously accepted\n", sockinfo->hostname);
 			X509_free(server_cert);
 			return TRUE;
@@ -290,11 +327,10 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinfo, SSLMethod method)
 				return FALSE;
 			} else if (res > 0) {
 				debug_print("Temporarily accept SSL certificate of %s\n", sockinfo->hostname);
-				trust_list = g_slist_prepend
-					(trust_list, X509_dup(server_cert));
+				tmp_trust_list = g_slist_prepend
+					(tmp_trust_list, X509_dup(server_cert));
 			} else {
 				debug_print("Permanently accept SSL certificate of %s\n", sockinfo->hostname);
-				/* TODO: save server cert */
 				trust_list = g_slist_prepend
 					(trust_list, X509_dup(server_cert));
 			}
diff --git a/po/be.po b/po/be.po
index 25baa9c0..ab7f46f2 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-07-31 21:33+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -548,50 +548,50 @@ msgstr "仆�礚��舒于��仍��仆�� 于仂亟从仍��从 SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "仗舒仄��仍从舒 仗舒亟��舒�� ��亠������ SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 仆亠亟舒������仗仆��\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 亟舒������仗仆��\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 仆亠亟舒������仗仆��\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 亟舒������仗仆��\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "��亠亟舒������仗仆�� 仄亠��舒亟 SSL\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "��亠于�磲仂仄�� 仄亠��舒亟 SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "��舒仄��仍从舒 ����于舒����仆仆�� 从舒仆����从������ ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "��仍������仆仆亠 SSL 亰 ��亢��于舒仆仆亠仄 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "弌亠����������从舒�� ��亠��于亠��舒:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr " 丐��仄舒: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ������舒��: %s\n"
@@ -2254,7 +2254,7 @@ msgstr "��仂于��"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "��亠������舒仆��"
 
@@ -5628,7 +5628,7 @@ msgstr "����仆��从 亰舒亞舒亟��"
 msgid "Age"
 msgstr "丕亰��仂����"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "��舒��从����舒于舒仆��"
 
@@ -6173,31 +6173,31 @@ msgstr "��亠����舒:"
 msgid "Folder name:"
 msgstr "��仄�� 从舒��舒仍仂亞舒:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "丕��亠"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "��舒亠 从舒仍����仂于���� 仄亠��从��"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "��舒亠 亟舒亟舒��从��"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "丕 仄亠亢舒�� 1 亟仆��"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "��仗仂��仆���� 5 亟亰亠仆"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "��仂����从:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "丿��从舒���� 丐��仄�� ���� ��亟仗��舒��仆��从舒"
 
@@ -6486,6 +6486,20 @@ msgstr ""
 "\n"
 "������仄舒亠��亠 亞������ ��亠����������从舒��?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��亠��舒从����舒于舒����"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��舒������亟��"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "��舒亟仗����舒����舒 仆舒 亞����仗�� 仆舒于��仆"
diff --git a/po/bg.po b/po/bg.po
index 1c44c574..bc6b8503 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -549,50 +549,50 @@ msgstr "亞��亠��亠仆 SMTP 仂��亞仂于仂��\n"
 msgid "error occurred on SMTP session\n"
 msgstr "亞��亠��从舒 仗��亳 SMTP ��亠��亳����舒\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "仆亠 亠 仆舒仍亳��亠仆 SSLv23\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "仆舒仍亳��亠仆 SSLv23\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "仆亠 亠 仆舒仍亳��亠仆 TLSv1\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "仆舒仍亳��亠仆 TLSv1\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "仆亠 亠 仆舒仍亳��亠仆 SSL 仄亠��仂亟舒\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "��亠仗仂亰仆舒�� SSL 仄亠��仂亟 *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "����亠��从舒 仗��亳 ����亰亟舒于舒仆亠 仆舒 ssl 从仂仆��亠从����\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL 于����亰从舒 亳亰仗仂仍亰于舒亶从亳 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "弌亠����亳��亳从舒�� 仆舒 ������于����舒:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  弌��弍亠从��: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ��亰亟舒��亠仍: %s\n"
@@ -2320,7 +2320,7 @@ msgstr "��仂于亳"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "��亠仗��仂��亠��亠仆亳"
 
@@ -5793,7 +5793,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "��舒从亳��舒仆亠"
@@ -6385,35 +6385,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "��仄亠 仆舒 ��舒亶仍"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/丶于亠��亠仆 _亠��亳从亠��"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "����亳������从舒"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "个舒仄亳仍亳��"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "丐������亠仆亠"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6695,6 +6695,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/��_��亠仆舒��仂��于舒仆亠"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��亳仆舒亞亳"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "��舒仗亳��于舒仆亠 于 仆仂于亳仆舒����从舒 亞����仗舒"
diff --git a/po/cs.po b/po/cs.po
index 4db7dc73..4e7211de 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-12-21 21:39+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -555,50 +555,50 @@ msgstr "chybn叩 odpov���� od SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "v relaci SMTP se vyskytla chyba\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 je nedostupn辿\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je dostupn辿\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 je nedostupn叩\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je dostupn叩\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "metoda SSL je nedostupn叩\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nezn叩m叩 metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Chyba p��i vytv叩��en鱈 ssl context\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Spojen鱈 SSL pou転鱈v叩 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certifik叩t serveru:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  P��edm��t: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Vydavatel: %s\n"
@@ -2258,7 +2258,7 @@ msgstr "Nov辿"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Nep��e��ten辿"
 
@@ -5637,7 +5637,7 @@ msgstr "V箪sledek p��鱈kazu"
 msgid "Age"
 msgstr "St叩��鱈"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Ozna��en辿"
 
@@ -6181,31 +6181,31 @@ msgstr "Um鱈st��n鱈:"
 msgid "Folder name:"
 msgstr "N叩zev slo転ky:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "V邸e"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "S barevn箪m 邸t鱈tkem"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "S p��鱈lohou"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "Za den"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Za posledn鱈ch p��t dn哲"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Hledat p��edm��t nebo odes鱈latele"
 
@@ -6494,6 +6494,20 @@ msgstr ""
 "\n"
 "P��ijmete tento certifik叩t?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "P��esm��rovat"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "V転dy"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Odeb鱈rat diskusn鱈 skupinu"
diff --git a/po/da.po b/po/da.po
index f1f6a132..e879e800 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -553,50 +553,50 @@ msgstr "forkert SMTP svar\n"
 msgid "error occurred on SMTP session\n"
 msgstr "fejl under SMTP session\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ikke tilg脱nglig\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 tilg脱nglig\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ikke tilg脱nglig\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 tilg脱nglig\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL metode ikke tilg脱nglig\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ukendt SSL metode *PROGRAM FEJL*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Fejl ved oprettelse af SSL kontext\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL forbindelse benytter %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Server certifikat:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Emne: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Afsender: %s\n"
@@ -2318,7 +2318,7 @@ msgstr "Ny"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Ul脱st"
 
@@ -5791,7 +5791,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Mark辿r"
@@ -6382,35 +6382,35 @@ msgstr "Afbryd handling"
 msgid "Folder name:"
 msgstr "Fil navn"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/Farve la_bel"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Vedh脱ftet"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Efternavn"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "S淡g"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6697,6 +6697,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/_Omdirig辿r"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Altid"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Abonnere nyhedsgruppe"
diff --git a/po/de.po b/po/de.po
index 696f36e6..6325afa8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -551,50 +551,50 @@ msgstr "fehlerhafte SMTP-Antwort\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Fehler w辰hrend einer SMTP-Sitzung\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nicht verf端gbar\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 verf端gbar\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nicht verf端gbar\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 verf端gbar\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL-Methode nicht verf端gbar\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Unbekannte SSL-Methode *PROGRAMM FEHLER*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Fehler beim Erstellen des SSL-Kontextes\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL-Verbindung benutzt %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Server-Zertifikat:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Betreff: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Aussteller(in): %s\n"
@@ -2261,7 +2261,7 @@ msgstr "Neu"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -5651,7 +5651,7 @@ msgstr "Ergebnis des Befehls"
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Markiert"
 
@@ -6198,31 +6198,31 @@ msgstr "Speicherort:"
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Alle"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Hat Farbetikett"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Hat Anhang"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "Innerhalb eines Tages"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Vergangene 5 Tage"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Suche nach Betreff oder Absender"
 
@@ -6523,6 +6523,20 @@ msgstr ""
 "\n"
 "M旦chten Sie dieses Zertifikat akzeptieren?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Umadressieren"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Immer"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Newsgroup abonnieren"
diff --git a/po/el.po b/po/el.po
index dde2f803..836c9cf0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -561,51 +561,51 @@ msgstr "竜����留了亮劉僚侶 留��略僚��侶��侶 SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "����凌劉虜����竜 ����略了亮留 ����侶 ����僚凌隆凌 SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "里凌 SSLv23 隆竜僚 竜溜僚留旅 隆旅留慮劉��旅亮凌\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "里凌 SSLv23 竜溜僚留旅 隆旅留慮劉��旅亮凌\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "里凌 TLSv1 隆竜僚 竜溜僚留旅 隆旅留慮劉��旅亮凌\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "里凌 TLSv1 竜溜僚留旅 隆旅留慮劉��旅亮凌\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "�� 亮劉慮凌隆凌�� SSL 隆竜僚 竜溜僚留旅 隆旅留慮劉��旅亮侶\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "��粒僚������侶 亮劉慮凌隆凌�� SSL *裡陸�������� 裡里�� ��痢����痢��������*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 #, fuzzy
 msgid "Error creating ssl context\n"
 msgstr "裡��略了亮留 隆侶亮旅凌����粒溜留�� signal pipe."
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "裡��僚隆竜��侶 SSL 亮竜 ����流��侶 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "��旅����凌��凌旅侶��旅虜�� 隆旅留虜凌亮旅����流:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  ��劉亮留: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ��虜隆����侶��: %s\n"
@@ -2306,7 +2306,7 @@ msgstr "��劉留"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "��隆旅略硫留����留"
 
@@ -5718,7 +5718,7 @@ msgstr "����凌��劉了竜��亮留 竜僚��凌了流��"
 msgid "Age"
 msgstr "��留了留旅����侶��留"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "裡侶亮竜旅��亮劉僚凌"
 
@@ -6266,33 +6266,33 @@ msgstr "里凌��凌慮竜��溜留: "
 msgid "Folder name:"
 msgstr "��僚凌亮留 ��留虜劉了凌��:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "��了留"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "里凌 �����ﾎ捨� ��侶�� 竜��旅虜劉��留�� 粒旅留 ��凌 URL"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "����竜旅 ����僚侶亮亮劉僚凌"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "�����ﾎ熟�亮凌"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "��僚留龍流��侶��侶:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "��僚留龍流��侶��侶 粒旅留 ��劉亮留 流 ������"
 
@@ -6574,6 +6574,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��僚留虜留��竜��慮��僚��侶"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��略僚��留"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "裡��僚隆��凌亮流 ��竜 凌亮略隆留 僚劉��僚"
diff --git a/po/es.po b/po/es.po
index 3b9ef8a1..4aa5c51e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-06-28 00:47+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -550,50 +550,50 @@ msgstr "respuesta SMTP err坦nea\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hubo alg炭n error en la sesi坦n SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 no est叩 disponible\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 no est叩 disponible\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "M辿todo SSL no disponible\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "M辿todo SSL desconocido *ERROR EN EL PROGRAMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Error creando el contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexi坦n SSL usando %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certificado del servidor:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Asunto: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Emisor: %s\n"
@@ -2262,7 +2262,7 @@ msgstr "Nuevos"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "No le鱈dos"
 
@@ -5643,7 +5643,7 @@ msgstr "Resultado de una orden"
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Marcado"
 
@@ -6188,31 +6188,31 @@ msgstr "Ubicaci坦n:"
 msgid "Folder name:"
 msgstr "Nombre de carpeta:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Todos"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Tiene etiqueta de color"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Tiene adjunto"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "En 1 d鱈a"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Los 炭ltimos 5 d鱈as"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Buscar por Asunto o Desde"
 
@@ -6502,6 +6502,20 @@ msgstr ""
 "\n"
 "多Desea aceptar 辿ste certificado?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Redirigir"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Siempre"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Suscribir grupo de noticias"
diff --git a/po/et.po b/po/et.po
index 3808703d..bc80a484 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -557,50 +557,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "autoriseerimisel tekkis viga\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 pole k辰ttesaadav\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 on k辰ttesaadav\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 pole saadav\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 on saadav\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL-i meetodit ei saa kasutada\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "ssl.c:94: Tundmatu SSL meetod *PROGRAMMI VIGA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Viga ssl konteksti loomisel\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL 端hendus kasutab %s-i\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Serveri srtifikaat:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Pealkiri: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  V辰ljalaskja: %s\n"
@@ -2328,7 +2328,7 @@ msgstr "Uus"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Pole loetud"
 
@@ -5795,7 +5795,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "M辰rk"
@@ -6388,35 +6388,35 @@ msgstr "Tsiteerimine"
 msgid "Folder name:"
 msgstr "Failinimi"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/V辰rviline silt"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Manus"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Perekonnanimi"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6700,6 +6700,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Suuna 端mber"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Alati"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Telli uudistegrupp"
diff --git a/po/fr.po b/po/fr.po
index 00b7d670..6c36567a 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-04-19 16:12+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -565,50 +565,50 @@ msgstr "mauvaise r辿ponse SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "Une erreur est survenue pendant la session SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 absent\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 absent\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "M辿thode SSL non disponible\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "M辿thode SSL inconnue *BUG DU PROGRAMME*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Erreur lors de la cr辿ation du contexte SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Connexion SSL utilisant %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Serveur de certificat :\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Sujet : %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  D辿livr辿 par : %s\n"
@@ -2282,7 +2282,7 @@ msgstr "Nouveau"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Non lu"
 
@@ -5693,7 +5693,7 @@ msgstr "R辿sultat de la commande"
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Marqu辿"
 
@@ -6240,31 +6240,31 @@ msgstr "Emplacement :"
 msgid "Folder name:"
 msgstr "Nom du dossier :"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Tous"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Avec coloration"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Avec pi竪ce(s) jointe(s)"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "Sur 1 jour"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Sur 5 jours"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Recherche dans les sujets ou exp辿diteurs"
 
@@ -6557,6 +6557,20 @@ msgstr ""
 "\n"
 "Accepter ce certificat?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Rediriger"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Toujours"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Inscription aux groupes de discussion"
diff --git a/po/gl.po b/po/gl.po
index 52c633ce..41fd1d56 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -553,50 +553,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "ocurriu alg炭n erro na sesi坦n SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non est叩 disponible\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponible\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 non est叩 disponible\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponible\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "M辿todo SSL non disponible\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "M辿todo SSL desconocido *ERROR no PROGRAMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Error creando o contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexi坦n SSL usando %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certificado do servidor:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Asunto: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Xenerador: %s\n"
@@ -2326,7 +2326,7 @@ msgstr "Novos"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Non le鱈dos"
 
@@ -5795,7 +5795,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -6385,35 +6385,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de cor"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adxunto"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Apelidos"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6697,6 +6697,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Red_irixir"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Sempre"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Subscribir grupo de novas"
diff --git a/po/hr.po b/po/hr.po
index 8671c95a..07e57e6e 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamati�� <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -561,50 +561,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "gre邸ka prilikom ovjeravanja\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nije dostupan\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dostupan\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nije dostupan\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dostupan\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL metoda nije dostupna\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nepoznata SSL metoda *BUG PROGRAMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Gre邸ka pri kreiranju ssl konteksta\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL veza koriste��i %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certifikat poslu転itelja:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tema: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Izdava��: %s\n"
@@ -2337,7 +2337,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Nepro��itano"
 
@@ -5885,7 +5885,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -6481,35 +6481,35 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Prilog"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6796,6 +6796,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Pre-_uredi"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Uvijek"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Pribilje転i se na news grupu"
diff --git a/po/hu.po b/po/hu.po
index 6d7e6eed..8f714f05 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-09-19 15:18+0200\n"
 "Last-Translator: N辿meth Tam叩s <ntomasz@vipmail.hu>\n"
 "Language-Team: HUNGARIAN <NONE>\n"
@@ -551,50 +551,50 @@ msgstr "hib叩s SMTP v叩lasz\n"
 msgid "error occurred on SMTP session\n"
 msgstr "hiba t旦rt辿nt az SMTP kapcsolat k旦zben\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nem el辿rhet��\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 el辿rhet��\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nem el辿rhet��\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 el辿rhet��\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL elj叩r叩s nem el辿rhet��\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ismeretlen SSL elj叩r叩s *PROGRAM HIBA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Hiba az ssl k旦rnyezet l辿trehoz叩sa k旦zben\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL kapcsolat %s haszn叩lat叩val\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Szerver igazolv叩ny:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  T叩rgy: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Szerz��: %s\n"
@@ -2260,7 +2260,7 @@ msgstr "��j"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -5643,7 +5643,7 @@ msgstr "A parancs eredm辿nye"
 msgid "Age"
 msgstr "Kor"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Megjel旦lt"
 
@@ -6187,31 +6187,31 @@ msgstr "Hely:"
 msgid "Folder name:"
 msgstr "Mappan辿v:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Minden"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Van sz鱈nes c鱈mk辿je"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Van csatolm叩nya"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "1 napon bel端li"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Elm炭lt 5 napi"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Keres辿s:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Keres辿s T叩rgyra vagy Felad坦ra"
 
@@ -6500,6 +6500,20 @@ msgstr ""
 "\n"
 "Elfogadja ezt a tanus鱈tv叩nyt?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��tir叩ny鱈t"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Mindig"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Feliratkoz叩s h鱈rcsoportra"
diff --git a/po/it.po b/po/it.po
index 257fe74a..c11a62ee 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-05-26 09:38+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -551,50 +551,50 @@ msgstr "risposta SMTP difettosa\n"
 msgid "error occurred on SMTP session\n"
 msgstr "si 竪 verificato un errore durante la sessione SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 non disponibile\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponibile\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 non disponibile\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponibile\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Metodo SSL non disponibile\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Metodo SSL sconosciuto *BUG DEL PROGRAMMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Errore creando il contesto ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Connessione SSL usando %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certificato del server:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Oggetto: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Distributore: %s\n"
@@ -2268,7 +2268,7 @@ msgstr "Nuovi"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Non letti"
 
@@ -5662,7 +5662,7 @@ msgstr "Risultato del comando"
 msgid "Age"
 msgstr "Et��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Segnato"
 
@@ -6208,31 +6208,31 @@ msgstr "Posizione:"
 msgid "Folder name:"
 msgstr "Nome della cartella:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Tutto"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Hanno l'etichetta di colore"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Hanno l'allegato"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "Entro 1 giorno"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Ultimi 5 giorni"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Ricerca per Oggetto o Da"
 
@@ -6522,6 +6522,20 @@ msgstr ""
 "\n"
 "Accettare questo certificato?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Rispedisci"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Sempre"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Iscrizione al newsgroup"
diff --git a/po/ja.po b/po/ja.po
index fed2cbfe..ca8b2a88 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -550,50 +550,50 @@ msgstr "筝�罩ｃ�� SMTP 綽�膈���с��\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP ��祉����激�с�割賢�����������若����榊�������障�����\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 �����������с����障�����\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 ��������������純�с��\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 �����������с����障�����\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 ��������������純�с��\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL ��＜�純����������������с����障�����\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "�����ャ�� SSL ��＜�純����� *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "ssl ��潟�潟�������鴻��������筝������������主�榊��\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "%s ������������ SSL �･膓�\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "��泣�若��荐惹�����:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  ���������: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ��肴�����: %s\n"
@@ -2256,7 +2256,7 @@ msgstr "��亥��"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "���茯�"
 
@@ -5625,7 +5625,7 @@ msgstr "��潟����潟�����絎�茵�腟����"
 msgid "Age"
 msgstr "腟������ユ��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "�����若��篁����"
 
@@ -6169,31 +6169,31 @@ msgstr "��贋��:"
 msgid "Folder name:"
 msgstr "���������������:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "�����鴻��"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "��������若��������篁����"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "羞私�������＜�ゃ��篁����"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "1��ヤ札���"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "���菴�5��ラ��"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "罎�膣�:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "篁九����障�����綏���坂査���罎�膣�"
 
@@ -6482,6 +6482,18 @@ msgstr ""
 "\n"
 "������荐惹����吾����������ャ����障�����?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+msgid "_Reject"
+msgstr "������������(_R)"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr "筝������������������ャ�����(_T)"
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+msgid "Always _accept"
+msgstr "絽吾����������ャ�����(_A)"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "�����ャ�若�鴻�違����若�����莖取��"
@@ -6944,6 +6956,3 @@ msgstr "腟�篋�(_X)"
 #: src/trayicon.c:198 src/trayicon.c:287
 msgid "Sylpheed"
 msgstr "Sylpheed"
-
-#~ msgid "Changing window separation type from %d to %d\n"
-#~ msgstr "�����ｃ�潟�������������≪�帥�ゃ����� %d ������ %d ���紊���眼����������障��\n"
diff --git a/po/ko.po b/po/ko.po
index ff83b6a5..a99dd16b 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -557,50 +557,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "��語�� ���譴� ������ 覦����\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23��� ��������� ��� �����給�����\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23��� ��������� ��� �����給�����\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1��� ��������� ��� �����給�����\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1��� ��������� ��� �����給�����\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL襯� ��������� ��� �����給�����\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "覈�襯企�� SSL *���襦�蠏碁�� 覯�蠏�*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "ssl 覓碁Д ������ ������\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "%s ������������ SSL ��郁屋\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "���覯� 讀�覈�:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  ���覈�: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  覦�������: %s\n"
@@ -2309,7 +2309,7 @@ msgstr "���蟆�"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "�����曙��"
 
@@ -5745,7 +5745,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "������"
@@ -6328,35 +6328,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "������ ��企��"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/��� ��朱襖(_b)"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "豌�覿�"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "襷�讌�襷� ��企��"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "谿剰鍵"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6637,6 +6637,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Redirec_t"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "������"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "��伎�り係襭� 蟲����"
diff --git a/po/lt.po b/po/lt.po
index e670a86c..3ed30fed 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -550,50 +550,50 @@ msgstr "blogas SMTP atsakymas\n"
 msgid "error occurred on SMTP session\n"
 msgstr "klaida SMTP sesijoje\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 neprieinamas\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 prieinamas\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 neprieinamas\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 prieinamas\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL metodas neprieinamas\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ne転inomas SSL metodas PROGRAMOS KLAIDA\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Klaida sukuriant SSL kontekst��\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL prisijungimas naudojant %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Serverio sertifikatas:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tema: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Leid��jas: %s\n"
@@ -2248,7 +2248,7 @@ msgstr "Nauji"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Neskaityti"
 
@@ -5618,7 +5618,7 @@ msgstr "Komandos rezultatas"
 msgid "Age"
 msgstr "Am転ius"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Pa転ym��ti"
 
@@ -6163,31 +6163,31 @@ msgstr "Vieta:"
 msgid "Folder name:"
 msgstr "Katalogo vardas:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Visi"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Su spalva"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Su priedu"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr ""
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Ie邸koti:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Ie邸koti temos arba sint��jo"
 
@@ -6468,6 +6468,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Nukreipti"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Visuomet"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Registruotis 眺 naujien迭 grup��"
diff --git a/po/nl.po b/po/nl.po
index 0a133b3c..7811fa5a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -557,50 +557,50 @@ msgstr "ongeldige SMTP-reactie\n"
 msgid "error occurred on SMTP session\n"
 msgstr "er is een fout opgetreden tijdens de SMTP-sessie\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niet beschikbaar\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSL v23 beschikbaar\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 niet beschikbaar\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 beschikbaar\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL methode niet beschikbaar\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Onbekende SSL methode * PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Fout bij het maken van de ssl context\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL verbinding met %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Server-certificaat:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Onderwerp: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Uitgever: %s\n"
@@ -2280,7 +2280,7 @@ msgstr "Nieuw"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Ongelezen"
 
@@ -5705,7 +5705,7 @@ msgstr "Resultaat van opdracht"
 msgid "Age"
 msgstr "Leeftijd"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Gemarkeerd"
 
@@ -6266,32 +6266,32 @@ msgstr "Locatie:"
 msgid "Folder name:"
 msgstr "mapnaam:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Alles"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Heeft kleurlabel"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Heeft bijlage"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Achternaam"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Zoeken op onderwerp of afzender"
 
@@ -6573,6 +6573,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Omleiden"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Altijd"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Abonneer op nieuwsgroep"
diff --git a/po/pl.po b/po/pl.po
index 577f5ac5..381934cc 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -547,50 +547,50 @@ msgstr "nieprawid��owa odpowied添 SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "wyst��pi�� b����d w sesji SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 niedost��pny\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dost��pny\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 niedost��pny\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dost��pny\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Niedost��pna metoda SSL\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nieznana metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "B����d tworzenia kontekstu ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Po����czenie SSL z u甜yciem %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Ceryfikat serwera:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "Temat: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Nadawca: %s\n"
@@ -2284,7 +2284,7 @@ msgstr "Nowy"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
@@ -5698,7 +5698,7 @@ msgstr "Wynik polecenia"
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Zaznacz"
@@ -6269,35 +6269,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nazwa pliku"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kolor etykiety"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Za����cznik"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Nazwisko"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6577,6 +6577,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Przekieruj"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Zawsze"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Subskrybuj grup�� dyskusyjn��"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6acf766e..a07eb43c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-07-20 09:44-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
@@ -558,50 +558,50 @@ msgstr "resposta SMTP inv叩lida\n"
 msgid "error occurred on SMTP session\n"
 msgstr "erro na sess達o SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 n達o dispon鱈vel\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dispon鱈vel\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 n達o dispon鱈vel\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dispon鱈vel\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "m辿todo SSL n達o dispon鱈vel\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "M辿todo SSL desconhecido *ERRO DE PROGRAMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Erro criando contexto SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conex達o SSL usando %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certificado do servidor:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Assunto: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "Emissor: %s\n"
@@ -2270,7 +2270,7 @@ msgstr "Nova"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "N達o lido"
 
@@ -5654,7 +5654,7 @@ msgstr "Resultado de comando"
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Marcada"
 
@@ -6198,31 +6198,31 @@ msgstr "Local:"
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Todos"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Possuem cor de identifica巽達o"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Possuem anexo"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "��ltimo dia"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "��ltimos 5 dias"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Procurar por Assunto ou Remetente"
 
@@ -6511,6 +6511,20 @@ msgstr ""
 "\n"
 "Voc棚 aceita este certificado?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Redirecionar"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Sempre"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Assinar grupo de not鱈cias"
diff --git a/po/ro.po b/po/ro.po
index d2dce885..e037ef44 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-12-22 00:31+0200\n"
 "Last-Translator: Cristian Secar�� <cristi AT secarica DOT ro>\n"
 "Language-Team: \n"
@@ -560,50 +560,50 @@ msgstr "r��spuns SMTP incorect\n"
 msgid "error occurred on SMTP session\n"
 msgstr "a ap��rut o eroare la sesiunea SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 indisponibil\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 disponibil\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 indisponibil\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponibil\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Metod�� SSL indisponibil��\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Metod�� SSL necunoscut�� *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Eroare creare context SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Conexiune SSL utiliz但nd %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Server de certificate:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Subiect: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Emitent: %s\n"
@@ -2295,7 +2295,7 @@ msgstr "Nou"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Necitit"
 
@@ -5726,7 +5726,7 @@ msgstr "Rezultatul comenzii"
 msgid "Age"
 msgstr "V但rst��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "Marcat"
 
@@ -6276,33 +6276,33 @@ msgstr "Loca��ie"
 msgid "Folder name:"
 msgstr "Nume folder:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "Tot"
 
 # hm ?
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "Cu etichet�� de culoare"
 
 # hm ?
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "Cu ata��ament"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "Timp de o zi"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "Ultimele 5 zile"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "Caut��:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "Caut�� dup�� c但mpul Subiect sau De la"
 
@@ -6594,6 +6594,20 @@ msgstr ""
 "\n"
 "Accepta��i acest certificat ?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Redirec��ioneaz��"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��ntotdeauna"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Subscrie la grupul de ��tiri"
diff --git a/po/ru.po b/po/ru.po
index 8cd9aac1..74fc05a5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-07-22 12:53+0400\n"
 "Last-Translator: Andrey Markelov <andrey@markelov.net>\n"
 "Language-Team: Russian <Project-Id-Version: gtranslato>\n"
@@ -553,50 +553,50 @@ msgstr "仆亠于亠��仆��亶 仂��于亠�� SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "仂��亳弍从舒 ��亠舒仆��舒 SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 仆亠亟仂������仗亠仆\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 亟仂������仗亠仆\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 仆亠亟仂������仗亠仆\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 亟仂������仗亠仆\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "��亠��仂亟 SSL 仆亠亟仂������仗亠仆\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "��亠亳亰于亠����仆��亶 仄亠��仂亟 SSL *��丿�������� �� ������������������*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 从仂仆��亠从����舒 SSL\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "弌仂亠亟亳仆亠仆亳亠 SSL �� 亳��仗仂仍��亰仂于舒仆亳亠仄 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "弌亠����亳��亳从舒�� ��亠��于亠��舒:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  弌��弍��亠从��: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  弌亠����亳��亳从舒�� 于��亟舒仍: %s\n"
@@ -2262,7 +2262,7 @@ msgstr "��仂于��亠"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "��亠 仗��仂��亳��舒仆仂"
 
@@ -5644,7 +5644,7 @@ msgstr "��亠亰��仍����舒�� 从仂仄舒仆亟��"
 msgid "Age"
 msgstr "��仂亰��舒���� ��仂仂弍��亠仆亳��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "��仂仄亠��亠仆仂"
 
@@ -6189,31 +6189,31 @@ msgstr "��舒亰仄亠��亠仆亳亠:"
 msgid "Folder name:"
 msgstr "��仄�� 仗舒仗从亳:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "����亠 ��仂仂弍��亠仆亳��"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "����亟亠仍亠仆仆��亠 ��于亠��仂仄"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "弌 于仍仂亢亠仆亳�礆亳"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr "1 亟亠仆��"
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 msgid "Last 5 days"
 msgstr "��仂��仍亠亟仆亳亠 5 亟仆亠亶"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "��仂亳��从:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "��仂亳��从 仗仂 ��亠仄亠 亳仍亳 仂��仗��舒于亳��亠仍��"
 
@@ -6502,6 +6502,20 @@ msgstr ""
 "\n"
 "����亳仆������ ��亠����亳��亳从舒��?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��亠��亠仆舒仗��舒于亳���� 弍亠亰 亳亰仄亠仆亠仆亳亶"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "����亠亞亟舒"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "��仂亟仗亳��从舒 仆舒 亞����仗仗�� 仆仂于仂����亠亶"
diff --git a/po/sk.po b/po/sk.po
index 1a4fdf73..c66f1004 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -551,50 +551,50 @@ msgstr "neplatn叩 odozva SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "vyskytla sa chyba pri SMTP spojen鱈\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nie je dostupn辿\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je dostupn辿\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nie je dostupn辿\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je dostupn辿\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Met坦da SSL nie je dostupn叩\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nezn叩ma met坦da SSL *CHYBA PROGRAMU*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Pri vytv叩ran鱈 SSL kontextu sa vyskytla chyba\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL spojenie pri pou転it鱈 %s zlyhalo\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certifik叩t serveru:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Predmet: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Vydavate直: %s\n"
@@ -2324,7 +2324,7 @@ msgstr "Nov箪"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Nepre��鱈tan辿"
 
@@ -5791,7 +5791,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Zna��ka"
@@ -6383,35 +6383,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "N叩zov s炭boru"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Farebn辿 ozna��enie"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Pr鱈loha"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Priezvisko"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "H直ada泥"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6693,6 +6693,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Pr_esmerova泥"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "V転dy"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Prihl叩si泥 sa do diskusnej skupiny"
diff --git a/po/sl.po b/po/sl.po
index 9684d907..dd9067d5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -557,50 +557,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "Med preverjanjem istovetnosti je pri邸lo do napake\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ni na razpolago\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 je na razpolago\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ni na razpolago\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 je na razpolago\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Metoda SSL ni na razpolago\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Neznana metoda SSL *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Napaka pri ustvarjanju konteksta ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "Povezava SSL z uporabo %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Certifikat stre転nika:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Zadeva: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Izdajatelj: %s\n"
@@ -2328,7 +2328,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Neprebrano"
 
@@ -5792,7 +5792,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Ozna��i"
@@ -6383,35 +6383,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/Barvanje oz_nak"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priloga"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Priimek"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6693,6 +6693,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Pre_usmeri"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Vedno"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Naro��anje na novi��arsko skupino"
diff --git a/po/sr.po b/po/sr.po
index 38c329a4..94f9f06d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -558,50 +558,50 @@ msgstr ""
 msgid "error occurred on SMTP session\n"
 msgstr "gre邸ka prilikom provere identiteta\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 nije dostupan\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 dostupan\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 nije dostupan\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 dostupan\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL metod nije dostupna\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Nepoznat SSL metod *BUG PROGRAMA*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Gre邸ka pri kreiranju ssl konteksta\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL veza koriste��i %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Sertifikat servera:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Tema: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Izdava��: %s\n"
@@ -2323,7 +2323,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Nepro��itano"
 
@@ -5787,7 +5787,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -6379,35 +6379,35 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Dodatak"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Prezime"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6692,6 +6692,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "/Pre_usmeri"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Uvek"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Prijavi se na news grupu"
diff --git a/po/sv.po b/po/sv.po
index f7c0e741..6a5565b2 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -553,50 +553,50 @@ msgstr "felaktigt SMTP-svar\n"
 msgid "error occurred on SMTP session\n"
 msgstr "fel uppstod vid SMTP-session\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 ej tillg辰ngligt\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 tillg辰ngligt\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 ej tillg辰ngligt\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 tillg辰ngligt\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL-metod ej tillg辰nglig\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ok辰nd SSL-metod *PROGRAMFEL*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "Fel vid skapande av SSL-kontext\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL-anslutning med %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Servercertifikat:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  ��rende:  %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Utf辰rdare: %s\n"
@@ -2278,7 +2278,7 @@ msgstr "Nya"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Ol辰sta"
 
@@ -5687,7 +5687,7 @@ msgstr "Resultat av kommando"
 msgid "Age"
 msgstr "��lder"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "Markering"
@@ -6255,35 +6255,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Filnamn"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/F_辰rgmarkera"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bilaga"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Efternamn"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "S旦k"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6565,6 +6565,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Omdirigera"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Alltid"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Prenumerera p奪 diskussionsgrupp"
diff --git a/po/tr.po b/po/tr.po
index 1ad6eaba..8ef87ba1 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -555,50 +555,50 @@ msgstr "k旦t端 SMTP cevab脹\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP oturumunda hata olu��tu\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 kullan脹lam脹yor\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 etkin\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 kullan脹lam脹yor\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 etkin\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL y旦ntemi kullan脹lam脹yor\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Bilinmeyen SSL y旦ntemi: Program hatas脹\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "SSL metni olu��turulurken hata\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL ba��lant脹s脹 %s kullanarak yap脹ld脹\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "Sunucu sertifikas脹:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Konu: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Veren: %s\n"
@@ -2314,7 +2314,7 @@ msgstr "Yeni"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Okunmam脹��"
 
@@ -5759,7 +5759,7 @@ msgstr "Komut sonucu"
 msgid "Age"
 msgstr "Ya��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "聴��aretle"
@@ -6328,35 +6328,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Dosya ad脹"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Renk etiketi"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "Ek"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "Soyad脹"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6638,6 +6638,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Yeniden y旦nlendir"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Her zaman"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "Haber grubuna 端ye ol"
diff --git a/po/uk.po b/po/uk.po
index 95c55ff6..a14450e1 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2007-01-05 13:58+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -559,50 +559,50 @@ msgstr "仗仂亞舒仆舒 于��亟仗仂��亟�� SMTP\n"
 msgid "error occurred on SMTP session\n"
 msgstr "仗仂仄亳仍从舒 仗��亟 ��舒�� ��亠������ SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 仆亠亟仂������仗仆亳亶\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 亟仂������仗仆亳亶\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 仆亠亟仂������仗仆亳亶\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 亟仂������仗仆亳亶\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "��亠��仂亟 SSL 仆亠亟仂������仗仆亳亶\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "��亠于��亟仂仄亳亶 仄亠��仂亟 SSL *�������������� �� ����������������*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "��仂仄亳仍从舒 �� ����于仂��亠仆仆�� 从仂仆��亠从������ ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "��'��亟仆舒仆仆�� SSL 亰 于亢亳于舒仆仆�礆 %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "弌亠����亳����从舒�� ��亠��于亠��舒:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  弌��弍'��从��:  %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ��亳亟舒于: %s\n"
@@ -2274,7 +2274,7 @@ msgstr "��仂于��"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "��亠仗��仂��亳��舒仆��"
 
@@ -5670,7 +5670,7 @@ msgstr "��亠亰��仍����舒�� 从仂仄舒仆亟亳"
 msgid "Age"
 msgstr "��舒于仆��������"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "����亟亰仆舒��亠仆亳亶"
 
@@ -6226,32 +6226,32 @@ msgstr "��仂亰��舒����于舒仆仆��:"
 msgid "Folder name:"
 msgstr "��仄'�� 仗舒仗从亳:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "������"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "��舒�ﾑ��� 从仂仍��仂��仂于�� 仗仂亰仆舒��从��"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "��舒�ﾑ��� 于从仍舒亟亠仆仆��"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "������亰于亳��亠"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "��仂����从:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "��仂����从 亰舒 仗仂仍亠仄 `丐亠仄舒' 舒弍仂 `����亟'"
 
@@ -6541,6 +6541,20 @@ msgstr ""
 "\n"
 "����亳亶仄舒����亠 ��亠亶 ��亠����亳����从舒��?"
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��亠��亠��仗���礆��于舒��亳"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��舒于亢亟亳"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "��亠��亠亟仗仍舒��亳��亳 从仂仆��亠��亠仆������"
diff --git a/po/vi.po b/po/vi.po
index ddbf2666..8a6e6c45 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -551,50 +551,50 @@ msgstr "ph畉�n h畛�i SMTP t畛�i\n"
 msgid "error occurred on SMTP session\n"
 msgstr "c坦 l畛�i trong phi棚n SMTP\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23 kh担ng s畉�n c坦\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23 hi畛�n c坦\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1 kh担ng s畉�n c坦\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1 hi畛�n c坦\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "Ph動董ng th畛�c SSL kh担ng s畉�n c坦\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "Ph動董ng th畛�c SSL kh担ng x叩c ��畛�nh *PROGRAM BUG*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "L畛�i khi t畉�o ng畛� c畉�nh ssl\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "K畉�t n畛�i SSL s畛� d畛�ng %s\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "M叩y ch畛� ch畛�ng nh畉�n:\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  Ti棚u ��畛�: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  Ng動畛�i ph叩t h��nh: %s\n"
@@ -2253,7 +2253,7 @@ msgstr "M畛�i"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "Ch動a ��畛�c"
 
@@ -5657,7 +5657,7 @@ msgstr "K畉�t qu畉� c畛�a l畛�nh"
 msgid "Age"
 msgstr "Tu畛�i"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 msgid "Marked"
 msgstr "��達 ��叩nh d畉�u"
 
@@ -6214,32 +6214,32 @@ msgstr "��畛�a ��i畛�m:"
 msgid "Folder name:"
 msgstr "T棚n th動 m畛�c:"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr "T畉�t c畉�"
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 msgid "Have color label"
 msgstr "C坦 nh達n m��u"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 msgid "Have attachment"
 msgstr "C坦 ��鱈nh k竪m"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "H畛�"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 msgid "Search:"
 msgstr "T狸m ki畉�m:"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr "T狸m theo ti棚u ��畛� ho畉�c ng動畛�i g畛�i"
 
@@ -6519,6 +6519,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "Chuy畛�n h動畛�ng"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "Lu担n lu担n"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "����ng k鱈 v��o nh坦m tin"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 42f9b64e..7c8bf15c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -550,50 +550,50 @@ msgstr "���莚���� SMTP ���綺�\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP 篌�莚����������莚�\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "SSLv23筝�������\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "SSLv23������\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "TLSv1筝�������\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "TLSv1������\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "SSL��号��筝�������\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "筝���ラ�����SSL��号�� *腮�綺����莚�*\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "���綮�SSL筝�筝������九��������莚�\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "篏睡�� %s ���SSL菴��･\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "�����≦��莚�箙�鐚�\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  ���蘂�鐚�%s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  膈上�����鐚�%s\n"
@@ -2276,7 +2276,7 @@ msgstr "��医産"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "���莚�"
 
@@ -5692,7 +5692,7 @@ msgstr "��巡擦膸����"
 msgid "Age"
 msgstr "���篁倶�狗��"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "���莅�"
@@ -6261,35 +6261,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "���篁九��"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/蘂���我��膈�(_B)"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "���篁�"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "紮�羂�"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "���膣�"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6573,6 +6573,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "���絎����"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "��紙��"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "莅∫����育�紫��"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f093128c..69e21d1b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-12-28 11:20+0900\n"
+"POT-Creation-Date: 2008-02-15 16:26+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -554,50 +554,50 @@ msgstr "SMTP ���荀����茯�\n"
 msgid "error occurred on SMTP session\n"
 msgstr "SMTP 茯�茘������主�����茯�\n"
 
-#: libsylph/ssl.c:128
+#: libsylph/ssl.c:130
 msgid "SSLv23 not available\n"
 msgstr "筝������� SSLv23\n"
 
-#: libsylph/ssl.c:130
+#: libsylph/ssl.c:132
 msgid "SSLv23 available\n"
 msgstr "������ SSLv23\n"
 
-#: libsylph/ssl.c:139
+#: libsylph/ssl.c:141
 msgid "TLSv1 not available\n"
 msgstr "筝������� TLSv1\n"
 
-#: libsylph/ssl.c:141
+#: libsylph/ssl.c:143
 msgid "TLSv1 available\n"
 msgstr "������ TLSv1\n"
 
-#: libsylph/ssl.c:196 libsylph/ssl.c:203
+#: libsylph/ssl.c:231 libsylph/ssl.c:238
 msgid "SSL method not available\n"
 msgstr "筝������� SSL\n"
 
-#: libsylph/ssl.c:209
+#: libsylph/ssl.c:244
 msgid "Unknown SSL method *PROGRAM BUG*\n"
 msgstr "�����ョ�� SSL ���篏����茯�\n"
 
-#: libsylph/ssl.c:215
+#: libsylph/ssl.c:250
 msgid "Error creating ssl context\n"
 msgstr "SSL ��活叱��主�����茯�\n"
 
 #. Get the cipher
-#: libsylph/ssl.c:234
+#: libsylph/ssl.c:269
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "篏睡�� %s ��画�� SSL ��ｇ��\n"
 
-#: libsylph/ssl.c:243
+#: libsylph/ssl.c:278
 msgid "Server certificate:\n"
 msgstr "篌堺�����茯�茘�鐚�\n"
 
-#: libsylph/ssl.c:246
+#: libsylph/ssl.c:281
 #, c-format
 msgid "  Subject: %s\n"
 msgstr "  筝紙��: %s\n"
 
-#: libsylph/ssl.c:251
+#: libsylph/ssl.c:286
 #, c-format
 msgid "  Issuer: %s\n"
 msgstr "  ��寂拭篋�: %s\n"
@@ -2272,7 +2272,7 @@ msgstr "��亥��"
 
 #. S_COL_MARK
 #: src/folderview.c:424 src/prefs_filter_edit.c:501
-#: src/prefs_summary_column.c:73 src/quick_search.c:96
+#: src/prefs_summary_column.c:73 src/quick_search.c:95
 msgid "Unread"
 msgstr "���莅����"
 
@@ -5656,7 +5656,7 @@ msgstr "��決��腟����"
 msgid "Age"
 msgstr "������"
 
-#: src/prefs_filter_edit.c:502 src/quick_search.c:97
+#: src/prefs_filter_edit.c:502 src/quick_search.c:96
 #, fuzzy
 msgid "Marked"
 msgstr "罔�荐�"
@@ -6223,35 +6223,35 @@ msgstr ""
 msgid "Folder name:"
 msgstr "罟����"
 
-#: src/quick_search.c:95
+#: src/quick_search.c:94
 msgid "All"
 msgstr ""
 
-#: src/quick_search.c:98
+#: src/quick_search.c:97
 #, fuzzy
 msgid "Have color label"
 msgstr "/篁ラ����峨��罔�荐�(_B)"
 
-#: src/quick_search.c:99
+#: src/quick_search.c:98
 #, fuzzy
 msgid "Have attachment"
 msgstr "������罟�罅�"
 
-#: src/quick_search.c:101
+#: src/quick_search.c:100
 msgid "Within 1 day"
 msgstr ""
 
-#: src/quick_search.c:102
+#: src/quick_search.c:101
 #, fuzzy
 msgid "Last 5 days"
 msgstr "紮�"
 
-#: src/quick_search.c:111
+#: src/quick_search.c:110
 #, fuzzy
 msgid "Search:"
 msgstr "絨����"
 
-#: src/quick_search.c:129
+#: src/quick_search.c:128
 msgid "Search for Subject or From"
 msgstr ""
 
@@ -6533,6 +6533,20 @@ msgid ""
 "Do you accept this certificate?"
 msgstr ""
 
+#: src/sslmanager.c:142 src/sslmanager.c:150
+#, fuzzy
+msgid "_Reject"
+msgstr "��灸散絨����"
+
+#: src/sslmanager.c:143 src/sslmanager.c:149
+msgid "_Temporarily accept"
+msgstr ""
+
+#: src/sslmanager.c:144 src/sslmanager.c:148
+#, fuzzy
+msgid "Always _accept"
+msgstr "筝�緇�蕁�腓�"
+
 #: src/subscribedialog.c:203
 msgid "Subscribe to newsgroup"
 msgstr "���荐���域��臂ょ��"
diff --git a/src/sslmanager.c b/src/sslmanager.c
index 45845357..eaed7786 100644
--- a/src/sslmanager.c
+++ b/src/sslmanager.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2007 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2008 Hiroyuki Yamamoto
  *
  * 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
@@ -139,13 +139,15 @@ gint ssl_manager_verify_cert(SockInfo *sockinfo, const gchar *hostname,
 
 	if (prefs_common.comply_gnome_hig)
 		gtk_dialog_add_buttons(GTK_DIALOG(dialog),
-				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				       GTK_STOCK_OK, GTK_RESPONSE_OK,
+				       _("_Reject"), GTK_RESPONSE_REJECT,
+				       _("_Temporarily accept"), GTK_RESPONSE_OK,
+				       _("Always _accept"), GTK_RESPONSE_ACCEPT,
 				       NULL);
 	else
 		gtk_dialog_add_buttons(GTK_DIALOG(dialog),
-				       GTK_STOCK_OK, GTK_RESPONSE_OK,
-				       GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+				       _("Always _accept"), GTK_RESPONSE_ACCEPT,
+				       _("_Temporarily accept"), GTK_RESPONSE_OK,
+				       _("_Reject"), GTK_RESPONSE_REJECT,
 				       NULL);
 	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
 
@@ -155,9 +157,11 @@ gint ssl_manager_verify_cert(SockInfo *sockinfo, const gchar *hostname,
 	gtk_widget_destroy(dialog);
 
 	switch (result) {
+	case GTK_RESPONSE_ACCEPT:
+		return 0;
 	case GTK_RESPONSE_OK:
 		return 1;
-	case GTK_RESPONSE_CANCEL:
+	case GTK_RESPONSE_REJECT:
 	default:
 		break;
 	}