diff --git a/mail/mail-config.glade b/mail/mail-config.glade
index 4ed99225e4..886ba1c6b9 100644
--- a/mail/mail-config.glade
+++ b/mail/mail-config.glade
@@ -1362,6 +1362,1299 @@ Click "Finish" to save your settings.
+
+ GnomeDialog
+ mail-account-editor
+ False
+ Account Properties
+ GTK_WINDOW_TOPLEVEL
+ GTK_WIN_POS_CENTER
+ True
+ False
+ True
+ True
+ False
+ False
+
+
+ GtkVBox
+ GnomeDialog:vbox
+ dialog-vbox3
+ False
+ 8
+
+ 4
+ True
+ True
+
+
+
+ GtkHButtonBox
+ GnomeDialog:action_area
+ dialog-action_area3
+ GTK_BUTTONBOX_END
+ 8
+ 85
+ 27
+ 7
+ 0
+
+ 0
+ False
+ True
+ GTK_PACK_END
+
+
+
+ GtkButton
+ cmdOK
+ True
+ True
+ GNOME_STOCK_BUTTON_OK
+
+
+
+ GtkButton
+ cmdApply
+ True
+ True
+ GNOME_STOCK_BUTTON_APPLY
+
+
+
+ GtkButton
+ cmdCancel
+ True
+ True
+ GNOME_STOCK_BUTTON_CANCEL
+
+
+
+
+ GtkNotebook
+ toplevel
+ True
+ True
+ True
+ GTK_POS_TOP
+ False
+ 2
+ 2
+ False
+
+ 0
+ True
+ True
+
+
+
+ GtkVBox
+ vbox32
+ 5
+ False
+ 0
+
+
+ GtkVBox
+ vbox33
+ False
+ 0
+
+ 0
+ False
+ False
+
+
+
+ GtkHBox
+ hbox26
+ False
+ 0
+
+ 5
+ True
+ True
+
+
+
+ GtkLabel
+ lblMailAccount
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 10
+ False
+ False
+
+
+
+
+ GtkHSeparator
+ hseparator
+
+ 10
+ True
+ True
+
+
+
+
+
+ GtkLabel
+ lblDirections
+
+ GTK_JUSTIFY_LEFT
+ True
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 0
+ False
+ False
+
+
+
+
+ GtkEntry
+ txtAccountName
+ True
+ True
+ True
+ 0
+
+
+ 5
+ False
+ False
+
+
+
+
+
+ GtkTable
+ tableUserInfo
+ 6
+ 10
+ True
+ 4
+ 0
+
+ 0
+ False
+ True
+
+
+
+ GtkHBox
+ hbox35
+ False
+ 0
+
+ 0
+ 10
+ 0
+ 1
+ 0
+ 0
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkLabel
+ lblUserInfo
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 10
+ False
+ False
+
+
+
+
+ GtkHSeparator
+ hseparator8
+
+ 10
+ True
+ True
+
+
+
+
+
+ GtkEntry
+ txtName
+ True
+ True
+ True
+ 0
+
+
+ 4
+ 10
+ 1
+ 2
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtAddress
+ True
+ True
+ True
+ 0
+
+
+ 4
+ 10
+ 2
+ 3
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtReplyTo
+ True
+ True
+ True
+ 0
+
+
+ 4
+ 10
+ 3
+ 4
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtOrganization
+ True
+ True
+ True
+ 0
+
+
+ 4
+ 10
+ 4
+ 5
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GnomeFileEntry
+ fileSignature
+ 10
+ Select signature file
+ False
+ True
+
+ 4
+ 10
+ 5
+ 6
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+ GtkEntry
+ GnomeEntry:entry
+ txtSignature
+ True
+ True
+ True
+ 0
+
+
+
+
+
+ GtkLabel
+ lblName
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblEMail
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblReplyTo
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblOrganization
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblSignature
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 5
+ 6
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+
+
+ GtkLabel
+ Notebook:tab
+ lblGeneral
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+ GtkVBox
+ vbox34
+ 5
+ False
+ 0
+
+
+ GtkTable
+ tableIncomingServer
+ 8
+ 10
+ True
+ 0
+ 0
+
+ 0
+ False
+ False
+
+
+
+ GtkHBox
+ hbox31
+ False
+ 0
+
+ 0
+ 10
+ 0
+ 1
+ 0
+ 0
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkLabel
+ lblIncomingMailServer
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 10
+ False
+ False
+
+
+
+
+ GtkHSeparator
+ hseparator4
+
+ 10
+ True
+ True
+
+
+
+
+
+ GtkCheckButton
+ chkSavePasswd
+ True
+
+ False
+ True
+
+ 4
+ 10
+ 5
+ 6
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkOptionMenu
+ omenuSourceAuth
+ True
+ Plain Text
+Kerberos
+CRAM-MD5
+DIGEST-MD5
+
+ 0
+
+ 4
+ 10
+ 6
+ 7
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtSourceHost
+ True
+ True
+ True
+ 0
+
+
+ 3
+ 10
+ 2
+ 3
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtSourceUser
+ True
+ True
+ True
+ 0
+
+
+ 3
+ 10
+ 3
+ 4
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtSourcePasswd
+ True
+ True
+ False
+ 0
+
+
+ 3
+ 10
+ 4
+ 5
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkCheckButton
+ chkSourceSSL
+ False
+ True
+
+ False
+ True
+
+ 1
+ 10
+ 7
+ 8
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblSourceUser
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblSourcePasswd
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblSourceAuth
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 6
+ 7
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblSourceHost
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblIncomingServerType
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkEntry
+ txtSourceType
+ False
+ True
+ False
+ True
+ 0
+
+
+ 3
+ 10
+ 1
+ 2
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+
+ GtkTable
+ tableOutgoingServer
+ 5
+ 10
+ True
+ 0
+ 0
+
+ 0
+ False
+ False
+
+
+
+ GtkHBox
+ hbox32
+ False
+ 0
+
+ 0
+ 10
+ 0
+ 1
+ 0
+ 0
+ True
+ True
+ False
+ False
+ True
+ True
+
+
+
+ GtkLabel
+ lblOutgoingMailServer
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 10
+ False
+ False
+
+
+
+
+ GtkHSeparator
+ hseparator5
+
+ 10
+ True
+ True
+
+
+
+
+
+ GtkOptionMenu
+ omenuTransportAuth
+ True
+ None
+CRAM-MD5
+
+ 0
+
+ 4
+ 10
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkEntry
+ txtTransportHost
+ True
+ True
+ True
+ 0
+
+
+ 3
+ 10
+ 2
+ 3
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkOptionMenu
+ omenuTransportType
+ True
+ Sendmail
+SMTP
+
+ 0
+
+ 3
+ 10
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkCheckButton
+ chkTransportSSL
+ False
+ True
+
+ False
+ True
+
+ 1
+ 10
+ 4
+ 5
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblOutgoingServerType
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblTransportHost
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+ GtkLabel
+ lblTransportAuth
+
+ GTK_JUSTIFY_LEFT
+ False
+ 0
+ 0.5
+ 0
+ 0
+
+ 1
+ 4
+ 3
+ 4
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+
+
+ GtkLabel
+ Notebook:tab
+ lblServers
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+ GtkVBox
+ vbox36
+ 5
+ False
+ 0
+
+
+ GtkTable
+ tableServerTimeouts
+ 3
+ 10
+ True
+ 0
+ 0
+
+ 0
+ False
+ True
+
+
+
+ GtkHBox
+ hbox34
+ False
+ 0
+
+ 0
+ 10
+ 0
+ 1
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ True
+
+
+
+ GtkLabel
+ lblMisc
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+ 10
+ False
+ False
+
+
+
+
+ GtkHSeparator
+ hseparator7
+
+ 10
+ True
+ True
+
+
+
+
+
+ GtkEntry
+ txtSourcePath
+ True
+ True
+ True
+ 0
+
+
+ 3
+ 10
+ 1
+ 2
+ 0
+ 0
+ True
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkLabel
+ lblSourcePath
+
+ GTK_JUSTIFY_LEFT
+ False
+ 7.45058e-09
+ 0.5
+ 0
+ 0
+
+ 1
+ 3
+ 1
+ 2
+ 0
+ 0
+ False
+ False
+ False
+ False
+ True
+ False
+
+
+
+
+ GtkCheckButton
+ chkKeepMailOnServer
+ True
+
+ True
+ True
+
+ 1
+ 10
+ 2
+ 3
+ 0
+ 0
+ False
+ False
+ False
+ False
+ False
+ False
+
+
+
+
+
+
+ GtkLabel
+ Notebook:tab
+ lblAdvanced
+
+ GTK_JUSTIFY_CENTER
+ False
+ 0.5
+ 0.5
+ 0
+ 0
+
+
+
+
+
GnomeDialog
mail-accounts-dialog
@@ -1661,1108 +2954,4 @@ Click "Finish" to save your settings.
-
- GnomeDialog
- mail-account-editor
- False
- Edit Mail Configuration Settings
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- False
- True
- False
- False
- False
-
-
- GtkVBox
- GnomeDialog:vbox
- dialog-vbox1
- False
- 8
-
- 4
- True
- True
-
-
-
- GtkHButtonBox
- GnomeDialog:action_area
- dialog-action_area1
- GTK_BUTTONBOX_END
- 8
- 85
- 27
- 7
- 0
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
- GtkButton
- button3
- True
- True
- GNOME_STOCK_BUTTON_OK
-
-
-
- GtkButton
- button4
- True
- True
- GNOME_STOCK_BUTTON_APPLY
-
-
-
- GtkButton
- button5
- True
- True
- GNOME_STOCK_BUTTON_CANCEL
-
-
-
-
- GtkVBox
- toplevel
- True
- 0
-
- 0
- False
- True
-
-
-
- GtkFrame
- identity-frame
- 3
-
- 0
- GTK_SHADOW_ETCHED_IN
-
- 0
- True
- True
-
-
-
- GtkVBox
- vbox28
- False
- 2
-
-
- GtkTable
- table14
- 4
- 2
- 2
- False
- 4
- 4
-
- 0
- True
- True
-
-
-
- GtkEntry
- txtName
- 80
- 20
- True
- True
- True
- True
- 50
-
-
- 1
- 2
- 0
- 1
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtAddress
- True
- True
- True
- 50
-
-
- 1
- 2
- 1
- 2
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- full-name-label
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- email-address-label
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 1
- 2
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
-
- GtkHButtonBox
- hbuttonbox6
- GTK_BUTTONBOX_END
- 30
- 85
- 27
- 7
- 0
-
- 0
- True
- True
-
-
-
- GtkButton
- add-fields-button
- True
- True
-
-
-
-
-
-
-
- GtkFrame
- receiving-frame
- 3
-
- 0
- GTK_SHADOW_ETCHED_IN
-
- 0
- True
- True
-
-
-
- GtkVBox
- vbox26
- False
- 0
-
-
- GtkTable
- table12
- 4
- 6
- 2
- False
- 4
- 4
-
- 4
- False
- True
-
-
-
- GtkLabel
- lblSourceType
-
- GTK_JUSTIFY_LEFT
- False
- 7.45058e-09
- 0.5
- 0
- 0
-
- 1
- 2
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtSourcePath
- True
- True
- True
- 0
-
-
- 1
- 2
- 4
- 5
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtSourcePasswd
- True
- True
- True
- 0
-
-
- 1
- 2
- 3
- 4
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtSourceUser
- True
- True
- True
- 0
-
-
- 1
- 2
- 2
- 3
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtSourceHost
- True
- True
- True
- 0
-
-
- 1
- 2
- 1
- 2
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- type-label
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblSourceHost
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 1
- 2
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblSourceUser
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 2
- 3
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblSourcePath
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 4
- 5
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblSourceAuth
-
- GTK_JUSTIFY_CENTER
- False
- 0.5
- 0.5
- 0
- 0
-
- 0
- 1
- 5
- 6
- 0
- 0
- False
- False
- False
- False
- False
- False
-
-
-
-
- GtkLabel
- lblSourcePasswd
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 3
- 4
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkOptionMenu
- omenuSourceAuth
- True
- Kerberos
-Plain-text Password
-
- 0
-
- 1
- 2
- 5
- 6
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
-
- GtkHBox
- hbox21
- False
- 0
-
- 0
- False
- True
-
-
-
- GtkCheckButton
- chkKeepMailOnServer
- 3
- True
-
- False
- True
-
- 2
- False
- True
-
-
-
-
- GtkHButtonBox
- hbuttonbox4
- GTK_BUTTONBOX_END
- 30
- 85
- 27
- 7
- 0
-
- 0
- True
- True
-
-
-
-
-
-
-
- GtkFrame
- sending-frame
- 3
-
- 0
- GTK_SHADOW_ETCHED_IN
-
- 0
- True
- True
-
-
-
- GtkVBox
- vbox27
- False
- 0
-
-
- GtkTable
- table13
- 4
- 3
- 2
- False
- 4
- 4
-
- 4
- False
- True
-
-
-
- GtkLabel
- lblTransportHost
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 1
- 2
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtTransportHost
- True
- True
- True
- 0
-
-
- 1
- 2
- 1
- 2
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- label100
-
- GTK_JUSTIFY_RIGHT
- False
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblTransportType
-
- GTK_JUSTIFY_LEFT
- False
- 0
- 0.5
- 0
- 0
-
- 1
- 2
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkLabel
- lblTransportAuth
-
- GTK_JUSTIFY_CENTER
- False
- 0.5
- 0.5
- 0
- 0
-
- 0
- 1
- 2
- 3
- 0
- 0
- False
- False
- False
- False
- False
- False
-
-
-
-
- GtkOptionMenu
- omenuTransportAuth
- True
- Kerberos
-Plain-text Password
-
- 0
-
- 1
- 2
- 2
- 3
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
-
- GtkHBox
- hbox22
- False
- 0
-
- 0
- False
- True
-
-
-
- GtkHButtonBox
- hbuttonbox5
- GTK_BUTTONBOX_END
- 30
- 85
- 27
- 7
- 0
-
- 0
- True
- True
-
-
-
-
-
-
-
-
-
-
- GnomeDialog
- optional-identity-info
- Additional Identity Fields
- GTK_WINDOW_TOPLEVEL
- GTK_WIN_POS_NONE
- False
- False
- False
- False
- False
- False
-
-
- GtkVBox
- GnomeDialog:vbox
- dialog-vbox3
- False
- 8
-
- 4
- True
- True
-
-
-
- GtkHButtonBox
- GnomeDialog:action_area
- dialog-action_area3
- GTK_BUTTONBOX_END
- 8
- 85
- 27
- 7
- 0
-
- 0
- False
- True
- GTK_PACK_END
-
-
-
- GtkButton
- button21
- True
- True
- GNOME_STOCK_BUTTON_OK
-
-
-
- GtkButton
- button23
- True
- True
- GNOME_STOCK_BUTTON_CANCEL
-
-
-
-
- GtkFrame
- frame19
- 3
- 102
-
- 0
- GTK_SHADOW_ETCHED_IN
-
- 3
- True
- True
-
-
-
- GtkTable
- table15
- 4
- 3
- 2
- False
- 4
- 4
-
-
- GtkLabel
- label106
-
- GTK_JUSTIFY_CENTER
- False
- 0.5
- 0.5
- 0
- 0
-
- 0
- 1
- 1
- 2
- 0
- 0
- False
- False
- False
- False
- False
- False
-
-
-
-
- GtkLabel
- label107
-
- GTK_JUSTIFY_CENTER
- False
- 0.5
- 0.5
- 0
- 0
-
- 0
- 1
- 2
- 3
- 0
- 0
- False
- False
- False
- False
- False
- False
-
-
-
-
- GtkEntry
- txtOrganization
- True
- True
- True
- 0
-
-
- 1
- 2
- 1
- 2
- 0
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
- GtkHBox
- hbox23
- False
- 4
-
- 1
- 2
- 2
- 3
- 0
- 0
- False
- False
- False
- False
- True
- True
-
-
-
- GnomeFileEntry
- fileSignature
- 10
- Select your signature file
- False
- True
-
- 0
- False
- False
-
-
-
- GtkEntry
- GnomeEntry:entry
- txtSignature
- True
- True
- True
- 0
-
-
-
-
-
-
- GtkLabel
- label108
-
- GTK_JUSTIFY_RIGHT
- True
- 1
- 0.5
- 0
- 0
-
- 0
- 1
- 0
- 1
- 0
- 0
- False
- False
- False
- False
- True
- False
-
-
-
-
- GtkEntry
- txtReplyTo
- True
- True
- True
- 0
-
-
- 1
- 2
- 0
- 1
- 1
- 0
- True
- False
- False
- False
- True
- False
-
-
-
-
-
-
-
diff --git a/mail/mail-config.glade.h b/mail/mail-config.glade.h
index 55de5a085d..d73107a150 100644
--- a/mail/mail-config.glade.h
+++ b/mail/mail-config.glade.h
@@ -44,6 +44,46 @@ gchar *s = N_("Congratulations, your mail configuration is complete.\n"
"using Evolution. \n"
"\n"
"Click \"Finish\" to save your settings.");
+gchar *s = N_("Account Properties");
+gchar *s = N_("Mail Account");
+gchar *s = N_("Type the name by which you would like to refer to these servers. For example: \"Work\" or \"Home\".");
+gchar *s = N_("User Information");
+gchar *s = N_("Select signature file");
+gchar *s = N_("Name:");
+gchar *s = N_("E-Mail Address:");
+gchar *s = N_("Reply-To:");
+gchar *s = N_("Organization:");
+gchar *s = N_("Signature:");
+gchar *s = N_("General");
+gchar *s = N_("Incoming Mail Server");
+gchar *s = N_("Save password");
+gchar *s = N_("Plain Text\n"
+ "Kerberos\n"
+ "CRAM-MD5\n"
+ "DIGEST-MD5\n"
+ "");
+gchar *s = N_("This server requires a secure connection (SSL)");
+gchar *s = N_("Username:");
+gchar *s = N_("Password:");
+gchar *s = N_("Authentication:");
+gchar *s = N_("Hostname:");
+gchar *s = N_("Type:");
+gchar *s = N_("Outgoing Mail Server");
+gchar *s = N_("None\n"
+ "CRAM-MD5\n"
+ "");
+gchar *s = N_("Sendmail\n"
+ "SMTP\n"
+ "");
+gchar *s = N_("This server requires a secure connection (SSL)");
+gchar *s = N_("Type:");
+gchar *s = N_("Hostname:");
+gchar *s = N_("Authentication:");
+gchar *s = N_("Servers");
+gchar *s = N_("Miscellaneous");
+gchar *s = N_("Path:");
+gchar *s = N_("Keep mail on server");
+gchar *s = N_("Advanced");
gchar *s = N_("Evolution Mail Configuration");
gchar *s = N_("Account");
gchar *s = N_("Type");
@@ -57,34 +97,3 @@ gchar *s = N_("Add");
gchar *s = N_("Edit");
gchar *s = N_("Delete");
gchar *s = N_("News");
-gchar *s = N_("Edit Mail Configuration Settings");
-gchar *s = N_("Identity");
-gchar *s = N_("Full Name:");
-gchar *s = N_("Email Address:");
-gchar *s = N_("Add Optional Fields...");
-gchar *s = N_("Receiving Mail");
-gchar *s = N_("IMAP");
-gchar *s = N_("Type:");
-gchar *s = N_("Server:");
-gchar *s = N_("Username:");
-gchar *s = N_("Path:");
-gchar *s = N_("Authentication:");
-gchar *s = N_("Password:");
-gchar *s = N_("Kerberos \n"
- "Plain-text Password\n"
- "");
-gchar *s = N_("Don't delete messages from server");
-gchar *s = N_("Sending Mail");
-gchar *s = N_("Server:");
-gchar *s = N_("Type:");
-gchar *s = N_("SMTP");
-gchar *s = N_("Authentication:");
-gchar *s = N_("Kerberos \n"
- "Plain-text Password\n"
- "");
-gchar *s = N_("Additional Identity Fields");
-gchar *s = N_("Optional Information");
-gchar *s = N_("Organization:");
-gchar *s = N_("Signature file:");
-gchar *s = N_("Select your signature file");
-gchar *s = N_("Reply-to:");