From 12a91dbb21f2a052d26460c9aad30835fd17456b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 18 Nov 2010 13:35:36 +0100 Subject: Bug #633779 - GtkComboBoxText issues --- mail/mail-config.ui | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 171205c94b..7252206a56 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2704,7 +2704,7 @@ For example: "Work" or "Personal" - + True model1 @@ -3342,7 +3342,7 @@ For example: "Work" or "Personal" - + True @@ -3427,7 +3427,7 @@ For example: "Work" or "Personal" - + True model2 -- cgit v1.2.3 From e419261d1841fa38c0c41f5eaddd9b790ab85996 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Nov 2010 19:48:58 +0100 Subject: Bug #633949 - Add an option to disable new e-mail check at startup --- mail/mail-config.ui | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 69 insertions(+), 2 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 7252206a56..8677b95f15 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2415,6 +2415,73 @@ For example: "Work" or "Personal" 12 vertical 12 + + + True + vertical + 6 + + + True + 0 + Start up + + + + + + False + False + 0 + + + + + True + 12 + + + True + vertical + 6 + + + True + 4 + + + Check for new _messages on start + True + True + False + True + True + + + False + False + 0 + + + + + 0 + + + + + + + 1 + + + + + False + False + 0 + + True @@ -2652,7 +2719,7 @@ For example: "Work" or "Personal" False False - 0 + 1 @@ -2749,7 +2816,7 @@ For example: "Work" or "Personal" False False - 1 + 2 -- cgit v1.2.3 From fc91bfc86e3a58d97d7819dbbbda74a33d3f1c2a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 30 Nov 2010 09:30:58 +0100 Subject: Add option "Check for new messages in all active accounts" As a follow-up for bug #633949 --- mail/mail-config.ui | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 8677b95f15..bfa365ed9a 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2468,6 +2468,30 @@ For example: "Work" or "Personal" 0 + + + True + 4 + + + Check for new messa_ges in all active accounts + True + True + False + True + True + + + False + False + 0 + + + + + 1 + + -- cgit v1.2.3 From 6e9c9986ac569a4e759f2102ec87e7614c8c00cc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 5 Jan 2011 17:42:04 +0100 Subject: Bug #637906 - Don't ask again when sending to non-mail recipients --- mail/mail-config.ui | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index bfa365ed9a..a38a0bfabe 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -4487,6 +4487,21 @@ For example: "Work" or "Personal" 4 + + + Sending a message with _recipients not entered as mail addresses + True + True + False + True + True + + + False + False + 5 + + -- cgit v1.2.3 From 7da22c1960fb1516963429fe9827af2624af7c98 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 25 Jan 2011 11:22:29 +0100 Subject: Most (but not all) packing issues from Mail preferences --- mail/mail-config.ui | 64 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 4 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index a38a0bfabe..289b052c3e 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2465,6 +2465,8 @@ For example: "Work" or "Personal" + False + False 0 @@ -2489,6 +2491,8 @@ For example: "Work" or "Personal" + False + False 1 @@ -2496,6 +2500,8 @@ For example: "Work" or "Personal" + False + False 1 @@ -2813,6 +2819,8 @@ For example: "Work" or "Personal" + False + False 0 @@ -2826,6 +2834,8 @@ For example: "Work" or "Personal" True + False + False 1 @@ -2928,6 +2938,8 @@ For example: "Work" or "Personal" + False + False 1 @@ -3022,6 +3034,8 @@ For example: "Work" or "Personal" 1 + False + False @@ -3254,6 +3268,8 @@ For example: "Work" or "Personal" 0 + True + True @@ -3306,6 +3322,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -3353,6 +3371,8 @@ For example: "Work" or "Personal" 1 + False + False @@ -3735,7 +3755,7 @@ For example: "Work" or "Personal" True 12 vertical - 18 + 6 True @@ -3839,6 +3859,7 @@ For example: "Work" or "Personal" False + False 0 @@ -3848,6 +3869,8 @@ For example: "Work" or "Personal" 4 + False + False @@ -3855,6 +3878,8 @@ For example: "Work" or "Personal" 1 + False + False @@ -3880,6 +3905,8 @@ For example: "Work" or "Personal" 0 + False + False @@ -4097,11 +4124,15 @@ For example: "Work" or "Personal" 1 + True + True 0 + True + True @@ -4143,12 +4174,14 @@ For example: "Work" or "Personal" 1 + True + True - False - False + True + True 1 @@ -4265,11 +4298,15 @@ For example: "Work" or "Personal" 1 + True + True 0 + True + True @@ -4351,6 +4388,7 @@ For example: "Work" or "Personal" False + False 1 @@ -4359,11 +4397,14 @@ For example: "Work" or "Personal" 1 + False + False False + False 1 @@ -4765,6 +4806,8 @@ for display purposes only. 0 + False + False @@ -4788,6 +4831,8 @@ for display purposes only. 0 + False + False @@ -4802,6 +4847,8 @@ for display purposes only. 1 + False + False @@ -4816,6 +4863,8 @@ for display purposes only. 2 + False + False @@ -4990,6 +5039,7 @@ for display purposes only. False + False 0 @@ -5004,6 +5054,7 @@ for display purposes only. False + False 1 @@ -5014,7 +5065,7 @@ for display purposes only. True - 2 + 3 2 6 3 @@ -5076,6 +5127,7 @@ for display purposes only. False + False 2 @@ -5084,6 +5136,7 @@ for display purposes only. False + False 3 @@ -5091,12 +5144,15 @@ for display purposes only. + False + False 1 False + False 0 -- cgit v1.2.3 From 2a5bbf490590b20002c1ced339fde3e3521eb094 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 Mar 2011 08:44:39 -0500 Subject: Bug 644053 - Fix packing in "Network Preferences" --- mail/mail-config.ui | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 289b052c3e..e582621c26 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -5065,7 +5065,7 @@ for display purposes only. True - 3 + 2 2 6 3 @@ -5106,6 +5106,7 @@ for display purposes only. 1 2 + GTK_FILL @@ -5120,6 +5121,7 @@ for display purposes only. 2 1 2 + GTK_FILL @@ -5156,6 +5158,17 @@ for display purposes only. 0 + + + True + + + + + + 1 + + -- cgit v1.2.3 From 175ee8ccc1bb463cb35dd8c7485a5c5a7341da8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1ti?= Date: Fri, 18 Mar 2011 11:39:00 -0400 Subject: Bug 418954 - Add a separate entry combo for port numbers Adds a new EPortEntry widget which appears alongside "host" entry boxes so users don't have to know about the "host:port" syntax to specify a custom port number. Currently only used in the mail account editor, but we'll generalize it futher so it can be used everywhere. --- mail/mail-config.ui | 70 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 63 insertions(+), 7 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index e582621c26..5305593e8c 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -625,7 +625,7 @@ For example: "Work" or "Personal" True 3 - 2 + 4 12 6 @@ -637,6 +637,25 @@ For example: "Work" or "Personal" source_host + 0 + 1 + 0 + GTK_FILL + + + + + + True + 1 + _Port: + True + source_port + + + 0 + 1 + 2 GTK_FILL @@ -651,7 +670,6 @@ For example: "Work" or "Personal" 1 - 2 GTK_FILL @@ -664,8 +682,20 @@ For example: "Work" or "Personal" 1 - 2 - + 0 + + + + + True + True + True + + + 3 + 0 + + @@ -676,7 +706,7 @@ For example: "Work" or "Personal" 1 - 2 + 4 1 2 @@ -1053,7 +1083,7 @@ For example: "Work" or "Personal" True 2 - 2 + 4 12 6 @@ -1062,7 +1092,6 @@ For example: "Work" or "Personal" 1 _Server: True - right transport_host @@ -1070,6 +1099,20 @@ For example: "Work" or "Personal" + + + True + _Port: + True + right + transport_port + + + 2 + GTK_FILL + + + True @@ -1082,6 +1125,18 @@ For example: "Work" or "Personal" + + + True + True + True + + + 3 + + + + Ser_ver requires authentication @@ -1092,6 +1147,7 @@ For example: "Work" or "Personal" True + 1 2 1 2 -- cgit v1.2.3 From 1622d0424c5b2b00240100cc123617e4dd6ed937 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Fri, 29 Apr 2011 09:21:58 +0200 Subject: Bug #588891 - Spam settings dialog terribly un-higgy --- mail/mail-config.ui | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 5305593e8c..faabb282b3 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -5236,6 +5236,126 @@ for display purposes only. False + + + dialog + Set custom junk header + 12 + 400 + FALSE + + + True + vertical + 12 + 12 + + + True + True + All new emails with header that matches given content will be automatically filtered as junk + + + + + True + 2 + 2 + 12 + 6 + + + True + Header name + junk-header-name + 0 + + + GTK_SHRINK + + + + + True + Header content + junk-header-content + 0 + + + 1 + 2 + GTK_SHRINK + + + + + True + True + + + 1 + 2 + + + + + True + True + + + 1 + 2> + 1 + 2 + + + + + + + True + end + + + gtk-cancel + True + True + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + True + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + junk-header-cancel + junk-header-ok + -- cgit v1.2.3 From 287e1401cc365ee226d3f039854e7b3594567944 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 23 Jun 2011 10:38:31 +0200 Subject: Bug #650278 - Tab doesn't exit port field --- mail/mail-config.ui | 2 -- 1 file changed, 2 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index faabb282b3..d2e5d8dd34 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -688,7 +688,6 @@ For example: "Work" or "Personal" True - True True @@ -1128,7 +1127,6 @@ For example: "Work" or "Personal" True - True True -- cgit v1.2.3 From c238fbfd1525aa282673abdc435a7f9e4a7f7f3e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Jul 2011 07:06:12 -0400 Subject: Convert junk filtering EPlugins to EExtensions. We now have a proper junk mail filtering API. All junk filtering extensions must subclass EMailJunkFilter for user preferences and availability testing, and implement the CamelJunkFilter interface for the actual junk filtering and learning operations. The bogofilter module should be feature-equivalent to its former EPlugin. The spamassassin module is far more complex. It's nearly feature-equivalent to its former EPlugin, but I ditched the spamd respawning code since it seemed unnecessary for a mail client to have to deal with. If there's a huge outcry from users about it I'll reluctantly put it back, but I don't expect one. This gets us a step closer to killing off EConfig, and eventually the EPlugin framework itself. --- mail/mail-config.ui | 7319 +++++++++++++++++++++++++++------------------------ 1 file changed, 3862 insertions(+), 3457 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index d2e5d8dd34..213f397660 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -1,798 +1,463 @@ - + - - - - 1.5 - 10 - 1 - 1 - - - 30000 - 1 - 10 - - - 5 - 1 - 100 - 1 - 10 - - - 65535 - 1 - 10 - - - 65535 - 1 - 10 - - - - - - - - - a - - - b - - - - - - - - - - - a - - - b - - - - - - - - - - - Attachment - - - Inline (Outlook style) - - - Quoted - - - Do not quote - - - - - - - - - - - Attachment - - - Inline - - - Quoted - - - - - - - - - - - Default - - - SHA1 - - - SHA256 - - - SHA384 - - - SHA512 - - - - - True + + + 400 + False 12 - vertical - 12 - - + Set custom junk header + False + dialog + + True + False vertical - 6 - - + 12 + + True - 0 - Account Information - - - + False + end + + + gtk-cancel + True + True + False + False + True + True + + + False + False + 0 + + + + + gtk-ok + True + True + False + False + True + True + + + False + False + 1 + + False - False + True + end 0 - + True - 12 - - - True - 6 - 2 - - - True - vertical - 6 - - - True - 0 - Type the name by which you would like to refer to this account. -For example: "Work" or "Personal" - True - - - False - 0 - - - - - True - 12 - - - True - _Name: - True - right - management_name - - - False - False - 0 - - - - - True - True - ● - - - 1 - - - - - False - 1 - - - - - - + False + All new emails with header that matches given content will be automatically filtered as junk + True + False + True 1 - - - False - False - 0 - - - - - True - vertical - 6 - + True - 0 - Required Information - - - - - - False - False - 0 - - - - - True - 12 + False + 2 + 2 + 12 + 6 - + True - 2 - 2 - 12 - 6 - - - True - True - ● - - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Email _Address: - True - identity_address - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - Full Nam_e: - True - identity_full_name - - - GTK_FILL - - - - - - True - True - ● - - - - - - - 1 - 2 - - - + False + 0 + Header name + junk-header-name + + + GTK_SHRINK + + + + + True + False + 0 + Header content + junk-header-content + + + 1 + 2 + GTK_SHRINK + + + + + True + True + + + 1 + 2 + + + + + True + True + + 1 + 2 + 1 + 2 + - 1 + False + True + 2 - - False - False - 1 - - - + + junk-header-cancel + junk-header-ok + + + + False + normal + + True + False vertical - 6 - - + 12 + + True - 0 - Optional Information - - - + False + end + + + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-add + + + False + False + 0 + + + + + True + False + _Add Signature + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + gtk-cancel + True + True + True + False + False + True + + + False + False + 1 + + False - False + True + end 0 - + True - 12 + False - + True - 4 - 2 - 12 - 6 - - - True - 0 - Signat_ure: - True - signature_dropdown - - - 3 - 4 - GTK_FILL - - - + False + 12 + 6 - + True + False 6 - + True + False + 0 + gtk-dialog-info + 6 - False - False + True + True 0 - - Add Ne_w Signature... + True - True - True - True - + False + 0 + The output of this script will be used as your +signature. The name you specify will be used +for display purposes only. + True False False - end 1 - 1 - 2 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - True - ● - - - - - - - 1 - 2 - 2 - 3 - - - - - - True - 0 - Or_ganization: - True - identity_organization - - - 2 - 3 - GTK_FILL - - - - - - True - True - ● - - - - - - - 1 - 2 - 1 - 2 - - - - - - True - 0 - Re_ply-To: - True - center - identity_reply_to - - - 1 - 2 - GTK_FILL - + False + False + 0 - - _Make this my default account + True - True - False - True - True + False + 2 + 2 + 6 + 6 + + + True + False + 0 + _Name: + True + center + entry_add_script_name + + + GTK_FILL + + + + + + True + False + 0 + _Script: + True + center + filechooserbutton_add_script + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + + + + + + True + False + + + + 1 + 2 + 1 + 2 + GTK_FILL + + + - 2 - GTK_FILL - GTK_FILL + True + True + 1 + + False + False + 0 + + False + True 1 - - False - False - 2 - + + button_add_script_add + button_add_script_cancel + - + + 10 + 1.5 + 1 + 1 + + + 30000 + 1 + 10 + + + 1 + 100 + 5 + 1 + 10 + + + 65535 + 1 + 10 + + + 65535 + 1 + 10 + + True - 12 - vertical - 12 + True - + True - 2 - 3 - 12 - 6 - - - True - 0 - Server _Type: - True - right - source_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - center - - - 1 - 2 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - + False + 12 + 6 - + True - - - 1 - 3 - GTK_FILL - - - - - - False - False - 0 - - - - - True - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Configuration - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 3 - 4 - 12 - 6 - - - True - 1 - _Server: - True - source_host - - - 0 - 1 - 0 - GTK_FILL - - - - - - True - 1 - _Port: - True - source_port - - - 0 - 1 - 2 - GTK_FILL - - - - - - True - 1 - User _Name: - True - source_user - - - 1 - GTK_FILL - - - - - - True - True - ● - - - 1 - 0 - - - - - True - True - - - 3 - 0 - - - - - - - True - True - ● - - - 1 - 4 - 1 - 2 - - - - - - True - 1 - _Path: - True - - - 2 - 3 - GTK_FILL - - - - - - True - Mailbox location - - - 1 - 2 - 2 - 3 - - - + False + 0 + Default Behavior + + + + + False + False + 0 + - - - 1 - - - - - False - False - 2 - - - - - True - vertical - 6 - - - True - 0 - Security - source_auth_dropdown - - - - - - False - False - 0 - - - - - True - 12 - + True - vertical - 6 + False + 12 - + True - 12 + False + 8 - + + Format messages in _HTML True - _Use Secure Connection: + True + False + False True - center - source_use_ssl + True False @@ -801,15 +466,14 @@ For example: "Work" or "Personal" - + + Automatically insert _emoticon images True - use_ssl_model - - - - 0 - - + True + False + False + True + True False @@ -817,79 +481,78 @@ For example: "Work" or "Personal" 1 - - - False - False - 0 - - - - - True - 6 - + + Always request rea_d receipt True - gtk-dialog-warning + True + False + False + True + True False False - 0 + 2 - + + Encode file names in an Outlook/GMail way True - 0 - SSL is not supported in this build of Evolution - center - - - + True + False + False + True + True False False - 1 + 3 - - - 1 - + + + True + False + 6 + + + True + False + 1 + C_haracter set: + True + center + + + False + False + 0 + + + + + + + + False + False + 4 + + + + + False + False + 1 + - - 1 - - - - - False - False - 3 - - - - - True - vertical - 6 - - - True - 0 - _Authentication Type - True - source_auth_dropdown - - - - False False @@ -897,351 +560,488 @@ For example: "Work" or "Personal" - + True - 12 + False + 6 - + True - vertical - 6 + False + 0 + Replies and Forwards + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 6 + 2 + 6 + 6 - + True + False + 1 + _Reply style: + True - False - False - 0 + GTK_FILL + - - Ch_eck for Supported Types + + True + False + 1 + _Forward style: + True + + + 1 + 2 + GTK_FILL + + + + + + Start _typing at the bottom on replying True True - True + False + False True + True - False - False - 1 + 2 + 2 + 3 + + + + + + _Keep signature above the original message on replying + True + True + False + False + True + True + + + 2 + 3 + 4 + + + + + + Ignore Reply-To: for mailing lists + True + True + False + False + True + True + + + 2 + 4 + 5 + + + + + + Group Reply goes only to mailing list, if possible + True + True + False + False + True + True + + + 2 + 5 + 6 + + + + + + True + False + 0 + 0 + + + True + False + model3 + + + + 0 + + + + + + + 1 + 2 + + + + + True + False + 0 + 0 + + + True + False + model4 + + + + 0 + + + + + + + 1 + 2 + 1 + 2 - - 0 - - - - - Re_member password - True - True - False - True - True - - - False - False - 1 - + + False + False + 1 + + False + False 1 - - False - False - 4 - - - - - True - 12 - vertical - 12 - - - True - 2 - 3 - 12 - 6 - - - True - 0 - 0 - Server _Type: - True - right - transport_type_dropdown - - - GTK_FILL - - - - - - True - 0 - 0 - Description: - right - - - 1 - 2 - GTK_FILL - - - - - True - - - 1 - 3 - GTK_FILL - - - - - - True - 0 - 0 - description - True - - - 1 - 3 - 1 - 2 - GTK_FILL - - - - - - False - False - 0 - - - + + True + False + General + True + center - False - False - 1 + False - + True - vertical - 6 + False + 12 + 12 - + True - 0 - Server Configuration - - - + False + 6 + + + True + False + 0 + Sig_natures + True + + + + + + False + False + 0 + + + + + True + False + 12 + + + + + + True + True + 1 + + - False - False + True + True 0 - + True - 12 + False + 6 - + True - 2 - 4 - 12 - 6 - - - True - 1 - _Server: - True - transport_host - - - GTK_FILL - - - - - - True - _Port: - True - right - transport_port - - - 2 - GTK_FILL - - - - - - True - True - ● - - - 1 - 2 - - - - - - True - True - - - 3 - - - - + False + 0 + Preview + + + + + + False + False + 0 + + + + + True + False + 12 - - Ser_ver requires authentication + True True - False - True - True + in + + + - - 1 - 2 - 1 - 2 - + + True + True + 1 + + True + True 1 - False - False - 2 + 1 + + + + + True + False + Signatures + True + center + + + 1 + False - + True - vertical - 6 + False + 12 + 12 - + True - 0 - Security - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 2 - 6 + False + 0 + _Languages + True + listSpellCheckLanguage + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 2 + 2 + 6 + 6 - + True - gtk-dialog-warning + False + 0 + gtk-dialog-info - False - False - 0 + 1 + 2 + + - + True + False 0 - SSL is not supported in this build of Evolution - center - - - + The list of languages here reflects only the languages for which you have a dictionary installed. + True - False - False - 1 + 1 + 2 + 1 + 2 + + + + + + True + True + in + + + True + True + False + + + Languages Table + + + + + + + + + + 2 - - 1 - 2 - + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + 6 + + + True + False + 0 + Options + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 12 + False + 6 - + + Check spelling while I _type True - _Use Secure Connection: + True + False + False True - center - transport_use_ssl + True False @@ -1250,14 +1050,39 @@ For example: "Work" or "Personal" - + True - use_ssl_model + False + 6 - - - 0 - + + True + False + Color for _misspelled words: + True + center + colorButtonSpellCheckColor + + + False + False + 0 + + + + + True + True + True + False + Pick a color + #000000000000 + + + False + False + 1 + @@ -1269,32 +1094,50 @@ For example: "Work" or "Personal" + + False + False + 1 + + False + False 1 - False - False - 3 + 2 + + + + + True + False + Spell Checking + True + center + + + 2 + False - + True - vertical - 6 + False + 12 + 12 - + True + False 0 - Authentication - - - + To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions: + True False @@ -1303,653 +1146,309 @@ For example: "Work" or "Personal" - + True + False 12 - + True - 3 - 2 - 12 - 6 + False + 6 - + + Sending a message with an _empty subject line True - 1 - T_ype: + True + False + False True - center - transport_auth_dropdown + True - GTK_FILL - + False + False + 0 - + + Sending a message with only _Bcc recipients defined True - 1 - User _Name: + True + False + False True - right - transport_user - - - 1 - 2 - GTK_FILL - - - - - - True - True - ● + True - 1 - 2 - 1 - 2 - + False + False + 1 - - Remember _password + + Sending a _private reply to a mailing list message True True False + False True True - 1 - 2 - 2 - 3 - - - - - True - 0 - 0 - - - True - 6 - - - True - - - False - False - 0 - - - - - Ch_eck for Supported Types - True - True - True - True - - - False - False - 1 - - - - - - - 1 - 2 - - - - - - - - - - 1 - - - - - False - False - 4 - - - - - True - 12 - vertical - 12 - - - True - vertical - 6 - - - True - 0 - Special Folders - - - - - - False - False - 0 - - - - - True - 0 - 0 - 12 - - - True - 5 - 2 - 12 - 6 - - - True - 0 - Drafts _Folder: - True - - - GTK_FILL - - - - - - True - 0 - Sent _Messages Folder: - True - - - 1 - 2 - GTK_FILL - + False + False + 2 - - _Trash Folder: + + Sending a reply to a large _number of recipients True True False + False True True - 2 - 3 - GTK_FILL - + False + False + 3 - - _Junk Folder: + + Allowing a _mailing list to redirect a private reply to the list True True False + False True True - 3 - 4 - GTK_FILL - - - - - - True - 0 - 0 - - - gtk-revert-to-saved - True - True - True - True - - - - - 1 - 2 - 4 - 5 - - - - - True - True - True - - - 1 - 2 - - - - - True - True - True - - - 1 - 2 - 1 - 2 - - - - - True - True - True - - - 1 - 2 - 2 - 3 + False + False + 4 - + + Sending a message with _recipients not entered as mail addresses True True - True + False + False + True + True - 1 - 2 - 3 - 4 + False + False + 5 - - - + True + True 1 - False - False - 0 + 3 + + + + + True + False + Confirmations + + + 3 + False + + + + + + + + + Default + + + SHA1 + + + SHA256 + + + SHA384 + + + SHA512 + + + + + + + + + + + a + + + b + + + + + + + + + + + a + + + b + + + + + + + + + + + Attachment + + + Inline (Outlook style) + + + Quoted + + + Do not quote + + + + + + + + + + + Attachment + + + Inline + + + Quoted + + + + + True + True - + True - vertical - 6 - - - True - 0 - Composing Messages - - - - - - False - False - 0 - - + False + 12 + 12 - + True - 12 + False + 6 - + True - 4 - 6 + False + 0 + Proxy Settings + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 18 + False + 6 - + + _Use system defaults True True - ● + False + False + True + True + True + + False + False + 0 + - - - 3 - 4 - - - - - Always _blind carbon-copy (bcc) to: - True - True - False - True - True - - - 2 - 3 - - - - - True - 18 - + + _Direct connection to the Internet True True - ● + False + False + True + True + rdoSysSettings - - - - 1 - 2 - - - - - Alway_s carbon-copy (cc) to: - True - True - False - True - True - - - - - - - 1 - - - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Message Receipts - - - - - - False - False - 0 - - - - - True - 12 - - - True - 12 - - - True - S_end message receipts: - True - receipt_policy_dropdown - - - False - False - 0 - - - - - True - - - 1 - - - - - - - 1 - - - - - False - False - 2 - - - - - True - 12 - vertical - 12 - - - True - vertical - 6 - - - True - 0 - General - - - - - - False - False - 0 - - - - - True - 12 - - - _Do not sign meeting requests (for Outlook compatibility) - True - True - False - True - True - - - - - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - True - 0 - Pretty Good Privacy (PGP/GPG) - - - - - - False - False - 0 - - - - - True - 12 - - - True - 6 - 2 - - - True - vertical - 6 - - - True - 12 - - - True - 0 - PGP/GPG _Key ID: - True - pgp_key - - - False - False - 0 - - - - - True - True - ● - - - 1 - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - Si_gning algorithm: - True - pgp_hash_algo - - - False - False - 0 - - - - - True - hash_algo_model - - - - 0 - - - - - False - False - 1 - - - - - 1 - + + False + False + 1 + - - Al_ways sign outgoing messages when using this account + + _Manual proxy configuration: True True False + False True True + rdoSysSettings False @@ -1958,507 +1457,335 @@ For example: "Work" or "Personal" - - Always encrypt to _myself when sending encrypted messages - True - True - False - True - True - True - - - False - False - 3 - - - - - Always _trust keys in my keyring when encrypting + True - True - False - True - True - - - False - False - 4 - - - - - - - - - 1 - - - - - False - False - 1 - - - - - True - vertical - 6 - - - True - 0 - Secure MIME (S/MIME) - - - - - - False - False - 0 - - - - - True - 12 - - - True - 7 - 3 - 12 - 6 - - - True - True - ● - - - 1 - 2 - 1 - 2 - - - - - - True - True - ● - - - 1 - 2 - 6 - 7 - - - - - - Also encrypt to sel_f when sending encrypted messages - True - True - False - True - True - - - 3 - 5 - 6 - GTK_FILL - - - - - - Encrypt out_going messages (by default) - True - True - False - True - True - - - 3 - 4 - 5 - GTK_FILL - - - - - - Digitally sign o_utgoing messages (by default) - True - True - False - True - True - - - 3 - GTK_FILL - - - - - - True - - - 3 - 3 - 4 - GTK_FILL - GTK_FILL - 6 - - - - - True - 0 - Encry_ption certificate: - True - smime_encrypt_key - - - 6 - 7 - GTK_FILL - - - - - - True - 0 - Sig_ning certificate: - True - smime_sign_key - - - 1 - 2 - GTK_FILL - - - - - - True - 6 - - - True - True - True + False + 24 - + True - 0 - 0 + False + 6 - + True - 2 + False + 4 + 4 + 6 + 6 - + True - gtk-open + False + 0 + H_TTP Proxy: + True + txtHttpHost - False - False - 0 + GTK_FILL + - + True - S_elect... + False + 0 + _Secure HTTP Proxy: True + txtHttpsHost - False - False - 1 + 1 + 2 + GTK_FILL + - - - - - - - False - False - 0 - - - - - True - True - True - - - True - 0 - 0 - - - True - 2 - + True - gtk-clear + False + 0 + No _Proxy for: + True + txtIgnoreHosts - False - False - 0 + 3 + 4 + GTK_FILL + - + True - Clea_r - True + True + ● - False - False - 1 + 1 + 2 + - - - - - - - False - False - 1 - - - - - 2 - 3 - 6 - 7 - GTK_FILL - GTK_FILL - - - - - True - 0 - Signing _algorithm: - True - smime_hash_algo - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - - - True - hash_algo_model - - - - 0 - - - - - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - 0 - 0 - - - True - 6 - - - True - True - True + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Port: + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + Port: + + + 2 + 3 + 1 + 2 + GTK_FILL + + + + + + True + True + ● + adjustment4 + 1 + + + 3 + 4 + + + + + + True + True + ● + adjustment5 + 1 + + + 3 + 4 + 1 + 2 + + + + + + True + True + ● + + + 1 + 4 + 3 + 4 + + + + + + + + + + + + + + + + + + False + False + 0 + + - + + Use Authe_ntication True - 0 - 0 + True + False + False + True + True + + + False + False + 1 + + + + + True + False + 24 - + True - 2 + False + 2 + 2 + 6 + 3 - + True - gtk-open + False + 0 + Us_ername: + True + txtAuthUser - False - False - 0 + GTK_FILL + - + True - _Select... + False + 0 + Pass_word: True + txtAuthPwd - False - False - 1 + 1 + 2 + GTK_FILL + - - - - - - - False - False - 0 - - - - - True - True - True - - - True - 0 - 0 - - - True - 2 - + True - gtk-clear + True + ● - False - False - 0 + 1 + 2 + GTK_FILL - + True - Cle_ar - True + True + False + ● - False - False - 1 - + 1 + 2 + 1 + 2 + GTK_FILL + + + False + False + 2 + - - False - False - 1 - + + False + False + 3 + - - 2 - 3 - 1 - 3 - + + False + False + 1 + + False + False + 0 + + + + + True + False + + + + + + True + True 1 + + + + True + False + General + - False - False - 2 + False - - - - - - - - - - No encryption - never - - - TLS encryption - when-possible - - - SSL encryption - always - - - True True @@ -2466,17 +1793,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 Start up @@ -2492,15 +1820,17 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 True + False 4 @@ -2508,6 +1838,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2527,6 +1858,7 @@ For example: "Work" or "Personal" True + False 4 @@ -2534,6 +1866,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2569,11 +1902,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Message Display @@ -2589,11 +1923,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -2601,6 +1936,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2613,10 +1949,12 @@ For example: "Work" or "Personal" True + False 24 True + False 2 2 6 @@ -2624,6 +1962,7 @@ For example: "Work" or "Personal" True + False 1 S_tandard Font: True @@ -2640,8 +1979,9 @@ For example: "Work" or "Personal" True True True + False Select HTML fixed width font - + 1 @@ -2657,8 +1997,9 @@ For example: "Work" or "Personal" True True True + False Select HTML variable width font - + 1 @@ -2670,6 +2011,7 @@ For example: "Work" or "Personal" True + False 1 Fix_ed Width Font: True @@ -2687,12 +2029,15 @@ For example: "Work" or "Personal" + True + True 1 True + False 6 @@ -2700,6 +2045,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -2715,6 +2061,7 @@ For example: "Work" or "Personal" True True True + False Pick a color #000000000000 @@ -2727,6 +2074,7 @@ For example: "Work" or "Personal" True + False color center @@ -2738,16 +2086,20 @@ For example: "Work" or "Personal" + True + True 2 True + False 6 True + False Default character e_ncoding: True center @@ -2763,6 +2115,8 @@ For example: "Work" or "Personal" + True + True 3 @@ -2772,10 +2126,13 @@ For example: "Work" or "Personal" True True False + False True True + True + True 4 @@ -2785,10 +2142,13 @@ For example: "Work" or "Personal" True True False + False True True + True + True 5 @@ -2796,6 +2156,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -2809,11 +2171,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Delete Mail @@ -2829,15 +2192,17 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 True + False 4 @@ -2845,6 +2210,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2857,6 +2223,7 @@ For example: "Work" or "Personal" True + False model1 @@ -2884,6 +2251,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2897,6 +2265,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -2915,6 +2285,7 @@ For example: "Work" or "Personal" True + False General True center @@ -2926,17 +2297,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 General @@ -2952,11 +2324,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -2964,6 +2337,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -2979,6 +2353,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3007,11 +2382,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Loading Images @@ -3027,11 +2403,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -3039,6 +2416,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3055,6 +2433,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3072,6 +2451,7 @@ For example: "Work" or "Personal" True True False + False True True True @@ -3087,9 +2467,9 @@ For example: "Work" or "Personal" - 1 False False + 1 @@ -3108,6 +2488,7 @@ For example: "Work" or "Personal" True + False HTML Messages True center @@ -3120,12 +2501,13 @@ For example: "Work" or "Personal" True + False 12 - vertical 6 True + False 0 Labels @@ -3141,12 +2523,15 @@ For example: "Work" or "Personal" True + False 12 + True + True 1 @@ -3158,6 +2543,7 @@ For example: "Work" or "Personal" True + False Labels True center @@ -3170,17 +2556,18 @@ For example: "Work" or "Personal" True + False 12 - vertical 12 True - vertical + False 6 True + False 0 Sender Photograph @@ -3196,11 +2583,12 @@ For example: "Work" or "Personal" True + False 12 True - vertical + False 6 @@ -3208,6 +2596,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3223,6 +2612,7 @@ For example: "Work" or "Personal" True True False + False True True @@ -3251,11 +2641,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Displayed Message Headers True @@ -3273,21 +2664,23 @@ For example: "Work" or "Personal" True + False 12 True + False 12 True - vertical + False 12 True True - ● + ● False @@ -3299,8 +2692,6 @@ For example: "Work" or "Personal" True True - automatic - automatic in @@ -3312,24 +2703,29 @@ For example: "Work" or "Personal" Mail Headers Table + + + + True + True 1 - 0 True True + 0 True - vertical + False 6 @@ -3338,6 +2734,7 @@ For example: "Work" or "Personal" False True True + False True @@ -3352,6 +2749,7 @@ For example: "Work" or "Personal" True True True + False True @@ -3371,6 +2769,8 @@ For example: "Work" or "Personal" + True + True 1 @@ -3384,11 +2784,12 @@ For example: "Work" or "Personal" True - vertical + False 6 True + False 0 Date/Time Format True @@ -3406,10 +2807,12 @@ For example: "Work" or "Personal" True + False 12 True + False 3 @@ -3424,9 +2827,9 @@ For example: "Work" or "Personal" - 1 False False + 1 @@ -3445,6 +2848,7 @@ For example: "Work" or "Personal" True + False Headers True @@ -3454,236 +2858,272 @@ For example: "Work" or "Personal" - + True - 12 - vertical - 12 + False + 0 + 0 - + True - vertical - 6 + False + 12 + immediate + 12 - + True - 0 - General - - - - - - False - False - 0 - - - - - True - 12 + False + 6 - + True - 9 - 3 + False + 0 + General + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 6 + False + 8 + 3 - + + Check incoming _messages for junk True - _Default junk plugin: + True + False + False True - default_junk_plugin + 0 + True - False - False - 6 - 0 + GTK_FILL + + 4 - + True + False + 4 + + + Delete junk messages on e_xit + True + True + False + False + True + 0 + True + + + False + False + 0 + + + + + True + False + model2 + + + + 0 + + + + + False + False + 1 + + - False - False - 1 + 1 + 2 + GTK_FILL + 4 - - - 7 - 8 - GTK_FILL - - - - - Check incoming _messages for junk - True - True - False - True - True - - - GTK_FILL - - 4 - - - - - True - 3 - + + Check cu_stom headers for junk True - gtk-info + True + False + False + True + 0 + True - False - False - 0 + 2 + 3 + GTK_FILL + + 4 - + True - True + False + 6 + + + True + True + in + + + True + True + + + + + + + + True + True + 0 + + + + + True + False + 6 + start + + + gtk-add + True + True + True + True + False + True + + + False + False + 0 + + + + + gtk-remove + True + True + True + True + False + True + + + False + False + 1 + + + + + False + True + 1 + + - False - False - 1 + 3 + 4 + 22 - - - 8 - 9 - GTK_FILL - 15 - - - - - True - 4 - - Delete junk messages on e_xit + + Do not mar_k messages as junk if sender is in my address book True True False + False True + 0 True - False - False - 0 - - - - - True - model2 - - - - 0 - - - - - False - False - 1 + 4 + 5 + GTK_FILL + + 4 - - - 1 - 2 - GTK_FILL - 4 - - - - - Check cu_stom headers for junk - True - True - False - True - True - - - 2 - 3 - GTK_FILL - - 4 - - - - - True - 6 - + + _Lookup in local address book only True True - automatic - automatic - in - - - True - True - - + False + False + True + 0 + True - 0 + 5 + 6 + GTK_FILL + + 25 - + True - vertical + False 6 - start - - gtk-add + True - True - True - True - True + False + gtk-info False - False + True 0 - - gtk-remove + True - True - True - True - True + False + Option is ignored if a match for custom junk headers is found. False @@ -3693,96 +3133,56 @@ For example: "Work" or "Personal" - False - 1 - - - - - 3 - 4 - 22 - - - - - Do not mar_k messages as junk if sender is in my address book - True - True - False - True - True - - - 4 - 5 - GTK_FILL - - 4 - - - - - _Lookup in local address book only - True - True - False - True - True - - - 5 - 6 - GTK_FILL - - 25 - - - - - True - 6 - - - True - gtk-info - - - False - 0 + 6 + 7 + GTK_FILL - + True - Option is ignored if a match for custom junk headers is found. + False + 12 + 6 + + + + + + + + + + + + + + + - False - False - 1 + 7 + 8 + GTK_FILL - - 6 - 7 - GTK_FILL - + + True + True + 1 + - 1 + False + False + 0 - - False - False - 0 - @@ -3792,6 +3192,7 @@ For example: "Work" or "Personal" True + False Junk True @@ -3801,142 +3202,243 @@ For example: "Work" or "Personal" - + + + + + + + + + + No encryption + never + + + TLS encryption + when-possible + + + SSL encryption + always + + + + True - True + False + 12 + 12 - + True - 12 - vertical + False 6 - + True - vertical - 6 - - - True - 0 - Default Behavior - - - - - - False - False - 0 - - + False + 0 + Special Folders + + + + + + False + False + 0 + + + + + True + False + 0 + 0 + 12 - + True - 12 + False + 5 + 2 + 12 + 6 - + True - vertical - 8 - - - Format messages in _HTML - True - True - False - True - True - - - False - False - 0 - - - - - Automatically insert _emoticon images - True - True - False - True - True - - - False - False - 1 - - - - - Always request rea_d receipt - True - True - False - True - True - - - False - False - 2 - - - - - Encode file names in an Outlook/GMail way - True - True - False - True - True - - - False - False - 3 - - + False + 0 + Drafts _Folder: + True + + + GTK_FILL + + + + + + True + False + 0 + Sent _Messages Folder: + True + + + 1 + 2 + GTK_FILL + + + + + + _Trash Folder: + True + True + False + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + _Junk Folder: + True + True + False + False + True + True + + + 3 + 4 + GTK_FILL + + + + + + True + False + 0 + 0 - + + gtk-revert-to-saved True - 6 - - - True - 1 - C_haracter set: - True - center - - - False - False - 0 - - - - - + True + True + False + True - - 4 - False - False - + + 1 + 2 + 4 + 5 + + + + + True + True + True + False + + + 1 + 2 + + + + + True + True + True + False + + + 1 + 2 + 1 + 2 + + + + + True + True + True + False + + + 1 + 2 + 2 + 3 + + + + + True + True + True + False + + + 1 + 2 + 3 + 4 + + + + - - 1 - False - False - + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Composing Messages + + + + False False @@ -3944,293 +3446,151 @@ For example: "Work" or "Personal" - + True - vertical - 6 - - - True - 0 - Replies and Forwards - - - - - - 0 - False - False - - + False + 12 - + True - 12 + False + 4 + 6 - + True - 6 - 2 - 6 - 6 - - - True - 1 - _Reply style: - True - - - GTK_FILL - - - - - - True - 1 - _Forward style: - True - - - 1 - 2 - GTK_FILL - - - + False + 18 - - Start _typing at the bottom on replying + True True - False - True - True + ● - - 2 - 2 - 3 - - - - - - _Keep signature above the original message on replying - True - True - False - True - True - - - 2 - 3 - 4 - - - - - - Ignore Reply-To: for mailing lists - True - True - False - True - True - - - 2 - 4 - 5 - - + + + 3 + 4 + + + + + Always _blind carbon-copy (bcc) to: + True + True + False + False + True + True + + + 2 + 3 + + + + + True + False + 18 - - Group Reply goes only to mailing list, if possible + True True - False - True - True - - - 2 - 5 - 6 - - - - - - True - 0 - 0 - - - True - model3 - - - - 0 - - - - - - - 1 - 2 - - - - - True - 0 - 0 - - - True - model4 - - - - 0 - - - - + ● - - 1 - 2 - 1 - 2 - + + 1 + 2 + + + + + Alway_s carbon-copy (cc) to: + True + True + False + False + True + True + - - False - False - 1 - - False - False + True + True 1 - - - - True - General - True - center - - False + False + False + 1 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 - - - True - 0 - Sig_natures - True - - - - - - False - False - 0 - - - - - True - 12 - - - - - - 1 - True - True - - + False + 0 + Message Receipts + + + + False + False 0 - True - True - + True - vertical - 6 - - - True - 0 - Preview - - - - - - False - False - 0 - - + False + 12 - + True - 12 + False + 12 - + True - True - automatic - automatic - in - - - + False + S_end message receipts: + True + receipt_policy_dropdown + + + False + False + 0 + + + + + True + False + + True + True + 1 + - - 1 - True - True - @@ -4241,183 +3601,82 @@ For example: "Work" or "Personal" - 1 - - - - - True - Signatures - True - center - - - 1 - False + False + False + 2 + + + True + False + 12 + 12 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 - - - True - 0 - _Languages - True - listSpellCheckLanguage - - - - - - False - False - 0 - - - - - True - 12 - - - True - 2 - 2 - 6 - 6 - - - True - 0 - gtk-dialog-info - - - 1 - 2 - - - - - - - True - 0 - The list of languages here reflects only the languages for which you have a dictionary installed. - True - - - 1 - 2 - 1 - 2 - - - - - - True - True - automatic - automatic - in - - - True - True - False - - - Languages Table - - - - - - - 2 - - - - - - - 1 - True - True - - + False + 0 + Account Information + + + + False + False 0 - True - True - + True - vertical - 6 - - - True - 0 - Options - - - - - - False - False - 0 - - + False + 12 - + True - 12 + False + 6 + 2 - + True - vertical + False 6 - - Check spelling while I _type + True - True - False - True - True + False + 0 + Type the name by which you would like to refer to this account. +For example: "Work" or "Personal" + True False - False + True 0 - + True - 6 + False + 12 - + True - Color for _misspelled words: + False + _Name: True - center - colorButtonSpellCheckColor + right + management_name False @@ -4426,71 +3685,56 @@ For example: "Work" or "Personal" - + True True - True - Pick a color - #000000000000 + ● - False - False + True + True 1 False - False + True 1 - - 1 - False - False - - False - False + True + True 1 - 2 - - - - - True - Spell Checking - True - center - - - 2 - False + False + False + 0 - + True - 12 - vertical - 12 + False + 6 - + True + False 0 - To help avoid email accidents and embarrassments, ask for confirmation before taking the following checkmarked actions: - True + Required Information + + + False @@ -4499,861 +3743,2028 @@ For example: "Work" or "Personal" - + True + False 12 - + True - vertical - 6 + False + 2 + 2 + 12 + 6 - - Sending a message with an _empty subject line + True True - False - True - True + ● + + + + - False - False - 0 + 1 + 2 + 1 + 2 + - - Sending a message with only _Bcc recipients defined + True - True - False - True - True - - - False - False - 1 - - - - - Sending a _private reply to a mailing list message - True - True - False - True - True - - - False - False - 2 - - - - - Sending a reply to a large _number of recipients - True - True - False + False + 0 + Email _Address: True - True + identity_address - False - False - 3 + 1 + 2 + GTK_FILL + - - Allowing a _mailing list to redirect a private reply to the list + True - True - False + False + 0 + Full Nam_e: True - True + identity_full_name - False - False - 4 + GTK_FILL + - - Sending a message with _recipients not entered as mail addresses + True True - False - True - True + ● + + + + - False - False - 5 + 1 + 2 + + True + True 1 - 3 - - - - - True - Confirmations - - - 3 - False + False + False + 1 - - - normal - - + + True - vertical - 12 + False + 6 - + + True + False + 0 + Optional Information + + + + + + False + False + 0 + + + + True - vertical + False + 12 - + True - 12 - vertical - 6 + False + 4 + 2 + 12 + 6 - + + True + False + 0 + Signat_ure: + True + signature_dropdown + + + 3 + 4 + GTK_FILL + + + + + True + False 6 - + True - 0 - gtk-dialog-info - 6 + False + False + False 0 - + + Add Ne_w Signature... True - 0 - The output of this script will be used as your -signature. The name you specify will be used -for display purposes only. - True + True + True + False + True + False False + end 1 - False - False - 0 + 1 + 2 + 3 + 4 + GTK_FILL + GTK_FILL - + True - 2 - 2 - 6 - 6 - - - True - 0 - _Name: - True - center - entry_add_script_name - - - GTK_FILL - - - - - - True - 0 - _Script: - True - center - filechooserbutton_add_script - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - - - - - - True - - - - 1 - 2 - 1 - 2 - GTK_FILL - - - + True + ● + + + + - 1 + 1 + 2 + 2 + 3 + - - - False - False - 0 - - - - - 1 - - - - - True - end - - - True - True - True - False - + True - 0 - 0 - - - True - 2 - - - True - gtk-add - - - False - False - 0 - - - - - True - _Add Signature - True - - - False - False - 1 - - - - + False + 0 + Or_ganization: + True + identity_organization + + 2 + 3 + GTK_FILL + + + + + + True + True + ● + + + + + + + 1 + 2 + 1 + 2 + + + + + + True + False + 0 + Re_ply-To: + True + center + identity_reply_to + + + 1 + 2 + GTK_FILL + + + + + + _Make this my default account + True + True + False + False + True + True + + + 2 + GTK_FILL + GTK_FILL + - - False - False - 0 - - - - - gtk-cancel - True - True - True - False - True - - - False - False - 1 - - False - end - 0 + True + True + 1 + + False + False + 2 + - - button_add_script_add - button_add_script_cancel - - + True - True + False + 12 + 12 - + True - 12 - vertical - 12 + False + 6 - + True - vertical - 6 + False + 0 + General + + + + + + False + False + 0 + + + + + True + False + 12 - + + _Do not sign meeting requests (for Outlook compatibility) True - 0 - Proxy Settings - - - + True + False + False + True + True - - 0 - False - False - + + + True + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + 0 + Pretty Good Privacy (PGP/GPG) + + + + + + False + False + 0 + + + + + True + False + 12 - + True - 12 + False + 6 + 2 - + True - vertical + False 6 - - _Use system defaults + True - True - False - True - True - True + False + 12 + + + True + False + 0 + PGP/GPG _Key ID: + True + pgp_key + + + False + False + 0 + + + + + True + True + ● + + + True + True + 1 + + - 0 False False + 0 - - _Direct connection to the Internet + + True + False + 12 + + + True + False + 0 + Si_gning algorithm: + True + pgp_hash_algo + + + False + False + 0 + + + + + True + False + hash_algo_model + + + + 0 + + + + + False + False + 1 + + + + + True + True + 1 + + + + + Al_ways sign outgoing messages when using this account True True False + False True True - rdoSysSettings - 1 False False + 2 - - _Manual proxy configuration: + + Always encrypt to _myself when sending encrypted messages True True False + False True + True True - rdoSysSettings - 2 False False + 3 - + + Always _trust keys in my keyring when encrypting True - 24 + True + False + False + True + True + + + False + False + 4 + + + + + + + + + True + True + 1 + + + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Secure MIME (S/MIME) + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 7 + 3 + 12 + 6 + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + True + True + ● + + + 1 + 2 + 6 + 7 + + + + + + Also encrypt to sel_f when sending encrypted messages + True + True + False + False + True + True + + + 3 + 5 + 6 + GTK_FILL + + + + + + Encrypt out_going messages (by default) + True + True + False + False + True + True + + + 3 + 4 + 5 + GTK_FILL + + + + + + Digitally sign o_utgoing messages (by default) + True + True + False + False + True + True + + + 3 + GTK_FILL + + + + + + True + False + + + 3 + 3 + 4 + GTK_FILL + GTK_FILL + 6 + + + + + True + False + 0 + Encry_ption certificate: + True + smime_encrypt_key + + + 6 + 7 + GTK_FILL + + + + + + True + False + 0 + Sig_ning certificate: + True + smime_sign_key + + + 1 + 2 + GTK_FILL + + + + + + True + False + 6 + + + True + True + True + False - + True - vertical - 6 + False + 0 + 0 - + True - 4 - 4 - 6 - 6 + False + 2 - + True - 0 - H_TTP Proxy: - True - txtHttpHost + False + gtk-open - GTK_FILL - + False + False + 0 - + True - 0 - _Secure HTTP Proxy: + False + S_elect... True - txtHttpsHost - 1 - 2 - GTK_FILL - + False + False + 1 + + + + + + + False + False + 0 + + + + + True + True + True + False + + + True + False + 0 + 0 + + + True + False + 2 - + True - 0 - No _Proxy for: - True - txtIgnoreHosts + False + gtk-clear - 3 - 4 - GTK_FILL - + False + False + 0 - + True - True - ● + False + Clea_r + True - 1 - 2 - + False + False + 1 + + + + + + + False + False + 1 + + + + + 2 + 3 + 6 + 7 + GTK_FILL + GTK_FILL + + + + + True + False + 0 + Signing _algorithm: + True + smime_hash_algo + + + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + + + True + False + hash_algo_model + + + + 0 + + + + + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + + + True + False + 6 + + + True + True + True + False + + + True + False + 0 + 0 - + True - True - ● + False + 2 + + + True + False + gtk-open + + + False + False + 0 + + + + + True + False + _Select... + True + + + False + False + 1 + + - - 1 - 2 - 1 - 2 - - + + + + + False + False + 0 + + + + + True + True + True + False + + + True + False + 0 + 0 - + True - 0 - Port: - - - 2 - 3 - GTK_FILL - - - - - - True - 0 - Port: - - - 2 - 3 - 1 - 2 - GTK_FILL - - - - - - True - True - ● - adjustment4 - 1 - - - 3 - 4 - - - - - - True - True - ● - adjustment5 - 1 - - - 3 - 4 - 1 - 2 - - - - - - True - True - ● - - - 1 - 4 - 3 - 4 - - - - - - - - - - - - - - - - - - False - False - 0 - - - - - Use Authe_ntication - True - True - False - True - True - - - False - False - 1 - - - - - True - 24 - - - True - 2 - 2 - 6 - 3 - - - True - 0 - Us_ername: - True - txtAuthUser - - - GTK_FILL - - - - - - True - 0 - Pass_word: - True - txtAuthPwd - - - 1 - 2 - GTK_FILL - - - - - - True - True - ● - - - 1 - 2 - GTK_FILL - - - - - True - True - False - ● - - - 1 - 2 - 1 - 2 - GTK_FILL - - + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + Cle_ar + True + + + False + False + 1 + + - - False - False - 2 - + + False + False + 1 + + + + + + + 2 + 3 + 1 + 3 + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 12 + 12 + + + True + False + 2 + 3 + 12 + 6 + + + True + False + 0 + Server _Type: + True + right + source_type_dropdown + + + GTK_FILL + + + + + + True + False + 0 + 0 + Description: + center + + + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + + + 1 + 3 + GTK_FILL + + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Configuration + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 3 + 4 + 12 + 6 + + + True + False + 1 + _Server: + True + source_host + + + GTK_FILL + + + + + + True + False + 1 + _Port: + True + source_port + + + 2 + GTK_FILL + + + + + + True + False + 1 + User _Name: + True + source_user + + + 1 + GTK_FILL + + + + + + True + True + ● + + + 1 + + + + + True + False + True + + + False + + + + + 3 + + + + + + + True + True + ● + + + 1 + 4 + 1 + 2 + + + + + + True + False + 1 + _Path: + True + + + 2 + 3 + GTK_FILL + + + + + + True + False + Mailbox location + + + 1 + 2 + 2 + 3 + + + + + + + + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 6 + + + True + False + 0 + Security + source_auth_dropdown + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + True + False + 12 + + + True + False + _Use Secure Connection: + True + center + source_use_ssl + + + False + False + 0 + + + + + True + False + use_ssl_model + + + + 0 + + + + + False + False + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + True + False + gtk-dialog-warning + + + False + False + 0 + + + + + True + False + 0 + SSL is not supported in this build of Evolution + center + + + + + + False + False + 1 + + + + + True + True + 1 + + + + + + + True + True + 1 + + + + + False + False + 3 + + + + + True + False + 6 + + + True + False + 0 + _Authentication Type + True + source_auth_dropdown + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 6 + + + True + False + 6 + + + True + False + + + False + False + 0 + + + + + Ch_eck for Supported Types + True + True + True + False + True + + + False + False + 1 + + + + + True + True + 0 + + + + + Re_member password + True + True + False + False + True + True + + + False + False + 1 + + + + + + + True + True + 1 + + + + + False + False + 4 + + + + + True + False + 12 + 12 + + + True + False + 2 + 3 + 12 + 6 + + + True + False + 0 + 0 + Server _Type: + True + right + transport_type_dropdown + + + GTK_FILL + + + + + + True + False + 0 + 0 + Description: + right + + + 1 + 2 + GTK_FILL + + + + + True + False + + + 1 + 3 + GTK_FILL + + + + + + True + False + 0 + 0 + description + True + + + 1 + 3 + 1 + 2 + GTK_FILL + + + + + + False + False + 0 + + + + + True + False + + + False + False + 1 + + + + + True + False + 6 + + + True + False + 0 + Server Configuration + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 4 + 12 + 6 + + + True + False + 1 + _Server: + True + transport_host + + + GTK_FILL + + + + + + True + False + _Port: + True + right + transport_port + + + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + + + + + + True + False + True + + + False + + + + + 3 + + + + + + + Ser_ver requires authentication + True + True + False + False + True + True + + + 1 + 2 + 1 + 2 + + + + + + + + + + + + + + + + True + True + 1 + + + + + False + False + 2 + + + + + True + False + 6 + + + True + False + 0 + Security + + + + + + False + False + 0 + + + + + True + False + 12 + + + True + False + 2 + 6 + + + True + False + 6 + + + True + False + gtk-dialog-warning + + + False + False + 0 + + + + + True + False + 0 + SSL is not supported in this build of Evolution + center + + + + + + False + False + 1 + + + + + 1 + 2 + + + + + True + False + 12 + + + True + False + _Use Secure Connection: + True + center + transport_use_ssl + + + False + False + 0 + + + + + True + False + use_ssl_model + + + + 0 + False False - 3 + 1 - - False - False - 1 - - - - - False - False - 0 - - - - - True - - + True + True 1 - - - - True - General - - False + False + False + 3 - - - dialog - Set custom junk header - 12 - 400 - FALSE - - + + True - vertical - 12 - 12 + False + 6 - + True - True - All new emails with header that matches given content will be automatically filtered as junk + False + 0 + Authentication + + + + + False + False + 0 + - - - True - 2 - 2 - 12 - 6 - - - True - Header name - junk-header-name - 0 - - - GTK_SHRINK - - - - - True - Header content - junk-header-content - 0 - - - 1 - 2 - GTK_SHRINK - - - - - True - True - - - 1 - 2 - - - - - True - True - - - 1 - 2> - 1 - 2 - - - - - - + + True - end - - - gtk-cancel - True - True - True - True - - - False - False - 0 - - + False + 12 - - gtk-ok + True - True - True - True + False + 3 + 2 + 12 + 6 + + + True + False + 1 + T_ype: + True + center + transport_auth_dropdown + + + GTK_FILL + + + + + + True + False + 1 + User _Name: + True + right + transport_user + + + 1 + 2 + GTK_FILL + + + + + + True + True + ● + + + 1 + 2 + 1 + 2 + + + + + + Remember _password + True + True + False + False + True + True + + + 1 + 2 + 2 + 3 + + + + + True + False + 0 + 0 + + + True + False + 6 + + + True + False + + + False + False + 0 + + + + + Ch_eck for Supported Types + True + True + True + False + True + + + False + False + 1 + + + + + + + 1 + 2 + + + + + - - False - False - 1 - - False - end - 0 + True + True + 1 + + False + False + 4 + - - junk-header-cancel - junk-header-ok - + + + + + + @@ -5362,10 +5773,4 @@ for display purposes only. - - - - - - -- cgit v1.2.3 From 22cd7a52392f144e2bd90a2d72eecebebdb34bb1 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Thu, 28 Jul 2011 13:02:59 +0200 Subject: Use the same term 'Secure connection' everywhere instead of SSL --- mail/mail-config.ui | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 213f397660..4a7515d349 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -5047,7 +5047,7 @@ For example: "Work" or "Personal" True False - _Use Secure Connection: + _Use secure connection: True center source_use_ssl @@ -5551,7 +5551,7 @@ For example: "Work" or "Personal" True False - _Use Secure Connection: + _Use secure connection: True center transport_use_ssl -- cgit v1.2.3 From db2dbe5ecbe4791dc01acec818f79e8d869db3e5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 3 Aug 2011 21:13:49 -0500 Subject: EMAccountEditor: Utilize CamelSettings. Simplifies the code overall, since now we can bind widget properties to settings properties and omit a bunch of callback functions. Plus now we can initialize the settings widgets with proper defaults according to the property specifications of CamelSettings classes. --- mail/mail-config.ui | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 4a7515d349..2f50f30cf2 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -3212,15 +3212,15 @@ for display purposes only. No encryption - never + none TLS encryption - when-possible + starttls-on-standard-port SSL encryption - always + ssl-on-alternate-port @@ -5063,6 +5063,7 @@ For example: "Work" or "Personal" True False use_ssl_model + 1 @@ -5567,6 +5568,7 @@ For example: "Work" or "Personal" True False use_ssl_model + 1 -- cgit v1.2.3 From b3b0cf89b137018c50b42d4162c7a3dab195d626 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2011 20:42:21 +0200 Subject: Bug #655254 - Cropped Junk settings text --- mail/mail-config.ui | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 2f50f30cf2..49eda714c5 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -2868,7 +2868,6 @@ for display purposes only. True False 12 - immediate 12 @@ -2900,7 +2899,7 @@ for display purposes only. True False - 8 + 7 3 -- cgit v1.2.3 From 725abeddcdf732123b357dcb8b4e26b5116375d8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 18 Aug 2011 18:23:16 +0200 Subject: Bug #656733 - GUI no longer allows for non-default ports for email --- mail/mail-config.ui | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 49eda714c5..2831747252 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -4928,11 +4928,6 @@ For example: "Work" or "Personal" True False True - - - False - - 3 @@ -5416,11 +5411,6 @@ For example: "Work" or "Personal" True False True - - - False - - 3 -- cgit v1.2.3 From 0c871a69a5babbdd092f56614fa53fc70636f2aa Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 25 Aug 2011 18:49:13 +0200 Subject: Bug #655629 - "Path:" label for spool file should be "File:" label --- mail/mail-config.ui | 1 + 1 file changed, 1 insertion(+) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 2831747252..d6fa441b74 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -4956,6 +4956,7 @@ For example: "Work" or "Personal" 1 _Path: True + source_path_entry 2 -- cgit v1.2.3 From d69aec8e0d39fae242e5c4de5a4bb8f4fdae7304 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 26 Aug 2011 16:38:12 +0200 Subject: Stick Account Editor widgets at the top, like it used to before gtk3 --- mail/mail-config.ui | 113 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 72 insertions(+), 41 deletions(-) (limited to 'mail/mail-config.ui') diff --git a/mail/mail-config.ui b/mail/mail-config.ui index d6fa441b74..5d934aafa2 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -3348,6 +3348,7 @@ for display purposes only. 2 4 5 + @@ -3360,6 +3361,7 @@ for display purposes only. 1 2 + @@ -3374,6 +3376,7 @@ for display purposes only. 2 1 2 + @@ -3388,6 +3391,7 @@ for display purposes only. 2 2 3 + @@ -3402,6 +3406,7 @@ for display purposes only. 2 3 4 + @@ -3411,8 +3416,8 @@ for display purposes only. - True - True + False + False 1 @@ -3471,6 +3476,7 @@ for display purposes only. 3 4 + @@ -3486,6 +3492,7 @@ for display purposes only. 2 3 + @@ -3504,6 +3511,7 @@ for display purposes only. 1 2 + @@ -3516,13 +3524,16 @@ for display purposes only. True True + + + - True - True + False + False 1 @@ -3593,8 +3604,8 @@ for display purposes only. - True - True + False + False 1 @@ -3659,7 +3670,7 @@ For example: "Work" or "Personal" False - True + False 0 @@ -3698,18 +3709,25 @@ For example: "Work" or "Personal" False - True + False 1 + + 0 + 1 + 0 + 1 + + - True - True + False + False 1 @@ -3822,8 +3840,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -4016,8 +4034,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -4073,8 +4091,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -4201,8 +4219,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -4256,13 +4274,16 @@ For example: "Work" or "Personal" + + + - True - True + False + False 1 @@ -4397,7 +4418,7 @@ For example: "Work" or "Personal" 3 4 GTK_FILL - GTK_FILL + 6 @@ -4551,7 +4572,7 @@ For example: "Work" or "Personal" 6 7 GTK_FILL - GTK_FILL + @@ -4723,15 +4744,16 @@ For example: "Work" or "Personal" 2 3 1 - 3 + 2 + - True - True + False + False 1 @@ -4921,6 +4943,7 @@ For example: "Work" or "Personal" 1 + @@ -4989,8 +5012,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -5115,8 +5138,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -5124,8 +5147,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -5202,8 +5225,8 @@ For example: "Work" or "Personal" - True - True + False + False 0 @@ -5227,8 +5250,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -5282,6 +5305,7 @@ For example: "Work" or "Personal" 1 2 GTK_FILL + @@ -5434,6 +5458,7 @@ For example: "Work" or "Personal" 2 1 2 + @@ -5449,8 +5474,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 @@ -5531,6 +5556,7 @@ For example: "Work" or "Personal" 1 2 + @@ -5573,13 +5599,16 @@ For example: "Work" or "Personal" + + + - True - True + False + False 1 @@ -5685,6 +5714,7 @@ For example: "Work" or "Personal" 2 2 3 + @@ -5730,6 +5760,7 @@ For example: "Work" or "Personal" 1 2 + @@ -5739,8 +5770,8 @@ For example: "Work" or "Personal" - True - True + False + False 1 -- cgit v1.2.3