sync 099claws

diff --git a/ChangeLog b/ChangeLog
index 869ec1cbe5a52e3a80d1b10498c4eb20f7735cc5..1e9d727cd53e272aeed4884972fabcfe6aa340f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,114 @@
+2004-01-29
+
+       * version 0.9.9
+
+2004-01-29
+
+       * src/folder.c: folder_item_fetch_all_msg()
+         src/folderview.c: folderview_download_cb(): show progress with
+         the progressbar.
+       * src/mainwindow.[ch]: added new functions for progressbar.
+
+2004-01-29
+
+       * src/summaryview.c: summary_key_pressed(): GDK_Left should only
+         switch to folderview when summaryview hscrollbar is at the leftmost
+         position (thanks to Alfons).
+
+2004-01-29
+
+       * src/codeconv.c: conv_euctojis(): made JIS X 0201 Kana conversion
+         configurable.
+       * src/prefs_common.[ch]: added PrefsCommon::allow_jisx0201_kana
+         (hidden setting).
+
+2004-01-28
+
+       * src/codeconv.c: conv_euctojis(): force JIS X 0201 Kana to JIS X 0208
+         conversion.
+
+2004-01-28
+
+       * src/imap.c: imap_get_msginfo(): fixed wrong counting.
+
+2004-01-28
+
+       * src/base64.c
+         src/codeconv.c
+         src/compose.c
+         src/html.c
+         src/imap.c
+         src/pop.c
+         src/prefs_account.c
+         src/procmime.c
+         src/procmsg.c
+         src/quote_fmt_parse.y
+         src/quoted-printable.c
+         src/textview.c
+         src/unmime.c
+         src/utils.c
+         src/utils.h
+         src/xml.c: fixed wrong type of argument for ctype functions (char
+         had been passed instead of unsigned char).
+
+
+2004-01-27
+
+       * src/mainwindow.[ch]: added MainWindow::messageview_cid.
+         Clear messageview when it is hidden.
+       * src/textview.c: show URL to the statusbar when its link is clicked.
+         textview_uri_security_check(): compare real URL and apparent one
+         and show warning if it seems to be a fake URL.
+       * src/utils.[ch]:
+         is_uri_string(): return TRUE if the string seems like a URL.
+         get_uri_path(): return URL except for its scheme part.
+
+2004-01-23
+
+       * src/folder.[ch]: folder_item_fetch_all_msg(): new. It fetches all
+         messages in a folder.
+       * src/folderview.c: implemented 'Download' feature.
+
+2004-01-23
+
+       * src/gtkutils.[ch]: implemented ComboButton which adds an arrow
+         menu button to a button.
+       * src/mainwindow.[ch]: main_window_toolbar_create(): added combo
+         button to reply and forward button.
+
+2004-01-22
+
+       * src/mainwindow.c: fixed automatic expansion of window size because
+         of toolbar.
+
+2004-01-21
+
+       * src/addr_compl.[ch]
+         src/gtkshruler.[ch]: changed the copyright notice.
+
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): also break between mutlibyte
+         and single-byte characters.
+
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): break lines between multibyte
+         characters on word wrap mode.
+
+2004-01-05
+
+       * src/codeconv.c: conv_iconv_strdup(): fixed crashes on LP64
+         environments (thanks to James Noyes).
+       * src/compose.c: compose_select_account(): don't turn off the sign/
+         encrypt option automatically.
+
+2003-12-17
+
+       * src/inc.[ch]: made inc_account_mail() public.
+       * src/mainwindow.c: moved receive menus into submenu, and added
+         dynamic menus for receiving from each account.
+

 2003-12-15
 
        * version 0.9.8a
 2003-12-15
 
        * version 0.9.8a

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b8a52725972b741efb86e8afe70d8aa514aac7ca..4c25467ec590ace5b47b3f98c4f1ff6239ee3487 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,518 @@
+2004-02-06 [paul]      0.9.9claws
+
+       0.9.9claws released
+
+2004-02-06 [darko]     0.9.8claws64
+
+       * src/compose.c
+               don't allow Ctrl+Enter while external editor is active
+
+2004-02-06 [paul]      0.9.8claws63
+
+       * po/es.po
+         po/pl.po
+         po/sk.po
+         po/sr.po
+               update Spanish, Polish, Slovak, and Serbian translations.
+               submitted by Ricardo Mones Lastra, Emil Nowak, Andrej Kacian,
+               and Urke MMI
+
+2004-02-04 [alfons]    0.9.8claws62
+
+       * src/compose.c
+               grab focus only when lbutton was pressed (bug #430 cont'd; 
+               don't have clue yet why the cursor pos is at the end of the
+               text.)
+
+2004-02-04 [alfons]    0.9.8claws61
+
+       * src/compose.c
+               always grab focus when one of the header entries is clicked 
+               (should fix bug #430, "no focus on pasted addresses 3 & higher")
+
+2004-02-02 [paul]
+
+       * ac/missing/gdk-pixbuf.m4
+         ac/missing/gpgme.m4
+         ac/missing/imlib.m4
+               prevent 'underquoted definition' warnings
+               patch submitted by David Relson
+               
+       * src/plugins/clamav/README
+               update, improve, correct
+
+2004-01-31 [thorsten]  0.9.8claws60
+
+       * src/news.c
+               'dir' not initialized if group has no messages
+
+2004-01-29 [christoph] 0.9.8claws59
+
+       * src/customheader.[ch]
+               add custom_header_is_allowed() to check for disallowed header names
+               that must not be overridden by custom headers
+
+       * src/compose.c
+               always write From: header and use custom_header_is_allowed() to
+               check if custom header should be written
+
+       * src/prefs_customheader.c
+               check if custom header is disallowed using custom_header_is_allowed()
+
+       * src/folderutils.c
+               destroy message id GHashTable before freeing the MsgInfos
+
+2004-01-29 [paul]      0.9.8claws58
+
+       * sync with 0.9.9 release
+               see ChangeLog 2004-01-29
+
+2004-01-29 [paul]      0.9.8claws57
+
+       * sync with 0.9.8cvs11
+               see ChangeLog 2004-01-29
+
+2004-01-28 [christoph] 0.9.8claws56
+
+       * src/pgpmime.c
+       * src/sgpgme.[ch]
+               return WARN signature status when signature is not trusted
+
+       * src/Makefile.am
+       * src/folder.c
+       * src/folderutils.[ch]                  ** NEW **
+       * src/summaryview.c
+               implement delete duplicates summaryview independent
+
+2004-01-28 [paul]      0.9.8claws55
+
+       * sync with 0.9.8cvs10
+               see Changelog 2004-01-27 and 2004-01-28
+
+2004-01-26 [christoph] 0.9.8claws54
+
+       * src/imap.c
+               create a root node for the Folder if scan fails because root
+               folder does not exist
+
+2004-01-26 [paul]      0.9.8claws53
+
+       * sync with 0.9.8cvs7
+               see ChangeLog 2004-01-23
+
+2004-01-25 [alfons]    0.9.8claws52
+
+       * src/compose.c
+               remove left-over constant INDENT_CHARS
+
+2004-01-25 [alfons]    0.9.8claws51
+
+       * src/procmime.c
+               add NULL pointer check for mimeinfo->node in
+               procmime_mimeinfo_parent()
+
+2004-01-25 [darko]     0.9.8claws50
+
+       * src/compose.c
+               make "Wrap all long lines" toolbar button wrap all
+               long lines not just the current line
+               patch by I. Oshadi Jayawardena <ioj4 at yahoo.co.uk>
+
+
+2004-01-25 [alfons]    0.9.8claws49
+
+       * src/procmime.c
+               remove g_strstrip(); prevents a NULL pointer deref, and isn't
+               necessary anyway, because *scanf() functions neglect white
+               space in the input. 
+               Fixes bug #425, "sylpheed 0.9.8claws42 crashes on some messages."
+
+2004-01-25 [paul]      0.9.8claws48
+
+       src/prefs_ext_prog.c
+               apply Alfons' patch to check for NULL pointers
+               fixes bug #424
+
+2004-01-25 [paul]      0.9.8claws47
+
+       * sync with 0.9.8cvs8
+               see ChangeLog 2004-01-23
+
+2004-01-25 [thorsten]  0.9.8claws46
+
+       * src/messageview.c
+               remove orphaned mimeview unref()
+
+2004-01-23 [christoph] 0.9.8claws45
+
+       * src/summaryview.c
+               set ctree widget style
+
+2004-01-23 [paul]      0.9.8claws44
+
+       * sync with 0.9.8cvs5
+               see ChangeLog 2004-01-22
+
+2004-01-23 [alfons]    0.9.8claws43
+
+       * src/procmsg.c
+               remove redundant code in procmsg_get_thread_tree()
+
+2004-01-21 [christoph] 0.9.8claws42
+
+       * src/folderview.c
+               set ctree widget style, otherwise GTK does not use the
+               the correct vertical size for the list items
+
+2004-01-21 [alfons]    0.9.8claws41
+
+       * src/summaryview.c
+               GDK_Left should only switch to folderview when
+               when summaryview hscrollbar is at the leftmost
+               position (fixes bug #420, "Focus error")
+
+2004-01-21 [paul]      0.9.8claws40
+
+       * sync with 0.9.8cvs4
+               see ChangeLog 2004-01-20
+
+2004-01-20 [christoph] 0.9.8claws39
+
+       * src/folderview.c
+               remove setting sensitivity for no longer existing
+               /Scoring... popup entry
+
+2004-01-20 [keith]     0.9.8claws38
+
+       * configure.ac
+               Revert AM_CONFIG_HEADER to AC_CONFIG_HEADER
+
+2004-01-20 [paul]      0.9.8claws37
+
+       * src/prefs_fonts.c
+               demystify font settings
+               
+       * src/textview.c
+               use textview->msgfont for header->body in
+               textview_show_header()
+
+2004-01-20 [paul]      0.9.8claws36
+
+       * src/compose.c
+         src/undo.c
+               remove superfluous debug_print's
+               
+       * src/inc.c
+               clear the statusbar after LOCAL incorporation
+
+2004-01-20 [paul]      0.9.8claws35
+
+       * sync with 0.9.8cvs3
+               see ChangeLog 2004-01-20
+
+2004-01-19 [keith]     0.9.8claws34
+
+       * src/folderview.c
+               don't show 'Search folder...' on popup menu
+               if folder has no mails in it
+
+2004-01-17 [keith]     0.9.8claws33
+
+       * src/compose.c
+         src/prefs_common.c
+         src/prefs_common.h
+               store position of compose window in prefs
+
+2004-01-17 [thorsten]  0.9.8claws32
+
+       * src/gtk/gtkvscrollbutton.c
+               ensure scrollbutton resize event on different gtk versions
+
+2004-01-15 [alfons]    0.9.8claws31
+       
+       * src/summaryview.c
+               keep MSG_REPLIED and MSG_FORWARDED even when marking a
+               message as read
+
+2004-01-12 [christoph] 0.9.8claws30
+
+       * src/procmime.c
+               better MIME-Version check
+
+2004-01-11 [alfons]    0.9.8claws29
+
+       * src/procmsg.c
+               remove unnecessary but still effective check (could possibly
+               lead to some unwanted side effects)
+
+2004-01-11 [alfons]    0.9.8claws28
+
+       * src/procmsg.c
+               we should not prefer lowest message number while threading 
+               (introduced in previous commit)
+
+2004-01-11 [alfons]    0.9.8claws27
+
+       * src/procmsg.c
+               subject threading fixes:
+               
+                       - make message with lowest message number the
+                         thread parent,
+                       - refine recording last node when threading. the last node
+                         should be the previous one if a node has a thread parent,
+                         or the current node if not
+               
+               (there's another threading bug fix coming up)
+
+2004-01-10 [paul]      0.9.8claws26
+
+       * src/main.c
+         src/prefs_ext_prog.c
+         src/plugins/clamav/clamav_plugin_gtk.c
+               minor gui fixes
+
+2004-01-09 [christoph] 0.9.8claws25
+
+       * src/Makefile.am
+       * src/string_match.[ch]                 ** REMOVE **
+       * src/common/Makefile.am
+       * src/common/string_match.[ch]          ** NEW **
+               move string_match.[ch] to common directory
+
+2004-01-09 [christoph] 0.9.8claws24
+
+       * src/pgpmime.c
+               add MIME-Version header for the message parser
+
+2004-01-09 [paul]      0.9.8claws23
+
+       * po/POTFILES.in
+         src/Makefile.am
+         src/main.c
+         src/prefs_common.c
+         src/prefs_ext_prog.[ch]       ** NEW FILES **
+               move External Command options from 'Common Prefs/Other' to
+               'Other Prefs/Message View/External Programs', also reveal
+               the hidden options for audio player and image viewer.
+               
+       * src/prefs_common.c
+               fix toggling of header pane
+
+2004-01-09 [paul]      0.9.8claws22
+
+       * src/compose.c
+               when changing account also change the save folder
+
+       * src/textview.c
+               if a text/plain attachment has 'Content-Disposition: attachment'
+               don't display it inline
+
+2004-01-08 [christoph] 0.9.8claws21
+
+       * src/procmime.c
+               check for "MIME-Version: 1.0" in message/rfc882 MIME-parts,
+               otherwise thread the message content as one text part and
+               don't assume charset US-ASCII which is only specified as
+               default for MIME-messages
+
+2004-01-08 [paul]      0.9.8claws20
+
+       * src/plugins/clamav/clamav_plugin.c
+         src/plugins/spamassassin/spamassassin.c
+               inform the user what is happening via the statusbar
+
+2004-01-06 [paul]      0.9.8claws19
+
+       * po/es.po
+               update Spanish translation. submitted by Ricardo
+               Mones Lastra
+
+2004-01-05 [paul]      0.9.8claws18
+
+       * sync with 0.9.8cvs2
+               see ChangeLog 2004-01-05
+
+2004-01-03 [luke]      0.9.8claws17
+
+       * src/procheader.c
+               Clean up:
+               o remove unused functions string_getchar() and file_getchar()
+               o remove the getchar_ parameter from generic_get_one_field()
+               o add an 'unfold' parameter to generic_get_one_field, to
+                 be used if no HeaderEntry is supplied
+               o procheader_get_one_field_asis() uses
+                 generic_get_one_field().
+
+2004-01-01 [christoph] 0.9.8claws16
+
+       * src/common/xml.[ch]
+               o add xml_new_tag() to manage usage counts of strings correctly
+               o correct xml_copy_tree() function name
+
+       * src/folder.c
+       * src/main.c
+               allow registering and unregistering of FolderClasses anytime
+
+2003-12-31 [christoph] 0.9.8claws15
+
+       * src/folder.[ch]
+       * src/common/xml.[ch]
+               keep folderlist.xml data for unloaded FolderClasses
+
+2003-12-30 [luke]      0.9.8claws14
+
+       * src/procheader.[ch]
+               o added procheader_get_one_field_asis() that does not do
+                 unfolding
+               o fix procheader_get_header_array_asis() to use the above,
+                 fixing ugliness of headers in textview
+
+       * src/compose.c
+               o don't unfold headers when redirecting.        
+
+2003-12-30 [paul]      0.9.8claws13
+
+       * po/POTFILES.in
+         src/common/defs.h
+         src/Makefile.am
+         src/main.c
+         src/prefs_common.c
+         src/prefs_themes.[ch] ** NEW FILES **
+               redesign and move Icon Theme selector to
+               the new prefs window
+         
+       * src/stock_pixmap.c
+               fix the old bug where icons are not always
+               updated when changing themes
+       
+       * src/summaryview.c
+               fix bug where the icons on the title row
+               of the summary view were not updated
+       
+       all patches submitted by Ricardo Mones Lastra
+
+2003-12-30 [hoa]       0.9.8claws12
+
+       * src/folder.c
+               run preglobal and postglobal processing rules
+               even if the folder does not have any rules.
+
+2003-12-28 [paul]      0.9.8claws11
+
+       * ac/aspell.m4
+         ac/check-type.m4
+         ac/gnupg-check-typedef.m4
+         ac/openssl.m4
+         ac/spamassassin.m4
+               fix 'underquoted definition' warnings, patch submitted by
+               David Relson <relson@osagesoftware.com>
+               
+       * src/common/utils.c
+               subject_get_prefix_length(): add "Odp\\:" to reply prefixes,
+               patch submitted by Jan Alboszta <J.Alboszta@students.mimuw.edu.pl>
+
+2003-12-28 [paul]      0.9.8claws10
+
+       * sync with 0.9.8cvs1
+               see ChangeLog 2003-12-17
+
+2003-12-27 [christoph] 0.9.8claws9
+
+       * src/common/utils.[ch]
+               add g_node_map() to map a GNode into a new GNode
+               converting all node data's with a function
+
+       * src/account.c
+       * src/folder.[ch]
+       * src/folderview.c
+       * src/imap.c
+       * src/mainwindow.c
+       * src/summaryview.c
+               o use g_node_map() to convert XML <-> Folder
+               o remove redundant FolderItem->parent and
+                 replace it with folder_item_parent()
+
+2003-12-23 [christoph] 0.9.8claws8
+
+       * src/folder.[ch]
+       * src/folderview.c
+       * src/mainwindow.c
+       * src/procmsg.c
+               o use callback for notifications about added and
+                 destroyed folders
+               o rewrite folderlist saving (new functions to create
+                 folder from XML tree, and XML tree from folder)
+
+       * src/common/xml.[ch]
+               add function to save XML trees
+
+       * src/prefs_filtering.c
+               code cleanup
+
+2003-12-22 [christoph] 0.9.8claws7
+
+       * src/prefs_account.[ch]
+               add "SMTP only" accounts
+
+2003-12-20 [melvin]    0.9.8claws6
+
+       * src/action.[ch]
+               Changed the interface for action_update_*_menu() so
+               action.c does not need to know the paths of the different
+               actions menu (mainwindow, message view and compose window). 
+
+       * src/compose.c
+               Tiny code cleanup to merge spell checker related code
+               compose_update_actions_menu(): new function to update
+               the actions menu. Use it in compose_create()
+
+       * src/compose.h
+               compose_update_actions_menu(): new function to update
+               the actions menu. Used also in prefs_actions.c.
+
+       * src/mainwindow.[ch]
+               main_window_update_actions_menu(): new function to update
+               the actions menu. Used in main_window_create() and in
+               prefs_actions.c
+
+       * src/messageview.[ch]
+               messageview_update_actions_menu(): new function to update
+               the actions menu. Used in messageview_add_toolbar() and in
+               prefs_actions.c
+               
+       * src/prefs_actions.c   
+               prefs_actions_ok(): fixed to update the actions menu of
+               the separate message view and the compose windows.
+
+2003-12-20 [luke]      0.9.8claws5
+       * src/procheader.c
+               fix unfolding/newline stripping for multiline fields
+               in generic_get_one_field()
+
+2003-12-19 [christoph] 0.9.8claws4
+
+       * src/summaryview.c
+               o code cleanup
+               o use subject_compare_for_sort() when comparing
+                 simplified subjects
+
+2003-12-19 [christoph] 0.9.8claws3
+
+       * src/msgcache.c
+               more syncing with 0.8.9a
+
+2003-12-19 [christoph] 0.9.8claws2
+
+       * src/folder.c
+               don't write all FolderItem XML attributes for the root node
+
+2003-12-19 [melvin]    0.9.8claws1
+
+       * src/messageview.c
+               Added missing menu branch (Tools/Create processing/rule)
+       * po/fr.po
+               Updated French translation for the added string.
+

 2003-12-19 [paul]      0.9.8claws
 
        0.9.8claws released
 2003-12-19 [paul]      0.9.8claws
 
        0.9.8claws released

diff --git a/ChangeLog.jp b/ChangeLog.jp
index d900068db95af01b69c4619c8d7a4f59a9c6957f..4d44e7b49887535e8011abbd3a16bce3a71afb20 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,115 @@
+2004-01-29
+
+       * version 0.9.9
+
+2004-01-29
+
+       * src/folder.c: folder_item_fetch_all_msg()
+         src/folderview.c: folderview_download_cb(): ¿ÊĽ¤ò¥×¥í¥°¥ì¥¹¥Ð¡¼¤Ç
+         ɽ¼¨¡£
+       * src/mainwindow.[ch]: ¿·¤¿¤Ë¥×¥í¥°¥ì¥¹¥Ð¡¼ÍѤδؿô¤òÄɲá£
+
+2004-01-29
+
+       * src/summaryview.c: summary_key_pressed(): ¥µ¥Þ¥ê¥Ó¥å¡¼¤Î¿åÊ¿
+         ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤¬º¸Ã¼¤Ë¤¢¤ë¤È¤­¤Î¤ß GDK_Left ¤Ç¥Õ¥©¥ë¥À¥Ó¥å¡¼¤Ë
+         ÀÚ¤êÂؤ¨¤ë¤è¤¦¤Ë¤·¤¿(Alfons ¤µ¤ó thanks)¡£
+
+2004-01-29
+
+       * src/codeconv.c: conv_euctojis(): JIS X 0201 ¥«¥ÊÊÑ´¹¤òÀßÄê²Äǽ¤Ë
+         ¤·¤¿¡£
+       * src/prefs_common.[ch]: PrefsCommon::allow_jisx0201_kana (±£¤·ÀßÄê)
+         ¤òÄɲá£
+
+2004-01-28
+
+       * src/codeconv.c: conv_euctojis(): JIS X 0201 ¥«¥Ê¤«¤é JIS X 0208
+         ¤Ø¶¯À©Åª¤ËÊÑ´¹¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-01-28
+
+       * src/imap.c: imap_get_msginfo(): ´Ö°ã¤Ã¤Æ¥«¥¦¥ó¥È¤µ¤ì¤Æ¤·¤Þ¤¦¤Î¤ò
+         ½¤Àµ¡£
+
+2004-01-28
+
+        * src/base64.c
+         src/codeconv.c
+         src/compose.c
+         src/html.c
+         src/imap.c
+         src/pop.c
+         src/prefs_account.c
+         src/procmime.c
+         src/procmsg.c
+         src/quote_fmt_parse.y
+         src/quoted-printable.c
+         src/textview.c
+         src/unmime.c
+         src/utils.c
+         src/utils.h
+         src/xml.c: ctype ´Ø¿ô¤ËÂФ·¤Æ°ú¿ô¤Î·¿¤¬¸í¤Ã¤Æ¤¤¤¿¤Î¤ò½¤Àµ(unsigned
+         char ¤Ç¤Ê¤¯¤Æ char ¤òÅϤ·¤Æ¤¤¤¿)¡£
+
+2004-01-27
+
+       * src/mainwindow.[ch]: MainWindow::messageview_cid ¤òÄɲá£
+         ¥á¥Ã¥»¡¼¥¸¥Ó¥å¡¼¤¬±£¤µ¤ì¤¿¾ì¹ç¥¯¥ê¥¢¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+       * src/textview.c: ¥ê¥ó¥¯¤¬¥¯¥ê¥Ã¥¯¤µ¤ì¤¿¤é URL ¤ò¥¹¥Æ¡¼¥¿¥¹¥Ð¡¼¤Ë
+         ɽ¼¨¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+         textview_uri_security_check(): ¼ÂºÝ¤Î URL ¤Èɽ¼¨¤µ¤ì¤Æ¤¤¤ë URL ¤ò
+         Èæ³Ó¤·¡¢µ¶¤Î URL ¤Î²ÄǽÀ­¤¬¤¢¤ì¤Ð·Ù¹ð¤ò½Ð¤¹¤è¤¦¤Ë¤·¤¿¡£
+       * src/utils.[ch]:
+         is_uri_string(): ʸ»úÎó¤¬ URL ¤Ç¤¢¤ì¤Ð TRUE ¤òÊÖ¤¹¡£
+         get_uri_path(): URL ¤Î¥¹¥­¡¼¥àÉô°Ê³°¤ÎÉôʬ¤òÊÖ¤¹¡£
+
+2004-01-23
+
+       * src/folder.[ch]: folder_item_fetch_all_msg(): ¿·µ¬¡£¥Õ¥©¥ë¥ÀÃæ¤Î
+         Á´¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ò¼èÆÀ¤¹¤ë¡£
+       * src/folderview.c: ¡Ö¥À¥¦¥ó¥í¡¼¥É¡×µ¡Ç½¤ò¼ÂÁõ¡£
+
+2004-01-23
+
+       * src/gtkutils.[ch]: Ìð°õ¥á¥Ë¥å¡¼¥Ü¥¿¥ó¤ò¥Ü¥¿¥ó¤ËÉղ乤ë ComboButton
+         ¤ò¼ÂÁõ¡£
+       * src/mainwindow.[ch]: main_window_toolbar_create(): ÊÖ¿®¡¢Å¾Á÷¥Ü¥¿¥ó
+         ¤Ë¥³¥ó¥Ü¥Ü¥¿¥ó¤òÄɲá£
+
+2004-01-22
+
+       * src/mainwindow.c: ¥Ä¡¼¥ë¥Ð¡¼¤Ë¤è¤Ã¤Æ¥¦¥£¥ó¥É¥¦¥µ¥¤¥º¤¬¼«Æ°Åª¤Ë
+         ¿­Ä¹¤·¤Æ¤·¤Þ¤¦¤Î¤ò½¤Àµ¡£
+
+2004-01-21
+
+       * src/addr_compl.[ch]
+         src/gtkshruler.[ch]: Ãøºî¸¢É½¼¨¤òÊѹ¹¡£
+
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): ¥Þ¥ë¥Á¥Ð¥¤¥È¤È¥·¥ó¥°¥ë¥Ð¥¤¥È
+         ʸ»ú¤Î´Ö¤Ç¤â²þ¹Ô¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-01-20
+
+       * src/gtkstext.c: find_line_params(): ¥ï¡¼¥É¥é¥Ã¥×¥â¡¼¥É¤Î¤È¤­
+         ¥Þ¥ë¥Á¥Ð¥¤¥Èʸ»ú´Ö¤Ç¤â²þ¹Ô¤¹¤ë¤è¤¦¤Ë¤·¤¿¡£
+
+2004-01-05
+
+       * src/codeconv.c: conv_iconv_strdup(): LP64 ´Ä¶­¤Ç¤Î¥¯¥é¥Ã¥·¥å¤ò½¤Àµ
+         (James Noyes ¤µ¤ó thanks)¡£
+       * src/compose.c: compose_select_account(): ¼«Æ°Åª¤Ë½ð̾/°Å¹æ²½
+         ¥ª¥×¥·¥ç¥ó¤ò¥ª¥Õ¤Ë¤·¤Ê¤¤¤è¤¦¤Ë¤·¤¿¡£
+
+2003-12-17
+
+       * src/inc.[ch]: inc_account_mail() ¤ò public ¤Ë¤·¤¿¡£
+       * src/mainwindow.c: ¼õ¿®¥á¥Ë¥å¡¼¤ò¥µ¥Ö¥á¥Ë¥å¡¼¤Ë¤·¡¢³Æ¥¢¥«¥¦¥ó¥È¤«¤é
+         ¤Î¼õ¿®¤Î¤¿¤á¤ÎưŪ¤Ê¥á¥Ë¥å¡¼¤òÄɲá£
+

 2003-12-15
 
        * version 0.9.8a
 2003-12-15
 
        * version 0.9.8a

diff --git a/NEWS b/NEWS
index 73f4273c5dc91477f5be36a96d2f72c6085a222a..16a809431a14ca1785301e90ee666fb6ad0e5369 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,18 @@
 Changes of Sylpheed
 
 Changes of Sylpheed
 

+* 0.9.9
+
+    * Word wrapping on multibyte locales has been improved.
+    * The receive menu has been improved.
+    * The combo button for toolbar has been implemented.
+    * The download feature for IMAP / News folders has been implemented.
+    * URL is now shown on the toolbar when links are clicked, and put
+      warning in case of fake URL.
+    * JIS X 0201 Kana (hankaku kana) will be converted into JIS X 0208
+      when sending.
+    * Crashes on 64-bit environments has been fixed.
+    * Other bugfixes have been made.
+

 * 0.9.8a
 
     * The bug that caused the failure of cache data read has been fixed.
 * 0.9.8a
 
     * The bug that caused the failure of cache data read has been fixed.

diff --git a/README b/README
index e8129b766f316865f3b04ca46c35162a5322132f..2b830ae27cd3c6d88724227c9a03feef928748f5 100644 (file)
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
        Sylpheed - a GTK+ based, lightweight, and fast e-mail client
 
        Sylpheed - a GTK+ based, lightweight, and fast e-mail client
 

-   Copyright(C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2004 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>

 
    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
 
    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


@@ -22,62 +22,89 @@
 What's Sylpheed
 ===============
 
 What's Sylpheed
 ===============
 

-Sylpheed is an e-mail client (and news reader) based on GTK+, running on
-X Window System, and aiming for
+Sylpheed is an e-mail client and news reader based on GTK+ GUI toolkit,
+and runs on X Window System.

 
 

-  * Quick response
-  * Graceful, and sophisticated interface
-  * Easy configuration, intuitive operation
-  * Abundant features
+Sylpheed is a free software distributed under the GNU GPL.
+
+The development of Sylpheed sets the following things as its goal:
+
+  * Quick response by keeping CPU and memory usage to a minimum
+  * Fast processing even though a folder contains large number of messages
+    (more than 10 thousand)
+  * Enables intuitive operation by simple, graceful, and well-polished
+    interface
+  * Similar operation methods to other mailers.
+  * Readily available with simple configuration
+  * Fully equipped with features required as a mailer
+  * Full support of Japanese, and support of i18n
+  * Enables flexible interaction with external commands
+  * Stable, and don't lose any data (to the utmost) in case of crash

 
 The appearance and interface are similar to some popular e-mail clients for
 Windows, such as Outlook Express, Becky!, and Datula. The interface is also
 
 The appearance and interface are similar to some popular e-mail clients for
 Windows, such as Outlook Express, Becky!, and Datula. The interface is also

-designed to emulate the mailers on Emacsen, and almost all commands are
-accessible with the keyboard. You'll figure out the usage if you have ever
-used some e-mail clients for Windows, or Mew or Wanderlust.
+designed to emulate the Emacs-based mailers, and almost all commands are
+accessible with the keyboard. So you will able to migrate to Sylpheed
+without much discomfort in the case where you are accustomed to other
+mailers.

 
 The messages are managed by MH format, and you'll be able to use it together
 
 The messages are managed by MH format, and you'll be able to use it together

-with another mailer based on MH format (like Mew). You can also utilize
-fetchmail or/and procmail, and external programs on receiving (like inc or
-imget).
+with another mailer based on MH format (like Mew). It has less possibility
+of losing mails on failures since one file corresponds to one mail. You can
+import or export mbox format messages. You can also utilize fetchmail or/and
+procmail, and external programs on receiving (like inc or imget).
+
+Currently implemented major features
+====================================
+
+Supported protocols

 
 

-Currently implemented features are:
+       o POP3
+       o IMAP4rev1
+       o SMTP
+       o NNTP
+       o SSL/TLSv1 (POP3, SMTP, IMAP4rev1, NNTP)
+       o IPv6
+
+Features

 
 

-       o POP3 support
-       o IMAP4rev1 support
-       o integrated NetNews client

        o unlimited multiple account handling
        o thread display
        o filtering
        o MIME (attachments)
        o unlimited multiple account handling
        o thread display
        o filtering
        o MIME (attachments)

+       o integrated News reader
+       o SMTP AUTH support
+       o CRAM-MD5 authentication (SMTP AUTH / IMAP4rev1)
+       o APOP authentication (POP3)
+       o PGP signature / encryption (requires GPGME)

        o built-in image view
        o built-in image view

-       o X-Face support
+       o X-Face display
+       o user-defined headers
+       o color label
+       o Mew/Wanderlust compatible key bind

        o multiple MH folder support
        o mbox importing / exporting
        o multiple MH folder support
        o mbox importing / exporting

-       o remote operation by command line
-       o per-folder configuration
-       o external editor support
+       o external editor

        o message queueing
        o automatic mail checking
        o message queueing
        o automatic mail checking

-       o draft message function
-       o template function
+       o draft message
+       o template

        o line-wrapping
        o clickable URI
        o XML-based address book
        o line-wrapping
        o clickable URI
        o XML-based address book

-       o LDAP, vCard, and JPilot support

        o newly arrived and unread message management
        o newly arrived and unread message management

-       o Mew/Wanderlust-like key bind

        o printing
        o printing

-       o APOP authentication support
-       o SMTP AUTH support
-       o SSL support (POP3, SMTP, IMAP4rev1)
-       o IPv6 support
+       o offline mode
+       o remote operation by command line
+       o per-folder configuration
+       o LDAP, vCard, and JPilot support

        o drag & drop (partially implemented)
        o drag & drop (partially implemented)

-       o GnuPG support (currently in progress)
-       o automake + autoconf support
+
+Others
+
+       o autoconf, automake support

        o internationalization of messages by gettext
        o internationalization of messages by gettext

-       o support of many code sets, including UTF-8 (Unicode) (when using
-         libjconv)
+       o support of many code sets, including UTF-8 (Unicode)

 
 and more.
 
 
 and more.
 


@@ -140,6 +167,9 @@ dialog, but there are a few parameters which don't have user interface
 (you don't have to modify them in normal use). You must edit
 ~/.sylpheed/sylpheedrc by an editor when Sylpheed is not running.
 
 (you don't have to modify them in normal use). You must edit
 ~/.sylpheed/sylpheedrc by an editor when Sylpheed is not running.
 

+allow_jisx0201_kana            allow JIS X 0201 Kana (hankaku kana) on
+                               sending.
+                               0: off  1: on   [default: 0]

 bold_font                      bold font used in folder, summary and text view
 small_font                     small font used in summary view etc.
 enable_hscrollbar              enable horizontal scroll bar in summary view
 bold_font                      bold font used in folder, summary and text view
 small_font                     small font used in summary view etc.
 enable_hscrollbar              enable horizontal scroll bar in summary view

diff --git a/README.jp b/README.jp
index 49064d4583da794bbc305b4cca0d39c76217ae68..aee7dddd6a770f10eb09dd304b9bcde1d7aab560 100644 (file)
--- a/README.jp
+++ b/README.jp
@@ -1,6 +1,6 @@
        Sylpheed - GTK+ ¥Ù¡¼¥¹¤Î·ÚÎ̤ǹ⮤ÊÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È
 
        Sylpheed - GTK+ ¥Ù¡¼¥¹¤Î·ÚÎ̤ǹ⮤ÊÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È
 

-   Copyright(C) 1999-2002 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>
+   Copyright(C) 1999-2004 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>

 
    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
 
    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


@@ -40,61 +40,86 @@
 What's Sylpheed
 ===============
 
 What's Sylpheed
 ===============
 

-Sylpheed ¤Ï GTK+ ¤ò»ÈÍѤ·¤¿¡¢ X Window System ¾å¤ÇÆ°ºî¤¹¤ë
+Sylpheed¤ÏGUI¥Ä¡¼¥ë¥­¥Ã¥È¤ËGTK+¤ò»ÈÍѤ·¤¿¡¢ X Window System¾å¤ÇÆ°ºî¤¹¤ë
+ÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È&¥Ë¥å¡¼¥¹¥ê¡¼¥À¡¼¤Ç¤¹¡£

 
 

-  * ·Ú²÷¤ÊÆ°ºî
-  * Èþ¤·¤¯¡¢ÀöÎý¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹
-  * ÍưפÊÀßÄꡦľ´ÑŪ¤ÊÁàºî
-  * Ë­É٤ʵ¡Ç½
+Sylpheed ¤Ï GNU GPL ¤Ë½¾¤Ã¤ÆÇÛÉÛ¤µ¤ì¤Æ¤¤¤ë¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£

 
 

-¤òÌܻؤ·¤¿ÅŻҥ᡼¥ë¥¯¥é¥¤¥¢¥ó¥È(& ¥Ë¥å¡¼¥¹¥ê¡¼¥À¡¼)¤Ç¤¹¡£
+Sylpheed¤Ï°Ê²¼¤Î¤³¤È¤òÌÜɸ¤Ë¤·¤Æ³«È¯¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+
+  * CPU¡¦¥á¥â¥ê¤Î¾ÃÈñ¤òºÇ¾®¸Â¤ËÍÞ¤¨¤Æ·Ú²÷¤ËÆ°ºî
+  * 1¥Õ¥©¥ë¥ÀÃæ¤ËÂçÎ̤˥á¥Ã¥»¡¼¥¸¤¬Â¸ºß¤¹¤ë¾ì¹ç(10000Ä̰ʾå)¤Ç¤â¹â®¤Ë½èÍý
+  * ¥·¥ó¥×¥ë¤ÇÈþ¤·¤¯¡¢ÀöÎý¤µ¤ì¤¿¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ë¤è¤êľ´ÑŪ¤ÊÁàºî¤¬²Äǽ
+  * ¾¤Î¥á¡¼¥é¤Ë¶á¤¤Áàºî¤¬²Äǽ
+  * ´Êñ¤ÊÀßÄê¤Ç¤¹¤°¤Ë»ÈÍѲÄǽ
+  * ¥á¡¼¥é¤ËɬÍפȤµ¤ì¤ëµ¡Ç½¤ò´°È÷
+  * ÆüËܸì¤Ë´°Á´Âбþ¤·¡¢¹ñºÝ²½¤Ë¤âÂбþ
+  * ³°Éô¥³¥Þ¥ó¥É¤È¤Î½ÀÆð¤ÊÏ¢·È¤¬²Äǽ
+  * °ÂÄêÆ°ºî¤·¡¢Ëü°ì¥¯¥é¥Ã¥·¥å¤·¤¿¾ì¹ç¤Ç¤â¶ËÎϥǡ¼¥¿¤ò¾Ã¼º¤·¤Ê¤¤

 
 ³°´Ñ¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï Outlook Express ¡¢ Becky! ¡¢ Datula ¤È¤¤¤Ã¤¿¡¢
 Windows ¤Ç¤ÏÄêÈ֤Υ᡼¥é¤ò»²¹Í¤Ë¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢Áàºî·Ï¤Ï Mew ¤ä
 Wanderlust Åù¤Î Emacs ·Ï¥á¡¼¥é¤ò»²¹Í¤Ë¤·¤Æ¤ª¤ê¡¢¥­¡¼¥Ü¡¼¥É¤Î¤ß¤Ë¤è¤ëÁàºî
 
 ³°´Ñ¤ä¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ï Outlook Express ¡¢ Becky! ¡¢ Datula ¤È¤¤¤Ã¤¿¡¢
 Windows ¤Ç¤ÏÄêÈ֤Υ᡼¥é¤ò»²¹Í¤Ë¤·¤Æ¤¤¤Þ¤¹¡£¤Þ¤¿¡¢Áàºî·Ï¤Ï Mew ¤ä
 Wanderlust Åù¤Î Emacs ·Ï¥á¡¼¥é¤ò»²¹Í¤Ë¤·¤Æ¤ª¤ê¡¢¥­¡¼¥Ü¡¼¥É¤Î¤ß¤Ë¤è¤ëÁàºî

-¤¬²Äǽ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ Windows ¾å¤Î¥á¡¼¥é¡¢¤¢¤ë¤¤¤Ï Mew ¤ä Wanderlust Åù
-¤Î»ÈÍѷи³¤¬¤¢¤ì¤Ð¤¹¤°¤Ë»È¤¤Êý¤Ïʬ¤«¤ë¤È»×¤¤¤Þ¤¹¡£
+¤¬²Äǽ¤È¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£¤½¤Î¤¿¤á¡¢Â¾¤Î¥á¡¼¥é¤Ë´·¤ì¤Æ¤¤¤ë¾ì¹ç¤Ç¤â¤½¤ì¤Û¤É
+°ãÏ´¶¤Ê¤¯°Ü¹Ô¤Ç¤­¤ë¤È»×¤¤¤Þ¤¹¡£

 
 ¥á¥Ã¥»¡¼¥¸¤Ï MH ·Á¼°¤Ç´ÉÍý¤·¤Æ¤ª¤ê¡¢Â¾¤Î MH ·Á¼°¤ò»ÈÍѤ·¤¿¥á¡¼¥é(Mew Åù)
 
 ¥á¥Ã¥»¡¼¥¸¤Ï MH ·Á¼°¤Ç´ÉÍý¤·¤Æ¤ª¤ê¡¢Â¾¤Î MH ·Á¼°¤ò»ÈÍѤ·¤¿¥á¡¼¥é(Mew Åù)

-¤ÈÊ»ÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£¤Þ¤¿¡¢ fetchmail ¤ä procmail ¤òÍøÍѤ·¤¿¤ê¡¢¼õ¿®
-¤Ë³°Éô¥×¥í¥°¥é¥à(inc, imget Åù)¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+¤ÈÊ»ÍѤ¹¤ë¤³¤È¤¬²Äǽ¤Ç¤¹¡£1¥Õ¥¡¥¤¥ë1¥á¡¼¥ë¤Î·Á¼°¤Î¤¿¤á¡¢¾ã³²¤¬È¯À¸¤·¤¿ºÝ¤Ë
+¥á¡¼¥ë¤ò¼º¤¦´í¸±À­¤¬¾¯¤Ê¤¯¤Ê¤Ã¤Æ¤¤¤Þ¤¹¡£ mbox·Á¼°¤Î¥á¥Ã¥»¡¼¥¸¤ò¥¤¥ó¥Ý¡¼¥È¡¦
+¥¨¥¯¥¹¥Ý¡¼¥È¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£¤Þ¤¿¡¢ fetchmail ¤ä procmail ¤òÍøÍѤ·¤¿¤ê¡¢
+¼õ¿®¤Ë³°Éô¥×¥í¥°¥é¥à(inc, imget Åù)¤ò»ÈÍѤ¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+
+¸½ºß¼ÂÁõ¤µ¤ì¤Æ¤¤¤ë¼ç¤Êµ¡Ç½
+==========================

 
 

-¸½ºß¼ÂÁõ¤µ¤ì¤Æ¤¤¤ëµ¡Ç½¤Ï
+Âбþ¥×¥í¥È¥³¥ë

 
        o POP3 Âбþ
        o IMAP4rev1 Âбþ
 
        o POP3 Âбþ
        o IMAP4rev1 Âбþ

-       o Åý¹ç NetNews ¥¯¥é¥¤¥¢¥ó¥È
+       o SMTP
+       o NNTP
+       o SSL/TLSv1 (POP3, SMTP, IMAP4rev1, NNTP)
+       o IPv6
+
+µ¡Ç½
+

        o ̵À©¸Â¤ÎÊ£¿ô¥¢¥«¥¦¥ó¥È´ÉÍý
        o ¥¹¥ì¥Ã¥Éɽ¼¨
        o ¿¶¤êʬ¤±µ¡Ç½
        o MIME (źÉÕ)
        o ̵À©¸Â¤ÎÊ£¿ô¥¢¥«¥¦¥ó¥È´ÉÍý
        o ¥¹¥ì¥Ã¥Éɽ¼¨
        o ¿¶¤êʬ¤±µ¡Ç½
        o MIME (źÉÕ)

+       o Åý¹ç ¥Ë¥å¡¼¥¹¥ê¡¼¥À¡¼
+       o SMTP AUTH Âбþ
+       o CRAM-MD5 ǧ¾Ú (SMTP AUTH / IMAP4rev1)
+       o APOP ǧ¾Ú (POP3)
+       o PGP ½ð̾¡¦°Å¹æ²½(Í× GPGME)

        o ²èÁüɽ¼¨µ¡Ç½¤òÆâ¢
        o ²èÁüɽ¼¨µ¡Ç½¤òÆâ¢

-       o X-Face Âбþ
-       o Ê£¿ô¤Î MH ¥Õ¥©¥ë¥À¤ËÂбþ
+       o X-Face ɽ¼¨
+       o ¥æ¡¼¥¶ÄêµÁ¥Ø¥Ã¥À
+       o ¥«¥é¡¼¥é¥Ù¥ë
+       o Mew/Wanderlust ¸ß´¹¥­¡¼¥Ð¥¤¥ó¥É
+       o Ê£¿ô¤Î MH ¥Õ¥©¥ë¥ÀÂбþ

        o mbox ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ý¡¼¥È / ¥¨¥¯¥¹¥Ý¡¼¥È
        o mbox ¥Õ¥¡¥¤¥ë¤Î¥¤¥ó¥Ý¡¼¥È / ¥¨¥¯¥¹¥Ý¡¼¥È

-       o ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤è¤ë¥ê¥â¡¼¥ÈÁàºî
-       o ¥Õ¥©¥ë¥ÀËè¤ÎÀßÄê
-       o ³°Éô¥¨¥Ç¥£¥¿Âбþ
-       o Á÷¿®ÂÔµ¡µ¡Ç½
-       o ¼«Æ°¥á¡¼¥ë¥Á¥§¥Ã¥¯µ¡Ç½
-       o Áð¹Æµ¡Ç½
-       o ¥Æ¥ó¥×¥ì¡¼¥Èµ¡Ç½
-       o ¼«Æ°²þ¹Ôµ¡Ç½
+       o ³°Éô¥¨¥Ç¥£¥¿
+       o Á÷¿®ÂÔµ¡
+       o ¼«Æ°¥á¡¼¥ë¥Á¥§¥Ã¥¯
+       o Áð¹Æ
+       o ¥Æ¥ó¥×¥ì¡¼¥È
+       o ¼«Æ°²þ¹Ô

        o ¥¯¥ê¥Ã¥«¥Ö¥ë URI
        o XML ¥Ù¡¼¥¹¤Î¥¢¥É¥ì¥¹Ä¢
        o ¥¯¥ê¥Ã¥«¥Ö¥ë URI
        o XML ¥Ù¡¼¥¹¤Î¥¢¥É¥ì¥¹Ä¢

-       o LDAP, vCard, JPilot Âбþ

        o ¿·Ã塦̤ÆÉ´ÉÍý
        o ¿·Ã塦̤ÆÉ´ÉÍý

-       o Mew/Wanderlust ¥é¥¤¥¯¤Ê¥­¡¼¥Ð¥¤¥ó¥É
-       o °õºþµ¡Ç½
-       o APOP ǧ¾ÚÂбþ
-       o SMTP AUTH Âбþ
-       o SSL Âбþ (POP3, SMTP, IMAP4rev1)
-       o IPv6 Âбþ
+       o °õºþ
+       o ¥ª¥Õ¥é¥¤¥ó¥â¡¼¥É
+       o ¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ë¤è¤ë¥ê¥â¡¼¥ÈÁàºî
+       o ¥Õ¥©¥ë¥ÀËè¤ÎÀßÄê
+       o LDAP, vCard, JPilot Âбþ

        o ¥É¥é¥Ã¥° & ¥É¥í¥Ã¥× (°ìÉô¼ÂÁõ)
        o ¥É¥é¥Ã¥° & ¥É¥í¥Ã¥× (°ìÉô¼ÂÁõ)

-       o GnuPG Âбþ (¸½ºß¼ÂÁõÃæ)
-       o automake + autoconf Âбþ
+
+¤½¤Î¾
+
+       o autoconf, automake Âбþ

        o gettext ¤Ë¤è¤ë¥á¥Ã¥»¡¼¥¸¤Î¹ñºÝ²½Âбþ
        o gettext ¤Ë¤è¤ë¥á¥Ã¥»¡¼¥¸¤Î¹ñºÝ²½Âбþ

-       o UTF-8 (Unicode) ¤ò´Þ¤à¿¿ô¤Î¥³¡¼¥É¥»¥Ã¥È¤ËÂбþ(libjconv »ÈÍÑ»þ)
+       o UTF-8 (Unicode) ¤ò´Þ¤à¿¿ô¤Îʸ»ú¥³¡¼¥É¤ËÂбþ

 
 Åù¤Ç¤¹¡£
 
 
 Åù¤Ç¤¹¡£
 


@@ -157,6 +182,8 @@ Sylpheed 
 Sylpheed ¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¤È¤­¤Ë ~/.sylpheed/sylpheedrc ¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸
 ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 
 Sylpheed ¤¬µ¯Æ°¤·¤Æ¤¤¤Ê¤¤¤È¤­¤Ë ~/.sylpheed/sylpheedrc ¤ò¥¨¥Ç¥£¥¿¤ÇÊÔ½¸
 ¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 

+allow_jisx0201_kana            JIS X 0201 ¥«¥Ê(Ⱦ³Ñ¥«¥Ê)¤òÁ÷¿®»þ¤Ëµö²Ä¤·¤Þ¤¹¡£
+                               0: off  1: on   [¥Ç¥Õ¥©¥ë¥È: 0]

 bold_font                      ¥Õ¥©¥ë¥À¡¢¥µ¥Þ¥ê¡¢¥Æ¥­¥¹¥È¥Ó¥å¡¼¤Ç»ÈÍѤµ¤ì¤ë
                                ¥Ü¡¼¥ë¥É¥Õ¥©¥ó¥È
 small_font                     ¥µ¥Þ¥ê¥Ó¥å¡¼Åù¤Ç»ÈÍѤµ¤ì¤ë¾®¥Õ¥©¥ó¥È
 bold_font                      ¥Õ¥©¥ë¥À¡¢¥µ¥Þ¥ê¡¢¥Æ¥­¥¹¥È¥Ó¥å¡¼¤Ç»ÈÍѤµ¤ì¤ë
                                ¥Ü¡¼¥ë¥É¥Õ¥©¥ó¥È
 small_font                     ¥µ¥Þ¥ê¥Ó¥å¡¼Åù¤Ç»ÈÍѤµ¤ì¤ë¾®¥Õ¥©¥ó¥È

diff --git a/configure.ac b/configure.ac
index 68bd46e6e6df540daa4da7db7992f3df4f7a0c0e..d983124e1a94c55c9bba53cf09668ac8f7642851 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ PACKAGE=sylpheed
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9
 dnl version number
 MAJOR_VERSION=0
 MINOR_VERSION=9

-MICRO_VERSION=8
+MICRO_VERSION=9

 INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 EXTRA_VERSION=0

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 779799fae9f9a5476aec9d4f5b036b1f8d52cb05..6afa358f71f742c7724f7bcebb5b4406fafaaaf6 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -13,6 +13,7 @@ src/common/plugin.c
 src/common/smtp.c
 src/common/ssl.c
 src/common/ssl_certificate.c
 src/common/smtp.c
 src/common/ssl.c
 src/common/ssl_certificate.c

+src/common/string_match.c

 src/common/utils.c
 src/compose.c
 src/crash.c
 src/common/utils.c
 src/compose.c
 src/crash.c


@@ -80,6 +81,7 @@ src/prefs_actions.c
 src/prefs_common.c
 src/prefs_customheader.c
 src/prefs_display_header.c
 src/prefs_common.c
 src/prefs_customheader.c
 src/prefs_display_header.c

+src/prefs_ext_prog.c

 src/prefs_filtering_action.c
 src/prefs_filtering.c
 src/prefs_folder_item.c
 src/prefs_filtering_action.c
 src/prefs_filtering.c
 src/prefs_folder_item.c


@@ -89,6 +91,7 @@ src/prefs_matcher.c
 src/prefs_spelling.c
 src/prefs_summary_column.c
 src/prefs_template.c
 src/prefs_spelling.c
 src/prefs_summary_column.c
 src/prefs_template.c

+src/prefs_themes.c

 src/prefs_toolbar.c
 src/privacy.c
 src/procmsg.c
 src/prefs_toolbar.c
 src/privacy.c
 src/procmsg.c


@@ -100,7 +103,6 @@ src/setup.c
 src/sgpgme.c
 src/sourcewindow.c
 src/ssl_manager.c
 src/sgpgme.c
 src/sourcewindow.c
 src/ssl_manager.c

-src/string_match.c

 src/summary_search.c
 src/summaryview.c
 src/textview.c
 src/summary_search.c
 src/summaryview.c
 src/textview.c

diff --git a/po/de.po b/po/de.po
index f16828db9bdf311c9db5df20b2006de837578838..e252f271db17faac2f5217164084349ca32293aa 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"

-"POT-Creation-Date: 2003-12-19 10:38+0100\n"
+"POT-Creation-Date: 2004-02-06 01:14+0100\n"

 "PO-Revision-Date: 2003-11-25 17:00+0100\n"
 "Last-Translator: Jens Oberender <j.obi@troja.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "PO-Revision-Date: 2003-11-25 17:00+0100\n"
 "Last-Translator: Jens Oberender <j.obi@troja.net>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"


@@ -36,7 +36,7 @@ msgstr ""
 "`G' Spalte wählen, um das Nachrichtenabholen mit `Hole alle' zu aktivieren."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
 "`G' Spalte wählen, um das Nachrichtenabholen mit `Hole alle' zu aktivieren."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635

-#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -44,7 +44,7 @@ msgstr ""
 msgid "Name"
 msgstr "Name"
 
 msgid "Name"
 msgstr "Name"
 

-#: src/account.c:602 src/prefs_account.c:928
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "Protokoll"
 
 msgid "Protocol"
 msgstr "Protokoll"
 


@@ -90,10 +90,10 @@ msgstr "Auf"
 msgid " Set as default account "
 msgstr " Als Standardaccount setzen "
 
 msgid " Set as default account "
 msgstr " Als Standardaccount setzen "
 

-#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008

 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196

-#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691

 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Schließen"
 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Schließen"


@@ -116,25 +116,27 @@ msgid "Do you really want to delete this account?"
 msgstr "Wollen Sie diesen Account wirklich löschen?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
 msgstr "Wollen Sie diesen Account wirklich löschen?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265

-#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
-#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
-#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
-#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "Ja"
 
 msgid "Yes"
 msgstr "Ja"
 

-#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+Nein"
 
 msgid "+No"
 msgstr "+Nein"
 


@@ -151,7 +153,7 @@ msgstr "Konnte Nachrichtteil nicht holen."
 msgid "Can't get part of multipart message"
 msgstr "Konnte Teile einer mehrteiligen Nachricht nicht holen"
 
 msgid "Can't get part of multipart message"
 msgstr "Konnte Teile einer mehrteiligen Nachricht nicht holen"
 

-#: src/action.c:488
+#: src/action.c:495

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"


@@ -160,7 +162,7 @@ msgstr ""
 "Die gewählte Aktion kann im Verfassen-Fenster nicht verwendet werden\n"
 "weil sie %%f, %%F, %%as oder %%p enthält."
 
 "Die gewählte Aktion kann im Verfassen-Fenster nicht verwendet werden\n"
 "weil sie %%f, %%F, %%as oder %%p enthält."
 

-#: src/action.c:776
+#: src/action.c:783

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -169,7 +171,7 @@ msgstr ""
 "Kommando konnte nicht gestartet werden. Erstellung der Pipe fehlgeschlagen.\n"
 "%s"
 
 "Kommando konnte nicht gestartet werden. Erstellung der Pipe fehlgeschlagen.\n"
 "%s"
 

-#: src/action.c:861
+#: src/action.c:868

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -180,33 +182,33 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1088
+#: src/action.c:1095

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Läuft: %s\n"
 

-#: src/action.c:1092
+#: src/action.c:1099

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Beendet: %s\n"
 

-#: src/action.c:1128
+#: src/action.c:1135

 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 
 msgid "Action's input/output"
 msgstr "Ein-/Ausgabe der Aktion"
 

-#: src/action.c:1174
+#: src/action.c:1181

 msgid " Send "
 msgstr " Senden "
 
 msgid " Send "
 msgstr " Senden "
 

-#: src/action.c:1194
+#: src/action.c:1201

 msgid "Completed %v/%u"
 msgstr "Erledigt %v/%u"
 
 msgid "Completed %v/%u"
 msgstr "Erledigt %v/%u"
 

-#: src/action.c:1204
+#: src/action.c:1211

 msgid "Abort"
 msgstr "Abbrechen"
 
 msgid "Abort"
 msgstr "Abbrechen"
 

-#: src/action.c:1353
+#: src/action.c:1360

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -217,11 +219,11 @@ msgstr ""
 "(`%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "(`%%h' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1358
+#: src/action.c:1365

 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 
 msgid "Action's hidden user argument"
 msgstr "Versteckte Benutzerargumente der Aktion"
 

-#: src/action.c:1362
+#: src/action.c:1369

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -232,7 +234,7 @@ msgstr ""
 "(`%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 
 "(`%%u' wird durch das Argument ersetzt)\n"
 "  %s"
 

-#: src/action.c:1367
+#: src/action.c:1374

 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 
 msgid "Action's user argument"
 msgstr "Benutzerargument der Aktion"
 


@@ -240,7 +242,7 @@ msgstr "Benutzerargument der Aktion"
 msgid "Add to address book"
 msgstr "Adressbuch hinzufügen"
 
 msgid "Add to address book"
 msgstr "Adressbuch hinzufügen"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "Adresse"
 
 msgid "Address"
 msgstr "Adresse"
 


@@ -254,7 +256,7 @@ msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
 msgstr "Wähle Adressbuchablage"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190

-#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193


@@ -262,10 +264,10 @@ msgstr "W
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313


@@ -274,7 +276,7 @@ msgid "OK"
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -282,18 +284,19 @@ msgstr "OK"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314

-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
-#: src/summaryview.c:3453
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "Abbrechen"
 
 msgid "Cancel"
 msgstr "Abbrechen"
 

-#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435

 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Datei"
 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Datei"


@@ -314,8 +317,8 @@ msgstr "/_Datei/Neue _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 
 msgid "/_File/New _Server"
 msgstr "/_Datei/Neuer _Server"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
-#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454

 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Datei/---"
 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Datei/---"


@@ -332,12 +335,12 @@ msgstr "/_Datei/_L
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 

-#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 


@@ -345,17 +348,17 @@ msgstr "/_Bearbeiten"
 msgid "/_Edit/C_ut"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
 msgid "/_Edit/C_ut"
 msgstr "/_Bearbeiten/_Ausschneiden"
 

-#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459

 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 

-#: src/addressbook.c:381 src/compose.c:520
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 

-#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
-#: src/mainwindow.c:452 src/messageview.c:152
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 
 msgid "/_Edit/---"
 msgstr "/_Bearbeiten/---"
 


@@ -391,10 +394,10 @@ msgstr "/_Adresse/_Bearbeiten"
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
-#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
-#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
-#: src/messageview.c:284
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Werkzeuge/---"
 
 msgid "/_Tools/---"
 msgstr "/_Werkzeuge/---"
 


@@ -418,13 +421,13 @@ msgstr "/_Werkzeuge/Exportiere HTML..."
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Werkzeuge/Exportiere LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Werkzeuge/Exportiere LDI_F..."
 

-#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
-#: src/messageview.c:287
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/_Hilfe"
 
 msgid "/_Help"
 msgstr "/_Hilfe"
 

-#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
-#: src/messageview.c:288
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 


@@ -441,19 +444,19 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
-#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
-#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
-#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
-#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
-#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
-#: src/summaryview.c:465
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303
+#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/_Löschen"
 
 msgid "/_Delete"
 msgstr "/_Löschen"
 


@@ -478,7 +481,8 @@ msgid "/_Browse Entry"
 msgstr "/Ü_berfliege Eintrag"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/Ü_berfliege Eintrag"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "Unbekannt"
 
 msgid "Unknown"
 msgstr "Unbekannt"
 


@@ -562,8 +566,8 @@ msgstr "LDAP Suche auf Verlangen abgebrochen"
 msgid "E-Mail address"
 msgstr "E-Mail-Adresse"
 
 msgid "E-Mail address"
 msgstr "E-Mail-Adresse"
 

-#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
-#: src/toolbar.c:1767
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "Adressbuch"
 
 msgid "Address book"
 msgstr "Adressbuch"
 


@@ -577,7 +581,7 @@ msgstr "Name:"
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781

-#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "Löschen"
 
 msgid "Delete"
 msgstr "Löschen"
 


@@ -585,18 +589,18 @@ msgstr "L
 msgid "Lookup"
 msgstr "Suchen"
 
 msgid "Lookup"
 msgstr "Suchen"
 

-#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
-#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "An:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "An:"
 

-#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 


@@ -613,16 +617,18 @@ msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "Adresse(n) wirklich löschen?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
-#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "Nein"
 
 msgid "No"
 msgstr "Nein"
 


@@ -731,7 +737,7 @@ msgstr "Besch
 msgid "Search '%s'"
 msgstr "Suche '%s'"
 
 msgid "Search '%s'"
 msgstr "Suche '%s'"
 

-#: src/addressbook.c:3794 src/prefs_common.c:984
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 


@@ -752,8 +758,8 @@ msgstr "E-Mail Adresse"
 msgid "Group"
 msgstr "Gruppe"
 
 msgid "Group"
 msgstr "Gruppe"
 

-#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
-#: src/prefs_account.c:2126
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Ablage"
 
 msgid "Folder"
 msgstr "Ablage"
 


@@ -832,8 +838,8 @@ msgstr "Kopfzeilenname"
 msgid "Address Count"
 msgstr "Adresszahl"
 
 msgid "Address Count"
 msgstr "Adresszahl"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
-#: src/sgpgme.c:279 src/textview.c:1863
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "Warnung"
 
 msgid "Warning"
 msgstr "Warnung"
 


@@ -862,12 +868,12 @@ msgstr "Allgemeine Adresse"
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 
 msgid "Personal address"
 msgstr "Persönliche Adresse"
 

-#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "Notiz"
 
 msgid "Notice"
 msgstr "Notiz"
 

-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "Fehler"
 
 msgid "Error"
 msgstr "Fehler"
 


@@ -1005,7 +1011,7 @@ msgstr ""
 "(\"%s\" Einstellung abwählen).\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(\"%s\" Einstellung abwählen).\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1123
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "Kein Popup-Fenster bei Empfangsfehlern"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Kein Popup-Fenster bei Empfangsfehlern"
 


@@ -1030,6 +1036,10 @@ msgstr ""
 "\n"
 "Das könnte heißen, der Server der antwortet ist nicht der Bekannte."
 
 "\n"
 "Das könnte heißen, der Server der antwortet ist nicht der Bekannte."
 

+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "(Betreff gelöscht durch RegExp)"
+

 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"
 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"


@@ -1050,355 +1060,355 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:499
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 
 msgid "/_Add..."
 msgstr "/_Hinzufügen..."
 

-#: src/compose.c:500
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/_Entfernen"
 
 msgid "/_Remove"
 msgstr "/_Entfernen"
 

-#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
-#: src/folderview.c:333 src/folderview.c:351
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/_Eigenschaften.."
 
 msgid "/_Properties..."
 msgstr "/_Eigenschaften.."
 

-#: src/compose.c:508
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 
 msgid "/_File/_Attach file"
 msgstr "/_Datei/Datei _anhängen"
 

-#: src/compose.c:509
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 
 msgid "/_File/_Insert file"
 msgstr "/_Datei/Datei _einfügen"
 

-#: src/compose.c:510
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/_Datei/_Unterschrift einfügen"
 

-#: src/compose.c:515
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Bearbeiten/_Rückgängig"
 

-#: src/compose.c:516
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Bearbeiten/_Wiederholen"
 

-#: src/compose.c:518
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Bearbeiten/_Ausschneiden"
 

-#: src/compose.c:521
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Einfügen als _Zitat"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Bearbeiten/Einfügen als _Zitat"
 

-#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lle auswählen"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Bearbeiten/A_lle auswählen"
 

-#: src/compose.c:524
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/_Erweitert"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Bearbeiten/_Erweitert"
 

-#: src/compose.c:525
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen rückwärts"
 

-#: src/compose.c:530
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen vorwärts"
 

-#: src/compose.c:535
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort rückwärts"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort rückwärts"
 

-#: src/compose.c:540
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort vorwärts"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort vorwärts"
 

-#: src/compose.c:545
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/_Erweitert/Zum Zeilenanfang"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Bearbeiten/_Erweitert/Zum Zeilenanfang"
 

-#: src/compose.c:550
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/_Erweitert/Zum Zeilenende"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Bearbeiten/_Erweitert/Zum Zeilenende"
 

-#: src/compose.c:555
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/_Erweitert/Zur vorherigen Zeile"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Bearbeiten/_Erweitert/Zur vorherigen Zeile"
 

-#: src/compose.c:560
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/_Erweitert/Zur nächsten Zeile"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Bearbeiten/_Erweitert/Zur nächsten Zeile"
 

-#: src/compose.c:565
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen rückwärts löschen"
 

-#: src/compose.c:570
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Zeichen vorwärts löschen"
 

-#: src/compose.c:575
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort rückwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort rückwärts löschen"
 

-#: src/compose.c:580
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort vorwärts löschen"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Bearbeiten/_Erweitert/Ein Wort vorwärts löschen"
 

-#: src/compose.c:585
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/_Erweitert/Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Bearbeiten/_Erweitert/Zeile löschen"
 

-#: src/compose.c:590
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/_Erweitert/Ganze Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Bearbeiten/_Erweitert/Ganze Zeile löschen"
 

-#: src/compose.c:595
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/_Erweitert/Bis zum Ende der Zeile löschen"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Bearbeiten/_Erweitert/Bis zum Ende der Zeile löschen"
 

-#: src/compose.c:601
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/_Umbrechen des aktuellen Paragraphen"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Bearbeiten/_Umbrechen des aktuellen Paragraphen"
 

-#: src/compose.c:603
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/_Umbrechen aller langen Zeilen"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Bearbeiten/_Umbrechen aller langen Zeilen"
 

-#: src/compose.c:605
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Bearbeiten mit e_xternem Editor"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Bearbeiten/Bearbeiten mit e_xternem Editor"
 

-#: src/compose.c:608
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 
 msgid "/_Spelling"
 msgstr "/_Rechtschreibung"
 

-#: src/compose.c:609
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Rechtschreibung/Alles _prüfen oder nur Selektiertes"
 

-#: src/compose.c:611
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Rechtschreibung/Alle _falschen Wörter markieren"
 

-#: src/compose.c:613
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter rückwärts prüfen"
 

-#: src/compose.c:615
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Rechtschreibung/Falsche Wörter vorwärts prüfen"
 

-#: src/compose.c:617
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Rechtschreibung/---"
 

-#: src/compose.c:618
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Rechtschreibung/Rechtschreibung konfigurieren"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Rechtschreibung/Rechtschreibung konfigurieren"
 

-#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
-#: src/summaryview.c:457
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/_Ansicht"
 
 msgid "/_View"
 msgstr "/_Ansicht"
 

-#: src/compose.c:623
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/_Ansicht/_Zu"
 
 msgid "/_View/_To"
 msgstr "/_Ansicht/_Zu"
 

-#: src/compose.c:624
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 
 msgid "/_View/_Cc"
 msgstr "/_Ansicht/_Cc"
 

-#: src/compose.c:625
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 
 msgid "/_View/_Bcc"
 msgstr "/_Ansicht/_Bcc"
 

-#: src/compose.c:626
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/_Ansicht/_Antwort an"
 
 msgid "/_View/_Reply to"
 msgstr "/_Ansicht/_Antwort an"
 

-#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
-#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
-#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 
 msgid "/_View/---"
 msgstr "/_Ansicht/---"
 

-#: src/compose.c:628
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/_Ansicht/_Followup to"
 
 msgid "/_View/_Followup to"
 msgstr "/_Ansicht/_Followup to"
 

-#: src/compose.c:630
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 
 msgid "/_View/R_uler"
 msgstr "/_Ansicht/_Lineal"
 

-#: src/compose.c:632
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/A_nhang"
 
 msgid "/_View/_Attachment"
 msgstr "/_Ansicht/A_nhang"
 

-#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/_Nachricht"
 
 msgid "/_Message"
 msgstr "/_Nachricht"
 

-#: src/compose.c:635
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/_Nachricht/_Senden"
 
 msgid "/_Message/_Send"
 msgstr "/_Nachricht/_Senden"
 

-#: src/compose.c:637
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 
 msgid "/_Message/Send _later"
 msgstr "/_Nachricht/S_päter senden"
 

-#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
-#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
-#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
-#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 
 msgid "/_Message/---"
 msgstr "/_Nachricht/---"
 

-#: src/compose.c:640
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/_Nachricht/Speichern in Ent_wurfablage"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/_Nachricht/Speichern in Ent_wurfablage"
 

-#: src/compose.c:642
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/_Nachricht/Speichern und weiterbearbeiten"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/_Nachricht/Speichern und weiterbearbeiten"
 

-#: src/compose.c:646
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/_Nachricht/_An"
 
 msgid "/_Message/_To"
 msgstr "/_Nachricht/_An"
 

-#: src/compose.c:647
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/_Nachricht/_Cc"
 
 msgid "/_Message/_Cc"
 msgstr "/_Nachricht/_Cc"
 

-#: src/compose.c:648
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/_Nachricht/_Bcc"
 
 msgid "/_Message/_Bcc"
 msgstr "/_Nachricht/_Bcc"
 

-#: src/compose.c:649
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/_Nachricht/_Antwort an"
 
 msgid "/_Message/_Reply to"
 msgstr "/_Nachricht/_Antwort an"
 

-#: src/compose.c:651
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/_Nachricht/_Followup to"
 
 msgid "/_Message/_Followup to"
 msgstr "/_Nachricht/_Followup to"
 

-#: src/compose.c:653
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/_Nachricht/An_hängen"
 
 msgid "/_Message/_Attach"
 msgstr "/_Nachricht/An_hängen"
 

-#: src/compose.c:657
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/_Nachricht/Digital _unterschreiben"
 
 msgid "/_Message/Si_gn"
 msgstr "/_Nachricht/Digital _unterschreiben"
 

-#: src/compose.c:658
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/_Nachricht/_Verschlüsseln"
 
 msgid "/_Message/_Encrypt"
 msgstr "/_Nachricht/_Verschlüsseln"
 

-#: src/compose.c:659
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/_Nachricht/Modus/MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/_Nachricht/Modus/MIME"
 

-#: src/compose.c:660
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/_Nachricht/Modus/Inline"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/_Nachricht/Modus/Inline"
 

-#: src/compose.c:663
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/_Nachricht/_Priorität"
 
 msgid "/_Message/_Priority"
 msgstr "/_Nachricht/_Priorität"
 

-#: src/compose.c:664
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "/_Nachricht/Priorität/_Höchste"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "/_Nachricht/Priorität/_Höchste"
 

-#: src/compose.c:665
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Nachricht/Priorität/H_och"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Nachricht/Priorität/H_och"
 

-#: src/compose.c:666
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/_Nachricht/Priorität/_Normal"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/_Nachricht/Priorität/_Normal"
 

-#: src/compose.c:667
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Nachricht/Priorität/Nie_drig"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Nachricht/Priorität/Nie_drig"
 

-#: src/compose.c:668
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Nachricht/Priorität/Nied_rigste"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Nachricht/Priorität/Nied_rigste"
 

-#: src/compose.c:670
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Nachricht/_Empfangsbestätigung fordern"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Nachricht/_Empfangsbestätigung fordern"
 

-#: src/compose.c:671
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/_Nachricht/Entferne Referenz"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/_Nachricht/Entferne Referenz"
 

-#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 

-#: src/compose.c:673
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/_Werkzeuge/_Lineal anzeigen"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Werkzeuge/_Lineal anzeigen"
 

-#: src/compose.c:674 src/messageview.c:262
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeuge/_Adressbuch"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Werkzeuge/_Adressbuch"
 

-#: src/compose.c:675
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/_Werkzeuge/_Vorlagen"
 
 msgid "/_Tools/_Template"
 msgstr "/_Werkzeuge/_Vorlagen"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeuge/A_ktionen"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Werkzeuge/A_ktionen"
 

-#: src/compose.c:1435
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "Antwort an:"
 
 msgid "Reply-To:"
 msgstr "Antwort an:"
 

-#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Newsgroups:"
 

-#: src/compose.c:1441
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "Nachfolgend an:"
 
 msgid "Followup-To:"
 msgstr "Nachfolgend an:"
 

-#: src/compose.c:1741
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 
 msgid "Quote mark format error."
 msgstr "Zitatzeichen Formatfehler."
 

-#: src/compose.c:1757
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "Nachrichten Antwort-/Weiterleitungs-Formatfehler."
 
 msgid "Message reply/forward format error."
 msgstr "Nachrichten Antwort-/Weiterleitungs-Formatfehler."
 

-#: src/compose.c:2099
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Datei %s ist leer."
 

-#: src/compose.c:2103
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Kann %s nicht lesen."
 

-#: src/compose.c:2141
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 

-#: src/compose.c:2229
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachrichte"
 
 msgid "Encrypted message"
 msgstr "Verschlüsselte Nachrichte"
 

-#: src/compose.c:2230
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1406,21 +1416,21 @@ msgstr ""
 "Kann verschlüsselte Nachricht nicht wieder bearbeiten. \n"
 "Verschlüsselten Teil enfernen?"
 
 "Kann verschlüsselte Nachricht nicht wieder bearbeiten. \n"
 "Verschlüsselten Teil enfernen?"
 

-#: src/compose.c:2891
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 
 msgid " [Edited]"
 msgstr " [Bearbeitet]"
 

-#: src/compose.c:2893
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Verfasse Nachricht%s"
 

-#: src/compose.c:2896
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "Verfasse Nachricht%s"
 

-#: src/compose.c:2920 src/compose.c:3169
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1428,24 +1438,24 @@ msgstr ""
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Account vor dem Senden."
 
 "Account zum Versenden von E-Mails, wurde nicht angegeben.\n"
 "Bitte wählen Sie einen E-Mail-Account vor dem Senden."
 

-#: src/compose.c:3067
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 
 msgid "Recipient is not specified."
 msgstr "Empfänger nicht angegeben"
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
-#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "Senden"
 
 msgid "Send"
 msgstr "Senden"
 

-#: src/compose.c:3076
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Betreff ist leer. Trotzdem senden?"
 

-#: src/compose.c:3097
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "Konnte Nachricht für das Senden nicht zwischenspeichern"
 
 msgid "Could not queue message for sending"
 msgstr "Konnte Nachricht für das Senden nicht zwischenspeichern"
 

-#: src/compose.c:3102
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1454,16 +1464,16 @@ msgstr ""
 "gesendet werden. Benutzen Sie \"Sende wartende Nachrichten\"\n"
 "aus dem Hauptmenu zum wiederholen."
 
 "gesendet werden. Benutzen Sie \"Sende wartende Nachrichten\"\n"
 "aus dem Hauptmenu zum wiederholen."
 

-#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Fehler beim Senden der Nachricht an %s ."
 

-#: src/compose.c:3199
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "Einreihen"
 
 msgid "Queueing"
 msgstr "Einreihen"
 

-#: src/compose.c:3200
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1471,26 +1481,26 @@ msgstr ""
 "Fehler aufgetreten beim Senden der Nachricht.\n"
 "Soll die Nachricht in die Queue-Ablage?"
 
 "Fehler aufgetreten beim Senden der Nachricht.\n"
 "Soll die Nachricht in die Queue-Ablage?"
 

-#: src/compose.c:3206
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 
 msgid "Can't queue the message."
 msgstr "Nachricht kann nicht eingereiht werden."
 

-#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 
 msgid "Error occurred while sending the message."
 msgstr "Fehler aufgetreten beim Senden der Nachricht."
 

-#: src/compose.c:3222
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "Kann die Nachricht nicht in Gesendet speichern."
 
 msgid "Can't save the message to Sent."
 msgstr "Kann die Nachricht nicht in Gesendet speichern."
 

-#: src/compose.c:3467
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Konnte keinen Schlüssel finden, der mit der aktuellen Schlüssel-ID `%s' "
 "verbunden ist."
 
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "Konnte keinen Schlüssel finden, der mit der aktuellen Schlüssel-ID `%s' "
 "verbunden ist."
 

-#: src/compose.c:3573
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1501,59 +1511,59 @@ msgstr ""
 "%s nach %s.\n"
 "Trotzdem senden?"
 
 "%s nach %s.\n"
 "Trotzdem senden?"
 

-#: src/compose.c:3836
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "Kein Account zum Emailversenden vorhanden!"
 
 msgid "No account for sending mails available!"
 msgstr "Kein Account zum Emailversenden vorhanden!"
 

-#: src/compose.c:3846
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "Kein Account zum Newsversenden vorhanden!"
 
 msgid "No account for posting news available!"
 msgstr "Kein Account zum Newsversenden vorhanden!"
 

-#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "Von:"
 
 msgid "From:"
 msgstr "Von:"
 

-#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "MIME-Typ"
 
 msgid "MIME type"
 msgstr "MIME-Typ"
 

-#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "Größe"
 
 msgid "Size"
 msgstr "Größe"
 

-#: src/compose.c:4828
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 
 msgid "Save Message to "
 msgstr "Nachricht speichern unter "
 

-#: src/compose.c:4848 src/prefs_filtering_action.c:420
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr "Auswählen ..."
 
 msgid "Select ..."
 msgstr "Auswählen ..."
 

-#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Kopfzeilen"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Kopfzeilen"
 

-#: src/compose.c:4986
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "Anhänge"
 
 msgid "Attachments"
 msgstr "Anhänge"
 

-#: src/compose.c:4988
+#: src/compose.c:4984

 msgid "Others"
 msgstr "Weitere"
 
 msgid "Others"
 msgstr "Weitere"
 

-#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Betreff:"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Betreff:"
 

-#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "Keine"
 
 msgid "None"
 msgstr "Keine"
 

-#: src/compose.c:5247
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1597,24 +1607,26 @@ msgstr ""
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 
 "Prozess terminieren?\n"
 "Prozessgruppen ID: %d"
 

-#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "Offlinewarnung"
 
 msgid "Offline warning"
 msgstr "Offlinewarnung"
 

-#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem weitermachen?"
 
 msgid "You're working offline. Override?"
 msgstr "Sie arbeiten offline. Trotzdem weitermachen?"
 

-#: src/compose.c:6475 src/compose.c:6496
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Wähle Datei"
 
 msgid "Select file"
 msgstr "Wähle Datei"
 

-#: src/compose.c:6510
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Datei '%s' konnte nicht gelesen werden."
 

-#: src/compose.c:6512
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1623,36 +1635,36 @@ msgstr ""
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 
 "Die Datei '%s' enthält ungültige Zeichen\n"
 "für die aktuelle Kodierung, Einfügung kann fehlerhaft sein."
 

-#: src/compose.c:6551
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 
 msgid "Discard message"
 msgstr "Nachricht verwerfen"
 

-#: src/compose.c:6552
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 
 msgid "This message has been modified. discard it?"
 msgstr "Diese Nachricht wurde geändert. Verwerfen?"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "Verwerfen"
 
 msgid "Discard"
 msgstr "Verwerfen"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "zum Entwurf"
 
 msgid "to Draft"
 msgstr "zum Entwurf"
 

-#: src/compose.c:6588
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Vorlage `%s' anwenden?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Wollen Sie die Vorlage `%s' anwenden?"
 

-#: src/compose.c:6590
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "Vorlage anwenden"
 
 msgid "Apply template"
 msgstr "Vorlage anwenden"
 

-#: src/compose.c:6591
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Ersetze"
 
 msgid "Replace"
 msgstr "Ersetze"
 

-#: src/compose.c:6591 src/toolbar.c:425
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "Einfügen"
 
 msgid "Insert"
 msgstr "Einfügen"
 


@@ -1789,7 +1801,7 @@ msgid " Check File "
 msgstr " Überprüfe Datei "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr " Überprüfe Datei "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Datei"
 
 msgid "File"
 msgstr "Datei"
 


@@ -1845,12 +1857,12 @@ msgstr "Bearbeite Ablage"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 

-#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
-#: src/folderview.c:2215
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "Neue Ablage"
 
 msgid "New folder"
 msgstr "Neue Ablage"
 

-#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 


@@ -1868,7 +1880,7 @@ msgstr "Bearbeite JPilot Eintrag"
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "


@@ -2105,7 +2117,7 @@ msgstr ""
 "Die maximale Zahl von Einträgen zu im Suchresultat zurückgeliefert werden "
 "sollen."
 
 "Die maximale Zahl von Einträgen zu im Suchresultat zurückgeliefert werden "
 "sollen."
 

-#: src/editldap.c:751 src/prefs_account.c:764
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "Grundeinstellungen"
 
 msgid "Basic"
 msgstr "Grundeinstellungen"
 


@@ -2113,7 +2125,7 @@ msgstr "Grundeinstellungen"
 msgid "Search"
 msgstr "Suchen"
 
 msgid "Search"
 msgstr "Suchen"
 

-#: src/editldap.c:753 src/summaryview.c:653
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "Erweitert"
 
 msgid "Extended"
 msgstr "Erweitert"
 


@@ -2191,11 +2203,11 @@ msgstr "HTML-Ausgabedatei"
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
 msgid "Stylesheet"
 msgstr "Stylesheet"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "Standard"
 
 msgid "Default"
 msgstr "Standard"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "Voll"
 
 msgid "Full"
 msgstr "Voll"
 


@@ -2256,7 +2268,7 @@ msgid "Prev"
 msgstr "Vorherige"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Vorherige"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:384 src/toolbar.c:475
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "Nächste"
 
 msgid "Next"
 msgstr "Nächste"
 


@@ -2443,7 +2455,7 @@ msgid "Exporting file:"
 msgstr "Exportiere Datei:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Exportiere Datei:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr " Auswählen... "
 
 msgid " Select... "
 msgstr " Auswählen... "
 


@@ -2479,32 +2491,32 @@ msgstr "Name zu lang."
 msgid "Not specified."
 msgstr "Nicht angegeben."
 
 msgid "Not specified."
 msgstr "Nicht angegeben."
 

-#: src/folder.c:1011
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "Inbox"
 
 msgid "Inbox"
 msgstr "Inbox"
 

-#: src/folder.c:1015
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "Gesendet"
 
 msgid "Sent"
 msgstr "Gesendet"
 

-#: src/folder.c:1019
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "Queue"
 
 msgid "Queue"
 msgstr "Queue"
 

-#: src/folder.c:1023
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "Trash"
 
 msgid "Trash"
 msgstr "Trash"
 

-#: src/folder.c:1027
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "Entwürfe"
 
 msgid "Drafts"
 msgstr "Entwürfe"
 

-#: src/folder.c:1240
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeite (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Bearbeite (%s)...\n"
 

-#: src/folder.c:2028
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Verschiebe %s nach %s...\n"


@@ -2513,140 +2525,158 @@ msgstr "Verschiebe %s nach %s...\n"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
 msgid "Select folder"
 msgstr "Wähle Ablage"
 

-#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 

-#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 

-#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "/Ver_schiebe Ablage"
 
 msgid "/M_ove folder..."
 msgstr "/Ver_schiebe Ablage"
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 

-#: src/folderview.c:289 src/folderview.c:310
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "/Entferne _Mailbox"
 
 msgid "/Remove _mailbox"
 msgstr "/Entferne _Mailbox"
 

-#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
-#: src/folderview.c:352
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgstr "/_Verarbeiten..."
 
 msgid "/_Processing..."
 msgstr "/_Verarbeiten..."
 

-#: src/folderview.c:293
-msgid "/_Scoring..."
-msgstr "/_Benotung..."
-
-#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/Markiere alle als gelesen"
 
 msgid "/Mark all _read"
 msgstr "/Markiere alle als gelesen"
 

-#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten _prüfen"
 
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten _prüfen"
 

-#: src/folderview.c:308 src/folderview.c:328
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/_Ablagenbaum erneuern"
 
 msgid "/R_ebuild folder tree"
 msgstr "/_Ablagenbaum erneuern"
 

-#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/_Durchsuche Ablage"
 
 msgid "/_Search folder..."
 msgstr "/_Durchsuche Ablage"
 

-#: src/folderview.c:330
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/Down_load"
+
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Entferne _IMAP4-Account"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Entferne _IMAP4-Account"
 

-#: src/folderview.c:341
+#: src/folderview.c:346

 msgid "/_Subscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 

-#: src/folderview.c:343
+#: src/folderview.c:348

 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 

-#: src/folderview.c:348
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/Newsaccount _entfernen"
 
 msgid "/Remove _news account"
 msgstr "/Newsaccount _entfernen"
 

-#: src/folderview.c:385
+#: src/folderview.c:392

 msgid "New"
 msgstr "Neu"
 
 msgid "New"
 msgstr "Neu"
 

-#: src/folderview.c:386
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "Ungelesen"
 
 msgid "Unread"
 msgstr "Ungelesen"
 

-#: src/folderview.c:387
+#: src/folderview.c:394

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:630
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 

-#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 

-#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 

-#: src/folderview.c:835
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr "Erneuere Ablagenbaum..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Erneuere Ablagenbaum..."
 

-#: src/folderview.c:918
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "Auf neue Nachrichten prüfen in allen Ablagen..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Auf neue Nachrichten prüfen in allen Ablagen..."
 

-#: src/folderview.c:1696
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Öffne Ablage %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Öffne Ablage %s..."
 

-#: src/folderview.c:1708
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "Ablage konnte nicht geöffnet werden."
 
 msgid "Folder could not be opened."
 msgstr "Ablage konnte nicht geöffnet werden."
 

-#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
+#: src/folderview.c:1841
+#, c-format
+msgid "Downloading messages in %s ..."
+msgstr "Lade Nachrichten herunter in %s ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "Offline"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Sie sind offline. Online zu gehen?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "Fehler aufgetreten beim Herunterladen der Nachrichten in `%s'."
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "NeueAblage"
 
 msgid "NewFolder"
 msgstr "NeueAblage"
 

-#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kann nicht in den Ablagenamen integriert werden."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kann nicht in den Ablagenamen integriert werden."
 

-#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
-#: src/folderview.c:2075 src/folderview.c:2236
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage `%s' existiert bereits."
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage `%s' existiert bereits."
 

-#: src/folderview.c:1920 src/folderview.c:2243
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage nicht erstellen `%s'."
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage nicht erstellen `%s'."
 

-#: src/folderview.c:1987 src/folderview.c:2065
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für `%s':"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für `%s':"
 

-#: src/folderview.c:1988 src/folderview.c:2067
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 

-#: src/folderview.c:2126
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2655,16 +2685,16 @@ msgstr ""
 "Alle Ablagen und Nachrichten in `%s' werden gelöscht.\n"
 "Wollen Sie das wirklich?"
 
 "Alle Ablagen und Nachrichten in `%s' werden gelöscht.\n"
 "Wollen Sie das wirklich?"
 

-#: src/folderview.c:2128
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "Ablage löschen"
 
 msgid "Delete folder"
 msgstr "Ablage löschen"
 

-#: src/folderview.c:2145
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage nicht entfernen `%s'."
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Kann Ablage nicht entfernen `%s'."
 

-#: src/folderview.c:2181
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2673,11 +2703,11 @@ msgstr ""
 "Mailbox `%s' wirklich entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
 "Mailbox `%s' wirklich entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 

-#: src/folderview.c:2183
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 

-#: src/folderview.c:2216
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2687,56 +2717,56 @@ msgstr ""
 "(um eine neue Ablage für Unterablagen zu erstellen\n"
 " `/' an Ende des Namens anhängen)"
 
 "(um eine neue Ablage für Unterablagen zu erstellen\n"
 " `/' an Ende des Namens anhängen)"
 

-#: src/folderview.c:2273
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account `%s' wirklich löschen?"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account `%s' wirklich löschen?"
 

-#: src/folderview.c:2274
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 

-#: src/folderview.c:2408
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup `%s' wirklich löschen?"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup `%s' wirklich löschen?"
 

-#: src/folderview.c:2409
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Newsaccount `%s' wirklich löschen?"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Newsaccount `%s' wirklich löschen?"
 

-#: src/folderview.c:2447
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "Newsaccount löschen"
 
 msgid "Delete news account"
 msgstr "Newsaccount löschen"
 

-#: src/folderview.c:2543
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Verschiebe %s nach %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Verschiebe %s nach %s..."
 

-#: src/folderview.c:2572
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind gleich."
 
 msgid "Source and destination are the same."
 msgstr "Ursprung und Ziel sind gleich."
 

-#: src/folderview.c:2575
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "Eine Ablage kann nicht in eines ihrer Kinder verschoben werden."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Eine Ablage kann nicht in eines ihrer Kinder verschoben werden."
 

-#: src/folderview.c:2578
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr ""
 "Ablagen können nicht zwischen verschiedenen Mailboxen verschoben werden"
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr ""
 "Ablagen können nicht zwischen verschiedenen Mailboxen verschoben werden"
 

-#: src/folderview.c:2581
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 
 msgid "Move failed!"
 msgstr "Verschieben fehlgeschlagen!"
 

-#: src/folderview.c:2625 src/summaryview.c:4050
+#: src/folderview.c:2704 src/summaryview.c:4013

 msgid "Processing configuration"
 msgstr "Verarbeite Konfiguration"
 
 msgid "Processing configuration"
 msgstr "Verarbeite Konfiguration"
 


@@ -2788,7 +2818,7 @@ msgstr "unbekannt"
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Gruppenliste nicht empfangen."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Gruppenliste nicht empfangen."
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1178
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Fertig."
 
 msgid "Done."
 msgstr "Fertig."
 


@@ -2987,7 +3017,7 @@ msgstr ""
 "Die Rechtschreibprüfung konnte das Wörterbuch nicht ändern.\n"
 "%s"
 
 "Die Rechtschreibprüfung konnte das Wörterbuch nicht ändern.\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr "Abcdef"
 
 msgid "Abcdef"
 msgstr "Abcdef"
 


@@ -3003,7 +3033,7 @@ msgstr "W
 msgid "Plugins"
 msgstr "Plugins"
 
 msgid "Plugins"
 msgstr "Plugins"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "Beschreibung"
 
 msgid "Description"
 msgstr "Beschreibung"
 


@@ -3046,6 +3076,7 @@ msgid "Signer"
 msgstr "Unterzeichner"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "Unterzeichner"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Name: "
 
 msgid "Name: "
 msgstr "Name: "
 


@@ -3117,11 +3148,11 @@ msgstr "Zeige Zertifikate"
 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 
 msgid "Changed SSL Certificate"
 msgstr "Geändertes SSL-Zertifikat"
 

-#: src/headerview.c:181 src/summaryview.c:2398
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(Kein Von)"
 
 msgid "(No From)"
 msgstr "(Kein Von)"
 

-#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 


@@ -3170,105 +3201,105 @@ msgstr "kann Ablage nicht schliessen\n"
 msgid "root folder %s does not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
 msgid "root folder %s does not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 

-#: src/imap.c:1415 src/imap.c:1423
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST aufgetreten.\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST aufgetreten.\n"
 

-#: src/imap.c:1651
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 

-#: src/imap.c:1673
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 

-#: src/imap.c:1742
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann %s nicht in %s umbenennen\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann %s nicht in %s umbenennen\n"
 

-#: src/imap.c:1804
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 

-#: src/imap.c:1842
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 

-#: src/imap.c:1850
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 

-#: src/imap.c:1872
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 

-#: src/imap.c:1928
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Kann IMAP Sitzung nicht herstellen mit: %s\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Kann IMAP Sitzung nicht herstellen mit: %s\n"
 

-#: src/imap.c:1950
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 

-#: src/imap.c:1957
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung nicht herstellen: %s:%d\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung nicht herstellen: %s:%d\n"
 

-#: src/imap.c:2047
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "kann Namensbereich nicht empfangen\n"
 
 msgid "can't get namespace\n"
 msgstr "kann Namensbereich nicht empfangen\n"
 

-#: src/imap.c:2480
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 

-#: src/imap.c:2620
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 Beglaubigung fehlgeschlagen.\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 Beglaubigung fehlgeschlagen.\n"
 

-#: src/imap.c:2637
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 

-#: src/imap.c:2953
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 

-#: src/imap.c:2960
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(sende Datei...)"
 
 msgid "(sending file...)"
 msgstr "(sende Datei...)"
 

-#: src/imap.c:3002
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht an %s anhängen\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht an %s anhängen\n"
 

-#: src/imap.c:3084
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 

-#: src/imap.c:3134
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 

-#: src/imap.c:3151
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 

-#: src/imap.c:3164
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 

-#: src/imap.c:3419
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv-Konvertierung schlug fehl: UTF-7 zu %s\n"


@@ -3349,7 +3380,7 @@ msgstr "Zu importierende LDIF-Datei w
 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:765 src/summaryview.c:472
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -3448,134 +3479,134 @@ msgstr "W
 msgid "Import Pine file into Address Book"
 msgstr "Importiere Pine-Datei in Adressbuch"
 
 msgid "Import Pine file into Address Book"
 msgstr "Importiere Pine-Datei in Adressbuch"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 
 msgid "Retrieving new messages"
 msgstr "Empfange neue Nachricht"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "Warten"
 
 msgid "Standby"
 msgstr "Warten"
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "Abgebrochen"
 
 msgid "Cancelled"
 msgstr "Abgebrochen"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "Empfange"
 
 msgid "Retrieving"
 msgstr "Empfange"
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Erledigt (%d Nachricht(en) (%s) empfangen)"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Erledigt (%d Nachricht(en) (%s) empfangen)"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Erledigt (keine neuen Nachrichten)"
 
 msgid "Done (no new messages)"
 msgstr "Erledigt (keine neuen Nachrichten)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
 msgid "Auth failed"
 msgstr "Authentifizierung fehlgeschlagen"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "Gesperrt"
 
 msgid "Locked"
 msgstr "Gesperrt"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autorisierung mit %s auf %s fehlgeschlagen"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autorisierung mit %s auf %s fehlgeschlagen"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Fertig (%d neue Nachricht(en))"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Fertig (%d neue Nachricht(en))"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 
 msgid "Finished (no new messages)"
 msgstr "Fertig (keine neuen Nachrichten)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "Einige Fehler beim Empfangen der Mail aufgetreten."
 
 msgid "Some errors occurred while getting mail."
 msgstr "Einige Fehler beim Empfangen der Mail aufgetreten."
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Empfange neue Nachrichten"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Verbinde mit POP3-Server: %s..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Keine Verbindung mit POP3-Server: %s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "Authentifiziere..."
 
 msgid "Authenticating..."
 msgstr "Authentifiziere..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Empfange Nachrichten von %s..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Empfange Nachrichten von %s..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (UIDL)..."
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Bekomme Anzahl neuer Nachrichten (LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "Lösche Nachricht %d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "Beenden"
 
 msgid "Quitting"
 msgstr "Beenden"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Empfange (%d Nachricht(en) (%s) empfangen)"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 
 msgid "Error occurred while processing mail."
 msgstr "Fehler beim Verarbeiten der E-Mail."
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -3584,27 +3615,27 @@ msgstr ""
 "Fehler beim Verarbeiten der E-Mail aufgetreten:\n"
 "%s"
 
 "Fehler beim Verarbeiten der E-Mail aufgetreten:\n"
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "Kein Festplattenplatz mehr frei."
 
 msgid "No disk space left."
 msgstr "Kein Festplattenplatz mehr frei."
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 
 msgid "Can't write file."
 msgstr "Kann Datei nicht schreiben."
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "Socketfehler"
 
 msgid "Socket error."
 msgstr "Socketfehler"
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Verbindung vom Partner getrennt."
 
 msgid "Connection closed by the remote host."
 msgstr "Verbindung vom Partner getrennt."
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "Mailbox ist gesperrt"
 
 msgid "Mailbox is locked."
 msgstr "Mailbox ist gesperrt"
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3613,11 +3644,11 @@ msgstr ""
 "Mailbox ist gesperrt:\n"
 "%s"
 
 "Mailbox ist gesperrt:\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 
 msgid "Authentication failed."
 msgstr "Beglaubigung fehlgeschlagen."
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3626,7 +3657,7 @@ msgstr ""
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 
 "Beglaubigung fehlgeschlagen:\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "Verbindung abgebrochen\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Verbindung abgebrochen\n"
 


@@ -3643,7 +3674,7 @@ msgstr "Kennwort eingeben"
 msgid "Nick Name"
 msgstr "Spitzname"
 
 msgid "Nick Name"
 msgstr "Spitzname"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3652,20 +3683,20 @@ msgstr ""
 "Datei `%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
 "Datei `%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread wird von glib nicht unterstützt.\n"
 

-#: src/main.c:514
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 

-#: src/main.c:517
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 

-#: src/main.c:518
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3676,23 +3707,23 @@ msgstr ""
 "Datei/-en\n"
 "                         angehangen"
 
 "Datei/-en\n"
 "                         angehangen"
 

-#: src/main.c:521
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 

-#: src/main.c:522
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 

-#: src/main.c:523
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sende alle zwischengespeicherten Nachrichten"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sende alle zwischengespeicherten Nachrichten"
 

-#: src/main.c:524
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Anzahl neuer Nachrichten"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Anzahl neuer Nachrichten"
 

-#: src/main.c:525
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3700,751 +3731,760 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt den Status von jeder Ablage"
 
 "  --status-full [Ablage]...\n"
 "                         zeigt den Status von jeder Ablage"
 

-#: src/main.c:527
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online               in den Onlinemodus schalten"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               in den Onlinemodus schalten"
 

-#: src/main.c:528
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              in den Offlinemodus schalten"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              in den Offlinemodus schalten"
 

-#: src/main.c:529
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                Debugmodus"
 

-#: src/main.c:530
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 

-#: src/main.c:531
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 

-#: src/main.c:532
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt Konfigurationsverzeichnis aus"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           gibt Konfigurationsverzeichnis aus"
 

-#: src/main.c:569 src/summaryview.c:5198
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeite (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Bearbeite (%s)..."
 

-#: src/main.c:572
+#: src/main.c:571

 msgid "top level folder"
 msgstr "Oberste Ablage"
 
 msgid "top level folder"
 msgstr "Oberste Ablage"
 

-#: src/main.c:637
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Verfasste Nachricht existiert."
 
 msgid "Composing message exists."
 msgstr "Verfasste Nachricht existiert."
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Draft them"
 msgstr "Zum Entwurf"
 
 msgid "Draft them"
 msgstr "Zum Entwurf"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Discard them"
 msgstr "Verwerfen"
 
 msgid "Discard them"
 msgstr "Verwerfen"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "Nicht beenden"
 
 msgid "Don't quit"
 msgstr "Nicht beenden"
 

-#: src/main.c:652
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 

-#: src/main.c:653
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 

-#: src/main.c:898
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler aufgetreten beim Senden der eingereihten Nachricht."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Fehler aufgetreten beim Senden der eingereihten Nachricht."
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/_Datei/_Ablage"
 
 msgid "/_File/_Folder"
 msgstr "/_Datei/_Ablage"
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/_Ablage/_Neue Ablage erstellen..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Datei/_Ablage/_Neue Ablage erstellen..."
 

-#: src/mainwindow.c:429
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/_Ablage/Ablage _umbenennen..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Datei/_Ablage/Ablage _umbenennen..."
 

-#: src/mainwindow.c:430
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/_Ablage/Ablage _löschen"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Datei/_Ablage/Ablage _löschen"
 

-#: src/mainwindow.c:431
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/_Datei/_Ablage/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/_Datei/_Ablage/---"
 

-#: src/mainwindow.c:432
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Datei/_Ablage/Auf neue Nachrichten in allen Ablagen _prüfen"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Datei/_Ablage/Auf neue Nachrichten in allen Ablagen _prüfen"
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/_Datei/_Mailbox hinzufügen"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Datei/_Mailbox hinzufügen"
 

-#: src/mainwindow.c:435
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Datei/_Mailbox hinzufügen/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Datei/_Mailbox hinzufügen/MH..."
 

-#: src/mainwindow.c:436
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Datei/_Importiere Mbox-Datei..."
 

-#: src/mainwindow.c:437
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Datei/_Exportiere in Mbox-Datei..."
 

-#: src/mainwindow.c:438
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/_Datei/Papierkorb _leeren"
 
 msgid "/_File/Empty _trash"
 msgstr "/_Datei/Papierkorb _leeren"
 

-#: src/mainwindow.c:440 src/messageview.c:144
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Datei/Speichern _als..."
 

-#: src/mainwindow.c:441 src/messageview.c:145
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 
 msgid "/_File/_Print..."
 msgstr "/_Datei/_Drucken..."
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:453

 msgid "/_File/_Work offline"
 msgstr "/_Datei/Ar_beite offline"
 
 msgid "/_File/_Work offline"
 msgstr "/_Datei/Ar_beite offline"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 
 msgid "/_File/E_xit"
 msgstr "/_Datei/_Beenden"
 

-#: src/mainwindow.c:451
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Wähle Thread"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Bearbeiten/_Wähle Thread"
 

-#: src/mainwindow.c:453 src/messageview.c:153
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Suche in aktueller Nachricht..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Bearbeiten/_Suche in aktueller Nachricht..."
 

-#: src/mainwindow.c:455
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "/_Bearbeiten/S_uchen in Ablage..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Bearbeiten/S_uchen in Ablage..."
 

-#: src/mainwindow.c:457
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/_Zeigen oder Verstecken"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Ansicht/_Zeigen oder Verstecken"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Ablagenbaum"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Ablagenbaum"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Nachrichtenansicht"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Nachrichtenansicht"
 

-#: src/mainwindow.c:462
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/Icon _und Text"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/Icon _und Text"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Icon"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Icon"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Text"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Text"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Keine"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Toolbar/_Keine"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Statuszeile"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ansicht/_Zeigen oder Verstecken/_Statuszeile"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Separater _Ablagebaum"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ansicht/Separater _Ablagebaum"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/_Ansicht/Separate _Nachrichtenansicht"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/_Ansicht/Separate _Nachrichtenansicht"
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/_Ansicht/S_ortieren"
 
 msgid "/_View/_Sort"
 msgstr "/_Ansicht/S_ortieren"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ansicht/_Sortieren/nach _Nummer"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ansicht/_Sortieren/nach _Datum"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ansicht/_Sortieren/nach _Absender"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Empfänger"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ansicht/_Sortieren/nach _Empfänger"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ansicht/_Sortieren/nach _Betreff"
 

-#: src/mainwindow.c:485
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbe"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ansicht/_Sortieren/nach _Farbe"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ansicht/_Sortieren/nach _Markierung"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/_Ansicht/_Sortieren/nach _Status"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Ansicht/_Sortieren/nach _Status"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach _Anhang"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ansicht/_Sortieren/nach _Anhang"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Ansicht/_Sortieren/nach _Größe"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 

-#: src/mainwindow.c:493
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ansicht/_Sortieren/nach _Ungelesen"
 

-#: src/mainwindow.c:494 src/mainwindow.c:497
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Ansicht/_Sortieren/---"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ansicht/_Sortieren/Aufsteigend"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ansicht/_Sortieren/Absteigend"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff aufbauen"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ansicht/_Sortieren/Threads nach Betreff aufbauen"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Mit Threads"
 
 msgid "/_View/Th_read view"
 msgstr "/_Ansicht/_Mit Threads"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads ausklappen"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ansicht/Alle Threads ausklappen"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads einklappen"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ansicht/Alle Threads einklappen"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/_Ansicht/_Verstecke gelesene Nachrichten"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Ansicht/_Verstecke gelesene Nachrichten"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/_Ansicht/Setze anzuzeigende _Informationen..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/_Ansicht/Setze anzuzeigende _Informationen..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 
 msgid "/_View/_Go to"
 msgstr "/_Ansicht/Gehe _zu"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorherige Nachricht"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ansicht/Gehe _zu/_Vorherige Nachricht"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächste Nachricht"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ansicht/Gehe _zu/_Nächste Nachricht"
 

-#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/mainwindow.c:523 src/mainwindow.c:528
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/Gehe _zu/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Ansicht/Gehe _zu/---"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _ungelesener Nachricht"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger _ungelesener Nachricht"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _ungelesener Nachricht"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ansicht/Gehe _zu/Nächster _ungelesener Nachricht"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger neuer Nachricht"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ansicht/Gehe _zu/_Vorheriger neuer Nachricht"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster neuer Nachricht"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ansicht/Gehe _zu/_Nächster neuer Nachricht"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger markierter Nachricht"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger markierter Nachricht"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster markierter  Nachricht"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ansicht/Gehe _zu/Nächster markierter  Nachricht"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger gefärbter Nachricht"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ansicht/Gehe _zu/Vorheriger gefärbter Nachricht"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster gefärbter  Nachricht"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ansicht/Gehe _zu/Nächster gefärbter  Nachricht"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/Gehe _zu/_Gehe zu anderer Ablage"
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ansicht/Gehe _zu/_Gehe zu anderer Ablage"
 

-#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/_Ansicht/_Zeichensatz/---"
 

-#: src/mainwindow.c:537 src/messageview.c:163
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/_Ansicht/_Zeichensatz"
 
 msgid "/_View/_Code set"
 msgstr "/_Ansicht/_Zeichensatz"
 

-#: src/mainwindow.c:538 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatikerkennung"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatikerkennung"
 

-#: src/mainwindow.c:541 src/messageview.c:167
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Ansicht/_Zeichensatz/7bit ascii (US-ASC_II)"
 

-#: src/mainwindow.c:545 src/messageview.c:171
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Ansicht/_Zeichensatz/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:549 src/messageview.c:175
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-1)"
 

-#: src/mainwindow.c:551 src/messageview.c:177
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-_15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Ansicht/_Zeichensatz/Western European (ISO-8859-_15)"
 

-#: src/mainwindow.c:555 src/messageview.c:181
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Central European (ISO-8859-_2)"
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Ansicht/_Zeichensatz/Central European (ISO-8859-_2)"
 

-#: src/mainwindow.c:558 src/messageview.c:184
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltic (ISO-8859-13)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Ansicht/_Zeichensatz/_Baltic (ISO-8859-13)"
 

-#: src/mainwindow.c:560 src/messageview.c:186
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltic (ISO-8859-_4)"
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Ansicht/_Zeichensatz/Baltic (ISO-8859-_4)"
 

-#: src/mainwindow.c:563 src/messageview.c:189
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Ansicht/_Zeichensatz/Greek (ISO-8859-_7)"
 

-#: src/mainwindow.c:566 src/messageview.c:192
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Turkish (ISO-8859-_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Ansicht/_Zeichensatz/Turkish (ISO-8859-_9)"
 

-#: src/mainwindow.c:569 src/messageview.c:195
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (ISO-8859-_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (ISO-8859-_5)"
 

-#: src/mainwindow.c:571 src/messageview.c:197
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (KOI8-_R)"
 

-#: src/mainwindow.c:573 src/messageview.c:199
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Ansicht/_Zeichensatz/Cyrillic (Windows-1251)"
 

-#: src/mainwindow.c:577 src/messageview.c:203
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-_JP)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-_JP)"
 

-#: src/mainwindow.c:580 src/messageview.c:206
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:583 src/messageview.c:209
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_EUC-JP)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_EUC-JP)"
 

-#: src/mainwindow.c:585 src/messageview.c:211
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_Shift_JIS)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Ansicht/_Zeichensatz/Japanese (_Shift_JIS)"
 

-#: src/mainwindow.c:589 src/messageview.c:215
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Ansicht/_Zeichensatz/Simplified Chinese (_GB2312)"
 

-#: src/mainwindow.c:591 src/messageview.c:217
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (_Big5)"
 

-#: src/mainwindow.c:593 src/messageview.c:219
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ansicht/_Zeichensatz/Traditional Chinese (EUC-_TW)"
 

-#: src/mainwindow.c:595 src/messageview.c:221
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinese (ISO-2022-_CN)"
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Ansicht/_Zeichensatz/Chinese (ISO-2022-_CN)"
 

-#: src/mainwindow.c:598 src/messageview.c:224
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (EUC-_KR)"
 

-#: src/mainwindow.c:600 src/messageview.c:226
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Korean (ISO-2022-KR)"
 

-#: src/mainwindow.c:603 src/messageview.c:229
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thailändisch (TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Ansicht/_Zeichensatz/Thailändisch (TIS-620)"
 

-#: src/mainwindow.c:605 src/messageview.c:231
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thailändisch (Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Ansicht/_Zeichensatz/Thailändisch (Windows-874)"
 

-#: src/mainwindow.c:613 src/summaryview.c:458
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 

-#: src/mainwindow.c:614 src/messageview.c:239
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Zeige _Quelle"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Zeige _Quelle"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 
 msgid "/_View/Show all _headers"
 msgstr "/_Ansicht/Zeige alle _Kopfzeilen"
 

-#: src/mainwindow.c:617
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/_Erneuern Übersicht"
 
 msgid "/_View/_Update summary"
 msgstr "/_Ansicht/_Erneuern Übersicht"
 

-#: src/mainwindow.c:620
-msgid "/_Message/Get new ma_il"
-msgstr "/_Nachricht/Empfange _neue E-Mail"
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/_Nachricht/E_mpfange"

 
 

-#: src/mainwindow.c:621
-msgid "/_Message/Get from _all accounts"
-msgstr "/_Nachricht/Empfange von _allen Accounts"
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/_Nachricht/E_mpfange/Hole von a_ktuellem Account"

 
 

-#: src/mainwindow.c:623
-msgid "/_Message/Cancel receivin_g"
-msgstr "/_Nachricht/Empfang a_bbrechen"
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/_Nachricht/E_mpfange/Hole von _allen Account"

 
 

-#: src/mainwindow.c:625
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/_Nachricht/E_mpfange/Empfang a_bbrechen"
+
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/_Nachricht/E_mpfange/---"
+
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/_Nachricht/Sende _wartende Nachrichten"
 

-#: src/mainwindow.c:627
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/_Nachricht/Verfasse n_eue Nachricht"
 

-#: src/mainwindow.c:628
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgstr "/_Nachricht/Verfasse n_eue News"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Nachricht/Verfasse n_eue News"
 

-#: src/mainwindow.c:629 src/messageview.c:246
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 
 msgid "/_Message/_Reply"
 msgstr "/_Nachricht/An_twort"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/_Antwort an"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Nachricht/_Antwort an"
 

-#: src/mainwindow.c:631 src/messageview.c:247
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/_Antwort an/A_lle"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Nachricht/_Antwort an/A_lle"
 

-#: src/mainwindow.c:632 src/messageview.c:249
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/_Antwort an/_Absender"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Nachricht/_Antwort an/_Absender"
 

-#: src/mainwindow.c:633 src/messageview.c:251
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Antwort an/_Mailingliste"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Nachricht/Antwort an/_Mailingliste"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Nachricht/Folge nach und antworte an"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Nachricht/Folge nach und antworte an"
 

-#: src/mainwindow.c:637 src/messageview.c:254
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 
 msgid "/_Message/_Forward"
 msgstr "/_Nachricht/We_iterleiten"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/_Nachricht/Umleiten"
 
 msgid "/_Message/Redirect"
 msgstr "/_Nachricht/Umleiten"
 

-#: src/mainwindow.c:640 src/messageview.c:259
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 
 msgid "/_Message/Re-_edit"
 msgstr "/_Nachricht/Wieder_bearbeiten"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 
 msgid "/_Message/M_ove..."
 msgstr "/_Nachricht/_Verschieben..."
 

-#: src/mainwindow.c:643
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 
 msgid "/_Message/_Copy..."
 msgstr "/_Nachricht/_Kopieren..."
 

-#: src/mainwindow.c:644
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 
 msgid "/_Message/_Delete"
 msgstr "/_Nachricht/_Löschen"
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/_Nachricht/News vom Server löschen"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/_Nachricht/News vom Server löschen"
 

-#: src/mainwindow.c:647
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 
 msgid "/_Message/_Mark"
 msgstr "/_Nachricht/_Markieren"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Nachricht/_Markieren/_Markieren"
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Nachricht/_Markieren/Markierung _entfernen"
 

-#: src/mainwindow.c:650
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Nachricht/_Markieren/---"
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Markieren als _ungelesen"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Nachricht/_Markieren/Markieren als _ungelesen"
 

-#: src/mainwindow.c:652
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Markieren als _gelesen"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Nachricht/_Markieren/Markieren als _gelesen"
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Markiere alle als _gelesen"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Nachricht/_Markieren/Markiere alle als _gelesen"
 

-#: src/mainwindow.c:657
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/_Werkzeuge/_Adressbuch..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Werkzeuge/_Adressbuch..."
 

-#: src/mainwindow.c:658 src/messageview.c:263
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeuge/Absender dem _Adressbuch hinzufügen"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Werkzeuge/Absender dem _Adressbuch hinzufügen"
 

-#: src/mainwindow.c:660
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Werkzeuge/Adressen _sammeln"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Werkzeuge/Adressen _sammeln"
 

-#: src/mainwindow.c:661
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Werkzeuge/Adressen _sammeln/aus _Ablage..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Werkzeuge/Adressen _sammeln/aus _Ablage..."
 

-#: src/mainwindow.c:663
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Werkzeuge/Adressen _sammeln/aus Nachricht..."
 
 # msgid "/_Tools/---"
 # msgstr "/_Werkzeuge/---"
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Werkzeuge/Adressen _sammeln/aus Nachricht..."
 
 # msgid "/_Tools/---"
 # msgstr "/_Werkzeuge/---"

-#: src/mainwindow.c:666
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/_Werkzeuge/Nachrichten _filtern"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/_Werkzeuge/Nachrichten _filtern"
 

-#: src/mainwindow.c:667 src/messageview.c:266
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeuge/Filter_regel erstellen"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Werkzeuge/Filter_regel erstellen"
 

-#: src/mainwindow.c:668 src/messageview.c:268
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeuge/Filter_regel erstellen/_Automatisch"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Werkzeuge/Filter_regel erstellen/_Automatisch"
 

-#: src/mainwindow.c:670 src/messageview.c:270
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _Von"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _Von"
 

-#: src/mainwindow.c:672 src/messageview.c:272
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _An"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _An"
 

-#: src/mainwindow.c:674 src/messageview.c:274
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _Betreff"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Werkzeuge/Filter_regel erstellen/nach _Betreff"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:689

 msgid "/_Tools/_Create processing rule"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen"
 
 msgid "/_Tools/_Create processing rule"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen"
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:690

 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/_Automatisch"
 
 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/_Automatisch"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:692

 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Von"
 
 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Von"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:694

 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _An"
 
 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _An"
 

-#: src/mainwindow.c:683
+#: src/mainwindow.c:696

 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Betreff"
 
 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Betreff"
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeuge/Doppelte Nachrichten löschen"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Werkzeuge/Doppelte Nachrichten löschen"
 

-#: src/mainwindow.c:691
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeuge/_Ausführen"
 
 msgid "/_Tools/E_xecute"
 msgstr "/_Werkzeuge/_Ausführen"
 

-#: src/mainwindow.c:694
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Werkzeuge/SSL-Zerti_fikate..."
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Werkzeuge/SSL-Zerti_fikate..."
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeuge/_Logbuch-Fenster"
 
 msgid "/_Tools/_Log window"
 msgstr "/_Werkzeuge/_Logbuch-Fenster"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 
 msgid "/_Configuration"
 msgstr "/_Einstellungen"
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Einstellungen/Aktuellen Account _wechseln..."
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Accounteinstellungen..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Einstellungen/_Accounteinstellungen..."
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Einstellungen/_Neuen Account erstellen..."
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Einstellungen/Accounts _bearbeiten..."
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 
 msgid "/_Configuration/---"
 msgstr "/_Einstellungen/---"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Einstellungen/Allgemeine _Einstellungen..."
 

-#: src/mainwindow.c:712
+#: src/mainwindow.c:725

 msgid "/_Configuration/Pre-processing..."
 msgstr "/_Einstellungen/Vorverarbeitung..."
 
 msgid "/_Configuration/Pre-processing..."
 msgstr "/_Einstellungen/Vorverarbeitung..."
 

-#: src/mainwindow.c:714
+#: src/mainwindow.c:727

 msgid "/_Configuration/Post-processing..."
 msgstr "/_Einstellungen/Nachverarbeitung..."
 
 msgid "/_Configuration/Post-processing..."
 msgstr "/_Einstellungen/Nachverarbeitung..."
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/_Einstellungen/_Filterung..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/_Einstellungen/_Filterung..."
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/_Einstellungen/_Vorlagen..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/_Einstellungen/_Vorlagen..."
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/_Aktionen..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/_Einstellungen/_Aktionen..."
 

-#: src/mainwindow.c:720
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/_Einstellungen/A_ndere Einstellungen..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/_Einstellungen/A_ndere Einstellungen..."
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/_Einstellungen/Plugins..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/_Einstellungen/Plugins..."
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/_Hilfe/_Anleitung (Lokal)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/_Hilfe/_Anleitung (Lokal)"
 

-#: src/mainwindow.c:725
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Hilfe/_Anleitung (Sylpheed Doc Homepage)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Hilfe/_Anleitung (Sylpheed Doc Homepage)"
 

-#: src/mainwindow.c:727
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/_Hilfe/_FAQ (Lokal)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/_Hilfe/_FAQ (Lokal)"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Hilfe/_FAQ (Sylpheed Doc Homepage)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Hilfe/_FAQ (Sylpheed Doc Homepage)"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Hilfe/_Claws FAQ (Claws Dokumentation)"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Hilfe/_Claws FAQ (Claws Dokumentation)"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 
 msgid "/_Help/---"
 msgstr "/_Hilfe/---"
 

-#: src/mainwindow.c:851
+#: src/mainwindow.c:868

 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Icon klicken um offline zu gehen"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Sie sind online. Icon klicken um offline zu gehen"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:872

 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Icon klicken um online zu gehen"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Sie sind offline. Icon klicken um online zu gehen"
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr "Wähle Account"
 
 msgid "Select account"
 msgstr "Wähle Account"
 

-#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "Unbenannt"
 
 msgid "Untitled"
 msgstr "Unbenannt"
 

-#: src/mainwindow.c:1222
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "nicht"
 
 msgid "none"
 msgstr "nicht"
 

-#: src/mainwindow.c:1462
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 

-#: src/mainwindow.c:1463
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
 msgid "Empty all messages in trash?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 

-#: src/mainwindow.c:1481
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 
 msgid "Add mailbox"
 msgstr "Neue Mailbox"
 

-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4454,16 +4494,16 @@ msgstr ""
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 
 "Wenn die existierende Mailbox angegeben wird, wird\n"
 "sie automatisch durchsucht."
 

-#: src/mainwindow.c:1488
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Die Mailbox `%s' existiert bereits."
 

-#: src/mainwindow.c:1493 src/setup.c:58
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "Mailbox"
 
 msgid "Mailbox"
 msgstr "Mailbox"
 

-#: src/mainwindow.c:1498 src/setup.c:62
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4473,31 +4513,31 @@ msgstr ""
 "Vielleicht existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 
 "Vielleicht existieren bereits einige Dateien, oder Sie haben keine "
 "Schreibrechte"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Ablagenansicht"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenanzeige"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenanzeige"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Beenden"
 
 msgid "Exit"
 msgstr "Beenden"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 
 msgid "Exit this program?"
 msgstr "Beenden des Programms?"
 

-#: src/mainwindow.c:2716 src/summaryview.c:4046
+#: src/mainwindow.c:2850 src/summaryview.c:4009

 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ablageregeln"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden vor den Ablageregeln"
 

-#: src/mainwindow.c:2724
+#: src/mainwindow.c:2858

 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ablageregeln"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Verarbeitungsregeln zum Anwenden nach den Ablageregeln"
 

-#: src/mainwindow.c:2732 src/summaryview.c:4055
+#: src/mainwindow.c:2866 src/summaryview.c:4018

 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 
 msgid "Filtering configuration"
 msgstr "Filterungs-Konfiguration"
 


@@ -4559,26 +4599,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/_Nachricht/Umlei_ten"
 
 #: src/messageview.c:276
 msgstr "/_Nachricht/Umlei_ten"
 
 #: src/messageview.c:276

+msgid "/_Tools/Create processing rule/"
+msgstr "/_Werkzeuge/Verarbeitungsregel erstellen"
+
+#: src/messageview.c:278

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/_Automatisch"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/_Automatisch"
 

-#: src/messageview.c:278
+#: src/messageview.c:280

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Von"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Von"
 

-#: src/messageview.c:280
+#: src/messageview.c:282

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _An"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _An"
 

-#: src/messageview.c:282
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Betreff"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Werkzeuge/Verarbeitungsregel erstellen/nach _Betreff"
 

-#: src/messageview.c:476
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 
 msgid "<No Return-Path found>"
 msgstr "<Kein Antwortpfad gefunden>"
 

-#: src/messageview.c:484
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4594,11 +4638,11 @@ msgstr ""
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 
 "Antwortpfad: %s\n"
 "Es wird geraten, die Empfangsbestätigung nicht zu senden."
 

-#: src/messageview.c:492
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+Nicht Senden"
 
 msgid "+Don't Send"
 msgstr "+Nicht Senden"
 

-#: src/messageview.c:502
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4610,39 +4654,39 @@ msgstr ""
 "offiziell an Sie adressiert.\n"
 "Empfangsbestätigung abgebrochen."
 
 "offiziell an Sie adressiert.\n"
 "Empfangsbestätigung abgebrochen."
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3448
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "Speichern als"
 
 msgid "Save as"
 msgstr "Speichern als"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3453
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "Überschreiben"
 
 msgid "Overwrite"
 msgstr "Überschreiben"
 

-#: src/messageview.c:907
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "Überschreibe existierende Datei?"
 
 msgid "Overwrite existing file?"
 msgstr "Überschreibe existierende Datei?"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
-#: src/summaryview.c:3482
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 

-#: src/messageview.c:979
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung"
 
 msgid "This message asks for a return receipt"
 msgstr "Diese Nachricht wünscht eine Empfangsbestätigung"
 

-#: src/messageview.c:980
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "Sende Bestätigung"
 
 msgid "Send receipt"
 msgstr "Sende Bestätigung"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 
 msgid "Return Receipt Notification"
 msgstr "Empfangsbestätigung"
 

-#: src/messageview.c:1034
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4652,20 +4696,19 @@ msgstr ""
 "Bitte wählen Sie welchen Account Sie für das Schicken der "
 "Empfangsbestätigung verwenden möchten:"
 
 "Bitte wählen Sie welchen Account Sie für das Schicken der "
 "Empfangsbestätigung verwenden möchten:"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "Benachrichtigung senden"
 
 msgid "Send Notification"
 msgstr "Benachrichtigung senden"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+Abbrechen"
 
 msgid "+Cancel"
 msgstr "+Abbrechen"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
-#: src/toolbar.c:171
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "Drucken"
 
 msgid "Print"
 msgstr "Drucken"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4674,7 +4717,7 @@ msgstr ""
 "Geben Sie den Druckbefehl ein:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 
 "Geben Sie den Druckbefehl ein:\n"
 "(`%s' wird durch den Dateinamen ersetzt)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4700,7 +4743,7 @@ msgstr "/
 msgid "/_Display as text"
 msgstr "/_Darstellung als Text"
 
 msgid "/_Display as text"
 msgstr "/_Darstellung als Text"
 

-#: src/mimeview.c:152 src/summaryview.c:463
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/_Speichern als..."
 
 msgid "/_Save as..."
 msgstr "/_Speichern als..."
 


@@ -4762,43 +4805,43 @@ msgstr "erstelle NNTP-Verbindung zu %s:%d ...\n"
 msgid "can't set group: %s\n"
 msgstr "kann die Gruppe: %s nicht setzen\n"
 
 msgid "can't set group: %s\n"
 msgstr "kann die Gruppe: %s nicht setzen\n"
 

-#: src/news.c:817
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "ungültiger Artikelbereich: %d - %d\n"
 

-#: src/news.c:838
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "Fehler beim Empfang von %s.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "Fehler beim Empfang von %s.\n"
 

-#: src/news.c:855
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "bekomme xover %d in %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "bekomme xover %d in %s...\n"
 

-#: src/news.c:858 src/news.c:927
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "kann Newsübersicht nicht bekommen\n"
 
 msgid "can't get xover\n"
 msgstr "kann Newsübersicht nicht bekommen\n"
 

-#: src/news.c:863 src/news.c:933
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der Newsübersicht.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "Fehler beim Empfang der Newsübersicht.\n"
 

-#: src/news.c:869 src/news.c:946
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ungültige Newsübersichtszeile: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "ungültige Newsübersichtszeile: %s\n"
 

-#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 
 msgid "can't get xhdr\n"
 msgstr "kann XHDR nicht bekommen\n"
 

-#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "Fehler beim Empfang von XHDR.\n"
 

-#: src/news.c:924
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme Newsübersicht %d - %d in %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "bekomme Newsübersicht %d - %d in %s...\n"


@@ -4832,11 +4875,15 @@ msgstr ""
 "Falsches Passwort! Nochmal...\n"
 "\n"
 
 "Falsches Passwort! Nochmal...\n"
 "\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: scanne Nachricht..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 

-#: src/plugins/clamav/clamav_plugin.c:229
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -5014,11 +5061,15 @@ msgstr ""
 "Diese Plugin verwendet GtkMathView um MathML ANhänge darzustellen (Content-"
 "Type: text/mathml)"
 
 "Diese Plugin verwendet GtkMathView um MathML ANhänge darzustellen (Content-"
 "Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: filtere Nachricht..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:314
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "
 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "


@@ -5032,11 +5083,11 @@ msgid ""
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "Diese Plugin überprüft alle von IMAP, LOCAL oder POP Accounts empfangenen "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "Diese Plugin überprüft alle von IMAP, LOCAL oder POP Accounts empfangenen "

-"Emails mit Hilfe des SpamAssassin Server auf Spam. Man braucht irgendwo einen "
-"SpamAssassin Server (spamd) am laufen.\n"
+"Emails mit Hilfe des SpamAssassin Server auf Spam. Man braucht irgendwo "
+"einen SpamAssassin Server (spamd) am laufen.\n"

 "\n"
 "\n"

-"Wenn eine Nachricht als Spam identifiziert wird, kann sie gelöscht oder "
-"in einem speziellen Ordner gespeichert werden.\n"
+"Wenn eine Nachricht als Spam identifiziert wird, kann sie gelöscht oder in "
+"einem speziellen Ordner gespeichert werden.\n"

 "\n"
 "Diese Plugin enthält nur die Funktionen für das Scannen und Löschen oder "
 "Verschieben der Nachrichten. Um die Pluginkonfiguration nicht von Hand "
 "\n"
 "Diese Plugin enthält nur die Funktionen für das Scannen und Löschen oder "
 "Verschieben der Nachrichten. Um die Pluginkonfiguration nicht von Hand "


@@ -5167,11 +5218,11 @@ msgstr ""
 "einstellen ob Spam Mails empfangen werden sollen (Standard: Ja) und den "
 "Ordner wählen in dem Spam Mails abgelegt werden.\n"
 
 "einstellen ob Spam Mails empfangen werden sollen (Standard: Ja) und den "
 "Ordner wählen in dem Spam Mails abgelegt werden.\n"
 

-#: src/plugins/trayicon/trayicon.c:213
+#: src/plugins/trayicon/trayicon.c:217

 msgid "Trayicon"
 msgstr "Trayicon"
 
 msgid "Trayicon"
 msgstr "Trayicon"
 

-#: src/plugins/trayicon/trayicon.c:218
+#: src/plugins/trayicon/trayicon.c:222

 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"
 msgid ""
 "This plugin places a mailbox icon in the system tray that indicates if you "
 "have new or unread mail.\n"


@@ -5237,204 +5288,208 @@ msgstr "Einstellungen eines neuen Accounts"
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 
 msgid "Account preferences"
 msgstr "Accounteinstellungen"
 

-#: src/prefs_account.c:766 src/prefs_common.c:968
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "Empfangen"
 
 msgid "Receive"
 msgstr "Empfangen"
 

-#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "Verfassen"
 
 msgid "Compose"
 msgstr "Verfassen"
 

-#: src/prefs_account.c:773 src/prefs_common.c:981
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Privat"
 
 msgid "Privacy"
 msgstr "Privat"
 

-#: src/prefs_account.c:777
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:780
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "Speziell"
 
 msgid "Advanced"
 msgstr "Speziell"
 

-#: src/prefs_account.c:859
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "Name des Accounts"
 
 msgid "Name of account"
 msgstr "Name des Accounts"
 

-#: src/prefs_account.c:868
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "Als Standard setzen"
 
 msgid "Set as default"
 msgstr "Als Standard setzen"
 

-#: src/prefs_account.c:872
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "Persönliche Informationen"
 
 msgid "Personal information"
 msgstr "Persönliche Informationen"
 

-#: src/prefs_account.c:881
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "Vollständiger Name"
 
 msgid "Full name"
 msgstr "Vollständiger Name"
 

-#: src/prefs_account.c:887
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 
 msgid "Mail address"
 msgstr "E-Mail-Adresse"
 

-#: src/prefs_account.c:893
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "Organisation"
 
 msgid "Organization"
 msgstr "Organisation"
 

-#: src/prefs_account.c:917
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "Serverdaten"
 
 msgid "Server information"
 msgstr "Serverdaten"
 

-#: src/prefs_account.c:938
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (normal)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (normal)"
 

-#: src/prefs_account.c:940
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP auth)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP auth)"
 

-#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:944
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:946
-msgid "None (local)"
-msgstr "Keiner (lokal)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "Lokale mbox Datei"
+
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "Keine (nur SMTP)"

 
 

-#: src/prefs_account.c:966
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 
 msgid "This server requires authentication"
 msgstr "Dieser Server benötigt Beglaubigung"
 

-#: src/prefs_account.c:973
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 
 msgid "Authenticate on connect"
 msgstr "Beglaubigung beim Verbinden"
 

-#: src/prefs_account.c:1018
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "Newsserver"
 
 msgid "News server"
 msgstr "Newsserver"
 

-#: src/prefs_account.c:1024
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 
 msgid "Server for receiving"
 msgstr "Server zum Empfangen"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 
 msgid "Local mailbox"
 msgstr "Lokale Mailbox"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP-Server (senden)"
 

-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "Verwende Mailkommand anstelle von SMTP-Server"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Verwende Mailkommand anstelle von SMTP-Server"
 

-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 
 msgid "command to send mails"
 msgstr "Befehl zum Versenden"
 

-#: src/prefs_account.c:1061 src/prefs_account.c:1435
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Benutzer-ID"
 
 msgid "User ID"
 msgstr "Benutzer-ID"
 

-#: src/prefs_account.c:1067 src/prefs_account.c:1444
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "Kennwort"
 
 msgid "Password"
 msgstr "Kennwort"
 

-#: src/prefs_account.c:1143 src/prefs_account.c:1849
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1151
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "Lösche Nachrichten vom Server wenn Empfangen"
 
 msgid "Remove messages on server when received"
 msgstr "Lösche Nachrichten vom Server wenn Empfangen"
 

-#: src/prefs_account.c:1162
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "Löschen nach"
 
 msgid "Remove after"
 msgstr "Löschen nach"
 

-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "Tagen"
 
 msgid "days"
 msgstr "Tagen"
 

-#: src/prefs_account.c:1188
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 Tage: löscht sofort)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 Tage: löscht sofort)"
 

-#: src/prefs_account.c:1195
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "Empfange alle Nachrichten vom Server"
 
 msgid "Download all messages on server"
 msgstr "Empfange alle Nachrichten vom Server"
 

-#: src/prefs_account.c:1201
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 
 msgid "Receive size limit"
 msgstr "Limit der Empfangsgröße"
 

-#: src/prefs_account.c:1208
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "Standard Inbox"
 
 msgid "Default inbox"
 msgstr "Standard Inbox"
 

-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Ungefilterte Nachrichten werden in dieser Ablage gespeichert)"
 

-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikeln"
 
 msgid "Maximum number of articles to download"
 msgstr "Maximalzahl herunterzuladender Artikeln"
 

-#: src/prefs_account.c:1267
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert wenn 0 angegeben"
 
 msgid "unlimited if 0 is specified"
 msgstr "unlimitiert wenn 0 angegeben"
 

-#: src/prefs_account.c:1283 src/prefs_account.c:1406
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 
 msgid "Authentication method"
 msgstr "Beglaubigungsmethode"
 

-#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "Autormatisch"
 
 msgid "Automatic"
 msgstr "Autormatisch"
 

-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 
 msgid "Filter messages on receiving"
 msgstr "Nachrichten beim Empfang filtern"
 

-#: src/prefs_account.c:1304
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Empfange alle' überprüft ob neue E-Mails für diesen Account vorhanden sind"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "`Empfange alle' überprüft ob neue E-Mails für diesen Account vorhanden sind"
 

-#: src/prefs_account.c:1363
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Datum hinzufügen"
 
 msgid "Add Date"
 msgstr "Datum hinzufügen"
 

-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1361

 msgid "Generate Message-Id"
 msgstr "Erzeuge Nachrichten-Id"
 
 msgid "Generate Message-Id"
 msgstr "Erzeuge Nachrichten-Id"
 

-#: src/prefs_account.c:1371
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 
 msgid "Add user-defined header"
 msgstr "Füge benutzerdefinierte Kopfzeile ein"
 

-#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " Bearbeiten... "
 
 msgid " Edit... "
 msgstr " Bearbeiten... "
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "Beglaubigung"
 
 msgid "Authentication"
 msgstr "Beglaubigung"
 

-#: src/prefs_account.c:1391
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP-Beglaubigung (SMTP AUTH)"
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."


@@ -5442,184 +5497,184 @@ msgstr ""
 "Wenn Sie diese Felder leer lassen, werden die\n"
 "selbe User-ID und das Passwort wie beim Empfang verwendet."
 
 "Wenn Sie diese Felder leer lassen, werden die\n"
 "selbe User-ID und das Passwort wie beim Empfang verwendet."
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Beglaubige mit POP3 vor dem Senden"
 

-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgstr "POP Beglaubigung Timeout:"
 
 msgid "POP authentication timeout: "
 msgstr "POP Beglaubigung Timeout:"
 

-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "Minuten"
 
 msgid "minutes"
 msgstr "Minuten"
 

-#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Unterschrift"
 
 msgid "Signature"
 msgstr "Unterschrift"
 

-#: src/prefs_account.c:1554
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "Füge Unterschrift automatisch hinzu"
 
 msgid "Insert signature automatically"
 msgstr "Füge Unterschrift automatisch hinzu"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 
 msgid "Signature separator"
 msgstr "Unterschriftentrenner"
 

-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "Befehlsausgabe"
 
 msgid "Command output"
 msgstr "Befehlsausgabe"
 

-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "Setze automatisch folgende Adressen"
 
 msgid "Automatically set the following addresses"
 msgstr "Setze automatisch folgende Adressen"
 

-#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116

 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 
 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "Bcc"
 
 msgid "Bcc"
 msgstr "Bcc"
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "Antwort an"
 
 msgid "Reply-To"
 msgstr "Antwort an"
 

-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "Nachrichten immer verschlüsseln"
 
 msgid "Encrypt message by default"
 msgstr "Nachrichten immer verschlüsseln"
 

-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "Nachrichten immer digital unterschreiben"
 
 msgid "Sign message by default"
 msgstr "Nachrichten immer digital unterschreiben"
 

-#: src/prefs_account.c:1693
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "Standard Modus"
 
 msgid "Default mode"
 msgstr "Standard Modus"
 

-#: src/prefs_account.c:1701
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "Verwende PGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "Verwende PGP/MIME"
 

-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "Verwende Inline"
 
 msgid "Use Inline"
 msgstr "Verwende Inline"
 

-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 
 msgid "Sign key"
 msgstr "Schlüssel für digitale Unterschrift"
 

-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPg Schlüssel"
 
 msgid "Use default GnuPG key"
 msgstr "Benutze voreingestellten GnuPg Schlüssel"
 

-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 
 msgid "Select key by your email address"
 msgstr "Wähle Schlüssel nach E-Mail Adresse"
 

-#: src/prefs_account.c:1746
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 
 msgid "Specify key manually"
 msgstr "Schlüssel manuell angeben"
 

-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 
 msgid "User or key ID:"
 msgstr "Benutzer- oder Schlüssel-ID"
 

-#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "Verwende kein SSL"
 
 msgid "Don't use SSL"
 msgstr "Verwende kein SSL"
 

-#: src/prefs_account.c:1860
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "Verwende SSL für POP3-Verbindung"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Verwende SSL für POP3-Verbindung"
 

-#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Verwende STARTTLS-Kommando zum Starten einer SSL-Sitzung"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Verwende STARTTLS-Kommando zum Starten einer SSL-Sitzung"
 

-#: src/prefs_account.c:1877
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "Verwende SSL für IMAP-Verbindung"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Verwende SSL für IMAP-Verbindung"
 

-#: src/prefs_account.c:1883
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "Verwende SSL für NNTP-Verbindung"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Verwende SSL für NNTP-Verbindung"
 

-#: src/prefs_account.c:1900
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Senden (SMTP)"
 

-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Verwende kein SSL (aber, wenn nötig, verwende STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Verwende kein SSL (aber, wenn nötig, verwende STARTTLS)"
 

-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "Verwende SSL für SMTP-Verbindung"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Verwende SSL für SMTP-Verbindung"
 

-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "Verwende nicht-blockendes SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "Verwende nicht-blockendes SSL"
 

-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Abstellen bei Problemen mit der SSL Verbindung)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Abstellen bei Problemen mit der SSL Verbindung)"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 
 msgid "Specify SMTP port"
 msgstr "SMTP-Port angeben"
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 
 msgid "Specify POP3 port"
 msgstr "POP3-Port angeben"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "IMAP-Port angeben"
 
 msgid "Specify IMAP4 port"
 msgstr "IMAP-Port angeben"
 

-#: src/prefs_account.c:2076
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 
 msgid "Specify NNTP port"
 msgstr "NNTP-Port angeben"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Domäne angeben"
 
 msgid "Specify domain name"
 msgstr "Domäne angeben"
 

-#: src/prefs_account.c:2091
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "Verwende Kommando zur Kommunikation mit dem Server"
 
 msgid "Use command to communicate with server"
 msgstr "Verwende Kommando zur Kommunikation mit dem Server"
 

-#: src/prefs_account.c:2099
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markiere Cross-gepostete Nachrichten als gelesen und mit Farbe:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Markiere Cross-gepostete Nachrichten als gelesen und mit Farbe:"
 

-#: src/prefs_account.c:2113
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 
 msgid "IMAP server directory"
 msgstr "IMAP Serververzeichnis"
 

-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 
 msgid "Put sent messages in"
 msgstr "Gesendete Nachrichten ablegen in"
 

-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "Lege Entwürfe ab in"
 
 msgid "Put draft messages in"
 msgstr "Lege Entwürfe ab in"
 

-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "Lege gelöschte Nachrichten ab in"
 
 msgid "Put deleted messages in"
 msgstr "Lege gelöschte Nachrichten ab in"
 

-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "Accountname wurde nicht angegeben."
 
 msgid "Account name is not entered."
 msgstr "Accountname wurde nicht angegeben."
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 
 msgid "Mail address is not entered."
 msgstr "Keine E-Mail-Adresse angegeben."
 


@@ -5686,8 +5741,8 @@ msgid "Current actions"
 msgstr "Aktuelle Aktionen"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
 msgstr "Aktuelle Aktionen"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546

-#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
-#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687

 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Neue)"
 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Neue)"


@@ -5731,180 +5786,180 @@ msgstr "Aktion l
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Wollen Sie diese Aktion wirklich löschen?"
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "MENÜ NAME"
 
 msgid "MENU NAME:"
 msgstr "MENÜ NAME"
 

-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr "Verwende / im Menu-Name, um Unter-Menus zu erzeugen."
 
 msgid "Use / in menu name to make submenus."
 msgstr "Verwende / im Menu-Name, um Unter-Menus zu erzeugen."
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "KOMMANDOZEILE:"
 
 msgid "COMMAND LINE:"
 msgstr "KOMMANDOZEILE:"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "Beginnt mit:"
 
 msgid "Begin with:"
 msgstr "Beginnt mit:"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "um Nachrichtenkörper oder Auswahl an Standard-in des Kommandos zu senden"
 
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "um Nachrichtenkörper oder Auswahl an Standard-in des Kommandos zu senden"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "um Texteingabe vom Benutzer an Standard-in des Kommandos zu senden"
 
 msgid "to send user provided text to command's standard input"
 msgstr "um Texteingabe vom Benutzer an Standard-in des Kommandos zu senden"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "um versteckte Texteingabe vom Benutzer an Standard-in des Kommandos zu senden"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "um versteckte Texteingabe vom Benutzer an Standard-in des Kommandos zu senden"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "endet mit:"
 
 msgid "End with:"
 msgstr "endet mit:"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "um den Nachrichtenkörper oder die Auswahl durch die Ausgabe des Kommandos zu "
 "ersetzen"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "um den Nachrichtenkörper oder die Auswahl durch die Ausgabe des Kommandos zu "
 "ersetzen"
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "um die Ausgabe des Kommandos einzufügen, ohne den alten Text zu ersetzen"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr ""
 "um die Ausgabe des Kommandos einzufügen, ohne den alten Text zu ersetzen"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "um das Kommando asynchron laufen zu lassen"
 
 msgid "to run command asynchronously"
 msgstr "um das Kommando asynchron laufen zu lassen"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "Verwende:"
 
 msgid "Use:"
 msgstr "Verwende:"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "für die Datei der gewählten Nachricht im RFC822/2822 Format "
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "für die Datei der gewählten Nachricht im RFC822/2822 Format "
 

-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:671

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "für die Liste der Dateien der ausgewählten Nachrichten im RFC822/2822 Format"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "für die Liste der Dateien der ausgewählten Nachrichten im RFC822/2822 Format"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "für die Datei des ausgewählten dekodierten MIME-Teils"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "für die Datei des ausgewählten dekodierten MIME-Teils"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "für ein vom Benutzer angegebenes Argument"
 
 msgid "for a user provided argument"
 msgstr "für ein vom Benutzer angegebenes Argument"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "für eine vom Benutzer eingegebenes verstecktes Argument (z.B. Passwort)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "für eine vom Benutzer eingegebenes verstecktes Argument (z.B. Passwort)"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "für die nächste Auswahl"
 
 msgid "for the text selection"
 msgstr "für die nächste Auswahl"
 

-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "wende Filteraktionen zwischen den () auf ausgewählte Nachricht an"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "wende Filteraktionen zwischen den () auf ausgewählte Nachricht an"
 

-#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131

 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 
 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Beschreibung der Symbole"
 

-#: src/prefs_common.c:951
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Allgemeine Einstellungen"
 
 msgid "Common Preferences"
 msgstr "Allgemeine Einstellungen"
 

-#: src/prefs_common.c:974
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "Zitat"
 
 msgid "Quote"
 msgstr "Zitat"
 

-#: src/prefs_common.c:976
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "Anzeige"
 
 msgid "Display"
 msgstr "Anzeige"
 

-#: src/prefs_common.c:978
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Nachricht"
 
 msgid "Message"
 msgstr "Nachricht"
 

-#: src/prefs_common.c:986 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "Weiteres"
 
 msgid "Other"
 msgstr "Weiteres"
 

-#: src/prefs_common.c:1032
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Externes Programm"
 
 msgid "External program"
 msgstr "Externes Programm"
 

-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 
 msgid "Use external program for incorporation"
 msgstr "Benutze externes Programm, um E-Mails zu empfangen"
 

-#: src/prefs_common.c:1048
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "Befehl"
 
 msgid "Command"
 msgstr "Befehl"
 

-#: src/prefs_common.c:1072
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "Automatische Aktualisierung"
 
 msgid "Auto-check new mail"
 msgstr "Automatische Aktualisierung"
 

-#: src/prefs_common.c:1074
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "alle"
 
 msgid "every"
 msgstr "alle"
 

-#: src/prefs_common.c:1086
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "Minute(n)"
 
 msgid "minute(s)"
 msgstr "Minute(n)"
 

-#: src/prefs_common.c:1095
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Hole neue E-Mail beim Programmstart"
 
 msgid "Check new mail on startup"
 msgstr "Hole neue E-Mail beim Programmstart"
 

-#: src/prefs_common.c:1097
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "Erneuere alle lokalen Ablagen nach Eingliederung"
 
 msgid "Update all local folders after incorporation"
 msgstr "Erneuere alle lokalen Ablagen nach Eingliederung"
 

-#: src/prefs_common.c:1105
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "Zeige Empfangsdialog"
 
 msgid "Show receive dialog"
 msgstr "Zeige Empfangsdialog"
 

-#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "Immer"
 
 msgid "Always"
 msgstr "Immer"
 

-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "Nur beim manuellen Empfang"
 
 msgid "Only on manual receiving"
 msgstr "Nur beim manuellen Empfang"
 

-#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "Niemals"
 
 msgid "Never"
 msgstr "Niemals"
 

-#: src/prefs_common.c:1126
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "Schließe Empfangsdialog wenn fertig"
 
 msgid "Close receive dialog when finished"
 msgstr "Schließe Empfangsdialog wenn fertig"
 

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "Führe Kommando aus wenn neue Nachrichten eintreffen"
 
 msgid "Run command when new mail arrives"
 msgstr "Führe Kommando aus wenn neue Nachrichten eintreffen"
 

-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "nach automatischer Überprüfung"
 
 msgid "after autochecking"
 msgstr "nach automatischer Überprüfung"
 

-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "nach manueller Überprüfung"
 
 msgid "after manual checking"
 msgstr "nach manueller Überprüfung"
 

-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5913,23 +5968,23 @@ msgstr ""
 "Auszuführendes Kommando:\n"
 "(verwende %d als Zahl der neuen Nachrichten)"
 
 "Auszuführendes Kommando:\n"
 "(verwende %d als Zahl der neuen Nachrichten)"
 

-#: src/prefs_common.c:1223
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "Gesendete Nachrichten in Gesendet speichern"
 
 msgid "Save sent messages to Sent folder"
 msgstr "Gesendete Nachrichten in Gesendet speichern"
 

-#: src/prefs_common.c:1225
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "Nachrichten die nicht gesendet werden konnten, in Queue-Ablage"
 
 msgid "Queue messages that fail to send"
 msgstr "Nachrichten die nicht gesendet werden konnten, in Queue-Ablage"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "Zeige Sendedialog"
 
 msgid "Show send dialog"
 msgstr "Zeige Sendedialog"
 

-#: src/prefs_common.c:1248
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "Ausgehender Zeichensatz"
 
 msgid "Outgoing codeset"
 msgstr "Ausgehender Zeichensatz"
 

-#: src/prefs_common.c:1257
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"


@@ -5937,107 +5992,107 @@ msgstr ""
 "Wenn `Automatisch' gewählt ist, wird die optimale Kodierung für die "
 "aktuellen Lokalisierungen verwendet"
 
 "Wenn `Automatisch' gewählt ist, wird die optimale Kodierung für die "
 "aktuellen Lokalisierungen verwendet"
 

-#: src/prefs_common.c:1269
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 
 msgid "Automatic (Recommended)"
 msgstr "Automatisch (Empfohlen)"
 

-#: src/prefs_common.c:1270
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 

-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropäisch (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Westeuropäisch (ISO-8859-1)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropäisch (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Westeuropäisch (ISO-8859-15)"
 

-#: src/prefs_common.c:1276
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "Mitteleuropäisch (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "Mitteleuropäisch (ISO-8859-2)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "Baltisch (ISO-8859-13)"
 

-#: src/prefs_common.c:1278
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "Baltisch (ISO-8859-4)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Griechisch (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Griechisch (ISO-8859-7)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkisch (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "Türkisch (ISO-8859-9)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisch (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Kyrillisch (ISO-8859-5)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisch (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "Kyrillisch (KOI8-R)"
 

-#: src/prefs_common.c:1286
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisch (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "Kyrillisch (Windows-1251)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisch (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "Kyrillisch (KOI8-U)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanisch (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japanisch (ISO-2022-JP)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "Japanisch (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "Japanisch (EUC-JP)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "Japanisch (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "Japanisch (Shift_JIS)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereinfachtes Chinesisch (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "Vereinfachtes Chinesisch (GB2312)"
 

-#: src/prefs_common.c:1295
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneles Chinesisch (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "Traditioneles Chinesisch (Big5)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneles Chinesisch (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Traditioneles Chinesisch (EUC-TW)"
 

-#: src/prefs_common.c:1298
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinesisch (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chinesisch (ISO-2022-CN)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "Koreanisch (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "Koreanisch (EUC-KR)"
 

-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Thailändisch (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Thailändisch (TIS-620)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Thailändisch (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Thailändisch (Windows-874)"
 

-#: src/prefs_common.c:1315
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "Übertragungskodierung"
 
 msgid "Transfer encoding"
 msgstr "Übertragungskodierung"
 

-#: src/prefs_common.c:1324
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"


@@ -6045,151 +6100,151 @@ msgstr ""
 "Wähle Übertragungskodierung die verwendet wird wenn der Nachrichtenkörper "
 "nicht-ASCII Zeichen enthält."
 
 "Wähle Übertragungskodierung die verwendet wird wenn der Nachrichtenkörper "
 "nicht-ASCII Zeichen enthält."
 

-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "Automatische Accountwahl"
 
 msgid "Automatic account selection"
 msgstr "Automatische Accountwahl"
 

-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "wenn antworten"
 
 msgid "when replying"
 msgstr "wenn antworten"
 

-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "wenn weiterleiten"
 
 msgid "when forwarding"
 msgstr "wenn weiterleiten"
 

-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "wenn erneut bearbeiten"
 
 msgid "when re-editing"
 msgstr "wenn erneut bearbeiten"
 

-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Antwortknopf löst Mailinglistenantwort aus"
 

-#: src/prefs_common.c:1433
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "Starte automatisch den externen Editor"
 
 msgid "Automatically launch the external editor"
 msgstr "Starte automatisch den externen Editor"
 

-#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 
 msgid "Forward as attachment"
 msgstr "Weiterleiten als Anhang"
 

-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "Cursor Rechteck"
 
 msgid "Block cursor"
 msgstr "Cursor Rechteck"
 

-#: src/prefs_common.c:1446
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Behalte den original 'Von' Nachrichtenkopf beim Umleiten"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Behalte den original 'Von' Nachrichtenkopf beim Umleiten"
 

-#: src/prefs_common.c:1454
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "Automatisch Speichern in Entwurfablage alle "
 
 msgid "Autosave to Drafts folder every "
 msgstr "Automatisch Speichern in Entwurfablage alle "
 

-#: src/prefs_common.c:1461 src/prefs_common.c:1506
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "Zeichen"
 
 msgid "characters"
 msgstr "Zeichen"
 

-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 
 msgid "Undo level"
 msgstr "Anzahl der Undoschritte"
 

-#: src/prefs_common.c:1482
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "Nachrichtenumbruch"
 
 msgid "Message wrapping"
 msgstr "Nachrichtenumbruch"
 

-#: src/prefs_common.c:1494
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 
 msgid "Wrap messages at"
 msgstr "Zeilenumbruch nach"
 

-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 
 msgid "Wrap quotation"
 msgstr "Zitat umbrechen"
 

-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "Umbrechen bei der Eingabe"
 
 msgid "Wrap on input"
 msgstr "Umbrechen bei der Eingabe"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 
 msgid "Wrap before sending"
 msgstr "Zeilenumbruch vor dem Senden"
 

-#: src/prefs_common.c:1522
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Intelligenter Zeilenumbruch (EXPERIMENTELL)"
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Intelligenter Zeilenumbruch (EXPERIMENTELL)"
 

-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "Antwort wird standardmäßig zitiert"
 
 msgid "Reply will quote by default"
 msgstr "Antwort wird standardmäßig zitiert"
 

-#: src/prefs_common.c:1590
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "Antwortformat"
 
 msgid "Reply format"
 msgstr "Antwortformat"
 

-#: src/prefs_common.c:1605 src/prefs_common.c:1644
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 
 msgid "Quotation mark"
 msgstr "Zitatzeichen"
 

-#: src/prefs_common.c:1629
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "Weiterleitungsformat"
 
 msgid "Forward format"
 msgstr "Weiterleitungsformat"
 

-#: src/prefs_common.c:1673
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 
 msgid " Description of symbols "
 msgstr " Beschreibung der Symbole "
 

-#: src/prefs_common.c:1681
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "Zitatzeichen"
 
 msgid "Quotation characters"
 msgstr "Zitatzeichen"
 

-#: src/prefs_common.c:1696
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "Behandle diese Zeichen als Zitatzeichen: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Behandle diese Zeichen als Zitatzeichen: "
 

-#: src/prefs_common.c:1746
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Übersetze Kopfzeilennamen (wie `Von:', `Betreff:')"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Übersetze Kopfzeilennamen (wie `Von:', `Betreff:')"
 

-#: src/prefs_common.c:1749
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 
 msgid "Display unread number next to folder name"
 msgstr "Zeige Anzahl der ungelesenen E-Mails nach Ablagenname"
 

-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürze Newsgruppen länger als"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Kürze Newsgruppen länger als"
 

-#: src/prefs_common.c:1773
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "Zeichen"
 
 msgid "letters"
 msgstr "Zeichen"
 

-#: src/prefs_common.c:1779
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "Gesamtansicht"
 
 msgid "Summary View"
 msgstr "Gesamtansicht"
 

-#: src/prefs_common.c:1788
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Zeile, wenn Sie selbst der Sender sind"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Zeige Empfänger in `Von'-Zeile, wenn Sie selbst der Sender sind"
 

-#: src/prefs_common.c:1791
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "Stelle Absender mittels Adressbuch dar"
 
 msgid "Display sender using address book"
 msgstr "Stelle Absender mittels Adressbuch dar"
 

-#: src/prefs_common.c:1794
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Threads mit Unterstützung des Betreffs zusätzlich zum Standardheader"
 

-#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "Datumsformat"
 
 msgid "Date format"
 msgstr "Datumsformat"
 

-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " Setze anzuzeigende Informationen des Ablageninhalts... "
 
 msgid " Set displayed items in summary... "
 msgstr " Setze anzuzeigende Informationen des Ablageninhalts... "
 

-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 
 msgid "Enable coloration of message"
 msgstr "Benutze Farben für Nachrichten"
 

-#: src/prefs_common.c:1900
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"


@@ -6197,347 +6252,330 @@ msgstr ""
 "Stelle multi-byte-alphanumerische Zeichen als\n"
 "ASCII Zeichen dar (nur Japanisch)"
 
 "Stelle multi-byte-alphanumerische Zeichen als\n"
 "ASCII Zeichen dar (nur Japanisch)"
 

-#: src/prefs_common.c:1906
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 
 msgid "Display header pane above message view"
 msgstr "Zeige Kopfzeilenleiste über Nachrichtenansicht"
 

-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 
 msgid "Display short headers on message view"
 msgstr "Zeige kurze Kopfzeilen in der Nachrichtenansicht"
 

-#: src/prefs_common.c:1935
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Zeilenabstand"
 
 msgid "Line space"
 msgstr "Zeilenabstand"
 

-#: src/prefs_common.c:1949 src/prefs_common.c:1989
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "Pixel"
 
 msgid "pixel(s)"
 msgstr "Pixel"
 

-#: src/prefs_common.c:1954
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "Halte Abstand vom Anfang"
 
 msgid "Leave space on head"
 msgstr "Halte Abstand vom Anfang"
 

-#: src/prefs_common.c:1956
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "Scroll"
 
 msgid "Scroll"
 msgstr "Scroll"
 

-#: src/prefs_common.c:1963
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Halbe Seite"
 
 msgid "Half page"
 msgstr "Halbe Seite"
 

-#: src/prefs_common.c:1969
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 
 msgid "Smooth scroll"
 msgstr "Fließendes Scrollen"
 

-#: src/prefs_common.c:1975
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "Schritt"
 
 msgid "Step"
 msgstr "Schritt"
 

-#: src/prefs_common.c:2000
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zeige Beschreibung des Anhangs (anstatt des Namens)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zeige Beschreibung des Anhangs (anstatt des Namens)"
 

-#: src/prefs_common.c:2046
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 
 msgid "Automatically check signatures"
 msgstr "Überprüfe digitale Unterschriften automatisch"
 

-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "Speichere Passwort zeitweilig im Speicher"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "Speichere Passwort zeitweilig im Speicher"
 

-#: src/prefs_common.c:2064
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr "Verfalle nach"
 
 msgid "Expire after"
 msgstr "Verfalle nach"
 

-#: src/prefs_common.c:2075
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ein Wert von '0' speichert das Passwort für die ganze Sitzung"
 

-#: src/prefs_common.c:2083
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "Minute(n) "
 
 msgid "minute(s) "
 msgstr "Minute(n) "
 

-#: src/prefs_common.c:2100
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Eingabe sperren, bei der Eingabe eines Mantra"
 

-#: src/prefs_common.c:2105
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Zeige Warnung beim Start, wenn GnuPG nicht funktioniert"
 

-#: src/prefs_common.c:2166
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Öffne Nachrichten in der Zusammenfassung sie ausgewählt wurde"
 
 msgid "Always open messages in summary when selected"
 msgstr "Öffne Nachrichten in der Zusammenfassung sie ausgewählt wurde"
 

-#: src/prefs_common.c:2170
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
 
 msgid "Open first unread message when entering a folder"
 msgstr "Erste Nachricht anzeigen beim Öffnen einer Ablage"
 

-#: src/prefs_common.c:2174
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachricht nur als gelesen markieren, wenn sie in einem neuen Fenster "
 "geöffnet wurde"
 
 msgid "Only mark message as read when opened in new window"
 msgstr ""
 "Nachricht nur als gelesen markieren, wenn sie in einem neuen Fenster "
 "geöffnet wurde"
 

-#: src/prefs_common.c:2178
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "Wechsle zu Inbox nach dem Empfang neuer E-Mail"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "Wechsle zu Inbox nach dem Empfang neuer E-Mail"
 

-#: src/prefs_common.c:2188
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Sofort Ausführen beim Bewegen oder Löschen von Nachrichten"
 

-#: src/prefs_common.c:2190
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgstr ""
 "Nachricht wird markiert bis zur Ausführung, wenn dies ausgeschaltet ist"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr ""
 "Nachricht wird markiert bis zur Ausführung, wenn dies ausgeschaltet ist"
 

-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "Zeige 'Keine ungelesenen Nachrichten' Dialog"
 
 msgid "Show no-unread-message dialog"
 msgstr "Zeige 'Keine ungelesenen Nachrichten' Dialog"
 

-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "Nehme an 'Ja'"
 
 msgid "Assume 'Yes'"
 msgstr "Nehme an 'Ja'"
 

-#: src/prefs_common.c:2215
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "Nehme an 'Nein'"
 
 msgid "Assume 'No'"
 msgstr "Nehme an 'Nein'"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr "Setze Tastenbindungen"
 
 msgid " Set key bindings... "
 msgstr "Setze Tastenbindungen"
 

-#: src/prefs_common.c:2230
-msgid "Icon theme"
-msgstr "Icon Theme"
-
-#: src/prefs_common.c:2314
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externeres Kommando (%s wird durch Dateinamen / URI ersetzt)"
-
-#: src/prefs_common.c:2323
-msgid "Web browser"
-msgstr "Webbrowser"
-
-#: src/prefs_common.c:2359 src/toolbar.c:429
-msgid "Editor"
-msgstr "Editor"
-
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Adresse ins Ziel einfügen bei Doppel-Click"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Adresse ins Ziel einfügen bei Doppel-Click"
 

-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "Loggröße"
 
 msgid "Log Size"
 msgstr "Loggröße"
 

-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "Kürze die Größe des Logs"
 
 msgid "Clip the log size"
 msgstr "Kürze die Größe des Logs"
 

-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "Logfensterlänge"
 
 msgid "Log window length"
 msgstr "Logfensterlänge"
 

-#: src/prefs_common.c:2417
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "0 um das Logging im Log-Fenster zu stoppen"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 um das Logging im Log-Fenster zu stoppen"
 

-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "Sicherheit"
 
 msgid "Security"
 msgstr "Sicherheit"
 

-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "Fragen vor Akzeptieren von SSL-Zertifikaten"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "Fragen vor Akzeptieren von SSL-Zertifikaten"
 

-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "Beim Beenden"
 
 msgid "On exit"
 msgstr "Beim Beenden"
 

-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 
 msgid "Confirm on exit"
 msgstr "Nachfragen beim Beenden"
 

-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 
 msgid "Empty trash on exit"
 msgstr "Leere Papierkorb beim Beenden"
 

-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 
 msgid "Ask before emptying"
 msgstr "Fragen vor dem Leeren"
 

-#: src/prefs_common.c:2462
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 
 msgid "Warn if there are queued messages"
 msgstr "Warnen, wenn wartende Nachrichten vorhanden"
 

-#: src/prefs_common.c:2468
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Socket I/O Timeout:"
 
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O Timeout:"
 

-#: src/prefs_common.c:2481
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "Sekunden"
 
 msgid "seconds"
 msgstr "Sekunden"
 

-#: src/prefs_common.c:2665
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 
 msgid "the full abbreviated weekday name"
 msgstr "den abgekürzten Namen des Wochentags"
 

-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 
 msgid "the full weekday name"
 msgstr "den vollständigen Namen des Wochentags"
 

-#: src/prefs_common.c:2667
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 
 msgid "the abbreviated month name"
 msgstr "den abgekürzten Namen des Monats"
 

-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 
 msgid "the full month name"
 msgstr "den vollständigen Namen des Monats"
 

-#: src/prefs_common.c:2669
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 
 msgid "the preferred date and time for the current locale"
 msgstr "das bevorzugte lokale Zeit-/Datumsformat"
 

-#: src/prefs_common.c:2670
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 
 msgid "the century number (year/100)"
 msgstr "das Jahrhundert (Jahr/100)"
 

-#: src/prefs_common.c:2671
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 
 msgid "the day of the month as a decimal number"
 msgstr "der Tag des Monats als Dezimalzahl"
 

-#: src/prefs_common.c:2672
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 24-Std. Uhr"
 

-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "die Stunde als Dezimalzahl einer 12-Std. Uhr"
 

-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 
 msgid "the day of the year as a decimal number"
 msgstr "der Tag des Jahres als Dezimalzahl"
 

-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 
 msgid "the month as a decimal number"
 msgstr "der Monat als Dezimalzahl"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 
 msgid "the minute as a decimal number"
 msgstr "die Minute als Dezimalzahl"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 
 msgid "either AM or PM"
 msgstr "entweder AM oder PM"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 
 msgid "the second as a decimal number"
 msgstr "die Sekunden als Dezimalzahl"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 
 msgid "the day of the week as a decimal number"
 msgstr "der Wochentag als Dezimalzahl"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 
 msgid "the preferred date for the current locale"
 msgstr "das bevorzugte lokale Datumsformat"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 
 msgid "the last two digits of a year"
 msgstr "die letzten beiden Stellen des Jahres"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 
 msgid "the year as a decimal number"
 msgstr "das Jahr als Dezimalzahl"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 
 msgid "the time zone or name or abbreviation"
 msgstr "die Zeitzone oder Abkürzung"
 

-#: src/prefs_common.c:2704
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 
 msgid "Specifier"
 msgstr "Spezifikationssymbol"
 

-#: src/prefs_common.c:2744
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "Beispiel"
 
 msgid "Example"
 msgstr "Beispiel"
 

-#: src/prefs_common.c:2833
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 
 msgid "Set message colors"
 msgstr "Setze Nachrichtenfarbe"
 

-#: src/prefs_common.c:2841
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "Farben"
 
 msgid "Colors"
 msgstr "Farben"
 

-#: src/prefs_common.c:2888
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 
 msgid "Quoted Text - First Level"
 msgstr "Zitierter Text - Erste Ebene"
 

-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 
 msgid "Quoted Text - Second Level"
 msgstr "Zitierter Text - Zweite Ebene"
 

-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 
 msgid "Quoted Text - Third Level"
 msgstr "Zitierter Text - Dritte Ebene"
 

-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "URI-Link"
 
 msgid "URI link"
 msgstr "URI-Link"
 

-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Zielablage"
 
 msgid "Target folder"
 msgstr "Zielablage"
 

-#: src/prefs_common.c:2918
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Unterschriften"
 
 msgid "Signatures"
 msgstr "Unterschriften"
 

-#: src/prefs_common.c:2925
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 
 msgid "Recycle quote colors"
 msgstr "Stelle Zitatfarben wiederher"
 

-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 
 msgid "Pick color for quotation level 1"
 msgstr "Wähle Farbe für Zitatebene 1"
 

-#: src/prefs_common.c:2995
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 
 msgid "Pick color for quotation level 2"
 msgstr "Wähle Farbe für Zitatebene 2"
 

-#: src/prefs_common.c:2998
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 
 msgid "Pick color for quotation level 3"
 msgstr "Wähle Farbe für Zitatebene 3"
 

-#: src/prefs_common.c:3001
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 
 msgid "Pick color for URI"
 msgstr "Wähle Farbe für URI"
 

-#: src/prefs_common.c:3004
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Wähle Farbe für Zielablage"
 
 msgid "Pick color for target folder"
 msgstr "Wähle Farbe für Zielablage"
 

-#: src/prefs_common.c:3007
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Wähle Farbe für Signaturen"
 
 msgid "Pick color for signatures"
 msgstr "Wähle Farbe für Signaturen"
 

-#: src/prefs_common.c:3142
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "Tastaturkürzel"
 
 msgid "Key bindings"
 msgstr "Tastaturkürzel"
 

-#: src/prefs_common.c:3156
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Wähle Voreinstellung:"
 
 msgid "Select preset:"
 msgstr "Wähle Voreinstellung:"
 

-#: src/prefs_common.c:3169 src/prefs_common.c:3454
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Altes Sylpheed"
 

-#: src/prefs_common.c:3177
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6559,11 +6597,15 @@ msgstr "Aktuelle benutzerdefinierte Kopfzeilen"
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 
 msgid "Header name is not set."
 msgstr "Kopfzeilenname ist nicht gesetzt."
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "Dieser Kopfzeilenname ist als benutzerdefinierte Kopfzeilen nicht erlaubt"
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "Kopfzeilen löschen"
 
 msgid "Delete header"
 msgstr "Kopfzeilen löschen"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "Wollen Sie wirklich diese Kopfzeile löschen?"
 
 msgid "Do you really want to delete this header?"
 msgstr "Wollen Sie wirklich diese Kopfzeile löschen?"
 


@@ -6591,6 +6633,35 @@ msgstr "Zeige alle unspezifizierten Kopfzeilen"
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 
 msgid "This header is already in the list."
 msgstr "Diese Kopfzeile ist bereits in der Liste enthalten."
 

+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s wird ersetzt durch Dateinamen / URI"
+
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "Webbrowser"
+
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "Druckbefehl"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Text Editor"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "Bildbetrachter"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "Audio Player"
+
+#: src/prefs_ext_prog.c:265
+msgid "Message View/External Programs"
+msgstr "Nachrichtenanzeige/Externe Programme"
+

 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Verschieben"
 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Verschieben"


@@ -6623,7 +6694,7 @@ msgstr "Markieren als gelesen"
 msgid "Mark as unread"
 msgstr "Markieren als ungelesen"
 
 msgid "Mark as unread"
 msgstr "Markieren als ungelesen"
 

-#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473

 msgid "Forward"
 msgstr "Weiterleiten"
 
 msgid "Forward"
 msgstr "Weiterleiten"
 


@@ -6632,7 +6703,7 @@ msgid "Redirect"
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
 msgstr "Umleiten"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395

-#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481

 msgid "Execute"
 msgstr "Ausführen"
 
 msgid "Execute"
 msgstr "Ausführen"
 


@@ -6673,7 +6744,7 @@ msgid "Recipient"
 msgstr "Empfänger"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
 msgstr "Empfänger"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75

-#: src/summaryview.c:479
+#: src/summaryview.c:480

 msgid "Score"
 msgstr "Note"
 
 msgid "Score"
 msgstr "Note"
 


@@ -6712,23 +6783,23 @@ msgstr "Es wurde keine Aktion definiert."
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47

-#: src/summaryview.c:474 src/summaryview.c:641
+#: src/summaryview.c:475 src/summaryview.c:642

 msgid "Subject"
 msgstr "Betreff"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
 msgid "Subject"
 msgstr "Betreff"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42

-#: src/summaryview.c:475 src/summaryview.c:645
+#: src/summaryview.c:476 src/summaryview.c:646

 msgid "From"
 msgstr "Von"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
 msgid "From"
 msgstr "Von"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143

-#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650

 msgid "To"
 msgstr "An:"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
 msgid "To"
 msgstr "An:"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715

-#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477

 msgid "Date"
 msgstr "Datum"
 
 msgid "Date"
 msgstr "Datum"
 


@@ -6787,35 +6858,35 @@ msgstr "Anfang"
 msgid "Bottom"
 msgstr "Ende"
 
 msgid "Bottom"
 msgstr "Ende"
 

-#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht zulässig."
 
 msgid "Condition string is not valid."
 msgstr "Bedingungszeichenfolge ist nicht zulässig."
 

-#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "Aktionszeichenfolge ist nicht zulässig."
 
 msgid "Action string is not valid."
 msgstr "Aktionszeichenfolge ist nicht zulässig."
 

-#: src/prefs_filtering.c:780
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 
 msgid "Condition string is empty."
 msgstr "Bedingungszeichenfolge ist leer."
 

-#: src/prefs_filtering.c:786
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 
 msgid "Action string is empty."
 msgstr "Aktionszeichenfolge ist leer."
 

-#: src/prefs_filtering.c:853
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "Lösche Regel"
 
 msgid "Delete rule"
 msgstr "Lösche Regel"
 

-#: src/prefs_filtering.c:854
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "Wollen Sie wirklich diese Regel löschen?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Wollen Sie wirklich diese Regel löschen?"
 

-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 
 msgid "Entry not saved"
 msgstr "Eintrag nicht gespeichert"
 

-#: src/prefs_filtering.c:1002
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "Der Eintrag wurde nicht gespeichert. Trotzdem schließen?"
 


@@ -6877,31 +6948,27 @@ msgstr "Generell"
 msgid "Settings for folder"
 msgstr "Ablageneinstellungen"
 
 msgid "Settings for folder"
 msgstr "Ablageneinstellungen"
 

-#: src/prefs_fonts.c:77
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Schriftauswahl"
 
 msgid "Font selection"
 msgstr "Schriftauswahl"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Text"
-
-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "Klein"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "Ablagenansicht"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Normal"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Nachrichtenansicht"

 
 

-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgstr "Fett"
 
 msgid "Bold"
 msgstr "Fett"
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr "Die Änderungen sind erst nach einem Neustart verfügbar"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr "Die Änderungen sind erst nach einem Neustart verfügbar"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "Anzeige/Schriften"
 
 msgid "Display/Fonts"
 msgstr "Anzeige/Schriften"
 


@@ -7198,6 +7265,167 @@ msgstr "L
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie wirklich diese Vorlage löschen?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie wirklich diese Vorlage löschen?"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "Standard internes Theme"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "Anzeige/Themes"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Nur root kann System Themes entfernen"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Entferne System Theme '%s'"
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Entferne Theme '%s'"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "Wollen Sie wirklich diese Theme löschen?"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Datei %s fehlgeschlagen\n"
+"beim Entfernen des Theme."
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "Entfernen des Theme Verzeichnisses fehlgeschlagen."
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Theme erfolgreich entfernt"
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Wähle Themeablage"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Installiere Theme '%s'"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Dieses Verzeichnis scheint kein Themeverzeichnis zu sein.\n"
+"Trotzdem installieren?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "Wollen Sie die Theme für alle Benutzer des Systems installieren?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"Ein Theme mit dem selben Namen\n"
+"ist bereits an dort installiert"
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr ""
+"Konnte Zielverzeichnis nicht erstellen"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Theme erfolgreich installiert"
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+"Datei %s fehlgeschlagen\n"
+"beim Installieren des Theme."
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "%d Themes vorhanden (%d User, %d System, 1 intern)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "Das Sylpheed Claws Team"
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "Internes Theme hat %d Icons"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "Keine Infodatei für dieses Theme vorhanden"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "Error: Kann Themestatus nicht holen"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d Dateien (%d Icons), Größe %s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Wählschalter"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "Neu installieren..."
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "Hole mehr..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "Information"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "Author: "
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "URL:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "Status:"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Vorschau"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "Aktionen"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "Benutze dies"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "Entfernen"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -7266,7 +7494,7 @@ msgstr "Toolbars anpassen/Nachrichtenfenster"
 msgid "Customize Toolbars/Compose Window"
 msgstr "Toolbars anpassen/Verfassen-Fenster"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "Toolbars anpassen/Verfassen-Fenster"
 

-#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140

 msgid "No signature found"
 msgstr "Keine digitale Unterschrift gefunden"
 
 msgid "No signature found"
 msgstr "Keine digitale Unterschrift gefunden"
 


@@ -7274,11 +7502,11 @@ msgstr "Keine digitale Unterschrift gefunden"
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 
 msgid "No information available"
 msgstr "Keine Informationen verfügbar"
 

-#: src/procmsg.c:1126
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr "Konnte temporäre Datei für das Senden der News nicht erstellen"
 
 msgid "Could not create temporary file for news sending."
 msgstr "Konnte temporäre Datei für das Senden der News nicht erstellen"
 

-#: src/procmsg.c:1137
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei für Newssendung."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Fehler beim Schreiben der temporären Datei für Newssendung."
 


@@ -7482,93 +7710,93 @@ msgstr ""
 "Sie können eine vorhandene Mailbox im MH-Format nutzen.\n"
 "Wenn Sie sich nicht sicher sind, wählen Sie OK."
 
 "Sie können eine vorhandene Mailbox im MH-Format nutzen.\n"
 "Wenn Sie sich nicht sicher sind, wählen Sie OK."
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr "Undefiniert"
 
 msgid "Undefined"
 msgstr "Undefiniert"
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr "Gering"
 
 msgid "Marginal"
 msgstr "Gering"
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 msgid "Ultimate"
 msgstr "Ultimativ"
 
 msgid "Ultimate"
 msgstr "Ultimativ"
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Gültige Signatur von %s (Vertrauen: %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Gültige Signatur von %s (Vertrauen: %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "Die Signatur ist abgelaufen"
 
 msgid "The signature has expired"
 msgstr "Die Signatur ist abgelaufen"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr ""
 "Der Schlüssel der verwendet wurde um diesen Teil zu signieren ist abgelaufen"
 
 msgid "The key that was used to sign this part has expired"
 msgstr ""
 "Der Schlüssel der verwendet wurde um diesen Teil zu signieren ist abgelaufen"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "Nicht alle Signaturen sind gültig"
 
 msgid "Not all signatures are valid"
 msgstr "Nicht alle Signaturen sind gültig"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "Diese Signatur ist ungültig"
 
 msgid "This signature is invalid"
 msgstr "Diese Signatur ist ungültig"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "Kein Schlüssel zum überprüfen dieser Signatur vorhanden"
 
 msgid "You have no key to verify this signature"
 msgstr "Kein Schlüssel zum überprüfen dieser Signatur vorhanden"
 

-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "Ein Fehler ist aufgetreten"
 
 msgid "An error occured"
 msgstr "Ein Fehler ist aufgetreten"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "Die Signatur wurde nicht überprüft"
 
 msgid "The signature has not been checked"
 msgstr "Die Signatur wurde nicht überprüft"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gemacht am %s unter Verwendung des %s Schlüssel ID %s\n"
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Signatur gemacht am %s unter Verwendung des %s Schlüssel ID %s\n"
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Gute Signatur von \"%s\"\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Gute Signatur von \"%s\"\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Abgelaufene Signatur von \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Abgelaufene Signatur von \"%s\"\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "SCHLECHTE Signatur von \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "SCHLECHTE Signatur von \"%s\"\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 

-#: src/sgpgme.c:194
+#: src/sgpgme.c:203

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Primärer Schlüssel Fingerabdruck: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Primärer Schlüssel Fingerabdruck: %s\n"
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur läuft %s ab\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Signatur läuft %s ab\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Unterschrift %s abgelaufen\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Unterschrift %s abgelaufen\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7601,10 +7829,6 @@ msgstr "L
 msgid "Do you really want to delete this certificate?"
 msgstr "Wollen Sie wirklich dieses Zertifikat löschen?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Wollen Sie wirklich dieses Zertifikat löschen?"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "(Betreff gelöscht durch RegExp)"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Suche Nachrichten"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Suche Nachrichten"


@@ -7629,538 +7853,539 @@ msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/An_twort"
 
 msgid "/_Reply"
 msgstr "/An_twort"
 

-#: src/summaryview.c:404
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/Antwort an"
 
 msgid "/Repl_y to"
 msgstr "/Antwort an"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/Antwort an/A_lle"
 
 msgid "/Repl_y to/_all"
 msgstr "/Antwort an/A_lle"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/_Antwort an/_Absender"
 
 msgid "/Repl_y to/_sender"
 msgstr "/_Antwort an/_Absender"
 

-#: src/summaryview.c:407
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/_Mailingliste"
 

-#: src/summaryview.c:409
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "/Folge-nach und antworte an"
 
 msgid "/Follow-up and reply to"
 msgstr "/Folge-nach und antworte an"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 

-#: src/summaryview.c:412
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/Umleiten"
 
 msgid "/Redirect"
 msgstr "/Umleiten"
 

-#: src/summaryview.c:414
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/Wi_ederbearbeiten"
 
 msgid "/Re-_edit"
 msgstr "/Wi_ederbearbeiten"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 
 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 
 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/News vom Server löschen"
 
 msgid "/Cancel a news message"
 msgstr "/News vom Server löschen"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "/_Ausführen"
 
 msgid "/E_xecute"
 msgstr "/_Ausführen"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/_Markieren"
 
 msgid "/_Mark"
 msgstr "/_Markieren"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/_Markieren/_Markieren"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Markieren/_Markieren"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/_Markieren/Markierung _entfernen"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Markieren/Markierung _entfernen"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 
 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Markiere als _ungelesen"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Markiere als _ungelesen"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Markiere als gelesen"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Markiere als gelesen"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/_Markieren/Markiere alle als gelesen"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Markieren/Markiere alle als gelesen"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/_Markieren/Ignoriere Thread"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Markieren/Ignoriere Thread"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/_Markieren/Unignoriere Thread"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Markieren/Unignoriere Thread"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/_Markieren/Sperren"
 
 msgid "/_Mark/Lock"
 msgstr "/_Markieren/Sperren"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/_Markieren/Entsperren"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Markieren/Entsperren"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/Einfärben"
 
 msgid "/Color la_bel"
 msgstr "/Einfärben"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "/Absender dem _Adressbuch hinzufügen"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Absender dem _Adressbuch hinzufügen"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgstr "/Filter_regel erstellen"
 
 msgid "/Create f_ilter rule"
 msgstr "/Filter_regel erstellen"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter_regel erstellen/_Automatisch"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter_regel erstellen/_Automatisch"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter_regel erstellen/nach _Von"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter_regel erstellen/nach _Von"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter_regel erstellen/nach _An"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter_regel erstellen/nach _An"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter_regel erstellen/nach _Betreff"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter_regel erstellen/nach _Betreff"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Create processing rule"
 msgstr "/Verarbeitungregel erstellen"
 
 msgid "/Create processing rule"
 msgstr "/Verarbeitungregel erstellen"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:449

 msgid "/Create processing rule/_Automatically"
 msgstr "/Verarbeitungregel erstellen/_Automatisch"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Verarbeitungregel erstellen/_Automatisch"
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Create processing rule/by _From"
 msgstr "/Verarbeitungregel erstellen/nach _Von"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Verarbeitungregel erstellen/nach _Von"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create processing rule/by _To"
 msgstr "/Verarbeitungregel erstellen/nach _An"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Verarbeitungregel erstellen/nach _An"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/Create processing rule/by _Subject"
 msgstr "/Verarbeitungregel erstellen/nach _Betreff"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Verarbeitungregel erstellen/nach _Betreff"
 

-#: src/summaryview.c:460
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "/_Ansicht/Zeige _Quellen"
 
 msgid "/_View/_Source"
 msgstr "/_Ansicht/Zeige _Quellen"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "/_Ansicht/Alle _Kopfzeilen"
 
 msgid "/_View/All _header"
 msgstr "/_Ansicht/Alle _Kopfzeilen"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/_Drucken..."
 
 msgid "/_Print..."
 msgstr "/_Drucken..."
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/A_lle auswählen"
 
 msgid "/Select _all"
 msgstr "/A_lle auswählen"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Wähle _Thread"
 
 msgid "/Select t_hread"
 msgstr "/Wähle _Thread"
 

-#: src/summaryview.c:471
+#: src/summaryview.c:472

 msgid "M"
 msgstr "M"
 
 msgid "M"
 msgstr "M"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "No."
 msgstr "Nr."
 
 msgid "No."
 msgstr "Nr."
 

-#: src/summaryview.c:480
+#: src/summaryview.c:481

 msgid "L"
 msgstr "L"
 
 msgid "L"
 msgstr "L"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "Alle Nachrichten"
 
 msgid "all messages"
 msgstr "Alle Nachrichten"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 
 msgid "messages whose age is greater than #"
 msgstr "Nachrichten, deren Alter größer ist als #"
 

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 
 msgid "messages whose age is less than #"
 msgstr "Nachrichten, deren Alter kleiner ist als #"
 

-#: src/summaryview.c:492
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 
 msgid "messages which contain S in the message body"
 msgstr "Nachrichten, die S im Nachrichtenkörper enthalten"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachrichten enthalten"
 
 msgid "messages which contain S in the whole message"
 msgstr "Nachrichten, die S in der ganzen Nachrichten enthalten"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr "Nachrichten, Kopie gesendet an S"
 
 msgid "messages carbon-copied to S"
 msgstr "Nachrichten, Kopie gesendet an S"
 

-#: src/summaryview.c:495
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 
 msgid "message is either to: or cc: to S"
 msgstr "Nachricht ist entweder to: oder cc: an S"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 
 msgid "deleted messages"
 msgstr "gelöschte Nachrichten"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 
 msgid "messages which contain S in the Sender field"
 msgstr "Nachrichten, die S im Absenderfeld enthalten"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "wahr wenn der Aufruf von \"S\" erfolgreich war"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "wahr wenn der Aufruf von \"S\" erfolgreich war"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 
 msgid "messages originating from user S"
 msgstr "Nachrichten, ursprünglich von User S"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 
 msgid "forwarded messages"
 msgstr "weitergeleitete Nachrichten"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 
 msgid "messages which contain header S"
 msgstr "Nachrichten, die den Header S enthalten"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "Nachrichten, die S im Message-Id-Header enthalten"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "Nachrichten, die S im 'Inreplyto'-Header enthalten"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 
 msgid "locked messages"
 msgstr "gesperrte Nachrichten"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 
 msgid "messages which are in newsgroup S"
 msgstr "Nachrichten in der Newsgroup S"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "neue Nachrichten"
 
 msgid "new messages"
 msgstr "neue Nachrichten"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "alte Nachrichten"
 
 msgid "old messages"
 msgstr "alte Nachrichten"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 
 msgid "messages which have been replied to"
 msgstr "Nachrichten, die beantwortet wurden"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "gelesene Nachrichten"
 
 msgid "read messages"
 msgstr "gelesene Nachrichten"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 
 msgid "messages which contain S in subject"
 msgstr "Nachrichten, die S im Betreff enthalten"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 
 msgid "messages whose score is equal to #"
 msgstr "Nachrichten, deren Score gleich # ist"
 

-#: src/summaryview.c:512
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 
 msgid "messages whose score is greater than #"
 msgstr "Nachrichten, deren Score größer als # ist"
 

-#: src/summaryview.c:513
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 
 msgid "messages whose score is lower than #"
 msgstr "Nachrichten, deren Score kleiner als # ist"
 

-#: src/summaryview.c:514
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 
 msgid "messages whose size is equal to #"
 msgstr "Nachrichten, deren Größe gleich # ist"
 

-#: src/summaryview.c:515
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 
 msgid "messages whose size is greater than #"
 msgstr "Nachrichten, deren Größe größer als # ist"
 

-#: src/summaryview.c:516
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 
 msgid "messages whose size is smaller than #"
 msgstr "Nachrichten, deren Größe kleiner als # ist"
 

-#: src/summaryview.c:517
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 
 msgid "messages which have been sent to S"
 msgstr "Nachrichten, die an S gesendet wurden"
 

-#: src/summaryview.c:518
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "markierte Nachrichten"
 
 msgid "marked messages"
 msgstr "markierte Nachrichten"
 

-#: src/summaryview.c:519
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 
 msgid "unread messages"
 msgstr "ungelesene Nachrichten"
 

-#: src/summaryview.c:520
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 
 msgid "messages which contain S in References header"
 msgstr "Nachrichten, die S im Referenzheader enthalten"
 

-#: src/summaryview.c:521
+#: src/summaryview.c:522

 msgid "messages returning 0 when passed to command"
 msgid "messages returning 0 when passed to command"

-msgstr "Nachrichten die 0 zurückgeben wenn sie an das Kommando übergeben werden"
+msgstr ""
+"Nachrichten die 0 zurückgeben wenn sie an das Kommando übergeben werden"

 
 

-#: src/summaryview.c:522
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 
 msgid "messages which contain S in X-Label header"
 msgstr "Nachrichten, die S im X-Label-Header enthalten"
 

-#: src/summaryview.c:524
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 
 msgid "logical AND operator"
 msgstr "Logischer UND Operator"
 

-#: src/summaryview.c:525
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 
 msgid "logical OR operator"
 msgstr "Logischer ODER Operator"
 

-#: src/summaryview.c:526
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 
 msgid "logical NOT operator"
 msgstr "Logischer NICHT Operator"
 

-#: src/summaryview.c:527
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachtende Suche"
 
 msgid "case sensitive search"
 msgstr "Groß-/Kleinschreibung beachtende Suche"
 

-#: src/summaryview.c:534
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "Erweiterte Suchsymbole"
 
 msgid "Extended Search symbols"
 msgstr "Erweiterte Suchsymbole"
 

-#: src/summaryview.c:584
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "Schnellsuchmenu umschalten"
 
 msgid "Toggle quick-search bar"
 msgstr "Schnellsuchmenu umschalten"
 

-#: src/summaryview.c:668
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "Erweiterte Symbole"
 
 msgid "Extended Symbols"
 msgstr "Erweiterte Symbole"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 

-#: src/summaryview.c:934
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 

-#: src/summaryview.c:977
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 

-#: src/summaryview.c:1400 src/summaryview.c:1444
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesene Nachrichten"
 
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesene Nachrichten"
 

-#: src/summaryview.c:1401
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1413 src/summaryview.c:1457
+#: src/summaryview.c:1416 src/summaryview.c:1460

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interner Fehler: Unerwarteter Wert für prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Interner Fehler: Unerwarteter Wert für prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1421
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "Keine ungelesene Nachrichten."
 
 msgid "No unread messages."
 msgstr "Keine ungelesene Nachrichten."
 

-#: src/summaryview.c:1445
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 

-#: src/summaryview.c:1487 src/summaryview.c:1511
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 
 msgid "No more new messages"
 msgstr "Keine weiteren neuen Nachrichten"
 

-#: src/summaryview.c:1488
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 

-#: src/summaryview.c:1512
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 

-#: src/summaryview.c:1514
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "Nochmal Suchen"
 
 msgid "Search again"
 msgstr "Nochmal Suchen"
 

-#: src/summaryview.c:1543 src/summaryview.c:1568
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 
 msgid "No more marked messages"
 msgstr "Keine weiteren markierten Nachrichten"
 

-#: src/summaryview.c:1544
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1553 src/summaryview.c:1578
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten"
 
 msgid "No marked messages."
 msgstr "Keine markierten Nachrichten"
 

-#: src/summaryview.c:1569
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 

-#: src/summaryview.c:1593 src/summaryview.c:1618
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "Keine weiteren eingefärbten Nachrichten"
 
 msgid "No more labeled messages"
 msgstr "Keine weiteren eingefärbten Nachrichten"
 

-#: src/summaryview.c:1594
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Ende suchen?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Ende suchen?"
 

-#: src/summaryview.c:1603 src/summaryview.c:1628
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "Keine eingefärbte Nachrichten"
 
 msgid "No labeled messages."
 msgstr "Keine eingefärbte Nachrichten"
 

-#: src/summaryview.c:1619
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Anfang suchen?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine eingefärbte Nachricht gefunden. Vom Anfang suchen?"
 

-#: src/summaryview.c:1832
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 

-#: src/summaryview.c:1979
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 

-#: src/summaryview.c:1983
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 

-#: src/summaryview.c:1984 src/summaryview.c:1991
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 

-#: src/summaryview.c:2004
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr " Eintrag gewählt"
 
 msgid " item selected"
 msgstr " Eintrag gewählt"
 

-#: src/summaryview.c:2006
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr " Einträge gewählt"
 
 msgid " items selected"
 msgstr " Einträge gewählt"
 

-#: src/summaryview.c:2022
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 

-#: src/summaryview.c:2196
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 

-#: src/summaryview.c:2266
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "Setze Ablagenansicht aus Nachrichtendaten..."
 
 msgid "Setting summary from message data..."
 msgstr "Setze Ablagenansicht aus Nachrichtendaten..."
 

-#: src/summaryview.c:2395
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 

-#: src/summaryview.c:3022
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Sie sind nicht der Autor dieses Artikels\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Sie sind nicht der Autor dieses Artikels\n"
 

-#: src/summaryview.c:3109
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 

-#: src/summaryview.c:3110
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Müll löschen?"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Müll löschen?"
 

-#: src/summaryview.c:3152
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 

-#: src/summaryview.c:3266
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "Ziel ist gleich der aktuellen Ablage."
 
 msgid "Destination is same as current folder."
 msgstr "Ziel ist gleich der aktuellen Ablage."
 

-#: src/summaryview.c:3343
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "Kopierziel ist gleich der aktuellen Ablage."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Kopierziel ist gleich der aktuellen Ablage."
 

-#: src/summaryview.c:3393
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Wähle alle Nachrichten..."
 
 msgid "Selecting all messages..."
 msgstr "Wähle alle Nachrichten..."
 

-#: src/summaryview.c:3451
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 
 msgid "Append or Overwrite"
 msgstr "Anhängen oder Überschreiben"
 

-#: src/summaryview.c:3452
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "Anhängen oder Überschreiben der existierenden Datei?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Anhängen oder Überschreiben der existierenden Datei?"
 

-#: src/summaryview.c:3453
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "Anhängen"
 
 msgid "Append"
 msgstr "Anhängen"
 

-#: src/summaryview.c:3744
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "Erstelle Threads"
 
 msgid "Building threads..."
 msgstr "Erstelle Threads"
 

-#: src/summaryview.c:3842
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "Hebe Threads auf"
 
 msgid "Unthreading..."
 msgstr "Hebe Threads auf"
 

-#: src/summaryview.c:3975
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "Keine Filterregeln definiert."
 
 msgid "No filter rules defined."
 msgstr "Keine Filterregeln definiert."
 

-#: src/summaryview.c:3984
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "Filtere..."
 
 msgid "Filtering..."
 msgstr "Filtere..."
 

-#: src/summaryview.c:5330
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8169,142 +8394,142 @@ msgstr ""
 "Fehler in der 'Regular Expression' (regexp):\n"
 "%s"
 
 "Fehler in der 'Regular Expression' (regexp):\n"
 "%s"
 

-#: src/textview.c:570
+#: src/textview.c:574

 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 

-#: src/textview.c:587
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr "Das Folgende kann mit diesem Teil durchgeführt werden "
 
 msgid "The following can be performed on this part by "
 msgstr "Das Folgende kann mit diesem Teil durchgeführt werden "
 

-#: src/textview.c:588
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "durch rechtsklicken auf das Icon oder Listenelement:\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "durch rechtsklicken auf das Icon oder Listenelement:\n"
 

-#: src/textview.c:590
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Zum Speichern wähle 'Speichern unter...' (Kurzwahltaste: 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Zum Speichern wähle 'Speichern unter...' (Kurzwahltaste: 'y')\n"
 

-#: src/textview.c:591
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Zum Darstellen als Text wähle 'Darstellen als Text' "
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Zum Darstellen als Text wähle 'Darstellen als Text' "
 

-#: src/textview.c:592
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(Kurzwahltaste: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(Kurzwahltaste: 't')\n"
 

-#: src/textview.c:593
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    Zum Öffnen in einem externen Programm wähle 'Öffnen' "
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    Zum Öffnen in einem externen Programm wähle 'Öffnen' "
 

-#: src/textview.c:594
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Kurzwahltaste: 'l'),\n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Kurzwahltaste: 'l'),\n"
 

-#: src/textview.c:595
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alternativ doppelklicken oder mit der mittleren "
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alternativ doppelklicken oder mit der mittleren "
 

-#: src/textview.c:596
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "Maustaste klicken),\n"
 
 msgid "mouse button),\n"
 msgstr "Maustaste klicken),\n"
 

-#: src/textview.c:597
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    oder 'Öffnen mit...' (Kurzwahltaste: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    oder 'Öffnen mit...' (Kurzwahltaste: 'o')\n"
 

-#: src/textview.c:1859
+#: src/textview.c:1957

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"

-"the apparent URL (%s).  \n"
+"the apparent URL (%s).\n"

 "Open it anyway?"
 msgstr ""
 "Die echte URL (%s) unterscheidet sich von\n"
 "Open it anyway?"
 msgstr ""
 "Die echte URL (%s) unterscheidet sich von\n"

-"der sichtbaren URL (%s).  \n"
+"der sichtbaren URL (%s).\n"

 "Trotzdem öffnen?"
 
 "Trotzdem öffnen?"
 

-#: src/toolbar.c:157 src/toolbar.c:1559
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "Empfange Mail von allen Accounts"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Empfange Mail von allen Accounts"
 

-#: src/toolbar.c:158 src/toolbar.c:1565
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "Empfange Mail von diesem Account"
 
 msgid "Receive Mail on current Account"
 msgstr "Empfange Mail von diesem Account"
 

-#: src/toolbar.c:159 src/toolbar.c:1571
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Sende wartende Nachricht(en)"
 
 msgid "Send Queued Message(s)"
 msgstr "Sende wartende Nachricht(en)"
 

-#: src/toolbar.c:160 src/toolbar.c:1584
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "Verfassen Email"
 
 msgid "Compose Email"
 msgstr "Verfassen Email"
 

-#: src/toolbar.c:161 src/toolbar.c:1588
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "Verfasse News"
 
 msgid "Compose News"
 msgstr "Verfasse News"
 

-#: src/toolbar.c:162 src/toolbar.c:1594
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "Antworte auf Nachricht"
 
 msgid "Reply to Message"
 msgstr "Antworte auf Nachricht"
 

-#: src/toolbar.c:163 src/toolbar.c:1615
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "Antworte an Absender"
 
 msgid "Reply to Sender"
 msgstr "Antworte an Absender"
 

-#: src/toolbar.c:164 src/toolbar.c:1636
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "Antworte an Alle"
 
 msgid "Reply to All"
 msgstr "Antworte an Alle"
 

-#: src/toolbar.c:165 src/toolbar.c:1657
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "Antwort an Mailingliste"
 
 msgid "Reply to Mailing-list"
 msgstr "Antwort an Mailingliste"
 

-#: src/toolbar.c:166 src/toolbar.c:1678
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 
 msgid "Forward Message"
 msgstr "Nachricht weiterleiten"
 

-#: src/toolbar.c:167 src/toolbar.c:1699
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "Nachricht löschen"
 
 msgid "Delete Message"
 msgstr "Nachricht löschen"
 

-#: src/toolbar.c:169 src/toolbar.c:1711
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "Zu nächste Nachricht"
 
 msgid "Goto Next Message"
 msgstr "Zu nächste Nachricht"
 

-#: src/toolbar.c:173 src/toolbar.c:1719
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "Sende Nachricht"
 
 msgid "Send Message"
 msgstr "Sende Nachricht"
 

-#: src/toolbar.c:174 src/toolbar.c:1725
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 
 msgid "Put into queue folder and send later"
 msgstr "In Queue-Ablage und später senden"
 

-#: src/toolbar.c:175 src/toolbar.c:1731
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 
 msgid "Save to draft folder"
 msgstr "Speichern in Entwurfablage"
 

-#: src/toolbar.c:176 src/toolbar.c:1737
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "Datei einfügen"
 
 msgid "Insert file"
 msgstr "Datei einfügen"
 

-#: src/toolbar.c:177 src/toolbar.c:1743
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "Datei anhängen"
 
 msgid "Attach file"
 msgstr "Datei anhängen"
 

-#: src/toolbar.c:178 src/toolbar.c:1749
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 
 msgid "Insert signature"
 msgstr "Unterschrift einfügen"
 

-#: src/toolbar.c:179 src/toolbar.c:1755
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 
 msgid "Edit with external editor"
 msgstr "Bearbeiten mit externem Editor"
 

-#: src/toolbar.c:180 src/toolbar.c:1761
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 
 msgid "Wrap all long lines"
 msgstr "Umbrechen aller langen Zeilen"
 

-#: src/toolbar.c:183 src/toolbar.c:1774
+#: src/toolbar.c:183 src/toolbar.c:1550

 msgid "Check spelling"
 msgstr "Überprüfe Rechtschreibung"
 
 msgid "Check spelling"
 msgstr "Überprüfe Rechtschreibung"
 


@@ -8344,54 +8569,82 @@ msgstr "/Antwort an A_bsender mit Zitat"
 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Antwort an Absender _ohne Zitat"
 

-#: src/toolbar.c:225
-msgid "/_Forward message (inline style)"
-msgstr "/_Weiterleiten mit eingefügter Nachricht"
-

 #: src/toolbar.c:226
 #: src/toolbar.c:226

-msgid "/Forward message as _attachment"
-msgstr "/Weiterleiten als An_hang"
+msgid "/For_ward as attachment"
+msgstr "/_Weiterleiten als Anhang"

 
 

-#: src/toolbar.c:371
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/U_mleiten"
+
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "Hole"
 
 msgid "Get"
 msgstr "Hole"
 

-#: src/toolbar.c:372
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "Hole Alle"
 
 msgid "Get All"
 msgstr "Hole Alle"
 

-#: src/toolbar.c:375
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "Email"
 
 msgid "Email"
 msgstr "Email"
 

-#: src/toolbar.c:377 src/toolbar.c:469
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "Antwort"
 
 msgid "Reply"
 msgstr "Antwort"
 

-#: src/toolbar.c:378 src/toolbar.c:470
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "Alle"
 
 msgid "All"
 msgstr "Alle"
 

-#: src/toolbar.c:379 src/toolbar.c:471
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "Absender"
 
 msgid "Sender"
 msgstr "Absender"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "Später senden"
 
 msgid "Send later"
 msgstr "Später senden"
 

-#: src/toolbar.c:423
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "Entwürfe"
 
 msgid "Draft"
 msgstr "Entwürfe"
 

-#: src/toolbar.c:426
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "Anhang"
 
 #: src/toolbar.c:430
 msgid "Attach"
 msgstr "Anhang"
 
 #: src/toolbar.c:430

+msgid "Editor"
+msgstr "Editor"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 
 msgid "Linewrap"
 msgstr "Zeilenumbruch"
 

-#: src/toolbar.c:1576
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "News"
 msgid "News"
 msgstr "News"

+
+#~ msgid "/_Scoring..."
+#~ msgstr "/_Benotung..."
+
+#~ msgid "/_Message/Get new ma_il"
+#~ msgstr "/_Nachricht/Empfange _neue E-Mail"
+
+#~ msgid "Icon theme"
+#~ msgstr "Icon Theme"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Small"
+#~ msgstr "Klein"
+
+#~ msgid "Normal"
+#~ msgstr "Normal"
+
+#~ msgid "/_Forward message (inline style)"
+#~ msgstr "/_Weiterleiten mit eingefügter Nachricht"
+
+#~ msgid "/Forward message as _attachment"
+#~ msgstr "/Weiterleiten als An_hang"

diff --git a/po/es.po b/po/es.po
index 90329fa151444e8358a34619d062aee0279f1bf5..51121e8ac0104cc55005a23ac1cf52764ab003d3 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -1,13 +1,13 @@
 # Spanish translation of Sylpheed.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Spanish translation of Sylpheed.
 # Copyright (C) 2000 Free Software Foundation, Inc.

-# Ricardo Mones Lastra <mones@aic.uniovi.es>, 2000-2003.
+# Ricardo Mones Lastra <mones@aic.uniovi.es>, 2000-2004.

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2003-12-18 19:13+0100\n"
-"PO-Revision-Date: 2003-12-18 19:13+0100\n"
+"POT-Creation-Date: 2004-02-05 20:10+0100\n"
+"PO-Revision-Date: 2004-02-05 20:11+0100\n"

 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones Lastra <mones@aic.uniovi.es>\n"
 "MIME-Version: 1.0\n"


@@ -35,7 +35,7 @@ msgstr ""
 "en la columna `G' para habilitar la descarga mediante `Recibir todo'."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
 "en la columna `G' para habilitar la descarga mediante `Recibir todo'."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635

-#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -43,7 +43,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nombre"
 
 msgid "Name"
 msgstr "Nombre"
 

-#: src/account.c:602 src/prefs_account.c:928
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "Protocolo"
 
 msgid "Protocol"
 msgstr "Protocolo"
 


@@ -89,10 +89,10 @@ msgstr "Arriba"
 msgid " Set as default account "
 msgstr " Cuenta por defecto "
 
 msgid " Set as default account "
 msgstr " Cuenta por defecto "
 

-#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008

 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196

-#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691

 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Cerrar"
 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Cerrar"


@@ -115,25 +115,27 @@ msgid "Do you really want to delete this account?"
 msgstr "¿Realmente quiere borrar esta cuenta?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
 msgstr "¿Realmente quiere borrar esta cuenta?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265

-#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
-#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
-#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
-#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "Si"
 
 msgid "Yes"
 msgstr "Si"
 

-#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+No"
 
 msgid "+No"
 msgstr "+No"
 


@@ -150,7 +152,7 @@ msgstr "No se pudo obtener la parte del mensaje."
 msgid "Can't get part of multipart message"
 msgstr "No se puede obtener la parte del mensaje multipartes"
 
 msgid "Can't get part of multipart message"
 msgstr "No se puede obtener la parte del mensaje multipartes"
 

-#: src/action.c:488
+#: src/action.c:495

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"


@@ -159,7 +161,7 @@ msgstr ""
 "La acción seleccionada no se puede usar en la ventana de composición\n"
 "porque contiene %%f, %%F, %%as o %%p."
 
 "La acción seleccionada no se puede usar en la ventana de composición\n"
 "porque contiene %%f, %%F, %%as o %%p."
 

-#: src/action.c:776
+#: src/action.c:783

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -168,7 +170,7 @@ msgstr ""
 "No se pudo iniciar la orden. Falló la creación de la tubería.\n"
 "%s"
 
 "No se pudo iniciar la orden. Falló la creación de la tubería.\n"
 "%s"
 

-#: src/action.c:861
+#: src/action.c:868

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -179,33 +181,33 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1088
+#: src/action.c:1095

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Ejecutando: %s\n"
 

-#: src/action.c:1092
+#: src/action.c:1099

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Finalizado: %s\n"
 

-#: src/action.c:1128
+#: src/action.c:1135

 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 
 msgid "Action's input/output"
 msgstr "Entrada/salida de la acción"
 

-#: src/action.c:1174
+#: src/action.c:1181

 msgid " Send "
 msgstr " Enviar "
 
 msgid " Send "
 msgstr " Enviar "
 

-#: src/action.c:1194
+#: src/action.c:1201

 msgid "Completed %v/%u"
 msgstr "Completado %v/%u"
 
 msgid "Completed %v/%u"
 msgstr "Completado %v/%u"
 

-#: src/action.c:1204
+#: src/action.c:1211

 msgid "Abort"
 msgstr "Abortar"
 
 msgid "Abort"
 msgstr "Abortar"
 

-#: src/action.c:1353
+#: src/action.c:1360

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -216,11 +218,11 @@ msgstr ""
 "(`%%h' será sustituido con el argumento)\n"
 "  %s"
 
 "(`%%h' será sustituido con el argumento)\n"
 "  %s"
 

-#: src/action.c:1358
+#: src/action.c:1365

 msgid "Action's hidden user argument"
 msgstr "Argumento de usuario oculto para la acción"
 
 msgid "Action's hidden user argument"
 msgstr "Argumento de usuario oculto para la acción"
 

-#: src/action.c:1362
+#: src/action.c:1369

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -231,7 +233,7 @@ msgstr ""
 "(`%%u' será sustituido con el argumento)\n"
 "  %s"
 
 "(`%%u' será sustituido con el argumento)\n"
 "  %s"
 

-#: src/action.c:1367
+#: src/action.c:1374

 msgid "Action's user argument"
 msgstr "Argumento de usuario para la acción"
 
 msgid "Action's user argument"
 msgstr "Argumento de usuario para la acción"
 


@@ -239,7 +241,7 @@ msgstr "Argumento de usuario para la acci
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 
 msgid "Add to address book"
 msgstr "Añadir a la agenda"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "Dirección"
 
 msgid "Address"
 msgstr "Dirección"
 


@@ -253,7 +255,7 @@ msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
 msgstr "Seleccionar carpeta de la agenda"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190

-#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193


@@ -261,10 +263,10 @@ msgstr "Seleccionar carpeta de la agenda"
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313


@@ -273,7 +275,7 @@ msgid "OK"
 msgstr "Aceptar"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgstr "Aceptar"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -281,18 +283,19 @@ msgstr "Aceptar"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314

-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
-#: src/summaryview.c:3453
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "Cancelar"
 
 msgid "Cancel"
 msgstr "Cancelar"
 

-#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435

 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Fichero"
 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Fichero"


@@ -313,8 +316,8 @@ msgstr "/_Fichero/Nuevo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 
 msgid "/_File/New _Server"
 msgstr "/_Fichero/Nuevo _servidor"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
-#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454

 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Fichero/---"


@@ -331,12 +334,12 @@ msgstr "/_Fichero/_Borrar"
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 

-#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/_Editar"
 
 msgid "/_Edit"
 msgstr "/_Editar"
 


@@ -344,17 +347,17 @@ msgstr "/_Editar"
 msgid "/_Edit/C_ut"
 msgstr "/_Editar/_Cortar"
 
 msgid "/_Edit/C_ut"
 msgstr "/_Editar/_Cortar"
 

-#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459

 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 

-#: src/addressbook.c:381 src/compose.c:520
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 

-#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
-#: src/mainwindow.c:452 src/messageview.c:152
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
 


@@ -390,10 +393,10 @@ msgstr "/_Direcci
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
-#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
-#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
-#: src/messageview.c:284
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 
 msgid "/_Tools/---"
 msgstr "/_Herramientas/---"
 


@@ -417,13 +420,13 @@ msgstr "/_Herramientas/Exportar _HTML..."
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Herramientas/Exportar LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Herramientas/Exportar LDI_F..."
 

-#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
-#: src/messageview.c:287
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/_Ayuda"
 
 msgid "/_Help"
 msgstr "/_Ayuda"
 

-#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
-#: src/messageview.c:288
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 


@@ -440,19 +443,19 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
-#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
-#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
-#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
-#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
-#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
-#: src/summaryview.c:465
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303
+#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/_Borrar"
 
 msgid "/_Delete"
 msgstr "/_Borrar"
 


@@ -477,7 +480,8 @@ msgid "/_Browse Entry"
 msgstr "/_Ver entrada"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/_Ver entrada"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "Desconocido"
 
 msgid "Unknown"
 msgstr "Desconocido"
 


@@ -561,8 +565,8 @@ msgstr "B
 msgid "E-Mail address"
 msgstr "Dirección de correo"
 
 msgid "E-Mail address"
 msgstr "Dirección de correo"
 

-#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
-#: src/toolbar.c:1767
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 msgid "Address book"
 msgstr "Agenda de direcciones"
 


@@ -576,7 +580,7 @@ msgstr "Nombre:"
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781

-#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "Borrar"
 
 msgid "Delete"
 msgstr "Borrar"
 


@@ -584,18 +588,18 @@ msgstr "Borrar"
 msgid "Lookup"
 msgstr "Buscar"
 
 msgid "Lookup"
 msgstr "Buscar"
 

-#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
-#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Para:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Para:"
 

-#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 


@@ -612,16 +616,18 @@ msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
-#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "No"
 
 msgid "No"
 msgstr "No"
 


@@ -729,7 +735,7 @@ msgstr "Buscando..."
 msgid "Search '%s'"
 msgstr " Buscar '%s'"
 
 msgid "Search '%s'"
 msgstr " Buscar '%s'"
 

-#: src/addressbook.c:3794 src/prefs_common.c:984
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "Interfaz"
 
 msgid "Interface"
 msgstr "Interfaz"
 


@@ -750,8 +756,8 @@ msgstr "Direcci
 msgid "Group"
 msgstr "Grupo"
 
 msgid "Group"
 msgstr "Grupo"
 

-#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
-#: src/prefs_account.c:2126
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Carpeta"
 
 msgid "Folder"
 msgstr "Carpeta"
 


@@ -830,8 +836,8 @@ msgstr "Nombre cabecera"
 msgid "Address Count"
 msgstr "Nº direcciones"
 
 msgid "Address Count"
 msgstr "Nº direcciones"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
-#: src/sgpgme.c:279 src/textview.c:1863
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "Aviso"
 
 msgid "Warning"
 msgstr "Aviso"
 


@@ -860,12 +866,12 @@ msgstr "Direcci
 msgid "Personal address"
 msgstr "Dirección personal"
 
 msgid "Personal address"
 msgstr "Dirección personal"
 

-#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "Notificación"
 
 msgid "Notice"
 msgstr "Notificación"
 

-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "Error"
 
 msgid "Error"
 msgstr "Error"
 


@@ -1002,7 +1008,7 @@ msgstr ""
 "(Desmarque la preferencia \"%s\").\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(Desmarque la preferencia \"%s\").\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1123
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay error de recepción"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "No mostrar diálogo de error si hay error de recepción"
 


@@ -1027,6 +1033,10 @@ msgstr ""
 "\n"
 "Esto puede indicar que el servidor que ha respondido no es el conocido."
 
 "\n"
 "Esto puede indicar que el servidor que ha respondido no es el conocido."
 

+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "(Asunto vacío por Exp.reg.)"
+

 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"
 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"


@@ -1047,355 +1057,355 @@ msgstr "%.2f Mb"
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 
 msgid "%.2fGB"
 msgstr "%.2f Gb"
 

-#: src/compose.c:499
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/_Añadir..."
 
 msgid "/_Add..."
 msgstr "/_Añadir..."
 

-#: src/compose.c:500
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/_Quitar"
 
 msgid "/_Remove"
 msgstr "/_Quitar"
 

-#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
-#: src/folderview.c:333 src/folderview.c:351
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 

-#: src/compose.c:508
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 
 msgid "/_File/_Attach file"
 msgstr "/_Fichero/_Adjuntar fichero"
 

-#: src/compose.c:509
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 
 msgid "/_File/_Insert file"
 msgstr "/_Fichero/_Insertar fichero"
 

-#: src/compose.c:510
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/_Fichero/Insertar _firma"
 

-#: src/compose.c:515
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Editar/_Deshacer"
 

-#: src/compose.c:516
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Rehacer"
 

-#: src/compose.c:518
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 

-#: src/compose.c:521
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como _cita"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Pegar como _cita"
 

-#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Seleccionar todo"
 

-#: src/compose.c:524
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Editar/Avanza_das"
 

-#: src/compose.c:525
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al carácter anterior"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Editar/Avanza_das/Ir al carácter anterior"
 

-#: src/compose.c:530
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al carácter siguiente"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Editar/Avanza_das/Ir al carácter siguiente"
 

-#: src/compose.c:535
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra anterior"
 

-#: src/compose.c:540
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Editar/Avanza_das/Ir a la palabra siguiente"
 

-#: src/compose.c:545
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Editar/Avanza_das/Ir al principio de la línea"
 

-#: src/compose.c:550
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Editar/Avanza_das/Ir al final de la línea"
 

-#: src/compose.c:555
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Editar/Avanza_das/Ir a la línea anterior"
 

-#: src/compose.c:560
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Editar/Avanza_das/Ir a la línea siguiente"
 

-#: src/compose.c:565
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter anterior"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter anterior"
 

-#: src/compose.c:570
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter siguiente"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Editar/Avanza_das/Borrar el carácter siguiente"
 

-#: src/compose.c:575
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra anterior"
 

-#: src/compose.c:580
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Editar/Avanza_das/Borrar la palabra siguiente"
 

-#: src/compose.c:585
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Editar/Avanza_das/Borrar línea"
 

-#: src/compose.c:590
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avanza_das/Borrar línea completa"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Editar/Avanza_das/Borrar línea completa"
 

-#: src/compose.c:595
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Editar/Avanza_das/Borrar hasta el final de la línea"
 

-#: src/compose.c:601
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Editar/_Recortar párrafo actual"
 

-#: src/compose.c:603
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Editar/_Cortar todas las líneas largas"
 

-#: src/compose.c:605
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Editar/Editar con editor e_xterno"
 

-#: src/compose.c:608
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/_Ortografía"
 
 msgid "/_Spelling"
 msgstr "/_Ortografía"
 

-#: src/compose.c:609
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografía/_Comprobar todo o la selección"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Ortografía/_Comprobar todo o la selección"
 

-#: src/compose.c:611
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografía/_Resaltar todas las faltas ortográficas"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Ortografía/_Resaltar todas las faltas ortográficas"
 

-#: src/compose.c:613
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografía/Comprobar faltas hacia _atrás"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Ortografía/Comprobar faltas hacia _atrás"
 

-#: src/compose.c:615
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografía/Avanzar hasta la siguiente _falta"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Ortografía/Avanzar hasta la siguiente _falta"
 

-#: src/compose.c:617
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/_Ortografía/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Ortografía/---"
 

-#: src/compose.c:618
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Ortografía/_Configuración del corrector"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Ortografía/_Configuración del corrector"
 

-#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
-#: src/summaryview.c:457
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/_Ver"
 
 msgid "/_View"
 msgstr "/_Ver"
 

-#: src/compose.c:623
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 
 msgid "/_View/_To"
 msgstr "/_Ver/_Para"
 

-#: src/compose.c:624
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 
 msgid "/_View/_Cc"
 msgstr "/_Ver/_Copia"
 

-#: src/compose.c:625
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/_Ver/_Copia oculta"
 
 msgid "/_View/_Bcc"
 msgstr "/_Ver/_Copia oculta"
 

-#: src/compose.c:626
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 
 msgid "/_View/_Reply to"
 msgstr "/_Ver/_Responder a"
 

-#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
-#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
-#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/_Ver/---"
 
 msgid "/_View/---"
 msgstr "/_Ver/---"
 

-#: src/compose.c:628
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Añadir a"
 
 msgid "/_View/_Followup to"
 msgstr "/_Ver/_Añadir a"
 

-#: src/compose.c:630
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 
 msgid "/_View/R_uler"
 msgstr "/_Ver/_Regleta"
 

-#: src/compose.c:632
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 
 msgid "/_View/_Attachment"
 msgstr "/_Ver/_Adjuntos"
 

-#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/_Mensaje"
 
 msgid "/_Message"
 msgstr "/_Mensaje"
 

-#: src/compose.c:635
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/_Mensaje/_Enviar"
 
 msgid "/_Message/_Send"
 msgstr "/_Mensaje/_Enviar"
 

-#: src/compose.c:637
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/_Mensaje/Enviar _después"
 
 msgid "/_Message/Send _later"
 msgstr "/_Mensaje/Enviar _después"
 

-#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
-#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
-#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
-#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 
 msgid "/_Message/---"
 msgstr "/_Mensaje/---"
 

-#: src/compose.c:640
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar como borrador"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/_Mensaje/_Guardar como borrador"
 

-#: src/compose.c:642
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/_Mensaje/Guardar y _seguir editando"
 

-#: src/compose.c:646
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/_Mensaje/_Para"
 
 msgid "/_Message/_To"
 msgstr "/_Mensaje/_Para"
 

-#: src/compose.c:647
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/_Mensaje/_Cc"
 
 msgid "/_Message/_Cc"
 msgstr "/_Mensaje/_Cc"
 

-#: src/compose.c:648
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/_Mensaje/_Bcc"
 
 msgid "/_Message/_Bcc"
 msgstr "/_Mensaje/_Bcc"
 

-#: src/compose.c:649
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/_Mensaje/_Responder a"
 
 msgid "/_Message/_Reply to"
 msgstr "/_Mensaje/_Responder a"
 

-#: src/compose.c:651
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/_Mensaje/_Reenviar a"
 
 msgid "/_Message/_Followup to"
 msgstr "/_Mensaje/_Reenviar a"
 

-#: src/compose.c:653
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/_Mensaje/_Adjuntar"
 
 msgid "/_Message/_Attach"
 msgstr "/_Mensaje/_Adjuntar"
 

-#: src/compose.c:657
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/_Mensaje/_Firmar"
 
 msgid "/_Message/Si_gn"
 msgstr "/_Mensaje/_Firmar"
 

-#: src/compose.c:658
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/_Mensaje/_Encriptar"
 
 msgid "/_Message/_Encrypt"
 msgstr "/_Mensaje/_Encriptar"
 

-#: src/compose.c:659
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/_Mensaje/Modo/MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/_Mensaje/Modo/MIME"
 

-#: src/compose.c:660
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/_Mensaje/Modo/Incrustado"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/_Mensaje/Modo/Incrustado"
 

-#: src/compose.c:663
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/_Mensaje/_Prioridad"
 
 msgid "/_Message/_Priority"
 msgstr "/_Mensaje/_Prioridad"
 

-#: src/compose.c:664
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "_Mensaje/Prioridad/Má_xima"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "_Mensaje/Prioridad/Má_xima"
 

-#: src/compose.c:665
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Mensaje/Prioridad/_Alta"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Mensaje/Prioridad/_Alta"
 

-#: src/compose.c:666
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/_Mensaje/Prioridad/_Normal"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/_Mensaje/Prioridad/_Normal"
 

-#: src/compose.c:667
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Mensaje/Prioridad/_Baja"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Mensaje/Prioridad/_Baja"
 

-#: src/compose.c:668
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Mensaje/Prioridad/_Mínima"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Mensaje/Prioridad/_Mínima"
 

-#: src/compose.c:670
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Mensaje/Solicitar acuse de _recibo"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Mensaje/Solicitar acuse de _recibo"
 

-#: src/compose.c:671
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/_Mensaje/Elimi_nar referencias"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/_Mensaje/Elimi_nar referencias"
 

-#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "/_Herramientas"
 
 msgid "/_Tools"
 msgstr "/_Herramientas"
 

-#: src/compose.c:673
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/_Herramientas/Mostrar _regleta"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Herramientas/Mostrar _regleta"
 

-#: src/compose.c:674 src/messageview.c:262
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Herramientas/_Agenda de direcciones"
 

-#: src/compose.c:675
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/_Plantillas"
 
 msgid "/_Tools/_Template"
 msgstr "/_Herramientas/_Plantillas"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Herramientas/Accio_nes"
 

-#: src/compose.c:1435
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "Responder a:"
 
 msgid "Reply-To:"
 msgstr "Responder a:"
 

-#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Grupos de noticias:"
 

-#: src/compose.c:1441
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "Enviar a:"
 
 msgid "Followup-To:"
 msgstr "Enviar a:"
 

-#: src/compose.c:1741
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "Marca de cita para error."
 
 msgid "Quote mark format error."
 msgstr "Marca de cita para error."
 

-#: src/compose.c:1757
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "Responder/reenviar para error."
 
 msgid "Message reply/forward format error."
 msgstr "Responder/reenviar para error."
 

-#: src/compose.c:2099
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "El fichero %s esta vacío."
 

-#: src/compose.c:2103
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "No puedo leer %s."
 

-#: src/compose.c:2141
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaje: %s"
 

-#: src/compose.c:2229
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 

-#: src/compose.c:2230
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1403,21 +1413,21 @@ msgstr ""
 "No se puede reeditar un mensaje encriptado. \n"
 "¿Descartar la parte encriptada?"
 
 "No se puede reeditar un mensaje encriptado. \n"
 "¿Descartar la parte encriptada?"
 

-#: src/compose.c:2891
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr " [Editado]"
 
 msgid " [Edited]"
 msgstr " [Editado]"
 

-#: src/compose.c:2893
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Componer mensaje%s"
 

-#: src/compose.c:2896
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "Componer mensaje%s"
 

-#: src/compose.c:2920 src/compose.c:3169
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1425,24 +1435,24 @@ msgstr ""
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 
 "No especificó ninguna cuenta para enviar.\n"
 "Seleccione alguna cuenta antes de enviar."
 

-#: src/compose.c:3067
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 
 msgid "Recipient is not specified."
 msgstr "No se especificó el destinatario."
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
-#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "Enviar"
 
 msgid "Send"
 msgstr "Enviar"
 

-#: src/compose.c:3076
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "El asunto esta vacío. ¿Enviar de todas formas?"
 

-#: src/compose.c:3097
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "No se pudo encolar el mensaje para enviar"
 
 msgid "Could not queue message for sending"
 msgstr "No se pudo encolar el mensaje para enviar"
 

-#: src/compose.c:3102
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1450,16 +1460,16 @@ msgstr ""
 "El mensaje está en la cola pero no pudo ser enviado.\n"
 "Utilize \"Enviar mensaje(s) en cola\" en la ventana principal para enviarlo"
 
 "El mensaje está en la cola pero no pudo ser enviado.\n"
 "Utilize \"Enviar mensaje(s) en cola\" en la ventana principal para enviarlo"
 

-#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurrió un error enviando el mensaje a %s ."
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Ocurrió un error enviando el mensaje a %s ."
 

-#: src/compose.c:3199
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "Poniendo en la cola"
 
 msgid "Queueing"
 msgstr "Poniendo en la cola"
 

-#: src/compose.c:3200
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1467,25 +1477,25 @@ msgstr ""
 "Ocurrió un error enviando los mensajes.\n"
 "¿Desea poner este mensaje en la cola?"
 
 "Ocurrió un error enviando los mensajes.\n"
 "¿Desea poner este mensaje en la cola?"
 

-#: src/compose.c:3206
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 
 msgid "Can't queue the message."
 msgstr "El mensaje no se puede poner en la cola."
 

-#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 
 msgid "Error occurred while sending the message."
 msgstr "Ocurrió un error enviando los mensajes."
 

-#: src/compose.c:3222
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "No puedo guardar el mensaje en Enviado."
 
 msgid "Can't save the message to Sent."
 msgstr "No puedo guardar el mensaje en Enviado."
 

-#: src/compose.c:3467
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada con el id de clave especificado `%s'."
 
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr ""
 "No se encontró ninguna clave asociada con el id de clave especificado `%s'."
 

-#: src/compose.c:3573
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1496,59 +1506,59 @@ msgstr ""
 "de %s a %s.\n"
 "¿Enviarlo de todas formas?"
 
 "de %s a %s.\n"
 "¿Enviarlo de todas formas?"
 

-#: src/compose.c:3836
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "No hay ninguna cuenta disponible para enviar correos!"
 
 msgid "No account for sending mails available!"
 msgstr "No hay ninguna cuenta disponible para enviar correos!"
 

-#: src/compose.c:3846
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "No hay ninguna cuenta disponible para enviar noticias!"
 
 msgid "No account for posting news available!"
 msgstr "No hay ninguna cuenta disponible para enviar noticias!"
 

-#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "Desde:"
 
 msgid "From:"
 msgstr "Desde:"
 

-#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "Tipo MIME"
 
 msgid "MIME type"
 msgstr "Tipo MIME"
 

-#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "Tamaño"
 
 msgid "Size"
 msgstr "Tamaño"
 

-#: src/compose.c:4828
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "Salvar mensaje en "
 
 msgid "Save Message to "
 msgstr "Salvar mensaje en "
 

-#: src/compose.c:4848 src/prefs_filtering_action.c:420
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr "Seleccionar ..."
 
 msgid "Select ..."
 msgstr "Seleccionar ..."
 

-#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Cabecera"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Cabecera"
 

-#: src/compose.c:4986
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "Adjuntos"
 
 msgid "Attachments"
 msgstr "Adjuntos"
 

-#: src/compose.c:4988
+#: src/compose.c:4984

 msgid "Others"
 msgstr "Otros"
 
 msgid "Others"
 msgstr "Otros"
 

-#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Asunto:"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Asunto:"
 

-#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "Ninguno"
 
 msgid "None"
 msgstr "Ninguno"
 

-#: src/compose.c:5247
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1592,24 +1602,26 @@ msgstr ""
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 
 "¿Desea terminar el proceso?\n"
 "Id. de proceso: %d"
 

-#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "Notificación conexión"
 
 msgid "Offline warning"
 msgstr "Notificación conexión"
 

-#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 
 msgid "You're working offline. Override?"
 msgstr "Está trabajando sin conexión ¿Ignorar?"
 

-#: src/compose.c:6475 src/compose.c:6496
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Seleccionar fichero"
 
 msgid "Select file"
 msgstr "Seleccionar fichero"
 

-#: src/compose.c:6510
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se pudo leer el fichero '%s'."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "No se pudo leer el fichero '%s'."
 

-#: src/compose.c:6512
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1618,36 +1630,36 @@ msgstr ""
 "El fichero '%s' contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 
 "El fichero '%s' contenía caracteres inválidos para\n"
 "la codificación actual, la inserción puede ser incorrecta."
 

-#: src/compose.c:6551
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "Descartar mensaje"
 
 msgid "Discard message"
 msgstr "Descartar mensaje"
 

-#: src/compose.c:6552
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 
 msgid "This message has been modified. discard it?"
 msgstr "Este mensaje se ha modificado. ¿Desea descartarlo?"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "Descartar"
 
 msgid "Discard"
 msgstr "Descartar"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "a Borrador"
 
 msgid "to Draft"
 msgstr "a Borrador"
 

-#: src/compose.c:6588
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla `%s'?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "¿Quiere aplicar la plantilla `%s'?"
 

-#: src/compose.c:6590
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "Aplicar plantilla"
 
 msgid "Apply template"
 msgstr "Aplicar plantilla"
 

-#: src/compose.c:6591
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Reemplazar"
 
 msgid "Replace"
 msgstr "Reemplazar"
 

-#: src/compose.c:6591 src/toolbar.c:425
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "Insertar"
 
 msgid "Insert"
 msgstr "Insertar"
 


@@ -1783,7 +1795,7 @@ msgid " Check File "
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr " Comprobar fichero "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Fichero"
 
 msgid "File"
 msgstr "Fichero"
 


@@ -1839,12 +1851,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 

-#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
-#: src/folderview.c:2215
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "Nueva carpeta"
 
 msgid "New folder"
 msgstr "Nueva carpeta"
 

-#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 


@@ -1862,7 +1874,7 @@ msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "


@@ -2100,7 +2112,7 @@ msgstr ""
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 
 "El número máximo de entradas que deberían retornarse en los resultados de la "
 "búsqueda."
 

-#: src/editldap.c:751 src/prefs_account.c:764
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "Básicas"
 
 msgid "Basic"
 msgstr "Básicas"
 


@@ -2108,7 +2120,7 @@ msgstr "B
 msgid "Search"
 msgstr "Buscar"
 
 msgid "Search"
 msgstr "Buscar"
 

-#: src/editldap.c:753 src/summaryview.c:653
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "Extendido"
 
 msgid "Extended"
 msgstr "Extendido"
 


@@ -2186,11 +2198,11 @@ msgstr "Fichero HTML de salida"
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 
 msgid "Stylesheet"
 msgstr "Hoja de estilos"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "Por defecto"
 
 msgid "Default"
 msgstr "Por defecto"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "Completo"
 
 msgid "Full"
 msgstr "Completo"
 


@@ -2251,7 +2263,7 @@ msgid "Prev"
 msgstr "Anterior"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Anterior"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:384 src/toolbar.c:475
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "Siguiente"
 
 msgid "Next"
 msgstr "Siguiente"
 


@@ -2439,7 +2451,7 @@ msgid "Exporting file:"
 msgstr "Fichero de exportación:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Fichero de exportación:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr "Seleccionar..."
 
 msgid " Select... "
 msgstr "Seleccionar..."
 


@@ -2475,32 +2487,32 @@ msgstr "El nombre es demasiado largo."
 msgid "Not specified."
 msgstr "Sin especificar."
 
 msgid "Not specified."
 msgstr "Sin especificar."
 

-#: src/folder.c:1011
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "Entrada"
 
 msgid "Inbox"
 msgstr "Entrada"
 

-#: src/folder.c:1015
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "Enviado"
 
 msgid "Sent"
 msgstr "Enviado"
 

-#: src/folder.c:1019
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "Cola"
 
 msgid "Queue"
 msgstr "Cola"
 

-#: src/folder.c:1023
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "Papelera"
 
 msgid "Trash"
 msgstr "Papelera"
 

-#: src/folder.c:1027
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "Borradores"
 
 msgid "Drafts"
 msgstr "Borradores"
 

-#: src/folder.c:1240
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Procesando (%s)...\n"
 

-#: src/folder.c:2028
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Moviendo %s a %s...\n"


@@ -2509,140 +2521,158 @@ msgstr "Moviendo %s a %s...\n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 

-#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 

-#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 

-#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "/_Mover carpeta..."
 
 msgid "/M_ove folder..."
 msgstr "/_Mover carpeta..."
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 

-#: src/folderview.c:289 src/folderview.c:310
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "/Eliminar _buzón"
 
 msgid "/Remove _mailbox"
 msgstr "/Eliminar _buzón"
 

-#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
-#: src/folderview.c:352
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgstr "/_Procesamiento..."
 
 msgid "/_Processing..."
 msgstr "/_Procesamiento..."
 

-#: src/folderview.c:293
-msgid "/_Scoring..."
-msgstr "/_Sistema de puntos..."
-
-#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/Marcar todo como _leído"
 
 msgid "/Mark all _read"
 msgstr "/Marcar todo como _leído"
 

-#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 

-#: src/folderview.c:308 src/folderview.c:328
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 

-#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/_Buscar en carpeta..."
 
 msgid "/_Search folder..."
 msgstr "/_Buscar en carpeta..."
 

-#: src/folderview.c:330
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/Desca_rgar"
+
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Eliminar cuenta _IMAP4"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Eliminar cuenta _IMAP4"
 

-#: src/folderview.c:341
+#: src/folderview.c:346

 msgid "/_Subscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 

-#: src/folderview.c:343
+#: src/folderview.c:348

 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 

-#: src/folderview.c:348
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/_Eliminar cuenta de noticias"
 
 msgid "/Remove _news account"
 msgstr "/_Eliminar cuenta de noticias"
 

-#: src/folderview.c:385
+#: src/folderview.c:392

 msgid "New"
 msgstr "Nuevos"
 
 msgid "New"
 msgstr "Nuevos"
 

-#: src/folderview.c:386
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "No leídos"
 
 msgid "Unread"
 msgstr "No leídos"
 

-#: src/folderview.c:387
+#: src/folderview.c:394

 msgid "#"
 msgstr "Nº"
 
 msgid "#"
 msgstr "Nº"
 

-#: src/folderview.c:630
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 

-#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 

-#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 

-#: src/folderview.c:835
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo árbol de carpetas..."
 

-#: src/folderview.c:918
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar mensajes nuevos en todas las carpetas..."
 

-#: src/folderview.c:1696
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abriendo carpeta %s ..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Abriendo carpeta %s ..."
 

-#: src/folderview.c:1708
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "No se pudo abrir la carpeta."
 
 msgid "Folder could not be opened."
 msgstr "No se pudo abrir la carpeta."
 

-#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
+#: src/folderview.c:1841
+#, c-format
+msgid "Downloading messages in %s ..."
+msgstr "Descargando mensajes en %s ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "Desconectado"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Esta desconectado. ¿Conectar?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "Ocurrió un error descargando mensajes en `%s'."
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 

-#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 

-#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
-#: src/folderview.c:2075 src/folderview.c:2236
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta `%s' ya existe."
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta `%s' ya existe."
 

-#: src/folderview.c:1920 src/folderview.c:2243
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta `%s'."
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta `%s'."
 

-#: src/folderview.c:1987 src/folderview.c:2065
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para `%s':"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para `%s':"
 

-#: src/folderview.c:1988 src/folderview.c:2067
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 

-#: src/folderview.c:2126
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2651,16 +2681,16 @@ msgstr ""
 "Todas las carpetas y mensajes bajo `%s' serán borrados.\n"
 "¿Confirma el borrado?"
 
 "Todas las carpetas y mensajes bajo `%s' serán borrados.\n"
 "¿Confirma el borrado?"
 

-#: src/folderview.c:2128
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 

-#: src/folderview.c:2145
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta `%s'."
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "No se puede eliminar la carpeta `%s'."
 

-#: src/folderview.c:2181
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2669,11 +2699,11 @@ msgstr ""
 "¿Realmente desea eliminar el buzón `%s' ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
 "¿Realmente desea eliminar el buzón `%s' ?\n"
 "(Los mensajes NO se borrarán del disco)"
 

-#: src/folderview.c:2183
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 
 msgid "Remove mailbox"
 msgstr "Eliminar buzón"
 

-#: src/folderview.c:2216
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2683,55 +2713,55 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 

-#: src/folderview.c:2273
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 `%s'?"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 `%s'?"
 

-#: src/folderview.c:2274
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 

-#: src/folderview.c:2408
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias `%s'?"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias `%s'?"
 

-#: src/folderview.c:2409
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias `%s'?"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias `%s'?"
 

-#: src/folderview.c:2447
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 

-#: src/folderview.c:2543
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Moviendo %s a %s..."
 

-#: src/folderview.c:2572
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 
 msgid "Source and destination are the same."
 msgstr "El destino y el origen son la misma."
 

-#: src/folderview.c:2575
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 
 msgid "Can't move a folder to one of its children."
 msgstr "No se puede mover la carpeta a una de sus subcarpetas."
 

-#: src/folderview.c:2578
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "No se pueden mover carpetas entre buzones distintos."
 

-#: src/folderview.c:2581
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "¡Mover falló!"
 
 msgid "Move failed!"
 msgstr "¡Mover falló!"
 

-#: src/folderview.c:2625 src/summaryview.c:4050
+#: src/folderview.c:2704 src/summaryview.c:4013

 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 
 msgid "Processing configuration"
 msgstr "Configuración de procesamiento"
 


@@ -2783,7 +2813,7 @@ msgstr "desconocido"
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1178
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Hecho."
 
 msgid "Done."
 msgstr "Hecho."
 


@@ -2982,7 +3012,7 @@ msgstr ""
 "El corrector no pudo cambiar de diccionario.\n"
 "%s"
 
 "El corrector no pudo cambiar de diccionario.\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr "Abcdef"
 
 msgid "Abcdef"
 msgstr "Abcdef"
 


@@ -2998,7 +3028,7 @@ msgstr "Seleccionar m
 msgid "Plugins"
 msgstr "Módulos"
 
 msgid "Plugins"
 msgstr "Módulos"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "Descripción"
 
 msgid "Description"
 msgstr "Descripción"
 


@@ -3041,6 +3071,7 @@ msgid "Signer"
 msgstr "Firmante"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "Firmante"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Nombre: "
 
 msgid "Name: "
 msgstr "Nombre: "
 


@@ -3112,11 +3143,11 @@ msgstr "Mostrar certificados"
 msgid "Changed SSL Certificate"
 msgstr "Certificado SSL cambiado"
 
 msgid "Changed SSL Certificate"
 msgstr "Certificado SSL cambiado"
 

-#: src/headerview.c:181 src/summaryview.c:2398
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(Sin remite)"
 
 msgid "(No From)"
 msgstr "(Sin remite)"
 

-#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 


@@ -3165,105 +3196,105 @@ msgstr "no puedo cerrar la carpeta\n"
 msgid "root folder %s does not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
 msgid "root folder %s does not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 

-#: src/imap.c:1415 src/imap.c:1423
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "ocurrió un error obteniendo LIST.\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurrió un error obteniendo LIST.\n"
 

-#: src/imap.c:1651
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 

-#: src/imap.c:1673
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 

-#: src/imap.c:1742
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar buzón: %s a %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar buzón: %s a %s\n"
 

-#: src/imap.c:1804
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 

-#: src/imap.c:1842
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 

-#: src/imap.c:1850
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "Error obteniendo la estructura del mensaje.\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "Error obteniendo la estructura del mensaje.\n"
 

-#: src/imap.c:1872
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 

-#: src/imap.c:1928
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "No puedo establecer la sesión IMAP4 con: %s\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "No puedo establecer la sesión IMAP4 con: %s\n"
 

-#: src/imap.c:1950
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 

-#: src/imap.c:1957
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4 con: %s:%d\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4 con: %s:%d\n"
 

-#: src/imap.c:2047
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 

-#: src/imap.c:2480
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 

-#: src/imap.c:2620
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificación IMAP fallida.\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificación IMAP fallida.\n"
 

-#: src/imap.c:2637
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 

-#: src/imap.c:2953
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 

-#: src/imap.c:2960
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 

-#: src/imap.c:3002
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no puedo añadir el mensaje a %s\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no puedo añadir el mensaje a %s\n"
 

-#: src/imap.c:3084
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 

-#: src/imap.c:3134
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en la orden imap: STORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en la orden imap: STORE %s %s\n"
 

-#: src/imap.c:3151
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en la orden imap: EXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en la orden imap: EXPUNGE\n"
 

-#: src/imap.c:3164
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "error en la orden imap: CLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "error en la orden imap: CLOSE\n"
 

-#: src/imap.c:3419
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"


@@ -3344,7 +3375,7 @@ msgstr "Seleccione el fichero LDIF a importar."
 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:765 src/summaryview.c:472
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "E"
 
 msgid "S"
 msgstr "E"
 


@@ -3443,134 +3474,134 @@ msgstr "Seleccionar fichero Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 
 msgid "Import Pine file into Address Book"
 msgstr "Importar fichero Pine a la agenda"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 
 msgid "Retrieving new messages"
 msgstr "Obteniendo nuevos mensajes"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "En espera"
 
 msgid "Standby"
 msgstr "En espera"
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "Cancelado"
 
 msgid "Cancelled"
 msgstr "Cancelado"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "Recuperando"
 
 msgid "Retrieving"
 msgstr "Recuperando"
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hecho (%d mensaje(s) (%s) recibido(s))"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 
 msgid "Done (no new messages)"
 msgstr "Hecho (no hay mensajes nuevos)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "Conexión fallida"
 
 msgid "Connection failed"
 msgstr "Conexión fallida"
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "Authorización fallida"
 
 msgid "Auth failed"
 msgstr "Authorización fallida"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "Bloqueado"
 
 msgid "Locked"
 msgstr "Bloqueado"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "La autorización para %s en %s falló"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "La autorización para %s en %s falló"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Finalizado (%d mensaje(s) nuevo(s))"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 
 msgid "Finished (no new messages)"
 msgstr "Finalizado (no hay mensajes nuevos)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algunos errores obteniendo el correo."
 
 msgid "Some errors occurred while getting mail."
 msgstr "Hubo algunos errores obteniendo el correo."
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Recuperando nuevos mensajes"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Conectando al servidor POP3: %s..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "No se puede conectar al servirdor POP3: %s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servirdor POP3: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "No se puede conectar al servirdor POP3: %s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "Autentificando..."
 
 msgid "Authenticating..."
 msgstr "Autentificando..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes de %s..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Obteniendo mensajes de %s..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Obteniendo el número de nuevos mensajes (STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Obteniendo el número de nuevos mensajes (LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Obteniendo el número de nuevos mensajes (UIDL)..."
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Obteniendo el tamaño de nuevos mensajes (LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "Borrando mensaje %d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "Saliendo"
 
 msgid "Quitting"
 msgstr "Saliendo"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recuperando (%d mensaje(s) (%s) recibido(s))"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Recuperando (%d mensaje(s) (%s) recibido(s))"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Conexión fallida."
 
 msgid "Connection failed."
 msgstr "Conexión fallida."
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 
 msgid "Error occurred while processing mail."
 msgstr "Ocurrió un error mientras se procesaba el correo."
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -3579,27 +3610,27 @@ msgstr ""
 "Ocurrió un error procesando el correo:\n"
 "%s"
 
 "Ocurrió un error procesando el correo:\n"
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 
 msgid "No disk space left."
 msgstr "No hay espacio libre en disco."
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 
 msgid "Can't write file."
 msgstr "No se puede escribir el fichero."
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "Error de socket."
 
 msgid "Socket error."
 msgstr "Error de socket."
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por el host remoto."
 
 msgid "Connection closed by the remote host."
 msgstr "Conexión cerrada por el host remoto."
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 
 msgid "Mailbox is locked."
 msgstr "El buzón está bloqueado."
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3608,11 +3639,11 @@ msgstr ""
 "El buzón está bloqueado:\n"
 "%s"
 
 "El buzón está bloqueado:\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "Autentificación fallida."
 
 msgid "Authentication failed."
 msgstr "Autentificación fallida."
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3621,7 +3652,7 @@ msgstr ""
 "La autentificación falló:\n"
 "%s"
 
 "La autentificación falló:\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Incorporación cancelada\n"
 


@@ -3638,7 +3669,7 @@ msgstr "Contrase
 msgid "Nick Name"
 msgstr "Apodo"
 
 msgid "Nick Name"
 msgstr "Apodo"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3647,20 +3678,20 @@ msgstr ""
 "El fichero `%s' ya existe.\n"
 "No puedo crear la carpeta."
 
 "El fichero `%s' ya existe.\n"
 "No puedo crear la carpeta."
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread no está soportado por glib.\n"
 

-#: src/main.c:514
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 

-#: src/main.c:517
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de edición"
 

-#: src/main.c:518
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3670,23 +3701,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 

-#: src/main.c:521
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 

-#: src/main.c:522
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 

-#: src/main.c:523
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 

-#: src/main.c:524
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 

-#: src/main.c:525
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3694,749 +3725,758 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 

-#: src/main.c:527
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               cambiar a modo de trabajo con conexión"
 

-#: src/main.c:528
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               cambiar a modo de trabajo sin conexión"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               cambiar a modo de trabajo sin conexión"
 

-#: src/main.c:529
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 

-#: src/main.c:530
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 

-#: src/main.c:531
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 

-#: src/main.c:532
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           muestra el directorio del configuración"
 

-#: src/main.c:569 src/summaryview.c:5198
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Procesando (%s)..."
 

-#: src/main.c:572
+#: src/main.c:571

 msgid "top level folder"
 msgstr "carpeta superior"
 
 msgid "top level folder"
 msgstr "carpeta superior"
 

-#: src/main.c:637
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Existen mensajes en composición."
 
 msgid "Composing message exists."
 msgstr "Existen mensajes en composición."
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Draft them"
 msgstr "A borrador"
 
 msgid "Draft them"
 msgstr "A borrador"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Discard them"
 msgstr "Descartarlos"
 
 msgid "Discard them"
 msgstr "Descartarlos"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "No salir"
 
 msgid "Don't quit"
 msgstr "No salir"
 

-#: src/main.c:652
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 

-#: src/main.c:653
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 

-#: src/main.c:898
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Ocurrieron algunos errores enviando los mensajes en la cola."
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 
 msgid "/_File/_Folder"
 msgstr "/_Fichero/_Carpeta"
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Fichero/_Carpeta_/Crear _nueva carpeta..."
 

-#: src/mainwindow.c:429
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Fichero/_Carpeta_/_Renombrar carpeta..."
 

-#: src/mainwindow.c:430
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Fichero/_Carpeta_/_Borrar carpeta"
 

-#: src/mainwindow.c:431
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/_Fichero/_Carpeta/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/_Fichero/_Carpeta/---"
 

-#: src/mainwindow.c:432
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Fichero/_Carpeta/_Comprobar mensajes nuevos en todas las carpetas"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Fichero/_Carpeta/_Comprobar mensajes nuevos en todas las carpetas"
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/_Fichero/_Añadir buzón"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Fichero/_Añadir buzón"
 

-#: src/mainwindow.c:435
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Fichero/_Añadir buzón/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Fichero/_Añadir buzón/MH..."
 

-#: src/mainwindow.c:436
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Fichero/I_mportar fichero mbox..."
 

-#: src/mainwindow.c:437
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a fichero mbox..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Fichero/_Exportar a fichero mbox..."
 

-#: src/mainwindow.c:438
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/_Fichero/_Vaciar papelera"
 
 msgid "/_File/Empty _trash"
 msgstr "/_Fichero/_Vaciar papelera"
 

-#: src/mainwindow.c:440 src/messageview.c:144
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Salvar como..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Fichero/_Salvar como..."
 

-#: src/mainwindow.c:441 src/messageview.c:145
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir"
 
 msgid "/_File/_Print..."
 msgstr "/_Fichero/_Imprimir"
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:453

 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 
 msgid "/_File/_Work offline"
 msgstr "/_Fichero/_Trabajar sin conexión"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 
 msgid "/_File/E_xit"
 msgstr "/_Fichero/Sali_r"
 

-#: src/mainwindow.c:451
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/Seleccionar _hilo"
 

-#: src/mainwindow.c:453 src/messageview.c:153
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edición/_Buscar en el mensaje actual..."
 

-#: src/mainwindow.c:455
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "/_Edición/_Buscar en carpeta..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Edición/_Buscar en carpeta..."
 

-#: src/mainwindow.c:457
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Ver/Mostrar u o_cultar"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Ver/Mostrar u o_cultar/_Árbol de carpetas"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/_Vista de mensaje"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Ver/Mostrar u o_cultar/_Vista de mensaje"
 

-#: src/mainwindow.c:462
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/Iconos _y texto"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Iconos"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Texto"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Ver/Mostrar u o_cultar/_Herramientas/_Ocultar"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Ver/Mostrar u o_cultar/_Barra de estado"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Ver/Separar árb_ol de carpetas"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/_Ver/Separar vista de m_ensajes"
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 
 msgid "/_View/_Sort"
 msgstr "/_Ver/_Ordenar"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/por _número"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Ver/_Ordenar/por _número"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/por _tamaño"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Ver/_Ordenar/por _tamaño"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/por _fecha"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/_Ver/_Ordenar/por _fecha"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/por _remitente"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/_Ver/_Ordenar/por _remitente"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/por _destinatario"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Ver/_Ordenar/por _destinatario"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/por as_unto"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Ver/_Ordenar/por as_unto"
 

-#: src/mainwindow.c:485
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/por color de _etiqueta"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Ver/_Ordenar/por color de _etiqueta"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/por _marca"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Ver/_Ordenar/por _marca"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/_Ver/_Ordenar/por e_stado"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Ver/_Ordenar/por e_stado"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/por _adjunto"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Ver/_Ordenar/por _adjunto"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/_Ver/_Ordenar/por tamaño"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Ver/_Ordenar/por tamaño"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/_Ver/_Ordenar/por bloqueado"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Ver/_Ordenar/por bloqueado"
 

-#: src/mainwindow.c:493
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Ver/_Ordenar/N_o ordenar"
 

-#: src/mainwindow.c:494 src/mainwindow.c:497
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Ver/_Ordenar/---"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Ver/_Ordenar/Ascendente"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/_Ver/_Ordenar/Descendente"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Ver/_Ordenar/Atraer _por asunto"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 
 msgid "/_View/Th_read view"
 msgstr "/_Ver/_Vista jerárquica"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Ver/E_xpandir todos los hilos"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Ver/Co_lapsar todos los hilos"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/_Ver/_Esconder los mensajes leídos"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Ver/_Esconder los mensajes leídos"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/_Ver/Elementos v_isibles..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/_Ver/Elementos v_isibles..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 
 msgid "/_View/_Go to"
 msgstr "/_Ver/_Ir a"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Ver/_Ir a/Mensaje a_nterior"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Ver/_Ir a/Mensaje s_iguiente"
 

-#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/mainwindow.c:523 src/mainwindow.c:528
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Ver/_Ir a/---"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Ver/_Ir a/_Anterior sin leer"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Ver/_Ir a/_Siguiente sin leer"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Ver/_Ir a/Mensaje nue_vo anterior"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo siguiente"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Ver/_Ir a/Mensaje n_uevo siguiente"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Ver/_Ir a/Mensaje marcado a_nterior"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje marcado"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Ver/_Ir a/Mensaje etiquetado anterior"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Ver/_Ir a/Siguiente mensaje etiquetado"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta"
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Ver/_Ir a/_Ir a otra carpeta"
 

-#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/_Ver/_Conjunto de códigos/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/_Ver/_Conjunto de códigos/---"
 

-#: src/mainwindow.c:537 src/messageview.c:163
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/_Ver/_Conjunto de códigos"
 
 msgid "/_View/_Code set"
 msgstr "/_Ver/_Conjunto de códigos"
 

-#: src/mainwindow.c:538 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Ver/_Conjunto de códigos/_Autodetectar"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Ver/_Conjunto de códigos/_Autodetectar"
 

-#: src/mainwindow.c:541 src/messageview.c:167
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Conjunto de códigos/ASCII de 7 bits (US-ASC_II)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Ver/_Conjunto de códigos/ASCII de 7 bits (US-ASC_II)"
 

-#: src/mainwindow.c:545 src/messageview.c:171
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Ver/_Conjunto de códigos/Unicode (_UTF-8)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Ver/_Conjunto de códigos/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:549 src/messageview.c:175
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo Occidental (ISO-8859-_1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo Occidental (ISO-8859-_1)"
 

-#: src/mainwindow.c:551 src/messageview.c:177
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo Occidental (ISO-8859-_15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Ver/_Conjunto de códigos/Europeo Occidental (ISO-8859-_15)"
 

-#: src/mainwindow.c:555 src/messageview.c:181
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Conjunto de códigos/Centroeuropeo (ISO-8859-_2)"
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Ver/_Conjunto de códigos/Centroeuropeo (ISO-8859-_2)"
 

-#: src/mainwindow.c:558 src/messageview.c:184
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-13)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-13)"
 

-#: src/mainwindow.c:560 src/messageview.c:186
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-_4)"
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Ver/_Conjunto de códigos/Báltico (ISO-8859-_4)"
 

-#: src/mainwindow.c:563 src/messageview.c:189
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Ver/_Conjunto de códigos/Griego (ISO-8859-_7)"
 

-#: src/mainwindow.c:566 src/messageview.c:192
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Conjunto de códigos/Turco (ISO-8859-_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Ver/_Conjunto de códigos/Turco (ISO-8859-_9)"
 

-#: src/mainwindow.c:569 src/messageview.c:195
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (ISO-8859-_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (ISO-8859-_5)"
 

-#: src/mainwindow.c:571 src/messageview.c:197
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (KOI8-_R)"
 

-#: src/mainwindow.c:573 src/messageview.c:199
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Ver/_Conjunto de códigos/Cirílico (Windows-1251)"
 

-#: src/mainwindow.c:577 src/messageview.c:203
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-_JP)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-_JP)"
 

-#: src/mainwindow.c:580 src/messageview.c:206
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:583 src/messageview.c:209
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_EUC-JP)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_EUC-JP)"
 

-#: src/mainwindow.c:585 src/messageview.c:211
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_Shift__JIS)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Ver/_Conjunto de códigos/Japonés (_Shift__JIS)"
 

-#: src/mainwindow.c:589 src/messageview.c:215
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Ver/_Conjunto de códigos/Chino simplificado (_GB2312)"
 

-#: src/mainwindow.c:591 src/messageview.c:217
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (_Big5)"
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (_Big5)"
 

-#: src/mainwindow.c:593 src/messageview.c:219
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (EUC-_TW)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Ver/_Conjunto de códigos/Chino tradicional (EUC-_TW)"
 

-#: src/mainwindow.c:595 src/messageview.c:221
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Conjunto de códigos/Chino (ISO-2022-_CN)"
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Ver/_Conjunto de códigos/Chino (ISO-2022-_CN)"
 

-#: src/mainwindow.c:598 src/messageview.c:224
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (EUC-_KR)"
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (EUC-_KR)"
 

-#: src/mainwindow.c:600 src/messageview.c:226
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Conjunto de códigos/Coreano (ISO-2022-KR)"
 

-#: src/mainwindow.c:603 src/messageview.c:229
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (TIS-620)"
 

-#: src/mainwindow.c:605 src/messageview.c:231
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Ver/_Conjunto de códigos/Tailandés (Windows-874)"
 

-#: src/mainwindow.c:613 src/summaryview.c:458
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en ventana _nueva"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en ventana _nueva"
 

-#: src/mainwindow.c:614 src/messageview.c:239
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/_Ver/Mostrar todas las ca_beceras"
 
 msgid "/_View/Show all _headers"
 msgstr "/_Ver/Mostrar todas las ca_beceras"
 

-#: src/mainwindow.c:617
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/_Ver/_Actualizar resumen"
 
 msgid "/_View/_Update summary"
 msgstr "/_Ver/_Actualizar resumen"
 

-#: src/mainwindow.c:620
-msgid "/_Message/Get new ma_il"
-msgstr "/_Mensaje/_Recibir correo nuevo"
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/_Mensaje/Reci_bir"

 
 

-#: src/mainwindow.c:621
-msgid "/_Message/Get from _all accounts"
-msgstr "/_Mensaje/Recibir de tod_as las cuentas"
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/_Mensaje/Reci_bir/De la cuenta _actual"

 
 

-#: src/mainwindow.c:623
-msgid "/_Message/Cancel receivin_g"
-msgstr "/_Mensaje/_Cancelar la recepción"
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/_Mensaje/Reci_bir/De _todas las cuentas"

 
 

-#: src/mainwindow.c:625
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/_Mensaje/Reci_bir/_Cancelar la recepción"
+
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/_Mensaje/Reci_bir/---"
+
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/_Enviar mensajes en cola"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensaje/_Enviar mensajes en cola"
 

-#: src/mainwindow.c:627
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/_Mensaje/Componer _nuevo mensaje"
 

-#: src/mainwindow.c:628
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgstr "/_Mensaje/Componer una noticia"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Mensaje/Componer una noticia"
 

-#: src/mainwindow.c:629 src/messageview.c:246
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 
 msgid "/_Message/_Reply"
 msgstr "/_Mensaje/_Responder"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensaje/Respon_der a"
 

-#: src/mainwindow.c:631 src/messageview.c:247
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Mensaje/Respon_der a/A _todos"
 

-#: src/mainwindow.c:632 src/messageview.c:249
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensaje/Respon_der a/Al _remitente"
 

-#: src/mainwindow.c:633 src/messageview.c:251
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Mensaje/Respon_der a/A la _lista de correo"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensaje/_Reenviar y responder a"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Mensaje/_Reenviar y responder a"
 

-#: src/mainwindow.c:637 src/messageview.c:254
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/Ree_nviar"
 
 msgid "/_Message/_Forward"
 msgstr "/_Mensaje/Ree_nviar"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/_Mensaje/Redirigir"
 
 msgid "/_Message/Redirect"
 msgstr "/_Mensaje/Redirigir"
 

-#: src/mainwindow.c:640 src/messageview.c:259
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensaje/Re_editar"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 
 msgid "/_Message/M_ove..."
 msgstr "/_Mensaje/M_over..."
 

-#: src/mainwindow.c:643
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 
 msgid "/_Message/_Copy..."
 msgstr "/_Mensaje/_Copiar..."
 

-#: src/mainwindow.c:644
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 
 msgid "/_Message/_Delete"
 msgstr "/_Mensaje/_Borrar"
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/_Mensaje/Cancelar una noticia"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/_Mensaje/Cancelar una noticia"
 

-#: src/mainwindow.c:647
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 
 msgid "/_Message/_Mark"
 msgstr "/_Mensaje/_Marcar"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Mensaje/_Marcar/_Marcar"
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Mensaje/_Marcar/_Desmarcar"
 

-#: src/mainwindow.c:650
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Mensaje/_Marcar/---"
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Mensaje/_Marcar/Marcar como no leído"
 

-#: src/mainwindow.c:652
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Mensaje/_Marcar/Marcar como leído"
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Mensaje/_Marcar/Marcar todo como leído"
 

-#: src/mainwindow.c:657
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/_Herramientas/_Agenda de direcciones..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Herramientas/_Agenda de direcciones..."
 

-#: src/mainwindow.c:658 src/messageview.c:263
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Herramientas/Añadir _remitente a la agenda"
 

-#: src/mainwindow.c:660
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Herramientas/_Recopilar direcciones"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Herramientas/_Recopilar direcciones"
 

-#: src/mainwindow.c:661
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Herramientas/_Recopilar direcciones/De la _carpeta..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Herramientas/_Recopilar direcciones/De la _carpeta..."
 

-#: src/mainwindow.c:663
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Herramientas/_Recopilar direcciones/De los _mensajes..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Herramientas/_Recopilar direcciones/De los _mensajes..."
 

-#: src/mainwindow.c:666
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/_Herramientas/_Filtrar mensajes"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/_Herramientas/_Filtrar mensajes"
 

-#: src/mainwindow.c:667 src/messageview.c:266
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 

-#: src/mainwindow.c:668 src/messageview.c:268
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 

-#: src/mainwindow.c:670 src/messageview.c:270
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 

-#: src/mainwindow.c:672 src/messageview.c:272
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 

-#: src/mainwindow.c:674 src/messageview.c:274
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:689

 msgid "/_Tools/_Create processing rule"
 msgstr "/_Herramientas/_Crear regla de procesamiento"
 
 msgid "/_Tools/_Create processing rule"
 msgstr "/_Herramientas/_Crear regla de procesamiento"
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:690

 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de procesamiento/_Automáticamente"
 
 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de procesamiento/_Automáticamente"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:692

 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Desde"
 
 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Desde"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:694

 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Para"
 
 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Para"
 

-#: src/mainwindow.c:683
+#: src/mainwindow.c:696

 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en el _Asunto"
 
 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en el _Asunto"
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Mensaje/_Borrar los mensajes repetidos"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Mensaje/_Borrar los mensajes repetidos"
 

-#: src/mainwindow.c:691
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 
 msgid "/_Tools/E_xecute"
 msgstr "/_Herramientas/E_jecutar"
 

-#: src/mainwindow.c:694
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Herramientas/Certi_ficados SSL..."
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Herramientas/Certi_ficados SSL..."
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 
 msgid "/_Tools/_Log window"
 msgstr "/_Herramientas/_Ventana de traza"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/_Configuración"
 
 msgid "/_Configuration"
 msgstr "/_Configuración"
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/_Configuración/_Cambiar cuenta actual"
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/_Configuración/_Preferencias de la cuenta actual..."
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/_Configuración/Crear _nueva cuenta..."
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/_Configuración/_Editar cuentas..."
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 
 msgid "/_Configuration/---"
 msgstr "/_Configuración/---"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/_Configuración/Preferencias _comunes..."
 

-#: src/mainwindow.c:712
+#: src/mainwindow.c:725

 msgid "/_Configuration/Pre-processing..."
 msgstr "/_Configuración/Pre-procesamiento..."
 
 msgid "/_Configuration/Pre-processing..."
 msgstr "/_Configuración/Pre-procesamiento..."
 

-#: src/mainwindow.c:714
+#: src/mainwindow.c:727

 msgid "/_Configuration/Post-processing..."
 msgstr "/_Configuración/Post-procesamiento..."
 
 msgid "/_Configuration/Post-processing..."
 msgstr "/_Configuración/Post-procesamiento..."
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configuración/_Filtrado..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/_Configuración/_Filtrado..."
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/_Configuración/_Plantillas..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/_Configuración/_Plantillas..."
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/_Configuración/_Acciones..."
 

-#: src/mainwindow.c:720
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/_Configuración/_Otras preferencias..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/_Configuración/_Otras preferencias..."
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/_Configuración/Módulos..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/_Configuración/Módulos..."
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/_Ayuda/_Manual (Local)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/_Ayuda/_Manual (Local)"
 

-#: src/mainwindow.c:725
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "_Ayuda/_Manual (Página de Sylpheed Doc)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "_Ayuda/_Manual (Página de Sylpheed Doc)"
 

-#: src/mainwindow.c:727
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/_Ayuda/_FAQ (Local)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/_Ayuda/_FAQ (Local)"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Ayuda/_FAQ (Página de Sylpheed Doc)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Ayuda/_FAQ (Página de Sylpheed Doc)"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Ayuda/_Claws FAQ (Documentación de Claws)"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Ayuda/_Claws FAQ (Documentación de Claws)"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 
 msgid "/_Help/---"
 msgstr "/_Ayuda/---"
 

-#: src/mainwindow.c:851
+#: src/mainwindow.c:868

 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Esta conectado. Pulse en el icono para desconectarse"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:872

 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Esta desconectado. Pulse en el icono para conectarse"
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr "Seleccionar cuenta"
 
 msgid "Select account"
 msgstr "Seleccionar cuenta"
 

-#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "Sin título"
 
 msgid "Untitled"
 msgstr "Sin título"
 

-#: src/mainwindow.c:1222
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "ninguna"
 
 msgid "none"
 msgstr "ninguna"
 

-#: src/mainwindow.c:1462
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 

-#: src/mainwindow.c:1463
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
 msgid "Empty all messages in trash?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 

-#: src/mainwindow.c:1481
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Añadir buzón"
 
 msgid "Add mailbox"
 msgstr "Añadir buzón"
 

-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4446,16 +4486,16 @@ msgstr ""
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 
 "Si el buzón especificado ya existe será\n"
 "escaneado automáticamente."
 

-#: src/mainwindow.c:1488
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón `%s' ya existe."
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "El buzón `%s' ya existe."
 

-#: src/mainwindow.c:1493 src/setup.c:58
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "Correo"
 
 msgid "Mailbox"
 msgstr "Correo"
 

-#: src/mainwindow.c:1498 src/setup.c:62
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4465,31 +4505,31 @@ msgstr ""
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 
 "Quizás ya existan los ficheros o no tenga permisos suficientes para "
 "escribir  en el directorio."
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Árbol de carpetas"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Salir"
 
 msgid "Exit"
 msgstr "Salir"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 
 msgid "Exit this program?"
 msgstr "¿Salir del programa?"
 

-#: src/mainwindow.c:2716 src/summaryview.c:4046
+#: src/mainwindow.c:2850 src/summaryview.c:4009

 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Reglas de procesamiento a aplicar antes de las de las carpetas"
 

-#: src/mainwindow.c:2724
+#: src/mainwindow.c:2858

 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Reglas de procesamiento a aplicar después de las de las carpetas"
 

-#: src/mainwindow.c:2732 src/summaryview.c:4055
+#: src/mainwindow.c:2866 src/summaryview.c:4018

 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 
 msgid "Filtering configuration"
 msgstr "Configuración de filtrado"
 


@@ -4551,26 +4591,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/_Mensaje/Redirigi_r"
 
 #: src/messageview.c:276
 msgstr "/_Mensaje/Redirigi_r"
 
 #: src/messageview.c:276

+msgid "/_Tools/Create processing rule/"
+msgstr "/_Herramientas/_Crear regla de procesamiento/"
+
+#: src/messageview.c:278

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de procesamiento/_Automáticamente"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de procesamiento/_Automáticamente"
 

-#: src/messageview.c:278
+#: src/messageview.c:280

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Desde"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Desde"
 

-#: src/messageview.c:280
+#: src/messageview.c:282

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Para"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en _Para"
 

-#: src/messageview.c:282
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en el _Asunto"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de procesamiento/Basada en el _Asunto"
 

-#: src/messageview.c:476
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 
 msgid "<No Return-Path found>"
 msgstr "<No se encontró Return-Path>"
 

-#: src/messageview.c:484
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4585,11 +4629,11 @@ msgstr ""
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 
 "Dirección de retorno: %s\n"
 "Se recomienda no enviar el acuse de recibo."
 

-#: src/messageview.c:492
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+No enviar"
 
 msgid "+Don't Send"
 msgstr "+No enviar"
 

-#: src/messageview.c:502
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4601,39 +4645,39 @@ msgstr ""
 "oficialmente dirigido a usted.\n"
 "Notificación de acuse de recibo cancelada."
 
 "oficialmente dirigido a usted.\n"
 "Notificación de acuse de recibo cancelada."
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3448
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "Guardar como"
 
 msgid "Save as"
 msgstr "Guardar como"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3453
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "Sobreescribir"
 
 msgid "Overwrite"
 msgstr "Sobreescribir"
 

-#: src/messageview.c:907
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 
 msgid "Overwrite existing file?"
 msgstr "¿Sobreescribir el fichero existente?"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
-#: src/summaryview.c:3482
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No se puede guardar el fichero `%s'."
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No se puede guardar el fichero `%s'."
 

-#: src/messageview.c:979
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "Este mensaje solicita acuse de recibo"
 
 msgid "This message asks for a return receipt"
 msgstr "Este mensaje solicita acuse de recibo"
 

-#: src/messageview.c:980
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 
 msgid "Send receipt"
 msgstr "Enviar acuse de recibo"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 
 msgid "Return Receipt Notification"
 msgstr "Notificación de acuse de recibo"
 

-#: src/messageview.c:1034
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4643,20 +4687,19 @@ msgstr ""
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 
 "Por favor, elija la cuenta que desea utilizar para enviar la notificación de "
 "acuse de recibo:"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "Enviar notificación"
 
 msgid "Send Notification"
 msgstr "Enviar notificación"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+Cancelar"
 
 msgid "+Cancel"
 msgstr "+Cancelar"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
-#: src/toolbar.c:171
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "Imprimir"
 
 msgid "Print"
 msgstr "Imprimir"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4665,7 +4708,7 @@ msgstr ""
 "Teclee la orden para imprimir:\n"
 "(`%s' será sustituido por el fichero)"
 
 "Teclee la orden para imprimir:\n"
 "(`%s' será sustituido por el fichero)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4691,7 +4734,7 @@ msgstr "/Abrir _con..."
 msgid "/_Display as text"
 msgstr "/_Ver como texto"
 
 msgid "/_Display as text"
 msgstr "/_Ver como texto"
 

-#: src/mimeview.c:152 src/summaryview.c:463
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/_Salvar como..."
 
 msgid "/_Save as..."
 msgstr "/_Salvar como..."
 


@@ -4753,43 +4796,43 @@ msgstr "creando conexi
 msgid "can't set group: %s\n"
 msgstr "no puedo establecer grupo: %s\n"
 
 msgid "can't set group: %s\n"
 msgstr "no puedo establecer grupo: %s\n"
 

-#: src/news.c:817
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "rango de artículos no válido: %d - %d\n"
 

-#: src/news.c:838
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "ocurrió un error obteniendo %s.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "ocurrió un error obteniendo %s.\n"
 

-#: src/news.c:855
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "obteniendo xover %d en %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "obteniendo xover %d en %s...\n"
 

-#: src/news.c:858 src/news.c:927
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 
 msgid "can't get xover\n"
 msgstr "no se puede obtener xover\n"
 

-#: src/news.c:863 src/news.c:933
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "ocurrió un error obteniendo xover.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "ocurrió un error obteniendo xover.\n"
 

-#: src/news.c:869 src/news.c:946
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover no válida: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "linea xover no válida: %s\n"
 

-#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 
 msgid "can't get xhdr\n"
 msgstr "no se puede obtener xhdr\n"
 

-#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurrió un error obteniendo xhdr.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocurrió un error obteniendo xhdr.\n"
 

-#: src/news.c:924
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "obteniendo xover %d - %d en %s...\n"


@@ -4823,11 +4866,15 @@ msgstr ""
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 
 "¡Contraseña errónea! Intentelo de nuevo...\n"
 "\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: inspeccionando mensaje..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr "Antivirus Clam"
 
 msgid "Clam AntiVirus"
 msgstr "Antivirus Clam"
 

-#: src/plugins/clamav/clamav_plugin.c:229
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -5003,11 +5050,15 @@ msgstr ""
 "Este módulo usa el contenedor GtkMathView para mostrar adjuntos MathML "
 "(Content-Type: text/mathml)"
 
 "Este módulo usa el contenedor GtkMathView para mostrar adjuntos MathML "
 "(Content-Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: filtrando mensaje..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:314
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "
 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "


@@ -5225,203 +5276,207 @@ msgstr "Preferencias para una nueva cuenta"
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 
 msgid "Account preferences"
 msgstr "Preferencias de la cuenta"
 

-#: src/prefs_account.c:766 src/prefs_common.c:968
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "Recibir"
 
 msgid "Receive"
 msgstr "Recibir"
 

-#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "Componer"
 
 msgid "Compose"
 msgstr "Componer"
 

-#: src/prefs_account.c:773 src/prefs_common.c:981
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Privacidad"
 
 msgid "Privacy"
 msgstr "Privacidad"
 

-#: src/prefs_account.c:777
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:780
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "Avanzadas"
 
 msgid "Advanced"
 msgstr "Avanzadas"
 

-#: src/prefs_account.c:859
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "Nombre de cuenta"
 
 msgid "Name of account"
 msgstr "Nombre de cuenta"
 

-#: src/prefs_account.c:868
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "Cuenta por defecto"
 
 msgid "Set as default"
 msgstr "Cuenta por defecto"
 

-#: src/prefs_account.c:872
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "Información personal"
 
 msgid "Personal information"
 msgstr "Información personal"
 

-#: src/prefs_account.c:881
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "Nombre completo"
 
 msgid "Full name"
 msgstr "Nombre completo"
 

-#: src/prefs_account.c:887
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "Dirección de correo"
 
 msgid "Mail address"
 msgstr "Dirección de correo"
 

-#: src/prefs_account.c:893
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "Organización"
 
 msgid "Organization"
 msgstr "Organización"
 

-#: src/prefs_account.c:917
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "Información del servidor"
 
 msgid "Server information"
 msgstr "Información del servidor"
 

-#: src/prefs_account.c:938
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (normal)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (normal)"
 

-#: src/prefs_account.c:940
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (autorz. APOP)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (autorz. APOP)"
 

-#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:944
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "Noticias (NNTP)"
 

-#: src/prefs_account.c:946
-msgid "None (local)"
-msgstr "Ninguna (local)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "Fichero mbox local"
+
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "Ninguno (sólo SMTP)"

 
 

-#: src/prefs_account.c:966
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 
 msgid "This server requires authentication"
 msgstr "Este servidor requiere autentificación"
 

-#: src/prefs_account.c:973
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Autentificación al conectar"
 
 msgid "Authenticate on connect"
 msgstr "Autentificación al conectar"
 

-#: src/prefs_account.c:1018
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "Servidor de news"
 
 msgid "News server"
 msgstr "Servidor de news"
 

-#: src/prefs_account.c:1024
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 
 msgid "Server for receiving"
 msgstr "Servidor de recepción"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "Buzón local"
 
 msgid "Local mailbox"
 msgstr "Buzón local"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (enviar)"
 

-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Usar mandato para correo en vez de servidor SMTP"
 

-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 
 msgid "command to send mails"
 msgstr "orden para enviar los correos"
 

-#: src/prefs_account.c:1061 src/prefs_account.c:1435
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Usuario"
 
 msgid "User ID"
 msgstr "Usuario"
 

-#: src/prefs_account.c:1067 src/prefs_account.c:1444
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "Contraseña"
 
 msgid "Password"
 msgstr "Contraseña"
 

-#: src/prefs_account.c:1143 src/prefs_account.c:1849
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1151
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "Eliminar mensajes del servidor recibidos"
 
 msgid "Remove messages on server when received"
 msgstr "Eliminar mensajes del servidor recibidos"
 

-#: src/prefs_account.c:1162
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "Eliminar después de"
 
 msgid "Remove after"
 msgstr "Eliminar después de"
 

-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "días"
 
 msgid "days"
 msgstr "días"
 

-#: src/prefs_account.c:1188
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 días: borrar inmediatamente)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 días: borrar inmediatamente)"
 

-#: src/prefs_account.c:1195
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "Descargar todos los mensajes del servidor"
 
 msgid "Download all messages on server"
 msgstr "Descargar todos los mensajes del servidor"
 

-#: src/prefs_account.c:1201
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 
 msgid "Receive size limit"
 msgstr "Límite de tamaño al recibir"
 

-#: src/prefs_account.c:1208
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "Kb"
 
 msgid "KB"
 msgstr "Kb"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "Buzón por defecto"
 
 msgid "Default inbox"
 msgstr "Buzón por defecto"
 

-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Los mensajes sin filtrar se guardarán en esta carpeta)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Los mensajes sin filtrar se guardarán en esta carpeta)"
 

-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 
 msgid "Maximum number of articles to download"
 msgstr "Número máximo de artículos a descargar"
 

-#: src/prefs_account.c:1267
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "sin límite si se especifica 0"
 

-#: src/prefs_account.c:1283 src/prefs_account.c:1406
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "Método de autentificación"
 
 msgid "Authentication method"
 msgstr "Método de autentificación"
 

-#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "Automático"
 
 msgid "Automatic"
 msgstr "Automático"
 

-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrar mensajes al recibir"
 

-#: src/prefs_account.c:1304
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr "`Recibir todo' comprueba si hay nuevos mensajes en esta cuenta"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Recibir todo' comprueba si hay nuevos mensajes en esta cuenta"
 

-#: src/prefs_account.c:1363
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Añadir fecha"
 
 msgid "Add Date"
 msgstr "Añadir fecha"
 

-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1361

 msgid "Generate Message-Id"
 msgstr "Generar Message-Id"
 
 msgid "Generate Message-Id"
 msgstr "Generar Message-Id"
 

-#: src/prefs_account.c:1371
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 
 msgid "Add user-defined header"
 msgstr "Añadir cabecera de usuario"
 

-#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " Editar... "
 
 msgid " Edit... "
 msgstr " Editar... "
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "Autentificación"
 
 msgid "Authentication"
 msgstr "Autentificación"
 

-#: src/prefs_account.c:1391
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentificación SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."


@@ -5429,184 +5484,184 @@ msgstr ""
 "Si dejas estos campos vacíos, se utilizará el mismo\n"
 "ID de usuario y contraseña usados para la recepción."
 
 "Si dejas estos campos vacíos, se utilizará el mismo\n"
 "ID de usuario y contraseña usados para la recepción."
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentificación con POP3 antes de enviar"
 

-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autentificación POP: "
 
 msgid "POP authentication timeout: "
 msgstr "Tiempo límite para autentificación POP: "
 

-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "minutos"
 
 msgid "minutes"
 msgstr "minutos"
 

-#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Firma"
 
 msgid "Signature"
 msgstr "Firma"
 

-#: src/prefs_account.c:1554
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "Insertar firma automáticamente"
 
 msgid "Insert signature automatically"
 msgstr "Insertar firma automáticamente"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Separador de firma"
 
 msgid "Signature separator"
 msgstr "Separador de firma"
 

-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "Salida de la orden"
 
 msgid "Command output"
 msgstr "Salida de la orden"
 

-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 

-#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116

 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 
 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Cc"
 

-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "Bcc"
 
 msgid "Bcc"
 msgstr "Bcc"
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "Responder a"
 
 msgid "Reply-To"
 msgstr "Responder a"
 

-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "Encriptar el mensaje por defecto"
 
 msgid "Encrypt message by default"
 msgstr "Encriptar el mensaje por defecto"
 

-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "Firmar el mensaje por defecto"
 
 msgid "Sign message by default"
 msgstr "Firmar el mensaje por defecto"
 

-#: src/prefs_account.c:1693
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "Modo por defecto"
 
 msgid "Default mode"
 msgstr "Modo por defecto"
 

-#: src/prefs_account.c:1701
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "Usar PGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "Usar PGP/MIME"
 

-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "Usar incrustado"
 
 msgid "Use Inline"
 msgstr "Usar incrustado"
 

-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr "Clave para firmar"
 
 msgid "Sign key"
 msgstr "Clave para firmar"
 

-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por defecto"
 
 msgid "Use default GnuPG key"
 msgstr "Usar la clave GnuPG por defecto"
 

-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "Seleccionar la clave en base a su dirección de correo"
 
 msgid "Select key by your email address"
 msgstr "Seleccionar la clave en base a su dirección de correo"
 

-#: src/prefs_account.c:1746
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 
 msgid "Specify key manually"
 msgstr "Especificar la clave manualmente"
 

-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 
 msgid "User or key ID:"
 msgstr "Usuario o ID de clave:"
 

-#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "No usar SSL"
 
 msgid "Don't use SSL"
 msgstr "No usar SSL"
 

-#: src/prefs_account.c:1860
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Usar SSL para la conexión POP3"
 

-#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Usar la orden STARTTLS para abrir la sesión SSL"
 

-#: src/prefs_account.c:1877
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Usar SSL para la conexión IMAP4"
 

-#: src/prefs_account.c:1883
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Usar SSL para la conexión NNTP"
 

-#: src/prefs_account.c:1900
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Enviar (SMTP)"
 

-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "No usar SSL (pero usar STARTTLS si es necesario)"
 

-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Usar SSL para la conexión SMTP"
 

-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 
 msgid "Use non-blocking SSL"
 msgstr "Usar SSL no-bloqueante"
 

-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Desactive esto si tiene problemas de conexión con SSL)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Desactive esto si tiene problemas de conexión con SSL)"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 
 msgid "Specify SMTP port"
 msgstr "Puerto SMTP"
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 
 msgid "Specify POP3 port"
 msgstr "Puerto POP3"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 
 msgid "Specify IMAP4 port"
 msgstr "Puerto IMAP4"
 

-#: src/prefs_account.c:2076
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 
 msgid "Specify NNTP port"
 msgstr "Puerto NNTP"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 
 msgid "Specify domain name"
 msgstr "Nombre del dominio"
 

-#: src/prefs_account.c:2091
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 
 msgid "Use command to communicate with server"
 msgstr "Usar orden para comunicarse con el servidor"
 

-#: src/prefs_account.c:2099
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Marcar los mensajes cruzados como leídos y de color:"
 

-#: src/prefs_account.c:2113
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 
 msgid "IMAP server directory"
 msgstr "Directorio del servidor IMAP4"
 

-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 
 msgid "Put sent messages in"
 msgstr "Poner mensajes enviados en"
 

-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 
 msgid "Put draft messages in"
 msgstr "Poner borradores de mensajes en"
 

-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 
 msgid "Put deleted messages in"
 msgstr "Poner mensajes borrados en"
 

-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 
 msgid "Account name is not entered."
 msgstr "No se especificó el nombre de la cuenta."
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 
 msgid "Mail address is not entered."
 msgstr "No se especificó la dirección de correo."
 


@@ -5673,8 +5728,8 @@ msgid "Current actions"
 msgstr "Acciones actuales"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
 msgstr "Acciones actuales"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546

-#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
-#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687

 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nueva)"
 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nueva)"


@@ -5718,178 +5773,178 @@ msgstr "Borrar acci
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 
 msgid "Do you really want to delete this action?"
 msgstr "¿Realmente quiere borrar esta acción?"
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "NOMBRE DE MENÚ:"
 
 msgid "MENU NAME:"
 msgstr "NOMBRE DE MENÚ:"
 

-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr "Utilize / en el nombre de menú para crear submenús."
 
 msgid "Use / in menu name to make submenus."
 msgstr "Utilize / en el nombre de menú para crear submenús."
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "LÍNEA DE COMANDO:"
 
 msgid "COMMAND LINE:"
 msgstr "LÍNEA DE COMANDO:"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "Comenzar con:"
 
 msgid "Begin with:"
 msgstr "Comenzar con:"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 
 msgid "to send message body or selection to command's standard input"
 msgstr ""
 "para enviar el mensaje o la selección a la entrada estándar de la orden"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 
 msgid "to send user provided text to command's standard input"
 msgstr "para enviar el texto de usuario a la entrada estándar de la orden"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "para enviar el texto de usuario oculto a la entrada estándar de la orden"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "Finalizar con:"
 
 msgid "End with:"
 msgstr "Finalizar con:"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr ""
 "para reemplazar el mensaje o selección con la salida estándar de la orden"
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "para insertar la salida estándar de la orden sin reemplazar el texto"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 
 msgid "to run command asynchronously"
 msgstr "para ejecutar la orden de manera asíncrona"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "Utilize:"
 
 msgid "Use:"
 msgstr "Utilize:"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "para el fichero del mensaje seleccionado en formato RFC822/2822 "
 

-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:671

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr ""
 "para la lista de nombres de los mensajes seleccionados en formato RFC822/2822"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "para el fichero de la parte MIME seleccionada del mensaje decodificada"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 
 msgid "for a user provided argument"
 msgstr "para un parámetro introducido por el usuario"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr ""
 "para un parámetro introducido por el usuario y oculto (p.ej. contraseña)"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 
 msgid "for the text selection"
 msgstr "para la parte seleccionada del texto"
 

-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplicar acciones de filtrado entre {} a los mensajes seleccionados"
 

-#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131

 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 
 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Descripción de símbolos"
 

-#: src/prefs_common.c:951
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Preferencias comunes"
 
 msgid "Common Preferences"
 msgstr "Preferencias comunes"
 

-#: src/prefs_common.c:974
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "Citar"
 
 msgid "Quote"
 msgstr "Citar"
 

-#: src/prefs_common.c:976
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "Ver"
 
 msgid "Display"
 msgstr "Ver"
 

-#: src/prefs_common.c:978
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Mensaje"
 
 msgid "Message"
 msgstr "Mensaje"
 

-#: src/prefs_common.c:986 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "Otras"
 
 msgid "Other"
 msgstr "Otras"
 

-#: src/prefs_common.c:1032
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Programa externo"
 
 msgid "External program"
 msgstr "Programa externo"
 

-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 
 msgid "Use external program for incorporation"
 msgstr "Usar un programa externo para incorporar"
 

-#: src/prefs_common.c:1048
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "Orden"
 
 msgid "Command"
 msgstr "Orden"
 

-#: src/prefs_common.c:1072
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "Comprobar correo nuevo"
 
 msgid "Auto-check new mail"
 msgstr "Comprobar correo nuevo"
 

-#: src/prefs_common.c:1074
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "cada"
 
 msgid "every"
 msgstr "cada"
 

-#: src/prefs_common.c:1086
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "minuto(s)"
 
 msgid "minute(s)"
 msgstr "minuto(s)"
 

-#: src/prefs_common.c:1095
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Comprueba correo nuevo al inicio"
 
 msgid "Check new mail on startup"
 msgstr "Comprueba correo nuevo al inicio"
 

-#: src/prefs_common.c:1097
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todos las carpetas locales después de incorporar"
 
 msgid "Update all local folders after incorporation"
 msgstr "Actualizar todos las carpetas locales después de incorporar"
 

-#: src/prefs_common.c:1105
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 
 msgid "Show receive dialog"
 msgstr "Mostrar diálogo de recepción"
 

-#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "Siempre"
 
 msgid "Always"
 msgstr "Siempre"
 

-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 
 msgid "Only on manual receiving"
 msgstr "Sólo al recibir manualmente"
 

-#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "Nunca"
 
 msgid "Never"
 msgstr "Nunca"
 

-#: src/prefs_common.c:1126
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "Cerrar el diálogo de recepción al finalizar"
 
 msgid "Close receive dialog when finished"
 msgstr "Cerrar el diálogo de recepción al finalizar"
 

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "Ejecutar una orden al recibir correo nuevo"
 
 msgid "Run command when new mail arrives"
 msgstr "Ejecutar una orden al recibir correo nuevo"
 

-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "después de la autocomprobación"
 
 msgid "after autochecking"
 msgstr "después de la autocomprobación"
 

-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "después de la comprobación manual"
 
 msgid "after manual checking"
 msgstr "después de la comprobación manual"
 

-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5898,23 +5953,23 @@ msgstr ""
 "Orden a ejecutar:\n"
 "(usar %d como nº de mensajes nuevos)"
 
 "Orden a ejecutar:\n"
 "(usar %d como nº de mensajes nuevos)"
 

-#: src/prefs_common.c:1223
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "Guardar mensajes enviados en la carpeta Enviado"
 
 msgid "Save sent messages to Sent folder"
 msgstr "Guardar mensajes enviados en la carpeta Enviado"
 

-#: src/prefs_common.c:1225
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "Poner en cola los envios fallidos"
 
 msgid "Queue messages that fail to send"
 msgstr "Poner en cola los envios fallidos"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "Mostrar diálogo de envío"
 
 msgid "Show send dialog"
 msgstr "Mostrar diálogo de envío"
 

-#: src/prefs_common.c:1248
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "Conjunto de códigos para enviar"
 
 msgid "Outgoing codeset"
 msgstr "Conjunto de códigos para enviar"
 

-#: src/prefs_common.c:1257
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"


@@ -5922,107 +5977,107 @@ msgstr ""
 "Si selecciona `Automático' se utilizará la codificación óptima para la "
 "localización actual."
 
 "Si selecciona `Automático' se utilizará la codificación óptima para la "
 "localización actual."
 

-#: src/prefs_common.c:1269
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 
 msgid "Automatic (Recommended)"
 msgstr "Automático (Recomendado)"
 

-#: src/prefs_common.c:1270
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 
 msgid "7bit ascii (US-ASCII)"
 msgstr "ASCII de 7 bits (US-ASC_II)"
 

-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Europeo Occidental (ISO-8859-1)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Europeo Occidental (ISO-8859-15)"
 

-#: src/prefs_common.c:1276
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "Centroeuropeo (ISO-8859-2)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "Báltico (ISO-8859-13)"
 

-#: src/prefs_common.c:1278
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "Báltico (ISO-8859-4)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Griego (ISO-8859-7)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turco (ISO-8859-9)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cirílico (ISO-8859-5)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cirílico (KOI8-R)"
 

-#: src/prefs_common.c:1286
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cirílico (Windows-1251)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cirílico (KOI8-U)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonés (ISO-2022-JP)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "Japonés (EUC-JP)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonés (Shift_JIS)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "Chino simplificado (GB2312)"
 

-#: src/prefs_common.c:1295
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "Chino tradicional (Big5)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Chino tradicional (EUC-TW)"
 

-#: src/prefs_common.c:1298
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chino (ISO-2022-CN)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "Coreano (EUC-KR)"
 

-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Tailandés (TIS-620)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Tailandés (Windows-874)"
 

-#: src/prefs_common.c:1315
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "Codificación de envío"
 
 msgid "Transfer encoding"
 msgstr "Codificación de envío"
 

-#: src/prefs_common.c:1324
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"


@@ -6030,151 +6085,151 @@ msgstr ""
 "Especificar la codificación de envío (Content-Transfer-Encoding) usada "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII"
 
 "Especificar la codificación de envío (Content-Transfer-Encoding) usada "
 "cuando el cuerpo del mensaje contiene caracteres no-ASCII"
 

-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "Selección automática de cuenta"
 
 msgid "Automatic account selection"
 msgstr "Selección automática de cuenta"
 

-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "al responder"
 
 msgid "when replying"
 msgstr "al responder"
 

-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "al reenviar"
 
 msgid "when forwarding"
 msgstr "al reenviar"
 

-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "al reeditar"
 
 msgid "when re-editing"
 msgstr "al reeditar"
 

-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "El botón Responder invoca responder a la lista de correo"
 

-#: src/prefs_common.c:1433
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 
 msgid "Automatically launch the external editor"
 msgstr "Lanzar el editor externo automáticamente"
 

-#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 
 msgid "Forward as attachment"
 msgstr "Reenviar como adjunto"
 

-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "Bloquear el cursor"
 
 msgid "Block cursor"
 msgstr "Bloquear el cursor"
 

-#: src/prefs_common.c:1446
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantener la cabecera 'Desde' original al redirigir"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Mantener la cabecera 'Desde' original al redirigir"
 

-#: src/prefs_common.c:1454
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "Autoguardar en Borradores cada "
 
 msgid "Autosave to Drafts folder every "
 msgstr "Autoguardar en Borradores cada "
 

-#: src/prefs_common.c:1461 src/prefs_common.c:1506
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "caracteres"
 
 msgid "characters"
 msgstr "caracteres"
 

-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "Niveles de deshacer"
 
 msgid "Undo level"
 msgstr "Niveles de deshacer"
 

-#: src/prefs_common.c:1482
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "Recorte de mensajes"
 
 msgid "Message wrapping"
 msgstr "Recorte de mensajes"
 

-#: src/prefs_common.c:1494
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 
 msgid "Wrap messages at"
 msgstr "Recortar mensajes a los"
 

-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "Recortar citación"
 
 msgid "Wrap quotation"
 msgstr "Recortar citación"
 

-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 
 msgid "Wrap on input"
 msgstr "Recortar al escribir"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 
 msgid "Wrap before sending"
 msgstr "Recortar antes de enviar"
 

-#: src/prefs_common.c:1522
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Recorte inteligente (EXPERIMENTAL)"
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Recorte inteligente (EXPERIMENTAL)"
 

-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "Responder con citación por defecto"
 
 msgid "Reply will quote by default"
 msgstr "Responder con citación por defecto"
 

-#: src/prefs_common.c:1590
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "Formato de réplica"
 
 msgid "Reply format"
 msgstr "Formato de réplica"
 

-#: src/prefs_common.c:1605 src/prefs_common.c:1644
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "Marca de citación"
 
 msgid "Quotation mark"
 msgstr "Marca de citación"
 

-#: src/prefs_common.c:1629
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "Formato de reenvio"
 
 msgid "Forward format"
 msgstr "Formato de reenvio"
 

-#: src/prefs_common.c:1673
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 
 msgid " Description of symbols "
 msgstr " Descripción de símbolos "
 

-#: src/prefs_common.c:1681
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "Caracteres de citación"
 
 msgid "Quotation characters"
 msgstr "Caracteres de citación"
 

-#: src/prefs_common.c:1696
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "Tratar estos caracteres como marcas de cita: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Tratar estos caracteres como marcas de cita: "
 

-#: src/prefs_common.c:1746
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Traducir cabeceras (como `Desde:', `Asunto:')"
 

-#: src/prefs_common.c:1749
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 
 msgid "Display unread number next to folder name"
 msgstr "Ver el número de no leídos junto al nombre de la carpeta"
 

-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Abreviar nombres de grupo con más de"
 

-#: src/prefs_common.c:1773
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "letras"
 
 msgid "letters"
 msgstr "letras"
 

-#: src/prefs_common.c:1779
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "Vista resumen"
 
 msgid "Summary View"
 msgstr "Vista resumen"
 

-#: src/prefs_common.c:1788
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna `Desde' si el remitente es usted"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Ver destinatario en la columna `Desde' si el remitente es usted"
 

-#: src/prefs_common.c:1791
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 
 msgid "Display sender using address book"
 msgstr "Mostrar remitente usando la agenda"
 

-#: src/prefs_common.c:1794
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Jerarquizar usando el asunto además de las cabeceras estándar"
 

-#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "Formato de fecha"
 
 msgid "Date format"
 msgstr "Formato de fecha"
 

-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " Elementos visibles en el resumen... "
 
 msgid " Set displayed items in summary... "
 msgstr " Elementos visibles en el resumen... "
 

-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 
 msgid "Enable coloration of message"
 msgstr "Permitir colores en el mensaje"
 

-#: src/prefs_common.c:1900
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"


@@ -6182,344 +6237,327 @@ msgstr ""
 "Mostrar alfanuméricos multi-byte con\n"
 "caracteres ASCII (solamente Japonés)"
 
 "Mostrar alfanuméricos multi-byte con\n"
 "caracteres ASCII (solamente Japonés)"
 

-#: src/prefs_common.c:1906
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 
 msgid "Display header pane above message view"
 msgstr "Mostrar panel de cabeceras sobre el mensaje"
 

-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 
 msgid "Display short headers on message view"
 msgstr "Cabeceras breves en la vista del mensaje"
 

-#: src/prefs_common.c:1935
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Interlineado"
 
 msgid "Line space"
 msgstr "Interlineado"
 

-#: src/prefs_common.c:1949 src/prefs_common.c:1989
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "pixel(s)"
 
 msgid "pixel(s)"
 msgstr "pixel(s)"
 

-#: src/prefs_common.c:1954
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "Dejar espacio de cabecera"
 
 msgid "Leave space on head"
 msgstr "Dejar espacio de cabecera"
 

-#: src/prefs_common.c:1956
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "Desplazamiento"
 
 msgid "Scroll"
 msgstr "Desplazamiento"
 

-#: src/prefs_common.c:1963
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Media página"
 
 msgid "Half page"
 msgstr "Media página"
 

-#: src/prefs_common.c:1969
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 
 msgid "Smooth scroll"
 msgstr "Desplazamiento suave"
 

-#: src/prefs_common.c:1975
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "Paso"
 
 msgid "Step"
 msgstr "Paso"
 

-#: src/prefs_common.c:2000
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripciones de los adjuntos (en vez de nombres)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Mostrar descripciones de los adjuntos (en vez de nombres)"
 

-#: src/prefs_common.c:2046
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 
 msgid "Automatically check signatures"
 msgstr "Comprobar las firmas automáticamente"
 

-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "Mantener contraseña en memoria temporalmente"
 

-#: src/prefs_common.c:2064
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr "Expirar después de"
 
 msgid "Expire after"
 msgstr "Expirar después de"
 

-#: src/prefs_common.c:2075
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Dejándolo a '0' mantendrá la contraseña durante toda la sesión"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Dejándolo a '0' mantendrá la contraseña durante toda la sesión"
 

-#: src/prefs_common.c:2083
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "minuto(s)"
 
 msgid "minute(s) "
 msgstr "minuto(s)"
 

-#: src/prefs_common.c:2100
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir contraseñas"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Capturar la entrada al introducir contraseñas"
 

-#: src/prefs_common.c:2105
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Mostrar aviso al arrancar si no funciona GnuPG"
 

-#: src/prefs_common.c:2166
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre mensajes en el resumen cuando se seleccionen"
 
 msgid "Always open messages in summary when selected"
 msgstr "Abrir siempre mensajes en el resumen cuando se seleccionen"
 

-#: src/prefs_common.c:2170
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 
 msgid "Open first unread message when entering a folder"
 msgstr "Abrir el primer mensaje no leído al abrir una carpeta"
 

-#: src/prefs_common.c:2174
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "Marcar mensaje como leído sólo al abrirlo en una ventana nueva"
 

-#: src/prefs_common.c:2178
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "Abrir entrada despues de recibir correo nuevo"
 

-#: src/prefs_common.c:2188
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Ejecutar inmediatamente movimientos o borrados de mensajes"
 

-#: src/prefs_common.c:2190
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgstr "Los mensajes serán marcados hasta la ejecución si está desactivado"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr "Los mensajes serán marcados hasta la ejecución si está desactivado"
 

-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "Mostrar diálogo de 'No hay mensajes sin leer...'"
 
 msgid "Show no-unread-message dialog"
 msgstr "Mostrar diálogo de 'No hay mensajes sin leer...'"
 

-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "Asumir 'Si'"
 
 msgid "Assume 'Yes'"
 msgstr "Asumir 'Si'"
 

-#: src/prefs_common.c:2215
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "Asumir 'No'"
 
 msgid "Assume 'No'"
 msgstr "Asumir 'No'"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado..."
 
 msgid " Set key bindings... "
 msgstr " Establecer atajos de teclado..."
 

-#: src/prefs_common.c:2230
-msgid "Icon theme"
-msgstr "Tema de iconos"
-
-#: src/prefs_common.c:2314
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Programas externos (%s se sustituirá con el nombre de fichero / URI)"
-
-#: src/prefs_common.c:2323
-msgid "Web browser"
-msgstr "Navegador web"
-
-#: src/prefs_common.c:2359 src/toolbar.c:429
-msgid "Editor"
-msgstr "Editor"
-
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble click"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Añadir dirección al destino con doble click"
 

-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "Tamaño de traza"
 
 msgid "Log Size"
 msgstr "Tamaño de traza"
 

-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "Recortar tamaño de traza"
 
 msgid "Clip the log size"
 msgstr "Recortar tamaño de traza"
 

-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "Longitud ventana de traza"
 
 msgid "Log window length"
 msgstr "Longitud ventana de traza"
 

-#: src/prefs_common.c:2417
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "0 para dejar de registrar en la ventana de traza"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 para dejar de registrar en la ventana de traza"
 

-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "Seguridad"
 
 msgid "Security"
 msgstr "Seguridad"
 

-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "Preguntar antes de aceptar los certificados SSL"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "Preguntar antes de aceptar los certificados SSL"
 

-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "Al salir"
 
 msgid "On exit"
 msgstr "Al salir"
 

-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 
 msgid "Confirm on exit"
 msgstr "Confirmar al salir"
 

-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 
 msgid "Empty trash on exit"
 msgstr "Vaciar papelera al salir"
 

-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 
 msgid "Ask before emptying"
 msgstr "Preguntar antes de vaciar"
 

-#: src/prefs_common.c:2462
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 
 msgid "Warn if there are queued messages"
 msgstr "Avisar si existen mensajes en cola"
 

-#: src/prefs_common.c:2468
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Tiempo límite E/S socket:"
 
 msgid "Socket I/O timeout:"
 msgstr "Tiempo límite E/S socket:"
 

-#: src/prefs_common.c:2481
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "segundos"
 
 msgid "seconds"
 msgstr "segundos"
 

-#: src/prefs_common.c:2665
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 
 msgid "the full abbreviated weekday name"
 msgstr "el dia de la semana abreviado"
 

-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 
 msgid "the full weekday name"
 msgstr "el dia de la semana completo"
 

-#: src/prefs_common.c:2667
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 
 msgid "the abbreviated month name"
 msgstr "el nombre del mes abreviado"
 

-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "el nombre del mes completo"
 
 msgid "the full month name"
 msgstr "el nombre del mes completo"
 

-#: src/prefs_common.c:2669
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 
 msgid "the preferred date and time for the current locale"
 msgstr "la fecha y hora preferida para la localización actual"
 

-#: src/prefs_common.c:2670
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 
 msgid "the century number (year/100)"
 msgstr "el número de siglo (año/100)"
 

-#: src/prefs_common.c:2671
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 
 msgid "the day of the month as a decimal number"
 msgstr "el dia del mes como número decimal"
 

-#: src/prefs_common.c:2672
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "la hora como número usando el reloj de 24 horas"
 

-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "la hora como número usando el reloj de 12 horas"
 

-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 
 msgid "the day of the year as a decimal number"
 msgstr "el dia del año como número decimal"
 

-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 
 msgid "the month as a decimal number"
 msgstr "el mes como número decimal"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 
 msgid "the minute as a decimal number"
 msgstr "el minuto como número decimal"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "AM o PM"
 
 msgid "either AM or PM"
 msgstr "AM o PM"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 
 msgid "the second as a decimal number"
 msgstr "el segundo como número decimal"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 
 msgid "the day of the week as a decimal number"
 msgstr "el dia de la semana como número decimal"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 
 msgid "the preferred date for the current locale"
 msgstr "la fecha preferida para la localización actual"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 
 msgid "the last two digits of a year"
 msgstr "los dos últimos dígitos del año"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 
 msgid "the year as a decimal number"
 msgstr "el año como número decimal"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 
 msgid "the time zone or name or abbreviation"
 msgstr "zona horaria o nombre o abreviatura"
 

-#: src/prefs_common.c:2704
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "Especificador"
 
 msgid "Specifier"
 msgstr "Especificador"
 

-#: src/prefs_common.c:2744
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "Ejemplo"
 
 msgid "Example"
 msgstr "Ejemplo"
 

-#: src/prefs_common.c:2833
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "Colores del mensaje"
 
 msgid "Set message colors"
 msgstr "Colores del mensaje"
 

-#: src/prefs_common.c:2841
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "Colores"
 
 msgid "Colors"
 msgstr "Colores"
 

-#: src/prefs_common.c:2888
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 
 msgid "Quoted Text - First Level"
 msgstr "Texto citado - Primer nivel"
 

-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 
 msgid "Quoted Text - Second Level"
 msgstr "Texto citado - Segundo nivel"
 

-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 
 msgid "Quoted Text - Third Level"
 msgstr "Texto citado - Tercer nivel"
 

-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "Enlace URI"
 
 msgid "URI link"
 msgstr "Enlace URI"
 

-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Carpeta destino"
 
 msgid "Target folder"
 msgstr "Carpeta destino"
 

-#: src/prefs_common.c:2918
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Firmas"
 
 msgid "Signatures"
 msgstr "Firmas"
 

-#: src/prefs_common.c:2925
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 
 msgid "Recycle quote colors"
 msgstr "Reutilizar colores de citación"
 

-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 
 msgid "Pick color for quotation level 1"
 msgstr "Elejir color para el nivel de citado 1"
 

-#: src/prefs_common.c:2995
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 
 msgid "Pick color for quotation level 2"
 msgstr "Elejir color para el nivel de citado 2"
 

-#: src/prefs_common.c:2998
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 
 msgid "Pick color for quotation level 3"
 msgstr "Elejir color para el nivel de citado 3"
 

-#: src/prefs_common.c:3001
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 
 msgid "Pick color for URI"
 msgstr "Elejir color para URIs"
 

-#: src/prefs_common.c:3004
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Elejir color para la carpeta destino"
 
 msgid "Pick color for target folder"
 msgstr "Elejir color para la carpeta destino"
 

-#: src/prefs_common.c:3007
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Elejir color para las firmas"
 
 msgid "Pick color for signatures"
 msgstr "Elejir color para las firmas"
 

-#: src/prefs_common.c:3142
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "Atajos de teclado"
 
 msgid "Key bindings"
 msgstr "Atajos de teclado"
 

-#: src/prefs_common.c:3156
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 
 msgid "Select preset:"
 msgstr "Seleccionar combinación:"
 

-#: src/prefs_common.c:3169 src/prefs_common.c:3454
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "Antigua de Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Antigua de Sylpheed"
 

-#: src/prefs_common.c:3177
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6540,11 +6578,15 @@ msgstr "Cabeceras de usuario actuales"
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 
 msgid "Header name is not set."
 msgstr "No se estableció el nombre de cabecera"
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "Este nombre de cabecera no está permitido como cabecera de usuario."
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "Borrar cabecera"
 
 msgid "Delete header"
 msgstr "Borrar cabecera"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 
 msgid "Do you really want to delete this header?"
 msgstr "¿Quiere borrar realmente esta cabecera?"
 


@@ -6572,6 +6614,35 @@ msgstr "Mostrar todas las cabeceras"
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 
 msgid "This header is already in the list."
 msgstr "Esa cabecera ya existe en la lista."
 

+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s se sustituirá con el nombre de fichero / URI)"
+
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "Navegador web"
+
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "Orden para imprimir"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Editor de texto"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "Visor de imágenes"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "Reproductor de audio"
+
+#: src/prefs_ext_prog.c:265
+msgid "Message View/External Programs"
+msgstr "Vista de mensaje/Programas externos"
+

 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Mover"
 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Mover"


@@ -6608,7 +6679,7 @@ msgstr "Marcar como le
 msgid "Mark as unread"
 msgstr "Marcar como no leído"
 
 msgid "Mark as unread"
 msgstr "Marcar como no leído"
 

-#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473

 msgid "Forward"
 msgstr "Reenviar"
 
 msgid "Forward"
 msgstr "Reenviar"
 


@@ -6617,7 +6688,7 @@ msgid "Redirect"
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
 msgstr "Redirigir"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395

-#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481

 msgid "Execute"
 msgstr "Ejecutar"
 
 msgid "Execute"
 msgstr "Ejecutar"
 


@@ -6658,7 +6729,7 @@ msgid "Recipient"
 msgstr "Destinatario"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
 msgstr "Destinatario"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75

-#: src/summaryview.c:479
+#: src/summaryview.c:480

 msgid "Score"
 msgstr "Puntos"
 
 msgid "Score"
 msgstr "Puntos"
 


@@ -6701,23 +6772,23 @@ msgstr "No se defini
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47

-#: src/summaryview.c:474 src/summaryview.c:641
+#: src/summaryview.c:475 src/summaryview.c:642

 msgid "Subject"
 msgstr "Asunto"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
 msgid "Subject"
 msgstr "Asunto"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42

-#: src/summaryview.c:475 src/summaryview.c:645
+#: src/summaryview.c:476 src/summaryview.c:646

 msgid "From"
 msgstr "Desde"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
 msgid "From"
 msgstr "Desde"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143

-#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650

 msgid "To"
 msgstr "Para"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
 msgid "To"
 msgstr "Para"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715

-#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477

 msgid "Date"
 msgstr "Fecha"
 
 msgid "Date"
 msgstr "Fecha"
 


@@ -6776,35 +6847,35 @@ msgstr "Encima"
 msgid "Bottom"
 msgstr "Debajo"
 
 msgid "Bottom"
 msgstr "Debajo"
 

-#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 
 msgid "Condition string is not valid."
 msgstr "La cadena de condición no es válida."
 

-#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 
 msgid "Action string is not valid."
 msgstr "La cadena de la acción no es válida."
 

-#: src/prefs_filtering.c:780
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 
 msgid "Condition string is empty."
 msgstr "La cadena de condición esta vacía."
 

-#: src/prefs_filtering.c:786
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 
 msgid "Action string is empty."
 msgstr "La cadena de la acción esta vacía."
 

-#: src/prefs_filtering.c:853
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "Borrar regla"
 
 msgid "Delete rule"
 msgstr "Borrar regla"
 

-#: src/prefs_filtering.c:854
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "¿Quiere borrar realmente esta regla?"
 

-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 
 msgid "Entry not saved"
 msgstr "Entrada no guardada"
 

-#: src/prefs_filtering.c:1002
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "La entrada no fue guardada. ¿Cerrar igualmente?"
 


@@ -6864,31 +6935,27 @@ msgstr "Gen
 msgid "Settings for folder"
 msgstr "Propiedades de la carpeta"
 
 msgid "Settings for folder"
 msgstr "Propiedades de la carpeta"
 

-#: src/prefs_fonts.c:77
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Selección de tipografía"
 
 msgid "Font selection"
 msgstr "Selección de tipografía"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Texto"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "Vista de carpeta"

 
 

-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "Pequeña"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Vista de mensaje"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Normal"
-
-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgstr "Negrita"
 
 msgid "Bold"
 msgstr "Negrita"
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr "Necesita reiniciar el programa para que los cambios sean efectivos"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr "Necesita reiniciar el programa para que los cambios sean efectivos"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "Visualización/Tipografías"
 
 msgid "Display/Fonts"
 msgstr "Visualización/Tipografías"
 


@@ -7184,6 +7251,166 @@ msgstr "Borrar plantilla"
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "Tema interno por defecto"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "Visualización/Temas"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Sólo el usuario root puede eliminar temas globales"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Eliminar tema global '%s'"
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Eliminar tema '%s'"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "¿Está seguro de que quiere borrar este tema?"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Error en el fichero %s\n"
+"al eliminar el tema."
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "Falló la eliminación del directorio del tema."
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Tema eliminado con éxito"
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Seleccionar carpeta del tema"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Instalar tema '%s'"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Esta carpeta no parece una carpeta de un tema.\n"
+"¿Instalar de todas maneras?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "¿Quiere instalar el tema para todos los usuarios del sistema?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"Ya hay un tema con el mismo nombre\n"
+"instalado en ésta ubicación"
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr "No pude crear el directorio de destino"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Tema instalado con éxito"
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+"Error en el fichero %s\n"
+"al instalar el tema."
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "Disponibles %d temas (%d de usuario, %d globales, 1 interno)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "The Sylpheed Claws Team"
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "El tema interno tiene %d iconos"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "No hay fichero de información para este tema"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "Error: no se puede obtener el estado del tema"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d ficheros (%d iconos), tamaño %s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Selector"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "Instalar nuevo..."
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "Más temas..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "Información"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "Autor: "
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "URL:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "Estado:"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Apariencia"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "Acciones"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "Usar este"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "Eliminar"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -7252,7 +7479,7 @@ msgstr "Configurar barras de herramientas/Ventana de mensaje"
 msgid "Customize Toolbars/Compose Window"
 msgstr "Configurar barras de herramientas/Ventana de composición"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "Configurar barras de herramientas/Ventana de composición"
 

-#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140

 msgid "No signature found"
 msgstr "No se encontró firma"
 
 msgid "No signature found"
 msgstr "No se encontró firma"
 


@@ -7260,11 +7487,11 @@ msgstr "No se encontr
 msgid "No information available"
 msgstr "No hay información disponible"
 
 msgid "No information available"
 msgstr "No hay información disponible"
 

-#: src/procmsg.c:1126
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 
 msgid "Could not create temporary file for news sending."
 msgstr "No se pudo crear el fichero temporal para enviar noticias."
 

-#: src/procmsg.c:1137
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Error al escribir el fichero temporal para enviar noticias."
 


@@ -7469,92 +7696,92 @@ msgstr ""
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 
 "si ya lo tiene.\n"
 "Si no está seguro, seleccione Aceptar."
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr "Indefinida"
 
 msgid "Undefined"
 msgstr "Indefinida"
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr "Marginal"
 
 msgid "Marginal"
 msgstr "Marginal"
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 msgid "Ultimate"
 msgstr "Máxima"
 
 msgid "Ultimate"
 msgstr "Máxima"
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Firma válida de %s (Confianza: %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Firma válida de %s (Confianza: %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "La firma ha caducado"
 
 msgid "The signature has expired"
 msgstr "La firma ha caducado"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr "La clave usada para firmar esta parte ha caducado"
 
 msgid "The key that was used to sign this part has expired"
 msgstr "La clave usada para firmar esta parte ha caducado"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "No todas las firmas son válidas"
 
 msgid "Not all signatures are valid"
 msgstr "No todas las firmas son válidas"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "Esta firma es inválida"
 
 msgid "This signature is invalid"
 msgstr "Esta firma es inválida"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "No tiene clave para verificar esta firma"
 
 msgid "You have no key to verify this signature"
 msgstr "No tiene clave para verificar esta firma"
 

-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "Ocurrió algún error"
 
 msgid "An error occured"
 msgstr "Ocurrió algún error"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 
 msgid "The signature has not been checked"
 msgstr "La firma no ha sido comprobada"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma realizada el %s usando %s ID de clave %s\n"
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Firma realizada el %s usando %s ID de clave %s\n"
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Firma válida de \"%s\"\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Firma válida de \"%s\"\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Firma caducada de \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Firma caducada de \"%s\"\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "Firma INVÁLIDA de \"%s\"\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               alias \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               alias \"%s\"\n"
 

-#: src/sgpgme.c:194
+#: src/sgpgme.c:203

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Huella de clave primaria: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Huella de clave primaria: %s\n"
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "La firma caduca el %s\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La firma caducó el %s\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "La firma caducó el %s\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7587,10 +7814,6 @@ msgstr "Eliminar certificado"
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "¿Quiere borrar realmente este certificado?"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "(Asunto vacío por Exp.reg.)"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Buscar en los mensajes"


@@ -7615,538 +7838,538 @@ msgstr "Se lleg
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Se terminó la lista, ¿comenzar desde el principio?"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/_Responder"
 
 msgid "/_Reply"
 msgstr "/_Responder"
 

-#: src/summaryview.c:404
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 

-#: src/summaryview.c:407
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 

-#: src/summaryview.c:409
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "/Redirijir y responder a"
 
 msgid "/Follow-up and reply to"
 msgstr "/Redirijir y responder a"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "/Reen_viar"
 
 msgid "/_Forward"
 msgstr "/Reen_viar"
 

-#: src/summaryview.c:412
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/Redirigir"
 
 msgid "/Redirect"
 msgstr "/Redirigir"
 

-#: src/summaryview.c:414
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/_Mover..."
 
 msgid "/M_ove..."
 msgstr "/_Mover..."
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/Cancelar una noticia"
 
 msgid "/Cancel a news message"
 msgstr "/Cancelar una noticia"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "/E_jecutar"
 
 msgid "/E_xecute"
 msgstr "/E_jecutar"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/_Marcar"
 
 msgid "/_Mark"
 msgstr "/_Marcar"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar todos leídos"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Marcar/Marcar todos leídos"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/_Ignorar hilo"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Marcar/_Ignorar hilo"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_No ignorar hilo"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Marcar/_No ignorar hilo"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Bloqueado"
 
 msgid "/_Mark/Lock"
 msgstr "/_Marcar/Bloqueado"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/Desbloqueado"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Marcar/Desbloqueado"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "/Añadir _remitente a la agenda"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Añadir _remitente a la agenda"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 
 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "Crear regla de f_iltrado/_Automáticamente"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "Crear regla de f_iltrado/_Automáticamente"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgstr "Crear regla de f_iltrado/Con el _remitente"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "Crear regla de f_iltrado/Con el _remitente"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Con el _destinatario"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Con el _destinatario"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Con el _asunto"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Con el _asunto"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Create processing rule"
 msgstr "/Crear regla de procesamiento"
 
 msgid "/Create processing rule"
 msgstr "/Crear regla de procesamiento"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:449

 msgid "/Create processing rule/_Automatically"
 msgstr "/Crear regla de procesamiento/_Automáticamente"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Crear regla de procesamiento/_Automáticamente"
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Create processing rule/by _From"
 msgstr "/Crear regla de procesamiento/Con el _remitente"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Crear regla de procesamiento/Con el _remitente"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create processing rule/by _To"
 msgstr "/Crear regla de procesamiento/Con el _destinatario"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Crear regla de procesamiento/Con el _destinatario"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/Create processing rule/by _Subject"
 msgstr "/Crear regla de procesamiento/Con el _asunto"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Crear regla de procesamiento/Con el _asunto"
 

-#: src/summaryview.c:460
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "/_Ver/_Fuente"
 
 msgid "/_View/_Source"
 msgstr "/_Ver/_Fuente"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "/_Ver/Todas las cabeceras"
 
 msgid "/_View/All _header"
 msgstr "/_Ver/Todas las cabeceras"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/_Seleccionar todo"
 
 msgid "/Select _all"
 msgstr "/_Seleccionar todo"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Seleccionar _hilo"
 
 msgid "/Select t_hread"
 msgstr "/Seleccionar _hilo"
 

-#: src/summaryview.c:471
+#: src/summaryview.c:472

 msgid "M"
 msgstr "x"
 
 msgid "M"
 msgstr "x"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "No."
 msgstr "No."
 
 msgid "No."
 msgstr "No."
 

-#: src/summaryview.c:480
+#: src/summaryview.c:481

 msgid "L"
 msgstr "B"
 
 msgid "L"
 msgstr "B"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "todos los mensajes"
 
 msgid "all messages"
 msgstr "todos los mensajes"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "mensajes cuya edad es mayor que "
 
 msgid "messages whose age is greater than #"
 msgstr "mensajes cuya edad es mayor que "
 

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "mensajes cuya edad es menor que "
 
 msgid "messages whose age is less than #"
 msgstr "mensajes cuya edad es menor que "
 

-#: src/summaryview.c:492
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 
 msgid "messages which contain S in the message body"
 msgstr "mensajes que contienen S en el cuerpo del mensaje"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 
 msgid "messages which contain S in the whole message"
 msgstr "mensajes que contienen S en el mensaje completo"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 
 msgid "messages carbon-copied to S"
 msgstr "mensajes con copia-carbón a S"
 

-#: src/summaryview.c:495
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 
 msgid "message is either to: or cc: to S"
 msgstr "mensaje con Para: o Cc: a S"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "mensajes borrados"
 
 msgid "deleted messages"
 msgstr "mensajes borrados"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 
 msgid "messages which contain S in the Sender field"
 msgstr "mensajes que contienen S en el campo remitente"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "cierto si ejecutar \"S\" tiene éxito"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "mensajes provinientes del usuario S"
 
 msgid "messages originating from user S"
 msgstr "mensajes provinientes del usuario S"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 
 msgid "forwarded messages"
 msgstr "mensajes reenviados"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "mensajes que contienen la cabecera S"
 
 msgid "messages which contain header S"
 msgstr "mensajes que contienen la cabecera S"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "mensajes que contienen S en la cabecera Message-Id"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "mensajes que contienen S en la cabecera Message-Id"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "mensajes que contienen S en la cabecera In-Reply-To"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "mensajes bloqueados"
 
 msgid "locked messages"
 msgstr "mensajes bloqueados"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 
 msgid "messages which are in newsgroup S"
 msgstr "mensajes que están en el grupo de noticias S"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "mensajes nuevos"
 
 msgid "new messages"
 msgstr "mensajes nuevos"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "mensajes antiguos"
 
 msgid "old messages"
 msgstr "mensajes antiguos"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "mensajes que han sido respondidos"
 
 msgid "messages which have been replied to"
 msgstr "mensajes que han sido respondidos"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "mensajes leídos"
 
 msgid "read messages"
 msgstr "mensajes leídos"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 
 msgid "messages which contain S in subject"
 msgstr "mensajes que contienen S en el asunto"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "mensajes con puntuación igual a "
 
 msgid "messages whose score is equal to #"
 msgstr "mensajes con puntuación igual a "
 

-#: src/summaryview.c:512
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "mensajes con puntuación mayor que "
 
 msgid "messages whose score is greater than #"
 msgstr "mensajes con puntuación mayor que "
 

-#: src/summaryview.c:513
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "mensajes con puntuación menor que "
 
 msgid "messages whose score is lower than #"
 msgstr "mensajes con puntuación menor que "
 

-#: src/summaryview.c:514
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "mensajes con tamaño igual a "
 
 msgid "messages whose size is equal to #"
 msgstr "mensajes con tamaño igual a "
 

-#: src/summaryview.c:515
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "mensajes con tamaño mayor que "
 
 msgid "messages whose size is greater than #"
 msgstr "mensajes con tamaño mayor que "
 

-#: src/summaryview.c:516
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "mensajes con tamaño menor que "
 
 msgid "messages whose size is smaller than #"
 msgstr "mensajes con tamaño menor que "
 

-#: src/summaryview.c:517
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 
 msgid "messages which have been sent to S"
 msgstr "mensajes que han sido enviados a S"
 

-#: src/summaryview.c:518
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "mensajes marcados"
 
 msgid "marked messages"
 msgstr "mensajes marcados"
 

-#: src/summaryview.c:519
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "mensajes sin leer"
 
 msgid "unread messages"
 msgstr "mensajes sin leer"
 

-#: src/summaryview.c:520
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 
 msgid "messages which contain S in References header"
 msgstr "mensajes que contienen S en la cabecera References"
 

-#: src/summaryview.c:521
+#: src/summaryview.c:522

 msgid "messages returning 0 when passed to command"
 msgstr "mensajes que devuelven 0 al pasarlos a una orden"
 
 msgid "messages returning 0 when passed to command"
 msgstr "mensajes que devuelven 0 al pasarlos a una orden"
 

-#: src/summaryview.c:522
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "mensajes que contienen S en la cabecera X-Label"
 

-#: src/summaryview.c:524
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "operador Y lógico"
 
 msgid "logical AND operator"
 msgstr "operador Y lógico"
 

-#: src/summaryview.c:525
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "operador O lógico"
 
 msgid "logical OR operator"
 msgstr "operador O lógico"
 

-#: src/summaryview.c:526
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 
 msgid "logical NOT operator"
 msgstr "operador NO lógico"
 

-#: src/summaryview.c:527
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 
 msgid "case sensitive search"
 msgstr "sensible a mayús./minús."
 

-#: src/summaryview.c:534
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "Símbolos de búsqueda extendida"
 
 msgid "Extended Search symbols"
 msgstr "Símbolos de búsqueda extendida"
 

-#: src/summaryview.c:584
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "Barra de búsqueda rápida"
 
 msgid "Toggle quick-search bar"
 msgstr "Barra de búsqueda rápida"
 

-#: src/summaryview.c:668
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "Símbolos extendidos"
 
 msgid "Extended Symbols"
 msgstr "Símbolos extendidos"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Procesar marcas"
 
 msgid "Process mark"
 msgstr "Procesar marcas"
 

-#: src/summaryview.c:934
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 

-#: src/summaryview.c:977
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 

-#: src/summaryview.c:1400 src/summaryview.c:1444
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 

-#: src/summaryview.c:1401
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1413 src/summaryview.c:1457
+#: src/summaryview.c:1416 src/summaryview.c:1460

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Error interno: valor inesperado para prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1421
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 

-#: src/summaryview.c:1445
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 

-#: src/summaryview.c:1487 src/summaryview.c:1511
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 

-#: src/summaryview.c:1488
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 

-#: src/summaryview.c:1512
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 

-#: src/summaryview.c:1514
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "Buscar de nuevo"
 
 msgid "Search again"
 msgstr "Buscar de nuevo"
 

-#: src/summaryview.c:1543 src/summaryview.c:1568
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 

-#: src/summaryview.c:1544
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1553 src/summaryview.c:1578
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 

-#: src/summaryview.c:1569
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 

-#: src/summaryview.c:1593 src/summaryview.c:1618
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 

-#: src/summaryview.c:1594
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 

-#: src/summaryview.c:1603 src/summaryview.c:1628
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 

-#: src/summaryview.c:1619
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 

-#: src/summaryview.c:1832
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por el asunto..."
 

-#: src/summaryview.c:1979
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrado(s)"
 

-#: src/summaryview.c:1983
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 

-#: src/summaryview.c:1984 src/summaryview.c:1991
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 

-#: src/summaryview.c:2004
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr " elemento seleccionado"
 
 msgid " item selected"
 msgstr " elemento seleccionado"
 

-#: src/summaryview.c:2006
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr " elementos seleccionados"
 
 msgid " items selected"
 msgstr " elementos seleccionados"
 

-#: src/summaryview.c:2022
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevo(s), %d no leído(s), %d total(es) (%s)"
 

-#: src/summaryview.c:2196
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 
 msgid "Sorting summary..."
 msgstr "Ordenando el resumen..."
 

-#: src/summaryview.c:2266
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 
 msgid "Setting summary from message data..."
 msgstr "Estableciendo el resumen de los mensajes..."
 

-#: src/summaryview.c:2395
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 

-#: src/summaryview.c:3022
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Usted no es el autor del artículo\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Usted no es el autor del artículo\n"
 

-#: src/summaryview.c:3109
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 

-#: src/summaryview.c:3110
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 

-#: src/summaryview.c:3152
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 

-#: src/summaryview.c:3266
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 

-#: src/summaryview.c:3343
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 
 msgid "Destination to copy is same as current folder."
 msgstr "El destino de copia es la carpeta actual."
 

-#: src/summaryview.c:3393
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Seleccionando todos los mensajes..."
 
 msgid "Selecting all messages..."
 msgstr "Seleccionando todos los mensajes..."
 

-#: src/summaryview.c:3451
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 
 msgid "Append or Overwrite"
 msgstr "Añadir o sobreescribir"
 

-#: src/summaryview.c:3452
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 
 msgid "Append or overwrite existing file?"
 msgstr "¿Añadir o sobreescribir el fichero existente?"
 

-#: src/summaryview.c:3453
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "Añadir"
 
 msgid "Append"
 msgstr "Añadir"
 

-#: src/summaryview.c:3744
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 
 msgid "Building threads..."
 msgstr "Construyendo jerarquía..."
 

-#: src/summaryview.c:3842
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "Deshaciendo jerarquía..."
 
 msgid "Unthreading..."
 msgstr "Deshaciendo jerarquía..."
 

-#: src/summaryview.c:3975
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "No hay filtros definidos."
 
 msgid "No filter rules defined."
 msgstr "No hay filtros definidos."
 

-#: src/summaryview.c:3984
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "Filtrando..."
 
 msgid "Filtering..."
 msgstr "Filtrando..."
 

-#: src/summaryview.c:5330
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8155,142 +8378,142 @@ msgstr ""
 "Error en la expresión regular (regexp):\n"
 "%s"
 
 "Error en la expresión regular (regexp):\n"
 "%s"
 

-#: src/textview.c:570
+#: src/textview.c:574

 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no se puede mostrar.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no se puede mostrar.\n"
 

-#: src/textview.c:587
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr "Haga click con el botón derecho en el icono o elemento "
 
 msgid "The following can be performed on this part by "
 msgstr "Haga click con el botón derecho en el icono o elemento "
 

-#: src/textview.c:588
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "de la lista para realizar lo siguiente:\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "de la lista para realizar lo siguiente:\n"
 

-#: src/textview.c:590
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Guardar seleccione 'Guardar como...' (Atajo: 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Guardar seleccione 'Guardar como...' (Atajo: 'y')\n"
 

-#: src/textview.c:591
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Mostrar como texto seleccione 'Ver como texto' "
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Mostrar como texto seleccione 'Ver como texto' "
 

-#: src/textview.c:592
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(Atajo: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(Atajo: 't')\n"
 

-#: src/textview.c:593
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    Abrir con un programa externo seleccione 'Abrir' "
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    Abrir con un programa externo seleccione 'Abrir' "
 

-#: src/textview.c:594
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Atajo: 'l'),\n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Atajo: 'l'),\n"
 

-#: src/textview.c:595
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alternativamente doble-click, click con el botón "
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alternativamente doble-click, click con el botón "
 

-#: src/textview.c:596
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "central del ratón),\n"
 
 msgid "mouse button),\n"
 msgstr "central del ratón),\n"
 

-#: src/textview.c:597
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    o 'Abrir con...' (Atajo: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    o 'Abrir con...' (Atajo: 'o')\n"
 

-#: src/textview.c:1859
+#: src/textview.c:1957

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"

-"the apparent URL (%s).  \n"
+"the apparent URL (%s).\n"

 "Open it anyway?"
 msgstr ""
 "La URL real (%s) es distinta de la\n"
 "Open it anyway?"
 msgstr ""
 "La URL real (%s) es distinta de la\n"

-"URL aparente (%s).  \n"
+"URL aparente (%s).\n"

 "¿Abrirla de todas formas?"
 
 "¿Abrirla de todas formas?"
 

-#: src/toolbar.c:157 src/toolbar.c:1559
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "Recibir correo de todas las cuentas"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Recibir correo de todas las cuentas"
 

-#: src/toolbar.c:158 src/toolbar.c:1565
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "Recibir correo de la cuenta actual"
 
 msgid "Receive Mail on current Account"
 msgstr "Recibir correo de la cuenta actual"
 

-#: src/toolbar.c:159 src/toolbar.c:1571
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Enviar mensaje(s) en cola"
 
 msgid "Send Queued Message(s)"
 msgstr "Enviar mensaje(s) en cola"
 

-#: src/toolbar.c:160 src/toolbar.c:1584
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "Componer correo"
 
 msgid "Compose Email"
 msgstr "Componer correo"
 

-#: src/toolbar.c:161 src/toolbar.c:1588
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "Componer noticia"
 
 msgid "Compose News"
 msgstr "Componer noticia"
 

-#: src/toolbar.c:162 src/toolbar.c:1594
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 
 msgid "Reply to Message"
 msgstr "Responder al mensaje"
 

-#: src/toolbar.c:163 src/toolbar.c:1615
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 
 msgid "Reply to Sender"
 msgstr "Responder al remitente"
 

-#: src/toolbar.c:164 src/toolbar.c:1636
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "Responder a todos"
 
 msgid "Reply to All"
 msgstr "Responder a todos"
 

-#: src/toolbar.c:165 src/toolbar.c:1657
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 
 msgid "Reply to Mailing-list"
 msgstr "Responder a la lista de correo"
 

-#: src/toolbar.c:166 src/toolbar.c:1678
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 
 msgid "Forward Message"
 msgstr "Reenviar mensaje"
 

-#: src/toolbar.c:167 src/toolbar.c:1699
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "Borrar mensaje"
 
 msgid "Delete Message"
 msgstr "Borrar mensaje"
 

-#: src/toolbar.c:169 src/toolbar.c:1711
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "Ir al mensaje siguiente"
 
 msgid "Goto Next Message"
 msgstr "Ir al mensaje siguiente"
 

-#: src/toolbar.c:173 src/toolbar.c:1719
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "Enviar mensaje"
 
 msgid "Send Message"
 msgstr "Enviar mensaje"
 

-#: src/toolbar.c:174 src/toolbar.c:1725
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 
 msgid "Put into queue folder and send later"
 msgstr "Poner en la cola y enviar después"
 

-#: src/toolbar.c:175 src/toolbar.c:1731
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 
 msgid "Save to draft folder"
 msgstr "Guardar como borrador"
 

-#: src/toolbar.c:176 src/toolbar.c:1737
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "Insertar fichero"
 
 msgid "Insert file"
 msgstr "Insertar fichero"
 

-#: src/toolbar.c:177 src/toolbar.c:1743
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "Adjuntar fichero"
 
 msgid "Attach file"
 msgstr "Adjuntar fichero"
 

-#: src/toolbar.c:178 src/toolbar.c:1749
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "Insertar firma"
 
 msgid "Insert signature"
 msgstr "Insertar firma"
 

-#: src/toolbar.c:179 src/toolbar.c:1755
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 
 msgid "Edit with external editor"
 msgstr "Editar con un editor externo"
 

-#: src/toolbar.c:180 src/toolbar.c:1761
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 
 msgid "Wrap all long lines"
 msgstr "Cortar todas las líneas largas"
 

-#: src/toolbar.c:183 src/toolbar.c:1774
+#: src/toolbar.c:183 src/toolbar.c:1550

 msgid "Check spelling"
 msgstr "Verificar ortografía"
 
 msgid "Check spelling"
 msgstr "Verificar ortografía"
 


@@ -8330,55 +8553,59 @@ msgstr "/Responder al remitente con _citaci
 msgid "/_Reply to sender without quote"
 msgstr "/_Responder al remitente sin citación"
 
 msgid "/_Reply to sender without quote"
 msgstr "/_Responder al remitente sin citación"
 

-#: src/toolbar.c:225
-msgid "/_Forward message (inline style)"
-msgstr "/R_eenviar mensaje (incluido en el texto)"
-

 #: src/toolbar.c:226
 #: src/toolbar.c:226

-msgid "/Forward message as _attachment"
-msgstr "/Reenviar mensaje como _adjunto"
+msgid "/For_ward as attachment"
+msgstr "/Reen_viar como adjunto"

 
 

-#: src/toolbar.c:371
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/Redirigi_r"
+
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "Recibir"
 
 msgid "Get"
 msgstr "Recibir"
 

-#: src/toolbar.c:372
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "Recibir todo"
 
 msgid "Get All"
 msgstr "Recibir todo"
 

-#: src/toolbar.c:375
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "Correo"
 
 msgid "Email"
 msgstr "Correo"
 

-#: src/toolbar.c:377 src/toolbar.c:469
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "Responder"
 
 msgid "Reply"
 msgstr "Responder"
 

-#: src/toolbar.c:378 src/toolbar.c:470
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "Todo"
 
 msgid "All"
 msgstr "Todo"
 

-#: src/toolbar.c:379 src/toolbar.c:471
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "Remitente"
 
 msgid "Sender"
 msgstr "Remitente"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "Enviar después"
 
 msgid "Send later"
 msgstr "Enviar después"
 

-#: src/toolbar.c:423
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "Borrador"
 
 msgid "Draft"
 msgstr "Borrador"
 

-#: src/toolbar.c:426
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "Adjuntar"
 
 #: src/toolbar.c:430
 msgid "Attach"
 msgstr "Adjuntar"
 
 #: src/toolbar.c:430

+msgid "Editor"
+msgstr "Editor"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "Recorte de líneas"
 
 msgid "Linewrap"
 msgstr "Recorte de líneas"
 

-#: src/toolbar.c:1576
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "Noticias"
 
 msgid "News"
 msgstr "Noticias"
 

diff --git a/po/fr.po b/po/fr.po
index fbfcd43833c017abd270f422ebeb60841ac00e33..82398fb87a68fc4a4d530c07942d4f3cd8f10646 100644 (file)
--- a/po/fr.po
+++ b/po/fr.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"

-"POT-Creation-Date: 2003-12-18 18:49+0100\n"
-"PO-Revision-Date: 2003-12-18 23:43+0100\n"
+"POT-Creation-Date: 2003-12-19 12:32+0100\n"
+"PO-Revision-Date: 2003-12-19 13:42+0100\n"

 "Last-Translator: Melvin Hadasht <melvin.hadasht@free.fr>\n"
 "Language-Team: Melvin Hadasht <melvin.hadasht@free.fr>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Melvin Hadasht <melvin.hadasht@free.fr>\n"
 "Language-Team: Melvin Hadasht <melvin.hadasht@free.fr>\n"
 "MIME-Version: 1.0\n"


@@ -269,7 +269,7 @@ msgstr "Choisissez un dossier"
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654

-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/mainwindow.c:2223 src/messageview.c:910 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194


@@ -288,7 +288,7 @@ msgstr "OK"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:910

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195


@@ -400,7 +400,7 @@ msgstr "/_Adresse/_Supprimer"
 #: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
 #: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
 #: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
 #: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
 #: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
 #: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265

-#: src/messageview.c:284
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 
 msgid "/_Tools/---"
 msgstr "/_Outils/---"
 


@@ -425,12 +425,12 @@ msgid "/_Tools/Export LDI_F..."
 msgstr "/_Outils/Exporter le carnet d'adresses en LDI_F..."
 
 #: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
 msgstr "/_Outils/Exporter le carnet d'adresses en LDI_F..."
 
 #: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723

-#: src/messageview.c:287
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/_Aide"
 
 #: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
 msgid "/_Help"
 msgstr "/_Aide"
 
 #: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733

-#: src/messageview.c:288
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/Aide/_A propos"
 
 msgid "/_Help/_About"
 msgstr "/Aide/_A propos"
 


@@ -845,7 +845,7 @@ msgstr "En-t
 msgid "Address Count"
 msgstr "Nombre d'adresses"
 
 msgid "Address Count"
 msgstr "Nombre d'adresses"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:493

 #: src/sgpgme.c:279 src/textview.c:1863
 msgid "Warning"
 msgstr "Alerte"
 #: src/sgpgme.c:279 src/textview.c:1863
 msgid "Warning"
 msgstr "Alerte"


@@ -1369,7 +1369,7 @@ msgstr "/_Outils/_Carnet d'adresses"
 msgid "/_Tools/_Template"
 msgstr "/Outils/_Modèles"
 
 msgid "/_Tools/_Template"
 msgstr "/Outils/_Modèles"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/Outils/_Actions"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/Outils/_Actions"
 


@@ -1447,7 +1447,7 @@ msgstr ""
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 
 msgid "Recipient is not specified."
 msgstr "Destinataire non spécifié."
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
+#: src/compose.c:3075 src/messageview.c:493 src/prefs_account.c:768

 #: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
 msgid "Send"
 msgstr "Envoyer"
 #: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
 msgid "Send"
 msgstr "Envoyer"


@@ -4496,7 +4496,7 @@ msgstr ""
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Dossiers"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1838 src/messageview.c:380

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 


@@ -4578,26 +4578,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/_Message/Rediri_ger"
 
 #: src/messageview.c:276
 msgstr "/_Message/Rediri_ger"
 
 #: src/messageview.c:276

+msgid "/_Tools/Create processing rule/"
+msgstr "/_Outils/Créer une règle de _traitement"
+
+#: src/messageview.c:278

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Outils/Créer une règle de traitement/Automatiquement"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Outils/Créer une règle de traitement/Automatiquement"
 

-#: src/messageview.c:278
+#: src/messageview.c:280

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Outils/Créer une règle de traitement/avec « De »"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Outils/Créer une règle de traitement/avec « De »"
 

-#: src/messageview.c:280
+#: src/messageview.c:282

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Outils/Créer une règle de traitement/avec « À »"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Outils/Créer une règle de traitement/avec « À »"
 

-#: src/messageview.c:282
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Outils/Créer une règle de traitement/avec « Sujet »"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Outils/Créer une règle de traitement/avec « Sujet »"
 

-#: src/messageview.c:476
+#: src/messageview.c:478

 msgid "<No Return-Path found>"
 msgstr "< « Return-Path: » introuvable>"
 
 msgid "<No Return-Path found>"
 msgstr "< « Return-Path: » introuvable>"
 

-#: src/messageview.c:484
+#: src/messageview.c:486

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4612,11 +4616,11 @@ msgstr ""
 "Return-Path : %s\n"
 "Il est conseillé de ne pas envoyer l'accusé de réception."
 
 "Return-Path : %s\n"
 "Il est conseillé de ne pas envoyer l'accusé de réception."
 

-#: src/messageview.c:492
+#: src/messageview.c:494

 msgid "+Don't Send"
 msgstr "+Ne pas envoyer"
 
 msgid "+Don't Send"
 msgstr "+Ne pas envoyer"
 

-#: src/messageview.c:502
+#: src/messageview.c:504

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4628,39 +4632,39 @@ msgstr ""
 "destinataire officiel.\n"
 "L'accusé de réception ne sera pas envoyé."
 
 "destinataire officiel.\n"
 "L'accusé de réception ne sera pas envoyé."
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
+#: src/messageview.c:903 src/mimeview.c:969 src/mimeview.c:1076

 #: src/summaryview.c:3448
 msgid "Save as"
 msgstr "Enregistrer sous"
 
 #: src/summaryview.c:3448
 msgid "Save as"
 msgstr "Enregistrer sous"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/messageview.c:908 src/mimeview.c:1018 src/mimeview.c:1082

 #: src/summaryview.c:3453
 msgid "Overwrite"
 msgstr "Écraser"
 
 #: src/summaryview.c:3453
 msgid "Overwrite"
 msgstr "Écraser"
 

-#: src/messageview.c:907
+#: src/messageview.c:909

 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 
 msgid "Overwrite existing file?"
 msgstr "Écraser le fichier existant ?"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
+#: src/messageview.c:916 src/summaryview.c:3461 src/summaryview.c:3465

 #: src/summaryview.c:3482
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible de sauvegarder le fichier « %s »."
 
 #: src/summaryview.c:3482
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible de sauvegarder le fichier « %s »."
 

-#: src/messageview.c:979
+#: src/messageview.c:981

 msgid "This message asks for a return receipt"
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 
 msgid "This message asks for a return receipt"
 msgstr "Ce message demande l'envoi d'un accusé de réception."
 

-#: src/messageview.c:980
+#: src/messageview.c:982

 msgid "Send receipt"
 msgstr "Envoyer"
 
 msgid "Send receipt"
 msgstr "Envoyer"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1035

 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 
 msgid "Return Receipt Notification"
 msgstr "Accusé de réception."
 

-#: src/messageview.c:1034
+#: src/messageview.c:1036

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4670,20 +4674,20 @@ msgstr ""
 "Veuillze choisir le compte que vous souhaitez utiliser pour l'envoi de \n"
 "l'accusé de réception :"
 
 "Veuillze choisir le compte que vous souhaitez utiliser pour l'envoi de \n"
 "l'accusé de réception :"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1040

 msgid "Send Notification"
 msgstr "Envoyer"
 
 msgid "Send Notification"
 msgstr "Envoyer"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1040

 msgid "+Cancel"
 msgstr "Annuler"
 
 msgid "+Cancel"
 msgstr "Annuler"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
+#: src/messageview.c:1094 src/prefs_common.c:2348 src/summaryview.c:3500

 #: src/toolbar.c:171
 msgid "Print"
 msgstr "Impression"
 
 #: src/toolbar.c:171
 msgid "Print"
 msgstr "Impression"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1095 src/summaryview.c:3501

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4692,7 +4696,7 @@ msgstr ""
 "Saisissez la ligne de commande d'impression :\n"
 "('%s' sera remplacé par le nom du fichier)"
 
 "Saisissez la ligne de commande d'impression :\n"
 "('%s' sera remplacé par le nom du fichier)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1101 src/summaryview.c:3507

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4866,11 +4870,15 @@ msgid ""
 "moving the message. You probably want to load the Gtk+ User Interface plugin "
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "moving the message. You probably want to load the Gtk+ User Interface plugin "
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""

-"Ce plugin utilise l'antivirus Clam pour scanner tous les fichiers attachés reçus des comptes locaux, POP ou IMAP.\n"
+"Ce plugin utilise l'antivirus Clam pour scanner tous les fichiers attachés "
+"reçus des comptes locaux, POP ou IMAP.\n"

 "\n"
 "\n"

-"Lorsqu'un fichier attaché se revèle infecté par un virus il peut soit être effacé soit déplacé dans un dossier spécifique.\n"
+"Lorsqu'un fichier attaché se revèle infecté par un virus il peut soit être "
+"effacé soit déplacé dans un dossier spécifique.\n"

 "\n"
 "\n"

-"Ce plugin ne contient que les fonctions de scannage, d'effacement et de déplacement.  Pour le configurer, il faut charger le plugin « Antivirus Clam GTK », sinon il faudrait éditer manuellement le fichier de configuration.\n"
+"Ce plugin ne contient que les fonctions de scannage, d'effacement et de "
+"déplacement.  Pour le configurer, il faut charger le plugin « Antivirus Clam "
+"GTK », sinon il faudrait éditer manuellement le fichier de configuration.\n"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:93
 msgid "Enable virus scanning"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:93
 msgid "Enable virus scanning"


@@ -5050,11 +5058,16 @@ msgid ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""

-"Ce plugin utilise SpamAssassin pour vérifier si les messages récus par un compte local, POP ou IMAP sont des SPAMs. Pour cela il doit accéder à un serveur SpamAssassin (spamd).\n"
+"Ce plugin utilise SpamAssassin pour vérifier si les messages récus par un "
+"compte local, POP ou IMAP sont des SPAMs. Pour cela il doit accéder à un "
+"serveur SpamAssassin (spamd).\n"

 "\n"
 "\n"

-"Lorsqu'un message est identifié comme SPAM, il peut soit être effacé soit déplacé dans un dossier spécifique.\n"
+"Lorsqu'un message est identifié comme SPAM, il peut soit être effacé soit "
+"déplacé dans un dossier spécifique.\n"

 "\n"
 "\n"

-"Ce plugin ne contient que la fonctionnalité de détection et de déplacement.  Pour le configurer, il faut charger le plugin « SpamAssassin GTK », sinon il faudrait éditer le fichier de configuration manuellement.\n"
+"Ce plugin ne contient que la fonctionnalité de détection et de déplacement.  "
+"Pour le configurer, il faut charger le plugin « SpamAssassin GTK », sinon il "
+"faudrait éditer le fichier de configuration manuellement.\n"

 
 #: src/plugins/spamassassin/spamassassin_gtk.c:76
 msgid "Disabled"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:76
 msgid "Disabled"


@@ -7962,7 +7975,8 @@ msgstr "messages contenant S dans l'en-t
 
 #: src/summaryview.c:521
 msgid "messages returning 0 when passed to command"
 
 #: src/summaryview.c:521
 msgid "messages returning 0 when passed to command"

-msgstr "messages qui lorsqu'ils sont passés à la commande « cmd », celle-ci retourn 0"
+msgstr ""
+"messages qui lorsqu'ils sont passés à la commande « cmd », celle-ci retourn 0"

 
 #: src/summaryview.c:522
 msgid "messages which contain S in X-Label header"
 
 #: src/summaryview.c:522
 msgid "messages which contain S in X-Label header"


@@ -8428,4 +8442,3 @@ msgstr "Justifier"
 #: src/toolbar.c:1576
 msgid "News"
 msgstr "Article"
 #: src/toolbar.c:1576
 msgid "News"
 msgstr "Article"

-

diff --git a/po/pl.po b/po/pl.po
index 8608a599a1dcf14592658b425a077ffdac86e1f0..ee6247b17743e5d2da68e2e0ad9fd2484bfc7902 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,3 +1,4 @@
+# translation of sylpheed-claws.po to Polish

 # Polish translation of Sylpheed
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
 # Translators:
 # Polish translation of Sylpheed
 # Copyright (C) 2000,2003 Free Software Foundation, Inc.
 # Translators:


@@ -9,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 msgstr ""
 "Project-Id-Version: sylpheed-claws\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"

-"POT-Creation-Date: 2003-12-18 05:54+0000\n"
-"PO-Revision-Date: 2003-12-19 02:20+0100\n"
+"POT-Creation-Date: 2004-02-05 07:38+0000\n"
+"PO-Revision-Date: 2004-02-05 13:37+0100\n"

 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: GNOME PL Team <translators@gnome.pl>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"


@@ -39,7 +40,7 @@ msgstr ""
 "z tych kont poprzez \"Pobierz wszystkie\""
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
 "z tych kont poprzez \"Pobierz wszystkie\""
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635

-#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -47,7 +48,7 @@ msgstr ""
 msgid "Name"
 msgstr "Nazwa"
 
 msgid "Name"
 msgstr "Nazwa"
 

-#: src/account.c:602 src/prefs_account.c:928
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "Protokó³"
 
 msgid "Protocol"
 msgstr "Protokó³"
 


@@ -93,10 +94,10 @@ msgstr "W g
 msgid " Set as default account "
 msgstr " Ustaw jako podstawowe konto "
 
 msgid " Set as default account "
 msgstr " Ustaw jako podstawowe konto "
 

-#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008

 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196

-#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691

 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Zamknij"
 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Zamknij"


@@ -119,25 +120,27 @@ msgid "Do you really want to delete this account?"
 msgstr "Czy naprawdê chcesz usun±æ to konto?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
 msgstr "Czy naprawdê chcesz usun±æ to konto?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265

-#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
-#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
-#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
-#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "Tak"
 
 msgid "Yes"
 msgstr "Tak"
 

-#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+Nie"
 
 msgid "+No"
 msgstr "+Nie"
 


@@ -154,7 +157,7 @@ msgstr "Nie mo
 msgid "Can't get part of multipart message"
 msgstr "Nie mo¿na pobraæ czê¶ci wiadomo¶ci wieloczê¶ciowej."
 
 msgid "Can't get part of multipart message"
 msgstr "Nie mo¿na pobraæ czê¶ci wiadomo¶ci wieloczê¶ciowej."
 

-#: src/action.c:488
+#: src/action.c:495

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"


@@ -163,7 +166,7 @@ msgstr ""
 "Wybrana akcjia nie mo¿e byæ stosowana w oknie kompozycji\n"
 "poniewa¿ zawiera %%f, %%F, %%as lub %%p."
 
 "Wybrana akcjia nie mo¿e byæ stosowana w oknie kompozycji\n"
 "poniewa¿ zawiera %%f, %%F, %%as lub %%p."
 

-#: src/action.c:776
+#: src/action.c:783

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -173,41 +176,44 @@ msgstr ""
 "nie powiod³o siê.\n"
 "%s"
 
 "nie powiod³o siê.\n"
 "%s"
 

-#: src/action.c:861
+#: src/action.c:868

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
 "%s"
 msgstr ""
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 "%s\n"
 "%s"
 msgstr ""

+"Nie mo¿na utworzyæ procesu potomnego dla nastêpuj±cego polecenia:\n"
+"%s\n"
+"%s"

 
 

-#: src/action.c:1088
+#: src/action.c:1095

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Uruchamianie: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Uruchamianie: %s\n"
 

-#: src/action.c:1092
+#: src/action.c:1099

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Zakoñczono: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Zakoñczono: %s\n"
 

-#: src/action.c:1128
+#: src/action.c:1135

 msgid "Action's input/output"
 msgstr "wej¶cie/wyj¶cie dla Akcji"
 
 msgid "Action's input/output"
 msgstr "wej¶cie/wyj¶cie dla Akcji"
 

-#: src/action.c:1174
+#: src/action.c:1181

 msgid " Send "
 msgstr " Wy¶lij "
 
 msgid " Send "
 msgstr " Wy¶lij "
 

-#: src/action.c:1194
+#: src/action.c:1201

 msgid "Completed %v/%u"
 msgstr "Ukoñczono %v/%u"
 
 msgid "Completed %v/%u"
 msgstr "Ukoñczono %v/%u"
 

-#: src/action.c:1204
+#: src/action.c:1211

 msgid "Abort"
 msgstr "Przerwij"
 
 msgid "Abort"
 msgstr "Przerwij"
 

-#: src/action.c:1353
+#: src/action.c:1360

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -218,11 +224,11 @@ msgstr ""
 "(`%%h' zostanie zast±pione przez argument)\n"
 "  %s"
 
 "(`%%h' zostanie zast±pione przez argument)\n"
 "  %s"
 

-#: src/action.c:1358
+#: src/action.c:1365

 msgid "Action's hidden user argument"
 msgstr "Ukryty argument u¿ytkownika dla Akcji"
 
 msgid "Action's hidden user argument"
 msgstr "Ukryty argument u¿ytkownika dla Akcji"
 

-#: src/action.c:1362
+#: src/action.c:1369

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -233,7 +239,7 @@ msgstr ""
 "(`%%u' zostanie zast±pione przez argument)\n"
 "  %s"
 
 "(`%%u' zostanie zast±pione przez argument)\n"
 "  %s"
 

-#: src/action.c:1367
+#: src/action.c:1374

 msgid "Action's user argument"
 msgstr "Argumentu u¿ytkownika dla Akcji"
 
 msgid "Action's user argument"
 msgstr "Argumentu u¿ytkownika dla Akcji"
 


@@ -241,7 +247,7 @@ msgstr "Argumentu u
 msgid "Add to address book"
 msgstr "Dodaj do ksi±¿ki adresowej"
 
 msgid "Add to address book"
 msgstr "Dodaj do ksi±¿ki adresowej"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "Adres"
 
 msgid "Address"
 msgstr "Adres"
 


@@ -255,7 +261,7 @@ msgid "Select Address Book Folder"
 msgstr "Wybierz katalog z ksi±¿k± adresow±"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
 msgstr "Wybierz katalog z ksi±¿k± adresow±"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190

-#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193


@@ -263,10 +269,10 @@ msgstr "Wybierz katalog z ksi
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313


@@ -275,7 +281,7 @@ msgid "OK"
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -283,18 +289,19 @@ msgstr "OK"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314

-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
-#: src/summaryview.c:3453
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "Anuluj"
 
 msgid "Cancel"
 msgstr "Anuluj"
 

-#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435

 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Plik"
 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Plik"


@@ -315,8 +322,8 @@ msgstr "/_Plik/Nowy _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _serwer"
 
 msgid "/_File/New _Server"
 msgstr "/_Plik/Nowy _serwer"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
-#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454

 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Plik/---"
 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Plik/---"


@@ -333,12 +340,12 @@ msgstr "/_Plik/_Usu
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 

-#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/_Edycja"
 
 msgid "/_Edit"
 msgstr "/_Edycja"
 


@@ -346,17 +353,17 @@ msgstr "/_Edycja"
 msgid "/_Edit/C_ut"
 msgstr "/_Edycja/Wy_tnij"
 
 msgid "/_Edit/C_ut"
 msgstr "/_Edycja/Wy_tnij"
 

-#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459

 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/S_kopiuj"
 
 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/S_kopiuj"
 

-#: src/addressbook.c:381 src/compose.c:520
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 

-#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
-#: src/mainwindow.c:452 src/messageview.c:152
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 
 msgid "/_Edit/---"
 msgstr "/_Edycja/---"
 


@@ -392,10 +399,10 @@ msgstr "/_Adres/_Edycja"
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuñ"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuñ"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
-#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
-#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
-#: src/messageview.c:284
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Narzêdzia/---"
 
 msgid "/_Tools/---"
 msgstr "/_Narzêdzia/---"
 


@@ -419,13 +426,13 @@ msgstr "/_Narz
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Narzêdzia/Wyeksportuj do LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Narzêdzia/Wyeksportuj do LDI_F..."
 

-#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
-#: src/messageview.c:287
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/Pomo_c"
 
 msgid "/_Help"
 msgstr "/Pomo_c"
 

-#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
-#: src/messageview.c:288
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 


@@ -442,19 +449,19 @@ msgid "/New _Folder"
 msgstr "/Nowy _folder"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/Nowy _folder"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
-#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
-#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
-#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
-#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
-#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
-#: src/summaryview.c:465
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303
+#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/_Usuñ"
 
 msgid "/_Delete"
 msgstr "/_Usuñ"
 


@@ -479,7 +486,8 @@ msgid "/_Browse Entry"
 msgstr "/_Przegl±danie wpisu"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/_Przegl±danie wpisu"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "Nieznany"
 
 msgid "Unknown"
 msgstr "Nieznany"
 


@@ -563,8 +571,8 @@ msgstr "przeszukiwanie LDAP zosta
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 

-#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
-#: src/toolbar.c:1767
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "Ksi±¿ka adresowa"
 
 msgid "Address book"
 msgstr "Ksi±¿ka adresowa"
 


@@ -578,7 +586,7 @@ msgstr "Nazwa:"
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781

-#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "Usuñ"
 
 msgid "Delete"
 msgstr "Usuñ"
 


@@ -586,18 +594,18 @@ msgstr "Usu
 msgid "Lookup"
 msgstr "Wyszukaj"
 
 msgid "Lookup"
 msgstr "Wyszukaj"
 

-#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
-#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Do:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Do:"
 

-#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Kopia:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Kopia:"
 

-#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 


@@ -614,16 +622,18 @@ msgid "Really delete the address(es)?"
 msgstr "Czy naprawdê chcesz usun±æ adres(y)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "Czy naprawdê chcesz usun±æ adres(y)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
-#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "Nie"
 
 msgid "No"
 msgstr "Nie"
 


@@ -732,7 +742,7 @@ msgstr "Zaj
 msgid "Search '%s'"
 msgstr "Szukaj '%s'"
 
 msgid "Search '%s'"
 msgstr "Szukaj '%s'"
 

-#: src/addressbook.c:3794 src/prefs_common.c:984
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "Interfejs"
 
 msgid "Interface"
 msgstr "Interfejs"
 


@@ -753,8 +763,8 @@ msgstr "Adres e-mail"
 msgid "Group"
 msgstr "Grupa"
 
 msgid "Group"
 msgstr "Grupa"
 

-#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
-#: src/prefs_account.c:2126
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Katalog"
 
 msgid "Folder"
 msgstr "Katalog"
 


@@ -833,8 +843,8 @@ msgstr "Nazwa nag
 msgid "Address Count"
 msgstr "Liczba adresów"
 
 msgid "Address Count"
 msgstr "Liczba adresów"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
-#: src/sgpgme.c:279 src/textview.c:1863
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "Ostrze¿enie"
 
 msgid "Warning"
 msgstr "Ostrze¿enie"
 


@@ -863,12 +873,12 @@ msgstr "Wsp
 msgid "Personal address"
 msgstr "Osobisty adres"
 
 msgid "Personal address"
 msgstr "Osobisty adres"
 

-#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "Notatka"
 
 msgid "Notice"
 msgstr "Notatka"
 

-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "B³±d"
 
 msgid "Error"
 msgstr "B³±d"
 


@@ -936,7 +946,7 @@ msgstr "wyst
 
 #: src/common/smtp.c:446 src/pop.c:683
 msgid "error occurred on authentication\n"
 
 #: src/common/smtp.c:446 src/pop.c:683
 msgid "error occurred on authentication\n"

-msgstr "wyst±pi³ b³±d podczas autentyfikacji\n"
+msgstr "wyst±pi³ b³±d podczas uwierzytelniania\n"

 
 #: src/common/smtp.c:511 src/pop.c:676
 msgid "can't start TLS session\n"
 
 #: src/common/smtp.c:511 src/pop.c:676
 msgid "can't start TLS session\n"


@@ -1005,7 +1015,7 @@ msgstr ""
 "(Odznacz pole \"%s\")\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(Odznacz pole \"%s\")\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1123
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "Brak okna dialogowego przy b³êdzie odbioru"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Brak okna dialogowego przy b³êdzie odbioru"
 


@@ -1030,6 +1040,10 @@ msgstr ""
 "\n"
 "To mo¿e oznaczaæ, ¿e serwer, który odpowiada nie jest znanym serwerem."
 
 "\n"
 "To mo¿e oznaczaæ, ¿e serwer, który odpowiada nie jest znanym serwerem."
 

+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "(Temat wyczyszczony przez Wyra¿enie Regularne)"
+

 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"
 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"


@@ -1050,355 +1064,355 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:499
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/Dod_aj..."
 
 msgid "/_Add..."
 msgstr "/Dod_aj..."
 

-#: src/compose.c:500
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/_Usuñ"
 
 msgid "/_Remove"
 msgstr "/_Usuñ"
 

-#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
-#: src/folderview.c:333 src/folderview.c:351
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/_W³a¶ciwo¶ci..."
 
 msgid "/_Properties..."
 msgstr "/_W³a¶ciwo¶ci..."
 

-#: src/compose.c:508
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Do³±cz plik"
 
 msgid "/_File/_Attach file"
 msgstr "/_Plik/_Do³±cz plik"
 

-#: src/compose.c:509
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 
 msgid "/_File/_Insert file"
 msgstr "/_Plik/Wstaw pl_ik"
 

-#: src/compose.c:510
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/_Plik/Wstaw p_odpis"
 

-#: src/compose.c:515
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Edycja/_Cofnij"
 

-#: src/compose.c:516
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Edycja/Po_nów"
 

-#: src/compose.c:518
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Edycja/Wy_tnij"
 

-#: src/compose.c:521
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/_Wstaw jako cytat"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Edycja/_Wstaw jako cytat"
 

-#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Edycja/W_ybierz wszystko"
 

-#: src/compose.c:524
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/_Edycja/_Zaawanowane"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Edycja/_Zaawanowane"
 

-#: src/compose.c:525
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o znak w ty³"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o znak w ty³"
 

-#: src/compose.c:530
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o znak w przód"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o znak w przód"
 

-#: src/compose.c:535
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o s³owo w ty³"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o s³owo w ty³"
 

-#: src/compose.c:540
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o s³owo w przód"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ o s³owo w przód"
 

-#: src/compose.c:545
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do pocz±tku linii"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do pocz±tku linii"
 

-#: src/compose.c:550
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do koñca linii"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do koñca linii"
 

-#: src/compose.c:555
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ  do poprzedniej linii"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ  do poprzedniej linii"
 

-#: src/compose.c:560
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do nastêpnej linii"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Edycja/_Zaawansowane/Przesuñ do nastêpnej linii"
 

-#: src/compose.c:565
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj znak za kursorem"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj znak za kursorem"
 

-#: src/compose.c:570
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj znak przed kursorem"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj znak przed kursorem"
 

-#: src/compose.c:575
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj s³owo za kursorem"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj s³owo za kursorem"
 

-#: src/compose.c:580
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj s³owo przed kursorem"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj s³owo przed kursorem"
 

-#: src/compose.c:585
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj liniê"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj liniê"
 

-#: src/compose.c:590
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Edycja/_Zaawansowane/Skasuj ca³± liniê"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Edycja/_Zaawansowane/Skasuj ca³± liniê"
 

-#: src/compose.c:595
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj do koñca linii"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Edycja/_Zaawansowane/Wykasuj do koñca linii"
 

-#: src/compose.c:601
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edycja/_Zaawansowane/Za_wiñ obecny akapit"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Edycja/_Zaawansowane/Za_wiñ obecny akapit"
 

-#: src/compose.c:603
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie _linie"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Edycja/Zawijaj wszystkie _linie"
 

-#: src/compose.c:605
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Edycja/Edytuj za pomoc± z_ewnêtrznego edytora"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Edycja/Edytuj za pomoc± z_ewnêtrznego edytora"
 

-#: src/compose.c:608
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/Pi_sownia"
 
 msgid "/_Spelling"
 msgstr "/Pi_sownia"
 

-#: src/compose.c:609
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Pi_sownia/Sprawd¼ wszystko albo zazna_czone"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/Pi_sownia/Sprawd¼ wszystko albo zazna_czone"
 

-#: src/compose.c:611
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Pi_sownia/P_odkre¶l wszystkie b³êdnie napisane s³owa"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/Pi_sownia/P_odkre¶l wszystkie b³êdnie napisane s³owa"
 

-#: src/compose.c:613
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Pi_sownia/Sprawd¼ w ty³ b³êdnie napisane s³owo"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/Pi_sownia/Sprawd¼ w ty³ b³êdnie napisane s³owo"
 

-#: src/compose.c:615
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Pi_sownia/_Przeskocz w przód do kolejnego b³êdnie napisanego s³owa"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/Pi_sownia/_Przeskocz w przód do kolejnego b³êdnie napisanego s³owa"
 

-#: src/compose.c:617
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/Pi_sownia/---"
 
 msgid "/_Spelling/---"
 msgstr "/Pi_sownia/---"
 

-#: src/compose.c:618
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/Pi_sowania/Konfiguracja pi_sowni"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/Pi_sowania/Konfiguracja pi_sowni"
 

-#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
-#: src/summaryview.c:457
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/_Widok"
 
 msgid "/_View"
 msgstr "/_Widok"
 

-#: src/compose.c:623
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 
 msgid "/_View/_To"
 msgstr "/_Widok/_Do"
 

-#: src/compose.c:624
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 
 msgid "/_View/_Cc"
 msgstr "/_Widok/_Kopia"
 

-#: src/compose.c:625
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 
 msgid "/_View/_Bcc"
 msgstr "/_Widok/_Ukryta kopia"
 

-#: src/compose.c:626
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 
 msgid "/_View/_Reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 

-#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
-#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
-#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/_Widok/---"
 
 msgid "/_View/---"
 msgstr "/_Widok/---"
 

-#: src/compose.c:628
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/_Wiadomo¶æ/_Przeka¿ do"
 
 msgid "/_View/_Followup to"
 msgstr "/_Wiadomo¶æ/_Przeka¿ do"
 

-#: src/compose.c:630
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 
 msgid "/_View/R_uler"
 msgstr "/_Widok/_Linijka"
 

-#: src/compose.c:632
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/_Plik/_Do³±cz plik"
 
 msgid "/_View/_Attachment"
 msgstr "/_Plik/_Do³±cz plik"
 

-#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/_Wiadomo¶æ"
 
 msgid "/_Message"
 msgstr "/_Wiadomo¶æ"
 

-#: src/compose.c:635
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/_Wiadomo¶æ/Wy¶_lij"
 
 msgid "/_Message/_Send"
 msgstr "/_Wiadomo¶æ/Wy¶_lij"
 

-#: src/compose.c:637
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/_Wiadomo¶æ/Wy¶lij _pó¼niej"
 
 msgid "/_Message/Send _later"
 msgstr "/_Wiadomo¶æ/Wy¶lij _pó¼niej"
 

-#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
-#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
-#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
-#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/_Wiadomo¶æ/---"
 
 msgid "/_Message/---"
 msgstr "/_Wiadomo¶æ/---"
 

-#: src/compose.c:640
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/_Wiadomo¶æ/Zapisz w folderze _draft"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/_Wiadomo¶æ/Zapisz w folderze _draft"
 

-#: src/compose.c:642
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/_Wiadomo¶æ/Zapisz i nadal edytuj"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/_Wiadomo¶æ/Zapisz i nadal edytuj"
 

-#: src/compose.c:646
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/_Wiadomo¶æ/_Do"
 
 msgid "/_Message/_To"
 msgstr "/_Wiadomo¶æ/_Do"
 

-#: src/compose.c:647
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/_Wiadomo¶æ/_Kopia do"
 
 msgid "/_Message/_Cc"
 msgstr "/_Wiadomo¶æ/_Kopia do"
 

-#: src/compose.c:648
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/_Wiadomo¶æ/Ukry_ta kopia"
 
 msgid "/_Message/_Bcc"
 msgstr "/_Wiadomo¶æ/Ukry_ta kopia"
 

-#: src/compose.c:649
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 
 msgid "/_Message/_Reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 

-#: src/compose.c:651
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/_Wiadomo¶æ/_Przeka¿ do"
 
 msgid "/_Message/_Followup to"
 msgstr "/_Wiadomo¶æ/_Przeka¿ do"
 

-#: src/compose.c:653
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/_Wiadomo¶æ/_Do³±cz"
 
 msgid "/_Message/_Attach"
 msgstr "/_Wiadomo¶æ/_Do³±cz"
 

-#: src/compose.c:657
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/_Wiadomo¶æ/P_odpisz"
 
 msgid "/_Message/Si_gn"
 msgstr "/_Wiadomo¶æ/P_odpisz"
 

-#: src/compose.c:658
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/_Wiadomo¶æ/_Szyfruj"
 
 msgid "/_Message/_Encrypt"
 msgstr "/_Wiadomo¶æ/_Szyfruj"
 

-#: src/compose.c:659
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/_Wiadomo¶æ/Tryb/_MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/_Wiadomo¶æ/Tryb/_MIME"
 

-#: src/compose.c:660
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/_Wiadomo¶æ/Tryb/_Wewn±trzwiadomo¶ciowy"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/_Wiadomo¶æ/Tryb/_Wewn±trzwiadomo¶ciowy"
 

-#: src/compose.c:663
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/_Wiadomo¶æ/_Priorytet"
 
 msgid "/_Message/_Priority"
 msgstr "/_Wiadomo¶æ/_Priorytet"
 

-#: src/compose.c:664
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "/_Wiadomo¶æ/Priorytet/_Najwy¿szy"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "/_Wiadomo¶æ/Priorytet/_Najwy¿szy"
 

-#: src/compose.c:665
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Wiadomo¶æ/Priorytet/_Wysoki"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Wiadomo¶æ/Priorytet/_Wysoki"
 

-#: src/compose.c:666
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/_Wiadomo¶æ/Priorytet/_Normalny"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/_Wiadomo¶æ/Priorytet/_Normalny"
 

-#: src/compose.c:667
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Wiado_mo¶æ/Priorytet/N_iski"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Wiado_mo¶æ/Priorytet/N_iski"
 

-#: src/compose.c:668
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Wiadomo¶æ/Priorytet/N_ajni¿szy"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Wiadomo¶æ/Priorytet/N_ajni¿szy"
 

-#: src/compose.c:670
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Wiadomo¶æ/_¯±daj potwierdzenia dostarczenia"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Wiadomo¶æ/_¯±daj potwierdzenia dostarczenia"
 

-#: src/compose.c:671
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/_Wiadomo¶æ/Usuñ odniesienia"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/_Wiadomo¶æ/Usuñ odniesienia"
 

-#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "/_Narzêdzia"
 
 msgid "/_Tools"
 msgstr "/_Narzêdzia"
 

-#: src/compose.c:673
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/_Narzêdzia/Poka¿ li_nijkê"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Narzêdzia/Poka¿ li_nijkê"
 

-#: src/compose.c:674 src/messageview.c:262
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/_Narzêdzia/_Ksi±¿ka adresowa"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Narzêdzia/_Ksi±¿ka adresowa"
 

-#: src/compose.c:675
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/_Narzêdzia/W_zory"
 
 msgid "/_Tools/_Template"
 msgstr "/_Narzêdzia/W_zory"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzêdzia/Akcj_e"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Narzêdzia/Akcj_e"
 

-#: src/compose.c:1435
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "Odpowiedz-Do:"
 
 msgid "Reply-To:"
 msgstr "Odpowiedz-Do:"
 

-#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Grupy news:"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Grupy news:"
 

-#: src/compose.c:1441
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "Odpowiedzi-Do(FUT):"
 
 msgid "Followup-To:"
 msgstr "Odpowiedzi-Do(FUT):"
 

-#: src/compose.c:1741
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "B³±d formatu cytowania"
 
 msgid "Quote mark format error."
 msgstr "B³±d formatu cytowania"
 

-#: src/compose.c:1757
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "B³±d formatu wzoru na odpowied¼/przekaz"
 
 msgid "Message reply/forward format error."
 msgstr "B³±d formatu wzoru na odpowied¼/przekaz"
 

-#: src/compose.c:2099
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Plik %s jest pusty."
 

-#: src/compose.c:2103
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "nie mo¿na otworzyæ %s"
 
 #, c-format
 msgid "Can't read %s."
 msgstr "nie mo¿na otworzyæ %s"
 

-#: src/compose.c:2141
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomo¶æ: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Wiadomo¶æ: %s"
 

-#: src/compose.c:2229
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "Zaszyfrowana wiadomo¶æ"
 
 msgid "Encrypted message"
 msgstr "Zaszyfrowana wiadomo¶æ"
 

-#: src/compose.c:2230
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1406,21 +1420,21 @@ msgstr ""
 "Nie mo¿na ponownie edytowaæ zaszyfrowanej wiadomo¶ci. \n"
 "Odrzuciæ zaszyfrowan± czê¶æ?"
 
 "Nie mo¿na ponownie edytowaæ zaszyfrowanej wiadomo¶ci. \n"
 "Odrzuciæ zaszyfrowan± czê¶æ?"
 

-#: src/compose.c:2891
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr " [Edytowany]"
 
 msgid " [Edited]"
 msgstr " [Edytowany]"
 

-#: src/compose.c:2893
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Twórz wiadomo¶æ%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Twórz wiadomo¶æ%s"
 

-#: src/compose.c:2896
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "Twórz wiadomo¶æ%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "Twórz wiadomo¶æ%s"
 

-#: src/compose.c:2920 src/compose.c:3169
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1428,24 +1442,24 @@ msgstr ""
 "Nie podano konta, z którego wysy³asz pocztê.\n"
 "Wybierz konto przed wys³aniem."
 
 "Nie podano konta, z którego wysy³asz pocztê.\n"
 "Wybierz konto przed wys³aniem."
 

-#: src/compose.c:3067
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 
 msgid "Recipient is not specified."
 msgstr "Nie podano odbiorcy."
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
-#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "Wy¶lij"
 
 msgid "Send"
 msgstr "Wy¶lij"
 

-#: src/compose.c:3076
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "Temat wiadomo¶ci jest pusty. Czy wys³ac mimo to?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Temat wiadomo¶ci jest pusty. Czy wys³ac mimo to?"
 

-#: src/compose.c:3097
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "Zakolejkowanie wiadomo¶ci do wys³ania nie powiod³o siê."
 
 msgid "Could not queue message for sending"
 msgstr "Zakolejkowanie wiadomo¶ci do wys³ania nie powiod³o siê."
 

-#: src/compose.c:3102
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1453,16 +1467,16 @@ msgstr ""
 "Wiadomo¶æ zosta³a zakolejkowana, ale nie mog³a zostaæ wys³ana\n"
 "U¿yk \"Wy¶lij zakolejkowane wiadomo¶ci\" z g³ównego okna by ponowiæ."
 
 "Wiadomo¶æ zosta³a zakolejkowana, ale nie mog³a zostaæ wys³ana\n"
 "U¿yk \"Wy¶lij zakolejkowane wiadomo¶ci\" z g³ównego okna by ponowiæ."
 

-#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "B³±d podczas wysy³ania wiadomo¶ci do %s"
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "B³±d podczas wysy³ania wiadomo¶ci do %s"
 

-#: src/compose.c:3199
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "Kolejkowanie"
 
 msgid "Queueing"
 msgstr "Kolejkowanie"
 

-#: src/compose.c:3200
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1470,25 +1484,24 @@ msgstr ""
 "B³±d podczas wysy³ania wiadomo¶ci.\n"
 "Wstawiæ tê wiadomo¶æ do kolejki?"
 
 "B³±d podczas wysy³ania wiadomo¶ci.\n"
 "Wstawiæ tê wiadomo¶æ do kolejki?"
 

-#: src/compose.c:3206
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "Nie mo¿na wstawiæ wiadomo¶ci do kolejki."
 
 msgid "Can't queue the message."
 msgstr "Nie mo¿na wstawiæ wiadomo¶ci do kolejki."
 

-#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "B³±d podczas wysy³ania wiadomo¶ci."
 
 msgid "Error occurred while sending the message."
 msgstr "B³±d podczas wysy³ania wiadomo¶ci."
 

-#: src/compose.c:3222
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "Nie mo¿na zapisaæ wiadomo¶ci do Wyslanych"
 
 msgid "Can't save the message to Sent."
 msgstr "Nie mo¿na zapisaæ wiadomo¶ci do Wyslanych"
 

-#: src/compose.c:3467
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."

-msgstr ""
-"Nie mo¿na znale¼æ klucza zwi±zanego z wybranym kluczem o identyfikatorze`%s'"
+msgstr "Nie mo¿na znale¼æ klucza zwi±zanego z wybranym kluczem o identyfikatorze`%s'"

 
 

-#: src/compose.c:3573
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1499,59 +1512,59 @@ msgstr ""
 "%s do %s.\n"
 "Czy wys³aæ mimo tego?"
 
 "%s do %s.\n"
 "Czy wys³aæ mimo tego?"
 

-#: src/compose.c:3836
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "Brak konta do wysy³ania poczty!"
 
 msgid "No account for sending mails available!"
 msgstr "Brak konta do wysy³ania poczty!"
 

-#: src/compose.c:3846
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "Brak konta do wysy³ania wiadomo¶ci do grup dyskusyjnych!"
 
 msgid "No account for posting news available!"
 msgstr "Brak konta do wysy³ania wiadomo¶ci do grup dyskusyjnych!"
 

-#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "Od:"
 
 msgid "From:"
 msgstr "Od:"
 

-#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "typ MIME"
 
 msgid "MIME type"
 msgstr "typ MIME"
 

-#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "Wielko¶æ"
 
 msgid "Size"
 msgstr "Wielko¶æ"
 

-#: src/compose.c:4828
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "Zapisz wiadomo¶æ do "
 
 msgid "Save Message to "
 msgstr "Zapisz wiadomo¶æ do "
 

-#: src/compose.c:4848 src/prefs_filtering_action.c:420
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr " Wybierz ..."
 
 msgid "Select ..."
 msgstr " Wybierz ..."
 

-#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Nag³ówek"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Nag³ówek"
 

-#: src/compose.c:4986
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "Za³±czniki"
 
 msgid "Attachments"
 msgstr "Za³±czniki"
 

-#: src/compose.c:4988
+#: src/compose.c:4984

 msgid "Others"
 msgstr "Inne"
 
 msgid "Others"
 msgstr "Inne"
 

-#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Temat:"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Temat:"
 

-#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "Brak"
 
 msgid "None"
 msgstr "Brak"
 

-#: src/compose.c:5247
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1595,24 +1608,26 @@ msgstr ""
 "Zakoñczyæ proces si³owo?\n"
 "identyfikator grupy procesów: %d"
 
 "Zakoñczyæ proces si³owo?\n"
 "identyfikator grupy procesów: %d"
 

-#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "Ostrze¿enie o trybie off-line"
 
 msgid "Offline warning"
 msgstr "Ostrze¿enie o trybie off-line"
 

-#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr "Pracujesz w trybie off-line. Czy chcesz to zmieniæ na on-line?"
 
 msgid "You're working offline. Override?"
 msgstr "Pracujesz w trybie off-line. Czy chcesz to zmieniæ na on-line?"
 

-#: src/compose.c:6475 src/compose.c:6496
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Wybierz plik"
 
 msgid "Select file"
 msgstr "Wybierz plik"
 

-#: src/compose.c:6510
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie mo¿na odczytaæ pliku \"%s\"."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Nie mo¿na odczytaæ pliku \"%s\"."
 

-#: src/compose.c:6512
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1621,36 +1636,36 @@ msgstr ""
 "Plik \"%s\" zawiera nieprawid³owe znaki\n"
 "dla bie¿±cego kodowania, wstawianie mo¿e byæ niepoprawne."
 
 "Plik \"%s\" zawiera nieprawid³owe znaki\n"
 "dla bie¿±cego kodowania, wstawianie mo¿e byæ niepoprawne."
 

-#: src/compose.c:6551
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "Porzuæ wiadomo¶æ"
 
 msgid "Discard message"
 msgstr "Porzuæ wiadomo¶æ"
 

-#: src/compose.c:6552
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "Wiadomo¶æ zosta³a zmieniona, porzuciæ?"
 
 msgid "This message has been modified. discard it?"
 msgstr "Wiadomo¶æ zosta³a zmieniona, porzuciæ?"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "Porzuæ"
 
 msgid "Discard"
 msgstr "Porzuæ"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "do Szablonów"
 
 msgid "to Draft"
 msgstr "do Szablonów"
 

-#: src/compose.c:6588
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz do³±czyæ szablon `%s'?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Czy chcesz do³±czyæ szablon `%s'?"
 

-#: src/compose.c:6590
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "Do³±cz szablon"
 
 msgid "Apply template"
 msgstr "Do³±cz szablon"
 

-#: src/compose.c:6591
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Podmieñ"
 
 msgid "Replace"
 msgstr "Podmieñ"
 

-#: src/compose.c:6591 src/toolbar.c:425
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "Wstaw"
 
 msgid "Insert"
 msgstr "Wstaw"
 


@@ -1661,7 +1676,7 @@ msgstr "Proces Sylpheed (%ld) otrzyma
 
 #: src/crash.c:186
 msgid "Sylpheed has crashed"
 
 #: src/crash.c:186
 msgid "Sylpheed has crashed"

-msgstr "Sylpheed wykitowa³"
+msgstr "Sylpheed zakoñczy³ dzia³anie z powodu b³êdu"

 
 #: src/crash.c:202
 #, c-format
 
 #: src/crash.c:202
 #, c-format


@@ -1711,7 +1726,7 @@ msgstr "Edytuj informacje osobiste"
 #: src/editaddress.c:577 src/expldifdlg.c:549 src/exporthtml.c:790
 #: src/ldif.c:826
 msgid "Display Name"
 #: src/editaddress.c:577 src/expldifdlg.c:549 src/exporthtml.c:790
 #: src/ldif.c:826
 msgid "Display Name"

-msgstr "Wy¶wietl imiê"
+msgstr "Wy¶wietlana nazwa"

 
 #: src/editaddress.c:583 src/editaddress.c:587 src/ldif.c:834
 msgid "Last Name"
 
 #: src/editaddress.c:583 src/editaddress.c:587 src/ldif.c:834
 msgid "Last Name"


@@ -1786,7 +1801,7 @@ msgid " Check File "
 msgstr "Sprawd¼ plik "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr "Sprawd¼ plik "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Plik"
 
 msgid "File"
 msgstr "Plik"
 


@@ -1842,12 +1857,12 @@ msgstr "Edytuj folder"
 msgid "Input the new name of folder:"
 msgstr "Podaj nazwê nowego katalogu:"
 
 msgid "Input the new name of folder:"
 msgstr "Podaj nazwê nowego katalogu:"
 

-#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
-#: src/folderview.c:2215
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "Nowy katalog"
 
 msgid "New folder"
 msgstr "Nowy katalog"
 

-#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr "Podaj nazwê nowego katalogu:"
 
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwê nowego katalogu:"
 


@@ -1865,7 +1880,7 @@ msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "


@@ -1900,8 +1915,7 @@ msgstr "Dost
 
 #: src/editldap_basedn.c:291
 msgid "Could not read Search Base(s) from server - please set manually"
 
 #: src/editldap_basedn.c:291
 msgid "Could not read Search Base(s) from server - please set manually"

-msgstr ""
-"Nie mo¿na uzyskaæ Podstaw(y) Wyszukiwania z serwera - proszê ustawiæ rêcznie"
+msgstr "Nie mo¿na uzyskaæ Podstaw(y) Wyszukiwania z serwera - proszê ustawiæ rêcznie"

 
 #: src/editldap_basedn.c:295 src/editldap.c:266
 msgid "Could not connect to server"
 
 #: src/editldap_basedn.c:295 src/editldap.c:266
 msgid "Could not connect to server"


@@ -1953,8 +1967,7 @@ msgstr " Sprawd
 
 #: src/editldap.c:454
 msgid "Press this button to test the connection to the server."
 
 #: src/editldap.c:454
 msgid "Press this button to test the connection to the server."

-msgstr ""
-"Wci¶niêcie tego przycisku spowoduje przetestowanie po³±czenia do serwera."
+msgstr "Wci¶niêcie tego przycisku spowoduje przetestowanie po³±czenia do serwera."

 
 #: src/editldap.c:469
 msgid ""
 
 #: src/editldap.c:469
 msgid ""


@@ -2062,18 +2075,17 @@ msgstr "Limit czasu (sekundy)"
 
 #: src/editldap.c:716
 msgid "The timeout period in seconds."
 
 #: src/editldap.c:716
 msgid "The timeout period in seconds."

-msgstr ""
+msgstr "Czas oczekiwania w sekundach"

 
 #: src/editldap.c:720
 msgid "Maximum Entries"
 msgstr "Maksymalna ilo¶æ wpisów"
 
 #: src/editldap.c:735
 
 #: src/editldap.c:720
 msgid "Maximum Entries"
 msgstr "Maksymalna ilo¶æ wpisów"
 
 #: src/editldap.c:735

-msgid ""
-"The maximum number of entries that should be returned in the search result."
+msgid "The maximum number of entries that should be returned in the search result."

 msgstr "Maksymalna liczba wyników zwrócona podczas wyszukiwania."
 
 msgstr "Maksymalna liczba wyników zwrócona podczas wyszukiwania."
 

-#: src/editldap.c:751 src/prefs_account.c:764
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "Podstawowe"
 
 msgid "Basic"
 msgstr "Podstawowe"
 


@@ -2081,7 +2093,7 @@ msgstr "Podstawowe"
 msgid "Search"
 msgstr "Szukaj"
 
 msgid "Search"
 msgstr "Szukaj"
 

-#: src/editldap.c:753 src/summaryview.c:653
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "Rozszerzone"
 
 msgid "Extended"
 msgstr "Rozszerzone"
 


@@ -2159,11 +2171,11 @@ msgstr "Plik wyj
 msgid "Stylesheet"
 msgstr "Wzór stylów"
 
 msgid "Stylesheet"
 msgstr "Wzór stylów"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "Domy¶lne"
 
 msgid "Default"
 msgstr "Domy¶lne"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "Pe³ny"
 
 msgid "Full"
 msgstr "Pe³ny"
 


@@ -2224,7 +2236,7 @@ msgid "Prev"
 msgstr "Poprzednie"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Poprzednie"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:384 src/toolbar.c:475
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "Nastêpne"
 
 msgid "Next"
 msgstr "Nastêpne"
 


@@ -2238,8 +2250,7 @@ msgstr "Format"
 
 #: src/expldifdlg.c:110
 msgid "Please specify output directory and LDIF filename to create."
 
 #: src/expldifdlg.c:110
 msgid "Please specify output directory and LDIF filename to create."

-msgstr ""
-"Wybierz katalog wyj¶ciowy oraz nazwê pliku LDIF, który zostanie utworzony."
+msgstr "Wybierz katalog wyj¶ciowy oraz nazwê pliku LDIF, który zostanie utworzony."

 
 #: src/expldifdlg.c:113
 msgid "Specify parameters to format distinguished name."
 
 #: src/expldifdlg.c:113
 msgid "Specify parameters to format distinguished name."


@@ -2387,7 +2398,7 @@ msgid "Exporting file:"
 msgstr "Eksportowanie pliku:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Eksportowanie pliku:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr " Wybierz... "
 
 msgid " Select... "
 msgstr " Wybierz... "
 


@@ -2423,32 +2434,32 @@ msgstr "Nazwa jest za d
 msgid "Not specified."
 msgstr "Nie okre¶lono"
 
 msgid "Not specified."
 msgstr "Nie okre¶lono"
 

-#: src/folder.c:1011
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "Przychodz±ca"
 
 msgid "Inbox"
 msgstr "Przychodz±ca"
 

-#: src/folder.c:1015
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "Wys³ane"
 
 msgid "Sent"
 msgstr "Wys³ane"
 

-#: src/folder.c:1019
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "Kolejka"
 
 msgid "Queue"
 msgstr "Kolejka"
 

-#: src/folder.c:1023
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "Wysypisko"
 
 msgid "Trash"
 msgstr "Wysypisko"
 

-#: src/folder.c:1027
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "Szablon"
 
 msgid "Drafts"
 msgstr "Szablon"
 

-#: src/folder.c:1240
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Przetwarzanie (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Przetwarzanie (%s)...\n"
 

-#: src/folder.c:2028
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Przenoszenie %s do %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Przenoszenie %s do %s...\n"


@@ -2457,140 +2468,158 @@ msgstr "Przenoszenie %s do %s...\n"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
 msgid "Select folder"
 msgstr "Wybierz katalog"
 

-#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/Stwórz _nowy katalog..."
 
 msgid "/Create _new folder..."
 msgstr "/Stwórz _nowy katalog..."
 

-#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/_Zmieñ nazwê katalogu..."
 
 msgid "/_Rename folder..."
 msgstr "/_Zmieñ nazwê katalogu..."
 

-#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "/_Przenie¶ katalog..."
 
 msgid "/M_ove folder..."
 msgstr "/_Przenie¶ katalog..."
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/_Usuñ katalog"
 
 msgid "/_Delete folder"
 msgstr "/_Usuñ katalog"
 

-#: src/folderview.c:289 src/folderview.c:310
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "/Usuñ _skrzynkê"
 
 msgid "/Remove _mailbox"
 msgstr "/Usuñ _skrzynkê"
 

-#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
-#: src/folderview.c:352
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgstr "/_Przetwarzanie..."
 
 msgid "/_Processing..."
 msgstr "/_Przetwarzanie..."
 

-#: src/folderview.c:293
-msgid "/_Scoring..."
-msgstr "/_Punktowanie..."
-
-#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/_Zaznacz wszystkie jako przeczytane"
 
 msgid "/Mark all _read"
 msgstr "/_Zaznacz wszystkie jako przeczytane"
 

-#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/_Sprawd¼ za nowymi wiadomo¶æ"
 
 msgid "/_Check for new messages"
 msgstr "/_Sprawd¼ za nowymi wiadomo¶æ"
 

-#: src/folderview.c:308 src/folderview.c:328
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/_Przebuduj drzewo katalogów"
 
 msgid "/R_ebuild folder tree"
 msgstr "/_Przebuduj drzewo katalogów"
 

-#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/_Przeszukaj katalog..."
 
 msgid "/_Search folder..."
 msgstr "/_Przeszukaj katalog..."
 

-#: src/folderview.c:330
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/Pobiera_nie"
+
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Usuñ konto _IMAP4"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Usuñ konto _IMAP4"
 

-#: src/folderview.c:341
+#: src/folderview.c:346

 msgid "/_Subscribe to newsgroup..."
 msgstr "/_Subskrybuj grupê news..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/_Subskrybuj grupê news..."
 

-#: src/folderview.c:343
+#: src/folderview.c:348

 msgid "/_Remove newsgroup"
 msgstr "/Usuñ g_rupê news"
 
 msgid "/_Remove newsgroup"
 msgstr "/Usuñ g_rupê news"
 

-#: src/folderview.c:348
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/Usuñ konto _news"
 
 msgid "/Remove _news account"
 msgstr "/Usuñ konto _news"
 

-#: src/folderview.c:385
+#: src/folderview.c:392

 msgid "New"
 msgstr "Nowy"
 
 msgid "New"
 msgstr "Nowy"
 

-#: src/folderview.c:386
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "Nieprzeczytane"
 
 msgid "Unread"
 msgstr "Nieprzeczytane"
 

-#: src/folderview.c:387
+#: src/folderview.c:394

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:630
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 

-#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 

-#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 

-#: src/folderview.c:835
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr "Przebudowywanie drzewa katalogu..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Przebudowywanie drzewa katalogu..."
 

-#: src/folderview.c:918
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie za nowymi wiadomo¶ciami we wszystkich folderach..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie za nowymi wiadomo¶ciami we wszystkich folderach..."
 

-#: src/folderview.c:1696
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otwieranie katalogu %s ..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otwieranie katalogu %s ..."
 

-#: src/folderview.c:1708
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "Katalog nie móg³ zostaæ otworzony"
 
 msgid "Folder could not be opened."
 msgstr "Katalog nie móg³ zostaæ otworzony"
 

-#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
+#: src/folderview.c:1841
+#, c-format
+msgid "Downloading messages in %s ..."
+msgstr "Pobieranie wiadomo¶ci z %s ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "Tryb offline"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Jeste¶ w trybie offline. Przej¶c do trybu online?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "B³±d podczas pobierania wiadomo¶ci w '%s'."
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "Nowy katalog"
 
 msgid "NewFolder"
 msgstr "Nowy katalog"
 

-#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie mo¿e wyst±piæ w nazwie katalogu."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie mo¿e wyst±piæ w nazwie katalogu."
 

-#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
-#: src/folderview.c:2075 src/folderview.c:2236
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' ju¿ istnieje."
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' ju¿ istnieje."
 

-#: src/folderview.c:1920 src/folderview.c:2243
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie mo¿na utworzyæ katalogu '%s'."
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie mo¿na utworzyæ katalogu '%s'."
 

-#: src/folderview.c:1987 src/folderview.c:2065
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowad¼ now± nazwê dla '%s' :"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowad¼ now± nazwê dla '%s' :"
 

-#: src/folderview.c:1988 src/folderview.c:2067
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "Zmieñ nazwê folderu"
 
 msgid "Rename folder"
 msgstr "Zmieñ nazwê folderu"
 

-#: src/folderview.c:2126
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2599,16 +2628,16 @@ msgstr ""
 "Wszystkie katalogi i wiadomo¶ci w `%s' zostan± usuniête.\n"
 "Naprawdê chcesz skasowaæ ?"
 
 "Wszystkie katalogi i wiadomo¶ci w `%s' zostan± usuniête.\n"
 "Naprawdê chcesz skasowaæ ?"
 

-#: src/folderview.c:2128
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "Usuñ katalog"
 
 msgid "Delete folder"
 msgstr "Usuñ katalog"
 

-#: src/folderview.c:2145
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie mo¿na usun±æ katalogu `%s'."
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Nie mo¿na usun±æ katalogu `%s'."
 

-#: src/folderview.c:2181
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2617,11 +2646,11 @@ msgstr ""
 "Naprawdê usun±æ skrzynkê `%s' ?\n"
 "(Wiadomo¶ci NIE bêd± skasowane z dysku)"
 
 "Naprawdê usun±æ skrzynkê `%s' ?\n"
 "(Wiadomo¶ci NIE bêd± skasowane z dysku)"
 

-#: src/folderview.c:2183
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "Usuñ skrzynkê"
 
 msgid "Remove mailbox"
 msgstr "Usuñ skrzynkê"
 

-#: src/folderview.c:2216
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2631,55 +2660,55 @@ msgstr ""
 "(je¶li chcesz utworzyæ katalog by przechowywaæ w nim\n"
 "inne podkatalogi, do³±cz `/' na koñcu nazwy)"
 
 "(je¶li chcesz utworzyæ katalog by przechowywaæ w nim\n"
 "inne podkatalogi, do³±cz `/' na koñcu nazwy)"
 

-#: src/folderview.c:2273
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naprawdê usun±æ konto IMAP4 `%s' ?"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naprawdê usun±æ konto IMAP4 `%s' ?"
 

-#: src/folderview.c:2274
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "Usuñ konto IMAP4"
 
 msgid "Delete IMAP4 account"
 msgstr "Usuñ konto IMAP4"
 

-#: src/folderview.c:2408
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naprawdê chcesz skasowaæ grupê news `%s' ?"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naprawdê chcesz skasowaæ grupê news `%s' ?"
 

-#: src/folderview.c:2409
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Usuñ grupê news"
 
 msgid "Delete newsgroup"
 msgstr "Usuñ grupê news"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naprawdê usun±æ konto grup news `%s' ?"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naprawdê usun±æ konto grup news `%s' ?"
 

-#: src/folderview.c:2447
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "Usuñ konto news"
 
 msgid "Delete news account"
 msgstr "Usuñ konto news"
 

-#: src/folderview.c:2543
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Przenoszenie %s do %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Przenoszenie %s do %s..."
 

-#: src/folderview.c:2572
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "¬ród³o i przeznaczenie s± takie same."
 
 msgid "Source and destination are the same."
 msgstr "¬ród³o i przeznaczenie s± takie same."
 

-#: src/folderview.c:2575
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "Nie mo¿na przenie¶æ folderu do jego w³asnego podfolderu."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Nie mo¿na przenie¶æ folderu do jego w³asnego podfolderu."
 

-#: src/folderview.c:2578
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Nie mo¿na przenie¶æ folderu miêdzy ró¿nymi skrzynkami."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Nie mo¿na przenie¶æ folderu miêdzy ró¿nymi skrzynkami."
 

-#: src/folderview.c:2581
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "Przeniesienie nie powiod³o siê"
 
 msgid "Move failed!"
 msgstr "Przeniesienie nie powiod³o siê"
 

-#: src/folderview.c:2625 src/summaryview.c:4050
+#: src/folderview.c:2704 src/summaryview.c:4013

 msgid "Processing configuration"
 msgstr "Konfiguracja przetwarzania"
 
 msgid "Processing configuration"
 msgstr "Konfiguracja przetwarzania"
 


@@ -2731,7 +2760,7 @@ msgstr "nieznana"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie uda³o siê pobraæ listy grup news."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie uda³o siê pobraæ listy grup news."
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1178
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Zrobiono."
 
 msgid "Done."
 msgstr "Zrobiono."
 


@@ -2933,7 +2962,7 @@ msgstr ""
 "Sprawdzacz pisowni nie by³ w stanie zmieniæ s³ownika.\n"
 "%s"
 
 "Sprawdzacz pisowni nie by³ w stanie zmieniæ s³ownika.\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr "Abcdef"
 
 msgid "Abcdef"
 msgstr "Abcdef"
 


@@ -2949,7 +2978,7 @@ msgstr "Wybierz wtyczk
 msgid "Plugins"
 msgstr "Wtyczki"
 
 msgid "Plugins"
 msgstr "Wtyczki"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "Opis"
 
 msgid "Description"
 msgstr "Opis"
 


@@ -2992,6 +3021,7 @@ msgid "Signer"
 msgstr "Podpisa³"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "Podpisa³"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Nazwa: "
 
 msgid "Name: "
 msgstr "Nazwa: "
 


@@ -3063,11 +3093,11 @@ msgstr "Poka
 msgid "Changed SSL Certificate"
 msgstr "Zmieniono certyfikat SSL"
 
 msgid "Changed SSL Certificate"
 msgstr "Zmieniono certyfikat SSL"
 

-#: src/headerview.c:181 src/summaryview.c:2398
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(Bez Od)"
 
 msgid "(No From)"
 msgstr "(Bez Od)"
 

-#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 


@@ -3116,105 +3146,105 @@ msgstr "nie mo
 msgid "root folder %s does not exist\n"
 msgstr "katalog g³ówny %s nie istnieje\n"
 
 msgid "root folder %s does not exist\n"
 msgstr "katalog g³ówny %s nie istnieje\n"
 

-#: src/imap.c:1415 src/imap.c:1423
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "wyst±pi³ b³±d przy poleceniu LIST.\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "wyst±pi³ b³±d przy poleceniu LIST.\n"
 

-#: src/imap.c:1651
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie mo¿na utworzyæ skrzynki: b³±d LIST.\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie mo¿na utworzyæ skrzynki: b³±d LIST.\n"
 

-#: src/imap.c:1673
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "nie mo¿na utworzyæ skrzynki\n"
 
 msgid "can't create mailbox\n"
 msgstr "nie mo¿na utworzyæ skrzynki\n"
 

-#: src/imap.c:1742
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie mo¿na zmieniæ nazwy skrzynki z %s do %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie mo¿na zmieniæ nazwy skrzynki z %s do %s\n"
 

-#: src/imap.c:1804
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "nie mo¿na skasowaæ skrzynki\n"
 
 msgid "can't delete mailbox\n"
 msgstr "nie mo¿na skasowaæ skrzynki\n"
 

-#: src/imap.c:1842
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "nie mo¿na pobraæ koperty\n"
 
 msgid "can't get envelope\n"
 msgstr "nie mo¿na pobraæ koperty\n"
 

-#: src/imap.c:1850
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "wyst±pi³ b³±d podczas pobierania koperty.\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "wyst±pi³ b³±d podczas pobierania koperty.\n"
 

-#: src/imap.c:1872
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie mo¿na przegl±daæ koperty: %s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie mo¿na przegl±daæ koperty: %s\n"
 

-#: src/imap.c:1928
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Nie mo¿na nawi±zaæ sesji IMAP4 z: %s\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Nie mo¿na nawi±zaæ sesji IMAP4 z: %s\n"
 

-#: src/imap.c:1950
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie mo¿na po³±czyæ sie z serwerem IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie mo¿na po³±czyæ sie z serwerem IMAP4: %s:%d\n"
 

-#: src/imap.c:1957
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie mo¿na nawi±zaæ sesji IMAP4 z: %s:%d\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie mo¿na nawi±zaæ sesji IMAP4 z: %s:%d\n"
 

-#: src/imap.c:2047
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "nie mo¿na osi±gn±æ przestrzeni nazw\n"
 
 msgid "can't get namespace\n"
 msgstr "nie mo¿na osi±gn±æ przestrzeni nazw\n"
 

-#: src/imap.c:2480
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie mo¿na wybraæ katalogu: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie mo¿na wybraæ katalogu: %s\n"
 

-#: src/imap.c:2620
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgid "IMAP4 authentication failed.\n"

-msgstr "Autentyfikacja IMAP4 nie powiod³a siê\n"
+msgstr "Uwierzytelnianie IMAP4 nie powiod³o siê\n"

 
 

-#: src/imap.c:2637
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "B³±d logowania poprzez IMAP4\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "B³±d logowania poprzez IMAP4\n"
 

-#: src/imap.c:2953
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie mo¿na do³±czyæ %s do %s\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie mo¿na do³±czyæ %s do %s\n"
 

-#: src/imap.c:2960
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(wysy³anie pliku...)"
 
 msgid "(sending file...)"
 msgstr "(wysy³anie pliku...)"
 

-#: src/imap.c:3002
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie mo¿na do³±czyæ wiadomo¶ci do %s\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie mo¿na do³±czyæ wiadomo¶ci do %s\n"
 

-#: src/imap.c:3084
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie mo¿na skopiowaæ %s do %s\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie mo¿na skopiowaæ %s do %s\n"
 

-#: src/imap.c:3134
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wyst±pi³ b³±d w komendzie IMAP: STORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wyst±pi³ b³±d w komendzie IMAP: STORE %s %s\n"
 

-#: src/imap.c:3151
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "wyst±pi³ b³±d w protokole IMAP: EXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wyst±pi³ b³±d w protokole IMAP: EXPUNGE\n"
 

-#: src/imap.c:3164
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "wyst±pi³ b³±d w protokole IMAP przy poleceniu: CLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "wyst±pi³ b³±d w protokole IMAP przy poleceniu: CLOSE\n"
 

-#: src/imap.c:3419
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nie mo¿e zmieniæ UTF-7 na %s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nie mo¿e zmieniæ UTF-7 na %s\n"


@@ -3241,8 +3271,7 @@ msgstr "Wybierz importowany plik"
 
 #: src/importldif.c:189
 msgid "Please specify address book name and file to import."
 
 #: src/importldif.c:189
 msgid "Please specify address book name and file to import."

-msgstr ""
-"Proszê sprecyzowaæ nazwê ksi±¿ki adresowej oraz plik do zaimportowania."
+msgstr "Proszê sprecyzowaæ nazwê ksi±¿ki adresowej oraz plik do zaimportowania."

 
 #: src/importldif.c:192
 msgid "Select and rename LDIF field names to import."
 
 #: src/importldif.c:192
 msgid "Select and rename LDIF field names to import."


@@ -3276,8 +3305,7 @@ msgstr "Wybierz plik LDIF"
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."
 msgid ""
 "Specify the name for the address book that will be created from the LDIF "
 "file data."

-msgstr ""
-"Wybierz nazwê dla ksi±¿ki adresowej, która zostanie utworzona z pliku LDIF."
+msgstr "Wybierz nazwê dla ksi±¿ki adresowej, która zostanie utworzona z pliku LDIF."

 
 #: src/importldif.c:707
 msgid "File Name"
 
 #: src/importldif.c:707
 msgid "File Name"


@@ -3295,7 +3323,7 @@ msgstr "Wybierz plik LDIF do importu"
 msgid "R"
 msgstr "Z"
 
 msgid "R"
 msgstr "Z"
 

-#: src/importldif.c:765 src/summaryview.c:472
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -3317,8 +3345,7 @@ msgstr "Atrybut"
 
 #: src/importldif.c:845
 msgid "The LDIF field can be renamed to the User Attribute name."
 
 #: src/importldif.c:845
 msgid "The LDIF field can be renamed to the User Attribute name."

-msgstr ""
-"Mo¿na zmieniæ nazwy pól LDIF zgodnie z atrybutem podanym przez u¿ytkownika"
+msgstr "Mo¿na zmieniæ nazwy pól LDIF zgodnie z atrybutem podanym przez u¿ytkownika"

 
 #: src/importldif.c:850
 msgid "???"
 
 #: src/importldif.c:850
 msgid "???"


@@ -3395,134 +3422,134 @@ msgstr "Wybierz plik PINE."
 msgid "Import Pine file into Address Book"
 msgstr "Importuj plik PINE do Ksi±¿ki Adresowej"
 
 msgid "Import Pine file into Address Book"
 msgstr "Importuj plik PINE do Ksi±¿ki Adresowej"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomo¶ci"
 
 msgid "Retrieving new messages"
 msgstr "Pobieranie nowych wiadomo¶ci"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "Oczekiwanie"
 
 msgid "Standby"
 msgstr "Oczekiwanie"
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "Anuluj"
 
 msgid "Cancelled"
 msgstr "Anuluj"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "Pobieranie"
 
 msgid "Retrieving"
 msgstr "Pobieranie"
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Wykonano (%d wiadomo¶æ(-ci) (%s) otrzymano)"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Wykonano (%d wiadomo¶æ(-ci) (%s) otrzymano)"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Wykonano (brak nowych wiadomo¶ci)"
 
 msgid "Done (no new messages)"
 msgstr "Wykonano (brak nowych wiadomo¶ci)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "B³±d po³aczenia."
 
 msgid "Connection failed"
 msgstr "B³±d po³aczenia."
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "B³ad autoryzacji"
 
 msgid "Auth failed"
 msgstr "B³ad autoryzacji"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "Zablokowane"
 
 msgid "Locked"
 msgstr "Zablokowane"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autoryzacja dla %s na %s nie powiod³a siê"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autoryzacja dla %s na %s nie powiod³a siê"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Skoñczono (%d nowa(-ych) wiadomo¶æ(-ci))"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Skoñczono (%d nowa(-ych) wiadomo¶æ(-ci))"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Skoñczono (brak nowych wiadomo¶ci)"
 
 msgid "Finished (no new messages)"
 msgstr "Skoñczono (brak nowych wiadomo¶ci)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "Wyst±pi³y b³êdy podczas pobierania poczty."
 
 msgid "Some errors occurred while getting mail."
 msgstr "Wyst±pi³y b³êdy podczas pobierania poczty."
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomo¶ci"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s : Pobieranie nowych wiadomo¶ci"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pod³±czanie do serwera POP3: %s ..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pod³±czanie do serwera POP3: %s ..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem POP3: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem POP3: %s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem POP3: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nie mo¿na po³±czyæ siê z serwerem POP3: %s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "Autentyfikacja..."
 
 msgid "Authenticating..."
 msgstr "Autentyfikacja..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomo¶ci z %s..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Pobieranie wiadomo¶ci z %s..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby wiadomo¶ci (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Pobieranie liczby wiadomo¶ci (STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby wiadomo¶ci (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Pobieranie liczby wiadomo¶ci (LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby wiadomo¶ci (UIDL)"
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Pobieranie liczby wiadomo¶ci (UIDL)"
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie wielko¶ci wiadomo¶ci (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Pobieranie wielko¶ci wiadomo¶ci (LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomo¶ci %d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "Usuwanie wiadomo¶ci %d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "Wychodzenie"
 
 msgid "Quitting"
 msgstr "Wychodzenie"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomo¶ci (%d / %d) (%s / %s bajtów)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomo¶ci (%d / %d) (%s / %s bajtów)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomo¶æ(-ci) (%s) otrzymano)"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Pobieranie (%d wiadomo¶æ(-ci) (%s) otrzymano)"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Po³±czenie nieudane"
 
 msgid "Connection failed."
 msgstr "Po³±czenie nieudane"
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr "B³±d podczas przetwarzania wiadomo¶ci."
 
 msgid "Error occurred while processing mail."
 msgstr "B³±d podczas przetwarzania wiadomo¶ci."
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -3531,27 +3558,27 @@ msgstr ""
 "B³±d podczas przetwarzania wiadomo¶ci:\n"
 "%s"
 
 "B³±d podczas przetwarzania wiadomo¶ci:\n"
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 
 msgid "No disk space left."
 msgstr "Brak miejsca na dysku."
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "Nie mo¿na zapisaæ pliku."
 
 msgid "Can't write file."
 msgstr "Nie mo¿na zapisaæ pliku."
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "B³±d gniazda."
 
 msgid "Socket error."
 msgstr "B³±d gniazda."
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Po³±czenie zosta³o przerwane przez zdalny komputer"
 
 msgid "Connection closed by the remote host."
 msgstr "Po³±czenie zosta³o przerwane przez zdalny komputer"
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "Skrzynka zablokowana."
 
 msgid "Mailbox is locked."
 msgstr "Skrzynka zablokowana."
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3560,11 +3587,11 @@ msgstr ""
 "Skrzynka zablokowana:\n"
 "%s"
 
 "Skrzynka zablokowana:\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "Autentyfikacja nieudana"
 
 msgid "Authentication failed."
 msgstr "Autentyfikacja nieudana"
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3573,7 +3600,7 @@ msgstr ""
 "Autentyfikacja nieudana:\n"
 "%s"
 
 "Autentyfikacja nieudana:\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "Wcielanie anulowane\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Wcielanie anulowane\n"
 


@@ -3590,7 +3617,7 @@ msgstr "Wprowad
 msgid "Nick Name"
 msgstr "Ksywka"
 
 msgid "Nick Name"
 msgstr "Ksywka"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3599,20 +3626,20 @@ msgstr ""
 "Plik `%s' ju¿ istnieje.\n"
 "Nie mo¿na utworzyæ katalogu."
 
 "Plik `%s' ju¿ istnieje.\n"
 "Nie mo¿na utworzyæ katalogu."
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nie obs³uguje g_thread.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nie obs³uguje g_thread.\n"
 

-#: src/main.c:514
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "U¿ycie: %s [OPCJE]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "U¿ycie: %s [OPCJE]...\n"
 

-#: src/main.c:517
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomo¶ci"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomo¶ci"
 

-#: src/main.c:518
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3622,23 +3649,23 @@ msgstr ""
 "                         otwórz okno kompozycji z za³±czonym wybranym\n"
 "                         plikiem"
 
 "                         otwórz okno kompozycji z za³±czonym wybranym\n"
 "                         plikiem"
 

-#: src/main.c:521
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomo¶ci"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomo¶ci"
 

-#: src/main.c:522
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomo¶ci dla wszystkich kont"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomo¶ci dla wszystkich kont"
 

-#: src/main.c:523
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysy³a zakolejkowane wiadomo¶ci"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysy³a zakolejkowane wiadomo¶ci"
 

-#: src/main.c:524
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   pokazuje ca³kowit± ilo¶æ wiadomo¶ci"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   pokazuje ca³kowit± ilo¶æ wiadomo¶ci"
 

-#: src/main.c:525
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3646,751 +3673,758 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         pokazuje ilo¶æ wszystkich wiadomo¶ci"
 
 "  --status-full [folder]...\n"
 "                         pokazuje ilo¶æ wszystkich wiadomo¶ci"
 

-#: src/main.c:527
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online                ustaw siê jako pod³±czonego do sieci"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online                ustaw siê jako pod³±czonego do sieci"
 

-#: src/main.c:528
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               ustaw siê jako od³±czonego od sieci"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline               ustaw siê jako od³±czonego od sieci"
 

-#: src/main.c:529
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debug"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debug"
 

-#: src/main.c:530
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wy¶wietla tê pomoc i wychodzi"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wy¶wietla tê pomoc i wychodzi"
 

-#: src/main.c:531
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version              wy¶wietla informacjê o wersji i wychodzi"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              wy¶wietla informacjê o wersji i wychodzi"
 

-#: src/main.c:532
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           wyj¶ciowy katalog konfiguracyjny"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           wyj¶ciowy katalog konfiguracyjny"
 

-#: src/main.c:569 src/summaryview.c:5198
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Przetwarzanie (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Przetwarzanie (%s)..."
 

-#: src/main.c:572
+#: src/main.c:571

 msgid "top level folder"
 msgstr "katalog górnego poziomu"
 
 msgid "top level folder"
 msgstr "katalog górnego poziomu"
 

-#: src/main.c:637
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Tworzona wiadomo¶æ ju¿ istnieje"
 
 msgid "Composing message exists."
 msgstr "Tworzona wiadomo¶æ ju¿ istnieje"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Draft them"
 msgstr "Ustaw jako szablon"
 
 msgid "Draft them"
 msgstr "Ustaw jako szablon"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Discard them"
 msgstr "Porzuæ je"
 
 msgid "Discard them"
 msgstr "Porzuæ je"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "Nie wychod¼"
 
 msgid "Don't quit"
 msgstr "Nie wychod¼"
 

-#: src/main.c:652
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "Skolejkowane wiadomo¶ci"
 
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomo¶ci"
 

-#: src/main.c:653
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewys³ane wiadomo¶ci zosta³y skolejkowane. Wyj¶æ?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewys³ane wiadomo¶ci zosta³y skolejkowane. Wyj¶æ?"
 

-#: src/main.c:898
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "B³êdy podczas wysy³ania zakolejkowanych wiadomo¶ci."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "B³êdy podczas wysy³ania zakolejkowanych wiadomo¶ci."
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 
 msgid "/_File/_Folder"
 msgstr "/_Plik/_Katalog"
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Stwórz _nowy katalog..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Plik/_Katalog/Stwórz _nowy katalog..."
 

-#: src/mainwindow.c:429
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmieñ nazwê katalo_gu..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Plik/_Katalog/_Zmieñ nazwê katalo_gu..."
 

-#: src/mainwindow.c:430
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuñ kata_log"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Plik/_Katalog/_Usuñ kata_log"
 

-#: src/mainwindow.c:431
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/_Plik/_Katalog/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/_Plik/_Katalog/---"
 

-#: src/mainwindow.c:432
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Plik/_Katalog/Sprawd¼ za now. wiadomo¶_ciami we wsz. katalogach"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Plik/_Katalog/Sprawd¼ za now. wiadomo¶_ciami we wsz. katalogach"
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/_Plik/Dod_aj skrzynkê"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Plik/Dod_aj skrzynkê"
 

-#: src/mainwindow.c:435
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Plik/Dod_aj skrzynkê/MH.."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Plik/Dod_aj skrzynkê/MH.."
 

-#: src/mainwindow.c:436
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Plik/_Importuj plik mbox..."
 

-#: src/mainwindow.c:437
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Plik/_Eksportuj do pliku mbox..."
 

-#: src/mainwindow.c:438
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/_Plik/Opró¿nij wysyp_isko"
 
 msgid "/_File/Empty _trash"
 msgstr "/_Plik/Opró¿nij wysyp_isko"
 

-#: src/mainwindow.c:440 src/messageview.c:144
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Plik/Zapi_sz jako..."
 

-#: src/mainwindow.c:441 src/messageview.c:145
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 
 msgid "/_File/_Print..."
 msgstr "/_Plik/_Drukuj..."
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:453

 msgid "/_File/_Work offline"
 msgstr "/_Plik/Pracuj w trybie off-line"
 
 msgid "/_File/_Work offline"
 msgstr "/_Plik/Pracuj w trybie off-line"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/_Plik/_Wyj¶cie"
 
 msgid "/_File/E_xit"
 msgstr "/_Plik/_Wyj¶cie"
 

-#: src/mainwindow.c:451
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/W_ybierz w±tek"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Edycja/W_ybierz w±tek"
 

-#: src/mainwindow.c:453 src/messageview.c:153
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/_Znajd¼ w obecnej wiadomo¶ci..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Edycja/_Znajd¼ w obecnej wiadomo¶ci..."
 

-#: src/mainwindow.c:455
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "/_Edycja/_Szukaj"
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Edycja/_Szukaj"
 

-#: src/mainwindow.c:457
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Poka¿ lub uk_ryj"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Widok/Poka¿ lub uk_ryj"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Drzwo katalogów"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Drzwo katalogów"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Poka¿ lub uk_ryj/Okno wiado_mo¶ci"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Widok/Poka¿ lub uk_ryj/Okno wiado_mo¶ci"
 

-#: src/mainwindow.c:462
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/I_kony i tekst"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/I_kony i tekst"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Ikony"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Ikony"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Tekst"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Tekst"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Brak"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Widok/Poka¿ lub uk_ryj/_Pasek narzêdzi/_Brak"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Poka¿ lub uk_ryj/Pa_sek statusu"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Widok/Poka¿ lub uk_ryj/Pa_sek statusu"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddziel drzewo katalogów"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Widok/_Oddziel drzewo katalogów"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/_Widok/Oddziel widok wiado_mo¶ci"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/_Widok/Oddziel widok wiado_mo¶ci"
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 
 msgid "/_View/_Sort"
 msgstr "/_Widok/_Sortuj"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Widok/_Sortuj/wg _numeru"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielko¶ci"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Widok/_Sortuj/wg w_ielko¶ci"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/_Widok/_Sortuj/wg _daty"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/_Widok/_Sortuj/wg pola _od"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Widok/_Sortuj/wg odbio_rcy"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Widok/_Sortuj/wg _tematu"
 

-#: src/mainwindow.c:485
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg. _koloru pod¶wietlenia"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Widok/_Sortuj/wg. _koloru pod¶wietlenia"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczenia"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Widok/_Sortuj/wg _zaznaczenia"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/_Widok/_Sortuj/wg _stanu"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Widok/_Sortuj/wg _stanu"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_a³±czników"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Widok/_Sortuj/wg z_a³±czników"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/_Widok/_Sortuj/wg punktacji"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Widok/_Sortuj/wg punktacji"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/_Widok/_Sortuj/wg zablokowanych"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Widok/_Sortuj/wg zablokowanych"
 

-#: src/mainwindow.c:493
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Widok/_Sortuj/Nie s_ortuj"
 

-#: src/mainwindow.c:494 src/mainwindow.c:497
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Widok/_Sortuj/---"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosn±co"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Widok/_Sortuj/Rosn±co"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malej±co"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/_Widok/_Sortuj/Malej±co"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/Segreguj wg tem_atu"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Widok/_Sortuj/Segreguj wg tem_atu"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/_Widok/W±_tkuj widok"
 
 msgid "/_View/Th_read view"
 msgstr "/_Widok/W±_tkuj widok"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/Ro_zwiñ wszystkie w±tki"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Widok/Ro_zwiñ wszystkie w±tki"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiñ wszystkie w±tki"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Widok/_Zwiñ wszystkie w±tki"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/_Widok/_Ukryj przeczytane wiadomo¶ci"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Widok/_Ukryj przeczytane wiadomo¶ci"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/_Widok/Ustaw wy¶wietlane _elementy..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/_Widok/Ustaw wy¶wietlane _elementy..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/_Widok/Prze_jd¼ do"
 
 msgid "/_View/_Go to"
 msgstr "/_Widok/Prze_jd¼ do"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/Prze_jd¼ do/_Poprzednia wiadomo¶æ"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Widok/Prze_jd¼ do/_Poprzednia wiadomo¶æ"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/Prze_jd¼ do/_Nastêpna wiadomo¶æ"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Widok/Prze_jd¼ do/_Nastêpna wiadomo¶æ"
 

-#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/mainwindow.c:523 src/mainwindow.c:528
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/_Widok/Prze_jd¼ do/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Widok/Prze_jd¼ do/---"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/Prze_jd¼ do/Pop_rzednia nieprzeczytana wiadomo¶æ"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Widok/Prze_jd¼ do/Pop_rzednia nieprzeczytana wiadomo¶æ"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna ni_eprzeczytana wiadomo¶æ"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna ni_eprzeczytana wiadomo¶æ"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia no_wa wiadomo¶æ"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia no_wa wiadomo¶æ"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna no_wa wiadomo¶æ"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna no_wa wiadomo¶æ"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia zaznaczona wiado_mo¶æ"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia zaznaczona wiado_mo¶æ"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/Prze_jd¼ do/N_astêpna zaznaczona wiadomo¶æ"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Widok/Prze_jd¼ do/N_astêpna zaznaczona wiadomo¶æ"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia oko_lorowana wiadomo¶æ"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Widok/Prze_jd¼ do/Poprzednia oko_lorowana wiadomo¶æ"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna okolo_rowana wiadomo¶æ"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Widok/Prze_jd¼ do/Nastêpna okolo_rowana wiadomo¶æ"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Prze_jd¼ do/Innego katalo_gu"
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Widok/Prze_jd¼ do/Innego katalo_gu"
 

-#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/_Widok/_Strona kodowa/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/_Widok/_Strona kodowa/---"
 

-#: src/mainwindow.c:537 src/messageview.c:163
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/_Widok/_Strona kodowa"
 
 msgid "/_View/_Code set"
 msgstr "/_Widok/_Strona kodowa"
 

-#: src/mainwindow.c:538 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Widok/_Strona kodowa/_Automatycznie"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Widok/_Strona kodowa/_Automatycznie"
 

-#: src/mainwindow.c:541 src/messageview.c:167
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/_Strona kodowa/7 bitów ascii (US-ASC_II)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Widok/_Strona kodowa/7 bitów ascii (US-ASC_II)"
 

-#: src/mainwindow.c:545 src/messageview.c:171
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Widok/_Strona kodowa/Unicode (_UTF-8)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Widok/_Strona kodowa/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:549 src/messageview.c:175
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-_1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-_1)"
 

-#: src/mainwindow.c:551 src/messageview.c:177
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Widok/_Strona kodowa/Europa Zachodnia (ISO-8859-15)"
 

-#: src/mainwindow.c:555 src/messageview.c:181
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Widok/_Strona kodowa/Europa ¦rodkowa (ISO-8859-_2)"
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Widok/_Strona kodowa/Europa ¦rodkowa (ISO-8859-_2)"
 

-#: src/mainwindow.c:558 src/messageview.c:184
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/_Strona kodowa/Kraje _Ba³tyckie (ISO-8859-13)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Widok/_Strona kodowa/Kraje _Ba³tyckie (ISO-8859-13)"
 

-#: src/mainwindow.c:560 src/messageview.c:186
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/_Strona kodowa/Kraje Ba³tyckie (ISO-8859-_4)"
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Widok/_Strona kodowa/Kraje Ba³tyckie (ISO-8859-_4)"
 

-#: src/mainwindow.c:563 src/messageview.c:189
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Widok/_Strona kodowa/Grecja (ISO-8859-_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Widok/_Strona kodowa/Grecja (ISO-8859-_7)"
 

-#: src/mainwindow.c:566 src/messageview.c:192
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/_Strona kodowa/Turcja (ISO-8859-_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Widok/_Strona kodowa/Turcja (ISO-8859-_9)"
 

-#: src/mainwindow.c:569 src/messageview.c:195
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (ISO-8859-_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (ISO-8859-_5)"
 

-#: src/mainwindow.c:571 src/messageview.c:197
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (KOI8-_R)"
 

-#: src/mainwindow.c:573 src/messageview.c:199
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Widok/_Strona kodowa/Cyrylica (Windows-1251)"
 

-#: src/mainwindow.c:577 src/messageview.c:203
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-_JP)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-_JP)"
 

-#: src/mainwindow.c:580 src/messageview.c:206
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Widok/_Strona kodowa/Japonia (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:583 src/messageview.c:209
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_EUC-JP)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_EUC-JP)"
 

-#: src/mainwindow.c:585 src/messageview.c:211
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_Shift__JIS)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Widok/_Strona kodowa/Japonia (_Shift__JIS)"
 

-#: src/mainwindow.c:589 src/messageview.c:215
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Widok/_Strona kodowa/Uproszczony Chiny (_GB2312)"
 

-#: src/mainwindow.c:591 src/messageview.c:217
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (_Big5)"
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (_Big5)"
 

-#: src/mainwindow.c:593 src/messageview.c:219
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (EUC-_TW)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Widok/_Strona kodowa/Tradycyjny Chiny (EUC-_TW)"
 

-#: src/mainwindow.c:595 src/messageview.c:221
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/_Strona kodowa/Chiny (ISO-2022-_CN)"
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Widok/_Strona kodowa/Chiny (ISO-2022-_CN)"
 

-#: src/mainwindow.c:598 src/messageview.c:224
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Widok/_Strona kodowa/Korea(EUC-_KR)"
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Widok/_Strona kodowa/Korea(EUC-_KR)"
 

-#: src/mainwindow.c:600 src/messageview.c:226
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Widok/_Strona kodowa/Korea (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Widok/_Strona kodowa/Korea (ISO-2022-KR)"
 

-#: src/mainwindow.c:603 src/messageview.c:229
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Widok/_Strona kodowa/Tajska (TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Widok/_Strona kodowa/Tajska (TIS-620)"
 

-#: src/mainwindow.c:605 src/messageview.c:231
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Widok/_Strona kodowa/Tajska (Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Widok/_Strona kodowa/Tajska (Windows-874)"
 

-#: src/mainwindow.c:613 src/summaryview.c:458
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/_Widok/Ot_wórz w nowym oknie"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Widok/Ot_wórz w nowym oknie"
 

-#: src/mainwindow.c:614 src/messageview.c:239
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/_Widok/¬ród³o wiado_mo¶ci"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/¬ród³o wiado_mo¶ci"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/_Widok/Poka¿ wszystkie na_g³ówki"
 
 msgid "/_View/Show all _headers"
 msgstr "/_Widok/Poka¿ wszystkie na_g³ówki"
 

-#: src/mainwindow.c:617
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/_Widok/Od¶wie¿enie _podsumowania"
 
 msgid "/_View/_Update summary"
 msgstr "/_Widok/Od¶wie¿enie _podsumowania"
 

-#: src/mainwindow.c:620
-msgid "/_Message/Get new ma_il"
-msgstr "/Wiado_mo¶æ/Pob_ierz now± pocztê "
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/Wiado_mo¶æ/Od_bieranie"

 
 

-#: src/mainwindow.c:621
-msgid "/_Message/Get from _all accounts"
-msgstr "/Wiado_mo¶æ/Pobierz z _wszystkich kont"
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/Wiado_mo¶æ/Od_bieranie/Pobierz z _aktualnego konta"

 
 

-#: src/mainwindow.c:623
-msgid "/_Message/Cancel receivin_g"
-msgstr "/Wiado_mo¶æ/_Anuluj pobieranie"
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/Wiado_mo¶æ/Od_bieranie/Pobierz z _wszystkich kont"

 
 

-#: src/mainwindow.c:625
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/Wiado_mo¶æ/Od_bieranie/_Anuluj pobieranie"
+
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/_Wiadomo¶æ/Od_bieranie/---"
+
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mo¶æ/Wy¶lij wia_domo¶ci z kolejki"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/Wiado_mo¶æ/Wy¶lij wia_domo¶ci z kolejki"
 

-#: src/mainwindow.c:627
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/Wiado_mo¶æ/Twórz _now± wiadomo¶æ"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/Wiado_mo¶æ/Twórz _now± wiadomo¶æ"
 

-#: src/mainwindow.c:628
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgstr "/Wiado_mo¶æ/Twórz nowego posta do grup"
 
 msgid "/_Message/Compose a news message"
 msgstr "/Wiado_mo¶æ/Twórz nowego posta do grup"
 

-#: src/mainwindow.c:629 src/messageview.c:246
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/Wiado_mo¶æ/_Odpowiedz"
 
 msgid "/_Message/_Reply"
 msgstr "/Wiado_mo¶æ/_Odpowiedz"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz do"
 

-#: src/mainwindow.c:631 src/messageview.c:247
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mo¶æ/_Odpowiedz do/_Wszystkich"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Wiado_mo¶æ/_Odpowiedz do/_Wszystkich"
 

-#: src/mainwindow.c:632 src/messageview.c:249
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mo¶æ/_Odpowiedz do/_Nadawcy"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Wiado_mo¶æ/_Odpowiedz do/_Nadawcy"
 

-#: src/mainwindow.c:633 src/messageview.c:251
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mo¶æ/Odpowiedz do/_Grupy mailingowej"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Wiado_mo¶æ/Odpowiedz do/_Grupy mailingowej"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz na grupê i nadawcy"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Wiadomo¶æ/_Odpowiedz na grupê i nadawcy"
 

-#: src/mainwindow.c:637 src/messageview.c:254
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/Wiado_mo¶æ/Pr_zeka¿"
 
 msgid "/_Message/_Forward"
 msgstr "/Wiado_mo¶æ/Pr_zeka¿"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/Wiado_mo¶æ/Prz_ekieruj"
 
 msgid "/_Message/Redirect"
 msgstr "/Wiado_mo¶æ/Prz_ekieruj"
 

-#: src/mainwindow.c:640 src/messageview.c:259
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mo¶æ/Powtórz _edycjê"
 
 msgid "/_Message/Re-_edit"
 msgstr "/Wiado_mo¶æ/Powtórz _edycjê"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mo¶æ/_Przesuñ..."
 
 msgid "/_Message/M_ove..."
 msgstr "/Wiado_mo¶æ/_Przesuñ..."
 

-#: src/mainwindow.c:643
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mo¶æ/_Kopiuj"
 
 msgid "/_Message/_Copy..."
 msgstr "/Wiado_mo¶æ/_Kopiuj"
 

-#: src/mainwindow.c:644
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/Wiado_mo¶æ/_Usuñ"
 
 msgid "/_Message/_Delete"
 msgstr "/Wiado_mo¶æ/_Usuñ"
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/Wiado_mo¶æ/Usuñ swojego posta z grup"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/Wiado_mo¶æ/Usuñ swojego posta z grup"
 

-#: src/mainwindow.c:647
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/Wiado_mo¶æ/_Zaznacz"
 
 msgid "/_Message/_Mark"
 msgstr "/Wiado_mo¶æ/_Zaznacz"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mo¶æ/_Zaznacz/_Zaznacz"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Wiado_mo¶æ/_Zaznacz/_Zaznacz"
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mo¶æ/_Zaznacz/_Odznacz"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Wiado_mo¶æ/_Zaznacz/_Odznacz"
 

-#: src/mainwindow.c:650
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mo¶æ/_Zaznacz/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/Wiado_mo¶æ/_Zaznacz/---"
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz jako ni_eprzeczytane"
 

-#: src/mainwindow.c:652
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz jako przecz_ytane"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz jako przecz_ytane"
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Wiado_mo¶æ/_Zaznacz/Zaznacz wszystkie jako przecz_ytane"
 

-#: src/mainwindow.c:657
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/_Narzêdzia/_Ksi±¿ka adresowa"
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Narzêdzia/_Ksi±¿ka adresowa"
 

-#: src/mainwindow.c:658 src/messageview.c:263
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzêdzia/Dodaj nadawcê do ksi±¿ki adresowej"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Narzêdzia/Dodaj nadawcê do ksi±¿ki adresowej"
 

-#: src/mainwindow.c:660
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Narzêdzia/Pobierz adresy"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Narzêdzia/Pobierz adresy"
 

-#: src/mainwindow.c:661
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Narzêdzia/Pobierz adresy/z _folderu..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Narzêdzia/Pobierz adresy/z _folderu..."
 

-#: src/mainwindow.c:663
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Narzêdzia/Pobierz adresy/z wiado_mo¶ci..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Narzêdzia/Pobierz adresy/z wiado_mo¶ci..."
 

-#: src/mainwindow.c:666
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/_Narzêdzia/_Filtruj wiadomo¶ci"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/_Narzêdzia/_Filtruj wiadomo¶ci"
 

-#: src/mainwindow.c:667 src/messageview.c:266
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzêdzia/_Od¶wie¿ drzewo katalogów"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Narzêdzia/_Od¶wie¿ drzewo katalogów"
 

-#: src/mainwindow.c:668 src/messageview.c:268
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/_Automatycznie"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/_Automatycznie"
 

-#: src/mainwindow.c:670 src/messageview.c:270
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z '_Od:'"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z '_Od:'"
 

-#: src/mainwindow.c:672 src/messageview.c:272
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z '_Do:'"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z '_Do:'"
 

-#: src/mainwindow.c:674 src/messageview.c:274
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z 'Temat:'"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê filtra/z 'Temat:'"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:689

 msgid "/_Tools/_Create processing rule"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania"
 
 msgid "/_Tools/_Create processing rule"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania"
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:690

 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/_Automatycznie"
 
 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/_Automatycznie"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:692

 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Od'"
 
 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Od'"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:694

 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Do'"
 
 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Do'"
 

-#: src/mainwindow.c:683
+#: src/mainwindow.c:696

 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z Tematu"
 
 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z Tematu"
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Narzêdzia/Usuñ _duplikaty wiadomo¶ci"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Narzêdzia/Usuñ _duplikaty wiadomo¶ci"
 

-#: src/mainwindow.c:691
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/_Narzêdzia/_Wykonaj"
 
 msgid "/_Tools/E_xecute"
 msgstr "/_Narzêdzia/_Wykonaj"
 

-#: src/mainwindow.c:694
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Narzêdzia/Certy_fikaty SSL..."
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Narzêdzia/Certy_fikaty SSL..."
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/_Narzêdzia/Okno _dziennika"
 
 msgid "/_Tools/_Log window"
 msgstr "/_Narzêdzia/Okno _dziennika"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 
 msgid "/_Configuration"
 msgstr "/Konfigura_cja"
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmieñ bie¿±_ce konto"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/Konfigura_cja/Zmieñ bie¿±_ce konto"
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Ustawienia dla bie¿±cego konta..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Konfigura_cja/_Ustawienia dla bie¿±cego konta..."
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/Konfigura_cja/Utwórz _nowe konto..."
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Konfigura_cja/_Edytuj konta..."
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 
 msgid "/_Configuration/---"
 msgstr "/Konfigura_cja/---"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Ustawie_nia..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Konfigura_cja/Ustawie_nia..."
 

-#: src/mainwindow.c:712
-#, fuzzy
+#: src/mainwindow.c:725

 msgid "/_Configuration/Pre-processing..."
 msgid "/_Configuration/Pre-processing..."

-msgstr "/Konfigura_cja/_Filtrowanie..."
+msgstr "/Konfigura_cja/Wstêpne przetwarzanie..."

 
 

-#: src/mainwindow.c:714
-#, fuzzy
+#: src/mainwindow.c:727

 msgid "/_Configuration/Post-processing..."
 msgid "/_Configuration/Post-processing..."

-msgstr "/Konfigura_cja/_Punktowanie..."
+msgstr "/Konfigura_cja/Przetwarzanie koñcowe..."

 
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/Konfigura_cja/_Filtrowanie..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/Konfigura_cja/_Filtrowanie..."
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/Konfigura_cja/_Szablony..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/Konfigura_cja/_Szablony..."
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/_Akcje..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/Konfigura_cja/_Akcje..."
 

-#: src/mainwindow.c:720
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Konfigura_cja/_Inne Ustawienia..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Konfigura_cja/_Inne Ustawienia..."
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/Konfigura_cja/_Wtyczki..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/Konfigura_cja/_Wtyczki..."
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/_Pomoc/_Instrukcja (Lokalna)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/_Pomoc/_Instrukcja (Lokalna)"
 

-#: src/mainwindow.c:725
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Pomoc/_Instrukcja (Strona dokumentacji Sylpheed)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Pomoc/_Instrukcja (Strona dokumentacji Sylpheed)"
 

-#: src/mainwindow.c:727
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/Po_moc/_FAQ (Lokalne)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/Po_moc/_FAQ (Lokalne)"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/Po_moc/_FAQ (Strona dokumentacji Sylpheed)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/Po_moc/_FAQ (Strona dokumentacji Sylpheed)"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/Po_moc/_Claws FAQ(Strona dokumentacji Claws)"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/Po_moc/_Claws FAQ(Strona dokumentacji Claws)"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 
 msgid "/_Help/---"
 msgstr "/_Pomoc/---"
 

-#: src/mainwindow.c:851
+#: src/mainwindow.c:868

 msgid "You are online. Click the icon to go offline"
 msgstr "Jeste¶ w trybie online. Kliknij ikonkê aby przej¶c do trybu offline"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Jeste¶ w trybie online. Kliknij ikonkê aby przej¶c do trybu offline"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:872

 msgid "You are offline. Click the icon to go online"
 msgstr "Jeste¶ w trybie offline. Kliknij ikonkê aby przej¶c do trybu online"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Jeste¶ w trybie offline. Kliknij ikonkê aby przej¶c do trybu online"
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr "Wybierz konto"
 
 msgid "Select account"
 msgstr "Wybierz konto"
 

-#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "Bez tytu³u"
 
 msgid "Untitled"
 msgstr "Bez tytu³u"
 

-#: src/mainwindow.c:1222
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "¿aden"
 
 msgid "none"
 msgstr "¿aden"
 

-#: src/mainwindow.c:1462
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Opró¿nij wysypisko"
 
 msgid "Empty trash"
 msgstr "Opró¿nij wysypisko"
 

-#: src/mainwindow.c:1463
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "Usun±æ wszystkie wiadomo¶ci z wysypiska?"
 
 msgid "Empty all messages in trash?"
 msgstr "Usun±æ wszystkie wiadomo¶ci z wysypiska?"
 

-#: src/mainwindow.c:1481
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Dodaj skrzynkê"
 
 msgid "Add mailbox"
 msgstr "Dodaj skrzynkê"
 

-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4400,16 +4434,16 @@ msgstr ""
 "Je¶li podasz istniej±c± skrzynkê, bêdzie ona\n"
 "automatycznie przeskanowana."
 
 "Je¶li podasz istniej±c± skrzynkê, bêdzie ona\n"
 "automatycznie przeskanowana."
 

-#: src/mainwindow.c:1488
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka `%s' ju¿ istnieje."
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Skrzynka `%s' ju¿ istnieje."
 

-#: src/mainwindow.c:1493 src/setup.c:58
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "Skrzynka"
 
 msgid "Mailbox"
 msgstr "Skrzynka"
 

-#: src/mainwindow.c:1498 src/setup.c:62
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4418,33 +4452,31 @@ msgstr ""
 "B³±d tworzenia skrzynki.\n"
 "Byæ mo¿e pliki ju¿ istniej± lub nie masz praw do zapisu w tym miejscu"
 
 "B³±d tworzenia skrzynki.\n"
 "Byæ mo¿e pliki ju¿ istniej± lub nie masz praw do zapisu w tym miejscu"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed- Widok folderów"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed- Widok folderów"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok wiadomo¶ci"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok wiadomo¶ci"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Koniec"
 
 msgid "Exit"
 msgstr "Koniec"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "Wyj¶æ z programu?"
 
 msgid "Exit this program?"
 msgstr "Wyj¶æ z programu?"
 

-#: src/mainwindow.c:2716 src/summaryview.c:4046
+#: src/mainwindow.c:2850 src/summaryview.c:4009

 msgid "Processing rules to apply before folder rules"
 msgid "Processing rules to apply before folder rules"

-msgstr ""
-"Regu³y przetwarzania, które bêd± zastosowane przed przetwarzaniem w folderach"
+msgstr "Regu³y przetwarzania, które bêd± zastosowane przed przetwarzaniem w folderach"

 
 

-#: src/mainwindow.c:2724
+#: src/mainwindow.c:2858

 msgid "Processing rules to apply after folder rules"
 msgid "Processing rules to apply after folder rules"

-msgstr ""
-"Regu³y przetwarzania, które bêd± zastosowane po przetwarzaniu w folderach"
+msgstr "Regu³y przetwarzania, które bêd± zastosowane po przetwarzaniu w folderach"

 
 

-#: src/mainwindow.c:2732 src/summaryview.c:4055
+#: src/mainwindow.c:2866 src/summaryview.c:4018

 msgid "Filtering configuration"
 msgstr "Konfiguracja filtrowania"
 
 msgid "Filtering configuration"
 msgstr "Konfiguracja filtrowania"
 


@@ -4506,26 +4538,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/Wiado_mo¶æ/Prz_ekieruj"
 
 #: src/messageview.c:276
 msgstr "/Wiado_mo¶æ/Prz_ekieruj"
 
 #: src/messageview.c:276

+msgid "/_Tools/Create processing rule/"
+msgstr "/_Narzêdzia/Twórz regu³ê przetwarzania"
+
+#: src/messageview.c:278

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/_Automatycznie"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/_Automatycznie"
 

-#: src/messageview.c:278
+#: src/messageview.c:280

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Od:'"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Od:'"
 

-#: src/messageview.c:280
+#: src/messageview.c:282

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Do:'"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z pola '_Do:'"
 

-#: src/messageview.c:282
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z Tematu"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Narzêdzia/_Twórz regu³ê przetwarzania/z Tematu"
 

-#: src/messageview.c:476
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<Nie znaleziono ¶cie¿ki powrotnej>"
 
 msgid "<No Return-Path found>"
 msgstr "<Nie znaleziono ¶cie¿ki powrotnej>"
 

-#: src/messageview.c:484
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4540,11 +4576,11 @@ msgstr ""
 "Adres ¶cie¿ki zwrotu: %s\n"
 "Nie jest zalecane by wysy³aæ potwierdzenie odbioru."
 
 "Adres ¶cie¿ki zwrotu: %s\n"
 "Nie jest zalecane by wysy³aæ potwierdzenie odbioru."
 

-#: src/messageview.c:492
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+Nie Wysy³aj"
 
 msgid "+Don't Send"
 msgstr "+Nie Wysy³aj"
 

-#: src/messageview.c:502
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4555,39 +4591,39 @@ msgstr ""
 "Do: i Kopia: ta wiadomo¶æ nie jest adresowana do Ciebie\n"
 "Potwierdzenie odbioru nie zosta³o wys³ane."
 
 "Do: i Kopia: ta wiadomo¶æ nie jest adresowana do Ciebie\n"
 "Potwierdzenie odbioru nie zosta³o wys³ane."
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3448
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "Zapisz jako"
 
 msgid "Save as"
 msgstr "Zapisz jako"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3453
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "Nadpisz"
 
 msgid "Overwrite"
 msgstr "Nadpisz"
 

-#: src/messageview.c:907
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "Nadpisaæ istniej±cy plik?"
 
 msgid "Overwrite existing file?"
 msgstr "Nadpisaæ istniej±cy plik?"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
-#: src/summaryview.c:3482
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie mo¿na zapisaæ do pliku '%s'."
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie mo¿na zapisaæ do pliku '%s'."
 

-#: src/messageview.c:979
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "Autor tej wiadomo¶ci prosi³ o potwierdzenie przeczytania."
 
 msgid "This message asks for a return receipt"
 msgstr "Autor tej wiadomo¶ci prosi³ o potwierdzenie przeczytania."
 

-#: src/messageview.c:980
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "Wy¶lij potwierdzenie"
 
 msgid "Send receipt"
 msgstr "Wy¶lij potwierdzenie"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "Potwierdzenie Odbioru Wiadomo¶ci"
 
 msgid "Return Receipt Notification"
 msgstr "Potwierdzenie Odbioru Wiadomo¶ci"
 

-#: src/messageview.c:1034
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4597,20 +4633,19 @@ msgstr ""
 "Proszê sprecyzowaæ którego konta chcesz u¿yæ do wys³ania potwierdzenia "
 "odbioru:"
 
 "Proszê sprecyzowaæ którego konta chcesz u¿yæ do wys³ania potwierdzenia "
 "odbioru:"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "Wy¶lij potwierdzenie odbioru"
 
 msgid "Send Notification"
 msgstr "Wy¶lij potwierdzenie odbioru"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+Anuluj"
 
 msgid "+Cancel"
 msgstr "+Anuluj"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
-#: src/toolbar.c:171
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "Drukuj"
 
 msgid "Print"
 msgstr "Drukuj"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4619,7 +4654,7 @@ msgstr ""
 "Podaj polecenie wydruku:\n"
 "('%s' zostanie zast±pione nazw± pliku)"
 
 "Podaj polecenie wydruku:\n"
 "('%s' zostanie zast±pione nazw± pliku)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4645,7 +4680,7 @@ msgstr "/Otw
 msgid "/_Display as text"
 msgstr "/_Wy¶wietl jako tekst"
 
 msgid "/_Display as text"
 msgstr "/_Wy¶wietl jako tekst"
 

-#: src/mimeview.c:152 src/summaryview.c:463
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/Zapi_sz jako..."
 
 msgid "/_Save as..."
 msgstr "/Zapi_sz jako..."
 


@@ -4707,43 +4742,43 @@ msgstr "tworzenie po
 msgid "can't set group: %s\n"
 msgstr "nie mo¿na ustawiæ grupy: %s\n"
 
 msgid "can't set group: %s\n"
 msgstr "nie mo¿na ustawiæ grupy: %s\n"
 

-#: src/news.c:817
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artyku³u: %d - %d\n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "niepoprawny zakres artyku³u: %d - %d\n"
 

-#: src/news.c:838
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "b³±d podczas pobierania %s.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "b³±d podczas pobierania %s.\n"
 

-#: src/news.c:855
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "pobieranie xover %d w %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "pobieranie xover %d w %s...\n"
 

-#: src/news.c:858 src/news.c:927
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "nie mo¿na pobraæ xover\n"
 
 msgid "can't get xover\n"
 msgstr "nie mo¿na pobraæ xover\n"
 

-#: src/news.c:863 src/news.c:933
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "b³±d podczas pobierania xover.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "b³±d podczas pobierania xover.\n"
 

-#: src/news.c:869 src/news.c:946
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "niepoprawna linia xover: %s\n"
 

-#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "nie mo¿na pobraæ xhdr\n"
 
 msgid "can't get xhdr\n"
 msgstr "nie mo¿na pobraæ xhdr\n"
 

-#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "b³±d podczas pobierania xhdr.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "b³±d podczas pobierania xhdr.\n"
 

-#: src/news.c:924
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "pobieranie xover %d - %d w %s...\n"


@@ -4777,11 +4812,15 @@ msgstr ""
 "Niew³a¶ciwe has³o! Spróbuj ponownie...\n"
 "\n"
 
 "Niew³a¶ciwe has³o! Spróbuj ponownie...\n"
 "\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: skanowanie wiadomo¶ci..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr "Clam AntyWirus"
 
 msgid "Clam AntiVirus"
 msgstr "Clam AntyWirus"
 

-#: src/plugins/clamav/clamav_plugin.c:229
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -4908,8 +4947,7 @@ msgstr "Przegl
 
 #: src/plugins/dillo_viewer/dillo_viewer.c:200
 msgid "This plugin renders HTML mail using the Dillo web browser."
 
 #: src/plugins/dillo_viewer/dillo_viewer.c:200
 msgid "This plugin renders HTML mail using the Dillo web browser."

-msgstr ""
-"Ta wtyczka przetwarza i pokazuje pocztê HTML u¿ywaj±c przegl±darki Dillo."
+msgstr "Ta wtyczka przetwarza i pokazuje pocztê HTML u¿ywaj±c przegl±darki Dillo."

 
 #: src/plugins/image_viewer/plugin.c:58
 msgid "Image Viewer"
 
 #: src/plugins/image_viewer/plugin.c:58
 msgid "Image Viewer"


@@ -4962,11 +5000,15 @@ msgstr ""
 "Ta wtyczka u¿ywa okna GtkMathView do rysowania za³±czników MathML (Content-"
 "Type: text/mathml)"
 
 "Ta wtyczka u¿ywa okna GtkMathView do rysowania za³±czników MathML (Content-"
 "Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "filtrowanie wiadomo¶ci SpamAssassin..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:314
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "
 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "


@@ -5186,203 +5228,207 @@ msgstr "Ustawienia nowego konta"
 msgid "Account preferences"
 msgstr "Ustawienia konta"
 
 msgid "Account preferences"
 msgstr "Ustawienia konta"
 

-#: src/prefs_account.c:766 src/prefs_common.c:968
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "Odbieranie"
 
 msgid "Receive"
 msgstr "Odbieranie"
 

-#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "Tworzenie"
 
 msgid "Compose"
 msgstr "Tworzenie"
 

-#: src/prefs_account.c:773 src/prefs_common.c:981
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Prywatno¶æ"
 
 msgid "Privacy"
 msgstr "Prywatno¶æ"
 

-#: src/prefs_account.c:777
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:780
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "Zaawansowane"
 
 msgid "Advanced"
 msgstr "Zaawansowane"
 

-#: src/prefs_account.c:859
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "Nazwa konta"
 
 msgid "Name of account"
 msgstr "Nazwa konta"
 

-#: src/prefs_account.c:868
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "Ustaw jako domy¶lne konto"
 
 msgid "Set as default"
 msgstr "Ustaw jako domy¶lne konto"
 

-#: src/prefs_account.c:872
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "Informacje osobiste"
 
 msgid "Personal information"
 msgstr "Informacje osobiste"
 

-#: src/prefs_account.c:881
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "Pe³na nazwa"
 
 msgid "Full name"
 msgstr "Pe³na nazwa"
 

-#: src/prefs_account.c:887
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "Adres e-mail"
 
 msgid "Mail address"
 msgstr "Adres e-mail"
 

-#: src/prefs_account.c:893
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "Organizacja"
 
 msgid "Organization"
 msgstr "Organizacja"
 

-#: src/prefs_account.c:917
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "Informacje o serwerze"
 
 msgid "Server information"
 msgstr "Informacje o serwerze"
 

-#: src/prefs_account.c:938
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (normalny)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (normalny)"
 

-#: src/prefs_account.c:940
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (autoryzacja APOP)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (autoryzacja APOP)"
 

-#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:944
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:946
-msgid "None (local)"
-msgstr "¯aden (lokalnie)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "Lokalny plik mbox"

 
 

-#: src/prefs_account.c:966
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "¯aden (tylko SMTP)"
+
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgid "This server requires authentication"

-msgstr "Ten serwer wymaga autentyfikacji"
+msgstr "Ten serwer wymaga uwierzytelniania"

 
 

-#: src/prefs_account.c:973
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Autentyfikacja przy po³±czeniu"
 
 msgid "Authenticate on connect"
 msgstr "Autentyfikacja przy po³±czeniu"
 

-#: src/prefs_account.c:1018
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "Serwer news"
 
 msgid "News server"
 msgstr "Serwer news"
 

-#: src/prefs_account.c:1024
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "Serwer do odbierania"
 
 msgid "Server for receiving"
 msgstr "Serwer do odbierania"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 
 msgid "Local mailbox"
 msgstr "Lokalny mailbox"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysy³ania)"
 
 msgid "SMTP server (send)"
 msgstr "Serwer SMTP (do wysy³ania)"
 

-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "U¿ywaj polecenia lokalnego ni¿ serwer SMTP"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "U¿ywaj polecenia lokalnego ni¿ serwer SMTP"
 

-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "polecenia do wysy³ania poczty"
 
 msgid "command to send mails"
 msgstr "polecenia do wysy³ania poczty"
 

-#: src/prefs_account.c:1061 src/prefs_account.c:1435
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Identyfikator u¿ytkownika"
 
 msgid "User ID"
 msgstr "Identyfikator u¿ytkownika"
 

-#: src/prefs_account.c:1067 src/prefs_account.c:1444
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "Has³o"
 
 msgid "Password"
 msgstr "Has³o"
 

-#: src/prefs_account.c:1143 src/prefs_account.c:1849
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1151
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "Po odebraniu skasuj wiadomo¶ci z serwera"
 
 msgid "Remove messages on server when received"
 msgstr "Po odebraniu skasuj wiadomo¶ci z serwera"
 

-#: src/prefs_account.c:1162
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "Usuñ po"
 
 msgid "Remove after"
 msgstr "Usuñ po"
 

-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "dni"
 
 msgid "days"
 msgstr "dni"
 

-#: src/prefs_account.c:1188
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 dni: skasuj od razu)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 dni: skasuj od razu)"
 

-#: src/prefs_account.c:1195
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "Pobierz wszystkie wiadomo¶ci z serwera"
 
 msgid "Download all messages on server"
 msgstr "Pobierz wszystkie wiadomo¶ci z serwera"
 

-#: src/prefs_account.c:1201
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Limit ilo¶ci pobieranych danych"
 
 msgid "Receive size limit"
 msgstr "Limit ilo¶ci pobieranych danych"
 

-#: src/prefs_account.c:1208
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "Domy¶lna skrzynka poczty przychodz±cej"
 
 msgid "Default inbox"
 msgstr "Domy¶lna skrzynka poczty przychodz±cej"
 

-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Niefiltrowane wiadomo¶ci bêd± przetrzymywane w tym katalogu)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Niefiltrowane wiadomo¶ci bêd± przetrzymywane w tym katalogu)"
 

-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "Maksymalna liczba artyku³ów do pobrania"
 
 msgid "Maximum number of articles to download"
 msgstr "Maksymalna liczba artyku³ów do pobrania"
 

-#: src/prefs_account.c:1267
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "nieskoñczona je¶li podano 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "nieskoñczona je¶li podano 0"
 

-#: src/prefs_account.c:1283 src/prefs_account.c:1406
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "Metoda autentykacji"
 
 msgid "Authentication method"
 msgstr "Metoda autentykacji"
 

-#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "Automatycznie"
 
 msgid "Automatic"
 msgstr "Automatycznie"
 

-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "Filtruj wiadomo¶ci podczas odbierania"
 
 msgid "Filter messages on receiving"
 msgstr "Filtruj wiadomo¶ci podczas odbierania"
 

-#: src/prefs_account.c:1304
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr "`Odbierz wszystkie' sprawdza za now± poczt± na tym koncie"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Odbierz wszystkie' sprawdza za now± poczt± na tym koncie"
 

-#: src/prefs_account.c:1363
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Dodaj datê"
 
 msgid "Add Date"
 msgstr "Dodaj datê"
 

-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1361

 msgid "Generate Message-Id"
 msgstr "Generuj identyfikator wiadomo¶ci (Message-ID)"
 
 msgid "Generate Message-Id"
 msgstr "Generuj identyfikator wiadomo¶ci (Message-ID)"
 

-#: src/prefs_account.c:1371
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Dodaj nag³ówek zdefiniowany przez u¿ytkownika"
 
 msgid "Add user-defined header"
 msgstr "Dodaj nag³ówek zdefiniowany przez u¿ytkownika"
 

-#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " Edycja... "
 
 msgid " Edit... "
 msgstr " Edycja... "
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "Autentykacja"
 
 msgid "Authentication"
 msgstr "Autentykacja"
 

-#: src/prefs_account.c:1391
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentykacja SMTP (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autentykacja SMTP (SMTP AUTH)"
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."


@@ -5390,184 +5436,184 @@ msgstr ""
 "Je¶li pozostawisz te pola puste, wtedy ten sam login i\n"
 "has³o u¿ytkownika jak przy odbieraniu zostanie wykorzystany"
 
 "Je¶li pozostawisz te pola puste, wtedy ten sam login i\n"
 "has³o u¿ytkownika jak przy odbieraniu zostanie wykorzystany"
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "Przed wys³aniem autentykacja POP3"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Przed wys³aniem autentykacja POP3"
 

-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgid "POP authentication timeout: "

-msgstr "Koniec czasu dla autentyfikacji POP: "
+msgstr "Up³yn±³ limit czasu dla uwierzytelniania POP: "

 
 

-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "minut"
 
 msgid "minutes"
 msgstr "minut"
 

-#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Podpis"
 
 msgid "Signature"
 msgstr "Podpis"
 

-#: src/prefs_account.c:1554
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "Automatycznie wstaw podpis"
 
 msgid "Insert signature automatically"
 msgstr "Automatycznie wstaw podpis"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 
 msgid "Signature separator"
 msgstr "Oddzielenie podpisu"
 

-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "Wyj¶cie komendy"
 
 msgid "Command output"
 msgstr "Wyj¶cie komendy"
 

-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "Automatycznie wstaw nastêpuj±ce adresy"
 
 msgid "Automatically set the following addresses"
 msgstr "Automatycznie wstaw nastêpuj±ce adresy"
 

-#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116

 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kopia"
 
 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kopia"
 

-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "Ukryta kopia"
 
 msgid "Bcc"
 msgstr "Ukryta kopia"
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "Adres zwrotny"
 
 msgid "Reply-To"
 msgstr "Adres zwrotny"
 

-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "Standardowo szyfruj wiadomo¶æ"
 
 msgid "Encrypt message by default"
 msgstr "Standardowo szyfruj wiadomo¶æ"
 

-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "Standardowo podpisz wiadomo¶æ"
 
 msgid "Sign message by default"
 msgstr "Standardowo podpisz wiadomo¶æ"
 

-#: src/prefs_account.c:1693
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "Domy¶lny tryb"
 
 msgid "Default mode"
 msgstr "Domy¶lny tryb"
 

-#: src/prefs_account.c:1701
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "U¿ywaj PGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "U¿ywaj PGP/MIME"
 

-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "U¿ywaj trybu wewn±trzwiadomo¶ciowego"
 
 msgid "Use Inline"
 msgstr "U¿ywaj trybu wewn±trzwiadomo¶ciowego"
 

-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr "Klucz"
 
 msgid "Sign key"
 msgstr "Klucz"
 

-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "U¿yj standardowego klucza GnuPG"
 
 msgid "Use default GnuPG key"
 msgstr "U¿yj standardowego klucza GnuPG"
 

-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "Wybierz klucz poprzez twój adres e-mail"
 
 msgid "Select key by your email address"
 msgstr "Wybierz klucz poprzez twój adres e-mail"
 

-#: src/prefs_account.c:1746
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "Okre¶l klucz rêcznie"
 
 msgid "Specify key manually"
 msgstr "Okre¶l klucz rêcznie"
 

-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr "U¿ytkownik lub klucz ID:"
 
 msgid "User or key ID:"
 msgstr "U¿ytkownik lub klucz ID:"
 

-#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "Nie u¿ywaj SSL"
 
 msgid "Don't use SSL"
 msgstr "Nie u¿ywaj SSL"
 

-#: src/prefs_account.c:1860
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "U¿ywaj SSL dla po³±czeñ POP3"
 
 msgid "Use SSL for POP3 connection"
 msgstr "U¿ywaj SSL dla po³±czeñ POP3"
 

-#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "U¿yj komendy STARTTLS by nawi±zaæ sesjê SSL"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "U¿yj komendy STARTTLS by nawi±zaæ sesjê SSL"
 

-#: src/prefs_account.c:1877
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "U¿ywaj SSL dla po³±czeñ IMAP4"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "U¿ywaj SSL dla po³±czeñ IMAP4"
 

-#: src/prefs_account.c:1883
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "U¿ywaj SSL dla po³±czeñ NNTP"
 
 msgid "Use SSL for NNTP connection"
 msgstr "U¿ywaj SSL dla po³±czeñ NNTP"
 

-#: src/prefs_account.c:1900
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "Wysy³aj (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Wysy³aj (SMTP)"
 

-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nie u¿ywaj SSL (ale w razie potrzeby u¿ywaj STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nie u¿ywaj SSL (ale w razie potrzeby u¿ywaj STARTTLS)"
 

-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "U¿ywaj SSL dla po³±czeñ SMTP"
 
 msgid "Use SSL for SMTP connection"
 msgstr "U¿ywaj SSL dla po³±czeñ SMTP"
 

-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "U¿ycie nie-blokuj±cego SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "U¿ycie nie-blokuj±cego SSL"
 

-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Wy³±cz tê opcjê je¿eli masz problemy przy nawi±zywaniu po³±czeñ SSL)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Wy³±cz tê opcjê je¿eli masz problemy przy nawi±zywaniu po³±czeñ SSL)"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "Okre¶l port SMTP"
 
 msgid "Specify SMTP port"
 msgstr "Okre¶l port SMTP"
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "Okre¶l port POP3"
 
 msgid "Specify POP3 port"
 msgstr "Okre¶l port POP3"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "Okre¶l port IMAP4"
 
 msgid "Specify IMAP4 port"
 msgstr "Okre¶l port IMAP4"
 

-#: src/prefs_account.c:2076
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "Okre¶l port NNTP"
 
 msgid "Specify NNTP port"
 msgstr "Okre¶l port NNTP"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Okre¶l nazwê domeny"
 
 msgid "Specify domain name"
 msgstr "Okre¶l nazwê domeny"
 

-#: src/prefs_account.c:2091
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "U¿yj komendy do komunikacji z serwerem"
 
 msgid "Use command to communicate with server"
 msgstr "U¿yj komendy do komunikacji z serwerem"
 

-#: src/prefs_account.c:2099
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zaznacz cross-posty jako przeczytane i zakoloruj:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Zaznacz cross-posty jako przeczytane i zakoloruj:"
 

-#: src/prefs_account.c:2113
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 
 msgid "IMAP server directory"
 msgstr "Katalog serwera IMAP4."
 

-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "Zapisz wys³ane wiadomo¶ci w"
 
 msgid "Put sent messages in"
 msgstr "Zapisz wys³ane wiadomo¶ci w"
 

-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "Zapisz wzorzec w"
 
 msgid "Put draft messages in"
 msgstr "Zapisz wzorzec w"
 

-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "Zapisz skasowane wiadomo¶ci w"
 
 msgid "Put deleted messages in"
 msgstr "Zapisz skasowane wiadomo¶ci w"
 

-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "Nie okre¶lono nazwy konta."
 
 msgid "Account name is not entered."
 msgstr "Nie okre¶lono nazwy konta."
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "Nie okre¶lono adresu e-mail."
 
 msgid "Mail address is not entered."
 msgstr "Nie okre¶lono adresu e-mail."
 


@@ -5635,8 +5681,8 @@ msgid "Current actions"
 msgstr "Obecne akcje"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
 msgstr "Obecne akcje"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546

-#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
-#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687

 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nowy)"
 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nowy)"


@@ -5680,174 +5726,172 @@ msgstr "Usu
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdê usun±æ t± akcjê?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Czy naprawdê usun±æ t± akcjê?"
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "NAZWA MENU:"
 
 msgid "MENU NAME:"
 msgstr "NAZWA MENU:"
 

-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr "U¿ywaj / w nazwie menu by zrobiæ podmenu"
 
 msgid "Use / in menu name to make submenus."
 msgstr "U¿ywaj / w nazwie menu by zrobiæ podmenu"
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "LINIA KOMEND:"
 
 msgid "COMMAND LINE:"
 msgstr "LINIA KOMEND:"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "Zacznij z:"
 
 msgid "Begin with:"
 msgstr "Zacznij z:"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr "aby wys³aæ tre¶æ wiadomo¶ci lub wybrany jej kawa³ek do stdin"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "aby wys³aæ tre¶æ wiadomo¶ci lub wybrany jej kawa³ek do stdin"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "aby wys³aæ tekst u¿ytkownika do stdin komendy"
 
 msgid "to send user provided text to command's standard input"
 msgstr "aby wys³aæ tekst u¿ytkownika do stdin komendy"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr "aby wys³aæ ukryty tekst u¿ytkownika do stdin komendy"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr "aby wys³aæ ukryty tekst u¿ytkownika do stdin komendy"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "Zakoñcz z"
 
 msgid "End with:"
 msgstr "Zakoñcz z"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgid "to replace message body or selection with command's standard output"

-msgstr ""
-"aby zamieniæ tre¶æ wiadomo¶ci lub wybrany jej kawa³ek na stdout komendy"
+msgstr "aby zamieniæ tre¶æ wiadomo¶ci lub wybrany jej kawa³ek na stdout komendy"

 
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr "aby wstawiæ stdout komendy bez zamieniania starego tekstu"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "aby wstawiæ stdout komendy bez zamieniania starego tekstu"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "aby uruchomiæ komendê asynchronicznie"
 
 msgid "to run command asynchronously"
 msgstr "aby uruchomiæ komendê asynchronicznie"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "U¿yj:"
 
 msgid "Use:"
 msgstr "U¿yj:"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "dla pliku lub wybranej wiadomo¶ci w formacie RFC822/2822 "
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "dla pliku lub wybranej wiadomo¶ci w formacie RFC822/2822 "
 

-#: src/prefs_actions.c:653
-msgid ""
-"for the list of the files of the selected messages in RFC822/2822 format"
+#: src/prefs_actions.c:671
+msgid "for the list of the files of the selected messages in RFC822/2822 format"

 msgstr "dla listy plików wybranych wiadomo¶ci w formacie RFC822/2822"
 
 msgstr "dla listy plików wybranych wiadomo¶ci w formacie RFC822/2822"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "dla pliku wybranej zdekodowanej czê¶ci MIME danej wiadomo¶ci"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "dla pliku wybranej zdekodowanej czê¶ci MIME danej wiadomo¶ci"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "dla argumentu wprowadzonego przez u¿ytkownika"
 
 msgid "for a user provided argument"
 msgstr "dla argumentu wprowadzonego przez u¿ytkownika"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "dla ukrytego argumentu (np. has³o) wprowadzonego przez u¿ytkownika"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "dla ukrytego argumentu (np. has³o) wprowadzonego przez u¿ytkownika"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "dla wybrania tekstu"
 
 msgid "for the text selection"
 msgstr "dla wybrania tekstu"
 

-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "zastosuj filtrowanie zdefiniowane pomiêdzy {} do wybranych wiadomo¶ci"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "zastosuj filtrowanie zdefiniowane pomiêdzy {} do wybranych wiadomo¶ci"
 

-#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131

 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Opis symboli"
 
 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Opis symboli"
 

-#: src/prefs_common.c:951
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Zwyk³e ustawienia"
 
 msgid "Common Preferences"
 msgstr "Zwyk³e ustawienia"
 

-#: src/prefs_common.c:974
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "Cytowanie"
 
 msgid "Quote"
 msgstr "Cytowanie"
 

-#: src/prefs_common.c:976
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "Wy¶wietlanie"
 
 msgid "Display"
 msgstr "Wy¶wietlanie"
 

-#: src/prefs_common.c:978
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Wiadomo¶æ"
 
 msgid "Message"
 msgstr "Wiadomo¶æ"
 

-#: src/prefs_common.c:986 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "Inne"
 
 msgid "Other"
 msgstr "Inne"
 

-#: src/prefs_common.c:1032
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Program zewnêtrzny"
 
 msgid "External program"
 msgstr "Program zewnêtrzny"
 

-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "U¿yj zewnêtrznego programu do inkorporacji"
 
 msgid "Use external program for incorporation"
 msgstr "U¿yj zewnêtrznego programu do inkorporacji"
 

-#: src/prefs_common.c:1048
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "Polecenie"
 
 msgid "Command"
 msgstr "Polecenie"
 

-#: src/prefs_common.c:1072
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "Automatycznie sprawdzaj pocztê"
 
 msgid "Auto-check new mail"
 msgstr "Automatycznie sprawdzaj pocztê"
 

-#: src/prefs_common.c:1074
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "co ka¿de"
 
 msgid "every"
 msgstr "co ka¿de"
 

-#: src/prefs_common.c:1086
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "minut"
 
 msgid "minute(s)"
 msgstr "minut"
 

-#: src/prefs_common.c:1095
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Sprawd¼ pocztê przy starcie"
 
 msgid "Check new mail on startup"
 msgstr "Sprawd¼ pocztê przy starcie"
 

-#: src/prefs_common.c:1097
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "Uaktualnij wszystkie lokalne foldery po inkorporacji"
 
 msgid "Update all local folders after incorporation"
 msgstr "Uaktualnij wszystkie lokalne foldery po inkorporacji"
 

-#: src/prefs_common.c:1105
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "Pokazuj okno dialogowe przy odbieraniu"
 
 msgid "Show receive dialog"
 msgstr "Pokazuj okno dialogowe przy odbieraniu"
 

-#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "Zawsze"
 
 msgid "Always"
 msgstr "Zawsze"
 

-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "Tylko w przypadku rêcznego wywo³ania"
 
 msgid "Only on manual receiving"
 msgstr "Tylko w przypadku rêcznego wywo³ania"
 

-#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "Nigdy"
 
 msgid "Never"
 msgstr "Nigdy"
 

-#: src/prefs_common.c:1126
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "Zamknij okno dialogowe po skoñczeniu"
 
 msgid "Close receive dialog when finished"
 msgstr "Zamknij okno dialogowe po skoñczeniu"
 

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "Uruchom polecenie kiedy przyjdzie nowa poczta"
 
 msgid "Run command when new mail arrives"
 msgstr "Uruchom polecenie kiedy przyjdzie nowa poczta"
 

-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "po automatycznym sprawdzeniu"
 
 msgid "after autochecking"
 msgstr "po automatycznym sprawdzeniu"
 

-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "po rêcznym sprawdzeniu"
 
 msgid "after manual checking"
 msgstr "po rêcznym sprawdzeniu"
 

-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5856,23 +5900,23 @@ msgstr ""
 "Komenda do uruchomienia:\n"
 "(u¿yj %d jako numeru nowych wiadomo¶ci)"
 
 "Komenda do uruchomienia:\n"
 "(u¿yj %d jako numeru nowych wiadomo¶ci)"
 

-#: src/prefs_common.c:1223
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "Zapisz wys³ane wiadomo¶ci do folderu Wys³anych"
 
 msgid "Save sent messages to Sent folder"
 msgstr "Zapisz wys³ane wiadomo¶ci do folderu Wys³anych"
 

-#: src/prefs_common.c:1225
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "Kolejkuj wiadomo¶ci których nie da³o siê wys³aæ"
 
 msgid "Queue messages that fail to send"
 msgstr "Kolejkuj wiadomo¶ci których nie da³o siê wys³aæ"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "Pokazuj okno dialogowe przy wysy³aniu"
 
 msgid "Show send dialog"
 msgstr "Pokazuj okno dialogowe przy wysy³aniu"
 

-#: src/prefs_common.c:1248
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "Strona kodowa dla wychodz±cych"
 
 msgid "Outgoing codeset"
 msgstr "Strona kodowa dla wychodz±cych"
 

-#: src/prefs_common.c:1257
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"


@@ -5880,107 +5924,107 @@ msgstr ""
 "Je¶li wybrana jest opcja `Automatycznie', wykorzystywane bêdzie optymalne "
 "kodowanie na podstawie lokalnych ustawieñ systemowych."
 
 "Je¶li wybrana jest opcja `Automatycznie', wykorzystywane bêdzie optymalne "
 "kodowanie na podstawie lokalnych ustawieñ systemowych."
 

-#: src/prefs_common.c:1269
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "Automatycznie (Zalecane)"
 
 msgid "Automatic (Recommended)"
 msgstr "Automatycznie (Zalecane)"
 

-#: src/prefs_common.c:1270
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitów ascii (US-ASCII)"
 
 msgid "7bit ascii (US-ASCII)"
 msgstr "7 bitów ascii (US-ASCII)"
 

-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Europa Zachodnia (ISO-8859-1)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Europa Zachodnia (ISO-8859-15)"
 

-#: src/prefs_common.c:1276
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "Europa ¦rodkowa (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "Europa ¦rodkowa (ISO-8859-2)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "Kraje Ba³tyckie (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "Kraje Ba³tyckie (ISO-8859-13)"
 

-#: src/prefs_common.c:1278
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "Kraje Ba³tyckie (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "Kraje Ba³tyckie (ISO-8859-4)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Grecja (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Grecja (ISO-8859-7)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcja (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turcja (ISO-8859-9)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrylica (ISO-8859-5)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrylica (KOI8-R)"
 

-#: src/prefs_common.c:1286
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrylica (Windows-1251)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrylica (KOI8-U)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonia (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonia (ISO-2022-JP)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "Japonia (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "Japonia (EUC-JP)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "Japonia (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonia (Shift_JIS)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczony Chiñski (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "Uproszczony Chiñski (GB2312)"
 

-#: src/prefs_common.c:1295
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjny Chiñski (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradycyjny Chiñski (Big5)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjny Chiñski (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradycyjny Chiñski (EUC-TW)"
 

-#: src/prefs_common.c:1298
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chiñski (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Chiñski (ISO-2022-CN)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "Korea (EUC-KR)"
 

-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Tajlandzki (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Tajlandzki (TIS-620)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Tajlandzki (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Tajlandzki (Windows-874)"
 

-#: src/prefs_common.c:1315
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "Kodowanie transferu"
 
 msgid "Transfer encoding"
 msgstr "Kodowanie transferu"
 

-#: src/prefs_common.c:1324
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"


@@ -5988,151 +6032,151 @@ msgstr ""
 "Wybierz Kodowanie transferu (Content-Transfer-Encoding)\n"
 "dla wiadomo¶æ zawieraj±cych znaki odmienne od formatu ASCII"
 
 "Wybierz Kodowanie transferu (Content-Transfer-Encoding)\n"
 "dla wiadomo¶æ zawieraj±cych znaki odmienne od formatu ASCII"
 

-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "Automatyczny wybór konta"
 
 msgid "Automatic account selection"
 msgstr "Automatyczny wybór konta"
 

-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "przy odpowiedzi"
 
 msgid "when replying"
 msgstr "przy odpowiedzi"
 

-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "przy przekazywaniu"
 
 msgid "when forwarding"
 msgstr "przy przekazywaniu"
 

-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "przy re-edycji"
 
 msgid "when re-editing"
 msgstr "przy re-edycji"
 

-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk odpowiedzi powoduje odpowied¼ do grupy mailingowej"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Przycisk odpowiedzi powoduje odpowied¼ do grupy mailingowej"
 

-#: src/prefs_common.c:1433
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "Automatycznie uruchom zewnêtrzny edytor"
 
 msgid "Automatically launch the external editor"
 msgstr "Automatycznie uruchom zewnêtrzny edytor"
 

-#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "Przeka¿ jako za³±cznik"
 
 msgid "Forward as attachment"
 msgstr "Przeka¿ jako za³±cznik"
 

-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "Blok kursora"
 
 msgid "Block cursor"
 msgstr "Blok kursora"
 

-#: src/prefs_common.c:1446
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Pozostaw oryginalny nag³ówek 'Od' ('From') przy przekazywaniu"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Pozostaw oryginalny nag³ówek 'Od' ('From') przy przekazywaniu"
 

-#: src/prefs_common.c:1454
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "Zapisz w katalogu szablonów co ka¿de "
 
 msgid "Autosave to Drafts folder every "
 msgstr "Zapisz w katalogu szablonów co ka¿de "
 

-#: src/prefs_common.c:1461 src/prefs_common.c:1506
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "znakach"
 
 msgid "characters"
 msgstr "znakach"
 

-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "Poziom cofania"
 
 msgid "Undo level"
 msgstr "Poziom cofania"
 

-#: src/prefs_common.c:1482
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "Zawijanie wiadomo¶ci"
 
 msgid "Message wrapping"
 msgstr "Zawijanie wiadomo¶ci"
 

-#: src/prefs_common.c:1494
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomo¶æ przy"
 
 msgid "Wrap messages at"
 msgstr "Zawijaj wiadomo¶æ przy"
 

-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "Zawijaj cytat"
 
 msgid "Wrap quotation"
 msgstr "Zawijaj cytat"
 

-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "Zawijaj wej¶cie"
 
 msgid "Wrap on input"
 msgstr "Zawijaj wej¶cie"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "Zawijaj przed wys³aniem"
 
 msgid "Wrap before sending"
 msgstr "Zawijaj przed wys³aniem"
 

-#: src/prefs_common.c:1522
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Inteligentne zawijanie (EKSPERYMENTALNE)"
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Inteligentne zawijanie (EKSPERYMENTALNE)"
 

-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "Odpowiedz z cytatem domy¶lnie"
 
 msgid "Reply will quote by default"
 msgstr "Odpowiedz z cytatem domy¶lnie"
 

-#: src/prefs_common.c:1590
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "Format odpowiedzi"
 
 msgid "Reply format"
 msgstr "Format odpowiedzi"
 

-#: src/prefs_common.c:1605 src/prefs_common.c:1644
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "Znak cytowania"
 
 msgid "Quotation mark"
 msgstr "Znak cytowania"
 

-#: src/prefs_common.c:1629
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "Format przekazu"
 
 msgid "Forward format"
 msgstr "Format przekazu"
 

-#: src/prefs_common.c:1673
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr " Opis symboli "
 
 msgid " Description of symbols "
 msgstr " Opis symboli "
 

-#: src/prefs_common.c:1681
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "Znaki cytowania"
 
 msgid "Quotation characters"
 msgstr "Znaki cytowania"
 

-#: src/prefs_common.c:1696
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "Traktuj te znaki jako znaczniki cytatu:"
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Traktuj te znaki jako znaczniki cytatu:"
 

-#: src/prefs_common.c:1746
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "T³umacz nazwê nag³ówka (jak np. 'Od:', 'Temat:')"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "T³umacz nazwê nag³ówka (jak np. 'Od:', 'Temat:')"
 

-#: src/prefs_common.c:1749
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "Wy¶wietl liczbê nieprzeczytanych wiadomo¶ci obok nazwy katalogu"
 
 msgid "Display unread number next to folder name"
 msgstr "Wy¶wietl liczbê nieprzeczytanych wiadomo¶ci obok nazwy katalogu"
 

-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skracaj nazwy grup d³u¿sze ni¿"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skracaj nazwy grup d³u¿sze ni¿"
 

-#: src/prefs_common.c:1773
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "litery"
 
 msgid "letters"
 msgstr "litery"
 

-#: src/prefs_common.c:1779
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "Widok podsumowania"
 
 msgid "Summary View"
 msgstr "Widok podsumowania"
 

-#: src/prefs_common.c:1788
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Wy¶wietl odbiorcê w kolumnie `Od` je¶li jeste¶ nadawc±"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Wy¶wietl odbiorcê w kolumnie `Od` je¶li jeste¶ nadawc±"
 

-#: src/prefs_common.c:1791
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "Wy¶wietlaj nadawnê u¿ywaj±c ksi±¿ki adresowej"
 
 msgid "Display sender using address book"
 msgstr "Wy¶wietlaj nadawnê u¿ywaj±c ksi±¿ki adresowej"
 

-#: src/prefs_common.c:1794
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr "W±tek u¿ywa tytu³u wiadomo¶ci w dodatku do standardowych nag³ówków"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "W±tek u¿ywa tytu³u wiadomo¶ci w dodatku do standardowych nag³ówków"
 

-#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "Format daty"
 
 msgid "Date format"
 msgstr "Format daty"
 

-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " Ustaw wy¶wietlane elementy podsumowania... "
 
 msgid " Set displayed items in summary... "
 msgstr " Ustaw wy¶wietlane elementy podsumowania... "
 

-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "W³±cz kolorowanie wiadomo¶ci"
 
 msgid "Enable coloration of message"
 msgstr "W³±cz kolorowanie wiadomo¶ci"
 

-#: src/prefs_common.c:1900
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"


@@ -6140,348 +6184,329 @@ msgstr ""
 "Wy¶wietlaj wielo-bajtowe znaki alphanumeryczne jako\n"
 "tekst ASCII (tylko Japoñski)"
 
 "Wy¶wietlaj wielo-bajtowe znaki alphanumeryczne jako\n"
 "tekst ASCII (tylko Japoñski)"
 

-#: src/prefs_common.c:1906
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "Wy¶wietl panel nag³ówków powy¿ej okna wiadomo¶ci"
 
 msgid "Display header pane above message view"
 msgstr "Wy¶wietl panel nag³ówków powy¿ej okna wiadomo¶ci"
 

-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "Pokazuj krótkie nag³ówki w widoku wiadomo¶ci"
 
 msgid "Display short headers on message view"
 msgstr "Pokazuj krótkie nag³ówki w widoku wiadomo¶ci"
 

-#: src/prefs_common.c:1935
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Interlinia"
 
 msgid "Line space"
 msgstr "Interlinia"
 

-#: src/prefs_common.c:1949 src/prefs_common.c:1989
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "piksel(e)"
 
 msgid "pixel(s)"
 msgstr "piksel(e)"
 

-#: src/prefs_common.c:1954
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "Zostaw miejsce w nag³ówku "
 
 msgid "Leave space on head"
 msgstr "Zostaw miejsce w nag³ówku "
 

-#: src/prefs_common.c:1956
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "Przewijanie"
 
 msgid "Scroll"
 msgstr "Przewijanie"
 

-#: src/prefs_common.c:1963
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Pó³ strony"
 
 msgid "Half page"
 msgstr "Pó³ strony"
 

-#: src/prefs_common.c:1969
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "P³ynne przewijanie"
 
 msgid "Smooth scroll"
 msgstr "P³ynne przewijanie"
 

-#: src/prefs_common.c:1975
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "Krok"
 
 msgid "Step"
 msgstr "Krok"
 

-#: src/prefs_common.c:2000
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Wybierz opisy za³±czników (a nie nazwy)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Wybierz opisy za³±czników (a nie nazwy)"
 

-#: src/prefs_common.c:2046
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "Automatycznie sprawd¼ podpisy"
 
 msgid "Automatically check signatures"
 msgstr "Automatycznie sprawd¼ podpisy"
 

-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "Przechowuj has³o chwilowo w pamiêci"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "Przechowuj has³o chwilowo w pamiêci"
 

-#: src/prefs_common.c:2064
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr "Usuñ po"
 
 msgid "Expire after"
 msgstr "Usuñ po"
 

-#: src/prefs_common.c:2075
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "(Ustawienie '0' powoduje przechowywanie\n"
 "has³a przez ca³± sesjê"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr ""
 "(Ustawienie '0' powoduje przechowywanie\n"
 "has³a przez ca³± sesjê"
 

-#: src/prefs_common.c:2083
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "minut(a) "
 
 msgid "minute(s) "
 msgstr "minut(a) "
 

-#: src/prefs_common.c:2100
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "Przechwyæ wej¶cie podczas wprowadzania has³a"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Przechwyæ wej¶cie podczas wprowadzania has³a"
 

-#: src/prefs_common.c:2105
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Je¶li GnuPG nie dzia³a wy¶wietl ostrze¿enie przy starcie"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Je¶li GnuPG nie dzia³a wy¶wietl ostrze¿enie przy starcie"
 

-#: src/prefs_common.c:2166
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomo¶ci w podsumowaniu gdy wybrane"
 
 msgid "Always open messages in summary when selected"
 msgstr "Zawsze otwieraj wiadomo¶ci w podsumowaniu gdy wybrane"
 

-#: src/prefs_common.c:2170
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgid "Open first unread message when entering a folder"

-msgstr ""
-"Podczas wchodzenia do katalogu otwórz pierwsz± nieprzeczytan± wiadomo¶æ"
+msgstr "Podczas wchodzenia do katalogu otwórz pierwsz± nieprzeczytan± wiadomo¶æ"

 
 

-#: src/prefs_common.c:2174
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr "Zaznaczaj wiadomo¶æ jako przeczytan± po otwarciu w nowym oknie"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "Zaznaczaj wiadomo¶æ jako przeczytan± po otwarciu w nowym oknie"
 

-#: src/prefs_common.c:2178
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "Przejd¼ do Skrzynki odbiorczej po potrzymaniu nowych wiadomo¶ci"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "Przejd¼ do Skrzynki odbiorczej po potrzymaniu nowych wiadomo¶ci"
 

-#: src/prefs_common.c:2188
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Wykonaj natychmiastowo podczas przenoszenia lub kasowania wiadomo¶ci"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Wykonaj natychmiastowo podczas przenoszenia lub kasowania wiadomo¶ci"
 

-#: src/prefs_common.c:2190
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgid "Messages will be marked until execution if this is turned off"

-msgstr ""
-"Gdy ta opcja jest w³±czona wiadomo¶ci pozostan± oznaczone a¿ do wykonania"
+msgstr "Gdy ta opcja jest w³±czona wiadomo¶ci pozostan± oznaczone a¿ do wykonania"

 
 

-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "Nie pokazuj komunikatu o nieprzeczytanych wiadomo¶ciach"
 
 msgid "Show no-unread-message dialog"
 msgstr "Nie pokazuj komunikatu o nieprzeczytanych wiadomo¶ciach"
 

-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "Przyjmij 'Tak'"
 
 msgid "Assume 'Yes'"
 msgstr "Przyjmij 'Tak'"
 

-#: src/prefs_common.c:2215
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "Przyjmij 'Nie'"
 
 msgid "Assume 'No'"
 msgstr "Przyjmij 'Nie'"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr " Ustawienia skrótów klawiszowych... "
 
 msgid " Set key bindings... "
 msgstr " Ustawienia skrótów klawiszowych... "
 

-#: src/prefs_common.c:2230
-msgid "Icon theme"
-msgstr "Skórka ikonek"
-
-#: src/prefs_common.c:2314
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Zewnêtrzny edytor (%s zostanie zast±pione nazw± pliku / URI)"
-
-#: src/prefs_common.c:2323
-msgid "Web browser"
-msgstr "Przegl±darka internetowa"
-
-#: src/prefs_common.c:2359 src/toolbar.c:429
-msgid "Editor"
-msgstr "Edytor"
-
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Dwukrotne klikniêcie dodaje adres do pola \"Do\" wiadomo¶ci"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Dwukrotne klikniêcie dodaje adres do pola \"Do\" wiadomo¶ci"
 

-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "Wielko¶æ dziennika"
 
 msgid "Log Size"
 msgstr "Wielko¶æ dziennika"
 

-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "¦cinaj d³ugo¶æ dziennika"
 
 msgid "Clip the log size"
 msgstr "¦cinaj d³ugo¶æ dziennika"
 

-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "D³ugo¶æ okna dziennika"
 
 msgid "Log window length"
 msgstr "D³ugo¶æ okna dziennika"
 

-#: src/prefs_common.c:2417
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "(0 by zatrzymaæ komunikaty w oknie dziennika)"
 
 msgid "0 to stop logging in the log window"
 msgstr "(0 by zatrzymaæ komunikaty w oknie dziennika)"
 

-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "Bezpieczeñstwo"
 
 msgid "Security"
 msgstr "Bezpieczeñstwo"
 

-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "Zapytaj przed zaakceptowaniem certyfikatu SSL"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "Zapytaj przed zaakceptowaniem certyfikatu SSL"
 

-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "Podczas wyj¶cia"
 
 msgid "On exit"
 msgstr "Podczas wyj¶cia"
 

-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "Potwierd¼ wyj¶cie"
 
 msgid "Confirm on exit"
 msgstr "Potwierd¼ wyj¶cie"
 

-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "Opró¿nij wysypisko przy wyj¶ciu"
 
 msgid "Empty trash on exit"
 msgstr "Opró¿nij wysypisko przy wyj¶ciu"
 

-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Zapytaj przed opró¿nieniem"
 
 msgid "Ask before emptying"
 msgstr "Zapytaj przed opró¿nieniem"
 

-#: src/prefs_common.c:2462
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "Ostrzegaj je¶li s± wiadomo¶ci w kolejce"
 
 msgid "Warn if there are queued messages"
 msgstr "Ostrzegaj je¶li s± wiadomo¶ci w kolejce"
 

-#: src/prefs_common.c:2468
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Limit czasu operacji wej¶cia/wyj¶cia gniazda"
 
 msgid "Socket I/O timeout:"
 msgstr "Limit czasu operacji wej¶cia/wyj¶cia gniazda"
 

-#: src/prefs_common.c:2481
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "sekund(a)"
 
 msgid "seconds"
 msgstr "sekund(a)"
 

-#: src/prefs_common.c:2665
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "pe³na skrócona nazwa dnia"
 
 msgid "the full abbreviated weekday name"
 msgstr "pe³na skrócona nazwa dnia"
 

-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "pe³na nazwa dnia"
 
 msgid "the full weekday name"
 msgstr "pe³na nazwa dnia"
 

-#: src/prefs_common.c:2667
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "pe³na skrócona nazwa miesi±ca"
 
 msgid "the abbreviated month name"
 msgstr "pe³na skrócona nazwa miesi±ca"
 

-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "pe³na nazwa miesi±ca"
 
 msgid "the full month name"
 msgstr "pe³na nazwa miesi±ca"
 

-#: src/prefs_common.c:2669
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "preferowany czas i data dla bie¿±cego locale"
 
 msgid "the preferred date and time for the current locale"
 msgstr "preferowany czas i data dla bie¿±cego locale"
 

-#: src/prefs_common.c:2670
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "numer wieku (rok/100)"
 
 msgid "the century number (year/100)"
 msgstr "numer wieku (rok/100)"
 

-#: src/prefs_common.c:2671
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "dzieñ jako liczba"
 
 msgid "the day of the month as a decimal number"
 msgstr "dzieñ jako liczba"
 

-#: src/prefs_common.c:2672
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako numer (zegar 24 godzinny)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "godzina jako numer (zegar 24 godzinny)"
 

-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako numer (zegar 12 godzinny)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "godzina jako numer (zegar 12 godzinny)"
 

-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "dzieñ roku jako liczba"
 
 msgid "the day of the year as a decimal number"
 msgstr "dzieñ roku jako liczba"
 

-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "miesi±c jako liczba"
 
 msgid "the month as a decimal number"
 msgstr "miesi±c jako liczba"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba"
 
 msgid "the minute as a decimal number"
 msgstr "minuta jako liczba"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 
 msgid "either AM or PM"
 msgstr "albo AM albo PM"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "drugie jako liczba"
 
 msgid "the second as a decimal number"
 msgstr "drugie jako liczba"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "dzieñ tygodnia jako liczba"
 
 msgid "the day of the week as a decimal number"
 msgstr "dzieñ tygodnia jako liczba"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla bie¿±cego locale"
 
 msgid "the preferred date for the current locale"
 msgstr "preferowana data dla bie¿±cego locale"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "ostatnie dwie liczby roku"
 
 msgid "the last two digits of a year"
 msgstr "ostatnie dwie liczby roku"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "rok jako liczba"
 
 msgid "the year as a decimal number"
 msgstr "rok jako liczba"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasu lub nazwa lub skrót"
 
 msgid "the time zone or name or abbreviation"
 msgstr "strefa czasu lub nazwa lub skrót"
 

-#: src/prefs_common.c:2704
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "Wybierz plik"
 
 msgid "Specifier"
 msgstr "Wybierz plik"
 

-#: src/prefs_common.c:2744
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "Przyk³ad"
 
 msgid "Example"
 msgstr "Przyk³ad"
 

-#: src/prefs_common.c:2833
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "Ustaw kolor wiadomo¶ci"
 
 msgid "Set message colors"
 msgstr "Ustaw kolor wiadomo¶ci"
 

-#: src/prefs_common.c:2841
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "Kolory"
 
 msgid "Colors"
 msgstr "Kolory"
 

-#: src/prefs_common.c:2888
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 
 msgid "Quoted Text - First Level"
 msgstr "Cytowany tekst - poziom pierwszy"
 

-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 
 msgid "Quoted Text - Second Level"
 msgstr "Cytowany tekst - poziom drugi"
 

-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 
 msgid "Quoted Text - Third Level"
 msgstr "Cytowany tekst - poziom trzeci"
 

-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "£±cze URI"
 
 msgid "URI link"
 msgstr "£±cze URI"
 

-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Katalog docelowy"
 
 msgid "Target folder"
 msgstr "Katalog docelowy"
 

-#: src/prefs_common.c:2918
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Podpisy"
 
 msgid "Signatures"
 msgstr "Podpisy"
 

-#: src/prefs_common.c:2925
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Powtarzaj kolory cytowania"
 
 msgid "Recycle quote colors"
 msgstr "Powtarzaj kolory cytowania"
 

-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 
 msgid "Pick color for quotation level 1"
 msgstr "Wybierz kolor dla pierwszego poziomu cytowania"
 

-#: src/prefs_common.c:2995
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 
 msgid "Pick color for quotation level 2"
 msgstr "Wybierz kolor dla drugiego poziomu cytowania"
 

-#: src/prefs_common.c:2998
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 
 msgid "Pick color for quotation level 3"
 msgstr "Wybierz kolor dla trzeciego poziomu cytowania"
 

-#: src/prefs_common.c:3001
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 
 msgid "Pick color for URI"
 msgstr "Wybierz kolor dla URI"
 

-#: src/prefs_common.c:3004
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Wybierz kolor dla docelowego katalogu"
 
 msgid "Pick color for target folder"
 msgstr "Wybierz kolor dla docelowego katalogu"
 

-#: src/prefs_common.c:3007
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Wybierz kolor dla podpisów"
 
 msgid "Pick color for signatures"
 msgstr "Wybierz kolor dla podpisów"
 

-#: src/prefs_common.c:3142
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "Powi±zania klawiszy"
 
 msgid "Key bindings"
 msgstr "Powi±zania klawiszy"
 

-#: src/prefs_common.c:3156
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Wybierz ustawienie:"
 
 msgid "Select preset:"
 msgstr "Wybierz ustawienie:"
 

-#: src/prefs_common.c:3169 src/prefs_common.c:3454
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "Stary Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Stary Sylpheed"
 

-#: src/prefs_common.c:3177
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6503,11 +6528,15 @@ msgstr "Obecne nag
 msgid "Header name is not set."
 msgstr "Brak nazwy nag³ówka."
 
 msgid "Header name is not set."
 msgstr "Brak nazwy nag³ówka."
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "Ta nazwa nag³ówka nie jest dozwolona jako konfigurowalany nag³ówek."
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "Usuñ nag³ówek"
 
 msgid "Delete header"
 msgstr "Usuñ nag³ówek"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "Czy naprawdê chcesz usun±æ ten nag³ówek?"
 
 msgid "Do you really want to delete this header?"
 msgstr "Czy naprawdê chcesz usun±æ ten nag³ówek?"
 


@@ -6535,6 +6564,36 @@ msgstr "Poka
 msgid "This header is already in the list."
 msgstr "Taki nag³ówek ju¿ wystêpuje."
 
 msgid "This header is already in the list."
 msgstr "Taki nag³ówek ju¿ wystêpuje."
 

+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s zostanie zast±pione nazw± pliku / URI"
+
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "Przegl±darka internetowa"
+
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "Polecenie wydruku"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Edytor tekstu"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "Przegl±darka obrazów"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "Odtwarzacz audio"
+
+#: src/prefs_ext_prog.c:265
+#, fuzzy
+msgid "Message View/External Programs"
+msgstr "Program zewnêtrzny"
+

 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Przenie¶"
 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Przenie¶"


@@ -6567,7 +6626,7 @@ msgstr "Zaznacz jako przeczytane"
 msgid "Mark as unread"
 msgstr "Zaznacz jako nieprzeczytane"
 
 msgid "Mark as unread"
 msgstr "Zaznacz jako nieprzeczytane"
 

-#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473

 msgid "Forward"
 msgstr "Przeka¿"
 
 msgid "Forward"
 msgstr "Przeka¿"
 


@@ -6576,7 +6635,7 @@ msgid "Redirect"
 msgstr "Przeka¿"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
 msgstr "Przeka¿"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395

-#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481

 msgid "Execute"
 msgstr "Wykonaj"
 
 msgid "Execute"
 msgstr "Wykonaj"
 


@@ -6617,7 +6676,7 @@ msgid "Recipient"
 msgstr "Adresat"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
 msgstr "Adresat"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75

-#: src/summaryview.c:479
+#: src/summaryview.c:480

 msgid "Score"
 msgstr "Punktowanie"
 
 msgid "Score"
 msgstr "Punktowanie"
 


@@ -6656,23 +6715,23 @@ msgstr "Nie zdefiniowano 
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47

-#: src/summaryview.c:474 src/summaryview.c:641
+#: src/summaryview.c:475 src/summaryview.c:642

 msgid "Subject"
 msgstr "Temat"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
 msgid "Subject"
 msgstr "Temat"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42

-#: src/summaryview.c:475 src/summaryview.c:645
+#: src/summaryview.c:476 src/summaryview.c:646

 msgid "From"
 msgstr "Od"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
 msgid "From"
 msgstr "Od"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143

-#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650

 msgid "To"
 msgstr "Do:"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
 msgid "To"
 msgstr "Do:"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715

-#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477

 msgid "Date"
 msgstr "Data"
 
 msgid "Date"
 msgstr "Data"
 


@@ -6731,35 +6790,35 @@ msgstr "Na g
 msgid "Bottom"
 msgstr "Na dó³"
 
 msgid "Bottom"
 msgstr "Na dó³"
 

-#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "Ci±g jest nieprawid³owy"
 
 msgid "Condition string is not valid."
 msgstr "Ci±g jest nieprawid³owy"
 

-#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "Podane wyra¿enie dla akcji jest nieprawid³owe"
 
 msgid "Action string is not valid."
 msgstr "Podane wyra¿enie dla akcji jest nieprawid³owe"
 

-#: src/prefs_filtering.c:780
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgstr "Ustawienia warunków s± puste"
 
 msgid "Condition string is empty."
 msgstr "Ustawienia warunków s± puste"
 

-#: src/prefs_filtering.c:786
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "Ustawienia akcji s± puste"
 
 msgid "Action string is empty."
 msgstr "Ustawienia akcji s± puste"
 

-#: src/prefs_filtering.c:853
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "Usuñ regu³ê"
 
 msgid "Delete rule"
 msgstr "Usuñ regu³ê"
 

-#: src/prefs_filtering.c:854
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "Naprawdê chcesz usun±æ tê regu³ê?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Naprawdê chcesz usun±æ tê regu³ê?"
 

-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "Wpis niezapisany"
 
 msgid "Entry not saved"
 msgstr "Wpis niezapisany"
 

-#: src/prefs_filtering.c:1002
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr "Wpis nie zapisany. Naprawdê zamkn±æ?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "Wpis nie zapisany. Naprawdê zamkn±æ?"
 


@@ -6819,33 +6878,29 @@ msgstr "Og
 msgid "Settings for folder"
 msgstr "Ustawienia dla katalogu"
 
 msgid "Settings for folder"
 msgstr "Ustawienia dla katalogu"
 

-#: src/prefs_fonts.c:77
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Wybór czcionki"
 
 msgid "Font selection"
 msgstr "Wybór czcionki"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Tekst"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "P"

 
 

-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "Ma³a"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Widok wiadomo¶ci"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Normalna"
-
-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgstr "Pogrubiona"
 
 msgid "Bold"
 msgstr "Pogrubiona"
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr ""
 "Aby wprowadzone zmiany da³y jakikolwiek efekt nale¿y ponownie uruchomiæ "
 "program"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr ""
 "Aby wprowadzone zmiany da³y jakikolwiek efekt nale¿y ponownie uruchomiæ "
 "program"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "Wy¶wietlanie/Czcionki"
 
 msgid "Display/Fonts"
 msgstr "Wy¶wietlanie/Czcionki"
 


@@ -7144,6 +7199,166 @@ msgstr "Usu
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdê chcesz usun±æ ten wzorzec?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdê chcesz usun±æ ten wzorzec?"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "Domy¶lny wewnêtrzny motyw"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "Wy¶wietlanie/Motywy"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Tylko u¿ytkownik root mo¿e usun±æ motywy systemowe"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Usuniêcie motywu systemowego '%s'"
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Usuniêcie motywu '%s'"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "Czy naprawdê chcesz usun±æ ten motyw?"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Wyst±pi³ b³±d pliku %s\n"
+"podczas usuwania motywu."
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "Usuniêcie katalogu motywu zakoñczy³o siê niepowodzeniem."
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Motyw zosta³ pomy¶lnie usuniêty."
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Wybierz katalog motywu"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Instalowanie motywu '%s'"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Ten katalog nie wygl±da na katalog motywów. \n"
+"Kontynuowaæ instalacjê?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "Czy chcesz zainstalowaæ motyw dla wszystkich u¿ytkowników systemu?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"Motyw o tej samej nazwie jest ju¿\n"
+"zainstalowany w tym miejscu"
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr "Nie mo¿na utworzyæ katalogu docelowego"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Motyw zosta³ zainstalowany prawid³owo."
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+"Wyst±pi³ b³±d pliku %s\n"
+"podczas instalowania motywu."
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "dostêpne motywy - %d (%d u¿ytkownika, %d systemowe, 1 wewnêtrzny)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "Zespó³ Sylpheed Claws "
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "Wewnêtrzny motyw ma %d ikon"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "Brak pliku informacyjnego dla tego motywu"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "B³±d: Nie mo¿na odczytaæ stanu motywów"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d plików (%d ikon), rozmiar %s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Wybór"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "Zainstaluj nowe..."
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "Pobierz wiêcej..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "Informacje"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "Autor: "
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "URL:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "Stan:"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Podgl±d"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "Akcje"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "U¿yj"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "Usuñ"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -7212,7 +7427,7 @@ msgstr "Dostosuj Paski Narz
 msgid "Customize Toolbars/Compose Window"
 msgstr "Dostosuj Paski Narzêdzi/Okno kompozycji"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "Dostosuj Paski Narzêdzi/Okno kompozycji"
 

-#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140

 msgid "No signature found"
 msgstr "Nie znaleziono podpisu"
 
 msgid "No signature found"
 msgstr "Nie znaleziono podpisu"
 


@@ -7220,14 +7435,13 @@ msgstr "Nie znaleziono podpisu"
 msgid "No information available"
 msgstr "Brak informacji"
 
 msgid "No information available"
 msgstr "Brak informacji"
 

-#: src/procmsg.c:1126
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr "Nie mo¿na by³o stworzyæ pliku tymczasowego do wys³ania postu na grupy."
 
 msgid "Could not create temporary file for news sending."
 msgstr "Nie mo¿na by³o stworzyæ pliku tymczasowego do wys³ania postu na grupy."
 

-#: src/procmsg.c:1137
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgid "Error when writing temporary file for news sending."

-msgstr ""
-"B³±d podczas zapisywania do pliku tymczasowego do wys³ania postu na grupy."
+msgstr "B³±d podczas zapisywania do pliku tymczasowego do wys³ania postu na grupy."

 
 #: src/quote_fmt.c:40
 msgid "Customize date format (see man strftime)"
 
 #: src/quote_fmt.c:40
 msgid "Customize date format (see man strftime)"


@@ -7430,92 +7644,92 @@ msgstr ""
 "skrzynki w formacie MH.\n"
 "Je¶li nie jeste¶ pewien, wybierz OK."
 
 "skrzynki w formacie MH.\n"
 "Je¶li nie jeste¶ pewien, wybierz OK."
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr "Niezdefiniowany"
 
 msgid "Undefined"
 msgstr "Niezdefiniowany"
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr "Marginalny"
 
 msgid "Marginal"
 msgstr "Marginalny"
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 msgid "Ultimate"
 msgstr ""
 
 msgid "Ultimate"
 msgstr ""
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "W³a¶ciwy podpis od %s (Zaufanie: %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "W³a¶ciwy podpis od %s (Zaufanie: %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "Podpis straci³ wa¿no¶æ"
 
 msgid "The signature has expired"
 msgstr "Podpis straci³ wa¿no¶æ"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr "Klucz, który zosta³ uzyty do podpisu tej czê¶ci jest przeterminowany"
 
 msgid "The key that was used to sign this part has expired"
 msgstr "Klucz, który zosta³ uzyty do podpisu tej czê¶ci jest przeterminowany"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "Nie wszystkie podpisy s± prawid³owe"
 
 msgid "Not all signatures are valid"
 msgstr "Nie wszystkie podpisy s± prawid³owe"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "Ten podpis jest niew³a¶ciwy"
 
 msgid "This signature is invalid"
 msgstr "Ten podpis jest niew³a¶ciwy"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "Brak klucza do weryfikacji tego podpisu"
 
 msgid "You have no key to verify this signature"
 msgstr "Brak klucza do weryfikacji tego podpisu"
 

-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "Wyst±pi³ b³±d"
 
 msgid "An error occured"
 msgstr "Wyst±pi³ b³±d"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "Ten podpis nie by³ sprawdzony"
 
 msgid "The signature has not been checked"
 msgstr "Ten podpis nie by³ sprawdzony"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Wykonano podpis %s za pomoc± %s ID klucza %s\n"
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Wykonano podpis %s za pomoc± %s ID klucza %s\n"
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Poprawny podpis od \"%s\"\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Poprawny podpis od \"%s\"\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Przedawniony podpis od \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Przedawniony podpis od \"%s\"\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "NIEW£A¦CIWY podpis od \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "NIEW£A¦CIWY podpis od \"%s\"\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                jako \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                jako \"%s\"\n"
 

-#: src/sgpgme.c:194
-#, fuzzy, c-format
+#: src/sgpgme.c:203
+#, c-format

 msgid "Primary key fingerprint: %s\n"
 msgid "Primary key fingerprint: %s\n"

-msgstr "Odcisk klucza: %s\n"
+msgstr "Odcisk podstawowego klucza: %s\n"

 
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Podpis wygasa %s\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Podpis wygasa %s\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Podpis wygas³ %s\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Podpis wygas³ %s\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7548,10 +7762,6 @@ msgstr "Skasuj certyfikat"
 msgid "Do you really want to delete this certificate?"
 msgstr "Czy naprawdê chcesz usun±æ ten certyfikat?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Czy naprawdê chcesz usun±æ ten certyfikat?"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "(Temat wyczyszczony przez Wyra¿enie Regularne)"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Przeszukaj wiadomo¶ci"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Przeszukaj wiadomo¶ci"


@@ -7576,539 +7786,538 @@ msgstr "Osi
 msgid "End of list reached; continue from beginning?"
 msgstr "Osi±gniêto koniec listy; zacz±æ od pocz±tku?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Osi±gniêto koniec listy; zacz±æ od pocz±tku?"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 

-#: src/summaryview.c:404
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/Odpowied¼ do"
 
 msgid "/Repl_y to"
 msgstr "/Odpowied¼ do"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/Odpowied¼ do/_Wszystkich"
 
 msgid "/Repl_y to/_all"
 msgstr "/Odpowied¼ do/_Wszystkich"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/Odpowiedz do/_Nadawcy"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Odpowiedz do/_Nadawcy"
 

-#: src/summaryview.c:407
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpowiedz do/_Listy mailingowej"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpowiedz do/_Listy mailingowej"
 

-#: src/summaryview.c:409
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "/Odpowiedz na grupy oraz nadawcy"
 
 msgid "/Follow-up and reply to"
 msgstr "/Odpowiedz na grupy oraz nadawcy"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "/Prze_ka¿"
 
 msgid "/_Forward"
 msgstr "/Prze_ka¿"
 

-#: src/summaryview.c:412
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/Przekieruj"
 
 msgid "/Redirect"
 msgstr "/Przekieruj"
 

-#: src/summaryview.c:414
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/Prz_eedytuj"
 
 msgid "/Re-_edit"
 msgstr "/Prz_eedytuj"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/_Przenie¶..."
 
 msgid "/M_ove..."
 msgstr "/_Przenie¶..."
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/_Kopiuj..."
 
 msgid "/_Copy..."
 msgstr "/_Kopiuj..."
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/Usuñ wiadomo¶æ z grup"
 
 msgid "/Cancel a news message"
 msgstr "/Usuñ wiadomo¶æ z grup"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "/_Wykonaj"
 
 msgid "/E_xecute"
 msgstr "/_Wykonaj"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/_Zaznacz"
 
 msgid "/_Mark"
 msgstr "/_Zaznacz"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/_Zaznacz/_Zaznacz"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Zaznacz/_Zaznacz"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/_Zaznacz/_Odznacz"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Zaznacz/_Odznacz"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/_Zaznacz/---"
 
 msgid "/_Mark/---"
 msgstr "/_Zaznacz/---"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Zaznacz/Zaznacz jako niep_rzeczytane"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Zaznacz/Zaznacz jako niep_rzeczytane"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/_Zaznacz/Zaznacz wszystkie jako prz_eczytane"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Zaznacz/Zaznacz wszystkie jako prz_eczytane"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/_Zaznacz/Ignoruj w±tek"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Zaznacz/Ignoruj w±tek"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/_Zaznacz/Przestañ ignorowaæ w±tek"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Zaznacz/Przestañ ignorowaæ w±tek"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/_Zaznacz/Zablokuj"
 
 msgid "/_Mark/Lock"
 msgstr "/_Zaznacz/Zablokuj"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/_Zaznacz/Odblokuj"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Zaznacz/Odblokuj"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/Kolor pod¶wiet_lenia"
 
 msgid "/Color la_bel"
 msgstr "/Kolor pod¶wiet_lenia"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "/Dodaj nadawcê do ksi±¿ki adresowej"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Dodaj nadawcê do ksi±¿ki adresowej"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgstr "/Twórz now± regu³ê f_iltra"
 
 msgid "/Create f_ilter rule"
 msgstr "/Twórz now± regu³ê f_iltra"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Twórz now± regu³ê f_iltra/_Automatycznie"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Twórz now± regu³ê f_iltra/_Automatycznie"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Twórz now± regu³ê f_iltra/z _Od"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Twórz now± regu³ê f_iltra/z _Od"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Twórz now± regu³ê f_iltra/z _Do"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Twórz now± regu³ê f_iltra/z _Do"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Twórz regu³ê filtra/z _Tematu"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Twórz regu³ê filtra/z _Tematu"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Create processing rule"
 msgstr "/Twórz regu³ê przetwarzania"
 
 msgid "/Create processing rule"
 msgstr "/Twórz regu³ê przetwarzania"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:449

 msgid "/Create processing rule/_Automatically"
 msgstr "/Twórz regu³ê przetwarzania/_Automatycznie"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Twórz regu³ê przetwarzania/_Automatycznie"
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Create processing rule/by _From"
 msgstr "/Twórz regu³ê przetwarzania/z _Od"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Twórz regu³ê przetwarzania/z _Od"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create processing rule/by _To"
 msgstr "/Twórz regu³ê przetwarzania/z _Do"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Twórz regu³ê przetwarzania/z _Do"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/Create processing rule/by _Subject"
 msgstr "/Twórz regu³ê przetwarzania/z _Tematu"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Twórz regu³ê przetwarzania/z _Tematu"
 

-#: src/summaryview.c:460
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "Poka¿ ¼ród³_o"
 
 msgid "/_View/_Source"
 msgstr "Poka¿ ¼ród³_o"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "Ca³y nag³ówek"
 
 msgid "/_View/All _header"
 msgstr "Ca³y nag³ówek"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/_Drukuj..."
 
 msgid "/_Print..."
 msgstr "/_Drukuj..."
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/_Wybierz wszystkie"
 
 msgid "/Select _all"
 msgstr "/_Wybierz wszystkie"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Wybierz w±_tek"
 
 msgid "/Select t_hread"
 msgstr "/Wybierz w±_tek"
 

-#: src/summaryview.c:471
+#: src/summaryview.c:472

 msgid "M"
 msgstr "M"
 
 msgid "M"
 msgstr "M"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "No."
 msgstr "Nr"
 
 msgid "No."
 msgstr "Nr"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:481

 msgid "L"
 msgstr "L"
 
 msgid "L"
 msgstr "L"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "wszystkie wiadomo¶ci"
 
 msgid "all messages"
 msgstr "wszystkie wiadomo¶ci"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "wiadomo¶ci starsze ni¿ #"
 
 msgid "messages whose age is greater than #"
 msgstr "wiadomo¶ci starsze ni¿ #"
 

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "wiadomo¶ci nowsze ni¿ #"
 
 msgid "messages whose age is less than #"
 msgstr "wiadomo¶ci nowsze ni¿ #"
 

-#: src/summaryview.c:492
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "wiadomo¶ci które zawieraj± S w tre¶ci wiadomo¶ci"
 
 msgid "messages which contain S in the message body"
 msgstr "wiadomo¶ci które zawieraj± S w tre¶ci wiadomo¶ci"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "wiadomo¶ci które zawieraj± S w ca³ej wiadomo¶ci"
 
 msgid "messages which contain S in the whole message"
 msgstr "wiadomo¶ci które zawieraj± S w ca³ej wiadomo¶ci"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr "wiadomo¶ci skopiowane do S"
 
 msgid "messages carbon-copied to S"
 msgstr "wiadomo¶ci skopiowane do S"
 

-#: src/summaryview.c:495
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "wiadomo¶æ jest albo do: albo kopia: do S"
 
 msgid "message is either to: or cc: to S"
 msgstr "wiadomo¶æ jest albo do: albo kopia: do S"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "usuniête wiadomo¶ci"
 
 msgid "deleted messages"
 msgstr "usuniête wiadomo¶ci"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "wiadomo¶ci które zawieraj± S w polu nadawcy"
 
 msgid "messages which contain S in the Sender field"
 msgstr "wiadomo¶ci które zawieraj± S w polu nadawcy"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "prawdziwe je¶li \"S\" powiedzie siê"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "prawdziwe je¶li \"S\" powiedzie siê"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "wiadomo¶ci od u¿ytkownika S"
 
 msgid "messages originating from user S"
 msgstr "wiadomo¶ci od u¿ytkownika S"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "przekazane wiadomo¶ci"
 
 msgid "forwarded messages"
 msgstr "przekazane wiadomo¶ci"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "wiadomo¶ci które zawieraj± nag³ówek S"
 
 msgid "messages which contain header S"
 msgstr "wiadomo¶ci które zawieraj± nag³ówek S"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "wiadomo¶ci które zawieraj± S w polu nag³ówka"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "wiadomo¶ci które zawieraj± S w polu nag³ówka"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "wiadomo¶ci które zawieraj± S w nag³ówków w-odpowiedzi-na"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "wiadomo¶ci które zawieraj± S w nag³ówków w-odpowiedzi-na"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "zablokowane wiadomo¶ci"
 
 msgid "locked messages"
 msgstr "zablokowane wiadomo¶ci"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "wiadomo¶ci które s± w grupie S"
 
 msgid "messages which are in newsgroup S"
 msgstr "wiadomo¶ci które s± w grupie S"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "nowe wiadomo¶ci"
 
 msgid "new messages"
 msgstr "nowe wiadomo¶ci"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "stare wiadomo¶ci"
 
 msgid "old messages"
 msgstr "stare wiadomo¶ci"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "wiadomo¶ci na które odpowiedziano"
 
 msgid "messages which have been replied to"
 msgstr "wiadomo¶ci na które odpowiedziano"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "przeczytanych wiadomo¶ci"
 
 msgid "read messages"
 msgstr "przeczytanych wiadomo¶ci"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "wiadomo¶ci zawieraj±ce S w tytule"
 
 msgid "messages which contain S in subject"
 msgstr "wiadomo¶ci zawieraj±ce S w tytule"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "wiadomo¶ci których punktacja jest równa #"
 
 msgid "messages whose score is equal to #"
 msgstr "wiadomo¶ci których punktacja jest równa #"
 

-#: src/summaryview.c:512
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "wiadomo¶ci których punktacja jest wiêksza od #"
 
 msgid "messages whose score is greater than #"
 msgstr "wiadomo¶ci których punktacja jest wiêksza od #"
 

-#: src/summaryview.c:513
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "wiadomo¶ci których punktacja jest ni¿sza od #"
 
 msgid "messages whose score is lower than #"
 msgstr "wiadomo¶ci których punktacja jest ni¿sza od #"
 

-#: src/summaryview.c:514
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "wiadomo¶ci których wielko¶æ jest równa #"
 
 msgid "messages whose size is equal to #"
 msgstr "wiadomo¶ci których wielko¶æ jest równa #"
 

-#: src/summaryview.c:515
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "wiadomo¶ci których wielko¶æ jest wiêksza od #"
 
 msgid "messages whose size is greater than #"
 msgstr "wiadomo¶ci których wielko¶æ jest wiêksza od #"
 

-#: src/summaryview.c:516
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "wiadomo¶ci których wielko¶æ jest mniejsza od #"
 
 msgid "messages whose size is smaller than #"
 msgstr "wiadomo¶ci których wielko¶æ jest mniejsza od #"
 

-#: src/summaryview.c:517
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "wiadomosci które zosta³y wys³ane do S"
 
 msgid "messages which have been sent to S"
 msgstr "wiadomosci które zosta³y wys³ane do S"
 

-#: src/summaryview.c:518
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "zaznaczone wiadomo¶ci"
 
 msgid "marked messages"
 msgstr "zaznaczone wiadomo¶ci"
 

-#: src/summaryview.c:519
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "nieprzeczytane wiadomo¶ci"
 
 msgid "unread messages"
 msgstr "nieprzeczytane wiadomo¶ci"
 

-#: src/summaryview.c:520
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "wiadomo¶ci zawieraj±ce S w nag³ówku Referencje"
 
 msgid "messages which contain S in References header"
 msgstr "wiadomo¶ci zawieraj±ce S w nag³ówku Referencje"
 

-#: src/summaryview.c:521
+#: src/summaryview.c:522

 msgid "messages returning 0 when passed to command"
 msgstr ""
 
 msgid "messages returning 0 when passed to command"
 msgstr ""
 

-#: src/summaryview.c:522
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "wiadomo¶ci zawieraj±ce S w nag³ówku X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "wiadomo¶ci zawieraj±ce S w nag³ówku X-Label"
 

-#: src/summaryview.c:524
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "operator logiczny AND (I/Oraz)"
 
 msgid "logical AND operator"
 msgstr "operator logiczny AND (I/Oraz)"
 

-#: src/summaryview.c:525
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "operator logiczny LUB"
 
 msgid "logical OR operator"
 msgstr "operator logiczny LUB"
 

-#: src/summaryview.c:526
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "logiczny operator NIE"
 
 msgid "logical NOT operator"
 msgstr "logiczny operator NIE"
 

-#: src/summaryview.c:527
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "szukanie z rozró¿nieniem na wielko¶æ liter"
 
 msgid "case sensitive search"
 msgstr "szukanie z rozró¿nieniem na wielko¶æ liter"
 

-#: src/summaryview.c:534
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "Symbole rozszerzonego wyszukiwania"
 
 msgid "Extended Search symbols"
 msgstr "Symbole rozszerzonego wyszukiwania"
 

-#: src/summaryview.c:584
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "W³±cz/Wy³±cz pasek szybkiego wyszukiwania"
 
 msgid "Toggle quick-search bar"
 msgstr "W³±cz/Wy³±cz pasek szybkiego wyszukiwania"
 

-#: src/summaryview.c:668
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "Rozszerzone znaki"
 
 msgid "Extended Symbols"
 msgstr "Rozszerzone znaki"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Znacznik procesu"
 
 msgid "Process mark"
 msgstr "Znacznik procesu"
 

-#: src/summaryview.c:934
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr "Niektóre znaki s± pozostawione. Przefiltrowaæ?"
 
 msgid "Some marks are left. Process it?"
 msgstr "Niektóre znaki s± pozostawione. Przefiltrowaæ?"
 

-#: src/summaryview.c:977
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 

-#: src/summaryview.c:1400 src/summaryview.c:1444
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "Brak nieprzeczytanych wiadomo¶ci"
 
 msgid "No more unread messages"
 msgstr "Brak nieprzeczytanych wiadomo¶ci"
 

-#: src/summaryview.c:1401
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "Nie znaleziono nieprzeczytanych wiadomo¶ci. Szukaæ od koñca?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Nie znaleziono nieprzeczytanych wiadomo¶ci. Szukaæ od koñca?"
 

-#: src/summaryview.c:1413 src/summaryview.c:1457
-msgid ""
-"Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
+#: src/summaryview.c:1416 src/summaryview.c:1460
+msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"

 msgstr ""
 "B³±d wewnêtrzny: niespodziewana warto¶æ w prefs_common."
 "next_unread_msg_dialog\n"
 
 msgstr ""
 "B³±d wewnêtrzny: niespodziewana warto¶æ w prefs_common."
 "next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1421
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomo¶ci"
 
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomo¶ci"
 

-#: src/summaryview.c:1445
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "Nie znaleziono nieprzeczytanych wiadomo¶ci. I¶æ do nastêpnego folderu?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Nie znaleziono nieprzeczytanych wiadomo¶ci. I¶æ do nastêpnego folderu?"
 

-#: src/summaryview.c:1487 src/summaryview.c:1511
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "Brak nowych wiadomo¶ci"
 
 msgid "No more new messages"
 msgstr "Brak nowych wiadomo¶ci"
 

-#: src/summaryview.c:1488
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "Nie znaleziono nowych wiadomo¶ci. Szukaæ od koñca?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Nie znaleziono nowych wiadomo¶ci. Szukaæ od koñca?"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "Brak nowych wiadomo¶ci."
 
 msgid "No new messages."
 msgstr "Brak nowych wiadomo¶ci."
 

-#: src/summaryview.c:1512
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "Nie znaleziono nowych wiadomo¶ci. I¶æ do nastêpnego folderu?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Nie znaleziono nowych wiadomo¶ci. I¶æ do nastêpnego folderu?"
 

-#: src/summaryview.c:1514
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "Szukaj ponownie"
 
 msgid "Search again"
 msgstr "Szukaj ponownie"
 

-#: src/summaryview.c:1543 src/summaryview.c:1568
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "Brak zaznaczonych wiadomo¶ci"
 
 msgid "No more marked messages"
 msgstr "Brak zaznaczonych wiadomo¶ci"
 

-#: src/summaryview.c:1544
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "Nie znaleziono zaznaczonych wiadomo¶ci. Szukaæ od koñca?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Nie znaleziono zaznaczonych wiadomo¶ci. Szukaæ od koñca?"
 

-#: src/summaryview.c:1553 src/summaryview.c:1578
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomo¶ci"
 
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomo¶ci"
 

-#: src/summaryview.c:1569
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "Nie znaleziono zaznaczonych wiadomo¶ci. Szukaæ od pocz±tku?"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nie znaleziono zaznaczonych wiadomo¶ci. Szukaæ od pocz±tku?"
 

-#: src/summaryview.c:1593 src/summaryview.c:1618
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "Brak kolorowanych wiadomo¶ci"
 
 msgid "No more labeled messages"
 msgstr "Brak kolorowanych wiadomo¶ci"
 

-#: src/summaryview.c:1594
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "Nie znaleziono kolorowanych wiadomo¶ci. Szukaæ od koñca?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Nie znaleziono kolorowanych wiadomo¶ci. Szukaæ od koñca?"
 

-#: src/summaryview.c:1603 src/summaryview.c:1628
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "Brak kolorowanych wiadomo¶ci"
 
 msgid "No labeled messages."
 msgstr "Brak kolorowanych wiadomo¶ci"
 

-#: src/summaryview.c:1619
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Brak kolorowanych wiadomo¶ci. Szukaæ od pocz±tku?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Brak kolorowanych wiadomo¶ci. Szukaæ od pocz±tku?"
 

-#: src/summaryview.c:1832
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "£±czenie wiadomo¶ci wg tematu..."
 
 msgid "Attracting messages by subject..."
 msgstr "£±czenie wiadomo¶ci wg tematu..."
 

-#: src/summaryview.c:1979
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d usuniêto"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d usuniêto"
 

-#: src/summaryview.c:1983
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 

-#: src/summaryview.c:1984 src/summaryview.c:1991
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 

-#: src/summaryview.c:2004
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr " element wybrany"
 
 msgid " item selected"
 msgstr " element wybrany"
 

-#: src/summaryview.c:2006
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr " elementów wybrano"
 
 msgid " items selected"
 msgstr " elementów wybrano"
 

-#: src/summaryview.c:2022
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 

-#: src/summaryview.c:2196
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 

-#: src/summaryview.c:2266
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomo¶ci..."
 
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomo¶ci..."
 

-#: src/summaryview.c:2395
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(Bez daty)"
 
 msgid "(No Date)"
 msgstr "(Bez daty)"
 

-#: src/summaryview.c:3022
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Nie jeste¶ autorem artyku³u\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Nie jeste¶ autorem artyku³u\n"
 

-#: src/summaryview.c:3109
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "Usuñ wiadomo¶æ(-ci)"
 
 msgid "Delete message(s)"
 msgstr "Usuñ wiadomo¶æ(-ci)"
 

-#: src/summaryview.c:3110
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdê chcesz usun±æ wiadomo¶æ(-ci) z wysypiska?"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdê chcesz usun±æ wiadomo¶æ(-ci) z wysypiska?"
 

-#: src/summaryview.c:3152
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomo¶ci..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomo¶ci..."
 

-#: src/summaryview.c:3266
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "Folder docelowy taki sam jak bie¿±cy."
 
 msgid "Destination is same as current folder."
 msgstr "Folder docelowy taki sam jak bie¿±cy."
 

-#: src/summaryview.c:3343
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "Folder docelowy taki sam jak bie¿±cy."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Folder docelowy taki sam jak bie¿±cy."
 

-#: src/summaryview.c:3393
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Wybieranie wszystkich wiadomo¶ci"
 
 msgid "Selecting all messages..."
 msgstr "Wybieranie wszystkich wiadomo¶ci"
 

-#: src/summaryview.c:3451
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "Dodaj lub Nadpisz"
 
 msgid "Append or Overwrite"
 msgstr "Dodaj lub Nadpisz"
 

-#: src/summaryview.c:3452
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "Dodaæ do, czy nadpisaæ istniej±cy plik?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Dodaæ do, czy nadpisaæ istniej±cy plik?"
 

-#: src/summaryview.c:3453
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "Dodaj"
 
 msgid "Append"
 msgstr "Dodaj"
 

-#: src/summaryview.c:3744
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "Tworzenie w±tków..."
 
 msgid "Building threads..."
 msgstr "Tworzenie w±tków..."
 

-#: src/summaryview.c:3842
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "Odw±tkowanie..."
 
 msgid "Unthreading..."
 msgstr "Odw±tkowanie..."
 

-#: src/summaryview.c:3975
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "Nie zdefiniowana regu³ filtrowania."
 
 msgid "No filter rules defined."
 msgstr "Nie zdefiniowana regu³ filtrowania."
 

-#: src/summaryview.c:3984
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "Filtowanie..."
 
 msgid "Filtering..."
 msgstr "Filtowanie..."
 

-#: src/summaryview.c:5330
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8117,139 +8326,142 @@ msgstr ""
 "B³±d regularnego wyra¿enia (regexp):\n"
 "%s"
 
 "B³±d regularnego wyra¿enia (regexp):\n"
 "%s"
 

-#: src/textview.c:570
+#: src/textview.c:574

 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomo¶æ nie mo¿e byæ wy¶wietlona.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomo¶æ nie mo¿e byæ wy¶wietlona.\n"
 

-#: src/textview.c:587
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr ""
 
 msgid "The following can be performed on this part by "
 msgstr ""
 

-#: src/textview.c:588
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "prawe klikniêcie na ikonie lub elemencie listy:\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "prawe klikniêcie na ikonie lub elemencie listy:\n"
 

-#: src/textview.c:590
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Aby zapisaæ 'Zapisz jako...' (Skrót klawiszowy: 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Aby zapisaæ 'Zapisz jako...' (Skrót klawiszowy: 'y')\n"
 

-#: src/textview.c:591
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Aby wy¶wietliæ jako tekst wybierz 'Wy¶wietl jako tekst' "
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Aby wy¶wietliæ jako tekst wybierz 'Wy¶wietl jako tekst' "
 

-#: src/textview.c:592
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(Skrót klawiszowy: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(Skrót klawiszowy: 't')\n"
 

-#: src/textview.c:593
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    Aby otworzyæ w zewnêtrznym programie wybierz 'Otwórz' "
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    Aby otworzyæ w zewnêtrznym programie wybierz 'Otwórz' "
 

-#: src/textview.c:594
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Skrót klawiszowy: 'l'),\n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Skrót klawiszowy: 'l'),\n"
 

-#: src/textview.c:595
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (mo¿na równie¿ podwójnie klikn±æ, lub klikn±æ ¶rodkowym"
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (mo¿na równie¿ podwójnie klikn±æ, lub klikn±æ ¶rodkowym"
 

-#: src/textview.c:596
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "przyciskiem myszy),\n"
 
 msgid "mouse button),\n"
 msgstr "przyciskiem myszy),\n"
 

-#: src/textview.c:597
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    lub 'Otwórz z...' (Skrót klawiszowy: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    lub 'Otwórz z...' (Skrót klawiszowy: 'o')\n"
 

-#: src/textview.c:1859
+#: src/textview.c:1957

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"

-"the apparent URL (%s).  \n"
+"the apparent URL (%s).\n"

 "Open it anyway?"
 msgstr ""
 "Open it anyway?"
 msgstr ""

+"Prawdziwy adres URL (%s) jest inny ni¿\n"
+"widoczny URL (%s).\n"
+"Czy na pewno chcesz go otworzyæ?"

 
 

-#: src/toolbar.c:157 src/toolbar.c:1559
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "Pobiera now± pocztê ze wszystkich kont"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Pobiera now± pocztê ze wszystkich kont"
 

-#: src/toolbar.c:158 src/toolbar.c:1565
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "Odbiera now± pocztê z bie¿±cego konta"
 
 msgid "Receive Mail on current Account"
 msgstr "Odbiera now± pocztê z bie¿±cego konta"
 

-#: src/toolbar.c:159 src/toolbar.c:1571
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Wysy³a wiadomo¶æ(-ci) z kolejki"
 
 msgid "Send Queued Message(s)"
 msgstr "Wysy³a wiadomo¶æ(-ci) z kolejki"
 

-#: src/toolbar.c:160 src/toolbar.c:1584
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "Tworzenie nowej wiadomo¶ci e-mail"
 
 msgid "Compose Email"
 msgstr "Tworzenie nowej wiadomo¶ci e-mail"
 

-#: src/toolbar.c:161 src/toolbar.c:1588
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "Tworzenie nowego posta"
 
 msgid "Compose News"
 msgstr "Tworzenie nowego posta"
 

-#: src/toolbar.c:162 src/toolbar.c:1594
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "Odpowiedz na wiadomo¶æ"
 
 msgid "Reply to Message"
 msgstr "Odpowiedz na wiadomo¶æ"
 

-#: src/toolbar.c:163 src/toolbar.c:1615
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "Odpowiedz nadawcy"
 
 msgid "Reply to Sender"
 msgstr "Odpowiedz nadawcy"
 

-#: src/toolbar.c:164 src/toolbar.c:1636
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "Odpowiedz wszystkim"
 
 msgid "Reply to All"
 msgstr "Odpowiedz wszystkim"
 

-#: src/toolbar.c:165 src/toolbar.c:1657
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "Odpowiedz Grupie Mailingowej"
 
 msgid "Reply to Mailing-list"
 msgstr "Odpowiedz Grupie Mailingowej"
 

-#: src/toolbar.c:166 src/toolbar.c:1678
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "Przeka¿ wiadomo¶æ"
 
 msgid "Forward Message"
 msgstr "Przeka¿ wiadomo¶æ"
 

-#: src/toolbar.c:167 src/toolbar.c:1699
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "Usuñ wiadomo¶æ"
 
 msgid "Delete Message"
 msgstr "Usuñ wiadomo¶æ"
 

-#: src/toolbar.c:169 src/toolbar.c:1711
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "Przejd¼ do nastêpnej wiadomo¶ci"
 
 msgid "Goto Next Message"
 msgstr "Przejd¼ do nastêpnej wiadomo¶ci"
 

-#: src/toolbar.c:173 src/toolbar.c:1719
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "Wy¶lij wiadomo¶æ"
 
 msgid "Send Message"
 msgstr "Wy¶lij wiadomo¶æ"
 

-#: src/toolbar.c:174 src/toolbar.c:1725
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "Umie¶æ w katalogu kolejki i wy¶lij pó¼niej"
 
 msgid "Put into queue folder and send later"
 msgstr "Umie¶æ w katalogu kolejki i wy¶lij pó¼niej"
 

-#: src/toolbar.c:175 src/toolbar.c:1731
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "Zapisuje wiadomo¶æ w katalogu szablonów"
 
 msgid "Save to draft folder"
 msgstr "Zapisuje wiadomo¶æ w katalogu szablonów"
 

-#: src/toolbar.c:176 src/toolbar.c:1737
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "Wstaw plik"
 
 msgid "Insert file"
 msgstr "Wstaw plik"
 

-#: src/toolbar.c:177 src/toolbar.c:1743
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "Do³±cz plik"
 
 msgid "Attach file"
 msgstr "Do³±cz plik"
 

-#: src/toolbar.c:178 src/toolbar.c:1749
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "Wstaw podpis"
 
 msgid "Insert signature"
 msgstr "Wstaw podpis"
 

-#: src/toolbar.c:179 src/toolbar.c:1755
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "Edytuj w zewnêtrznym edytorze"
 
 msgid "Edit with external editor"
 msgstr "Edytuj w zewnêtrznym edytorze"
 

-#: src/toolbar.c:180 src/toolbar.c:1761
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie d³ugie linie"
 
 msgid "Wrap all long lines"
 msgstr "Zawijaj wszystkie d³ugie linie"
 

-#: src/toolbar.c:183 src/toolbar.c:1774
+#: src/toolbar.c:183 src/toolbar.c:1550

 msgid "Check spelling"
 msgstr "Sprawd¼ pisowniê"
 
 msgid "Check spelling"
 msgstr "Sprawd¼ pisowniê"
 


@@ -8289,63 +8501,88 @@ msgstr "/Odpowiedz nadawc_y z cytatem"
 msgid "/_Reply to sender without quote"
 msgstr "/Odpowiedz nadawc_y bez cytatu"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Odpowiedz nadawc_y bez cytatu"
 

-#: src/toolbar.c:225
-msgid "/_Forward message (inline style)"
-msgstr "/_Przeka¿ wiadomo¶æ (jako tekst wiadomo¶ci)"
-

 #: src/toolbar.c:226
 #: src/toolbar.c:226

-msgid "/Forward message as _attachment"
-msgstr "/Przeka¿ jako z_a³±cznik"
+msgid "/For_ward as attachment"
+msgstr "Prz_eka¿ jako za³±cznik"
+
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/Prze_kieruj"

 
 

-#: src/toolbar.c:371
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "Pobierz"
 
 msgid "Get"
 msgstr "Pobierz"
 

-#: src/toolbar.c:372
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "Pobierz wszystkie"
 
 msgid "Get All"
 msgstr "Pobierz wszystkie"
 

-#: src/toolbar.c:375
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "Email"
 
 msgid "Email"
 msgstr "Email"
 

-#: src/toolbar.c:377 src/toolbar.c:469
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "Odpowied¼"
 
 msgid "Reply"
 msgstr "Odpowied¼"
 

-#: src/toolbar.c:378 src/toolbar.c:470
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "Wszystkie"
 
 msgid "All"
 msgstr "Wszystkie"
 

-#: src/toolbar.c:379 src/toolbar.c:471
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "Nadawca"
 
 msgid "Sender"
 msgstr "Nadawca"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "Wy¶lij pó¼niej"
 
 msgid "Send later"
 msgstr "Wy¶lij pó¼niej"
 

-#: src/toolbar.c:423
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "Szablon"
 
 msgid "Draft"
 msgstr "Szablon"
 

-#: src/toolbar.c:426
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "Za³±cznik"
 
 #: src/toolbar.c:430
 msgid "Attach"
 msgstr "Za³±cznik"
 
 #: src/toolbar.c:430

+msgid "Editor"
+msgstr "Edytor"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "Zawijanie wierszy"
 
 msgid "Linewrap"
 msgstr "Zawijanie wierszy"
 

-#: src/toolbar.c:1576
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "News"
 
 msgid "News"
 msgstr "News"
 

-#~ msgid "/S_coring..."
+#~ msgid "/_Scoring..."

 #~ msgstr "/_Punktowanie..."
 
 #~ msgstr "/_Punktowanie..."
 

-#~ msgid "Go offline"
-#~ msgstr "Pracuj w trybie od³±czenia od sieci"
+#~ msgid "/_Message/Get new ma_il"
+#~ msgstr "/Wiado_mo¶æ/Pob_ierz now± pocztê "
+
+#~ msgid "Icon theme"
+#~ msgstr "Skórka ikonek"
+
+#~ msgid "Text"
+#~ msgstr "Tekst"
+
+#~ msgid "Small"
+#~ msgstr "Ma³a"
+
+#~ msgid "Normal"
+#~ msgstr "Normalna"
+
+#~ msgid "/_Forward message (inline style)"
+#~ msgstr "/_Przeka¿ wiadomo¶æ (jako tekst wiadomo¶ci)"
+
+#~ msgid "/Forward message as _attachment"
+#~ msgstr "/Przeka¿ jako z_a³±cznik"
+
+#~ msgid "/S_coring..."
+#~ msgstr "/_Punktowanie..."

 
 #~ msgid "Go online"
 #~ msgstr "Pracuj w trybie po³±czonego do sieci"
 
 #~ msgid "Go online"
 #~ msgstr "Pracuj w trybie po³±czonego do sieci"


@@ -8386,9 +8623,6 @@ msgstr "News"
 #~ msgid "Different results for signatures"
 #~ msgstr "Ró¿ne wyniki dla podpisów"
 
 #~ msgid "Different results for signatures"
 #~ msgstr "Ró¿ne wyniki dla podpisów"
 

-#~ msgid "Error: Unknown status"
-#~ msgstr "B³±d: Nieznany stan"
-

 #~ msgid "Good signature from \"%s\" but it has expired"
 #~ msgstr "Poprawny podpis od \"%s\", ale ju¿ wygas³"
 
 #~ msgid "Good signature from \"%s\" but it has expired"
 #~ msgstr "Poprawny podpis od \"%s\", ale ju¿ wygas³"
 


@@ -8431,9 +8665,6 @@ msgstr "News"
 #~ msgid "Enable"
 #~ msgstr "W³±czone"
 
 #~ msgid "Enable"
 #~ msgstr "W³±czone"
 

-#~ msgid "Enable SpamAssassin filtering"
-#~ msgstr "W³±cza filtrowanie SpamAssassin"
-

 #~ msgid "Incorporate from spool"
 #~ msgstr "Inkorporacja z Spool"
 
 #~ msgid "Incorporate from spool"
 #~ msgstr "Inkorporacja z Spool"
 


@@ -8466,3 +8697,4 @@ msgstr "News"
 
 #~ msgid "Receive Spam"
 #~ msgstr "Pobieraj Spam"
 
 #~ msgid "Receive Spam"
 #~ msgstr "Pobieraj Spam"

+

diff --git a/po/sk.po b/po/sk.po
index 89c89baec29ef0eeaa8a8f01dd6a56446a803598..47395c520ffee8d6ee80501db569fa363b11bcad 100644 (file)
--- a/po/sk.po
+++ b/po/sk.po
@@ -1,20 +1,20 @@
 # translation of sylpheed-claws to Slovak
 # Copyright (C) 2003 Andrej Kacian (applies only for msgstr fields)
 # This file is distributed under the same license as the sylpheed-claws package.
 # translation of sylpheed-claws to Slovak
 # Copyright (C) 2003 Andrej Kacian (applies only for msgstr fields)
 # This file is distributed under the same license as the sylpheed-claws package.

-# Andrej Kacian <andrej@kacian.sk>, 2003.
+# Andrej Kacian <andrej@kacian.sk>, 2003, 2004.

 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: twb@users.sourceforge.net\n"

-"POT-Creation-Date: 2003-12-18 05:54+0000\n"
-"PO-Revision-Date: 2003-12-18 11:49+0100\n"
+"POT-Creation-Date: 2004-02-05 07:38+0000\n"
+"PO-Revision-Date: 2004-02-06 02:40+0100\n"

 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: KBabel 1.0.2\n"
+"X-Generator: KBabel 1.2\n"

 
 #: src/account.c:312
 msgid ""
 
 #: src/account.c:312
 msgid ""


@@ -37,7 +37,7 @@ msgstr ""
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
 "pri voľbe 'Prijať všetko', zatrhnite políčko v stĺpci označenom 'G'."
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635

-#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -45,7 +45,7 @@ msgstr ""
 msgid "Name"
 msgstr "Meno"
 
 msgid "Name"
 msgstr "Meno"
 

-#: src/account.c:602 src/prefs_account.c:928
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "Protokol"
 
 msgid "Protocol"
 msgstr "Protokol"
 


@@ -91,10 +91,10 @@ msgstr "Nahor"
 msgid " Set as default account "
 msgstr "Nastaviť ako východzie konto"
 
 msgid " Set as default account "
 msgstr "Nastaviť ako východzie konto"
 

-#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008

 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196

-#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691

 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Zavrieť"
 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "Zavrieť"


@@ -117,25 +117,27 @@ msgid "Do you really want to delete this account?"
 msgstr "Naozaj chcete zmazať toto konto?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
 msgstr "Naozaj chcete zmazať toto konto?"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265

-#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
-#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
-#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
-#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "Áno"
 
 msgid "Yes"
 msgstr "Áno"
 

-#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+Nie"
 
 msgid "+No"
 msgstr "+Nie"
 


@@ -152,7 +154,7 @@ msgstr "Nemôžem získať časť správy."
 msgid "Can't get part of multipart message"
 msgstr "Nemôžem získať časť viacdielnej správy"
 
 msgid "Can't get part of multipart message"
 msgstr "Nemôžem získať časť viacdielnej správy"
 

-#: src/action.c:488
+#: src/action.c:495

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"


@@ -161,7 +163,7 @@ msgstr ""
 "Zvolená akcia nemôže byť použitá v okne písania správy,\n"
 "pretože obsahuje %%f, %%F, %%as alebo %%p."
 
 "Zvolená akcia nemôže byť použitá v okne písania správy,\n"
 "pretože obsahuje %%f, %%F, %%as alebo %%p."
 

-#: src/action.c:776
+#: src/action.c:783

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -170,7 +172,7 @@ msgstr ""
 "Príkaz nemohol byť spustený, nepodarilo sa vytvoriť rúru.\n"
 "%s"
 
 "Príkaz nemohol byť spustený, nepodarilo sa vytvoriť rúru.\n"
 "%s"
 

-#: src/action.c:861
+#: src/action.c:868

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -181,33 +183,33 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1088
+#: src/action.c:1095

 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Beží: %s\n"
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr "--- Beží: %s\n"
 

-#: src/action.c:1092
+#: src/action.c:1099

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr "--- Ukončené: %s\n"
 

-#: src/action.c:1128
+#: src/action.c:1135

 msgid "Action's input/output"
 msgstr "Vstup/výstup akcie"
 
 msgid "Action's input/output"
 msgstr "Vstup/výstup akcie"
 

-#: src/action.c:1174
+#: src/action.c:1181

 msgid " Send "
 msgstr " Odoslať "
 
 msgid " Send "
 msgstr " Odoslať "
 

-#: src/action.c:1194
+#: src/action.c:1201

 msgid "Completed %v/%u"
 msgstr "Dokončené %v/%u"
 
 msgid "Completed %v/%u"
 msgstr "Dokončené %v/%u"
 

-#: src/action.c:1204
+#: src/action.c:1211

 msgid "Abort"
 msgstr "Ukončiť"
 
 msgid "Abort"
 msgstr "Ukončiť"
 

-#: src/action.c:1353
+#: src/action.c:1360

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -218,11 +220,11 @@ msgstr ""
 "('%%h' bude nahradené parametrom)\n"
 "  %s"
 
 "('%%h' bude nahradené parametrom)\n"
 "  %s"
 

-#: src/action.c:1358
+#: src/action.c:1365

 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľom zadaný parameter"
 
 msgid "Action's hidden user argument"
 msgstr "Skrytý používateľom zadaný parameter"
 

-#: src/action.c:1362
+#: src/action.c:1369

 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 #, c-format
 msgid ""
 "Enter the argument for the following action:\n"


@@ -233,7 +235,7 @@ msgstr ""
 "('%%u' bude nahradené parametrom)\n"
 "  %s"
 
 "('%%u' bude nahradené parametrom)\n"
 "  %s"
 

-#: src/action.c:1367
+#: src/action.c:1374

 msgid "Action's user argument"
 msgstr "Používateľom zadaný parameter"
 
 msgid "Action's user argument"
 msgstr "Používateľom zadaný parameter"
 


@@ -241,7 +243,7 @@ msgstr "Používateľom zadaný parameter"
 msgid "Add to address book"
 msgstr "Pridať do adresára"
 
 msgid "Add to address book"
 msgstr "Pridať do adresára"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "Adresár"
 
 msgid "Address"
 msgstr "Adresár"
 


@@ -255,7 +257,7 @@ msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
 msgstr "Vyberte priečinok adresára"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190

-#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193


@@ -263,10 +265,10 @@ msgstr "Vyberte priečinok adresára"
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313


@@ -275,7 +277,7 @@ msgid "OK"
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgstr "OK"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -283,18 +285,19 @@ msgstr "OK"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314

-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
-#: src/summaryview.c:3453
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "Storno"
 
 msgid "Cancel"
 msgstr "Storno"
 

-#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435

 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Súbor"
 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/_Súbor"


@@ -315,8 +318,8 @@ msgstr "/_Súbor/Nový _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 
 msgid "/_File/New _Server"
 msgstr "/_Súbor/Nový _Server"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
-#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454

 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/_Súbor/---"


@@ -333,12 +336,12 @@ msgstr "/_Súbor/Z_mazať"
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 

-#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/_Upraviť"
 
 msgid "/_Edit"
 msgstr "/_Upraviť"
 


@@ -346,17 +349,17 @@ msgstr "/_Upraviť"
 msgid "/_Edit/C_ut"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
 msgid "/_Edit/C_ut"
 msgstr "/Úp_ravy/_Vystrihnúť"
 

-#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459

 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 

-#: src/addressbook.c:381 src/compose.c:520
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 

-#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
-#: src/mainwindow.c:452 src/messageview.c:152
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 
 msgid "/_Edit/---"
 msgstr "/Úp_ravy/---"
 


@@ -392,10 +395,10 @@ msgstr "/_Adresa/_Upraviť"
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
-#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
-#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
-#: src/messageview.c:284
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 
 msgid "/_Tools/---"
 msgstr "/_Nástroje/---"
 


@@ -419,13 +422,13 @@ msgstr "/_Nástroje/Exportovať _HTML..."
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Nástroje/Exportovať súbor L_DIF"
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Nástroje/Exportovať súbor L_DIF"
 

-#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
-#: src/messageview.c:287
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/_Pomocník"
 
 msgid "/_Help"
 msgstr "/_Pomocník"
 

-#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
-#: src/messageview.c:288
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/_Pomocník/_O programe"
 
 msgid "/_Help/_About"
 msgstr "/_Pomocník/_O programe"
 


@@ -442,19 +445,19 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
-#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
-#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
-#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
-#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
-#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
-#: src/summaryview.c:465
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303
+#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/Z_mazať"
 
 msgid "/_Delete"
 msgstr "/Z_mazať"
 


@@ -479,7 +482,8 @@ msgid "/_Browse Entry"
 msgstr "/P_rehliadať položky"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/P_rehliadať položky"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "Neznáma"
 
 msgid "Unknown"
 msgstr "Neznáma"
 


@@ -563,8 +567,8 @@ msgstr "LDAP vyhľadávanie bolo ukončené na požiadavku používateľa"
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 

-#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
-#: src/toolbar.c:1767
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 msgid "Address book"
 msgstr "Otvoriť adresár"
 


@@ -578,7 +582,7 @@ msgstr "Meno:"
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781

-#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "Zmazať"
 
 msgid "Delete"
 msgstr "Zmazať"
 


@@ -586,18 +590,18 @@ msgstr "Zmazať"
 msgid "Lookup"
 msgstr "Vyhľadať"
 
 msgid "Lookup"
 msgstr "Vyhľadať"
 

-#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
-#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Komu:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Komu:"
 

-#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Kópia:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Kópia:"
 

-#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 


@@ -614,16 +618,18 @@ msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "Naozaj zmazať adresu(y)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
-#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "Nie"
 
 msgid "No"
 msgstr "Nie"
 


@@ -731,7 +737,7 @@ msgstr "Prehľadávam..."
 msgid "Search '%s'"
 msgstr "Vyhľadať  '%s'"
 
 msgid "Search '%s'"
 msgstr "Vyhľadať  '%s'"
 

-#: src/addressbook.c:3794 src/prefs_common.c:984
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "Ovládanie"
 
 msgid "Interface"
 msgstr "Ovládanie"
 


@@ -752,8 +758,8 @@ msgstr "E-mailová adresa"
 msgid "Group"
 msgstr "Skupina"
 
 msgid "Group"
 msgstr "Skupina"
 

-#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
-#: src/prefs_account.c:2126
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Priečinok"
 
 msgid "Folder"
 msgstr "Priečinok"
 


@@ -831,8 +837,8 @@ msgstr "Názov hlavičky"
 msgid "Address Count"
 msgstr "Počet adries"
 
 msgid "Address Count"
 msgstr "Počet adries"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
-#: src/sgpgme.c:279 src/textview.c:1863
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "Varovanie"
 
 msgid "Warning"
 msgstr "Varovanie"
 


@@ -861,12 +867,12 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
 msgid "Personal address"
 msgstr "Súkromná adresa"
 

-#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "Upozornenie"
 
 msgid "Notice"
 msgstr "Upozornenie"
 

-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "Chyba"
 
 msgid "Error"
 msgstr "Chyba"
 


@@ -1003,7 +1009,7 @@ msgstr ""
 "(Vypnite voľbu \"%s\").\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(Vypnite voľbu \"%s\").\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1123
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Nezobrazovať upozornenie pri chybe pri prijímaní"
 


@@ -1028,6 +1034,10 @@ msgstr ""
 "\n"
 "Môže to znamenať, že odpovedá nepravý server."
 
 "\n"
 "Môže to znamenať, že odpovedá nepravý server."
 

+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "(Názov vymazaný kvôli RegExp)"
+

 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"
 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"


@@ -1048,355 +1058,355 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
 msgid "%.2fGB"
 msgstr "%.2fGB"
 

-#: src/compose.c:499
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/_Pridať..."
 
 msgid "/_Add..."
 msgstr "/_Pridať..."
 

-#: src/compose.c:500
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 

-#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
-#: src/folderview.c:333 src/folderview.c:351
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 

-#: src/compose.c:508
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 
 msgid "/_File/_Attach file"
 msgstr "/_Súbor/_Pripojiť súbor"
 

-#: src/compose.c:509
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 
 msgid "/_File/_Insert file"
 msgstr "/_Súbor/_Vložiť súbor"
 

-#: src/compose.c:510
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/_Súbor/V_ložiť podpis"
 

-#: src/compose.c:515
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 
 msgid "/_Edit/_Undo"
 msgstr "/Úp_ravy"
 

-#: src/compose.c:516
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 
 msgid "/_Edit/_Redo"
 msgstr "/Úp_ravy/Z_novu urobiť"
 

-#: src/compose.c:518
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 
 msgid "/_Edit/Cu_t"
 msgstr "/Úp_ravy/_Vystrihnúť"
 

-#: src/compose.c:521
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/Úp_ravy/Prilepiť ako _citáciu"
 

-#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 
 msgid "/_Edit/Select _all"
 msgstr "/Úp_ravy/Vy_brať všetko"
 

-#: src/compose.c:524
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/R_ozšírené"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/Úp_ravy/R_ozšírené"
 

-#: src/compose.c:525
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dozadu"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dozadu"
 

-#: src/compose.c:530
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dopredu"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o znak dopredu"
 

-#: src/compose.c:535
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dozadu"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dozadu"
 

-#: src/compose.c:540
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dopredu"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť o slovo dopredu"
 

-#: src/compose.c:545
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na začiatok riadku"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na začiatok riadku"
 

-#: src/compose.c:550
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na koniec riadku"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na koniec riadku"
 

-#: src/compose.c:555
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na predchodzí riadok"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na predchodzí riadok"
 

-#: src/compose.c:560
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na ďalší riadok"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/Úp_ravy/R_ozšírené/Presunúť na ďalší riadok"
 

-#: src/compose.c:565
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak naľavo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak naľavo od kurzora"
 

-#: src/compose.c:570
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak napravo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať znak napravo od kurzora"
 

-#: src/compose.c:575
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo naľavo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo naľavo od kurzora"
 

-#: src/compose.c:580
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo napravo od kurzora"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať slovo napravo od kurzora"
 

-#: src/compose.c:585
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 

-#: src/compose.c:590
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať riadok"
 

-#: src/compose.c:595
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať text do konca riadku"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/Úp_ravy/R_ozšírené/Zmazať text do konca riadku"
 

-#: src/compose.c:601
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/Úp_ravy/_Zalomiť aktuálny odstavec"
 

-#: src/compose.c:603
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/Úp_ravy/Zalomiť všetky _dlhé riadky"
 

-#: src/compose.c:605
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/Úp_ravy/Upraviť e_xterným editorom"
 

-#: src/compose.c:608
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/P_ravopis"
 
 msgid "/_Spelling"
 msgstr "/P_ravopis"
 

-#: src/compose.c:609
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/P_ravopis/_Skontrolovať všetko alebo výber"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/P_ravopis/_Skontrolovať všetko alebo výber"
 

-#: src/compose.c:611
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/P_ravopis/_Zvýrazniť všetky nesprávne slová"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/P_ravopis/_Zvýrazniť všetky nesprávne slová"
 

-#: src/compose.c:613
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/P_ravopis/_Spätne skontrolovať nesprávne slovo"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/P_ravopis/_Spätne skontrolovať nesprávne slovo"
 

-#: src/compose.c:615
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/P_ravopis/_Dopredu na ďalšie nesprávne slovo"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/P_ravopis/_Dopredu na ďalšie nesprávne slovo"
 

-#: src/compose.c:617
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/P_ravopis/---"
 
 msgid "/_Spelling/---"
 msgstr "/P_ravopis/---"
 

-#: src/compose.c:618
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/P_ravopis/_Nastavenie"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/P_ravopis/_Nastavenie"
 

-#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
-#: src/summaryview.c:457
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/_Zobraziť"
 
 msgid "/_View"
 msgstr "/_Zobraziť"
 

-#: src/compose.c:623
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 
 msgid "/_View/_To"
 msgstr "/_Zobraziť/_Komu"
 

-#: src/compose.c:624
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 
 msgid "/_View/_Cc"
 msgstr "/_Zobraziť/Kó_pia"
 

-#: src/compose.c:625
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 
 msgid "/_View/_Bcc"
 msgstr "/_Zobraziť/_Slepá kópia"
 

-#: src/compose.c:626
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 
 msgid "/_View/_Reply to"
 msgstr "/_Zobraziť/_Odpoveď komu"
 

-#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
-#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
-#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 
 msgid "/_View/---"
 msgstr "/_Zobraziť/---"
 

-#: src/compose.c:628
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
 msgid "/_View/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 

-#: src/compose.c:630
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 
 msgid "/_View/R_uler"
 msgstr "/_Zobraziť/P_ravítko"
 

-#: src/compose.c:632
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 
 msgid "/_View/_Attachment"
 msgstr "/_Zobraziť/Prí_lohy"
 

-#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/Sp_ráva"
 
 msgid "/_Message"
 msgstr "/Sp_ráva"
 

-#: src/compose.c:635
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/Sp_ráva/_Odoslať"
 
 msgid "/_Message/_Send"
 msgstr "/Sp_ráva/_Odoslať"
 

-#: src/compose.c:637
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 
 msgid "/_Message/Send _later"
 msgstr "/Sp_ráva/Odoslať _neskôr"
 

-#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
-#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
-#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
-#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 
 msgid "/_Message/---"
 msgstr "/Sp_ráva/---"
 

-#: src/compose.c:640
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/Sp_ráva/_Uložiť medzi koncepty"
 

-#: src/compose.c:642
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/Sp_ráva/Uložiť a _pokračovať v editácii"
 

-#: src/compose.c:646
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/Sp_ráva/_Komu"
 
 msgid "/_Message/_To"
 msgstr "/Sp_ráva/_Komu"
 

-#: src/compose.c:647
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/Sp_ráva/Kóp_ia"
 
 msgid "/_Message/_Cc"
 msgstr "/Sp_ráva/Kóp_ia"
 

-#: src/compose.c:648
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/Sp_ráva/_Slepá kópia"
 
 msgid "/_Message/_Bcc"
 msgstr "/Sp_ráva/_Slepá kópia"
 

-#: src/compose.c:649
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 
 msgid "/_Message/_Reply to"
 msgstr "/Sp_ráva/Odpo_vedať komu"
 

-#: src/compose.c:651
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 
 msgid "/_Message/_Followup to"
 msgstr "/_Zobraziť/O_dovzdať komu"
 

-#: src/compose.c:653
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/Sp_ráva/P_ripojiť"
 
 msgid "/_Message/_Attach"
 msgstr "/Sp_ráva/P_ripojiť"
 

-#: src/compose.c:657
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/Sp_ráva/Po_dpísať"
 
 msgid "/_Message/Si_gn"
 msgstr "/Sp_ráva/Po_dpísať"
 

-#: src/compose.c:658
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 
 msgid "/_Message/_Encrypt"
 msgstr "/Sp_ráva/_Zašifrovať"
 

-#: src/compose.c:659
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/Sp_ráva/Režim/MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/Sp_ráva/Režim/MIME"
 

-#: src/compose.c:660
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/Sp_ráva/Režim/Inline"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/Sp_ráva/Režim/Inline"
 

-#: src/compose.c:663
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/Sp_ráva/Pri_orita"
 
 msgid "/_Message/_Priority"
 msgstr "/Sp_ráva/Pri_orita"
 

-#: src/compose.c:664
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "/Sp_ráva/Pri_orita/Na_jvyššia"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "/Sp_ráva/Pri_orita/Na_jvyššia"
 

-#: src/compose.c:665
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/Sp_ráva/Pri_orita/_Vysoká"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/Sp_ráva/Pri_orita/_Vysoká"
 

-#: src/compose.c:666
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/Sp_ráva/Pri_orita/_Normálna"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/Sp_ráva/Pri_orita/_Normálna"
 

-#: src/compose.c:667
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/Sp_ráva/Pri_orita/Ní_zka"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/Sp_ráva/Pri_orita/Ní_zka"
 

-#: src/compose.c:668
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/Sp_ráva/Pri_orita/N_ajnižšia"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/Sp_ráva/Pri_orita/N_ajnižšia"
 

-#: src/compose.c:670
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/Sp_ráva/Vyžia_dať potvrdenie o príjme"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/Sp_ráva/Vyžia_dať potvrdenie o príjme"
 

-#: src/compose.c:671
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/Sp_ráva/Odstrániť od_kazy"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/Sp_ráva/Odstrániť od_kazy"
 

-#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "/_Nástroje"
 
 msgid "/_Tools"
 msgstr "/_Nástroje"
 

-#: src/compose.c:673
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/_Nástroje/Zobraziť _mierku"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Nástroje/Zobraziť _mierku"
 

-#: src/compose.c:674 src/messageview.c:262
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Nástroje/_Adresár"
 

-#: src/compose.c:675
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 
 msgid "/_Tools/_Template"
 msgstr "/_Nástroje/Ša_blóna"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Nástroje/A_kcie"
 

-#: src/compose.c:1435
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 

-#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Diskusné skupiny:"
 

-#: src/compose.c:1441
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "Followup-To:"
 
 msgid "Followup-To:"
 msgstr "Followup-To:"
 

-#: src/compose.c:1741
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 
 msgid "Quote mark format error."
 msgstr "Chyba v úvodzovkách."
 

-#: src/compose.c:1757
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 
 msgid "Message reply/forward format error."
 msgstr "Chyba formátu odpovede/preposielania."
 

-#: src/compose.c:2099
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Súbor %s je prázdny."
 

-#: src/compose.c:2103
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Nedá sa čítať %s."
 

-#: src/compose.c:2141
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Správa: %s"
 

-#: src/compose.c:2229
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 
 msgid "Encrypted message"
 msgstr "Zašifrovaná správa"
 

-#: src/compose.c:2230
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1404,21 +1414,21 @@ msgstr ""
 "Nemôžem upravovať zašifrovanú správu. \n"
 "Odstrániť zašifrovanú časť?"
 
 "Nemôžem upravovať zašifrovanú správu. \n"
 "Odstrániť zašifrovanú časť?"
 

-#: src/compose.c:2891
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr "[Upravené]"
 
 msgid " [Edited]"
 msgstr "[Upravené]"
 

-#: src/compose.c:2893
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Písanie správy%s"
 

-#: src/compose.c:2896
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "Písanie správy%s"
 

-#: src/compose.c:2920 src/compose.c:3169
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1426,24 +1436,24 @@ msgstr ""
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 
 "Nie je určené konto pre odosielanie správ.\n"
 "Pred odosielaním prosím zvoľte poštové konto."
 

-#: src/compose.c:3067
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 
 msgid "Recipient is not specified."
 msgstr "Nie je určený príjemca."
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
-#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "Odoslať"
 
 msgid "Send"
 msgstr "Odoslať"
 

-#: src/compose.c:3076
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Predmet je prázdny. Odoslať napriek tomu?"
 

-#: src/compose.c:3097
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie"
 
 msgid "Could not queue message for sending"
 msgstr "Nie je možné zaradiť správu do fronty na odoslanie"
 

-#: src/compose.c:3102
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1451,16 +1461,16 @@ msgstr ""
 "Správa bola zaradená do fronty, ale nebolo možné odoslať ju.\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 
 "Správa bola zaradená do fronty, ale nebolo možné odoslať ju.\n"
 "Použite \"Odoslať správy vo fronte\" z hlavného okna pre opätovný pokus."
 

-#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 

-#: src/compose.c:3199
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "Zaraďujem do fronty"
 
 msgid "Queueing"
 msgstr "Zaraďujem do fronty"
 

-#: src/compose.c:3200
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1468,24 +1478,24 @@ msgstr ""
 "Pri odosielaní správy nastala chyba.\n"
 "Chcete správu zaradiť do priečinka Na odoslanie?"
 
 "Pri odosielaní správy nastala chyba.\n"
 "Chcete správu zaradiť do priečinka Na odoslanie?"
 

-#: src/compose.c:3206
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 
 msgid "Can't queue the message."
 msgstr "Správa sa nedá zaradiť do fronty."
 

-#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 
 msgid "Error occurred while sending the message."
 msgstr "Pri odosielaní správy nastala chyba."
 

-#: src/compose.c:3222
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 
 msgid "Can't save the message to Sent."
 msgstr "Správa sa nedá uložiť medzi odoslané správy."
 

-#: src/compose.c:3467
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemôžem nájsť žiadny kľúč asociovaný so zvoleným ID kľúča `%s'."
 
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Nemôžem nájsť žiadny kľúč asociovaný so zvoleným ID kľúča `%s'."
 

-#: src/compose.c:3573
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1496,59 +1506,59 @@ msgstr ""
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 
 "%s na %s.\n"
 "Odoslať správu aj napriek tomu?"
 

-#: src/compose.c:3836
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie správ!"
 
 msgid "No account for sending mails available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie správ!"
 

-#: src/compose.c:3846
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie news článkov!"
 
 msgid "No account for posting news available!"
 msgstr "Nie je dostupné žiadne konto pre odosielanie news článkov!"
 

-#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "Od:"
 
 msgid "From:"
 msgstr "Od:"
 

-#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "MIME typ"
 
 msgid "MIME type"
 msgstr "MIME typ"
 

-#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "Veľkosť"
 
 msgid "Size"
 msgstr "Veľkosť"
 

-#: src/compose.c:4828
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "Uložiť správu do "
 
 msgid "Save Message to "
 msgstr "Uložiť správu do "
 

-#: src/compose.c:4848 src/prefs_filtering_action.c:420
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr "Zvoľte ..."
 
 msgid "Select ..."
 msgstr "Zvoľte ..."
 

-#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Hlavička"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Hlavička"
 

-#: src/compose.c:4986
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "Prílohy"
 
 msgid "Attachments"
 msgstr "Prílohy"
 

-#: src/compose.c:4988
+#: src/compose.c:4984

 msgid "Others"
 msgstr "Ostatné"
 
 msgid "Others"
 msgstr "Ostatné"
 

-#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Predmet:"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Predmet:"
 

-#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "Žiadna"
 
 msgid "None"
 msgstr "Žiadna"
 

-#: src/compose.c:5247
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1592,24 +1602,26 @@ msgstr ""
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 
 "Ukončiť ho násilne?\n"
 "skupinový ID procesu: %d"
 

-#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "Offline varovanie"
 
 msgid "Offline warning"
 msgstr "Offline varovanie"
 

-#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr "Pracujete offline. Pripojiť sa?"
 
 msgid "You're working offline. Override?"
 msgstr "Pracujete offline. Pripojiť sa?"
 

-#: src/compose.c:6475 src/compose.c:6496
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Zvoľte súbor"
 
 msgid "Select file"
 msgstr "Zvoľte súbor"
 

-#: src/compose.c:6510
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor `%s' sa nedá čítať."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Súbor `%s' sa nedá čítať."
 

-#: src/compose.c:6512
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1618,36 +1630,36 @@ msgstr ""
 "Súbor `%s' obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 
 "Súbor `%s' obsahuje neplatné znaky pre\n"
 "súčasné kódovanie, vloženie môže byť nepresné."
 

-#: src/compose.c:6551
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "Zrušiť správu"
 
 msgid "Discard message"
 msgstr "Zrušiť správu"
 

-#: src/compose.c:6552
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 
 msgid "This message has been modified. discard it?"
 msgstr "Obsah správy sa zmenil. Chcete zahodiť zmeny?"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "Zahodiť"
 
 msgid "Discard"
 msgstr "Zahodiť"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "medzi Koncepty"
 
 msgid "to Draft"
 msgstr "medzi Koncepty"
 

-#: src/compose.c:6588
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Chcete použiť šablónu `%s' ?"
 

-#: src/compose.c:6590
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "Použiť šablónu"
 
 msgid "Apply template"
 msgstr "Použiť šablónu"
 

-#: src/compose.c:6591
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Nahradiť"
 
 msgid "Replace"
 msgstr "Nahradiť"
 

-#: src/compose.c:6591 src/toolbar.c:425
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "Vložiť"
 
 msgid "Insert"
 msgstr "Vložiť"
 


@@ -1783,7 +1795,7 @@ msgid " Check File "
 msgstr "Testovať súbor"
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr "Testovať súbor"
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Súbor"
 
 msgid "File"
 msgstr "Súbor"
 


@@ -1839,12 +1851,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 

-#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
-#: src/folderview.c:2215
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "Nový priečinok"
 
 msgid "New folder"
 msgstr "Nový priečinok"
 

-#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 


@@ -1862,7 +1874,7 @@ msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "


@@ -2090,7 +2102,7 @@ msgstr "Maximum záznamov"
 msgid "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 
 msgid "The maximum number of entries that should be returned in the search result."
 msgstr "Najväčší počet vrátených výsledkov vyhľadávania."
 

-#: src/editldap.c:751 src/prefs_account.c:764
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "Základné"
 
 msgid "Basic"
 msgstr "Základné"
 


@@ -2098,7 +2110,7 @@ msgstr "Základné"
 msgid "Search"
 msgstr "Hľadať"
 
 msgid "Search"
 msgstr "Hľadať"
 

-#: src/editldap.c:753 src/summaryview.c:653
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "Rozšírené"
 
 msgid "Extended"
 msgstr "Rozšírené"
 


@@ -2176,11 +2188,11 @@ msgstr "Výstupný súbor HTML"
 msgid "Stylesheet"
 msgstr "Stylesheet"
 
 msgid "Stylesheet"
 msgstr "Stylesheet"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "Štandardné"
 
 msgid "Default"
 msgstr "Štandardné"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "Plné"
 
 msgid "Full"
 msgstr "Plné"
 


@@ -2241,7 +2253,7 @@ msgid "Prev"
 msgstr "Predchádzajúci"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Predchádzajúci"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:384 src/toolbar.c:475
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "Nasledujúca"
 
 msgid "Next"
 msgstr "Nasledujúca"
 


@@ -2425,7 +2437,7 @@ msgid "Exporting file:"
 msgstr "Exportovaný súbor:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Exportovaný súbor:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr "Zvoľte..."
 
 msgid " Select... "
 msgstr "Zvoľte..."
 


@@ -2461,32 +2473,32 @@ msgstr "Názov je príliš dlhý."
 msgid "Not specified."
 msgstr "Nie je určený."
 
 msgid "Not specified."
 msgstr "Nie je určený."
 

-#: src/folder.c:1011
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "Prijaté"
 
 msgid "Inbox"
 msgstr "Prijaté"
 

-#: src/folder.c:1015
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "Odoslané"
 
 msgid "Sent"
 msgstr "Odoslané"
 

-#: src/folder.c:1019
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "Na odoslanie"
 
 msgid "Queue"
 msgstr "Na odoslanie"
 

-#: src/folder.c:1023
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "Odpadkový kôš"
 
 msgid "Trash"
 msgstr "Odpadkový kôš"
 

-#: src/folder.c:1027
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "Koncepty"
 
 msgid "Drafts"
 msgstr "Koncepty"
 

-#: src/folder.c:1240
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "Spracúvam (%s)...\n"
 

-#: src/folder.c:2028
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Presúvam %s do %s...\n"


@@ -2495,140 +2507,158 @@ msgstr "Presúvam %s do %s...\n"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 

-#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 

-#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 

-#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "/_Presunúť priečinok..."
 
 msgid "/M_ove folder..."
 msgstr "/_Presunúť priečinok..."
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 

-#: src/folderview.c:289 src/folderview.c:310
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "/_Odstrániť schránku"
 
 msgid "/Remove _mailbox"
 msgstr "/_Odstrániť schránku"
 

-#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
-#: src/folderview.c:352
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgstr "/_Spracovanie..."
 
 msgid "/_Processing..."
 msgstr "/_Spracovanie..."
 

-#: src/folderview.c:293
-msgid "/_Scoring..."
-msgstr "/_Hodnotenie..."
-
-#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/Označiť _všetky ako prečítané"
 
 msgid "/Mark all _read"
 msgstr "/Označiť _všetky ako prečítané"
 

-#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 

-#: src/folderview.c:308 src/folderview.c:328
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 

-#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/_Prehľadať priečinok..."
 
 msgid "/_Search folder..."
 msgstr "/_Prehľadať priečinok..."
 

-#: src/folderview.c:330
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/S_tiahnuť"
+
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Odstrániť konto _IMAP4"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Odstrániť konto _IMAP4"
 

-#: src/folderview.c:341
+#: src/folderview.c:346

 msgid "/_Subscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny..."
 

-#: src/folderview.c:343
+#: src/folderview.c:348

 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 

-#: src/folderview.c:348
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/Odstrániť _news konto"
 
 msgid "/Remove _news account"
 msgstr "/Odstrániť _news konto"
 

-#: src/folderview.c:385
+#: src/folderview.c:392

 msgid "New"
 msgstr "Nový"
 
 msgid "New"
 msgstr "Nový"
 

-#: src/folderview.c:386
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "Neprečítané"
 
 msgid "Unread"
 msgstr "Neprečítané"
 

-#: src/folderview.c:387
+#: src/folderview.c:394

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:630
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 

-#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 

-#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 

-#: src/folderview.c:835
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 

-#: src/folderview.c:918
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 

-#: src/folderview.c:1696
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otváram priečinok %s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Otváram priečinok %s..."
 

-#: src/folderview.c:1708
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "Priečinok sa nedá otvoriť."
 
 msgid "Folder could not be opened."
 msgstr "Priečinok sa nedá otvoriť."
 

-#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
+#: src/folderview.c:1841
+#, c-format
+msgid "Downloading messages in %s ..."
+msgstr "Sťahujem správy v %s ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "Offline"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Ste odpojený. Chcete sa pripojiť?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "Pri sťahovaní správ v `%s' nastala chyba."
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 

-#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 

-#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
-#: src/folderview.c:2075 src/folderview.c:2236
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 

-#: src/folderview.c:1920 src/folderview.c:2243
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 

-#: src/folderview.c:1987 src/folderview.c:2065
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 

-#: src/folderview.c:1988 src/folderview.c:2067
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 

-#: src/folderview.c:2126
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2637,16 +2667,16 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 

-#: src/folderview.c:2128
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 

-#: src/folderview.c:2145
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 

-#: src/folderview.c:2181
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2655,11 +2685,11 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 

-#: src/folderview.c:2183
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 

-#: src/folderview.c:2216
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2669,55 +2699,55 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 

-#: src/folderview.c:2273
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 

-#: src/folderview.c:2274
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 

-#: src/folderview.c:2408
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 

-#: src/folderview.c:2409
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 

-#: src/folderview.c:2447
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 

-#: src/folderview.c:2543
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Presúvam %s do %s..."
 

-#: src/folderview.c:2572
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 
 msgid "Source and destination are the same."
 msgstr "Zdroj je identický s cieľom."
 

-#: src/folderview.c:2575
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť priečinok do jeho podpriečinku."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Nie je možné presunúť priečinok do jeho podpriečinku."
 

-#: src/folderview.c:2578
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Priečinky nie je možné presúvať medzi jednotlivými schránkami."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Priečinky nie je možné presúvať medzi jednotlivými schránkami."
 

-#: src/folderview.c:2581
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "Presun sa nepodaril!"
 
 msgid "Move failed!"
 msgstr "Presun sa nepodaril!"
 

-#: src/folderview.c:2625 src/summaryview.c:4050
+#: src/folderview.c:2704 src/summaryview.c:4013

 msgid "Processing configuration"
 msgstr "Nastavenie spracúvania"
 
 msgid "Processing configuration"
 msgstr "Nastavenie spracúvania"
 


@@ -2769,7 +2799,7 @@ msgstr "neznáma"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1178
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Hotovo."
 
 msgid "Done."
 msgstr "Hotovo."
 


@@ -2966,7 +2996,7 @@ msgstr ""
 "Kontrola pravopisu nemohla zmeniť slovník.\n"
 "%s"
 
 "Kontrola pravopisu nemohla zmeniť slovník.\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr "Abcdef"
 
 msgid "Abcdef"
 msgstr "Abcdef"
 


@@ -2982,7 +3012,7 @@ msgstr "Zvoľte plugin ktorý sa má načítať"
 msgid "Plugins"
 msgstr "Pluginy"
 
 msgid "Plugins"
 msgstr "Pluginy"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "Popis"
 
 msgid "Description"
 msgstr "Popis"
 


@@ -3025,6 +3055,7 @@ msgid "Signer"
 msgstr "Podpisovateľ"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "Podpisovateľ"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Meno: "
 
 msgid "Name: "
 msgstr "Meno: "
 


@@ -3096,11 +3127,11 @@ msgstr "Zobraziť certifikáty"
 msgid "Changed SSL Certificate"
 msgstr "Zmena SSL certifikátu"
 
 msgid "Changed SSL Certificate"
 msgstr "Zmena SSL certifikátu"
 

-#: src/headerview.c:181 src/summaryview.c:2398
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 

-#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 


@@ -3149,105 +3180,105 @@ msgstr "priečinok sa nedá zatvoriť\n"
 msgid "root folder %s does not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
 msgid "root folder %s does not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 

-#: src/imap.c:1415 src/imap.c:1423
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 

-#: src/imap.c:1651
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 

-#: src/imap.c:1673
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 

-#: src/imap.c:1742
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 

-#: src/imap.c:1804
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 

-#: src/imap.c:1842
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 

-#: src/imap.c:1850
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 

-#: src/imap.c:1872
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 

-#: src/imap.c:1928
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s\n"
 

-#: src/imap.c:1950
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 

-#: src/imap.c:1957
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 

-#: src/imap.c:2047
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 

-#: src/imap.c:2480
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 

-#: src/imap.c:2620
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 

-#: src/imap.c:2637
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 

-#: src/imap.c:2953
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 

-#: src/imap.c:2960
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 

-#: src/imap.c:3002
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 

-#: src/imap.c:3084
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 

-#: src/imap.c:3134
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 

-#: src/imap.c:3151
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 

-#: src/imap.c:3164
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 

-#: src/imap.c:3419
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"


@@ -3326,7 +3357,7 @@ msgstr "Zvoľte súbor LDIF pre import."
 msgid "R"
 msgstr "R"
 
 msgid "R"
 msgstr "R"
 

-#: src/importldif.c:765 src/summaryview.c:472
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "V"
 
 msgid "S"
 msgstr "V"
 


@@ -3424,134 +3455,134 @@ msgstr "Vyberte súbor Pine"
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 
 msgid "Import Pine file into Address Book"
 msgstr "Importovať súbor Pine do adresára"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 
 msgid "Retrieving new messages"
 msgstr "Prijímam nové správy"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "Čakajte"
 
 msgid "Standby"
 msgstr "Čakajte"
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "Zrušené"
 
 msgid "Cancelled"
 msgstr "Zrušené"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "Prijímam"
 
 msgid "Retrieving"
 msgstr "Prijímam"
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Hotovo (%d správ (%s) prijatých)"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 
 msgid "Done (no new messages)"
 msgstr "Hotovo (žiadne nové správy)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 
 msgid "Connection failed"
 msgstr "Spojenie zlyhalo"
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 
 msgid "Auth failed"
 msgstr "Autentizácia zlyhala"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "Zamknuté"
 
 msgid "Locked"
 msgstr "Zamknuté"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autorizácia pre %s na %s zlyhala"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Autorizácia pre %s na %s zlyhala"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Dokončené (%d nových správ)"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 
 msgid "Finished (no new messages)"
 msgstr "Dokončené (žiadne nové správy)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 
 msgid "Some errors occurred while getting mail."
 msgstr "Pri prijímaní pošty sa vyskytli chyby."
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Prijímam nové správy"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Pripájam sa k serveru POP3: %s..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Nepodarilo sa pripojiť k serveru POP3: %s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "Autentizácia..."
 
 msgid "Authenticating..."
 msgstr "Autentizácia..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Prijímam správy z %s..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Získavam počet nových správ (STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Získavam počet nových správ (LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Získavam počet nových správ (UIDL)..."
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Získavam veľkosť správ (LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "Odstraňujem správu %d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "Odpájam sa"
 
 msgid "Quitting"
 msgstr "Odpájam sa"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Prijímam (%d správ (%s) prijatých)"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 
 msgid "Connection failed."
 msgstr "Spojenie zlyhalo."
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
 msgid "Error occurred while processing mail."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -3560,27 +3591,27 @@ msgstr ""
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 
 "Pri spracovávaní pošty sa vyskytla chyba:\n"
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 
 msgid "No disk space left."
 msgstr "Na disku už nie je miesto."
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 
 msgid "Can't write file."
 msgstr "Nedá sa zapisovať do súboru."
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "Chyba socketu."
 
 msgid "Socket error."
 msgstr "Chyba socketu."
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 
 msgid "Connection closed by the remote host."
 msgstr "Vzdialený hostiteľ ukončil spojenie."
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 
 msgid "Mailbox is locked."
 msgstr "Mailbox je zamknutý."
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3589,11 +3620,11 @@ msgstr ""
 "Mailbox je zamknutý:\n"
 "%s"
 
 "Mailbox je zamknutý:\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 
 msgid "Authentication failed."
 msgstr "Autentizácia bola neúspešná."
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3602,7 +3633,7 @@ msgstr ""
 "Autentizácia bola neúspešná:\n"
 "%s"
 
 "Autentizácia bola neúspešná:\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Začleňovanie zrušené\n"
 


@@ -3619,7 +3650,7 @@ msgstr "Zadajte heslo"
 msgid "Nick Name"
 msgstr "Prezývka"
 
 msgid "Nick Name"
 msgstr "Prezývka"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3628,20 +3659,20 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib nepodporuje g_thread.\n"
 

-#: src/main.c:514
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 

-#: src/main.c:517
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 

-#: src/main.c:518
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3652,23 +3683,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
 "uvedenými\n"
 "                         súbormi"
 

-#: src/main.c:521
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 

-#: src/main.c:522
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 

-#: src/main.c:523
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 

-#: src/main.c:524
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 

-#: src/main.c:525
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3676,749 +3707,758 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 

-#: src/main.c:527
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               prepne do online režimu"
 

-#: src/main.c:528
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do režimu offline"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              prepne do režimu offline"
 

-#: src/main.c:529
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 

-#: src/main.c:530
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 

-#: src/main.c:531
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version                zobrazí informácie o verzii a ukončí program"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version                zobrazí informácie o verzii a ukončí program"
 

-#: src/main.c:532
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný priečinok s nastaveniami"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           výstupný priečinok s nastaveniami"
 

-#: src/main.c:569 src/summaryview.c:5198
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracúvam (%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "Spracúvam (%s)..."
 

-#: src/main.c:572
+#: src/main.c:571

 msgid "top level folder"
 msgstr "priečinok vrchnej úrovne"
 
 msgid "top level folder"
 msgstr "priečinok vrchnej úrovne"
 

-#: src/main.c:637
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Máte rozpísanú správu."
 
 msgid "Composing message exists."
 msgstr "Máte rozpísanú správu."
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Draft them"
 msgstr "Medzi koncepty"
 
 msgid "Draft them"
 msgstr "Medzi koncepty"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Discard them"
 msgstr "Zahodiť"
 
 msgid "Discard them"
 msgstr "Zahodiť"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "Neukončiť"
 
 msgid "Don't quit"
 msgstr "Neukončiť"
 

-#: src/main.c:652
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 

-#: src/main.c:653
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 

-#: src/main.c:898
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Pri odosielaní správ vo fronte nastali chyby."
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 
 msgid "/_File/_Folder"
 msgstr "/_Súbor/P_riečinok"
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Súbor/P_riečinok/Vytvoriť _nový priečinok..."
 

-#: src/mainwindow.c:429
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Súbor/P_riečinok/P_remenovať priečinok..."
 

-#: src/mainwindow.c:430
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Súbor/P_riečinok/O_dstrániť priečinok"
 

-#: src/mainwindow.c:431
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/_Súbor/P_riečinok/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/_Súbor/P_riečinok/---"
 

-#: src/mainwindow.c:432
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Súbor/P_riečinok/Pri_jať nové správy vo všetkých priečinkoch"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Súbor/P_riečinok/Pri_jať nové správy vo všetkých priečinkoch"
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/_Súbor/_Pridať schránku"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Súbor/_Pridať schránku"
 

-#: src/mainwindow.c:435
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Súbor/_Pridať schránku/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Súbor/_Pridať schránku/MH..."
 

-#: src/mainwindow.c:436
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Súbor/_Importovať súbor mbox..."
 

-#: src/mainwindow.c:437
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Súbor/_Exportovať do súboru mbox..."
 

-#: src/mainwindow.c:438
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 
 msgid "/_File/Empty _trash"
 msgstr "/_Súbor/Vyčistiť odpadkový _kôš"
 

-#: src/mainwindow.c:440 src/messageview.c:144
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Súbor/_Uložiť ako..."
 

-#: src/mainwindow.c:441 src/messageview.c:145
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 
 msgid "/_File/_Print..."
 msgstr "/_Súbor/_Tlačiť..."
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:453

 msgid "/_File/_Work offline"
 msgstr "/Súbor/Pracovať _offline"
 
 msgid "/_File/_Work offline"
 msgstr "/Súbor/Pracovať _offline"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 
 msgid "/_File/E_xit"
 msgstr "/_Súbor/Uk_ončiť"
 

-#: src/mainwindow.c:451
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 
 msgid "/_Edit/Select _thread"
 msgstr "/Ú_pravy/Zvoliť _vlákno"
 

-#: src/mainwindow.c:453 src/messageview.c:153
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/Ú_pravy/Vy_hľadať v aktuálnej správe..."
 

-#: src/mainwindow.c:455
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/Ú_pravy/_Vyhľadať v správach..."
 

-#: src/mainwindow.c:457
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 
 msgid "/_View/Show or hi_de"
 msgstr "/_Zobraziť/_Ukázať alebo skryť"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Strom priečinkov"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Zobrazenie správy"
 

-#: src/mainwindow.c:462
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Ikony _a text"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Ikony _a text"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Ikony"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/_Text"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/_Panel nástrojov/Žiad_ne"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/_Zobraziť/_Ukázať alebo skryť/Stavový _riadok"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/_Zobraziť/Samostatný str_om priečinkov"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/_Zobraziť/Samostatné zobraz_enie správy"
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 
 msgid "/_View/_Sort"
 msgstr "/_Zobraziť/_Triediť"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/_Zobraziť/_Triediť/podľa čí_sla"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/_Zobraziť/_Triediť/podľa _veľkosti"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/_Zobraziť/_Triediť/podľa _dátumu"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/_Zobraziť/_Triediť/podľa _odosielateľa"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/_Zobraziť/_Triediť/podľa _príjemcu"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/_Zobraziť/_Triediť/podľa p_redmetu"
 

-#: src/mainwindow.c:485
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/_Zobraziť/_Triediť/podľa _farebného označenia"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/_Zobraziť/_Triediť/podľa _značky"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/_Zobraziť/_Triediť/podľa _stavu"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/_Zobraziť/_Triediť/podľa _stavu"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/_Zobraziť/_Triediť/podľa prí_loh"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/_Zobraziť/_Triediť/podľa _hodnotenia"
 
 msgid "/_View/_Sort/by score"
 msgstr "/_Zobraziť/_Triediť/podľa _hodnotenia"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/_Zobraziť/_Triediť/podľa zámku"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/_Zobraziť/_Triediť/podľa zámku"
 

-#: src/mainwindow.c:493
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/_Zobraziť/_Triediť/_Netriediť"
 

-#: src/mainwindow.c:494 src/mainwindow.c:497
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/_Zobraziť/_Triediť/---"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/_Zobraziť/_Triediť/Vzostupne"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/_Zobraziť/_Triediť/Zostupne"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/_Zobraziť/_Triediť/Zos_kupiť podľa predmetu"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 
 msgid "/_View/Th_read view"
 msgstr "/_Zobraziť/Zobraziť _vlákna"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/_Zobraziť/_Rozbaliť všetky vlákna"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/_Zobraziť/Zba_liť všetky vlákna"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/_Zobraziť/S_kryť prečítané správy"
 
 msgid "/_View/_Hide read messages"
 msgstr "/_Zobraziť/S_kryť prečítané správy"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/_Zobraziť/Nastav_iť zobrazované položky..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 
 msgid "/_View/_Go to"
 msgstr "/_Zobraziť/Pre_jsť na"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/_Zobraziť/Pre_jsť na/_Predošlú správu"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/_Zobraziť/Pre_jsť na/Ď_alšiu správu"
 

-#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/mainwindow.c:523 src/mainwindow.c:528
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/_Zobraziť/Pre_jsť na/---"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/_Zobraziť/Pre_jsť na/P_redošlú neprečítanú správu"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu n_eprečítanú správu"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú no_vú správu"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalši_u novú správu"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú _označenú správu"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďalšiu o_značenú správu"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/_Zobraziť/Pre_jsť na/Predošlú správu s návestí_m"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/_Zobraziť/Pre_jsť na/Ďa_lšiu správu s návestím"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/_Zobraziť/Pre_jsť na/Iný priečino_k..."
 

-#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/_Zobraziť/_Kódovanie/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/_Zobraziť/_Kódovanie/---"
 

-#: src/mainwindow.c:537 src/messageview.c:163
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/_Zobraziť/_Kódovanie"
 
 msgid "/_View/_Code set"
 msgstr "/_Zobraziť/_Kódovanie"
 

-#: src/mainwindow.c:538 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/_Zobraziť/_Kódovanie/_Automatické"
 

-#: src/mainwindow.c:541 src/messageview.c:167
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/_Zobraziť/_Kódovanie/7bit ascii (US-ASC_II)"
 

-#: src/mainwindow.c:545 src/messageview.c:171
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/_Zobraziť/_Kódovanie/Unicode (_UTF-8)"
 

-#: src/mainwindow.c:549 src/messageview.c:175
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-_1)"
 

-#: src/mainwindow.c:551 src/messageview.c:177
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/_Zobraziť/_Kódovanie/Západná Európa (ISO-8859-15)"
 

-#: src/mainwindow.c:555 src/messageview.c:181
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/_Zobraziť/_Kódovanie/Stredná Európa (ISO-8859-_2)"
 

-#: src/mainwindow.c:558 src/messageview.c:184
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/_Zobraziť/_Kódovanie/_Pobaltie (ISO-8859-13)"
 

-#: src/mainwindow.c:560 src/messageview.c:186
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/_Zobraziť/_Kódovanie/Pobaltie (ISO-8859-_4)"
 

-#: src/mainwindow.c:563 src/messageview.c:189
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/_Zobraziť/_Kódovanie/Grécko (ISO-8859-_7)"
 

-#: src/mainwindow.c:566 src/messageview.c:192
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/_Zobraziť/_Kódovanie/Turecko (ISO-8859-_9)"
 

-#: src/mainwindow.c:569 src/messageview.c:195
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (ISO-8859-_5)"
 

-#: src/mainwindow.c:571 src/messageview.c:197
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (KOI8-_R)"
 

-#: src/mainwindow.c:573 src/messageview.c:199
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/_Zobraziť/_Kódovanie/Cyrilika (Windows-1251)"
 

-#: src/mainwindow.c:577 src/messageview.c:203
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-_JP)"
 

-#: src/mainwindow.c:580 src/messageview.c:206
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:583 src/messageview.c:209
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_EUC-JP)"
 

-#: src/mainwindow.c:585 src/messageview.c:211
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/_Zobraziť/_Kódovanie/Japonsko (_Shift__JIS)"
 

-#: src/mainwindow.c:589 src/messageview.c:215
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/_Zobraziť/_Kódovanie/Zjednodušená čínština (_GB2312)"
 

-#: src/mainwindow.c:591 src/messageview.c:217
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (_Big5)"
 

-#: src/mainwindow.c:593 src/messageview.c:219
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/_Zobraziť/_Kódovanie/Tradičná čínština (EUC-_TW)"
 

-#: src/mainwindow.c:595 src/messageview.c:221
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 

-#: src/mainwindow.c:598 src/messageview.c:224
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (EUC-_KR)"
 

-#: src/mainwindow.c:600 src/messageview.c:226
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 

-#: src/mainwindow.c:603 src/messageview.c:229
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (TIS-620)"
 

-#: src/mainwindow.c:605 src/messageview.c:231
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/_Zobraziť/_Kódovanie/Thajsko (Windows-874)"
 

-#: src/mainwindow.c:613 src/summaryview.c:458
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 

-#: src/mainwindow.c:614 src/messageview.c:239
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 
 msgid "/_View/Show all _headers"
 msgstr "/_Zobraziť/Zobraziť všetky _hlavičky"
 

-#: src/mainwindow.c:617
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
 msgid "/_View/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 

-#: src/mainwindow.c:620
-msgid "/_Message/Get new ma_il"
-msgstr "/Sp_ráva/_Prijať poštu"
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/Sp_ráva/Pri_jať"

 
 

-#: src/mainwindow.c:621
-msgid "/_Message/Get from _all accounts"
-msgstr "/Sp_ráva/Prijať poš_tu pre všetky kontá"
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/Sp_ráva/Prijať poštu pre _súčasné konto"

 
 

-#: src/mainwindow.c:623
-msgid "/_Message/Cancel receivin_g"
-msgstr "/Sp_ráva/Ukonč_iť prijímanie"
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/Sp_ráva/Prijať poštu pre _všetky kontá"

 
 

-#: src/mainwindow.c:625
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/Sp_ráva/_Ukončiť prijímanie"
+
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/Sp_ráva/Pri_jať/---"
+
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/Sp_ráva/_Odoslať správy vo fronte"
 

-#: src/mainwindow.c:627
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/Sp_ráva/_Napísať novú správu"
 

-#: src/mainwindow.c:628
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgid "/_Message/Compose a news message"

-msgstr "/Sp_ráva/_Napísať novu news správu"
+msgstr "/Sp_ráva/Napísať novu n_ews správu"

 
 

-#: src/mainwindow.c:629 src/messageview.c:246
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 
 msgid "/_Message/_Reply"
 msgstr "/Sp_ráva/O_dpovedať"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgid "/_Message/Repl_y to"

-msgstr "/Sp_ráva/Odpo_vedať komu"
+msgstr "/Sp_ráva/Od_povedať komu"

 
 

-#: src/mainwindow.c:631 src/messageview.c:247
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgid "/_Message/Repl_y to/_all"

-msgstr "/Sp_ráva/Odpoved_ať komu/_všetkým"
+msgstr "/Sp_ráva/Od_povedať komu/_všetkým"

 
 

-#: src/mainwindow.c:632 src/messageview.c:249
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Sp_ráva/Od_povedať komu/_odosielateľovi"
 

-#: src/mainwindow.c:633 src/messageview.c:251
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Sp_ráva/Od_povedať komu/do _diskusnej skupiny"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/Sp_ráva/Follow-up a odpovedať"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/Sp_ráva/Follow-up a odpovedať"
 

-#: src/mainwindow.c:637 src/messageview.c:254
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 
 msgid "/_Message/_Forward"
 msgstr "/Sp_ráva/_Poslať ďalej"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/Sp_ráva/Pre_smerovať"
 
 msgid "/_Message/Redirect"
 msgstr "/Sp_ráva/Pre_smerovať"
 

-#: src/mainwindow.c:640 src/messageview.c:259
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 
 msgid "/_Message/Re-_edit"
 msgstr "/Sp_ráva/Znovu _editovať"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 
 msgid "/_Message/M_ove..."
 msgstr "/Sp_ráva/Pres_unúť"
 

-#: src/mainwindow.c:643
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 
 msgid "/_Message/_Copy..."
 msgstr "/Sp_ráva/_Kopírovať"
 

-#: src/mainwindow.c:644
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 
 msgid "/_Message/_Delete"
 msgstr "/Sp_ráva/Z_mazať"
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/Sp_ráva/S_tornovať news správu"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/Sp_ráva/S_tornovať news správu"
 

-#: src/mainwindow.c:647
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 
 msgid "/_Message/_Mark"
 msgstr "/Sp_ráva/O_značiť"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Sp_ráva/O_značiť/O_značiť"
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Sp_ráva/O_značiť/O_dznačiť"
 

-#: src/mainwindow.c:650
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/Sp_ráva/O_značiť/---"
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _neprečítané"
 

-#: src/mainwindow.c:652
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Sp_ráva/O_značiť/Označiť ako _prečítané"
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Sp_ráva/O_značiť/Označiť _všetky ako prečítané"
 

-#: src/mainwindow.c:657
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/_Nástroje/_Adresár..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Nástroje/_Adresár..."
 

-#: src/mainwindow.c:658 src/messageview.c:263
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Nástroje/Pridať _odosielateľa do adresára"
 

-#: src/mainwindow.c:660
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Nástroje/_Zozbierať správy"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Nástroje/_Zozbierať správy"
 

-#: src/mainwindow.c:661
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Nástroje/_Zozbierať správy/z _priečinka..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Nástroje/_Zozbierať správy/z _priečinka..."
 

-#: src/mainwindow.c:663
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Nástroje/_Zozbierať správy/zo _správ..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Nástroje/_Zozbierať správy/zo _správ..."
 

-#: src/mainwindow.c:666
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/_Nástroje/_Filtrovať správy"
 

-#: src/mainwindow.c:667 src/messageview.c:266
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra"
 

-#: src/mainwindow.c:668 src/messageview.c:268
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/_Automaticky"
 

-#: src/mainwindow.c:670 src/messageview.c:270
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _odosielateľa"
 

-#: src/mainwindow.c:672 src/messageview.c:272
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa _príjemcu"
 

-#: src/mainwindow.c:674 src/messageview.c:274
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo fi_ltra/podľa p_redmetu"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:689

 msgid "/_Tools/_Create processing rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania"
 
 msgid "/_Tools/_Create processing rule"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania"
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:690

 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/_Automaticky"
 
 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/_Automaticky"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:692

 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _odosielateľa"
 
 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _odosielateľa"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:694

 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _príjemcu"
 
 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _príjemcu"
 

-#: src/mainwindow.c:683
+#: src/mainwindow.c:696

 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa p_redmetu"
 
 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa p_redmetu"
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Nástroje/Zmazať du_plikátne správy"
 

-#: src/mainwindow.c:691
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 
 msgid "/_Tools/E_xecute"
 msgstr "/_Nástroje/V_ykonať"
 

-#: src/mainwindow.c:694
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Nástroje/SSL certi_fikáty..."
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Nástroje/SSL certi_fikáty..."
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 
 msgid "/_Tools/_Log window"
 msgstr "/_Nástroje/Okno _záznamu"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 
 msgid "/_Configuration"
 msgstr "/Nastav_enia"
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/Nastav_enia/_Zmeniť aktívne konto"
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Nastav_enia/Nastavenia aktívneho _konta..."
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/Nastav_enia/Vytvoriť _nové konto..."
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Nastav_enia/_Upraviť kontá..."
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 
 msgid "/_Configuration/---"
 msgstr "/Nastav_enia/---"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Nastav_enia/_Všeobecné nastavenia..."
 

-#: src/mainwindow.c:712
+#: src/mainwindow.c:725

 msgid "/_Configuration/Pre-processing..."
 msgstr "/Nastav_enia/Úvodné _spracúvanie..."
 
 msgid "/_Configuration/Pre-processing..."
 msgstr "/Nastav_enia/Úvodné _spracúvanie..."
 

-#: src/mainwindow.c:714
+#: src/mainwindow.c:727

 msgid "/_Configuration/Post-processing..."
 msgstr "/Nastav_enia/_Dodatočné spracúvanie..."
 
 msgid "/_Configuration/Post-processing..."
 msgstr "/Nastav_enia/_Dodatočné spracúvanie..."
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/Nastav_enia/_Filtrovanie..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/Nastav_enia/_Filtrovanie..."
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/Nastav_enia/Š_ablóny..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/Nastav_enia/Š_ablóny..."
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/Nastav_enia/_Akcie..."
 

-#: src/mainwindow.c:720
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Nastav_enia/Ď_alšie nastavenia..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Nastav_enia/Ď_alšie nastavenia..."
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/Nastav_enia/_Pluginy..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/Nastav_enia/_Pluginy..."
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/Nápo_veda/_Manuál (lokálny)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/Nápo_veda/_Manuál (lokálny)"
 

-#: src/mainwindow.c:725
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/Nápo_veda/_Manuál (WWW)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/Nápo_veda/_Manuál (WWW)"
 

-#: src/mainwindow.c:727
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/Nápo_veda/_FAQ (lokálne)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/Nápo_veda/_FAQ (lokálne)"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/Nápo_veda/_FAQ (WWW)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/Nápo_veda/_FAQ (WWW)"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/Nápo_veda/_Claws FAQ (WWW)"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/Nápo_veda/_Claws FAQ (WWW)"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 
 msgid "/_Help/---"
 msgstr "/Nápo_veda/---"
 

-#: src/mainwindow.c:851
+#: src/mainwindow.c:868

 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Ste pripojený. Kliknite na ikonu ak sa chcete odpojiť"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:872

 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Ste odpojený. Kliknite na ikonu ak sa chcete pripojiť"
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr "Zvoliť konto"
 
 msgid "Select account"
 msgstr "Zvoliť konto"
 

-#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "Bez názvu"
 
 msgid "Untitled"
 msgstr "Bez názvu"
 

-#: src/mainwindow.c:1222
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "žiadny"
 
 msgid "none"
 msgstr "žiadny"
 

-#: src/mainwindow.c:1462
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 

-#: src/mainwindow.c:1463
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "Zmazať všetky správy v koši?"
 
 msgid "Empty all messages in trash?"
 msgstr "Zmazať všetky správy v koši?"
 

-#: src/mainwindow.c:1481
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 
 msgid "Add mailbox"
 msgstr "Pridať mailbox"
 

-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4428,16 +4468,16 @@ msgstr ""
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 
 "Ak zadáte existujúci mailbox, bude\n"
 "automaticky prehľadaný."
 

-#: src/mainwindow.c:1488
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Mailbox '%s' už existuje."
 

-#: src/mainwindow.c:1493 src/setup.c:58
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "Mailbox"
 
 msgid "Mailbox"
 msgstr "Mailbox"
 

-#: src/mainwindow.c:1498 src/setup.c:62
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4447,31 +4487,31 @@ msgstr ""
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 
 "Pravdepodobne už niektoré súbory existujú, alebo tam nemáte práva na "
 "zapisovanie."
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Zobrazenie priečinku"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Ukončiť"
 
 msgid "Exit"
 msgstr "Ukončiť"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "Ukončiť program"
 
 msgid "Exit this program?"
 msgstr "Ukončiť program"
 

-#: src/mainwindow.c:2716 src/summaryview.c:4046
+#: src/mainwindow.c:2850 src/summaryview.c:4009

 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracúvania použité pred pravidlami priečinkov"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "Pravidlá spracúvania použité pred pravidlami priečinkov"
 

-#: src/mainwindow.c:2724
+#: src/mainwindow.c:2858

 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracúvania použité po pravidlách priečinkov"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "Pravidlá spracúvania použité po pravidlách priečinkov"
 

-#: src/mainwindow.c:2732 src/summaryview.c:4055
+#: src/mainwindow.c:2866 src/summaryview.c:4018

 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 
 msgid "Filtering configuration"
 msgstr "Nastavenie filtrovania"
 


@@ -4533,26 +4573,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/Sp_ráva/Pre_smerovať"
 
 #: src/messageview.c:276
 msgstr "/Sp_ráva/Pre_smerovať"
 
 #: src/messageview.c:276

+msgid "/_Tools/Create processing rule/"
+msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/"
+
+#: src/messageview.c:278

 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/_Automaticky"
 
 msgid "/_Tools/Create processing rule/_Automatically"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/_Automaticky"
 

-#: src/messageview.c:278
+#: src/messageview.c:280

 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _odosielateľa"
 
 msgid "/_Tools/Create processing rule/by _From"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _odosielateľa"
 

-#: src/messageview.c:280
+#: src/messageview.c:282

 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _príjemcu"
 
 msgid "/_Tools/Create processing rule/by _To"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa _príjemcu"
 

-#: src/messageview.c:282
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa p_redmetu"
 
 msgid "/_Tools/Create processing rule/by _Subject"
 msgstr "/_Nástroje/Vytvoriť pravidlo _spracúvania/podľa p_redmetu"
 

-#: src/messageview.c:476
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<nebola nájdená hlavička Return-Path>"
 
 msgid "<No Return-Path found>"
 msgstr "<nebola nájdená hlavička Return-Path>"
 

-#: src/messageview.c:484
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4567,11 +4611,11 @@ msgstr ""
 "Návratová cesta: %s\n"
 "Doporučuje sa neodoslať potvrdenie."
 
 "Návratová cesta: %s\n"
 "Doporučuje sa neodoslať potvrdenie."
 

-#: src/messageview.c:492
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+Neodoslať"
 
 msgid "+Don't Send"
 msgstr "+Neodoslať"
 

-#: src/messageview.c:502
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4582,39 +4626,39 @@ msgstr ""
 "ale podľa jej hlavičiek 'To:' a 'Cc:' nebola oficiálne adresovaná\n"
 "vám. Odosielanie potvrdenia o prijatí bolo zrušené."
 
 "ale podľa jej hlavičiek 'To:' a 'Cc:' nebola oficiálne adresovaná\n"
 "vám. Odosielanie potvrdenia o prijatí bolo zrušené."
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3448
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "Uložiť ako"
 
 msgid "Save as"
 msgstr "Uložiť ako"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3453
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "Prepísať"
 
 msgid "Overwrite"
 msgstr "Prepísať"
 

-#: src/messageview.c:907
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 
 msgid "Overwrite existing file?"
 msgstr "Prepísať existujúci súbor?"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
-#: src/summaryview.c:3482
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 

-#: src/messageview.c:979
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "Táto správa chce aby ste odoslali potvrdenie o jej príjme"
 
 msgid "This message asks for a return receipt"
 msgstr "Táto správa chce aby ste odoslali potvrdenie o jej príjme"
 

-#: src/messageview.c:980
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 
 msgid "Send receipt"
 msgstr "Odoslať potvrdenie"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 
 msgid "Return Receipt Notification"
 msgstr "Potvrdenie o príjme"
 

-#: src/messageview.c:1034
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4623,20 +4667,19 @@ msgstr ""
 "Správa bola odoslaná na viacero vašich kônt.\n"
 "Prosím vyberte konto, ktoré chcete použiť na odoslanie potvrdenia o príjme:"
 
 "Správa bola odoslaná na viacero vašich kônt.\n"
 "Prosím vyberte konto, ktoré chcete použiť na odoslanie potvrdenia o príjme:"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "Odoslať potvrdenie"
 
 msgid "Send Notification"
 msgstr "Odoslať potvrdenie"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+Storno"
 
 msgid "+Cancel"
 msgstr "+Storno"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
-#: src/toolbar.c:171
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "Tlačiť"
 
 msgid "Print"
 msgstr "Tlačiť"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4645,7 +4688,7 @@ msgstr ""
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 
 "Zadajte príkazový riadok tlače:\n"
 "('%s' bude nahradené názvom súboru)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4671,7 +4714,7 @@ msgstr "/O_tvoriť čím..."
 msgid "/_Display as text"
 msgstr "/_Zobraziť ako text"
 
 msgid "/_Display as text"
 msgstr "/_Zobraziť ako text"
 

-#: src/mimeview.c:152 src/summaryview.c:463
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/_Uložiť ako..."
 
 msgid "/_Save as..."
 msgstr "/_Uložiť ako..."
 


@@ -4733,43 +4776,43 @@ msgstr "nadväzujem NNTP spojenie k %s:%d ...\n"
 msgid "can't set group: %s\n"
 msgstr "nemôžem nastaviť skupinu: %s\n"
 
 msgid "can't set group: %s\n"
 msgstr "nemôžem nastaviť skupinu: %s\n"
 

-#: src/news.c:817
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "neplatný rozsah článkov: %d - %d\n"
 

-#: src/news.c:838
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "pri prijímaní %s sa vyskytla chyba.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "pri prijímaní %s sa vyskytla chyba.\n"
 

-#: src/news.c:855
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "prijímam xover %d v %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "prijímam xover %d v %s...\n"
 

-#: src/news.c:858 src/news.c:927
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "nemôžem prijať xover\n"
 
 msgid "can't get xover\n"
 msgstr "nemôžem prijať xover\n"
 

-#: src/news.c:863 src/news.c:933
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "pri prijímaní xover sa vyskytla chyba.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "pri prijímaní xover sa vyskytla chyba.\n"
 

-#: src/news.c:869 src/news.c:946
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "neplatný xover riadok: %s\n"
 

-#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "nemôžem prijať xhdr\n"
 
 msgid "can't get xhdr\n"
 msgstr "nemôžem prijať xhdr\n"
 

-#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "pri prijímaní xhdr sa vyskytla chyba.\n"
 

-#: src/news.c:924
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "prijímam xover %d - %d v %s...\n"


@@ -4803,11 +4846,15 @@ msgstr ""
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 
 "Neplatné heslo! Skúste znova...\n"
 "\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: testujem správu..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 
 msgid "Clam AntiVirus"
 msgstr "Clam AntiVirus"
 

-#: src/plugins/clamav/clamav_plugin.c:229
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -4985,11 +5032,15 @@ msgstr ""
 "Tento plugin používa widget GtkMathView pre vykresľovanie príloh MathML "
 "(Content-Type: text/mathml)"
 
 "Tento plugin používa widget GtkMathView pre vykresľovanie príloh MathML "
 "(Content-Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: filtrujem správu..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:314
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "
 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "


@@ -5002,9 +5053,9 @@ msgid ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""

-"Tento plugin vytriedi nevyžiadanú poštu (spam) z pošty prijatej z IMAP, "
-"POP alebo lokálnych kônt. Budete potrebovať bežiaci server "
-"SpamAssassinu (spamd).\n"
+"Tento plugin vytriedi nevyžiadanú poštu (spam) z pošty prijatej z IMAP, POP "
+"alebo lokálnych kônt. Budete potrebovať bežiaci server SpamAssassinu "
+"(spamd).\n"

 "\n"
 "Ak je správa identifikovaná ako spam, môže byť zmazaná alebo uložená do "
 "určeného priečinku.\n"
 "\n"
 "Ak je správa identifikovaná ako spam, môže byť zmazaná alebo uložená do "
 "určeného priečinku.\n"


@@ -5208,203 +5259,207 @@ msgstr "Nastavenie nového konta"
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 
 msgid "Account preferences"
 msgstr "Nastavenie konta"
 

-#: src/prefs_account.c:766 src/prefs_common.c:968
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "Prijať"
 
 msgid "Receive"
 msgstr "Prijať"
 

-#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "Nová správa"
 
 msgid "Compose"
 msgstr "Nová správa"
 

-#: src/prefs_account.c:773 src/prefs_common.c:981
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Súkromie"
 
 msgid "Privacy"
 msgstr "Súkromie"
 

-#: src/prefs_account.c:777
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:780
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "Rozšírené"
 
 msgid "Advanced"
 msgstr "Rozšírené"
 

-#: src/prefs_account.c:859
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "Názov konta"
 
 msgid "Name of account"
 msgstr "Názov konta"
 

-#: src/prefs_account.c:868
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 
 msgid "Set as default"
 msgstr "Nastaviť ako východzie"
 

-#: src/prefs_account.c:872
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "Osobné informácie"
 
 msgid "Personal information"
 msgstr "Osobné informácie"
 

-#: src/prefs_account.c:881
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "Celé meno"
 
 msgid "Full name"
 msgstr "Celé meno"
 

-#: src/prefs_account.c:887
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "E-mailová adresa"
 
 msgid "Mail address"
 msgstr "E-mailová adresa"
 

-#: src/prefs_account.c:893
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "Organizácia"
 
 msgid "Organization"
 msgstr "Organizácia"
 

-#: src/prefs_account.c:917
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "Informácie o serveri"
 
 msgid "Server information"
 msgstr "Informácie o serveri"
 

-#: src/prefs_account.c:938
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (obyčajné)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (obyčajné)"
 

-#: src/prefs_account.c:940
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP auth)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP auth)"
 

-#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:944
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:946
-msgid "None (local)"
-msgstr "Žiadne (lokálne)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "Lokálna schránka mbox"
+
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "Žiadne (len SMTP)"

 
 

-#: src/prefs_account.c:966
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 
 msgid "This server requires authentication"
 msgstr "Tento server vyžaduje autentizáciu"
 

-#: src/prefs_account.c:973
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Autentizovať pri pripojení"
 
 msgid "Authenticate on connect"
 msgstr "Autentizovať pri pripojení"
 

-#: src/prefs_account.c:1018
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "News server"
 
 msgid "News server"
 msgstr "News server"
 

-#: src/prefs_account.c:1024
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 
 msgid "Server for receiving"
 msgstr "Server pre prijímanie"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "Lokálna schránka"
 
 msgid "Local mailbox"
 msgstr "Lokálna schránka"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP server (odosielanie)"
 

-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Použiť príkaz miesto SMTP serveru"
 

-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 
 msgid "command to send mails"
 msgstr "príkaz na odosielanie pošty"
 

-#: src/prefs_account.c:1061 src/prefs_account.c:1435
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Prihlasovacie meno"
 
 msgid "User ID"
 msgstr "Prihlasovacie meno"
 

-#: src/prefs_account.c:1067 src/prefs_account.c:1444
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "Heslo"
 
 msgid "Password"
 msgstr "Heslo"
 

-#: src/prefs_account.c:1143 src/prefs_account.c:1849
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1151
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 
 msgid "Remove messages on server when received"
 msgstr "Vymazať správy na serveri po ich prijatí"
 

-#: src/prefs_account.c:1162
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "Vymazať po"
 
 msgid "Remove after"
 msgstr "Vymazať po"
 

-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "dňoch"
 
 msgid "days"
 msgstr "dňoch"
 

-#: src/prefs_account.c:1188
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 dní: zmazať ihneď)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 dní: zmazať ihneď)"
 

-#: src/prefs_account.c:1195
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 
 msgid "Download all messages on server"
 msgstr "Prijať všetky správy na serveri"
 

-#: src/prefs_account.c:1201
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 
 msgid "Receive size limit"
 msgstr "Obmedzenie veľkosti správy pre príjem"
 

-#: src/prefs_account.c:1208
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "Východzí inbox"
 
 msgid "Default inbox"
 msgstr "Východzí inbox"
 

-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Nefiltrované správy budú umiestnené v tomto priečinku)"
 

-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 
 msgid "Maximum number of articles to download"
 msgstr "Maximálny počet príspevkov na stiahnutie"
 

-#: src/prefs_account.c:1267
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "0 pre neobmedzený počet"
 
 msgid "unlimited if 0 is specified"
 msgstr "0 pre neobmedzený počet"
 

-#: src/prefs_account.c:1283 src/prefs_account.c:1406
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 
 msgid "Authentication method"
 msgstr "Metóda autentizácie"
 

-#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "Automatická"
 
 msgid "Automatic"
 msgstr "Automatická"
 

-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 
 msgid "Filter messages on receiving"
 msgstr "Filtrovať správy pri prijatí"
 

-#: src/prefs_account.c:1304
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr "Pri voľbe 'Prijať všetko' prijať správy aj pre toto konto"
 

-#: src/prefs_account.c:1363
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Pridať dátum"
 
 msgid "Add Date"
 msgstr "Pridať dátum"
 

-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1361

 msgid "Generate Message-Id"
 msgstr "Generovať Message-Id"
 
 msgid "Generate Message-Id"
 msgstr "Generovať Message-Id"
 

-#: src/prefs_account.c:1371
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 
 msgid "Add user-defined header"
 msgstr "Pridať uživateľom definované hlavičky"
 

-#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " Upresniť... "
 
 msgid " Edit... "
 msgstr " Upresniť... "
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "Autentizácia"
 
 msgid "Authentication"
 msgstr "Autentizácia"
 

-#: src/prefs_account.c:1391
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP Autentizácia (SMTP AUTH)"
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."


@@ -5412,184 +5467,184 @@ msgstr ""
 "Ak necháte tieto polia prázdne, bude použité to isté\n"
 "prihlasovacie meno a heslo ako pri prijímaní."
 
 "Ak necháte tieto polia prázdne, bude použité to isté\n"
 "prihlasovacie meno a heslo ako pri prijímaní."
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Autentizovať cez POP3 pred odosielaním"
 

-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgstr "Časový limit pre POP autentizáciu: "
 
 msgid "POP authentication timeout: "
 msgstr "Časový limit pre POP autentizáciu: "
 

-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "minút"
 
 msgid "minutes"
 msgstr "minút"
 

-#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Podpis"
 
 msgid "Signature"
 msgstr "Podpis"
 

-#: src/prefs_account.c:1554
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "Vložiť podpis automaticky"
 
 msgid "Insert signature automatically"
 msgstr "Vložiť podpis automaticky"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 
 msgid "Signature separator"
 msgstr "Oddeľovač podpisu"
 

-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "Výstup príkazu"
 
 msgid "Command output"
 msgstr "Výstup príkazu"
 

-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 

-#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116

 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kópia"
 
 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "Kópia"
 

-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "Slepá kópia"
 
 msgid "Bcc"
 msgstr "Slepá kópia"
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "Odpovedať komu"
 
 msgid "Reply-To"
 msgstr "Odpovedať komu"
 

-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 
 msgid "Encrypt message by default"
 msgstr "Implicitne zašifrovať správu"
 

-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "Implicitne podpísať správu"
 
 msgid "Sign message by default"
 msgstr "Implicitne podpísať správu"
 

-#: src/prefs_account.c:1693
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "Štandardný režim"
 
 msgid "Default mode"
 msgstr "Štandardný režim"
 

-#: src/prefs_account.c:1701
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "Používať PGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "Používať PGP/MIME"
 

-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "Používať Inline"
 
 msgid "Use Inline"
 msgstr "Používať Inline"
 

-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr "Kľúč pre podpis"
 
 msgid "Sign key"
 msgstr "Kľúč pre podpis"
 

-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 
 msgid "Use default GnuPG key"
 msgstr "Použiť východzí kľúč GnuPG"
 

-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 
 msgid "Select key by your email address"
 msgstr "Zvoliť kľúč podľa vašej emailovej adresy"
 

-#: src/prefs_account.c:1746
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 
 msgid "Specify key manually"
 msgstr "Zadať kľúč ručne"
 

-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 
 msgid "User or key ID:"
 msgstr "User alebo key ID:"
 

-#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 
 msgid "Don't use SSL"
 msgstr "Nepoužívať SSL"
 

-#: src/prefs_account.c:1860
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Použiť SSL pre POP3 spojenie"
 

-#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Použiť príkaz STARTTLS pre nadviazanie SSL spojenia"
 

-#: src/prefs_account.c:1877
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Použiť SSL pre IMAP4 spojenie"
 

-#: src/prefs_account.c:1883
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Použiť SSL pre NNTP spojenie"
 

-#: src/prefs_account.c:1900
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Odoslať (SMTP)"
 

-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Nepoužívať SSL (v prípade potreby použiť STARTTLS)"
 

-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Použiť SSL pre SMTP spojenie"
 

-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "Používať non-blocking SSL"
 

-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Vypnite túto voľbu ak máte problémy pri SSL spojeniach)"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 
 msgid "Specify SMTP port"
 msgstr "Určiť SMTP port"
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 
 msgid "Specify POP3 port"
 msgstr "Určiť POP3 port"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 
 msgid "Specify IMAP4 port"
 msgstr "Určiť IMAP4 port"
 

-#: src/prefs_account.c:2076
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 
 msgid "Specify NNTP port"
 msgstr "Určiť NNTP port"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 
 msgid "Specify domain name"
 msgstr "Určiť názov domény"
 

-#: src/prefs_account.c:2091
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz pre komunikáciu so serverom"
 
 msgid "Use command to communicate with server"
 msgstr "Použiť príkaz pre komunikáciu so serverom"
 

-#: src/prefs_account.c:2099
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť cross-postované správy ako prečítané a zafarbiť:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Označiť cross-postované správy ako prečítané a zafarbiť:"
 

-#: src/prefs_account.c:2113
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "Adresár serveru IMAP"
 
 msgid "IMAP server directory"
 msgstr "Adresár serveru IMAP"
 

-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 
 msgid "Put sent messages in"
 msgstr "Uložiť odoslané správy do"
 

-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 
 msgid "Put draft messages in"
 msgstr "Uložiť koncepty do"
 

-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 
 msgid "Put deleted messages in"
 msgstr "Uložiť vymazané správy do"
 

-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 
 msgid "Account name is not entered."
 msgstr "Nebol zadaný názov konta."
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 
 msgid "Mail address is not entered."
 msgstr "Nebola zadaná e-mailová adresa."
 


@@ -5655,8 +5710,8 @@ msgid "Current actions"
 msgstr "Aktuálne akcie"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
 msgstr "Aktuálne akcie"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546

-#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
-#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687

 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nová)"
 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(Nová)"


@@ -5700,174 +5755,174 @@ msgstr "Zmazať akciu"
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Naozaj chcete zmazať túto akciu?"
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "NÁZOV MENU:"
 
 msgid "MENU NAME:"
 msgstr "NÁZOV MENU:"
 

-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr "Použite \"/\" v názve menu pre tvorbu podmenu."
 
 msgid "Use / in menu name to make submenus."
 msgstr "Použite \"/\" v názve menu pre tvorbu podmenu."
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "PRÍKAZOVÝ RIADOK:"
 
 msgid "COMMAND LINE:"
 msgstr "PRÍKAZOVÝ RIADOK:"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "Začnite:"
 
 msgid "Begin with:"
 msgstr "Začnite:"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr "pre odoslanie tela správy alebo výberu na štandardný vstup príkazu"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "pre odoslanie tela správy alebo výberu na štandardný vstup príkazu"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "pre odoslanie textu zadaného používateľom na štandardný vstup príkazu"
 
 msgid "to send user provided text to command's standard input"
 msgstr "pre odoslanie textu zadaného používateľom na štandardný vstup príkazu"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "pre odoslanie maskovaného textu zadaného používateľom na štandardný vstup "
 "príkazu"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "pre odoslanie maskovaného textu zadaného používateľom na štandardný vstup "
 "príkazu"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "Zakončite:"
 
 msgid "End with:"
 msgstr "Zakončite:"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgstr "pre nahradenie tela správy alebo výberu štandardným výstupom príkazu"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr "pre nahradenie tela správy alebo výberu štandardným výstupom príkazu"
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr "pre vloženie štandardného výstupu príkazu bez odstránenia pôvodného textu"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "pre vloženie štandardného výstupu príkazu bez odstránenia pôvodného textu"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "pre vykonanie príkazu asynchrónne"
 
 msgid "to run command asynchronously"
 msgstr "pre vykonanie príkazu asynchrónne"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "Použite:"
 
 msgid "Use:"
 msgstr "Použite:"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pre súbor zvolenej správy vo formáte RFC822/2822 "
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "pre súbor zvolenej správy vo formáte RFC822/2822 "
 

-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:671

 msgid "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pre zoznam súborov zvolených správ vo formáte RFC822/2822"
 
 msgid "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "pre zoznam súborov zvolených správ vo formáte RFC822/2822"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "pre súbor dekódovanej zvolenej MIME časti správy"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "pre súbor dekódovanej zvolenej MIME časti správy"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "pre parameter zadaný používateľom"
 
 msgid "for a user provided argument"
 msgstr "pre parameter zadaný používateľom"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pre maskovaný parameter zadaný používateľom (napr. heslo)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "pre maskovaný parameter zadaný používateľom (napr. heslo)"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "pre textový výber"
 
 msgid "for the text selection"
 msgstr "pre textový výber"
 

-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplikuje akcie medzi {} na zvolené správy"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "aplikuje akcie medzi {} na zvolené správy"
 

-#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131

 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 
 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "Popis symbolov"
 

-#: src/prefs_common.c:951
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Všeobecné nastavenia"
 
 msgid "Common Preferences"
 msgstr "Všeobecné nastavenia"
 

-#: src/prefs_common.c:974
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "Citát"
 
 msgid "Quote"
 msgstr "Citát"
 

-#: src/prefs_common.c:976
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "Zobrazenie"
 
 msgid "Display"
 msgstr "Zobrazenie"
 

-#: src/prefs_common.c:978
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Správa"
 
 msgid "Message"
 msgstr "Správa"
 

-#: src/prefs_common.c:986 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "Ostatné"
 
 msgid "Other"
 msgstr "Ostatné"
 

-#: src/prefs_common.c:1032
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Externý program"
 
 msgid "External program"
 msgstr "Externý program"
 

-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 
 msgid "Use external program for incorporation"
 msgstr "Použiť externý program pre prijímanie lokálnej pošty"
 

-#: src/prefs_common.c:1048
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "Príkaz"
 
 msgid "Command"
 msgstr "Príkaz"
 

-#: src/prefs_common.c:1072
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "Automaticky zisťovať novú poštu"
 
 msgid "Auto-check new mail"
 msgstr "Automaticky zisťovať novú poštu"
 

-#: src/prefs_common.c:1074
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "každých"
 
 msgid "every"
 msgstr "každých"
 

-#: src/prefs_common.c:1086
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "minút"
 
 msgid "minute(s)"
 msgstr "minút"
 

-#: src/prefs_common.c:1095
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 
 msgid "Check new mail on startup"
 msgstr "Zistiť novú poštu pri spustení"
 

-#: src/prefs_common.c:1097
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 
 msgid "Update all local folders after incorporation"
 msgstr "Aktualizovať všetky miestne priečinky po prijatí pošty"
 

-#: src/prefs_common.c:1105
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 
 msgid "Show receive dialog"
 msgstr "Zobraziť okno prijímania"
 

-#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "Vždy"
 
 msgid "Always"
 msgstr "Vždy"
 

-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 
 msgid "Only on manual receiving"
 msgstr "Len pri manuálnom prijímaní"
 

-#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "Nikdy"
 
 msgid "Never"
 msgstr "Nikdy"
 

-#: src/prefs_common.c:1126
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 
 msgid "Close receive dialog when finished"
 msgstr "Po skončení zavrieť okno prijímania"
 

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "Vykonať príkaz po príchode novej správy"
 
 msgid "Run command when new mail arrives"
 msgstr "Vykonať príkaz po príchode novej správy"
 

-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "po automatickom prevzatí"
 
 msgid "after autochecking"
 msgstr "po automatickom prevzatí"
 

-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "po ručnom prevzatí"
 
 msgid "after manual checking"
 msgstr "po ručnom prevzatí"
 

-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5876,23 +5931,23 @@ msgstr ""
 "Vykonávaný príkaz:\n"
 "(použite %d ako počet nových správ)"
 
 "Vykonávaný príkaz:\n"
 "(použite %d ako počet nových správ)"
 

-#: src/prefs_common.c:1223
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "Uložiť odoslané správy do priečinka Odoslané"
 
 msgid "Save sent messages to Sent folder"
 msgstr "Uložiť odoslané správy do priečinka Odoslané"
 

-#: src/prefs_common.c:1225
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "Zaradiť do fronty správy, ktoré sa nepodarilo odoslať"
 
 msgid "Queue messages that fail to send"
 msgstr "Zaradiť do fronty správy, ktoré sa nepodarilo odoslať"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "Zobraziť okno odosielania"
 
 msgid "Show send dialog"
 msgstr "Zobraziť okno odosielania"
 

-#: src/prefs_common.c:1248
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "Výstupné kódovanie znakov"
 
 msgid "Outgoing codeset"
 msgstr "Výstupné kódovanie znakov"
 

-#: src/prefs_common.c:1257
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"


@@ -5900,107 +5955,107 @@ msgstr ""
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie pre súčasnú "
 "lokalizáciu."
 
 "Po zvolení 'Automatické' bude zvolené optimálne kódovanie pre súčasnú "
 "lokalizáciu."
 

-#: src/prefs_common.c:1269
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 
 msgid "Automatic (Recommended)"
 msgstr "Automatické (doporučené)"
 

-#: src/prefs_common.c:1270
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 
 msgid "7bit ascii (US-ASCII)"
 msgstr "7bit ascii (US-ASCII)"
 

-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 
 msgid "Unicode (UTF-8)"
 msgstr "Unicode (UTF-8)"
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Západná Európa (ISO-8859-1)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Západná Európa (ISO-8859-15)"
 

-#: src/prefs_common.c:1276
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "Stredná Európa (ISO-8859-2)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "Pobaltie (ISO-8859-13)"
 

-#: src/prefs_common.c:1278
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "Pobaltie (ISO-8859-4)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Grécko (ISO-8859-7)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "Turecko (ISO-8859-9)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Cyrilika (ISO-8859-5)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "Cyrilika (KOI8-R)"
 

-#: src/prefs_common.c:1286
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "Cyrilika (Windows-1251)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "Cyrilika (KOI8-U)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Japonsko (ISO-2022-JP)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "Japonsko (EUC-JP)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "Japonsko (Shift_JIS)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "Zjednodušená čínština (GB2312)"
 

-#: src/prefs_common.c:1295
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "Tradičná čínština (Big5)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Tradičná čínština (EUC-TW)"
 

-#: src/prefs_common.c:1298
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Čínština (ISO-2022-CN)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "Kórea (EUC-KR)"
 

-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Thajsko (TIS-620)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Thajsko (Windows-874)"
 

-#: src/prefs_common.c:1315
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 
 msgid "Transfer encoding"
 msgstr "Kódovanie pri prenose"
 

-#: src/prefs_common.c:1324
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"


@@ -6008,151 +6063,151 @@ msgstr ""
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII."
 
 "Zadajte hodnotu Content-Transfer-Encoding, ktorá bude použitá, keď bude "
 "správa obsahovať iné znaky ako ASCII."
 

-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "Automatická voľba konta"
 
 msgid "Automatic account selection"
 msgstr "Automatická voľba konta"
 

-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "pri odpovedaní"
 
 msgid "when replying"
 msgstr "pri odpovedaní"
 

-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "pri preposielaní"
 
 msgid "when forwarding"
 msgstr "pri preposielaní"
 

-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "pri re-editácií"
 
 msgid "when re-editing"
 msgstr "pri re-editácií"
 

-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Tlačítko Odpovedať zvolí odpoveď do mailinglistu"
 

-#: src/prefs_common.c:1433
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 
 msgid "Automatically launch the external editor"
 msgstr "Automaticky spustiť externý editor"
 

-#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 
 msgid "Forward as attachment"
 msgstr "Poslať ďalej ako prílohu"
 

-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "Blokovať kurzor"
 
 msgid "Block cursor"
 msgstr "Blokovať kurzor"
 

-#: src/prefs_common.c:1446
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Zachovať pôvodnú hlavičku Od pri presmerovaní"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Zachovať pôvodnú hlavičku Od pri presmerovaní"
 

-#: src/prefs_common.c:1454
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "Automaticky ukladať medzi koncepty každých "
 
 msgid "Autosave to Drafts folder every "
 msgstr "Automaticky ukladať medzi koncepty každých "
 

-#: src/prefs_common.c:1461 src/prefs_common.c:1506
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "znakoch"
 
 msgid "characters"
 msgstr "znakoch"
 

-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "Počet spätných krokov"
 
 msgid "Undo level"
 msgstr "Počet spätných krokov"
 

-#: src/prefs_common.c:1482
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "Zalamovanie správy"
 
 msgid "Message wrapping"
 msgstr "Zalamovanie správy"
 

-#: src/prefs_common.c:1494
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 
 msgid "Wrap messages at"
 msgstr "Zalomiť správy na"
 

-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 
 msgid "Wrap quotation"
 msgstr "Zalomiť citáciu"
 

-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 
 msgid "Wrap on input"
 msgstr "Zalamovať pri písaní"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "Zalomiť pred odoslaním"
 
 msgid "Wrap before sending"
 msgstr "Zalomiť pred odoslaním"
 

-#: src/prefs_common.c:1522
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Inteligentné zalamovanie (EXPERIMENTÁLNE)"
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Inteligentné zalamovanie (EXPERIMENTÁLNE)"
 

-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "Pri odpovedaní implicitne citovať"
 
 msgid "Reply will quote by default"
 msgstr "Pri odpovedaní implicitne citovať"
 

-#: src/prefs_common.c:1590
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "Formát odpovede"
 
 msgid "Reply format"
 msgstr "Formát odpovede"
 

-#: src/prefs_common.c:1605 src/prefs_common.c:1644
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "Značka citácie"
 
 msgid "Quotation mark"
 msgstr "Značka citácie"
 

-#: src/prefs_common.c:1629
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 
 msgid "Forward format"
 msgstr "Formát posielania ďalej"
 

-#: src/prefs_common.c:1673
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr " Popis znakov "
 
 msgid " Description of symbols "
 msgstr " Popis znakov "
 

-#: src/prefs_common.c:1681
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "Znak citácie"
 
 msgid "Quotation characters"
 msgstr "Znak citácie"
 

-#: src/prefs_common.c:1696
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "Brať tieto znaky ako znaky citácie: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Brať tieto znaky ako znaky citácie: "
 

-#: src/prefs_common.c:1746
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Preložiť názov hlavičky (ako napríklad 'From:', 'Subject:')"
 

-#: src/prefs_common.c:1749
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 
 msgid "Display unread number next to folder name"
 msgstr "Zobraziť počet neprečítaných správ pri názve priečinka"
 

-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Skrátiť diskusné skupiny dlhšie ako"
 

-#: src/prefs_common.c:1773
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "písmen"
 
 msgid "letters"
 msgstr "písmen"
 

-#: src/prefs_common.c:1779
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "Zoznam správ"
 
 msgid "Summary View"
 msgstr "Zoznam správ"
 

-#: src/prefs_common.c:1788
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Zobraziť príjemcu v stĺpci 'Od' ak ste odosielateľ vy"
 

-#: src/prefs_common.c:1791
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "Zobraziť odosielateľa za použitia adresáru"
 
 msgid "Display sender using address book"
 msgstr "Zobraziť odosielateľa za použitia adresáru"
 

-#: src/prefs_common.c:1794
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr "Zaraďovať do vlákien dodatočne aj podľa názvu správy."
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "Zaraďovať do vlákien dodatočne aj podľa názvu správy."
 

-#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "Formát dátumu"
 
 msgid "Date format"
 msgstr "Formát dátumu"
 

-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 
 msgid " Set displayed items in summary... "
 msgstr " Nastavenie zobrazovaných položiek v zozname správ... "
 

-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 
 msgid "Enable coloration of message"
 msgstr "Povoliť farby v správe"
 

-#: src/prefs_common.c:1900
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"


@@ -6160,344 +6215,327 @@ msgstr ""
 "Zobraziť viacbajtovú abecedu a čísla ako\n"
 "ASCII znaky (len Japonsko)"
 
 "Zobraziť viacbajtovú abecedu a čísla ako\n"
 "ASCII znaky (len Japonsko)"
 

-#: src/prefs_common.c:1906
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 
 msgid "Display header pane above message view"
 msgstr "Zobraziť panel s hlavičkami nad správou"
 

-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 
 msgid "Display short headers on message view"
 msgstr "Zobraziť vybrané hlavičky v správe"
 

-#: src/prefs_common.c:1935
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 
 msgid "Line space"
 msgstr "Medzera medzi riadkami"
 

-#: src/prefs_common.c:1949 src/prefs_common.c:1989
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "pixel(ov)"
 
 msgid "pixel(s)"
 msgstr "pixel(ov)"
 

-#: src/prefs_common.c:1954
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "Odsadiť telo správy"
 
 msgid "Leave space on head"
 msgstr "Odsadiť telo správy"
 

-#: src/prefs_common.c:1956
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "Posúvanie"
 
 msgid "Scroll"
 msgstr "Posúvanie"
 

-#: src/prefs_common.c:1963
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Pol stránky"
 
 msgid "Half page"
 msgstr "Pol stránky"
 

-#: src/prefs_common.c:1969
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 
 msgid "Smooth scroll"
 msgstr "Plynulé posúvanie"
 

-#: src/prefs_common.c:1975
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "Posun"
 
 msgid "Step"
 msgstr "Posun"
 

-#: src/prefs_common.c:2000
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zobraziť popisy príloh, miesto názvov"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Zobraziť popisy príloh, miesto názvov"
 

-#: src/prefs_common.c:2046
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 
 msgid "Automatically check signatures"
 msgstr "Automaticky overovať podpisy"
 

-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "Uložiť heslo dočasne v pamäti"
 

-#: src/prefs_common.c:2064
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr "Vymazať z pamäte po"
 
 msgid "Expire after"
 msgstr "Vymazať z pamäte po"
 

-#: src/prefs_common.c:2075
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte na '0', ak chcete uložiť heslo do pamäte  až do ukončenia"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Nastavte na '0', ak chcete uložiť heslo do pamäte  až do ukončenia"
 

-#: src/prefs_common.c:2083
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "minútach "
 
 msgid "minute(s) "
 msgstr "minútach "
 

-#: src/prefs_common.c:2100
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Zachytiť vstup počas zadávania hesla"
 

-#: src/prefs_common.c:2105
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Pri spustení zobraziť varovanie v prípade, že sa GnuPG nedá použiť."
 

-#: src/prefs_common.c:2166
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 
 msgid "Always open messages in summary when selected"
 msgstr "Otvoriť správu hneď pri zvolení v zozname"
 

-#: src/prefs_common.c:2170
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 
 msgid "Open first unread message when entering a folder"
 msgstr "Pri vstupe do priečinka otvoriť prvú neprečítanú správu"
 

-#: src/prefs_common.c:2174
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "Správu označiť ako prečítanú len ak je otvorená v samostatnom okne"
 

-#: src/prefs_common.c:2178
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "Po prijatí novej pošty sa presunúť do priečinka prijatých správ"
 

-#: src/prefs_common.c:2188
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Pri presúvaní alebo mazaní správ toto vykonať okamžite"
 

-#: src/prefs_common.c:2190
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgstr "Správy budú označené až do vykonania,  ak je táto možnosť vypnutá"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr "Správy budú označené až do vykonania,  ak je táto možnosť vypnutá"
 

-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "Zobraziť okno dialógu pri žiadnych nečítaných správach"
 
 msgid "Show no-unread-message dialog"
 msgstr "Zobraziť okno dialógu pri žiadnych nečítaných správach"
 

-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "Predpokladať 'Áno'"
 
 msgid "Assume 'Yes'"
 msgstr "Predpokladať 'Áno'"
 

-#: src/prefs_common.c:2215
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "Predpokladať 'Nie'"
 
 msgid "Assume 'No'"
 msgstr "Predpokladať 'Nie'"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 
 msgid " Set key bindings... "
 msgstr " Nastaviť klávesové skratky... "
 

-#: src/prefs_common.c:2230
-msgid "Icon theme"
-msgstr "Téma ikon"
-
-#: src/prefs_common.c:2314
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Externé príkazy (%s bude nahradené názvom súboru / URI)"
-
-#: src/prefs_common.c:2323
-msgid "Web browser"
-msgstr "Webový prehliadač"
-
-#: src/prefs_common.c:2359 src/toolbar.c:429
-msgid "Editor"
-msgstr "Editor"
-
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Pridať adresu k príjemcom pri dvojkliknutí"
 

-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "Veľkosť záznamu"
 
 msgid "Log Size"
 msgstr "Veľkosť záznamu"
 

-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "Zrezať veľkosť záznamu"
 
 msgid "Clip the log size"
 msgstr "Zrezať veľkosť záznamu"
 

-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "Dĺžka okna záznamu"
 
 msgid "Log window length"
 msgstr "Dĺžka okna záznamu"
 

-#: src/prefs_common.c:2417
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "0 pre zrušenie zápisu do okna záznamu"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 pre zrušenie zápisu do okna záznamu"
 

-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "Bezpečnosť"
 
 msgid "Security"
 msgstr "Bezpečnosť"
 

-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "Opýtať sa pred prijatím SSL certifikátov"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "Opýtať sa pred prijatím SSL certifikátov"
 

-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "Pri ukončení"
 
 msgid "On exit"
 msgstr "Pri ukončení"
 

-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 
 msgid "Confirm on exit"
 msgstr "Potvrdiť ukončenie"
 

-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 
 msgid "Empty trash on exit"
 msgstr "Vyprázdniť kôš pri ukončení"
 

-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 
 msgid "Ask before emptying"
 msgstr "Opýtať sa pred vyprázdnením"
 

-#: src/prefs_common.c:2462
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 
 msgid "Warn if there are queued messages"
 msgstr "Upozorniť, ak sú správy vo fronte"
 

-#: src/prefs_common.c:2468
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 
 msgid "Socket I/O timeout:"
 msgstr "Časový limit spojení:"
 

-#: src/prefs_common.c:2481
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "sekúnd"
 
 msgid "seconds"
 msgstr "sekúnd"
 

-#: src/prefs_common.c:2665
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 
 msgid "the full abbreviated weekday name"
 msgstr "skrátený názov dňa v týždni"
 

-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 
 msgid "the full weekday name"
 msgstr "názov dňa v týždni"
 

-#: src/prefs_common.c:2667
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 
 msgid "the abbreviated month name"
 msgstr "skrátený názov mesiaca"
 

-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "názov mesiaca"
 
 msgid "the full month name"
 msgstr "názov mesiaca"
 

-#: src/prefs_common.c:2669
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 
 msgid "the preferred date and time for the current locale"
 msgstr "uprednostňovaný dátum a čas pre súčasnú lokalizáciu"
 

-#: src/prefs_common.c:2670
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 
 msgid "the century number (year/100)"
 msgstr "storočie (rok/100)"
 

-#: src/prefs_common.c:2671
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 
 msgid "the day of the month as a decimal number"
 msgstr "deň v mesiaci"
 

-#: src/prefs_common.c:2672
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "číslo hodiny pri použití 24-hodinového času"
 

-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "číslo hodiny pri použití 12-hodinového času"
 

-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 
 msgid "the day of the year as a decimal number"
 msgstr "číslo dňa v roku"
 

-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 
 msgid "the month as a decimal number"
 msgstr "číslo mesiaca"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "minúty"
 
 msgid "the minute as a decimal number"
 msgstr "minúty"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "AM alebo PM"
 
 msgid "either AM or PM"
 msgstr "AM alebo PM"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "sekundy"
 
 msgid "the second as a decimal number"
 msgstr "sekundy"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 
 msgid "the day of the week as a decimal number"
 msgstr "poradie dňa v týždni"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 
 msgid "the preferred date for the current locale"
 msgstr "uprednostňovaný dátum pre súčasnú lokalizáciu"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 
 msgid "the last two digits of a year"
 msgstr "posledné dve číslice roku"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "rok"
 
 msgid "the year as a decimal number"
 msgstr "rok"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 
 msgid "the time zone or name or abbreviation"
 msgstr "časová zóna, jej názov alebo skratka"
 

-#: src/prefs_common.c:2704
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "Symbol"
 
 msgid "Specifier"
 msgstr "Symbol"
 

-#: src/prefs_common.c:2744
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "Príklad"
 
 msgid "Example"
 msgstr "Príklad"
 

-#: src/prefs_common.c:2833
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 
 msgid "Set message colors"
 msgstr "Nastaviť farby správy"
 

-#: src/prefs_common.c:2841
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "Farby"
 
 msgid "Colors"
 msgstr "Farby"
 

-#: src/prefs_common.c:2888
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 
 msgid "Quoted Text - First Level"
 msgstr "Citovaný text - Prvá úroveň"
 

-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 
 msgid "Quoted Text - Second Level"
 msgstr "Citovaný text - Druhá úroveň"
 

-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 
 msgid "Quoted Text - Third Level"
 msgstr "Citovaný text - Tretia úroveň"
 

-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "URI odkaz"
 
 msgid "URI link"
 msgstr "URI odkaz"
 

-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Cieľový priečinok"
 
 msgid "Target folder"
 msgstr "Cieľový priečinok"
 

-#: src/prefs_common.c:2918
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Podpisy"
 
 msgid "Signatures"
 msgstr "Podpisy"
 

-#: src/prefs_common.c:2925
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 
 msgid "Recycle quote colors"
 msgstr "Opakovať farby"
 

-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 
 msgid "Pick color for quotation level 1"
 msgstr "Vyberte farbu pre 1. úroveň citácie"
 

-#: src/prefs_common.c:2995
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 
 msgid "Pick color for quotation level 2"
 msgstr "Vyberte farbu pre 2. úroveň citácie"
 

-#: src/prefs_common.c:2998
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 
 msgid "Pick color for quotation level 3"
 msgstr "Vyberte farbu pre 3. úroveň citácie"
 

-#: src/prefs_common.c:3001
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 
 msgid "Pick color for URI"
 msgstr "Vyberte farbu pre URI odkazy"
 

-#: src/prefs_common.c:3004
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Vyberte farbu pre cieľový priečinok"
 
 msgid "Pick color for target folder"
 msgstr "Vyberte farbu pre cieľový priečinok"
 

-#: src/prefs_common.c:3007
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Vyberte farbu pre podpisy"
 
 msgid "Pick color for signatures"
 msgstr "Vyberte farbu pre podpisy"
 

-#: src/prefs_common.c:3142
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "Klávesové skratky"
 
 msgid "Key bindings"
 msgstr "Klávesové skratky"
 

-#: src/prefs_common.c:3156
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 
 msgid "Select preset:"
 msgstr "Zvoľte sadu klávesových skratiek:"
 

-#: src/prefs_common.c:3169 src/prefs_common.c:3454
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "Starší Sylpheed"
 

-#: src/prefs_common.c:3177
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6507,22 +6545,26 @@ msgstr ""
 
 #: src/prefs_customheader.c:163
 msgid "Custom header configuration"
 
 #: src/prefs_customheader.c:163
 msgid "Custom header configuration"

-msgstr "Nastavenie vlastných hlavičiek"
+msgstr "Nastavenie dodatočných hlavičiek"

 
 #: src/prefs_customheader.c:261
 msgid "Current custom headers"
 
 #: src/prefs_customheader.c:261
 msgid "Current custom headers"

-msgstr "Aktuálne vlastné hlavičky"
+msgstr "Aktuálne dodatočné hlavičky"

 
 #: src/prefs_customheader.c:483 src/prefs_display_header.c:530
 #: src/prefs_matcher.c:1175
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 
 
 #: src/prefs_customheader.c:483 src/prefs_display_header.c:530
 #: src/prefs_matcher.c:1175
 msgid "Header name is not set."
 msgstr "Nebol zadaný názov hlavičky."
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "Táto hlavička nie je povolená ako dodatočná"
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 
 msgid "Delete header"
 msgstr "Zmazať hlavičku"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 
 msgid "Do you really want to delete this header?"
 msgstr "Naozaj chcete zmazať túto hlavičku?"
 


@@ -6550,6 +6592,35 @@ msgstr "Zobraziť všetky neurčené hlavičky"
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 
 msgid "This header is already in the list."
 msgstr "Táto hlavička už je v zozname."
 

+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s bude nahradené názvom súboru / URI"
+
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "Webový prehliadač"
+
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "Príkaz pre tlač"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Textový editor"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "Prezerač obrázkov"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "Prehrávač zvuku"
+
+#: src/prefs_ext_prog.c:265
+msgid "Message View/External Programs"
+msgstr "Zobrazenie správy/Externé programy"
+

 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Presunúť"
 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Presunúť"


@@ -6582,7 +6653,7 @@ msgstr "Označiť ako prečítané"
 msgid "Mark as unread"
 msgstr "Označiť ako neprečítané"
 
 msgid "Mark as unread"
 msgstr "Označiť ako neprečítané"
 

-#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473

 msgid "Forward"
 msgstr "Poslať ďalej"
 
 msgid "Forward"
 msgstr "Poslať ďalej"
 


@@ -6591,7 +6662,7 @@ msgid "Redirect"
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
 msgstr "Presmerovať"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395

-#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481

 msgid "Execute"
 msgstr "Vykonať"
 
 msgid "Execute"
 msgstr "Vykonať"
 


@@ -6632,7 +6703,7 @@ msgid "Recipient"
 msgstr "Príjemca"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
 msgstr "Príjemca"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75

-#: src/summaryview.c:479
+#: src/summaryview.c:480

 msgid "Score"
 msgstr "Ohodnotenie"
 
 msgid "Score"
 msgstr "Ohodnotenie"
 


@@ -6671,23 +6742,23 @@ msgstr "Nebola definovaná žiadna akcia."
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47

-#: src/summaryview.c:474 src/summaryview.c:641
+#: src/summaryview.c:475 src/summaryview.c:642

 msgid "Subject"
 msgstr "Predmet"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
 msgid "Subject"
 msgstr "Predmet"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42

-#: src/summaryview.c:475 src/summaryview.c:645
+#: src/summaryview.c:476 src/summaryview.c:646

 msgid "From"
 msgstr "Od"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
 msgid "From"
 msgstr "Od"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143

-#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650

 msgid "To"
 msgstr "Komu"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
 msgid "To"
 msgstr "Komu"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715

-#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477

 msgid "Date"
 msgstr "Dátum"
 
 msgid "Date"
 msgstr "Dátum"
 


@@ -6746,35 +6817,35 @@ msgstr "Prvé"
 msgid "Bottom"
 msgstr "Posledné"
 
 msgid "Bottom"
 msgstr "Posledné"
 

-#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "Reťazec podmienky je neplatný."
 
 msgid "Condition string is not valid."
 msgstr "Reťazec podmienky je neplatný."
 

-#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 
 msgid "Action string is not valid."
 msgstr "Reťazec akcie je neplatný."
 

-#: src/prefs_filtering.c:780
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgstr "Reťazec podmienky je prázdny."
 
 msgid "Condition string is empty."
 msgstr "Reťazec podmienky je prázdny."
 

-#: src/prefs_filtering.c:786
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "Reťazec akcie je prázdny."
 
 msgid "Action string is empty."
 msgstr "Reťazec akcie je prázdny."
 

-#: src/prefs_filtering.c:853
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "Odstrániť pravidlo"
 
 msgid "Delete rule"
 msgstr "Odstrániť pravidlo"
 

-#: src/prefs_filtering.c:854
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete odstrániť toto pravidlo?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Naozaj chcete odstrániť toto pravidlo?"
 

-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "Pravidlo nebolo uložené"
 
 msgid "Entry not saved"
 msgstr "Pravidlo nebolo uložené"
 

-#: src/prefs_filtering.c:1002
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr "Pravidlo nebolo uložené. Zavrieť napriek tomu?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "Pravidlo nebolo uložené. Zavrieť napriek tomu?"
 


@@ -6836,31 +6907,27 @@ msgstr "Všeobecné"
 msgid "Settings for folder"
 msgstr "Nastavenia priečinku"
 
 msgid "Settings for folder"
 msgstr "Nastavenia priečinku"
 

-#: src/prefs_fonts.c:77
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Voľba písma"
 
 msgid "Font selection"
 msgstr "Voľba písma"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Text"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "Zobrazenie priečinku"

 
 

-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "Malé"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Zobrazenie správy"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Obyčajné"
-
-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgstr "Tučné"
 
 msgid "Bold"
 msgstr "Tučné"
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr "Aby zmeny nadobudli platnosť, musíte znovu spustiť program"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr "Aby zmeny nadobudli platnosť, musíte znovu spustiť program"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "Zobrazenie/Fonty"
 
 msgid "Display/Fonts"
 msgstr "Zobrazenie/Fonty"
 


@@ -7157,6 +7224,166 @@ msgstr "Zmazať šablónu"
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "Východzia interná téma"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "Zobraziť/Témy"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Len root môže odstrániť systémové témy"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Odstrániť systémovú tému: '%s'"
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Odstrániť tému '%s'"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "Naozaj chcete zmazať túto tému?"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Chyba pri súbore %s\n"
+"počas odstraňovania témy."
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "Chyba pri odstraňovaní priečinku témy."
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Téma bola úspešne odstránená"
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Zvoľte priečinok pre tému"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Nainštalovať tému '%s'"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Tento priečinok asi nie je priečinok pre témy.\n"
+"Nainštalovať aj napriek tomu?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "Chcete nainštalovať tému pre všetkých používateľov v systéme?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"Téma s rovnakým názvom\n"
+"je tu už nainštalovaná"
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr "Nepodarilo sa vytvoriť cieľový priečinok"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Téma bola úspešne nainštalovaná"
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+"Chyba pri súbore %s\n"
+"počas inštalácie témy."
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "%d tém dostupných (%d používateľských, %d systémových, 1 interná)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "Team Sylpheed Claws"
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "Interná téma má %d ikon"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "O tejto téme nie sú k dispozícii žiadne informácie"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "Chyba: nemôžem zistiť stav témy"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d súborov (%d ikon), veľkosť je %s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Výber"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "Inštalovať novú..."
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "Získať ďalšie..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "Informácie"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "Autor:"
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "URL:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "Stav:"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Náhľad"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "Akcie"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "Použiť toto"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "Odstrániť"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -7225,7 +7452,7 @@ msgstr "Prispôsobiť panely nástrojov/Okno písania správy"
 msgid "Customize Toolbars/Compose Window"
 msgstr "Prispôsobiť panely nástrojov/Okno prezerania správy"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "Prispôsobiť panely nástrojov/Okno prezerania správy"
 

-#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140

 msgid "No signature found"
 msgstr "Nebol nájdený žiadny podpis"
 
 msgid "No signature found"
 msgstr "Nebol nájdený žiadny podpis"
 


@@ -7233,11 +7460,11 @@ msgstr "Nebol nájdený žiadny podpis"
 msgid "No information available"
 msgstr "Nie sú dostupné žiadne informácie"
 
 msgid "No information available"
 msgstr "Nie sú dostupné žiadne informácie"
 

-#: src/procmsg.c:1126
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr "Nemôžem vytvoriť dočasný súbor pre odosielanie news príspevkov."
 
 msgid "Could not create temporary file for news sending."
 msgstr "Nemôžem vytvoriť dočasný súbor pre odosielanie news príspevkov."
 

-#: src/procmsg.c:1137
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru pre odosielanie news príspevkov."
 
 msgid "Error when writing temporary file for news sending."
 msgstr "Chyba pri zápise do dočasného súboru pre odosielanie news príspevkov."
 


@@ -7442,92 +7669,92 @@ msgstr ""
 "ak nejaký máte.\n"
 "Ak ste si nie istý, zvoľte len OK."
 
 "ak nejaký máte.\n"
 "Ak ste si nie istý, zvoľte len OK."
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr "Nezadaná"
 
 msgid "Undefined"
 msgstr "Nezadaná"
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr "Čiastočná"
 
 msgid "Marginal"
 msgstr "Čiastočná"
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 msgid "Ultimate"
 msgstr "Úplná"
 
 msgid "Ultimate"
 msgstr "Úplná"
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Platný podpis od %s (Dôvera %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Platný podpis od %s (Dôvera %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "Platnosť podpisu vypršala"
 
 msgid "The signature has expired"
 msgstr "Platnosť podpisu vypršala"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr "Platnosť kľúča použitého na podpísanie tejto časti vypršala"
 
 msgid "The key that was used to sign this part has expired"
 msgstr "Platnosť kľúča použitého na podpísanie tejto časti vypršala"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "Niektoré podpisy sú neplatné"
 
 msgid "Not all signatures are valid"
 msgstr "Niektoré podpisy sú neplatné"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "Podpis je neplatný"
 
 msgid "This signature is invalid"
 msgstr "Podpis je neplatný"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "Nemôžem nájsť verejný kľúč pre overenie tohoto podpisu"
 
 msgid "You have no key to verify this signature"
 msgstr "Nemôžem nájsť verejný kľúč pre overenie tohoto podpisu"
 

-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "Vyskytla sa chyba"
 
 msgid "An error occured"
 msgstr "Vyskytla sa chyba"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "Podpis nebol overený"
 
 msgid "The signature has not been checked"
 msgstr "Podpis nebol overený"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpísané dňa %s použitím %s kľúča %s\n"
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Podpísané dňa %s použitím %s kľúča %s\n"
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Správny podpis od \"%s\"\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Správny podpis od \"%s\"\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Platnosť podpisu vypršaná od \"%s\"\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Platnosť podpisu vypršaná od \"%s\"\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "CHYBNÝ podpis od \"%s\"\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "CHYBNÝ podpis od \"%s\"\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                aka \"%s\"\n"
 

-#: src/sgpgme.c:194
+#: src/sgpgme.c:203

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Odtlačok primárneho kľúča: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Odtlačok primárneho kľúča: %s\n"
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Podpis vyprší %s\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Podpis vyprší %s\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Podpis vypršal %s\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Podpis vypršal %s\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7560,10 +7787,6 @@ msgstr "Vymazať certifikát"
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Naozaj chcete vymazať tento certifikát"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "(Názov vymazaný kvôli RegExp)"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Vyhľadať v správach"


@@ -7588,536 +7811,536 @@ msgstr "Bol dosiahnutý začiatok zoznamu; pokračovať od konca?"
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Bol dosiahnutý koniec zoznamu; pokračovať od začiatku?"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 

-#: src/summaryview.c:404
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/O_dpovedať komu"
 
 msgid "/Repl_y to"
 msgstr "/O_dpovedať komu"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/O_dpovedať komu/_všetkým"
 
 msgid "/Repl_y to/_all"
 msgstr "/O_dpovedať komu/_všetkým"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
 msgid "/Repl_y to/_sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 

-#: src/summaryview.c:407
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 

-#: src/summaryview.c:409
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "Follow-up a odpovedať"
 
 msgid "/Follow-up and reply to"
 msgstr "Follow-up a odpovedať"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 

-#: src/summaryview.c:412
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/Presmerovať"
 
 msgid "/Redirect"
 msgstr "/Presmerovať"
 

-#: src/summaryview.c:414
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/Znovu upraviť"
 
 msgid "/Re-_edit"
 msgstr "/Znovu upraviť"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/Pre_sunúť"
 
 msgid "/M_ove..."
 msgstr "/Pre_sunúť"
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/_Kopírovať..."
 
 msgid "/_Copy..."
 msgstr "/_Kopírovať..."
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/Stornovať news príspevok"
 
 msgid "/Cancel a news message"
 msgstr "/Stornovať news príspevok"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "/V_ykonať"
 
 msgid "/E_xecute"
 msgstr "/V_ykonať"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/Oz_načiť"
 
 msgid "/_Mark"
 msgstr "/Oz_načiť"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/Oz_načiť/Oz_načiť"
 
 msgid "/_Mark/_Mark"
 msgstr "/Oz_načiť/Oz_načiť"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/Oz_načiť/_Odznačiť"
 
 msgid "/_Mark/_Unmark"
 msgstr "/Oz_načiť/_Odznačiť"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/Oz_načiť/---"
 
 msgid "/_Mark/---"
 msgstr "/Oz_načiť/---"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Oz_načiť/Označiť ako n_eprečítané"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Oz_načiť/Označiť ako n_eprečítané"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/Oz_načiť/Označiť všetky ako prečítané"
 
 msgid "/_Mark/Mark all read"
 msgstr "/Oz_načiť/Označiť všetky ako prečítané"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/Oz_načiť/Ignorovať vlákno"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/Oz_načiť/Ignorovať vlákno"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/Oz_načiť/Odignorovať vlákno"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/Oz_načiť/Odignorovať vlákno"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/Oz_načiť/Zamknúť"
 
 msgid "/_Mark/Lock"
 msgstr "/Oz_načiť/Zamknúť"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/Oz_načiť/Odomknúť"
 
 msgid "/_Mark/Unlock"
 msgstr "/Oz_načiť/Odomknúť"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/_Farebné označenie"
 
 msgid "/Color la_bel"
 msgstr "/_Farebné označenie"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "/Pridať odosielateľa do _adresára"
 
 msgid "/Add sender to address boo_k"
 msgstr "/Pridať odosielateľa do _adresára"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgstr "/Vytvor_iť pravidlo filtra"
 
 msgid "/Create f_ilter rule"
 msgstr "/Vytvor_iť pravidlo filtra"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Vytvor_iť pravidlo filtra/_Automaticky"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Vytvor_iť pravidlo filtra/_Automaticky"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _odosielateľa"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _odosielateľa"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _príjemcu"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _príjemcu"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Vytvor_iť pravidlo filtra/podľa p_redmetu"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Vytvor_iť pravidlo filtra/podľa p_redmetu"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Create processing rule"
 msgstr "/Vytvoriť pravidlo spracúvania"
 
 msgid "/Create processing rule"
 msgstr "/Vytvoriť pravidlo spracúvania"
 

-#: src/summaryview.c:448
+#: src/summaryview.c:449

 msgid "/Create processing rule/_Automatically"
 msgstr "/Vytvoriť pravidlo spracúvania/_Automaticky"
 
 msgid "/Create processing rule/_Automatically"
 msgstr "/Vytvoriť pravidlo spracúvania/_Automaticky"
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Create processing rule/by _From"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa _odosielateľa"
 
 msgid "/Create processing rule/by _From"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa _odosielateľa"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create processing rule/by _To"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa _príjemcu"
 
 msgid "/Create processing rule/by _To"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa _príjemcu"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/Create processing rule/by _Subject"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa p_redmetu"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/Vytvoriť pravidlo spracúvania/podľa p_redmetu"
 

-#: src/summaryview.c:460
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "/_Zobraziť/_Zdroj"
 
 msgid "/_View/_Source"
 msgstr "/_Zobraziť/_Zdroj"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
 msgid "/_View/All _header"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/_Tlačiť..."
 
 msgid "/_Print..."
 msgstr "/_Tlačiť..."
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/Zvo_liť všetky"
 
 msgid "/Select _all"
 msgstr "/Zvo_liť všetky"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Zvoliť celé _vlákno"
 
 msgid "/Select t_hread"
 msgstr "/Zvoliť celé _vlákno"
 

-#: src/summaryview.c:471
+#: src/summaryview.c:472

 msgid "M"
 msgstr "M"
 
 msgid "M"
 msgstr "M"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "No."
 msgstr "Č."
 
 msgid "No."
 msgstr "Č."
 

-#: src/summaryview.c:480
+#: src/summaryview.c:481

 msgid "L"
 msgstr "L"
 
 msgid "L"
 msgstr "L"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "všetky správy"
 
 msgid "all messages"
 msgstr "všetky správy"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "správy, ktoré sú staršie ako #"
 
 msgid "messages whose age is greater than #"
 msgstr "správy, ktoré sú staršie ako #"
 

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "správy, ktoré sú novšie ako #"
 
 msgid "messages whose age is less than #"
 msgstr "správy, ktoré sú novšie ako #"
 

-#: src/summaryview.c:492
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 
 msgid "messages which contain S in the message body"
 msgstr "správy, ktorých telo obsahuje S"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 
 msgid "messages which contain S in the whole message"
 msgstr "správy, ktoré obsahujú S kdekoľvek"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 
 msgid "messages carbon-copied to S"
 msgstr "správy s kópiou v S"
 

-#: src/summaryview.c:495
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 
 msgid "message is either to: or cc: to S"
 msgstr "správa je buď to: alebo cc: S"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "vymazané správy"
 
 msgid "deleted messages"
 msgstr "vymazané správy"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 
 msgid "messages which contain S in the Sender field"
 msgstr "správy, ktoré obsahujú S v hlavičke Sender"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je \"S\" vykonané úspešne"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "pravda, ak je \"S\" vykonané úspešne"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 
 msgid "messages originating from user S"
 msgstr "správy pochádzajúce od používateľa S"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "preposlané správy"
 
 msgid "forwarded messages"
 msgstr "preposlané správy"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "správy, ktoré obsahujú hlavičku S"
 
 msgid "messages which contain header S"
 msgstr "správy, ktoré obsahujú hlavičku S"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-Id"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "správy, ktoré obsahujú S v hlavičke Message-Id"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "správy, ktoré obsahujú S v hlavičke inreplyto"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "správy, ktoré obsahujú S v hlavičke inreplyto"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "zamknuté správy"
 
 msgid "locked messages"
 msgstr "zamknuté správy"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 
 msgid "messages which are in newsgroup S"
 msgstr "správy, ktoré sú v diskusnej skupine S"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "nové správy"
 
 msgid "new messages"
 msgstr "nové správy"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "staré správy"
 
 msgid "old messages"
 msgstr "staré správy"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "správy, ktoré boli zodpovedané"
 
 msgid "messages which have been replied to"
 msgstr "správy, ktoré boli zodpovedané"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "prečítané správy"
 
 msgid "read messages"
 msgstr "prečítané správy"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 
 msgid "messages which contain S in subject"
 msgstr "správy, ktoré obsahujú S v názve"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "správy, ktorých ohodnotenie je rovné #"
 
 msgid "messages whose score is equal to #"
 msgstr "správy, ktorých ohodnotenie je rovné #"
 

-#: src/summaryview.c:512
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "správy, ktorých ohodnotenie je väčšie ako #"
 
 msgid "messages whose score is greater than #"
 msgstr "správy, ktorých ohodnotenie je väčšie ako #"
 

-#: src/summaryview.c:513
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "správy, ktorých ohodnotenie je menšie ako #"
 
 msgid "messages whose score is lower than #"
 msgstr "správy, ktorých ohodnotenie je menšie ako #"
 

-#: src/summaryview.c:514
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "správy, ktorých veľkosť je rovná #"
 
 msgid "messages whose size is equal to #"
 msgstr "správy, ktorých veľkosť je rovná #"
 

-#: src/summaryview.c:515
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "správy, ktorých veľkosť je väčšia ako #"
 
 msgid "messages whose size is greater than #"
 msgstr "správy, ktorých veľkosť je väčšia ako #"
 

-#: src/summaryview.c:516
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "správy, ktorých veľkosť je menšia ako #"
 
 msgid "messages whose size is smaller than #"
 msgstr "správy, ktorých veľkosť je menšia ako #"
 

-#: src/summaryview.c:517
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 
 msgid "messages which have been sent to S"
 msgstr "správy, odoslané S"
 

-#: src/summaryview.c:518
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "označené správy"
 
 msgid "marked messages"
 msgstr "označené správy"
 

-#: src/summaryview.c:519
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "neprečítané správy"
 
 msgid "unread messages"
 msgstr "neprečítané správy"
 

-#: src/summaryview.c:520
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 
 msgid "messages which contain S in References header"
 msgstr "správy, ktoré obsahujú S v hlavičke References"
 

-#: src/summaryview.c:521
+#: src/summaryview.c:522

 msgid "messages returning 0 when passed to command"
 msgstr "správy vracajúce 0 po odovzdaní príkazu"
 
 msgid "messages returning 0 when passed to command"
 msgstr "správy vracajúce 0 po odovzdaní príkazu"
 

-#: src/summaryview.c:522
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 
 msgid "messages which contain S in X-Label header"
 msgstr "správy, ktoré obsahujú S v hlavičke X-Label"
 

-#: src/summaryview.c:524
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "logický operátor AND"
 
 msgid "logical AND operator"
 msgstr "logický operátor AND"
 

-#: src/summaryview.c:525
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "logický operátor OR"
 
 msgid "logical OR operator"
 msgstr "logický operátor OR"
 

-#: src/summaryview.c:526
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 
 msgid "logical NOT operator"
 msgstr "logický operátor NOT"
 

-#: src/summaryview.c:527
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 
 msgid "case sensitive search"
 msgstr "záleží na veľkosti písmen"
 

-#: src/summaryview.c:534
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "Rozšírené symboly vyhľadávania"
 
 msgid "Extended Search symbols"
 msgstr "Rozšírené symboly vyhľadávania"
 

-#: src/summaryview.c:584
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "Zap/vyp. panel rýchleho vyhľadávania"
 
 msgid "Toggle quick-search bar"
 msgstr "Zap/vyp. panel rýchleho vyhľadávania"
 

-#: src/summaryview.c:668
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "Rozšírené symboly"
 
 msgid "Extended Symbols"
 msgstr "Rozšírené symboly"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Spracovať značky"
 
 msgid "Process mark"
 msgstr "Spracovať značky"
 

-#: src/summaryview.c:934
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 

-#: src/summaryview.c:977
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 

-#: src/summaryview.c:1400 src/summaryview.c:1444
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 

-#: src/summaryview.c:1401
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 

-#: src/summaryview.c:1413 src/summaryview.c:1457
+#: src/summaryview.c:1416 src/summaryview.c:1460

 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Interná chyba: nečakaná hodnota pre prefs_common.next_unread_msg_dialog\n"
 
 msgid "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr "Interná chyba: nečakaná hodnota pre prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1421
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 

-#: src/summaryview.c:1445
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 

-#: src/summaryview.c:1487 src/summaryview.c:1511
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 

-#: src/summaryview.c:1488
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 

-#: src/summaryview.c:1512
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 

-#: src/summaryview.c:1514
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "Hľadať znova"
 
 msgid "Search again"
 msgstr "Hľadať znova"
 

-#: src/summaryview.c:1543 src/summaryview.c:1568
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 

-#: src/summaryview.c:1544
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 

-#: src/summaryview.c:1553 src/summaryview.c:1578
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 

-#: src/summaryview.c:1569
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 

-#: src/summaryview.c:1593 src/summaryview.c:1618
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 

-#: src/summaryview.c:1594
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 

-#: src/summaryview.c:1603 src/summaryview.c:1628
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 

-#: src/summaryview.c:1619
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 

-#: src/summaryview.c:1832
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 

-#: src/summaryview.c:1979
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 

-#: src/summaryview.c:1983
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 

-#: src/summaryview.c:1984 src/summaryview.c:1991
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 

-#: src/summaryview.c:2004
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr " položka zvolená"
 
 msgid " item selected"
 msgstr " položka zvolená"
 

-#: src/summaryview.c:2006
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr " položiek zvolených"
 
 msgid " items selected"
 msgstr " položiek zvolených"
 

-#: src/summaryview.c:2022
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 

-#: src/summaryview.c:2196
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 

-#: src/summaryview.c:2266
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 

-#: src/summaryview.c:2395
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 

-#: src/summaryview.c:3022
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Nie ste autor tohoto príspevku\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Nie ste autor tohoto príspevku\n"
 

-#: src/summaryview.c:3109
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 

-#: src/summaryview.c:3110
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 

-#: src/summaryview.c:3152
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 

-#: src/summaryview.c:3266
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 

-#: src/summaryview.c:3343
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 

-#: src/summaryview.c:3393
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Vyberám všetky správy."
 
 msgid "Selecting all messages..."
 msgstr "Vyberám všetky správy."
 

-#: src/summaryview.c:3451
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "Pripojiť za alebo prepísať"
 
 msgid "Append or Overwrite"
 msgstr "Pripojiť za alebo prepísať"
 

-#: src/summaryview.c:3452
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť za alebo prepísať existujúci súbor?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Pripojiť za alebo prepísať existujúci súbor?"
 

-#: src/summaryview.c:3453
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "Pripojiť za"
 
 msgid "Append"
 msgstr "Pripojiť za"
 

-#: src/summaryview.c:3744
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 

-#: src/summaryview.c:3842
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 

-#: src/summaryview.c:3975
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "Neboli definované filtrovacie pravidlá."
 
 msgid "No filter rules defined."
 msgstr "Neboli definované filtrovacie pravidlá."
 

-#: src/summaryview.c:3984
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "Filtrujem..."
 
 msgid "Filtering..."
 msgstr "Filtrujem..."
 

-#: src/summaryview.c:5330
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8126,142 +8349,142 @@ msgstr ""
 "Chyba v regulérnom výraze:\n"
 "%s"
 
 "Chyba v regulérnom výraze:\n"
 "%s"
 

-#: src/textview.c:570
+#: src/textview.c:574

 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 

-#: src/textview.c:587
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr "Nasledujúce sa dá urobiť s touto časťou "
 
 msgid "The following can be performed on this part by "
 msgstr "Nasledujúce sa dá urobiť s touto časťou "
 

-#: src/textview.c:588
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "pravým kliknutím na ikonu alebo položku zoznamu:\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "pravým kliknutím na ikonu alebo položku zoznamu:\n"
 

-#: src/textview.c:590
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Pre uloženie vyberte 'Uložiť ako...' (Skratka 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Pre uloženie vyberte 'Uložiť ako...' (Skratka 'y')\n"
 

-#: src/textview.c:591
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Pre zobrazenie ako text vyberte 'Zobraz ako text' "
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Pre zobrazenie ako text vyberte 'Zobraz ako text' "
 

-#: src/textview.c:592
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(Skratka: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(Skratka: 't')\n"
 

-#: src/textview.c:593
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    Pre otvorenie v inej aplikácii vyberte 'Otvoriť' "
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    Pre otvorenie v inej aplikácii vyberte 'Otvoriť' "
 

-#: src/textview.c:594
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Skratka: 'l')\n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Skratka: 'l')\n"
 

-#: src/textview.c:595
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alebo dvojklik, alebo kliknutie stredným tlačítkom "
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (alebo dvojklik, alebo kliknutie stredným tlačítkom "
 

-#: src/textview.c:596
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "myši),\n"
 
 msgid "mouse button),\n"
 msgstr "myši),\n"
 

-#: src/textview.c:597
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    alebo 'Otvoriť čím...' (Skratka: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    alebo 'Otvoriť čím...' (Skratka: 'o')\n"
 

-#: src/textview.c:1859
+#: src/textview.c:1957

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"

-"the apparent URL (%s).  \n"
+"the apparent URL (%s).\n"

 "Open it anyway?"
 msgstr ""
 "Open it anyway?"
 msgstr ""

-"Skutočná adresa (%s) sa líši od \n"
-"zdanlivej (%s).  \n"
+"Skutočná adresa (%s) sa líši od\n"
+"zdanlivej (%s).\n"

 "Otvoriť ju napriek tomu?"
 
 "Otvoriť ju napriek tomu?"
 

-#: src/toolbar.c:157 src/toolbar.c:1559
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Prijať novú poštu pre všetky kontá"
 

-#: src/toolbar.c:158 src/toolbar.c:1565
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "Prijať novú poštu pre aktuálne konto"
 
 msgid "Receive Mail on current Account"
 msgstr "Prijať novú poštu pre aktuálne konto"
 

-#: src/toolbar.c:159 src/toolbar.c:1571
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Odoslať správy vo fronte"
 
 msgid "Send Queued Message(s)"
 msgstr "Odoslať správy vo fronte"
 

-#: src/toolbar.c:160 src/toolbar.c:1584
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "Nová správa"
 
 msgid "Compose Email"
 msgstr "Nová správa"
 

-#: src/toolbar.c:161 src/toolbar.c:1588
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "Nový news príspevok"
 
 msgid "Compose News"
 msgstr "Nový news príspevok"
 

-#: src/toolbar.c:162 src/toolbar.c:1594
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 
 msgid "Reply to Message"
 msgstr "Odpovedať na správu"
 

-#: src/toolbar.c:163 src/toolbar.c:1615
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 
 msgid "Reply to Sender"
 msgstr "Odpovedať odosielateľovi"
 

-#: src/toolbar.c:164 src/toolbar.c:1636
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 
 msgid "Reply to All"
 msgstr "Odpovedať odosielateľovi i všetkým príjemcom"
 

-#: src/toolbar.c:165 src/toolbar.c:1657
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 
 msgid "Reply to Mailing-list"
 msgstr "Odpovedať do diskusnej skupiny"
 

-#: src/toolbar.c:166 src/toolbar.c:1678
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 
 msgid "Forward Message"
 msgstr "Poslať správu ďalej"
 

-#: src/toolbar.c:167 src/toolbar.c:1699
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "Zmazať správu"
 
 msgid "Delete Message"
 msgstr "Zmazať správu"
 

-#: src/toolbar.c:169 src/toolbar.c:1711
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "Prejsť na ďalšiu správu"
 
 msgid "Goto Next Message"
 msgstr "Prejsť na ďalšiu správu"
 

-#: src/toolbar.c:173 src/toolbar.c:1719
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "Odoslať správu"
 
 msgid "Send Message"
 msgstr "Odoslať správu"
 

-#: src/toolbar.c:174 src/toolbar.c:1725
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 
 msgid "Put into queue folder and send later"
 msgstr "Zaradiť správu do priečinka Na odoslanie a odoslať neskôr"
 

-#: src/toolbar.c:175 src/toolbar.c:1731
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 
 msgid "Save to draft folder"
 msgstr "Uložiť medzi koncepty"
 

-#: src/toolbar.c:176 src/toolbar.c:1737
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 
 msgid "Insert file"
 msgstr "Vložiť obsah súboru"
 

-#: src/toolbar.c:177 src/toolbar.c:1743
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "Pripojiť súbor"
 
 msgid "Attach file"
 msgstr "Pripojiť súbor"
 

-#: src/toolbar.c:178 src/toolbar.c:1749
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "Vložiť podpis"
 
 msgid "Insert signature"
 msgstr "Vložiť podpis"
 

-#: src/toolbar.c:179 src/toolbar.c:1755
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 
 msgid "Edit with external editor"
 msgstr "Upraviť pomocou externého editoru"
 

-#: src/toolbar.c:180 src/toolbar.c:1761
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 
 msgid "Wrap all long lines"
 msgstr "Zalomiť všetky dlhé riadky"
 

-#: src/toolbar.c:183 src/toolbar.c:1774
+#: src/toolbar.c:183 src/toolbar.c:1550

 msgid "Check spelling"
 msgstr "Overiť pravopis"
 
 msgid "Check spelling"
 msgstr "Overiť pravopis"
 


@@ -8301,55 +8524,83 @@ msgstr "/Odpovedať o_dosielateľovi s citáciou"
 msgid "/_Reply to sender without quote"
 msgstr "/Odpovedať odo_sielateľovi bez citácie"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Odpovedať odo_sielateľovi bez citácie"
 

-#: src/toolbar.c:225
-msgid "/_Forward message (inline style)"
-msgstr "/Poslať ďalej (inline)"
-

 #: src/toolbar.c:226
 #: src/toolbar.c:226

-msgid "/Forward message as _attachment"
-msgstr "/Poslať ďalej ako p_rílohu"
+msgid "/For_ward as attachment"
+msgstr "/P_oslať ďalej ako prílohu"

 
 

-#: src/toolbar.c:371
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/P_resmerovať"
+
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "Prijať"
 
 msgid "Get"
 msgstr "Prijať"
 

-#: src/toolbar.c:372
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "Prijať všetko"
 
 msgid "Get All"
 msgstr "Prijať všetko"
 

-#: src/toolbar.c:375
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "Nová správa"
 
 msgid "Email"
 msgstr "Nová správa"
 

-#: src/toolbar.c:377 src/toolbar.c:469
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "Odpovedať"
 
 msgid "Reply"
 msgstr "Odpovedať"
 

-#: src/toolbar.c:378 src/toolbar.c:470
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "Všetky"
 
 msgid "All"
 msgstr "Všetky"
 

-#: src/toolbar.c:379 src/toolbar.c:471
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "Odosielateľ"
 
 msgid "Sender"
 msgstr "Odosielateľ"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "Odoslať neskôr"
 
 msgid "Send later"
 msgstr "Odoslať neskôr"
 

-#: src/toolbar.c:423
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "Koncept"
 
 msgid "Draft"
 msgstr "Koncept"
 

-#: src/toolbar.c:426
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "Pripojiť"
 
 #: src/toolbar.c:430
 msgid "Attach"
 msgstr "Pripojiť"
 
 #: src/toolbar.c:430

+msgid "Editor"
+msgstr "Editor"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "Riadkovanie"
 
 msgid "Linewrap"
 msgstr "Riadkovanie"
 

-#: src/toolbar.c:1576
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "Nový príspevok"
 
 msgid "News"
 msgstr "Nový príspevok"
 

+#~ msgid "/_Scoring..."
+#~ msgstr "/_Hodnotenie..."
+
+#~ msgid "/_Message/Get new ma_il"
+#~ msgstr "/Sp_ráva/_Prijať poštu"
+
+#~ msgid "Icon theme"
+#~ msgstr "Téma ikon"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Small"
+#~ msgstr "Malé"
+
+#~ msgid "Normal"
+#~ msgstr "Obyčajné"
+
+#~ msgid "/_Forward message (inline style)"
+#~ msgstr "/Poslať ďalej (inline)"
+
+#~ msgid "/Forward message as _attachment"
+#~ msgstr "/Poslať ďalej ako p_rílohu"
+

diff --git a/po/sr.po b/po/sr.po
index b60e7c801c8ed8fb17f45c42c3afb1a3c3432055..eb6bbb331ee3264a29f635210bad445e0d79f88f 100644 (file)
--- a/po/sr.po
+++ b/po/sr.po
@@ -7,9 +7,9 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: 0.9.7\n"
-"POT-Creation-Date: 2003-11-24 21:39+0000\n"
-"PO-Revision-Date: 2003-11-25 13:31+0100\n"
+"Project-Id-Version: 0.9.9\n"
+"POT-Creation-Date: 2004-02-05 07:38+0000\n"
+"PO-Revision-Date: 2004-02-05 20:47+0100\n"

 "Last-Translator: Александар Урошевић <urke@users.sourceforge.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"
 "Last-Translator: Александар Урошевић <urke@users.sourceforge.net>\n"
 "Language-Team: Serbian (sr) <serbiangnome-lista@nongnu.org>\n"
 "MIME-Version: 1.0\n"


@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 
 "Content-Transfer-Encoding: 8bit\n"
 "Report-Msgid-Bugs-To: \n"
 

-#: src/account.c:305
+#: src/account.c:312

 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."


@@ -25,11 +25,11 @@ msgstr ""
 "Неки прозори за креирање поруке су отворени.\n"
 "Затворите све прозоре за креирање поруке пре подешавања налога."
 
 "Неки прозори за креирање поруке су отворени.\n"
 "Затворите све прозоре за креирање поруке пре подешавања налога."
 

-#: src/account.c:555
+#: src/account.c:563

 msgid "Edit accounts"
 msgstr "Подешавање налога"
 
 msgid "Edit accounts"
 msgstr "Подешавање налога"
 

-#: src/account.c:573
+#: src/account.c:581

 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."
 msgid ""
 "New messages will be checked in this order. Check the boxes\n"
 "on the `G' column to enable message retrieval by `Get all'."


@@ -37,8 +37,8 @@ msgstr ""
 "Прикупљање порука по налозима обавиће се по овом редоследу.\n"
 "Укључите опцију у колони „Г“ за проверу налога са „Провери све“."
 
 "Прикупљање порука по налозима обавиће се по овом редоследу.\n"
 "Укључите опцију у колони „Г“ за проверу налога са „Провери све“."
 

-#: src/account.c:593 src/addressadd.c:182 src/addressbook.c:635
-#: src/compose.c:4770 src/compose.c:4940 src/editaddress.c:774
+#: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -46,92 +46,205 @@ msgstr ""
 msgid "Name"
 msgstr "Назив"
 
 msgid "Name"
 msgstr "Назив"
 

-#: src/account.c:594 src/prefs_account.c:927
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "Протокол"
 
 msgid "Protocol"
 msgstr "Протокол"
 

-#: src/account.c:595 src/ssl_manager.c:105
+#: src/account.c:603 src/ssl_manager.c:105

 msgid "Server"
 msgstr "Сервер"
 
 msgid "Server"
 msgstr "Сервер"
 

-#: src/account.c:624 src/addressbook.c:774 src/editaddress.c:722
+#: src/account.c:632 src/addressbook.c:774 src/editaddress.c:722

 #: src/editaddress.c:856 src/prefs_actions.c:221 src/prefs_customheader.c:234
 #: src/prefs_display_header.c:275 src/prefs_display_header.c:330
 #: src/editaddress.c:856 src/prefs_actions.c:221 src/prefs_customheader.c:234
 #: src/prefs_display_header.c:275 src/prefs_display_header.c:330

-#: src/prefs_filtering.c:293 src/prefs_matcher.c:557 src/prefs_scoring.c:271
-#: src/prefs_template.c:216 src/prefs_toolbar.c:769
+#: src/prefs_filtering_action.c:449 src/prefs_filtering.c:280
+#: src/prefs_matcher.c:557 src/prefs_template.c:216 src/prefs_toolbar.c:769

 msgid "Add"
 msgstr " Додај "
 
 msgid "Add"
 msgstr " Додај "
 

-#: src/account.c:630
+#: src/account.c:638

 msgid "Edit"
 msgstr " Уреди "
 
 msgid "Edit"
 msgstr " Уреди "
 

-#: src/account.c:636 src/prefs_customheader.c:241
+#: src/account.c:644 src/prefs_customheader.c:241

 msgid " Delete "
 msgstr " Уклони "
 
 msgid " Delete "
 msgstr " Уклони "
 

-#: src/account.c:642 src/prefs_actions.c:284 src/prefs_customheader.c:289
-#: src/prefs_display_header.c:294 src/prefs_filtering.c:355
-#: src/prefs_matcher.c:639 src/prefs_scoring.c:325
+#: src/account.c:650
+msgid " Clone "
+msgstr " Клонирај "
+
+#: src/account.c:656 src/prefs_actions.c:284 src/prefs_customheader.c:289
+#: src/prefs_display_header.c:294 src/prefs_filtering_action.c:503
+#: src/prefs_filtering.c:342 src/prefs_matcher.c:639

 #: src/prefs_summary_column.c:289 src/prefs_toolbar.c:830
 msgid "Down"
 msgstr " Доле "
 
 #: src/prefs_summary_column.c:289 src/prefs_toolbar.c:830
 msgid "Down"
 msgstr " Доле "
 

-#: src/account.c:648 src/prefs_actions.c:278 src/prefs_customheader.c:283
-#: src/prefs_display_header.c:288 src/prefs_filtering.c:349
-#: src/prefs_matcher.c:633 src/prefs_scoring.c:319
+#: src/account.c:662 src/prefs_actions.c:278 src/prefs_customheader.c:283
+#: src/prefs_display_header.c:288 src/prefs_filtering_action.c:497
+#: src/prefs_filtering.c:336 src/prefs_matcher.c:633

 #: src/prefs_summary_column.c:285 src/prefs_toolbar.c:826
 msgid "Up"
 msgstr " Горе "
 
 #: src/prefs_summary_column.c:285 src/prefs_toolbar.c:826
 msgid "Up"
 msgstr " Горе "
 

-#: src/account.c:662
+#: src/account.c:676

 msgid " Set as default account "
 msgstr " Постави као подразумевани налог "
 
 msgid " Set as default account "
 msgstr " Постави као подразумевани налог "
 

-#: src/account.c:668 src/addressbook.c:1008 src/addressbook.c:3120
-#: src/addressbook.c:3124 src/addressbook.c:3162 src/browseldap.c:307
-#: src/crash.c:242 src/exphtmldlg.c:196 src/expldifdlg.c:203
-#: src/gtk/pluginwindow.c:224 src/inc.c:674 src/message_search.c:135
-#: src/summary_search.c:211
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008
+#: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
+#: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691
+#: src/message_search.c:135 src/summary_search.c:211

 msgid "Close"
 msgstr " Затвори "
 
 msgid "Close"
 msgstr " Затвори "
 

-#: src/account.c:736
+#: src/account.c:758
+msgid "Accounts with remote folders cannot be cloned"
+msgstr "Налози са удаљеним директоријумима не могу да се клонирају"
+
+#: src/account.c:764
+#, c-format
+msgid "Cloned %s"
+msgstr "Клониран %s"
+
+#: src/account.c:906

 msgid "Delete account"
 msgstr " Уклони налог "
 
 msgid "Delete account"
 msgstr " Уклони налог "
 

-#: src/account.c:737
+#: src/account.c:907

 msgid "Do you really want to delete this account?"
 msgstr "Да ли заиста желите да уклоните налог?"
 
 msgid "Do you really want to delete this account?"
 msgstr "Да ли заиста желите да уклоните налог?"
 

-#: src/account.c:738 src/addressbook.c:1031 src/addressbook.c:2265
-#: src/addressbook.c:2293 src/compose.c:2228 src/compose.c:3073
-#: src/compose.c:3573 src/compose.c:6055 src/compose.c:6363
+#: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2134 src/folderview.c:2189 src/folderview.c:2280
-#: src/folderview.c:2415 src/folderview.c:2453 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1434 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:854
-#: src/prefs_filtering.c:1002 src/prefs_matcher.c:1667 src/prefs_scoring.c:623
-#: src/prefs_scoring.c:760 src/prefs_template.c:544 src/ssl_manager.c:271
-#: src/summary_search.c:328 src/summaryview.c:921 src/summaryview.c:1386
-#: src/summaryview.c:1430 src/summaryview.c:1473 src/summaryview.c:1497
-#: src/summaryview.c:1529 src/summaryview.c:1554 src/summaryview.c:1579
-#: src/summaryview.c:1604 src/summaryview.c:3086 src/toolbar.c:2048
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "Да"
 
 msgid "Yes"
 msgstr "Да"
 

-#: src/account.c:738 src/compose.c:3573 src/compose.c:6055
-#: src/folderview.c:2134 src/folderview.c:2189 src/folderview.c:2280
-#: src/folderview.c:2415 src/folderview.c:2453 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+Не"
 
 msgid "+No"
 msgstr "+Не"
 

+#: src/action.c:346
+#, c-format
+msgid "Could not get message file %d"
+msgstr "Не могу да пронађем датотеку поруке %d"
+
+#: src/action.c:365
+msgid "Could not get message part."
+msgstr "Не могу да пронађем део поруке."
+
+#: src/action.c:382
+msgid "Can't get part of multipart message"
+msgstr "Не могу да пронађем део вишеделне поруке"
+
+#: src/action.c:495
+#, c-format
+msgid ""
+"The selected action cannot be used in the compose window\n"
+"because it contains %%f, %%F, %%as or %%p."
+msgstr ""
+"Одабрана акција не може да се примени у дијалогу за састављање поруке\n"
+"зато што садржи %%f, %%F, %%as или %%p."
+
+#: src/action.c:783
+#, c-format
+msgid ""
+"Command could not be started. Pipe creation failed.\n"
+"%s"
+msgstr ""
+"Наредба не може да се покрене. Грешка у прављењу канала.\n"
+"%s"
+
+#: src/action.c:868
+#, c-format
+msgid ""
+"Could not fork to execute the following command:\n"
+"%s\n"
+"%s"
+msgstr ""
+"Не могу да извршим поделу за извршавање наредбе:\n"
+"%s\n"
+"%s"
+
+#: src/action.c:1095
+#, c-format
+msgid "--- Running: %s\n"
+msgstr "--- Извршавање: %s\n"
+
+#: src/action.c:1099
+#, c-format
+msgid "--- Ended: %s\n"
+msgstr "--- Завршено: %s\n"
+
+#: src/action.c:1135
+msgid "Action's input/output"
+msgstr "Улаз/излаз акција"
+
+#: src/action.c:1181
+msgid " Send "
+msgstr " Пошаљи "
+
+#: src/action.c:1201
+msgid "Completed %v/%u"
+msgstr "Готово %v/%u"
+
+#: src/action.c:1211
+msgid "Abort"
+msgstr "Обустави"
+
+#: src/action.c:1360
+#, c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"(`%%h' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"Унесите аргимент за следећу акцију:\n"
+"(„%%h“ ће бити замењено аргументом)\n"
+"  %s"
+
+#: src/action.c:1365
+msgid "Action's hidden user argument"
+msgstr "Скривени кориснички аргументи акција"
+
+#: src/action.c:1369
+#, c-format
+msgid ""
+"Enter the argument for the following action:\n"
+"(`%%u' will be replaced with the argument)\n"
+"  %s"
+msgstr ""
+"Унесите аргумент за следећу акцију:\n"
+"(„%%u“ ће бити замењено аргументом)\n"
+"  %s"
+
+#: src/action.c:1374
+msgid "Action's user argument"
+msgstr "Кориснички аргументи акција"
+

 #: src/addressadd.c:162
 msgid "Add to address book"
 msgstr "Додај у адресар"
 
 #: src/addressadd.c:162
 msgid "Add to address book"
 msgstr "Додај у адресар"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:424
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "Адреса"
 
 msgid "Address"
 msgstr "Адреса"
 


@@ -144,27 +257,28 @@ msgstr "Напомена"
 msgid "Select Address Book Folder"
 msgstr "Одаберите директоријум адресара"
 
 msgid "Select Address Book Folder"
 msgstr "Одаберите директоријум адресара"
 

-#: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:189
-#: src/alertpanel.c:323 src/compose.c:3198 src/compose.c:5877
+#: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193

-#: src/grouplistdialog.c:244 src/gtk/about.c:233 src/gtk/gtkaspell.c:1425
+#: src/grouplistdialog.c:244 src/gtk/about.c:233
+#: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425

 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:600
-#: src/mainwindow.c:2193 src/messageview.c:890 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2769 src/prefs_common.c:2938 src/prefs_common.c:3196
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194

-#: src/prefs_filtering.c:212 src/prefs_gtk.c:451 src/prefs_matcher.c:370
-#: src/prefs_scoring.c:196 src/prefs_summary_column.c:313
-#: src/prefs_template.c:263 src/sigstatus.c:134 src/ssl_manager.c:98
+#: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
+#: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
+#: src/prefs_template.c:263 src/ssl_manager.c:98

 msgid "OK"
 msgstr "У реду"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgid "OK"
 msgstr "У реду"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3198 src/compose.c:5878 src/compose.c:6558 src/compose.c:6596
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -172,19 +286,20 @@ msgstr "У реду"
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:600 src/mainwindow.c:2193 src/messageview.c:890
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2770 src/prefs_common.c:3197
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195

-#: src/prefs_filtering.c:213 src/prefs_gtk.c:452 src/prefs_matcher.c:371
-#: src/prefs_scoring.c:197 src/prefs_summary_column.c:314
-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:921
-#: src/summaryview.c:3428
+#: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
+#: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "Поништи"
 
 msgid "Cancel"
 msgstr "Поништи"
 

-#: src/addressbook.c:363 src/compose.c:508 src/mainwindow.c:414
-#: src/messageview.c:139
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435
+#: src/messageview.c:143

 msgid "/_File"
 msgstr "/_Датотека"
 
 msgid "/_File"
 msgstr "/_Датотека"
 


@@ -204,8 +319,9 @@ msgstr "/_Датотека/Нови _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Датотека/_Нови сервер"
 
 msgid "/_File/New _Server"
 msgstr "/_Датотека/_Нови сервер"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:512
-#: src/mainwindow.c:429 src/mainwindow.c:432 src/messageview.c:142
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454
+#: src/messageview.c:146

 msgid "/_File/---"
 msgstr "/_Датотека/---"
 
 msgid "/_File/---"
 msgstr "/_Датотека/---"
 


@@ -221,12 +337,12 @@ msgstr "/_Датотека/_Уклони"
 msgid "/_File/_Save"
 msgstr "/_Датотека/_Сачувај"
 
 msgid "/_File/_Save"
 msgstr "/_Датотека/_Сачувај"
 

-#: src/addressbook.c:377 src/compose.c:513 src/messageview.c:143
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/_Датотека/_Затвори"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/_Датотека/_Затвори"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:515 src/mainwindow.c:436 src/messageview.c:145
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/_Уређивање"
 
 msgid "/_Edit"
 msgstr "/_Уређивање"
 


@@ -234,17 +350,17 @@ msgstr "/_Уређивање"
 msgid "/_Edit/C_ut"
 msgstr "/_Уређивање/_Исеци"
 
 msgid "/_Edit/C_ut"
 msgstr "/_Уређивање/_Исеци"
 

-#: src/addressbook.c:380 src/compose.c:520 src/mainwindow.c:437
-#: src/messageview.c:146
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459
+#: src/messageview.c:150

 msgid "/_Edit/_Copy"
 msgstr "/_Уређивање/_Копирај"
 
 msgid "/_Edit/_Copy"
 msgstr "/_Уређивање/_Копирај"
 

-#: src/addressbook.c:381 src/compose.c:521
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/_Уређивање/_Пренеси"
 
 msgid "/_Edit/_Paste"
 msgstr "/_Уређивање/_Пренеси"
 

-#: src/addressbook.c:382 src/compose.c:518 src/compose.c:601
-#: src/mainwindow.c:440 src/messageview.c:148
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/_Уређивање/---"
 
 msgid "/_Edit/---"
 msgstr "/_Уређивање/---"
 


@@ -280,10 +396,10 @@ msgstr "/А_дреса/_Измени"
 msgid "/_Address/_Delete"
 msgstr "/А_дреса/_Уклони"
 
 msgid "/_Address/_Delete"
 msgstr "/А_дреса/_Уклони"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:653
-#: src/mainwindow.c:664 src/mainwindow.c:666 src/mainwindow.c:669
-#: src/mainwindow.c:672 src/mainwindow.c:676 src/messageview.c:261
-#: src/messageview.c:272
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/_Алати/---"
 
 msgid "/_Tools/---"
 msgstr "/_Алати/---"
 


@@ -307,13 +423,13 @@ msgstr "/_Алати/Извези у _HTML датотеку..."
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Алати/Извези у LDI_F датотеку..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/_Алати/Извези у LDI_F датотеку..."
 

-#: src/addressbook.c:398 src/compose.c:678 src/mainwindow.c:700
-#: src/messageview.c:275
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/По_моћ"
 
 msgid "/_Help"
 msgstr "/По_моћ"
 

-#: src/addressbook.c:399 src/compose.c:679 src/mainwindow.c:710
-#: src/messageview.c:276
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/По_моћ/_О програму"
 
 msgid "/_Help/_About"
 msgstr "/По_моћ/_О програму"
 


@@ -330,19 +446,19 @@ msgid "/New _Folder"
 msgstr "/Нови _директоријум"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/Нови _директоријум"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:502
-#: src/folderview.c:291 src/folderview.c:293 src/folderview.c:303
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303

 #: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
 #: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314

-#: src/folderview.c:324 src/folderview.c:329 src/folderview.c:333
-#: src/folderview.c:335 src/folderview.c:345 src/folderview.c:349
-#: src/folderview.c:352 src/folderview.c:354 src/summaryview.c:409
-#: src/summaryview.c:412 src/summaryview.c:414 src/summaryview.c:420
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
-#: src/summaryview.c:455
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:417
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/_Уклони"
 
 msgid "/_Delete"
 msgstr "/_Уклони"
 


@@ -367,7 +483,8 @@ msgid "/_Browse Entry"
 msgstr "/_Прегледај унос"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/_Прегледај унос"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "Непознато"
 
 msgid "Unknown"
 msgstr "Непознато"
 


@@ -451,8 +568,8 @@ msgstr "Прекинута је претрага ЛДАП—а по захтев
 msgid "E-Mail address"
 msgstr "Адреса е-поште"
 
 msgid "E-Mail address"
 msgstr "Адреса е-поште"
 

-#: src/addressbook.c:640 src/prefs_common.c:2391 src/toolbar.c:178
-#: src/toolbar.c:1751
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "Адресар"
 
 msgid "Address book"
 msgstr "Адресар"
 


@@ -463,10 +580,10 @@ msgstr "Име:"
 #: src/addressbook.c:771 src/addressbook.c:2264 src/addressbook.c:2278
 #: src/addressbook.c:2293 src/editaddress.c:716 src/editaddress.c:850
 #: src/prefs_actions.c:234 src/prefs_display_header.c:281
 #: src/addressbook.c:771 src/addressbook.c:2264 src/addressbook.c:2278
 #: src/addressbook.c:2293 src/editaddress.c:716 src/editaddress.c:850
 #: src/prefs_actions.c:234 src/prefs_display_header.c:281

-#: src/prefs_display_header.c:337 src/prefs_filtering.c:306
-#: src/prefs_matcher.c:570 src/prefs_scoring.c:284 src/prefs_template.c:229
-#: src/prefs_toolbar.c:781 src/ssl_manager.c:92 src/toolbar.c:374
-#: src/toolbar.c:466
+#: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
+#: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
+#: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "Уклони"
 
 msgid "Delete"
 msgstr "Уклони"
 


@@ -474,18 +591,18 @@ msgstr "Уклони"
 msgid "Lookup"
 msgstr " Пронађи "
 
 msgid "Lookup"
 msgstr " Пронађи "
 

-#: src/addressbook.c:789 src/compose.c:1446 src/compose.c:3249
-#: src/compose.c:4587 src/compose.c:5294 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Прималац:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "Прималац:"
 

-#: src/addressbook.c:793 src/compose.c:1430 src/compose.c:3248
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Копија:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Копија:"
 

-#: src/addressbook.c:797 src/compose.c:1433 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Невидљива копија:"
 
 msgid "Bcc:"
 msgstr "Невидљива копија:"
 


@@ -502,17 +619,18 @@ msgid "Really delete the address(es)?"
 msgstr "Да ли заиста желите да уклоните адресу(е)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "Да ли заиста желите да уклоните адресу(е)?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2228 src/compose.c:3073 src/compose.c:6363
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1434 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:854 src/prefs_filtering.c:1002
-#: src/prefs_matcher.c:1667 src/prefs_scoring.c:623 src/prefs_scoring.c:760
-#: src/prefs_template.c:544 src/summary_search.c:328 src/summaryview.c:921
-#: src/summaryview.c:1386 src/summaryview.c:1430 src/summaryview.c:1473
-#: src/summaryview.c:1497 src/summaryview.c:1529 src/summaryview.c:1554
-#: src/summaryview.c:1579 src/summaryview.c:1604 src/summaryview.c:3086
-#: src/toolbar.c:2048
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "Не"
 
 msgid "No"
 msgstr "Не"
 


@@ -621,45 +739,45 @@ msgstr "Претражујемс..."
 msgid "Search '%s'"
 msgstr " Пронађи „%s“"
 
 msgid "Search '%s'"
 msgstr " Пронађи „%s“"
 

-#: src/addressbook.c:3782 src/prefs_common.c:989
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "Сучеље"
 
 msgid "Interface"
 msgstr "Сучеље"
 

-#: src/addressbook.c:3798 src/exphtmldlg.c:423 src/expldifdlg.c:435
+#: src/addressbook.c:3810 src/exphtmldlg.c:423 src/expldifdlg.c:435

 #: src/exporthtml.c:1011 src/importldif.c:690
 msgid "Address Book"
 msgstr "Адресар"
 
 #: src/exporthtml.c:1011 src/importldif.c:690
 msgid "Address Book"
 msgstr "Адресар"
 

-#: src/addressbook.c:3814
+#: src/addressbook.c:3826

 msgid "Person"
 msgstr "Особа"
 
 msgid "Person"
 msgstr "Особа"
 

-#: src/addressbook.c:3830
+#: src/addressbook.c:3842

 msgid "EMail Address"
 msgstr "Адреса е-поште"
 
 msgid "EMail Address"
 msgstr "Адреса е-поште"
 

-#: src/addressbook.c:3846
+#: src/addressbook.c:3858

 msgid "Group"
 msgstr "Група"
 
 msgid "Group"
 msgstr "Група"
 

-#: src/addressbook.c:3862 src/exporthtml.c:913 src/folderview.c:390
-#: src/prefs_account.c:2125
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Директоријум"
 
 msgid "Folder"
 msgstr "Директоријум"
 

-#: src/addressbook.c:3878
+#: src/addressbook.c:3890

 msgid "vCard"
 msgstr "Контакт"
 
 msgid "vCard"
 msgstr "Контакт"
 

-#: src/addressbook.c:3894 src/addressbook.c:3910
+#: src/addressbook.c:3906 src/addressbook.c:3922

 msgid "JPilot"
 msgstr "JPilot"
 
 msgid "JPilot"
 msgstr "JPilot"
 

-#: src/addressbook.c:3926
+#: src/addressbook.c:3938

 msgid "LDAP Server"
 msgstr "LDAP сервер"
 
 msgid "LDAP Server"
 msgstr "LDAP сервер"
 

-#: src/addressbook.c:3942
+#: src/addressbook.c:3954

 msgid "LDAP Query"
 msgstr "LDAP упит"
 
 msgid "LDAP Query"
 msgstr "LDAP упит"
 


@@ -722,8 +840,8 @@ msgstr "Назив заглавља"
 msgid "Address Count"
 msgstr "Број налога"
 
 msgid "Address Count"
 msgstr "Број налога"
 

-#: src/addrgather.c:527 src/alertpanel.c:154 src/messageview.c:479
-#: src/sgpgme.c:279
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "Упозорење"
 
 msgid "Warning"
 msgstr "Упозорење"
 


@@ -752,20 +870,20 @@ msgstr "Опште адресе"
 msgid "Personal address"
 msgstr "Личне адресе"
 
 msgid "Personal address"
 msgstr "Личне адресе"
 

-#: src/alertpanel.c:141 src/compose.c:6055 src/main.c:582
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "Напомена"
 
 msgid "Notice"
 msgstr "Напомена"
 

-#: src/alertpanel.c:167 src/alertpanel.c:189 src/compose.c:3573 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "Грешка"
 
 msgid "Error"
 msgstr "Грешка"
 

-#: src/alertpanel.c:189
+#: src/alertpanel.c:190

 msgid "View log"
 msgstr "Преглед дневника рада"
 
 msgid "View log"
 msgstr "Преглед дневника рада"
 

-#: src/alertpanel.c:307
+#: src/alertpanel.c:308

 msgid "Show this message next time"
 msgstr "Прикажи ову поруку и следећи пут"
 
 msgid "Show this message next time"
 msgstr "Прикажи ову поруку и следећи пут"
 


@@ -807,6 +925,10 @@ msgstr "грешка у протоколу\n"
 msgid "Error occurred while posting\n"
 msgstr "Настала је грешка при слању\n"
 
 msgid "Error occurred while posting\n"
 msgstr "Настала је грешка при слању\n"
 

+#: src/common/plugin.c:103
+msgid "Failed to allocate memory for Plugin"
+msgstr "Неуспешно резервисање меморије за додатак"
+

 #: src/common/smtp.c:152
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH није доступан\n"
 #: src/common/smtp.c:152
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH није доступан\n"


@@ -827,16 +949,16 @@ msgstr "настала је грешка при идентификацији\n"
 msgid "can't start TLS session\n"
 msgstr "не могу да покренем TLS сесију\n"
 
 msgid "can't start TLS session\n"
 msgstr "не могу да покренем TLS сесију\n"
 

-#: src/common/ssl.c:78
+#: src/common/ssl.c:77

 msgid "Error creating ssl context\n"
 msgstr "Настала је грешка при креирању SSL садржаја\n"
 
 msgid "Error creating ssl context\n"
 msgstr "Настала је грешка при креирању SSL садржаја\n"
 

-#: src/common/ssl.c:97
+#: src/common/ssl.c:96

 #, c-format
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL конекција неуспела (%s)\n"
 
 #, c-format
 msgid "SSL connect failed (%s)\n"
 msgstr "SSL конекција неуспела (%s)\n"
 

-#: src/common/ssl.c:105
+#: src/common/ssl.c:104

 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL конекција употребом %s\n"
 #, c-format
 msgid "SSL connection using %s\n"
 msgstr "SSL конекција употребом %s\n"


@@ -890,7 +1012,7 @@ msgstr ""
 "(Уклоните потврду „%s“ из подешавња).\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(Уклоните потврду „%s“ из подешавња).\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "Немој да приказујеш дијалог о грешци у случају настанка грешке"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "Немој да приказујеш дијалог о грешци у случају настанка грешке"
 


@@ -915,355 +1037,379 @@ msgstr ""
 "\n"
 "Ово може да значи да сервер који шаље одговор није међу регистрованима."
 
 "\n"
 "Ово може да значи да сервер који шаље одговор није међу регистрованима."
 

-#: src/compose.c:500
+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "(Тема уклоњена регуларним изразом)"
+
+#: src/common/utils.c:178
+#, c-format
+msgid "%dB"
+msgstr "%d Б"
+
+#: src/common/utils.c:180
+#, c-format
+msgid "%.1fKB"
+msgstr "%.1f КБ"
+
+#: src/common/utils.c:182
+#, c-format
+msgid "%.2fMB"
+msgstr "%.2f МБ"
+
+#: src/common/utils.c:184
+#, c-format
+msgid "%.2fGB"
+msgstr "%.2f ГБ"
+
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/_Додај..."
 
 msgid "/_Add..."
 msgstr "/_Додај..."
 

-#: src/compose.c:501
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/_Уклони"
 
 msgid "/_Remove"
 msgstr "/_Уклони"
 

-#: src/compose.c:503 src/folderview.c:294 src/folderview.c:316
-#: src/folderview.c:337 src/folderview.c:356
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/_Поставке..."
 
 msgid "/_Properties..."
 msgstr "/_Поставке..."
 

-#: src/compose.c:509
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/_Датотека/При_ложи датотеку"
 
 msgid "/_File/_Attach file"
 msgstr "/_Датотека/При_ложи датотеку"
 

-#: src/compose.c:510
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/_Датотека/Уметни _датотеку"
 
 msgid "/_File/_Insert file"
 msgstr "/_Датотека/Уметни _датотеку"
 

-#: src/compose.c:511
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/_Датотека/Уметни _потпис"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/_Датотека/Уметни _потпис"
 

-#: src/compose.c:516
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/_Уређивање/_Опозови"
 
 msgid "/_Edit/_Undo"
 msgstr "/_Уређивање/_Опозови"
 

-#: src/compose.c:517
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/_Уређивање/_Понови"
 
 msgid "/_Edit/_Redo"
 msgstr "/_Уређивање/_Понови"
 

-#: src/compose.c:519
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/_Уређивање/_Исеци"
 
 msgid "/_Edit/Cu_t"
 msgstr "/_Уређивање/_Исеци"
 

-#: src/compose.c:522
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Уређивање/Убаци као _цитат"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Уређивање/Убаци као _цитат"
 

-#: src/compose.c:524 src/mainwindow.c:438 src/messageview.c:147
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/_Уређивање/Одабери _све"
 
 msgid "/_Edit/Select _all"
 msgstr "/_Уређивање/Одабери _све"
 

-#: src/compose.c:525
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/_Уређивање/_Напредно"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/_Уређивање/_Напредно"
 

-#: src/compose.c:526
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Уређивање/_Напредно/Помери карактер уназад"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/_Уређивање/_Напредно/Помери карактер уназад"
 

-#: src/compose.c:531
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Уређивање/_Напредно/Помери карактер напред"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/_Уређивање/_Напредно/Помери карактер напред"
 

-#: src/compose.c:536
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Уређивање/_Напредно/Помери реч уназад"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/_Уређивање/_Напредно/Помери реч уназад"
 

-#: src/compose.c:541
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Уређивање/_Напредно/Помери реч напред"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/_Уређивање/_Напредно/Помери реч напред"
 

-#: src/compose.c:546
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Уређивање/_Напредно/Помери на почетак линије"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/_Уређивање/_Напредно/Помери на почетак линије"
 

-#: src/compose.c:551
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Уређивање/_Напредно/Помери на крај линије"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/_Уређивање/_Напредно/Помери на крај линије"
 

-#: src/compose.c:556
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Уређивање/_Напредно/Помери у претходну линију"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/_Уређивање/_Напредно/Помери у претходну линију"
 

-#: src/compose.c:561
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Уређивање/_Напредно/Помери у следећу линију"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/_Уређивање/_Напредно/Помери у следећу линију"
 

-#: src/compose.c:566
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Уређивање/_Напредно/Уклони претходни карактер"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/_Уређивање/_Напредно/Уклони претходни карактер"
 

-#: src/compose.c:571
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Уређивање/_Напредно/Уклони следећи карактер"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/_Уређивање/_Напредно/Уклони следећи карактер"
 

-#: src/compose.c:576
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Уређивање/_Напредно/Уклони претходну реч"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/_Уређивање/_Напредно/Уклони претходну реч"
 

-#: src/compose.c:581
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Уређивање/_Напредно/Уклони следећу реч"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/_Уређивање/_Напредно/Уклони следећу реч"
 

-#: src/compose.c:586
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Уређивање/_Напредно/Уклони линију"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/_Уређивање/_Напредно/Уклони линију"
 

-#: src/compose.c:591
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Уређивање/_Напредно/Уклони комплетну линију"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/_Уређивање/_Напредно/Уклони комплетну линију"
 

-#: src/compose.c:596
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Уређивање/_Напредно/Уклони до краја линије"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/_Уређивање/_Напредно/Уклони до краја линије"
 

-#: src/compose.c:602
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Уређивање/Прелом _текућег пасуса"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Уређивање/Прелом _текућег пасуса"
 

-#: src/compose.c:604
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Уређивање/Прелом свих _дугих линија"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Уређивање/Прелом свих _дугих линија"
 

-#: src/compose.c:606
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Уређивање/Измена у _екстерном уређивачу текста"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/_Уређивање/Измена у _екстерном уређивачу текста"
 

-#: src/compose.c:609
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/_Правопис"
 
 msgid "/_Spelling"
 msgstr "/_Правопис"
 

-#: src/compose.c:610
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Правопис/_Провери цео или одабрани текст"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/_Правопис/_Провери цео или одабрани текст"
 

-#: src/compose.c:612
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Правопис/_Означи све погрешно написане речи"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/_Правопис/_Означи све погрешно написане речи"
 

-#: src/compose.c:614
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Правопис/_Уназад провери погрешно написане речи"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/_Правопис/_Уназад провери погрешно написане речи"
 

-#: src/compose.c:616
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Правопис/_Иди до следеће погрешно написане речи"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/_Правопис/_Иди до следеће погрешно написане речи"
 

-#: src/compose.c:618
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/_Правопис/---"
 
 msgid "/_Spelling/---"
 msgstr "/_Правопис/---"
 

-#: src/compose.c:619
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Правопис/Подешавање правопи_са"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/_Правопис/Подешавање правопи_са"
 

-#: src/compose.c:623 src/mainwindow.c:444 src/messageview.c:152
-#: src/summaryview.c:447
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/П_реглед"
 
 msgid "/_View"
 msgstr "/П_реглед"
 

-#: src/compose.c:624
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/П_реглед/_Прималац"
 
 msgid "/_View/_To"
 msgstr "/П_реглед/_Прималац"
 

-#: src/compose.c:625
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/П_реглед/_Копија"
 
 msgid "/_View/_Cc"
 msgstr "/П_реглед/_Копија"
 

-#: src/compose.c:626
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/П_реглед/Не_видљива копија"
 
 msgid "/_View/_Bcc"
 msgstr "/П_реглед/Не_видљива копија"
 

-#: src/compose.c:627
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/П_реглед/Од_говори..."
 
 msgid "/_View/_Reply to"
 msgstr "/П_реглед/Од_говори..."
 

-#: src/compose.c:628 src/compose.c:630 src/compose.c:632 src/mainwindow.c:462
-#: src/mainwindow.c:465 src/mainwindow.c:494 src/mainwindow.c:518
-#: src/mainwindow.c:600 src/mainwindow.c:604 src/messageview.c:234
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/П_реглед/---"
 
 msgid "/_View/---"
 msgstr "/П_реглед/---"
 

-#: src/compose.c:629
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/П_реглед/_Настави на"
 
 msgid "/_View/_Followup to"
 msgstr "/П_реглед/_Настави на"
 

-#: src/compose.c:631
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/П_реглед/_Лењир"
 
 msgid "/_View/R_uler"
 msgstr "/П_реглед/_Лењир"
 

-#: src/compose.c:633
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/П_реглед/_Прилог"
 
 msgid "/_View/_Attachment"
 msgstr "/П_реглед/_Прилог"
 

-#: src/compose.c:635 src/mainwindow.c:607 src/messageview.c:238
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/_Порука"
 
 msgid "/_Message"
 msgstr "/_Порука"
 

-#: src/compose.c:636
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/_Порука/_Пошаљи"
 
 msgid "/_Message/_Send"
 msgstr "/_Порука/_Пошаљи"
 

-#: src/compose.c:638
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/_Порука/Пошаљи _касније"
 
 msgid "/_Message/Send _later"
 msgstr "/_Порука/Пошаљи _касније"
 

-#: src/compose.c:640 src/compose.c:646 src/compose.c:651 src/compose.c:653
-#: src/compose.c:657 src/compose.c:663 src/compose.c:670 src/mainwindow.c:612
-#: src/mainwindow.c:614 src/mainwindow.c:624 src/mainwindow.c:627
-#: src/mainwindow.c:629 src/mainwindow.c:634 src/messageview.c:241
-#: src/messageview.c:249 src/messageview.c:254
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/_Порука/---"
 
 msgid "/_Message/---"
 msgstr "/_Порука/---"
 

-#: src/compose.c:641
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/_Порука/Сачувај _недовршену поруку"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/_Порука/Сачувај _недовршену поруку"
 

-#: src/compose.c:643
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/_Порука/Сачувај и настави _са писањем"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/_Порука/Сачувај и настави _са писањем"
 

-#: src/compose.c:647
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/_Порука/_Прималац"
 
 msgid "/_Message/_To"
 msgstr "/_Порука/_Прималац"
 

-#: src/compose.c:648
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/_Порука/_Копија"
 
 msgid "/_Message/_Cc"
 msgstr "/_Порука/_Копија"
 

-#: src/compose.c:649
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/_Порука/Не_видљива копија"
 
 msgid "/_Message/_Bcc"
 msgstr "/_Порука/Не_видљива копија"
 

-#: src/compose.c:650
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/_Порука/_Одговор за"
 
 msgid "/_Message/_Reply to"
 msgstr "/_Порука/_Одговор за"
 

-#: src/compose.c:652
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/_Порука/_Настави на"
 
 msgid "/_Message/_Followup to"
 msgstr "/_Порука/_Настави на"
 

-#: src/compose.c:654
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/_Порука/Прило_г"
 
 msgid "/_Message/_Attach"
 msgstr "/_Порука/Прило_г"
 

-#: src/compose.c:658
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/_Порука/Потпи_с"
 
 msgid "/_Message/Si_gn"
 msgstr "/_Порука/Потпи_с"
 

-#: src/compose.c:659
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/_Порука/_Енкрипција"
 
 msgid "/_Message/_Encrypt"
 msgstr "/_Порука/_Енкрипција"
 

-#: src/compose.c:660
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/_Порука/Ре_жим/_MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/_Порука/Ре_жим/_MIME"
 

-#: src/compose.c:661
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/_Порука/Ре_жим/_Линијски"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/_Порука/Ре_жим/_Линијски"
 

-#: src/compose.c:664
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/_Порука/Приорите_т"
 
 msgid "/_Message/_Priority"
 msgstr "/_Порука/Приорите_т"
 

-#: src/compose.c:665
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "/_Порука/Приорите_т/Н_ајвиши"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "/_Порука/Приорите_т/Н_ајвиши"
 

-#: src/compose.c:666
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Порука/Приорите_т/_Висок"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/_Порука/Приорите_т/_Висок"
 

-#: src/compose.c:667
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/_Порука/Приорите_т/_Нормалан"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/_Порука/Приорите_т/_Нормалан"
 

-#: src/compose.c:668
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Порука/Приорите_т/Ни_зак"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/_Порука/Приорите_т/Ни_зак"
 

-#: src/compose.c:669
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Порука/Приорите_т/На_јнижи"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/_Порука/Приорите_т/На_јнижи"
 

-#: src/compose.c:671
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Порука/Захтевај потвр_ду пријема"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/_Порука/Захтевај потвр_ду пријема"
 

-#: src/compose.c:672
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/_Порука/Уклони ре_ференце"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/_Порука/Уклони ре_ференце"
 

-#: src/compose.c:673 src/mainwindow.c:644 src/messageview.c:257
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "/_Алати"
 
 msgid "/_Tools"
 msgstr "/_Алати"
 

-#: src/compose.c:674
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/_Алати/Прикажи _лењир"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/_Алати/Прикажи _лењир"
 

-#: src/compose.c:675 src/messageview.c:258
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/_Алати/_Адресар"
 
 msgid "/_Tools/_Address book"
 msgstr "/_Алати/_Адресар"
 

-#: src/compose.c:676
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/_Алати/_Шаблон"
 
 msgid "/_Tools/_Template"
 msgstr "/_Алати/_Шаблон"
 

-#: src/compose.c:677 src/mainwindow.c:665 src/messageview.c:273
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/_Алати/Ак_ције"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/_Алати/Ак_ције"
 

-#: src/compose.c:1436
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "Одговор-За:"
 
 msgid "Reply-To:"
 msgstr "Одговор-За:"
 

-#: src/compose.c:1439 src/compose.c:4584 src/compose.c:5296
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Дискусиона група:"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "Дискусиона група:"
 

-#: src/compose.c:1442
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "Настави-На:"
 
 msgid "Followup-To:"
 msgstr "Настави-На:"
 

-#: src/compose.c:1737
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "Грешка за ознаку цитата."
 
 msgid "Quote mark format error."
 msgstr "Грешка за ознаку цитата."
 

-#: src/compose.c:1753
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "Грешка за формат одговора/прослеђивања поруке."
 
 msgid "Message reply/forward format error."
 msgstr "Грешка за формат одговора/прослеђивања поруке."
 

-#: src/compose.c:2095
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "Датотека %s је празна."
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Датотека %s је празна."
 

-#: src/compose.c:2099
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "Не могу да прочитам датотеку %s."
 
 #, c-format
 msgid "Can't read %s."
 msgstr "Не могу да прочитам датотеку %s."
 

-#: src/compose.c:2137
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Порука: %s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Порука: %s"
 

-#: src/compose.c:2225
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "Енкриптована порука"
 
 msgid "Encrypted message"
 msgstr "Енкриптована порука"
 

-#: src/compose.c:2226
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1271,21 +1417,21 @@ msgstr ""
 "Не можете да поново уређујете енкриптовану поруку. \n"
 "Да ли желите да занемарим енкриптовани део поруке?"
 
 "Не можете да поново уређујете енкриптовану поруку. \n"
 "Да ли желите да занемарим енкриптовани део поруке?"
 

-#: src/compose.c:2887
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr " [Измењено]"
 
 msgid " [Edited]"
 msgstr " [Измењено]"
 

-#: src/compose.c:2889
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Састављање поруке%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Састављање поруке%s"
 

-#: src/compose.c:2892
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "Састављање поруке%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "Састављање поруке%s"
 

-#: src/compose.c:2916 src/compose.c:3165
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1293,24 +1439,24 @@ msgstr ""
 "Нисте одредили налог за слање поруке.\n"
 "Одаберите налог е-поште пре слања."
 
 "Нисте одредили налог за слање поруке.\n"
 "Одаберите налог е-поште пре слања."
 

-#: src/compose.c:3063
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "Нисте одредили примаоца поруке."
 
 msgid "Recipient is not specified."
 msgstr "Нисте одредили примаоца поруке."
 

-#: src/compose.c:3071 src/messageview.c:479 src/prefs_account.c:767
-#: src/prefs_common.c:975 src/toolbar.c:366 src/toolbar.c:413
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "Слање"
 
 msgid "Send"
 msgstr "Слање"
 

-#: src/compose.c:3072
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема је празна. Да ли да ипак пошаљем поруку?"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "Тема је празна. Да ли да ипак пошаљем поруку?"
 

-#: src/compose.c:3093
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "Не могу да ставим поруку у ред за слање"
 
 msgid "Could not queue message for sending"
 msgstr "Не могу да ставим поруку у ред за слање"
 

-#: src/compose.c:3098
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1318,16 +1464,16 @@ msgstr ""
 "Порука је припремљена али нисам могао да је пошаљем.\n"
 "Покрените опцију \"Пошаљи припремљене поруке\" за поновно слање."
 
 "Порука је припремљена али нисам могао да је пошаљем.\n"
 "Покрените опцију \"Пошаљи припремљене поруке\" за поновно слање."
 

-#: src/compose.c:3181 src/procmsg.c:1159 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Настала је грешка при слању поруке на %s ."
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Настала је грешка при слању поруке на %s ."
 

-#: src/compose.c:3195
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "Стављање у „Припремљене“"
 
 msgid "Queueing"
 msgstr "Стављање у „Припремљене“"
 

-#: src/compose.c:3196
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1335,24 +1481,24 @@ msgstr ""
 "Настала је грешка при слању поруке.\n"
 "Да ли да ставим ову поруку у директоријум „Припремљено“?"
 
 "Настала је грешка при слању поруке.\n"
 "Да ли да ставим ову поруку у директоријум „Припремљено“?"
 

-#: src/compose.c:3202
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "Не могу да ставим ову поруку у ред на чекање за слање."
 
 msgid "Can't queue the message."
 msgstr "Не могу да ставим ову поруку у ред на чекање за слање."
 

-#: src/compose.c:3205 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "Настала је грешка при слању поруке."
 
 msgid "Error occurred while sending the message."
 msgstr "Настала је грешка при слању поруке."
 

-#: src/compose.c:3218
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "Не могу да сачувам поруку у директоријуму за послате поруке."
 
 msgid "Can't save the message to Sent."
 msgstr "Не могу да сачувам поруку у директоријуму за послате поруке."
 

-#: src/compose.c:3463
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не могу да пронађем ни један кључ асоциран одабраним кључем „%s“"
 
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Не могу да пронађем ни један кључ асоциран одабраним кључем „%s“"
 

-#: src/compose.c:3569
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1363,59 +1509,59 @@ msgstr ""
 "%s у %s.\n"
 "Да ли да ипак пошаљем поруку?"
 
 "%s у %s.\n"
 "Да ли да ипак пошаљем поруку?"
 

-#: src/compose.c:3832
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "Ову поруку не можете да пошаљете са одабраног налога!"
 
 msgid "No account for sending mails available!"
 msgstr "Ову поруку не можете да пошаљете са одабраног налога!"
 

-#: src/compose.c:3842
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "Овај налог није предвиђен за слање на дискусионе групе!"
 
 msgid "No account for posting news available!"
 msgstr "Овај налог није предвиђен за слање на дискусионе групе!"
 

-#: src/compose.c:4664 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "Пошиљалац:"
 
 msgid "From:"
 msgstr "Пошиљалац:"
 

-#: src/compose.c:4768 src/compose.c:4938 src/compose.c:5816
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "MIME тип"
 
 msgid "MIME type"
 msgstr "MIME тип"
 

-#: src/compose.c:4769 src/compose.c:4939 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:467
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "Величина"
 
 msgid "Size"
 msgstr "Величина"
 

-#: src/compose.c:4833
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "Сачувај поруку у "
 
 msgid "Save Message to "
 msgstr "Сачувај поруку у "
 

-#: src/compose.c:4853
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr " Одабери ... "
 
 msgid "Select ..."
 msgstr " Одабери ... "
 

-#: src/compose.c:4989 src/prefs_account.c:1355 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Поље заглавља"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "Поље заглавља"
 

-#: src/compose.c:4991
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "Прилози"
 
 msgid "Attachments"
 msgstr "Прилози"
 

-#: src/compose.c:4993
+#: src/compose.c:4984

 msgid "Others"
 msgstr "Друго"
 
 msgid "Others"
 msgstr "Друго"
 

-#: src/compose.c:5008 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Тема:"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Тема:"
 

-#: src/compose.c:5243 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4197
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "Ништа"
 
 msgid "None"
 msgstr "Ништа"
 

-#: src/compose.c:5252
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1424,31 +1570,31 @@ msgstr ""
 "Не могу да покренем правописну проверу.\n"
 "%s"
 
 "Не могу да покренем правописну проверу.\n"
 "%s"
 

-#: src/compose.c:5711
+#: src/compose.c:5706

 msgid "Invalid MIME type."
 msgstr "Неважећи MIME тип."
 
 msgid "Invalid MIME type."
 msgstr "Неважећи MIME тип."
 

-#: src/compose.c:5729
+#: src/compose.c:5724

 msgid "File doesn't exist or is empty."
 msgstr "Датотека не постоји или је празна."
 
 msgid "File doesn't exist or is empty."
 msgstr "Датотека не постоји или је празна."
 

-#: src/compose.c:5798
+#: src/compose.c:5793

 msgid "Properties"
 msgstr "Особине"
 
 msgid "Properties"
 msgstr "Особине"
 

-#: src/compose.c:5843
+#: src/compose.c:5838

 msgid "Encoding"
 msgstr "Енкодирање"
 
 msgid "Encoding"
 msgstr "Енкодирање"
 

-#: src/compose.c:5874
+#: src/compose.c:5869

 msgid "Path"
 msgstr "Путања"
 
 msgid "Path"
 msgstr "Путања"
 

-#: src/compose.c:5875 src/prefs_toolbar.c:808
+#: src/compose.c:5870 src/prefs_toolbar.c:808

 msgid "File name"
 msgstr "Назив датотеке"
 
 msgid "File name"
 msgstr "Назив датотеке"
 

-#: src/compose.c:6052
+#: src/compose.c:6047

 #, c-format
 msgid ""
 "The external editor is still working.\n"
 #, c-format
 msgid ""
 "The external editor is still working.\n"


@@ -1459,26 +1605,28 @@ msgstr ""
 "Да ли да насилно прекинем процес?\n"
 "Шифра групе процеса: %d"
 
 "Да ли да насилно прекинем процес?\n"
 "Шифра групе процеса: %d"
 

-#: src/compose.c:6361 src/inc.c:167 src/inc.c:257 src/toolbar.c:2046
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "Независно упозорење"
 
 msgid "Offline warning"
 msgstr "Независно упозорење"
 

-#: src/compose.c:6362 src/inc.c:168 src/inc.c:258 src/toolbar.c:2047
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr ""
 "Активан је независан режим рада.\n"
 "Да ли желите да га заобиђем?"
 
 msgid "You're working offline. Override?"
 msgstr ""
 "Активан је независан режим рада.\n"
 "Да ли желите да га заобиђем?"
 

-#: src/compose.c:6480 src/compose.c:6501
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Одаберите датотеку"
 
 msgid "Select file"
 msgstr "Одаберите датотеку"
 

-#: src/compose.c:6515
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Не могу да читам датотеку „%s“."
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "Не могу да читам датотеку „%s“."
 

-#: src/compose.c:6517
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1487,43 +1635,43 @@ msgstr ""
 "Датотека „%s“ садржи неисправне знакове\n"
 "за текуће кодирање, уметање може да буде неправилно."
 
 "Датотека „%s“ садржи неисправне знакове\n"
 "за текуће кодирање, уметање може да буде неправилно."
 

-#: src/compose.c:6556
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "Одбаци поруку"
 
 msgid "Discard message"
 msgstr "Одбаци поруку"
 

-#: src/compose.c:6557
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "Ова порука је измењена. Да ли да је одбацим?"
 
 msgid "This message has been modified. discard it?"
 msgstr "Ова порука је измењена. Да ли да је одбацим?"
 

-#: src/compose.c:6558
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "Одбаци"
 
 msgid "Discard"
 msgstr "Одбаци"
 

-#: src/compose.c:6558
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "у Недовршене"
 
 msgid "to Draft"
 msgstr "у Недовршене"
 

-#: src/compose.c:6593
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желите ли да примените шаблон „%s“ ?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Желите ли да примените шаблон „%s“ ?"
 

-#: src/compose.c:6595
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "Примени шаблон"
 
 msgid "Apply template"
 msgstr "Примени шаблон"
 

-#: src/compose.c:6596
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Замени"
 
 msgid "Replace"
 msgstr "Замени"
 

-#: src/compose.c:6596 src/toolbar.c:417
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "Уметни"
 
 #: src/crash.c:141
 #, c-format
 msgid "Sylpheed process (%ld) received signal %ld"
 msgid "Insert"
 msgstr "Уметни"
 
 #: src/crash.c:141
 #, c-format
 msgid "Sylpheed process (%ld) received signal %ld"

-msgstr "Sylpheed процесира (%ld) преузет сигнал %ld"
+msgstr "Обрада (%ld) преузетог сигнала %ld"

 
 #: src/crash.c:186
 msgid "Sylpheed has crashed"
 
 #: src/crash.c:186
 msgid "Sylpheed has crashed"


@@ -1652,7 +1800,7 @@ msgid " Check File "
 msgstr " Провери датотеку "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr " Провери датотеку "
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1572
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Датотека"
 
 msgid "File"
 msgstr "Датотека"
 


@@ -1708,12 +1856,12 @@ msgstr "Измени директоријум"
 msgid "Input the new name of folder:"
 msgstr "Унесите нови назив за директоријум:"
 
 msgid "Input the new name of folder:"
 msgstr "Унесите нови назив за директоријум:"
 

-#: src/editgroup.c:506 src/folderview.c:1898 src/folderview.c:1949
-#: src/folderview.c:2220
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "Нови директоријум"
 
 msgid "New folder"
 msgstr "Нови директоријум"
 

-#: src/editgroup.c:507 src/folderview.c:1899 src/folderview.c:1950
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr "Унесите назив за нови директоријум:"
 
 msgid "Input the name of new folder:"
 msgstr "Унесите назив за нови директоријум:"
 


@@ -1731,7 +1879,7 @@ msgstr "Измени ЈПилот запис"
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2153
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr " ... "


@@ -1928,14 +2076,15 @@ msgstr "Доделите ДН"
 
 #: src/editldap.c:677
 msgid ""
 
 #: src/editldap.c:677
 msgid ""

-"The LDAP user account name to be used to connect to the This is usually only "
-"used for protected servers. This name is typically formatted as: \"cn=user,"
-"dc=sylpheed,dc=com\". This is usually left empty when performing a search."
+"The LDAP user account name to be used to connect to the server. This is "
+"usually only used for protected servers. This name is typically formatted "
+"as: \"cn=user,dc=sylpheed,dc=com\". This is usually left empty when "
+"performing a search."

 msgstr ""
 msgstr ""

-"Назив ЛДАП корисничког налога који ће бити коришћен за повезивање на сервер. "
-"ово Ñ\81еобиÑ\87но коÑ\80иÑ\81Ñ\82и за заÑ\88Ñ\82иÑ\9bене Ñ\81еÑ\80веÑ\80е. Ð\9eваÑ\98 назив Ñ\98е обиÑ\87но Ñ\84оÑ\80миÑ\80ан Ñ\83 "
-"обликÑ\83: „cn=корисник,dc=sylpheed,dc=com“. Обично се ова опција оставља "
-"пÑ\80азном приликом претраге."
+"Назив ЛДАП корисничког налога који ће се користити за повезивање на сервер. "
+"Ð\9eво Ñ\81е наÑ\98Ñ\87еÑ\88Ñ\9bе коÑ\80иÑ\81Ñ\82и код заÑ\88Ñ\82иÑ\9bениÑ\85 Ñ\81еÑ\80веÑ\80а. Ð\9eваÑ\98 назив Ñ\98е обиÑ\87но Ñ\84оÑ\80миÑ\80ан "
+"као: „cn=корисник,dc=sylpheed,dc=com“. Обично се ова опција оставља "
+"непопÑ\83Ñ\9aеном приликом претраге."

 
 #: src/editldap.c:685
 msgid "Bind Password"
 
 #: src/editldap.c:685
 msgid "Bind Password"


@@ -1962,7 +2111,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr "Максималан број ставки који ће се добити у резултатима претраге."
 
 "The maximum number of entries that should be returned in the search result."
 msgstr "Максималан број ставки који ће се добити у резултатима претраге."
 

-#: src/editldap.c:751 src/prefs_account.c:763
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "Основно"
 
 msgid "Basic"
 msgstr "Основно"
 


@@ -1970,7 +2119,7 @@ msgstr "Основно"
 msgid "Search"
 msgstr "Тражи"
 
 msgid "Search"
 msgstr "Тражи"
 

-#: src/editldap.c:753 src/summaryview.c:642
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "Проширено"
 
 msgid "Extended"
 msgstr "Проширено"
 


@@ -2048,11 +2197,11 @@ msgstr "Излазна HTML датотека"
 msgid "Stylesheet"
 msgstr "Датотека о стилу"
 
 msgid "Stylesheet"
 msgstr "Датотека о стилу"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3177 src/prefs_common.c:3459
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "Стандардни"
 
 msgid "Default"
 msgstr "Стандардни"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "Потпун"
 
 msgid "Full"
 msgstr "Потпун"
 


@@ -2113,7 +2262,7 @@ msgid "Prev"
 msgstr "Назад"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Назад"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:376 src/toolbar.c:467
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "Напред"
 
 msgid "Next"
 msgstr "Напред"
 


@@ -2298,7 +2447,7 @@ msgid "Exporting file:"
 msgstr "Извозна датотека:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Извозна датотека:"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1228
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr " Одаберите... "
 
 msgid " Select... "
 msgstr " Одаберите... "
 


@@ -2318,48 +2467,48 @@ msgstr "Атрибути"
 msgid "Sylpheed Address Book"
 msgstr "Силфед адресар"
 
 msgid "Sylpheed Address Book"
 msgstr "Силфед адресар"
 

-#: src/exporthtml.c:1113 src/exportldif.c:592
+#: src/exporthtml.c:1113 src/exportldif.c:590

 msgid "Name already exists but is not a directory."
 msgstr "Назив већ постоји али није директоријум."
 
 msgid "Name already exists but is not a directory."
 msgstr "Назив већ постоји али није директоријум."
 

-#: src/exporthtml.c:1116 src/exportldif.c:595
+#: src/exporthtml.c:1116 src/exportldif.c:593

 msgid "No permissions to create directory."
 msgstr "Немате дозволе за креирање директоријума."
 
 msgid "No permissions to create directory."
 msgstr "Немате дозволе за креирање директоријума."
 

-#: src/exporthtml.c:1119 src/exportldif.c:598
+#: src/exporthtml.c:1119 src/exportldif.c:596

 msgid "Name is too long."
 msgstr "Назив је предугачак."
 
 msgid "Name is too long."
 msgstr "Назив је предугачак."
 

-#: src/exporthtml.c:1122 src/exportldif.c:601
+#: src/exporthtml.c:1122 src/exportldif.c:599

 msgid "Not specified."
 msgstr "Није одређено."
 
 msgid "Not specified."
 msgstr "Није одређено."
 

-#: src/folder.c:854
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "Сандуче"
 
 msgid "Inbox"
 msgstr "Сандуче"
 

-#: src/folder.c:858
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "Послато"
 
 msgid "Sent"
 msgstr "Послато"
 

-#: src/folder.c:862
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "Припремљено"
 
 msgid "Queue"
 msgstr "Припремљено"
 

-#: src/folder.c:866
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "Смеће"
 
 msgid "Trash"
 msgstr "Смеће"
 

-#: src/folder.c:870
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "Недовршено"
 
 msgid "Drafts"
 msgstr "Недовршено"
 

-#: src/folder.c:1083
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 #, c-format
 msgid "Processing (%s)...\n"

-msgstr "Ð\98звÑ\80Ñ\88аваÑ\9aе (%s)...\n"
+msgstr "Ð\9eбÑ\80ада (%s)...\n"

 
 

-#: src/folder.c:1871
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Премештање %s у %s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "Премештање %s у %s...\n"


@@ -2368,56 +2517,52 @@ msgstr "Премештање %s у %s...\n"
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:325
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/Креирај _нови директоријум..."
 
 msgid "/Create _new folder..."
 msgstr "/Креирај _нови директоријум..."
 

-#: src/folderview.c:288 src/folderview.c:305 src/folderview.c:326
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/_Преименуј директоријум..."
 
 msgid "/_Rename folder..."
 msgstr "/_Преименуј директоријум..."
 

-#: src/folderview.c:289 src/folderview.c:306 src/folderview.c:327
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "/Пр_емести директоријум..."
 
 msgid "/M_ove folder..."
 msgstr "/Пр_емести директоријум..."
 

-#: src/folderview.c:290 src/folderview.c:307 src/folderview.c:328
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/_Уклони директоријум"
 
 msgid "/_Delete folder"
 msgstr "/_Уклони директоријум"
 

-#: src/folderview.c:292 src/folderview.c:313
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "/Уклони _сандуче"
 
 msgid "/Remove _mailbox"
 msgstr "/Уклони _сандуче"
 

-#: src/folderview.c:295 src/folderview.c:317 src/folderview.c:338
-#: src/folderview.c:357
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgid "/_Processing..."

-msgstr "/_Ð\9fÑ\80оÑ\86еÑ\81иÑ\80аÑ\9aе..."
+msgstr "/_Ð\9eбÑ\80ада..."

 
 

-#: src/folderview.c:296
-msgid "/_Scoring..."
-msgstr "/_Бодовање..."
-
-#: src/folderview.c:302 src/folderview.c:323 src/folderview.c:344
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/Означи као _прочитано"
 
 msgid "/Mark all _read"
 msgstr "/Означи као _прочитано"
 

-#: src/folderview.c:309 src/folderview.c:330 src/folderview.c:350
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/Про_вери пошту"
 
 msgid "/_Check for new messages"
 msgstr "/Про_вери пошту"
 

-#: src/folderview.c:311 src/folderview.c:332
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/Ажурирај стабло _директоријума"
 
 msgid "/R_ebuild folder tree"
 msgstr "/Ажурирај стабло _директоријума"
 

-#: src/folderview.c:315 src/folderview.c:336 src/folderview.c:355
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/Пр_етражи директоријум..."
 
 msgid "/_Search folder..."
 msgstr "/Пр_етражи директоријум..."
 

-#: src/folderview.c:318 src/folderview.c:339 src/folderview.c:358
-msgid "/S_coring..."
-msgstr "/Ð\91_одоваÑ\9aе..."
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/Ð\9fÑ\80еÑ\83_зимаÑ\9aе"

 
 

-#: src/folderview.c:334
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Уклони _IMAP4 налог"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Уклони _IMAP4 налог"
 


@@ -2429,83 +2574,102 @@ msgstr "/Пријава на диску_сиону групу..."
 msgid "/_Remove newsgroup"
 msgstr "/Одјава са дискусионе _групе"
 
 msgid "/_Remove newsgroup"
 msgstr "/Одјава са дискусионе _групе"
 

-#: src/folderview.c:353
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/Уклони н_алог за дискусионе групе"
 
 msgid "/Remove _news account"
 msgstr "/Уклони н_алог за дискусионе групе"
 

-#: src/folderview.c:391
+#: src/folderview.c:392

 msgid "New"
 msgstr "Ново"
 
 msgid "New"
 msgstr "Ново"
 

-#: src/folderview.c:392
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "Непрочитано"
 
 msgid "Unread"
 msgstr "Непрочитано"
 

-#: src/folderview.c:393
+#: src/folderview.c:394

 msgid "#"
 msgstr "#"
 
 msgid "#"
 msgstr "#"
 

-#: src/folderview.c:636
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "Постављам информације директоријума..."
 
 msgid "Setting folder info..."
 msgstr "Постављам информације директоријума..."
 

-#: src/folderview.c:796 src/mainwindow.c:2751 src/setup.c:79
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Скенирам директоријум %s%c%s ..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Скенирам директоријум %s%c%s ..."
 

-#: src/folderview.c:800 src/mainwindow.c:2756 src/setup.c:84
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Скенирам директоријум %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Скенирам директоријум %s ..."
 

-#: src/folderview.c:841
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr "Ажурирам стабло директоријума..."
 
 msgid "Rebuilding folder tree..."
 msgstr "Ажурирам стабло директоријума..."
 

-#: src/folderview.c:923
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "Освежавам садржај свих директоријума..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "Освежавам садржај свих директоријума..."
 

-#: src/folderview.c:1701
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Отварам директоријум %s ..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "Отварам директоријум %s ..."
 

-#: src/folderview.c:1713
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "Не могу да отворим директоријум."
 
 msgid "Folder could not be opened."
 msgstr "Не могу да отворим директоријум."
 

-#: src/folderview.c:1900 src/folderview.c:1951 src/folderview.c:2224
+#: src/folderview.c:1841
+#, c-format
+msgid "Downloading messages in %s ..."
+msgstr "Преузми поруке у %s ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "Откачи се са мреже"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Тренутно нисма повезан на мрежу.\n"
+"Да ли желите да се повежем?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "Настала је грешка при преузимању поруке у „%s“."
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "Нови директоријум"
 
 msgid "NewFolder"
 msgstr "Нови директоријум"
 

-#: src/folderview.c:1905 src/folderview.c:1999 src/folderview.c:2229
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ не може да се налази у називу директоријума."
 

-#: src/folderview.c:1918 src/folderview.c:1956 src/folderview.c:2009
-#: src/folderview.c:2080 src/folderview.c:2241
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Директоријум „%s“ већ псотоји."
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Директоријум „%s“ већ псотоји."
 

-#: src/folderview.c:1925 src/folderview.c:2248
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не могу да направим директоријум „%s“."
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не могу да направим директоријум „%s“."
 

-#: src/folderview.c:1992 src/folderview.c:2070
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Унесите нови назив за „%s“:"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Унесите нови назив за „%s“:"
 

-#: src/folderview.c:1993 src/folderview.c:2072
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "Преименуј директоријум"
 
 msgid "Rename folder"
 msgstr "Преименуј директоријум"
 

-#: src/folderview.c:2131
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2514,16 +2678,16 @@ msgstr ""
 "Сви директоријуми и поруке испод „%s“ ће бити уклоњени.\n"
 "Да ли заиста желите да их уклоните?"
 
 "Сви директоријуми и поруке испод „%s“ ће бити уклоњени.\n"
 "Да ли заиста желите да их уклоните?"
 

-#: src/folderview.c:2133
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "Уклони директоријум"
 
 msgid "Delete folder"
 msgstr "Уклони директоријум"
 

-#: src/folderview.c:2150
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Не могу да уклоним директоријум „%s“."
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "Не могу да уклоним директоријум „%s“."
 

-#: src/folderview.c:2186
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2532,11 +2696,11 @@ msgstr ""
 "Да ли заиста желите да уклоните налог „%s“ ?\n"
 "(Поруке ће остати сачуване на диску)"
 
 "Да ли заиста желите да уклоните налог „%s“ ?\n"
 "(Поруке ће остати сачуване на диску)"
 

-#: src/folderview.c:2188
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "Уколни налог"
 
 msgid "Remove mailbox"
 msgstr "Уколни налог"
 

-#: src/folderview.c:2221
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2546,54 +2710,58 @@ msgstr ""
 "(ако желите да креирате директоријум за смештање поддиреоторијума,\n"
 " додајте  „/“ на крај назива)"
 
 "(ако желите да креирате директоријум за смештање поддиреоторијума,\n"
 " додајте  „/“ на крај назива)"
 

-#: src/folderview.c:2278
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Да ли заиста желите да уклоните IMAP4 налог „%s“?"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Да ли заиста желите да уклоните IMAP4 налог „%s“?"
 

-#: src/folderview.c:2279
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "Уклањање IMAP4 налога"
 
 msgid "Delete IMAP4 account"
 msgstr "Уклањање IMAP4 налога"
 

-#: src/folderview.c:2413
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Да ли заиста желите да се одјавите са дискусионе групе „%s“?"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Да ли заиста желите да се одјавите са дискусионе групе „%s“?"
 

-#: src/folderview.c:2414
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Одјава са дискусионе групе"
 
 msgid "Delete newsgroup"
 msgstr "Одјава са дискусионе групе"
 

-#: src/folderview.c:2451
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Да ли заиста желите да уклоните налог за дискусионе групе „%s“?"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Да ли заиста желите да уклоните налог за дискусионе групе „%s“?"
 

-#: src/folderview.c:2452
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "Уклањање налога за дискусионе групе"
 
 msgid "Delete news account"
 msgstr "Уклањање налога за дискусионе групе"
 

-#: src/folderview.c:2560
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Премештање %s у %s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "Премештање %s у %s..."
 

-#: src/folderview.c:2589
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "Извор и одредиште су на истој локацији."
 
 msgid "Source and destination are the same."
 msgstr "Извор и одредиште су на истој локацији."
 

-#: src/folderview.c:2592
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "Не могу да преместим директоријум у његов поддиректоријум."
 
 msgid "Can't move a folder to one of its children."
 msgstr "Не могу да преместим директоријум у његов поддиректоријум."
 

-#: src/folderview.c:2595
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Премештање директоријума између различитих сандучића није могуће."
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Премештање директоријума између различитих сандучића није могуће."
 

-#: src/folderview.c:2598
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "Неуспело премештање!"
 
 msgid "Move failed!"
 msgstr "Неуспело премештање!"
 

+#: src/folderview.c:2704 src/summaryview.c:4013
+msgid "Processing configuration"
+msgstr "Обрађујем подешавање"
+

 #: src/grouplistdialog.c:176
 msgid "Newsgroup subscription"
 msgstr "Пријава на дискусионе групе"
 #: src/grouplistdialog.c:176
 msgid "Newsgroup subscription"
 msgstr "Пријава на дискусионе групе"


@@ -2642,7 +2810,7 @@ msgstr "непознато"
 msgid "Can't retrieve newsgroup list."
 msgstr "Не могу да преузем листу дискусионих група."
 
 msgid "Can't retrieve newsgroup list."
 msgstr "Не могу да преузем листу дискусионих група."
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1162
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Готово."
 
 msgid "Done."
 msgstr "Готово."
 


@@ -2842,7 +3010,7 @@ msgstr ""
 "Модул за правописну проверу не може да промени речник.\n"
 "%s"
 
 "Модул за правописну проверу не може да промени речник.\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr "Абцдеф"
 
 msgid "Abcdef"
 msgstr "Абцдеф"
 


@@ -2858,7 +3026,7 @@ msgstr "Одаберите додатак за учитавање"
 msgid "Plugins"
 msgstr "Додатци"
 
 msgid "Plugins"
 msgstr "Додатци"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2716
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "Опис"
 
 msgid "Description"
 msgstr "Опис"
 


@@ -2878,7 +3046,7 @@ msgstr "Листа опција"
 msgid "Apply"
 msgstr "Примени"
 
 msgid "Apply"
 msgstr "Примени"
 

-#: src/gtk/progressdialog.c:52
+#: src/gtk/progressdialog.c:52 src/prefs_filtering_action.c:344

 msgid "Account"
 msgstr "Налог"
 
 msgid "Account"
 msgstr "Налог"
 


@@ -2901,6 +3069,7 @@ msgid "Signer"
 msgstr "Потписник"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "Потписник"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Име: "
 
 msgid "Name: "
 msgstr "Име: "
 


@@ -2972,159 +3141,159 @@ msgstr "Преглед сертификата"
 msgid "Changed SSL Certificate"
 msgstr "Промењени SSL сертификат"
 
 msgid "Changed SSL Certificate"
 msgstr "Промењени SSL сертификат"
 

-#: src/headerview.c:181 src/summaryview.c:2377
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(Без пошиљаоца)"
 
 msgid "(No From)"
 msgstr "(Без пошиљаоца)"
 

-#: src/headerview.c:202 src/summaryview.c:2419 src/summaryview.c:2422
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(Без теме)"
 
 msgid "(No Subject)"
 msgstr "(Без теме)"
 

-#: src/imap.c:659
+#: src/imap.c:669

 #, c-format
 msgid "Connecting %s failed"
 msgstr "Неуспешно повезивање на %s"
 
 #, c-format
 msgid "Connecting %s failed"
 msgstr "Неуспешно повезивање на %s"
 

-#: src/imap.c:664
+#: src/imap.c:674

 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 конекција са %s је прекинута. Поновно успостављање конекције...\n"
 
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 конекција са %s је прекинута. Поновно успостављање конекције...\n"
 

-#: src/imap.c:704
+#: src/imap.c:714

 msgid "creating tunneled IMAP4 connection\n"
 msgstr "креирање тунел IMAP4 конекције\n"
 
 msgid "creating tunneled IMAP4 connection\n"
 msgstr "креирање тунел IMAP4 конекције\n"
 

-#: src/imap.c:717
+#: src/imap.c:727

 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "креирање IMAP4 конекције са %s:%d ...\n"
 
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "креирање IMAP4 конекције са %s:%d ...\n"
 

-#: src/imap.c:756
+#: src/imap.c:766

 msgid "Can't start TLS session.\n"
 msgstr "Не могу да покренем TLS сесију.\n"
 
 msgid "Can't start TLS session.\n"
 msgstr "Не могу да покренем TLS сесију.\n"
 

-#: src/imap.c:1089
+#: src/imap.c:1100

 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "не могу да поставим ознаку „Обирсано“: %d\n"
 
 #, c-format
 msgid "can't set deleted flags: %d\n"
 msgstr "не могу да поставим ознаку „Обирсано“: %d\n"
 

-#: src/imap.c:1103 src/imap.c:1143
+#: src/imap.c:1114 src/imap.c:1154

 msgid "can't expunge\n"
 msgstr "не могу да избришем\n"
 
 msgid "can't expunge\n"
 msgstr "не могу да избришем\n"
 

-#: src/imap.c:1137
+#: src/imap.c:1148

 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могу да поставим ознаку „Обирсано“: 1:*\n"
 
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могу да поставим ознаку „Обирсано“: 1:*\n"
 

-#: src/imap.c:1179
+#: src/imap.c:1190

 msgid "can't close folder\n"
 msgstr "не могу да затворим директоријум\n"
 
 msgid "can't close folder\n"
 msgstr "не могу да затворим директоријум\n"
 

-#: src/imap.c:1231
+#: src/imap.c:1242

 #, c-format
 msgid "root folder %s does not exist\n"
 msgstr "корени директоријум %s не постоји\n"
 
 #, c-format
 msgid "root folder %s does not exist\n"
 msgstr "корени директоријум %s не постоји\n"
 

-#: src/imap.c:1404 src/imap.c:1412
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "настала је грешка при преузимању резултата команде LIST.\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "настала је грешка при преузимању резултата команде LIST.\n"
 

-#: src/imap.c:1640
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "не могу да направим сандуче: неуспела команда LIST\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не могу да направим сандуче: неуспела команда LIST\n"
 

-#: src/imap.c:1662
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "не могу да направим сандуче\n"
 
 msgid "can't create mailbox\n"
 msgstr "не могу да направим сандуче\n"
 

-#: src/imap.c:1731
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не могу да преименујем сандуче: %s у %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не могу да преименујем сандуче: %s у %s\n"
 

-#: src/imap.c:1793
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "не могу да уклоним сандуче\n"
 
 msgid "can't delete mailbox\n"
 msgstr "не могу да уклоним сандуче\n"
 

-#: src/imap.c:1831
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "не могу да преузмем уводно заглавље поруке\n"
 
 msgid "can't get envelope\n"
 msgstr "не могу да преузмем уводно заглавље поруке\n"
 

-#: src/imap.c:1839
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "настала је грешка при преузимању уводног заглавља поруке.\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "настала је грешка при преузимању уводног заглавља поруке.\n"
 

-#: src/imap.c:1861
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не могу да обрадим уводно заглавље поруке: %s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не могу да обрадим уводно заглавље поруке: %s\n"
 

-#: src/imap.c:1917
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Не могу да успоставим IMAP4 сесију са: %s\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "Не могу да успоставим IMAP4 сесију са: %s\n"
 

-#: src/imap.c:1939
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не могу да се повежем на IMAP4 сервер: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не могу да се повежем на IMAP4 сервер: %s:%d\n"
 

-#: src/imap.c:1946
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не могу да успоставим IMAP4 сесију са: %s:%d\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не могу да успоставим IMAP4 сесију са: %s:%d\n"
 

-#: src/imap.c:2036
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "не могу да сазнм namespace\n"
 
 msgid "can't get namespace\n"
 msgstr "не могу да сазнм namespace\n"
 

-#: src/imap.c:2469
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не могу да одаберем директоријум: %s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не могу да одаберем директоријум: %s\n"
 

-#: src/imap.c:2609
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgstr "Неуспешна IMAP идентификација.\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "Неуспешна IMAP идентификација.\n"
 

-#: src/imap.c:2626
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 пријављивање неуспело.\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 пријављивање неуспело.\n"
 

-#: src/imap.c:2942
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не могу да додам %s на %s\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не могу да додам %s на %s\n"
 

-#: src/imap.c:2949
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(слање датотека...)"
 
 msgid "(sending file...)"
 msgstr "(слање датотека...)"
 

-#: src/imap.c:2991
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не могу да додам поруку на %s\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не могу да додам поруку на %s\n"
 

-#: src/imap.c:3073
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не могу да копирам %s у %s\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не могу да копирам %s у %s\n"
 

-#: src/imap.c:3123
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "настала је грешка при извршавању imap наредбе: STORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "настала је грешка при извршавању imap наредбе: STORE %s %s\n"
 

-#: src/imap.c:3140
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "настала је грешка при извршавању imap наредбе: EXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "настала је грешка при извршавању imap наредбе: EXPUNGE\n"
 

-#: src/imap.c:3153
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "настала је грешка при извршавању IMAP наредбе: CLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "настала је грешка при извршавању IMAP наредбе: CLOSE\n"
 

-#: src/imap.c:3408
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преведе UTF-7 у %s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преведе UTF-7 у %s\n"


@@ -3205,7 +3374,7 @@ msgstr "Одаберите LDIF датотеку за увоз."
 msgid "R"
 msgstr "Р"
 
 msgid "R"
 msgstr "Р"
 

-#: src/importldif.c:765 src/summaryview.c:462
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "С"
 
 msgid "S"
 msgstr "С"
 


@@ -3302,163 +3471,163 @@ msgstr "Одаберите Пине датотеку"
 msgid "Import Pine file into Address Book"
 msgstr "Увоз Пине датотеке у адресар"
 
 msgid "Import Pine file into Address Book"
 msgstr "Увоз Пине датотеке у адресар"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "Преузимање нових порука"
 
 msgid "Retrieving new messages"
 msgstr "Преузимање нових порука"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "У приправности..."
 
 msgid "Standby"
 msgstr "У приправности..."
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "Отказано"
 
 msgid "Cancelled"
 msgstr "Отказано"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "Преузимање у току..."
 
 msgid "Retrieving"
 msgstr "Преузимање у току..."
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Готово (%d порука(е) (%s) преузето)"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Готово (%d порука(е) (%s) преузето)"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Готово (нема нових порука)"
 
 msgid "Done (no new messages)"
 msgstr "Готово (нема нових порука)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "Неуспело повезивање"
 
 msgid "Connection failed"
 msgstr "Неуспело повезивање"
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "Неуспело пријављивање"
 
 msgid "Auth failed"
 msgstr "Неуспело пријављивање"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "Закључано"
 
 msgid "Locked"
 msgstr "Закључано"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Пријављивање за %s на %s неуспело"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "Пријављивање за %s на %s неуспело"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завршено (%d нова(их) порука)"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Завршено (%d нова(их) порука)"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Завршено (нема нових порука)"
 
 msgid "Finished (no new messages)"
 msgstr "Завршено (нема нових порука)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "Настале су грешке при преузимању порука."
 
 msgid "Some errors occurred while getting mail."
 msgstr "Настале су грешке при преузимању порука."
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Преузимање нових порука"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s: Преузимање нових порука"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Повезивање на POP3 сервер: %s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "Повезивање на POP3 сервер: %s..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не могу да се повежем на POP3 сервер: %s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Не могу да се повежем на POP3 сервер: %s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не могу да се повежем на POP3 сервер: %s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr "Не могу да се повежем на POP3 сервер: %s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "Идентификација..."
 
 msgid "Authenticating..."
 msgstr "Идентификација..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Преузимам поруке са %s..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "Преузимам поруке са %s..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "Преузимам број нових порука (STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "Преузимам број нових порука (STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr "Преузимам број нових порука (LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr "Преузимам број нових порука (LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Преузимам број нових порука (UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr "Преузимам број нових порука (UIDL)..."
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "Преузимам величину порука (LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "Преузимам величину порука (LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "Уклањам поруку %d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "Уклањам поруку %d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "Затварам везу са сервером"
 
 msgid "Quitting"
 msgstr "Затварам везу са сервером"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Преузимам поруке (%d / %d) (%s / %s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Преузимам поруке (%d / %d) (%s / %s)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Преузимам (%d порука(е), (%s) преузето)"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "Преузимам (%d порука(е), (%s) преузето)"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Неуспело повезивање."
 
 msgid "Connection failed."
 msgstr "Неуспело повезивање."
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr "Настала је грешка при процесирању поруке."
 
 msgid "Error occurred while processing mail."
 msgstr "Настала је грешка при процесирању поруке."
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 "%s"
 msgstr ""

-"Ð\9dаÑ\81Ñ\82ала Ñ\98е гÑ\80еÑ\88ка пÑ\80и пÑ\80оÑ\86еÑ\81иÑ\80аÑ\9aÑ\83 поруке:\n"
+"Ð\9dаÑ\81Ñ\82ала Ñ\98е гÑ\80еÑ\88ка пÑ\80и обÑ\80ади поруке:\n"

 "%s"
 
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "На диску више нема места."
 
 msgid "No disk space left."
 msgstr "На диску више нема места."
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "Не могу да запишем датотеку."
 
 msgid "Can't write file."
 msgstr "Не могу да запишем датотеку."
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "Грешка у сокету"
 
 msgid "Socket error."
 msgstr "Грешка у сокету"
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Удаљени сервер је прекинуо везу."
 
 msgid "Connection closed by the remote host."
 msgstr "Удаљени сервер је прекинуо везу."
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "Сандуче је закључано."
 
 msgid "Mailbox is locked."
 msgstr "Сандуче је закључано."
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3467,11 +3636,11 @@ msgstr ""
 "Сандуче је закључано:\n"
 "%s"
 
 "Сандуче је закључано:\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "Неуспешна идентификација."
 
 msgid "Authentication failed."
 msgstr "Неуспешна идентификација."
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3480,7 +3649,7 @@ msgstr ""
 "Неуспешна идентификација:\n"
 "%s"
 
 "Неуспешна идентификација:\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "Увоз је обустављен\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "Увоз је обустављен\n"
 


@@ -3497,7 +3666,7 @@ msgstr "Унесите лозинку"
 msgid "Nick Name"
 msgstr "Надимак"
 
 msgid "Nick Name"
 msgstr "Надимак"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3506,20 +3675,20 @@ msgstr ""
 "Датотека „%s“ већ постоји.\n"
 "Не могу да направим директоријум."
 
 "Датотека „%s“ већ постоји.\n"
 "Не могу да направим директоријум."
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread није подржан glib-ом.\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "g_thread није подржан glib-ом.\n"
 

-#: src/main.c:451
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЈЕ]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЈЕ]...\n"
 

-#: src/main.c:454
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адреса]     отвара прозор за креирање поруке"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адреса]     отвара прозор за креирање поруке"
 

-#: src/main.c:455
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3529,23 +3698,23 @@ msgstr ""
 "                         отвара прозор за креирање поруке са прилагањем\n"
 "                         одабраног датотеке"
 
 "                         отвара прозор за креирање поруке са прилагањем\n"
 "                         одабраног датотеке"
 

-#: src/main.c:458
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              преузимање нових порука"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              преузимање нових порука"
 

-#: src/main.c:459
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          преузимање нових порука са свих налога"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          преузимање нових порука са свих налога"
 

-#: src/main.c:460
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 слање свих прирпремљених порука"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 слање свих прирпремљених порука"
 

-#: src/main.c:461
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   исписује укупан броја порука"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   исписује укупан броја порука"
 

-#: src/main.c:462
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3553,727 +3722,760 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         исписује укупан броја порука за сваки директоријум"
 
 "  --status-full [folder]...\n"
 "                         исписује укупан броја порука за сваки директоријум"
 

-#: src/main.c:464
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online               прелазак у мрежни рад (умрежен)"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               прелазак у мрежни рад (умрежен)"
 

-#: src/main.c:465
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              напуштање мрежног рада (неумрежен)"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              напуштање мрежног рада (неумрежен)"
 

-#: src/main.c:466
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                мод за проналажење грешака"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                мод за проналажење грешака"
 

-#: src/main.c:467
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 приказује ову помоћ и затвара програм"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 приказује ову помоћ и затвара програм"
 

-#: src/main.c:468
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version              исписује верзију и затвара програм"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              исписује верзију и затвара програм"
 

-#: src/main.c:469
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           исписује конфигурациони директоријум"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           исписује конфигурациони директоријум"
 

-#: src/main.c:513 src/summaryview.c:5142
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 #, c-format
 msgid "Processing (%s)..."

-msgstr "Ð\98звÑ\80Ñ\88аваÑ\9aе (%s)..."
+msgstr "Ð\9eбÑ\80ада (%s)..."

 
 

-#: src/main.c:516
+#: src/main.c:571

 msgid "top level folder"
 msgstr "директоријум највишег нивоа"
 
 msgid "top level folder"
 msgstr "директоријум највишег нивоа"
 

-#: src/main.c:583
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Састављање поруке је у току."
 
 msgid "Composing message exists."
 msgstr "Састављање поруке је у току."
 

-#: src/main.c:584
+#: src/main.c:637

 msgid "Draft them"
 msgstr "Недовршено"
 
 msgid "Draft them"
 msgstr "Недовршено"
 

-#: src/main.c:584
+#: src/main.c:637

 msgid "Discard them"
 msgstr "Одбаци"
 
 msgid "Discard them"
 msgstr "Одбаци"
 

-#: src/main.c:584
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "Одустани"
 
 msgid "Don't quit"
 msgstr "Одустани"
 

-#: src/main.c:598
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "Припремљене поруке"
 
 msgid "Queued messages"
 msgstr "Припремљене поруке"
 

-#: src/main.c:599
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Неке непослате поруке су стављене у директоријум за слање. Да ли желите да "
 "одмах напустите програм?"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Неке непослате поруке су стављене у директоријум за слање. Да ли желите да "
 "одмах напустите програм?"
 

-#: src/main.c:889
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "Настале су грешке при слању припремљених порука."
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "Настале су грешке при слању припремљених порука."
 

-#: src/mainwindow.c:415
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/_Датотека/_Директоријум"
 
 msgid "/_File/_Folder"
 msgstr "/_Датотека/_Директоријум"
 

-#: src/mainwindow.c:416
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Датотека/_Директоријум/_Креирај нови директоријум..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/_Датотека/_Директоријум/_Креирај нови директоријум..."
 

-#: src/mainwindow.c:418
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Датотека/_Директоријум/_Преименуј директоријум..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/_Датотека/_Директоријум/_Преименуј директоријум..."
 

-#: src/mainwindow.c:419
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Датотека/_Директоријум/_Уклони директоријум"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/_Датотека/_Директоријум/_Уклони директоријум"
 

-#: src/mainwindow.c:420
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/_Датотека/_Директоријум/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/_Датотека/_Директоријум/---"
 

-#: src/mainwindow.c:421
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Датотека/_Директоријум/_Пронађи нове поруке у свим директоријумима"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/_Датотека/_Директоријум/_Пронађи нове поруке у свим директоријумима"
 

-#: src/mainwindow.c:423
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/_Датотека/Ново _сандуче"
 
 msgid "/_File/_Add mailbox"
 msgstr "/_Датотека/Ново _сандуче"
 

-#: src/mainwindow.c:424
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Датотека/Ново _сандуче/MH..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/_Датотека/Ново _сандуче/MH..."
 

-#: src/mainwindow.c:425
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/_Датотека/_Увези mbox датотеку..."
 
 msgid "/_File/_Import mbox file..."
 msgstr "/_Датотека/_Увези mbox датотеку..."
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/_Датотека/_Извези у mbox датотеку..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/_Датотека/_Извези у mbox датотеку..."
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/_Датотека/Испразни с_меће"
 
 msgid "/_File/Empty _trash"
 msgstr "/_Датотека/Испразни с_меће"
 

-#: src/mainwindow.c:428
-msgid "/_File/_Work offline"
-msgstr "/_Датотека/_Независан рад"
-
-#: src/mainwindow.c:430 src/messageview.c:140
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/_Датотека/Сачувај _као..."
 
 msgid "/_File/_Save as..."
 msgstr "/_Датотека/Сачувај _као..."
 

-#: src/mainwindow.c:431 src/messageview.c:141
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/_Датотека/_Штампа..."
 
 msgid "/_File/_Print..."
 msgstr "/_Датотека/_Штампа..."
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:453
+msgid "/_File/_Work offline"
+msgstr "/_Датотека/_Независан рад"
+
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/_Датотека/И_злаз"
 
 msgid "/_File/E_xit"
 msgstr "/_Датотека/И_злаз"
 

-#: src/mainwindow.c:439
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/_Уређивање/Одабери _нит расправе"
 
 msgid "/_Edit/Select _thread"
 msgstr "/_Уређивање/Одабери _нит расправе"
 

-#: src/mainwindow.c:441 src/messageview.c:149
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr "/_Уређивање/Пронађи _текст у поруци..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Уређивање/Пронађи _текст у поруци..."
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "/_Уређивање/Претражи _директоријум..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "/_Уређивање/Претражи _директоријум..."
 

-#: src/mainwindow.c:445
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "/П_реглед/_Приказивање"
 
 msgid "/_View/Show or hi_de"
 msgstr "/П_реглед/_Приказивање"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/П_реглед/_Приказивање/Стабло _директоријума"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "/П_реглед/_Приказивање/Стабло _директоријума"
 

-#: src/mainwindow.c:448
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/П_реглед/_Приказивање/Преглед _поруке"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/П_реглед/_Приказивање/Преглед _поруке"
 

-#: src/mainwindow.c:450
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/П_реглед/_Приказивање/_Линија алата"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "/П_реглед/_Приказивање/_Линија алата"
 

-#: src/mainwindow.c:452
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/П_реглед/_Приказивање/_Линија алата/Ик_онице и текст"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/П_реглед/_Приказивање/_Линија алата/Ик_онице и текст"
 

-#: src/mainwindow.c:454
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Иконице"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Иконице"
 

-#: src/mainwindow.c:456
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Текст"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Текст"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Ништа"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/П_реглед/_Приказивање/_Линија алата/_Ништа"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/П_реглед/_Приказивање/_Статусна линија"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/П_реглед/_Приказивање/_Статусна линија"
 

-#: src/mainwindow.c:463
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/П_реглед/П_лутајуће стабло директоријума"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/П_реглед/П_лутајуће стабло директоријума"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/П_реглед/Пл_утајући приказ порука"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/П_реглед/Пл_утајући приказ порука"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/П_реглед/Поре_дак"
 
 msgid "/_View/_Sort"
 msgstr "/П_реглед/Поре_дак"
 

-#: src/mainwindow.c:467
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/П_реглед/Поре_дак/по _броју поруке"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/П_реглед/Поре_дак/по _броју поруке"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/П_реглед/Поре_дак/по _величини поруке"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/П_реглед/Поре_дак/по _величини поруке"
 

-#: src/mainwindow.c:469
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/П_реглед/Поре_дак/по _датуму креирања"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/П_реглед/Поре_дак/по _датуму креирања"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/П_реглед/Поре_дак/по _пошиљаоцу поруке"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/П_реглед/Поре_дак/по _пошиљаоцу поруке"
 

-#: src/mainwindow.c:471
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/П_реглед/Поре_дак/по п_римаоцу поруке"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/П_реглед/Поре_дак/по п_римаоцу поруке"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/П_реглед/Поре_дак/по _теми поруке"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/П_реглед/Поре_дак/по _теми поруке"
 

-#: src/mainwindow.c:473
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/П_реглед/Поре_дак/по бо_ји поруке"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/П_реглед/Поре_дак/по бо_ји поруке"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/П_реглед/Поре_дак/по _ознаци"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/П_реглед/Поре_дак/по _ознаци"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/П_реглед/Поре_дак/по _статусу"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/П_реглед/Поре_дак/по _статусу"
 

-#: src/mainwindow.c:477
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/П_реглед/Поре_дак/по прилозим_а"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/П_реглед/Поре_дак/по прилозим_а"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/П_реглед/Поре_дак/по бодови_ма"
 
 msgid "/_View/_Sort/by score"
 msgstr "/П_реглед/Поре_дак/по бодови_ма"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/П_реглед/Поре_дак/по _закључаности"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/П_реглед/Поре_дак/по _закључаности"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/П_реглед/Поре_дак/_Несортирано"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/П_реглед/Поре_дак/_Несортирано"
 

-#: src/mainwindow.c:482 src/mainwindow.c:485
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/П_реглед/Поре_дак/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/П_реглед/Поре_дак/---"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/П_реглед/Поре_дак/Растуће сортирање  [А->Ш]"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/П_реглед/Поре_дак/Растуће сортирање  [А->Ш]"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/П_реглед/Поре_дак/Опадајуће сортирање [Ш->А]"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/П_реглед/Поре_дак/Опадајуће сортирање [Ш->А]"
 

-#: src/mainwindow.c:486
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/П_реглед/Поре_дак/По _теми"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/П_реглед/Поре_дак/По _теми"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/П_реглед/_Формирај нити расправа"
 
 msgid "/_View/Th_read view"
 msgstr "/П_реглед/_Формирај нити расправа"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/П_реглед/Разгранај с_ве нити расправа"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/П_реглед/Разгранај с_ве нити расправа"
 

-#: src/mainwindow.c:490
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/П_реглед/Скупи с_ве нити расправа"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/П_реглед/Скупи с_ве нити расправа"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/П_реглед/С_акриј прочитане поруке"
 
 msgid "/_View/_Hide read messages"
 msgstr "/П_реглед/С_акриј прочитане поруке"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/П_реглед/Подеси _делове заглавља за приказ..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/П_реглед/Подеси _делове заглавља за приказ..."
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/П_реглед/_Иди на"
 
 msgid "/_View/_Go to"
 msgstr "/П_реглед/_Иди на"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/П_реглед/_Иди на/_Претходну поруку"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/П_реглед/_Иди на/_Претходну поруку"
 

-#: src/mainwindow.c:497
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/П_реглед/_Иди на/_Следећу поруку"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/П_реглед/_Иди на/_Следећу поруку"
 

-#: src/mainwindow.c:498 src/mainwindow.c:503 src/mainwindow.c:506
-#: src/mainwindow.c:511 src/mainwindow.c:516
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/П_реглед/_Иди на/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/П_реглед/_Иди на/---"
 

-#: src/mainwindow.c:499
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/П_реглед/_Иди на/П_ретходну непрочитану поруку"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/П_реглед/_Иди на/П_ретходну непрочитану поруку"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/П_реглед/_Иди на/С_ледећу непрочитану поруку"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/П_реглед/_Иди на/С_ледећу непрочитану поруку"
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/П_реглед/_Иди на/Претходну но_ву поруку"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/П_реглед/_Иди на/Претходну но_ву поруку"
 

-#: src/mainwindow.c:505
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/П_реглед/_Иди на/Сл_едећу нову поруку"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/П_реглед/_Иди на/Сл_едећу нову поруку"
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/П_реглед/_Иди на/Претходну _маркирану поруку"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/П_реглед/_Иди на/Претходну _маркирану поруку"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/П_реглед/_Иди на/Следећу м_аркирану поруку"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/П_реглед/_Иди на/Следећу м_аркирану поруку"
 

-#: src/mainwindow.c:512
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/П_реглед/_Иди на/Претходну _обојену поруку"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/П_реглед/_Иди на/Претходну _обојену поруку"
 

-#: src/mainwindow.c:514
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/П_реглед/_Иди на/Следећу о_бојену поруку"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/П_реглед/_Иди на/Следећу о_бојену поруку"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/П_реглед/_Иди на/Други _директоријум..."
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/П_реглед/_Иди на/Други _директоријум..."
 

-#: src/mainwindow.c:521 src/mainwindow.c:528 src/messageview.c:155
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/П_реглед/С_куп знакова/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/П_реглед/С_куп знакова/---"
 

-#: src/mainwindow.c:525 src/messageview.c:159
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/П_реглед/С_куп знакова"
 
 msgid "/_View/_Code set"
 msgstr "/П_реглед/С_куп знакова"
 

-#: src/mainwindow.c:526 src/messageview.c:160
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/П_реглед/С_куп знакова/_Аутоматска детекција"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/П_реглед/С_куп знакова/_Аутоматска детекција"
 

-#: src/mainwindow.c:529 src/messageview.c:163
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/П_реглед/С_куп знакова/7бит аски (US-ASC_II)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/П_реглед/С_куп знакова/7бит аски (US-ASC_II)"
 

-#: src/mainwindow.c:533 src/messageview.c:167
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/П_реглед/С_куп знакова/Јуникод (_UTF-8)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/П_реглед/С_куп знакова/Јуникод (_UTF-8)"
 

-#: src/mainwindow.c:537 src/messageview.c:171
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/П_реглед/С_куп знакова/Западноевропски (ISO-8859-_1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/П_реглед/С_куп знакова/Западноевропски (ISO-8859-_1)"
 

-#: src/mainwindow.c:539 src/messageview.c:173
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/П_реглед/С_куп знакова/Западноевропски (ISO-_8859-15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/П_реглед/С_куп знакова/Западноевропски (ISO-_8859-15)"
 

-#: src/mainwindow.c:543 src/messageview.c:177
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/П_реглед/С_куп знакова/Централноевропски (ISO-8859-_2)"
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/П_реглед/С_куп знакова/Централноевропски (ISO-8859-_2)"
 

-#: src/mainwindow.c:546 src/messageview.c:180
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/П_реглед/С_куп знакова/Балтички (ISO-8858-1_3)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/П_реглед/С_куп знакова/Балтички (ISO-8858-1_3)"
 

-#: src/mainwindow.c:548 src/messageview.c:182
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/П_реглед/С_куп знакова/Балтички (ISO-8859-_4)"
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/П_реглед/С_куп знакова/Балтички (ISO-8859-_4)"
 

-#: src/mainwindow.c:551 src/messageview.c:185
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/П_реглед/С_куп знакова/Грчки (ISO-8859-_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/П_реглед/С_куп знакова/Грчки (ISO-8859-_7)"
 

-#: src/mainwindow.c:554 src/messageview.c:188
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/П_реглед/С_куп знакова/Турски (ISO-8859-_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/П_реглед/С_куп знакова/Турски (ISO-8859-_9)"
 

-#: src/mainwindow.c:557 src/messageview.c:191
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (ISO-8859-_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (ISO-8859-_5)"
 

-#: src/mainwindow.c:559 src/messageview.c:193
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (KOI8-_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (KOI8-_R)"
 

-#: src/mainwindow.c:561 src/messageview.c:195
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/П_реглед/С_куп знакова/Ћирилица (Windows-1251)"
 

-#: src/mainwindow.c:565 src/messageview.c:199
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/П_реглед/С_куп знакова/Јапански (ISO-2022-JP)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/П_реглед/С_куп знакова/Јапански (ISO-2022-JP)"
 

-#: src/mainwindow.c:568 src/messageview.c:202
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/П_реглед/С_куп знакова/Јапански (ISO-2022-JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/П_реглед/С_куп знакова/Јапански (ISO-2022-JP-2)"
 

-#: src/mainwindow.c:571 src/messageview.c:205
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/П_реглед/С_куп знакова/Јапански (EUC-JP)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/П_реглед/С_куп знакова/Јапански (EUC-JP)"
 

-#: src/mainwindow.c:573 src/messageview.c:207
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/П_реглед/С_куп знакова/Јапански (_Shift_JIS)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/П_реглед/С_куп знакова/Јапански (_Shift_JIS)"
 

-#: src/mainwindow.c:577 src/messageview.c:211
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/П_реглед/С_куп знакова/Поједностављени Кинески (GB2312)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/П_реглед/С_куп знакова/Поједностављени Кинески (GB2312)"
 

-#: src/mainwindow.c:579 src/messageview.c:213
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/П_реглед/С_куп знакова/Традиционални Кинески (Big5)"
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/П_реглед/С_куп знакова/Традиционални Кинески (Big5)"
 

-#: src/mainwindow.c:581 src/messageview.c:215
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/П_реглед/С_куп знакова/Традиционални Кинески (EUC-ТW)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/П_реглед/С_куп знакова/Традиционални Кинески (EUC-ТW)"
 

-#: src/mainwindow.c:583 src/messageview.c:217
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/П_реглед/С_куп знакова/Кинески (ISO-2022-CN)"
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/П_реглед/С_куп знакова/Кинески (ISO-2022-CN)"
 

-#: src/mainwindow.c:586 src/messageview.c:220
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/П_реглед/С_куп знакова/Корејски (EUC-KR)"
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/П_реглед/С_куп знакова/Корејски (EUC-KR)"
 

-#: src/mainwindow.c:588 src/messageview.c:222
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/П_реглед/С_куп знакова/Корејски (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/П_реглед/С_куп знакова/Корејски (ISO-2022-KR)"
 

-#: src/mainwindow.c:591 src/messageview.c:225
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/П_реглед/С_куп знакова/Таи (TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/П_реглед/С_куп знакова/Таи (TIS-620)"
 

-#: src/mainwindow.c:593 src/messageview.c:227
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/П_реглед/С_куп знакова/Таи (Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/П_реглед/С_куп знакова/Таи (Windows-874)"
 

-#: src/mainwindow.c:601 src/summaryview.c:448
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/П_реглед/Прикажи поруку у _новом прозору"
 
 msgid "/_View/Open in new _window"
 msgstr "/П_реглед/Прикажи поруку у _новом прозору"
 

-#: src/mainwindow.c:602 src/messageview.c:235
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/П_реглед/Прикажи и_звор поруке у новом прозору"
 
 msgid "/_View/Mess_age source"
 msgstr "/П_реглед/Прикажи и_звор поруке у новом прозору"
 

-#: src/mainwindow.c:603
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/П_реглед/Прикажи комплетно за_главље поруке"
 
 msgid "/_View/Show all _headers"
 msgstr "/П_реглед/Прикажи комплетно за_главље поруке"
 

-#: src/mainwindow.c:605
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/П_реглед/_Освежи листу порука"
 
 msgid "/_View/_Update summary"
 msgstr "/П_реглед/_Освежи листу порука"
 

-#: src/mainwindow.c:608
-msgid "/_Message/Get new ma_il"
-msgstr "/_Порука/Преузми но_ву пошту"
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/_Порука/Преу_зимање"
+
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/_Порука/Преу_зимање/Преузми са _активног налога"
+
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/_Порука/Преу_зимање/Преузми са одабрани_х налога"

 
 

-#: src/mainwindow.c:609
-msgid "/_Message/Get from _all accounts"
-msgstr "/_Порука/Преузми са одабрани_х налога"
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/_Порука/Преу_зимање/О_бустави преузимање"

 
 

-#: src/mainwindow.c:611
-msgid "/_Message/Cancel receivin_g"
-msgstr "/_Ð\9fоÑ\80Ñ\83ка/Ð\9e_бÑ\83Ñ\81Ñ\82ави пÑ\80еÑ\83зимаÑ\9aе"
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/_Ð\9fоÑ\80Ñ\83ка/Ð\9fÑ\80еÑ\83_зимаÑ\9aе/---"

 
 

-#: src/mainwindow.c:613
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/_Порука/Пошаљи припр_емљене поруке"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/_Порука/Пошаљи припр_емљене поруке"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/_Порука/Креирај поруку _е-поште"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/_Порука/Креирај поруку _е-поште"
 

-#: src/mainwindow.c:616
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgstr "/_Порука/Креирај поруку за _дискусиону групу"
 
 msgid "/_Message/Compose a news message"
 msgstr "/_Порука/Креирај поруку за _дискусиону групу"
 

-#: src/mainwindow.c:617 src/messageview.c:242
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/_Порука/О_дговори"
 
 msgid "/_Message/_Reply"
 msgstr "/_Порука/О_дговори"
 

-#: src/mainwindow.c:618
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgstr "/_Порука/Одговори_..."
 
 msgid "/_Message/Repl_y to"
 msgstr "/_Порука/Одговори_..."
 

-#: src/mainwindow.c:619 src/messageview.c:243
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Порука/Одговори_.../_Свима"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/_Порука/Одговори_.../_Свима"
 

-#: src/mainwindow.c:620 src/messageview.c:245
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Порука/Одговори_.../_Пошиљаоцу"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Порука/Одговори_.../_Пошиљаоцу"
 

-#: src/mainwindow.c:621 src/messageview.c:247
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Порука/Одговори_.../На _дописно друштво"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/_Порука/Одговори_.../На _дописно друштво"
 

-#: src/mainwindow.c:623
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Порука/Нас_тави-на и одговори"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/_Порука/Нас_тави-на и одговори"
 

-#: src/mainwindow.c:625 src/messageview.c:250
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/_Порука/Прос_леди"
 
 msgid "/_Message/_Forward"
 msgstr "/_Порука/Прос_леди"
 

-#: src/mainwindow.c:626
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/_Порука/Пре_усмери"
 
 msgid "/_Message/Redirect"
 msgstr "/_Порука/Пре_усмери"
 

-#: src/mainwindow.c:628 src/messageview.c:255
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/_Порука/Поново и_змени"
 
 msgid "/_Message/Re-_edit"
 msgstr "/_Порука/Поново и_змени"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/_Порука/_Премести..."
 
 msgid "/_Message/M_ove..."
 msgstr "/_Порука/_Премести..."
 

-#: src/mainwindow.c:631
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/_Порука/_Копирај..."
 
 msgid "/_Message/_Copy..."
 msgstr "/_Порука/_Копирај..."
 

-#: src/mainwindow.c:632
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/_Порука/_Уклони"
 
 msgid "/_Message/_Delete"
 msgstr "/_Порука/_Уклони"
 

-#: src/mainwindow.c:633
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/_Порука/Укини поруку на диск_усионој групи"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/_Порука/Укини поруку на диск_усионој групи"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/_Порука/_Обележавање"
 
 msgid "/_Message/_Mark"
 msgstr "/_Порука/_Обележавање"
 

-#: src/mainwindow.c:636
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Порука/_Обележавање/Пос_тави маркицу"
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/_Порука/_Обележавање/Пос_тави маркицу"
 

-#: src/mainwindow.c:637
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Порука/_Обележавање/_Уклони маркицу"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/_Порука/_Обележавање/_Уклони маркицу"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/_Порука/_Обележавање/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/_Порука/_Обележавање/---"
 

-#: src/mainwindow.c:639
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Порука/_Обележавање/Обележи као _непрочитано"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/_Порука/_Обележавање/Обележи као _непрочитано"
 

-#: src/mainwindow.c:640
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Порука/_Обележавање/Обележи као _прочитано"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/_Порука/_Обележавање/Обележи као _прочитано"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Порука/_Обележавање/Обележи све као прочита_не"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/_Порука/_Обележавање/Обележи све као прочита_не"
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/_Алати/_Адресар..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/_Алати/_Адресар..."
 

-#: src/mainwindow.c:646 src/messageview.c:259
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Алати/_Додај пошиљаоца у адресар"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/_Алати/_Додај пошиљаоца у адресар"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Алати/Сакупљање адрес_а"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/_Алати/Сакупљање адрес_а"
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Алати/Сакупљање адрес_/Из одабраног _директоријума..."
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/_Алати/Сакупљање адрес_/Из одабраног _директоријума..."
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Алати/Сакупљање адрес_а/Из одабраних _порука..."
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/_Алати/Сакупљање адрес_а/Из одабраних _порука..."
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/_Алати/_Филтрирај поруке"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/_Алати/_Филтрирај поруке"
 

-#: src/mainwindow.c:655 src/messageview.c:262
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgid "/_Tools/_Create filter rule"

-msgstr "/_Ð\90лаÑ\82и/_Ð\9aÑ\80еиÑ\80аÑ\98 Ñ\84илÑ\82еÑ\80 пÑ\80авило"
+msgstr "/_Ð\90лаÑ\82и/_Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила Ñ\84илÑ\82еÑ\80а"

 
 

-#: src/mainwindow.c:656 src/messageview.c:264
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgid "/_Tools/_Create filter rule/_Automatically"

-msgstr "/_Ð\90лаÑ\82и/_Ð\9aÑ\80еиÑ\80аÑ\98 Ñ\84илÑ\82еÑ\80 пÑ\80авило/_Аутоматски"
+msgstr "/_Ð\90лаÑ\82и/_Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила Ñ\84илÑ\82еÑ\80а/_Аутоматски"

 
 

-#: src/mainwindow.c:658 src/messageview.c:266
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgid "/_Tools/_Create filter rule/by _From"

-msgstr "/_Ð\90лаÑ\82и/_Ð\9aÑ\80еиÑ\80аÑ\98 Ñ\84илÑ\82еÑ\80 пÑ\80авило/по _пошиљаоцу"
+msgstr "/_Ð\90лаÑ\82и/_Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила Ñ\84илÑ\82еÑ\80а/по _пошиљаоцу"

 
 

-#: src/mainwindow.c:660 src/messageview.c:268
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgid "/_Tools/_Create filter rule/by _To"

-msgstr "/_Ð\90лаÑ\82и/_Ð\9aÑ\80еиÑ\80аÑ\98 Ñ\84илÑ\82еÑ\80 пÑ\80авило/по п_римаоцу"
+msgstr "/_Ð\90лаÑ\82и/_Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила Ñ\84илÑ\82еÑ\80а/по п_римаоцу"

 
 

-#: src/mainwindow.c:662 src/messageview.c:270
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgid "/_Tools/_Create filter rule/by _Subject"

-msgstr "/_Ð\90лаÑ\82и/_Ð\9aÑ\80еиÑ\80аÑ\98 Ñ\84илÑ\82еÑ\80 пÑ\80авило/по _теми"
+msgstr "/_Ð\90лаÑ\82и/_Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила Ñ\84илÑ\82еÑ\80а/по _теми"

 
 

-#: src/mainwindow.c:667
+#: src/mainwindow.c:689
+msgid "/_Tools/_Create processing rule"
+msgstr "/_Алати/_Прављење правила за обраду"
+
+#: src/mainwindow.c:690
+msgid "/_Tools/_Create processing rule/_Automatically"
+msgstr "/_Алати/_Прављење правила за обраду/_Аутоматски"
+
+#: src/mainwindow.c:692
+msgid "/_Tools/_Create processing rule/by _From"
+msgstr "/_Алати/_Прављење правила за обраду/по _пошиљаоцу"
+
+#: src/mainwindow.c:694
+msgid "/_Tools/_Create processing rule/by _To"
+msgstr "/_Алати/_Прављење правила за обраду/по п_римаоцу"
+
+#: src/mainwindow.c:696
+msgid "/_Tools/_Create processing rule/by _Subject"
+msgstr "/_Алати/_Прављење правила за обраду/по _теми"
+
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Алати/_Уклони дуплиране поруке"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/_Алати/_Уклони дуплиране поруке"
 

-#: src/mainwindow.c:670
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/_Алати/_Изврши обележене акције"
 
 msgid "/_Tools/E_xecute"
 msgstr "/_Алати/_Изврши обележене акције"
 

-#: src/mainwindow.c:673
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Алати/SSL Серти_фикати..."
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/_Алати/SSL Серти_фикати..."
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/_Алати/Прозор дневника _рада"
 
 msgid "/_Tools/_Log window"
 msgstr "/_Алати/Прозор дневника _рада"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/Подеша_вање"
 
 msgid "/_Configuration"
 msgstr "/Подеша_вање"
 

-#: src/mainwindow.c:680
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/Подеша_вање/_Промена активног налога"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/Подеша_вање/_Промена активног налога"
 

-#: src/mainwindow.c:682
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Подеша_вање/Поставке ак_тивног налога..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/Подеша_вање/Поставке ак_тивног налога..."
 

-#: src/mainwindow.c:684
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/Подеша_вање/_Креирање новог налога..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/Подеша_вање/_Креирање новог налога..."
 

-#: src/mainwindow.c:686
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Подеша_вање/Уређивање _свих налога..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/Подеша_вање/Уређивање _свих налога..."
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/Подеша_вање/---"
 
 msgid "/_Configuration/---"
 msgstr "/Подеша_вање/---"
 

-#: src/mainwindow.c:689
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/Подеша_вање/_Опште поставке..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/Подеша_вање/_Опште поставке..."
 

-#: src/mainwindow.c:691
-msgid "/_Configuration/_Scoring..."
-msgstr "/Ð\9fодеÑ\88а_ваÑ\9aе/_Ð\91одоваÑ\9aе..."
+#: src/mainwindow.c:725
+msgid "/_Configuration/Pre-processing..."
+msgstr "/Ð\9fодеÑ\88а_ваÑ\9aе/_Ð\9fÑ\80едобÑ\80ада..."

 
 

-#: src/mainwindow.c:693
+#: src/mainwindow.c:727
+msgid "/_Configuration/Post-processing..."
+msgstr "/Подеша_вање/_Накнадна обрада..."
+
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/Подеша_вање/_Филтрирање..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/Подеша_вање/_Филтрирање..."
 

-#: src/mainwindow.c:695
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/Подеша_вање/_Шаблони..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/Подеша_вање/_Шаблони..."
 

-#: src/mainwindow.c:696
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/Подеша_вање/_Акције..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/Подеша_вање/_Акције..."
 

-#: src/mainwindow.c:697
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Подеша_вање/О_стале поставке..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/Подеша_вање/О_стале поставке..."
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/Подеша_вање/_Додатци..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/Подеша_вање/_Додатци..."
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/По_моћ/_Приручник (Локални)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/По_моћ/_Приручник (Локални)"
 

-#: src/mainwindow.c:702
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Помоћ/_Приручник (Силфед документација на Интернету)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/_Помоћ/_Приручник (Силфед документација на Интернету)"
 

-#: src/mainwindow.c:704
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/По_моћ/_Често Постављана Питања (Локални)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/По_моћ/_Често Постављана Питања (Локални)"
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Помоћ/_Често Постављана Питања (Силфед документација на Интернету)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/_Помоћ/_Често Постављана Питања (Силфед документација на Интернету)"
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Помоћ/Claws Често _Постављана Питања (Клавс документација)"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Помоћ/Claws Често _Постављана Питања (Клавс документација)"
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/По_моћ/---"
 
 msgid "/_Help/---"
 msgstr "/По_моћ/---"
 

-#: src/mainwindow.c:828
-msgid "Go offline"
-msgstr "Ð\9eÑ\82каÑ\87и Ñ\81е Ñ\81а мÑ\80еже"
+#: src/mainwindow.c:868
+msgid "You are online. Click the icon to go offline"
+msgstr "ТÑ\80енÑ\83Ñ\82но Ñ\81Ñ\82е повезани на мÑ\80ежÑ\83. Ð\9aликниÑ\82е на иконÑ\83 за незавиÑ\81ан Ñ\80ад"

 
 

-#: src/mainwindow.c:832
-msgid "Go online"
-msgstr "УмÑ\80ежи Ñ\81е"
+#: src/mainwindow.c:872
+msgid "You are offline. Click the icon to go online"
+msgstr "ТÑ\80енÑ\83Ñ\82но ниÑ\81Ñ\82е повезани на мÑ\80ежÑ\83. Ð\9aликниÑ\82е на иконÑ\83 за повезиваÑ\9aе"

 
 

-#: src/mainwindow.c:848
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr " Одабери налог "
 
 msgid "Select account"
 msgstr " Одабери налог "
 

-#: src/mainwindow.c:1174 src/mainwindow.c:1191 src/prefs_folder_item.c:395
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "Неименовано"
 
 msgid "Untitled"
 msgstr "Неименовано"
 

-#: src/mainwindow.c:1192
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "ништа"
 
 msgid "none"
 msgstr "ништа"
 

-#: src/mainwindow.c:1432
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Пражњење смећа"
 
 msgid "Empty trash"
 msgstr "Пражњење смећа"
 

-#: src/mainwindow.c:1433
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "Да ли заиста желите да уклоним све поруке из смећа?"
 
 msgid "Empty all messages in trash?"
 msgstr "Да ли заиста желите да уклоним све поруке из смећа?"
 

-#: src/mainwindow.c:1451
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Додавање сандучета"
 
 msgid "Add mailbox"
 msgstr "Додавање сандучета"
 

-#: src/mainwindow.c:1452
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4283,16 +4485,16 @@ msgstr ""
 "Ако унесете адресу постојећег сандучета,\n"
 "оно ће аутоматски бити скенирано."
 
 "Ако унесете адресу постојећег сандучета,\n"
 "оно ће аутоматски бити скенирано."
 

-#: src/mainwindow.c:1458
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Поштанско сандуче „%s“ већ постоји."
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "Поштанско сандуче „%s“ већ постоји."
 

-#: src/mainwindow.c:1463 src/setup.c:57
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "Поштанско сандуче"
 
 msgid "Mailbox"
 msgstr "Поштанско сандуче"
 

-#: src/mainwindow.c:1468 src/setup.c:61
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4301,24 +4503,36 @@ msgstr ""
 "Креирање сандучета није успело.\n"
 "Можда неке датотеке већ постоје, или Ви немате дозволу да пишете."
 
 "Креирање сандучета није успело.\n"
 "Можда неке датотеке већ постоје, или Ви немате дозволу да пишете."
 

-#: src/mainwindow.c:1787
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Силфед - Стабло директоријума"
 
 msgid "Sylpheed - Folder View"
 msgstr "Силфед - Стабло директоријума"
 

-#: src/mainwindow.c:1808 src/messageview.c:366
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Силфед - Приказ порука"
 
 msgid "Sylpheed - Message View"
 msgstr "Силфед - Приказ порука"
 

-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Излаз"
 
 msgid "Exit"
 msgstr "Излаз"
 

-#: src/mainwindow.c:2192
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "Излаз из програма?"
 
 msgid "Exit this program?"
 msgstr "Излаз из програма?"
 

-#: src/matcher.c:1214 src/matcher.c:1215 src/matcher.c:1216 src/matcher.c:1217
-#: src/matcher.c:1218 src/matcher.c:1219 src/matcher.c:1220 src/matcher.c:1221
+#: src/mainwindow.c:2850 src/summaryview.c:4009
+msgid "Processing rules to apply before folder rules"
+msgstr "Правило за обраду пре правила директоријума"
+
+#: src/mainwindow.c:2858
+msgid "Processing rules to apply after folder rules"
+msgstr "Правило за обраду после правила директоријума"
+
+#: src/mainwindow.c:2866 src/summaryview.c:4018
+msgid "Filtering configuration"
+msgstr "Подешавања филтера"
+
+#: src/matcher.c:1178 src/matcher.c:1179 src/matcher.c:1180 src/matcher.c:1181
+#: src/matcher.c:1182 src/matcher.c:1183 src/matcher.c:1184 src/matcher.c:1185

 msgid "(none)"
 msgstr "(ништа)"
 
 msgid "(none)"
 msgstr "(ништа)"
 


@@ -4358,27 +4572,47 @@ msgstr "Дошап сам до краја поруке. Да наставим о
 msgid "Search finished"
 msgstr "Готова претрага."
 
 msgid "Search finished"
 msgstr "Готова претрага."
 

-#: src/messageview.c:236
+#: src/messageview.c:240

 msgid "/_View/Show all _header"
 msgstr "/П_реглед/Прикажи комплетно за_главље поруке"
 
 msgid "/_View/Show all _header"
 msgstr "/П_реглед/Прикажи комплетно за_главље поруке"
 

-#: src/messageview.c:239
+#: src/messageview.c:243

 msgid "/_Message/Compose _new message"
 msgstr "/_Порука/Креирај нову поруку за _дискусиону групу"
 
 msgid "/_Message/Compose _new message"
 msgstr "/_Порука/Креирај нову поруку за _дискусиону групу"
 

-#: src/messageview.c:251
+#: src/messageview.c:255

 msgid "/_Message/For_ward as attachment"
 msgstr "/_Порука/_Проследи као прилог"
 
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Порука/_Проследи као прилог"
 

-#: src/messageview.c:253
+#: src/messageview.c:257

 msgid "/_Message/Redirec_t"
 msgstr "/_Порука/Пре_усмери"
 
 msgid "/_Message/Redirec_t"
 msgstr "/_Порука/Пре_усмери"
 

-#: src/messageview.c:464
+#: src/messageview.c:276
+msgid "/_Tools/Create processing rule/"
+msgstr "/_Алати/_Прављење правила за обраду/"
+
+#: src/messageview.c:278
+msgid "/_Tools/Create processing rule/_Automatically"
+msgstr "/_Алати/_Прављење правила за обраду/_Аутоматски"
+
+#: src/messageview.c:280
+msgid "/_Tools/Create processing rule/by _From"
+msgstr "/_Алати/_Прављење правила за обраду/по _Пошиљаоцу"
+
+#: src/messageview.c:282
+msgid "/_Tools/Create processing rule/by _To"
+msgstr "/_Алати/_Прављење правила за обраду/по П_римаоцу"
+
+#: src/messageview.c:284
+msgid "/_Tools/Create processing rule/by _Subject"
+msgstr "/_Алати/_Прављење правила за обраду/по _Теми"
+
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<Нема Повратне-Путање>"
 
 msgid "<No Return-Path found>"
 msgstr "<Нема Повратне-Путање>"
 

-#: src/messageview.c:472
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4393,11 +4627,11 @@ msgstr ""
 "Повратна путања: %s\n"
 "Препоручљиво је да не шаљете обавештење о приспећу поруке."
 
 "Повратна путања: %s\n"
 "Препоручљиво је да не шаљете обавештење о приспећу поруке."
 

-#: src/messageview.c:480
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+Одустани од слања"
 
 msgid "+Don't Send"
 msgstr "+Одустани од слања"
 

-#: src/messageview.c:490
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4409,39 +4643,39 @@ msgstr ""
 "она није званично послата Вама.\n"
 "Слање обавештења о приспећу поруке је обустављено."
 
 "она није званично послата Вама.\n"
 "Слање обавештења о приспећу поруке је обустављено."
 

-#: src/messageview.c:883 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3423
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "Сачувај као"
 
 msgid "Save as"
 msgstr "Сачувај као"
 

-#: src/messageview.c:888 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3428
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "Препиши"
 
 msgid "Overwrite"
 msgstr "Препиши"
 

-#: src/messageview.c:889
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "Да ли желите да се препише постојећа датотека?"
 
 msgid "Overwrite existing file?"
 msgstr "Да ли желите да се препише постојећа датотека?"
 

-#: src/messageview.c:896 src/summaryview.c:3436 src/summaryview.c:3440
-#: src/summaryview.c:3457
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не могу да сачувам датотеку „%s“."
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не могу да сачувам датотеку „%s“."
 

-#: src/messageview.c:961
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "У овој поруци се захтева потврда пријема"
 
 msgid "This message asks for a return receipt"
 msgstr "У овој поруци се захтева потврда пријема"
 

-#: src/messageview.c:962
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "Пошаљи потврду"
 
 msgid "Send receipt"
 msgstr "Пошаљи потврду"
 

-#: src/messageview.c:1015
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "Пошаљи обавештење о пријему поруке"
 
 msgid "Return Receipt Notification"
 msgstr "Пошаљи обавештење о пријему поруке"
 

-#: src/messageview.c:1016
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4450,20 +4684,19 @@ msgstr ""
 "Порука је послата на више Ваших налога.\n"
 "Одаберите са ког ће се налога послати обавештење о пријему поруке:"
 
 "Порука је послата на више Ваших налога.\n"
 "Одаберите са ког ће се налога послати обавештење о пријему поруке:"
 

-#: src/messageview.c:1020
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "Пошаљи обавештење"
 
 msgid "Send Notification"
 msgstr "Пошаљи обавештење"
 

-#: src/messageview.c:1020
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+Поништи"
 
 msgid "+Cancel"
 msgstr "+Поништи"
 

-#: src/messageview.c:1074 src/prefs_common.c:2359 src/summaryview.c:3475
-#: src/toolbar.c:168
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "Штампање"
 
 msgid "Print"
 msgstr "Штампање"
 

-#: src/messageview.c:1075 src/summaryview.c:3476
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4472,7 +4705,7 @@ msgstr ""
 "Унесите команду за штампање:\n"
 "(„%s“ ће бити замењено називом датотеке)"
 
 "Унесите команду за штампање:\n"
 "(„%s“ ће бити замењено називом датотеке)"
 

-#: src/messageview.c:1081 src/summaryview.c:3482
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4481,7 +4714,12 @@ msgstr ""
 "Команда за штампање је неисправна:\n"
 "„%s“"
 
 "Команда за штампање је неисправна:\n"
 "„%s“"
 

-#: src/mimeview.c:149
+#: src/mh.c:360
+#, c-format
+msgid "can't copy message %s to %s\n"
+msgstr "не могу да копирам поруку %s у %s\n"
+
+#: src/mimeview.c:149

 msgid "/_Open"
 msgstr "/_Отвори"
 
 msgid "/_Open"
 msgstr "/_Отвори"
 


@@ -4493,7 +4731,7 @@ msgstr "/Отвори _са..."
 msgid "/_Display as text"
 msgstr "/_Прикажи као текст"
 
 msgid "/_Display as text"
 msgstr "/_Прикажи као текст"
 

-#: src/mimeview.c:152 src/summaryview.c:453
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/_Сачувај као..."
 
 msgid "/_Save as..."
 msgstr "/_Сачувај као..."
 


@@ -4505,15 +4743,15 @@ msgstr "/Сачувај с_ве..."
 msgid "MIME Type"
 msgstr "MIME тип"
 
 msgid "MIME Type"
 msgstr "MIME тип"
 

-#: src/mimeview.c:634
+#: src/mimeview.c:636

 msgid "Check"
 msgstr "Провери"
 
 msgid "Check"
 msgstr "Провери"
 

-#: src/mimeview.c:639 src/mimeview.c:644 src/mimeview.c:649
+#: src/mimeview.c:641 src/mimeview.c:646 src/mimeview.c:651

 msgid "Full info"
 msgstr "Комплетна информација"
 
 msgid "Full info"
 msgstr "Комплетна информација"
 

-#: src/mimeview.c:654
+#: src/mimeview.c:656

 msgid "Check again"
 msgstr "Поново провери"
 
 msgid "Check again"
 msgstr "Поново провери"
 


@@ -4545,53 +4783,53 @@ msgstr ""
 "Унесите команду којом ће се отворити датотека:\n"
 "(„%s“ ће бити преправљено називом датотеке)"
 
 "Унесите команду којом ће се отворити датотека:\n"
 "(„%s“ ће бити преправљено називом датотеке)"
 

-#: src/news.c:209
+#: src/news.c:226

 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Успостављам NNTP конекције са %s:%d ...\n"
 
 #, c-format
 msgid "creating NNTP connection to %s:%d ...\n"
 msgstr "Успостављам NNTP конекције са %s:%d ...\n"
 

-#: src/news.c:787
+#: src/news.c:807

 #, c-format
 msgid "can't set group: %s\n"
 msgstr "не могу да поставим групу: %s\n"
 
 #, c-format
 msgid "can't set group: %s\n"
 msgstr "не могу да поставим групу: %s\n"
 

-#: src/news.c:797
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неисправан опсег порука: %d - %d\n"
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr "неисправан опсег порука: %d - %d\n"
 

-#: src/news.c:818
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "настала је грешка при прузимању %s.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "настала је грешка при прузимању %s.\n"
 

-#: src/news.c:835
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "преузимам XOVER %d у %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "преузимам XOVER %d у %s...\n"
 

-#: src/news.c:838 src/news.c:907
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "не могу да преузмем резултат команде XOVER\n"
 
 msgid "can't get xover\n"
 msgstr "не могу да преузмем резултат команде XOVER\n"
 

-#: src/news.c:843 src/news.c:913
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "настала је грешка при преузимању резултата команде XOVER.\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "настала је грешка при преузимању резултата команде XOVER.\n"
 

-#: src/news.c:849 src/news.c:926
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "неисправна линија резултата команде XOVER: %s\n"
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr "неисправна линија резултата команде XOVER: %s\n"
 

-#: src/news.c:863 src/news.c:877 src/news.c:944 src/news.c:974
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "не могу да преузмем резултат команде XHDR\n"
 
 msgid "can't get xhdr\n"
 msgstr "не могу да преузмем резултат команде XHDR\n"
 

-#: src/news.c:868 src/news.c:882 src/news.c:952 src/news.c:982
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "настала је грешка при преузимању резултата команде XHDR.\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "настала је грешка при преузимању резултата команде XHDR.\n"
 

-#: src/news.c:904
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "преузимам XOVER %d - %d у %s...\n"
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr "преузимам XOVER %d - %d у %s...\n"


@@ -4625,14 +4863,18 @@ msgstr ""
 "Лоша лозинка! Покушајте поново...\n"
 "\n"
 
 "Лоша лозинка! Покушајте поново...\n"
 "\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: проверавам поруке..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr "Clam АнтиВирус"
 
 msgid "Clam AntiVirus"
 msgstr "Clam АнтиВирус"
 

-#: src/plugins/clamav/clamav_plugin.c:229
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 msgid ""

-"This plugin uses Clam AntiVirus to scan all message attachments that are "
-"received from a POP account.\n"
+"This plugin uses Clam AntiVirus to scan all messages that are received from "
+"an IMAP, LOCAL or POP account.\n"

 "\n"
 "When a message attachment is found to contain a virus it can be deleted or "
 "saved in a specially designated folder.\n"
 "\n"
 "When a message attachment is found to contain a virus it can be deleted or "
 "saved in a specially designated folder.\n"


@@ -4641,16 +4883,15 @@ msgid ""
 "moving the message. You probably want to load the Gtk+ User Interface plugin "
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "moving the message. You probably want to load the Gtk+ User Interface plugin "
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""

-"Овај додатак користи Clam АнтиВирус за проверу прилога свих порука које се "
-"преузимају са POP налога.\n"
+"Овај додатак користи Clam АнтиВирус за проверу свих порука које се "
+"преузимају са ИМАП, локалноих или POP налога.\n"

 "\n"
 "\n"

-"Ð\9aада Ñ\81е Ñ\83 поÑ\80Ñ\83Ñ\86и оÑ\82кÑ\80иÑ\98е инÑ\84иÑ\86иÑ\80ани пÑ\80илог, Ñ\82.Ñ\98. да Ñ\81адÑ\80жи виÑ\80Ñ\83Ñ\81, може бити "
-"Ñ\83клоÑ\9aена или Ñ\81аÑ\87Ñ\83вана Ñ\83 Ñ\81пеÑ\86иÑ\98ално деÑ\84иниÑ\81ном директоријуму.\n"
+"Ð\9aада Ñ\81е Ñ\83 поÑ\80Ñ\83Ñ\86и оÑ\82кÑ\80иÑ\98е пÑ\80илог заÑ\80ажен виÑ\80Ñ\83Ñ\81ом, иÑ\81Ñ\82а може бити "
+"Ñ\83клоÑ\9aена или Ñ\81аÑ\87Ñ\83вана Ñ\83 Ñ\81пеÑ\86иÑ\98ално одÑ\80еÑ\92еном директоријуму.\n"

 "\n"
 "Овај додатак садржи само основне функције за проверу и уклањање или "
 "\n"
 "Овај додатак садржи само основне функције за проверу и уклањање или "

-"премештање порука. Вероватно ћете желети да користите и додатак за Гтк+ "
-"Корисничко Сучеље, у супротном ћете морати ручно да саставите конфигурациона "
-"правила овог додатка.\n"
+"премештање заражених порука. Вероватно ћете користити додатак за Гтк+ "
+"Корисничко сучеље или ћете ручно поставити подешавања додатка.\n"

 
 #: src/plugins/clamav/clamav_plugin_gtk.c:93
 msgid "Enable virus scanning"
 
 #: src/plugins/clamav/clamav_plugin_gtk.c:93
 msgid "Enable virus scanning"


@@ -4757,11 +4998,11 @@ msgstr "Дило HTML прегледник"
 msgid "This plugin renders HTML mail using the Dillo web browser."
 msgstr "Овај додатак приказује HTML поруке користећи Дило Веб претраживач."
 
 msgid "This plugin renders HTML mail using the Dillo web browser."
 msgstr "Овај додатак приказује HTML поруке користећи Дило Веб претраживач."
 

-#: src/plugins/image_viewer/plugin.c:56
+#: src/plugins/image_viewer/plugin.c:58

 msgid "Image Viewer"
 msgstr "Прегледник слика"
 
 msgid "Image Viewer"
 msgstr "Прегледник слика"
 

-#: src/plugins/image_viewer/plugin.c:61
+#: src/plugins/image_viewer/plugin.c:63

 msgid "This plugin uses either gdk-pixbuf or imlib to display attached images."
 msgstr "Овај додатак користи gdk-pixbuf или imlib за приказ приложених слика."
 
 msgid "This plugin uses either gdk-pixbuf or imlib to display attached images."
 msgstr "Овај додатак користи gdk-pixbuf или imlib за приказ приложених слика."
 


@@ -4805,15 +5046,19 @@ msgstr ""
 "Овај додатак користи GtkMathView алат за приказивање MathML прилога (Content-"
 "Type: text/mathml)"
 
 "Овај додатак користи GtkMathView алат за приказивање MathML прилога (Content-"
 "Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: филтрирање порука..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 

-#: src/plugins/spamassassin/spamassassin.c:314
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 msgid ""

-"This plugin checks all messages that are received from a POP account for "
-"spam using a SpamAssassin server. You will need a SpamAssassin Server "
-"(spamd) running somewhere.\n"
+"This plugin checks all messages that are received from an IMAP, LOCAL or POP "
+"account for spam using a SpamAssassin server. You will need a SpamAssassin "
+"Server (spamd) running somewhere.\n"

 "\n"
 "When a message is identified as spam it can be deleted or saved into a "
 "special folder.\n"
 "\n"
 "When a message is identified as spam it can be deleted or saved into a "
 "special folder.\n"


@@ -4822,16 +5067,16 @@ msgid ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "moving the message. You probably want to load a User Interface plugin too, "
 "otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""

-"Овај додатак проверава све поруке које се преузимају са POP налога и "
-"деÑ\82екÑ\82Ñ\83Ñ\98е нежељену пошту користећи SpamAssassin сервер. Биће Вам потребан "
+"Овај додатак проверава све поруке које се преузимају са ИМАП, локалних или POP "
+"налога, оÑ\82кÑ\80иваÑ\98Ñ\83Ñ\9bи нежељену пошту користећи SpamAssassin сервер. Биће Вам потребан "

 "већ покренут SpamAssassin сервер (spamd).\n"
 "\n"
 "већ покренут SpamAssassin сервер (spamd).\n"
 "\n"

-"Када се порука идентификује као нежељена, може бити уклоњена или сачувана у "
+"Када се пронађе нежељена порука, иста може бити уклоњена или сачувана у "

 "посебном директоријуму.\n"
 "\n"
 "Овај додатак садржи само основне функције за филтрирање и уклањање или "
 "посебном директоријуму.\n"
 "\n"
 "Овај додатак садржи само основне функције за филтрирање и уклањање или "

-"премештање нежељених порука. Вероватно ћете користити додатак са Корисничким "
-"СÑ\83Ñ\87еÑ\99ем, Ñ\83 Ñ\81Ñ\83пÑ\80оÑ\82ном Ñ\9bеÑ\82е моÑ\80аÑ\82и Ñ\80Ñ\83Ñ\87но да деÑ\84иниÑ\88еÑ\82е конÑ\84игÑ\83Ñ\80аÑ\86иÑ\98Ñ\83 додатка.\n"
+"премештање нежељених порука. Вероватно ћете користити додатак за Гтк+ "
+"Ð\9aоÑ\80иÑ\81ниÑ\87ко Ñ\81Ñ\83Ñ\87еÑ\99ем или Ñ\9bеÑ\82е Ñ\80Ñ\83Ñ\87но поÑ\81Ñ\82авиÑ\82и подеÑ\88аваÑ\9aа додатка.\n"

 
 #: src/plugins/spamassassin/spamassassin_gtk.c:76
 msgid "Disabled"
 
 #: src/plugins/spamassassin/spamassassin_gtk.c:76
 msgid "Disabled"


@@ -5014,217 +5259,221 @@ msgstr "команда није подржана\n"
 msgid "error occurred on POP3 session\n"
 msgstr "настала је грешка у POP3 сесији\n"
 
 msgid "error occurred on POP3 session\n"
 msgstr "настала је грешка у POP3 сесији\n"
 

-#: src/prefs_account.c:691
+#: src/prefs_account.c:692

 #, c-format
 msgid "Account%d"
 msgstr "Налог%d"
 
 #, c-format
 msgid "Account%d"
 msgstr "Налог%d"
 

-#: src/prefs_account.c:710
+#: src/prefs_account.c:711

 msgid "Preferences for new account"
 msgstr "Подешавања новог налога"
 
 msgid "Preferences for new account"
 msgstr "Подешавања новог налога"
 

-#: src/prefs_account.c:715
+#: src/prefs_account.c:716

 msgid "Account preferences"
 msgstr "Подешавања налога"
 
 msgid "Account preferences"
 msgstr "Подешавања налога"
 

-#: src/prefs_account.c:765 src/prefs_common.c:973
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "Преузимање"
 
 msgid "Receive"
 msgstr "Преузимање"
 

-#: src/prefs_account.c:769 src/prefs_common.c:977 src/prefs_folder_item.c:563
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "Креирање"
 
 msgid "Compose"
 msgstr "Креирање"
 

-#: src/prefs_account.c:772 src/prefs_common.c:986
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Приватност"
 
 msgid "Privacy"
 msgstr "Приватност"
 

-#: src/prefs_account.c:776
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:779
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "Напредно"
 
 msgid "Advanced"
 msgstr "Напредно"
 

-#: src/prefs_account.c:858
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "Назив налога"
 
 msgid "Name of account"
 msgstr "Назив налога"
 

-#: src/prefs_account.c:867
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "Подразумевани налог"
 
 msgid "Set as default"
 msgstr "Подразумевани налог"
 

-#: src/prefs_account.c:871
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "Лични подаци"
 
 msgid "Personal information"
 msgstr "Лични подаци"
 

-#: src/prefs_account.c:880
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "Име и презиме"
 
 msgid "Full name"
 msgstr "Име и презиме"
 

-#: src/prefs_account.c:886
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "Адреса е-поште"
 
 msgid "Mail address"
 msgstr "Адреса е-поште"
 

-#: src/prefs_account.c:892
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "Организација"
 
 msgid "Organization"
 msgstr "Организација"
 

-#: src/prefs_account.c:916
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "Информације о серверу"
 
 msgid "Server information"
 msgstr "Информације о серверу"
 

-#: src/prefs_account.c:937
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (нормалан)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (нормалан)"
 

-#: src/prefs_account.c:939
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (АПОП идентификација)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (АПОП идентификација)"
 

-#: src/prefs_account.c:941 src/prefs_account.c:1271 src/prefs_account.c:1865
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:943
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "Дискусионе групе (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "Дискусионе групе (NNTP)"
 

-#: src/prefs_account.c:945
-msgid "None (local)"
-msgstr "Ð\9dиÑ\88Ñ\82а (локални)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "Ð\94аÑ\82оÑ\82ека локалног мбокÑ\81 Ñ\81андÑ\83Ñ\87иÑ\9bа"

 
 

-#: src/prefs_account.c:965
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "Ништа (само СМТП)"
+
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgstr "Овај сервер захтева идентификацију"
 
 msgid "This server requires authentication"
 msgstr "Овај сервер захтева идентификацију"
 

-#: src/prefs_account.c:972
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Идентификација при повезивању"
 
 msgid "Authenticate on connect"
 msgstr "Идентификација при повезивању"
 

-#: src/prefs_account.c:1017
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "Сервер за дискусионе групе"
 
 msgid "News server"
 msgstr "Сервер за дискусионе групе"
 

-#: src/prefs_account.c:1023
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "Сервер за преузимане порука"
 
 msgid "Server for receiving"
 msgstr "Сервер за преузимане порука"
 

-#: src/prefs_account.c:1029
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "Локални сандучић"
 
 msgid "Local mailbox"
 msgstr "Локални сандучић"
 

-#: src/prefs_account.c:1036
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "SMTP сервер (слање)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP сервер (слање)"
 

-#: src/prefs_account.c:1044
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "Користи mail команду уместо SMTP сервера"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "Користи mail команду уместо SMTP сервера"
 

-#: src/prefs_account.c:1053
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "Команда за слање порука"
 
 msgid "command to send mails"
 msgstr "Команда за слање порука"
 

-#: src/prefs_account.c:1060 src/prefs_account.c:1434
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Корисничко име"
 
 msgid "User ID"
 msgstr "Корисничко име"
 

-#: src/prefs_account.c:1066 src/prefs_account.c:1443
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "Лозинка"
 
 msgid "Password"
 msgstr "Лозинка"
 

-#: src/prefs_account.c:1142 src/prefs_account.c:1848
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1150
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "Уклони поруке са сервера при преузимању"
 
 msgid "Remove messages on server when received"
 msgstr "Уклони поруке са сервера при преузимању"
 

-#: src/prefs_account.c:1161
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "Уклони након"
 
 msgid "Remove after"
 msgstr "Уклони након"
 

-#: src/prefs_account.c:1170
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "дана"
 
 msgid "days"
 msgstr "дана"
 

-#: src/prefs_account.c:1187
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 дана: уклони одмах)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 дана: уклони одмах)"
 

-#: src/prefs_account.c:1194
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "Преузми све поруке са сервера"
 
 msgid "Download all messages on server"
 msgstr "Преузми све поруке са сервера"
 

-#: src/prefs_account.c:1200
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Ограничи величину поруке за преузиање на"
 
 msgid "Receive size limit"
 msgstr "Ограничи величину поруке за преузиање на"
 

-#: src/prefs_account.c:1207
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "КБ"
 
 msgid "KB"
 msgstr "КБ"
 

-#: src/prefs_account.c:1219
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "Подразумевано сандуче"
 
 msgid "Default inbox"
 msgstr "Подразумевано сандуче"
 

-#: src/prefs_account.c:1242
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Нефилтриране поруке ће бити смештене у овај директоријум)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(Нефилтриране поруке ће бити смештене у овај директоријум)"
 

-#: src/prefs_account.c:1247
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "Максималан број порука за преузимање"
 
 msgid "Maximum number of articles to download"
 msgstr "Максималан број порука за преузимање"
 

-#: src/prefs_account.c:1266
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "неограничено ако је вредност 0"
 
 msgid "unlimited if 0 is specified"
 msgstr "неограничено ако је вредност 0"
 

-#: src/prefs_account.c:1282 src/prefs_account.c:1405
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "Метод идентификације"
 
 msgid "Authentication method"
 msgstr "Метод идентификације"
 

-#: src/prefs_account.c:1292 src/prefs_account.c:1415 src/prefs_common.c:1336
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "Аутоматски"
 
 msgid "Automatic"
 msgstr "Аутоматски"
 

-#: src/prefs_account.c:1299
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "Примени филтер при преузимању порука"
 
 msgid "Filter messages on receiving"
 msgstr "Примени филтер при преузимању порука"
 

-#: src/prefs_account.c:1303
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "„Преузми све поруке“ проверава да ли постоје нове поруке и на овом налогу"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr ""
 "„Преузми све поруке“ проверава да ли постоје нове поруке и на овом налогу"
 

-#: src/prefs_account.c:1362
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Додај датум"
 
 msgid "Add Date"
 msgstr "Додај датум"
 

-#: src/prefs_account.c:1363
-msgid "Generate Message-ID"
-msgstr "Ð\93енеÑ\80иÑ\88и Ð\98Ð\94 поÑ\80Ñ\83ке"
+#: src/prefs_account.c:1361
+msgid "Generate Message-Id"
+msgstr "Ð\93енеÑ\80иÑ\81аÑ\9aе Ð\98Ð\91 поÑ\80Ñ\83ке (Message-Id)"

 
 

-#: src/prefs_account.c:1370
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Додај кориснички дефинисана поља заглавља"
 
 msgid "Add user-defined header"
 msgstr "Додај кориснички дефинисана поља заглавља"
 

-#: src/prefs_account.c:1372 src/prefs_common.c:1895 src/prefs_common.c:1920
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " Измени... "
 
 msgid " Edit... "
 msgstr " Измени... "
 

-#: src/prefs_account.c:1382
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "Идентификација"
 
 msgid "Authentication"
 msgstr "Идентификација"
 

-#: src/prefs_account.c:1390
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP идентифкација (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP идентифкација (SMTP AUTH)"
 

-#: src/prefs_account.c:1465
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."


@@ -5232,216 +5481,216 @@ msgstr ""
 "Ако оставите ово поље непопуњено, користиће се\n"
 "исти назив корисника и лозинка као и за преузимање."
 
 "Ако оставите ово поље непопуњено, користиће се\n"
 "исти назив корисника и лозинка као и за преузимање."
 

-#: src/prefs_account.c:1474
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "Идентификација са POP3 пре слања"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "Идентификација са POP3 пре слања"
 

-#: src/prefs_account.c:1489
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgstr "Време трајања POP идентификације: "
 
 msgid "POP authentication timeout: "
 msgstr "Време трајања POP идентификације: "
 

-#: src/prefs_account.c:1498
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "минут(а)"
 
 msgid "minutes"
 msgstr "минут(а)"
 

-#: src/prefs_account.c:1545 src/prefs_account.c:1590 src/toolbar.c:419
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Потпис"
 
 msgid "Signature"
 msgstr "Потпис"
 

-#: src/prefs_account.c:1553
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "Аутоматско убацивање потписа"
 
 msgid "Insert signature automatically"
 msgstr "Аутоматско убацивање потписа"
 

-#: src/prefs_account.c:1558
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Раздвајач потписа"
 
 msgid "Signature separator"
 msgstr "Раздвајач потписа"
 

-#: src/prefs_account.c:1580
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "Резултат команде"
 
 msgid "Command output"
 msgstr "Резултат команде"
 

-#: src/prefs_account.c:1598
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "Аутоматски постави адресу за прослеђивање"
 
 msgid "Automatically set the following addresses"
 msgstr "Аутоматски постави адресу за прослеђивање"
 

-#: src/prefs_account.c:1607 src/prefs_matcher.c:143 src/prefs_matcher.c:1714
-#: src/quote_fmt.c:49
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116
+#: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49

 msgid "Cc"
 msgstr "Копија"
 
 msgid "Cc"
 msgstr "Копија"
 

-#: src/prefs_account.c:1620
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "Невидљива копија"
 
 msgid "Bcc"
 msgstr "Невидљива копија"
 

-#: src/prefs_account.c:1633
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "Одговор-За"
 
 msgid "Reply-To"
 msgstr "Одговор-За"
 

-#: src/prefs_account.c:1688
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "Шифровање поруке се подразумева"
 
 msgid "Encrypt message by default"
 msgstr "Шифровање поруке се подразумева"
 

-#: src/prefs_account.c:1690
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "Потписивање поруке се подразумева"
 
 msgid "Sign message by default"
 msgstr "Потписивање поруке се подразумева"
 

-#: src/prefs_account.c:1692
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "Подразумевани мод"
 
 msgid "Default mode"
 msgstr "Подразумевани мод"
 

-#: src/prefs_account.c:1700
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "Користи PGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "Користи PGP/MIME"
 

-#: src/prefs_account.c:1709
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "Користи линијски"
 
 msgid "Use Inline"
 msgstr "Користи линијски"
 

-#: src/prefs_account.c:1719
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr "Кључ за потпис"
 
 msgid "Sign key"
 msgstr "Кључ за потпис"
 

-#: src/prefs_account.c:1727
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "Користи подразумевани GnuPG кључ"
 
 msgid "Use default GnuPG key"
 msgstr "Користи подразумевани GnuPG кључ"
 

-#: src/prefs_account.c:1736
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "Одабери кључ по адреси е-поште"
 
 msgid "Select key by your email address"
 msgstr "Одабери кључ по адреси е-поште"
 

-#: src/prefs_account.c:1745
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "Ручни избор кључа"
 
 msgid "Specify key manually"
 msgstr "Ручни избор кључа"
 

-#: src/prefs_account.c:1761
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr "Корисник или ИД кључа:"
 
 msgid "User or key ID:"
 msgstr "Корисник или ИД кључа:"
 

-#: src/prefs_account.c:1856 src/prefs_account.c:1873 src/prefs_account.c:1889
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "Немој да користиш SSL"
 
 msgid "Don't use SSL"
 msgstr "Немој да користиш SSL"
 

-#: src/prefs_account.c:1859
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "Користи SSL за POP3 везу"
 
 msgid "Use SSL for POP3 connection"
 msgstr "Користи SSL за POP3 везу"
 

-#: src/prefs_account.c:1862 src/prefs_account.c:1879 src/prefs_account.c:1913
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "Користи STARTTLS команду за покретање SSL сесије"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Користи STARTTLS команду за покретање SSL сесије"
 

-#: src/prefs_account.c:1876
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "Користи SSL за IMAP4 везу"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "Користи SSL за IMAP4 везу"
 

-#: src/prefs_account.c:1882
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr "NNTP"
 
 msgid "NNTP"
 msgstr "NNTP"
 

-#: src/prefs_account.c:1897
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "Користи SSL за NNTP везу"
 
 msgid "Use SSL for NNTP connection"
 msgstr "Користи SSL за NNTP везу"
 

-#: src/prefs_account.c:1899
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "Слање (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "Слање (SMTP)"
 

-#: src/prefs_account.c:1907
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Немој да користиш SSL (али, уколико је неопходно, користи STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "Немој да користиш SSL (али, уколико је неопходно, користи STARTTLS)"
 

-#: src/prefs_account.c:1910
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "Користи SSL за SMTP везу"
 
 msgid "Use SSL for SMTP connection"
 msgstr "Користи SSL за SMTP везу"
 

-#: src/prefs_account.c:1921
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "Користи неблокирајући SSL"
 
 msgid "Use non-blocking SSL"
 msgstr "Користи неблокирајући SSL"
 

-#: src/prefs_account.c:1933
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Искључите ову опцију ако имате проблема са SSL конекцијама)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Искључите ову опцију ако имате проблема са SSL конекцијама)"
 

-#: src/prefs_account.c:2057
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "Посебан SMTP порт"
 
 msgid "Specify SMTP port"
 msgstr "Посебан SMTP порт"
 

-#: src/prefs_account.c:2063
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "Посебан POP3 порт"
 
 msgid "Specify POP3 port"
 msgstr "Посебан POP3 порт"
 

-#: src/prefs_account.c:2069
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "Посебан IMAP4 порт"
 
 msgid "Specify IMAP4 port"
 msgstr "Посебан IMAP4 порт"
 

-#: src/prefs_account.c:2075
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "Посебан NNTP порт"
 
 msgid "Specify NNTP port"
 msgstr "Посебан NNTP порт"
 

-#: src/prefs_account.c:2080
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Посебан домен"
 
 msgid "Specify domain name"
 msgstr "Посебан домен"
 

-#: src/prefs_account.c:2090
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "Користи команду за комуникацију са сервером"
 
 msgid "Use command to communicate with server"
 msgstr "Користи команду за комуникацију са сервером"
 

-#: src/prefs_account.c:2098
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "Обележи кроспостоване поруке као прочитане и обој их у:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "Обележи кроспостоване поруке као прочитане и обој их у:"
 

-#: src/prefs_account.c:2112
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "IMAP сервер директоријум"
 
 msgid "IMAP server directory"
 msgstr "IMAP сервер директоријум"
 

-#: src/prefs_account.c:2166
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "Смести послате поруке у"
 
 msgid "Put sent messages in"
 msgstr "Смести послате поруке у"
 

-#: src/prefs_account.c:2168
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "Смести недовршене поруке у"
 
 msgid "Put draft messages in"
 msgstr "Смести недовршене поруке у"
 

-#: src/prefs_account.c:2170
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "Смести уклоњене поруке у"
 
 msgid "Put deleted messages in"
 msgstr "Смести уклоњене поруке у"
 

-#: src/prefs_account.c:2234
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "НИсте унели назив налога."
 
 msgid "Account name is not entered."
 msgstr "НИсте унели назив налога."
 

-#: src/prefs_account.c:2238
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "Нисте унели адресу е-поште."
 
 msgid "Mail address is not entered."
 msgstr "Нисте унели адресу е-поште."
 

-#: src/prefs_account.c:2243
+#: src/prefs_account.c:2244

 msgid "SMTP server is not entered."
 msgstr "Нисте унели SMTP сервер."
 
 msgid "SMTP server is not entered."
 msgstr "Нисте унели SMTP сервер."
 

-#: src/prefs_account.c:2248
+#: src/prefs_account.c:2249

 msgid "User ID is not entered."
 msgstr "Нисте унели корисничко име."
 
 msgid "User ID is not entered."
 msgstr "Нисте унели корисничко име."
 

-#: src/prefs_account.c:2253
+#: src/prefs_account.c:2254

 msgid "POP3 server is not entered."
 msgstr "Нисте унели POP3 сервер."
 
 msgid "POP3 server is not entered."
 msgstr "Нисте унели POP3 сервер."
 

-#: src/prefs_account.c:2258
+#: src/prefs_account.c:2259

 msgid "IMAP4 server is not entered."
 msgstr "Нисте унели IMAP4 сервер."
 
 msgid "IMAP4 server is not entered."
 msgstr "Нисте унели IMAP4 сервер."
 

-#: src/prefs_account.c:2263
+#: src/prefs_account.c:2264

 msgid "NNTP server is not entered."
 msgstr "Нисте унели NNTP сервер."
 
 msgid "NNTP server is not entered."
 msgstr "Нисте унели NNTP сервер."
 

-#: src/prefs_account.c:2269
+#: src/prefs_account.c:2270

 msgid "local mailbox filename is not entered."
 msgstr "Нисте унели назив датотеке локалног сандучета."
 
 msgid "local mailbox filename is not entered."
 msgstr "Нисте унели назив датотеке локалног сандучета."
 

-#: src/prefs_account.c:2275
+#: src/prefs_account.c:2276

 msgid "mail command is not entered."
 msgstr "Нисте унели команду за слање порука."
 
 msgid "mail command is not entered."
 msgstr "Нисте унели команду за слање порука."
 

-#: src/prefs_account.c:2359
+#: src/prefs_account.c:2360

 msgid ""
 "Its not recommended to use the old style Inline\n"
 "mode for GnuPG messages. It doesn't comply with\n"
 msgid ""
 "Its not recommended to use the old style Inline\n"
 "mode for GnuPG messages. It doesn't comply with\n"


@@ -5475,9 +5724,10 @@ msgstr " Синтаксна помоћ "
 msgid "Current actions"
 msgstr "Постојеће акције"
 
 msgid "Current actions"
 msgstr "Постојеће акције"
 

-#: src/prefs_actions.c:382 src/prefs_filtering.c:591 src/prefs_filtering.c:651
-#: src/prefs_filtering.c:673 src/prefs_matcher.c:687 src/prefs_matcher.c:777
-#: src/prefs_scoring.c:444 src/prefs_scoring.c:475 src/prefs_template.c:309
+#: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687
+#: src/prefs_matcher.c:777 src/prefs_template.c:309

 msgid "(New)"
 msgstr "(ново)"
 
 msgid "(New)"
 msgstr "(ново)"
 


@@ -5520,174 +5770,175 @@ msgstr "Уклони акцију"
 msgid "Do you really want to delete this action?"
 msgstr "Да ли заиста желите да уклоните акцију?"
 
 msgid "Do you really want to delete this action?"
 msgstr "Да ли заиста желите да уклоните акцију?"
 

-#: src/prefs_actions.c:638
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "Назив менија:"
 
 msgid "MENU NAME:"
 msgstr "Назив менија:"
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr ""
 "Користите обрнуту косу црту „/“ у називу менија за формирање подменија."
 
 msgid "Use / in menu name to make submenus."
 msgstr ""
 "Користите обрнуту косу црту „/“ у називу менија за формирање подменија."
 

-#: src/prefs_actions.c:641
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "Командна линија:"
 
 msgid "COMMAND LINE:"
 msgstr "Командна линија:"
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "Почиње са:"
 
 msgid "Begin with:"
 msgstr "Почиње са:"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr "за слање тела поруке или одабраног текста стандардном улазу команде"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "за слање тела поруке или одабраног текста стандардном улазу команде"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "за слање кориснички дефинисаног текста стандардном улазу команде"
 
 msgid "to send user provided text to command's standard input"
 msgstr "за слање кориснички дефинисаног текста стандардном улазу команде"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "за слање скривеног кориснички дефинисаног текста стандардном улазу команде"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr ""
 "за слање скривеног кориснички дефинисаног текста стандардном улазу команде"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "Завршава се са:"
 
 msgid "End with:"
 msgstr "Завршава се са:"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgstr "за замену тела поруке или одабраног текста стандардним излазом команде"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr "за замену тела поруке или одабраног текста стандардним излазом команде"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr "за уметање стандардног излаза команде без преписивања старог текста"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "за уметање стандардног излаза команде без преписивања старог текста"
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "за асинхорно покретање команде"
 
 msgid "to run command asynchronously"
 msgstr "за асинхорно покретање команде"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "Користите:"
 
 msgid "Use:"
 msgstr "Користите:"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "за датотеку одабране поруке у RFC822/2822 формату"
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "за датотеку одабране поруке у RFC822/2822 формату"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:671

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "за листу датотека одабраних порука у RFC822/2822 формату"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "за листу датотека одабраних порука у RFC822/2822 формату"
 

-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "за датотеку одабраног декодованог MIME дела поруке"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "за датотеку одабраног декодованог MIME дела поруке"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "за кориснички прослеђен аргумент"
 
 msgid "for a user provided argument"
 msgstr "за кориснички прослеђен аргумент"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "за кориснички прослеђен скривени аргумент (нпр. лозинку)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "за кориснички прослеђен скривени аргумент (нпр. лозинку)"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "за одабрани део текста"
 
 msgid "for the text selection"
 msgstr "за одабрани део текста"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "примени акције филтрирања између {} за одабране поруке"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "примени акције филтрирања између {} за одабране поруке"
 

-#: src/prefs_actions.c:665 src/quote_fmt.c:75
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131
+#: src/quote_fmt.c:75

 msgid "Description of symbols"
 msgstr "Опис симбола"
 
 msgid "Description of symbols"
 msgstr "Опис симбола"
 

-#: src/prefs_common.c:956
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Општа подешавања"
 
 msgid "Common Preferences"
 msgstr "Општа подешавања"
 

-#: src/prefs_common.c:979
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "Цитирање"
 
 msgid "Quote"
 msgstr "Цитирање"
 

-#: src/prefs_common.c:981
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "Приказ"
 
 msgid "Display"
 msgstr "Приказ"
 

-#: src/prefs_common.c:983
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Порука"
 
 msgid "Message"
 msgstr "Порука"
 

-#: src/prefs_common.c:991 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "Остало"
 
 msgid "Other"
 msgstr "Остало"
 

-#: src/prefs_common.c:1037
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Екстерни програм"
 
 msgid "External program"
 msgstr "Екстерни програм"
 

-#: src/prefs_common.c:1046
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "Користи екстерни програм за увоз"
 
 msgid "Use external program for incorporation"
 msgstr "Користи екстерни програм за увоз"
 

-#: src/prefs_common.c:1053
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "Команда"
 
 msgid "Command"
 msgstr "Команда"
 

-#: src/prefs_common.c:1077
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "Аутоматска провера налога"
 
 msgid "Auto-check new mail"
 msgstr "Аутоматска провера налога"
 

-#: src/prefs_common.c:1079
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "сваки(х)"
 
 msgid "every"
 msgstr "сваки(х)"
 

-#: src/prefs_common.c:1091
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "минут(а)"
 
 msgid "minute(s)"
 msgstr "минут(а)"
 

-#: src/prefs_common.c:1100
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Провери налоге при покретању програма"
 
 msgid "Check new mail on startup"
 msgstr "Провери налоге при покретању програма"
 

-#: src/prefs_common.c:1102
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "Освежи садржај свих локалних директоријума након уградње"
 
 msgid "Update all local folders after incorporation"
 msgstr "Освежи садржај свих локалних директоријума након уградње"
 

-#: src/prefs_common.c:1110
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "Прикажи дијалог за преузимање порука"
 
 msgid "Show receive dialog"
 msgstr "Прикажи дијалог за преузимање порука"
 

-#: src/prefs_common.c:1120 src/prefs_common.c:1244 src/prefs_common.c:2223
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "Увек"
 
 msgid "Always"
 msgstr "Увек"
 

-#: src/prefs_common.c:1121
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "Само при ручној провери"
 
 msgid "Only on manual receiving"
 msgstr "Само при ручној провери"
 

-#: src/prefs_common.c:1123 src/prefs_common.c:1245 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "Никада"
 
 msgid "Never"
 msgstr "Никада"
 

-#: src/prefs_common.c:1131
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "Затвори дијалог за преузимање по завршетку трансфера"
 
 msgid "Close receive dialog when finished"
 msgstr "Затвори дијалог за преузимање по завршетку трансфера"
 

-#: src/prefs_common.c:1133
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "Покрени команду по преузимању нових порука"
 
 msgid "Run command when new mail arrives"
 msgstr "Покрени команду по преузимању нових порука"
 

-#: src/prefs_common.c:1143
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "након аутоматске провере"
 
 msgid "after autochecking"
 msgstr "након аутоматске провере"
 

-#: src/prefs_common.c:1145
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "након ручне провере"
 
 msgid "after manual checking"
 msgstr "након ручне провере"
 

-#: src/prefs_common.c:1159
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5696,23 +5947,23 @@ msgstr ""
 "Команда за извршење:\n"
 "(користите %d као број нових порука)"
 
 "Команда за извршење:\n"
 "(користите %d као број нових порука)"
 

-#: src/prefs_common.c:1228
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "Сачувај послате поруке у директоријум „Послато“"
 
 msgid "Save sent messages to Sent folder"
 msgstr "Сачувај послате поруке у директоријум „Послато“"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "Припреми за слање поруке које нису могле да се пошаљу"
 
 msgid "Queue messages that fail to send"
 msgstr "Припреми за слање поруке које нису могле да се пошаљу"
 

-#: src/prefs_common.c:1235
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "Прикажи дијалог за слање порука"
 
 msgid "Show send dialog"
 msgstr "Прикажи дијалог за слање порука"
 

-#: src/prefs_common.c:1253
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "Излазни кодни распоред"
 
 msgid "Outgoing codeset"
 msgstr "Излазни кодни распоред"
 

-#: src/prefs_common.c:1262
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"


@@ -5720,107 +5971,107 @@ msgstr ""
 "Ако је одабрана опција „Аутоматски“, биће коришћено оптимално кодирање "
 "тренутне системске локализације"
 
 "Ако је одабрана опција „Аутоматски“, биће коришћено оптимално кодирање "
 "тренутне системске локализације"
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "Аутоматски (препоручено)"
 
 msgid "Automatic (Recommended)"
 msgstr "Аутоматски (препоручено)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr "7бит аски (US-ASCII)"
 
 msgid "7bit ascii (US-ASCII)"
 msgstr "7бит аски (US-ASCII)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr "Јуникод (UTF-8)"
 
 msgid "Unicode (UTF-8)"
 msgstr "Јуникод (UTF-8)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропски (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Западноевропски (ISO-8859-1)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропски (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Западноевропски (ISO-8859-15)"
 

-#: src/prefs_common.c:1281
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "Централноевропски (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "Централноевропски (ISO-8859-2)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "Балтички (ISO-8859-13)"
 

-#: src/prefs_common.c:1283
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "Балтички (ISO-8859-4)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Грчки (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Грчки (ISO-8859-7)"
 

-#: src/prefs_common.c:1285
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "Турски (ISO-8859-9)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ћирилица (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "Ћирилица (ISO-8859-5)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "Ћирилица (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "Ћирилица (KOI8-R)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "Ћирилица (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "Ћирилица (Windows-1251)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "Ћирилица (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "Ћирилица (KOI8-U)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "Јапаснки (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "Јапаснки (ISO-2022-JP)"
 

-#: src/prefs_common.c:1296
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "Јапански (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "Јапански (EUC-JP)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "Јапански (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "Јапански (Shift_JIS)"
 

-#: src/prefs_common.c:1299
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "Поједностављени кинески (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "Поједностављени кинески (GB2312)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционални кинески (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "Традиционални кинески (Big5)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционални кинески (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "Традиционални кинески (EUC-TW)"
 

-#: src/prefs_common.c:1303
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "Кинески (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "Кинески (ISO-2022-CN)"
 

-#: src/prefs_common.c:1305
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "Корејски (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "Корејски (EUC-KR)"
 

-#: src/prefs_common.c:1306
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Таи (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Таи (TIS-620)"
 

-#: src/prefs_common.c:1307
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Таи (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Таи (Windows-874)"
 

-#: src/prefs_common.c:1320
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "Енкодирање при преносу"
 
 msgid "Transfer encoding"
 msgstr "Енкодирање при преносу"
 

-#: src/prefs_common.c:1329
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"


@@ -5828,153 +6079,153 @@ msgstr ""
 "Наведите кодирање садржаја при преносу ако тело поруке садржи неаски "
 "карактере."
 
 "Наведите кодирање садржаја при преносу ако тело поруке садржи неаски "
 "карактере."
 

-#: src/prefs_common.c:1416
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "Аутоматски одабир налога"
 
 msgid "Automatic account selection"
 msgstr "Аутоматски одабир налога"
 

-#: src/prefs_common.c:1424
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "при одговору"
 
 msgid "when replying"
 msgstr "при одговору"
 

-#: src/prefs_common.c:1426
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "при прослеђивању"
 
 msgid "when forwarding"
 msgstr "при прослеђивању"
 

-#: src/prefs_common.c:1428
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "при преуређивању"
 
 msgid "when re-editing"
 msgstr "при преуређивању"
 

-#: src/prefs_common.c:1435
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "Дугме за „Одговор“ шаље одговор на дописно друштво"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "Дугме за „Одговор“ шаље одговор на дописно друштво"
 

-#: src/prefs_common.c:1438
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "Аутоматско покретање екстерног уређивача текста"
 
 msgid "Automatically launch the external editor"
 msgstr "Аутоматско покретање екстерног уређивача текста"
 

-#: src/prefs_common.c:1445
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "Проследи као прилог"
 
 msgid "Forward as attachment"
 msgstr "Проследи као прилог"
 

-#: src/prefs_common.c:1448
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "Показивач блока"
 
 msgid "Block cursor"
 msgstr "Показивач блока"
 

-#: src/prefs_common.c:1451
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Задржи оригинално заглавље „Пошиљалац“ код преусмеравања"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Задржи оригинално заглавље „Пошиљалац“ код преусмеравања"
 

-#: src/prefs_common.c:1459
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "Сачувај измене у поруци у директоријум „Недовршено“, након"
 
 msgid "Autosave to Drafts folder every "
 msgstr "Сачувај измене у поруци у директоријум „Недовршено“, након"
 

-#: src/prefs_common.c:1466 src/prefs_common.c:1511
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "карактера"
 
 msgid "characters"
 msgstr "карактера"
 

-#: src/prefs_common.c:1474
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "Максималан број опозива"
 
 msgid "Undo level"
 msgstr "Максималан број опозива"
 

-#: src/prefs_common.c:1487
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "Преламање текста"
 
 msgid "Message wrapping"
 msgstr "Преламање текста"
 

-#: src/prefs_common.c:1499
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "Преломи линију на"
 
 msgid "Wrap messages at"
 msgstr "Преломи линију на"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "Преломи цитат"
 
 msgid "Wrap quotation"
 msgstr "Преломи цитат"
 

-#: src/prefs_common.c:1521
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "Прелом при уносу"
 
 msgid "Wrap on input"
 msgstr "Прелом при уносу"
 

-#: src/prefs_common.c:1524
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "Прелом пре слања"
 
 msgid "Wrap before sending"
 msgstr "Прелом пре слања"
 

-#: src/prefs_common.c:1527
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Паметни прелом (ЕКСПЕРИМЕНТАЛНО)"
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr "Паметни прелом (ЕКСПЕРИМЕНТАЛНО)"
 

-#: src/prefs_common.c:1593
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "Одговор са цитатом"
 
 msgid "Reply will quote by default"
 msgstr "Одговор са цитатом"
 

-#: src/prefs_common.c:1595
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "Формат одговора"
 
 msgid "Reply format"
 msgstr "Формат одговора"
 

-#: src/prefs_common.c:1610 src/prefs_common.c:1649
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "Карактер за цитат"
 
 msgid "Quotation mark"
 msgstr "Карактер за цитат"
 

-#: src/prefs_common.c:1634
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "Формат прослеђивања"
 
 msgid "Forward format"
 msgstr "Формат прослеђивања"
 

-#: src/prefs_common.c:1678
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr " Опис симбола "
 
 msgid " Description of symbols "
 msgstr " Опис симбола "
 

-#: src/prefs_common.c:1686
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "Карактери за цитат"
 
 msgid "Quotation characters"
 msgstr "Карактери за цитат"
 

-#: src/prefs_common.c:1701
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "Третирај ове карактере као ознаке за цитат: "
 
 msgid "Treat these characters as quotation marks: "
 msgstr "Третирај ове карактере као ознаке за цитат: "
 

-#: src/prefs_common.c:1751
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Преведи називе поља заглавља (нпр. „From:“, „Subject:“)"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "Преведи називе поља заглавља (нпр. „From:“, „Subject:“)"
 

-#: src/prefs_common.c:1754
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "Прикажи број непрочитаних порука иза назива директоријума"
 
 msgid "Display unread number next to folder name"
 msgstr "Прикажи број непрочитаних порука иза назива директоријума"
 

-#: src/prefs_common.c:1763
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "Скрати назив дискусионе групе ако је дужи од"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "Скрати назив дискусионе групе ако је дужи од"
 

-#: src/prefs_common.c:1778
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "карактера"
 
 msgid "letters"
 msgstr "карактера"
 

-#: src/prefs_common.c:1784
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "Листа порука"
 
 msgid "Summary View"
 msgstr "Листа порука"
 

-#: src/prefs_common.c:1793
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Прикажи примаоца у колони „Пошиљалац“ уколико сте Ви пошиљалац"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Прикажи примаоца у колони „Пошиљалац“ уколико сте Ви пошиљалац"
 

-#: src/prefs_common.c:1796
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "Прикажи пошиљаоца користећи адресар"
 
 msgid "Display sender using address book"
 msgstr "Прикажи пошиљаоца користећи адресар"
 

-#: src/prefs_common.c:1799
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 "Формирај нити расправа користећи тему као допуну стандардним деловима "
 "заглавља"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr ""
 "Формирај нити расправа користећи тему као допуну стандардним деловима "
 "заглавља"
 

-#: src/prefs_common.c:1807 src/prefs_common.c:2700 src/prefs_common.c:2738
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "Формат датума"
 
 msgid "Date format"
 msgstr "Формат датума"
 

-#: src/prefs_common.c:1829
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " Одаберите поља за приказ у листи порука... "
 
 msgid " Set displayed items in summary... "
 msgstr " Одаберите поља за приказ у листи порука... "
 

-#: src/prefs_common.c:1890
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "Омогући бојење цитата и потписа у поруци"
 
 msgid "Enable coloration of message"
 msgstr "Омогући бојење цитата и потписа у поруци"
 

-#: src/prefs_common.c:1905
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"


@@ -5982,350 +6233,329 @@ msgstr ""
 "Прикажи вишебајтни симбол као\n"
 "ASCII карактер (само Јапанска верзија)"
 
 "Прикажи вишебајтни симбол као\n"
 "ASCII карактер (само Јапанска верзија)"
 

-#: src/prefs_common.c:1911
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "Прикажи заглавље изнад приказа поруке"
 
 msgid "Display header pane above message view"
 msgstr "Прикажи заглавље изнад приказа поруке"
 

-#: src/prefs_common.c:1918
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "Прикажи кратко заглавље у поруци"
 
 msgid "Display short headers on message view"
 msgstr "Прикажи кратко заглавље у поруци"
 

-#: src/prefs_common.c:1940
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Размак између линија текста"
 
 msgid "Line space"
 msgstr "Размак између линија текста"
 

-#: src/prefs_common.c:1954 src/prefs_common.c:1994
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "тачака"
 
 msgid "pixel(s)"
 msgstr "тачака"
 

-#: src/prefs_common.c:1959
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "Остави празну линију на почетку поруке"
 
 msgid "Leave space on head"
 msgstr "Остави празну линију на почетку поруке"
 

-#: src/prefs_common.c:1961
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "Померање текста"
 
 msgid "Scroll"
 msgstr "Померање текста"
 

-#: src/prefs_common.c:1968
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Пола стране"
 
 msgid "Half page"
 msgstr "Пола стране"
 

-#: src/prefs_common.c:1974
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "Глатко померање"
 
 msgid "Smooth scroll"
 msgstr "Глатко померање"
 

-#: src/prefs_common.c:1980
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "Корак померања"
 
 msgid "Step"
 msgstr "Корак померања"
 

-#: src/prefs_common.c:2005
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "Прикажи опис прилога (уместо назива прилога)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "Прикажи опис прилога (уместо назива прилога)"
 

-#: src/prefs_common.c:2052
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "Аутоматска провера потписа"
 
 msgid "Automatically check signatures"
 msgstr "Аутоматска провера потписа"
 

-#: src/prefs_common.c:2055
-msgid "Show signature check result in a popup window"
-msgstr "Прикажи резултат провере потписа у искачућем прозору"
-
-#: src/prefs_common.c:2058
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "Привремено сачувај лозинку у меморији"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "Привремено сачувај лозинку у меморији"
 

-#: src/prefs_common.c:2073
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr "Истиче након"
 
 msgid "Expire after"
 msgstr "Истиче након"
 

-#: src/prefs_common.c:2084
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ако је вредност „0“, лозинка ће бити сачувана током целе сесије"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "Ако је вредност „0“, лозинка ће бити сачувана током целе сесије"
 

-#: src/prefs_common.c:2092
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "минут(а)"
 
 msgid "minute(s) "
 msgstr "минут(а)"
 

-#: src/prefs_common.c:2109
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "Ухвати унос при упису лозинке"
 
 msgid "Grab input while entering a passphrase"
 msgstr "Ухвати унос при упису лозинке"
 

-#: src/prefs_common.c:2114
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Прикажи упозорење при покретању програма ако GnuPG не ради"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Прикажи упозорење при покретању програма ако GnuPG не ради"
 

-#: src/prefs_common.c:2177
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Прикажи поруку када се одабере у листи порука"
 
 msgid "Always open messages in summary when selected"
 msgstr "Прикажи поруку када се одабере у листи порука"
 

-#: src/prefs_common.c:2181
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgstr "Прикажи прву непрочитану поруку при уласку у директоријум"
 
 msgid "Open first unread message when entering a folder"
 msgstr "Прикажи прву непрочитану поруку при уласку у директоријум"
 

-#: src/prefs_common.c:2185
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr "Обележи поруку као прочитану само када се отвори у новом прозору"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "Обележи поруку као прочитану само када се отвори у новом прозору"
 

-#: src/prefs_common.c:2189
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "Пређи у директоријум „Сандуче“ по преузимању нових порука"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "Пређи у директоријум „Сандуче“ по преузимању нових порука"
 

-#: src/prefs_common.c:2199
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Изврши промене одмах по премештању или уклањању поруке"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Изврши промене одмах по премештању или уклањању поруке"
 

-#: src/prefs_common.c:2201
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgstr ""
 "Ако је ова опција искључена, порука ће до следећег извршавања бити само "
 "обележена за акцију"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr ""
 "Ако је ова опција искључена, порука ће до следећег извршавања бити само "
 "обележена за акцију"
 

-#: src/prefs_common.c:2214
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "Прикажи дијалог „Нема непрочитаних порука“"
 
 msgid "Show no-unread-message dialog"
 msgstr "Прикажи дијалог „Нема непрочитаних порука“"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "Подразумева се „Да“"
 
 msgid "Assume 'Yes'"
 msgstr "Подразумева се „Да“"
 

-#: src/prefs_common.c:2226
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "Подразумева се „Не“"
 
 msgid "Assume 'No'"
 msgstr "Подразумева се „Не“"
 

-#: src/prefs_common.c:2235
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr " Одаберите предефинисани скуп тастерских пречица... "
 
 msgid " Set key bindings... "
 msgstr " Одаберите предефинисани скуп тастерских пречица... "
 

-#: src/prefs_common.c:2241
-msgid "Icon theme"
-msgstr "Графичка тема икона"
-
-#: src/prefs_common.c:2325
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "Екстерне команде (%s је путања до датотеке или УРЛ)"
-
-#: src/prefs_common.c:2334
-msgid "Web browser"
-msgstr "Интернет претраживач"
-
-#: src/prefs_common.c:2370 src/toolbar.c:421
-msgid "Editor"
-msgstr "Уређивач текста"
-
-#: src/prefs_common.c:2400
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Додај адресу у одредиште при двоклику"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Додај адресу у одредиште при двоклику"
 

-#: src/prefs_common.c:2403
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "Величина дневника рада"
 
 msgid "Log Size"
 msgstr "Величина дневника рада"
 

-#: src/prefs_common.c:2410
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "Прекрати велики дневник рада"
 
 msgid "Clip the log size"
 msgstr "Прекрати велики дневник рада"
 

-#: src/prefs_common.c:2415
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "Дужина прозора дневника рада"
 
 msgid "Log window length"
 msgstr "Дужина прозора дневника рада"
 

-#: src/prefs_common.c:2428
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "0 за заустављање логовања у прозору дневника рада"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 за заустављање логовања у прозору дневника рада"
 

-#: src/prefs_common.c:2437
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "Безбедност"
 
 msgid "Security"
 msgstr "Безбедност"
 

-#: src/prefs_common.c:2444
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "Упитај пре прихватања SSL сертификата"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "Упитај пре прихватања SSL сертификата"
 

-#: src/prefs_common.c:2452
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "При напуштању програма"
 
 msgid "On exit"
 msgstr "При напуштању програма"
 

-#: src/prefs_common.c:2460
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "Упитај за потврду напуштања програма"
 
 msgid "Confirm on exit"
 msgstr "Упитај за потврду напуштања програма"
 

-#: src/prefs_common.c:2467
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "Испразни смеће"
 
 msgid "Empty trash on exit"
 msgstr "Испразни смеће"
 

-#: src/prefs_common.c:2469
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Упитај за потврду пре пражњења смећа"
 
 msgid "Ask before emptying"
 msgstr "Упитај за потврду пре пражњења смећа"
 

-#: src/prefs_common.c:2473
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "Прикажи обавештење о постојању порука припремљених за слање"
 
 msgid "Warn if there are queued messages"
 msgstr "Прикажи обавештење о постојању порука припремљених за слање"
 

-#: src/prefs_common.c:2479
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Време трајања I/O секвенце сокета:"
 
 msgid "Socket I/O timeout:"
 msgstr "Време трајања I/O секвенце сокета:"
 

-#: src/prefs_common.c:2492
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "секунди"
 
 msgid "seconds"
 msgstr "секунди"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "скраћени назив седмице"
 
 msgid "the full abbreviated weekday name"
 msgstr "скраћени назив седмице"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "пун назив седмице"
 
 msgid "the full weekday name"
 msgstr "пун назив седмице"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "скраћени назив месеца"
 
 msgid "the abbreviated month name"
 msgstr "скраћени назив месеца"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "пун назив месеца"
 
 msgid "the full month name"
 msgstr "пун назив месеца"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "приоритетан датум и време тренутне локализације"
 
 msgid "the preferred date and time for the current locale"
 msgstr "приоритетан датум и време тренутне локализације"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "број столећа (година/100)"
 
 msgid "the century number (year/100)"
 msgstr "број столећа (година/100)"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "дан у месецу као децималан број"
 
 msgid "the day of the month as a decimal number"
 msgstr "дан у месецу као децималан број"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час као децималан број користећи 24-часовно време"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "час као децималан број користећи 24-часовно време"
 

-#: src/prefs_common.c:2684
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час као децималан број користећи 12-часовно време"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "час као децималан број користећи 12-часовно време"
 

-#: src/prefs_common.c:2685
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "дан у години као децималан број"
 
 msgid "the day of the year as a decimal number"
 msgstr "дан у години као децималан број"
 

-#: src/prefs_common.c:2686
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "месец као децималан број"
 
 msgid "the month as a decimal number"
 msgstr "месец као децималан број"
 

-#: src/prefs_common.c:2687
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "минут као децималан број"
 
 msgid "the minute as a decimal number"
 msgstr "минут као децималан број"
 

-#: src/prefs_common.c:2688
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "АМ или ПМ"
 
 msgid "either AM or PM"
 msgstr "АМ или ПМ"
 

-#: src/prefs_common.c:2689
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "секунде као децималан број"
 
 msgid "the second as a decimal number"
 msgstr "секунде као децималан број"
 

-#: src/prefs_common.c:2690
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "дан у седмици као децималан број"
 
 msgid "the day of the week as a decimal number"
 msgstr "дан у седмици као децималан број"
 

-#: src/prefs_common.c:2691
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "приоритетан датум за тренутну локализацију"
 
 msgid "the preferred date for the current locale"
 msgstr "приоритетан датум за тренутну локализацију"
 

-#: src/prefs_common.c:2692
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "последње две цифре године"
 
 msgid "the last two digits of a year"
 msgstr "последње две цифре године"
 

-#: src/prefs_common.c:2693
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "година као децималан број"
 
 msgid "the year as a decimal number"
 msgstr "година као децималан број"
 

-#: src/prefs_common.c:2694
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "временска зона"
 
 msgid "the time zone or name or abbreviation"
 msgstr "временска зона"
 

-#: src/prefs_common.c:2715
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "Идентификатор"
 
 msgid "Specifier"
 msgstr "Идентификатор"
 

-#: src/prefs_common.c:2755
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "Пример"
 
 msgid "Example"
 msgstr "Пример"
 

-#: src/prefs_common.c:2844
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "Боје цитата и потписа"
 
 msgid "Set message colors"
 msgstr "Боје цитата и потписа"
 

-#: src/prefs_common.c:2852
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "Боје за"
 
 msgid "Colors"
 msgstr "Боје за"
 

-#: src/prefs_common.c:2899
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "Цитат - први ниво"
 
 msgid "Quoted Text - First Level"
 msgstr "Цитат - први ниво"
 

-#: src/prefs_common.c:2905
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "Цитат - други ниво"
 
 msgid "Quoted Text - Second Level"
 msgstr "Цитат - други ниво"
 

-#: src/prefs_common.c:2911
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "Цитат - трећи ниво"
 
 msgid "Quoted Text - Third Level"
 msgstr "Цитат - трећи ниво"
 

-#: src/prefs_common.c:2917
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "УРЛ веза"
 
 msgid "URI link"
 msgstr "УРЛ веза"
 

-#: src/prefs_common.c:2923
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Циљни директоријум"
 
 msgid "Target folder"
 msgstr "Циљни директоријум"
 

-#: src/prefs_common.c:2929
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Потпис"
 
 msgid "Signatures"
 msgstr "Потпис"
 

-#: src/prefs_common.c:2936
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Кружи кроз боје цитата"
 
 msgid "Recycle quote colors"
 msgstr "Кружи кроз боје цитата"
 

-#: src/prefs_common.c:3003
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Одаберите боју за цитат првог нивоа"
 
 msgid "Pick color for quotation level 1"
 msgstr "Одаберите боју за цитат првог нивоа"
 

-#: src/prefs_common.c:3006
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Одаберите боју за цитат другог нивоа"
 
 msgid "Pick color for quotation level 2"
 msgstr "Одаберите боју за цитат другог нивоа"
 

-#: src/prefs_common.c:3009
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Одаберите боју за цитат трећегг нивоа"
 
 msgid "Pick color for quotation level 3"
 msgstr "Одаберите боју за цитат трећегг нивоа"
 

-#: src/prefs_common.c:3012
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Одаберите боју за линк"
 
 msgid "Pick color for URI"
 msgstr "Одаберите боју за линк"
 

-#: src/prefs_common.c:3015
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Одаберите боју за циљни директоријум"
 
 msgid "Pick color for target folder"
 msgstr "Одаберите боју за циљни директоријум"
 

-#: src/prefs_common.c:3018
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Одаберите боју за потпис"
 
 msgid "Pick color for signatures"
 msgstr "Одаберите боју за потпис"
 

-#: src/prefs_common.c:3153
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "Тастерске пречице"
 
 msgid "Key bindings"
 msgstr "Тастерске пречице"
 

-#: src/prefs_common.c:3167
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Одаберите предефинисани скуп тастерских пречица:"
 
 msgid "Select preset:"
 msgstr "Одаберите предефинисани скуп тастерских пречица:"
 

-#: src/prefs_common.c:3180 src/prefs_common.c:3465
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "Стари Силфед"
 
 msgid "Old Sylpheed"
 msgstr "Стари Силфед"
 

-#: src/prefs_common.c:3188
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6346,11 +6576,15 @@ msgstr "Кориснички дефинисана поља заглавља"
 msgid "Header name is not set."
 msgstr "Назив поља заглавља није одређен."
 
 msgid "Header name is not set."
 msgstr "Назив поља заглавља није одређен."
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "Ово поље заглавља није дозвољено као кориснички дефинисано."
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "Уклони поље заглавља"
 
 msgid "Delete header"
 msgstr "Уклони поље заглавља"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "Да ли заиста желите да уклоните ово поље заглавља?"
 
 msgid "Do you really want to delete this header?"
 msgstr "Да ли заиста желите да уклоните ово поље заглавља?"
 


@@ -6378,151 +6612,342 @@ msgstr "Прикажи сва неодређена поља заглавља"
 msgid "This header is already in the list."
 msgstr "Ово поље заглавља је већ у листи."
 
 msgid "This header is already in the list."
 msgstr "Ово поље заглавља је већ у листи."
 

-#: src/prefs_filtering.c:219
-msgid "Filtering/Processing configuration"
-msgstr "Конфигурација филтрирања/процесирања"
+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s ће бити замењено називом датотека / УРЛ адресом"

 
 

-#: src/prefs_filtering.c:236 src/prefs_scoring.c:219
-msgid "Condition"
-msgstr "УÑ\81лов за извÑ\80Ñ\88еÑ\9aе"
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "Ð\98нÑ\82еÑ\80неÑ\82 пÑ\80еÑ\82Ñ\80аживаÑ\87"

 
 

-#: src/prefs_filtering.c:250 src/prefs_filtering.c:271 src/prefs_scoring.c:234
-msgid "Define ..."
-msgstr " Одреди ... "
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "Наредба за штампање"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Уређивач текста"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "Прегледник слика"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "Звучни свирач"

 
 

-#: src/prefs_filtering.c:257
+#: src/prefs_ext_prog.c:265
+msgid "Message View/External Programs"
+msgstr "Преглед поруке/Екстерни програми"
+
+#: src/prefs_filtering_action.c:133
+msgid "Move"
+msgstr "Премести"
+
+#: src/prefs_filtering_action.c:134
+msgid "Copy"
+msgstr "Копирај"
+
+#: src/prefs_filtering_action.c:136 src/prefs_summary_column.c:67
+msgid "Mark"
+msgstr "Означи"
+
+#: src/prefs_filtering_action.c:137
+msgid "Unmark"
+msgstr "Уклони ознаку"
+
+#: src/prefs_filtering_action.c:138
+msgid "Lock"
+msgstr "Закључај"
+
+#: src/prefs_filtering_action.c:139
+msgid "Unlock"
+msgstr "Откључај"
+
+#: src/prefs_filtering_action.c:140
+msgid "Mark as read"
+msgstr "Означи као прочитано"
+
+#: src/prefs_filtering_action.c:141
+msgid "Mark as unread"
+msgstr "Означи као непрочитано"
+
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473
+msgid "Forward"
+msgstr "Проследи"
+
+#: src/prefs_filtering_action.c:144
+msgid "Redirect"
+msgstr "Преусмери"
+
+#: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481
+msgid "Execute"
+msgstr "Изврши означене акције"
+
+#: src/prefs_filtering_action.c:146 src/prefs_filtering_action.c:400
+msgid "Color"
+msgstr "Боје"
+
+#: src/prefs_filtering_action.c:147
+msgid "Change score"
+msgstr "Промени бодове"
+
+#: src/prefs_filtering_action.c:148
+msgid "Set score"
+msgstr "Постави бодове"
+
+#: src/prefs_filtering_action.c:149
+msgid "Hide"
+msgstr "Сакриј"
+
+#: src/prefs_filtering_action.c:150
+msgid "Stop filter"
+msgstr "Заустави филтрирање"
+
+#: src/prefs_filtering_action.c:285
+msgid "Filtering action configuration"
+msgstr "Подешавања акција за филтрирање"
+
+#: src/prefs_filtering_action.c:308 src/prefs_filtering.c:244

 msgid "Action"
 msgstr "Акција"
 
 msgid "Action"
 msgstr "Акција"
 

-#: src/prefs_filtering.c:299 src/prefs_matcher.c:563 src/prefs_scoring.c:277
-#: src/prefs_template.c:222 src/prefs_toolbar.c:775
+#: src/prefs_filtering_action.c:385
+msgid "Destination"
+msgstr "Одредиште"
+
+#: src/prefs_filtering_action.c:390
+msgid "Recipient"
+msgstr "Прималац"
+
+#: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
+#: src/summaryview.c:480
+msgid "Score"
+msgstr "Бодови"
+
+#: src/prefs_filtering_action.c:427 src/prefs_matcher.c:467
+msgid "Info ..."
+msgstr " Информације ... "
+
+#: src/prefs_filtering_action.c:455 src/prefs_filtering.c:286
+#: src/prefs_matcher.c:563 src/prefs_template.c:222 src/prefs_toolbar.c:775

 msgid "  Replace  "
 msgstr "  Замени  "
 
 msgid "  Replace  "
 msgstr "  Замени  "
 

-#: src/prefs_filtering.c:325
+#: src/prefs_filtering_action.c:481
+msgid "Current action list"
+msgstr "Постојеће акције"
+
+#: src/prefs_filtering_action.c:761
+msgid "Command line not set"
+msgstr "Нисте унели наредбу"
+
+#: src/prefs_filtering_action.c:762
+msgid "Destination is not set."
+msgstr "Нисте одредили одредиште."
+
+#: src/prefs_filtering_action.c:772
+msgid "Recipient is not set."
+msgstr "Нисте одредили примаоца."
+
+#: src/prefs_filtering_action.c:786
+msgid "Score is not set"
+msgstr "Нисте одредили број бодова"
+
+#: src/prefs_filtering_action.c:1075
+msgid "No action was defined."
+msgstr "Нисте одредили акцију."
+
+#: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
+#: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
+#: src/summaryview.c:475 src/summaryview.c:642
+msgid "Subject"
+msgstr "Тема"
+
+#: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
+#: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
+#: src/summaryview.c:476 src/summaryview.c:646
+msgid "From"
+msgstr "Пошиљалац"
+
+#: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650
+msgid "To"
+msgstr "Прималац"
+
+#: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477
+msgid "Date"
+msgstr "Датум"
+
+#: src/prefs_filtering_action.c:1118 src/prefs_matcher.c:1716
+#: src/quote_fmt.c:52
+msgid "Message-ID"
+msgstr "ИД поруке"
+
+#: src/prefs_filtering_action.c:1119 src/prefs_matcher.c:144
+#: src/prefs_matcher.c:1717 src/quote_fmt.c:50
+msgid "Newsgroups"
+msgstr "Дискусиона група"
+
+#: src/prefs_filtering_action.c:1120 src/prefs_matcher.c:144
+#: src/prefs_matcher.c:1718 src/quote_fmt.c:51
+msgid "References"
+msgstr "Референце"
+
+#: src/prefs_filtering_action.c:1121 src/prefs_matcher.c:1719
+msgid "Filename - should not be modified"
+msgstr "Не могу да изменим назив датотеке"
+
+#: src/prefs_filtering_action.c:1122 src/prefs_matcher.c:1720
+msgid "new line"
+msgstr "нова линија"
+
+#: src/prefs_filtering_action.c:1123 src/prefs_matcher.c:1721
+msgid "escape character for quotes"
+msgstr "завршни знак цитата"
+
+#: src/prefs_filtering_action.c:1124 src/prefs_matcher.c:1722
+msgid "quote character"
+msgstr "знак за почетак цитата"
+
+#: src/prefs_filtering.c:129 src/prefs_filtering.c:206
+msgid "Filtering/Processing configuration"
+msgstr "Подешавање филтрирања/обраде"
+
+#: src/prefs_filtering.c:223
+msgid "Condition"
+msgstr "Услов за извршење"
+
+#: src/prefs_filtering.c:237 src/prefs_filtering.c:258
+msgid "Define ..."
+msgstr " Одреди ... "
+
+#: src/prefs_filtering.c:312

 msgid "Current filtering/processing rules"
 msgid "Current filtering/processing rules"

-msgstr "Ð\9fоÑ\81Ñ\82оÑ\98еÑ\9bа пÑ\80авила Ñ\84илÑ\82Ñ\80иÑ\80аÑ\9aа/пÑ\80оÑ\86еÑ\81иÑ\80аÑ\9aа"
+msgstr "Ð\9fоÑ\81Ñ\82оÑ\98еÑ\9bа пÑ\80авила Ñ\84илÑ\82Ñ\80иÑ\80аÑ\9aа/обÑ\80аде"

 
 

-#: src/prefs_filtering.c:341
+#: src/prefs_filtering.c:328

 msgid "Top"
 msgstr "Горе"
 
 msgid "Top"
 msgstr "Горе"
 

-#: src/prefs_filtering.c:363
+#: src/prefs_filtering.c:350

 msgid "Bottom"
 msgstr "Доле"
 
 msgid "Bottom"
 msgstr "Доле"
 

-#: src/prefs_filtering.c:717 src/prefs_filtering.c:792 src/prefs_scoring.c:555
-#: src/prefs_scoring.c:599
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "Улов за тражење није ваљан."
 
 msgid "Condition string is not valid."
 msgstr "Улов за тражење није ваљан."
 

-#: src/prefs_filtering.c:751 src/prefs_filtering.c:799
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "Наредба акције није валидна."
 
 msgid "Action string is not valid."
 msgstr "Наредба акције није валидна."
 

-#: src/prefs_filtering.c:779 src/prefs_scoring.c:541 src/prefs_scoring.c:585
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgid "Condition string is empty."

-msgstr "УÑ\81лов за Ñ\82Ñ\80ажеÑ\9aе Ñ\98е пÑ\80азан."
+msgstr "Ð\9dема Ñ\83Ñ\81лова за Ñ\82Ñ\80ажеÑ\9aе."

 
 

-#: src/prefs_filtering.c:785
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "Наредба акције није одређена."
 
 msgid "Action string is empty."
 msgstr "Наредба акције није одређена."
 

-#: src/prefs_filtering.c:852 src/prefs_scoring.c:621
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "Уклони правило"
 
 msgid "Delete rule"
 msgstr "Уклони правило"
 

-#: src/prefs_filtering.c:853 src/prefs_scoring.c:622
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "Да ли заиста желите да уклоните ово правило?"
 
 msgid "Do you really want to delete this rule?"
 msgstr "Да ли заиста желите да уклоните ово правило?"
 

-#: src/prefs_filtering.c:1000 src/prefs_matcher.c:1665 src/prefs_scoring.c:758
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "Унос није сачуван"
 
 msgid "Entry not saved"
 msgstr "Унос није сачуван"
 

-#: src/prefs_filtering.c:1001
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 "Унос није сачуван.\n"
 "Да ли заиста желите да затворите?"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr ""
 "Унос није сачуван.\n"
 "Да ли заиста желите да затворите?"
 

-#: src/prefs_folder_item.c:132
+#: src/prefs_folder_item.c:133

 msgid "Simplify Subject RegExp: "
 msgstr "Регуларни израз за скраћивање теме: "
 
 msgid "Simplify Subject RegExp: "
 msgstr "Регуларни израз за скраћивање теме: "
 

-#: src/prefs_folder_item.c:150
+#: src/prefs_folder_item.c:151

 msgid "Folder chmod: "
 msgstr "Приступни мод директоријума: "
 
 msgid "Folder chmod: "
 msgstr "Приступни мод директоријума: "
 

-#: src/prefs_folder_item.c:174
+#: src/prefs_folder_item.c:175

 msgid "Folder color: "
 msgstr "Боја назива директоријума: "
 
 msgid "Folder color: "
 msgstr "Боја назива директоријума: "
 

-#: src/prefs_folder_item.c:200
-msgid "Processing on startup: "
-msgstr "Ð\98звÑ\80Ñ\88аваÑ\9aе пÑ\80и покÑ\80еÑ\82аÑ\9aÑ\83:"
+#: src/prefs_folder_item.c:201
+msgid "Process at startup"
+msgstr "Ð\9eбÑ\80ада пÑ\80и покÑ\80еÑ\82аÑ\9aÑ\83 пÑ\80огÑ\80ама"

 
 

-#: src/prefs_folder_item.c:320
-msgid "Request Return Receipt"
-msgstr "Ð\97аÑ\85Ñ\82еваÑ\98 поÑ\82вÑ\80дÑ\83 пÑ\80иÑ\98ема поÑ\80Ñ\83ке од пÑ\80имаоÑ\86а"
+#: src/prefs_folder_item.c:212
+msgid "Scan for new mail"
+msgstr "Ð\9eÑ\81вежаваÑ\9aе новиÑ\85 поÑ\80Ñ\83ка"

 
 #: src/prefs_folder_item.c:332
 
 #: src/prefs_folder_item.c:332

+msgid "Request Return Receipt"
+msgstr "Захтевање потврде пријема поруке"
+
+#: src/prefs_folder_item.c:344

 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Сачувај копију послате поруке у овај уместо у директоријум „Послато“"
 
 msgid "Save copy of outgoing messages to this folder instead of Sent"
 msgstr "Сачувај копију послате поруке у овај уместо у директоријум „Послато“"
 

-#: src/prefs_folder_item.c:342
+#: src/prefs_folder_item.c:354

 msgid "Default To: "
 msgstr "Подразумевани Прималац: "
 
 msgid "Default To: "
 msgstr "Подразумевани Прималац: "
 

-#: src/prefs_folder_item.c:359
+#: src/prefs_folder_item.c:371

 msgid "Send replies to: "
 msgid "Send replies to: "

-msgstr "Пошаљи одговору за: "
+msgstr "Пошаљи одговор за: "

 
 

-#: src/prefs_folder_item.c:376
+#: src/prefs_folder_item.c:388

 msgid "Default account: "
 msgstr "Подразумевани налог: "
 
 msgid "Default account: "
 msgstr "Подразумевани налог: "
 

-#: src/prefs_folder_item.c:418
+#: src/prefs_folder_item.c:430

 msgid "Default dictionary: "
 msgstr "Подразумевани речник: "
 
 msgid "Default dictionary: "
 msgstr "Подразумевани речник: "
 

-#: src/prefs_folder_item.c:541
+#: src/prefs_folder_item.c:553

 msgid "Pick color for folder"
 msgstr "Одаберите боју за назив директоријума"
 
 msgid "Pick color for folder"
 msgstr "Одаберите боју за назив директоријума"
 

-#: src/prefs_folder_item.c:551
+#: src/prefs_folder_item.c:563

 msgid "General"
 msgstr "Опште"
 
 msgid "General"
 msgstr "Опште"
 

-#: src/prefs_folder_item.c:580
+#: src/prefs_folder_item.c:592

 msgid "Settings for folder"
 msgstr "Подешавања директоријума"
 
 msgid "Settings for folder"
 msgstr "Подешавања директоријума"
 

-#: src/prefs_fonts.c:75
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Одабир писма"
 
 msgid "Font selection"
 msgstr "Одабир писма"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Текст"
-
-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "Мали"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "Попис доректоријума"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Ð\9dоÑ\80малан"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Ð\9fÑ\80иказ поÑ\80Ñ\83ке"

 
 

-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgid "Bold"

-msgstr "Ð\9cаÑ\81ни"
+msgstr "Ð\9fодебÑ\99ан"

 
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr "Морате рестартовати програм да би измене биле примењене"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr "Морате рестартовати програм да би измене биле примењене"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "Приказ/Писма"
 
 msgid "Display/Fonts"
 msgstr "Приказ/Писма"
 


@@ -6534,39 +6959,14 @@ msgstr "Поставке"
 msgid "All messages"
 msgstr "Све поруке"
 
 msgid "All messages"
 msgstr "Све поруке"
 

-#: src/prefs_matcher.c:142 src/prefs_matcher.c:1711
-#: src/prefs_summary_column.c:70 src/quote_fmt.c:47 src/summaryview.c:464
-#: src/summaryview.c:630
-msgid "Subject"
-msgstr "Тема"
-
-#: src/prefs_matcher.c:143 src/prefs_matcher.c:1712
-#: src/prefs_summary_column.c:71 src/quote_fmt.c:42 src/summaryview.c:465
-#: src/summaryview.c:634
-msgid "From"
-msgstr "Пошиљалац"
-
-#: src/prefs_matcher.c:143 src/prefs_matcher.c:1713 src/quote_fmt.c:48
-#: src/summaryview.c:638
-msgid "To"
-msgstr "Прималац"
-

 #: src/prefs_matcher.c:143
 msgid "To or Cc"
 msgstr "Прималац или Копија"
 
 #: src/prefs_matcher.c:143
 msgid "To or Cc"
 msgstr "Прималац или Копија"
 

-#: src/prefs_matcher.c:144 src/prefs_matcher.c:1717 src/quote_fmt.c:50
-msgid "Newsgroups"
-msgstr "Дискусиона група"
-

 #: src/prefs_matcher.c:144
 msgid "In reply to"
 msgstr "У одговору на"
 
 #: src/prefs_matcher.c:144
 msgid "In reply to"
 msgstr "У одговору на"
 

-#: src/prefs_matcher.c:144 src/prefs_matcher.c:1718 src/quote_fmt.c:51
-msgid "References"
-msgstr "Референце"
-

 #: src/prefs_matcher.c:145
 msgid "Age greater than"
 msgstr "Старије од"
 #: src/prefs_matcher.c:145
 msgid "Age greater than"
 msgstr "Старије од"


@@ -6619,7 +7019,7 @@ msgstr "Закључано"
 msgid "Color label"
 msgstr "Боја поруке"
 
 msgid "Color label"
 msgstr "Боја поруке"
 

-#: src/prefs_matcher.c:153 src/toolbar.c:167
+#: src/prefs_matcher.c:153 src/toolbar.c:170

 msgid "Ignore thread"
 msgstr "Игнориши нит расправе"
 
 msgid "Ignore thread"
 msgstr "Игнориши нит расправе"
 


@@ -6683,10 +7083,6 @@ msgstr "Конфигурација услова"
 msgid "Match type"
 msgstr "Тражи у"
 
 msgid "Match type"
 msgstr "Тражи у"
 

-#: src/prefs_matcher.c:467
-msgid "Info ..."
-msgstr " Информације ... "
-

 #: src/prefs_matcher.c:489
 msgid "Predicate"
 msgstr "Тврдња"
 #: src/prefs_matcher.c:489
 msgid "Predicate"
 msgstr "Тврдња"


@@ -6707,7 +7103,7 @@ msgstr "Постојећа правила услова"
 msgid "Value is not set."
 msgstr "Вредност није одређена."
 
 msgid "Value is not set."
 msgstr "Вредност није одређена."
 

-#: src/prefs_matcher.c:1666 src/prefs_scoring.c:759
+#: src/prefs_matcher.c:1666

 msgid ""
 "The entry was not saved\n"
 "Have you really finished?"
 msgid ""
 "The entry was not saved\n"
 "Have you really finished?"


@@ -6731,63 +7127,10 @@ msgstr "вратити 0 или 1"
 msgid "The following symbols can be used:"
 msgstr "Можете користити следеће знакове:"
 
 msgid "The following symbols can be used:"
 msgstr "Можете користити следеће знакове:"
 

-#: src/prefs_matcher.c:1715 src/prefs_summary_column.c:72 src/quote_fmt.c:41
-#: src/summaryview.c:466
-msgid "Date"
-msgstr "Датум"
-
-#: src/prefs_matcher.c:1716 src/quote_fmt.c:52
-msgid "Message-ID"
-msgstr "ИД поруке"
-
-#: src/prefs_matcher.c:1719
-msgid "Filename - should not be modified"
-msgstr "Не могу да изменим назив датотеке"
-
-#: src/prefs_matcher.c:1720
-msgid "new line"
-msgstr "нова линија"
-
-#: src/prefs_matcher.c:1721
-msgid "escape character for quotes"
-msgstr "искључни карактер за цитат"
-
-#: src/prefs_matcher.c:1722
-msgid "quote character"
-msgstr "карактер за цитат"
-

 #: src/prefs_matcher.c:1729
 msgid "Match Type: 'Test'"
 msgstr "Тражи: „Провера“"
 
 #: src/prefs_matcher.c:1729
 msgid "Match Type: 'Test'"
 msgstr "Тражи: „Провера“"
 

-#: src/prefs_scoring.c:203
-msgid "Scoring configuration"
-msgstr "Конфигурација бодовања"
-
-#: src/prefs_scoring.c:246 src/prefs_summary_column.c:75 src/summaryview.c:469
-msgid "Score"
-msgstr "Скор"
-
-#: src/prefs_scoring.c:303
-msgid "Current scoring rules"
-msgstr "Постојећа правила бодовања"
-
-#: src/prefs_scoring.c:335
-msgid "Hide score"
-msgstr "Поруке за сакривање имају"
-
-#: src/prefs_scoring.c:347
-msgid "Important score"
-msgstr "Важне поруке имају"
-
-#: src/prefs_scoring.c:519
-msgid "Match string is not valid."
-msgstr "Улов за тражење није ваљан."
-
-#: src/prefs_scoring.c:547 src/prefs_scoring.c:591
-msgid "Score is not set."
-msgstr "Број бодова није одређен."
-

 #: src/prefs_spelling.c:95
 msgid "Select dictionaries location"
 msgstr "Одаберите адресу речника"
 #: src/prefs_spelling.c:95
 msgid "Select dictionaries location"
 msgstr "Одаберите адресу речника"


@@ -6828,10 +7171,6 @@ msgstr "Боја погрешно написаних речи:"
 msgid "Compose/Spell Checker"
 msgstr "Креирање/Правописна провера"
 
 msgid "Compose/Spell Checker"
 msgstr "Креирање/Правописна провера"
 

-#: src/prefs_summary_column.c:67
-msgid "Mark"
-msgstr "Означи"
-

 #: src/prefs_summary_column.c:69
 msgid "Attachment"
 msgstr "Прилог"
 #: src/prefs_summary_column.c:69
 msgid "Attachment"
 msgstr "Прилог"


@@ -6904,6 +7243,166 @@ msgstr "Уклони шаблон"
 msgid "Do you really want to delete this template?"
 msgstr "Да ли заиста желите да уклоните шаблон?"
 
 msgid "Do you really want to delete this template?"
 msgstr "Да ли заиста желите да уклоните шаблон?"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "Подразумевана интерна тема"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "Приказ/Теме"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Само супер–корисник може да уклони системске теме"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "Уклони системску тему „%s“"
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "Уклони тему „%s“"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "Да ли заиста желите да уклоните одабрану тему?"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr ""
+"Датотека %s је неисправна\n"
+"при уклањању теме."
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "Неуспешно уклањање директоријума теме."
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Тема је успешно уклоњена"
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Одаберите директоријум са темама"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "Инсталирај тему „%s“"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"Овај директоријум не изгледа као директоријум теме.\n"
+"Да ли желите да наставите инсталацију теме?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "Желите ли да инсталирате тему за све кориснике система?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"Тема са истим именом је\n"
+"већ инсталирана на овој локацији"
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr "Не могу да направим циљни директоријум"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Тема је успешно инсталирана"
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+"Датотека %s је неисправна\n"
+"при инсталацији теме."
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "%d тема доступно (%d корисничких, %d системских, 1 интерна)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "Sylpheed Claws тим"
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "Интерна тема има %d икона"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "Нема доступне информационе датотеке за ову тему"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "Грешка: немогуће распознавање статуса теме"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d датотека (%d икона), величина је %s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Изборник"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "Инсталирај нову..."
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "Преузми још тема..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "Информације"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "Атуор: "
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "УРЛ:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "Статус:"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Приказ"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "Акције"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "Користи ову"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "Уклони"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -6972,12 +7471,20 @@ msgstr "Подешавања линије алата/Преглед порука
 msgid "Customize Toolbars/Compose Window"
 msgstr "Подешавања линије алата/Уређивач порка"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "Подешавања линије алата/Уређивач порка"
 

-#: src/procmsg.c:1136
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140
+msgid "No signature found"
+msgstr "Потпис није пронађен"
+
+#: src/privacy.c:154 src/privacy.c:173
+msgid "No information available"
+msgstr "Нема доступних информација"
+
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr ""
 "Не могу да направим привремену датотеку за слање поруке на дискусиону групу."
 
 msgid "Could not create temporary file for news sending."
 msgstr ""
 "Не могу да направим привремену датотеку за слање поруке на дискусиону групу."
 

-#: src/procmsg.c:1147
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Настала је грешка при писању привремене датотеке за слање поруке на "
 msgid "Error when writing temporary file for news sending."
 msgstr ""
 "Настала је грешка при писању привремене датотеке за слање поруке на "


@@ -7168,11 +7675,11 @@ msgstr ""
 "Настала је грешка при слању поруке:\n"
 "%s"
 
 "Настала је грешка при слању поруке:\n"
 "%s"
 

-#: src/setup.c:44
+#: src/setup.c:45

 msgid "Mailbox setting"
 msgstr "Подешавања сандучета"
 
 msgid "Mailbox setting"
 msgstr "Подешавања сандучета"
 

-#: src/setup.c:45
+#: src/setup.c:46

 msgid ""
 "First, you have to set the location of mailbox.\n"
 "You can use existing mailbox in MH format\n"
 msgid ""
 "First, you have to set the location of mailbox.\n"
 "You can use existing mailbox in MH format\n"


@@ -7184,96 +7691,92 @@ msgstr ""
 "ако већ имате неко.\n"
 "Ако нисте сигурни шта да радите, кликните на „У реду“."
 
 "ако већ имате неко.\n"
 "Ако нисте сигурни шта да радите, кликните на „У реду“."
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr "Неодређено"
 
 msgid "Undefined"
 msgstr "Неодређено"
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr "Површно"
 
 msgid "Marginal"
 msgstr "Површно"
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 msgid "Ultimate"
 msgstr "Основно"
 
 msgid "Ultimate"
 msgstr "Основно"
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Важећи потпис %s (Поверљиво: %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "Важећи потпис %s (Поверљиво: %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "Потпису је истекао рок важности"
 
 msgid "The signature has expired"
 msgstr "Потпису је истекао рок важности"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr "Кључ који је коришћен за потписивање овог дела је истекао"
 
 msgid "The key that was used to sign this part has expired"
 msgstr "Кључ који је коришћен за потписивање овог дела је истекао"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "Нису сви потписи важећи"
 
 msgid "Not all signatures are valid"
 msgstr "Нису сви потписи важећи"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "Овај потпис није исправан"
 
 msgid "This signature is invalid"
 msgstr "Овај потпис није исправан"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "Нема кључ за верификацију овог потписа"
 
 msgid "You have no key to verify this signature"
 msgstr "Нема кључ за верификацију овог потписа"
 

-#: src/sgpgme.c:131 src/sigstatus.c:222
-msgid "No signature found"
-msgstr "Потпис није пронађен"
-
-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "Настала је грешка"
 
 msgid "An error occured"
 msgstr "Настала је грешка"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "Потпис није проверен"
 
 msgid "The signature has not been checked"
 msgstr "Потпис није проверен"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Потпис је направио %s користећи %s број кључа %s\n"
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "Потпис је направио %s користећи %s број кључа %s\n"
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Добар потпис од „%s“\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "Добар потпис од „%s“\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Потпис од „%s“ је истекао\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "Потпис од „%s“ је истекао\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ЛОШ (невалидан) потпис од „%s“\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "ЛОШ (невалидан) потпис од „%s“\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                такође познат као „%s“\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "                такође познат као „%s“\n"
 

-#: src/sgpgme.c:194
+#: src/sgpgme.c:203

 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Отисак примарног кључа: %s\n"
 
 #, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Отисак примарног кључа: %s\n"
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Потпис је истекао %s\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "Потпис је истекао %s\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Потпис је истекао %s\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "Потпис је истекао %s\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7281,43 +7784,6 @@ msgstr ""
 "GnuPG није правилно инсталиран, или га треба надоградити.\n"
 "OpenPGP подршка је искључена."
 
 "GnuPG није правилно инсталиран, или га треба надоградити.\n"
 "OpenPGP подршка је искључена."
 

-#: src/sigstatus.c:129
-msgid "Checking signature"
-msgstr "Провера потписа"
-
-#: src/sigstatus.c:196
-#, c-format
-msgid "%s%s%s from \"%s\""
-msgstr "%s%s%s са „%s“"
-
-#: src/sigstatus.c:219
-msgid "Oops: Signature not verified"
-msgstr "На жалост, потпис није верификован"
-
-#: src/sigstatus.c:225
-msgid "Good signature"
-msgstr "Добар (валидан) потпис"
-
-#: src/sigstatus.c:228
-msgid "Good signature but it has expired"
-msgstr "Исправан потпис али је истекао рок важности"
-
-#: src/sigstatus.c:231
-msgid "Good signature but the key has expired"
-msgstr "Исправан потпис али је истакао рок важности кључа"
-
-#: src/sigstatus.c:234
-msgid "BAD signature"
-msgstr "ЛОШ (невалидан) потпис"
-
-#: src/sigstatus.c:237
-msgid "No public key to verify the signature"
-msgstr "Нема јавног кључа за верификацију потписа"
-
-#: src/sigstatus.c:240
-msgid "Error verifying the signature"
-msgstr "Настала је грешка при верификацији потписа"
-

 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Извор поруке"
 #: src/sourcewindow.c:66
 msgid "Source of the message"
 msgstr "Извор поруке"


@@ -7343,10 +7809,6 @@ msgstr "Уклони сертификат"
 msgid "Do you really want to delete this certificate?"
 msgstr "Да ли заиста желите да уклоните сертификат?"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "Да ли заиста желите да уклоните сертификат?"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "(Тема уклоњена регуларним изразом)"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Претражи поруку(е)"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Претражи поруку(е)"


@@ -7371,327 +7833,351 @@ msgstr "Дошао сам до почетка листе. Да наставим
 msgid "End of list reached; continue from beginning?"
 msgstr "Дошао сам до краја листе. Да наставим од почетка?"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "Дошао сам до краја листе. Да наставим од почетка?"
 

-#: src/summaryview.c:402
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/_Одговори"
 
 msgid "/_Reply"
 msgstr "/_Одговори"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/Одговори_..."
 
 msgid "/Repl_y to"
 msgstr "/Одговори_..."
 

-#: src/summaryview.c:404
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/Одговори_.../_Свима"
 
 msgid "/Repl_y to/_all"
 msgstr "/Одговори_.../_Свима"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/Одговори_.../_Пошиљаоцу"
 
 msgid "/Repl_y to/_sender"
 msgstr "/Одговори_.../_Пошиљаоцу"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/Одговори_.../На _дописно друштво"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/Одговори_.../На _дописно друштво"
 

-#: src/summaryview.c:408
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "/Настави-на и одговори"
 
 msgid "/Follow-up and reply to"
 msgstr "/Настави-на и одговори"
 

-#: src/summaryview.c:410
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "/_Проследи"
 
 msgid "/_Forward"
 msgstr "/_Проследи"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/П_реусмери"
 
 msgid "/Redirect"
 msgstr "/П_реусмери"
 

-#: src/summaryview.c:413
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/Пре_уреди"
 
 msgid "/Re-_edit"
 msgstr "/Пре_уреди"
 

-#: src/summaryview.c:415
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/Пр_емести..."
 
 msgid "/M_ove..."
 msgstr "/Пр_емести..."
 

-#: src/summaryview.c:416
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/_Копирај..."
 
 msgid "/_Copy..."
 msgstr "/_Копирај..."
 

-#: src/summaryview.c:418
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/Укини поруку на диск_усионој групи"
 
 msgid "/Cancel a news message"
 msgstr "/Укини поруку на диск_усионој групи"
 

-#: src/summaryview.c:419
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "/_Изврши означене акције"
 
 msgid "/E_xecute"
 msgstr "/_Изврши означене акције"
 

-#: src/summaryview.c:421
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/_Обележавање"
 
 msgid "/_Mark"
 msgstr "/_Обележавање"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/_Обележавање/_Постави ознаку"
 
 msgid "/_Mark/_Mark"
 msgstr "/_Обележавање/_Постави ознаку"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/_Обележавање/_Уклони ознаку"
 
 msgid "/_Mark/_Unmark"
 msgstr "/_Обележавање/_Уклони ознаку"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/_Обележавање/---"
 
 msgid "/_Mark/---"
 msgstr "/_Обележавање/---"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Обележавање/Обележи као _непрочитано"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Обележавање/Обележи као _непрочитано"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Обележавање/Обележи _као прочитано"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Обележавање/Обележи _као прочитано"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/_Обележавање/Обележи _све као прочитано"
 
 msgid "/_Mark/Mark all read"
 msgstr "/_Обележавање/Обележи _све као прочитано"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/_Обележавање/_Игнориши нит расправе"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/_Обележавање/_Игнориши нит расправе"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/_Обележавање/Укини и_гнорисање нити расправе"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/_Обележавање/Укини и_гнорисање нити расправе"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/_Обележавање/_Закључај"
 
 msgid "/_Mark/Lock"
 msgstr "/_Обележавање/_Закључај"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/_Обележавање/_Откључај"
 
 msgid "/_Mark/Unlock"
 msgstr "/_Обележавање/_Откључај"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/_Боја поруке"
 
 msgid "/Color la_bel"
 msgstr "/_Боја поруке"
 

-#: src/summaryview.c:435
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "/_Додај пошиљаоца у адресар"
 
 msgid "/Add sender to address boo_k"
 msgstr "/_Додај пошиљаоца у адресар"
 

-#: src/summaryview.c:437
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgid "/Create f_ilter rule"

-msgstr "/Ð\9aÑ\80еиÑ\80аÑ\98 _Ñ\84илÑ\82еÑ\80 пÑ\80авило"
+msgstr "/Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила _Ñ\84илÑ\82еÑ\80а"

 
 

-#: src/summaryview.c:438
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgid "/Create f_ilter rule/_Automatically"

-msgstr "/Ð\9aÑ\80еиÑ\80аÑ\98 _Ñ\84илÑ\82еÑ\80 пÑ\80авило/_Аутоматски"
+msgstr "/Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила _Ñ\84илÑ\82еÑ\80а/_Аутоматски"

 
 

-#: src/summaryview.c:440
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgid "/Create f_ilter rule/by _From"

-msgstr "/Ð\9aÑ\80еиÑ\80аÑ\98 _Ñ\84илÑ\82еÑ\80 пÑ\80авило/по _пошиљаоцу"
+msgstr "/Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила _Ñ\84илÑ\82еÑ\80а/по _Ð\9fошиљаоцу"

 
 

-#: src/summaryview.c:442
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgid "/Create f_ilter rule/by _To"

-msgstr "/Ð\9aÑ\80еиÑ\80аÑ\98 _Ñ\84илÑ\82еÑ\80 пÑ\80авило/по п_римаоцу"
+msgstr "/Ð\9fÑ\80авÑ\99еÑ\9aе пÑ\80авила _Ñ\84илÑ\82еÑ\80а/по Ð\9f_римаоцу"

 
 

-#: src/summaryview.c:444
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgid "/Create f_ilter rule/by _Subject"

-msgstr "/Креирај _филтер правило/по _теми"
+msgstr "/Прављење правила _филтера/по _Теми"
+
+#: src/summaryview.c:448
+msgid "/Create processing rule"
+msgstr "/Прављење правила за обраду"
+
+#: src/summaryview.c:449
+msgid "/Create processing rule/_Automatically"
+msgstr "/Прављење правила за обраду/_Аутоматски"
+
+#: src/summaryview.c:451
+msgid "/Create processing rule/by _From"
+msgstr "/Прављење правила за обраду/по _Пошиљаоцу"
+
+#: src/summaryview.c:453
+msgid "/Create processing rule/by _To"
+msgstr "/Прављење правила за обраду/по П_римаоцу"

 
 

-#: src/summaryview.c:450
+#: src/summaryview.c:455
+msgid "/Create processing rule/by _Subject"
+msgstr "/Прављење правила за обраду/по _Теми"
+
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "/П_реглед/Прикажи _извор поруке у новом прозору"
 
 msgid "/_View/_Source"
 msgstr "/П_реглед/Прикажи _извор поруке у новом прозору"
 

-#: src/summaryview.c:451
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "/П_реглед/_Комплетно заглавље поруке"
 
 msgid "/_View/All _header"
 msgstr "/П_реглед/_Комплетно заглавље поруке"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/_Штампа..."
 
 msgid "/_Print..."
 msgstr "/_Штампа..."
 

-#: src/summaryview.c:456
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/Одабери _све"
 
 msgid "/Select _all"
 msgstr "/Одабери _све"
 

-#: src/summaryview.c:457
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Одабери _нит расправе"
 
 msgid "/Select t_hread"
 msgstr "/Одабери _нит расправе"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:472

 msgid "M"
 msgstr "М"
 
 msgid "M"
 msgstr "М"
 

-#: src/summaryview.c:468
+#: src/summaryview.c:479

 msgid "No."
 msgstr "Порука"
 
 msgid "No."
 msgstr "Порука"
 

-#: src/summaryview.c:470
+#: src/summaryview.c:481

 msgid "L"
 msgstr "Л"
 
 msgid "L"
 msgstr "Л"
 

-#: src/summaryview.c:479
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "све поруке"
 
 msgid "all messages"
 msgstr "све поруке"
 

-#: src/summaryview.c:480
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "поруке које су веће од #"
 
 msgid "messages whose age is greater than #"
 msgstr "поруке које су веће од #"
 

-#: src/summaryview.c:481
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "поруке које су мање од #"
 
 msgid "messages whose age is less than #"
 msgstr "поруке које су мање од #"
 

-#: src/summaryview.c:482
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "поруке које садрже „С“ у телу поруке"
 
 msgid "messages which contain S in the message body"
 msgstr "поруке које садрже „С“ у телу поруке"
 

-#: src/summaryview.c:483
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "поруке које садрже „С“ у заглављу или телу поруке"
 
 msgid "messages which contain S in the whole message"
 msgstr "поруке које садрже „С“ у заглављу или телу поруке"
 

-#: src/summaryview.c:484
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr "поруке чија је Копија: за „С“"
 
 msgid "messages carbon-copied to S"
 msgstr "поруке чија је Копија: за „С“"
 

-#: src/summaryview.c:485
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "поруке у којима је Прималац: или Копија: за „С“"
 
 msgid "message is either to: or cc: to S"
 msgstr "поруке у којима је Прималац: или Копија: за „С“"
 

-#: src/summaryview.c:486
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "поруке које имају ознаку „уклоњено“"
 
 msgid "deleted messages"
 msgstr "поруке које имају ознаку „уклоњено“"
 

-#: src/summaryview.c:487
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "поруке које садрже „С“ у пољу Пошиљалац:"
 
 msgid "messages which contain S in the Sender field"
 msgstr "поруке које садрже „С“ у пољу Пошиљалац:"
 

-#: src/summaryview.c:488
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "тачно ако се „С“ успешно изврши"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "тачно ако се „С“ успешно изврши"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "поруке чији је аутор „С“"
 
 msgid "messages originating from user S"
 msgstr "поруке чији је аутор „С“"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "прослеђене поруке"
 
 msgid "forwarded messages"
 msgstr "прослеђене поруке"
 

-#: src/summaryview.c:491
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "поруке које садрже поље заглавља „С“"
 
 msgid "messages which contain header S"
 msgstr "поруке које садрже поље заглавља „С“"
 

-#: src/summaryview.c:492
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "поруке које садрже „С“ у „Message-Id“ пољу заглавља"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "поруке које садрже „С“ у „Message-Id“ пољу заглавља"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "поруке које садрже „С“ у „In-Reply-To“ пољу заглавља"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "поруке које садрже „С“ у „In-Reply-To“ пољу заглавља"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "закључане поруке"
 
 msgid "locked messages"
 msgstr "закључане поруке"
 

-#: src/summaryview.c:495
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "поруке које су у дискусионој групи „С“"
 
 msgid "messages which are in newsgroup S"
 msgstr "поруке које су у дискусионој групи „С“"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "нове поруке"
 
 msgid "new messages"
 msgstr "нове поруке"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "старе поруке"
 
 msgid "old messages"
 msgstr "старе поруке"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "поруке на које постоје одговори (реплике)"
 
 msgid "messages which have been replied to"
 msgstr "поруке на које постоје одговори (реплике)"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "прочитане поруке"
 
 msgid "read messages"
 msgstr "прочитане поруке"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "поруке које садрже „С“ у теми поруке"
 
 msgid "messages which contain S in subject"
 msgstr "поруке које садрже „С“ у теми поруке"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "поруке са # бодова"
 
 msgid "messages whose score is equal to #"
 msgstr "поруке са # бодова"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "поруке са више од # бодова"
 
 msgid "messages whose score is greater than #"
 msgstr "поруке са више од # бодова"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "поруке са мање од # бодова"
 
 msgid "messages whose score is lower than #"
 msgstr "поруке са мање од # бодова"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "поруке величине # бајтова"
 
 msgid "messages whose size is equal to #"
 msgstr "поруке величине # бајтова"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "поруке веће од # бајтова"
 
 msgid "messages whose size is greater than #"
 msgstr "поруке веће од # бајтова"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "поруке мање од # бајтова"
 
 msgid "messages whose size is smaller than #"
 msgstr "поруке мање од # бајтова"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "поруке послате за „С“"
 
 msgid "messages which have been sent to S"
 msgstr "поруке послате за „С“"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "обележене поруке"
 
 msgid "marked messages"
 msgstr "обележене поруке"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "непрочитане поруке"
 
 msgid "unread messages"
 msgstr "непрочитане поруке"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "поруке које садрже „С“ у „References“ пољу заглавља"
 
 msgid "messages which contain S in References header"
 msgstr "поруке које садрже „С“ у „References“ пољу заглавља"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:522
+msgid "messages returning 0 when passed to command"
+msgstr "порука враћа 0 при слању команди"
+
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "поруке које садрже „С“ у „X-Label“ пољу заглавља"
 
 msgid "messages which contain S in X-Label header"
 msgstr "поруке које садрже „С“ у „X-Label“ пољу заглавља"
 

-#: src/summaryview.c:513
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "логички оператор И"
 
 msgid "logical AND operator"
 msgstr "логички оператор И"
 

-#: src/summaryview.c:514
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "логички оператор ИЛИ"
 
 msgid "logical OR operator"
 msgstr "логички оператор ИЛИ"
 

-#: src/summaryview.c:515
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "логички оператор НЕ"
 
 msgid "logical NOT operator"
 msgstr "логички оператор НЕ"
 

-#: src/summaryview.c:516
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "величина слова је битна"
 
 msgid "case sensitive search"
 msgstr "величина слова је битна"
 

-#: src/summaryview.c:523
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "Карактери за напредну претрагу"
 
 msgid "Extended Search symbols"
 msgstr "Карактери за напредну претрагу"
 

-#: src/summaryview.c:573
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "Укључи/искључи поље за брзу претрагу"
 
 msgid "Toggle quick-search bar"
 msgstr "Укључи/искључи поље за брзу претрагу"
 

-#: src/summaryview.c:657
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "Карактери напредне брзе претраге"
 
 msgid "Extended Symbols"
 msgstr "Карактери напредне брзе претраге"
 

-#: src/summaryview.c:919
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Процесирање означених порука"
 
 msgid "Process mark"
 msgstr "Процесирање означених порука"
 

-#: src/summaryview.c:920
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr ""
 "Неке поруке су обележене за извршавње одређених акција.\n"
 msgid "Some marks are left. Process it?"
 msgstr ""
 "Неке поруке су обележене за извршавње одређених акција.\n"


@@ -7700,190 +8186,190 @@ msgstr ""
 "Ако одговорите са „Не“, по напуштању програма означене акције ће бити "
 "занемарене!"
 
 "Ако одговорите са „Не“, по напуштању програма означене акције ће бити "
 "занемарене!"
 

-#: src/summaryview.c:963
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Претражујем директоријум (%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Претражујем директоријум (%s)..."
 

-#: src/summaryview.c:1383 src/summaryview.c:1427
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "Нема више непрочитаних порука"
 
 msgid "No more unread messages"
 msgstr "Нема више непрочитаних порука"
 

-#: src/summaryview.c:1384
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "Нема непрочитаних порука. Да наставим претрагу од краја?"
 
 msgid "No unread message found. Search from the end?"
 msgstr "Нема непрочитаних порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1396 src/summaryview.c:1440
+#: src/summaryview.c:1416 src/summaryview.c:1460

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Интерна грешка: неочекивана вредност за prefs_common.next_unread_msg_dialog\n"
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 "Интерна грешка: неочекивана вредност за prefs_common.next_unread_msg_dialog\n"
 

-#: src/summaryview.c:1404
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "Нема непрочитаних порука."
 
 msgid "No unread messages."
 msgstr "Нема непрочитаних порука."
 

-#: src/summaryview.c:1428
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "Нема непрочитаних порука. Да идем у следећи директоријум?"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "Нема непрочитаних порука. Да идем у следећи директоријум?"
 

-#: src/summaryview.c:1470 src/summaryview.c:1494
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "Нема више нових порука"
 
 msgid "No more new messages"
 msgstr "Нема више нових порука"
 

-#: src/summaryview.c:1471
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "Нема више нових порука. Да наставим претрагу од краја?"
 
 msgid "No new message found. Search from the end?"
 msgstr "Нема више нових порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1480
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "Нема нових порука."
 
 msgid "No new messages."
 msgstr "Нема нових порука."
 

-#: src/summaryview.c:1495
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "Нема нових порука. Да идем у следећи директоријум?"
 
 msgid "No new message found. Go to next folder?"
 msgstr "Нема нових порука. Да идем у следећи директоријум?"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "Претражи поново"
 
 msgid "Search again"
 msgstr "Претражи поново"
 

-#: src/summaryview.c:1526 src/summaryview.c:1551
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "Нема више обележених порука"
 
 msgid "No more marked messages"
 msgstr "Нема више обележених порука"
 

-#: src/summaryview.c:1527
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "Нема обележених порука. Да наставим претрагу од краја?"
 
 msgid "No marked message found. Search from the end?"
 msgstr "Нема обележених порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1536 src/summaryview.c:1561
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "Нема обележених порука."
 
 msgid "No marked messages."
 msgstr "Нема обележених порука."
 

-#: src/summaryview.c:1552
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "Нема обележених порука. Да наставим претрагу од почетка?"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "Нема обележених порука. Да наставим претрагу од почетка?"
 

-#: src/summaryview.c:1576 src/summaryview.c:1601
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "Нема више означених порука"
 
 msgid "No more labeled messages"
 msgstr "Нема више означених порука"
 

-#: src/summaryview.c:1577
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "Нема означених порука. Да наставим претрагу од краја?"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "Нема означених порука. Да наставим претрагу од краја?"
 

-#: src/summaryview.c:1586 src/summaryview.c:1611
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "Нема означених порука."
 
 msgid "No labeled messages."
 msgstr "Нема означених порука."
 

-#: src/summaryview.c:1602
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "Нема означених порука. Да наставим претрагу од почетка?"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Нема означених порука. Да наставим претрагу од почетка?"
 

-#: src/summaryview.c:1815
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "Ређање порука по теми..."
 
 msgid "Attracting messages by subject..."
 msgstr "Ређање порука по теми..."
 

-#: src/summaryview.c:1962
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d уклоњен"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d уклоњен"
 

-#: src/summaryview.c:1966
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d премештен"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d премештен"
 

-#: src/summaryview.c:1967 src/summaryview.c:1974
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr ", "
 
 msgid ", "
 msgstr ", "
 

-#: src/summaryview.c:1972
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копиран"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копиран"
 

-#: src/summaryview.c:1987
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr " одабрана порука"
 
 msgid " item selected"
 msgstr " одабрана порука"
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr " одабране(их) поруке(а)"
 
 msgid " items selected"
 msgstr " одабране(их) поруке(а)"
 

-#: src/summaryview.c:2005
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "нових: %d, непрочитаних: %d, укупно: %d (%s)"
 

-#: src/summaryview.c:2175
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "Сортирање листе порука..."
 
 msgid "Sorting summary..."
 msgstr "Сортирање листе порука..."
 

-#: src/summaryview.c:2245
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "Обележавам поруке у листи на основу информација у порукама..."
 
 msgid "Setting summary from message data..."
 msgstr "Обележавам поруке у листи на основу информација у порукама..."
 

-#: src/summaryview.c:2374
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(Без датума)"
 
 msgid "(No Date)"
 msgstr "(Без датума)"
 

-#: src/summaryview.c:2997
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Ви нисте аутор поруке\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Ви нисте аутор поруке\n"
 

-#: src/summaryview.c:3084
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "Уклони поруку(е)"
 
 msgid "Delete message(s)"
 msgstr "Уклони поруку(е)"
 

-#: src/summaryview.c:3085
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Да ли заиста желите да уклоните поруку(е) из смећа?"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Да ли заиста желите да уклоните поруку(е) из смећа?"
 

-#: src/summaryview.c:3127
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "Уклањање дуплираних порука..."
 
 msgid "Deleting duplicated messages..."
 msgstr "Уклањање дуплираних порука..."
 

-#: src/summaryview.c:3241
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "Дестинација је иста као и тренутни директоријум."
 
 msgid "Destination is same as current folder."
 msgstr "Дестинација је иста као и тренутни директоријум."
 

-#: src/summaryview.c:3318
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "Дестинација за копирање је иста као и тренутни директоријум."
 
 msgid "Destination to copy is same as current folder."
 msgstr "Дестинација за копирање је иста као и тренутни директоријум."
 

-#: src/summaryview.c:3368
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Одабирање свих порука..."
 
 msgid "Selecting all messages..."
 msgstr "Одабирање свих порука..."
 

-#: src/summaryview.c:3426
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "Додај или препиши"
 
 msgid "Append or Overwrite"
 msgstr "Додај или препиши"
 

-#: src/summaryview.c:3427
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "Додај на или препиши постојећу датотеку?"
 
 msgid "Append or overwrite existing file?"
 msgstr "Додај на или препиши постојећу датотеку?"
 

-#: src/summaryview.c:3428
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "Додај на"
 
 msgid "Append"
 msgstr "Додај на"
 

-#: src/summaryview.c:3719
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "Креирање нити расправа..."
 
 msgid "Building threads..."
 msgstr "Креирање нити расправа..."
 

-#: src/summaryview.c:3817
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "Укидање нити расправа..."
 
 msgid "Unthreading..."
 msgstr "Укидање нити расправа..."
 

-#: src/summaryview.c:3950
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "Нема дефинисаних прафила филтера."
 
 msgid "No filter rules defined."
 msgstr "Нема дефинисаних прафила филтера."
 

-#: src/summaryview.c:3959
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "Филтрирање у току..."
 
 msgid "Filtering..."
 msgstr "Филтрирање у току..."
 

-#: src/summaryview.c:5274
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -7892,219 +8378,302 @@ msgstr ""
 "Грешка у регуларним изразима (regexp):\n"
 "%s"
 
 "Грешка у регуларним изразима (regexp):\n"
 "%s"
 

-#: src/textview.c:567
+#: src/textview.c:574
+msgid "This message can't be displayed.\n"
+msgstr "Ова порука не може бити приказана.\n"
+
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr "Следеће акције се могу извршити употербом "
 
 msgid "The following can be performed on this part by "
 msgstr "Следеће акције се могу извршити употербом "
 

-#: src/textview.c:568
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "десног клика мишем на иконицу или ставку у листи:\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "десног клика мишем на иконицу или ставку у листи:\n"
 

-#: src/textview.c:570
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Да сачувате прилог одаберите „Сачувај ако...“ (Пречица: „y“)\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Да сачувате прилог одаберите „Сачувај ако...“ (Пречица: „y“)\n"
 

-#: src/textview.c:571
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Да се прикаже обичан текст одаберите „Прикажи као текст“ "
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Да се прикаже обичан текст одаберите „Прикажи као текст“ "
 

-#: src/textview.c:572
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(Пречица: „t“)\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(Пречица: „t“)\n"
 

-#: src/textview.c:573
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    За отварање у екстерном програму одаберите „Отвори“ "
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    За отварање у екстерном програму одаберите „Отвори“ "
 

-#: src/textview.c:574
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Пречица: „l“),\n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(Пречица: „l“),\n"
 

-#: src/textview.c:575
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (алтернатива је двоклик, или средњи клик "
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (алтернатива је двоклик, или средњи клик "
 

-#: src/textview.c:576
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "мишем),\n"
 
 msgid "mouse button),\n"
 msgstr "мишем),\n"
 

-#: src/textview.c:577
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    или „Отвори помоћу...“ (Пречица: „o“)\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    или „Отвори помоћу...“ (Пречица: „o“)\n"
 

-#: src/toolbar.c:154 src/toolbar.c:1543
+#: src/textview.c:1957
+#, c-format
+msgid ""
+"The real URL (%s) is different from\n"
+"the apparent URL (%s).\n"
+"Open it anyway?"
+msgstr ""
+"Прави УРЛ (%s) се разликује од\n"
+"добијеног УРЛ-а (%s).\n"
+"Да ли да га ипак отворим?"
+
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "Преузми пошту за одабране налоге"
 
 msgid "Receive Mail on all Accounts"
 msgstr "Преузми пошту за одабране налоге"
 

-#: src/toolbar.c:155 src/toolbar.c:1549
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "Преузми пошту за текући налог"
 
 msgid "Receive Mail on current Account"
 msgstr "Преузми пошту за текући налог"
 

-#: src/toolbar.c:156 src/toolbar.c:1555
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Пошаљи припремљене поруке"
 
 msgid "Send Queued Message(s)"
 msgstr "Пошаљи припремљене поруке"
 

-#: src/toolbar.c:157 src/toolbar.c:1568
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "Креирај поруку е-поште"
 
 msgid "Compose Email"
 msgstr "Креирај поруку е-поште"
 

-#: src/toolbar.c:158 src/toolbar.c:1572
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "Креирај поруку за дискусиону групу"
 
 msgid "Compose News"
 msgstr "Креирај поруку за дискусиону групу"
 

-#: src/toolbar.c:159 src/toolbar.c:1578
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "Одговори на поруку"
 
 msgid "Reply to Message"
 msgstr "Одговори на поруку"
 

-#: src/toolbar.c:160 src/toolbar.c:1599
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "Одговори пошиљаоцу"
 
 msgid "Reply to Sender"
 msgstr "Одговори пошиљаоцу"
 

-#: src/toolbar.c:161 src/toolbar.c:1620
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "Одговори свима"
 
 msgid "Reply to All"
 msgstr "Одговори свима"
 

-#: src/toolbar.c:162 src/toolbar.c:1641
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "Одговори на дописно друштво"
 
 msgid "Reply to Mailing-list"
 msgstr "Одговори на дописно друштво"
 

-#: src/toolbar.c:163 src/toolbar.c:1662
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "Проследи поруку"
 
 msgid "Forward Message"
 msgstr "Проследи поруку"
 

-#: src/toolbar.c:164 src/toolbar.c:1683
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "Уклони поруку"
 
 msgid "Delete Message"
 msgstr "Уклони поруку"
 

-#: src/toolbar.c:165 src/toolbar.c:375 src/toolbar.c:1689
-msgid "Execute"
-msgstr "Изврши означене акције"
-
-#: src/toolbar.c:166 src/toolbar.c:1695
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "Иди на следећу поруку"
 
 msgid "Goto Next Message"
 msgstr "Иди на следећу поруку"
 

-#: src/toolbar.c:170 src/toolbar.c:1703
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "Одмах пошаљи поруку"
 
 msgid "Send Message"
 msgstr "Одмах пошаљи поруку"
 

-#: src/toolbar.c:171 src/toolbar.c:1709
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "Сачувај у директоријуму „Припремљено“ и пошаљи касније"
 
 msgid "Put into queue folder and send later"
 msgstr "Сачувај у директоријуму „Припремљено“ и пошаљи касније"
 

-#: src/toolbar.c:172 src/toolbar.c:1715
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "Сачувај у директоријуму „Недовршено“"
 
 msgid "Save to draft folder"
 msgstr "Сачувај у директоријуму „Недовршено“"
 

-#: src/toolbar.c:173 src/toolbar.c:1721
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "Уметни датотеку као текст у поруку"
 
 msgid "Insert file"
 msgstr "Уметни датотеку као текст у поруку"
 

-#: src/toolbar.c:174 src/toolbar.c:1727
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "Приложи датотеку уз поруку"
 
 msgid "Attach file"
 msgstr "Приложи датотеку уз поруку"
 

-#: src/toolbar.c:175 src/toolbar.c:1733
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "Потпиши поруку"
 
 msgid "Insert signature"
 msgstr "Потпиши поруку"
 

-#: src/toolbar.c:176 src/toolbar.c:1739
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "Измена поруке у екстерном уређивачу текста"
 
 msgid "Edit with external editor"
 msgstr "Измена поруке у екстерном уређивачу текста"
 

-#: src/toolbar.c:177 src/toolbar.c:1745
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "Прелом свих дугих линија"
 
 msgid "Wrap all long lines"
 msgstr "Прелом свих дугих линија"
 

-#: src/toolbar.c:180
+#: src/toolbar.c:183 src/toolbar.c:1550
+msgid "Check spelling"
+msgstr "Провера правописа"
+
+#: src/toolbar.c:185

 msgid "Sylpheed Actions Feature"
 msgstr "Силфед Акције"
 
 msgid "Sylpheed Actions Feature"
 msgstr "Силфед Акције"
 

-#: src/toolbar.c:200
+#: src/toolbar.c:205

 msgid "/Reply with _quote"
 msgstr "/Одговор _са цитатом"
 
 msgid "/Reply with _quote"
 msgstr "/Одговор _са цитатом"
 

-#: src/toolbar.c:201
+#: src/toolbar.c:206

 msgid "/_Reply without quote"
 msgstr "/Одговор _без цитата"
 
 msgid "/_Reply without quote"
 msgstr "/Одговор _без цитата"
 

-#: src/toolbar.c:205
+#: src/toolbar.c:210

 msgid "/Reply to all with _quote"
 msgstr "/Одговор свима _са цитатом"
 
 msgid "/Reply to all with _quote"
 msgstr "/Одговор свима _са цитатом"
 

-#: src/toolbar.c:206
+#: src/toolbar.c:211

 msgid "/_Reply to all without quote"
 msgstr "/Одговор свима _без цитата"
 
 msgid "/_Reply to all without quote"
 msgstr "/Одговор свима _без цитата"
 

-#: src/toolbar.c:210
+#: src/toolbar.c:215

 msgid "/Reply to list with _quote"
 msgstr "/Одговор на дописно друштво _са цитатом"
 
 msgid "/Reply to list with _quote"
 msgstr "/Одговор на дописно друштво _са цитатом"
 

-#: src/toolbar.c:211
+#: src/toolbar.c:216

 msgid "/_Reply to list without quote"
 msgstr "/Одговор на дописно друштво _без цитата"
 
 msgid "/_Reply to list without quote"
 msgstr "/Одговор на дописно друштво _без цитата"
 

-#: src/toolbar.c:215
+#: src/toolbar.c:220

 msgid "/Reply to sender with _quote"
 msgstr "/Одговор пошиљаоцу _са цитатом"
 
 msgid "/Reply to sender with _quote"
 msgstr "/Одговор пошиљаоцу _са цитатом"
 

-#: src/toolbar.c:216
+#: src/toolbar.c:221

 msgid "/_Reply to sender without quote"
 msgstr "/Одговор пошиљаоцу _без цитата"
 
 msgid "/_Reply to sender without quote"
 msgstr "/Одговор пошиљаоцу _без цитата"
 

-#: src/toolbar.c:220
-msgid "/_Forward message (inline style)"
-msgstr "/Проследи поруку (_линијски стил)"
+#: src/toolbar.c:226
+msgid "/For_ward as attachment"
+msgstr "/Прос_леди као прилог"

 
 

-#: src/toolbar.c:221
-msgid "/Forward message as _attachment"
-msgstr "/Проследи поруку (као _прилог)"
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/П_реусмери"

 
 

-#: src/toolbar.c:363
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "Преузми"
 
 msgid "Get"
 msgstr "Преузми"
 

-#: src/toolbar.c:364
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "Преузми са свих налога"
 
 msgid "Get All"
 msgstr "Преузми са свих налога"
 

-#: src/toolbar.c:367
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "Е-пошта"
 
 msgid "Email"
 msgstr "Е-пошта"
 

-#: src/toolbar.c:369 src/toolbar.c:461
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "Одговори"
 
 msgid "Reply"
 msgstr "Одговори"
 

-#: src/toolbar.c:370 src/toolbar.c:462
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "Свима"
 
 msgid "All"
 msgstr "Свима"
 

-#: src/toolbar.c:371 src/toolbar.c:463
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "Пошиљалац"
 
 msgid "Sender"
 msgstr "Пошиљалац"
 

-#: src/toolbar.c:372 src/toolbar.c:464
-msgid "Forward"
-msgstr "Проследи"
-
-#: src/toolbar.c:414
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "Пошаљи касније"
 
 msgid "Send later"
 msgstr "Пошаљи касније"
 

-#: src/toolbar.c:415
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "Недовршено"
 
 msgid "Draft"
 msgstr "Недовршено"
 

-#: src/toolbar.c:418
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "Прилог"
 
 msgid "Attach"
 msgstr "Прилог"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:430
+msgid "Editor"
+msgstr "Уређивач текста"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "Прелом линија"
 
 msgid "Linewrap"
 msgstr "Прелом линија"
 

-#: src/toolbar.c:1560
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "Дискусионе групе"
 
 msgid "News"
 msgstr "Дискусионе групе"
 

+#~ msgid "/_Scoring..."
+#~ msgstr "/_Бодовање..."
+
+#~ msgid "/_Message/Get new ma_il"
+#~ msgstr "/_Порука/Преузми но_ву пошту"
+
+#~ msgid "Icon theme"
+#~ msgstr "Графичка тема икона"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Small"
+#~ msgstr "Мали"
+
+#~ msgid "Normal"
+#~ msgstr "Нормалан"
+
+#~ msgid "/_Forward message (inline style)"
+#~ msgstr "/Проследи поруку (_линијски стил)"
+
+#~ msgid "/Forward message as _attachment"
+#~ msgstr "/Проследи поруку (као _прилог)"
+
+#~ msgid "/S_coring..."
+#~ msgstr "/Б_одовање..."
+
+#~ msgid "Go online"
+#~ msgstr "Умрежи се"
+
+#~ msgid "Show signature check result in a popup window"
+#~ msgstr "Прикажи резултат провере потписа у искачућем прозору"
+
+#~ msgid "Current scoring rules"
+#~ msgstr "Постојећа правила бодовања"
+
+#~ msgid "Important score"
+#~ msgstr "Важне поруке имају"
+
+#~ msgid "Match string is not valid."
+#~ msgstr "Улов за тражење није ваљан."
+
+#~ msgid "Checking signature"
+#~ msgstr "Провера потписа"
+
+#~ msgid "%s%s%s from \"%s\""
+#~ msgstr "%s%s%s са „%s“"
+
+#~ msgid "Oops: Signature not verified"
+#~ msgstr "На жалост, потпис није верификован"
+
+#~ msgid "Good signature"
+#~ msgstr "Добар (валидан) потпис"
+
+#~ msgid "Good signature but it has expired"
+#~ msgstr "Исправан потпис али је истекао рок важности"
+
+#~ msgid "Good signature but the key has expired"
+#~ msgstr "Исправан потпис али је истакао рок важности кључа"
+
+#~ msgid "BAD signature"
+#~ msgstr "ЛОШ (невалидан) потпис"
+
+#~ msgid "No public key to verify the signature"
+#~ msgstr "Нема јавног кључа за верификацију потписа"
+
+#~ msgid "Error verifying the signature"
+#~ msgstr "Настала је грешка при верификацији потписа"

diff --git a/po/zh_CN.po b/po/zh_CN.po
index d1b118aa079402c856ac010643778101cb80d81a..3416621b23db4905820cf39cdfaed6a46994a495 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed-claw\n"

-"POT-Creation-Date: 2003-12-18 05:54+0000\n"
+"POT-Creation-Date: 2004-02-05 07:38+0000\n"

 "PO-Revision-Date: 2003-09-22 14:05+0000\n"
 "Last-Translator: Hansom Young <glyoung@users.sourceforge.net>\n"
 "Language-Team: Hansom Young <glyoung@users.sourceforge.net> \n"
 "PO-Revision-Date: 2003-09-22 14:05+0000\n"
 "Last-Translator: Hansom Young <glyoung@users.sourceforge.net>\n"
 "Language-Team: Hansom Young <glyoung@users.sourceforge.net> \n"


@@ -37,7 +37,7 @@ msgstr ""
 "À´¾ö¶¨ÊÇ·ñÔÚ¡¸È«²¿¼ì²é¡¹Ê±Òª¼ì²é¸ÃÕʺŵÄÓʼþ¡£"
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635
 "À´¾ö¶¨ÊÇ·ñÔÚ¡¸È«²¿¼ì²é¡¹Ê±Òª¼ì²é¸ÃÕʺŵÄÓʼþ¡£"
 
 #: src/account.c:601 src/addressadd.c:182 src/addressbook.c:635

-#: src/compose.c:4765 src/compose.c:4935 src/editaddress.c:774
+#: src/compose.c:4760 src/compose.c:4930 src/editaddress.c:774

 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194
 #: src/editaddress.c:823 src/editbook.c:174 src/editgroup.c:257
 #: src/editjpilot.c:295 src/editldap.c:396 src/editvcard.c:210
 #: src/importmutt.c:261 src/importpine.c:261 src/mimeview.c:194


@@ -45,7 +45,7 @@ msgstr ""
 msgid "Name"
 msgstr "Ãû³Æ"
 
 msgid "Name"
 msgstr "Ãû³Æ"
 

-#: src/account.c:602 src/prefs_account.c:928
+#: src/account.c:602 src/prefs_account.c:923

 msgid "Protocol"
 msgstr "ͨѶЭÒé"
 
 msgid "Protocol"
 msgstr "ͨѶЭÒé"
 


@@ -91,10 +91,10 @@ msgstr "
 msgid " Set as default account "
 msgstr " ÉèΪȱʡÕʺŠ"
 
 msgid " Set as default account "
 msgstr " ÉèΪȱʡÕʺŠ"
 

-#: src/account.c:682 src/action.c:1205 src/addressbook.c:1008
+#: src/account.c:682 src/action.c:1212 src/addressbook.c:1008

 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196
 #: src/addressbook.c:3120 src/addressbook.c:3124 src/addressbook.c:3162
 #: src/browseldap.c:307 src/crash.c:242 src/exphtmldlg.c:196

-#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:674
+#: src/expldifdlg.c:203 src/gtk/pluginwindow.c:224 src/inc.c:691

 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "¹Ø±Õ"
 #: src/message_search.c:135 src/summary_search.c:211
 msgid "Close"
 msgstr "¹Ø±Õ"


@@ -117,25 +117,27 @@ msgid "Do you really want to delete this account?"
 msgstr "ÄúÈ·¶¨ÒªÉ¾³ýÕâ¸öÕʺÅÂð£¿"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265
 msgstr "ÄúÈ·¶¨ÒªÉ¾³ýÕâ¸öÕʺÅÂð£¿"
 
 #: src/account.c:908 src/addressbook.c:1031 src/addressbook.c:2265

-#: src/addressbook.c:2293 src/compose.c:2232 src/compose.c:3077
-#: src/compose.c:3577 src/compose.c:6050 src/compose.c:6358
+#: src/addressbook.c:2293 src/compose.c:2236 src/compose.c:3081
+#: src/compose.c:3581 src/compose.c:6050 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/inc.c:169 src/inc.c:259
-#: src/mainwindow.c:1464 src/message_search.c:198 src/prefs_actions.c:525
-#: src/prefs_customheader.c:543 src/prefs_filtering.c:855
-#: src/prefs_filtering.c:1003 src/prefs_matcher.c:1667
-#: src/prefs_template.c:544 src/ssl_manager.c:271 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1865 src/toolbar.c:2079
+#: src/folderview.c:1866 src/folderview.c:2210 src/folderview.c:2265
+#: src/folderview.c:2354 src/folderview.c:2489 src/folderview.c:2527
+#: src/inc.c:169 src/inc.c:257 src/inc.c:283 src/mainwindow.c:1566
+#: src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/ssl_manager.c:271 src/summary_search.c:328
+#: src/summaryview.c:938 src/summaryview.c:1406 src/summaryview.c:1450
+#: src/summaryview.c:1493 src/summaryview.c:1517 src/summaryview.c:1549
+#: src/summaryview.c:1574 src/summaryview.c:1599 src/summaryview.c:1624
+#: src/summaryview.c:3113 src/textview.c:1961 src/toolbar.c:1870

 msgid "Yes"
 msgstr "ÊÇ"
 
 msgid "Yes"
 msgstr "ÊÇ"
 

-#: src/account.c:908 src/compose.c:3577 src/compose.c:6050
-#: src/folderview.c:2129 src/folderview.c:2184 src/folderview.c:2275
-#: src/folderview.c:2410 src/folderview.c:2448 src/ssl_manager.c:271
+#: src/account.c:908 src/compose.c:3581 src/compose.c:6050
+#: src/folderview.c:2210 src/folderview.c:2265 src/folderview.c:2354
+#: src/folderview.c:2489 src/folderview.c:2527 src/ssl_manager.c:271

 msgid "+No"
 msgstr "+·ñ"
 
 msgid "+No"
 msgstr "+·ñ"
 


@@ -152,15 +154,16 @@ msgstr "
 msgid "Can't get part of multipart message"
 msgstr "ÎÞ·¨¶ÁÈ¡·ûºÏÓʼþµÄÒ»²¿·Ö¡£"
 
 msgid "Can't get part of multipart message"
 msgstr "ÎÞ·¨¶ÁÈ¡·ûºÏÓʼþµÄÒ»²¿·Ö¡£"
 

-#: src/action.c:488
+#: src/action.c:495

 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."
 #, c-format
 msgid ""
 "The selected action cannot be used in the compose window\n"
 "because it contains %%f, %%F, %%as or %%p."

-msgstr "±»Ñ¡ÔñµÄ¶¯×÷²»ÄÜÓÃÓÚÓʼþ׫д´°¿Ú\n"
+msgstr ""
+"±»Ñ¡ÔñµÄ¶¯×÷²»ÄÜÓÃÓÚÓʼþ׫д´°¿Ú\n"

 "ÒòÆä°üº¬ %%f, %%F, %%as»òÕß%%p¡£"
 
 "ÒòÆä°üº¬ %%f, %%F, %%as»òÕß%%p¡£"
 

-#: src/action.c:776
+#: src/action.c:783

 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"
 #, c-format
 msgid ""
 "Command could not be started. Pipe creation failed.\n"


@@ -169,7 +172,7 @@ msgstr ""
 "ÎÞ·¨Æô¶¯ÃüÁî¡£´´½¨¹ÜµÀʧ°Ü¡£\n"
 "%s"
 
 "ÎÞ·¨Æô¶¯ÃüÁî¡£´´½¨¹ÜµÀʧ°Ü¡£\n"
 "%s"
 

-#: src/action.c:861
+#: src/action.c:868

 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"
 #, c-format
 msgid ""
 "Could not fork to execute the following command:\n"


@@ -180,48 +183,49 @@ msgstr ""
 "%s\n"
 "%s"
 
 "%s\n"
 "%s"
 

-#: src/action.c:1088
+#: src/action.c:1095

 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 
 #, c-format
 msgid "--- Running: %s\n"
 msgstr ""
 

-#: src/action.c:1092
+#: src/action.c:1099

 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 
 #, c-format
 msgid "--- Ended: %s\n"
 msgstr ""
 

-#: src/action.c:1128
+#: src/action.c:1135

 msgid "Action's input/output"
 msgstr "¶¯×÷ÊäÈë/Êä³ö"
 
 msgid "Action's input/output"
 msgstr "¶¯×÷ÊäÈë/Êä³ö"
 

-#: src/action.c:1174
+#: src/action.c:1181

 msgid " Send "
 msgstr " ·¢ËÍ "
 
 msgid " Send "
 msgstr " ·¢ËÍ "
 

-#: src/action.c:1194
+#: src/action.c:1201

 msgid "Completed %v/%u"
 msgstr "ÒÑÍê³É %v/%u"
 
 msgid "Completed %v/%u"
 msgstr "ÒÑÍê³É %v/%u"
 

-#: src/action.c:1204
+#: src/action.c:1211

 msgid "Abort"
 msgstr "ÖÐÖ¹"
 
 msgid "Abort"
 msgstr "ÖÐÖ¹"
 

-#: src/action.c:1353
+#: src/action.c:1360

 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "(`%%h' will be replaced with the argument)\n"
 "  %s"
 msgstr ""
 #, fuzzy, c-format
 msgid ""
 "Enter the argument for the following action:\n"
 "(`%%h' will be replaced with the argument)\n"
 "  %s"
 msgstr ""

-"ÇëÊäÈëÓÃÓÚ´òÓ¡µÄÃüÁîÐÐ:\n"
-"(`%s' ½«±»Ì滻ΪÎļþÃû)"
+"ÇëÊäÈëÓÃÓÚÏÂÊö¶¯×÷µÄ²ÎÊý:\n"
+"(`%%h' ½«±»ËùÊäÈëµÄ²ÎÊýÌæ»»)\n"
+"  %s"

 
 

-#: src/action.c:1358
+#: src/action.c:1365

 msgid "Action's hidden user argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý(ÊäÈëʱ²»»ØÏÔ)"
 
 msgid "Action's hidden user argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý(ÊäÈëʱ²»»ØÏÔ)"
 

-#: src/action.c:1362
-#,  c-format
+#: src/action.c:1369
+#, c-format

 msgid ""
 "Enter the argument for the following action:\n"
 "(`%%u' will be replaced with the argument)\n"
 msgid ""
 "Enter the argument for the following action:\n"
 "(`%%u' will be replaced with the argument)\n"


@@ -231,7 +235,7 @@ msgstr ""
 "(`%%u' ½«±»ÊäÈëµÄ²ÎÊýÌæ»»)\n"
 "  %s"
 
 "(`%%u' ½«±»ÊäÈëµÄ²ÎÊýÌæ»»)\n"
 "  %s"
 

-#: src/action.c:1367
+#: src/action.c:1374

 msgid "Action's user argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý"
 
 msgid "Action's user argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý"
 


@@ -239,7 +243,7 @@ msgstr "
 msgid "Add to address book"
 msgstr "½«µØÖ·¼ÓÈëµØÖ·²¾"
 
 msgid "Add to address book"
 msgstr "½«µØÖ·¼ÓÈëµØÖ·²¾"
 

-#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:432
+#: src/addressadd.c:194 src/select-keys.c:302 src/toolbar.c:433

 msgid "Address"
 msgstr "µØÖ·"
 
 msgid "Address"
 msgstr "µØÖ·"
 


@@ -253,7 +257,7 @@ msgid "Select Address Book Folder"
 msgstr "Ñ¡ÔñµØÖ·²¾×ÊÁϼÐ"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190
 msgstr "Ñ¡ÔñµØÖ·²¾×ÊÁϼÐ"
 
 #: src/addressadd.c:240 src/addrgather.c:506 src/alertpanel.c:190

-#: src/alertpanel.c:324 src/compose.c:3202 src/compose.c:5872
+#: src/alertpanel.c:324 src/compose.c:3206 src/compose.c:5872

 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193
 #: src/editaddress.c:513 src/editbook.c:204 src/editgroup.c:369
 #: src/editjpilot.c:344 src/editldap_basedn.c:212 src/editldap.c:341
 #: src/editvcard.c:239 src/export.c:188 src/foldersel.c:193


@@ -261,10 +265,10 @@ msgstr "ѡ
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287
 #: src/gtk/description_window.c:121 src/gtk/gtkaspell.c:1425
 #: src/gtk/gtkaspell.c:2378 src/gtk/prefswindow.c:318
 #: src/gtk/sslcertwindow.c:230 src/import.c:190 src/importmutt.c:287

-#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:654
-#: src/mainwindow.c:2223 src/messageview.c:908 src/mimeview.c:1018
+#: src/importpine.c:287 src/inputdialog.c:203 src/main.c:653
+#: src/mainwindow.c:2357 src/messageview.c:918 src/mimeview.c:1018

 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161
 #: src/mimeview.c:1082 src/passphrase.c:130 src/prefs_actions.c:161

-#: src/prefs_common.c:2758 src/prefs_common.c:2927 src/prefs_common.c:3185
+#: src/prefs_common.c:2642 src/prefs_common.c:2811 src/prefs_common.c:3069

 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313
 #: src/prefs_customheader.c:157 src/prefs_display_header.c:194
 #: src/prefs_filtering_action.c:278 src/prefs_filtering.c:199
 #: src/prefs_gtk.c:451 src/prefs_matcher.c:370 src/prefs_summary_column.c:313


@@ -273,7 +277,7 @@ msgid "OK"
 msgstr "È·¶¨"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507
 msgstr "È·¶¨"
 
 #: src/addressadd.c:241 src/addressbook.c:2281 src/addrgather.c:507

-#: src/compose.c:3202 src/compose.c:5873 src/compose.c:6553 src/compose.c:6591
+#: src/compose.c:3206 src/compose.c:5873 src/compose.c:6572 src/compose.c:6610

 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746
 #: src/editaddress.c:514 src/editbook.c:205 src/editgroup.c:370
 #: src/editjpilot.c:345 src/editldap_basedn.c:213 src/editldap.c:342
 #: src/editvcard.c:240 src/exphtmldlg.c:725 src/expldifdlg.c:746


@@ -281,18 +285,19 @@ msgstr "ȷ
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204
 #: src/gtk/gtkaspell.c:1434 src/gtk/prefswindow.c:319
 #: src/gtk/progressdialog.c:77 src/import.c:191 src/importldif.c:1034
 #: src/importmutt.c:288 src/importpine.c:288 src/inputdialog.c:204

-#: src/main.c:654 src/mainwindow.c:2223 src/messageview.c:908
+#: src/main.c:653 src/mainwindow.c:2357 src/messageview.c:918

 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134
 #: src/mimeview.c:1019 src/mimeview.c:1083 src/passphrase.c:134

-#: src/prefs_actions.c:162 src/prefs_common.c:2759 src/prefs_common.c:3186
+#: src/prefs_actions.c:162 src/prefs_common.c:2643 src/prefs_common.c:3070

 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314
 #: src/prefs_customheader.c:158 src/prefs_display_header.c:195
 #: src/prefs_filtering_action.c:279 src/prefs_filtering.c:200
 #: src/prefs_gtk.c:452 src/prefs_matcher.c:371 src/prefs_summary_column.c:314

-#: src/prefs_template.c:264 src/select-keys.c:332 src/summaryview.c:935
-#: src/summaryview.c:3453
+#: src/prefs_template.c:264 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/select-keys.c:332 src/summaryview.c:938
+#: src/summaryview.c:3416

 msgid "Cancel"
 msgstr "È¡Ïû"
 
 msgid "Cancel"
 msgstr "È¡Ïû"
 

-#: src/addressbook.c:363 src/compose.c:507 src/mainwindow.c:425
+#: src/addressbook.c:363 src/compose.c:510 src/mainwindow.c:435

 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/Îļþ(_F)"
 #: src/messageview.c:143
 msgid "/_File"
 msgstr "/Îļþ(_F)"


@@ -313,8 +318,8 @@ msgstr "/
 msgid "/_File/New _Server"
 msgstr "/Îļþ(_F)/ÐÂÔö·þÎñÆ÷(_S)"
 
 msgid "/_File/New _Server"
 msgstr "/Îļþ(_F)/ÐÂÔö·þÎñÆ÷(_S)"
 

-#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:511
-#: src/mainwindow.c:439 src/mainwindow.c:442 src/mainwindow.c:444
+#: src/addressbook.c:372 src/addressbook.c:375 src/compose.c:514
+#: src/mainwindow.c:449 src/mainwindow.c:452 src/mainwindow.c:454

 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/Îļþ(_F)/---"
 #: src/messageview.c:146
 msgid "/_File/---"
 msgstr "/Îļþ(_F)/---"


@@ -331,12 +336,12 @@ msgstr "/
 msgid "/_File/_Save"
 msgstr "/Îļþ(_F)/±£´æ(_S)"
 
 msgid "/_File/_Save"
 msgstr "/Îļþ(_F)/±£´æ(_S)"
 

-#: src/addressbook.c:377 src/compose.c:512 src/messageview.c:147
+#: src/addressbook.c:377 src/compose.c:515 src/messageview.c:147

 msgid "/_File/_Close"
 msgstr "/Îļþ(_F)/¹Ø±Õ(_C)"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422
 msgid "/_File/_Close"
 msgstr "/Îļþ(_F)/¹Ø±Õ(_C)"
 
 #: src/addressbook.c:378 src/addressbook.c:408 src/addressbook.c:422

-#: src/compose.c:514 src/mainwindow.c:448 src/messageview.c:149
+#: src/compose.c:517 src/mainwindow.c:458 src/messageview.c:149

 msgid "/_Edit"
 msgstr "/±à¼­(_E)"
 
 msgid "/_Edit"
 msgstr "/±à¼­(_E)"
 


@@ -344,17 +349,17 @@ msgstr "/
 msgid "/_Edit/C_ut"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_u)"
 
 msgid "/_Edit/C_ut"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_u)"
 

-#: src/addressbook.c:380 src/compose.c:519 src/mainwindow.c:449
+#: src/addressbook.c:380 src/compose.c:522 src/mainwindow.c:459

 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/±à¼­(_E)/¿½±´(_C)"
 
 #: src/messageview.c:150
 msgid "/_Edit/_Copy"
 msgstr "/±à¼­(_E)/¿½±´(_C)"
 

-#: src/addressbook.c:381 src/compose.c:520
+#: src/addressbook.c:381 src/compose.c:523

 msgid "/_Edit/_Paste"
 msgstr "/±à¼­(_E)/Õ³Ìù(_P)"
 
 msgid "/_Edit/_Paste"
 msgstr "/±à¼­(_E)/Õ³Ìù(_P)"
 

-#: src/addressbook.c:382 src/compose.c:517 src/compose.c:600
-#: src/mainwindow.c:452 src/messageview.c:152
+#: src/addressbook.c:382 src/compose.c:520 src/compose.c:603
+#: src/mainwindow.c:462 src/messageview.c:152

 msgid "/_Edit/---"
 msgstr "/±à¼­(_E)/---"
 
 msgid "/_Edit/---"
 msgstr "/±à¼­(_E)/---"
 


@@ -390,10 +395,10 @@ msgstr "/
 msgid "/_Address/_Delete"
 msgstr "/µØÖ·(_A)/ɾ³ý(_D)"
 
 msgid "/_Address/_Delete"
 msgstr "/µØÖ·(_A)/ɾ³ý(_D)"
 

-#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:665
-#: src/mainwindow.c:685 src/mainwindow.c:687 src/mainwindow.c:690
-#: src/mainwindow.c:693 src/mainwindow.c:697 src/messageview.c:265
-#: src/messageview.c:284
+#: src/addressbook.c:391 src/addressbook.c:395 src/mainwindow.c:678
+#: src/mainwindow.c:698 src/mainwindow.c:700 src/mainwindow.c:703
+#: src/mainwindow.c:706 src/mainwindow.c:710 src/messageview.c:265
+#: src/messageview.c:286

 msgid "/_Tools/---"
 msgstr "/¹¤¾ß(_T)/---"
 
 msgid "/_Tools/---"
 msgstr "/¹¤¾ß(_T)/---"
 


@@ -417,13 +422,13 @@ msgstr "/
 msgid "/_Tools/Export LDI_F..."
 msgstr "/¹¤¾ß(_T)/Êä³ö LDI_F..."
 
 msgid "/_Tools/Export LDI_F..."
 msgstr "/¹¤¾ß(_T)/Êä³ö LDI_F..."
 

-#: src/addressbook.c:398 src/compose.c:677 src/mainwindow.c:723
-#: src/messageview.c:287
+#: src/addressbook.c:398 src/compose.c:680 src/mainwindow.c:736
+#: src/messageview.c:289

 msgid "/_Help"
 msgstr "/°ïÖú(_H)"
 
 msgid "/_Help"
 msgstr "/°ïÖú(_H)"
 

-#: src/addressbook.c:399 src/compose.c:678 src/mainwindow.c:733
-#: src/messageview.c:288
+#: src/addressbook.c:399 src/compose.c:681 src/mainwindow.c:746
+#: src/messageview.c:290

 msgid "/_Help/_About"
 msgstr "/°ïÖú(_H)/¹ØÓÚ(_A)"
 
 msgid "/_Help/_About"
 msgstr "/°ïÖú(_H)/¹ØÓÚ(_A)"
 


@@ -440,19 +445,19 @@ msgid "/New _Folder"
 msgstr "/ÐÂ×ÊÁϼÐ(_F)"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421
 msgstr "/ÐÂ×ÊÁϼÐ(_F)"
 
 #: src/addressbook.c:407 src/addressbook.c:410 src/addressbook.c:421

-#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:501
-#: src/folderview.c:288 src/folderview.c:290 src/folderview.c:300
-#: src/folderview.c:305 src/folderview.c:309 src/folderview.c:311
-#: src/folderview.c:320 src/folderview.c:325 src/folderview.c:329
-#: src/folderview.c:331 src/folderview.c:340 src/folderview.c:344
-#: src/folderview.c:347 src/folderview.c:349 src/summaryview.c:410
-#: src/summaryview.c:413 src/summaryview.c:415 src/summaryview.c:421
-#: src/summaryview.c:435 src/summaryview.c:456 src/summaryview.c:462
-#: src/summaryview.c:465
+#: src/addressbook.c:424 src/addressbook.c:428 src/compose.c:504
+#: src/folderview.c:292 src/folderview.c:294 src/folderview.c:303
+#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
+#: src/folderview.c:323 src/folderview.c:328 src/folderview.c:330
+#: src/folderview.c:334 src/folderview.c:336 src/folderview.c:345
+#: src/folderview.c:349 src/folderview.c:351 src/folderview.c:354
+#: src/folderview.c:356 src/summaryview.c:411 src/summaryview.c:414
+#: src/summaryview.c:416 src/summaryview.c:422 src/summaryview.c:436
+#: src/summaryview.c:457 src/summaryview.c:463 src/summaryview.c:466

 msgid "/---"
 msgstr "/---"
 
 msgid "/---"
 msgstr "/---"
 

-#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:418
+#: src/addressbook.c:409 src/addressbook.c:423 src/summaryview.c:419

 msgid "/_Delete"
 msgstr "/ɾ³ý(_D)"
 
 msgid "/_Delete"
 msgstr "/ɾ³ý(_D)"
 


@@ -477,7 +482,8 @@ msgid "/_Browse Entry"
 msgstr "/²é¿´ÏîÄ¿(_B)"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118
 msgstr "/²é¿´ÏîÄ¿(_B)"
 
 #: src/addressbook.c:446 src/crash.c:444 src/crash.c:463 src/importldif.c:118

-#: src/sgpgme.c:86
+#: src/prefs_themes.c:620 src/prefs_themes.c:652 src/prefs_themes.c:653
+#: src/sgpgme.c:95

 msgid "Unknown"
 msgstr "δ֪"
 
 msgid "Unknown"
 msgstr "δ֪"
 


@@ -561,8 +567,8 @@ msgstr "LDAP
 msgid "E-Mail address"
 msgstr "E-Mail µØÖ·"
 
 msgid "E-Mail address"
 msgstr "E-Mail µØÖ·"
 

-#: src/addressbook.c:640 src/prefs_common.c:2380 src/toolbar.c:181
-#: src/toolbar.c:1767
+#: src/addressbook.c:640 src/prefs_common.c:2271 src/toolbar.c:181
+#: src/toolbar.c:1543

 msgid "Address book"
 msgstr "ͨѶ¼"
 
 msgid "Address book"
 msgstr "ͨѶ¼"
 


@@ -576,7 +582,7 @@ msgstr "
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781
 #: src/prefs_display_header.c:337 src/prefs_filtering_action.c:135
 #: src/prefs_filtering_action.c:462 src/prefs_filtering.c:293
 #: src/prefs_matcher.c:570 src/prefs_template.c:229 src/prefs_toolbar.c:781

-#: src/ssl_manager.c:92 src/toolbar.c:382 src/toolbar.c:474
+#: src/ssl_manager.c:92 src/toolbar.c:383 src/toolbar.c:475

 msgid "Delete"
 msgstr "ɾ³ý"
 
 msgid "Delete"
 msgstr "ɾ³ý"
 


@@ -584,18 +590,18 @@ msgstr "ɾ
 msgid "Lookup"
 msgstr "²éÕÒ"
 
 msgid "Lookup"
 msgstr "²éÕÒ"
 

-#: src/addressbook.c:789 src/compose.c:1445 src/compose.c:3253
-#: src/compose.c:4582 src/compose.c:5289 src/headerview.c:53
+#: src/addressbook.c:789 src/compose.c:1448 src/compose.c:3257
+#: src/compose.c:4574 src/compose.c:5279 src/headerview.c:53

 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "To:"
 
 #: src/prefs_template.c:173 src/summary_search.c:157
 msgid "To:"
 msgstr "To:"
 

-#: src/addressbook.c:793 src/compose.c:1429 src/compose.c:3252
+#: src/addressbook.c:793 src/compose.c:1432 src/compose.c:3256

 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 
 #: src/prefs_template.c:175
 msgid "Cc:"
 msgstr "Cc:"
 

-#: src/addressbook.c:797 src/compose.c:1432 src/prefs_template.c:176
+#: src/addressbook.c:797 src/compose.c:1435 src/prefs_template.c:176

 msgid "Bcc:"
 msgstr "Bcc:"
 
 msgid "Bcc:"
 msgstr "Bcc:"
 


@@ -612,16 +618,18 @@ msgid "Really delete the address(es)?"
 msgstr "È·¶¨É¾³ýÓʼþµØÖ·?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293
 msgstr "È·¶¨É¾³ýÓʼþµØÖ·?"
 
 #: src/addressbook.c:1031 src/addressbook.c:2265 src/addressbook.c:2293

-#: src/compose.c:2232 src/compose.c:3077 src/compose.c:6358
+#: src/compose.c:2236 src/compose.c:3081 src/compose.c:6371

 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250
 #: src/exphtmldlg.c:185 src/expldifdlg.c:192 src/expldifdlg.c:250

-#: src/inc.c:169 src/inc.c:259 src/mainwindow.c:1464 src/message_search.c:198
-#: src/prefs_actions.c:525 src/prefs_customheader.c:543
-#: src/prefs_filtering.c:855 src/prefs_filtering.c:1003
-#: src/prefs_matcher.c:1667 src/prefs_template.c:544 src/summary_search.c:328
-#: src/summaryview.c:935 src/summaryview.c:1403 src/summaryview.c:1447
-#: src/summaryview.c:1490 src/summaryview.c:1514 src/summaryview.c:1546
-#: src/summaryview.c:1571 src/summaryview.c:1596 src/summaryview.c:1621
-#: src/summaryview.c:3111 src/textview.c:1866 src/toolbar.c:2079
+#: src/folderview.c:1866 src/inc.c:169 src/inc.c:257 src/inc.c:283
+#: src/mainwindow.c:1566 src/message_search.c:198 src/prefs_actions.c:525
+#: src/prefs_customheader.c:547 src/prefs_filtering.c:853
+#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1667
+#: src/prefs_template.c:544 src/prefs_themes.c:422 src/prefs_themes.c:472
+#: src/prefs_themes.c:479 src/summary_search.c:328 src/summaryview.c:938
+#: src/summaryview.c:1406 src/summaryview.c:1450 src/summaryview.c:1493
+#: src/summaryview.c:1517 src/summaryview.c:1549 src/summaryview.c:1574
+#: src/summaryview.c:1599 src/summaryview.c:1624 src/summaryview.c:3113
+#: src/textview.c:1961 src/toolbar.c:1870

 msgid "No"
 msgstr "²»"
 
 msgid "No"
 msgstr "²»"
 


@@ -731,7 +739,7 @@ msgstr "
 msgid "Search '%s'"
 msgstr "ËÑË÷ '%s'"
 
 msgid "Search '%s'"
 msgstr "ËÑË÷ '%s'"
 

-#: src/addressbook.c:3794 src/prefs_common.c:984
+#: src/addressbook.c:3794 src/prefs_common.c:980

 msgid "Interface"
 msgstr "½çÃæ"
 
 msgid "Interface"
 msgstr "½çÃæ"
 


@@ -752,8 +760,8 @@ msgstr "
 msgid "Group"
 msgstr "Ⱥ×é"
 
 msgid "Group"
 msgstr "Ⱥ×é"
 

-#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:384
-#: src/prefs_account.c:2126
+#: src/addressbook.c:3874 src/exporthtml.c:913 src/folderview.c:391
+#: src/prefs_account.c:2123

 msgid "Folder"
 msgstr "Óʼþ¼Ð"
 
 msgid "Folder"
 msgstr "Óʼþ¼Ð"
 


@@ -829,8 +837,8 @@ msgstr ""
 msgid "Address Count"
 msgstr "ÓʼþµØÖ·ÊýÄ¿"
 
 msgid "Address Count"
 msgstr "ÓʼþµØÖ·ÊýÄ¿"
 

-#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:491
-#: src/sgpgme.c:279 src/textview.c:1863
+#: src/addrgather.c:527 src/alertpanel.c:155 src/messageview.c:503
+#: src/sgpgme.c:288 src/textview.c:1961

 msgid "Warning"
 msgstr "¾¯¸æ"
 
 msgid "Warning"
 msgstr "¾¯¸æ"
 


@@ -859,12 +867,12 @@ msgstr "
 msgid "Personal address"
 msgstr "¸öÈËÓʼþµØÖ·"
 
 msgid "Personal address"
 msgstr "¸öÈËÓʼþµØÖ·"
 

-#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:636
+#: src/alertpanel.c:142 src/compose.c:6050 src/main.c:635

 msgid "Notice"
 msgstr "×¢Òâ"
 
 msgid "Notice"
 msgstr "×¢Òâ"
 

-#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3577 src/inc.c:556
-#: src/sgpgme.c:98 src/sgpgme.c:111 src/sgpgme.c:137
+#: src/alertpanel.c:168 src/alertpanel.c:190 src/compose.c:3581 src/inc.c:573
+#: src/sgpgme.c:107 src/sgpgme.c:120 src/sgpgme.c:146

 msgid "Error"
 msgstr "´íÎó"
 
 msgid "Error"
 msgstr "´íÎó"
 


@@ -1001,7 +1009,7 @@ msgstr ""
 "(È¡Ïû\"%s\"Æ«ºÃÉèÖÃ)¡£\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409
 "(È¡Ïû\"%s\"Æ«ºÃÉèÖÃ)¡£\n"
 
 #: src/common/ssl_certificate.c:371 src/common/ssl_certificate.c:409

-#: src/prefs_common.c:1123
+#: src/prefs_common.c:1119

 msgid "Don't popup error dialog on receive error"
 msgstr "½ÓÊÕÓдíÎóʱ²»ÒªÏÔʾ´íÎóѶϢ"
 
 msgid "Don't popup error dialog on receive error"
 msgstr "½ÓÊÕÓдíÎóʱ²»ÒªÏÔʾ´íÎóѶϢ"
 


@@ -1026,6 +1034,10 @@ msgstr ""
 "\n"
 "Ä¿Ç°»ØÓ¦µÄ·þÎñÆ÷¿ÉÄÜÒѾ­²»ÊÇͬһ¸ö¡£"
 
 "\n"
 "Ä¿Ç°»ØÓ¦µÄ·þÎñÆ÷¿ÉÄÜÒѾ­²»ÊÇͬһ¸ö¡£"
 

+#: src/common/string_match.c:73
+msgid "(Subject cleared by RegExp)"
+msgstr "£¨Ö÷Ìâ±»RegExpÇå³ýÁË£©"
+

 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"
 #: src/common/utils.c:178
 #, c-format
 msgid "%dB"


@@ -1046,355 +1058,355 @@ msgstr ""
 msgid "%.2fGB"
 msgstr ""
 
 msgid "%.2fGB"
 msgstr ""
 

-#: src/compose.c:499
+#: src/compose.c:502

 msgid "/_Add..."
 msgstr "/ÐÂÔö(_A)..."
 
 msgid "/_Add..."
 msgstr "/ÐÂÔö(_A)..."
 

-#: src/compose.c:500
+#: src/compose.c:503

 msgid "/_Remove"
 msgstr "/ɾ³ý(_R)"
 
 msgid "/_Remove"
 msgstr "/ɾ³ý(_R)"
 

-#: src/compose.c:502 src/folderview.c:291 src/folderview.c:313
-#: src/folderview.c:333 src/folderview.c:351
+#: src/compose.c:505 src/folderview.c:295 src/folderview.c:316
+#: src/folderview.c:338 src/folderview.c:358

 msgid "/_Properties..."
 msgstr "/ÊôÐÔ(_P)..."
 
 msgid "/_Properties..."
 msgstr "/ÊôÐÔ(_P)..."
 

-#: src/compose.c:508
+#: src/compose.c:511

 msgid "/_File/_Attach file"
 msgstr "/Îļþ(_F)/¸½¼ÓÎļþ(_A)"
 
 msgid "/_File/_Attach file"
 msgstr "/Îļþ(_F)/¸½¼ÓÎļþ(_A)"
 

-#: src/compose.c:509
+#: src/compose.c:512

 msgid "/_File/_Insert file"
 msgstr "/Îļþ(_F)/²åÈëÎļþ(_I)"
 
 msgid "/_File/_Insert file"
 msgstr "/Îļþ(_F)/²åÈëÎļþ(_I)"
 

-#: src/compose.c:510
+#: src/compose.c:513

 msgid "/_File/Insert si_gnature"
 msgstr "/Îļþ(_F)/²åÈëÇ©Ãû(_g)"
 
 msgid "/_File/Insert si_gnature"
 msgstr "/Îļþ(_F)/²åÈëÇ©Ãû(_g)"
 

-#: src/compose.c:515
+#: src/compose.c:518

 msgid "/_Edit/_Undo"
 msgstr "/±à¼­(_E)/³·Ïû(_U)"
 
 msgid "/_Edit/_Undo"
 msgstr "/±à¼­(_E)/³·Ïû(_U)"
 

-#: src/compose.c:516
+#: src/compose.c:519

 msgid "/_Edit/_Redo"
 msgstr "/±à¼­(_E)/Öظ´Ç°Ò»¸ö¶¯×÷(_R)"
 
 msgid "/_Edit/_Redo"
 msgstr "/±à¼­(_E)/Öظ´Ç°Ò»¸ö¶¯×÷(_R)"
 

-#: src/compose.c:518
+#: src/compose.c:521

 msgid "/_Edit/Cu_t"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_t)"
 
 msgid "/_Edit/Cu_t"
 msgstr "/±à¼­(_E)/¼ôÇÐ(_t)"
 

-#: src/compose.c:521
+#: src/compose.c:524

 msgid "/_Edit/Paste as _quotation"
 msgstr "/±à¼­(_E)/Õ³ÌùΪÒýÎÄ(_q)"
 
 msgid "/_Edit/Paste as _quotation"
 msgstr "/±à¼­(_E)/Õ³ÌùΪÒýÎÄ(_q)"
 

-#: src/compose.c:523 src/mainwindow.c:450 src/messageview.c:151
+#: src/compose.c:526 src/mainwindow.c:460 src/messageview.c:151

 msgid "/_Edit/Select _all"
 msgstr "/±à¼­(_E)/È«Ñ¡(_a)"
 
 msgid "/_Edit/Select _all"
 msgstr "/±à¼­(_E)/È«Ñ¡(_a)"
 

-#: src/compose.c:524
+#: src/compose.c:527

 msgid "/_Edit/A_dvanced"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)"
 
 msgid "/_Edit/A_dvanced"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)"
 

-#: src/compose.c:525
+#: src/compose.c:528

 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö·û"
 
 msgid "/_Edit/A_dvanced/Move a character backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö·û"
 

-#: src/compose.c:530
+#: src/compose.c:533

 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö·û"
 
 msgid "/_Edit/A_dvanced/Move a character forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö·û"
 

-#: src/compose.c:535
+#: src/compose.c:538

 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö"
 
 msgid "/_Edit/A_dvanced/Move a word backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ºóÒÆÒ»×Ö"
 

-#: src/compose.c:540
+#: src/compose.c:543

 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö"
 
 msgid "/_Edit/A_dvanced/Move a word forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Ç°ÒÆÒ»×Ö"
 

-#: src/compose.c:545
+#: src/compose.c:548

 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐпªÍ·"
 
 msgid "/_Edit/A_dvanced/Move to beginning of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐпªÍ·"
 

-#: src/compose.c:550
+#: src/compose.c:553

 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐÐβ"
 
 msgid "/_Edit/A_dvanced/Move to end of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÐÐβ"
 

-#: src/compose.c:555
+#: src/compose.c:558

 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½Ç°Ò»ÐÐ"
 
 msgid "/_Edit/A_dvanced/Move to previous line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½Ç°Ò»ÐÐ"
 

-#: src/compose.c:560
+#: src/compose.c:563

 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÏÂÒ»ÐÐ"
 
 msgid "/_Edit/A_dvanced/Move to next line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ÒƵ½ÏÂÒ»ÐÐ"
 

-#: src/compose.c:565
+#: src/compose.c:568

 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö·û"
 
 msgid "/_Edit/A_dvanced/Delete a character backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö·û"
 

-#: src/compose.c:570
+#: src/compose.c:573

 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö·û"
 
 msgid "/_Edit/A_dvanced/Delete a character forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö·û"
 

-#: src/compose.c:575
+#: src/compose.c:578

 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö"
 
 msgid "/_Edit/A_dvanced/Delete a word backward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùºóɾ³ýÒ»×Ö"
 

-#: src/compose.c:580
+#: src/compose.c:583

 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö"
 
 msgid "/_Edit/A_dvanced/Delete a word forward"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/Íùǰɾ³ýÒ»×Ö"
 

-#: src/compose.c:585
+#: src/compose.c:588

 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 
 msgid "/_Edit/A_dvanced/Delete line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 

-#: src/compose.c:590
+#: src/compose.c:593

 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 
 msgid "/_Edit/A_dvanced/Delete entire line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/ɾ³ýÒ»ÐÐ"
 

-#: src/compose.c:595
+#: src/compose.c:598

 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/´ÓÓα괦Æðɾ³ýÖÁÐÐβ"
 
 msgid "/_Edit/A_dvanced/Delete to end of line"
 msgstr "/±à¼­(_E)/¸ß¼¶(_d)/´ÓÓα괦Æðɾ³ýÖÁÐÐβ"
 

-#: src/compose.c:601
+#: src/compose.c:604

 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/±à¼­(_E)/½«µ±Ç°¶ÎÂäÕÛÐÐ(_W)"
 
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/±à¼­(_E)/½«µ±Ç°¶ÎÂäÕÛÐÐ(_W)"
 

-#: src/compose.c:603
+#: src/compose.c:606

 msgid "/_Edit/Wrap all long _lines"
 msgstr "/±à¼­(_E)/½«ËùÓйý³¤µÄÐÐÕÛÐÐ(_l)"
 
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/±à¼­(_E)/½«ËùÓйý³¤µÄÐÐÕÛÐÐ(_l)"
 

-#: src/compose.c:605
+#: src/compose.c:608

 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/±à¼­(_E)/ʹÓÃÍⲿ±à¼­Æ÷(_x)"
 
 msgid "/_Edit/Edit with e_xternal editor"
 msgstr "/±à¼­(_E)/ʹÓÃÍⲿ±à¼­Æ÷(_x)"
 

-#: src/compose.c:608
+#: src/compose.c:611

 msgid "/_Spelling"
 msgstr "/ƴд(_S)"
 
 msgid "/_Spelling"
 msgstr "/ƴд(_S)"
 

-#: src/compose.c:609
+#: src/compose.c:612

 msgid "/_Spelling/_Check all or check selection"
 msgstr "/ƴд(_S)/¼ì²éÈ«ÎÄ»òÑ¡¶¨ÇøÓò(_C)"
 
 msgid "/_Spelling/_Check all or check selection"
 msgstr "/ƴд(_S)/¼ì²éÈ«ÎÄ»òÑ¡¶¨ÇøÓò(_C)"
 

-#: src/compose.c:611
+#: src/compose.c:614

 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/ƴд(_S)/ÏÔʾËùÓÐÆ´´íµÄµ¥´Ê(_H)"
 
 msgid "/_Spelling/_Highlight all misspelled words"
 msgstr "/ƴд(_S)/ÏÔʾËùÓÐÆ´´íµÄµ¥´Ê(_H)"
 

-#: src/compose.c:613
+#: src/compose.c:616

 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/ƴд(_S)/Ïòºó¼ì²éÆ´´íµÄµ¥´Ê(_b)"
 
 msgid "/_Spelling/Check _backwards misspelled word"
 msgstr "/ƴд(_S)/Ïòºó¼ì²éÆ´´íµÄµ¥´Ê(_b)"
 

-#: src/compose.c:615
+#: src/compose.c:618

 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/ƴд(_S)/ÏòÇ°¼ì²éÆ´´íµÄµ¥´Ê(_F)"
 
 msgid "/_Spelling/_Forward to next misspelled word"
 msgstr "/ƴд(_S)/ÏòÇ°¼ì²éÆ´´íµÄµ¥´Ê(_F)"
 

-#: src/compose.c:617
+#: src/compose.c:620

 msgid "/_Spelling/---"
 msgstr "/ƴд(_S)/---"
 
 msgid "/_Spelling/---"
 msgstr "/ƴд(_S)/---"
 

-#: src/compose.c:618
+#: src/compose.c:621

 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/ƴд(_S)/ÅäÖÃƴд¼ì²éÆ÷(_S)"
 
 msgid "/_Spelling/_Spelling Configuration"
 msgstr "/ƴд(_S)/ÅäÖÃƴд¼ì²éÆ÷(_S)"
 

-#: src/compose.c:622 src/mainwindow.c:456 src/messageview.c:156
-#: src/summaryview.c:457
+#: src/compose.c:625 src/mainwindow.c:466 src/messageview.c:156
+#: src/summaryview.c:458

 msgid "/_View"
 msgstr "/²é¿´(_V)"
 
 msgid "/_View"
 msgstr "/²é¿´(_V)"
 

-#: src/compose.c:623
+#: src/compose.c:626

 msgid "/_View/_To"
 msgstr "/²é¿´(_V)/ÊÕ¼þÕß(_T)"
 
 msgid "/_View/_To"
 msgstr "/²é¿´(_V)/ÊÕ¼þÕß(_T)"
 

-#: src/compose.c:624
+#: src/compose.c:627

 msgid "/_View/_Cc"
 msgstr "/²é¿´(_V)/³­ËÍ(_C)"
 
 msgid "/_View/_Cc"
 msgstr "/²é¿´(_V)/³­ËÍ(_C)"
 

-#: src/compose.c:625
+#: src/compose.c:628

 msgid "/_View/_Bcc"
 msgstr "/²é¿´(_V)/ÃØÃܳ­ËÍ(_B)"
 
 msgid "/_View/_Bcc"
 msgstr "/²é¿´(_V)/ÃØÃܳ­ËÍ(_B)"
 

-#: src/compose.c:626
+#: src/compose.c:629

 msgid "/_View/_Reply to"
 msgstr "/²é¿´(_V)/»Ø¸´(_R)"
 
 msgid "/_View/_Reply to"
 msgstr "/²é¿´(_V)/»Ø¸´(_R)"
 

-#: src/compose.c:627 src/compose.c:629 src/compose.c:631 src/mainwindow.c:474
-#: src/mainwindow.c:477 src/mainwindow.c:506 src/mainwindow.c:530
-#: src/mainwindow.c:612 src/mainwindow.c:616 src/messageview.c:238
+#: src/compose.c:630 src/compose.c:632 src/compose.c:634 src/mainwindow.c:484
+#: src/mainwindow.c:487 src/mainwindow.c:516 src/mainwindow.c:540
+#: src/mainwindow.c:622 src/mainwindow.c:626 src/messageview.c:238

 msgid "/_View/---"
 msgstr "/ÏÔʾ(_V)/---"
 
 msgid "/_View/---"
 msgstr "/ÏÔʾ(_V)/---"
 

-#: src/compose.c:628
+#: src/compose.c:631

 msgid "/_View/_Followup to"
 msgstr "/ÏÔʾ(_V)/»ØÓ¦ÎÄÕÂ(_F)"
 
 msgid "/_View/_Followup to"
 msgstr "/ÏÔʾ(_V)/»ØÓ¦ÎÄÕÂ(_F)"
 

-#: src/compose.c:630
+#: src/compose.c:633

 msgid "/_View/R_uler"
 msgstr "/ÏÔʾ(_V)/±ê³ß(_u)"
 
 msgid "/_View/R_uler"
 msgstr "/ÏÔʾ(_V)/±ê³ß(_u)"
 

-#: src/compose.c:632
+#: src/compose.c:635

 msgid "/_View/_Attachment"
 msgstr "/ÏÔʾ(_V)/¸½¼Ó(_A)"
 
 msgid "/_View/_Attachment"
 msgstr "/ÏÔʾ(_V)/¸½¼Ó(_A)"
 

-#: src/compose.c:634 src/mainwindow.c:619 src/messageview.c:242
+#: src/compose.c:637 src/mainwindow.c:629 src/messageview.c:242

 msgid "/_Message"
 msgstr "/Óʼþ(_M)"
 
 msgid "/_Message"
 msgstr "/Óʼþ(_M)"
 

-#: src/compose.c:635
+#: src/compose.c:638

 msgid "/_Message/_Send"
 msgstr "/Óʼþ(_M)/Ëͳö(_S)"
 
 msgid "/_Message/_Send"
 msgstr "/Óʼþ(_M)/Ëͳö(_S)"
 

-#: src/compose.c:637
+#: src/compose.c:640

 msgid "/_Message/Send _later"
 msgstr "/Óʼþ(_M)/ÉÔºóËͳö(_l)"
 
 msgid "/_Message/Send _later"
 msgstr "/Óʼþ(_M)/ÉÔºóËͳö(_l)"
 

-#: src/compose.c:639 src/compose.c:645 src/compose.c:650 src/compose.c:652
-#: src/compose.c:656 src/compose.c:662 src/compose.c:669 src/mainwindow.c:624
-#: src/mainwindow.c:626 src/mainwindow.c:636 src/mainwindow.c:639
-#: src/mainwindow.c:641 src/mainwindow.c:646 src/messageview.c:245
-#: src/messageview.c:253 src/messageview.c:258
+#: src/compose.c:642 src/compose.c:648 src/compose.c:653 src/compose.c:655
+#: src/compose.c:659 src/compose.c:665 src/compose.c:672 src/mainwindow.c:639
+#: src/mainwindow.c:649 src/mainwindow.c:652 src/mainwindow.c:654
+#: src/mainwindow.c:659 src/messageview.c:245 src/messageview.c:253
+#: src/messageview.c:258

 msgid "/_Message/---"
 msgstr "/Óʼþ(_M)/---"
 
 msgid "/_Message/---"
 msgstr "/Óʼþ(_M)/---"
 

-#: src/compose.c:640
+#: src/compose.c:643

 msgid "/_Message/Save to _draft folder"
 msgstr "/Óʼþ(_M)/±£´æÖÁ²Ý¸å¼Ð(_d)"
 
 msgid "/_Message/Save to _draft folder"
 msgstr "/Óʼþ(_M)/±£´æÖÁ²Ý¸å¼Ð(_d)"
 

-#: src/compose.c:642
+#: src/compose.c:645

 msgid "/_Message/Save and _keep editing"
 msgstr "/Óʼþ(_M)/±£´æ²¢¼ÌÐø±à¼­(_k)"
 
 msgid "/_Message/Save and _keep editing"
 msgstr "/Óʼþ(_M)/±£´æ²¢¼ÌÐø±à¼­(_k)"
 

-#: src/compose.c:646
+#: src/compose.c:649

 msgid "/_Message/_To"
 msgstr "/Óʼþ(_M)/ÊÕ¼þÕß(_T)"
 
 msgid "/_Message/_To"
 msgstr "/Óʼþ(_M)/ÊÕ¼þÕß(_T)"
 

-#: src/compose.c:647
+#: src/compose.c:650

 msgid "/_Message/_Cc"
 msgstr "/Óʼþ(_M)/¸±±¾³­ËÍ(_C)"
 
 msgid "/_Message/_Cc"
 msgstr "/Óʼþ(_M)/¸±±¾³­ËÍ(_C)"
 

-#: src/compose.c:648
+#: src/compose.c:651

 msgid "/_Message/_Bcc"
 msgstr "/Óʼþ(_M)/ÃØÃܳ­ËÍ(_B)"
 
 msgid "/_Message/_Bcc"
 msgstr "/Óʼþ(_M)/ÃØÃܳ­ËÍ(_B)"
 

-#: src/compose.c:649
+#: src/compose.c:652

 msgid "/_Message/_Reply to"
 msgstr "/Óʼþ(_M)/»Ø¸´¸ø(_y)"
 
 msgid "/_Message/_Reply to"
 msgstr "/Óʼþ(_M)/»Ø¸´¸ø(_y)"
 

-#: src/compose.c:651
+#: src/compose.c:654

 msgid "/_Message/_Followup to"
 msgstr "/Óʼþ(_M)/»ØÓ¦ÎÄÕÂ(_F)"
 
 msgid "/_Message/_Followup to"
 msgstr "/Óʼþ(_M)/»ØÓ¦ÎÄÕÂ(_F)"
 

-#: src/compose.c:653
+#: src/compose.c:656

 msgid "/_Message/_Attach"
 msgstr "/Óʼþ(_M)/¸½¼Ó(_A)"
 
 msgid "/_Message/_Attach"
 msgstr "/Óʼþ(_M)/¸½¼Ó(_A)"
 

-#: src/compose.c:657
+#: src/compose.c:660

 msgid "/_Message/Si_gn"
 msgstr "/Óʼþ(_M)/Ç©Ãû(_g)"
 
 msgid "/_Message/Si_gn"
 msgstr "/Óʼþ(_M)/Ç©Ãû(_g)"
 

-#: src/compose.c:658
+#: src/compose.c:661

 msgid "/_Message/_Encrypt"
 msgstr "/Óʼþ(_M)/¼ÓÃÜ(_E)"
 
 msgid "/_Message/_Encrypt"
 msgstr "/Óʼþ(_M)/¼ÓÃÜ(_E)"
 

-#: src/compose.c:659
+#: src/compose.c:662

 msgid "/_Message/Mode/MIME"
 msgstr "/Óʼþ(_M)/ģʽ/MIME"
 
 msgid "/_Message/Mode/MIME"
 msgstr "/Óʼþ(_M)/ģʽ/MIME"
 

-#: src/compose.c:660
+#: src/compose.c:663

 msgid "/_Message/Mode/Inline"
 msgstr "/Óʼþ(_M)/ģʽ/Inline"
 
 msgid "/_Message/Mode/Inline"
 msgstr "/Óʼþ(_M)/ģʽ/Inline"
 

-#: src/compose.c:663
+#: src/compose.c:666

 msgid "/_Message/_Priority"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò(_P)"
 
 msgid "/_Message/_Priority"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò(_P)"
 

-#: src/compose.c:664
+#: src/compose.c:667

 msgid "/_Message/Priority/_Highest"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îÓÅÏÈ(_H)"
 
 msgid "/_Message/Priority/_Highest"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îÓÅÏÈ(_H)"
 

-#: src/compose.c:665
+#: src/compose.c:668

 msgid "/_Message/Priority/Hi_gh"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÓÅÏÈ(_g)"
 
 msgid "/_Message/Priority/Hi_gh"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÓÅÏÈ(_g)"
 

-#: src/compose.c:666
+#: src/compose.c:669

 msgid "/_Message/Priority/_Normal"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÆÕͨ(_N)"
 
 msgid "/_Message/Priority/_Normal"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/ÆÕͨ(_N)"
 

-#: src/compose.c:667
+#: src/compose.c:670

 msgid "/_Message/Priority/Lo_w"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/µÍ(_w)"
 
 msgid "/_Message/Priority/Lo_w"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/µÍ(_w)"
 

-#: src/compose.c:668
+#: src/compose.c:671

 msgid "/_Message/Priority/_Lowest"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îµÍ(_L)"
 
 msgid "/_Message/Priority/_Lowest"
 msgstr "/Óʼþ(_M)/ÓÅÏÈ˳Ðò/×îµÍ(_L)"
 

-#: src/compose.c:670
+#: src/compose.c:673

 msgid "/_Message/_Request Return Receipt"
 msgstr "/Óʼþ(_M)/ÒªÇó»Øº¯Æ¾Ö¤(_R)"
 
 msgid "/_Message/_Request Return Receipt"
 msgstr "/Óʼþ(_M)/ÒªÇó»Øº¯Æ¾Ö¤(_R)"
 

-#: src/compose.c:671
+#: src/compose.c:674

 msgid "/_Message/Remo_ve references"
 msgstr "/Óʼþ(_M)/ɾ³ýÒýÎÄ(_V)"
 
 msgid "/_Message/Remo_ve references"
 msgstr "/Óʼþ(_M)/ɾ³ýÒýÎÄ(_V)"
 

-#: src/compose.c:672 src/mainwindow.c:656 src/messageview.c:261
+#: src/compose.c:675 src/mainwindow.c:669 src/messageview.c:261

 msgid "/_Tools"
 msgstr "¹¤¾ß(_T)"
 
 msgid "/_Tools"
 msgstr "¹¤¾ß(_T)"
 

-#: src/compose.c:673
+#: src/compose.c:676

 msgid "/_Tools/Show _ruler"
 msgstr "/¹¤¾ß(_T)/ÏÔʾ±ê³ß(_r)"
 
 msgid "/_Tools/Show _ruler"
 msgstr "/¹¤¾ß(_T)/ÏÔʾ±ê³ß(_r)"
 

-#: src/compose.c:674 src/messageview.c:262
+#: src/compose.c:677 src/messageview.c:262

 msgid "/_Tools/_Address book"
 msgstr "/¹¤¾ß(_T)/ͨѶ¼(_A)"
 
 msgid "/_Tools/_Address book"
 msgstr "/¹¤¾ß(_T)/ͨѶ¼(_A)"
 

-#: src/compose.c:675
+#: src/compose.c:678

 msgid "/_Tools/_Template"
 msgstr "/¹¤¾ß(_T)/Ì×ÓÃÓʼþÄ£°å(_T)"
 
 msgid "/_Tools/_Template"
 msgstr "/¹¤¾ß(_T)/Ì×ÓÃÓʼþÄ£°å(_T)"
 

-#: src/compose.c:676 src/mainwindow.c:686 src/messageview.c:285
+#: src/compose.c:679 src/mainwindow.c:699 src/messageview.c:287

 msgid "/_Tools/Actio_ns"
 msgstr "/¹¤¾ß(_T)/Ö´Ðж¯×÷(_n)"
 
 msgid "/_Tools/Actio_ns"
 msgstr "/¹¤¾ß(_T)/Ö´Ðж¯×÷(_n)"
 

-#: src/compose.c:1435
+#: src/compose.c:1438

 msgid "Reply-To:"
 msgstr "»Ø¸´£º"
 
 msgid "Reply-To:"
 msgstr "»Ø¸´£º"
 

-#: src/compose.c:1438 src/compose.c:4579 src/compose.c:5291
+#: src/compose.c:1441 src/compose.c:4571 src/compose.c:5281

 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "ÐÂÎÅȺ×飺"
 
 #: src/headerview.c:54
 msgid "Newsgroups:"
 msgstr "ÐÂÎÅȺ×飺"
 

-#: src/compose.c:1441
+#: src/compose.c:1444

 msgid "Followup-To:"
 msgstr "»ØÓ¦ÎÄÕ£º"
 
 msgid "Followup-To:"
 msgstr "»ØÓ¦ÎÄÕ£º"
 

-#: src/compose.c:1741
+#: src/compose.c:1744

 msgid "Quote mark format error."
 msgstr "ÒýÎĸñʽ´íÎó¡£"
 
 msgid "Quote mark format error."
 msgstr "ÒýÎĸñʽ´íÎó¡£"
 

-#: src/compose.c:1757
+#: src/compose.c:1760

 msgid "Message reply/forward format error."
 msgstr "»Ø¸´/ת·¢Óʼþ¸ñʽ´íÎó¡£"
 
 msgid "Message reply/forward format error."
 msgstr "»Ø¸´/ת·¢Óʼþ¸ñʽ´íÎó¡£"
 

-#: src/compose.c:2099
+#: src/compose.c:2103

 #, c-format
 msgid "File %s is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 
 #, c-format
 msgid "File %s is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 

-#: src/compose.c:2103
+#: src/compose.c:2107

 #, c-format
 msgid "Can't read %s."
 msgstr "ÎÞ·¨¶ÁÈ¡ %s¡£"
 
 #, c-format
 msgid "Can't read %s."
 msgstr "ÎÞ·¨¶ÁÈ¡ %s¡£"
 

-#: src/compose.c:2141
+#: src/compose.c:2145

 #, c-format
 msgid "Message: %s"
 msgstr "Óʼþ£º%s"
 
 #, c-format
 msgid "Message: %s"
 msgstr "Óʼþ£º%s"
 

-#: src/compose.c:2229
+#: src/compose.c:2233

 msgid "Encrypted message"
 msgstr "¼ÓÃÜÓʼþ"
 
 msgid "Encrypted message"
 msgstr "¼ÓÃÜÓʼþ"
 

-#: src/compose.c:2230
+#: src/compose.c:2234

 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"
 msgid ""
 "Cannot re-edit an encrypted message. \n"
 "Discard encrypted part?"


@@ -1402,21 +1414,21 @@ msgstr ""
 "²»ÄÜÖØб༭¼ÓÃÜÓʼþ.\n"
 "¶ªÆú¼ÓÃܲ¿·ÖÂð?"
 
 "²»ÄÜÖØб༭¼ÓÃÜÓʼþ.\n"
 "¶ªÆú¼ÓÃܲ¿·ÖÂð?"
 

-#: src/compose.c:2891
+#: src/compose.c:2895

 msgid " [Edited]"
 msgstr " [ÒÑÐÞ¸Ä] "
 
 msgid " [Edited]"
 msgstr " [ÒÑÐÞ¸Ä] "
 

-#: src/compose.c:2893
+#: src/compose.c:2897

 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ÐÂÓʼþ%s"
 
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - ÐÂÓʼþ%s"
 

-#: src/compose.c:2896
+#: src/compose.c:2900

 #, c-format
 msgid "Compose message%s"
 msgstr "ÐÂÓʼþ%s"
 
 #, c-format
 msgid "Compose message%s"
 msgstr "ÐÂÓʼþ%s"
 

-#: src/compose.c:2920 src/compose.c:3169
+#: src/compose.c:2924 src/compose.c:3173

 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."


@@ -1424,24 +1436,24 @@ msgstr ""
 "ÄúÑ¡ÓõÄÕʺŲ¢·ÇÒ»¸öµç×ÓÓʼþÕʺţ¬¿ÉÄÜÊÇÓÃÀ´ÔÚÐÂÎÅȺ×éÉÏ·¢±íÎÄÕÂÓõġ£\n"
 "Òª·¢ËÍÓʼþÇëÑ¡Ôñµç×ÓÓʼþÕʺš£"
 
 "ÄúÑ¡ÓõÄÕʺŲ¢·ÇÒ»¸öµç×ÓÓʼþÕʺţ¬¿ÉÄÜÊÇÓÃÀ´ÔÚÐÂÎÅȺ×éÉÏ·¢±íÎÄÕÂÓõġ£\n"
 "Òª·¢ËÍÓʼþÇëÑ¡Ôñµç×ÓÓʼþÕʺš£"
 

-#: src/compose.c:3067
+#: src/compose.c:3071

 msgid "Recipient is not specified."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 
 msgid "Recipient is not specified."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 

-#: src/compose.c:3075 src/messageview.c:491 src/prefs_account.c:768
-#: src/prefs_common.c:970 src/toolbar.c:374 src/toolbar.c:421
+#: src/compose.c:3079 src/messageview.c:503 src/prefs_account.c:763
+#: src/prefs_common.c:966 src/toolbar.c:375 src/toolbar.c:422

 msgid "Send"
 msgstr "·¢ËÍ"
 
 msgid "Send"
 msgstr "·¢ËÍ"
 

-#: src/compose.c:3076
+#: src/compose.c:3080

 msgid "Subject is empty. Send it anyway?"
 msgstr "ûÓбêÌ⡣ȷ¶¨ÒªËͳö£¿"
 
 msgid "Subject is empty. Send it anyway?"
 msgstr "ûÓбêÌ⡣ȷ¶¨ÒªËͳö£¿"
 

-#: src/compose.c:3097
+#: src/compose.c:3101

 msgid "Could not queue message for sending"
 msgstr "ÎÞ·¨ËͳöÔÝ´æ×ÊÁÏ"
 
 msgid "Could not queue message for sending"
 msgstr "ÎÞ·¨ËͳöÔÝ´æ×ÊÁÏ"
 

-#: src/compose.c:3102
+#: src/compose.c:3106

 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."
 msgid ""
 "The message was queued but could not be sent.\n"
 "Use \"Send queued messages\" from the main window to retry."


@@ -1449,16 +1461,16 @@ msgstr ""
 "ÓʼþÕýÔÚ´ý·¢ËÍÓʼþ¼ÐÖе«ÎÞ·¨´«ËÍ¡£\n"
 "ÇëʹÓÃÖ÷´°¿Ú \"Ëͳö´ý·¢ËÍÓʼþ\" ÔÙÊÔÒ»´Î¡£"
 
 "ÓʼþÕýÔÚ´ý·¢ËÍÓʼþ¼ÐÖе«ÎÞ·¨´«ËÍ¡£\n"
 "ÇëʹÓÃÖ÷´°¿Ú \"Ëͳö´ý·¢ËÍÓʼþ\" ÔÙÊÔÒ»´Î¡£"
 

-#: src/compose.c:3185 src/procmsg.c:1149 src/send_message.c:229
+#: src/compose.c:3189 src/procmsg.c:1140 src/send_message.c:229

 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "·¢±íÎÄÕÂÖÁ %s ʱ·¢Éú´íÎó¡£"
 
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "·¢±íÎÄÕÂÖÁ %s ʱ·¢Éú´íÎó¡£"
 

-#: src/compose.c:3199
+#: src/compose.c:3203

 msgid "Queueing"
 msgstr "´æÈë´ý·¢ËÍÓʼþ¼Ð"
 
 msgid "Queueing"
 msgstr "´æÈë´ý·¢ËÍÓʼþ¼Ð"
 

-#: src/compose.c:3200
+#: src/compose.c:3204

 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"
 msgid ""
 "Error occurred while sending the message.\n"
 "Put this message into queue folder?"


@@ -1466,24 +1478,24 @@ msgstr ""
 "ËÍÐÅʱ·¢Éú´íÎó¡£\n"
 "Òª°ÑÓʼþ·Å½ø´ý·¢ËÍÓʼþ¼ÐÖÐÂð£¿"
 
 "ËÍÐÅʱ·¢Éú´íÎó¡£\n"
 "Òª°ÑÓʼþ·Å½ø´ý·¢ËÍÓʼþ¼ÐÖÐÂð£¿"
 

-#: src/compose.c:3206
+#: src/compose.c:3210

 msgid "Can't queue the message."
 msgstr "ÎÞ·¨·Å½ø´ý·¢ËÍÓʼþ¼Ð¡£"
 
 msgid "Can't queue the message."
 msgstr "ÎÞ·¨·Å½ø´ý·¢ËÍÓʼþ¼Ð¡£"
 

-#: src/compose.c:3209 src/send_message.c:580 src/send_message.c:599
+#: src/compose.c:3213 src/send_message.c:580 src/send_message.c:599

 msgid "Error occurred while sending the message."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 
 msgid "Error occurred while sending the message."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 

-#: src/compose.c:3222
+#: src/compose.c:3226

 msgid "Can't save the message to Sent."
 msgstr "ÎÞ·¨½«ÓʼþËÍÖÁ¼Ä¼þ¼ÐÖС£"
 
 msgid "Can't save the message to Sent."
 msgstr "ÎÞ·¨½«ÓʼþËÍÖÁ¼Ä¼þ¼ÐÖС£"
 

-#: src/compose.c:3467
+#: src/compose.c:3471

 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "ÎÞ·¨ÕÒµ½ËùÖ¸¶¨µÄ key id '%s'"
 
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "ÎÞ·¨ÕÒµ½ËùÖ¸¶¨µÄ key id '%s'"
 

-#: src/compose.c:3573
+#: src/compose.c:3577

 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"
 #, c-format
 msgid ""
 "Can't convert the character encoding of the message from\n"


@@ -1493,59 +1505,59 @@ msgstr ""
 "ÎÞ·¨×ª»»ÓʼþµÄ±àÂëÉèÖÃÓÉ %s ³É %s ¡£\n"
 "ÈÔ¾ÉÒª´«ËÍÂð£¿"
 
 "ÎÞ·¨×ª»»ÓʼþµÄ±àÂëÉèÖÃÓÉ %s ³É %s ¡£\n"
 "ÈÔ¾ÉÒª´«ËÍÂð£¿"
 

-#: src/compose.c:3836
+#: src/compose.c:3840

 msgid "No account for sending mails available!"
 msgstr "ûÓз¢ÐÅËùÐèµÄÕʺţ¡"
 
 msgid "No account for sending mails available!"
 msgstr "ûÓз¢ÐÅËùÐèµÄÕʺţ¡"
 

-#: src/compose.c:3846
+#: src/compose.c:3850

 msgid "No account for posting news available!"
 msgstr "ûÓÐÕÅÌùnewsËùÐèµÄÕʺţ¡"
 
 msgid "No account for posting news available!"
 msgstr "ûÓÐÕÅÌùnewsËùÐèµÄÕʺţ¡"
 

-#: src/compose.c:4659 src/headerview.c:52 src/summary_search.c:150
+#: src/compose.c:4654 src/headerview.c:52 src/summary_search.c:150

 msgid "From:"
 msgstr "·¢ÐÅÕß:"
 
 msgid "From:"
 msgstr "·¢ÐÅÕß:"
 

-#: src/compose.c:4763 src/compose.c:4933 src/compose.c:5811
+#: src/compose.c:4758 src/compose.c:4928 src/compose.c:5811

 msgid "MIME type"
 msgstr "MIME ÀàÐÍ"
 
 msgid "MIME type"
 msgstr "MIME ÀàÐÍ"
 

-#: src/compose.c:4764 src/compose.c:4934 src/mimeview.c:193
-#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:477
+#: src/compose.c:4759 src/compose.c:4929 src/mimeview.c:193
+#: src/prefs_summary_column.c:73 src/select-keys.c:299 src/summaryview.c:478

 msgid "Size"
 msgstr "´óС"
 
 msgid "Size"
 msgstr "´óС"
 

-#: src/compose.c:4828
+#: src/compose.c:4823

 msgid "Save Message to "
 msgstr "½«Óʼþ±£´æÖÁ"
 
 msgid "Save Message to "
 msgstr "½«Óʼþ±£´æÖÁ"
 

-#: src/compose.c:4848 src/prefs_filtering_action.c:420
+#: src/compose.c:4843 src/prefs_filtering_action.c:420

 msgid "Select ..."
 msgstr "Ñ¡Ôñ..."
 
 msgid "Select ..."
 msgstr "Ñ¡Ôñ..."
 

-#: src/compose.c:4984 src/prefs_account.c:1356 src/prefs_customheader.c:188
+#: src/compose.c:4980 src/prefs_account.c:1353 src/prefs_customheader.c:188

 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "ÓʼþÍ·"
 
 #: src/prefs_matcher.c:146
 msgid "Header"
 msgstr "ÓʼþÍ·"
 

-#: src/compose.c:4986
+#: src/compose.c:4982

 msgid "Attachments"
 msgstr "¸½¼þ"
 
 msgid "Attachments"
 msgstr "¸½¼þ"
 

-#: src/compose.c:4988
+#: src/compose.c:4984

 msgid "Others"
 msgstr "ÆäËû"
 
 msgid "Others"
 msgstr "ÆäËû"
 

-#: src/compose.c:5003 src/headerview.c:55 src/prefs_template.c:177
+#: src/compose.c:4999 src/headerview.c:55 src/prefs_template.c:177

 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Ö÷Ì⣺"
 
 #: src/summary_search.c:164
 msgid "Subject:"
 msgstr "Ö÷Ì⣺"
 

-#: src/compose.c:5238 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
-#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4247
+#: src/compose.c:5231 src/exphtmldlg.c:503 src/gtk/colorlabel.c:279
+#: src/gtk/gtkaspell.c:1499 src/gtk/gtkaspell.c:2173 src/summaryview.c:4210

 msgid "None"
 msgstr "ûÓÐÄÚÈÝ"
 
 msgid "None"
 msgstr "ûÓÐÄÚÈÝ"
 

-#: src/compose.c:5247
+#: src/compose.c:5240

 #, c-format
 msgid ""
 "Spell checker could not be started.\n"
 #, c-format
 msgid ""
 "Spell checker could not be started.\n"


@@ -1589,24 +1601,26 @@ msgstr ""
 "Ç¿ÖƹرճÌÐòÂð£¿\n"
 "³ÌÐò×æid: %d"
 
 "Ç¿ÖƹرճÌÐòÂð£¿\n"
 "³ÌÐò×æid: %d"
 

-#: src/compose.c:6356 src/inc.c:167 src/inc.c:257 src/toolbar.c:2077
+#: src/compose.c:6369 src/inc.c:167 src/inc.c:255 src/inc.c:281
+#: src/toolbar.c:1868

 msgid "Offline warning"
 msgstr "ÍÑ»ú¾¯¸æ"
 
 msgid "Offline warning"
 msgstr "ÍÑ»ú¾¯¸æ"
 

-#: src/compose.c:6357 src/inc.c:168 src/inc.c:258 src/toolbar.c:2078
+#: src/compose.c:6370 src/inc.c:168 src/inc.c:256 src/inc.c:282
+#: src/toolbar.c:1869

 msgid "You're working offline. Override?"
 msgstr "ÄúÕýÔÚÍÑ»ú¹¤×÷¡£ÊÇ·ñ¸ü¸Ä£¿"
 
 msgid "You're working offline. Override?"
 msgstr "ÄúÕýÔÚÍÑ»ú¹¤×÷¡£ÊÇ·ñ¸ü¸Ä£¿"
 

-#: src/compose.c:6475 src/compose.c:6496
+#: src/compose.c:6488 src/compose.c:6509

 msgid "Select file"
 msgstr "Ñ¡ÔñÎļþ"
 
 msgid "Select file"
 msgstr "Ñ¡ÔñÎļþ"
 

-#: src/compose.c:6510
+#: src/compose.c:6523

 #, c-format
 msgid "File '%s' could not be read."
 msgstr "ÎÞ·¨¶ÁÈ¡Îļþ '%s'¡£"
 
 #, c-format
 msgid "File '%s' could not be read."
 msgstr "ÎÞ·¨¶ÁÈ¡Îļþ '%s'¡£"
 

-#: src/compose.c:6512
+#: src/compose.c:6525

 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"
 #, c-format
 msgid ""
 "File '%s' contained invalid characters\n"


@@ -1615,36 +1629,36 @@ msgstr ""
 "Îļþ '%s' °üº¬²»ÊôÓÚµ±Ç°±àÂ뼯µÄÎÞЧ×Ö·û\n"
 "²åÈ벿·Ö¿ÉÄܲ»ÕýÈ·."
 
 "Îļþ '%s' °üº¬²»ÊôÓÚµ±Ç°±àÂ뼯µÄÎÞЧ×Ö·û\n"
 "²åÈ벿·Ö¿ÉÄܲ»ÕýÈ·."
 

-#: src/compose.c:6551
+#: src/compose.c:6570

 msgid "Discard message"
 msgstr "ɾµôѶϢ"
 
 msgid "Discard message"
 msgstr "ɾµôѶϢ"
 

-#: src/compose.c:6552
+#: src/compose.c:6571

 msgid "This message has been modified. discard it?"
 msgstr "ÕâÏîѶϢÒѱ»¸ü¸Ä£¬ÊÇ·ñɾ³ý£¿"
 
 msgid "This message has been modified. discard it?"
 msgstr "ÕâÏîѶϢÒѱ»¸ü¸Ä£¬ÊÇ·ñɾ³ý£¿"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "Discard"
 msgstr "ɾ³ý"
 
 msgid "Discard"
 msgstr "ɾ³ý"
 

-#: src/compose.c:6553
+#: src/compose.c:6572

 msgid "to Draft"
 msgstr "´æΪ²Ý¸å"
 
 msgid "to Draft"
 msgstr "´æΪ²Ý¸å"
 

-#: src/compose.c:6588
+#: src/compose.c:6607

 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "ÊÇ·ñʹÓÃÔ­À´µÄÑù±¾'%s'?"
 
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "ÊÇ·ñʹÓÃÔ­À´µÄÑù±¾'%s'?"
 

-#: src/compose.c:6590
+#: src/compose.c:6609

 msgid "Apply template"
 msgstr "ʹÓÃÑù±¾"
 
 msgid "Apply template"
 msgstr "ʹÓÃÑù±¾"
 

-#: src/compose.c:6591
+#: src/compose.c:6610

 msgid "Replace"
 msgstr "Ìæ»»"
 
 msgid "Replace"
 msgstr "Ìæ»»"
 

-#: src/compose.c:6591 src/toolbar.c:425
+#: src/compose.c:6610 src/toolbar.c:426

 msgid "Insert"
 msgstr "²åÈë"
 
 msgid "Insert"
 msgstr "²åÈë"
 


@@ -1780,7 +1794,7 @@ msgid " Check File "
 msgstr "¼ì²éÎļþ"
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222
 msgstr "¼ì²éÎļþ"
 
 #: src/editbook.c:186 src/editjpilot.c:307 src/editvcard.c:222

-#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1573
+#: src/importmutt.c:270 src/importpine.c:270 src/prefs_account.c:1570

 msgid "File"
 msgstr "Îļþ"
 
 msgid "File"
 msgstr "Îļþ"
 


@@ -1836,12 +1850,12 @@ msgstr "
 msgid "Input the new name of folder:"
 msgstr "ÇëÊäÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 
 msgid "Input the new name of folder:"
 msgstr "ÇëÊäÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 

-#: src/editgroup.c:506 src/folderview.c:1893 src/folderview.c:1944
-#: src/folderview.c:2215
+#: src/editgroup.c:506 src/folderview.c:1974 src/folderview.c:2025
+#: src/folderview.c:2294

 msgid "New folder"
 msgstr "ÐÂÓʼþ¼Ð"
 
 msgid "New folder"
 msgstr "ÐÂÓʼþ¼Ð"
 

-#: src/editgroup.c:507 src/folderview.c:1894 src/folderview.c:1945
+#: src/editgroup.c:507 src/folderview.c:1975 src/folderview.c:2026

 msgid "Input the name of new folder:"
 msgstr " Çëµ¼ÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 
 msgid "Input the name of new folder:"
 msgstr " Çëµ¼ÈëÓʼþ¼ÐµÄÐÂÃû×Ö£º"
 


@@ -1859,7 +1873,7 @@ msgstr "
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721
 
 #: src/editjpilot.c:314 src/editldap.c:477 src/editvcard.c:229
 #: src/exphtmldlg.c:444 src/expldifdlg.c:456 src/importldif.c:721

-#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2154
+#: src/importmutt.c:277 src/importpine.c:277 src/prefs_account.c:2151

 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr "..."
 #: src/prefs_spelling.c:244
 msgid " ... "
 msgstr "..."


@@ -2063,7 +2077,7 @@ msgid ""
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 
 "The maximum number of entries that should be returned in the search result."
 msgstr ""
 

-#: src/editldap.c:751 src/prefs_account.c:764
+#: src/editldap.c:751 src/prefs_account.c:759

 msgid "Basic"
 msgstr "»ù±¾ÉèÖÃ"
 
 msgid "Basic"
 msgstr "»ù±¾ÉèÖÃ"
 


@@ -2071,7 +2085,7 @@ msgstr "
 msgid "Search"
 msgstr "ËÑÑ°"
 
 msgid "Search"
 msgstr "ËÑÑ°"
 

-#: src/editldap.c:753 src/summaryview.c:653
+#: src/editldap.c:753 src/summaryview.c:654

 msgid "Extended"
 msgstr "À©Õ¹"
 
 msgid "Extended"
 msgstr "À©Õ¹"
 


@@ -2149,11 +2163,11 @@ msgstr "HTML
 msgid "Stylesheet"
 msgstr "ÐÎʽ±í"
 
 msgid "Stylesheet"
 msgstr "ÐÎʽ±í"
 

-#: src/exphtmldlg.c:509 src/prefs_common.c:3166 src/prefs_common.c:3448
+#: src/exphtmldlg.c:509 src/prefs_common.c:3050 src/prefs_common.c:3332

 msgid "Default"
 msgstr "ȱʡֵ"
 
 msgid "Default"
 msgstr "ȱʡֵ"
 

-#: src/exphtmldlg.c:515 src/sgpgme.c:94
+#: src/exphtmldlg.c:515 src/sgpgme.c:103

 msgid "Full"
 msgstr "ÍêÕûÉèÖÃ"
 
 msgid "Full"
 msgstr "ÍêÕûÉèÖÃ"
 


@@ -2214,7 +2228,7 @@ msgid "Prev"
 msgstr "Ç°Ò»¸ö"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033
 msgstr "Ç°Ò»¸ö"
 
 #: src/exphtmldlg.c:724 src/expldifdlg.c:745 src/importldif.c:1033

-#: src/toolbar.c:384 src/toolbar.c:475
+#: src/toolbar.c:385 src/toolbar.c:476

 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 


@@ -2374,7 +2388,7 @@ msgid "Exporting file:"
 msgstr "Êä³öÎļþ£º"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183
 msgstr "Êä³öÎļþ£º"
 
 #: src/export.c:175 src/export.c:181 src/import.c:177 src/import.c:183

-#: src/prefs_account.c:1229
+#: src/prefs_account.c:1226

 msgid " Select... "
 msgstr " Ñ¡Ôñ... "
 
 msgid " Select... "
 msgstr " Ñ¡Ôñ... "
 


@@ -2410,32 +2424,32 @@ msgstr "
 msgid "Not specified."
 msgstr "²»È·¶¨¡£"
 
 msgid "Not specified."
 msgstr "²»È·¶¨¡£"
 

-#: src/folder.c:1011
+#: src/folder.c:1125

 msgid "Inbox"
 msgstr "ÊÕÐżÐ"
 
 msgid "Inbox"
 msgstr "ÊÕÐżÐ"
 

-#: src/folder.c:1015
+#: src/folder.c:1129

 msgid "Sent"
 msgstr "ÒÑ·¢ËÍ"
 
 msgid "Sent"
 msgstr "ÒÑ·¢ËÍ"
 

-#: src/folder.c:1019
+#: src/folder.c:1133

 msgid "Queue"
 msgstr "´ý·¢ËÍ"
 
 msgid "Queue"
 msgstr "´ý·¢ËÍ"
 

-#: src/folder.c:1023
+#: src/folder.c:1137

 msgid "Trash"
 msgstr "À¬»øÍ°"
 
 msgid "Trash"
 msgstr "À¬»øÍ°"
 

-#: src/folder.c:1027
+#: src/folder.c:1141

 msgid "Drafts"
 msgstr "²Ý¸å"
 
 msgid "Drafts"
 msgstr "²Ý¸å"
 

-#: src/folder.c:1240
+#: src/folder.c:1354

 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "´¦ÀíÖÐ(%s)...\n"
 
 #, c-format
 msgid "Processing (%s)...\n"
 msgstr "´¦ÀíÖÐ(%s)...\n"
 

-#: src/folder.c:2028
+#: src/folder.c:2188

 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "½«%s ÒƵ½%s...\n"
 #, c-format
 msgid "Moving %s to %s...\n"
 msgstr "½«%s ÒƵ½%s...\n"


@@ -2444,140 +2458,157 @@ msgstr "
 msgid "Select folder"
 msgstr "Ñ¡ÔñÓʼþ¼Ð"
 
 msgid "Select folder"
 msgstr "Ñ¡ÔñÓʼþ¼Ð"
 

-#: src/folderview.c:284 src/folderview.c:301 src/folderview.c:321
+#: src/folderview.c:288 src/folderview.c:304 src/folderview.c:324

 msgid "/Create _new folder..."
 msgstr "/´´½¨ÐÂÓʼþ¼Ð(_n)..."
 
 msgid "/Create _new folder..."
 msgstr "/´´½¨ÐÂÓʼþ¼Ð(_n)..."
 

-#: src/folderview.c:285 src/folderview.c:302 src/folderview.c:322
+#: src/folderview.c:289 src/folderview.c:305 src/folderview.c:325

 msgid "/_Rename folder..."
 msgstr "/ÖØÃüÃûÓʼþ¼Ð(_R)..."
 
 msgid "/_Rename folder..."
 msgstr "/ÖØÃüÃûÓʼþ¼Ð(_R)..."
 

-#: src/folderview.c:286 src/folderview.c:303 src/folderview.c:323
+#: src/folderview.c:290 src/folderview.c:306 src/folderview.c:326

 msgid "/M_ove folder..."
 msgstr "Òƶ¯Óʼþ¼Ð(_o)..."
 
 msgid "/M_ove folder..."
 msgstr "Òƶ¯Óʼþ¼Ð(_o)..."
 

-#: src/folderview.c:287 src/folderview.c:304 src/folderview.c:324
+#: src/folderview.c:291 src/folderview.c:307 src/folderview.c:327

 msgid "/_Delete folder"
 msgstr "/ɾ³ýÓʼþ¼Ð(_D)"
 
 msgid "/_Delete folder"
 msgstr "/ɾ³ýÓʼþ¼Ð(_D)"
 

-#: src/folderview.c:289 src/folderview.c:310
+#: src/folderview.c:293 src/folderview.c:313

 msgid "/Remove _mailbox"
 msgstr "Çå³ýÐÅÏä(_m)"
 
 msgid "/Remove _mailbox"
 msgstr "Çå³ýÐÅÏä(_m)"
 

-#: src/folderview.c:292 src/folderview.c:314 src/folderview.c:334
-#: src/folderview.c:352
+#: src/folderview.c:296 src/folderview.c:317 src/folderview.c:339
+#: src/folderview.c:359

 msgid "/_Processing..."
 msgstr "/´¦Àí(_P)..."
 
 msgid "/_Processing..."
 msgstr "/´¦Àí(_P)..."
 

-#: src/folderview.c:293
-msgid "/_Scoring..."
-msgstr "/ͳ¼Æ»ý·Ö(_S)..."
-
-#: src/folderview.c:299 src/folderview.c:319 src/folderview.c:339
+#: src/folderview.c:302 src/folderview.c:322 src/folderview.c:344

 msgid "/Mark all _read"
 msgstr "/±ê¼ÇËùÓÐÓʼþΪÒѶÁ(_r)"
 
 msgid "/Mark all _read"
 msgstr "/±ê¼ÇËùÓÐÓʼþΪÒѶÁ(_r)"
 

-#: src/folderview.c:306 src/folderview.c:326 src/folderview.c:345
+#: src/folderview.c:309 src/folderview.c:331 src/folderview.c:352

 msgid "/_Check for new messages"
 msgstr "/¼ì²éÐÂÓʼþ(_C)"
 
 msgid "/_Check for new messages"
 msgstr "/¼ì²éÐÂÓʼþ(_C)"
 

-#: src/folderview.c:308 src/folderview.c:328
+#: src/folderview.c:311 src/folderview.c:333

 msgid "/R_ebuild folder tree"
 msgstr "/ÖØн¨Á¢Óʼþ¼ÐÊ÷(_e)"
 
 msgid "/R_ebuild folder tree"
 msgstr "/ÖØн¨Á¢Óʼþ¼ÐÊ÷(_e)"
 

-#: src/folderview.c:312 src/folderview.c:332 src/folderview.c:350
+#: src/folderview.c:315 src/folderview.c:337 src/folderview.c:357

 msgid "/_Search folder..."
 msgstr "/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 
 msgid "/_Search folder..."
 msgstr "/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 

-#: src/folderview.c:330
+#: src/folderview.c:329 src/folderview.c:350
+msgid "/Down_load"
+msgstr "/ÏÂÔØ(_L)"
+
+#: src/folderview.c:335

 msgid "/Remove _IMAP4 account"
 msgstr "/Çå³ýIMAP4ÕʺÅ(_I)"
 
 msgid "/Remove _IMAP4 account"
 msgstr "/Çå³ýIMAP4ÕʺÅ(_I)"
 

-#: src/folderview.c:341
+#: src/folderview.c:346

 msgid "/_Subscribe to newsgroup..."
 msgstr "/¶©ÔÄÐÂÎÅȺ×é (_S)..."
 
 msgid "/_Subscribe to newsgroup..."
 msgstr "/¶©ÔÄÐÂÎÅȺ×é (_S)..."
 

-#: src/folderview.c:343
+#: src/folderview.c:348

 msgid "/_Remove newsgroup"
 msgstr "/Çå³ýÐÂÎÅȺ×é(_R)"
 
 msgid "/_Remove newsgroup"
 msgstr "/Çå³ýÐÂÎÅȺ×é(_R)"
 

-#: src/folderview.c:348
+#: src/folderview.c:355

 msgid "/Remove _news account"
 msgstr "/Çå³ýÕʺÅ(_n)"
 
 msgid "/Remove _news account"
 msgstr "/Çå³ýÕʺÅ(_n)"
 

-#: src/folderview.c:385
+#: src/folderview.c:392

 msgid "New"
 msgstr "ÐÂÓʼþ"
 
 msgid "New"
 msgstr "ÐÂÓʼþ"
 

-#: src/folderview.c:386
+#: src/folderview.c:393

 msgid "Unread"
 msgstr "δ¶Á"
 
 msgid "Unread"
 msgstr "δ¶Á"
 

-#: src/folderview.c:387
+#: src/folderview.c:394

 msgid "#"
 msgstr "££"
 
 msgid "#"
 msgstr "££"
 

-#: src/folderview.c:630
+#: src/folderview.c:639

 msgid "Setting folder info..."
 msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 
 msgid "Setting folder info..."
 msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 

-#: src/folderview.c:790 src/mainwindow.c:2799 src/setup.c:80
+#: src/folderview.c:799 src/mainwindow.c:2941 src/setup.c:80

 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "ɨÃèÓʼþ¼Ð%s%c%s..."
 
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "ɨÃèÓʼþ¼Ð%s%c%s..."
 

-#: src/folderview.c:794 src/mainwindow.c:2804 src/setup.c:85
+#: src/folderview.c:803 src/mainwindow.c:2946 src/setup.c:85

 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " ɨÃèÓʼþ¼Ð %s ..."
 
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr " ɨÃèÓʼþ¼Ð %s ..."
 

-#: src/folderview.c:835
+#: src/folderview.c:844

 msgid "Rebuilding folder tree..."
 msgstr " ÖØн¨Á¢Óʼþ¼ÐÊ÷ ..."
 
 msgid "Rebuilding folder tree..."
 msgstr " ÖØн¨Á¢Óʼþ¼ÐÊ÷ ..."
 

-#: src/folderview.c:918
+#: src/folderview.c:927

 msgid "Checking for new messages in all folders..."
 msgstr "¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ..."
 
 msgid "Checking for new messages in all folders..."
 msgstr "¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ..."
 

-#: src/folderview.c:1696
+#: src/folderview.c:1713

 #, c-format
 msgid "Opening Folder %s..."
 msgstr "´ò¿ªÓʼþ¼Ð%s..."
 
 #, c-format
 msgid "Opening Folder %s..."
 msgstr "´ò¿ªÓʼþ¼Ð%s..."
 

-#: src/folderview.c:1708
+#: src/folderview.c:1725

 msgid "Folder could not be opened."
 msgstr "ÎÞ·¨´ò¿ªÓʼþ¼Ð¡£"
 
 msgid "Folder could not be opened."
 msgstr "ÎÞ·¨´ò¿ªÓʼþ¼Ð¡£"
 

-#: src/folderview.c:1895 src/folderview.c:1946 src/folderview.c:2219
+#: src/folderview.c:1841
+msgid "Downloading messages in %s ..."
+msgstr "ÕýÔÚ´Ó %s ÏÂÔØÓʼþ ..."
+
+#: src/folderview.c:1864
+msgid "Offline"
+msgstr "ÍÑ»ú"
+
+#: src/folderview.c:1865
+msgid "You are offline. Go online?"
+msgstr "Ä¿Ç°ÀëÏß¡£×ªµ½ÔÚÏß״̬?"
+
+#: src/folderview.c:1883
+#, c-format
+msgid "Error occurred while downloading messages in `%s'."
+msgstr "´Ó `%s' ÏÂÔØÓʼþʱ·¢Éú´íÎó¡£"
+
+#: src/folderview.c:1976 src/folderview.c:2027 src/folderview.c:2298

 msgid "NewFolder"
 msgstr "ÐÂÓʼþ¼Ð"
 
 msgid "NewFolder"
 msgstr "ÐÂÓʼþ¼Ð"
 

-#: src/folderview.c:1900 src/folderview.c:1994 src/folderview.c:2224
+#: src/folderview.c:1981 src/folderview.c:2075 src/folderview.c:2303

 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "ÎÞ·¨Ê¹ÓÃ'%c'×÷ΪÓʼþ¼ÐÃû³Æ¡£"
 
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "ÎÞ·¨Ê¹ÓÃ'%c'×÷ΪÓʼþ¼ÐÃû³Æ¡£"
 

-#: src/folderview.c:1913 src/folderview.c:1951 src/folderview.c:2004
-#: src/folderview.c:2075 src/folderview.c:2236
+#: src/folderview.c:1994 src/folderview.c:2032 src/folderview.c:2085
+#: src/folderview.c:2156 src/folderview.c:2315

 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "'%s'Óʼþ¼ÐÒÑ´æÔÚ¡£"
 
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "'%s'Óʼþ¼ÐÒÑ´æÔÚ¡£"
 

-#: src/folderview.c:1920 src/folderview.c:2243
+#: src/folderview.c:2001 src/folderview.c:2322

 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "ÎÞ·¨´´½¨Óʼþ¼Ð'%s'¡£"
 
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "ÎÞ·¨´´½¨Óʼþ¼Ð'%s'¡£"
 

-#: src/folderview.c:1987 src/folderview.c:2065
+#: src/folderview.c:2068 src/folderview.c:2146

 #, c-format
 msgid "Input new name for `%s':"
 msgstr "ÊäÈë'%s'µÄÐÂÃû×Ö£º"
 
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "ÊäÈë'%s'µÄÐÂÃû×Ö£º"
 

-#: src/folderview.c:1988 src/folderview.c:2067
+#: src/folderview.c:2069 src/folderview.c:2148

 msgid "Rename folder"
 msgstr "ÖØÐÂÃüÃûÓʼþ¼Ð"
 
 msgid "Rename folder"
 msgstr "ÖØÐÂÃüÃûÓʼþ¼Ð"
 

-#: src/folderview.c:2126
+#: src/folderview.c:2207

 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"
 #, c-format
 msgid ""
 "All folder(s) and message(s) under `%s' will be deleted.\n"


@@ -2586,16 +2617,16 @@ msgstr ""
 "ÔÚ'%s'֮ϵÄÓʼþ¼ÐÒÔ¼°ÆäÖÐËùÓеÄÓʼþ½«±»É¾³ý¡£\n"
 "È·¶¨É¾³ý£¿"
 
 "ÔÚ'%s'֮ϵÄÓʼþ¼ÐÒÔ¼°ÆäÖÐËùÓеÄÓʼþ½«±»É¾³ý¡£\n"
 "È·¶¨É¾³ý£¿"
 

-#: src/folderview.c:2128
+#: src/folderview.c:2209

 msgid "Delete folder"
 msgstr "ɾ³ýÓʼþ¼Ð"
 
 msgid "Delete folder"
 msgstr "ɾ³ýÓʼþ¼Ð"
 

-#: src/folderview.c:2145
+#: src/folderview.c:2226

 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "ÎÞ·¨É¾³ýÓʼþ¼Ð'%s'"
 
 #, c-format
 msgid "Can't remove the folder `%s'."
 msgstr "ÎÞ·¨É¾³ýÓʼþ¼Ð'%s'"
 

-#: src/folderview.c:2181
+#: src/folderview.c:2262

 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"


@@ -2604,11 +2635,11 @@ msgstr ""
 "È·¶¨É¾³ýÓÊÏä'%s'£¿\n"
 "(ÆäÖеÄÓʼþ²»»áÖÁÓ²µúÖÐɾ³ý)"
 
 "È·¶¨É¾³ýÓÊÏä'%s'£¿\n"
 "(ÆäÖеÄÓʼþ²»»áÖÁÓ²µúÖÐɾ³ý)"
 

-#: src/folderview.c:2183
+#: src/folderview.c:2264

 msgid "Remove mailbox"
 msgstr "ɾ³ýÓÊÏä"
 
 msgid "Remove mailbox"
 msgstr "ɾ³ýÓÊÏä"
 

-#: src/folderview.c:2216
+#: src/folderview.c:2295

 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"


@@ -2618,55 +2649,55 @@ msgstr ""
 "(Èç¹ûÏëÒ»²¢´´½¨×ÓÓʼþ¼Ð£¬\n"
 "ÇëÔÚÐÂÃû×ֵĺóÃæ¼ÓÉÏ'/')"
 
 "(Èç¹ûÏëÒ»²¢´´½¨×ÓÓʼþ¼Ð£¬\n"
 "ÇëÔÚÐÂÃû×ֵĺóÃæ¼ÓÉÏ'/')"
 

-#: src/folderview.c:2273
+#: src/folderview.c:2352

 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "È·¶¨É¾³ýIMAP4µÄÕʺÅ'%s'£¿"
 
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "È·¶¨É¾³ýIMAP4µÄÕʺÅ'%s'£¿"
 

-#: src/folderview.c:2274
+#: src/folderview.c:2353

 msgid "Delete IMAP4 account"
 msgstr "Çå³ýIMAP4ÕʺÅ"
 
 msgid "Delete IMAP4 account"
 msgstr "Çå³ýIMAP4ÕʺÅ"
 

-#: src/folderview.c:2408
+#: src/folderview.c:2487

 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "È·¶¨Çå³ýÐÂÎÅȺ×é'%s'£¿"
 
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "È·¶¨Çå³ýÐÂÎÅȺ×é'%s'£¿"
 

-#: src/folderview.c:2409
+#: src/folderview.c:2488

 msgid "Delete newsgroup"
 msgstr "Çå³ýÐÂÎÅȺ×é"
 
 msgid "Delete newsgroup"
 msgstr "Çå³ýÐÂÎÅȺ×é"
 

-#: src/folderview.c:2446
+#: src/folderview.c:2525

 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "È·¶¨É¾³ýÐÂÎÅȺ×éÕʺÅ'%s'£¿"
 
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "È·¶¨É¾³ýÐÂÎÅȺ×éÕʺÅ'%s'£¿"
 

-#: src/folderview.c:2447
+#: src/folderview.c:2526

 msgid "Delete news account"
 msgstr "ɾ³ýÐÂÎÅȺÕʺÅ"
 
 msgid "Delete news account"
 msgstr "ɾ³ýÐÂÎÅȺÕʺÅ"
 

-#: src/folderview.c:2543
+#: src/folderview.c:2622

 #, c-format
 msgid "Moving %s to %s..."
 msgstr "½«%s ÒƵ½%s..."
 
 #, c-format
 msgid "Moving %s to %s..."
 msgstr "½«%s ÒƵ½%s..."
 

-#: src/folderview.c:2572
+#: src/folderview.c:2651

 msgid "Source and destination are the same."
 msgstr "ÎļþÀ´Ô´ºÍÄ¿µÄÏàͬ¡£"
 
 msgid "Source and destination are the same."
 msgstr "ÎļþÀ´Ô´ºÍÄ¿µÄÏàͬ¡£"
 

-#: src/folderview.c:2575
+#: src/folderview.c:2654

 msgid "Can't move a folder to one of its children."
 msgstr "ÎÞ·¨½«ÉÏÒ»²ãÓʼþ¼ÐÒƵ½Æä×ÓÓʼþ¼ÐÖС£"
 
 msgid "Can't move a folder to one of its children."
 msgstr "ÎÞ·¨½«ÉÏÒ»²ãÓʼþ¼ÐÒƵ½Æä×ÓÓʼþ¼ÐÖС£"
 

-#: src/folderview.c:2578
+#: src/folderview.c:2657

 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Óʼþ¼Ð²»ÄÜ¿çÓÊÏäÒƶ¯¡£"
 
 msgid "Folder moving cannot be done between different mailboxes."
 msgstr "Óʼþ¼Ð²»ÄÜ¿çÓÊÏäÒƶ¯¡£"
 

-#: src/folderview.c:2581
+#: src/folderview.c:2660

 msgid "Move failed!"
 msgstr "Òƶ¯Ê§°Ü£¡"
 
 msgid "Move failed!"
 msgstr "Òƶ¯Ê§°Ü£¡"
 

-#: src/folderview.c:2625 src/summaryview.c:4050
+#: src/folderview.c:2704 src/summaryview.c:4013

 #, fuzzy
 msgid "Processing configuration"
 msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
 #, fuzzy
 msgid "Processing configuration"
 msgstr "¹ýÂË/´¦Àí ÅäÖÃ"


@@ -2719,7 +2750,7 @@ msgstr "δ֪"
 msgid "Can't retrieve newsgroup list."
 msgstr "ÎÞ·¨È¡»ØÐÂÎÅȺ×éÁÐ±í¡£"
 
 msgid "Can't retrieve newsgroup list."
 msgstr "ÎÞ·¨È¡»ØÐÂÎÅȺ×éÁÐ±í¡£"
 

-#: src/grouplistdialog.c:444 src/summaryview.c:1178
+#: src/grouplistdialog.c:444 src/summaryview.c:1181

 msgid "Done."
 msgstr "Íê³É¡£"
 
 msgid "Done."
 msgstr "Íê³É¡£"
 


@@ -2906,7 +2937,7 @@ msgstr ""
 "ƴд¼ì²éÆ÷Çл»×Öµäʧ°Ü\n"
 "%s"
 
 "ƴд¼ì²éÆ÷Çл»×Öµäʧ°Ü\n"
 "%s"
 

-#: src/gtk/gtkutils.c:60 src/gtk/gtkutils.c:76
+#: src/gtk/gtkutils.c:61 src/gtk/gtkutils.c:77

 msgid "Abcdef"
 msgstr ""
 
 msgid "Abcdef"
 msgstr ""
 


@@ -2922,7 +2953,7 @@ msgstr "ѡ
 msgid "Plugins"
 msgstr "²å¼þ"
 
 msgid "Plugins"
 msgstr "²å¼þ"
 

-#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2705
+#: src/gtk/pluginwindow.c:190 src/prefs_common.c:2589

 msgid "Description"
 msgstr "ÃèÊö"
 
 msgid "Description"
 msgstr "ÃèÊö"
 


@@ -2965,6 +2996,7 @@ msgid "Signer"
 msgstr "¸èÕß"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148
 msgstr "¸èÕß"
 
 #: src/gtk/sslcertwindow.c:127 src/gtk/sslcertwindow.c:148

+#: src/prefs_themes.c:851

 msgid "Name: "
 msgstr "Ãû×Ö"
 
 msgid "Name: "
 msgstr "Ãû×Ö"
 


@@ -3036,11 +3068,11 @@ msgstr "
 msgid "Changed SSL Certificate"
 msgstr "¸ü¸ÄSSLÈÏÖ¤"
 
 msgid "Changed SSL Certificate"
 msgstr "¸ü¸ÄSSLÈÏÖ¤"
 

-#: src/headerview.c:181 src/summaryview.c:2398
+#: src/headerview.c:181 src/summaryview.c:2401

 msgid "(No From)"
 msgstr "(ûÓмļþÕß)"
 
 msgid "(No From)"
 msgstr "(ûÓмļþÕß)"
 

-#: src/headerview.c:202 src/summaryview.c:2440 src/summaryview.c:2443
+#: src/headerview.c:202 src/summaryview.c:2443 src/summaryview.c:2446

 msgid "(No Subject)"
 msgstr "(ûÓÐÖ÷Ìâ)"
 
 msgid "(No Subject)"
 msgstr "(ûÓÐÖ÷Ìâ)"
 


@@ -3089,105 +3121,105 @@ msgstr "
 msgid "root folder %s does not exist\n"
 msgstr "¸ùĿ¼ %s ²»´æÔÚ\n"
 
 msgid "root folder %s does not exist\n"
 msgstr "¸ùĿ¼ %s ²»´æÔÚ\n"
 

-#: src/imap.c:1415 src/imap.c:1423
+#: src/imap.c:1421 src/imap.c:1429

 msgid "error occurred while getting LIST.\n"
 msgstr "È¡µÃLISTʱ·¢Éú´íÎó¡£\n"
 
 msgid "error occurred while getting LIST.\n"
 msgstr "È¡µÃLISTʱ·¢Éú´íÎó¡£\n"
 

-#: src/imap.c:1651
+#: src/imap.c:1657

 msgid "can't create mailbox: LIST failed\n"
 msgstr "ÎÞ·¨´´½¨ÊÕÐżУºLISTʧ°Ü\n"
 
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ÎÞ·¨´´½¨ÊÕÐżУºLISTʧ°Ü\n"
 

-#: src/imap.c:1673
+#: src/imap.c:1679

 msgid "can't create mailbox\n"
 msgstr "ÎÞ·¨Æô¶¯ÊÕÐżÐ\n"
 
 msgid "can't create mailbox\n"
 msgstr "ÎÞ·¨Æô¶¯ÊÕÐżÐ\n"
 

-#: src/imap.c:1742
+#: src/imap.c:1748

 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ÎÞ·¨½«ÐÅÏä%s ÖØÐÂÃüÃûΪ %s\n"
 
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ÎÞ·¨½«ÐÅÏä%s ÖØÐÂÃüÃûΪ %s\n"
 

-#: src/imap.c:1804
+#: src/imap.c:1810

 msgid "can't delete mailbox\n"
 msgstr "ÎÞ·¨É¾³ýÐżÐ\n"
 
 msgid "can't delete mailbox\n"
 msgstr "ÎÞ·¨É¾³ýÐżÐ\n"
 

-#: src/imap.c:1842
+#: src/imap.c:1848

 msgid "can't get envelope\n"
 msgstr "ûÓÐÐÅ·â\n"
 
 msgid "can't get envelope\n"
 msgstr "ûÓÐÐÅ·â\n"
 

-#: src/imap.c:1850
+#: src/imap.c:1856

 msgid "error occurred while getting envelope.\n"
 msgstr "ÄÃÐÅ·âʱ·¢Éú´íÎó¡£\n"
 
 msgid "error occurred while getting envelope.\n"
 msgstr "ÄÃÐÅ·âʱ·¢Éú´íÎó¡£\n"
 

-#: src/imap.c:1872
+#: src/imap.c:1878

 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ÎÞ·¨·ÖÎöÐŷ⣺%s\n"
 
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ÎÞ·¨·ÖÎöÐŷ⣺%s\n"
 

-#: src/imap.c:1928
+#: src/imap.c:1934

 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "ÎÞ·¨Óë%s½¨Á¢IMAP4ÁªÏµ\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s\n"
 msgstr "ÎÞ·¨Óë%s½¨Á¢IMAP4ÁªÏµ\n"
 

-#: src/imap.c:1950
+#: src/imap.c:1956

 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½ÓIMAP4·þÎñÆ÷£º%s:%d\n"
 
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½ÓIMAP4·þÎñÆ÷£º%s:%d\n"
 

-#: src/imap.c:1957
+#: src/imap.c:1963

 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr " ÎÞ·¨Óë %s:%d ½¨Á¢IMAP4ÁªÏµ\n"
 
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr " ÎÞ·¨Óë %s:%d ½¨Á¢IMAP4ÁªÏµ\n"
 

-#: src/imap.c:2047
+#: src/imap.c:2053

 msgid "can't get namespace\n"
 msgstr "ÎÞ·¨È¡µÃÃüÃû¿Õ¼ä\n"
 
 msgid "can't get namespace\n"
 msgstr "ÎÞ·¨È¡µÃÃüÃû¿Õ¼ä\n"
 

-#: src/imap.c:2480
+#: src/imap.c:2486

 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ÎÞ·¨Ñ¡ÔñÓʼþ¼Ð£º%s\n"
 
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ÎÞ·¨Ñ¡ÔñÓʼþ¼Ð£º%s\n"
 

-#: src/imap.c:2620
+#: src/imap.c:2626

 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4¼øȨʧ°Ü¡£\n"
 
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4¼øȨʧ°Ü¡£\n"
 

-#: src/imap.c:2637
+#: src/imap.c:2643

 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4µÇ¼ʧ°Ü¡£\n"
 
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4µÇ¼ʧ°Ü¡£\n"
 

-#: src/imap.c:2953
+#: src/imap.c:2959

 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ÎÞ·¨½«%s¸½ÔÚ%sÖ®ºó\n"
 
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ÎÞ·¨½«%s¸½ÔÚ%sÖ®ºó\n"
 

-#: src/imap.c:2960
+#: src/imap.c:2966

 msgid "(sending file...)"
 msgstr "(ÕýÔÚ·¢ËÍ...)"
 
 msgid "(sending file...)"
 msgstr "(ÕýÔÚ·¢ËÍ...)"
 

-#: src/imap.c:3002
+#: src/imap.c:3008

 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ÎÞ·¨½«Óʼþ¸½ÔÚ%sÖ®ºó\n"
 
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ÎÞ·¨½«Óʼþ¸½ÔÚ%sÖ®ºó\n"
 

-#: src/imap.c:3084
+#: src/imap.c:3090

 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ÎÞ·¨½«%s¿½±´µ½%s\n"
 
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ÎÞ·¨½«%s¿½±´µ½%s\n"
 

-#: src/imap.c:3134
+#: src/imap.c:3140

 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºSTORE %s %s\n"
 
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºSTORE %s %s\n"
 

-#: src/imap.c:3151
+#: src/imap.c:3157

 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºEXPUNGE\n"
 
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºEXPUNGE\n"
 

-#: src/imap.c:3164
+#: src/imap.c:3170

 msgid "error while imap command: CLOSE\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºCLOSE\n"
 
 msgid "error while imap command: CLOSE\n"
 msgstr "imapÖ¸Áîʧ°Ü£ºCLOSE\n"
 

-#: src/imap.c:3419
+#: src/imap.c:3425

 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconvÎÞ·¨½«UTF-7ת»»³É%s\n"
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconvÎÞ·¨½«UTF-7ת»»³É%s\n"


@@ -3266,7 +3298,7 @@ msgstr "
 msgid "R"
 msgstr ""
 
 msgid "R"
 msgstr ""
 

-#: src/importldif.c:765 src/summaryview.c:472
+#: src/importldif.c:765 src/summaryview.c:473

 msgid "S"
 msgstr "S"
 
 msgid "S"
 msgstr "S"
 


@@ -3358,134 +3390,134 @@ msgstr "ѡ
 msgid "Import Pine file into Address Book"
 msgstr "½«PineÎļþµ¼ÈëÖÁͨѶ¼ÖÐ"
 
 msgid "Import Pine file into Address Book"
 msgstr "½«PineÎļþµ¼ÈëÖÁͨѶ¼ÖÐ"
 

-#: src/inc.c:334
+#: src/inc.c:358

 msgid "Retrieving new messages"
 msgstr "È¡»ØÐÂÓʼþ"
 
 msgid "Retrieving new messages"
 msgstr "È¡»ØÐÂÓʼþ"
 

-#: src/inc.c:379
+#: src/inc.c:403

 msgid "Standby"
 msgstr "´ýÃü"
 
 msgid "Standby"
 msgstr "´ýÃü"
 

-#: src/inc.c:504 src/inc.c:559
+#: src/inc.c:521 src/inc.c:576

 msgid "Cancelled"
 msgstr "È¡Ïû"
 
 msgid "Cancelled"
 msgstr "È¡Ïû"
 

-#: src/inc.c:515
+#: src/inc.c:532

 msgid "Retrieving"
 msgstr "ÕýÔÚÊÕÈ¡"
 
 msgid "Retrieving"
 msgstr "ÕýÔÚÊÕÈ¡"
 

-#: src/inc.c:531
+#: src/inc.c:548

 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Íê³É(È¡»Ø%d¸öÓʼþ(%s))"
 
 #, c-format
 msgid "Done (%d message(s) (%s) received)"
 msgstr "Íê³É(È¡»Ø%d¸öÓʼþ(%s))"
 

-#: src/inc.c:535
+#: src/inc.c:552

 msgid "Done (no new messages)"
 msgstr "Íê³É(ûÓÐÐÂÓʼþ)"
 
 msgid "Done (no new messages)"
 msgstr "Íê³É(ûÓÐÐÂÓʼþ)"
 

-#: src/inc.c:541
+#: src/inc.c:558

 msgid "Connection failed"
 msgstr "Á¬½Óʧ°Ü"
 
 msgid "Connection failed"
 msgstr "Á¬½Óʧ°Ü"
 

-#: src/inc.c:545
+#: src/inc.c:562

 msgid "Auth failed"
 msgstr "ÊÚȨʧ°Ü"
 
 msgid "Auth failed"
 msgstr "ÊÚȨʧ°Ü"
 

-#: src/inc.c:549 src/prefs_summary_column.c:76
+#: src/inc.c:566 src/prefs_summary_column.c:76

 msgid "Locked"
 msgstr "ÒÑËø¶¨"
 
 msgid "Locked"
 msgstr "ÒÑËø¶¨"
 

-#: src/inc.c:572
+#: src/inc.c:589

 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "ÔÚ%sÉϵÄ%sÊÚȨʧ°Ü"
 
 #, c-format
 msgid "Authorization for %s on %s failed"
 msgstr "ÔÚ%sÉϵÄ%sÊÚȨʧ°Ü"
 

-#: src/inc.c:642
+#: src/inc.c:659

 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Íê³É (%d¸öÐÂÓʼþ)"
 
 #, c-format
 msgid "Finished (%d new message(s))"
 msgstr "Íê³É (%d¸öÐÂÓʼþ)"
 

-#: src/inc.c:645
+#: src/inc.c:662

 msgid "Finished (no new messages)"
 msgstr "Íê³É (ûÓÐÐÂÓʼþ)"
 
 msgid "Finished (no new messages)"
 msgstr "Íê³É (ûÓÐÐÂÓʼþ)"
 

-#: src/inc.c:654
+#: src/inc.c:671

 msgid "Some errors occurred while getting mail."
 msgstr "È¡Óʼþʱ·¢Éú´íÎó¡£"
 
 msgid "Some errors occurred while getting mail."
 msgstr "È¡Óʼþʱ·¢Éú´íÎó¡£"
 

-#: src/inc.c:695
+#: src/inc.c:712

 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s:ÕýÔÚÊÕÈ¡Óʼþ"
 
 #, c-format
 msgid "%s: Retrieving new messages"
 msgstr "%s:ÕýÔÚÊÕÈ¡Óʼþ"
 

-#: src/inc.c:714
+#: src/inc.c:731

 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "ÕýÔÚÁ¬½ÓPOP3·þÎñÆ÷£º%s..."
 
 #, c-format
 msgid "Connecting to POP3 server: %s..."
 msgstr "ÕýÔÚÁ¬½ÓPOP3·þÎñÆ÷£º%s..."
 

-#: src/inc.c:721
+#: src/inc.c:738

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d\n"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d\n"
 

-#: src/inc.c:728
+#: src/inc.c:745

 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr " ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d"
 
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d"
 msgstr " ÎÞ·¨Á¬½Óµ½POP3·þÎñÆ÷£º%s:%d"
 

-#: src/inc.c:794 src/send_message.c:461
+#: src/inc.c:811 src/send_message.c:461

 msgid "Authenticating..."
 msgstr "ÕýÔÚÊÚȨ..."
 
 msgid "Authenticating..."
 msgstr "ÕýÔÚÊÚȨ..."
 

-#: src/inc.c:795
+#: src/inc.c:812

 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "ÕýÔÚ´Ó%sÊÕÈ¡Óʼþ..."
 
 #, c-format
 msgid "Retrieving messages from %s..."
 msgstr "ÕýÔÚ´Ó%sÊÕÈ¡Óʼþ..."
 

-#: src/inc.c:800
+#: src/inc.c:817

 msgid "Getting the number of new messages (STAT)..."
 msgstr "»ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(STAT)..."
 
 msgid "Getting the number of new messages (STAT)..."
 msgstr "»ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(STAT)..."
 

-#: src/inc.c:804
+#: src/inc.c:821

 msgid "Getting the number of new messages (LAST)..."
 msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(LAST)..."
 
 msgid "Getting the number of new messages (LAST)..."
 msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(LAST)..."
 

-#: src/inc.c:808
+#: src/inc.c:825

 msgid "Getting the number of new messages (UIDL)..."
 msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(UIDL)..."
 
 msgid "Getting the number of new messages (UIDL)..."
 msgstr " »ñÈ¡ÐÂÓʼþÊýÄ¿ÖÐ(UIDL)..."
 

-#: src/inc.c:812
+#: src/inc.c:829

 msgid "Getting the size of messages (LIST)..."
 msgstr "»ñÈ¡Óʼþ´óСÖÐ(LIST)..."
 
 msgid "Getting the size of messages (LIST)..."
 msgstr "»ñÈ¡Óʼþ´óСÖÐ(LIST)..."
 

-#: src/inc.c:829
+#: src/inc.c:846

 #, c-format
 msgid "Deleting message %d"
 msgstr "ɾ³ýÓʼþ%d"
 
 #, c-format
 msgid "Deleting message %d"
 msgstr "ɾ³ýÓʼþ%d"
 

-#: src/inc.c:835 src/send_message.c:479
+#: src/inc.c:852 src/send_message.c:479

 msgid "Quitting"
 msgstr "ÕýÔÚÍ˳ö"
 
 msgid "Quitting"
 msgstr "ÕýÔÚÍ˳ö"
 

-#: src/inc.c:872
+#: src/inc.c:889

 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "È¡»ØÓʼþ(%d/%d)(%s/%s)"
 
 #, c-format
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "È¡»ØÓʼþ(%d/%d)(%s/%s)"
 

-#: src/inc.c:901
+#: src/inc.c:918

 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "ÕýÔÚÊÕÈ¡Óʼþ(¹²%d¸ö£¬ÒÑÊÕµ½%s¸ö)"
 
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
 msgstr "ÕýÔÚÊÕÈ¡Óʼþ(¹²%d¸ö£¬ÒÑÊÕµ½%s¸ö)"
 

-#: src/inc.c:963
+#: src/inc.c:980

 msgid "Connection failed."
 msgstr "Á¬½Óʧ°Ü"
 
 msgid "Connection failed."
 msgstr "Á¬½Óʧ°Ü"
 

-#: src/inc.c:969
+#: src/inc.c:986

 msgid "Error occurred while processing mail."
 msgstr " ´¦ÀíÓʼþʱ·¢Éú´íÎó¡£"
 
 msgid "Error occurred while processing mail."
 msgstr " ´¦ÀíÓʼþʱ·¢Éú´íÎó¡£"
 

-#: src/inc.c:974
+#: src/inc.c:991

 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"
 #, c-format
 msgid ""
 "Error occurred while processing mail:\n"


@@ -3494,27 +3526,27 @@ msgstr ""
 "´¦ÀíÓʼþʱ·¢Éú´íÎó£º\n"
 "%s"
 
 "´¦ÀíÓʼþʱ·¢Éú´íÎó£º\n"
 "%s"
 

-#: src/inc.c:980
+#: src/inc.c:997

 msgid "No disk space left."
 msgstr "Ó²µúÎ޿ռ䡣"
 
 msgid "No disk space left."
 msgstr "Ó²µúÎ޿ռ䡣"
 

-#: src/inc.c:985
+#: src/inc.c:1002

 msgid "Can't write file."
 msgstr "ÎÞ·¨Ð´ÈëÎļþ¡£"
 
 msgid "Can't write file."
 msgstr "ÎÞ·¨Ð´ÈëÎļþ¡£"
 

-#: src/inc.c:990
+#: src/inc.c:1007

 msgid "Socket error."
 msgstr "Socket´íÎó¡£"
 
 msgid "Socket error."
 msgstr "Socket´íÎó¡£"
 

-#: src/inc.c:996 src/send_message.c:602
+#: src/inc.c:1013 src/send_message.c:602

 msgid "Connection closed by the remote host."
 msgstr "Á¬½Ó±»Ô¶³ÌÖ÷»ú¹Ø±Õ¡£"
 
 msgid "Connection closed by the remote host."
 msgstr "Á¬½Ó±»Ô¶³ÌÖ÷»ú¹Ø±Õ¡£"
 

-#: src/inc.c:1002
+#: src/inc.c:1019

 msgid "Mailbox is locked."
 msgstr "ÓÊÏäÒѾ­±»Ëø£¬ÎÞ·¨´ò¿ª¡£"
 
 msgid "Mailbox is locked."
 msgstr "ÓÊÏäÒѾ­±»Ëø£¬ÎÞ·¨´ò¿ª¡£"
 

-#: src/inc.c:1006
+#: src/inc.c:1023

 #, c-format
 msgid ""
 "Mailbox is locked:\n"
 #, c-format
 msgid ""
 "Mailbox is locked:\n"


@@ -3523,11 +3555,11 @@ msgstr ""
 "ÓÊÏäÎÞ·¨´ò¿ª£º\n"
 "%s"
 
 "ÓÊÏäÎÞ·¨´ò¿ª£º\n"
 "%s"
 

-#: src/inc.c:1012 src/send_message.c:589
+#: src/inc.c:1029 src/send_message.c:589

 msgid "Authentication failed."
 msgstr "ÊÚȨʧ°Ü¡£"
 
 msgid "Authentication failed."
 msgstr "ÊÚȨʧ°Ü¡£"
 

-#: src/inc.c:1017 src/send_message.c:592
+#: src/inc.c:1034 src/send_message.c:592

 #, c-format
 msgid ""
 "Authentication failed:\n"
 #, c-format
 msgid ""
 "Authentication failed:\n"


@@ -3536,7 +3568,7 @@ msgstr ""
 "ÊÚȨʧ°Ü£º\n"
 "%s"
 
 "ÊÚȨʧ°Ü£º\n"
 "%s"
 

-#: src/inc.c:1052
+#: src/inc.c:1069

 msgid "Incorporation cancelled\n"
 msgstr "ºÏ²¢²Ù×÷±»È¡Ïû\n"
 
 msgid "Incorporation cancelled\n"
 msgstr "ºÏ²¢²Ù×÷±»È¡Ïû\n"
 


@@ -3553,7 +3585,7 @@ msgstr "
 msgid "Nick Name"
 msgstr "´ÂºÅ"
 
 msgid "Nick Name"
 msgstr "´ÂºÅ"
 

-#: src/main.c:143 src/main.c:152
+#: src/main.c:145 src/main.c:154

 #, c-format
 msgid ""
 "File `%s' already exists.\n"
 #, c-format
 msgid ""
 "File `%s' already exists.\n"


@@ -3562,20 +3594,20 @@ msgstr ""
 "'%s'ÒÑ´æÔÚ¡£\n"
 "ÎÞ·¨´´½¨Ä¿Â¼¼Ð¡£"
 
 "'%s'ÒÑ´æÔÚ¡£\n"
 "ÎÞ·¨´´½¨Ä¿Â¼¼Ð¡£"
 

-#: src/main.c:212
+#: src/main.c:214

 msgid "g_thread is not supported by glib.\n"
 msgstr "glib²»Ö§³Ög_thread¡£\n"
 
 msgid "g_thread is not supported by glib.\n"
 msgstr "glib²»Ö§³Ög_thread¡£\n"
 

-#: src/main.c:514
+#: src/main.c:513

 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ó÷¨£º %s[Ñ¡Ïî]...\n"
 
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ó÷¨£º %s[Ñ¡Ïî]...\n"
 

-#: src/main.c:517
+#: src/main.c:516

 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [µØÖ·]       ´ò¿ªÐ´ÐÅ´°¿Ú"
 
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [µØÖ·]       ´ò¿ªÐ´ÐÅ´°¿Ú"
 

-#: src/main.c:518
+#: src/main.c:517

 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"


@@ -3584,23 +3616,23 @@ msgstr ""
 " --attach Îļþ1 [Îļþ2]...\n"
 "                         ½«Ìض¨µÄÎļþÒÔдÐÅ´°¿Ú´ò¿ª"
 
 " --attach Îļþ1 [Îļþ2]...\n"
 "                         ½«Ìض¨µÄÎļþÒÔдÐÅ´°¿Ú´ò¿ª"
 

-#: src/main.c:521
+#: src/main.c:520

 msgid "  --receive              receive new messages"
 msgstr "  --receive              ½ÓÊÕÐÂÓʼþ"
 
 msgid "  --receive              receive new messages"
 msgstr "  --receive              ½ÓÊÕÐÂÓʼþ"
 

-#: src/main.c:522
+#: src/main.c:521

 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          ½ÓÊÕËùÓÐ ÕʺŵÄÐÂÓʼþ"
 
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          ½ÓÊÕËùÓÐ ÕʺŵÄÐÂÓʼþ"
 

-#: src/main.c:523
+#: src/main.c:522

 msgid "  --send                 send all queued messages"
 msgstr "  --send                 ·¢ËÍËùÓдý·¢ËÍÓʼþ"
 
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 ·¢ËÍËùÓдý·¢ËÍÓʼþ"
 

-#: src/main.c:524
+#: src/main.c:523

 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               ÏÔʾËùÓÐÓʼþµÄÊýÄ¿"
 
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               ÏÔʾËùÓÐÓʼþµÄÊýÄ¿"
 

-#: src/main.c:525
+#: src/main.c:524

 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"


@@ -3608,749 +3640,758 @@ msgstr ""
 "  --status-full [Óʼþ¼Ð]...\n"
 "                         ÏÔʾËùÓÐÓʼþ¼ÐµÄ״̬"
 
 "  --status-full [Óʼþ¼Ð]...\n"
 "                         ÏÔʾËùÓÐÓʼþ¼ÐµÄ״̬"
 

-#: src/main.c:527
+#: src/main.c:526

 msgid "  --online               switch to online mode"
 msgstr "  --online               Çл»µ½Áª»úģʽ"
 
 msgid "  --online               switch to online mode"
 msgstr "  --online               Çл»µ½Áª»úģʽ"
 

-#: src/main.c:528
+#: src/main.c:527

 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              Çл»µ½ÍÑ»ú״̬"
 
 msgid "  --offline              switch to offline mode"
 msgstr "  --offline              Çл»µ½ÍÑ»ú״̬"
 

-#: src/main.c:529
+#: src/main.c:528

 msgid "  --debug                debug mode"
 msgstr "  --debug                µ÷ÊÔģʽ"
 
 msgid "  --debug                debug mode"
 msgstr "  --debug                µ÷ÊÔģʽ"
 

-#: src/main.c:530
+#: src/main.c:529

 msgid "  --help                 display this help and exit"
 msgstr "  --help                 ÏÔʾ±¾ËµÃ÷²¢½áÊø³ÌÐò"
 
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 ÏÔʾ±¾ËµÃ÷²¢½áÊø³ÌÐò"
 

-#: src/main.c:531
+#: src/main.c:530

 msgid "  --version              output version information and exit"
 msgstr "  --version              ÏÔʾ°æ±¾ÄÚÈݲ¢½áÊø³ÌÐò"
 
 msgid "  --version              output version information and exit"
 msgstr "  --version              ÏÔʾ°æ±¾ÄÚÈݲ¢½áÊø³ÌÐò"
 

-#: src/main.c:532
+#: src/main.c:531

 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           ÏÔʾÅäÖÃÊý¾ÝĿ¼"
 
 msgid "  --config-dir           output configuration directory"
 msgstr "  --config-dir           ÏÔʾÅäÖÃÊý¾ÝĿ¼"
 

-#: src/main.c:569 src/summaryview.c:5198
+#: src/main.c:568 src/summaryview.c:5167

 #, c-format
 msgid "Processing (%s)..."
 msgstr "ÕýÔÚ´¦Àí(%s)..."
 
 #, c-format
 msgid "Processing (%s)..."
 msgstr "ÕýÔÚ´¦Àí(%s)..."
 

-#: src/main.c:572
+#: src/main.c:571

 msgid "top level folder"
 msgstr "×îÉÏÒ»²ãÓʼþ¼Ð"
 
 msgid "top level folder"
 msgstr "×îÉÏÒ»²ãÓʼþ¼Ð"
 

-#: src/main.c:637
+#: src/main.c:636

 msgid "Composing message exists."
 msgstr "Ëù±à¼­µÄÎļþÒѾ­´æÔÚ¡£"
 
 msgid "Composing message exists."
 msgstr "Ëù±à¼­µÄÎļþÒѾ­´æÔÚ¡£"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Draft them"
 msgstr "±£´æΪ²Ý¸å"
 
 msgid "Draft them"
 msgstr "±£´æΪ²Ý¸å"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Discard them"
 msgstr "¶ªÆú"
 
 msgid "Discard them"
 msgstr "¶ªÆú"
 

-#: src/main.c:638
+#: src/main.c:637

 msgid "Don't quit"
 msgstr "²»Í˳ö"
 
 msgid "Don't quit"
 msgstr "²»Í˳ö"
 

-#: src/main.c:652
+#: src/main.c:651

 msgid "Queued messages"
 msgstr "´ý·¢Ë͵ÄÓʼþ"
 
 msgid "Queued messages"
 msgstr "´ý·¢Ë͵ÄÓʼþ"
 

-#: src/main.c:653
+#: src/main.c:652

 msgid "Some unsent messages are queued. Exit now?"
 msgstr "´ý·¢ËÍÓʼþ¼ÐÄÚÉÐÓÐÓʼþ¡£ÒªÍ˳öÂð£¿"
 
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "´ý·¢ËÍÓʼþ¼ÐÄÚÉÐÓÐÓʼþ¡£ÒªÍ˳öÂð£¿"
 

-#: src/main.c:898
+#: src/main.c:897

 msgid "Some errors occurred while sending queued messages."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 
 msgid "Some errors occurred while sending queued messages."
 msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
 

-#: src/mainwindow.c:426
+#: src/mainwindow.c:436

 msgid "/_File/_Folder"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)"
 
 msgid "/_File/_Folder"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)"
 

-#: src/mainwindow.c:427
+#: src/mainwindow.c:437

 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/н¨Óʼþ¼Ð(_n)..."
 
 msgid "/_File/_Folder/Create _new folder..."
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/н¨Óʼþ¼Ð(_n)..."
 

-#: src/mainwindow.c:429
+#: src/mainwindow.c:439

 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ÖØÐÂÃüÃûÓʼþ¼Ð(_R)..."
 
 msgid "/_File/_Folder/_Rename folder..."
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ÖØÐÂÃüÃûÓʼþ¼Ð(_R)..."
 

-#: src/mainwindow.c:430
+#: src/mainwindow.c:440

 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ɾ³ýÓʼþ¼Ð(_D)"
 
 msgid "/_File/_Folder/_Delete folder"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/ɾ³ýÓʼþ¼Ð(_D)"
 

-#: src/mainwindow.c:431
+#: src/mainwindow.c:441

 msgid "/_File/_Folder/---"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/---"
 
 msgid "/_File/_Folder/---"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/---"
 

-#: src/mainwindow.c:432
+#: src/mainwindow.c:442

 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ(_C)"
 
 msgid "/_File/_Folder/_Check for new messages in all folders"
 msgstr "/Îļþ(_F)/Óʼþ¼Ð(_F)/¼ì²éËùÓÐÓʼþ¼ÐÖеÄÐÂÓʼþ(_C)"
 

-#: src/mainwindow.c:434
+#: src/mainwindow.c:444

 msgid "/_File/_Add mailbox"
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)..."
 
 msgid "/_File/_Add mailbox"
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)..."
 

-#: src/mainwindow.c:435
+#: src/mainwindow.c:445

 msgid "/_File/_Add mailbox/MH..."
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)/MH¸ñʽ..."
 
 msgid "/_File/_Add mailbox/MH..."
 msgstr "/Îļþ(_F)/Ôö¼ÓÓÊÏä(_A)/MH¸ñʽ..."
 

-#: src/mainwindow.c:436
+#: src/mainwindow.c:446

 msgid "/_File/_Import mbox file..."
 msgstr "/Îļþ(_F)/µ¼ÈëmboxµÄÎļþ(_I)... "
 
 msgid "/_File/_Import mbox file..."
 msgstr "/Îļþ(_F)/µ¼ÈëmboxµÄÎļþ(_I)... "
 

-#: src/mainwindow.c:437
+#: src/mainwindow.c:447

 msgid "/_File/_Export to mbox file..."
 msgstr "/Îļþ(_F)/ÒÔmbox¸ñʽµ¼³öÓʼþ¼Ð..."
 
 msgid "/_File/_Export to mbox file..."
 msgstr "/Îļþ(_F)/ÒÔmbox¸ñʽµ¼³öÓʼþ¼Ð..."
 

-#: src/mainwindow.c:438
+#: src/mainwindow.c:448

 msgid "/_File/Empty _trash"
 msgstr "/Îļþ(_F)/Çå¿ÕÀ¬»øÍ°(_t)"
 
 msgid "/_File/Empty _trash"
 msgstr "/Îļþ(_F)/Çå¿ÕÀ¬»øÍ°(_t)"
 

-#: src/mainwindow.c:440 src/messageview.c:144
+#: src/mainwindow.c:450 src/messageview.c:144

 msgid "/_File/_Save as..."
 msgstr "/Îļþ(_F)/±£´æΪ(_S)..."
 
 msgid "/_File/_Save as..."
 msgstr "/Îļþ(_F)/±£´æΪ(_S)..."
 

-#: src/mainwindow.c:441 src/messageview.c:145
+#: src/mainwindow.c:451 src/messageview.c:145

 msgid "/_File/_Print..."
 msgstr "/Îļþ(_F)/´òÓ¡(_P)..."
 
 msgid "/_File/_Print..."
 msgstr "/Îļþ(_F)/´òÓ¡(_P)..."
 

-#: src/mainwindow.c:443
+#: src/mainwindow.c:453

 msgid "/_File/_Work offline"
 msgstr "/Îļþ(_F)/ÍÑ»ú¹¤×÷(_W)"
 
 msgid "/_File/_Work offline"
 msgstr "/Îļþ(_F)/ÍÑ»ú¹¤×÷(_W)"
 

-#: src/mainwindow.c:446
+#: src/mainwindow.c:456

 msgid "/_File/E_xit"
 msgstr "/Îļþ(_F)/Í˳ö(_x)"
 
 msgid "/_File/E_xit"
 msgstr "/Îļþ(_F)/Í˳ö(_x)"
 

-#: src/mainwindow.c:451
+#: src/mainwindow.c:461

 msgid "/_Edit/Select _thread"
 msgstr "/±à¼­(_E)/Ñ¡ÔñÏßË÷(_T)"
 
 msgid "/_Edit/Select _thread"
 msgstr "/±à¼­(_E)/Ñ¡ÔñÏßË÷(_T)"
 

-#: src/mainwindow.c:453 src/messageview.c:153
+#: src/mainwindow.c:463 src/messageview.c:153

 msgid "/_Edit/_Find in current message..."
 msgstr " ±à¼­(_E)/ÔÚÓʼþÖÐËÑÑ°(_F)..."
 
 msgid "/_Edit/_Find in current message..."
 msgstr " ±à¼­(_E)/ÔÚÓʼþÖÐËÑÑ°(_F)..."
 

-#: src/mainwindow.c:455
+#: src/mainwindow.c:465

 msgid "/_Edit/_Search folder..."
 msgstr "±à¼­(_E)/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 
 msgid "/_Edit/_Search folder..."
 msgstr "±à¼­(_E)/ÔÚÓʼþ¼ÐÖвéÕÒ(_S)..."
 

-#: src/mainwindow.c:457
+#: src/mainwindow.c:467

 msgid "/_View/Show or hi_de"
 msgstr "²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)"
 
 msgid "/_View/Show or hi_de"
 msgstr "²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)"
 

-#: src/mainwindow.c:458
+#: src/mainwindow.c:468

 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/Óʼþ¼ÐÊ÷(_F)"
 
 msgid "/_View/Show or hi_de/_Folder tree"
 msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/Óʼþ¼ÐÊ÷(_F)"
 

-#: src/mainwindow.c:460
+#: src/mainwindow.c:470

 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/ÔĶÁÓʼþ(_M)"
 
 msgid "/_View/Show or hi_de/_Message view"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/ÔĶÁÓʼþ(_M)"
 

-#: src/mainwindow.c:462
+#: src/mainwindow.c:472

 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar"
 msgstr "²é¿´(_V)/ ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)"
 

-#: src/mainwindow.c:464
+#: src/mainwindow.c:474

 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ»òÎÄ×Ö(_a)"
 
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ»òÎÄ×Ö(_a)"
 

-#: src/mainwindow.c:466
+#: src/mainwindow.c:476

 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ(_I)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ͼÏñ(_I)"
 

-#: src/mainwindow.c:468
+#: src/mainwindow.c:478

 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ÎÄ×Ö(_T)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ÎÄ×Ö(_T)"
 

-#: src/mainwindow.c:470
+#: src/mainwindow.c:480

 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ûÓÐ(_N)"
 
 msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/¹¤¾ßÀ¸(_T)/ûÓÐ(_N)"
 

-#: src/mainwindow.c:472
+#: src/mainwindow.c:482

 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/Òþ²Ø¹¤¾ßÀ¸(_b)"
 
 msgid "/_View/Show or hi_de/Status _bar"
 msgstr "/²é¿´(_V)/ÏÔʾ»òÒþ²Ø(_d)/Òþ²Ø¹¤¾ßÀ¸(_b)"
 

-#: src/mainwindow.c:475
+#: src/mainwindow.c:485

 msgid "/_View/Separate f_older tree"
 msgstr "/²é¿´(_V)/Óõ¥¶À´°¿ÚÏÔʾÓʼþ¼ÐÊ÷(_o)"
 
 msgid "/_View/Separate f_older tree"
 msgstr "/²é¿´(_V)/Óõ¥¶À´°¿ÚÏÔʾÓʼþ¼ÐÊ÷(_o)"
 

-#: src/mainwindow.c:476
+#: src/mainwindow.c:486

 msgid "/_View/Separate m_essage view"
 msgstr "/ ²é¿´(_V)/Óõ¥¶À´°¿ÚÖÐÏÔʾÓʼþÄÚÈÝ(_e)"
 
 msgid "/_View/Separate m_essage view"
 msgstr "/ ²é¿´(_V)/Óõ¥¶À´°¿ÚÖÐÏÔʾÓʼþÄÚÈÝ(_e)"
 

-#: src/mainwindow.c:478
+#: src/mainwindow.c:488

 msgid "/_View/_Sort"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)"
 
 msgid "/_View/_Sort"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)"
 

-#: src/mainwindow.c:479
+#: src/mainwindow.c:489

 msgid "/_View/_Sort/by _number"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)/°´Ë³Ðò(_n)"
 
 msgid "/_View/_Sort/by _number"
 msgstr "/²é¿´(_V)/ÅÅÐò(_S)/°´Ë³Ðò(_n)"
 

-#: src/mainwindow.c:480
+#: src/mainwindow.c:490

 msgid "/_View/_Sort/by s_ize"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´´óС(_i)"
 
 msgid "/_View/_Sort/by s_ize"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´´óС(_i)"
 

-#: src/mainwindow.c:481
+#: src/mainwindow.c:491

 msgid "/_View/_Sort/by _date"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÈÕÆÚ(_d)"
 
 msgid "/_View/_Sort/by _date"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÈÕÆÚ(_d)"
 

-#: src/mainwindow.c:482
+#: src/mainwindow.c:492

 msgid "/_View/_Sort/by _from"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¼ÄÐÅÕß(_f)"
 
 msgid "/_View/_Sort/by _from"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¼ÄÐÅÕß(_f)"
 

-#: src/mainwindow.c:483
+#: src/mainwindow.c:493

 msgid "/_View/_Sort/by _recipient"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÊÕÐÅÕß(_r)"
 
 msgid "/_View/_Sort/by _recipient"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÊÕÐÅÕß(_r)"
 

-#: src/mainwindow.c:484
+#: src/mainwindow.c:494

 msgid "/_View/_Sort/by _subject"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷Ìâ(_s)"
 
 msgid "/_View/_Sort/by _subject"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷Ìâ(_s)"
 

-#: src/mainwindow.c:485
+#: src/mainwindow.c:495

 msgid "/_View/_Sort/by _color label"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÑÕÉ«±êÇ©(_l)"
 
 msgid "/_View/_Sort/by _color label"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´ÑÕÉ«±êÇ©(_l)"
 

-#: src/mainwindow.c:487
+#: src/mainwindow.c:497

 msgid "/_View/_Sort/by _mark"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´±ê¼Ç(_m)"
 
 msgid "/_View/_Sort/by _mark"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´±ê¼Ç(_m)"
 

-#: src/mainwindow.c:488
+#: src/mainwindow.c:498

 msgid "/_View/_Sort/by _status"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´×´Ì¬(_s)"
 
 msgid "/_View/_Sort/by _status"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´×´Ì¬(_s)"
 

-#: src/mainwindow.c:489
+#: src/mainwindow.c:499

 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¸½¼þ(_t)"
 
 msgid "/_View/_Sort/by a_ttachment"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´¸½¼þ(_t)"
 

-#: src/mainwindow.c:491
+#: src/mainwindow.c:501

 msgid "/_View/_Sort/by score"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´µÃ·Ö"
 
 msgid "/_View/_Sort/by score"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´µÃ·Ö"
 

-#: src/mainwindow.c:492
+#: src/mainwindow.c:502

 msgid "/_View/_Sort/by locked"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ëøס״̬"
 
 msgid "/_View/_Sort/by locked"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ëøס״̬"
 

-#: src/mainwindow.c:493
+#: src/mainwindow.c:503

 msgid "/_View/_Sort/D_on't sort"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/²»ÅÅÐò(_o)"
 
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/²»ÅÅÐò(_o)"
 

-#: src/mainwindow.c:494 src/mainwindow.c:497
+#: src/mainwindow.c:504 src/mainwindow.c:507

 msgid "/_View/_Sort/---"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/---"
 
 msgid "/_View/_Sort/---"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/---"
 

-#: src/mainwindow.c:495
+#: src/mainwindow.c:505

 msgid "/_View/_Sort/Ascending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/ÉýÐò"
 
 msgid "/_View/_Sort/Ascending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/ÉýÐò"
 

-#: src/mainwindow.c:496
+#: src/mainwindow.c:506

 msgid "/_View/_Sort/Descending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/½µÐò"
 
 msgid "/_View/_Sort/Descending"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/½µÐò"
 

-#: src/mainwindow.c:498
+#: src/mainwindow.c:508

 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷ÌâÅÅÁÐ(_A)"
 
 msgid "/_View/_Sort/_Attract by subject"
 msgstr "/²é¿´(_V)/ ÅÅÐò(_S)/°´Ö÷ÌâÅÅÁÐ(_A)"
 

-#: src/mainwindow.c:500
+#: src/mainwindow.c:510

 msgid "/_View/Th_read view"
 msgstr "/²é¿´(_V)/°´ÏßË÷²é¿´(_R)"
 
 msgid "/_View/Th_read view"
 msgstr "/²é¿´(_V)/°´ÏßË÷²é¿´(_R)"
 

-#: src/mainwindow.c:501
+#: src/mainwindow.c:511

 msgid "/_View/E_xpand all threads"
 msgstr "/²é¿´(_V)/Õ¹¿ªËùÓÐÏßË÷(_X)"
 
 msgid "/_View/E_xpand all threads"
 msgstr "/²é¿´(_V)/Õ¹¿ªËùÓÐÏßË÷(_X)"
 

-#: src/mainwindow.c:502
+#: src/mainwindow.c:512

 msgid "/_View/Co_llapse all threads"
 msgstr "/²é¿´(_V)/ÕÛµþËùÓÐÏßË÷(_L)"
 
 msgid "/_View/Co_llapse all threads"
 msgstr "/²é¿´(_V)/ÕÛµþËùÓÐÏßË÷(_L)"
 

-#: src/mainwindow.c:503
+#: src/mainwindow.c:513

 msgid "/_View/_Hide read messages"
 msgstr "/²é¿´(_V)/Òþ²ØÒѶÁÓʼþ(_H) "
 
 msgid "/_View/_Hide read messages"
 msgstr "/²é¿´(_V)/Òþ²ØÒѶÁÓʼþ(_H) "
 

-#: src/mainwindow.c:504
+#: src/mainwindow.c:514

 msgid "/_View/Set displayed _items..."
 msgstr "/²é¿´(_V)/ÉèÖÃÏÔʾÁÐ(_i)..."
 
 msgid "/_View/Set displayed _items..."
 msgstr "/²é¿´(_V)/ÉèÖÃÏÔʾÁÐ(_i)..."
 

-#: src/mainwindow.c:507
+#: src/mainwindow.c:517

 msgid "/_View/_Go to"
 msgstr "/²é¿´(_V)/תµ½(_G)"
 
 msgid "/_View/_Go to"
 msgstr "/²é¿´(_V)/תµ½(_G)"
 

-#: src/mainwindow.c:508
+#: src/mainwindow.c:518

 msgid "/_View/_Go to/_Prev message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·â(_P)"
 
 msgid "/_View/_Go to/_Prev message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·â(_P)"
 

-#: src/mainwindow.c:509
+#: src/mainwindow.c:519

 msgid "/_View/_Go to/_Next message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·â(_N)"
 
 msgid "/_View/_Go to/_Next message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·â(_N)"
 

-#: src/mainwindow.c:510 src/mainwindow.c:515 src/mainwindow.c:518
-#: src/mainwindow.c:523 src/mainwindow.c:528
+#: src/mainwindow.c:520 src/mainwindow.c:525 src/mainwindow.c:528
+#: src/mainwindow.c:533 src/mainwindow.c:538

 msgid "/_View/_Go to/---"
 msgstr "/²é¿´(_V)/תµ½(_G)/---"
 
 msgid "/_View/_Go to/---"
 msgstr "/²é¿´(_V)/תµ½(_G)/---"
 

-#: src/mainwindow.c:511
+#: src/mainwindow.c:521

 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·âδ¶ÁÐÅ(_r)"
 
 msgid "/_View/_Go to/P_rev unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÉÏÒ»·âδ¶ÁÐÅ(_r)"
 

-#: src/mainwindow.c:513
+#: src/mainwindow.c:523

 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âδ¶ÁÐÅ(_e)"
 
 msgid "/_View/_Go to/N_ext unread message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âδ¶ÁÐÅ(_e)"
 

-#: src/mainwindow.c:516
+#: src/mainwindow.c:526

 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/²é¿´(_V)/תµ½(_G)/Ç°Ò»·âÐÂÓʼþ(_w)"
 
 msgid "/_View/_Go to/Prev ne_w message"
 msgstr "/²é¿´(_V)/תµ½(_G)/Ç°Ò»·âÐÂÓʼþ(_w)"
 

-#: src/mainwindow.c:517
+#: src/mainwindow.c:527

 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âÐÂÐÅ(_x)"
 
 msgid "/_View/_Go to/Ne_xt new message"
 msgstr "/²é¿´(_V)/תµ½(_G)/ÏÂÒ»·âÐÂÐÅ(_x)"
 

-#: src/mainwindow.c:519
+#: src/mainwindow.c:529

 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±ê¼ÇÓʼþ(_M)"
 
 msgid "/_View/_Go to/Prev _marked message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±ê¼ÇÓʼþ(_M)"
 

-#: src/mainwindow.c:521
+#: src/mainwindow.c:531

 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±ê¼ÇÓʼþ(_a)"
 
 msgid "/_View/_Go to/Next m_arked message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±ê¼ÇÓʼþ(_a)"
 

-#: src/mainwindow.c:524
+#: src/mainwindow.c:534

 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±êÇ©Óʼþ(_l)"
 
 msgid "/_View/_Go to/Prev _labeled message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/Ç°Ò»·â±êÇ©Óʼþ(_l)"
 

-#: src/mainwindow.c:526
+#: src/mainwindow.c:536

 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±êÇ©Óʼþ(_b)"
 
 msgid "/_View/_Go to/Next la_beled message"
 msgstr "/²é¿´(_V)/ תµ½(_G)/ÏÂÒ»·â±êÇ©Óʼþ(_b)"
 

-#: src/mainwindow.c:529
+#: src/mainwindow.c:539

 msgid "/_View/_Go to/Other _folder..."
 msgstr "/²é¿´(_V)/תµ½(_G)/ÆäËûÓʼþ¼Ð(_f)"
 
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/²é¿´(_V)/תµ½(_G)/ÆäËûÓʼþ¼Ð(_f)"
 

-#: src/mainwindow.c:533 src/mainwindow.c:540 src/messageview.c:159
+#: src/mainwindow.c:543 src/mainwindow.c:550 src/messageview.c:159

 msgid "/_View/_Code set/---"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/---"
 
 msgid "/_View/_Code set/---"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/---"
 

-#: src/mainwindow.c:537 src/messageview.c:163
+#: src/mainwindow.c:547 src/messageview.c:163

 msgid "/_View/_Code set"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)"
 
 msgid "/_View/_Code set"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)"
 

-#: src/mainwindow.c:538 src/messageview.c:164
+#: src/mainwindow.c:548 src/messageview.c:164

 msgid "/_View/_Code set/_Auto detect"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/×Ô¶¯Õì²â(_A)"
 
 msgid "/_View/_Code set/_Auto detect"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/×Ô¶¯Õì²â(_A)"
 

-#: src/mainwindow.c:541 src/messageview.c:167
+#: src/mainwindow.c:551 src/messageview.c:167

 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/7bit ascii (US-ASCII)(_ I)"
 
 msgid "/_View/_Code set/7bit ascii (US-ASC_II)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/7bit ascii (US-ASCII)(_ I)"
 

-#: src/mainwindow.c:545 src/messageview.c:171
+#: src/mainwindow.c:555 src/messageview.c:171

 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Unicode (UTF-8)(_U)"
 
 msgid "/_View/_Code set/Unicode (_UTF-8)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Unicode (UTF-8)(_U)"
 

-#: src/mainwindow.c:549 src/messageview.c:175
+#: src/mainwindow.c:559 src/messageview.c:175

 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-1)(_1)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-_1)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-1)(_1)"
 

-#: src/mainwindow.c:551 src/messageview.c:177
+#: src/mainwindow.c:561 src/messageview.c:177

 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-15)"
 
 msgid "/_View/_Code set/Western European (ISO-8859-15)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-15)"
 

-#: src/mainwindow.c:555 src/messageview.c:181
+#: src/mainwindow.c:565 src/messageview.c:181

 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-2)(_2) "
 
 msgid "/_View/_Code set/Central European (ISO-8859-_2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Î÷Å·(ISO-8859-2)(_2) "
 

-#: src/mainwindow.c:558 src/messageview.c:184
+#: src/mainwindow.c:568 src/messageview.c:184

 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-13)(_B)"
 
 msgid "/_View/_Code set/_Baltic (ISO-8859-13)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-13)(_B)"
 

-#: src/mainwindow.c:560 src/messageview.c:186
+#: src/mainwindow.c:570 src/messageview.c:186

 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-4)(_4) "
 
 msgid "/_View/_Code set/Baltic (ISO-8859-_4)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/²¨Â޵ĺ£ (ISO-8859-4)(_4) "
 

-#: src/mainwindow.c:563 src/messageview.c:189
+#: src/mainwindow.c:573 src/messageview.c:189

 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ï£À° (ISO-8859-7)(_7)"
 
 msgid "/_View/_Code set/Greek (ISO-8859-_7)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ï£À° (ISO-8859-7)(_7)"
 

-#: src/mainwindow.c:566 src/messageview.c:192
+#: src/mainwindow.c:576 src/messageview.c:192

 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÍÁ¶úÆä (ISO-8859-9)(_9)"
 
 msgid "/_View/_Code set/Turkish (ISO-8859-_9)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÍÁ¶úÆä (ISO-8859-9)(_9)"
 

-#: src/mainwindow.c:569 src/messageview.c:195
+#: src/mainwindow.c:579 src/messageview.c:195

 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(ISO-8859-5)(_5)"
 
 msgid "/_View/_Code set/Cyrillic (ISO-8859-_5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(ISO-8859-5)(_5)"
 

-#: src/mainwindow.c:571 src/messageview.c:197
+#: src/mainwindow.c:581 src/messageview.c:197

 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(KOI8-R) (_R)"
 
 msgid "/_View/_Code set/Cyrillic (KOI8-_R)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(KOI8-R) (_R)"
 

-#: src/mainwindow.c:573 src/messageview.c:199
+#: src/mainwindow.c:583 src/messageview.c:199

 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(Windows-1251)"
 
 msgid "/_View/_Code set/Cyrillic (Windows-1251)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/˹À­·ò(Windows-1251)"
 

-#: src/mainwindow.c:577 src/messageview.c:203
+#: src/mainwindow.c:587 src/messageview.c:203

 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022-JP)(_J)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-_JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022-JP)(_J)"
 

-#: src/mainwindow.c:580 src/messageview.c:206
+#: src/mainwindow.c:590 src/messageview.c:206

 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022- JP-2)"
 
 msgid "/_View/_Code set/Japanese (ISO-2022-JP-2)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ(ISO-2022- JP-2)"
 

-#: src/mainwindow.c:583 src/messageview.c:209
+#: src/mainwindow.c:593 src/messageview.c:209

 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (EUC-JP)(_E)"
 
 msgid "/_View/_Code set/Japanese (_EUC-JP)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (EUC-JP)(_E)"
 

-#: src/mainwindow.c:585 src/messageview.c:211
+#: src/mainwindow.c:595 src/messageview.c:211

 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (Shift__JIS)(_S)"
 
 msgid "/_View/_Code set/Japanese (_Shift__JIS)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÈÕÎÄ (Shift__JIS)(_S)"
 

-#: src/mainwindow.c:589 src/messageview.c:215
+#: src/mainwindow.c:599 src/messageview.c:215

 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/¼òÌåÖÐÎÄ(GB2312)(_G)"
 
 msgid "/_View/_Code set/Simplified Chinese (_GB2312)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/¼òÌåÖÐÎÄ(GB2312)(_G)"
 

-#: src/mainwindow.c:591 src/messageview.c:217
+#: src/mainwindow.c:601 src/messageview.c:217

 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(Big5)(_B) "
 
 msgid "/_View/_Code set/Traditional Chinese (_Big5)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(Big5)(_B) "
 

-#: src/mainwindow.c:593 src/messageview.c:219
+#: src/mainwindow.c:603 src/messageview.c:219

 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(EUC-TW)(_T)"
 
 msgid "/_View/_Code set/Traditional Chinese (EUC-_TW)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/·±ÌåÖÐÎÄ(EUC-TW)(_T)"
 

-#: src/mainwindow.c:595 src/messageview.c:221
+#: src/mainwindow.c:605 src/messageview.c:221

 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÖÐÎÄ(ISO-2022-CN)(_C) "
 
 msgid "/_View/_Code set/Chinese (ISO-2022-_CN)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/ÖÐÎÄ(ISO-2022-CN)(_C) "
 

-#: src/mainwindow.c:598 src/messageview.c:224
+#: src/mainwindow.c:608 src/messageview.c:224

 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ(EUC-KR)(_K) "
 
 msgid "/_View/_Code set/Korean (EUC-_KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ(EUC-KR)(_K) "
 

-#: src/mainwindow.c:600 src/messageview.c:226
+#: src/mainwindow.c:610 src/messageview.c:226

 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ (ISO-2022-KR)"
 
 msgid "/_View/_Code set/Korean (ISO-2022-KR)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/º«ÎÄ (ISO-2022-KR)"
 

-#: src/mainwindow.c:603 src/messageview.c:229
+#: src/mainwindow.c:613 src/messageview.c:229

 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(TIS-620)"
 
 msgid "/_View/_Code set/Thai (TIS-620)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(TIS-620)"
 

-#: src/mainwindow.c:605 src/messageview.c:231
+#: src/mainwindow.c:615 src/messageview.c:231

 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(Windows-874)"
 
 msgid "/_View/_Code set/Thai (Windows-874)"
 msgstr "/²é¿´(_V)/×Ö·û¼¯(_C)/Ì©¹ú(Windows-874)"
 

-#: src/mainwindow.c:613 src/summaryview.c:458
+#: src/mainwindow.c:623 src/summaryview.c:459

 msgid "/_View/Open in new _window"
 msgstr "/²é¿´(_V)/ÔÚд°¿ÚÖдò¿ª(_w)"
 
 msgid "/_View/Open in new _window"
 msgstr "/²é¿´(_V)/ÔÚд°¿ÚÖдò¿ª(_w)"
 

-#: src/mainwindow.c:614 src/messageview.c:239
+#: src/mainwindow.c:624 src/messageview.c:239

 msgid "/_View/Mess_age source"
 msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_a)"
 
 msgid "/_View/Mess_age source"
 msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_a)"
 

-#: src/mainwindow.c:615
+#: src/mainwindow.c:625

 msgid "/_View/Show all _headers"
 msgstr "/²é¿´(_V)/ÏÔʾËùÓÐÐÅϢͷ(_H)"
 
 msgid "/_View/Show all _headers"
 msgstr "/²é¿´(_V)/ÏÔʾËùÓÐÐÅϢͷ(_H)"
 

-#: src/mainwindow.c:617
+#: src/mainwindow.c:627

 msgid "/_View/_Update summary"
 msgstr "/²é¿´(_V)/¸üÐÂÓʼþÕªÒª(_U)"
 
 msgid "/_View/_Update summary"
 msgstr "/²é¿´(_V)/¸üÐÂÓʼþÕªÒª(_U)"
 

-#: src/mainwindow.c:620
-msgid "/_Message/Get new ma_il"
-msgstr "/Óʼþ(_M)/ÊÕÐÂÓʼþ(_i)"
+#: src/mainwindow.c:630
+msgid "/_Message/Recei_ve"
+msgstr "/Óʼþ(_M)/ÊÕȡ(_v)"

 
 

-#: src/mainwindow.c:621
-msgid "/_Message/Get from _all accounts"
-msgstr "/Óʼþ(_M)/ÊÕËùÓÐÕʺŵÄÓʼþ(_a)"
+#: src/mainwindow.c:631
+msgid "/_Message/Recei_ve/Get from _current account"
+msgstr "/Óʼþ(_M)/ÊÕÈ¡(_v)/´Óµ±Ç°ÕʺÅÊÕÈ¡(_c)"

 
 

-#: src/mainwindow.c:623
-msgid "/_Message/Cancel receivin_g"
-msgstr "/Óʼþ(_M)/È¡ÏûÊÕÐÅ(_g)"
+#: src/mainwindow.c:633
+msgid "/_Message/Recei_ve/Get from _all accounts"
+msgstr "/Óʼþ(_M)/ÊÕÈ¡(_v)/´ÓËùÓÐÕʺÅÊÕÈ¡(_c)"

 
 

-#: src/mainwindow.c:625
+#: src/mainwindow.c:635
+msgid "/_Message/Recei_ve/Cancel receivin_g"
+msgstr "/Óʼþ(_M)/ÊÕÈ¡(_v)/È¡Ïû(_g)"
+
+#: src/mainwindow.c:637
+msgid "/_Message/Recei_ve/---"
+msgstr "/Óʼþ(_M)/ÊÕÈ¡(_v)/---"
+
+#: src/mainwindow.c:638

 msgid "/_Message/_Send queued messages"
 msgstr "/Óʼþ(_M)/Ëͳö´ý·¢ËÍÓʼþ(_S)"
 
 msgid "/_Message/_Send queued messages"
 msgstr "/Óʼþ(_M)/Ëͳö´ý·¢ËÍÓʼþ(_S)"
 

-#: src/mainwindow.c:627
+#: src/mainwindow.c:640

 msgid "/_Message/Compose a_n email message"
 msgstr "/Óʼþ(_M)/дÐÅ(_n)"
 
 msgid "/_Message/Compose a_n email message"
 msgstr "/Óʼþ(_M)/дÐÅ(_n)"
 

-#: src/mainwindow.c:628
+#: src/mainwindow.c:641

 msgid "/_Message/Compose a news message"
 msgstr "/Óʼþ(_M)/дÐÂÎÅȺÁôÑÔ"
 
 msgid "/_Message/Compose a news message"
 msgstr "/Óʼþ(_M)/дÐÂÎÅȺÁôÑÔ"
 

-#: src/mainwindow.c:629 src/messageview.c:246
+#: src/mainwindow.c:642 src/messageview.c:246

 msgid "/_Message/_Reply"
 msgstr "/Óʼþ(_M)/»ØÐÅ(_R)"
 
 msgid "/_Message/_Reply"
 msgstr "/Óʼþ(_M)/»ØÐÅ(_R)"
 

-#: src/mainwindow.c:630
+#: src/mainwindow.c:643

 msgid "/_Message/Repl_y to"
 msgstr "/Óʼþ(_M)/»ØПø(_y)"
 
 msgid "/_Message/Repl_y to"
 msgstr "/Óʼþ(_M)/»ØПø(_y)"
 

-#: src/mainwindow.c:631 src/messageview.c:247
+#: src/mainwindow.c:644 src/messageview.c:247

 msgid "/_Message/Repl_y to/_all"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/È«²¿ÈË(_a)"
 
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/È«²¿ÈË(_a)"
 

-#: src/mainwindow.c:632 src/messageview.c:249
+#: src/mainwindow.c:645 src/messageview.c:249

 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/¼ÄÐÅÈË(_s)"
 
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/¼ÄÐÅÈË(_s)"
 

-#: src/mainwindow.c:633 src/messageview.c:251
+#: src/mainwindow.c:646 src/messageview.c:251

 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/ÓʼþÁбí(_l)"
 
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Óʼþ(_M)/»ØПø(_y)/ÓʼþÁбí(_l)"
 

-#: src/mainwindow.c:635
+#: src/mainwindow.c:648

 msgid "/_Message/Follow-up and reply to"
 msgstr "/Óʼþ(_M)/Follow-up and reply to"
 
 msgid "/_Message/Follow-up and reply to"
 msgstr "/Óʼþ(_M)/Follow-up and reply to"
 

-#: src/mainwindow.c:637 src/messageview.c:254
+#: src/mainwindow.c:650 src/messageview.c:254

 msgid "/_Message/_Forward"
 msgstr "/Óʼþ(_M)/ת·¢(_F)"
 
 msgid "/_Message/_Forward"
 msgstr "/Óʼþ(_M)/ת·¢(_F)"
 

-#: src/mainwindow.c:638
+#: src/mainwindow.c:651

 msgid "/_Message/Redirect"
 msgstr "/Óʼþ(_M)/Öض¨Ïò"
 
 msgid "/_Message/Redirect"
 msgstr "/Óʼþ(_M)/Öض¨Ïò"
 

-#: src/mainwindow.c:640 src/messageview.c:259
+#: src/mainwindow.c:653 src/messageview.c:259

 msgid "/_Message/Re-_edit"
 msgstr "/Óʼþ(_M)/ÖØб༭(_e)"
 
 msgid "/_Message/Re-_edit"
 msgstr "/Óʼþ(_M)/ÖØб༭(_e)"
 

-#: src/mainwindow.c:642
+#: src/mainwindow.c:655

 msgid "/_Message/M_ove..."
 msgstr "/Óʼþ(_M)/ Òƶ¯(_o)"
 
 msgid "/_Message/M_ove..."
 msgstr "/Óʼþ(_M)/ Òƶ¯(_o)"
 

-#: src/mainwindow.c:643
+#: src/mainwindow.c:656

 msgid "/_Message/_Copy..."
 msgstr "/Óʼþ(_M)/ ¸´ÖÆ(_C)"
 
 msgid "/_Message/_Copy..."
 msgstr "/Óʼþ(_M)/ ¸´ÖÆ(_C)"
 

-#: src/mainwindow.c:644
+#: src/mainwindow.c:657

 msgid "/_Message/_Delete"
 msgstr "/Óʼþ(_M)/ ɾ³ý(_D) "
 
 msgid "/_Message/_Delete"
 msgstr "/Óʼþ(_M)/ ɾ³ý(_D) "
 

-#: src/mainwindow.c:645
+#: src/mainwindow.c:658

 msgid "/_Message/Cancel a news message"
 msgstr "/Óʼþ(_M)/ È¡ÏûÐÂÓʼþ"
 
 msgid "/_Message/Cancel a news message"
 msgstr "/Óʼþ(_M)/ È¡ÏûÐÂÓʼþ"
 

-#: src/mainwindow.c:647
+#: src/mainwindow.c:660

 msgid "/_Message/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)"
 
 msgid "/_Message/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)"
 

-#: src/mainwindow.c:648
+#: src/mainwindow.c:661

 msgid "/_Message/_Mark/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ±ê¼Ç(_M) "
 
 msgid "/_Message/_Mark/_Mark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ±ê¼Ç(_M) "
 

-#: src/mainwindow.c:649
+#: src/mainwindow.c:662

 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ²»±ê¼Ç(_U)"
 
 msgid "/_Message/_Mark/_Unmark"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/ ²»±ê¼Ç(_U)"
 

-#: src/mainwindow.c:650
+#: src/mainwindow.c:663

 msgid "/_Message/_Mark/---"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/---"
 
 msgid "/_Message/_Mark/---"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/---"
 

-#: src/mainwindow.c:651
+#: src/mainwindow.c:664

 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
 msgid "/_Message/_Mark/Mark as unr_ead"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 

-#: src/mainwindow.c:652
+#: src/mainwindow.c:665

 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 
 msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 

-#: src/mainwindow.c:654
+#: src/mainwindow.c:667

 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇËùÓÐΪÒѶÁ(_r)"
 
 msgid "/_Message/_Mark/Mark all _read"
 msgstr "/Óʼþ(_M)/ ±ê¼Ç(_M)/±ê¼ÇËùÓÐΪÒѶÁ(_r)"
 

-#: src/mainwindow.c:657
+#: src/mainwindow.c:670

 msgid "/_Tools/_Address book..."
 msgstr "/¹¤¾ß(_T)/ͨѶ²¾(_A)..."
 
 msgid "/_Tools/_Address book..."
 msgstr "/¹¤¾ß(_T)/ͨѶ²¾(_A)..."
 

-#: src/mainwindow.c:658 src/messageview.c:263
+#: src/mainwindow.c:671 src/messageview.c:263

 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/¹¤¾ß(_T)/¼ÓÈëͨѶ²¾ÖÐ(_k)"
 
 msgid "/_Tools/Add sender to address boo_k"
 msgstr "/¹¤¾ß(_T)/¼ÓÈëͨѶ²¾ÖÐ(_k)"
 

-#: src/mainwindow.c:660
+#: src/mainwindow.c:673

 msgid "/_Tools/_Harvest addresses"
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)"
 
 msgid "/_Tools/_Harvest addresses"
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)"
 

-#: src/mainwindow.c:661
+#: src/mainwindow.c:674

 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ¼Ð(_F)"
 
 msgid "/_Tools/_Harvest addresses/from _Folder..."
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ¼Ð(_F)"
 

-#: src/mainwindow.c:663
+#: src/mainwindow.c:676

 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ(_M)"
 
 msgid "/_Tools/_Harvest addresses/from _Messages..."
 msgstr "/¹¤¾ß(_T)/ÅúÁ¿ÌáȡͨѶµØÖ·(_H)/´ÓÓʼþ(_M)"
 

-#: src/mainwindow.c:666
+#: src/mainwindow.c:679

 msgid "/_Tools/_Filter messages"
 msgstr "/¹¤¾ß(_T)/¹ýÂËÓʼþ(_F)"
 
 msgid "/_Tools/_Filter messages"
 msgstr "/¹¤¾ß(_T)/¹ýÂËÓʼþ(_F)"
 

-#: src/mainwindow.c:667 src/messageview.c:266
+#: src/mainwindow.c:680 src/messageview.c:266

 msgid "/_Tools/_Create filter rule"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
 
 msgid "/_Tools/_Create filter rule"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
 

-#: src/mainwindow.c:668 src/messageview.c:268
+#: src/mainwindow.c:681 src/messageview.c:268

 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
 
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
 

-#: src/mainwindow.c:670 src/messageview.c:270
+#: src/mainwindow.c:683 src/messageview.c:270

 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
 
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
 

-#: src/mainwindow.c:672 src/messageview.c:272
+#: src/mainwindow.c:685 src/messageview.c:272

 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
 
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
 

-#: src/mainwindow.c:674 src/messageview.c:274
+#: src/mainwindow.c:687 src/messageview.c:274

 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 

-#: src/mainwindow.c:676
+#: src/mainwindow.c:689

 msgid "/_Tools/_Create processing rule"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
 
 msgid "/_Tools/_Create processing rule"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)"
 

-#: src/mainwindow.c:677
+#: src/mainwindow.c:690

 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
 
 msgid "/_Tools/_Create processing rule/_Automatically"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
 

-#: src/mainwindow.c:679
+#: src/mainwindow.c:692

 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
 
 msgid "/_Tools/_Create processing rule/by _From"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
 

-#: src/mainwindow.c:681
+#: src/mainwindow.c:694

 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
 
 msgid "/_Tools/_Create processing rule/by _To"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
 

-#: src/mainwindow.c:683
+#: src/mainwindow.c:696

 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 
 msgid "/_Tools/_Create processing rule/by _Subject"
 msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
 

-#: src/mainwindow.c:688
+#: src/mainwindow.c:701

 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/¹¤¾ß(_T)/ɾ³ýÖظ´Óʼþ(_p)"
 
 msgid "/_Tools/Delete du_plicated messages"
 msgstr "/¹¤¾ß(_T)/ɾ³ýÖظ´Óʼþ(_p)"
 

-#: src/mainwindow.c:691
+#: src/mainwindow.c:704

 msgid "/_Tools/E_xecute"
 msgstr "/¹¤¾ß(_T)/Ö´ÐÐ(_x)"
 
 msgid "/_Tools/E_xecute"
 msgstr "/¹¤¾ß(_T)/Ö´ÐÐ(_x)"
 

-#: src/mainwindow.c:694
+#: src/mainwindow.c:707

 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/¹¤¾ß(_T)/SSLÈÏÖ¤(_f)"
 
 msgid "/_Tools/SSL certi_ficates..."
 msgstr "/¹¤¾ß(_T)/SSLÈÏÖ¤(_f)"
 

-#: src/mainwindow.c:698
+#: src/mainwindow.c:711

 msgid "/_Tools/_Log window"
 msgstr "/¹¤¾ß(_T)/ÈÕÖ¾´°¿Ú(_L)"
 
 msgid "/_Tools/_Log window"
 msgstr "/¹¤¾ß(_T)/ÈÕÖ¾´°¿Ú(_L)"
 

-#: src/mainwindow.c:700
+#: src/mainwindow.c:713

 msgid "/_Configuration"
 msgstr "/ÉèÖÃ(_C)"
 
 msgid "/_Configuration"
 msgstr "/ÉèÖÃ(_C)"
 

-#: src/mainwindow.c:701
+#: src/mainwindow.c:714

 msgid "/_Configuration/C_hange current account"
 msgstr "/ÉèÖÃ(_C)/¸ü¸ÄÄ¿Ç°ÕʺÅ(_h)"
 
 msgid "/_Configuration/C_hange current account"
 msgstr "/ÉèÖÃ(_C)/¸ü¸ÄÄ¿Ç°ÕʺÅ(_h)"
 

-#: src/mainwindow.c:703
+#: src/mainwindow.c:716

 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/ÉèÖÃ(_C)/Ä¿Ç°ÕʺŵÄÆ«ºÃÉèÖÃ(_P)..."
 
 msgid "/_Configuration/_Preferences for current account..."
 msgstr "/ÉèÖÃ(_C)/Ä¿Ç°ÕʺŵÄÆ«ºÃÉèÖÃ(_P)..."
 

-#: src/mainwindow.c:705
+#: src/mainwindow.c:718

 msgid "/_Configuration/Create _new account..."
 msgstr "/ÉèÖÃ(_C)/´´½¨ÐÂÕʺÅ(_n)..."
 
 msgid "/_Configuration/Create _new account..."
 msgstr "/ÉèÖÃ(_C)/´´½¨ÐÂÕʺÅ(_n)..."
 

-#: src/mainwindow.c:707
+#: src/mainwindow.c:720

 msgid "/_Configuration/_Edit accounts..."
 msgstr "/ÉèÖÃ(_C)/±à¼­ÕʺÅ(_E)..."
 
 msgid "/_Configuration/_Edit accounts..."
 msgstr "/ÉèÖÃ(_C)/±à¼­ÕʺÅ(_E)..."
 

-#: src/mainwindow.c:709
+#: src/mainwindow.c:722

 msgid "/_Configuration/---"
 msgstr "/ÉèÖÃ(_C)/---"
 
 msgid "/_Configuration/---"
 msgstr "/ÉèÖÃ(_C)/---"
 

-#: src/mainwindow.c:710
+#: src/mainwindow.c:723

 msgid "/_Configuration/_Common preferences..."
 msgstr "/ÉèÖÃ(_C)/Ò»°ãÆ«ºÃ(_C)..."
 
 msgid "/_Configuration/_Common preferences..."
 msgstr "/ÉèÖÃ(_C)/Ò»°ãÆ«ºÃ(_C)..."
 

-#: src/mainwindow.c:712
+#: src/mainwindow.c:725

 msgid "/_Configuration/Pre-processing..."
 msgstr "/ÉèÖÃ(_C)/Ç°´¦Àí..."
 
 msgid "/_Configuration/Pre-processing..."
 msgstr "/ÉèÖÃ(_C)/Ç°´¦Àí..."
 

-#: src/mainwindow.c:714
+#: src/mainwindow.c:727

 msgid "/_Configuration/Post-processing..."
 msgstr "/ÉèÖÃ(_C)/ºó´¦Àí..."
 
 msgid "/_Configuration/Post-processing..."
 msgstr "/ÉèÖÃ(_C)/ºó´¦Àí..."
 

-#: src/mainwindow.c:716
+#: src/mainwindow.c:729

 msgid "/_Configuration/_Filtering..."
 msgstr "/ÉèÖÃ(_C)/¹ýÂË(_F)..."
 
 msgid "/_Configuration/_Filtering..."
 msgstr "/ÉèÖÃ(_C)/¹ýÂË(_F)..."
 

-#: src/mainwindow.c:718
+#: src/mainwindow.c:731

 msgid "/_Configuration/_Templates..."
 msgstr "/ÉèÖÃ(_C)/Ä£°å(_T)..."
 
 msgid "/_Configuration/_Templates..."
 msgstr "/ÉèÖÃ(_C)/Ä£°å(_T)..."
 

-#: src/mainwindow.c:719
+#: src/mainwindow.c:732

 msgid "/_Configuration/_Actions..."
 msgstr "/ÉèÖÃ(_C)/¶¯×÷(_A)..."
 
 msgid "/_Configuration/_Actions..."
 msgstr "/ÉèÖÃ(_C)/¶¯×÷(_A)..."
 

-#: src/mainwindow.c:720
+#: src/mainwindow.c:733

 msgid "/_Configuration/_Other Preferences..."
 msgstr "/ÉèÖÃ(_C)/ÆäËûÆ«ºÃ(_O)..."
 
 msgid "/_Configuration/_Other Preferences..."
 msgstr "/ÉèÖÃ(_C)/ÆäËûÆ«ºÃ(_O)..."
 

-#: src/mainwindow.c:721
+#: src/mainwindow.c:734

 msgid "/_Configuration/Plugins..."
 msgstr "/ÉèÖÃ(_C)/²å¼þ..."
 
 msgid "/_Configuration/Plugins..."
 msgstr "/ÉèÖÃ(_C)/²å¼þ..."
 

-#: src/mainwindow.c:724
+#: src/mainwindow.c:737

 msgid "/_Help/_Manual (Local)"
 msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(±¾µØ)"
 
 msgid "/_Help/_Manual (Local)"
 msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(±¾µØ)"
 

-#: src/mainwindow.c:725
+#: src/mainwindow.c:738

 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(SylpheedÊÖ²áÍøÒ³)"
 
 msgid "/_Help/_Manual (Sylpheed Doc Homepage)"
 msgstr "/ÇóÖú(_H)/Áª»úÊÖ²á(_M)(SylpheedÊÖ²áÍøÒ³)"
 

-#: src/mainwindow.c:727
+#: src/mainwindow.c:740

 msgid "/_Help/_FAQ (Local)"
 msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F)(±¾µØ)"
 
 msgid "/_Help/_FAQ (Local)"
 msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F)(±¾µØ)"
 

-#: src/mainwindow.c:728
+#: src/mainwindow.c:741

 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F) (SylpheedÊÖ²áÍøÒ³)"
 
 msgid "/_Help/_FAQ (Sylpheed Doc Homepage)"
 msgstr "/ÇóÖú(_H)/³£¼ûÎÊÌâ(_F) (SylpheedÊÖ²áÍøÒ³)"
 

-#: src/mainwindow.c:730
+#: src/mainwindow.c:743

 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Help/_Claws °æ±¾³£¼ûÎÊÌâ"
 
 msgid "/_Help/_Claws FAQ (Claws Documentation)"
 msgstr "/_Help/_Claws °æ±¾³£¼ûÎÊÌâ"
 

-#: src/mainwindow.c:732
+#: src/mainwindow.c:745

 msgid "/_Help/---"
 msgstr "/ÇóÖú(_H)/---"
 
 msgid "/_Help/---"
 msgstr "/ÇóÖú(_H)/---"
 

-#: src/mainwindow.c:851
+#: src/mainwindow.c:868

 msgid "You are online. Click the icon to go offline"
 msgstr "Ä¿Ç°ÔÚÏß¡£µã»÷ͼ±êתµ½ÀëÏßģʽ¡£"
 
 msgid "You are online. Click the icon to go offline"
 msgstr "Ä¿Ç°ÔÚÏß¡£µã»÷ͼ±êתµ½ÀëÏßģʽ¡£"
 

-#: src/mainwindow.c:855
+#: src/mainwindow.c:872

 msgid "You are offline. Click the icon to go online"
 msgstr "Ä¿Ç°ÀëÏß¡£µã»÷ͼ±êתµ½ÔÚÏß״̬¡£"
 
 msgid "You are offline. Click the icon to go online"
 msgstr "Ä¿Ç°ÀëÏß¡£µã»÷ͼ±êתµ½ÔÚÏß״̬¡£"
 

-#: src/mainwindow.c:872
+#: src/mainwindow.c:889

 msgid "Select account"
 msgstr "Ñ¡ÔñÕʺÅ"
 
 msgid "Select account"
 msgstr "Ñ¡ÔñÕʺÅ"
 

-#: src/mainwindow.c:1204 src/mainwindow.c:1221 src/prefs_folder_item.c:407
+#: src/mainwindow.c:1227 src/mainwindow.c:1268 src/mainwindow.c:1296
+#: src/prefs_folder_item.c:407

 msgid "Untitled"
 msgstr "δÃüÃû"
 
 msgid "Untitled"
 msgstr "δÃüÃû"
 

-#: src/mainwindow.c:1222
+#: src/mainwindow.c:1297

 msgid "none"
 msgstr "ÎÞ"
 
 msgid "none"
 msgstr "ÎÞ"
 

-#: src/mainwindow.c:1462
+#: src/mainwindow.c:1564

 msgid "Empty trash"
 msgstr "Çå¿ÕÀ¬»øÏä"
 
 msgid "Empty trash"
 msgstr "Çå¿ÕÀ¬»øÏä"
 

-#: src/mainwindow.c:1463
+#: src/mainwindow.c:1565

 msgid "Empty all messages in trash?"
 msgstr "Çå¿ÕÀ¬»øÏäÄÚËùÓÐÓʼþ£¿"
 
 msgid "Empty all messages in trash?"
 msgstr "Çå¿ÕÀ¬»øÏäÄÚËùÓÐÓʼþ£¿"
 

-#: src/mainwindow.c:1481
+#: src/mainwindow.c:1583

 msgid "Add mailbox"
 msgstr "Ìí¼ÓÓÊÏä"
 
 msgid "Add mailbox"
 msgstr "Ìí¼ÓÓÊÏä"
 

-#: src/mainwindow.c:1482
+#: src/mainwindow.c:1584

 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 msgid ""
 "Input the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"


@@ -4359,16 +4400,16 @@ msgstr ""
 "ÇëÊäÈëÓÊÏäλÖá£\n"
 "Èç¹ûÖ¸¶¨ÒÑ´æÔÚµÄÓÊÏ䣬Ëü½«»á×Ô¶¯±»É¨Ãè¡£"
 
 "ÇëÊäÈëÓÊÏäλÖá£\n"
 "Èç¹ûÖ¸¶¨ÒÑ´æÔÚµÄÓÊÏ䣬Ëü½«»á×Ô¶¯±»É¨Ãè¡£"
 

-#: src/mainwindow.c:1488
+#: src/mainwindow.c:1590

 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "ÓÊÏä `%s' ÒѾ­´æÔÚ¡£"
 
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "ÓÊÏä `%s' ÒѾ­´æÔÚ¡£"
 

-#: src/mainwindow.c:1493 src/setup.c:58
+#: src/mainwindow.c:1595 src/setup.c:58

 msgid "Mailbox"
 msgstr "ÓÊÏä"
 
 msgid "Mailbox"
 msgstr "ÓÊÏä"
 

-#: src/mainwindow.c:1498 src/setup.c:62
+#: src/mainwindow.c:1600 src/setup.c:62

 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "
 msgid ""
 "Creation of the mailbox failed.\n"
 "Maybe some files already exist, or you don't have the permission to write "


@@ -4377,31 +4418,31 @@ msgstr ""
 "´´½¨ÓÊÏäʧ°Ü¡£\n"
 "Ò²ÐíijЩÎļþÒѾ­´æÔÚ£¬»òÕßÄãûÓÐ×ã¹»µÄдȨÏÞ¡£"
 
 "´´½¨ÓÊÏäʧ°Ü¡£\n"
 "Ò²ÐíijЩÎļþÒѾ­´æÔÚ£¬»òÕßÄãûÓÐ×ã¹»µÄдȨÏÞ¡£"
 

-#: src/mainwindow.c:1817
+#: src/mainwindow.c:1939

 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Óʼþ¼Ð"
 
 msgid "Sylpheed - Folder View"
 msgstr "Sylpheed - Óʼþ¼Ð"
 

-#: src/mainwindow.c:1838 src/messageview.c:378
+#: src/mainwindow.c:1960 src/messageview.c:390

 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Óʼþ"
 
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Óʼþ"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit"
 msgstr "Í˳ö"
 
 msgid "Exit"
 msgstr "Í˳ö"
 

-#: src/mainwindow.c:2222
+#: src/mainwindow.c:2356

 msgid "Exit this program?"
 msgstr "Í˳ö±¾³ÌÐò"
 
 msgid "Exit this program?"
 msgstr "Í˳ö±¾³ÌÐò"
 

-#: src/mainwindow.c:2716 src/summaryview.c:4046
+#: src/mainwindow.c:2850 src/summaryview.c:4009

 msgid "Processing rules to apply before folder rules"
 msgstr "ÔÚÓʼþ¼Ð¹æÔòÇ°Ó¦ÓõĹæÔò"
 
 msgid "Processing rules to apply before folder rules"
 msgstr "ÔÚÓʼþ¼Ð¹æÔòÇ°Ó¦ÓõĹæÔò"
 

-#: src/mainwindow.c:2724
+#: src/mainwindow.c:2858

 msgid "Processing rules to apply after folder rules"
 msgstr "ÔÚÓʼþ¼Ð¹æÔòºóÓ¦ÓõĹæÔò"
 
 msgid "Processing rules to apply after folder rules"
 msgstr "ÔÚÓʼþ¼Ð¹æÔòºóÓ¦ÓõĹæÔò"
 

-#: src/mainwindow.c:2732 src/summaryview.c:4055
+#: src/mainwindow.c:2866 src/summaryview.c:4018

 msgid "Filtering configuration"
 msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
 
 msgid "Filtering configuration"
 msgstr "¹ýÂË/´¦Àí ÅäÖÃ"
 


@@ -4463,29 +4504,30 @@ msgid "/_Message/Redirec_t"
 msgstr "/Óʼþ(_M)/Öض¨Ïò(_t)"
 
 #: src/messageview.c:276
 msgstr "/Óʼþ(_M)/Öض¨Ïò(_t)"
 
 #: src/messageview.c:276

-msgid "/_Tools/Create processing rule/_Automatically"
-msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/×Ô¶¯²úÉú(_A)"
+msgid "/_Tools/Create processing rule/"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò/"

 
 #: src/messageview.c:278
 
 #: src/messageview.c:278

-#, fuzzy
-msgid "/_Tools/Create processing rule/by _From"
-msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓɼļþÕß(_F)"
+msgid "/_Tools/Create processing rule/_Automatically"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò/×Ô¶¯²úÉú(_A)"

 
 #: src/messageview.c:280
 
 #: src/messageview.c:280

-#, fuzzy
-msgid "/_Tools/Create processing rule/by _To"
-msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÊÕÐÅÕß(_T)"
+msgid "/_Tools/Create processing rule/by _From"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò/ÓɼļþÕß(_F)"

 
 #: src/messageview.c:282
 
 #: src/messageview.c:282

-#, fuzzy
+msgid "/_Tools/Create processing rule/by _To"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò/ÓÉÊÕÐÅÕß(_T)"
+
+#: src/messageview.c:284

 msgid "/_Tools/Create processing rule/by _Subject"
 msgid "/_Tools/Create processing rule/by _Subject"

-msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò(_C)/ÓÉÖ÷Ìâ(_S)"
+msgstr "/¹¤¾ß(_T)/´´½¨¹ýÂ˹æÔò/ÓÉÖ÷Ìâ(_S)"

 
 

-#: src/messageview.c:476
+#: src/messageview.c:488

 msgid "<No Return-Path found>"
 msgstr "<δÕÒµ½»ØÐŵØÖ·>"
 
 msgid "<No Return-Path found>"
 msgstr "<δÕÒµ½»ØÐŵØÖ·>"
 

-#: src/messageview.c:484
+#: src/messageview.c:496

 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"
 #, c-format
 msgid ""
 "The notification address to which the return receipt is to be sent\n"


@@ -4499,11 +4541,11 @@ msgstr ""
 " Return path: %s\n"
 "½¨Òé²»·¢ËÍ´Ë»ØÖ´¡£"
 
 " Return path: %s\n"
 "½¨Òé²»·¢ËÍ´Ë»ØÖ´¡£"
 

-#: src/messageview.c:492
+#: src/messageview.c:504

 msgid "+Don't Send"
 msgstr "+²»Ëͳö"
 
 msgid "+Don't Send"
 msgstr "+²»Ëͳö"
 

-#: src/messageview.c:502
+#: src/messageview.c:514

 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"
 msgid ""
 "This message is asking for a return receipt notification\n"
 "but according to its 'To:' and 'CC:' headers it was not\n"


@@ -4514,39 +4556,39 @@ msgstr ""
 "µ«ÄúµÄÓʼþµØÖ·²¢Î´ÔÚÀ´ÐŵÄ'ÊÕ¼þÈË'ºÍ'³­ËÍ'Öб»Ö¸¶¨¡£\n"
 "ÒÑÈ¡Ïû»ØÖ´¡£"
 
 "µ«ÄúµÄÓʼþµØÖ·²¢Î´ÔÚÀ´ÐŵÄ'ÊÕ¼þÈË'ºÍ'³­ËÍ'Öб»Ö¸¶¨¡£\n"
 "ÒÑÈ¡Ïû»ØÖ´¡£"
 

-#: src/messageview.c:901 src/mimeview.c:969 src/mimeview.c:1076
-#: src/summaryview.c:3448
+#: src/messageview.c:911 src/mimeview.c:969 src/mimeview.c:1076
+#: src/summaryview.c:3411

 msgid "Save as"
 msgstr "±£´æΪ"
 
 msgid "Save as"
 msgstr "±£´æΪ"
 

-#: src/messageview.c:906 src/mimeview.c:1018 src/mimeview.c:1082
-#: src/summaryview.c:3453
+#: src/messageview.c:916 src/mimeview.c:1018 src/mimeview.c:1082
+#: src/summaryview.c:3416

 msgid "Overwrite"
 msgstr "¸²¸Ç"
 
 msgid "Overwrite"
 msgstr "¸²¸Ç"
 

-#: src/messageview.c:907
+#: src/messageview.c:917

 msgid "Overwrite existing file?"
 msgstr "¸½¼ÓÒÑÓÐÎļþ£¿"
 
 msgid "Overwrite existing file?"
 msgstr "¸½¼ÓÒÑÓÐÎļþ£¿"
 

-#: src/messageview.c:914 src/summaryview.c:3461 src/summaryview.c:3465
-#: src/summaryview.c:3482
+#: src/messageview.c:924 src/summaryview.c:3424 src/summaryview.c:3428
+#: src/summaryview.c:3445

 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ÎÞ·¨±£´æ´ËÎļþ '%s'¡£"
 
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ÎÞ·¨±£´æ´ËÎļþ '%s'¡£"
 

-#: src/messageview.c:979
+#: src/messageview.c:989

 msgid "This message asks for a return receipt"
 msgstr "¸ÃÓʼþÒªÇ󷵻ػØÖ´"
 
 msgid "This message asks for a return receipt"
 msgstr "¸ÃÓʼþÒªÇ󷵻ػØÖ´"
 

-#: src/messageview.c:980
+#: src/messageview.c:990

 msgid "Send receipt"
 msgstr "·¢ËÍ»ØÖ´"
 
 msgid "Send receipt"
 msgstr "·¢ËÍ»ØÖ´"
 

-#: src/messageview.c:1033
+#: src/messageview.c:1043

 msgid "Return Receipt Notification"
 msgstr "·µ»Ø»ØÖ´"
 
 msgid "Return Receipt Notification"
 msgstr "·µ»Ø»ØÖ´"
 

-#: src/messageview.c:1034
+#: src/messageview.c:1044

 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "
 msgid ""
 "The message was sent to several of your accounts.\n"
 "Please choose which account do you want to use for sending the receipt "


@@ -4555,20 +4597,19 @@ msgstr ""
 "¸ÃÓʼþ·¢Ë͵½ÁËÄúµÄ¶à¸öÕʺÅÖС£\n"
 "ÇëÑ¡ÔñÓÃÒÔ·¢ËÍ»ØÖ´µÄÕʺÅ: "
 
 "¸ÃÓʼþ·¢Ë͵½ÁËÄúµÄ¶à¸öÕʺÅÖС£\n"
 "ÇëÑ¡ÔñÓÃÒÔ·¢ËÍ»ØÖ´µÄÕʺÅ: "
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "Send Notification"
 msgstr "·¢ËÍ֪ͨ"
 
 msgid "Send Notification"
 msgstr "·¢ËÍ֪ͨ"
 

-#: src/messageview.c:1038
+#: src/messageview.c:1048

 msgid "+Cancel"
 msgstr "+È¡Ïû"
 
 msgid "+Cancel"
 msgstr "+È¡Ïû"
 

-#: src/messageview.c:1092 src/prefs_common.c:2348 src/summaryview.c:3500
-#: src/toolbar.c:171
+#: src/messageview.c:1102 src/summaryview.c:3463 src/toolbar.c:171

 msgid "Print"
 msgstr "´òÓ¡"
 
 msgid "Print"
 msgstr "´òÓ¡"
 

-#: src/messageview.c:1093 src/summaryview.c:3501
+#: src/messageview.c:1103 src/summaryview.c:3464

 #, c-format
 msgid ""
 "Enter the print command line:\n"
 #, c-format
 msgid ""
 "Enter the print command line:\n"


@@ -4577,7 +4618,7 @@ msgstr ""
 "ÇëÊäÈëÓÃÓÚ´òÓ¡µÄÃüÁîÐÐ:\n"
 "(`%s' ½«±»Ì滻ΪÎļþÃû)"
 
 "ÇëÊäÈëÓÃÓÚ´òÓ¡µÄÃüÁîÐÐ:\n"
 "(`%s' ½«±»Ì滻ΪÎļþÃû)"
 

-#: src/messageview.c:1099 src/summaryview.c:3507
+#: src/messageview.c:1109 src/summaryview.c:3470

 #, c-format
 msgid ""
 "Print command line is invalid:\n"
 #, c-format
 msgid ""
 "Print command line is invalid:\n"


@@ -4587,9 +4628,9 @@ msgstr ""
 "`%s'"
 
 #: src/mh.c:360
 "`%s'"
 
 #: src/mh.c:360

-#, fuzzy, c-format
+#, c-format

 msgid "can't copy message %s to %s\n"
 msgid "can't copy message %s to %s\n"

-msgstr "ÎÞ·¨½«%s¿½±´µ½%s\n"
+msgstr "ÎÞ·¨½«Óʼþ %s ¿½±´µ½ %s\n"

 
 #: src/mimeview.c:149
 msgid "/_Open"
 
 #: src/mimeview.c:149
 msgid "/_Open"


@@ -4603,7 +4644,7 @@ msgstr "/
 msgid "/_Display as text"
 msgstr "/ÒÔÎı¾·½Ê½ÏÔʾ(_D)"
 
 msgid "/_Display as text"
 msgstr "/ÒÔÎı¾·½Ê½ÏÔʾ(_D)"
 

-#: src/mimeview.c:152 src/summaryview.c:463
+#: src/mimeview.c:152 src/summaryview.c:464

 msgid "/_Save as..."
 msgstr "/Áí´æΪ(_S)..."
 
 msgid "/_Save as..."
 msgstr "/Áí´æΪ(_S)..."
 


@@ -4665,43 +4706,43 @@ msgstr "
 msgid "can't set group: %s\n"
 msgstr "ÎÞ·¨ÉèÖÃȺ×é: %s\n"
 
 msgid "can't set group: %s\n"
 msgstr "ÎÞ·¨ÉèÖÃȺ×é: %s\n"
 

-#: src/news.c:817
+#: src/news.c:815

 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 
 #, c-format
 msgid "invalid article range: %d - %d\n"
 msgstr ""
 

-#: src/news.c:838
+#: src/news.c:835

 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "ÌáÈ¡ %s ʱ·¢Éú´íÎó.\n"
 
 #, c-format
 msgid "error occurred while getting %s.\n"
 msgstr "ÌáÈ¡ %s ʱ·¢Éú´íÎó.\n"
 

-#: src/news.c:855
+#: src/news.c:852

 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "ÕýÔÚÌáÈ¡xover %dÓÚ %s...\n"
 
 #, c-format
 msgid "getting xover %d in %s...\n"
 msgstr "ÕýÔÚÌáÈ¡xover %dÓÚ %s...\n"
 

-#: src/news.c:858 src/news.c:927
+#: src/news.c:855 src/news.c:924

 msgid "can't get xover\n"
 msgstr "ÎÞ·¨È¡µÃxover\n"
 
 msgid "can't get xover\n"
 msgstr "ÎÞ·¨È¡µÃxover\n"
 

-#: src/news.c:863 src/news.c:933
+#: src/news.c:860 src/news.c:930

 msgid "error occurred while getting xover.\n"
 msgstr "ÌáÈ¡xoverʱ·¢Éú´íÎó¡£\n"
 
 msgid "error occurred while getting xover.\n"
 msgstr "ÌáÈ¡xoverʱ·¢Éú´íÎó¡£\n"
 

-#: src/news.c:869 src/news.c:946
+#: src/news.c:866 src/news.c:943

 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 
 #, c-format
 msgid "invalid xover line: %s\n"
 msgstr ""
 

-#: src/news.c:883 src/news.c:897 src/news.c:964 src/news.c:994
+#: src/news.c:880 src/news.c:894 src/news.c:961 src/news.c:991

 msgid "can't get xhdr\n"
 msgstr "ÎÞ·¨È¡µÃxhdr\n"
 
 msgid "can't get xhdr\n"
 msgstr "ÎÞ·¨È¡µÃxhdr\n"
 

-#: src/news.c:888 src/news.c:902 src/news.c:972 src/news.c:1002
+#: src/news.c:885 src/news.c:899 src/news.c:969 src/news.c:999

 msgid "error occurred while getting xhdr.\n"
 msgstr "ÌáÈ¡xhdrʱ·¢Éú´íÎó¡£\n"
 
 msgid "error occurred while getting xhdr.\n"
 msgstr "ÌáÈ¡xhdrʱ·¢Éú´íÎó¡£\n"
 

-#: src/news.c:924
+#: src/news.c:921

 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""
 #, c-format
 msgid "getting xover %d - %d in %s...\n"
 msgstr ""


@@ -4729,12 +4770,15 @@ msgid ""
 "\n"
 msgstr "ÎÞЧµÄpassphrase! ÖØÊÔ...\n"
 
 "\n"
 msgstr "ÎÞЧµÄpassphrase! ÖØÊÔ...\n"
 

-#: src/plugins/clamav/clamav_plugin.c:224
+#: src/plugins/clamav/clamav_plugin.c:116
+msgid "ClamAV: scanning message..."
+msgstr "ClamAV: ÕýÔÚɨÃèÓʼþ..."
+
+#: src/plugins/clamav/clamav_plugin.c:225

 msgid "Clam AntiVirus"
 msgstr ""
 
 msgid "Clam AntiVirus"
 msgstr ""
 

-#: src/plugins/clamav/clamav_plugin.c:229
-#, fuzzy
+#: src/plugins/clamav/clamav_plugin.c:230

 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"
 msgid ""
 "This plugin uses Clam AntiVirus to scan all messages that are received from "
 "an IMAP, LOCAL or POP account.\n"


@@ -4747,6 +4791,7 @@ msgid ""
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "±¾²å¼þµ÷ÓÃClam AntiVirusɨÃè´ÓPOPÕÊ»§ÊÕÈ¡µÄËùÓÐÓʼþ¸½¼þ¡£\n"
 "too, otherwise you will have to manually write the plugin configuration.\n"
 msgstr ""
 "±¾²å¼þµ÷ÓÃClam AntiVirusɨÃè´ÓPOPÕÊ»§ÊÕÈ¡µÄËùÓÐÓʼþ¸½¼þ¡£\n"

+"\n"

 "µ±Óʼþ¸½¼þ±»·¢ÏÖº¬Óв¡¶¾Ê±£¬Ëü»á±»É¾³ý»òÕß´æÈëÒ»¸öÌØÊâµÄÓʼþ¼Ð¡£\n"
 "\n"
 "±¾²å¼þ½ö°üº¬ÓʼþµÄɨÃ衢ɾ³ý/Òƶ¯¹¦ÄÜ¡£Èç¹ûÒª½øÐвÎÊýÅäÖã¬Äú»¹ÐèÒª¼ÓÔØÏàÓ¦µÄ"
 "µ±Óʼþ¸½¼þ±»·¢ÏÖº¬Óв¡¶¾Ê±£¬Ëü»á±»É¾³ý»òÕß´æÈëÒ»¸öÌØÊâµÄÓʼþ¼Ð¡£\n"
 "\n"
 "±¾²å¼þ½ö°üº¬ÓʼþµÄɨÃ衢ɾ³ý/Òƶ¯¹¦ÄÜ¡£Èç¹ûÒª½øÐвÎÊýÅäÖã¬Äú»¹ÐèÒª¼ÓÔØÏàÓ¦µÄ"


@@ -4900,12 +4945,15 @@ msgid ""
 msgstr ""
 "±¾²å¼þʹÓÃGtkMathView¿Ø¼þÏÔʾMathMLÀàÐ͵ĸ½¼þ(Content-Type: text/mathml)"
 
 msgstr ""
 "±¾²å¼þʹÓÃGtkMathView¿Ø¼þÏÔʾMathMLÀàÐ͵ĸ½¼þ(Content-Type: text/mathml)"
 

-#: src/plugins/spamassassin/spamassassin.c:309
+#: src/plugins/spamassassin/spamassassin.c:181
+msgid "SpamAssassin: filtering message..."
+msgstr "SpamAssassin: ÕýÔÚ¹ýÂËÓʼþ..."
+
+#: src/plugins/spamassassin/spamassassin.c:310

 msgid "SpamAssassin"
 msgstr ""
 
 msgid "SpamAssassin"
 msgstr ""
 

-#: src/plugins/spamassassin/spamassassin.c:314
-#, fuzzy
+#: src/plugins/spamassassin/spamassassin.c:315

 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "
 msgid ""
 "This plugin checks all messages that are received from an IMAP, LOCAL or POP "
 "account for spam using a SpamAssassin server. You will need a SpamAssassin "


@@ -5041,9 +5089,9 @@ msgstr ""
 "\n"
 "Äú¿ÉÒÔÔÚ'ÆäËûÆ«ºÃ'½çÃæµÄ'¹ýÂË/SpamAssassin'ÕÒµ½ÕâЩѡÏî¡£\n"
 "\n"
 "\n"
 "Äú¿ÉÒÔÔÚ'ÆäËûÆ«ºÃ'½çÃæµÄ'¹ýÂË/SpamAssassin'ÕÒµ½ÕâЩѡÏî¡£\n"
 "\n"

-"ͨ¹ý±¾²å¼þÄú¿ÉÒÔÆô¶¯À¬»øÓʼþ¹ýÂË£¬ÐÞ¸ÄSpamAssassinµÄ·þÎñÆ÷¶Ë¿Ú£¬"
-"ÉèÖÃÔÊÐí½øÐмì²éµÄ×î´óÓʼþ³ß´ç(³¬¹ý´Ë³ß´ç½«²»±»¼ì²é)£¬"
-"»¹¿ÉÒÔÉèÖÃÊÇ·ñ½ÓÊÕÕâЩÓʼþ(ȱʡ:ÊÇ)ÒÔ¼°±£´æÕâЩÓʼþµÄÓʼþ¼Ð¡£\n"
+"ͨ¹ý±¾²å¼þÄú¿ÉÒÔÆô¶¯À¬»øÓʼþ¹ýÂË£¬ÐÞ¸ÄSpamAssassinµÄ·þÎñÆ÷¶Ë¿Ú£¬ÉèÖÃÔÊÐí½øÐÐ"
+"¼ì²éµÄ×î´óÓʼþ³ß´ç(³¬¹ý´Ë³ß´ç½«²»±»¼ì²é)£¬»¹¿ÉÒÔÉèÖÃÊÇ·ñ½ÓÊÕÕâЩÓʼþ(ȱʡ:ÊÇ)"
+"ÒÔ¼°±£´æÕâЩÓʼþµÄÓʼþ¼Ð¡£\n"

 
 #: src/plugins/trayicon/trayicon.c:217
 msgid "Trayicon"
 
 #: src/plugins/trayicon/trayicon.c:217
 msgid "Trayicon"


@@ -5113,386 +5161,390 @@ msgstr "
 msgid "Account preferences"
 msgstr "ÕʺÅÉèÖÃ"
 
 msgid "Account preferences"
 msgstr "ÕʺÅÉèÖÃ"
 

-#: src/prefs_account.c:766 src/prefs_common.c:968
+#: src/prefs_account.c:761 src/prefs_common.c:964

 msgid "Receive"
 msgstr "½ÓÊÕ"
 
 msgid "Receive"
 msgstr "½ÓÊÕ"
 

-#: src/prefs_account.c:770 src/prefs_common.c:972 src/prefs_folder_item.c:575
+#: src/prefs_account.c:765 src/prefs_common.c:968 src/prefs_folder_item.c:575

 msgid "Compose"
 msgstr "׫д"
 
 msgid "Compose"
 msgstr "׫д"
 

-#: src/prefs_account.c:773 src/prefs_common.c:981
+#: src/prefs_account.c:768 src/prefs_common.c:977

 msgid "Privacy"
 msgstr "Òþ˽"
 
 msgid "Privacy"
 msgstr "Òþ˽"
 

-#: src/prefs_account.c:777
+#: src/prefs_account.c:772

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: src/prefs_account.c:780
+#: src/prefs_account.c:775

 msgid "Advanced"
 msgstr "¸ß¼¶"
 
 msgid "Advanced"
 msgstr "¸ß¼¶"
 

-#: src/prefs_account.c:859
+#: src/prefs_account.c:854

 msgid "Name of account"
 msgstr "ÕʺÅÃû³Æ"
 
 msgid "Name of account"
 msgstr "ÕʺÅÃû³Æ"
 

-#: src/prefs_account.c:868
+#: src/prefs_account.c:863

 msgid "Set as default"
 msgstr "ÉèΪȱʡÕʺÅ"
 
 msgid "Set as default"
 msgstr "ÉèΪȱʡÕʺÅ"
 

-#: src/prefs_account.c:872
+#: src/prefs_account.c:867

 msgid "Personal information"
 msgstr "¸öÈË×ÊÁÏ"
 
 msgid "Personal information"
 msgstr "¸öÈË×ÊÁÏ"
 

-#: src/prefs_account.c:881
+#: src/prefs_account.c:876

 msgid "Full name"
 msgstr "È«Ãû"
 
 msgid "Full name"
 msgstr "È«Ãû"
 

-#: src/prefs_account.c:887
+#: src/prefs_account.c:882

 msgid "Mail address"
 msgstr "ÓʼþµØÖ·"
 
 msgid "Mail address"
 msgstr "ÓʼþµØÖ·"
 

-#: src/prefs_account.c:893
+#: src/prefs_account.c:888

 msgid "Organization"
 msgstr "×éÖ¯"
 
 msgid "Organization"
 msgstr "×éÖ¯"
 

-#: src/prefs_account.c:917
+#: src/prefs_account.c:912

 msgid "Server information"
 msgstr "·þÎñÆ÷ÐÅÏ¢"
 
 msgid "Server information"
 msgstr "·þÎñÆ÷ÐÅÏ¢"
 

-#: src/prefs_account.c:938
+#: src/prefs_account.c:933

 msgid "POP3 (normal)"
 msgstr "POP3 (ÆÕͨ)"
 
 msgid "POP3 (normal)"
 msgstr "POP3 (ÆÕͨ)"
 

-#: src/prefs_account.c:940
+#: src/prefs_account.c:935

 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP¼øȨ)"
 
 msgid "POP3 (APOP auth)"
 msgstr "POP3 (APOP¼øȨ)"
 

-#: src/prefs_account.c:942 src/prefs_account.c:1272 src/prefs_account.c:1866
+#: src/prefs_account.c:937 src/prefs_account.c:1269 src/prefs_account.c:1863

 msgid "IMAP4"
 msgstr "IMAP4"
 
 msgid "IMAP4"
 msgstr "IMAP4"
 

-#: src/prefs_account.c:944
+#: src/prefs_account.c:939

 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 
 msgid "News (NNTP)"
 msgstr "News (NNTP)"
 

-#: src/prefs_account.c:946
-msgid "None (local)"
-msgstr "ÎÞ (±¾µØ)"
+#: src/prefs_account.c:941
+msgid "Local mbox file"
+msgstr "±¾µØmboxÎļþ"
+
+#: src/prefs_account.c:943
+msgid "None (SMTP only)"
+msgstr "ÎÞ (½öSMTP)"

 
 

-#: src/prefs_account.c:966
+#: src/prefs_account.c:963

 msgid "This server requires authentication"
 msgstr "·þÎñÆ÷ÐèÒª¼øȨ"
 
 msgid "This server requires authentication"
 msgstr "·þÎñÆ÷ÐèÒª¼øȨ"
 

-#: src/prefs_account.c:973
+#: src/prefs_account.c:970

 msgid "Authenticate on connect"
 msgstr "Á¬½Óʱ¼øȨ"
 
 msgid "Authenticate on connect"
 msgstr "Á¬½Óʱ¼øȨ"
 

-#: src/prefs_account.c:1018
+#: src/prefs_account.c:1015

 msgid "News server"
 msgstr "ÐÂÎÅ·þÎñÆ÷"
 
 msgid "News server"
 msgstr "ÐÂÎÅ·þÎñÆ÷"
 

-#: src/prefs_account.c:1024
+#: src/prefs_account.c:1021

 msgid "Server for receiving"
 msgstr "½ÓÊÕ·þÎñÆ÷"
 
 msgid "Server for receiving"
 msgstr "½ÓÊÕ·þÎñÆ÷"
 

-#: src/prefs_account.c:1030
+#: src/prefs_account.c:1027

 msgid "Local mailbox"
 msgstr "±¾µØÓÊÏä"
 
 msgid "Local mailbox"
 msgstr "±¾µØÓÊÏä"
 

-#: src/prefs_account.c:1037
+#: src/prefs_account.c:1034

 msgid "SMTP server (send)"
 msgstr "SMTP ·þÎñÆ÷(·¢ËÍ)"
 
 msgid "SMTP server (send)"
 msgstr "SMTP ·þÎñÆ÷(·¢ËÍ)"
 

-#: src/prefs_account.c:1045
+#: src/prefs_account.c:1042

 msgid "Use mail command rather than SMTP server"
 msgstr "ʹÓÃmailÃüÁî¶ø²»ÊÇSMTP·þÎñÆ÷"
 
 msgid "Use mail command rather than SMTP server"
 msgstr "ʹÓÃmailÃüÁî¶ø²»ÊÇSMTP·þÎñÆ÷"
 

-#: src/prefs_account.c:1054
+#: src/prefs_account.c:1051

 msgid "command to send mails"
 msgstr "·¢ËÍÓʼþµÄÃüÁî"
 
 msgid "command to send mails"
 msgstr "·¢ËÍÓʼþµÄÃüÁî"
 

-#: src/prefs_account.c:1061 src/prefs_account.c:1435
+#: src/prefs_account.c:1058 src/prefs_account.c:1432

 msgid "User ID"
 msgstr "Óû§ID"
 
 msgid "User ID"
 msgstr "Óû§ID"
 

-#: src/prefs_account.c:1067 src/prefs_account.c:1444
+#: src/prefs_account.c:1064 src/prefs_account.c:1441

 msgid "Password"
 msgstr "ÃÜÂë"
 
 msgid "Password"
 msgstr "ÃÜÂë"
 

-#: src/prefs_account.c:1143 src/prefs_account.c:1849
+#: src/prefs_account.c:1140 src/prefs_account.c:1846

 msgid "POP3"
 msgstr "POP3"
 
 msgid "POP3"
 msgstr "POP3"
 

-#: src/prefs_account.c:1151
+#: src/prefs_account.c:1148

 msgid "Remove messages on server when received"
 msgstr "ÊÕµ½Óʼþºó´Ó·þÎñÆ÷ÉÏɾ³ý"
 
 msgid "Remove messages on server when received"
 msgstr "ÊÕµ½Óʼþºó´Ó·þÎñÆ÷ÉÏɾ³ý"
 

-#: src/prefs_account.c:1162
+#: src/prefs_account.c:1159

 msgid "Remove after"
 msgstr "ɾ³ýÓÚ"
 
 msgid "Remove after"
 msgstr "ɾ³ýÓÚ"
 

-#: src/prefs_account.c:1171
+#: src/prefs_account.c:1168

 msgid "days"
 msgstr "Ììºó"
 
 msgid "days"
 msgstr "Ììºó"
 

-#: src/prefs_account.c:1188
+#: src/prefs_account.c:1185

 msgid "(0 days: remove immediately)"
 msgstr "(0 Ìì: Á¢¼´É¾³ý)"
 
 msgid "(0 days: remove immediately)"
 msgstr "(0 Ìì: Á¢¼´É¾³ý)"
 

-#: src/prefs_account.c:1195
+#: src/prefs_account.c:1192

 msgid "Download all messages on server"
 msgstr "ÏÂÔØ·þÎñÆ÷ÉÏËùÓÐÓʼþ"
 
 msgid "Download all messages on server"
 msgstr "ÏÂÔØ·þÎñÆ÷ÉÏËùÓÐÓʼþ"
 

-#: src/prefs_account.c:1201
+#: src/prefs_account.c:1198

 msgid "Receive size limit"
 msgstr "Óʼþ´óСÏÞÖÆ"
 
 msgid "Receive size limit"
 msgstr "Óʼþ´óСÏÞÖÆ"
 

-#: src/prefs_account.c:1208
+#: src/prefs_account.c:1205

 msgid "KB"
 msgstr "KB"
 
 msgid "KB"
 msgstr "KB"
 

-#: src/prefs_account.c:1220
+#: src/prefs_account.c:1217

 msgid "Default inbox"
 msgstr "ȱʡÊÕ¼þ¼Ð"
 
 msgid "Default inbox"
 msgstr "ȱʡÊÕ¼þ¼Ð"
 

-#: src/prefs_account.c:1243
+#: src/prefs_account.c:1240

 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(δ±»¹ýÂ˵ÄÓʼþ½«·ÅÈë¸ÃÓʼþ¼Ð)"
 
 msgid "(Unfiltered messages will be stored in this folder)"
 msgstr "(δ±»¹ýÂ˵ÄÓʼþ½«·ÅÈë¸ÃÓʼþ¼Ð)"
 

-#: src/prefs_account.c:1248
+#: src/prefs_account.c:1245

 msgid "Maximum number of articles to download"
 msgstr "ÓʼþÏÂÔØ×î´óÊýÁ¿"
 
 msgid "Maximum number of articles to download"
 msgstr "ÓʼþÏÂÔØ×î´óÊýÁ¿"
 

-#: src/prefs_account.c:1267
+#: src/prefs_account.c:1264

 msgid "unlimited if 0 is specified"
 msgstr "Èç¹ûÉèΪ0Ϊ²»×÷ÏÞÖÆ"
 
 msgid "unlimited if 0 is specified"
 msgstr "Èç¹ûÉèΪ0Ϊ²»×÷ÏÞÖÆ"
 

-#: src/prefs_account.c:1283 src/prefs_account.c:1406
+#: src/prefs_account.c:1280 src/prefs_account.c:1403

 msgid "Authentication method"
 msgstr "¼øȨ·½Ê½"
 
 msgid "Authentication method"
 msgstr "¼øȨ·½Ê½"
 

-#: src/prefs_account.c:1293 src/prefs_account.c:1416 src/prefs_common.c:1331
+#: src/prefs_account.c:1290 src/prefs_account.c:1413 src/prefs_common.c:1327

 msgid "Automatic"
 msgstr "×Ô¶¯"
 
 msgid "Automatic"
 msgstr "×Ô¶¯"
 

-#: src/prefs_account.c:1300
+#: src/prefs_account.c:1297

 msgid "Filter messages on receiving"
 msgstr "½ÓÊÕÓʼþʱ½øÐйýÂË"
 
 msgid "Filter messages on receiving"
 msgstr "½ÓÊÕÓʼþʱ½øÐйýÂË"
 

-#: src/prefs_account.c:1304
+#: src/prefs_account.c:1301

 msgid "`Get all' checks for new messages on this account"
 msgstr "`È¡»ØËùÓÐÓʼþ'°üº¬±¾ÕÊ»§µÄÐÂÓʼþ"
 
 msgid "`Get all' checks for new messages on this account"
 msgstr "`È¡»ØËùÓÐÓʼþ'°üº¬±¾ÕÊ»§µÄÐÂÓʼþ"
 

-#: src/prefs_account.c:1363
+#: src/prefs_account.c:1360

 msgid "Add Date"
 msgstr "Ìí¼ÓÈÕÆÚ"
 
 msgid "Add Date"
 msgstr "Ìí¼ÓÈÕÆÚ"
 

-#: src/prefs_account.c:1364
+#: src/prefs_account.c:1361

 msgid "Generate Message-Id"
 msgstr "Éú³ÉMessage-ID"
 
 msgid "Generate Message-Id"
 msgstr "Éú³ÉMessage-ID"
 

-#: src/prefs_account.c:1371
+#: src/prefs_account.c:1368

 msgid "Add user-defined header"
 msgstr "Ìí¼Ó×Ô¶¨ÒåÏûϢͷ"
 
 msgid "Add user-defined header"
 msgstr "Ìí¼Ó×Ô¶¨ÒåÏûϢͷ"
 

-#: src/prefs_account.c:1373 src/prefs_common.c:1890 src/prefs_common.c:1915
+#: src/prefs_account.c:1370 src/prefs_common.c:1886 src/prefs_common.c:1911

 msgid " Edit... "
 msgstr " ±à¼­... "
 
 msgid " Edit... "
 msgstr " ±à¼­... "
 

-#: src/prefs_account.c:1383
+#: src/prefs_account.c:1380

 msgid "Authentication"
 msgstr "¼øȨ"
 
 msgid "Authentication"
 msgstr "¼øȨ"
 

-#: src/prefs_account.c:1391
+#: src/prefs_account.c:1388

 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP¼øȨ (SMTP AUTH)"
 
 msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "SMTP¼øȨ (SMTP AUTH)"
 

-#: src/prefs_account.c:1466
+#: src/prefs_account.c:1463

 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgstr "Èç¹ûÄã²»ÉèÖÃÕ⼸Ï½«²ÉÓýÓÊÕÓʼþµÄÓû§IDºÍ¿ÚÁî¡£"
 
 msgid ""
 "If you leave these entries empty, the same\n"
 "user ID and password as receiving will be used."
 msgstr "Èç¹ûÄã²»ÉèÖÃÕ⼸Ï½«²ÉÓýÓÊÕÓʼþµÄÓû§IDºÍ¿ÚÁî¡£"
 

-#: src/prefs_account.c:1475
+#: src/prefs_account.c:1472

 msgid "Authenticate with POP3 before sending"
 msgstr "·¢ËÍ֮ǰ²ÉÓÃPOP3½øÐмøȨ"
 
 msgid "Authenticate with POP3 before sending"
 msgstr "·¢ËÍ֮ǰ²ÉÓÃPOP3½øÐмøȨ"
 

-#: src/prefs_account.c:1490
+#: src/prefs_account.c:1487

 msgid "POP authentication timeout: "
 msgstr "POP¼øȨ³¬Ê±ÏÞÖÆ"
 
 msgid "POP authentication timeout: "
 msgstr "POP¼øȨ³¬Ê±ÏÞÖÆ"
 

-#: src/prefs_account.c:1499
+#: src/prefs_account.c:1496

 msgid "minutes"
 msgstr "·ÖÖÓ"
 
 msgid "minutes"
 msgstr "·ÖÖÓ"
 

-#: src/prefs_account.c:1546 src/prefs_account.c:1591 src/toolbar.c:427
+#: src/prefs_account.c:1543 src/prefs_account.c:1588 src/toolbar.c:428

 msgid "Signature"
 msgstr "Ç©Ãû"
 
 msgid "Signature"
 msgstr "Ç©Ãû"
 

-#: src/prefs_account.c:1554
+#: src/prefs_account.c:1551

 msgid "Insert signature automatically"
 msgstr "×Ô¶¯²åÈëÇ©Ãû"
 
 msgid "Insert signature automatically"
 msgstr "×Ô¶¯²åÈëÇ©Ãû"
 

-#: src/prefs_account.c:1559
+#: src/prefs_account.c:1556

 msgid "Signature separator"
 msgstr "Ç©Ãû·Ö¸ô·û"
 
 msgid "Signature separator"
 msgstr "Ç©Ãû·Ö¸ô·û"
 

-#: src/prefs_account.c:1581
+#: src/prefs_account.c:1578

 msgid "Command output"
 msgstr "ÃüÁîÊä³ö"
 
 msgid "Command output"
 msgstr "ÃüÁîÊä³ö"
 

-#: src/prefs_account.c:1599
+#: src/prefs_account.c:1596

 msgid "Automatically set the following addresses"
 msgstr "×Ô¶¯ÉèÖÃÈçϵØÖ·"
 
 msgid "Automatically set the following addresses"
 msgstr "×Ô¶¯ÉèÖÃÈçϵØÖ·"
 

-#: src/prefs_account.c:1608 src/prefs_filtering_action.c:1116
+#: src/prefs_account.c:1605 src/prefs_filtering_action.c:1116

 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "»ØÐŵØÖ·"
 
 #: src/prefs_matcher.c:143 src/prefs_matcher.c:1714 src/quote_fmt.c:49
 msgid "Cc"
 msgstr "»ØÐŵØÖ·"
 

-#: src/prefs_account.c:1621
+#: src/prefs_account.c:1618

 msgid "Bcc"
 msgstr "³­Ë͵ØÖ·"
 
 msgid "Bcc"
 msgstr "³­Ë͵ØÖ·"
 

-#: src/prefs_account.c:1634
+#: src/prefs_account.c:1631

 msgid "Reply-To"
 msgstr "»ØÐŵØÖ·"
 
 msgid "Reply-To"
 msgstr "»ØÐŵØÖ·"
 

-#: src/prefs_account.c:1689
+#: src/prefs_account.c:1686

 msgid "Encrypt message by default"
 msgstr "ȱʡÇé¿ö϶ÔÏûÏ¢½øÐмÓÃÜ"
 
 msgid "Encrypt message by default"
 msgstr "ȱʡÇé¿ö϶ÔÏûÏ¢½øÐмÓÃÜ"
 

-#: src/prefs_account.c:1691
+#: src/prefs_account.c:1688

 msgid "Sign message by default"
 msgstr "ȱʡÇé¿öÏÂÌí¼ÓÇ©Ãû"
 
 msgid "Sign message by default"
 msgstr "ȱʡÇé¿öÏÂÌí¼ÓÇ©Ãû"
 

-#: src/prefs_account.c:1693
+#: src/prefs_account.c:1690

 msgid "Default mode"
 msgstr "ȱʡģʽ"
 
 msgid "Default mode"
 msgstr "ȱʡģʽ"
 

-#: src/prefs_account.c:1701
+#: src/prefs_account.c:1698

 msgid "Use PGP/MIME"
 msgstr "²ÉÓÃPGP/MIME"
 
 msgid "Use PGP/MIME"
 msgstr "²ÉÓÃPGP/MIME"
 

-#: src/prefs_account.c:1710
+#: src/prefs_account.c:1707

 msgid "Use Inline"
 msgstr "²ÉÓÃInline"
 
 msgid "Use Inline"
 msgstr "²ÉÓÃInline"
 

-#: src/prefs_account.c:1720
+#: src/prefs_account.c:1717

 msgid "Sign key"
 msgstr ""
 
 msgid "Sign key"
 msgstr ""
 

-#: src/prefs_account.c:1728
+#: src/prefs_account.c:1725

 msgid "Use default GnuPG key"
 msgstr "ʹÓÃȱʡ GnuPG ÃÜÔ¿"
 
 msgid "Use default GnuPG key"
 msgstr "ʹÓÃȱʡ GnuPG ÃÜÔ¿"
 

-#: src/prefs_account.c:1737
+#: src/prefs_account.c:1734

 msgid "Select key by your email address"
 msgstr "°´ÓʼþµØÖ·Ñ¡ÔñÃÜÔ¿"
 
 msgid "Select key by your email address"
 msgstr "°´ÓʼþµØÖ·Ñ¡ÔñÃÜÔ¿"
 

-#: src/prefs_account.c:1746
+#: src/prefs_account.c:1743

 msgid "Specify key manually"
 msgstr "ÊÖ¹¤Ö¸¶¨ÃÜÔ¿"
 
 msgid "Specify key manually"
 msgstr "ÊÖ¹¤Ö¸¶¨ÃÜÔ¿"
 

-#: src/prefs_account.c:1762
+#: src/prefs_account.c:1759

 msgid "User or key ID:"
 msgstr ""
 
 msgid "User or key ID:"
 msgstr ""
 

-#: src/prefs_account.c:1857 src/prefs_account.c:1874 src/prefs_account.c:1890
+#: src/prefs_account.c:1854 src/prefs_account.c:1871 src/prefs_account.c:1887

 msgid "Don't use SSL"
 msgstr "²»²ÉÓÃSSL"
 
 msgid "Don't use SSL"
 msgstr "²»²ÉÓÃSSL"
 

-#: src/prefs_account.c:1860
+#: src/prefs_account.c:1857

 msgid "Use SSL for POP3 connection"
 msgstr "ÓÃSSL½øÐÐPOP3Á¬½Ó"
 
 msgid "Use SSL for POP3 connection"
 msgstr "ÓÃSSL½øÐÐPOP3Á¬½Ó"
 

-#: src/prefs_account.c:1863 src/prefs_account.c:1880 src/prefs_account.c:1914
+#: src/prefs_account.c:1860 src/prefs_account.c:1877 src/prefs_account.c:1911

 msgid "Use STARTTLS command to start SSL session"
 msgstr "ÓÃSTARTTLSÃüÁʼSSL»á»°"
 
 msgid "Use STARTTLS command to start SSL session"
 msgstr "ÓÃSTARTTLSÃüÁʼSSL»á»°"
 

-#: src/prefs_account.c:1877
+#: src/prefs_account.c:1874

 msgid "Use SSL for IMAP4 connection"
 msgstr "ÓÃSSL½øÐÐIMAPÁ¬½Ó"
 
 msgid "Use SSL for IMAP4 connection"
 msgstr "ÓÃSSL½øÐÐIMAPÁ¬½Ó"
 

-#: src/prefs_account.c:1883
+#: src/prefs_account.c:1880

 msgid "NNTP"
 msgstr ""
 
 msgid "NNTP"
 msgstr ""
 

-#: src/prefs_account.c:1898
+#: src/prefs_account.c:1895

 msgid "Use SSL for NNTP connection"
 msgstr "ÓÃSSL½øÐÐNNTPÁ¬½Ó"
 
 msgid "Use SSL for NNTP connection"
 msgstr "ÓÃSSL½øÐÐNNTPÁ¬½Ó"
 

-#: src/prefs_account.c:1900
+#: src/prefs_account.c:1897

 msgid "Send (SMTP)"
 msgstr "·¢ËÍ (SMTP)"
 
 msgid "Send (SMTP)"
 msgstr "·¢ËÍ (SMTP)"
 

-#: src/prefs_account.c:1908
+#: src/prefs_account.c:1905

 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "²»²ÉÓÃSSL (Èç¹û±ØÒªµÄ»°½«Æô¶¯STARTTLS)"
 
 msgid "Don't use SSL (but, if necessary, use STARTTLS)"
 msgstr "²»²ÉÓÃSSL (Èç¹û±ØÒªµÄ»°½«Æô¶¯STARTTLS)"
 

-#: src/prefs_account.c:1911
+#: src/prefs_account.c:1908

 msgid "Use SSL for SMTP connection"
 msgstr "ÓÃSSL½øÐÐSMTPÁ¬½Ó"
 
 msgid "Use SSL for SMTP connection"
 msgstr "ÓÃSSL½øÐÐSMTPÁ¬½Ó"
 

-#: src/prefs_account.c:1922
+#: src/prefs_account.c:1919

 msgid "Use non-blocking SSL"
 msgstr "²ÉÓ÷Ç×èÈûʽSSL"
 
 msgid "Use non-blocking SSL"
 msgstr "²ÉÓ÷Ç×èÈûʽSSL"
 

-#: src/prefs_account.c:1934
+#: src/prefs_account.c:1931

 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Èç¹ûÄãÔÚSSLÁ¬½ÓÉÏÅöµ½ÎÊÌâÇë´ò¿ª±¾Ïî)"
 
 msgid "(Turn this off if you have SSL connection problems)"
 msgstr "(Èç¹ûÄãÔÚSSLÁ¬½ÓÉÏÅöµ½ÎÊÌâÇë´ò¿ª±¾Ïî)"
 

-#: src/prefs_account.c:2058
+#: src/prefs_account.c:2055

 msgid "Specify SMTP port"
 msgstr "Ö¸¶¨SMTP¶Ë¿Ú"
 
 msgid "Specify SMTP port"
 msgstr "Ö¸¶¨SMTP¶Ë¿Ú"
 

-#: src/prefs_account.c:2064
+#: src/prefs_account.c:2061

 msgid "Specify POP3 port"
 msgstr "Ö¸¶¨POP3¶Ë¿Ú"
 
 msgid "Specify POP3 port"
 msgstr "Ö¸¶¨POP3¶Ë¿Ú"
 

-#: src/prefs_account.c:2070
+#: src/prefs_account.c:2067

 msgid "Specify IMAP4 port"
 msgstr "Ö¸¶¨IMAP4¶Ë¿Ú"
 
 msgid "Specify IMAP4 port"
 msgstr "Ö¸¶¨IMAP4¶Ë¿Ú"
 

-#: src/prefs_account.c:2076
+#: src/prefs_account.c:2073

 msgid "Specify NNTP port"
 msgstr "Ö¸¶¨NNTP¶Ë¿Ú"
 
 msgid "Specify NNTP port"
 msgstr "Ö¸¶¨NNTP¶Ë¿Ú"
 

-#: src/prefs_account.c:2081
+#: src/prefs_account.c:2078

 msgid "Specify domain name"
 msgstr "Ö¸¶¨ÓòÃû"
 
 msgid "Specify domain name"
 msgstr "Ö¸¶¨ÓòÃû"
 

-#: src/prefs_account.c:2091
+#: src/prefs_account.c:2088

 msgid "Use command to communicate with server"
 msgstr "ÓÃÈçÏÂÃüÁîÓë·þÎñÆ÷ͨѶ"
 
 msgid "Use command to communicate with server"
 msgstr "ÓÃÈçÏÂÃüÁîÓë·þÎñÆ÷ͨѶ"
 

-#: src/prefs_account.c:2099
+#: src/prefs_account.c:2096

 msgid "Mark cross-posted messages as read and color:"
 msgstr "½«½»²æͶµÝ(cross-posted)µÄÓʼþ±íʾΪÒѶÁºÍ²ÊÉ«:"
 
 msgid "Mark cross-posted messages as read and color:"
 msgstr "½«½»²æͶµÝ(cross-posted)µÄÓʼþ±íʾΪÒѶÁºÍ²ÊÉ«:"
 

-#: src/prefs_account.c:2113
+#: src/prefs_account.c:2110

 msgid "IMAP server directory"
 msgstr "IMAP·þÎñÆ÷Ŀ¼"
 
 msgid "IMAP server directory"
 msgstr "IMAP·þÎñÆ÷Ŀ¼"
 

-#: src/prefs_account.c:2167
+#: src/prefs_account.c:2164

 msgid "Put sent messages in"
 msgstr "½«ÒÑ·¢ËÍÓʼþ´æ·Åµ½"
 
 msgid "Put sent messages in"
 msgstr "½«ÒÑ·¢ËÍÓʼþ´æ·Åµ½"
 

-#: src/prefs_account.c:2169
+#: src/prefs_account.c:2166

 msgid "Put draft messages in"
 msgstr "½«Óʼþ²Ý¸å´æ·Åµ½"
 
 msgid "Put draft messages in"
 msgstr "½«Óʼþ²Ý¸å´æ·Åµ½"
 

-#: src/prefs_account.c:2171
+#: src/prefs_account.c:2168

 msgid "Put deleted messages in"
 msgstr "½«ÒÑɾ³ýµÄÓʼþ´æ·Åµ½"
 
 msgid "Put deleted messages in"
 msgstr "½«ÒÑɾ³ýµÄÓʼþ´æ·Åµ½"
 

-#: src/prefs_account.c:2235
+#: src/prefs_account.c:2232

 msgid "Account name is not entered."
 msgstr "δÊäÈëÕÊ»§Ãû³Æ"
 
 msgid "Account name is not entered."
 msgstr "δÊäÈëÕÊ»§Ãû³Æ"
 

-#: src/prefs_account.c:2239
+#: src/prefs_account.c:2236

 msgid "Mail address is not entered."
 msgstr "δÊäÈëÓʼþµØÖ·"
 
 msgid "Mail address is not entered."
 msgstr "δÊäÈëÓʼþµØÖ·"
 


@@ -5558,8 +5610,8 @@ msgid "Current actions"
 msgstr "µ±Ç°¶¯×÷"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546
 msgstr "µ±Ç°¶¯×÷"
 
 #: src/prefs_actions.c:382 src/prefs_filtering_action.c:546

-#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:595
-#: src/prefs_filtering.c:655 src/prefs_filtering.c:674 src/prefs_matcher.c:687
+#: src/prefs_filtering_action.c:619 src/prefs_filtering.c:593
+#: src/prefs_filtering.c:653 src/prefs_filtering.c:672 src/prefs_matcher.c:687

 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(н¨)"
 #: src/prefs_matcher.c:777 src/prefs_template.c:309
 msgid "(New)"
 msgstr "(н¨)"


@@ -5603,173 +5655,173 @@ msgstr "ɾ
 msgid "Do you really want to delete this action?"
 msgstr "ÄãÕæµÄҪɾ³ý´Ë¶¯×÷Âë? "
 
 msgid "Do you really want to delete this action?"
 msgstr "ÄãÕæµÄҪɾ³ý´Ë¶¯×÷Âë? "
 

-#: src/prefs_actions.c:639
+#: src/prefs_actions.c:657

 msgid "MENU NAME:"
 msgstr "²Ëµ¥ÏîÃû³Æ:"
 
 msgid "MENU NAME:"
 msgstr "²Ëµ¥ÏîÃû³Æ:"
 

-#: src/prefs_actions.c:640
+#: src/prefs_actions.c:658

 msgid "Use / in menu name to make submenus."
 msgstr "²Ëµ¥ÏîÃû³ÆÖпÉÒÔÓÃбÏß(/)±êʶ×Ӳ˵¥Ïî"
 
 msgid "Use / in menu name to make submenus."
 msgstr "²Ëµ¥ÏîÃû³ÆÖпÉÒÔÓÃбÏß(/)±êʶ×Ӳ˵¥Ïî"
 

-#: src/prefs_actions.c:642
+#: src/prefs_actions.c:660

 msgid "COMMAND LINE:"
 msgstr "ÃüÁîÐÐ"
 
 msgid "COMMAND LINE:"
 msgstr "ÃüÁîÐÐ"
 

-#: src/prefs_actions.c:643
+#: src/prefs_actions.c:661

 msgid "Begin with:"
 msgstr "¿ªÊ¼·ûºÅ:"
 
 msgid "Begin with:"
 msgstr "¿ªÊ¼·ûºÅ:"
 

-#: src/prefs_actions.c:644
+#: src/prefs_actions.c:662

 msgid "to send message body or selection to command's standard input"
 msgstr "½«ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 
 msgid "to send message body or selection to command's standard input"
 msgstr "½«ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 

-#: src/prefs_actions.c:645
+#: src/prefs_actions.c:663

 msgid "to send user provided text to command's standard input"
 msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 
 msgid "to send user provided text to command's standard input"
 msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë"
 

-#: src/prefs_actions.c:646
+#: src/prefs_actions.c:664

 msgid "to send user provided hidden text to command's standard input"
 msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë(ÊäÈëʱ²»ÏÔʾÃ÷ÎÄ)"
 
 msgid "to send user provided hidden text to command's standard input"
 msgstr "½«Óû§ÊäÈëµÄÎÄ×Ö´«µÝ¸øÃüÁîµÄ±ê×¼ÊäÈë(ÊäÈëʱ²»ÏÔʾÃ÷ÎÄ)"
 

-#: src/prefs_actions.c:647
+#: src/prefs_actions.c:665

 msgid "End with:"
 msgstr "½áÊø·ûºÅ:"
 
 msgid "End with:"
 msgstr "½áÊø·ûºÅ:"
 

-#: src/prefs_actions.c:648
+#: src/prefs_actions.c:666

 msgid "to replace message body or selection with command's standard output"
 msgstr "ÒÔÃüÁîµÄ±ê×¼Êä³öÌæ»»µ±Ç°ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö"
 
 msgid "to replace message body or selection with command's standard output"
 msgstr "ÒÔÃüÁîµÄ±ê×¼Êä³öÌæ»»µ±Ç°ÓʼþÄÚÈÝ»òÕßÑ¡Öв¿·Ö"
 

-#: src/prefs_actions.c:649
+#: src/prefs_actions.c:667

 msgid "to insert command's standard output without replacing old text"
 msgstr "²åÈëÃüÁîµÄ±ê×¼Êä³öÄÚÈÝ"
 
 msgid "to insert command's standard output without replacing old text"
 msgstr "²åÈëÃüÁîµÄ±ê×¼Êä³öÄÚÈÝ"
 

-#: src/prefs_actions.c:650
+#: src/prefs_actions.c:668

 msgid "to run command asynchronously"
 msgstr "Òì²½ÔËÐÐÃüÁî"
 
 msgid "to run command asynchronously"
 msgstr "Òì²½ÔËÐÐÃüÁî"
 

-#: src/prefs_actions.c:651
+#: src/prefs_actions.c:669

 msgid "Use:"
 msgstr "ʹÓÃ:"
 
 msgid "Use:"
 msgstr "ʹÓÃ:"
 

-#: src/prefs_actions.c:652
+#: src/prefs_actions.c:670

 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "±»Ñ¡ÖÐÓʼþÎļþ(RFC822/2822¸ñʽ)"
 
 msgid "for the file of the selected message in RFC822/2822 format "
 msgstr "±»Ñ¡ÖÐÓʼþÎļþ(RFC822/2822¸ñʽ)"
 

-#: src/prefs_actions.c:653
+#: src/prefs_actions.c:671

 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "±»Ñ¡ÖеĶà¸öÓʼþÎļþ(RFC822/2822¸ñʽ)"
 
 msgid ""
 "for the list of the files of the selected messages in RFC822/2822 format"
 msgstr "±»Ñ¡ÖеĶà¸öÓʼþÎļþ(RFC822/2822¸ñʽ)"
 

-#: src/prefs_actions.c:654
+#: src/prefs_actions.c:672

 msgid "for the file of the selected decoded message MIME part"
 msgstr "±»Ñ¡ÖеÄMIME part(½âÂëºó)"
 
 msgid "for the file of the selected decoded message MIME part"
 msgstr "±»Ñ¡ÖеÄMIME part(½âÂëºó)"
 

-#: src/prefs_actions.c:655
+#: src/prefs_actions.c:673

 msgid "for a user provided argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý"
 
 msgid "for a user provided argument"
 msgstr "Óû§ÌṩµÄ²ÎÊý"
 

-#: src/prefs_actions.c:656
+#: src/prefs_actions.c:674

 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "Óû§ÌṩµÄÒþ²Ø²ÎÊý(ÀýÈç: ÃÜÂë)"
 
 msgid "for a user provided hidden argument (e.g. password)"
 msgstr "Óû§ÌṩµÄÒþ²Ø²ÎÊý(ÀýÈç: ÃÜÂë)"
 

-#: src/prefs_actions.c:657
+#: src/prefs_actions.c:675

 msgid "for the text selection"
 msgstr "Ñ¡ÖеÄÎÄ×Ö"
 
 msgid "for the text selection"
 msgstr "Ñ¡ÖеÄÎÄ×Ö"
 

-#: src/prefs_actions.c:658
+#: src/prefs_actions.c:676

 msgid "apply filtering actions between {} to selected messages"
 msgstr "¶ÔÑ¡ÖеÄÓʼþÖ´ÐÐ{}ÖеĹýÂ˶¯×÷"
 
 msgid "apply filtering actions between {} to selected messages"
 msgstr "¶ÔÑ¡ÖеÄÓʼþÖ´ÐÐ{}ÖеĹýÂ˶¯×÷"
 

-#: src/prefs_actions.c:666 src/prefs_filtering_action.c:1131
+#: src/prefs_actions.c:684 src/prefs_filtering_action.c:1131

 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "·ûºÅÃèÊö"
 
 #: src/quote_fmt.c:75
 msgid "Description of symbols"
 msgstr "·ûºÅÃèÊö"
 

-#: src/prefs_common.c:951
+#: src/prefs_common.c:947

 msgid "Common Preferences"
 msgstr "Ò»°ãÆ«ºÃ"
 
 msgid "Common Preferences"
 msgstr "Ò»°ãÆ«ºÃ"
 

-#: src/prefs_common.c:974
+#: src/prefs_common.c:970

 msgid "Quote"
 msgstr "ÒýÎÄ"
 
 msgid "Quote"
 msgstr "ÒýÎÄ"
 

-#: src/prefs_common.c:976
+#: src/prefs_common.c:972

 msgid "Display"
 msgstr "ÏÔʾ"
 
 msgid "Display"
 msgstr "ÏÔʾ"
 

-#: src/prefs_common.c:978
+#: src/prefs_common.c:974

 msgid "Message"
 msgstr "Óʼþ"
 
 msgid "Message"
 msgstr "Óʼþ"
 

-#: src/prefs_common.c:986 src/select-keys.c:333
+#: src/prefs_common.c:982 src/select-keys.c:333

 msgid "Other"
 msgstr "ÆäËü"
 
 msgid "Other"
 msgstr "ÆäËü"
 

-#: src/prefs_common.c:1032
+#: src/prefs_common.c:1028

 msgid "External program"
 msgstr "Íⲿ³ÌÐò"
 
 msgid "External program"
 msgstr "Íⲿ³ÌÐò"
 

-#: src/prefs_common.c:1041
+#: src/prefs_common.c:1037

 msgid "Use external program for incorporation"
 msgstr "ʹÓÃÍⲿ³ÌÐòºÏ²¢Óʼþ"
 
 msgid "Use external program for incorporation"
 msgstr "ʹÓÃÍⲿ³ÌÐòºÏ²¢Óʼþ"
 

-#: src/prefs_common.c:1048
+#: src/prefs_common.c:1044

 msgid "Command"
 msgstr "ÃüÁî"
 
 msgid "Command"
 msgstr "ÃüÁî"
 

-#: src/prefs_common.c:1072
+#: src/prefs_common.c:1068

 msgid "Auto-check new mail"
 msgstr "×Ô¶¯¼ì²éÐÂÓʼþ"
 
 msgid "Auto-check new mail"
 msgstr "×Ô¶¯¼ì²éÐÂÓʼþ"
 

-#: src/prefs_common.c:1074
+#: src/prefs_common.c:1070

 msgid "every"
 msgstr "ÿ"
 
 msgid "every"
 msgstr "ÿ"
 

-#: src/prefs_common.c:1086
+#: src/prefs_common.c:1082

 msgid "minute(s)"
 msgstr "·ÖÖÓ"
 
 msgid "minute(s)"
 msgstr "·ÖÖÓ"
 

-#: src/prefs_common.c:1095
+#: src/prefs_common.c:1091

 msgid "Check new mail on startup"
 msgstr "Æô¶¯Ê±¼ì²éÐÂÓʼþ"
 
 msgid "Check new mail on startup"
 msgstr "Æô¶¯Ê±¼ì²éÐÂÓʼþ"
 

-#: src/prefs_common.c:1097
+#: src/prefs_common.c:1093

 msgid "Update all local folders after incorporation"
 msgstr "ºÏ²¢Óʼþºó¸üÐÂËùÓб¾µØÓʼþ¼Ð"
 
 msgid "Update all local folders after incorporation"
 msgstr "ºÏ²¢Óʼþºó¸üÐÂËùÓб¾µØÓʼþ¼Ð"
 

-#: src/prefs_common.c:1105
+#: src/prefs_common.c:1101

 msgid "Show receive dialog"
 msgstr "ÏÔʾÊÕÓʼþ½ø¶È¶Ô»°¿ò"
 
 msgid "Show receive dialog"
 msgstr "ÏÔʾÊÕÓʼþ½ø¶È¶Ô»°¿ò"
 

-#: src/prefs_common.c:1115 src/prefs_common.c:1239 src/prefs_common.c:2212
+#: src/prefs_common.c:1111 src/prefs_common.c:1235 src/prefs_common.c:2202

 msgid "Always"
 msgstr "×ÜÏÔʾ"
 
 msgid "Always"
 msgstr "×ÜÏÔʾ"
 

-#: src/prefs_common.c:1116
+#: src/prefs_common.c:1112

 msgid "Only on manual receiving"
 msgstr "½öÊÖ¹¤ÊÕȡʱÏÔʾ"
 
 msgid "Only on manual receiving"
 msgstr "½öÊÖ¹¤ÊÕȡʱÏÔʾ"
 

-#: src/prefs_common.c:1118 src/prefs_common.c:1240 src/sgpgme.c:90
+#: src/prefs_common.c:1114 src/prefs_common.c:1236 src/sgpgme.c:99

 msgid "Never"
 msgstr "´Ó²»ÏÔʾ"
 
 msgid "Never"
 msgstr "´Ó²»ÏÔʾ"
 

-#: src/prefs_common.c:1126
+#: src/prefs_common.c:1122

 msgid "Close receive dialog when finished"
 msgstr "ÊÕ¼þÍê³Éºó¹Ø±ÕÊÕ¼þ¶Ô»°¿ò"
 
 msgid "Close receive dialog when finished"
 msgstr "ÊÕ¼þÍê³Éºó¹Ø±ÕÊÕ¼þ¶Ô»°¿ò"
 

-#: src/prefs_common.c:1128
+#: src/prefs_common.c:1124

 msgid "Run command when new mail arrives"
 msgstr "ÐÂÓʼþµ½´ïʱÔËÐÐÃüÁî"
 
 msgid "Run command when new mail arrives"
 msgstr "ÐÂÓʼþµ½´ïʱÔËÐÐÃüÁî"
 

-#: src/prefs_common.c:1138
+#: src/prefs_common.c:1134

 msgid "after autochecking"
 msgstr "×Ô¶¯¼ì²éºó"
 
 msgid "after autochecking"
 msgstr "×Ô¶¯¼ì²éºó"
 

-#: src/prefs_common.c:1140
+#: src/prefs_common.c:1136

 msgid "after manual checking"
 msgstr "ÊÖ¹¤¼ì²éºó"
 
 msgid "after manual checking"
 msgstr "ÊÖ¹¤¼ì²éºó"
 

-#: src/prefs_common.c:1154
+#: src/prefs_common.c:1150

 #, c-format
 msgid ""
 "Command to execute:\n"
 #, c-format
 msgid ""
 "Command to execute:\n"


@@ -5778,622 +5830,605 @@ msgstr ""
 "ÒªÖ´ÐеÄÃüÁî:\n"
 "(Óà %d ±íʾÐÂÓʼþÊýÁ¿)"
 
 "ÒªÖ´ÐеÄÃüÁî:\n"
 "(Óà %d ±íʾÐÂÓʼþÊýÁ¿)"
 

-#: src/prefs_common.c:1223
+#: src/prefs_common.c:1219

 msgid "Save sent messages to Sent folder"
 msgstr "½«ÒѾ­·¢Ë͵ÄÓʼþ±£´æµ½ÒÑ·¢ËÍÓʼþ¼Ð"
 
 msgid "Save sent messages to Sent folder"
 msgstr "½«ÒѾ­·¢Ë͵ÄÓʼþ±£´æµ½ÒÑ·¢ËÍÓʼþ¼Ð"
 

-#: src/prefs_common.c:1225
+#: src/prefs_common.c:1221

 msgid "Queue messages that fail to send"
 msgstr "ÔÝ´æ·¢ËÍʧ°ÜµÄÓʼþµ½´ý·¢ËÍÓʼþ¼Ð"
 
 msgid "Queue messages that fail to send"
 msgstr "ÔÝ´æ·¢ËÍʧ°ÜµÄÓʼþµ½´ý·¢ËÍÓʼþ¼Ð"
 

-#: src/prefs_common.c:1230
+#: src/prefs_common.c:1226

 msgid "Show send dialog"
 msgstr "ÏÔʾ·¢ËͶԻ°¿ò"
 
 msgid "Show send dialog"
 msgstr "ÏÔʾ·¢ËͶԻ°¿ò"
 

-#: src/prefs_common.c:1248
+#: src/prefs_common.c:1244

 msgid "Outgoing codeset"
 msgstr "·¢ËÍÓʼþ×Ö·û¼¯"
 
 msgid "Outgoing codeset"
 msgstr "·¢ËÍÓʼþ×Ö·û¼¯"
 

-#: src/prefs_common.c:1257
+#: src/prefs_common.c:1253

 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "Èç¹ûÑ¡ÔñÁË`×Ô¶¯'£¬µ±Ç°localeÉèÖý«±»ÓÅÏÈÑ¡ÓÃ"
 
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used"
 msgstr "Èç¹ûÑ¡ÔñÁË`×Ô¶¯'£¬µ±Ç°localeÉèÖý«±»ÓÅÏÈÑ¡ÓÃ"
 

-#: src/prefs_common.c:1269
+#: src/prefs_common.c:1265

 msgid "Automatic (Recommended)"
 msgstr "×Ô¶¯ (ÍƼö)"
 
 msgid "Automatic (Recommended)"
 msgstr "×Ô¶¯ (ÍƼö)"
 

-#: src/prefs_common.c:1270
+#: src/prefs_common.c:1266

 msgid "7bit ascii (US-ASCII)"
 msgstr ""
 
 msgid "7bit ascii (US-ASCII)"
 msgstr ""
 

-#: src/prefs_common.c:1272
+#: src/prefs_common.c:1268

 msgid "Unicode (UTF-8)"
 msgstr ""
 
 msgid "Unicode (UTF-8)"
 msgstr ""
 

-#: src/prefs_common.c:1274
+#: src/prefs_common.c:1270

 msgid "Western European (ISO-8859-1)"
 msgstr "Î÷Å· (ISO-8859-1)"
 
 msgid "Western European (ISO-8859-1)"
 msgstr "Î÷Å· (ISO-8859-1)"
 

-#: src/prefs_common.c:1275
+#: src/prefs_common.c:1271

 msgid "Western European (ISO-8859-15)"
 msgstr "Î÷Å· (ISO-8859-15)"
 
 msgid "Western European (ISO-8859-15)"
 msgstr "Î÷Å· (ISO-8859-15)"
 

-#: src/prefs_common.c:1276
+#: src/prefs_common.c:1272

 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ· (ISO-8859-2)"
 
 msgid "Central European (ISO-8859-2)"
 msgstr "ÖÐÅ· (ISO-8859-2)"
 

-#: src/prefs_common.c:1277
+#: src/prefs_common.c:1273

 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨Â޵ĺ£ (ISO-8859-13)"
 
 msgid "Baltic (ISO-8859-13)"
 msgstr "²¨Â޵ĺ£ (ISO-8859-13)"
 

-#: src/prefs_common.c:1278
+#: src/prefs_common.c:1274

 msgid "Baltic (ISO-8859-4)"
 msgstr "²¨Â޵ĺ£ (ISO-8859-4)"
 
 msgid "Baltic (ISO-8859-4)"
 msgstr "²¨Â޵ĺ£ (ISO-8859-4)"
 

-#: src/prefs_common.c:1279
+#: src/prefs_common.c:1275

 msgid "Greek (ISO-8859-7)"
 msgstr "Ï£À° (ISO-8859-7)"
 
 msgid "Greek (ISO-8859-7)"
 msgstr "Ï£À° (ISO-8859-7)"
 

-#: src/prefs_common.c:1280
+#: src/prefs_common.c:1276

 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆä (ISO-8859-9)"
 
 msgid "Turkish (ISO-8859-9)"
 msgstr "ÍÁ¶úÆä (ISO-8859-9)"
 

-#: src/prefs_common.c:1282
+#: src/prefs_common.c:1278

 msgid "Cyrillic (ISO-8859-5)"
 msgstr "˹À­·òÓï (ISO-8859-5)"
 
 msgid "Cyrillic (ISO-8859-5)"
 msgstr "˹À­·òÓï (ISO-8859-5)"
 

-#: src/prefs_common.c:1284
+#: src/prefs_common.c:1280

 msgid "Cyrillic (KOI8-R)"
 msgstr "˹À­·òÓï (KOI8-R)"
 
 msgid "Cyrillic (KOI8-R)"
 msgstr "˹À­·òÓï (KOI8-R)"
 

-#: src/prefs_common.c:1286
+#: src/prefs_common.c:1282

 msgid "Cyrillic (Windows-1251)"
 msgstr "˹À­·òÓï (Windows-1251)"
 
 msgid "Cyrillic (Windows-1251)"
 msgstr "˹À­·òÓï (Windows-1251)"
 

-#: src/prefs_common.c:1287
+#: src/prefs_common.c:1283

 msgid "Cyrillic (KOI8-U)"
 msgstr "˹À­·òÓï (KOI8-U)"
 
 msgid "Cyrillic (KOI8-U)"
 msgstr "˹À­·òÓï (KOI8-U)"
 

-#: src/prefs_common.c:1289
+#: src/prefs_common.c:1285

 msgid "Japanese (ISO-2022-JP)"
 msgstr "ÈÕÓï (ISO-2022-JP)"
 
 msgid "Japanese (ISO-2022-JP)"
 msgstr "ÈÕÓï (ISO-2022-JP)"
 

-#: src/prefs_common.c:1291
+#: src/prefs_common.c:1287

 msgid "Japanese (EUC-JP)"
 msgstr "ÈÕÓï (EUC-JP)"
 
 msgid "Japanese (EUC-JP)"
 msgstr "ÈÕÓï (EUC-JP)"
 

-#: src/prefs_common.c:1292
+#: src/prefs_common.c:1288

 msgid "Japanese (Shift_JIS)"
 msgstr "ÈÕÓï (Shift_JIS)"
 
 msgid "Japanese (Shift_JIS)"
 msgstr "ÈÕÓï (Shift_JIS)"
 

-#: src/prefs_common.c:1294
+#: src/prefs_common.c:1290

 msgid "Simplified Chinese (GB2312)"
 msgstr "¼òÌåÖÐÎÄ (GB2312)"
 
 msgid "Simplified Chinese (GB2312)"
 msgstr "¼òÌåÖÐÎÄ (GB2312)"
 

-#: src/prefs_common.c:1295
+#: src/prefs_common.c:1291

 msgid "Traditional Chinese (Big5)"
 msgstr "·±ÌåÖÐÎÄ (Big5)"
 
 msgid "Traditional Chinese (Big5)"
 msgstr "·±ÌåÖÐÎÄ (Big5)"
 

-#: src/prefs_common.c:1297
+#: src/prefs_common.c:1293

 msgid "Traditional Chinese (EUC-TW)"
 msgstr "·±ÌåÖÐÎÄ (EUC-TW)"
 
 msgid "Traditional Chinese (EUC-TW)"
 msgstr "·±ÌåÖÐÎÄ (EUC-TW)"
 

-#: src/prefs_common.c:1298
+#: src/prefs_common.c:1294

 msgid "Chinese (ISO-2022-CN)"
 msgstr "ÖÐÎÄ (ISO-2022-CN)"
 
 msgid "Chinese (ISO-2022-CN)"
 msgstr "ÖÐÎÄ (ISO-2022-CN)"
 

-#: src/prefs_common.c:1300
+#: src/prefs_common.c:1296

 msgid "Korean (EUC-KR)"
 msgstr "³¯ÏÊÓï (EUC-KR)"
 
 msgid "Korean (EUC-KR)"
 msgstr "³¯ÏÊÓï (EUC-KR)"
 

-#: src/prefs_common.c:1301
+#: src/prefs_common.c:1297

 msgid "Thai (TIS-620)"
 msgstr "Ì©Óï (TIS-620)"
 
 msgid "Thai (TIS-620)"
 msgstr "Ì©Óï (TIS-620)"
 

-#: src/prefs_common.c:1302
+#: src/prefs_common.c:1298

 msgid "Thai (Windows-874)"
 msgstr "Ì©Óï (Windows-874)"
 
 msgid "Thai (Windows-874)"
 msgstr "Ì©Óï (Windows-874)"
 

-#: src/prefs_common.c:1315
+#: src/prefs_common.c:1311

 msgid "Transfer encoding"
 msgstr "´«ËͱàÂë"
 
 msgid "Transfer encoding"
 msgstr "´«ËͱàÂë"
 

-#: src/prefs_common.c:1324
+#: src/prefs_common.c:1320

 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "Ö¸¶¨µ±Óʼþº¬ÓзÇASCII×Ö·ûʱµÄÓʼþÄÚÈݱàÂ뷽ʽ"
 
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters"
 msgstr "Ö¸¶¨µ±Óʼþº¬ÓзÇASCII×Ö·ûʱµÄÓʼþÄÚÈݱàÂ뷽ʽ"
 

-#: src/prefs_common.c:1411
+#: src/prefs_common.c:1407

 msgid "Automatic account selection"
 msgstr "×Ô¶¯Ñ¡ÔñÕÊ»§"
 
 msgid "Automatic account selection"
 msgstr "×Ô¶¯Ñ¡ÔñÕÊ»§"
 

-#: src/prefs_common.c:1419
+#: src/prefs_common.c:1415

 msgid "when replying"
 msgstr "»ØÐÅʱ"
 
 msgid "when replying"
 msgstr "»ØÐÅʱ"
 

-#: src/prefs_common.c:1421
+#: src/prefs_common.c:1417

 msgid "when forwarding"
 msgstr "ת·¢Ê±"
 
 msgid "when forwarding"
 msgstr "ת·¢Ê±"
 

-#: src/prefs_common.c:1423
+#: src/prefs_common.c:1419

 msgid "when re-editing"
 msgstr "ÖØб༭ʱ"
 
 msgid "when re-editing"
 msgstr "ÖØб༭ʱ"
 

-#: src/prefs_common.c:1430
+#: src/prefs_common.c:1426

 msgid "Reply button invokes mailing list reply"
 msgstr "µã»÷»ØÐÅ°´Å¥Ê±»Ø¸´¸øÓʼþÁбí"
 
 msgid "Reply button invokes mailing list reply"
 msgstr "µã»÷»ØÐÅ°´Å¥Ê±»Ø¸´¸øÓʼþÁбí"
 

-#: src/prefs_common.c:1433
+#: src/prefs_common.c:1429

 msgid "Automatically launch the external editor"
 msgstr "×Ô¶¯Æô¶¯Íⲿ±à¼­Æ÷"
 
 msgid "Automatically launch the external editor"
 msgstr "×Ô¶¯Æô¶¯Íⲿ±à¼­Æ÷"
 

-#: src/prefs_common.c:1440 src/prefs_filtering_action.c:143
+#: src/prefs_common.c:1436 src/prefs_filtering_action.c:143

 msgid "Forward as attachment"
 msgstr "ÒÔ¸½¼þÐÎʽת·¢"
 
 msgid "Forward as attachment"
 msgstr "ÒÔ¸½¼þÐÎʽת·¢"
 

-#: src/prefs_common.c:1443
+#: src/prefs_common.c:1439

 msgid "Block cursor"
 msgstr "¿é×´Óαê"
 
 msgid "Block cursor"
 msgstr "¿é×´Óαê"
 

-#: src/prefs_common.c:1446
+#: src/prefs_common.c:1442

 msgid "Keep the original 'From' header when redirecting"
 msgstr "Öض¨Ïòʱ±£³ÖÔ­À´µÄ·¢¼þÈË"
 
 msgid "Keep the original 'From' header when redirecting"
 msgstr "Öض¨Ïòʱ±£³ÖÔ­À´µÄ·¢¼þÈË"
 

-#: src/prefs_common.c:1454
+#: src/prefs_common.c:1450

 msgid "Autosave to Drafts folder every "
 msgstr "×Ô¶¯±£´æ²Ý¸å:  ÿ"
 
 msgid "Autosave to Drafts folder every "
 msgstr "×Ô¶¯±£´æ²Ý¸å:  ÿ"
 

-#: src/prefs_common.c:1461 src/prefs_common.c:1506
+#: src/prefs_common.c:1457 src/prefs_common.c:1502

 msgid "characters"
 msgstr "¸ö×Ö·û"
 
 msgid "characters"
 msgstr "¸ö×Ö·û"
 

-#: src/prefs_common.c:1469
+#: src/prefs_common.c:1465

 msgid "Undo level"
 msgstr "¸´Ô­¼Í¼"
 
 msgid "Undo level"
 msgstr "¸´Ô­¼Í¼"
 

-#: src/prefs_common.c:1482
+#: src/prefs_common.c:1478

 msgid "Message wrapping"
 msgstr "×Ô¶¯»»ÐÐ"
 
 msgid "Message wrapping"
 msgstr "×Ô¶¯»»ÐÐ"
 

-#: src/prefs_common.c:1494
+#: src/prefs_common.c:1490

 msgid "Wrap messages at"
 msgstr "ÿÐÐ×î¶à"
 
 msgid "Wrap messages at"
 msgstr "ÿÐÐ×î¶à"
 

-#: src/prefs_common.c:1514
+#: src/prefs_common.c:1510

 msgid "Wrap quotation"
 msgstr "ÕÛÐÐʱÏÔʾ·ûºÅ"
 
 msgid "Wrap quotation"
 msgstr "ÕÛÐÐʱÏÔʾ·ûºÅ"
 

-#: src/prefs_common.c:1516
+#: src/prefs_common.c:1512

 msgid "Wrap on input"
 msgstr "ÇиÈë¹ý³¤µÄÎÄ×ÖÐÐ"
 
 msgid "Wrap on input"
 msgstr "ÇиÈë¹ý³¤µÄÎÄ×ÖÐÐ"
 

-#: src/prefs_common.c:1519
+#: src/prefs_common.c:1515

 msgid "Wrap before sending"
 msgstr "¼ÄËÍ֮ǰ×Ô¶¯ÕÛÐÐ"
 
 msgid "Wrap before sending"
 msgstr "¼ÄËÍ֮ǰ×Ô¶¯ÕÛÐÐ"
 

-#: src/prefs_common.c:1522
+#: src/prefs_common.c:1518

 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr ""
 
 msgid "Smart wrapping (EXPERIMENTAL)"
 msgstr ""
 

-#: src/prefs_common.c:1588
+#: src/prefs_common.c:1584

 msgid "Reply will quote by default"
 msgstr "»ØÐÅʱÒýÓÃÔ­ÎÄ"
 
 msgid "Reply will quote by default"
 msgstr "»ØÐÅʱÒýÓÃÔ­ÎÄ"
 

-#: src/prefs_common.c:1590
+#: src/prefs_common.c:1586

 msgid "Reply format"
 msgstr "»Ø¸´¸ñʽ"
 
 msgid "Reply format"
 msgstr "»Ø¸´¸ñʽ"
 

-#: src/prefs_common.c:1605 src/prefs_common.c:1644
+#: src/prefs_common.c:1601 src/prefs_common.c:1640

 msgid "Quotation mark"
 msgstr "ÒýÎÄ·ûºÅ"
 
 msgid "Quotation mark"
 msgstr "ÒýÎÄ·ûºÅ"
 

-#: src/prefs_common.c:1629
+#: src/prefs_common.c:1625

 msgid "Forward format"
 msgstr "ת·¢¸ñʽ"
 
 msgid "Forward format"
 msgstr "ת·¢¸ñʽ"
 

-#: src/prefs_common.c:1673
+#: src/prefs_common.c:1669

 msgid " Description of symbols "
 msgstr "ÌØÊâ·ûºÅ˵Ã÷"
 
 msgid " Description of symbols "
 msgstr "ÌØÊâ·ûºÅ˵Ã÷"
 

-#: src/prefs_common.c:1681
+#: src/prefs_common.c:1677

 msgid "Quotation characters"
 msgstr "ÒýÎıêʶ"
 
 msgid "Quotation characters"
 msgstr "ÒýÎıêʶ"
 

-#: src/prefs_common.c:1696
+#: src/prefs_common.c:1692

 msgid "Treat these characters as quotation marks: "
 msgstr "½«ÕâЩ×Ö·û×÷ΪÒýÎıêʶ"
 
 msgid "Treat these characters as quotation marks: "
 msgstr "½«ÕâЩ×Ö·û×÷ΪÒýÎıêʶ"
 

-#: src/prefs_common.c:1746
+#: src/prefs_common.c:1742

 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "½«ÐÅÍ·Ãû³Æ·­Òë³öÀ´"
 
 msgid "Translate header name (such as `From:', `Subject:')"
 msgstr "½«ÐÅÍ·Ãû³Æ·­Òë³öÀ´"
 

-#: src/prefs_common.c:1749
+#: src/prefs_common.c:1745

 msgid "Display unread number next to folder name"
 msgstr "ÔÚÓʼþ¼ÐÃû³ÆºóÏÔʾδ¶ÁÓʼþÊý"
 
 msgid "Display unread number next to folder name"
 msgstr "ÔÚÓʼþ¼ÐÃû³ÆºóÏÔʾδ¶ÁÓʼþÊý"
 

-#: src/prefs_common.c:1758
+#: src/prefs_common.c:1754

 msgid "Abbreviate newsgroup names longer than"
 msgstr "ËõдÐÂÎÅȺ×éÃû³Æ£¬Èç¹ûÆ䳤¶È´óÓÚ"
 
 msgid "Abbreviate newsgroup names longer than"
 msgstr "ËõдÐÂÎÅȺ×éÃû³Æ£¬Èç¹ûÆ䳤¶È´óÓÚ"
 

-#: src/prefs_common.c:1773
+#: src/prefs_common.c:1769

 msgid "letters"
 msgstr "¸ö×Öĸ"
 
 msgid "letters"
 msgstr "¸ö×Öĸ"
 

-#: src/prefs_common.c:1779
+#: src/prefs_common.c:1775 src/prefs_fonts.c:176

 msgid "Summary View"
 msgstr "ÓʼþÁбí"
 
 msgid "Summary View"
 msgstr "ÓʼþÁбí"
 

-#: src/prefs_common.c:1788
+#: src/prefs_common.c:1784

 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Èô·¢ÐÅÈËÊÇÄã×Ô¼º£¬¾ÍÔÚÓʼþÁбíµÄÀ´Ô´ÖÐÏÔʾÊÕÐÅÈË"
 
 msgid "Display recipient in `From' column if sender is yourself"
 msgstr "Èô·¢ÐÅÈËÊÇÄã×Ô¼º£¬¾ÍÔÚÓʼþÁбíµÄÀ´Ô´ÖÐÏÔʾÊÕÐÅÈË"
 

-#: src/prefs_common.c:1791
+#: src/prefs_common.c:1787

 msgid "Display sender using address book"
 msgstr "ÒÔͨѶ¼ÖеÄÃû×ÖÏÔʾ·¢¼þÈË"
 
 msgid "Display sender using address book"
 msgstr "ÒÔͨѶ¼ÖеÄÃû×ÖÏÔʾ·¢¼þÈË"
 

-#: src/prefs_common.c:1794
+#: src/prefs_common.c:1790

 msgid "Thread using subject in addition to standard headers"
 msgstr "½¨Á¢ÏßË÷ʱҲ²ÉÓÃÓʼþÖ÷Ì⣨³ýÁ˱ê×¼ÐÅÍ·ÖеÄÐÅÏ¢£©"
 
 msgid "Thread using subject in addition to standard headers"
 msgstr "½¨Á¢ÏßË÷ʱҲ²ÉÓÃÓʼþÖ÷Ì⣨³ýÁ˱ê×¼ÐÅÍ·ÖеÄÐÅÏ¢£©"
 

-#: src/prefs_common.c:1802 src/prefs_common.c:2689 src/prefs_common.c:2727
+#: src/prefs_common.c:1798 src/prefs_common.c:2573 src/prefs_common.c:2611

 msgid "Date format"
 msgstr "ÈÕÆÚ¸ñʽ"
 
 msgid "Date format"
 msgstr "ÈÕÆÚ¸ñʽ"
 

-#: src/prefs_common.c:1824
+#: src/prefs_common.c:1820

 msgid " Set displayed items in summary... "
 msgstr " ÉèÖÃÓʼþÁбíÖÐÒªÏÔʾµÄÁÐ..."
 
 msgid " Set displayed items in summary... "
 msgstr " ÉèÖÃÓʼþÁбíÖÐÒªÏÔʾµÄÁÐ..."
 

-#: src/prefs_common.c:1885
+#: src/prefs_common.c:1881

 msgid "Enable coloration of message"
 msgstr "²ÊÉ«ÏÔʾÓʼþÖеÄÒýÎÄÓ볬Á´½Ó"
 
 msgid "Enable coloration of message"
 msgstr "²ÊÉ«ÏÔʾÓʼþÖеÄÒýÎÄÓ볬Á´½Ó"
 

-#: src/prefs_common.c:1900
+#: src/prefs_common.c:1896

 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgstr "½«È«½ÇÓ¢ÎÄÓëÊý×ÖÒÔ°ë½ÇÀ´ÏÔʾ (Ö»ÊÊÓÃÈÕÎÄ)"
 
 msgid ""
 "Display multi-byte alphanumeric as\n"
 "ASCII character (Japanese only)"
 msgstr "½«È«½ÇÓ¢ÎÄÓëÊý×ÖÒÔ°ë½ÇÀ´ÏÔʾ (Ö»ÊÊÓÃÈÕÎÄ)"
 

-#: src/prefs_common.c:1906
+#: src/prefs_common.c:1902

 msgid "Display header pane above message view"
 msgstr "ÔÚÓʼþÔĶÁÆ÷ÉÏ·½ÏÔʾÐÅÍ·ÐÅÏ¢Ãæ°å"
 
 msgid "Display header pane above message view"
 msgstr "ÔÚÓʼþÔĶÁÆ÷ÉÏ·½ÏÔʾÐÅÍ·ÐÅÏ¢Ãæ°å"
 

-#: src/prefs_common.c:1913
+#: src/prefs_common.c:1909

 msgid "Display short headers on message view"
 msgstr "ÔÚÓʼþ´°¿ÚÏÔʾÓʼþµÄ¼òÒªÐÅÍ·"
 
 msgid "Display short headers on message view"
 msgstr "ÔÚÓʼþ´°¿ÚÏÔʾÓʼþµÄ¼òÒªÐÅÍ·"
 

-#: src/prefs_common.c:1935
+#: src/prefs_common.c:1931

 msgid "Line space"
 msgstr "Ðмä¾à"
 
 msgid "Line space"
 msgstr "Ðмä¾à"
 

-#: src/prefs_common.c:1949 src/prefs_common.c:1989
+#: src/prefs_common.c:1945 src/prefs_common.c:1985

 msgid "pixel(s)"
 msgstr "ÏñËØ"
 
 msgid "pixel(s)"
 msgstr "ÏñËØ"
 

-#: src/prefs_common.c:1954
+#: src/prefs_common.c:1950

 msgid "Leave space on head"
 msgstr "ÿÐÐ×îÇ°Ãæ¿ÕÒ»¸ñ"
 
 msgid "Leave space on head"
 msgstr "ÿÐÐ×îÇ°Ãæ¿ÕÒ»¸ñ"
 

-#: src/prefs_common.c:1956
+#: src/prefs_common.c:1952

 msgid "Scroll"
 msgstr "¾íÖá"
 
 msgid "Scroll"
 msgstr "¾íÖá"
 

-#: src/prefs_common.c:1963
+#: src/prefs_common.c:1959

 msgid "Half page"
 msgstr "Ò»´Î°ëÒ³"
 
 msgid "Half page"
 msgstr "Ò»´Î°ëÒ³"
 

-#: src/prefs_common.c:1969
+#: src/prefs_common.c:1965

 msgid "Smooth scroll"
 msgstr "ƽ»¬¾í¶¯"
 
 msgid "Smooth scroll"
 msgstr "ƽ»¬¾í¶¯"
 

-#: src/prefs_common.c:1975
+#: src/prefs_common.c:1971

 msgid "Step"
 msgstr "ÿ´Î¾í¶¯"
 
 msgid "Step"
 msgstr "ÿ´Î¾í¶¯"
 

-#: src/prefs_common.c:2000
+#: src/prefs_common.c:1996

 msgid "Show attachment descriptions (rather than names)"
 msgstr "ÏÔʾ¸½¼þµÄÃèÊöÐÅÏ¢(¶ø²»ÊǸ½¼þÃû³Æ)"
 
 msgid "Show attachment descriptions (rather than names)"
 msgstr "ÏÔʾ¸½¼þµÄÃèÊöÐÅÏ¢(¶ø²»ÊǸ½¼þÃû³Æ)"
 

-#: src/prefs_common.c:2046
+#: src/prefs_common.c:2042

 msgid "Automatically check signatures"
 msgstr "×Ô¶¯¼ì²éÊý×ÖÇ©Ãû"
 
 msgid "Automatically check signatures"
 msgstr "×Ô¶¯¼ì²éÊý×ÖÇ©Ãû"
 

-#: src/prefs_common.c:2049
+#: src/prefs_common.c:2045

 msgid "Store passphrase in memory temporarily"
 msgstr "½«passphraseÔÝʱ´æÔÚÄÚ´æÖÐ"
 
 msgid "Store passphrase in memory temporarily"
 msgstr "½«passphraseÔÝʱ´æÔÚÄÚ´æÖÐ"
 

-#: src/prefs_common.c:2064
+#: src/prefs_common.c:2060

 msgid "Expire after"
 msgstr " ÓÐÏÞÆÚ£º"
 
 msgid "Expire after"
 msgstr " ÓÐÏÞÆÚ£º"
 

-#: src/prefs_common.c:2075
+#: src/prefs_common.c:2071

 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "ÈôÉèÖÃΪ '0' Ôò»áÔÚÕû¸ö»Ø»°ÆÚÄÚ±£´æpassphrase"
 
 msgid "Setting to '0' will store the passphrase for the whole session"
 msgstr "ÈôÉèÖÃΪ '0' Ôò»áÔÚÕû¸ö»Ø»°ÆÚÄÚ±£´æpassphrase"
 

-#: src/prefs_common.c:2083
+#: src/prefs_common.c:2079

 msgid "minute(s) "
 msgstr "·ÖÖÓ"
 
 msgid "minute(s) "
 msgstr "·ÖÖÓ"
 

-#: src/prefs_common.c:2100
+#: src/prefs_common.c:2096

 msgid "Grab input while entering a passphrase"
 msgstr "µ¼Èë passphrase ʱץȡµ¼Èë"
 
 msgid "Grab input while entering a passphrase"
 msgstr "µ¼Èë passphrase ʱץȡµ¼Èë"
 

-#: src/prefs_common.c:2105
+#: src/prefs_common.c:2101

 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Èô GnuPG ÎÞ·¨ÔË×÷£¬ÔòÔÚÆô¶¯Ê±·¢³ö¾¯¸æ"
 
 msgid "Display warning on startup if GnuPG doesn't work"
 msgstr "Èô GnuPG ÎÞ·¨ÔË×÷£¬ÔòÔÚÆô¶¯Ê±·¢³ö¾¯¸æ"
 

-#: src/prefs_common.c:2166
+#: src/prefs_common.c:2156

 msgid "Always open messages in summary when selected"
 msgstr "Ñ¡ÖÐĿ¼ʱ×Ü´ò¿ªÓʼþÁбíÀïÃæµÄÓʼþ¡£"
 
 msgid "Always open messages in summary when selected"
 msgstr "Ñ¡ÖÐĿ¼ʱ×Ü´ò¿ªÓʼþÁбíÀïÃæµÄÓʼþ¡£"
 

-#: src/prefs_common.c:2170
+#: src/prefs_common.c:2160

 msgid "Open first unread message when entering a folder"
 msgstr "½øÈëÓʼþ¼Ðʱֱ½ÓÌøµ½µÚÒ»·âδ¶ÁÓʼþÉÏ"
 
 msgid "Open first unread message when entering a folder"
 msgstr "½øÈëÓʼþ¼Ðʱֱ½ÓÌøµ½µÚÒ»·âδ¶ÁÓʼþÉÏ"
 

-#: src/prefs_common.c:2174
+#: src/prefs_common.c:2164

 msgid "Only mark message as read when opened in new window"
 msgstr "Ö»ÔÚÓÃд°¿Ú´ò¿ªÓʼþʱ±ê¼ÇΪÒѶÁ"
 
 msgid "Only mark message as read when opened in new window"
 msgstr "Ö»ÔÚÓÃд°¿Ú´ò¿ªÓʼþʱ±ê¼ÇΪÒѶÁ"
 

-#: src/prefs_common.c:2178
+#: src/prefs_common.c:2168

 msgid "Go to inbox after receiving new mail"
 msgstr "½ÓÊÕÍêÐÂÓʼþºóÖ±½Ó½øÈëÊÕ¼þ¼Ð"
 
 msgid "Go to inbox after receiving new mail"
 msgstr "½ÓÊÕÍêÐÂÓʼþºóÖ±½Ó½øÈëÊÕ¼þ¼Ð"
 

-#: src/prefs_common.c:2188
+#: src/prefs_common.c:2178

 msgid "Execute immediately when moving or deleting messages"
 msgstr "Òƶ¯»òɾ³ýÓʼþʱÁ¢¼´Ö´ÐÐ"
 
 msgid "Execute immediately when moving or deleting messages"
 msgstr "Òƶ¯»òɾ³ýÓʼþʱÁ¢¼´Ö´ÐÐ"
 

-#: src/prefs_common.c:2190
+#: src/prefs_common.c:2180

 msgid "Messages will be marked until execution if this is turned off"
 msgstr "£¨Èô´ËÑ¡Ïî¹Ø±Õ£¬Ôò±ØÐë°´Ï¡¸Ö´ÐС¹²Å»áÖ´ÐÐÒƶ¯»òɾ³ý£©"
 
 msgid "Messages will be marked until execution if this is turned off"
 msgstr "£¨Èô´ËÑ¡Ïî¹Ø±Õ£¬Ôò±ØÐë°´Ï¡¸Ö´ÐС¹²Å»áÖ´ÐÐÒƶ¯»òɾ³ý£©"
 

-#: src/prefs_common.c:2203
+#: src/prefs_common.c:2193

 msgid "Show no-unread-message dialog"
 msgstr "ÏÔʾûÓÐδ¶ÁÓʼþ¶Ô»°¿ò"
 
 msgid "Show no-unread-message dialog"
 msgstr "ÏÔʾûÓÐδ¶ÁÓʼþ¶Ô»°¿ò"
 

-#: src/prefs_common.c:2213
+#: src/prefs_common.c:2203

 msgid "Assume 'Yes'"
 msgstr "ȱʡ»Ø´ð'ÊÇ'"
 
 msgid "Assume 'Yes'"
 msgstr "ȱʡ»Ø´ð'ÊÇ'"
 

-#: src/prefs_common.c:2215
+#: src/prefs_common.c:2205

 msgid "Assume 'No'"
 msgstr "ȱʡ»Ø´ð'·ñ'"
 
 msgid "Assume 'No'"
 msgstr "ȱʡ»Ø´ð'·ñ'"
 

-#: src/prefs_common.c:2224
+#: src/prefs_common.c:2214

 msgid " Set key bindings... "
 msgstr " ÉèÖüü°ó¶¨... "
 
 msgid " Set key bindings... "
 msgstr " ÉèÖüü°ó¶¨... "
 

-#: src/prefs_common.c:2230
-msgid "Icon theme"
-msgstr "ͼ±êÖ÷Ìâ"
-
-#: src/prefs_common.c:2314
-#, c-format
-msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "ÍⲿÃüÁî (%s ½«±»Ì滻ΪÏàÓ¦µÄÎļþÃû»òÕßURI)"
-
-#: src/prefs_common.c:2323
-msgid "Web browser"
-msgstr "ÍøÒ³ä¯ÀÀÆ÷"
-
-#: src/prefs_common.c:2359 src/toolbar.c:429
-msgid "Editor"
-msgstr "±à¼­Æ÷"
-
-#: src/prefs_common.c:2389
+#: src/prefs_common.c:2280

 msgid "Add address to destination when double-clicked"
 msgstr "Ë«»÷ʱ½«µØÖ·Ìí¼ÓΪÊÕ¼þÈË"
 
 msgid "Add address to destination when double-clicked"
 msgstr "Ë«»÷ʱ½«µØÖ·Ìí¼ÓΪÊÕ¼þÈË"
 

-#: src/prefs_common.c:2392
+#: src/prefs_common.c:2283

 msgid "Log Size"
 msgstr "ÈÕÖ¾´óС"
 
 msgid "Log Size"
 msgstr "ÈÕÖ¾´óС"
 

-#: src/prefs_common.c:2399
+#: src/prefs_common.c:2290

 msgid "Clip the log size"
 msgstr "ÏÞÖÆÈÕÖ¾Îļþ´óС"
 
 msgid "Clip the log size"
 msgstr "ÏÞÖÆÈÕÖ¾Îļþ´óС"
 

-#: src/prefs_common.c:2404
+#: src/prefs_common.c:2295

 msgid "Log window length"
 msgstr "ÈÕÖ¾´°¿Ú³¤¶È"
 
 msgid "Log window length"
 msgstr "ÈÕÖ¾´°¿Ú³¤¶È"
 

-#: src/prefs_common.c:2417
+#: src/prefs_common.c:2308

 msgid "0 to stop logging in the log window"
 msgstr "0 ±íʾ½ûÖ¹ÍùÈÕÖ¾´°¿ÚдÐÅÏ¢"
 
 msgid "0 to stop logging in the log window"
 msgstr "0 ±íʾ½ûÖ¹ÍùÈÕÖ¾´°¿ÚдÐÅÏ¢"
 

-#: src/prefs_common.c:2426
+#: src/prefs_common.c:2317

 msgid "Security"
 msgstr "°²È«"
 
 msgid "Security"
 msgstr "°²È«"
 

-#: src/prefs_common.c:2433
+#: src/prefs_common.c:2324

 msgid "Ask before accepting SSL certificates"
 msgstr "½ÓÊÜSSLÈÏ֤ǰȷÈÏ"
 
 msgid "Ask before accepting SSL certificates"
 msgstr "½ÓÊÜSSLÈÏ֤ǰȷÈÏ"
 

-#: src/prefs_common.c:2441
+#: src/prefs_common.c:2332

 msgid "On exit"
 msgstr "À뿪ÉèÖÃ"
 
 msgid "On exit"
 msgstr "À뿪ÉèÖÃ"
 

-#: src/prefs_common.c:2449
+#: src/prefs_common.c:2340

 msgid "Confirm on exit"
 msgstr "À뿪ʱȷÈÏ"
 
 msgid "Confirm on exit"
 msgstr "À뿪ʱȷÈÏ"
 

-#: src/prefs_common.c:2456
+#: src/prefs_common.c:2347

 msgid "Empty trash on exit"
 msgstr "À뿪ʱÇå¿Õɾ³ýµÄÓʼþ"
 
 msgid "Empty trash on exit"
 msgstr "À뿪ʱÇå¿Õɾ³ýµÄÓʼþ"
 

-#: src/prefs_common.c:2458
+#: src/prefs_common.c:2349

 msgid "Ask before emptying"
 msgstr "Çå³ýʱȷÈÏ"
 
 msgid "Ask before emptying"
 msgstr "Çå³ýʱȷÈÏ"
 

-#: src/prefs_common.c:2462
+#: src/prefs_common.c:2353

 msgid "Warn if there are queued messages"
 msgstr "À뿪ʱÈôÓÐÉÐδËͳöÖ®Óʼþ¼´·¢³ö¾¯¸æ"
 
 msgid "Warn if there are queued messages"
 msgstr "À뿪ʱÈôÓÐÉÐδËͳöÖ®Óʼþ¼´·¢³ö¾¯¸æ"
 

-#: src/prefs_common.c:2468
+#: src/prefs_common.c:2359

 msgid "Socket I/O timeout:"
 msgstr "Socket I/O ³¬Ê±Ê±¼ä"
 
 msgid "Socket I/O timeout:"
 msgstr "Socket I/O ³¬Ê±Ê±¼ä"
 

-#: src/prefs_common.c:2481
+#: src/prefs_common.c:2372

 msgid "seconds"
 msgstr "Ãë"
 
 msgid "seconds"
 msgstr "Ãë"
 

-#: src/prefs_common.c:2665
+#: src/prefs_common.c:2549

 msgid "the full abbreviated weekday name"
 msgstr "(ÐÇÆÚ)£ºÒ»¡¢¶þ¡¢..."
 
 msgid "the full abbreviated weekday name"
 msgstr "(ÐÇÆÚ)£ºÒ»¡¢¶þ¡¢..."
 

-#: src/prefs_common.c:2666
+#: src/prefs_common.c:2550

 msgid "the full weekday name"
 msgstr "ÐÇÆÚÒ»¡¢ÐÇÆÚ¶þ¡¢..."
 
 msgid "the full weekday name"
 msgstr "ÐÇÆÚÒ»¡¢ÐÇÆÚ¶þ¡¢..."
 

-#: src/prefs_common.c:2667
+#: src/prefs_common.c:2551

 msgid "the abbreviated month name"
 msgstr "1Ô¡¢2Ô¡¢..."
 
 msgid "the abbreviated month name"
 msgstr "1Ô¡¢2Ô¡¢..."
 

-#: src/prefs_common.c:2668
+#: src/prefs_common.c:2552

 msgid "the full month name"
 msgstr "Ò»Ô¡¢¶þÔ¡¢..."
 
 msgid "the full month name"
 msgstr "Ò»Ô¡¢¶þÔ¡¢..."
 

-#: src/prefs_common.c:2669
+#: src/prefs_common.c:2553

 msgid "the preferred date and time for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚÓëʱ¼ä£¨±¾µØʱ¼ä£©"
 
 msgid "the preferred date and time for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚÓëʱ¼ä£¨±¾µØʱ¼ä£©"
 

-#: src/prefs_common.c:2670
+#: src/prefs_common.c:2554

 msgid "the century number (year/100)"
 msgstr "ÊÀ¼Í (Äê/100)"
 
 msgid "the century number (year/100)"
 msgstr "ÊÀ¼Í (Äê/100)"
 

-#: src/prefs_common.c:2671
+#: src/prefs_common.c:2555

 msgid "the day of the month as a decimal number"
 msgstr "½ñÌìÊǼ¸ºÅ (ÒÔÊý×Ö±íʾ)"
 
 msgid "the day of the month as a decimal number"
 msgstr "½ñÌìÊǼ¸ºÅ (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2672
+#: src/prefs_common.c:2556

 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ø¥ËÄʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 
 msgid "the hour as a decimal number using a 24-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ø¥ËÄʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2673
+#: src/prefs_common.c:2557

 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ê®¶þʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 
 msgid "the hour as a decimal number using a 12-hour clock"
 msgstr "ÏÖÔÚ¼¸µãÖÓ (Ê®¶þʱÖÆ£¬ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2674
+#: src/prefs_common.c:2558

 msgid "the day of the year as a decimal number"
 msgstr "½ñÌìÊǽñÄêµÄµÚ¼¸Ìì (ÒÔÊý×Ö±íʾ)"
 
 msgid "the day of the year as a decimal number"
 msgstr "½ñÌìÊǽñÄêµÄµÚ¼¸Ìì (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2675
+#: src/prefs_common.c:2559

 msgid "the month as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ô (ÒÔÊý×Ö±íʾ)"
 
 msgid "the month as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ô (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2676
+#: src/prefs_common.c:2560

 msgid "the minute as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸·Ö (ÒÔÊý×Ö±íʾ)"
 
 msgid "the minute as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸·Ö (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2677
+#: src/prefs_common.c:2561

 msgid "either AM or PM"
 msgstr "ÉÏÎç»òÏÂÎç"
 
 msgid "either AM or PM"
 msgstr "ÉÏÎç»òÏÂÎç"
 

-#: src/prefs_common.c:2678
+#: src/prefs_common.c:2562

 msgid "the second as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ãë (ÒÔÊý×Ö±íʾ)"
 
 msgid "the second as a decimal number"
 msgstr "ÏÖÔÚÊǼ¸Ãë (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2679
+#: src/prefs_common.c:2563

 msgid "the day of the week as a decimal number"
 msgstr "ÏÖÔÚÊÇÒ»Öܵĵڼ¸Ìì (ÒÔÊý×Ö±íʾ)"
 
 msgid "the day of the week as a decimal number"
 msgstr "ÏÖÔÚÊÇÒ»Öܵĵڼ¸Ìì (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2680
+#: src/prefs_common.c:2564

 msgid "the preferred date for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚ (±¾µØʱ¼ä)"
 
 msgid "the preferred date for the current locale"
 msgstr "ÍêÕûµÄÎ÷ÔªÈÕÆÚ (±¾µØʱ¼ä)"
 

-#: src/prefs_common.c:2681
+#: src/prefs_common.c:2565

 msgid "the last two digits of a year"
 msgstr "Î÷ÔªÄê·ÝµÄÄ©Á½Î»Êý×Ö"
 
 msgid "the last two digits of a year"
 msgstr "Î÷ÔªÄê·ÝµÄÄ©Á½Î»Êý×Ö"
 

-#: src/prefs_common.c:2682
+#: src/prefs_common.c:2566

 msgid "the year as a decimal number"
 msgstr "Î÷ÔªÄê·Ý (ÒÔÊý×Ö±íʾ)"
 
 msgid "the year as a decimal number"
 msgstr "Î÷ÔªÄê·Ý (ÒÔÊý×Ö±íʾ)"
 

-#: src/prefs_common.c:2683
+#: src/prefs_common.c:2567

 msgid "the time zone or name or abbreviation"
 msgstr "ʱÇø"
 
 msgid "the time zone or name or abbreviation"
 msgstr "ʱÇø"
 

-#: src/prefs_common.c:2704
+#: src/prefs_common.c:2588

 msgid "Specifier"
 msgstr "ÌØÊâ·ûºÅ"
 
 msgid "Specifier"
 msgstr "ÌØÊâ·ûºÅ"
 

-#: src/prefs_common.c:2744
+#: src/prefs_common.c:2628

 msgid "Example"
 msgstr "ʾÀý"
 
 msgid "Example"
 msgstr "ʾÀý"
 

-#: src/prefs_common.c:2833
+#: src/prefs_common.c:2717

 msgid "Set message colors"
 msgstr "ÉèÓʼþÑÕÉ«"
 
 msgid "Set message colors"
 msgstr "ÉèÓʼþÑÕÉ«"
 

-#: src/prefs_common.c:2841
+#: src/prefs_common.c:2725

 msgid "Colors"
 msgstr "ÑÕÉ«"
 
 msgid "Colors"
 msgstr "ÑÕÉ«"
 

-#: src/prefs_common.c:2888
+#: src/prefs_common.c:2772

 msgid "Quoted Text - First Level"
 msgstr "ÒýÎÄ - µÚÒ»²ã"
 
 msgid "Quoted Text - First Level"
 msgstr "ÒýÎÄ - µÚÒ»²ã"
 

-#: src/prefs_common.c:2894
+#: src/prefs_common.c:2778

 msgid "Quoted Text - Second Level"
 msgstr "ÒýÎÄ - µÚ¶þ²ã"
 
 msgid "Quoted Text - Second Level"
 msgstr "ÒýÎÄ - µÚ¶þ²ã"
 

-#: src/prefs_common.c:2900
+#: src/prefs_common.c:2784

 msgid "Quoted Text - Third Level"
 msgstr "ÒýÎÄ - µÚÈþ²ã"
 
 msgid "Quoted Text - Third Level"
 msgstr "ÒýÎÄ - µÚÈþ²ã"
 

-#: src/prefs_common.c:2906
+#: src/prefs_common.c:2790

 msgid "URI link"
 msgstr "URI Á¬½á"
 
 msgid "URI link"
 msgstr "URI Á¬½á"
 

-#: src/prefs_common.c:2912
+#: src/prefs_common.c:2796

 msgid "Target folder"
 msgstr "Ä¿µÄÎļþ¼Ð"
 
 msgid "Target folder"
 msgstr "Ä¿µÄÎļþ¼Ð"
 

-#: src/prefs_common.c:2918
+#: src/prefs_common.c:2802

 msgid "Signatures"
 msgstr "Ç©Ãû"
 
 msgid "Signatures"
 msgstr "Ç©Ãû"
 

-#: src/prefs_common.c:2925
+#: src/prefs_common.c:2809

 msgid "Recycle quote colors"
 msgstr "Ñ­»·ÒýÎÄÑÕÉ«"
 
 msgid "Recycle quote colors"
 msgstr "Ñ­»·ÒýÎÄÑÕÉ«"
 

-#: src/prefs_common.c:2992
+#: src/prefs_common.c:2876

 msgid "Pick color for quotation level 1"
 msgstr "Ñ¡level 1ÒýÎÄÑÕÉ«"
 
 msgid "Pick color for quotation level 1"
 msgstr "Ñ¡level 1ÒýÎÄÑÕÉ«"
 

-#: src/prefs_common.c:2995
+#: src/prefs_common.c:2879

 msgid "Pick color for quotation level 2"
 msgstr "Ñ¡level 2ÒýÎÄÑÕÉ«"
 
 msgid "Pick color for quotation level 2"
 msgstr "Ñ¡level 2ÒýÎÄÑÕÉ«"
 

-#: src/prefs_common.c:2998
+#: src/prefs_common.c:2882

 msgid "Pick color for quotation level 3"
 msgstr "Ñ¡level 3ÒýÎÄÑÕÉ«"
 
 msgid "Pick color for quotation level 3"
 msgstr "Ñ¡level 3ÒýÎÄÑÕÉ«"
 

-#: src/prefs_common.c:3001
+#: src/prefs_common.c:2885

 msgid "Pick color for URI"
 msgstr "Ñ¡URIÑÕÉ«"
 
 msgid "Pick color for URI"
 msgstr "Ñ¡URIÑÕÉ«"
 

-#: src/prefs_common.c:3004
+#: src/prefs_common.c:2888

 msgid "Pick color for target folder"
 msgstr "Ñ¡Óʼþ¼ÐÑÕÉ«"
 
 msgid "Pick color for target folder"
 msgstr "Ñ¡Óʼþ¼ÐÑÕÉ«"
 

-#: src/prefs_common.c:3007
+#: src/prefs_common.c:2891

 msgid "Pick color for signatures"
 msgstr "Ñ¡Ç©ÃûÑÕÉ«"
 
 msgid "Pick color for signatures"
 msgstr "Ñ¡Ç©ÃûÑÕÉ«"
 

-#: src/prefs_common.c:3142
+#: src/prefs_common.c:3026

 msgid "Key bindings"
 msgstr "¼ü°ó¶¨"
 
 msgid "Key bindings"
 msgstr "¼ü°ó¶¨"
 

-#: src/prefs_common.c:3156
+#: src/prefs_common.c:3040

 msgid "Select preset:"
 msgstr "Ñ¡ÔñÔ¤ÉèÖµ"
 
 msgid "Select preset:"
 msgstr "Ñ¡ÔñÔ¤ÉèÖµ"
 

-#: src/prefs_common.c:3169 src/prefs_common.c:3454
+#: src/prefs_common.c:3053 src/prefs_common.c:3338

 msgid "Old Sylpheed"
 msgstr "ÀÏ Sylpheed"
 
 msgid "Old Sylpheed"
 msgstr "ÀÏ Sylpheed"
 

-#: src/prefs_common.c:3177
+#: src/prefs_common.c:3061

 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."
 msgid ""
 "You can also modify each menu shortcut by pressing\n"
 "any key(s) when placing the mouse pointer on the item."


@@ -6412,11 +6447,15 @@ msgstr "
 msgid "Header name is not set."
 msgstr "ΪÉ趨ÐÅÍ·Ãû³Æ¡£"
 
 msgid "Header name is not set."
 msgstr "ΪÉ趨ÐÅÍ·Ãû³Æ¡£"
 

-#: src/prefs_customheader.c:541
+#: src/prefs_customheader.c:487
+msgid "This Header name is not allowed as a custom header."
+msgstr "´ËÃû³Æ²»ÄÜ×÷Ϊ×Ô¶¨ÒåÐÅÍ·Ãû³Æ¡£"
+
+#: src/prefs_customheader.c:545

 msgid "Delete header"
 msgstr "ɾ³ýÐÅÍ·"
 
 msgid "Delete header"
 msgstr "ɾ³ýÐÅÍ·"
 

-#: src/prefs_customheader.c:542
+#: src/prefs_customheader.c:546

 msgid "Do you really want to delete this header?"
 msgstr "È·¶¨É¾³ýÐÅÍ·£¿"
 
 msgid "Do you really want to delete this header?"
 msgstr "È·¶¨É¾³ýÐÅÍ·£¿"
 


@@ -6444,6 +6483,35 @@ msgstr "
 msgid "This header is already in the list."
 msgstr "¸Ã×Ö¶ÎÒѾ­ÔÚÁбíÖдæÔÚ¡£"
 
 msgid "This header is already in the list."
 msgstr "¸Ã×Ö¶ÎÒѾ­ÔÚÁбíÖдæÔÚ¡£"
 

+#: src/prefs_ext_prog.c:102
+#, c-format
+msgid "%s will be replaced with file name / URI"
+msgstr "%s ½«±»Ì滻ΪÏàÓ¦µÄÎļþÃû»òÕßURI"
+
+#: src/prefs_ext_prog.c:118
+msgid "Web browser"
+msgstr "ÍøÒ³ä¯ÀÀÆ÷"
+
+#: src/prefs_ext_prog.c:147
+msgid "Print command"
+msgstr "´òÓ¡ÃüÁî"
+
+#: src/prefs_ext_prog.c:163
+msgid "Text editor"
+msgstr "Îı¾±à¼­Æ÷"
+
+#: src/prefs_ext_prog.c:190
+msgid "Image viewer"
+msgstr "ͼƬ²é¿´Æ÷"
+
+#: src/prefs_ext_prog.c:208
+msgid "Audio player"
+msgstr "ÒôƵ²¥·ÅÆ÷"
+
+#: src/prefs_ext_prog.c:265
+msgid "Message View/External Programs"
+msgstr "ÓʼþÔĶÁ/Íⲿ³ÌÐò"
+

 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Òƶ¯"
 #: src/prefs_filtering_action.c:133
 msgid "Move"
 msgstr "Òƶ¯"


@@ -6476,7 +6544,7 @@ msgstr "
 msgid "Mark as unread"
 msgstr "ÉèΪδ¶Á"
 
 msgid "Mark as unread"
 msgstr "ÉèΪδ¶Á"
 

-#: src/prefs_filtering_action.c:142 src/toolbar.c:380 src/toolbar.c:472
+#: src/prefs_filtering_action.c:142 src/toolbar.c:381 src/toolbar.c:473

 msgid "Forward"
 msgstr "ת·¢"
 
 msgid "Forward"
 msgstr "ת·¢"
 


@@ -6485,7 +6553,7 @@ msgid "Redirect"
 msgstr "ÖØÐÂÖ¸¶¨"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395
 msgstr "ÖØÐÂÖ¸¶¨"
 
 #: src/prefs_filtering_action.c:145 src/prefs_filtering_action.c:395

-#: src/toolbar.c:168 src/toolbar.c:383 src/toolbar.c:1705
+#: src/toolbar.c:168 src/toolbar.c:384 src/toolbar.c:1481

 msgid "Execute"
 msgstr "Ö´ÐÐ"
 
 msgid "Execute"
 msgstr "Ö´ÐÐ"
 


@@ -6494,9 +6562,8 @@ msgid "Color"
 msgstr "ÑÕÉ«"
 
 #: src/prefs_filtering_action.c:147
 msgstr "ÑÕÉ«"
 
 #: src/prefs_filtering_action.c:147

-#, fuzzy

 msgid "Change score"
 msgid "Change score"

-msgstr "Çл»×Öµä"
+msgstr "Ð޸Ļý·Ö"

 
 #: src/prefs_filtering_action.c:148
 msgid "Set score"
 
 #: src/prefs_filtering_action.c:148
 msgid "Set score"


@@ -6528,7 +6595,7 @@ msgid "Recipient"
 msgstr "»ØÖ´"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75
 msgstr "»ØÖ´"
 
 #: src/prefs_filtering_action.c:405 src/prefs_summary_column.c:75

-#: src/summaryview.c:479
+#: src/summaryview.c:480

 msgid "Score"
 msgstr "µÃ·Ö"
 
 msgid "Score"
 msgstr "µÃ·Ö"
 


@@ -6554,7 +6621,6 @@ msgid "Destination is not set."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 
 #: src/prefs_filtering_action.c:772
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 
 #: src/prefs_filtering_action.c:772

-#, fuzzy

 msgid "Recipient is not set."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 
 msgid "Recipient is not set."
 msgstr "ûÓÐÖ¸¶¨ÊÕ¼þÈË¡£"
 


@@ -6568,23 +6634,23 @@ msgstr "û
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47
 
 #: src/prefs_filtering_action.c:1113 src/prefs_matcher.c:142
 #: src/prefs_matcher.c:1711 src/prefs_summary_column.c:70 src/quote_fmt.c:47

-#: src/summaryview.c:474 src/summaryview.c:641
+#: src/summaryview.c:475 src/summaryview.c:642

 msgid "Subject"
 msgstr "Ö÷Ìâ"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42
 msgid "Subject"
 msgstr "Ö÷Ìâ"
 
 #: src/prefs_filtering_action.c:1114 src/prefs_matcher.c:143
 #: src/prefs_matcher.c:1712 src/prefs_summary_column.c:71 src/quote_fmt.c:42

-#: src/summaryview.c:475 src/summaryview.c:645
+#: src/summaryview.c:476 src/summaryview.c:646

 msgid "From"
 msgstr "·¢¼þÈË"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143
 msgid "From"
 msgstr "·¢¼þÈË"
 
 #: src/prefs_filtering_action.c:1115 src/prefs_matcher.c:143

-#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:649
+#: src/prefs_matcher.c:1713 src/quote_fmt.c:48 src/summaryview.c:650

 msgid "To"
 msgstr "ÊÕ¼þÈË"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715
 msgid "To"
 msgstr "ÊÕ¼þÈË"
 
 #: src/prefs_filtering_action.c:1117 src/prefs_matcher.c:1715

-#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:476
+#: src/prefs_summary_column.c:72 src/quote_fmt.c:41 src/summaryview.c:477

 msgid "Date"
 msgstr "ÈÕÆÚ"
 
 msgid "Date"
 msgstr "ÈÕÆÚ"
 


@@ -6643,35 +6709,35 @@ msgstr "
 msgid "Bottom"
 msgstr "Öõ×"
 
 msgid "Bottom"
 msgstr "Öõ×"
 

-#: src/prefs_filtering.c:718 src/prefs_filtering.c:793
+#: src/prefs_filtering.c:716 src/prefs_filtering.c:791

 msgid "Condition string is not valid."
 msgstr "ÎÞЧµÄÌõ¼þ×Ö·û´®¡£"
 
 msgid "Condition string is not valid."
 msgstr "ÎÞЧµÄÌõ¼þ×Ö·û´®¡£"
 

-#: src/prefs_filtering.c:752 src/prefs_filtering.c:800
+#: src/prefs_filtering.c:750 src/prefs_filtering.c:798

 msgid "Action string is not valid."
 msgstr "ÎÞЧµÄ¶¯×÷¡£"
 
 msgid "Action string is not valid."
 msgstr "ÎÞЧµÄ¶¯×÷¡£"
 

-#: src/prefs_filtering.c:780
+#: src/prefs_filtering.c:778

 msgid "Condition string is empty."
 msgstr "Ìõ¼þ×Ö·û´®Îª¿Õ¡£"
 
 msgid "Condition string is empty."
 msgstr "Ìõ¼þ×Ö·û´®Îª¿Õ¡£"
 

-#: src/prefs_filtering.c:786
+#: src/prefs_filtering.c:784

 msgid "Action string is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 
 msgid "Action string is empty."
 msgstr "Îļþ %s ²»´æÔÚ¡£"
 

-#: src/prefs_filtering.c:853
+#: src/prefs_filtering.c:851

 msgid "Delete rule"
 msgstr "ɾ³ý¹æÔò"
 
 msgid "Delete rule"
 msgstr "ɾ³ý¹æÔò"
 

-#: src/prefs_filtering.c:854
+#: src/prefs_filtering.c:852

 msgid "Do you really want to delete this rule?"
 msgstr "È·¶¨É¾³ýÕâÏî¹æÔò£¿"
 
 msgid "Do you really want to delete this rule?"
 msgstr "È·¶¨É¾³ýÕâÏî¹æÔò£¿"
 

-#: src/prefs_filtering.c:1001 src/prefs_matcher.c:1665
+#: src/prefs_filtering.c:999 src/prefs_matcher.c:1665

 msgid "Entry not saved"
 msgstr "ÏîĿδ±£´æ"
 
 msgid "Entry not saved"
 msgstr "ÏîĿδ±£´æ"
 

-#: src/prefs_filtering.c:1002
+#: src/prefs_filtering.c:1000

 msgid "The entry was not saved. Close anyway?"
 msgstr "¸ÃÏîδ±£´æ£¬ÕæµÄÍ˳ö£¿"
 
 msgid "The entry was not saved. Close anyway?"
 msgstr "¸ÃÏîδ±£´æ£¬ÕæµÄÍ˳ö£¿"
 


@@ -6731,31 +6797,27 @@ msgstr "һ
 msgid "Settings for folder"
 msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 
 msgid "Settings for folder"
 msgstr "ÉèÖÃÓʼþ¼Ð×ÊÁÏ..."
 

-#: src/prefs_fonts.c:77
+#: src/prefs_fonts.c:73

 msgid "Font selection"
 msgstr "Ñ¡Ôñ×ÖÌå"
 
 msgid "Font selection"
 msgstr "Ñ¡Ôñ×ÖÌå"
 

-#: src/prefs_fonts.c:160
-msgid "Text"
-msgstr "Îı¾"
+#: src/prefs_fonts.c:154
+msgid "Folder View"
+msgstr "Óʼþ¼Ð´°¿Ú"

 
 

-#: src/prefs_fonts.c:183
-msgid "Small"
-msgstr "С×ÖÌå"
+#: src/prefs_fonts.c:198
+msgid "Message View"
+msgstr "Óʼþ´°¿Ú"

 
 

-#: src/prefs_fonts.c:205
-msgid "Normal"
-msgstr "Ò»°ã"
-
-#: src/prefs_fonts.c:227
+#: src/prefs_fonts.c:220

 msgid "Bold"
 msgstr "´ÖÌå"
 
 msgid "Bold"
 msgstr "´ÖÌå"
 

-#: src/prefs_fonts.c:255
+#: src/prefs_fonts.c:248

 msgid "You will need to restart for the changes to take effect"
 msgstr "×ÖÌåÉèÖÃÐèÒªÖØÐÂÆô¶¯³ÌÐò²ÅÄÜÉúЧ"
 
 msgid "You will need to restart for the changes to take effect"
 msgstr "×ÖÌåÉèÖÃÐèÒªÖØÐÂÆô¶¯³ÌÐò²ÅÄÜÉúЧ"
 

-#: src/prefs_fonts.c:298
+#: src/prefs_fonts.c:291

 msgid "Display/Fonts"
 msgstr "ÏÔʾ/×ÖÌå"
 
 msgid "Display/Fonts"
 msgstr "ÏÔʾ/×ÖÌå"
 


@@ -6936,9 +6998,8 @@ msgid "The following symbols can be used:"
 msgstr "¿ÉÒÔʹÓÃÏÂÊö·ûºÅ:"
 
 #: src/prefs_matcher.c:1729
 msgstr "¿ÉÒÔʹÓÃÏÂÊö·ûºÅ:"
 
 #: src/prefs_matcher.c:1729

-#, fuzzy

 msgid "Match Type: 'Test'"
 msgid "Match Type: 'Test'"

-msgstr "Æ¥ÅäÀàÐÍ"
+msgstr "Æ¥ÅäÀàÐÍ: 'Test'"

 
 #: src/prefs_spelling.c:95
 msgid "Select dictionaries location"
 
 #: src/prefs_spelling.c:95
 msgid "Select dictionaries location"


@@ -7052,6 +7113,164 @@ msgstr "ɾ
 msgid "Do you really want to delete this template?"
 msgstr "È·¶¨É¾³ýÕâ¸öÄ£°åÂð£¿"
 
 msgid "Do you really want to delete this template?"
 msgstr "È·¶¨É¾³ýÕâ¸öÄ£°åÂð£¿"
 

+#: src/prefs_themes.c:312 src/prefs_themes.c:642
+msgid "Default internal theme"
+msgstr "ȱʡÄÚÖÃÖ÷Ìâ"
+
+#: src/prefs_themes.c:337
+msgid "Display/Themes"
+msgstr "ÏÔʾ/Ö÷Ìâ"
+
+#: src/prefs_themes.c:410
+msgid "Only root can remove system themes"
+msgstr "Ö»ÓÐrootÓû§²ÅÄÜɾ³ýϵͳÖ÷Ìâ"
+
+#: src/prefs_themes.c:413
+#, c-format
+msgid "Remove system theme '%s'"
+msgstr "ɾ³ýϵͳÖ÷Ìâ '%s' "
+
+#: src/prefs_themes.c:417
+#, c-format
+msgid "Remove theme '%s'"
+msgstr "ɾ³ýÖ÷Ìâ '%s'"
+
+#: src/prefs_themes.c:421
+msgid "Are you sure you want to remove this theme?"
+msgstr "È·¶¨ÒªÉ¾³ýÕâ¸öÖ÷ÌâÂð£¿"
+
+#: src/prefs_themes.c:430
+#, c-format
+msgid ""
+"File %s failed\n"
+"while removing theme."
+msgstr "ɾ³ýÖ÷Ìâʱ\n"
+"Îļþ %s ·¢Éú´íÎó¡£"
+
+#: src/prefs_themes.c:434
+msgid "Removing theme directory failed."
+msgstr "ɾ³ýÖ÷ÌâĿ¼ʧ°Ü¡£"
+
+#: src/prefs_themes.c:437
+msgid "Theme removed succesfully"
+msgstr "Ö÷Ìâɾ³ý³É¹¦"
+
+#: src/prefs_themes.c:458
+msgid "Select theme folder"
+msgstr "Ñ¡ÔñÖ÷ÌâĿ¼"
+
+#: src/prefs_themes.c:468
+#, c-format
+msgid "Install theme '%s'"
+msgstr "°²×°Ö÷Ìâ '%s'"
+
+#: src/prefs_themes.c:471
+msgid ""
+"This folder doesn't seem to be a theme folder.\n"
+"Install anyway?"
+msgstr ""
+"¸ÃĿ¼Ëƺõ²¢²»ÊÇ°üº¬Ö÷Ìâ²¼¾°¡£\n"
+"¼ÌÐø°²×°Âð?"
+
+#: src/prefs_themes.c:478
+msgid "Do you want to install theme for system's all users?"
+msgstr "ÊÇ·ñ°²×°µ½ÏµÍ³Ä¿Â¼ÒÔ¹©ËùÓÐÓû§Ê¹ÓÃ?"
+
+#: src/prefs_themes.c:499
+msgid ""
+"A theme with the same name is\n"
+"already installed in this location"
+msgstr ""
+"¸ÃλÖÃÒѾ­°²×°ÓÐÒ»¸öͬÃûÖ÷Ìâ¡£\n"
+" "
+
+#: src/prefs_themes.c:503
+msgid "Couldn't create destination directory"
+msgstr ""
+"ÎÞ·¨´´½¨Ä¿µÄĿ¼"
+
+#: src/prefs_themes.c:510
+msgid "Theme installed succesfully"
+msgstr "Ö÷Ìâ°²×°³É¹¦"
+
+#: src/prefs_themes.c:522
+#, c-format
+msgid ""
+"File %s failed\n"
+"while installing theme."
+msgstr ""
+
+#: src/prefs_themes.c:605
+#, c-format
+msgid "%d themes available (%d user, %d system, 1 internal)"
+msgstr "¹²ÓÐ%d¸öÖ÷Ìâ¿ÉÓà (Óû§Ä¿Â¼%d¸ö£¬ÏµÍ³Ä¿Â¼%d¸ö£¬ÄÚÖÃ1¸ö)"
+
+#: src/prefs_themes.c:643
+msgid "The Sylpheed Claws Team"
+msgstr "Sylpheed Claws¿ª·¢×é"
+
+#: src/prefs_themes.c:645
+#, c-format
+msgid "Internal theme has %d icons"
+msgstr "ÄÚÖÃÖ÷Ìâ°üº¬ÓÐ %d ¸öͼ±ê"
+
+#: src/prefs_themes.c:651
+msgid "No info file available for this theme"
+msgstr "¸ÃÖ÷ÌâûÓÐ˵Ã÷Îļþ"
+
+#: src/prefs_themes.c:669
+msgid "Error: can't get theme status"
+msgstr "´íÎó£º ÎÞ·¨È¡µÃÖ÷Ìâ״̬"
+
+#: src/prefs_themes.c:693
+#, c-format
+msgid "%d files (%d icons), size is %s"
+msgstr "%d ¸öÎļþ(%d ¸öͼ±ê), ´óС%s"
+
+#: src/prefs_themes.c:784
+msgid "Selector"
+msgstr "Ñ¡ÔñÆ÷"
+
+#: src/prefs_themes.c:806
+msgid "Install new..."
+msgstr "°²×°ÐÂÖ÷Ìâ"
+
+#: src/prefs_themes.c:811
+msgid "Get more..."
+msgstr "ÏÂÔظü¶à..."
+
+#: src/prefs_themes.c:843
+msgid "Information"
+msgstr "ÐÅÏ¢"
+
+#: src/prefs_themes.c:859
+msgid "Author: "
+msgstr "×÷Õß: "
+
+#: src/prefs_themes.c:867
+msgid "URL:"
+msgstr "URL:"
+
+#: src/prefs_themes.c:895
+msgid "Status:"
+msgstr "״̬"
+
+#: src/prefs_themes.c:909
+msgid "Preview"
+msgstr "Ô¤ÀÀ"
+
+#: src/prefs_themes.c:952
+msgid "Actions"
+msgstr "¶¯×÷"
+
+#: src/prefs_themes.c:964
+msgid "Use this"
+msgstr "²ÉÓôËÖ÷Ìâ"
+
+#: src/prefs_themes.c:969
+msgid "Remove"
+msgstr "ɾ³ý"
+

 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"
 #: src/prefs_toolbar.c:86
 msgid ""
 "Selected Action already set.\n"


@@ -7120,7 +7339,7 @@ msgstr "
 msgid "Customize Toolbars/Compose Window"
 msgstr "ÉèÖù¤¾ßÌõ/׫дÓʼþ´°¿Ú"
 
 msgid "Customize Toolbars/Compose Window"
 msgstr "ÉèÖù¤¾ßÌõ/׫дÓʼþ´°¿Ú"
 

-#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:131
+#: src/privacy.c:150 src/privacy.c:169 src/sgpgme.c:140

 msgid "No signature found"
 msgstr "δ·¢ÏÖÇ©Ãû"
 
 msgid "No signature found"
 msgstr "δ·¢ÏÖÇ©Ãû"
 


@@ -7128,11 +7347,11 @@ msgstr "δ
 msgid "No information available"
 msgstr "ûÓÐÐÅÏ¢"
 
 msgid "No information available"
 msgstr "ûÓÐÐÅÏ¢"
 

-#: src/procmsg.c:1126
+#: src/procmsg.c:1117

 msgid "Could not create temporary file for news sending."
 msgstr "·¢ËÍÐÂÎŹý³ÌÖÐÎÞ·¨´´½¨ÁÙʱÎļþ¡£"
 
 msgid "Could not create temporary file for news sending."
 msgstr "·¢ËÍÐÂÎŹý³ÌÖÐÎÞ·¨´´½¨ÁÙʱÎļþ¡£"
 

-#: src/procmsg.c:1137
+#: src/procmsg.c:1128

 msgid "Error when writing temporary file for news sending."
 msgstr "·¢ËÍÐÂÎŹý³ÌÖÐдÍùÁÙʱÎļþʱ³ö´í¡£"
 
 msgid "Error when writing temporary file for news sending."
 msgstr "·¢ËÍÐÂÎŹý³ÌÖÐдÍùÁÙʱÎļþʱ³ö´í¡£"
 


@@ -7337,93 +7556,93 @@ msgstr ""
 "Ö±½ÓʹÓá£\n"
 "Èç¹ûÄú²»È·¶¨ÓÐûÓУ¬ÇëÖ±½Ó°´Ï¡¸È·¶¨¡¹¡£"
 
 "Ö±½ÓʹÓá£\n"
 "Èç¹ûÄú²»È·¶¨ÓÐûÓУ¬ÇëÖ±½Ó°´Ï¡¸È·¶¨¡¹¡£"
 

-#: src/sgpgme.c:88
+#: src/sgpgme.c:97

 msgid "Undefined"
 msgstr ""
 
 msgid "Undefined"
 msgstr ""
 

-#: src/sgpgme.c:92
+#: src/sgpgme.c:101

 msgid "Marginal"
 msgstr ""
 
 msgid "Marginal"
 msgstr ""
 

-#: src/sgpgme.c:96
+#: src/sgpgme.c:105

 #, fuzzy
 msgid "Ultimate"
 msgstr "δÃüÃû"
 
 #, fuzzy
 msgid "Ultimate"
 msgstr "δÃüÃû"
 

-#: src/sgpgme.c:116
+#: src/sgpgme.c:125

 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "%sµÄÇ©ÃûÓÐЧ (ÐÅÈÎ: %s)"
 
 #, c-format
 msgid "Valid signature by %s (Trust: %s)"
 msgstr "%sµÄÇ©ÃûÓÐЧ (ÐÅÈÎ: %s)"
 

-#: src/sgpgme.c:121
+#: src/sgpgme.c:130

 msgid "The signature has expired"
 msgstr "Ç©ÃûÒѹýÆÚ"
 
 msgid "The signature has expired"
 msgstr "Ç©ÃûÒѹýÆÚ"
 

-#: src/sgpgme.c:123
+#: src/sgpgme.c:132

 msgid "The key that was used to sign this part has expired"
 msgstr "Õⲿ·ÖÇ©ÃûËù²ÉÓõĹ«Ô¿ÒѾ­¹ýÆÚ"
 
 msgid "The key that was used to sign this part has expired"
 msgstr "Õⲿ·ÖÇ©ÃûËù²ÉÓõĹ«Ô¿ÒѾ­¹ýÆÚ"
 

-#: src/sgpgme.c:125
+#: src/sgpgme.c:134

 msgid "Not all signatures are valid"
 msgstr "²¢·ÇËùÓÐÇ©Ãû¾ùÓÐЧ"
 
 msgid "Not all signatures are valid"
 msgstr "²¢·ÇËùÓÐÇ©Ãû¾ùÓÐЧ"
 

-#: src/sgpgme.c:127
+#: src/sgpgme.c:136

 msgid "This signature is invalid"
 msgstr "¸ÃÇ©ÃûÎÞЧ"
 
 msgid "This signature is invalid"
 msgstr "¸ÃÇ©ÃûÎÞЧ"
 

-#: src/sgpgme.c:129
+#: src/sgpgme.c:138

 msgid "You have no key to verify this signature"
 msgstr "ûÓй«¹²Ô¿³×¹©¼ì²éÇ©Ãû"
 
 msgid "You have no key to verify this signature"
 msgstr "ûÓй«¹²Ô¿³×¹©¼ì²éÇ©Ãû"
 

-#: src/sgpgme.c:133
+#: src/sgpgme.c:142

 msgid "An error occured"
 msgstr "·¢ÉúÁË´íÎó"
 
 msgid "An error occured"
 msgstr "·¢ÉúÁË´íÎó"
 

-#: src/sgpgme.c:135
+#: src/sgpgme.c:144

 msgid "The signature has not been checked"
 msgstr "¸ÃÇ©ÃûÉÐδ±»¼ì²é"
 
 msgid "The signature has not been checked"
 msgstr "¸ÃÇ©ÃûÉÐδ±»¼ì²é"
 

-#: src/sgpgme.c:159
+#: src/sgpgme.c:168

 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr ""
 

-#: src/sgpgme.c:168
+#: src/sgpgme.c:177

 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·\n"
 
 #, c-format
 msgid "Good signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·\n"
 

-#: src/sgpgme.c:173
+#: src/sgpgme.c:182

 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©ÃûÒѹýÆÚ\n"
 
 #, c-format
 msgid "Expired signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©ÃûÒѹýÆÚ\n"
 

-#: src/sgpgme.c:178
+#: src/sgpgme.c:187

 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©Ãû¼ì²é´íÎó\n"
 
 #, c-format
 msgid "BAD signature from \"%s\"\n"
 msgstr "À´×Ô \"%s\" µÄÇ©Ãû¼ì²é´íÎó\n"
 

-#: src/sgpgme.c:189
+#: src/sgpgme.c:198

 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               ÓÖ³ÆΪ \"%s\"\n"
 
 #, c-format
 msgid "                aka \"%s\"\n"
 msgstr "               ÓÖ³ÆΪ \"%s\"\n"
 

-#: src/sgpgme.c:194
+#: src/sgpgme.c:203

 #, fuzzy, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Ô¿³×µÄ fingerprint: %s\n"
 
 #, fuzzy, c-format
 msgid "Primary key fingerprint: %s\n"
 msgstr "Ô¿³×µÄ fingerprint: %s\n"
 

-#: src/sgpgme.c:205
+#: src/sgpgme.c:214

 #, c-format
 msgid "Signature expires %s\n"
 msgstr "¹ýÆÚÇ©Ãû %s\n"
 
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "¹ýÆÚÇ©Ãû %s\n"
 

-#: src/sgpgme.c:207
+#: src/sgpgme.c:216

 #, c-format
 msgid "Signature expired %s\n"
 msgstr "¹ýÆÚÇ©Ãû %s\n"
 
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "¹ýÆÚÇ©Ãû %s\n"
 

-#: src/sgpgme.c:280
+#: src/sgpgme.c:289

 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."
 msgid ""
 "GnuPG is not installed properly, or needs to be upgraded.\n"
 "OpenPGP support disabled."


@@ -7456,10 +7675,6 @@ msgstr "ɾ
 msgid "Do you really want to delete this certificate?"
 msgstr "È·¶¨É¾³ýÕâÏîÈÏÖ¤£¿"
 
 msgid "Do you really want to delete this certificate?"
 msgstr "È·¶¨É¾³ýÕâÏîÈÏÖ¤£¿"
 

-#: src/string_match.c:73
-msgid "(Subject cleared by RegExp)"
-msgstr "£¨Ö÷Ìâ±»RegExpÇå³ýÁË£©"
-

 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Ñ°ÕÒÓʼþ"
 #: src/summary_search.c:101
 msgid "Search messages"
 msgstr "Ñ°ÕÒÓʼþ"


@@ -7484,538 +7699,537 @@ msgstr "
 msgid "End of list reached; continue from beginning?"
 msgstr "ËÑÑ°Òѵ½½áβ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "End of list reached; continue from beginning?"
 msgstr "ËÑÑ°Òѵ½½áβ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:403
+#: src/summaryview.c:404

 msgid "/_Reply"
 msgstr "/»Ø¸´(_R)"
 
 msgid "/_Reply"
 msgstr "/»Ø¸´(_R)"
 

-#: src/summaryview.c:404
+#: src/summaryview.c:405

 msgid "/Repl_y to"
 msgstr "/»Ø¸´¸ø(_y)"
 
 msgid "/Repl_y to"
 msgstr "/»Ø¸´¸ø(_y)"
 

-#: src/summaryview.c:405
+#: src/summaryview.c:406

 msgid "/Repl_y to/_all"
 msgstr "/»Ø¸´¸ø(_y)/ËùÓÐÊÕ¼þÈË(_a)"
 
 msgid "/Repl_y to/_all"
 msgstr "/»Ø¸´¸ø(_y)/ËùÓÐÊÕ¼þÈË(_a)"
 

-#: src/summaryview.c:406
+#: src/summaryview.c:407

 msgid "/Repl_y to/_sender"
 msgstr "/»Ø¸´¸ø(_y)/Ô­×÷Õß(_s)"
 
 msgid "/Repl_y to/_sender"
 msgstr "/»Ø¸´¸ø(_y)/Ô­×÷Õß(_s)"
 

-#: src/summaryview.c:407
+#: src/summaryview.c:408

 msgid "/Repl_y to/mailing _list"
 msgstr "/»Ø¸´¸ø(_y)/ÓʼþÁбí (_l)"
 
 msgid "/Repl_y to/mailing _list"
 msgstr "/»Ø¸´¸ø(_y)/ÓʼþÁбí (_l)"
 

-#: src/summaryview.c:409
+#: src/summaryview.c:410

 msgid "/Follow-up and reply to"
 msgstr "/»ØÓ¦ÎÄÕÂ"
 
 msgid "/Follow-up and reply to"
 msgstr "/»ØÓ¦ÎÄÕÂ"
 

-#: src/summaryview.c:411
+#: src/summaryview.c:412 src/toolbar.c:225

 msgid "/_Forward"
 msgstr "ת·¢(_F)"
 
 msgid "/_Forward"
 msgstr "ת·¢(_F)"
 

-#: src/summaryview.c:412
+#: src/summaryview.c:413

 msgid "/Redirect"
 msgstr "/Öض¨Ïò"
 
 msgid "/Redirect"
 msgstr "/Öض¨Ïò"
 

-#: src/summaryview.c:414
+#: src/summaryview.c:415

 msgid "/Re-_edit"
 msgstr "/ÖØб༭(_e)"
 
 msgid "/Re-_edit"
 msgstr "/ÖØб༭(_e)"
 

-#: src/summaryview.c:416
+#: src/summaryview.c:417

 msgid "/M_ove..."
 msgstr "/Òƶ¯(_o)..."
 
 msgid "/M_ove..."
 msgstr "/Òƶ¯(_o)..."
 

-#: src/summaryview.c:417
+#: src/summaryview.c:418

 msgid "/_Copy..."
 msgstr "/¸´ÖÆ(_C)..."
 
 msgid "/_Copy..."
 msgstr "/¸´ÖÆ(_C)..."
 

-#: src/summaryview.c:419
+#: src/summaryview.c:420

 msgid "/Cancel a news message"
 msgstr "/È¡ÏûÐÂÎÅ×éÓʼþ"
 
 msgid "/Cancel a news message"
 msgstr "/È¡ÏûÐÂÎÅ×éÓʼþ"
 

-#: src/summaryview.c:420
+#: src/summaryview.c:421

 msgid "/E_xecute"
 msgstr "Ö´ÐÐ(_x)"
 
 msgid "/E_xecute"
 msgstr "Ö´ÐÐ(_x)"
 

-#: src/summaryview.c:422
+#: src/summaryview.c:423

 msgid "/_Mark"
 msgstr "/񈬀(_M)"
 
 msgid "/_Mark"
 msgstr "/񈬀(_M)"
 

-#: src/summaryview.c:423
+#: src/summaryview.c:424

 msgid "/_Mark/_Mark"
 msgstr "/񈬀(_M)/񈬀(_M)"
 
 msgid "/_Mark/_Mark"
 msgstr "/񈬀(_M)/񈬀(_M)"
 

-#: src/summaryview.c:424
+#: src/summaryview.c:425

 msgid "/_Mark/_Unmark"
 msgstr "/±ê¼Ç(_M)/È¥³ý±ê¼Ç(_U)"
 
 msgid "/_Mark/_Unmark"
 msgstr "/±ê¼Ç(_M)/È¥³ý±ê¼Ç(_U)"
 

-#: src/summaryview.c:425
+#: src/summaryview.c:426

 msgid "/_Mark/---"
 msgstr "/񈬀(_M)/---"
 
 msgid "/_Mark/---"
 msgstr "/񈬀(_M)/---"
 

-#: src/summaryview.c:426
+#: src/summaryview.c:427

 msgid "/_Mark/Mark as unr_ead"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪδ¶Á(_e)"
 

-#: src/summaryview.c:427
+#: src/summaryview.c:428

 msgid "/_Mark/Mark as rea_d"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 
 msgid "/_Mark/Mark as rea_d"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇΪÒѶÁ(_d)"
 

-#: src/summaryview.c:428
+#: src/summaryview.c:429

 msgid "/_Mark/Mark all read"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇÈ«²¿ÎªÒѶÁ"
 
 msgid "/_Mark/Mark all read"
 msgstr "/±ê¼Ç(_M)/±ê¼ÇÈ«²¿ÎªÒѶÁ"
 

-#: src/summaryview.c:429
+#: src/summaryview.c:430

 msgid "/_Mark/Ignore thread"
 msgstr "/±ê¼Ç(_M)/ºöÂÔÓʼþÏßË÷"
 
 msgid "/_Mark/Ignore thread"
 msgstr "/±ê¼Ç(_M)/ºöÂÔÓʼþÏßË÷"
 

-#: src/summaryview.c:430
+#: src/summaryview.c:431

 msgid "/_Mark/Unignore thread"
 msgstr "/±ê¼Ç(_M)/²»ºöÂÔÓʼþÏßË÷"
 
 msgid "/_Mark/Unignore thread"
 msgstr "/±ê¼Ç(_M)/²»ºöÂÔÓʼþÏßË÷"
 

-#: src/summaryview.c:431
+#: src/summaryview.c:432

 msgid "/_Mark/Lock"
 msgstr "/±ê¼Ç(_M)/Ëøס"
 
 msgid "/_Mark/Lock"
 msgstr "/±ê¼Ç(_M)/Ëøס"
 

-#: src/summaryview.c:432
+#: src/summaryview.c:433

 msgid "/_Mark/Unlock"
 msgstr "/±ê¼Ç(_M)/½âËø"
 
 msgid "/_Mark/Unlock"
 msgstr "/±ê¼Ç(_M)/½âËø"
 

-#: src/summaryview.c:433
+#: src/summaryview.c:434

 msgid "/Color la_bel"
 msgstr "/²ÊÉ«±ê¼Ç(_b)"
 
 msgid "/Color la_bel"
 msgstr "/²ÊÉ«±ê¼Ç(_b)"
 

-#: src/summaryview.c:436
+#: src/summaryview.c:437

 msgid "/Add sender to address boo_k"
 msgstr "½«¼ÄÐÅÈ˼ÓÈëͨѶ¼ÖÐ(_k)"
 
 msgid "/Add sender to address boo_k"
 msgstr "½«¼ÄÐÅÈ˼ÓÈëͨѶ¼ÖÐ(_k)"
 

-#: src/summaryview.c:438
+#: src/summaryview.c:439

 msgid "/Create f_ilter rule"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)"
 
 msgid "/Create f_ilter rule"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)"
 

-#: src/summaryview.c:439
+#: src/summaryview.c:440

 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/×Ô¶¯²úÉú"
 
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/×Ô¶¯²úÉú"
 

-#: src/summaryview.c:441
+#: src/summaryview.c:442

 msgid "/Create f_ilter rule/by _From"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´À´Ô´(_F)"
 
 msgid "/Create f_ilter rule/by _From"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´À´Ô´(_F)"
 

-#: src/summaryview.c:443
+#: src/summaryview.c:444

 msgid "/Create f_ilter rule/by _To"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´ÊÕÐÅÈË(_T)"
 
 msgid "/Create f_ilter rule/by _To"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´ÊÕÐÅÈË(_T)"
 

-#: src/summaryview.c:445
+#: src/summaryview.c:446

 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´±êÌâ(_S)"
 
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/´´½¨Óʼþ¹ýÂ˹æÔò(_i)/°´±êÌâ(_S)"
 

-#: src/summaryview.c:447
+#: src/summaryview.c:448

 msgid "/Create processing rule"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò"
 
 msgid "/Create processing rule"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò"
 

-#: src/summaryview.c:448
-#, fuzzy
+#: src/summaryview.c:449

 msgid "/Create processing rule/_Automatically"
 msgid "/Create processing rule/_Automatically"

-msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/×Ô¶¯²úÉú"
+msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/×Ô¶¯²úÉú(_A)"

 
 

-#: src/summaryview.c:450
+#: src/summaryview.c:451

 msgid "/Create processing rule/by _From"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´À´Ô´(_F)"
 
 msgid "/Create processing rule/by _From"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´À´Ô´(_F)"
 

-#: src/summaryview.c:452
+#: src/summaryview.c:453

 msgid "/Create processing rule/by _To"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´ÊÕÐÅÈË(_T)"
 
 msgid "/Create processing rule/by _To"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´ÊÕÐÅÈË(_T)"
 

-#: src/summaryview.c:454
+#: src/summaryview.c:455

 msgid "/Create processing rule/by _Subject"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´±êÌâ(_S)"
 
 msgid "/Create processing rule/by _Subject"
 msgstr "/´´½¨´¦Àí¹æÔò¹æÔò/°´±êÌâ(_S)"
 

-#: src/summaryview.c:460
+#: src/summaryview.c:461

 msgid "/_View/_Source"
 msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_S)"
 
 msgid "/_View/_Source"
 msgstr "/²é¿´(_V)/ÓʼþÔ´Îļþ(_S)"
 

-#: src/summaryview.c:461
+#: src/summaryview.c:462

 msgid "/_View/All _header"
 msgstr "/²é¿´(_V)/ËùÓеÄÐÅÍ·(_h)"
 
 msgid "/_View/All _header"
 msgstr "/²é¿´(_V)/ËùÓеÄÐÅÍ·(_h)"
 

-#: src/summaryview.c:464
+#: src/summaryview.c:465

 msgid "/_Print..."
 msgstr "/´òÓ¡(_P)"
 
 msgid "/_Print..."
 msgstr "/´òÓ¡(_P)"
 

-#: src/summaryview.c:466
+#: src/summaryview.c:467

 msgid "/Select _all"
 msgstr "/Ñ¡È¡È«²¿(_a)"
 
 msgid "/Select _all"
 msgstr "/Ñ¡È¡È«²¿(_a)"
 

-#: src/summaryview.c:467
+#: src/summaryview.c:468

 msgid "/Select t_hread"
 msgstr "/Ñ¡È¡ÏßË÷(_t)"
 
 msgid "/Select t_hread"
 msgstr "/Ñ¡È¡ÏßË÷(_t)"
 

-#: src/summaryview.c:471
+#: src/summaryview.c:472

 msgid "M"
 msgstr "M"
 
 msgid "M"
 msgstr "M"
 

-#: src/summaryview.c:478
+#: src/summaryview.c:479

 msgid "No."
 msgstr "No."
 
 msgid "No."
 msgstr "No."
 

-#: src/summaryview.c:480
+#: src/summaryview.c:481

 msgid "L"
 msgstr "L"
 
 msgid "L"
 msgstr "L"
 

-#: src/summaryview.c:489
+#: src/summaryview.c:490

 msgid "all messages"
 msgstr "ËùÓÐÓʼþ"
 
 msgid "all messages"
 msgstr "ËùÓÐÓʼþ"
 

-#: src/summaryview.c:490
+#: src/summaryview.c:491

 msgid "messages whose age is greater than #"
 msgstr "±È#¾ÉµÄÓʼþ"
 
 msgid "messages whose age is greater than #"
 msgstr "±È#¾ÉµÄÓʼþ"
 

-#: src/summaryview.c:491
+#: src/summaryview.c:492

 msgid "messages whose age is less than #"
 msgstr "±È#еÄÓʼþ"
 
 msgid "messages whose age is less than #"
 msgstr "±È#еÄÓʼþ"
 

-#: src/summaryview.c:492
+#: src/summaryview.c:493

 msgid "messages which contain S in the message body"
 msgstr "ÔÚÎļþÖ÷ÌåÖаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in the message body"
 msgstr "ÔÚÎļþÖ÷ÌåÖаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:493
+#: src/summaryview.c:494

 msgid "messages which contain S in the whole message"
 msgstr "ÕûƪÎÄÕÂÖаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in the whole message"
 msgstr "ÕûƪÎÄÕÂÖаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:494
+#: src/summaryview.c:495

 msgid "messages carbon-copied to S"
 msgstr ""
 
 msgid "messages carbon-copied to S"
 msgstr ""
 

-#: src/summaryview.c:495
+#: src/summaryview.c:496

 msgid "message is either to: or cc: to S"
 msgstr "¼Ä¸ø»òÊǸ±±¾³­Ë͸øSµÄÓʼþ"
 
 msgid "message is either to: or cc: to S"
 msgstr "¼Ä¸ø»òÊǸ±±¾³­Ë͸øSµÄÓʼþ"
 

-#: src/summaryview.c:496
+#: src/summaryview.c:497

 msgid "deleted messages"
 msgstr "ÒÑɾ³ýµÄÓʼþ"
 
 msgid "deleted messages"
 msgstr "ÒÑɾ³ýµÄÓʼþ"
 

-#: src/summaryview.c:497
+#: src/summaryview.c:498

 msgid "messages which contain S in the Sender field"
 msgstr "ÔÚËÍÐÅÀ¸Öаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in the Sender field"
 msgstr "ÔÚËÍÐÅÀ¸Öаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:498
+#: src/summaryview.c:499

 msgid "true if execute \"S\" succeeds"
 msgstr "Èç¹ûÖ´ÐÐ \"S\"³É¹¦"
 
 msgid "true if execute \"S\" succeeds"
 msgstr "Èç¹ûÖ´ÐÐ \"S\"³É¹¦"
 

-#: src/summaryview.c:499
+#: src/summaryview.c:500

 msgid "messages originating from user S"
 msgstr "ÓÉSËù·¢³öµÄÓʼþ"
 
 msgid "messages originating from user S"
 msgstr "ÓÉSËù·¢³öµÄÓʼþ"
 

-#: src/summaryview.c:500
+#: src/summaryview.c:501

 msgid "forwarded messages"
 msgstr "ÒÑת·¢µÄÓʼþ"
 
 msgid "forwarded messages"
 msgstr "ÒÑת·¢µÄÓʼþ"
 

-#: src/summaryview.c:501
+#: src/summaryview.c:502

 msgid "messages which contain header S"
 msgstr "ÔÚÐÅÍ·Öаüº¬SµÄÓʼþ"
 
 msgid "messages which contain header S"
 msgstr "ÔÚÐÅÍ·Öаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:502
+#: src/summaryview.c:503

 msgid "messages which contain S in Message-Id header"
 msgstr "ÔÚÓʼþÐÅÍ·Öаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in Message-Id header"
 msgstr "ÔÚÓʼþÐÅÍ·Öаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:503
+#: src/summaryview.c:504

 msgid "messages which contain S in inreplyto header"
 msgstr "Ôڻظ´ÐÅÍ·Öаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in inreplyto header"
 msgstr "Ôڻظ´ÐÅÍ·Öаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:504
+#: src/summaryview.c:505

 msgid "locked messages"
 msgstr "ÒÑËø¶¨µÄÓʼþ"
 
 msgid "locked messages"
 msgstr "ÒÑËø¶¨µÄÓʼþ"
 

-#: src/summaryview.c:505
+#: src/summaryview.c:506

 msgid "messages which are in newsgroup S"
 msgstr "ÔÚÐÂÎÅȺ×éSÖеÄÓʼþ"
 
 msgid "messages which are in newsgroup S"
 msgstr "ÔÚÐÂÎÅȺ×éSÖеÄÓʼþ"
 

-#: src/summaryview.c:506
+#: src/summaryview.c:507

 msgid "new messages"
 msgstr "ÐÂÓʼþ"
 
 msgid "new messages"
 msgstr "ÐÂÓʼþ"
 

-#: src/summaryview.c:507
+#: src/summaryview.c:508

 msgid "old messages"
 msgstr "¾ÉÓʼþ"
 
 msgid "old messages"
 msgstr "¾ÉÓʼþ"
 

-#: src/summaryview.c:508
+#: src/summaryview.c:509

 msgid "messages which have been replied to"
 msgstr "Òѻظ´µÄÓʼþ"
 
 msgid "messages which have been replied to"
 msgstr "Òѻظ´µÄÓʼþ"
 

-#: src/summaryview.c:509
+#: src/summaryview.c:510

 msgid "read messages"
 msgstr "ÒѶÁÓʼþ"
 
 msgid "read messages"
 msgstr "ÒѶÁÓʼþ"
 

-#: src/summaryview.c:510
+#: src/summaryview.c:511

 msgid "messages which contain S in subject"
 msgstr "Ö÷ÌâÖаüº¬SµÄÓʼþ"
 
 msgid "messages which contain S in subject"
 msgstr "Ö÷ÌâÖаüº¬SµÄÓʼþ"
 

-#: src/summaryview.c:511
+#: src/summaryview.c:512

 msgid "messages whose score is equal to #"
 msgstr "µÃ·ÖÓë#Ò»Ñù¸ßµÄÓʼþ"
 
 msgid "messages whose score is equal to #"
 msgstr "µÃ·ÖÓë#Ò»Ñù¸ßµÄÓʼþ"
 

-#: src/summaryview.c:512
+#: src/summaryview.c:513

 msgid "messages whose score is greater than #"
 msgstr "µÃ·Ö½Ï#¸ßµÄÓʼþ"
 
 msgid "messages whose score is greater than #"
 msgstr "µÃ·Ö½Ï#¸ßµÄÓʼþ"
 

-#: src/summaryview.c:513
+#: src/summaryview.c:514

 msgid "messages whose score is lower than #"
 msgstr "µÃ·Ö½Ï#µÍµÄÓʼþ"
 
 msgid "messages whose score is lower than #"
 msgstr "µÃ·Ö½Ï#µÍµÄÓʼþ"
 

-#: src/summaryview.c:514
+#: src/summaryview.c:515

 msgid "messages whose size is equal to #"
 msgstr "ÎļþÓë#Ò»Ñù´óµÄÓʼþ"
 
 msgid "messages whose size is equal to #"
 msgstr "ÎļþÓë#Ò»Ñù´óµÄÓʼþ"
 

-#: src/summaryview.c:515
+#: src/summaryview.c:516

 msgid "messages whose size is greater than #"
 msgstr "Îļþ±È#´óµÄÓʼþ"
 
 msgid "messages whose size is greater than #"
 msgstr "Îļþ±È#´óµÄÓʼþ"
 

-#: src/summaryview.c:516
+#: src/summaryview.c:517

 msgid "messages whose size is smaller than #"
 msgstr "Îļþ±È#СµÄÓʼþ"
 
 msgid "messages whose size is smaller than #"
 msgstr "Îļþ±È#СµÄÓʼþ"
 

-#: src/summaryview.c:517
+#: src/summaryview.c:518

 msgid "messages which have been sent to S"
 msgstr "ÒѾ­Ë͸øSµÄÓʼþ"
 
 msgid "messages which have been sent to S"
 msgstr "ÒѾ­Ë͸øSµÄÓʼþ"
 

-#: src/summaryview.c:518
+#: src/summaryview.c:519

 msgid "marked messages"
 msgstr "Òѱê¼ÇµÄÓʼþ"
 
 msgid "marked messages"
 msgstr "Òѱê¼ÇµÄÓʼþ"
 

-#: src/summaryview.c:519
+#: src/summaryview.c:520

 msgid "unread messages"
 msgstr "δ¶ÁÓʼþ"
 
 msgid "unread messages"
 msgstr "δ¶ÁÓʼþ"
 

-#: src/summaryview.c:520
+#: src/summaryview.c:521

 msgid "messages which contain S in References header"
 msgstr "ÔÚReferencesÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 
 msgid "messages which contain S in References header"
 msgstr "ÔÚReferencesÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 

-#: src/summaryview.c:521
+#: src/summaryview.c:522

 msgid "messages returning 0 when passed to command"
 msgstr ""
 
 msgid "messages returning 0 when passed to command"
 msgstr ""
 

-#: src/summaryview.c:522
+#: src/summaryview.c:523

 msgid "messages which contain S in X-Label header"
 msgstr "ÔÚX-LabelÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 
 msgid "messages which contain S in X-Label header"
 msgstr "ÔÚX-LabelÐÅϢͷÀﺬÓÐSµÄÓʼþ"
 

-#: src/summaryview.c:524
+#: src/summaryview.c:525

 msgid "logical AND operator"
 msgstr "Âß¼­ÔËËãAND"
 
 msgid "logical AND operator"
 msgstr "Âß¼­ÔËËãAND"
 

-#: src/summaryview.c:525
+#: src/summaryview.c:526

 msgid "logical OR operator"
 msgstr "Âß¼­ÔËËãOR"
 
 msgid "logical OR operator"
 msgstr "Âß¼­ÔËËãOR"
 

-#: src/summaryview.c:526
+#: src/summaryview.c:527

 msgid "logical NOT operator"
 msgstr "Âß¼­ÔËËãNOT"
 
 msgid "logical NOT operator"
 msgstr "Âß¼­ÔËËãNOT"
 

-#: src/summaryview.c:527
+#: src/summaryview.c:528

 msgid "case sensitive search"
 msgstr "Çø·Ö´óСдµÄËÑÑ°"
 
 msgid "case sensitive search"
 msgstr "Çø·Ö´óСдµÄËÑÑ°"
 

-#: src/summaryview.c:534
+#: src/summaryview.c:535

 msgid "Extended Search symbols"
 msgstr "ÓÃÓÚÀ©Õ¹ËÑË÷µÄ·ûºÅ"
 
 msgid "Extended Search symbols"
 msgstr "ÓÃÓÚÀ©Õ¹ËÑË÷µÄ·ûºÅ"
 

-#: src/summaryview.c:584
+#: src/summaryview.c:585

 msgid "Toggle quick-search bar"
 msgstr "Çл»¿ìËÙËÑË÷Ìõ"
 
 msgid "Toggle quick-search bar"
 msgstr "Çл»¿ìËÙËÑË÷Ìõ"
 

-#: src/summaryview.c:668
+#: src/summaryview.c:669

 msgid "Extended Symbols"
 msgstr "À©Õ¹·ûºÅ"
 
 msgid "Extended Symbols"
 msgstr "À©Õ¹·ûºÅ"
 

-#: src/summaryview.c:933
+#: src/summaryview.c:936

 msgid "Process mark"
 msgstr "Óʼþ±ê¼Ç"
 
 msgid "Process mark"
 msgstr "Óʼþ±ê¼Ç"
 

-#: src/summaryview.c:934
+#: src/summaryview.c:937

 msgid "Some marks are left. Process it?"
 msgstr "ijЩÓʼþÒѱ»±ê¼Ç¡£Òª¼ÌÐøÂð£¿"
 
 msgid "Some marks are left. Process it?"
 msgstr "ijЩÓʼþÒѱ»±ê¼Ç¡£Òª¼ÌÐøÂð£¿"
 

-#: src/summaryview.c:977
+#: src/summaryview.c:980

 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "ɨÃèÓʼþ¼Ð(%s)..."
 
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "ɨÃèÓʼþ¼Ð(%s)..."
 

-#: src/summaryview.c:1400 src/summaryview.c:1444
+#: src/summaryview.c:1403 src/summaryview.c:1447

 msgid "No more unread messages"
 msgstr "ûÓÐÆäËûÐÂÓʼþ"
 
 msgid "No more unread messages"
 msgstr "ûÓÐÆäËûÐÂÓʼþ"
 

-#: src/summaryview.c:1401
+#: src/summaryview.c:1404

 msgid "No unread message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No unread message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1413 src/summaryview.c:1457
+#: src/summaryview.c:1416 src/summaryview.c:1460

 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 
 msgid ""
 "Internal error: unexpected value for prefs_common.next_unread_msg_dialog\n"
 msgstr ""
 

-#: src/summaryview.c:1421
+#: src/summaryview.c:1424

 msgid "No unread messages."
 msgstr "ûÓÐδ¶ÁÓʼþ¡£"
 
 msgid "No unread messages."
 msgstr "ûÓÐδ¶ÁÓʼþ¡£"
 

-#: src/summaryview.c:1445
+#: src/summaryview.c:1448

 msgid "No unread message found. Go to next folder?"
 msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 
 msgid "No unread message found. Go to next folder?"
 msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 

-#: src/summaryview.c:1487 src/summaryview.c:1511
+#: src/summaryview.c:1490 src/summaryview.c:1514

 msgid "No more new messages"
 msgstr "ûÓÐÆäËûÐÂÓʼþ"
 
 msgid "No more new messages"
 msgstr "ûÓÐÆäËûÐÂÓʼþ"
 

-#: src/summaryview.c:1488
+#: src/summaryview.c:1491

 msgid "No new message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No new message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½ÐÂÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1497
+#: src/summaryview.c:1500

 msgid "No new messages."
 msgstr "ûÓÐÐÂÓʼþ"
 
 msgid "No new messages."
 msgstr "ûÓÐÐÂÓʼþ"
 

-#: src/summaryview.c:1512
+#: src/summaryview.c:1515

 msgid "No new message found. Go to next folder?"
 msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 
 msgid "No new message found. Go to next folder?"
 msgstr "ûÓÐÐÂÓʼþ¡£Òªµ½ÏÂÒ»¸öÓʼþ¼ÐÂð£¿"
 

-#: src/summaryview.c:1514
+#: src/summaryview.c:1517

 msgid "Search again"
 msgstr "ÔÙ´ÎËÑÑ°"
 
 msgid "Search again"
 msgstr "ÔÙ´ÎËÑÑ°"
 

-#: src/summaryview.c:1543 src/summaryview.c:1568
+#: src/summaryview.c:1546 src/summaryview.c:1571

 msgid "No more marked messages"
 msgstr "ûÓÐÆäËûÒѱê¼ÇÓʼþ"
 
 msgid "No more marked messages"
 msgstr "ûÓÐÆäËûÒѱê¼ÇÓʼþ"
 

-#: src/summaryview.c:1544
+#: src/summaryview.c:1547

 msgid "No marked message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No marked message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1553 src/summaryview.c:1578
+#: src/summaryview.c:1556 src/summaryview.c:1581

 msgid "No marked messages."
 msgstr "ûÓÐÒѱê¼ÇÓʼþ"
 
 msgid "No marked messages."
 msgstr "ûÓÐÒѱê¼ÇÓʼþ"
 

-#: src/summaryview.c:1569
+#: src/summaryview.c:1572

 msgid "No marked message found. Search from the beginning?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No marked message found. Search from the beginning?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÓʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1593 src/summaryview.c:1618
+#: src/summaryview.c:1596 src/summaryview.c:1621

 msgid "No more labeled messages"
 msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 
 msgid "No more labeled messages"
 msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 

-#: src/summaryview.c:1594
+#: src/summaryview.c:1597

 msgid "No labeled message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No labeled message found. Search from the end?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Óβ²¿¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1603 src/summaryview.c:1628
+#: src/summaryview.c:1606 src/summaryview.c:1631

 msgid "No labeled messages."
 msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 
 msgid "No labeled messages."
 msgstr "ûÓÐÒѱê¼ÇÑÕÉ«Ö®Óʼþ"
 

-#: src/summaryview.c:1619
+#: src/summaryview.c:1622

 msgid "No labeled message found. Search from the beginning?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ûÓÐÕÒµ½Òѱê¼ÇÑÕÉ«Ö®Óʼþ¡£Òª´Ó¿ªÍ·¼ÌÐøËÑÑ°Âð£¿"
 

-#: src/summaryview.c:1832
+#: src/summaryview.c:1835

 msgid "Attracting messages by subject..."
 msgstr "ÕýÔÚ°´Ö÷ÌâÅÅÁÐÓʼþÓʼþ..."
 
 msgid "Attracting messages by subject..."
 msgstr "ÕýÔÚ°´Ö÷ÌâÅÅÁÐÓʼþÓʼþ..."
 

-#: src/summaryview.c:1979
+#: src/summaryview.c:1982

 #, c-format
 msgid "%d deleted"
 msgstr "%d ·âÒÑɾ³ý"
 
 #, c-format
 msgid "%d deleted"
 msgstr "%d ·âÒÑɾ³ý"
 

-#: src/summaryview.c:1983
+#: src/summaryview.c:1986

 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ·âÒÑÒƶ¯"
 
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d ·âÒÑÒƶ¯"
 

-#: src/summaryview.c:1984 src/summaryview.c:1991
+#: src/summaryview.c:1987 src/summaryview.c:1994

 msgid ", "
 msgstr "£¬"
 
 msgid ", "
 msgstr "£¬"
 

-#: src/summaryview.c:1989
+#: src/summaryview.c:1992

 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ÒѸ´ÖÆ"
 
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d ÒѸ´ÖÆ"
 

-#: src/summaryview.c:2004
+#: src/summaryview.c:2007

 msgid " item selected"
 msgstr "·âÒÑÑ¡Ôñ"
 
 msgid " item selected"
 msgstr "·âÒÑÑ¡Ôñ"
 

-#: src/summaryview.c:2006
+#: src/summaryview.c:2009

 msgid " items selected"
 msgstr "·âÒÑÑ¡Ôñ"
 
 msgid " items selected"
 msgstr "·âÒÑÑ¡Ôñ"
 

-#: src/summaryview.c:2022
+#: src/summaryview.c:2025

 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ·âδ¶Á£¬%d ·âÒѶÁ£¬¹² %d ·â (%s)"
 
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d ·âδ¶Á£¬%d ·âÒѶÁ£¬¹² %d ·â (%s)"
 

-#: src/summaryview.c:2196
+#: src/summaryview.c:2199

 msgid "Sorting summary..."
 msgstr "ÕýÔÚ¶ÔÓʼþ½øÐÐÅÅÐò..."
 
 msgid "Sorting summary..."
 msgstr "ÕýÔÚ¶ÔÓʼþ½øÐÐÅÅÐò..."
 

-#: src/summaryview.c:2266
+#: src/summaryview.c:2269

 msgid "Setting summary from message data..."
 msgstr "ÕýÔÚ¸ù¾ÝÓʼþÊý¾ÝÌáÈ¡ÕªÒªÐÅÏ¢..."
 
 msgid "Setting summary from message data..."
 msgstr "ÕýÔÚ¸ù¾ÝÓʼþÊý¾ÝÌáÈ¡ÕªÒªÐÅÏ¢..."
 

-#: src/summaryview.c:2395
+#: src/summaryview.c:2398

 msgid "(No Date)"
 msgstr "(ûÓÐÈÕÆÚ)"
 
 msgid "(No Date)"
 msgstr "(ûÓÐÈÕÆÚ)"
 

-#: src/summaryview.c:3022
+#: src/summaryview.c:3024

 msgid "You're not the author of the article\n"
 msgstr "Äú²»ÊÇÕâ·âÐŵÄ×÷Õß\n"
 
 msgid "You're not the author of the article\n"
 msgstr "Äú²»ÊÇÕâ·âÐŵÄ×÷Õß\n"
 

-#: src/summaryview.c:3109
+#: src/summaryview.c:3111

 msgid "Delete message(s)"
 msgstr "ɾ³ýÓʼþ"
 
 msgid "Delete message(s)"
 msgstr "ɾ³ýÓʼþ"
 

-#: src/summaryview.c:3110
+#: src/summaryview.c:3112

 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "ÄúÈ·¶¨Òª´ÓÀ¬»øÍ°ÖÐɾ³ýÕâ·âÓʼþÂð£¿"
 
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "ÄúÈ·¶¨Òª´ÓÀ¬»øÍ°ÖÐɾ³ýÕâ·âÓʼþÂð£¿"
 

-#: src/summaryview.c:3152
+#: src/summaryview.c:3149

 msgid "Deleting duplicated messages..."
 msgstr "ɾ³ýÖظ²µÄÓʼþ..."
 
 msgid "Deleting duplicated messages..."
 msgstr "ɾ³ýÖظ²µÄÓʼþ..."
 

-#: src/summaryview.c:3266
+#: src/summaryview.c:3229

 msgid "Destination is same as current folder."
 msgstr "Ä¿±êÓʼþ¼ÐÓ뵱ǰÓʼþ¼ÐÏàͬ"
 
 msgid "Destination is same as current folder."
 msgstr "Ä¿±êÓʼþ¼ÐÓ뵱ǰÓʼþ¼ÐÏàͬ"
 

-#: src/summaryview.c:3343
+#: src/summaryview.c:3306

 msgid "Destination to copy is same as current folder."
 msgstr "Ä¿±êÓʼþ¼ÐÓëÀ´Ô´Óʼþ¼ÐÏàͬ"
 
 msgid "Destination to copy is same as current folder."
 msgstr "Ä¿±êÓʼþ¼ÐÓëÀ´Ô´Óʼþ¼ÐÏàͬ"
 

-#: src/summaryview.c:3393
+#: src/summaryview.c:3356

 msgid "Selecting all messages..."
 msgstr "Ñ¡ÔñËùÓÐÓʼþ..."
 
 msgid "Selecting all messages..."
 msgstr "Ñ¡ÔñËùÓÐÓʼþ..."
 

-#: src/summaryview.c:3451
+#: src/summaryview.c:3414

 msgid "Append or Overwrite"
 msgstr "¸½¼Ó»ò¸²¸Ç"
 
 msgid "Append or Overwrite"
 msgstr "¸½¼Ó»ò¸²¸Ç"
 

-#: src/summaryview.c:3452
+#: src/summaryview.c:3415

 msgid "Append or overwrite existing file?"
 msgstr "¸½¼Ó»ò¸²¸ÇÎļþ£¿"
 
 msgid "Append or overwrite existing file?"
 msgstr "¸½¼Ó»ò¸²¸ÇÎļþ£¿"
 

-#: src/summaryview.c:3453
+#: src/summaryview.c:3416

 msgid "Append"
 msgstr "¸½¼Ó"
 
 msgid "Append"
 msgstr "¸½¼Ó"
 

-#: src/summaryview.c:3744
+#: src/summaryview.c:3707

 msgid "Building threads..."
 msgstr "ÕýÔÚ½¨Á¢ÓʼþÏßË÷..."
 
 msgid "Building threads..."
 msgstr "ÕýÔÚ½¨Á¢ÓʼþÏßË÷..."
 

-#: src/summaryview.c:3842
+#: src/summaryview.c:3805

 msgid "Unthreading..."
 msgstr "ÕýÔÚ½â³ýÓʼþÏßË÷..."
 
 msgid "Unthreading..."
 msgstr "ÕýÔÚ½â³ýÓʼþÏßË÷..."
 

-#: src/summaryview.c:3975
+#: src/summaryview.c:3938

 msgid "No filter rules defined."
 msgstr "ûÓйýÂËÓʼþµÄ¹æÔò¡£"
 
 msgid "No filter rules defined."
 msgstr "ûÓйýÂËÓʼþµÄ¹æÔò¡£"
 

-#: src/summaryview.c:3984
+#: src/summaryview.c:3947

 msgid "Filtering..."
 msgstr "ÕýÔÚ¹ýÂËÓʼþ..."
 
 msgid "Filtering..."
 msgstr "ÕýÔÚ¹ýÂËÓʼþ..."
 

-#: src/summaryview.c:5330
+#: src/summaryview.c:5300

 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"
 #, c-format
 msgid ""
 "Regular expression (regexp) error:\n"


@@ -8024,141 +8238,141 @@ msgstr ""
 "ÕýÔò±í´ïʽ(regexp)´íÎó:\n"
 "%s"
 
 "ÕýÔò±í´ïʽ(regexp)´íÎó:\n"
 "%s"
 

-#: src/textview.c:570
+#: src/textview.c:574

 msgid "This message can't be displayed.\n"
 msgstr "ÎÞ·¨ÏÔʾ¸ÃÓʼþ.\n"
 
 msgid "This message can't be displayed.\n"
 msgstr "ÎÞ·¨ÏÔʾ¸ÃÓʼþ.\n"
 

-#: src/textview.c:587
+#: src/textview.c:591

 msgid "The following can be performed on this part by "
 msgstr "¿É¶Ô±»²¿·ÖÖ´ÐÐÒÔϲÙ×÷"
 
 msgid "The following can be performed on this part by "
 msgstr "¿É¶Ô±»²¿·ÖÖ´ÐÐÒÔϲÙ×÷"
 

-#: src/textview.c:588
+#: src/textview.c:592

 msgid "right-clicking the icon or list item:\n"
 msgstr "(ÓÒ¼üµã»÷ͼ±ê»òÕßÁбíÏî´ò¿ª²Ù×÷²Ëµ¥):\n"
 
 msgid "right-clicking the icon or list item:\n"
 msgstr "(ÓÒ¼üµã»÷ͼ±ê»òÕßÁбíÏî´ò¿ª²Ù×÷²Ëµ¥):\n"
 

-#: src/textview.c:590
+#: src/textview.c:594

 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Ñ¡Ôñ'Áí´æΪ...'½øÐб£´æ (¿ì½Ý¼ü: 'y')\n"
 
 msgid "    To save select 'Save as...' (Shortcut key: 'y')\n"
 msgstr "    Ñ¡Ôñ'Áí´æΪ...'½øÐб£´æ (¿ì½Ý¼ü: 'y')\n"
 

-#: src/textview.c:591
+#: src/textview.c:595

 msgid "    To display as text select 'Display as text' "
 msgstr "    Ñ¡Ôñ'ÒÔÎı¾·½Ê½ÏÔʾ'¿ÉÒÔÒÔÎı¾·½Ê½²é¿´"
 
 msgid "    To display as text select 'Display as text' "
 msgstr "    Ñ¡Ôñ'ÒÔÎı¾·½Ê½ÏÔʾ'¿ÉÒÔÒÔÎı¾·½Ê½²é¿´"
 

-#: src/textview.c:592
+#: src/textview.c:596

 msgid "(Shortcut key: 't')\n"
 msgstr "(¿ì½Ý¼ü: 't')\n"
 
 msgid "(Shortcut key: 't')\n"
 msgstr "(¿ì½Ý¼ü: 't')\n"
 

-#: src/textview.c:593
+#: src/textview.c:597

 msgid "    To open with an external program select 'Open' "
 msgstr "    ÒªÓÃÍⲿ³ÌÐò´ò¿ªÇëÑ¡Ôñ'´ò¿ª'"
 
 msgid "    To open with an external program select 'Open' "
 msgstr "    ÒªÓÃÍⲿ³ÌÐò´ò¿ªÇëÑ¡Ôñ'´ò¿ª'"
 

-#: src/textview.c:594
+#: src/textview.c:598

 msgid "(Shortcut key: 'l'),\n"
 msgstr "(¿ì½Ý¼ü: 'l'), \n"
 
 msgid "(Shortcut key: 'l'),\n"
 msgstr "(¿ì½Ý¼ü: 'l'), \n"
 

-#: src/textview.c:595
+#: src/textview.c:599

 msgid "    (alternately double-click, or click the middle "
 msgstr "    (Ò²¿ÉÒÔË«»÷»òÕßµã»÷),"
 
 msgid "    (alternately double-click, or click the middle "
 msgstr "    (Ò²¿ÉÒÔË«»÷»òÕßµã»÷),"
 

-#: src/textview.c:596
+#: src/textview.c:600

 msgid "mouse button),\n"
 msgstr "Êó±êÖмü\n"
 
 msgid "mouse button),\n"
 msgstr "Êó±êÖмü\n"
 

-#: src/textview.c:597
+#: src/textview.c:601

 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    »òÕß'ÓÃ...´ò¿ª' (¿ì½Ý¼ü: 'o')\n"
 
 msgid "    or 'Open with...' (Shortcut key: 'o')\n"
 msgstr "    »òÕß'ÓÃ...´ò¿ª' (¿ì½Ý¼ü: 'o')\n"
 

-#: src/textview.c:1859
+#: src/textview.c:1957

 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"

-"the apparent URL (%s).  \n"
+"the apparent URL (%s).\n"

 "Open it anyway?"
 msgstr ""
 "Open it anyway?"
 msgstr ""

-"ÕæʵURL (%s) ÓëÏÔʾµÄURL (%s) ²»Í¬¡£\n"
+"ÕæʵURL (%s) ÓëËùÏÔʾµÄURL (%s) ²»Í¬¡£\n"

 "ÕæµÄÒª´ò¿ªÂð?"
 
 "ÕæµÄÒª´ò¿ªÂð?"
 

-#: src/toolbar.c:157 src/toolbar.c:1559
+#: src/toolbar.c:157 src/toolbar.c:1355

 msgid "Receive Mail on all Accounts"
 msgstr "ÊÕËùÓÐÕʺŵÄÐÅ"
 
 msgid "Receive Mail on all Accounts"
 msgstr "ÊÕËùÓÐÕʺŵÄÐÅ"
 

-#: src/toolbar.c:158 src/toolbar.c:1565
+#: src/toolbar.c:158 src/toolbar.c:1361

 msgid "Receive Mail on current Account"
 msgstr "ÓÃÄ¿Ç°µÄÕʺÅÊÕÐÅ"
 
 msgid "Receive Mail on current Account"
 msgstr "ÓÃÄ¿Ç°µÄÕʺÅÊÕÐÅ"
 

-#: src/toolbar.c:159 src/toolbar.c:1571
+#: src/toolbar.c:159 src/toolbar.c:1367

 msgid "Send Queued Message(s)"
 msgstr "Ëͳö´ý·¢ËÍÓʼþ"
 
 msgid "Send Queued Message(s)"
 msgstr "Ëͳö´ý·¢ËÍÓʼþ"
 

-#: src/toolbar.c:160 src/toolbar.c:1584
+#: src/toolbar.c:160 src/toolbar.c:1380

 msgid "Compose Email"
 msgstr "дÐÅ"
 
 msgid "Compose Email"
 msgstr "дÐÅ"
 

-#: src/toolbar.c:161 src/toolbar.c:1588
+#: src/toolbar.c:161 src/toolbar.c:1384

 msgid "Compose News"
 msgstr "׫дÎÄÕÂ"
 
 msgid "Compose News"
 msgstr "׫дÎÄÕÂ"
 

-#: src/toolbar.c:162 src/toolbar.c:1594
+#: src/toolbar.c:162 src/toolbar.c:1390 src/toolbar.c:1400

 msgid "Reply to Message"
 msgstr "»ØÓ¦Ô­ÎÄ"
 
 msgid "Reply to Message"
 msgstr "»ØÓ¦Ô­ÎÄ"
 

-#: src/toolbar.c:163 src/toolbar.c:1615
+#: src/toolbar.c:163 src/toolbar.c:1407 src/toolbar.c:1417

 msgid "Reply to Sender"
 msgstr "»Ø¸´¸ø·¢ÐÅÕß"
 
 msgid "Reply to Sender"
 msgstr "»Ø¸´¸ø·¢ÐÅÕß"
 

-#: src/toolbar.c:164 src/toolbar.c:1636
+#: src/toolbar.c:164 src/toolbar.c:1424 src/toolbar.c:1434

 msgid "Reply to All"
 msgstr "»Ø¸øËùÓÐÈË"
 
 msgid "Reply to All"
 msgstr "»Ø¸øËùÓÐÈË"
 

-#: src/toolbar.c:165 src/toolbar.c:1657
+#: src/toolbar.c:165 src/toolbar.c:1441 src/toolbar.c:1451

 msgid "Reply to Mailing-list"
 msgstr "»Ø¸´ÖÁÓʼþÁбí"
 
 msgid "Reply to Mailing-list"
 msgstr "»Ø¸´ÖÁÓʼþÁбí"
 

-#: src/toolbar.c:166 src/toolbar.c:1678
+#: src/toolbar.c:166 src/toolbar.c:1458 src/toolbar.c:1468

 msgid "Forward Message"
 msgstr "ת·¢Óʼþ"
 
 msgid "Forward Message"
 msgstr "ת·¢Óʼþ"
 

-#: src/toolbar.c:167 src/toolbar.c:1699
+#: src/toolbar.c:167 src/toolbar.c:1475

 msgid "Delete Message"
 msgstr "ɾ³ýÓʼþ"
 
 msgid "Delete Message"
 msgstr "ɾ³ýÓʼþ"
 

-#: src/toolbar.c:169 src/toolbar.c:1711
+#: src/toolbar.c:169 src/toolbar.c:1487

 msgid "Goto Next Message"
 msgstr "ÏÂÒ»¸ö"
 
 msgid "Goto Next Message"
 msgstr "ÏÂÒ»¸ö"
 

-#: src/toolbar.c:173 src/toolbar.c:1719
+#: src/toolbar.c:173 src/toolbar.c:1495

 msgid "Send Message"
 msgstr "ËÍÐÅ"
 
 msgid "Send Message"
 msgstr "ËÍÐÅ"
 

-#: src/toolbar.c:174 src/toolbar.c:1725
+#: src/toolbar.c:174 src/toolbar.c:1501

 msgid "Put into queue folder and send later"
 msgstr "·ÅÈë´ý·¢ËÍÓʼþ¼ÐÉÔºóÔÙËÍ"
 
 msgid "Put into queue folder and send later"
 msgstr "·ÅÈë´ý·¢ËÍÓʼþ¼ÐÉÔºóÔÙËÍ"
 

-#: src/toolbar.c:175 src/toolbar.c:1731
+#: src/toolbar.c:175 src/toolbar.c:1507

 msgid "Save to draft folder"
 msgstr "´æÈë²Ý¸åÓʼþ¼Ð"
 
 msgid "Save to draft folder"
 msgstr "´æÈë²Ý¸åÓʼþ¼Ð"
 

-#: src/toolbar.c:176 src/toolbar.c:1737
+#: src/toolbar.c:176 src/toolbar.c:1513

 msgid "Insert file"
 msgstr "²åÈëÎļþ"
 
 msgid "Insert file"
 msgstr "²åÈëÎļþ"
 

-#: src/toolbar.c:177 src/toolbar.c:1743
+#: src/toolbar.c:177 src/toolbar.c:1519

 msgid "Attach file"
 msgstr "¸½¼ÓÎļþ"
 
 msgid "Attach file"
 msgstr "¸½¼ÓÎļþ"
 

-#: src/toolbar.c:178 src/toolbar.c:1749
+#: src/toolbar.c:178 src/toolbar.c:1525

 msgid "Insert signature"
 msgstr "²åÈëÇ©Ãû"
 
 msgid "Insert signature"
 msgstr "²åÈëÇ©Ãû"
 

-#: src/toolbar.c:179 src/toolbar.c:1755
+#: src/toolbar.c:179 src/toolbar.c:1531

 msgid "Edit with external editor"
 msgstr "ÒÔÍⲿ±à¼­Æ÷±à¼­"
 
 msgid "Edit with external editor"
 msgstr "ÒÔÍⲿ±à¼­Æ÷±à¼­"
 

-#: src/toolbar.c:180 src/toolbar.c:1761
+#: src/toolbar.c:180 src/toolbar.c:1537

 msgid "Wrap all long lines"
 msgstr "×Ô¶¯¶Ï¾ä"
 
 msgid "Wrap all long lines"
 msgstr "×Ô¶¯¶Ï¾ä"
 

-#: src/toolbar.c:183 src/toolbar.c:1774
+#: src/toolbar.c:183 src/toolbar.c:1550

 msgid "Check spelling"
 msgstr "ÕýÔÚ¼ì²éƴд"
 
 msgid "Check spelling"
 msgstr "ÕýÔÚ¼ì²éƴд"
 


@@ -8198,64 +8412,89 @@ msgstr "/
 msgid "/_Reply to sender without quote"
 msgstr "/»ØÐÅʱ²»ÒýÓÃÔ­ÎÄ(_R)"
 
 msgid "/_Reply to sender without quote"
 msgstr "/»ØÐÅʱ²»ÒýÓÃÔ­ÎÄ(_R)"
 

-#: src/toolbar.c:225
-msgid "/_Forward message (inline style)"
-msgstr "/ת·¢Óʼþ (inline style)"
-

 #: src/toolbar.c:226
 #: src/toolbar.c:226

-msgid "/Forward message as _attachment"
-msgstr "/½«ÓʼþÒÔ¸½¼ÓÎļþÐÎʽת·¢(_a)"
+msgid "/For_ward as attachment"
+msgstr "/×÷Ϊ¸½¼þת·¢(_w)"

 
 

-#: src/toolbar.c:371
+#: src/toolbar.c:227
+msgid "/Redirec_t"
+msgstr "/Öض¨Ïò(_t)"
+
+#: src/toolbar.c:372

 msgid "Get"
 msgstr "ÊÕÐÅ"
 
 msgid "Get"
 msgstr "ÊÕÐÅ"
 

-#: src/toolbar.c:372
+#: src/toolbar.c:373

 msgid "Get All"
 msgstr "È«²¿ÊÕÈ¡"
 
 msgid "Get All"
 msgstr "È«²¿ÊÕÈ¡"
 

-#: src/toolbar.c:375
+#: src/toolbar.c:376

 msgid "Email"
 msgstr "µç×ÓÓʼþ"
 
 msgid "Email"
 msgstr "µç×ÓÓʼþ"
 

-#: src/toolbar.c:377 src/toolbar.c:469
+#: src/toolbar.c:378 src/toolbar.c:470

 msgid "Reply"
 msgstr "»Ø¸´"
 
 msgid "Reply"
 msgstr "»Ø¸´"
 

-#: src/toolbar.c:378 src/toolbar.c:470
+#: src/toolbar.c:379 src/toolbar.c:471

 msgid "All"
 msgstr "È«²¿"
 
 msgid "All"
 msgstr "È«²¿"
 

-#: src/toolbar.c:379 src/toolbar.c:471
+#: src/toolbar.c:380 src/toolbar.c:472

 msgid "Sender"
 msgstr "ËͼþÕß"
 
 msgid "Sender"
 msgstr "ËͼþÕß"
 

-#: src/toolbar.c:422
+#: src/toolbar.c:423

 msgid "Send later"
 msgstr "ÉÔºóÔÙËÍ"
 
 msgid "Send later"
 msgstr "ÉÔºóÔÙËÍ"
 

-#: src/toolbar.c:423
+#: src/toolbar.c:424

 msgid "Draft"
 msgstr "²Ý¸å"
 
 msgid "Draft"
 msgstr "²Ý¸å"
 

-#: src/toolbar.c:426
+#: src/toolbar.c:427

 msgid "Attach"
 msgstr "¸½¼ÓÎļþ"
 
 #: src/toolbar.c:430
 msgid "Attach"
 msgstr "¸½¼ÓÎļþ"
 
 #: src/toolbar.c:430

+msgid "Editor"
+msgstr "±à¼­Æ÷"
+
+#: src/toolbar.c:431

 msgid "Linewrap"
 msgstr "×Ô¶¯»»ÐÐ"
 
 msgid "Linewrap"
 msgstr "×Ô¶¯»»ÐÐ"
 

-#: src/toolbar.c:1576
+#: src/toolbar.c:1372

 msgid "News"
 msgstr "ÐÂÎÅȺ×é"
 
 msgid "News"
 msgstr "ÐÂÎÅȺ×é"
 

+#~ msgid "/_Scoring..."
+#~ msgstr "/ͳ¼Æ»ý·Ö(_S)..."
+
+#~ msgid "/_Message/Get new ma_il"
+#~ msgstr "/Óʼþ(_M)/ÊÕÐÂÓʼþ(_i)"
+
+#~ msgid "Icon theme"
+#~ msgstr "ͼ±êÖ÷Ìâ"
+
+#~ msgid "Text"
+#~ msgstr "Îı¾"
+
+#~ msgid "Small"
+#~ msgstr "С×ÖÌå"
+
+#~ msgid "Normal"
+#~ msgstr "Ò»°ã"
+
+#~ msgid "/_Forward message (inline style)"
+#~ msgstr "/ת·¢Óʼþ (inline style)"
+
+#~ msgid "/Forward message as _attachment"
+#~ msgstr "/½«ÓʼþÒÔ¸½¼ÓÎļþÐÎʽת·¢(_a)"
+

 #~ msgid "/S_coring..."
 #~ msgstr "/ͳ¼Æ»ý·Ö(_c)..."
 
 #~ msgid "/S_coring..."
 #~ msgstr "/ͳ¼Æ»ý·Ö(_c)..."
 

-#~ msgid "Go offline"
-#~ msgstr "ÍÑ»ú"
-

 #~ msgid "Go online"
 #~ msgstr "Áª»ú"
 
 #~ msgid "Go online"
 #~ msgstr "Áª»ú"
 


@@ -8323,15 +8562,9 @@ msgstr "
 #~ msgid "Enable"
 #~ msgstr "ÆôÓÃ"
 
 #~ msgid "Enable"
 #~ msgstr "ÆôÓÃ"
 

-#~ msgid "Enable SpamAssassin filtering"
-#~ msgstr "ÆôÓÃÀ¬»øÓʼþ¹ýÂ˹¦ÄÜ"
-

 #~ msgid "Different results for signatures"
 #~ msgstr "Ç©Ãû¼ì²é½á¹û´íÎó"
 
 #~ msgid "Different results for signatures"
 #~ msgstr "Ç©Ãû¼ì²é½á¹û´íÎó"
 

-#~ msgid "Error: Unknown status"
-#~ msgstr "´íÎó£º Î´ÖªµÄ״̬"
-

 #~ msgid "Good signature from \"%s\" but it has expired"
 #~ msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«ÒѾ­¹ýÆÚ"
 
 #~ msgid "Good signature from \"%s\" but it has expired"
 #~ msgstr "À´×Ô \"%s\" µÄÇ©ÃûÕýÈ·µ«ÒѾ­¹ýÆÚ"
 


@@ -8431,10 +8664,6 @@ msgstr "
 #~ msgid "Delete on Server"
 #~ msgstr "ɾ³ýÓʼþ¼Ð"
 
 #~ msgid "Delete on Server"
 #~ msgstr "ɾ³ýÓʼþ¼Ð"
 

-#, fuzzy
-#~ msgid "Error occurred while sending the message to `%s'."
-#~ msgstr "ËÍÐÅʱ·¢Éú´íÎó¡£"
-

 #, fuzzy
 #~ msgid "Error occurred while sending the message with command `%s'."
 #~ msgstr "·¢±íÎÄÕÂÖÁ %s ʱ·¢Éú´íÎó¡£"
 #, fuzzy
 #~ msgid "Error occurred while sending the message with command `%s'."
 #~ msgstr "·¢±íÎÄÕÂÖÁ %s ʱ·¢Éú´íÎó¡£"


@@ -8459,10 +8688,6 @@ msgstr "
 #~ msgid "%i Messages"
 #~ msgstr "Óʼþ"
 
 #~ msgid "%i Messages"
 #~ msgstr "Óʼþ"
 

-#, fuzzy
-#~ msgid "Preview mail"
-#~ msgstr "Ô¤ÀÀÓʼþ"
-

 #, fuzzy
 #~ msgid "Preview old/new mail on account"
 #~ msgstr "ÊÕËùÓÐÕʺŵÄÐÅ"
 #, fuzzy
 #~ msgid "Preview old/new mail on account"
 #~ msgstr "ÊÕËùÓÐÕʺŵÄÐÅ"


@@ -8471,10 +8696,6 @@ msgstr "
 #~ msgid "Remove selected mail"
 #~ msgstr "Çå³ýÊÕ¼þ¼Ð"
 
 #~ msgid "Remove selected mail"
 #~ msgstr "Çå³ýÊÕ¼þ¼Ð"
 

-#, fuzzy
-#~ msgid "Download"
-#~ msgstr "ÏòÏÂ"
-

 #, fuzzy
 #~ msgid "Download selected mail"
 #~ msgstr "ÇëÑ¡ÔñÒ»¸öÎļþ¡£"
 #, fuzzy
 #~ msgid "Download selected mail"
 #~ msgstr "ÇëÑ¡ÔñÒ»¸öÎļþ¡£"

diff --git a/src/Makefile.am b/src/Makefile.am
index 8afb6c00b7ce49b6ef820a014341fa985b95c0dd..10f9b91907db3f981a644d14e3e86fc9ea7296e8 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,6 +55,7 @@ sylpheed_SOURCES = \
        folder.c \
        folder_item_prefs.c \
        foldersel.c \
        folder.c \
        folder_item_prefs.c \
        foldersel.c \

+       folderutils.c \

        folderview.c \
        grouplistdialog.c \
        headerview.c \
        folderview.c \
        grouplistdialog.c \
        headerview.c \


@@ -73,6 +74,7 @@ sylpheed_SOURCES = \
        ldapserver.c \
        ldaputil.c \
        ldif.c \
        ldapserver.c \
        ldaputil.c \
        ldif.c \

+       localfolder.c \

        main.c \
        mainwindow.c \
        manual.c \
        main.c \
        mainwindow.c \
        manual.c \


@@ -97,6 +99,7 @@ sylpheed_SOURCES = \
        prefs_common.c \
        prefs_customheader.c \
        prefs_display_header.c \
        prefs_common.c \
        prefs_customheader.c \
        prefs_display_header.c \

+       prefs_ext_prog.c \

        prefs_filtering_action.c \
        prefs_filtering.c \
        prefs_folder_item.c \
        prefs_filtering_action.c \
        prefs_filtering.c \
        prefs_folder_item.c \


@@ -106,6 +109,7 @@ sylpheed_SOURCES = \
        prefs_spelling.c \
        prefs_summary_column.c \
        prefs_template.c \
        prefs_spelling.c \
        prefs_summary_column.c \
        prefs_template.c \

+       prefs_themes.c \

        prefs_toolbar.c \
        privacy.c \
        procheader.c \
        prefs_toolbar.c \
        privacy.c \
        procheader.c \


@@ -115,6 +119,7 @@ sylpheed_SOURCES = \
        quote_fmt_lex.l \
        quote_fmt_parse.y \
        recv.c \
        quote_fmt_lex.l \
        quote_fmt_parse.y \
        recv.c \

+       remotefolder.c \

        rfc2015.c \
        select-keys.c \
        send_message.c \
        rfc2015.c \
        select-keys.c \
        send_message.c \


@@ -125,15 +130,12 @@ sylpheed_SOURCES = \
        ssl_manager.c \
        statusbar.c \
        stock_pixmap.c \
        ssl_manager.c \
        statusbar.c \
        stock_pixmap.c \

-       string_match.c \

        summary_search.c \
        summaryview.c \
        textview.c \
        toolbar.c \
        undo.c \
        unmime.c \
        summary_search.c \
        summaryview.c \
        textview.c \
        toolbar.c \
        undo.c \
        unmime.c \

-       localfolder.c \
-       remotefolder.c \

        vcard.c
 
 sylpheedincludedir = $(pkgincludedir)
        vcard.c
 
 sylpheedincludedir = $(pkgincludedir)


@@ -179,6 +181,7 @@ sylpheedinclude_HEADERS = \
        folder.h \
        folder_item_prefs.h \
        foldersel.h \
        folder.h \
        folder_item_prefs.h \
        foldersel.h \

+       folderutils.h \

        folderview.h \
        grouplistdialog.h \
        headerview.h \
        folderview.h \
        grouplistdialog.h \
        headerview.h \


@@ -197,6 +200,7 @@ sylpheedinclude_HEADERS = \
        ldapserver.h \
        ldaputil.h \
        ldif.h \
        ldapserver.h \
        ldaputil.h \
        ldif.h \

+       localfolder.h \

        main.h \
        mainwindow.h \
        manual.h \
        main.h \
        mainwindow.h \
        manual.h \


@@ -222,6 +226,7 @@ sylpheedinclude_HEADERS = \
        prefs_common.h \
        prefs_customheader.h \
        prefs_display_header.h \
        prefs_common.h \
        prefs_customheader.h \
        prefs_display_header.h \

+       prefs_ext_prog.h \

        prefs_filtering_action.h \
        prefs_filtering.h \
        prefs_folder_item.h \
        prefs_filtering_action.h \
        prefs_filtering.h \
        prefs_folder_item.h \


@@ -231,6 +236,7 @@ sylpheedinclude_HEADERS = \
        prefs_spelling.h \
        prefs_summary_column.h \
        prefs_template.h \
        prefs_spelling.h \
        prefs_summary_column.h \
        prefs_template.h \

+       prefs_themes.h \

        prefs_toolbar.h \
        privacy.h \
        procheader.h \
        prefs_toolbar.h \
        privacy.h \
        procheader.h \


@@ -240,6 +246,7 @@ sylpheedinclude_HEADERS = \
        quote_fmt_lex.h \
        quote_fmt_parse.h \
        recv.h \
        quote_fmt_lex.h \
        quote_fmt_parse.h \
        recv.h \

+       remotefolder.h \

        rfc2015.h \
        select-keys.h \
        send_message.h \
        rfc2015.h \
        select-keys.h \
        send_message.h \


@@ -249,15 +256,12 @@ sylpheedinclude_HEADERS = \
        ssl_manager.h \
        statusbar.h \
        stock_pixmap.h \
        ssl_manager.h \
        statusbar.h \
        stock_pixmap.h \

-       string_match.h \

        summary_search.h \
        summaryview.h \
        textview.h \
        toolbar.h \
        undo.h \
        unmime.h \
        summary_search.h \
        summaryview.h \
        textview.h \
        toolbar.h \
        undo.h \
        unmime.h \

-       localfolder.h \
-       remotefolder.h \

        vcard.h
 
 BUILT_SOURCES = \
        vcard.h
 
 BUILT_SOURCES = \

diff --git a/src/account.c b/src/account.c
index 7b82709217ff7c1bbd6782754d4ad6fccde0e4cc..252f8c3735dd8fabeed142f19111700e8ee09643 100644 (file)
--- a/src/account.c
+++ b/src/account.c
@@ -270,13 +270,13 @@ PrefsAccount *account_find_from_item(FolderItem *item)
 
        ac = item->account;
        if (!ac) {
 
        ac = item->account;
        if (!ac) {

-               FolderItem *cur_item = item->parent;
+               FolderItem *cur_item = folder_item_parent(item);

                while (cur_item != NULL) {
                        if (cur_item->account && cur_item->apply_sub) {
                                ac = cur_item->account;
                                break;
                        }                               
                while (cur_item != NULL) {
                        if (cur_item->account && cur_item->apply_sub) {
                                ac = cur_item->account;
                                break;
                        }                               

-                       cur_item = cur_item->parent;
+                       cur_item = folder_item_parent(cur_item);

                }
        }
        if (!ac)
                }
        }
        if (!ac)

diff --git a/src/action.c b/src/action.c
index c6bd4bd92537d41df48978b2be4d68b35460c908..c097785234f31609f42b627c70fcece07677cd34 100644 (file)
--- a/src/action.c
+++ b/src/action.c
@@ -100,7 +100,7 @@ struct _ChildInfo
 };
 
 static void action_update_menu         (GtkItemFactory *ifactory,
 };
 
 static void action_update_menu         (GtkItemFactory *ifactory,

-                                        gchar          *branch_path,
+                                        const gchar    *branch_path,

                                         gpointer        callback,
                                         gpointer        data);
 static void compose_actions_execute_cb (Compose        *compose,
                                         gpointer        callback,
                                         gpointer        data);
 static void compose_actions_execute_cb (Compose        *compose,


@@ -405,25 +405,32 @@ void actions_execute(gpointer data,
                msgview_actions_execute_cb((MessageView*)data, action_nb, widget);      
 }
 
                msgview_actions_execute_cb((MessageView*)data, action_nb, widget);      
 }
 

-void action_update_mainwin_menu(GtkItemFactory *ifactory, MainWindow *mainwin)
+void action_update_mainwin_menu(GtkItemFactory *ifactory,
+                               const gchar *branch_path,
+                               MainWindow *mainwin)

 {
 {

-       action_update_menu(ifactory, "/Tools/Actions",
+       action_update_menu(ifactory, branch_path,

                           mainwin_actions_execute_cb, mainwin);
 }
 
                           mainwin_actions_execute_cb, mainwin);
 }
 

-void action_update_msgview_menu(GtkItemFactory *ifactory, MessageView *msgview)
+void action_update_msgview_menu(GtkItemFactory *ifactory,
+                               const gchar *branch_path,
+                               MessageView *msgview)

 {
 {

-       action_update_menu(ifactory, "/Tools/Actions",
+       action_update_menu(ifactory, branch_path,

                           msgview_actions_execute_cb, msgview);
 }
 
                           msgview_actions_execute_cb, msgview);
 }
 

-void action_update_compose_menu(GtkItemFactory *ifactory, Compose *compose)
+void action_update_compose_menu(GtkItemFactory *ifactory, 
+                               const gchar *branch_path,
+                               Compose *compose)

 {
 {

-       action_update_menu(ifactory, "/Tools/Actions",
+       action_update_menu(ifactory, branch_path,

                           compose_actions_execute_cb, compose);
 }
 
                           compose_actions_execute_cb, compose);
 }
 

-static void action_update_menu(GtkItemFactory *ifactory, gchar *branch_path,
+static void action_update_menu(GtkItemFactory *ifactory, 
+                              const gchar *branch_path,

                               gpointer callback, gpointer data)
 {
        GtkWidget *menuitem;
                               gpointer callback, gpointer data)
 {
        GtkWidget *menuitem;

diff --git a/src/action.h b/src/action.h
index 9f4179f3d717964a478a491f5767da606bfd9ea5..d3d7a028c8e7c59df9fe1029f30e4b90d5032bd1 100644 (file)
--- a/src/action.h
+++ b/src/action.h
@@ -47,16 +47,19 @@ typedef enum
 
 ActionType action_get_type     (const gchar    *action_str);
 
 
 ActionType action_get_type     (const gchar    *action_str);
 

-void actions_execute                    (gpointer       data, 
-                                        guint          action_nb,
-                                        GtkWidget      *widget,
-                                        gint           source);
+void actions_execute           (gpointer       data, 
+                                guint          action_nb,
+                                GtkWidget      *widget,
+                                gint           source);

 
 

-void action_update_mainwin_menu        (GtkItemFactory *ifactory, 
+void action_update_mainwin_menu        (GtkItemFactory *ifactory,
+                                const gchar    *branch_path,

                                 MainWindow     *mainwin);
 void action_update_msgview_menu        (GtkItemFactory *ifactory,
                                 MainWindow     *mainwin);
 void action_update_msgview_menu        (GtkItemFactory *ifactory,

+                                const gchar    *branch_path,

                                 MessageView    *msgview);
                                 MessageView    *msgview);

-void action_update_compose_menu        (GtkItemFactory *ifactory, 
+void action_update_compose_menu        (GtkItemFactory *ifactory,
+                                const gchar    *branch_path,

                                 Compose        *compose);
 
 #endif /* __ACTION_H__ */
                                 Compose        *compose);
 
 #endif /* __ACTION_H__ */

diff --git a/src/addr_compl.c b/src/addr_compl.c
index 205aa90066f4d9e4f4cffb605a16cb6a317ee12a..ff14740eb060c8c9ce010a4a0a88f007123f1b80 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  *
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  *

- * Copyright (c) 2000-2003 by Alfons Hoogervorst <alfons@proteus.demon.nl>
+ * Copyright (C) 2000-2004 by Alfons Hoogervorst & The Sylpheed Claws Team. 

  *
  * 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
  *
  * 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

diff --git a/src/addr_compl.h b/src/addr_compl.h
index d11b73b9dd237b9597ec25d4aee0716669d67112..9952eca395103b9c08fd03b29eee9400ea49ebe0 100644 (file)
--- a/src/addr_compl.h
+++ b/src/addr_compl.h
@@ -1,7 +1,7 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * 
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
  * 

- * Copyright (c) 2000-2003 by Alfons Hoogervorst <alfons@proteus.demon.nl>
+ * Copyright (C) 2000-2004 by Alfons Hoogervorst & The Sylpheed Claws Team. 

  *
  * 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
  *
  * 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

diff --git a/src/codeconv.c b/src/codeconv.c
index ecab8f5635f0f40a849e3efb6e2f120b986cd58c..3d26457c40b55c0ac541a530565002d187aca76d 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -173,6 +173,72 @@ void conv_jistoeuc(gchar *outbuf, gint outlen, const gchar *inbuf)
        *out = '\0';
 }
 
        *out = '\0';
 }
 

+#define JIS_HWDAKUTEN          0x5e
+#define JIS_HWHANDAKUTEN       0x5f
+
+static gint conv_jis_hantozen(guchar *outbuf, guchar jis_code, guchar sound_sym)
+{
+       static guint16 h2z_tbl[] = {
+               /* 0x20 - 0x2f */
+               0x0000, 0x2123, 0x2156, 0x2157, 0x2122, 0x2126, 0x2572, 0x2521,
+               0x2523, 0x2525, 0x2527, 0x2529, 0x2563, 0x2565, 0x2567, 0x2543,
+               /* 0x30 - 0x3f */
+               0x213c, 0x2522, 0x2524, 0x2526, 0x2528, 0x252a, 0x252b, 0x252d,
+               0x252f, 0x2531, 0x2533, 0x2535, 0x2537, 0x2539, 0x253b, 0x253d,
+               /* 0x40 - 0x4f */
+               0x253f, 0x2541, 0x2544, 0x2546, 0x2548, 0x254a, 0x254b, 0x254c,
+               0x254d, 0x254e, 0x254f, 0x2552, 0x2555, 0x2558, 0x255b, 0x255e,
+               /* 0x50 - 0x5f */
+               0x255f, 0x2560, 0x2561, 0x2562, 0x2564, 0x2566, 0x2568, 0x2569,
+               0x256a, 0x256b, 0x256c, 0x256d, 0x256f, 0x2573, 0x212b, 0x212c
+       };
+
+       static guint16 dakuten_tbl[] = {
+               /* 0x30 - 0x3f */
+               0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x252c, 0x252e,
+               0x2530, 0x2532, 0x2534, 0x2536, 0x2538, 0x253a, 0x253c, 0x253e,
+               /* 0x40 - 0x4f */
+               0x2540, 0x2542, 0x2545, 0x2547, 0x2549, 0x0000, 0x0000, 0x0000,
+               0x0000, 0x0000, 0x2550, 0x2553, 0x2556, 0x2559, 0x255c, 0x0000
+       };
+
+       static guint16 handakuten_tbl[] = {
+               /* 0x4a - 0x4e */
+               0x2551, 0x2554, 0x2557, 0x255a, 0x255d
+       };
+
+       guint16 out_code;
+
+       jis_code &= 0x7f;
+       sound_sym &= 0x7f;
+
+       if (jis_code < 0x21 || jis_code > 0x5f)
+               return 0;
+
+       if (sound_sym == JIS_HWDAKUTEN &&
+           jis_code >= 0x36 && jis_code <= 0x4e) {
+               out_code = dakuten_tbl[jis_code - 0x30];
+               if (out_code != 0) {
+                       *outbuf = out_code >> 8;
+                       *(outbuf + 1) = out_code & 0xff;
+                       return 2;
+               }
+       }
+
+       if (sound_sym == JIS_HWHANDAKUTEN &&
+           jis_code >= 0x4a && jis_code <= 0x4e) {
+               out_code = handakuten_tbl[jis_code - 0x4a];
+               *outbuf = out_code >> 8;
+               *(outbuf + 1) = out_code & 0xff;
+               return 2;
+       }
+
+       out_code = h2z_tbl[jis_code - 0x20];
+       *outbuf = out_code >> 8;
+       *(outbuf + 1) = out_code & 0xff;
+       return 1;
+}
+

 void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        const guchar *in = inbuf;
 void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
 {
        const guchar *in = inbuf;


@@ -198,12 +264,36 @@ void conv_euctojis(gchar *outbuf, gint outlen, const gchar *inbuf)
                                }
                        }
                } else if (iseuchwkana1(*in)) {
                                }
                        }
                } else if (iseuchwkana1(*in)) {

-                       in++;
-                       if (iseuchwkana2(*in)) {
-                               HW_IN();
-                               *out++ = *in++ & 0x7f;
+                       if (iseuchwkana2(*(in + 1))) {
+                               if (prefs_common.allow_jisx0201_kana) {
+                                       HW_IN();
+                                       in++;
+                                       *out++ = *in++ & 0x7f;
+                               } else {
+                                       guchar jis_ch[2];
+                                       gint len;
+
+                                       if (iseuchwkana1(*(in + 2)) &&
+                                           iseuchwkana2(*(in + 3)))
+                                               len = conv_jis_hantozen
+                                                       (jis_ch,
+                                                        *(in + 1), *(in + 3));
+                                       else
+                                               len = conv_jis_hantozen
+                                                       (jis_ch,
+                                                        *(in + 1), '\0');
+                                       if (len == 0)
+                                               in += 2;
+                                       else {
+                                               K_IN();
+                                               in += len * 2;
+                                               *out++ = jis_ch[0];
+                                               *out++ = jis_ch[1];
+                                       }
+                               }

                        } else {
                                K_OUT();
                        } else {
                                K_OUT();

+                               in++;

                                if (*in != '\0' && !isascii(*in)) {
                                        *out++ = SUBST_CHAR;
                                        in++;
                                if (*in != '\0' && !isascii(*in)) {
                                        *out++ = SUBST_CHAR;
                                        in++;


@@ -838,12 +928,12 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
        const gchar *inbuf_p;
        gchar *outbuf;
        gchar *outbuf_p;
        const gchar *inbuf_p;
        gchar *outbuf;
        gchar *outbuf_p;

-       gint in_size;
-       gint in_left;
-       gint out_size;
-       gint out_left;
-       gint n_conv;
-       gint len;
+       size_t in_size;
+       size_t in_left;
+       size_t out_size;
+       size_t out_left;
+       size_t n_conv;
+       size_t len;

 
        if (!src_code)
                src_code = conv_get_outgoing_charset_str();
 
        if (!src_code)
                src_code = conv_get_outgoing_charset_str();


@@ -880,7 +970,7 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
 }
 
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,
 }
 
        while ((n_conv = iconv(cd, (ICONV_CONST gchar **)&inbuf_p, &in_left,

-                              &outbuf_p, &out_left)) < 0) {
+                              &outbuf_p, &out_left)) == (size_t)-1) {

                if (EILSEQ == errno) {
                        inbuf_p++;
                        in_left--;
                if (EILSEQ == errno) {
                        inbuf_p++;
                        in_left--;


@@ -900,7 +990,8 @@ gchar *conv_iconv_strdup(const gchar *inbuf,
                }
        }
 
                }
        }
 

-       while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) < 0) {
+       while ((n_conv = iconv(cd, NULL, NULL, &outbuf_p, &out_left)) ==
+              (size_t)-1) {

                if (E2BIG == errno) {
                        EXPAND_BUF();
                } else {
                if (E2BIG == errno) {
                        EXPAND_BUF();
                } else {


@@ -1340,7 +1431,7 @@ const gchar *conv_get_outgoing_charset_str(void)
        const gchar *str;
 
        if (prefs_common.outgoing_charset) {
        const gchar *str;
 
        if (prefs_common.outgoing_charset) {

-               if (!isalpha(prefs_common.outgoing_charset[0])) {
+               if (!isalpha((guchar)prefs_common.outgoing_charset[0])) {

                        g_free(prefs_common.outgoing_charset);
                        prefs_common.outgoing_charset = g_strdup(CS_AUTO);
                } else if (strcmp(prefs_common.outgoing_charset, CS_AUTO) != 0)
                        g_free(prefs_common.outgoing_charset);
                        prefs_common.outgoing_charset = g_strdup(CS_AUTO);
                } else if (strcmp(prefs_common.outgoing_charset, CS_AUTO) != 0)


@@ -1449,13 +1540,13 @@ void conv_unmime_header(gchar *outbuf, gint outlen, const gchar *str,
 
 #define LBREAK_IF_REQUIRED(cond, is_plain_text)                                \
 {                                                                      \
 
 #define LBREAK_IF_REQUIRED(cond, is_plain_text)                                \
 {                                                                      \

-       if (len - (destp - dest) < MAX_LINELEN + 2) {                   \
+       if (len - (destp - (guchar *)dest) < MAX_LINELEN + 2) {         \

                *destp = '\0';                                          \
                return;                                                 \
        }                                                               \
                                                                        \
        if ((cond) && *srcp) {                                          \
                *destp = '\0';                                          \
                return;                                                 \
        }                                                               \
                                                                        \
        if ((cond) && *srcp) {                                          \

-               if (destp > dest && left < MAX_LINELEN - 1) {           \
+               if (destp > (guchar *)dest && left < MAX_LINELEN - 1) { \

                        if (isspace(*(destp - 1)))                      \
                                destp--;                                \
                        else if (is_plain_text && isspace(*srcp))       \
                        if (isspace(*(destp - 1)))                      \
                                destp--;                                \
                        else if (is_plain_text && isspace(*srcp))       \


@@ -1477,8 +1568,8 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
        gint mimestr_len;
        gchar *mimesep_enc;
        gint left;
        gint mimestr_len;
        gchar *mimesep_enc;
        gint left;

-       const gchar *srcp = src;
-       gchar *destp = dest;
+       const guchar *srcp = src;
+       guchar *destp = dest;

        gboolean use_base64;
 
        if (MB_CUR_MAX > 1) {
        gboolean use_base64;
 
        if (MB_CUR_MAX > 1) {


@@ -1539,7 +1630,7 @@ void conv_encode_header(gchar *dest, gint len, const gchar *src,
                        gchar *part_str;
                        gchar *out_str;
                        gchar *enc_str;
                        gchar *part_str;
                        gchar *out_str;
                        gchar *enc_str;

-                       const gchar *p = srcp;
+                       const guchar *p = srcp;

                        gint out_str_len;
                        gint out_enc_str_len;
                        gint mime_block_len;
                        gint out_str_len;
                        gint out_enc_str_len;
                        gint mime_block_len;

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
index e66182fba3eac87cc821fde9dd6a1c40926100fa..8f71f46c98430f9329ad2937533f6573f63c6e2a 100644 (file)
--- a/src/common/Makefile.am
+++ b/src/common/Makefile.am
@@ -17,6 +17,7 @@ libsylpheedcommon_la_SOURCES = \
        socket.c \
        ssl.c \
        ssl_certificate.c \
        socket.c \
        ssl.c \
        ssl_certificate.c \

+       string_match.c \

        stringtable.c \
        sylpheed.c \
        template.c \
        stringtable.c \
        sylpheed.c \
        template.c \


@@ -45,6 +46,7 @@ sylpheedcommoninclude_HEADERS = \
        socket.h \
        ssl_certificate.h \
        ssl.h \
        socket.h \
        ssl_certificate.h \
        ssl.h \

+       string_match.h \

        stringtable.h \
        sylpheed.h \
        template.h \
        stringtable.h \
        sylpheed.h \
        template.h \

diff --git a/src/common/base64.c b/src/common/base64.c
index 7ed3c40afde9a8de55227e8e4efd3c60591d2951..484cd286abba40a12b7c6e293d4b5070bdd67747 100644 (file)
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -37,7 +37,7 @@ static const gchar base64val[128] = {
        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
 };
 
        41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -1, -1, -1, -1, -1
 };
 

-#define BASE64VAL(c)   (isascii(c) ? base64val[(gint)(c)] : -1)
+#define BASE64VAL(c)   (isascii((guchar)c) ? base64val[(gint)(c)] : -1)

 
 void base64_encode(gchar *out, const guchar *in, gint inlen)
 {
 
 void base64_encode(gchar *out, const guchar *in, gint inlen)
 {

diff --git a/src/common/defs.h b/src/common/defs.h
index 2b55f6fe28f1a35b3d913f364b0fc4207aabd861..922dd4b9d6876371d5a7556f931dc1f420e23a3b 100644 (file)
--- a/src/common/defs.h
+++ b/src/common/defs.h
@@ -71,6 +71,8 @@
 #define SYLDOC_FAQ_HTML_INDEX  "/faq/faq.html"
 #define CLAWS_FAQ_URI          "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
 #define CLAWS_BUGZILLA_URI     "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"
 #define SYLDOC_FAQ_HTML_INDEX  "/faq/faq.html"
 #define CLAWS_FAQ_URI          "http://sylpheed-claws.sourceforge.net/phpwiki/index.php"
 #define CLAWS_BUGZILLA_URI     "http://www.thewildbeast.co.uk/sylpheed-claws/bugzilla/enter_bug.cgi"

+#define CLAWS_THEMES_URI       "http://sylpheed-claws.sourceforge.net/themes.php"
+#define THEMEINFO_FILE         ".sylpheed_themeinfo"

 #define FOLDER_LIST            "folderlist.xml"
 #define CACHE_FILE             ".sylpheed_cache"
 #define MARK_FILE              ".sylpheed_mark"
 #define FOLDER_LIST            "folderlist.xml"
 #define CACHE_FILE             ".sylpheed_cache"
 #define MARK_FILE              ".sylpheed_mark"

diff --git a/src/common/quoted-printable.c b/src/common/quoted-printable.c
index 7e8da23e453bddc43227879aff83ea71c1d594de..bf99a234f927189859a67dd53a9f3bcc8cf527df 100644 (file)
--- a/src/common/quoted-printable.c
+++ b/src/common/quoted-printable.c
@@ -94,7 +94,7 @@ gint qp_decode_line(gchar *str)
                        if (inp[1] && inp[2] &&
                            get_hex_value(outp, inp[1], inp[2]) == TRUE) {
                                inp += 3;
                        if (inp[1] && inp[2] &&
                            get_hex_value(outp, inp[1], inp[2]) == TRUE) {
                                inp += 3;

-                       } else if (inp[1] == '\0' || isspace(inp[1])) {
+                       } else if (inp[1] == '\0' || isspace((guchar)inp[1])) {

                                /* soft line break */
                                break;
                        } else {
                                /* soft line break */
                                break;
                        } else {

diff --git a/src/common/utils.c b/src/common/utils.c
index 0f9b4944be00332b39d4dc709f7b4f0c772251e1..aef3c96418107209342a13a64f4bab8ba80e5688 100644 (file)
--- a/src/common/utils.c
+++ b/src/common/utils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team

  *
  * 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
  *
  * 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


@@ -145,7 +145,7 @@ void ptr_array_free_strings(GPtrArray *array)
 
 gint to_number(const gchar *nstr)
 {
 
 gint to_number(const gchar *nstr)
 {

-       register const gchar *p;
+       register const guchar *p;

 
        if (*nstr == '\0') return -1;
 
 
        if (*nstr == '\0') return -1;
 


@@ -530,7 +530,7 @@ gboolean is_next_nonascii(const guchar *s)
        return FALSE;
 }
 
        return FALSE;
 }
 

-gint get_next_word_len(const gchar *s)
+gint get_next_word_len(const guchar *s)

 {
        gint len = 0;
 
 {
        gint len = 0;
 


@@ -576,7 +576,7 @@ gint subject_compare_for_sort(const gchar *s1, const gchar *s2)
 
 void trim_subject_for_compare(gchar *str)
 {
 
 void trim_subject_for_compare(gchar *str)
 {

-       gchar *srcp;
+       guchar *srcp;

 
        eliminate_parenthesis(str, '[', ']');
        eliminate_parenthesis(str, '(', ')');
 
        eliminate_parenthesis(str, '[', ']');
        eliminate_parenthesis(str, '(', ')');


@@ -589,7 +589,7 @@ void trim_subject_for_compare(gchar *str)
 
 void trim_subject_for_sort(gchar *str)
 {
 
 void trim_subject_for_sort(gchar *str)
 {

-       gchar *srcp;
+       guchar *srcp;

 
        g_strstrip(str);
 
 
        g_strstrip(str);
 


@@ -600,7 +600,7 @@ void trim_subject_for_sort(gchar *str)
 
 void trim_subject(gchar *str)
 {
 
 void trim_subject(gchar *str)
 {

-       register gchar *srcp, *destp;
+       register guchar *srcp, *destp;

        gchar op, cl;
        gint in_brace;
 
        gchar op, cl;
        gint in_brace;
 


@@ -632,7 +632,7 @@ void trim_subject(gchar *str)
 
 void eliminate_parenthesis(gchar *str, gchar op, gchar cl)
 {
 
 void eliminate_parenthesis(gchar *str, gchar op, gchar cl)
 {

-       register gchar *srcp, *destp;
+       register guchar *srcp, *destp;

        gint in_brace;
 
        srcp = destp = str;
        gint in_brace;
 
        srcp = destp = str;


@@ -714,7 +714,7 @@ void extract_parenthesis_with_skip_quote(gchar *str, gchar quote_chr,
 
 void eliminate_quote(gchar *str, gchar quote_chr)
 {
 
 void eliminate_quote(gchar *str, gchar quote_chr)
 {

-       register gchar *srcp, *destp;
+       register guchar *srcp, *destp;

 
        srcp = destp = str;
 
 
        srcp = destp = str;
 


@@ -749,7 +749,7 @@ void extract_quote(gchar *str, gchar quote_chr)
 
 void eliminate_address_comment(gchar *str)
 {
 
 void eliminate_address_comment(gchar *str)
 {

-       register gchar *srcp, *destp;
+       register guchar *srcp, *destp;

        gint in_brace;
 
        srcp = destp = str;
        gint in_brace;
 
        srcp = destp = str;


@@ -981,7 +981,7 @@ void remove_return(gchar *str)
 
 void remove_space(gchar *str)
 {
 
 void remove_space(gchar *str)
 {

-       register gchar *p = str;
+       register guchar *p = str;

        register gint spc;
 
        while (*p) {
        register gint spc;
 
        while (*p) {


@@ -997,7 +997,7 @@ void remove_space(gchar *str)
 
 void unfold_line(gchar *str)
 {
 
 void unfold_line(gchar *str)
 {

-       register gchar *p = str;
+       register guchar *p = str;

        register gint spc;
 
        while (*p) {
        register gint spc;
 
        while (*p) {


@@ -1076,15 +1076,15 @@ gboolean is_ascii_str(const guchar *str)
 
 gint get_quote_level(const gchar *str, const gchar *quote_chars)
 {
 
 gint get_quote_level(const gchar *str, const gchar *quote_chars)
 {

-       const gchar *first_pos;
-       const gchar *last_pos;
-       const gchar *p = str;
+       const guchar *first_pos;
+       const guchar *last_pos;
+       const guchar *p = str;

        gint quote_level = -1;
 
        /* speed up line processing by only searching to the last '>' */
        if ((first_pos = line_has_quote_char(str, quote_chars)) != NULL) {
                /* skip a line if it contains a '<' before the initial '>' */
        gint quote_level = -1;
 
        /* speed up line processing by only searching to the last '>' */
        if ((first_pos = line_has_quote_char(str, quote_chars)) != NULL) {
                /* skip a line if it contains a '<' before the initial '>' */

-               if (memchr(str, '<', first_pos - str) != NULL)
+               if (memchr(str, '<', first_pos - (const guchar *)str) != NULL)

                        return -1;
                last_pos = line_has_quote_char_last(first_pos, quote_chars);
        } else
                        return -1;
                last_pos = line_has_quote_char_last(first_pos, quote_chars);
        } else


@@ -1253,7 +1253,7 @@ gchar **strsplit_parenthesis(const gchar *str, gchar op, gchar cl,
                        n++;
                        str = s_cl + 1;
 
                        n++;
                        str = s_cl + 1;
 

-                       while (*str && isspace(*str)) str++;
+                       while (*str && isspace(*(guchar *)str)) str++;

                        if (*str != op) {
                                string_list = g_slist_prepend(string_list,
                                                              g_strdup(""));
                        if (*str != op) {
                                string_list = g_slist_prepend(string_list,
                                                              g_strdup(""));


@@ -1401,6 +1401,7 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
        GList *result = NULL;
        const gchar *p, *q;
        gchar *escaped_utf8uri;
        GList *result = NULL;
        const gchar *p, *q;
        gchar *escaped_utf8uri;

+       gchar *file;

 
        p = uri_list;
 
 
        p = uri_list;
 


@@ -1463,6 +1464,88 @@ GList *uri_list_extract_filenames(const gchar *uri_list)
        } \
 }
 
        } \
 }
 

+/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
+ * characters
+ */
+static gint axtoi(const gchar *hexstr)
+{
+       gint hi, lo, result;
+       
+       hi = hexstr[0];
+       if ('0' <= hi && hi <= '9') {
+               hi -= '0';
+       } else
+               if ('a' <= hi && hi <= 'f') {
+                       hi -= ('a' - 10);
+               } else
+                       if ('A' <= hi && hi <= 'F') {
+                               hi -= ('A' - 10);
+                       }
+
+       lo = hexstr[1];
+       if ('0' <= lo && lo <= '9') {
+               lo -= '0';
+       } else
+               if ('a' <= lo && lo <= 'f') {
+                       lo -= ('a'-10);
+               } else
+                       if ('A' <= lo && lo <= 'F') {
+                               lo -= ('A' - 10);
+                       }
+       result = lo + (16 * hi);
+       return result;
+}
+
+gboolean is_uri_string(const gchar *str)
+{
+       return (g_strncasecmp(str, "http://", 7) == 0 ||
+               g_strncasecmp(str, "https://", 8) == 0 ||
+               g_strncasecmp(str, "ftp://", 6) == 0 ||
+               g_strncasecmp(str, "www.", 4) == 0);
+}
+
+gchar *get_uri_path(const gchar *uri)
+{
+       if (g_strncasecmp(uri, "http://", 7) == 0)
+               return (gchar *)(uri + 7);
+       else if (g_strncasecmp(uri, "https://", 8) == 0)
+               return (gchar *)(uri + 8);
+       else if (g_strncasecmp(uri, "ftp://", 6) == 0)
+               return (gchar *)(uri + 6);
+       else
+               return (gchar *)uri;
+}
+
+/* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
+ * plusses, and escape characters are used)
+ */
+void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
+{
+       gchar *dec = decoded_uri;
+       const gchar *enc = encoded_uri;
+
+       while (*enc) {
+               if (*enc == '%') {
+                       enc++;
+                       if (isxdigit((guchar)enc[0]) &&
+                           isxdigit((guchar)enc[1])) {
+                               *dec = axtoi(enc);
+                               dec++;
+                               enc += 2;
+                       }
+               } else {
+                       if (*enc == '+')
+                               *dec = ' ';
+                       else
+                               *dec = *enc;
+                       dec++;
+                       enc++;
+               }
+       }
+
+       *dec = '\0';
+}
+

 gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                     gchar **subject, gchar **body)
 {
 gint scan_mailto_url(const gchar *mailto, gchar **to, gchar **cc, gchar **bcc,
                     gchar **subject, gchar **body)
 {


@@ -3088,77 +3171,6 @@ void encode_uri(gchar *encoded_uri, gint bufsize, const gchar *uri)
        encoded_uri[k] = 0;
 }
 
        encoded_uri[k] = 0;
 }
 

-/* Converts two-digit hexadecimal to decimal.  Used for unescaping escaped 
- * characters
- */
-static gint axtoi(const gchar *hexstr)
-{
-       gint hi, lo, result;
-       
-       hi = hexstr[0];
-       if ('0' <= hi && hi <= '9') {
-               hi -= '0';
-       } else
-               if ('a' <= hi && hi <= 'f') {
-                       hi -= ('a' - 10);
-               } else
-                       if ('A' <= hi && hi <= 'F') {
-                               hi -= ('A' - 10);
-                       }
-
-       lo = hexstr[1];
-       if ('0' <= lo && lo <= '9') {
-               lo -= '0';
-       } else
-               if ('a' <= lo && lo <= 'f') {
-                       lo -= ('a'-10);
-               } else
-                       if ('A' <= lo && lo <= 'F') {
-                               lo -= ('A' - 10);
-                       }
-       result = lo + (16 * hi);
-       return result;
-}
-
-
-/* Decodes URL-Encoded strings (i.e. strings in which spaces are replaced by
- * plusses, and escape characters are used)
- */
-
-void decode_uri(gchar *decoded_uri, const gchar *encoded_uri)
-{
-       const gchar *encoded;
-       gchar *decoded;
-
-       encoded = encoded_uri;
-       decoded = decoded_uri;
-
-       while (*encoded) {
-               if (*encoded == '%') {
-                       encoded++;
-                       if (isxdigit(encoded[0])
-                           && isxdigit(encoded[1])) {
-                               *decoded = (gchar) axtoi(encoded);
-                               decoded++;
-                               encoded += 2;
-                       }
-               }
-               else if (*encoded == '+') {
-                       *decoded = ' ';
-                       decoded++;
-                       encoded++;
-               }
-               else {
-                       *decoded = *encoded;
-                       decoded++;
-                       encoded++;
-               }
-       }
-
-       *decoded = '\0';
-}
-
-

 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
        gchar buf[BUFFSIZE];
 gint open_uri(const gchar *uri, const gchar *cmdline)
 {
        gchar buf[BUFFSIZE];


@@ -3406,7 +3418,8 @@ int subject_get_prefix_length(const gchar *subject)
                "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
                "Res\\:",                       /* "Res:" (Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */
                "Antwort\\:",                   /* "Antwort:" (German Lotus Notes) */
                "Res\\:",                       /* "Res:" (Brazilian Outlook) */
                "Fw\\:",                        /* "Fw:" Forward */

-               "Enc\\:"                        /* "Enc:" Forward (Brazilian Outlook) */
+               "Enc\\:",                       /* "Enc:" Forward (Brazilian Outlook) */
+               "Odp\\:",                       /* "Odp:" Re (Polish Outlook) */

                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];
                /* add more */
        };
        const int PREFIXES = sizeof prefixes / sizeof prefixes[0];


@@ -3751,3 +3764,48 @@ gint quote_cmd_argument(gchar * result, guint size,
        return 0;
 }
 
        return 0;
 }
 

+typedef struct 
+{
+       GNode           *parent;
+       GNodeMapFunc     func;
+       gpointer         data;
+} GNodeMapData;
+
+static void g_node_map_recursive(GNode *node, gpointer data)
+{
+       GNodeMapData *mapdata = (GNodeMapData *) data;
+       GNode *newnode;
+       GNodeMapData newmapdata;
+       gpointer newdata;
+
+       newdata = mapdata->func(node->data, mapdata->data);
+       if (newdata != NULL) {
+               newnode = g_node_new(newdata);
+               g_node_append(mapdata->parent, newnode);
+
+               newmapdata.parent = newnode;
+               newmapdata.func = mapdata->func;
+               newmapdata.data = mapdata->data;
+
+               g_node_children_foreach(node, G_TRAVERSE_ALL, g_node_map_recursive, &newmapdata);
+       }
+}
+
+GNode *g_node_map(GNode *node, GNodeMapFunc func, gpointer data)
+{
+       GNode *root;
+       GNodeMapData mapdata;
+
+       g_return_val_if_fail(node != NULL, NULL);
+       g_return_val_if_fail(func != NULL, NULL);
+
+       root = g_node_new(func(node->data, data));
+
+       mapdata.parent = root;
+       mapdata.func = func;
+       mapdata.data = data;
+
+       g_node_children_foreach(node, G_TRAVERSE_ALL, g_node_map_recursive, &mapdata);
+
+       return root;
+}

diff --git a/src/common/utils.h b/src/common/utils.h
index 7dce7e2ba269dbb298fc5f459dd5f49248d54f23..434c6f9a2990500bc6ae6a42550007ff48674229 100644 (file)
--- a/src/common/utils.h
+++ b/src/common/utils.h
@@ -136,6 +136,8 @@
        perror(func); \
 }
 
        perror(func); \
 }
 

+typedef gpointer (*GNodeMapFunc)       (gpointer nodedata, gpointer data);
+

 /* debug functions */
 void debug_set_mode            (gboolean mode);
 gboolean debug_get_mode                (void);
 /* debug functions */
 void debug_set_mode            (gboolean mode);
 gboolean debug_get_mode                (void);


@@ -220,7 +222,7 @@ wchar_t *wcscasestr         (const wchar_t *haystack,
 gint get_mbs_len               (const gchar    *s);
 
 gboolean is_next_nonascii      (const guchar *s);
 gint get_mbs_len               (const gchar    *s);
 
 gboolean is_next_nonascii      (const guchar *s);

-gint get_next_word_len         (const gchar *s);
+gint get_next_word_len         (const guchar *s);

 
 /* functions for string parsing */
 gint subject_compare                   (const gchar    *s1,
 
 /* functions for string parsing */
 gint subject_compare                   (const gchar    *s1,


@@ -305,6 +307,8 @@ gchar *trim_string                  (const gchar    *str,
                                         gint            len);
 
 GList *uri_list_extract_filenames      (const gchar    *uri_list);
                                         gint            len);
 
 GList *uri_list_extract_filenames      (const gchar    *uri_list);

+gboolean is_uri_string                 (const gchar    *str);
+gchar *get_uri_path                    (const gchar    *uri);

 void decode_uri                                (gchar          *decoded_uri,
                                         const gchar    *encoded_uri);
 gint scan_mailto_url                   (const gchar    *mailto,
 void decode_uri                                (gchar          *decoded_uri,
                                         const gchar    *encoded_uri);
 gint scan_mailto_url                   (const gchar    *mailto,


@@ -437,5 +441,6 @@ gchar *generate_mime_boundary       (const gchar *prefix);
 
 gint quote_cmd_argument(gchar * result, guint size,
                        const gchar * path);
 
 gint quote_cmd_argument(gchar * result, guint size,
                        const gchar * path);

+GNode *g_node_map(GNode *node, GNodeMapFunc func, gpointer data);

 
 #endif /* __UTILS_H__ */
 
 #endif /* __UTILS_H__ */

diff --git a/src/common/xml.c b/src/common/xml.c
index c3d5581a1411817b2e5c82461c394093b0172946..d86f045d5a26e03ca37d67f48ca77d109a238f56 100644 (file)
--- a/src/common/xml.c
+++ b/src/common/xml.c
@@ -180,7 +180,7 @@ gint xml_get_dtd(XMLFile *file)
 gint xml_parse_next_tag(XMLFile *file)
 {
        gchar buf[XMLBUFSIZE];
 gint xml_parse_next_tag(XMLFile *file)
 {
        gchar buf[XMLBUFSIZE];

-       gchar *bufp = buf;
+       guchar *bufp = buf;

        XMLTag *tag;
        gint len;
 
        XMLTag *tag;
        gint len;
 


@@ -412,6 +412,17 @@ gboolean xml_compare_tag(XMLFile *file, const gchar *name)
                return FALSE;
 }
 
                return FALSE;
 }
 

+XMLTag *xml_new_tag(const gchar        *tag)
+{
+       XMLTag *new_tag;
+
+       new_tag = g_new(XMLTag, 1);
+       new_tag->tag = XML_STRING_ADD(tag);
+       new_tag->attr = NULL;
+
+       return new_tag;
+}
+

 XMLTag *xml_copy_tag(XMLTag *tag)
 {
        XMLTag *new_tag;
 XMLTag *xml_copy_tag(XMLTag *tag)
 {
        XMLTag *new_tag;


@@ -606,3 +617,68 @@ void xml_tag_add_attr(XMLTag *tag, const gchar *name, gchar *value)
 
        tag->attr = g_list_append(tag->attr, attr);
 }
 
        tag->attr = g_list_append(tag->attr, attr);
 }

+
+static void xml_write_tree_recursive(GNode *node, FILE *fp)
+{
+       gint i, depth;
+       XMLTag *tag;
+       GList *cur;
+
+       g_return_if_fail(node != NULL);
+       g_return_if_fail(fp != NULL);
+
+       depth = g_node_depth(node) - 1;
+       for (i = 0; i < depth; i++)
+               fputs("    ", fp);
+       tag = ((XMLNode *) node->data)->tag;
+
+       fprintf(fp, "<%s", tag->tag);
+       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
+               XMLAttr *attr = (XMLAttr *) cur->data;
+
+               fprintf(fp, " %s=\"", attr->name);
+               xml_file_put_escape_str(fp, attr->value);
+               fputs("\"", fp);
+       }
+
+       if (node->children) {
+               GNode *child;
+               fputs(">\n", fp);
+
+               child = node->children;
+               while (child) {
+                       GNode *cur;
+
+                       cur = child;
+                       child = cur->next;
+                       xml_write_tree_recursive(cur, fp);
+               }
+
+               for (i = 0; i < depth; i++)
+                       fputs("    ", fp);
+               fprintf(fp, "</%s>\n", tag->tag);
+       } else
+               fputs(" />\n", fp);
+}
+
+void xml_write_tree(GNode *node, FILE *fp)
+{
+       xml_write_tree_recursive(node, fp);
+}
+
+static gpointer copy_node_func(gpointer nodedata, gpointer data)
+{
+       XMLNode *xmlnode = (XMLNode *) nodedata;
+       XMLNode *newxmlnode;
+       
+       newxmlnode = g_new0(XMLNode, 1);
+       newxmlnode->tag = xml_copy_tag(xmlnode->tag);
+       newxmlnode->element = g_strdup(xmlnode->element);
+
+       return newxmlnode;
+}
+
+GNode *xml_copy_tree(GNode *node)
+{
+       return g_node_map(node, copy_node_func, NULL);
+}

diff --git a/src/common/xml.h b/src/common/xml.h
index dadded5538f8c71bfdcc5155afa621bb5cfd3e07..b9036cee5638e1b0d88915a9de72d946ccbb7f1d 100644 (file)
--- a/src/common/xml.h
+++ b/src/common/xml.h
@@ -81,6 +81,7 @@ void xml_truncate_buf         (XMLFile        *file);
 gboolean  xml_compare_tag      (XMLFile        *file,
                                 const gchar    *name);
 
 gboolean  xml_compare_tag      (XMLFile        *file,
                                 const gchar    *name);
 

+XMLTag *xml_new_tag            (const gchar    *tag);

 XMLTag  *xml_copy_tag          (XMLTag         *tag);
 XMLAttr *xml_copy_attr         (XMLAttr        *attr);
 
 XMLTag  *xml_copy_tag          (XMLTag         *tag);
 XMLAttr *xml_copy_attr         (XMLAttr        *attr);
 


@@ -95,5 +96,8 @@ void xml_free_tag             (XMLTag         *tag);
 void xml_tag_add_attr          (XMLTag         *tag,
                                 const gchar    *name, 
                                 gchar          *value);
 void xml_tag_add_attr          (XMLTag         *tag,
                                 const gchar    *name, 
                                 gchar          *value);

+void xml_write_tree            (GNode          *node,
+                                FILE           *fp);
+GNode *xml_copy_tree           (GNode          *node);

 
 #endif /* __XML_H__ */
 
 #endif /* __XML_H__ */

diff --git a/src/compose.c b/src/compose.c
index 5624a54d5904f90adb7c32264132bbb3276e735a..6da76b2431da4f4ac722c08e14d4695fe168c3c2 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -474,6 +474,9 @@ gboolean compose_headerentry_changed_cb        (GtkWidget          *entry,
 gboolean compose_headerentry_key_press_event_cb(GtkWidget             *entry,
                                            GdkEventKey        *event,
                                            ComposeHeaderEntry *headerentry);
 gboolean compose_headerentry_key_press_event_cb(GtkWidget             *entry,
                                            GdkEventKey        *event,
                                            ComposeHeaderEntry *headerentry);

+static gboolean compose_headerentry_button_pressed (GtkWidget *entry, 
+                                                   GdkEventButton *event,
+                                                   gpointer data);

 
 static void compose_show_first_last_header (Compose *compose, gboolean show_first);
 
 
 static void compose_show_first_last_header (Compose *compose, gboolean show_first);
 


@@ -1493,7 +1496,7 @@ void compose_toolbar_cb(gint action, gpointer data)
                compose_ext_editor_cb(compose, 0, NULL);
                break;
        case A_LINEWRAP:
                compose_ext_editor_cb(compose, 0, NULL);
                break;
        case A_LINEWRAP:

-               compose_wrap_line(compose);
+               compose_wrap_line_all(compose);

                break;
        case A_ADDRBOOK:
                compose_address_cb(compose, 0, NULL);
                break;
        case A_ADDRBOOK:
                compose_address_cb(compose, 0, NULL);


@@ -1857,7 +1860,8 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
        }
 
        if (msginfo->subject && *msginfo->subject) {
        }
 
        if (msginfo->subject && *msginfo->subject) {

-               gchar *buf, *buf2, *p;
+               gchar *buf, *buf2;
+               guchar *p;

 
                buf = p = g_strdup(msginfo->subject);
                p += subject_get_prefix_length(p);
 
                buf = p = g_strdup(msginfo->subject);
                p += subject_get_prefix_length(p);


@@ -2359,7 +2363,10 @@ static void compose_attach_parts(Compose *compose, MsgInfo *msginfo)
        g_free(tmp);                                                         \
 }
 
        g_free(tmp);                                                         \
 }
 

-#define INDENT_CHARS   ">|#"
+#define DISP_WIDTH(len) \
+       ((len > 2 && conv_get_current_charset() == C_UTF_8) ? 2 : \
+        (len == 2 && conv_get_current_charset() == C_UTF_8) ? 1 : len)
+

 #define SPACE_CHARS    " \t"
 
 #warning FIXME_GTK2
 #define SPACE_CHARS    " \t"
 
 #warning FIXME_GTK2


@@ -2408,9 +2415,9 @@ static void compose_wrap_line(Compose *compose)
                } else {
                        if (ch_len == 1 
                            && strchr(prefs_common.quote_chars, *cbuf))
                } else {
                        if (ch_len == 1 
                            && strchr(prefs_common.quote_chars, *cbuf))

-                               quoted = TRUE;
-                       else if (ch_len != 1 || !isspace(*cbuf))
-                               quoted = FALSE;
+                               quoted = 1;
+                       else if (ch_len != 1 || !isspace(*(guchar *)cbuf))
+                               quoted = 0;

 
                        line_end = FALSE;
                }
 
                        line_end = FALSE;
                }


@@ -2460,8 +2467,8 @@ static void compose_wrap_line(Compose *compose)
                        ch_len = 1;
                }
 
                        ch_len = 1;
                }
 

-               if (ch_len == 1 && isspace(*cbuf))
-                       space = TRUE;
+               if (ch_len == 1 && isspace(*(guchar *)cbuf))
+                       space = 1;

 
                if (ch_len == 1 && *cbuf == '\n') {
                        gboolean replace = FALSE;
 
                if (ch_len == 1 && *cbuf == '\n') {
                        gboolean replace = FALSE;


@@ -2469,10 +2476,11 @@ static void compose_wrap_line(Compose *compose)
 
                        gtk_text_iter_forward_char(&next_iter);
 
 
                        gtk_text_iter_forward_char(&next_iter);
 

-                       if (last_ch_len == 1 && !isspace(last_ch)) {
+                       if (last_ch_len == 1 && !isspace((guchar)last_ch)) {

                                if (cur_pos + 1 < p_end) {
                                        GET_CHAR(&next_iter, cbuf, ch_len);
                                if (cur_pos + 1 < p_end) {
                                        GET_CHAR(&next_iter, cbuf, ch_len);

-                                       if (ch_len == 1 && !isspace(*cbuf))
+                                       if (ch_len == 1 &&
+                                           !isspace(*(guchar *)cbuf))

                                                replace = TRUE;
                                }
                        }
                                                replace = TRUE;
                                }
                        }


@@ -2508,7 +2516,7 @@ static void compose_wrap_line(Compose *compose)
                        gtk_text_iter_backward_char(&prev_iter);
 
                        GET_CHAR(&prev_iter, cbuf, ch_len);
                        gtk_text_iter_backward_char(&prev_iter);
 
                        GET_CHAR(&prev_iter, cbuf, ch_len);

-                       if (ch_len == 1 && isspace(*cbuf)) {
+                       if (ch_len == 1 && isspace(*(guchar *)cbuf)) {

                                gtk_text_buffer_delete(textbuf, &prev_iter, &iter);
                                iter = prev_iter;
                                p_end--;
                                gtk_text_buffer_delete(textbuf, &prev_iter, &iter);
                                iter = prev_iter;
                                p_end--;


@@ -2606,7 +2614,7 @@ static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos, guint te
                        break;
                case WAIT_FOR_INDENT_CHAR_OR_SPACE:
                        if (is_indent == FALSE && is_space == FALSE &&
                        break;
                case WAIT_FOR_INDENT_CHAR_OR_SPACE:
                        if (is_indent == FALSE && is_space == FALSE &&

-                           !isupper(cbuf[0]))
+                           !isupper((guchar)cbuf[0]))

                                goto out;
                        if (is_space == TRUE) {
                                alnum_cnt = 0;
                                goto out;
                        if (is_space == TRUE) {
                                alnum_cnt = 0;


@@ -2620,7 +2628,7 @@ static guint get_indent_length(GtkTextBuffer *textbuf, guint start_pos, guint te
                        }
                        break;
                case WAIT_FOR_INDENT_CHAR:
                        }
                        break;
                case WAIT_FOR_INDENT_CHAR:

-                       if (is_indent == FALSE && !isupper(cbuf[0]))
+                       if (is_indent == FALSE && !isupper((guchar)cbuf[0]))

                                goto out;
                        if (is_indent == TRUE) {
                                if (alnum_cnt > 0 
                                goto out;
                        if (is_indent == TRUE) {
                                if (alnum_cnt > 0 


@@ -2802,7 +2810,7 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
 
                                /* insert space if it's alphanumeric */
                                if ((cur_pos != line_pos) &&
 
                                /* insert space if it's alphanumeric */
                                if ((cur_pos != line_pos) &&

-                                   ((clen > 1) || isalnum(cb[0]))) {
+                                   ((clen > 1) || isalnum((guchar)cb[0]))) {

                                        gtk_text_buffer_insert(textbuf, &iter,
                                                               " ", 1);
                                        tlen++;
                                        gtk_text_buffer_insert(textbuf, &iter,
                                                               " ", 1);
                                        tlen++;


@@ -2843,7 +2851,7 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                }
 
                /* possible line break */
                }
 
                /* possible line break */

-               if (ch_len == 1 && isspace(*cbuf)) {
+               if (ch_len == 1 && isspace(*(guchar *)cbuf)) {

                        line_pos = cur_pos + 1;
                        line_len = cur_len + ch_len;
                }
                        line_pos = cur_pos + 1;
                        line_len = cur_len + ch_len;
                }


@@ -2869,7 +2877,7 @@ static void compose_wrap_line_all_full(Compose *compose, gboolean autowrap)
                        GET_CHAR(line_pos - 1, cbuf, clen);
 
                        /* if next character is space delete it */
                        GET_CHAR(line_pos - 1, cbuf, clen);
 
                        /* if next character is space delete it */

-                       if (clen == 1 && isspace(*cbuf)) {
+                       if (clen == 1 && isspace(*(guchar *)cbuf)) {

                                if (p_pos + i_len != line_pos ||
                                    !gtk_stext_is_uri_string
                                        (text, line_pos, tlen)) {
                                if (p_pos + i_len != line_pos ||
                                    !gtk_stext_is_uri_string
                                        (text, line_pos, tlen)) {


@@ -3452,7 +3460,7 @@ static gint compose_redirect_write_to_file(Compose *compose, const gchar *file)
                g_warning("can't change file mode\n");
        }
 
                g_warning("can't change file mode\n");
        }
 

-       while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
+       while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {

                /* should filter returnpath, delivered-to */
                if (g_strncasecmp(buf, "Return-Path:",
                                   strlen("Return-Path:")) == 0 ||
                /* should filter returnpath, delivered-to */
                if (g_strncasecmp(buf, "Return-Path:",
                                   strlen("Return-Path:")) == 0 ||


@@ -4333,17 +4341,15 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
        }
 
        /* From */
        }
 
        /* From */

-       if (!IS_IN_CUSTOM_HEADER("From")) {
-               if (compose->account->name && *compose->account->name) {
-                       compose_convert_header
-                               (buf, sizeof(buf), compose->account->name,
-                                strlen("From: "), TRUE);
-                       QUOTE_IF_REQUIRED(name, buf);
-                       fprintf(fp, "From: %s <%s>\n",
-                               name, compose->account->address);
-               } else
-                       fprintf(fp, "From: %s\n", compose->account->address);
-       }
+       if (compose->account->name && *compose->account->name) {
+               compose_convert_header
+                       (buf, sizeof(buf), compose->account->name,
+                        strlen("From: "), TRUE);
+               QUOTE_IF_REQUIRED(name, buf);
+               fprintf(fp, "From: %s <%s>\n",
+                       name, compose->account->address);
+       } else
+               fprintf(fp, "From: %s\n", compose->account->address);

        
        /* To */
        compose_write_headers_from_headerlist(compose, fp, "To", ", ");
        
        /* To */
        compose_write_headers_from_headerlist(compose, fp, "To", ", ");


@@ -4491,17 +4497,7 @@ static gint compose_write_headers(Compose *compose, FILE *fp,
                     cur = cur->next) {
                        CustomHeader *chdr = (CustomHeader *)cur->data;
 
                     cur = cur->next) {
                        CustomHeader *chdr = (CustomHeader *)cur->data;
 

-                       if (strcasecmp(chdr->name, "Date")         != 0 &&
-                           strcasecmp(chdr->name, "From")         != 0 &&
-                           strcasecmp(chdr->name, "To")           != 0 &&
-                        /* strcasecmp(chdr->name, "Sender")       != 0 && */
-                           strcasecmp(chdr->name, "Message-Id")   != 0 &&
-                           strcasecmp(chdr->name, "In-Reply-To")  != 0 &&
-                           strcasecmp(chdr->name, "References")   != 0 &&
-                           strcasecmp(chdr->name, "Mime-Version") != 0 &&
-                           strcasecmp(chdr->name, "Content-Type") != 0 &&
-                           strcasecmp(chdr->name, "Content-Transfer-Encoding")
-                           != 0) {
+                       if (custom_header_is_allowed(chdr->name)) {

                                compose_convert_header
                                        (buf, sizeof(buf),
                                         chdr->value ? chdr->value : "",
                                compose_convert_header
                                        (buf, sizeof(buf),
                                         chdr->value ? chdr->value : "",


@@ -4725,6 +4721,9 @@ static void compose_create_header_entry(Compose *compose)
        gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
        g_signal_connect(G_OBJECT(entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);
        gtk_signal_connect(GTK_OBJECT(entry), "activate", GTK_SIGNAL_FUNC(text_activated), compose);
        g_signal_connect(G_OBJECT(entry), "grab_focus",
                         G_CALLBACK(compose_grab_focus_cb), compose);

+       gtk_signal_connect(GTK_OBJECT(entry), "button-press-event", 
+                          GTK_SIGNAL_FUNC(compose_headerentry_button_pressed),
+                          NULL);

 
        address_completion_register_entry(GTK_ENTRY(entry));
 
 
        address_completion_register_entry(GTK_ENTRY(entry));
 


@@ -5082,6 +5081,8 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
                                      &geometry, GDK_HINT_MAX_SIZE);
        }
        gtk_window_set_geometry_hints(GTK_WINDOW(window), NULL,
                                      &geometry, GDK_HINT_MAX_SIZE);

+       gtk_widget_set_uposition(window, prefs_common.compose_x, 
+                                prefs_common.compose_y);

 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(compose_delete_cb), compose);
 
        g_signal_connect(G_OBJECT(window), "delete_event",
                         G_CALLBACK(compose_delete_cb), compose);


@@ -5311,9 +5312,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        }
 #endif
 
        }
 #endif
 

-       action_update_compose_menu(ifactory, compose);
-
-

        undostruct = undo_init(text);
        undo_set_change_state_func(undostruct, &compose_undo_state_changed,
                                   menubar);
        undostruct = undo_init(text);
        undo_set_change_state_func(undostruct, &compose_undo_state_changed,
                                   menubar);


@@ -5417,14 +5415,11 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                        }
                }
        }
                        }
                }
        }

+        compose->gtkaspell = gtkaspell;

 #endif
 
        compose_select_account(compose, account, TRUE);
 
 #endif
 
        compose_select_account(compose, account, TRUE);
 

-#if USE_ASPELL
-        compose->gtkaspell      = gtkaspell;
-#endif
-

        if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
                compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
 
        if (account->set_autocc && account->auto_cc && mode != COMPOSE_REEDIT)
                compose_entry_append(compose, account->auto_cc, COMPOSE_CC);
 


@@ -5441,7 +5436,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
                gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
 
        addressbook_set_target_compose(compose);
                gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(compose->header_last->combo)->entry), prefs_common.trans_hdr ? _("Newsgroups:") : "Newsgroups:");
 
        addressbook_set_target_compose(compose);

-       action_update_compose_menu(ifactory, compose);

        
        if (mode != COMPOSE_REDIRECT)
                compose_set_template_menu(compose);
        
        if (mode != COMPOSE_REDIRECT)
                compose_set_template_menu(compose);


@@ -5459,7 +5453,10 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode)
        /* Priority */
        compose->priority = PRIORITY_NORMAL;
        compose_update_priority_menu_item(compose);
        /* Priority */
        compose->priority = PRIORITY_NORMAL;
        compose_update_priority_menu_item(compose);

-       
+
+       /* Actions menu */
+       compose_update_actions_menu(compose);
+

 #if USE_GPGME
        activate_gnupg_mode(compose, account);
 #endif 
 #if USE_GPGME
        activate_gnupg_mode(compose, account);
 #endif 


@@ -5613,6 +5610,14 @@ static void compose_set_template_menu(Compose *compose)
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
 }
 
        gtk_menu_item_set_submenu(GTK_MENU_ITEM(compose->tmpl_menu), menu);
 }
 

+void compose_update_actions_menu(Compose *compose)
+{
+       GtkItemFactory *ifactory;
+
+       ifactory = gtk_item_factory_from_widget(compose->menubar);
+       action_update_compose_menu(ifactory, "/Tools/Actions", compose);
+}
+

 void compose_reflect_prefs_all(void)
 {
        GList *cur;
 void compose_reflect_prefs_all(void)
 {
        GList *cur;


@@ -6333,14 +6338,11 @@ static void compose_undo_state_changed(UndoMain *undostruct, gint undo_state,
 
        g_return_if_fail(widget != NULL);
 
 
        g_return_if_fail(widget != NULL);
 

-       debug_print("Set_undo.  UNDO:%i  REDO:%i\n", undo_state, redo_state);
-

        ifactory = gtk_item_factory_from_widget(widget);
 
        switch (undo_state) {
        case UNDO_STATE_TRUE:
                if (!undostruct->undo_state) {
        ifactory = gtk_item_factory_from_widget(widget);
 
        switch (undo_state) {
        case UNDO_STATE_TRUE:
                if (!undostruct->undo_state) {

-                       debug_print ("Set_undo - Testpoint\n");

                        undostruct->undo_state = TRUE;
                        menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
                }
                        undostruct->undo_state = TRUE;
                        menu_set_sensitive(ifactory, "/Edit/Undo", TRUE);
                }


@@ -6429,6 +6431,7 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
        Compose *compose = (Compose *)data;
 
        PrefsAccount *ac;
        Compose *compose = (Compose *)data;
 
        PrefsAccount *ac;

+       gchar *folderidentifier;

 
        ac = account_find_from_id(
                GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));
 
        ac = account_find_from_id(
                GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), MENU_VAL_ID)));


@@ -6436,6 +6439,21 @@ static void account_activated(GtkMenuItem *menuitem, gpointer data)
 
        if (ac != compose->account)
                compose_select_account(compose, ac, FALSE);
 
        if (ac != compose->account)
                compose_select_account(compose, ac, FALSE);

+
+       /* Set message save folder */
+       if (account_get_special_folder(compose->account, F_OUTBOX)) {
+               gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(compose->savemsg_checkbtn), prefs_common.savemsg);
+       }
+       gtk_signal_connect(GTK_OBJECT(compose->savemsg_checkbtn), "toggled",
+                          GTK_SIGNAL_FUNC(compose_savemsg_checkbtn_cb), compose);
+                          
+       gtk_editable_delete_text(GTK_EDITABLE(compose->savemsg_entry), 0, -1);
+       if (account_get_special_folder(compose->account, F_OUTBOX)) {
+               folderidentifier = folder_item_get_identifier(account_get_special_folder
+                                 (compose->account, F_OUTBOX));
+               gtk_entry_set_text(GTK_ENTRY(compose->savemsg_entry), folderidentifier);
+               g_free(folderidentifier);
+       }

 }
 
 static void attach_selected(GtkCList *clist, gint row, gint column,
 }
 
 static void attach_selected(GtkCList *clist, gint row, gint column,


@@ -6686,7 +6704,13 @@ static void compose_insert_sig_cb(gpointer data, guint action,
 static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
                              gpointer data)
 {
 static gint compose_delete_cb(GtkWidget *widget, GdkEventAny *event,
                              gpointer data)
 {

+       gint x, y;

        Compose *compose = (Compose *)data;
        Compose *compose = (Compose *)data;

+
+       gtkut_widget_get_uposition(widget, &x, &y);
+       prefs_common.compose_x = x;
+       prefs_common.compose_y = y;
+

        if (compose->sending)
                return TRUE;
        compose_close_cb(compose, 0, NULL);
        if (compose->sending)
                return TRUE;
        compose_close_cb(compose, 0, NULL);


@@ -6697,7 +6721,7 @@ static void compose_close_cb(gpointer data, guint action, GtkWidget *widget)
 {
        Compose *compose = (Compose *)data;
        AlertValue val;
 {
        Compose *compose = (Compose *)data;
        AlertValue val;

-       
+

        if (compose->exteditor_tag != -1) {
                if (!compose_ext_editor_kill(compose))
                        return;
        if (compose->exteditor_tag != -1) {
                if (!compose_ext_editor_kill(compose))
                        return;


@@ -7549,6 +7573,15 @@ gboolean compose_headerentry_changed_cb(GtkWidget *entry,
        return FALSE;
 }
 
        return FALSE;
 }
 

+static gboolean compose_headerentry_button_pressed
+       (GtkWidget *entry, GdkEventButton *event, gpointer data)
+{
+       /* if this is a lclick, grab the focus */
+       if (event->button == 1)
+               gtk_widget_grab_focus(entry);
+       return FALSE;
+}
+

 static void compose_show_first_last_header(Compose *compose, gboolean show_first)
 {
        GtkAdjustment *vadj;
 static void compose_show_first_last_header(Compose *compose, gboolean show_first)
 {
        GtkAdjustment *vadj;


@@ -7635,6 +7668,9 @@ static gboolean compose_send_control_enter(Compose *compose)
        if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
                return FALSE;
 
        if (!(kev->keyval == GDK_Return && (kev->state & GDK_CONTROL_MASK)))
                return FALSE;
 

+       if (compose->exteditor_tag != -1)
+               return FALSE;
+

        ifactory = gtk_item_factory_from_widget(compose->menubar);
        send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
        list = gtk_accel_groups_from_object(G_OBJECT(send_menu));
        ifactory = gtk_item_factory_from_widget(compose->menubar);
        send_menu = gtk_item_factory_get_widget(ifactory, "/Message/Send");
        list = gtk_accel_groups_from_object(G_OBJECT(send_menu));

diff --git a/src/compose.h b/src/compose.h
index d0297d90012319234a2fb1cd19e312688347a7fb..7641e2d587cbf84e449195f89cff1dcc5410425f 100644 (file)
--- a/src/compose.h
+++ b/src/compose.h
@@ -266,6 +266,8 @@ void compose_entry_select           (Compose          *compose,
 
 gint compose_send                      (Compose          *compose);
 
 
 gint compose_send                      (Compose          *compose);
 

+void compose_update_actions_menu       (Compose        *compose);
+

 void compose_reflect_prefs_all                 (void);
 void compose_reflect_prefs_pixmap_theme        (void);
 
 void compose_reflect_prefs_all                 (void);
 void compose_reflect_prefs_pixmap_theme        (void);
 

diff --git a/src/customheader.c b/src/customheader.c
index 2bcb03571da4ca0efb88477df25e0621e36e18c1..6bdfd9ee631dab2fa9e6b08faa21cf07a0637e73 100644 (file)
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -98,3 +98,23 @@ void custom_header_free(CustomHeader *ch)
        g_free(ch->value);
        g_free(ch);
 }
        g_free(ch->value);
        g_free(ch);
 }

+
+gboolean custom_header_is_allowed(const gchar *header)
+{
+       g_return_val_if_fail(header != NULL, FALSE);
+
+       if (strcasecmp(header, "Date")         != 0 &&
+           strcasecmp(header, "From")         != 0 &&
+           strcasecmp(header, "To")           != 0 &&
+        /* strcasecmp(header, "Sender")       != 0 && */
+           strcasecmp(header, "Message-Id")   != 0 &&
+           strcasecmp(header, "In-Reply-To")  != 0 &&
+           strcasecmp(header, "References")   != 0 &&
+           strcasecmp(header, "Mime-Version") != 0 &&
+           strcasecmp(header, "Content-Type") != 0 &&
+           strcasecmp(header, "Content-Transfer-Encoding")
+           != 0)
+               return TRUE;
+
+       return FALSE;
+}

diff --git a/src/customheader.h b/src/customheader.h
index 8554ea7fd52273106c3a5e5036a536ed01179354..b3d7518bfb9435d93d28a5678d065790ac3f5f3d 100644 (file)
--- a/src/customheader.h
+++ b/src/customheader.h
@@ -36,5 +36,6 @@ CustomHeader *custom_header_read_str  (const gchar    *buf);
 CustomHeader *custom_header_find       (GSList         *header_list,
                                         const gchar    *header);
 void custom_header_free                        (CustomHeader   *ch);
 CustomHeader *custom_header_find       (GSList         *header_list,
                                         const gchar    *header);
 void custom_header_free                        (CustomHeader   *ch);

+gboolean custom_header_is_allowed      (const gchar    *header);

 
 #endif /* __CUSTOMHEADER_H__ */
 
 #endif /* __CUSTOMHEADER_H__ */

diff --git a/src/enriched.c b/src/enriched.c
index bd846eef146ccc48e4fffa79059555fd975bca42..92597c96aa2b59baf0142a0f375f8e01b842d3e2 100644 (file)
--- a/src/enriched.c
+++ b/src/enriched.c
@@ -170,7 +170,7 @@ static ERTFState ertf_parse_tag(ERTFParser *parser)
        ertf_get_parenthesis (parser, buf, sizeof(buf));
        
        for (p = buf; *p != '\0'; p++) {
        ertf_get_parenthesis (parser, buf, sizeof(buf));
        
        for (p = buf; *p != '\0'; p++) {

-               if (isspace (*p)) {
+               if (isspace (*(guchar *)p)) {

                        *p = '\0';
                        break;
                }
                        *p = '\0';
                        break;
                }

diff --git a/src/folder.c b/src/folder.c
index ca2d7a157f1e031bae7d881c6df08385624a64e2..71f7688aa823b3b347e6235dae7ebc3c1255014e 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -54,15 +54,15 @@
 #include "prefs_account.h"
 
 static GList *folder_list = NULL;
 #include "prefs_account.h"
 
 static GList *folder_list = NULL;

+static GSList *class_list = NULL;
+static GSList *folder_unloaded_list = NULL;

 
 void folder_init               (Folder         *folder,
                                 const gchar    *name);
 
 
 void folder_init               (Folder         *folder,
                                 const gchar    *name);
 

-static gboolean folder_read_folder_func        (GNode          *node,
-                                        gpointer        data);

 static gchar *folder_get_list_path     (void);
 static gchar *folder_get_list_path     (void);

-static void folder_write_list_recursive        (GNode          *node,
-                                        gpointer        data);
+static GNode *folder_get_xml_node      (Folder         *folder);
+static Folder *folder_get_from_xml     (GNode          *node);

 static void folder_update_op_count_rec (GNode          *node);
 
 
 static void folder_update_op_count_rec (GNode          *node);
 
 


@@ -73,8 +73,6 @@ void folder_item_read_cache           (FolderItem *item);
 void folder_item_free_cache            (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 
 void folder_item_free_cache            (FolderItem *item);
 gint folder_item_scan_full             (FolderItem *item, gboolean filtering);
 

-static GSList *classlist;
-

 void folder_system_init(void)
 {
        folder_register_class(mh_get_class());
 void folder_system_init(void)
 {
        folder_register_class(mh_get_class());


@@ -84,13 +82,61 @@ void folder_system_init(void)
 
 GSList *folder_get_class_list(void)
 {
 
 GSList *folder_get_class_list(void)
 {

-       return classlist;
+       return class_list;

 }
 
 void folder_register_class(FolderClass *klass)
 {
 }
 
 void folder_register_class(FolderClass *klass)
 {

+       GSList *xmllist, *cur;
+

        debug_print("registering folder class %s\n", klass->idstr);
        debug_print("registering folder class %s\n", klass->idstr);

-       classlist = g_slist_append(classlist, klass);
+
+       class_list = g_slist_append(class_list, klass);
+
+       xmllist = g_slist_copy(folder_unloaded_list);
+       for (cur = xmllist; cur != NULL; cur = g_slist_next(cur)) {
+               GNode *node = (GNode *) cur->data;
+               XMLNode *xmlnode = (XMLNode *) node->data;
+               GList *cur = xmlnode->tag->attr;
+
+               for (; cur != NULL; cur = g_list_next(cur)) {
+                       XMLAttr *attr = (XMLAttr *) cur->data;
+
+                       if (!attr || !attr->name || !attr->value) continue;
+                       if (!strcmp(attr->name, "type") && !strcmp(attr->value, klass->idstr)) {
+                               Folder *folder;
+
+                               folder = folder_get_from_xml(node);
+                               folder_add(folder);
+                               folder_unloaded_list = g_slist_remove(folder_unloaded_list, node);
+
+                               cur = NULL;
+                               continue;
+                       }
+               }
+       }
+       g_slist_free(xmllist);
+}
+
+void folder_unregister_class(FolderClass *klass)
+{
+       GList *folderlist, *cur;
+
+       debug_print("unregistering folder class %s\n", klass->idstr);
+
+       class_list = g_slist_remove(class_list, klass);
+
+       folderlist = g_list_copy(folder_get_list());
+       for (cur = folderlist; cur != NULL; cur = g_list_next(cur)) {
+               Folder *folder = (Folder *) cur->data;
+
+               if (folder->klass == klass) {
+                       GNode *xmlnode = folder_get_xml_node(folder);
+                       folder_unloaded_list = g_slist_append(folder_unloaded_list, xmlnode);
+                       folder_destroy(folder);
+               }
+       }
+       g_list_free(folderlist);

 }
 
 Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)
 }
 
 Folder *folder_new(FolderClass *klass, const gchar *name, const gchar *path)


@@ -129,11 +175,18 @@ void folder_init(Folder *folder, const gchar *name)
 
 void folder_destroy(Folder *folder)
 {
 
 void folder_destroy(Folder *folder)
 {

+       FolderUpdateData hookdata;
+

        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->klass->destroy_folder != NULL);
 
        folder_list = g_list_remove(folder_list, folder);
 
        g_return_if_fail(folder != NULL);
        g_return_if_fail(folder->klass->destroy_folder != NULL);
 
        folder_list = g_list_remove(folder_list, folder);
 

+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_DESTROY_FOLDER;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);
+

        folder_tree_destroy(folder);
 
        folder->klass->destroy_folder(folder);
        folder_tree_destroy(folder);
 
        folder->klass->destroy_folder(folder);


@@ -145,6 +198,10 @@ void folder_destroy(Folder *folder)
 void folder_set_xml(Folder *folder, XMLTag *tag)
 {
        GList *cur;
 void folder_set_xml(Folder *folder, XMLTag *tag)
 {
        GList *cur;

+       FolderItem *rootitem = NULL;
+
+       if ((folder->node != NULL) && (folder->node->data != NULL))
+               rootitem = (FolderItem *) folder->node->data;

 
        for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
                XMLAttr *attr = (XMLAttr *) cur->data;
 
        for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
                XMLAttr *attr = (XMLAttr *) cur->data;


@@ -154,6 +211,11 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
                        if (folder->name != NULL)
                                g_free(folder->name);
                        folder->name = g_strdup(attr->value);
                        if (folder->name != NULL)
                                g_free(folder->name);
                        folder->name = g_strdup(attr->value);

+                       if (rootitem != NULL) {
+                               if (rootitem->name != NULL)
+                                       g_free(rootitem->name);
+                               rootitem->name = g_strdup(attr->value);
+                       }

                } else if (!strcmp(attr->name, "account_id")) {
                        PrefsAccount *account;
 
                } else if (!strcmp(attr->name, "account_id")) {
                        PrefsAccount *account;
 


@@ -164,6 +226,9 @@ void folder_set_xml(Folder *folder, XMLTag *tag)
                                folder->account = account;
                                account->folder = folder;
                        }
                                folder->account = account;
                                account->folder = folder;
                        }

+               } else if (!strcmp(attr->name, "collapsed")) {
+                       if (rootitem != NULL)
+                               rootitem->collapsed = *attr->value == '1' ? TRUE : FALSE;

                }
        }
 }
                }
        }
 }


@@ -172,13 +237,17 @@ XMLTag *folder_get_xml(Folder *folder)
 {
        XMLTag *tag;
 
 {
        XMLTag *tag;
 

-       tag = g_new0(XMLTag, 1);
-       tag->tag = g_strdup("folder");
+       tag = xml_new_tag("folder");

 
        if (folder->name)
                xml_tag_add_attr(tag, "name", g_strdup(folder->name));
        if (folder->account)
                xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", folder->account->account_id));
 
        if (folder->name)
                xml_tag_add_attr(tag, "name", g_strdup(folder->name));
        if (folder->account)
                xml_tag_add_attr(tag, "account_id", g_strdup_printf("%d", folder->account->account_id));

+       if (folder->node && folder->node->data) {
+               FolderItem *rootitem = (FolderItem *) folder->node->data;
+
+               xml_tag_add_attr(tag, "collapsed", g_strdup(rootitem->collapsed ? "1" : "0"));
+       }

 
        return tag;
 }
 
        return tag;
 }


@@ -213,7 +282,6 @@ FolderItem *folder_item_new(Folder *folder, const gchar *name, const gchar *path
        item->ret_rcpt  = FALSE;
        item->opened    = FALSE;
        item->node = NULL;
        item->ret_rcpt  = FALSE;
        item->opened    = FALSE;
        item->node = NULL;

-       item->parent = NULL;

        item->folder = NULL;
        item->account = NULL;
        item->apply_sub = FALSE;
        item->folder = NULL;
        item->account = NULL;
        item->apply_sub = FALSE;


@@ -232,7 +300,6 @@ void folder_item_append(FolderItem *parent, FolderItem *item)
        g_return_if_fail(parent->node != NULL);
        g_return_if_fail(item != NULL);
 
        g_return_if_fail(parent->node != NULL);
        g_return_if_fail(item != NULL);
 

-       item->parent = parent;

        item->folder = parent->folder;
        item->node = g_node_append_data(parent->node, item);
 }
        item->folder = parent->folder;
        item->node = g_node_append_data(parent->node, item);
 }


@@ -327,6 +394,16 @@ void folder_item_destroy(FolderItem *item)
        }
 }
 
        }
 }
 

+FolderItem *folder_item_parent(FolderItem *item)
+{
+       g_return_val_if_fail(item != NULL, NULL);
+       g_return_val_if_fail(item->node != NULL, NULL);
+
+       if (item->node->parent == NULL)
+               return NULL;
+       return (FolderItem *) item->node->parent->data;
+}
+

 void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {
        GList *cur;
 void folder_item_set_xml(Folder *folder, FolderItem *item, XMLTag *tag)
 {
        GList *cur;


@@ -435,8 +512,7 @@ XMLTag *folder_item_get_xml(Folder *folder, FolderItem *item)
                                        "locked"};
        XMLTag *tag;
 
                                        "locked"};
        XMLTag *tag;
 

-       tag = g_new0(XMLTag, 1);
-       tag->tag = g_strdup("folderitem");
+       tag = xml_new_tag("folderitem");

 
        xml_tag_add_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
        if (item->name)
 
        xml_tag_add_attr(tag, "type", g_strdup(folder_item_stype_str[item->stype]));
        if (item->name)


@@ -525,6 +601,7 @@ void folder_add(Folder *folder)
        Folder *cur_folder;
        GList *cur;
        gint i;
        Folder *cur_folder;
        GList *cur;
        gint i;

+       FolderUpdateData hookdata;

 
        g_return_if_fail(folder != NULL);
 
 
        g_return_if_fail(folder != NULL);
 


@@ -548,6 +625,11 @@ void folder_add(Folder *folder)
        }
 
        folder_list = g_list_insert(folder_list, folder, i);
        }
 
        folder_list = g_list_insert(folder_list, folder, i);

+
+       hookdata.folder = folder;
+       hookdata.update_flags = FOLDER_NEW_FOLDER;
+       hookdata.item = NULL;
+       hooks_invoke(FOLDER_UPDATE_HOOKLIST, &hookdata);

 }
 
 GList *folder_get_list(void)
 }
 
 GList *folder_get_list(void)


@@ -557,7 +639,7 @@ GList *folder_get_list(void)
 
 gint folder_read_list(void)
 {
 
 gint folder_read_list(void)
 {

-       GNode *node;
+       GNode *node, *cur;

        XMLNode *xmlnode;
        gchar *path;
 
        XMLNode *xmlnode;
        gchar *path;
 


@@ -573,8 +655,18 @@ gint folder_read_list(void)
                return -1;
        }
 
                return -1;
        }
 

-       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, 2,
-                       folder_read_folder_func, NULL);
+       cur = node->children;
+       while (cur != NULL) {
+               Folder *folder;
+
+               folder = folder_get_from_xml(cur);
+               if (folder != NULL)
+                       folder_add(folder);
+               else
+                       folder_unloaded_list = g_slist_append(folder_unloaded_list,
+                               (gpointer) xml_copy_tree(cur));
+               cur = cur->next;
+       }

 
        xml_free_tree(node);
        if (folder_list)
 
        xml_free_tree(node);
        if (folder_list)


@@ -586,26 +678,48 @@ gint folder_read_list(void)
 void folder_write_list(void)
 {
        GList *list;
 void folder_write_list(void)
 {
        GList *list;

+       GSList *slist;

        Folder *folder;
        gchar *path;
        PrefFile *pfile;
        Folder *folder;
        gchar *path;
        PrefFile *pfile;

+       GNode *rootnode;
+       XMLNode *xmlnode;
+       XMLTag *tag;

 
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
        fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
                conv_get_current_charset_str());
 
        path = folder_get_list_path();
        if ((pfile = prefs_write_open(path)) == NULL) return;
 
        fprintf(pfile->fp, "<?xml version=\"1.0\" encoding=\"%s\"?>\n",
                conv_get_current_charset_str());

-       fputs("\n<folderlist>\n", pfile->fp);
+       tag = xml_new_tag("folderlist");
+
+       xmlnode = g_new0(XMLNode, 1);
+       xmlnode->tag = tag;
+       xmlnode->element = NULL;
+
+       rootnode = g_node_new(xmlnode);

 
        for (list = folder_list; list != NULL; list = list->next) {
 
        for (list = folder_list; list != NULL; list = list->next) {

+               GNode *node;
+

                folder = list->data;
                folder = list->data;

-               folder_write_list_recursive(folder->node, pfile->fp);
+               node = folder_get_xml_node(folder);
+               if (node != NULL)
+                       g_node_append(rootnode, node);

        }
 
        }
 

-       fputs("</folderlist>\n", pfile->fp);
+       for (slist = folder_unloaded_list; slist != NULL; slist = g_slist_next(slist)) {
+               GNode *node = (GNode *) slist->data;
+
+               g_node_append(rootnode, (gpointer) xml_copy_tree(node));
+       }
+
+       xml_write_tree(rootnode, pfile->fp);

 
        if (prefs_file_close(pfile) < 0)
                g_warning("failed to write folder list.\n");
 
        if (prefs_file_close(pfile) < 0)
                g_warning("failed to write folder list.\n");

+
+       xml_free_tree(rootnode);

 }
 
 gboolean folder_scan_tree_func(GNode *node, gpointer data)
 }
 
 gboolean folder_scan_tree_func(GNode *node, gpointer data)


@@ -1036,7 +1150,7 @@ gchar *folder_item_get_name(FolderItem *item)
                 * should probably be done by a virtual function,
                 * the folder knows the ui string and how to abbrev
                */
                 * should probably be done by a virtual function,
                 * the folder knows the ui string and how to abbrev
                */

-               if (!item->parent) {
+               if (folder_item_parent(item) == NULL) {

                        name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
                } else {
                        if (FOLDER_CLASS(item->folder) == news_get_class() &&
                        name = g_strconcat(item->name, " (", item->folder->klass->uistr, ")", NULL);
                } else {
                        if (FOLDER_CLASS(item->folder) == news_get_class() &&


@@ -1767,6 +1881,52 @@ gchar *folder_item_fetch_msg(FolderItem *item, gint num)
        return folder->klass->fetch_msg(folder, item, num);
 }
 
        return folder->klass->fetch_msg(folder, item, num);
 }
 

+gint folder_item_fetch_all_msg(FolderItem *item)
+{
+       Folder *folder;
+       GSList *mlist;
+       GSList *cur;
+       gint num = 0;
+       gint ret = 0;
+
+       g_return_val_if_fail(item != NULL, -1);
+
+       debug_print("fetching all messages in %s ...\n", item->path);
+
+       folder = item->folder;
+
+       if (folder->ui_func)
+               folder->ui_func(folder, item, folder->ui_func_data ?
+                               folder->ui_func_data : GINT_TO_POINTER(num));
+
+       mlist = folder_item_get_msg_list(item);
+
+       for (cur = mlist; cur != NULL; cur = cur->next) {
+               MsgInfo *msginfo = (MsgInfo *)cur->data;
+               gchar *msg;
+
+               num++;
+               if (folder->ui_func)
+                       folder->ui_func(folder, item,
+                                       folder->ui_func_data ?
+                                       folder->ui_func_data :
+                                       GINT_TO_POINTER(num));
+
+               msg = folder_item_fetch_msg(item, msginfo->msgnum);
+               if (!msg) {
+                       g_warning("Can't fetch message %d. Aborting.\n",
+                                 msginfo->msgnum);
+                       ret = -1;
+                       break;
+               }
+               g_free(msg);
+       }
+
+       procmsg_msg_list_free(mlist);
+
+       return ret;
+}
+

 static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
 {
        static HeaderEntry hentry[] = {{"Message-ID:",  NULL, TRUE},
 static gint folder_item_get_msg_num_by_file(FolderItem *dest, const gchar *file)
 {
        static HeaderEntry hentry[] = {{"Message-ID:",  NULL, TRUE},


@@ -2070,7 +2230,7 @@ FolderItem *folder_item_move_recursive(FolderItem *src, FolderItem *dest)
 
 gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
 {
 
 gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_item)
 {

-       FolderItem *tmp = dest->parent;
+       FolderItem *tmp = folder_item_parent(dest);

        gchar * src_identifier, * dst_identifier;
        gchar * phys_srcpath, * phys_dstpath;
        
        gchar * src_identifier, * dst_identifier;
        gchar * phys_srcpath, * phys_dstpath;
        


@@ -2078,15 +2238,15 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
                }
                if (tmp == src) {
                        return F_MOVE_FAILED_DEST_IS_CHILD;
                }

-               tmp = tmp->parent;
+               tmp = folder_item_parent(tmp);;

        }
        
        }
        

-       tmp = src->parent;
+       tmp = folder_item_parent(src);

        
        src_identifier = folder_item_get_identifier(src);
        dst_identifier = folder_item_get_identifier(dest);
        
        
        src_identifier = folder_item_get_identifier(src);
        dst_identifier = folder_item_get_identifier(dest);
        

-       if(dst_identifier == NULL && dest->folder && dest->parent == NULL) {
+       if(dst_identifier == NULL && dest->folder && folder_item_parent(dest) == NULL) {

                /* dest can be a root folder */
                dst_identifier = folder_get_identifier(dest->folder);
        }
                /* dest can be a root folder */
                dst_identifier = folder_get_identifier(dest->folder);
        }


@@ -2102,7 +2262,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 

-       if (src->parent == dest || src == dest) {
+       if (folder_item_parent(src) == dest || src == dest) {

                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);
                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);


@@ -2342,6 +2502,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
 
        if (!item->cache) folder_item_read_cache(item);
 
 
        if (!item->cache) folder_item_read_cache(item);
 

+       folder_item_update_freeze();

        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
 
        while (msglist != NULL) {
                MsgInfo *msginfo = (MsgInfo *)msglist->data;
 


@@ -2350,6 +2511,7 @@ gint folder_item_remove_msgs(FolderItem *item, GSList *msglist)
                msgcache_remove_msg(item->cache, msginfo->msgnum);
                msglist = msglist->next;
        }
                msgcache_remove_msg(item->cache, msginfo->msgnum);
                msglist = msglist->next;
        }

+       folder_item_update_thaw();

 
        return ret;
 }
 
        return ret;
 }


@@ -2445,19 +2607,18 @@ gchar *folder_item_get_mark_file(FolderItem *item)
        return file;
 }
 
        return file;
 }
 

-static gboolean folder_build_tree(GNode *node, gpointer data)
+static gpointer xml_to_folder_item(gpointer nodedata, gpointer data)

 {
 {

-       Folder *folder = FOLDER(data);
+       XMLNode *xmlnode = (XMLNode *) nodedata;
+       Folder *folder = (Folder *) data;

        FolderItem *item;
        FolderItem *item;

-       XMLNode *xmlnode;

 
 

-       g_return_val_if_fail(node->data != NULL, FALSE);
-       if (!node->parent) return FALSE;
+       g_return_val_if_fail(xmlnode != NULL, NULL);
+       g_return_val_if_fail(folder != NULL, NULL);

 
 

-       xmlnode = node->data;

        if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
                g_warning("tag name != \"folderitem\"\n");
        if (strcmp2(xmlnode->tag->tag, "folderitem") != 0) {
                g_warning("tag name != \"folderitem\"\n");

-               return FALSE;
+               return NULL;

        }
 
        item = folder_item_new(folder, "", "");
        }
 
        item = folder_item_new(folder, "", "");


@@ -2465,9 +2626,9 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
                folder->klass->item_set_xml(folder, item, xmlnode->tag);
        else
                folder_item_set_xml(folder, item, xmlnode->tag);
                folder->klass->item_set_xml(folder, item, xmlnode->tag);
        else
                folder_item_set_xml(folder, item, xmlnode->tag);

-       item->node = node;
-       item->parent = FOLDER_ITEM(node->parent->data);
+

        item->folder = folder;
        item->folder = folder;

+

        switch (item->stype) {
        case F_INBOX:  folder->inbox  = item; break;
        case F_OUTBOX: folder->outbox = item; break;
        switch (item->stype) {
        case F_INBOX:  folder->inbox  = item; break;
        case F_OUTBOX: folder->outbox = item; break;


@@ -2478,29 +2639,32 @@ static gboolean folder_build_tree(GNode *node, gpointer data)
        }
        folder_item_prefs_read_config(item);
 
        }
        folder_item_prefs_read_config(item);
 

-       node->data = item;
-       xml_free_node(xmlnode);
+       return item;
+}
+
+static gboolean folder_item_set_node(GNode *node, gpointer data)
+{
+       FolderItem *item = (FolderItem *) node->data;
+       item->node = node;

 
        return FALSE;
 }
 
 
        return FALSE;
 }
 

-static gboolean folder_read_folder_func(GNode *node, gpointer data)
+static Folder *folder_get_from_xml(GNode *node)

 {
        Folder *folder;
 {
        Folder *folder;

-       FolderItem *item;

        XMLNode *xmlnode;
        GList *list;
        FolderClass *klass = NULL;
        XMLNode *xmlnode;
        GList *list;
        FolderClass *klass = NULL;

+       GNode *cur;

 
 

-       if (g_node_depth(node) != 2) return FALSE;
-       g_return_val_if_fail(node->data != NULL, FALSE);
+       g_return_val_if_fail(node->data != NULL, NULL);

 
        xmlnode = node->data;
        if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
                g_warning("tag name != \"folder\"\n");
 
        xmlnode = node->data;
        if (strcmp2(xmlnode->tag->tag, "folder") != 0) {
                g_warning("tag name != \"folder\"\n");

-               return TRUE;
+               return NULL;

        }
        }

-       g_node_unlink(node);

        list = xmlnode->tag->attr;
        for (; list != NULL; list = list->next) {
                XMLAttr *attr = list->data;
        list = xmlnode->tag->attr;
        for (; list != NULL; list = list->next) {
                XMLAttr *attr = list->data;


@@ -2509,31 +2673,28 @@ static gboolean folder_read_folder_func(GNode *node, gpointer data)
                if (!strcmp(attr->name, "type"))
                        klass = folder_get_class_from_string(attr->value);
        }
                if (!strcmp(attr->name, "type"))
                        klass = folder_get_class_from_string(attr->value);
        }

+       if (klass == NULL)
+               return NULL;

 
        folder = folder_new(klass, "", "");
 
        folder = folder_new(klass, "", "");

-       g_return_val_if_fail(folder != NULL, FALSE);
+       g_return_val_if_fail(folder != NULL, NULL);

 
 

-       item = FOLDER_ITEM(folder->node->data);
-       
-       node->data = item;
-       item->node = node;
-       g_node_destroy(folder->node);
-       folder->node = node;

        if (klass->set_xml)
                klass->set_xml(folder, xmlnode->tag);
        else
                folder_set_xml(folder, xmlnode->tag);
 
        if (klass->set_xml)
                klass->set_xml(folder, xmlnode->tag);
        else
                folder_set_xml(folder, xmlnode->tag);
 

-       if (folder->klass->item_set_xml != NULL)
-               folder->klass->item_set_xml(folder, item, xmlnode->tag);
-       else
-               folder_item_set_xml(folder, item, xmlnode->tag);
-
-       folder_add(folder);
-       g_node_traverse(node, G_PRE_ORDER, G_TRAVERSE_ALL, -1,
-                       folder_build_tree, folder);
+       cur = node->children;
+       while (cur != NULL) {
+               GNode *itemnode;

 
 

-       return FALSE;
+               itemnode = g_node_map(cur, xml_to_folder_item, (gpointer) folder);
+               g_node_append(folder->node, itemnode);
+               cur = cur->next;
+       }
+       g_node_traverse(folder->node, G_IN_ORDER, G_TRAVERSE_ALL, -1, folder_item_set_node, NULL);
+       
+       return folder;

 }
 
 static gchar *folder_get_list_path(void)
 }
 
 static gchar *folder_get_list_path(void)


@@ -2554,91 +2715,60 @@ static gchar *folder_get_list_path(void)
        fputs("\"", fp);                                \
 }
 
        fputs("\"", fp);                                \
 }
 

-gint xml_attr_cmp_name(gconstpointer _a, gconstpointer _b)
+static gpointer folder_item_to_xml(gpointer nodedata, gpointer data)

 {
 {

-       XMLAttr *a = (XMLAttr *) _a;
-       XMLAttr *b = (XMLAttr *) _b;
-
-       return g_str_equal(a->name, b->name) ? 0 : 1;
-}
-
-static void folder_write_list_recursive(GNode *node, gpointer data)
-{
-       FILE *fp = (FILE *)data;
-       FolderItem *item;
-       gint i, depth;
+       FolderItem *item = (FolderItem *) nodedata;
+       XMLNode *xmlnode;

        XMLTag *tag;
        XMLTag *tag;

-       GList *cur;
-
-       g_return_if_fail(node != NULL);
-       g_return_if_fail(fp != NULL);
-
-       item = FOLDER_ITEM(node->data);
-       g_return_if_fail(item != NULL);
-
-       depth = g_node_depth(node);
-       for (i = 0; i < depth; i++)
-               fputs("    ", fp);
-       if (depth == 1) {
-               XMLTag *folderitem_tag;
-               GList *cur;

 
 

-               if (item->folder->klass->get_xml != NULL)
-                       tag = item->folder->klass->get_xml(item->folder);
-               else
-                       tag = folder_get_xml(item->folder);
+       g_return_val_if_fail(item != NULL, NULL);

 
 

-               if (item->folder->klass->item_get_xml != NULL)
-                       folderitem_tag = item->folder->klass->item_get_xml(item->folder, item);
-               else
-                       folderitem_tag = folder_item_get_xml(item->folder, item);
-               xml_tag_add_attr(tag, "type", g_strdup(item->folder->klass->idstr));
+       if (item->folder->klass->item_get_xml != NULL)
+               tag = item->folder->klass->item_get_xml(item->folder, item);
+       else
+               tag = folder_item_get_xml(item->folder, item);

 
 

-               for (cur = folderitem_tag->attr; cur != NULL; cur = g_list_next(cur)) {
-                       XMLAttr *attr = (XMLAttr *) cur->data;
+       xmlnode = g_new0(XMLNode, 1);
+       xmlnode->tag = tag;
+       xmlnode->element = NULL;

 
 

-                       if (g_list_find_custom(tag->attr, attr, xml_attr_cmp_name) == NULL)
-                               tag->attr = g_list_append(tag->attr, xml_copy_attr(attr));
-               }
-               xml_free_tag(folderitem_tag);
+       return xmlnode;
+}

 
 

-       } else {
+static GNode *folder_get_xml_node(Folder *folder)
+{
+       GNode *node;
+       XMLNode *xmlnode;
+       XMLTag *tag;

 
 

-               if (item->folder->klass->item_get_xml != NULL)
-                       tag = item->folder->klass->item_get_xml(item->folder, item);
-               else
-                       tag = folder_item_get_xml(item->folder, item);
+       g_return_val_if_fail(folder != NULL, NULL);

 
 

-       }
+       if (folder->klass->get_xml != NULL)
+               tag = folder->klass->get_xml(folder);
+       else
+               tag = folder_get_xml(folder);

 
 

-       fprintf(fp, "<%s", tag->tag);
-       for (cur = tag->attr; cur != NULL; cur = g_list_next(cur)) {
-               XMLAttr *attr = (XMLAttr *) cur->data;
+       xml_tag_add_attr(tag, "type", g_strdup(folder->klass->idstr));

 
 

-               fprintf(fp, " %s=\"", attr->name);
-               xml_file_put_escape_str(fp, attr->value);
-               fputs("\"", fp);
-       }
+       xmlnode = g_new0(XMLNode, 1);
+       xmlnode->tag = tag;
+       xmlnode->element = NULL;

 
 

-       if (node->children) {
-               GNode *child;
-               fputs(">\n", fp);
+       node = g_node_new(xmlnode);
+       if (folder->node->children) {
+               GNode *cur;

 
 

-               child = node->children;
-               while (child) {
-                       GNode *cur;
+               cur = folder->node->children;
+               while (cur) {
+                       GNode *xmlnode;

 
 

-                       cur = child;
-                       child = cur->next;
-                       folder_write_list_recursive(cur, data);
+                       xmlnode = g_node_map(cur, folder_item_to_xml, (gpointer) folder);
+                       g_node_append(node, xmlnode);
+                       cur = cur->next;

                }
                }

+       }

 
 

-               for (i = 0; i < depth; i++)
-                       fputs("    ", fp);
-               fprintf(fp, "</%s>\n", tag->tag);
-       } else
-               fputs(" />\n", fp);
-       xml_free_tag(tag);
+       return node;

 }
 
 static void folder_update_op_count_rec(GNode *node)
 }
 
 static void folder_update_op_count_rec(GNode *node)


@@ -2803,7 +2933,7 @@ void folder_item_restore_persist_prefs(FolderItem *item, GHashTable *pptable)
         * folderlist.xml, we need to call the old stuff first before
         * setting things that apply both to Main and Claws. */
        folder_item_prefs_read_config(item); 
         * folderlist.xml, we need to call the old stuff first before
         * setting things that apply both to Main and Claws. */
        folder_item_prefs_read_config(item); 

-        
+

        item->collapsed = pp->collapsed;
        item->thread_collapsed = pp->thread_collapsed;
        item->threaded  = pp->threaded;
        item->collapsed = pp->collapsed;
        item->thread_collapsed = pp->thread_collapsed;
        item->threaded  = pp->threaded;


@@ -2866,8 +2996,6 @@ void folder_item_apply_processing(FolderItem *item)
        g_return_if_fail(item != NULL);
        
        processing_list = item->prefs->processing;
        g_return_if_fail(item != NULL);
        
        processing_list = item->prefs->processing;

-       if (processing_list == NULL)
-               return;

 
        folder_item_update_freeze();
 
 
        folder_item_update_freeze();
 

diff --git a/src/folder.h b/src/folder.h
index fdab9572a60a7e54f7727569536b90452f81fc5d..0896a620247785bdab773125c391f80d456e6be7 100644 (file)
--- a/src/folder.h
+++ b/src/folder.h
@@ -98,9 +98,11 @@ typedef enum
 
 typedef enum
 {
 
 typedef enum
 {

-       FOLDER_TREE_CHANGED = 1 << 0,
-       FOLDER_NEW_FOLDERITEM = 1 << 1,
-       FOLDER_REMOVE_FOLDERITEM = 1 << 2,
+       FOLDER_NEW_FOLDER               = 1 << 0,
+       FOLDER_DESTROY_FOLDER           = 1 << 1,
+       FOLDER_TREE_CHANGED             = 1 << 2,
+       FOLDER_NEW_FOLDERITEM           = 1 << 3,
+       FOLDER_REMOVE_FOLDERITEM        = 1 << 4,

 } FolderUpdateFlags;
 
 typedef enum
 } FolderUpdateFlags;
 
 typedef enum


@@ -278,8 +280,6 @@ struct _FolderItem
 
        GNode *node;
 
 
        GNode *node;
 

-       FolderItem *parent;
-

        Folder *folder;
 
        PrefsAccount *account;
        Folder *folder;
 
        PrefsAccount *account;


@@ -319,6 +319,7 @@ struct _FolderItemUpdateData
 
 void       folder_system_init          (void);
 void       folder_register_class       (FolderClass    *klass);
 
 void       folder_system_init          (void);
 void       folder_register_class       (FolderClass    *klass);

+void       folder_unregister_class     (FolderClass    *klass);

 Folder     *folder_new                 (FolderClass    *type,
                                         const gchar    *name,
                                         const gchar    *path);
 Folder     *folder_new                 (FolderClass    *type,
                                         const gchar    *name,
                                         const gchar    *path);


@@ -339,6 +340,7 @@ void        folder_item_append              (FolderItem     *parent,
 void        folder_item_remove         (FolderItem     *item);
 void        folder_item_remove_children        (FolderItem     *item);
 void        folder_item_destroy                (FolderItem     *item);
 void        folder_item_remove         (FolderItem     *item);
 void        folder_item_remove_children        (FolderItem     *item);
 void        folder_item_destroy                (FolderItem     *item);

+FolderItem *folder_item_parent         (FolderItem     *item);

 
 void       folder_item_set_xml         (Folder          *folder,
                                         FolderItem      *item,
 
 void       folder_item_set_xml         (Folder          *folder,
                                         FolderItem      *item,


@@ -405,6 +407,7 @@ GSList *folder_item_get_msg_list    (FolderItem     *item);
 /* return value is locale charset */
 gchar *folder_item_fetch_msg           (FolderItem     *item,
                                         gint            num);
 /* return value is locale charset */
 gchar *folder_item_fetch_msg           (FolderItem     *item,
                                         gint            num);

+gint   folder_item_fetch_all_msg       (FolderItem     *item);

 gint   folder_item_add_msg             (FolderItem     *dest,
                                         const gchar    *file,
                                         MsgFlags       *flags,
 gint   folder_item_add_msg             (FolderItem     *dest,
                                         const gchar    *file,
                                         MsgFlags       *flags,

diff --git a/src/folderutils.c b/src/folderutils.c
index eb1da22c046815d7637bce75926c0a7534baaf3e..099631b7b69ba2dee72ed1b62df0de7fe07a4b30 100644 (file)
--- a/src/folderutils.c
+++ b/src/folderutils.c
@@ -56,22 +56,20 @@ void folderutils_delete_duplicates(FolderItem *item)
                }
        }
 
                }
        }
 

-       if (duplist) {
-               if (prefs_common.immediate_exec) {
-                       FolderItem *trash = item->folder->trash;
+       if (prefs_common.immediate_exec) {
+               FolderItem *trash = item->folder->trash;

 
 

-                       if (item->stype == F_TRASH || trash == NULL)
-                               folder_item_remove_msgs(item, duplist);
-                       else
-                               folder_item_move_msgs(trash, duplist);
-               } else {
-                       for (cur = duplist; cur != NULL; cur = g_slist_next(cur)) {
-                               MsgInfo *msginfo = (MsgInfo *) cur->data;
+               if (item->stype == F_TRASH || trash == NULL)
+                       folder_item_remove_msgs(item, duplist);
+               else
+                       folder_item_move_msgs(trash, duplist);
+       } else {
+               for (cur = duplist; cur != NULL; cur = g_slist_next(cur)) {
+                       MsgInfo *msginfo = (MsgInfo *) cur->data;

 
 

-                               procmsg_msginfo_set_to_folder(msginfo, NULL);
-                               procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
-                               procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);
-                       }
+                       procmsg_msginfo_set_to_folder(msginfo, NULL);
+                       procmsg_msginfo_unset_flags(msginfo, MSG_MARKED, MSG_MOVE | MSG_COPY);
+                       procmsg_msginfo_set_flags(msginfo, MSG_DELETED, 0);

                }
        }
        g_slist_free(duplist);
                }
        }
        g_slist_free(duplist);

diff --git a/src/folderview.c b/src/folderview.c
index 3f474dd8e8bad954ddb4083f5d04d833b89b8558..71caae308a8d2e14fbfc4761e3400b1274b9bf9f 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -180,6 +180,10 @@ static void folderview_col_resized (GtkCList       *clist,
                                         gint            width,
                                         FolderView     *folderview);
 
                                         gint            width,
                                         FolderView     *folderview);
 

+static void folderview_download_cb     (FolderView     *folderview,
+                                        guint           action,
+                                        GtkWidget      *widget);
+

 static void folderview_update_tree_cb  (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);
 static void folderview_update_tree_cb  (FolderView     *folderview,
                                         guint           action,
                                         GtkWidget      *widget);


@@ -290,7 +294,6 @@ static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Properties..."),         NULL, NULL, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Properties..."),         NULL, NULL, 0, NULL},
        {N_("/_Processing..."),         NULL, folderview_processing_cb, 0, NULL},

-       {N_("/_Scoring..."),            NULL, folderview_scoring_cb, 0, NULL}

 };
 #endif
 
 };
 #endif
 


@@ -323,6 +326,8 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},

+       {N_("/Down_load"),              NULL, folderview_download_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},

        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/R_ebuild folder tree"),   NULL, folderview_update_tree_cb, 1, NULL},


@@ -342,6 +347,8 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
                                        NULL, folderview_new_news_group_cb, 0, NULL},
        {N_("/_Remove newsgroup"),      NULL, folderview_rm_news_group_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
                                        NULL, folderview_new_news_group_cb, 0, NULL},
        {N_("/_Remove newsgroup"),      NULL, folderview_rm_news_group_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},

+       {N_("/Down_load"),              NULL, folderview_download_cb, 0, NULL},
+       {N_("/---"),                    NULL, NULL, 0, "<Separator>"},

        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
                                        NULL, folderview_update_tree_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},


@@ -609,6 +616,8 @@ void folderview_init(FolderView *folderview)
                }
                normal_color_style = gtk_style_copy(normal_style);
                normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;
                }
                normal_color_style = gtk_style_copy(normal_style);
                normal_color_style->fg[GTK_STATE_NORMAL] = folderview->color_new;

+
+               gtk_widget_set_style(ctree, normal_style);

        }
 
        if (!bold_style) {
        }
 
        if (!bold_style) {


@@ -1160,7 +1169,7 @@ static void folderview_update_node(FolderView *folderview, GtkCTreeNode *node)
        }
        g_free(name);
 
        }
        g_free(name);
 

-       if (!item->parent) {
+       if (!folder_item_parent(item)) {

                gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
                gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");
                gtk_ctree_node_set_text(ctree, node, COL_NEW,    "-");
                gtk_ctree_node_set_text(ctree, node, COL_UNREAD, "-");
                gtk_ctree_node_set_text(ctree, node, COL_TOTAL,  "-");


@@ -1449,6 +1458,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
        gboolean rename_folder   = FALSE;
        gboolean move_folder     = FALSE;
        gboolean delete_folder   = FALSE;
        gboolean rename_folder   = FALSE;
        gboolean move_folder     = FALSE;
        gboolean delete_folder   = FALSE;

+       gboolean download_msg    = FALSE;

        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
        gboolean remove_tree     = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
        gboolean remove_tree     = FALSE;


@@ -1499,7 +1509,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;
 
        if (folderview->mainwin->lock_count == 0) {
                new_folder = TRUE;

-               if (item->parent == NULL) {
+               if (folder_item_parent(item) == NULL) {

                        update_tree = remove_tree = TRUE;
                        if (folder->account)
                                folder_property = TRUE;
                        update_tree = remove_tree = TRUE;
                        if (folder->account)
                                folder_property = TRUE;


@@ -1507,7 +1517,7 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                        mark_all_read = search_folder = folder_property = TRUE;
                        
                if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP /* || FOLDER_TYPE(folder) == F_MBOX */) {
                        mark_all_read = search_folder = folder_property = TRUE;
                        
                if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP /* || FOLDER_TYPE(folder) == F_MBOX */) {

-                       if (item->parent == NULL)
+                       if (folder_item_parent(item) == NULL)

                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
                                move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
                                move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;


@@ -1517,10 +1527,19 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
                                folder_processing = TRUE;
                                folder_processing = TRUE;
                        else if (item->stype == F_OUTBOX)
                                folder_processing = TRUE;

+                       if (0 == item->total_msgs)
+                               search_folder = FALSE;

                } else if (FOLDER_TYPE(folder) == F_NEWS) {
                } else if (FOLDER_TYPE(folder) == F_NEWS) {

-                       if (item->parent != NULL)
+                       if (folder_item_parent(item) != NULL)

                                delete_folder = folder_scoring = folder_processing = TRUE;
                }
                                delete_folder = folder_scoring = folder_processing = TRUE;
                }

+               if (FOLDER_TYPE(folder) == F_IMAP ||
+                   FOLDER_TYPE(folder) == F_NEWS) {
+                       if (folder_item_parent(item) != NULL && 
+                           item->no_select == FALSE &&
+                           !prefs_common.work_offline)
+                               download_msg = TRUE;
+               }

                if (item->unread_msgs < 1) 
                        mark_all_read = FALSE;
        }
                if (item->unread_msgs < 1) 
                        mark_all_read = FALSE;
        }


@@ -1545,7 +1564,6 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                SET_SENS(mail_factory, "/Search folder...", search_folder);
                SET_SENS(mail_factory, "/Properties...", folder_property);
                SET_SENS(mail_factory, "/Processing...", folder_processing);
                SET_SENS(mail_factory, "/Search folder...", search_folder);
                SET_SENS(mail_factory, "/Properties...", folder_property);
                SET_SENS(mail_factory, "/Processing...", folder_processing);

-               SET_SENS(mail_factory, "/Scoring...", folder_scoring);

        } else if (FOLDER_TYPE(folder) == F_IMAP) {
                popup = folderview->imap_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
        } else if (FOLDER_TYPE(folder) == F_IMAP) {
                popup = folderview->imap_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));


@@ -1554,25 +1572,25 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);
                SET_SENS(imap_factory, "/Move folder...", move_folder);
                SET_SENS(imap_factory, "/Delete folder", delete_folder);
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);
                SET_SENS(imap_factory, "/Move folder...", move_folder);
                SET_SENS(imap_factory, "/Delete folder", delete_folder);

+               SET_SENS(imap_factory, "/Download", download_msg);

                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
                SET_SENS(imap_factory, "/Search folder...", search_folder);
                SET_SENS(imap_factory, "/Properties...", folder_property);
                SET_SENS(imap_factory, "/Processing...", folder_processing);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Remove IMAP4 account", remove_tree);
                SET_SENS(imap_factory, "/Search folder...", search_folder);
                SET_SENS(imap_factory, "/Properties...", folder_property);
                SET_SENS(imap_factory, "/Processing...", folder_processing);

-               SET_SENS(imap_factory, "/Scoring...", folder_scoring);

        } else if (FOLDER_TYPE(folder) == F_NEWS) {
                popup = folderview->news_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(news_factory, "/Mark all read", mark_all_read);
                SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
                SET_SENS(news_factory, "/Remove newsgroup", delete_folder);
        } else if (FOLDER_TYPE(folder) == F_NEWS) {
                popup = folderview->news_popup;
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(news_factory, "/Mark all read", mark_all_read);
                SET_SENS(news_factory, "/Subscribe to newsgroup...", new_folder);
                SET_SENS(news_factory, "/Remove newsgroup", delete_folder);

+               SET_SENS(news_factory, "/Download", download_msg);

                SET_SENS(news_factory, "/Check for new messages", update_tree);
                SET_SENS(news_factory, "/Remove news account", remove_tree);
                SET_SENS(news_factory, "/Search folder...", search_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(news_factory, "/Processing...", folder_processing);
                SET_SENS(news_factory, "/Check for new messages", update_tree);
                SET_SENS(news_factory, "/Remove news account", remove_tree);
                SET_SENS(news_factory, "/Search folder...", search_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(news_factory, "/Processing...", folder_processing);

-               SET_SENS(news_factory, "/Scoring...", folder_scoring);

 #if 0
        } else if (FOLDER_TYPE(folder) == F_MBOX) {
                popup = folderview->mbox_popup;
 #if 0
        } else if (FOLDER_TYPE(folder) == F_MBOX) {
                popup = folderview->mbox_popup;


@@ -1583,7 +1601,6 @@ static gboolean folderview_button_pressed(GtkWidget *ctree, GdkEventButton *even
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);

-               SET_SENS(mbox_factory, "/Scoring...", folder_scoring);

 #endif
        } else
                return FALSE;
 #endif
        } else
                return FALSE;


@@ -1824,6 +1841,70 @@ static GtkCTreeNode *folderview_find_by_name(GtkCTree *ctree,
        return NULL;
 }
 
        return NULL;
 }
 

+static void folderview_download_func(Folder *folder, FolderItem *item,
+                                    gpointer data)
+{
+       GList *list;
+
+       for (list = folderview_list; list != NULL; list = list->next) {
+               FolderView *folderview = (FolderView *)list->data;
+               MainWindow *mainwin = folderview->mainwin;
+               gchar *str;
+
+               str = g_strdup_printf
+                       (_("Downloading messages in %s ..."), item->path);
+               main_window_progress_set(mainwin,
+                                        GPOINTER_TO_INT(data), item->total_msgs);
+               STATUSBAR_PUSH(mainwin, str);
+               STATUSBAR_POP(mainwin);
+               g_free(str);
+       }
+}
+
+static void folderview_download_cb(FolderView *folderview, guint action,
+                                  GtkWidget *widget)
+{
+       GtkCTree *ctree = GTK_CTREE(folderview->ctree);
+       MainWindow *mainwin = folderview->mainwin;
+       FolderItem *item;
+
+       if (!folderview->selected) return;
+
+       item = gtk_ctree_node_get_row_data(ctree, folderview->selected);
+       g_return_if_fail(item != NULL);
+       g_return_if_fail(item->folder != NULL);
+#if 0
+       if (!prefs_common.online_mode) {
+               if (alertpanel(_("Offline"),
+                              _("You are offline. Go online?"),
+                              _("Yes"), _("No"), NULL) == G_ALERTDEFAULT)
+                       main_window_toggle_online(folderview->mainwin, TRUE);
+               else
+                       return;
+       }
+#endif
+       main_window_cursor_wait(mainwin);
+       inc_lock();
+       main_window_lock(mainwin);
+       gtk_widget_set_sensitive(folderview->ctree, FALSE);
+       main_window_progress_on(mainwin);
+       GTK_EVENTS_FLUSH();
+       folder_set_ui_func(item->folder, folderview_download_func, NULL);
+       if (folder_item_fetch_all_msg(item) < 0) {
+               gchar *name;
+
+               name = trim_string(item->name, 32);
+               alertpanel_error(_("Error occurred while downloading messages in `%s'."), name);
+               g_free(name);
+       }
+       folder_set_ui_func(item->folder, NULL, NULL);
+       main_window_progress_off(mainwin);
+       gtk_widget_set_sensitive(folderview->ctree, TRUE);
+       main_window_unlock(mainwin);
+       inc_unlock();
+       main_window_cursor_normal(mainwin);
+}
+

 static void folderview_update_tree_cb(FolderView *folderview, guint action,
                                      GtkWidget *widget)
 {
 static void folderview_update_tree_cb(FolderView *folderview, guint action,
                                      GtkWidget *widget)
 {


@@ -1868,7 +1949,7 @@ void folderview_create_folder_node(FolderView *folderview, FolderItem *item)
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *node, *parent_node;
        
        gchar *text[N_FOLDER_COLS] = {NULL, "0", "0", "0"};
        GtkCTreeNode *node, *parent_node;
        

-       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, item->parent);
+       parent_node = gtk_ctree_find_by_row_data(ctree, NULL, folder_item_parent(item));

        if (parent_node == NULL)
                return;
 
        if (parent_node == NULL)
                return;
 


@@ -2186,7 +2267,7 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
        item = gtk_ctree_node_get_row_data(ctree, node);
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);

-       if (item->parent) return;
+       if (folder_item_parent(item)) return;

 
        name_ = trim_string(item->folder->name, 32);
        Xstrdup_a(name, name_, return);
 
        name_ = trim_string(item->folder->name, 32);
        Xstrdup_a(name, name_, return);


@@ -2201,10 +2282,8 @@ static void folderview_remove_mailbox_cb(FolderView *folderview, guint action,
 
        folderview_unselect(folderview);
        summary_clear_all(folderview->summaryview);
 
        folderview_unselect(folderview);
        summary_clear_all(folderview->summaryview);

-       gtk_ctree_remove_node(ctree, node);

 
        folder_destroy(item->folder);
 
        folder_destroy(item->folder);

-       folder_write_list();

 }
 
 static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,
 }
 
 static void folderview_new_imap_folder_cb(FolderView *folderview, guint action,


@@ -2499,7 +2578,7 @@ static void folderview_property_cb(FolderView *folderview, guint action,
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 
        g_return_if_fail(item != NULL);
        g_return_if_fail(item->folder != NULL);
 

-       if (item->parent == NULL && item->folder->account)
+       if (folder_item_parent(item) == NULL && item->folder->account)

                account_open(item->folder->account);
        else {
                prefs_folder_item_open(item);
                account_open(item->folder->account);
        else {
                prefs_folder_item_open(item);


@@ -2553,7 +2632,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
        gint status;
 
        src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
        gint status;
 
        src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);

-       from_parent = from_folder->parent;
+       from_parent = folder_item_parent(from_folder);

        buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);
        buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
        STATUSBAR_PUSH(folderview->mainwin, buf);
        g_free(buf);


@@ -2574,7 +2653,7 @@ static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
 
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
 
                folderview_sort_folders(folderview, 
                        gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 

-                               NULL, new_folder->parent), new_folder->folder);
+                               NULL, folder_item_parent(new_folder)), new_folder->folder);

                folderview_select(folderview, new_folder);
        } else {
                statusbar_verbosity_set(FALSE);         
                folderview_select(folderview, new_folder);
        } else {
                statusbar_verbosity_set(FALSE);         


@@ -2765,7 +2844,7 @@ gboolean folderview_update_folder(gpointer source, gpointer userdata)
                node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
                if (node != NULL)
                        gtk_ctree_remove_node(GTK_CTREE(ctree), node);
                node = gtk_ctree_find_by_row_data(GTK_CTREE(ctree), NULL, hookdata->item);
                if (node != NULL)
                        gtk_ctree_remove_node(GTK_CTREE(ctree), node);

-       } else if (hookdata->update_flags & FOLDER_TREE_CHANGED)
+       } else if (hookdata->update_flags & (FOLDER_TREE_CHANGED | FOLDER_NEW_FOLDER | FOLDER_DESTROY_FOLDER))

                folderview_set(folderview);
 
        return FALSE;
                folderview_set(folderview);
 
        return FALSE;

diff --git a/src/gtk/gtkshruler.c b/src/gtk/gtkshruler.c
index 5a79123ce1014852d20afc3d2bf9e99514d3651f..45062ecd67433621fe902f873ef82eaf1c1505f5 100644 (file)
--- a/src/gtk/gtkshruler.c
+++ b/src/gtk/gtkshruler.c
@@ -1,6 +1,6 @@
 /* GtkSHRuler
  *
 /* GtkSHRuler
  *

- *  Copyright (C) 2000 Alfons Hoogervorst
+ *  Copyright (C) 2000-2004 Alfons Hoogervorst & The Sylpheed Claws Team

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public


@@ -25,7 +25,7 @@
  * last parameter has the distance between two ticks (which is
  * the width of the fixed font character!
  * 
  * last parameter has the distance between two ticks (which is
  * the width of the fixed font character!
  * 

- * -- Alfons (alfons@proteus.demon.nl)
+ * -- Alfons

  */
 
 #include <math.h>
  */
 
 #include <math.h>

diff --git a/src/gtk/gtkshruler.h b/src/gtk/gtkshruler.h
index 2d6ddb2345cfd68d15cb2c223670ba9efd70e426..bf7e0cde5002fd60c3756088f890a5d65fec33aa 100644 (file)
--- a/src/gtk/gtkshruler.h
+++ b/src/gtk/gtkshruler.h
@@ -1,5 +1,5 @@
 /* GTKSHRuler
 /* GTKSHRuler

- * Copyright (C) 2000 Alfons Hoogervorst
+ * Copyright (C) 2000-2004 Alfons Hoogervorst & The Sylpheed Claws Team

  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public

diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index 4abec525f8596b07a90cfb9449fa89cf811427b8..ac9fe554dff9c4c4a53fb6af5ea4a928aa908302 100644 (file)
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -32,6 +32,7 @@
 #warning FIXME_GTK2
 /* #include <gtk/gtkthemes.h> */
 #include <gtk/gtkbindings.h>
 #warning FIXME_GTK2
 /* #include <gtk/gtkthemes.h> */
 #include <gtk/gtkbindings.h>

+#include <gtk/gtkitemfactory.h>

 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <sys/stat.h>


@@ -111,6 +112,105 @@ void gtkut_button_set_create(GtkWidget **bbox,
        }
 }
 
        }
 }
 

+static void combo_button_size_request(GtkWidget *widget,
+                                     GtkRequisition *requisition,
+                                     gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (combo->arrow->allocation.height != requisition->height)
+               gtk_widget_set_usize(combo->arrow, -1, requisition->height);
+}
+
+static void combo_button_enter(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_PRELIGHT) {
+               gtk_widget_set_state(combo->arrow, GTK_STATE_PRELIGHT);
+               gtk_widget_queue_draw(combo->arrow);
+       }
+       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_PRELIGHT) {
+               gtk_widget_set_state(combo->button, GTK_STATE_PRELIGHT);
+               gtk_widget_queue_draw(combo->button);
+       }
+}
+
+static void combo_button_leave(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (GTK_WIDGET_STATE(combo->arrow) != GTK_STATE_NORMAL) {
+               gtk_widget_set_state(combo->arrow, GTK_STATE_NORMAL);
+               gtk_widget_queue_draw(combo->arrow);
+       }
+       if (GTK_WIDGET_STATE(combo->button) != GTK_STATE_NORMAL) {
+               gtk_widget_set_state(combo->button, GTK_STATE_NORMAL);
+               gtk_widget_queue_draw(combo->button);
+       }
+}
+
+static gint combo_button_arrow_pressed(GtkWidget *widget, GdkEventButton *event,
+                                      gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       if (!event) return FALSE;
+
+       gtk_menu_popup(GTK_MENU(combo->menu), NULL, NULL,
+                      menu_button_position, combo->button,
+                      event->button, event->time);
+
+       return FALSE;
+}
+
+static void combo_button_destroy(GtkWidget *widget, gpointer data)
+{
+       ComboButton *combo = (ComboButton *)data;
+
+       gtk_object_destroy(GTK_OBJECT(combo->factory));
+       g_free(combo);
+}
+
+ComboButton *gtkut_combo_button_create(GtkWidget *button,
+                                      GtkItemFactoryEntry *entries,
+                                      gint n_entries, const gchar *path,
+                                      gpointer data)
+{
+       ComboButton *combo;
+       GtkWidget *arrow;
+
+       combo = g_new0(ComboButton, 1);
+
+       combo->arrow = gtk_button_new();
+       arrow = gtk_arrow_new(GTK_ARROW_DOWN, GTK_SHADOW_OUT);
+       gtk_container_add(GTK_CONTAINER(combo->arrow), arrow);
+       GTK_WIDGET_UNSET_FLAGS(combo->arrow, GTK_CAN_FOCUS);
+       gtk_widget_show_all(combo->arrow);
+
+       combo->button = button;
+       combo->menu = menu_create_items(entries, n_entries, path,
+                                       &combo->factory, data);
+       combo->data = data;
+
+       gtk_signal_connect(GTK_OBJECT(combo->button), "size_request",
+                          GTK_SIGNAL_FUNC(combo_button_size_request), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->button), "enter",
+                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->button), "leave",
+                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "enter",
+                          GTK_SIGNAL_FUNC(combo_button_enter), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "leave",
+                          GTK_SIGNAL_FUNC(combo_button_leave), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "button_press_event",
+                          GTK_SIGNAL_FUNC(combo_button_arrow_pressed), combo);
+       gtk_signal_connect(GTK_OBJECT(combo->arrow), "destroy",
+                          GTK_SIGNAL_FUNC(combo_button_destroy), combo);
+
+       return combo;
+}
+

 #define CELL_SPACING 1
 #define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
                                    (((row) + 1) * CELL_SPACING) + \
 #define CELL_SPACING 1
 #define ROW_TOP_YPIXEL(clist, row) (((clist)->row_height * (row)) + \
                                    (((row) + 1) * CELL_SPACING) + \

diff --git a/src/gtk/gtkutils.h b/src/gtk/gtkutils.h
index 90b7eb0f0d1c4feb0fdebcc2593aea8690b6bb7b..3a5517b2ba90470bb8ce68abde28b19ac340b880 100644 (file)
--- a/src/gtk/gtkutils.h
+++ b/src/gtk/gtkutils.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -33,11 +33,23 @@
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcombo.h>
 #include <gtk/gtktextview.h>

+#include <gtk/gtkitemfactory.h>

 #include <stdlib.h>
 #if HAVE_WCHAR_H
 #  include <wchar.h>
 #endif
 
 #include <stdlib.h>
 #if HAVE_WCHAR_H
 #  include <wchar.h>
 #endif
 

+typedef struct _ComboButton    ComboButton;
+
+struct _ComboButton
+{
+       GtkWidget *arrow;
+       GtkWidget *button;
+       GtkWidget *menu;
+       GtkItemFactory *factory;
+       gpointer data;
+};
+

 #define GTK_EVENTS_FLUSH() \
 { \
        while (gtk_events_pending()) \
 #define GTK_EVENTS_FLUSH() \
 { \
        while (gtk_events_pending()) \


@@ -92,6 +104,12 @@ void gtkut_button_set_create                (GtkWidget      **bbox,
                                         GtkWidget      **button3,
                                         const gchar     *label3);
 
                                         GtkWidget      **button3,
                                         const gchar     *label3);
 

+ComboButton *gtkut_combo_button_create (GtkWidget              *button,
+                                        GtkItemFactoryEntry    *entries,
+                                        gint                    n_entries,
+                                        const gchar            *path,
+                                        gpointer                data);
+

 void gtkut_ctree_node_move_if_on_the_edge
                                        (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);
 void gtkut_ctree_node_move_if_on_the_edge
                                        (GtkCTree       *ctree,
                                         GtkCTreeNode   *node);

diff --git a/src/gtk/gtkvscrollbutton.c b/src/gtk/gtkvscrollbutton.c
index 7b33b7af3f7651d18fe83e0db460f7af688a874a..0dd1c4b55e49b1fd75feb62ad4f5bcf53a1f5bd4 100644 (file)
--- a/src/gtk/gtkvscrollbutton.c
+++ b/src/gtk/gtkvscrollbutton.c
@@ -285,6 +285,7 @@ static gint gtk_vscrollbutton_scroll(GtkVScrollbutton *scrollbutton)
        gtk_signal_emit_by_name(GTK_OBJECT
                                (scrollbutton->adjustment),
                                "value_changed");
        gtk_signal_emit_by_name(GTK_OBJECT
                                (scrollbutton->adjustment),
                                "value_changed");

+       gtk_widget_queue_resize(GTK_WIDGET(scrollbutton)); /* ensure resize */

     }
 
     return return_val;
     }
 
     return return_val;

diff --git a/src/html.c b/src/html.c
index f10c55b26ae6739f9fca3ff0dfb6c0211793928c..47d6adcbd3a538a509171487b3bea8243216845f 100644 (file)
--- a/src/html.c
+++ b/src/html.c
@@ -519,7 +519,7 @@ static HTMLTag *html_get_tag(const gchar *str)
 {
        HTMLTag *tag;
        gchar *tmp;
 {
        HTMLTag *tag;
        gchar *tmp;

-       gchar *tmpp;
+       guchar *tmpp;

 
        g_return_val_if_fail(str != NULL, NULL);
 
 
        g_return_val_if_fail(str != NULL, NULL);
 


@@ -664,7 +664,7 @@ static HTMLState html_parse_tag(HTMLParser *parser)
                   !strcmp(tag->name, "li")     ||
                   !strcmp(tag->name, "table")  ||
                   !strcmp(tag->name, "tr")     ||
                   !strcmp(tag->name, "li")     ||
                   !strcmp(tag->name, "table")  ||
                   !strcmp(tag->name, "tr")     ||

-                  (tag->name[0] == 'h' && isdigit(tag->name[1]))) {
+                  (tag->name[0] == 'h' && isdigit((guchar)tag->name[1]))) {

                if (!parser->newline) {
                        parser->space = FALSE;
                        html_append_char(parser, '\n');
                if (!parser->newline) {
                        parser->space = FALSE;
                        html_append_char(parser, '\n');


@@ -673,7 +673,7 @@ static HTMLState html_parse_tag(HTMLParser *parser)
        } else if (!strcmp(tag->name, "/table") ||
                   (tag->name[0] == '/' &&
                    tag->name[1] == 'h' &&
        } else if (!strcmp(tag->name, "/table") ||
                   (tag->name[0] == '/' &&
                    tag->name[1] == 'h' &&

-                   isdigit(tag->name[1]))) {
+                   isdigit((guchar)tag->name[1]))) {

                if (!parser->empty_line) {
                        parser->space = FALSE;
                        if (!parser->newline) html_append_char(parser, '\n');
                if (!parser->empty_line) {
                        parser->space = FALSE;
                        if (!parser->newline) html_append_char(parser, '\n');


@@ -721,7 +721,7 @@ static void html_parse_special(HTMLParser *parser)
                html_append_str(parser, val, -1);
                parser->state = HTML_NORMAL;
                return;
                html_append_str(parser, val, -1);
                parser->state = HTML_NORMAL;
                return;

-       } else if (symbol_name[1] == '#' && isdigit(symbol_name[2])) {
+       } else if (symbol_name[1] == '#' && isdigit((guchar)symbol_name[2])) {

                gint ch;
 
                ch = atoi(symbol_name + 2);
                gint ch;
 
                ch = atoi(symbol_name + 2);

diff --git a/src/imap.c b/src/imap.c
index 414ee3f6f949c6068028cdbc755b3c2a75f5da10..9e3abfca6bc0cec29f9ca91a42407468f45a74db 100644 (file)
--- a/src/imap.c
+++ b/src/imap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -1242,6 +1242,12 @@ static gint imap_scan_tree(Folder *folder)
                        log_warning(_("root folder %s does not exist\n"), real_path);
                        g_ptr_array_free(argbuf, TRUE);
                        g_free(real_path);
                        log_warning(_("root folder %s does not exist\n"), real_path);
                        g_ptr_array_free(argbuf, TRUE);
                        g_free(real_path);

+
+                       if (!folder->node) {
+                               item = folder_item_new(folder, folder->name, NULL);
+                               item->folder = folder;
+                               folder->node = item->node = g_node_new(item);
+                       }

                        return -1;
                }
                g_ptr_array_free(argbuf, TRUE);
                        return -1;
                }
                g_ptr_array_free(argbuf, TRUE);


@@ -1363,8 +1369,8 @@ static gint imap_scan_tree_recursive(IMAPSession *session, FolderItem *item)
                if (!strcmp(new_item->path, "INBOX")) {
                        new_item->stype = F_INBOX;
                        folder->inbox = new_item;
                if (!strcmp(new_item->path, "INBOX")) {
                        new_item->stype = F_INBOX;
                        folder->inbox = new_item;

-               } else if (!item->parent || item->stype == F_INBOX) {
-                       const gchar *base;
+               } else if (!folder_item_parent(item) || item->stype == F_INBOX) {
+                       gchar *base;

 
                        base = g_basename(new_item->path);
 
 
                        base = g_basename(new_item->path);
 


@@ -1614,7 +1620,7 @@ static FolderItem *imap_create_folder(Folder *folder, FolderItem *parent,
        session = imap_session_get(folder);
        if (!session) return NULL;
 
        session = imap_session_get(folder);
        if (!session) return NULL;
 

-       if (!parent->parent && strcmp(name, "INBOX") == 0)
+       if (!folder_item_parent(parent) && strcmp(name, "INBOX") == 0)

                dirpath = g_strdup(name);
        else if (parent->path)
                dirpath = g_strconcat(parent->path, "/", name, NULL);
                dirpath = g_strdup(name);
        else if (parent->path)
                dirpath = g_strconcat(parent->path, "/", name, NULL);


@@ -1975,7 +1981,7 @@ static SockInfo *imap_init_sock(SockInfo *sock)
 
 static GList *imap_parse_namespace_str(gchar *str)
 {
 
 static GList *imap_parse_namespace_str(gchar *str)
 {

-       gchar *p = str;
+       guchar *p = str;

        gchar *name;
        gchar *separator;
        IMAPNameSpace *namespace;
        gchar *name;
        gchar *separator;
        IMAPNameSpace *namespace;


@@ -2167,7 +2173,7 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
        g_return_val_if_fail(str != NULL, cur_pos);
 
        /* read the next line if the current response buffer is empty */
        g_return_val_if_fail(str != NULL, cur_pos);
 
        /* read the next line if the current response buffer is empty */

-       while (isspace(*cur_pos)) cur_pos++;
+       while (isspace(*(guchar *)cur_pos)) cur_pos++;

        while (*cur_pos == '\0') {
                if ((nextline = sock_getline(sock)) == NULL)
                        return cur_pos;
        while (*cur_pos == '\0') {
                if ((nextline = sock_getline(sock)) == NULL)
                        return cur_pos;


@@ -2178,7 +2184,7 @@ static gchar *imap_parse_atom(SockInfo *sock, gchar *src,
                debug_print("IMAP4< %s\n", nextline);
                g_free(nextline);
 
                debug_print("IMAP4< %s\n", nextline);
                g_free(nextline);
 

-               while (isspace(*cur_pos)) cur_pos++;
+               while (isspace(*(guchar *)cur_pos)) cur_pos++;

        }
 
        if (!strncmp(cur_pos, "NIL", 3)) {
        }
 
        if (!strncmp(cur_pos, "NIL", 3)) {


@@ -2233,7 +2239,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
 
        g_return_val_if_fail(str != NULL, cur_pos);
 
 
        g_return_val_if_fail(str != NULL, cur_pos);
 

-       while (isspace(*cur_pos)) cur_pos++;
+       while (isspace(*(guchar *)cur_pos)) cur_pos++;

 
        g_return_val_if_fail(*cur_pos == '{', cur_pos);
 
 
        g_return_val_if_fail(*cur_pos == '{', cur_pos);
 


@@ -2260,7 +2266,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
        *headers = g_strndup(cur_pos, len);
        cur_pos += len;
 
        *headers = g_strndup(cur_pos, len);
        cur_pos += len;
 

-       while (isspace(*cur_pos)) cur_pos++;
+       while (isspace(*(guchar *)cur_pos)) cur_pos++;

        while (*cur_pos == '\0') {
                if ((nextline = sock_getline(sock)) == NULL)
                        return cur_pos;
        while (*cur_pos == '\0') {
                if ((nextline = sock_getline(sock)) == NULL)
                        return cur_pos;


@@ -2270,7 +2276,7 @@ static gchar *imap_get_header(SockInfo *sock, gchar *cur_pos, gchar **headers,
                debug_print("IMAP4< %s\n", nextline);
                g_free(nextline);
 
                debug_print("IMAP4< %s\n", nextline);
                g_free(nextline);
 

-               while (isspace(*cur_pos)) cur_pos++;
+               while (isspace(*(guchar *)cur_pos)) cur_pos++;

        }
 
        return cur_pos;
        }
 
        return cur_pos;


@@ -3484,7 +3490,7 @@ static gchar *imap_utf8_to_modified_utf7(const gchar *from)
                        norm_utf7_len -= 2;
                        from_tmp++;
                        from_len--;
                        norm_utf7_len -= 2;
                        from_tmp++;
                        from_len--;

-               } else if (IS_PRINT(*from_tmp)) {
+               } else if (IS_PRINT(*(guchar *)from_tmp)) {

                        /* printable ascii char */
                        *norm_utf7_p = *from_tmp;
                        norm_utf7_p++;
                        /* printable ascii char */
                        *norm_utf7_p = *from_tmp;
                        norm_utf7_p++;


@@ -3496,7 +3502,7 @@ static gchar *imap_utf8_to_modified_utf7(const gchar *from)
 
                        /* unprintable char: convert to UTF-7 */
                        p = from_tmp;
 
                        /* unprintable char: convert to UTF-7 */
                        p = from_tmp;

-                       while (!IS_PRINT(*p) && conv_len < from_len) {
+                       while (!IS_PRINT(*(guchar *)p) && conv_len < from_len) {

                                mb_len = mblen(p, MB_LEN_MAX);
                                if (mb_len <= 0) {
                                        g_warning("wrong multibyte sequence\n");
                                mb_len = mblen(p, MB_LEN_MAX);
                                if (mb_len <= 0) {
                                        g_warning("wrong multibyte sequence\n");

diff --git a/src/inc.c b/src/inc.c
index 98c0dded5ab8557e9f150f5efcf93d53f32383c6..2de2414e1dc999a22778b4ac5c2312a2a3ff351e 100644 (file)
--- a/src/inc.c
+++ b/src/inc.c
@@ -81,8 +81,8 @@ static GdkBitmap *okxpmmask;
 
 static void inc_finished               (MainWindow             *mainwin,
                                         gboolean                new_messages);
 
 static void inc_finished               (MainWindow             *mainwin,
                                         gboolean                new_messages);

-static gint inc_account_mail           (PrefsAccount           *account,
-                                        MainWindow             *mainwin);
+static gint inc_account_mail_real      (MainWindow             *mainwin,
+                                        PrefsAccount           *account);

 
 static IncProgressDialog *inc_progress_dialog_create
                                        (gboolean                autocheck);
 
 static IncProgressDialog *inc_progress_dialog_create
                                        (gboolean                autocheck);


@@ -181,7 +181,7 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
                        return;
                }
        } else {
                        return;
                }
        } else {

-               account_new_msgs = inc_account_mail(cur_account, mainwin);
+               account_new_msgs = inc_account_mail_real(mainwin, cur_account);

                if (account_new_msgs > 0)
                        new_msgs += account_new_msgs;
        }
                if (account_new_msgs > 0)
                        new_msgs += account_new_msgs;
        }


@@ -196,10 +196,10 @@ void inc_mail(MainWindow *mainwin, gboolean notify)
 void inc_pop_before_smtp(PrefsAccount *acc)
 {
        /* FIXME: assumes to attach to first main window */
 void inc_pop_before_smtp(PrefsAccount *acc)
 {
        /* FIXME: assumes to attach to first main window */

-       inc_account_mail(acc, mainwindow_get_mainwindow());
+       inc_account_mail(mainwindow_get_mainwindow(), acc);

 }
 
 }
 

-static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
+static gint inc_account_mail_real(MainWindow *mainwin, PrefsAccount *account)

 {
        IncProgressDialog *inc_dialog;
        IncSession *session;
 {
        IncProgressDialog *inc_dialog;
        IncSession *session;


@@ -245,6 +245,30 @@ static gint inc_account_mail(PrefsAccount *account, MainWindow *mainwin)
        return 0;
 }
 
        return 0;
 }
 

+gint inc_account_mail(MainWindow *mainwin, PrefsAccount *account)
+{
+       gint new_msgs;
+
+       if (inc_lock_count) return 0;
+
+       if (prefs_common.work_offline)
+               if (alertpanel(_("Offline warning"), 
+                              _("You're working offline. Override?"),
+                              _("Yes"), _("No"), NULL) != G_ALERTDEFAULT)
+               return;
+
+       inc_autocheck_timer_remove();
+       main_window_lock(mainwin);
+
+       new_msgs = inc_account_mail_real(mainwin, account);
+
+       inc_finished(mainwin, new_msgs > 0);
+       main_window_unlock(mainwin);
+       inc_autocheck_timer_set();
+
+       return new_msgs;
+}
+

 void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
                          gboolean notify)
 {
 void inc_all_account_mail(MainWindow *mainwin, gboolean autocheck,
                          gboolean notify)
 {


@@ -386,10 +410,7 @@ static void inc_progress_dialog_clear(IncProgressDialog *inc_dialog)
        progress_dialog_set_value(inc_dialog->dialog, 0.0);
        progress_dialog_set_label(inc_dialog->dialog, "");
        if (inc_dialog->mainwin)
        progress_dialog_set_value(inc_dialog->dialog, 0.0);
        progress_dialog_set_label(inc_dialog->dialog, "");
        if (inc_dialog->mainwin)

-               gtk_progress_set_show_text
-                       (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
-       gtk_progress_bar_update
-               (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
+               main_window_progress_off(inc_dialog->mainwin);

 }
 
 static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
 }
 
 static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)


@@ -399,11 +420,7 @@ static void inc_progress_dialog_destroy(IncProgressDialog *inc_dialog)
        inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
 
        if (inc_dialog->mainwin)
        inc_dialog_list = g_list_remove(inc_dialog_list, inc_dialog);
 
        if (inc_dialog->mainwin)

-               gtk_progress_set_show_text
-                       (GTK_PROGRESS(inc_dialog->mainwin->progressbar), FALSE);
-       gtk_progress_bar_update
-               (GTK_PROGRESS_BAR(inc_dialog->mainwin->progressbar), 0.0);
-
+               main_window_progress_off(inc_dialog->mainwin);

        progress_dialog_destroy(inc_dialog->dialog);
 
        g_free(inc_dialog);
        progress_dialog_destroy(inc_dialog->dialog);
 
        g_free(inc_dialog);


@@ -1102,8 +1119,12 @@ static gint inc_spool_account(PrefsAccount *account)
        else 
                mbox = g_strconcat(account->local_mbox,
                                   G_DIR_SEPARATOR_S, logname, NULL);
        else 
                mbox = g_strconcat(account->local_mbox,
                                   G_DIR_SEPARATOR_S, logname, NULL);

+       

        result = get_spool(inbox, mbox);
        g_free(mbox);
        result = get_spool(inbox, mbox);
        g_free(mbox);

+       
+       statusbar_pop_all();
+       

        return result;
 }
 
        return result;
 }
 

diff --git a/src/inc.h b/src/inc.h
index 045bb11c95fe06f69f334516bb1444cfc13b728d..09c352ba47d93782b139bce5c9309ef22902334d 100644 (file)
--- a/src/inc.h
+++ b/src/inc.h
@@ -73,7 +73,9 @@ struct _IncSession
 #define TIMEOUT_ITV    200
 
 void inc_mail                  (MainWindow     *mainwin,
 #define TIMEOUT_ITV    200
 
 void inc_mail                  (MainWindow     *mainwin,

-                                gboolean notify);
+                                gboolean        notify);
+gint inc_account_mail          (MainWindow     *mainwin,
+                                PrefsAccount   *account);

 void inc_all_account_mail      (MainWindow     *mainwin,
                                 gboolean        autocheck,
                                 gboolean        notify);
 void inc_all_account_mail      (MainWindow     *mainwin,
                                 gboolean        autocheck,
                                 gboolean        notify);

diff --git a/src/main.c b/src/main.c
index 88271a2f0449e1f3e5a6c540718753eeacc0b866..43adc18ebda3afbe3eff6af1b74505306de7f75c 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -51,8 +51,10 @@
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_actions.h"
 #include "prefs_common.h"
 #include "prefs_account.h"
 #include "prefs_actions.h"

+#include "prefs_ext_prog.h"

 #include "prefs_fonts.h"
 #include "prefs_spelling.h"
 #include "prefs_fonts.h"
 #include "prefs_spelling.h"

+#include "prefs_themes.h"

 #include "prefs_display_header.h"
 #include "account.h"
 #include "procmsg.h"
 #include "prefs_display_header.h"
 #include "account.h"
 #include "procmsg.h"


@@ -254,8 +256,9 @@ int main(int argc, char *argv[])
        sgpgme_init();
        pgpmime_init();
 #endif
        sgpgme_init();
        pgpmime_init();
 #endif

-
+       prefs_themes_init();

        prefs_fonts_init();
        prefs_fonts_init();

+       prefs_ext_prog_init();

 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
        prefs_spelling_init();
 #ifdef USE_ASPELL
        gtkaspell_checkers_init();
        prefs_spelling_init();


@@ -372,7 +375,7 @@ static void save_all_caches(FolderItem *item, gpointer data)
 static void exit_sylpheed(MainWindow *mainwin)
 {
        gchar *filename;
 static void exit_sylpheed(MainWindow *mainwin)
 {
        gchar *filename;

-       GList *list;
+       GList *list, *cur;

 
        debug_print("shutting down\n");
 
 
        debug_print("shutting down\n");
 


@@ -393,11 +396,6 @@ static void exit_sylpheed(MainWindow *mainwin)
        /* save all state before exiting */
        folder_write_list();
        folder_func_to_all_folders(save_all_caches, NULL);
        /* save all state before exiting */
        folder_write_list();
        folder_func_to_all_folders(save_all_caches, NULL);

-       for (list = folder_get_list(); list != NULL; list = g_list_next(list)) {
-               Folder *folder = FOLDER(list->data);
-
-               folder_tree_destroy(folder);
-       }

 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);
 
        main_window_get_size(mainwin);
        main_window_get_position(mainwin);


@@ -436,8 +434,9 @@ static void exit_sylpheed(MainWindow *mainwin)
        pgpmime_done();
        sgpgme_done();
 #endif
        pgpmime_done();
        sgpgme_done();
 #endif

-
+       prefs_themes_done();

        prefs_fonts_done();
        prefs_fonts_done();

+       prefs_ext_prog_done();

 #ifdef USE_ASPELL       
        prefs_spelling_done();
        gtkaspell_checkers_quit();
 #ifdef USE_ASPELL       
        prefs_spelling_done();
        gtkaspell_checkers_quit();

diff --git a/src/mainwindow.c b/src/mainwindow.c
index 29c00527198a1000cfbd303352c14608f7e5a5d1..2c21dff63aa41f08b016247d848c656379b27361 100644 (file)
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -109,7 +109,15 @@ static gboolean toolbar_account_button_pressed     (GtkWidget      *widget,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 #endif
                                                 GdkEventButton *event,
                                                 gpointer        data);
 #endif

-static gboolean ac_label_button_pressed                (GtkWidget      *widget,
+
+static void toolbar_child_attached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+static void toolbar_child_detached             (GtkWidget      *widget,
+                                                GtkWidget      *child,
+                                                gpointer        data);
+
+static void ac_label_button_pressed            (GtkWidget      *widget,

                                                 GdkEventButton *event,
                                                 gpointer        data);
 static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,
                                                 GdkEventButton *event,
                                                 gpointer        data);
 static void ac_menu_popup_closed               (GtkMenuShell   *menu_shell,


@@ -381,8 +389,10 @@ static void new_account_cb  (MainWindow    *mainwin,
                                  guint          action,
                                  GtkWidget     *widget);
 
                                  guint          action,
                                  GtkWidget     *widget);
 

-static void account_menu_cb     (GtkMenuItem   *menuitem,
-                                 gpointer       data);
+static void account_selector_menu_cb    (GtkMenuItem   *menuitem,
+                                         gpointer       data);
+static void account_receive_menu_cb     (GtkMenuItem   *menuitem,
+                                         gpointer       data);

 
 static void prefs_open_cb      (GtkMenuItem    *menuitem,
                                 gpointer        data);
 
 static void prefs_open_cb      (GtkMenuItem    *menuitem,
                                 gpointer        data);


@@ -617,11 +627,14 @@ static GtkItemFactoryEntry mainwin_entries[] =
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},
        {N_("/_View/_Update summary"),          "<control><alt>U", update_summary_cb,  0, NULL},
 
        {N_("/_Message"),                       NULL, NULL, 0, "<Branch>"},

-       {N_("/_Message/Get new ma_il"),         "<control>I",   inc_mail_cb, 0, NULL},
-       {N_("/_Message/Get from _all accounts"),
+       {N_("/_Message/Recei_ve"),              NULL, NULL, 0, "<Branch>"},
+       {N_("/_Message/Recei_ve/Get from _current account"),
+                                               "<control>I",   inc_mail_cb, 0, NULL},
+       {N_("/_Message/Recei_ve/Get from _all accounts"),

                                                "<shift><control>I", inc_all_account_mail_cb, 0, NULL},
                                                "<shift><control>I", inc_all_account_mail_cb, 0, NULL},

-       {N_("/_Message/Cancel receivin_g"),     NULL, inc_cancel_cb, 0, NULL},
-       {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
+       {N_("/_Message/Recei_ve/Cancel receivin_g"),
+                                               NULL, inc_cancel_cb, 0, NULL},
+       {N_("/_Message/Recei_ve/---"),          NULL, NULL, 0, "<Separator>"},

        {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},
        {N_("/_Message/_Send queued messages"), NULL, send_queue_cb, 0, NULL},
        {N_("/_Message/---"),                   NULL, NULL, 0, "<Separator>"},
        {N_("/_Message/Compose a_n email message"),     "<control>M", compose_mail_cb, 0, NULL},


@@ -818,6 +831,10 @@ MainWindow *main_window_create(SeparateType type)
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);
        handlebox = gtk_handle_box_new();
        gtk_widget_show(handlebox);
        gtk_box_pack_start(GTK_BOX(vbox), handlebox, FALSE, FALSE, 0);

+       gtk_signal_connect(GTK_OBJECT(handlebox), "child_attached",
+                          GTK_SIGNAL_FUNC(toolbar_child_attached), mainwin);
+       gtk_signal_connect(GTK_OBJECT(handlebox), "child_detached",
+                          GTK_SIGNAL_FUNC(toolbar_child_detached), mainwin);

 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;
 
        /* link window to mainwin->window to avoid gdk warnings */
        mainwin->window       = window;


@@ -921,6 +938,8 @@ MainWindow *main_window_create(SeparateType type)
                (GTK_STATUSBAR(statusbar), "Folder View");
        mainwin->summaryview_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Summary View");
                (GTK_STATUSBAR(statusbar), "Folder View");
        mainwin->summaryview_cid = gtk_statusbar_get_context_id
                (GTK_STATUSBAR(statusbar), "Summary View");

+       mainwin->messageview_cid = gtk_statusbar_get_context_id
+               (GTK_STATUSBAR(statusbar), "Message View");

 
        /* allocate colors for summary view and folder view */
        summaryview->color_marked.red = summaryview->color_marked.green = 0;
 
        /* allocate colors for summary view and folder view */
        summaryview->color_marked.red = summaryview->color_marked.green = 0;


@@ -1009,7 +1028,7 @@ MainWindow *main_window_create(SeparateType type)
        toolbar_main_set_sensitive(mainwin);
 
        /* create actions menu */
        toolbar_main_set_sensitive(mainwin);
 
        /* create actions menu */

-       action_update_mainwin_menu(ifactory, mainwin);
+       main_window_update_actions_menu(mainwin);

 
        /* attach accel groups to main window */
 #define        ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win)        \
 
        /* attach accel groups to main window */
 #define        ADD_MENU_ACCEL_GROUP_TO_WINDOW(menu,win)        \


@@ -1063,6 +1082,14 @@ void main_window_destroy(MainWindow *mainwin)
        messageview_destroy(mainwin->messageview);
 }
 
        messageview_destroy(mainwin->messageview);
 }
 

+void main_window_update_actions_menu(MainWindow *mainwin)
+{
+       GtkItemFactory *ifactory;
+
+       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
+       action_update_mainwin_menu(ifactory, "/Tools/Actions", mainwin);
+}
+

 void main_window_cursor_wait(MainWindow *mainwin)
 {
 
 void main_window_cursor_wait(MainWindow *mainwin)
 {
 


@@ -1177,39 +1204,86 @@ void main_window_set_summary_column(void)
        }
 }
 
        }
 }
 

-void main_window_set_account_menu(GList *account_list)
+static void main_window_set_account_selector_menu(MainWindow *mainwin,
+                                                 GList *account_list)

 {
 {

-       GList *cur, *cur_ac, *cur_item;
+       GList *cur_ac, *cur_item;

        GtkWidget *menuitem;
        GtkWidget *menuitem;

-       MainWindow *mainwin;

        PrefsAccount *ac_prefs;
 
        PrefsAccount *ac_prefs;
 

-       for (cur = mainwin_list; cur != NULL; cur = cur->next) {
-               mainwin = (MainWindow *)cur->data;
+       /* destroy all previous menu item */
+       cur_item = GTK_MENU_SHELL(mainwin->ac_menu)->children;
+       while (cur_item != NULL) {
+               GList *next = cur_item->next;
+               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
+               cur_item = next;
+       }

 
 

-               /* destroy all previous menu item */
-               cur_item = GTK_MENU_SHELL(mainwin->ac_menu)->children;
-               while (cur_item != NULL) {
-                       GList *next = cur_item->next;
-                       gtk_widget_destroy(GTK_WIDGET(cur_item->data));
-                       cur_item = next;
-               }
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name
+                        ? ac_prefs->account_name : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_append(GTK_MENU(mainwin->ac_menu), menuitem);
+               gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+                                  GTK_SIGNAL_FUNC(account_selector_menu_cb),
+                                  ac_prefs);
+       }
+}
+
+static void main_window_set_account_receive_menu(MainWindow *mainwin,
+                                                GList *account_list)
+{
+       GList *cur_ac, *cur_item;
+       GtkWidget *menu;
+       GtkWidget *menuitem;
+       PrefsAccount *ac_prefs;

 
 

-               for (cur_ac = account_list; cur_ac != NULL;
-                    cur_ac = cur_ac->next) {
-                       ac_prefs = (PrefsAccount *)cur_ac->data;
-
-                       menuitem = gtk_menu_item_new_with_label
-                               (ac_prefs->account_name
-                                ? ac_prefs->account_name : _("Untitled"));
-                       gtk_widget_show(menuitem);
-                       gtk_menu_shell_append(GTK_MENU_SHELL(mainwin->ac_menu),
-                                             menuitem);
-                       g_signal_connect(G_OBJECT(menuitem), "activate",
-                                        G_CALLBACK(account_menu_cb),
-                                        ac_prefs);
+       menu = gtk_item_factory_get_widget(mainwin->menu_factory,
+                                          "/Message/Receive");
+
+       /* search for separator */
+       for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
+            cur_item = cur_item->next) {
+               if (GTK_BIN(cur_item->data)->child == NULL) {
+                       cur_item = cur_item->next;
+                       break;

                }
        }
                }
        }

+
+       /* destroy all previous menu item */
+       while (cur_item != NULL) {
+               GList *next = cur_item->next;
+               gtk_widget_destroy(GTK_WIDGET(cur_item->data));
+               cur_item = next;
+       }
+
+       for (cur_ac = account_list; cur_ac != NULL; cur_ac = cur_ac->next) {
+               ac_prefs = (PrefsAccount *)cur_ac->data;
+
+               menuitem = gtk_menu_item_new_with_label
+                       (ac_prefs->account_name ? ac_prefs->account_name
+                        : _("Untitled"));
+               gtk_widget_show(menuitem);
+               gtk_menu_append(GTK_MENU(menu), menuitem);
+               gtk_signal_connect(GTK_OBJECT(menuitem), "activate",
+                                  GTK_SIGNAL_FUNC(account_receive_menu_cb),
+                                  ac_prefs);
+       }
+}
+
+void main_window_set_account_menu(GList *account_list)
+{
+       GList *cur;
+       MainWindow *mainwin;
+
+       for (cur = mainwin_list; cur != NULL; cur = cur->next) {
+               mainwin = (MainWindow *)cur->data;
+               main_window_set_account_selector_menu(mainwin, account_list);
+               main_window_set_account_receive_menu(mainwin, account_list);
+       }

 }
 
 static void main_window_show_cur_account(MainWindow *mainwin)
 }
 
 static void main_window_show_cur_account(MainWindow *mainwin)


@@ -1361,6 +1435,9 @@ void main_window_toggle_message_view(MainWindow *mainwin)
                              GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        }
 
                              GTK_ARROW_DOWN, GTK_SHADOW_OUT);
        }
 

+       if (mainwin->messageview->visible == FALSE)
+               messageview_clear(mainwin->messageview);
+

        main_window_set_menu_sensitive(mainwin);
 
        prefs_common.msgview_visible = mainwin->messageview->visible;
        main_window_set_menu_sensitive(mainwin);
 
        prefs_common.msgview_visible = mainwin->messageview->visible;


@@ -1445,6 +1522,30 @@ void main_window_get_position(MainWindow *mainwin)
        }
 }
 
        }
 }
 

+void main_window_progress_on(MainWindow *mainwin)
+{
+       gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), TRUE);
+       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+}
+
+void main_window_progress_off(MainWindow *mainwin)
+{
+       gtk_progress_set_show_text(GTK_PROGRESS(mainwin->progressbar), FALSE);
+       gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar), 0.0);
+       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), "");
+}
+
+void main_window_progress_set(MainWindow *mainwin, gint cur, gint total)
+{
+       gchar buf[32];
+
+       g_snprintf(buf, sizeof(buf), "%d / %d", cur, total);
+       gtk_progress_set_format_string(GTK_PROGRESS(mainwin->progressbar), buf);
+       gtk_progress_bar_update(GTK_PROGRESS_BAR(mainwin->progressbar),
+                               (cur == 0 && total == 0) ? 0 :
+                               (gfloat)cur / (gfloat)total);
+}
+

 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 {
        GList *list;
 void main_window_empty_trash(MainWindow *mainwin, gboolean confirm)
 {
        GList *list;


@@ -1506,8 +1607,6 @@ void main_window_add_mailbox(MainWindow *mainwin)
        folder_set_ui_func(folder, scan_tree_func, mainwin);
        folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);
        folder_set_ui_func(folder, scan_tree_func, mainwin);
        folder_scan_tree(folder);
        folder_set_ui_func(folder, NULL, NULL);

-
-       folderview_set(mainwin->folderview);

 }
 
 SensitiveCond main_window_get_current_state(MainWindow *mainwin)
 }
 
 SensitiveCond main_window_get_current_state(MainWindow *mainwin)


@@ -1523,7 +1622,7 @@ SensitiveCond main_window_get_current_state(MainWindow *mainwin)
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;
                state |= M_UNLOCKED;
        if (selection != SUMMARY_NONE)
                state |= M_MSG_EXIST;

-       if (item && item->path && item->parent && !item->no_select) {
+       if (item && item->path && folder_item_parent(item) && !item->no_select) {

                state |= M_EXEC;
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;
                state |= M_EXEC;
                /*              if (item->folder->type != F_NEWS) */
                state |= M_ALLOW_DELETE;


@@ -1578,10 +1677,12 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
        GtkItemFactory *ifactory = mainwin->menu_factory;
        SensitiveCond state;
        gboolean sensitive;
        GtkItemFactory *ifactory = mainwin->menu_factory;
        SensitiveCond state;
        gboolean sensitive;

+       GtkWidget *menu;

        GtkWidget *menuitem;
        SummaryView *summaryview;
        gchar *menu_path;
        gint i;
        GtkWidget *menuitem;
        SummaryView *summaryview;
        gchar *menu_path;
        gint i;

+       GList *cur_item;

 
        static const struct {
                gchar *const entry;
 
        static const struct {
                gchar *const entry;


@@ -1619,9 +1720,13 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 
                {"/View/Show all headers"          , M_SINGLE_TARGET_EXIST},
                {"/View/Message source"            , M_SINGLE_TARGET_EXIST},
 

-               {"/Message/Get new mail"          , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {"/Message/Get from all accounts" , M_HAVE_ACCOUNT|M_UNLOCKED},
-               {"/Message/Cancel receiving"      , M_INC_ACTIVE},
+               {"/Message/Receive/Get from current account"
+                                                , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Receive/Get from all accounts"
+                                                , M_HAVE_ACCOUNT|M_UNLOCKED},
+               {"/Message/Receive/Cancel receiving"
+                                                , M_INC_ACTIVE},
+

                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Reply to"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Compose a news message", M_HAVE_NEWS_ACCOUNT},
                {"/Message/Reply"                 , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},
                {"/Message/Reply to"             , M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST},


@@ -1655,6 +1760,22 @@ void main_window_set_menu_sensitive(MainWindow *mainwin)
                menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 
                menu_set_sensitive(ifactory, entry[i].entry, sensitive);
        }
 

+       menu = gtk_item_factory_get_widget(ifactory, "/Message/Receive");
+
+       /* search for separator */
+       for (cur_item = GTK_MENU_SHELL(menu)->children; cur_item != NULL;
+            cur_item = cur_item->next) {
+               if (GTK_BIN(cur_item->data)->child == NULL) {
+                       cur_item = cur_item->next;
+                       break;
+               }
+       }
+
+       for (; cur_item != NULL; cur_item = cur_item->next) {
+               gtk_widget_set_sensitive(GTK_WIDGET(cur_item->data),
+                                        (M_UNLOCKED & state) != 0);
+       }
+

        main_window_menu_callback_block(mainwin);
 
 #define SET_CHECK_MENU_ACTIVE(path, active) \
        main_window_menu_callback_block(mainwin);
 
 #define SET_CHECK_MENU_ACTIVE(path, active) \


@@ -2068,8 +2189,20 @@ static gboolean toolbar_account_button_pressed(GtkWidget *widget,
 }
 #endif
 
 }
 #endif
 

-static gboolean ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
-                                       gpointer data)
+static void toolbar_child_attached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, 1, -1);
+}
+
+static void toolbar_child_detached(GtkWidget *widget, GtkWidget *child,
+                                  gpointer data)
+{
+       gtk_widget_set_usize(child, -1, -1);
+}
+
+static void ac_label_button_pressed(GtkWidget *widget, GdkEventButton *event,
+                                   gpointer data)

 {
        MainWindow *mainwin = (MainWindow *)data;
 
 {
        MainWindow *mainwin = (MainWindow *)data;
 


@@ -2773,12 +2906,20 @@ static void new_account_cb(MainWindow *mainwin, guint action,
        if (!compose_get_compose_list()) account_add();
 }
 
        if (!compose_get_compose_list()) account_add();
 }
 

-static void account_menu_cb(GtkMenuItem        *menuitem, gpointer data)
+static void account_selector_menu_cb(GtkMenuItem *menuitem, gpointer data)

 {
        cur_account = (PrefsAccount *)data;
        main_window_reflect_prefs_all();
 }
 
 {
        cur_account = (PrefsAccount *)data;
        main_window_reflect_prefs_all();
 }
 

+static void account_receive_menu_cb(GtkMenuItem *menuitem, gpointer data)
+{
+       MainWindow *mainwin = (MainWindow *)mainwin_list->data;
+       PrefsAccount *account = (PrefsAccount *)data;
+
+       inc_account_mail(mainwin, account);
+}
+

 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
        prefs_gtk_open();
 static void prefs_open_cb(GtkMenuItem *menuitem, gpointer data)
 {
        prefs_gtk_open();

diff --git a/src/mainwindow.h b/src/mainwindow.h
index c51a45c163d109161c660f9127580e662c917059..3c8fd0739518393c263661911d999430f347eb5b 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -119,6 +119,7 @@ struct _MainWindow
        gint mainwin_cid;
        gint folderview_cid;
        gint summaryview_cid;
        gint mainwin_cid;
        gint folderview_cid;
        gint summaryview_cid;

+       gint messageview_cid;

 
        ToolbarStyle toolbar_style;
 
 
        ToolbarStyle toolbar_style;
 


@@ -138,6 +139,8 @@ MainWindow *main_window_create              (SeparateType    type);
 
 void main_window_destroy                (MainWindow *mainwin);
 
 
 void main_window_destroy                (MainWindow *mainwin);
 

+void main_window_update_actions_menu   (MainWindow     *mainwin);
+

 void main_window_cursor_wait           (MainWindow     *mainwin);
 void main_window_cursor_normal         (MainWindow     *mainwin);
 
 void main_window_cursor_wait           (MainWindow     *mainwin);
 void main_window_cursor_normal         (MainWindow     *mainwin);
 


@@ -160,6 +163,12 @@ void main_window_toggle_message_view       (MainWindow *mainwin);
 void main_window_get_size              (MainWindow     *mainwin);
 void main_window_get_position          (MainWindow     *mainwin);
 
 void main_window_get_size              (MainWindow     *mainwin);
 void main_window_get_position          (MainWindow     *mainwin);
 

+void main_window_progress_on           (MainWindow     *mainwin);
+void main_window_progress_off          (MainWindow     *mainwin);
+void main_window_progress_set          (MainWindow     *mainwin,
+                                        gint            cur,
+                                        gint            total);
+

 void main_window_empty_trash           (MainWindow     *mainwin,
                                         gboolean        confirm);
 void main_window_add_mailbox           (MainWindow     *mainwin);
 void main_window_empty_trash           (MainWindow     *mainwin,
                                         gboolean        confirm);
 void main_window_add_mailbox           (MainWindow     *mainwin);

diff --git a/src/messageview.c b/src/messageview.c
index df450461309428714ceb42a8befc42611b4c19ca..c77fc88182dc92fabd187dc98c1184a3a174ccc2 100644 (file)
--- a/src/messageview.c
+++ b/src/messageview.c
@@ -273,6 +273,8 @@ static GtkItemFactoryEntry msgview_entries[] =
                                        NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                        NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},
                                        NULL, create_filter_cb, FILTER_BY_TO, NULL},
        {N_("/_Tools/_Create filter rule/by _Subject"),
                                        NULL, create_filter_cb, FILTER_BY_SUBJECT, NULL},

+       {N_("/_Tools/Create processing rule/"),
+                                       NULL, NULL, 0, "<Branch>"},

        {N_("/_Tools/Create processing rule/_Automatically"),
                                        NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
        {N_("/_Tools/Create processing rule/by _From"),
        {N_("/_Tools/Create processing rule/_Automatically"),
                                        NULL, create_processing_cb, FILTER_BY_AUTO, NULL},
        {N_("/_Tools/Create processing rule/by _From"),


@@ -336,6 +338,17 @@ GList *messageview_get_msgview_list(void)
        return msgview_list;
 }
 
        return msgview_list;
 }
 

+void messageview_update_actions_menu(MessageView *msgview)
+{
+       GtkItemFactory *ifactory;
+
+       /* Messages opened in a new window do not have a menu bar */
+       if (msgview->menubar == NULL)
+               return;
+       ifactory = gtk_item_factory_from_widget(msgview->menubar);
+       action_update_msgview_menu(ifactory, "/Tools/Actions", msgview);
+}
+

 void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
 {
        GtkWidget *handlebox;
 void messageview_add_toolbar(MessageView *msgview, GtkWidget *window) 
 {
        GtkWidget *handlebox;


@@ -363,8 +376,7 @@ void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
        gtk_container_add(GTK_CONTAINER(vbox),
                          GTK_WIDGET_PTR(msgview));
 
        gtk_container_add(GTK_CONTAINER(vbox),
                          GTK_WIDGET_PTR(msgview));
 

-       ifactory = gtk_item_factory_from_widget(menubar);
-       action_update_msgview_menu(ifactory, msgview);
+       messageview_update_actions_menu(msgview);

 
        msgview_list = g_list_append(msgview_list, msgview);
 }
 
        msgview_list = g_list_append(msgview_list, msgview);
 }

diff --git a/src/messageview.h b/src/messageview.h
index d4ba73ab5781317ec99984c6cb458b60ced70c38..4d0533ccded953ac7944d5fe5bbf9f583d394f77 100644 (file)
--- a/src/messageview.h
+++ b/src/messageview.h
@@ -99,6 +99,7 @@ gboolean messageview_search_string_backward   (MessageView    *messageview,
 
 gboolean messageview_is_visible                        (MessageView    *messageview);
 
 
 gboolean messageview_is_visible                        (MessageView    *messageview);
 

+void messageview_update_actions_menu           (MessageView    *msgview);

 void messageview_add_toolbar                   (MessageView    *msgview,
                                                 GtkWidget      *vbox);
 void messageview_reflect_prefs_pixmap_theme    (void);
 void messageview_add_toolbar                   (MessageView    *msgview,
                                                 GtkWidget      *vbox);
 void messageview_reflect_prefs_pixmap_theme    (void);

diff --git a/src/msgcache.c b/src/msgcache.c
index 7e5c3b3b44555e4756561e97ed873f25307ef6e3..6273f54cce56681902638a7797992f86e0f2f9e5 100644 (file)
--- a/src/msgcache.c
+++ b/src/msgcache.c
@@ -28,6 +28,13 @@
 #include "utils.h"
 #include "procmsg.h"
 
 #include "utils.h"
 #include "procmsg.h"
 

+typedef enum
+{
+       DATA_READ,
+       DATA_WRITE,
+       DATA_APPEND
+} DataOpenMode;
+

 struct _MsgCache {
        GHashTable      *msgnum_table;
        GHashTable      *msgid_table;
 struct _MsgCache {
        GHashTable      *msgnum_table;
        GHashTable      *msgid_table;


@@ -128,6 +135,164 @@ void msgcache_update_msg(MsgCache *cache, MsgInfo *msginfo)
        return;
 }
 
        return;
 }
 

+MsgInfo *msgcache_get_msg(MsgCache *cache, guint num)
+{
+       MsgInfo *msginfo;
+
+       g_return_val_if_fail(cache != NULL, NULL);
+
+       msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+       if(!msginfo)
+               return NULL;
+       cache->last_access = time(NULL);
+       
+       return procmsg_msginfo_new_ref(msginfo);
+}
+
+MsgInfo *msgcache_get_msg_by_id(MsgCache *cache, const gchar *msgid)
+{
+       MsgInfo *msginfo;
+       
+       g_return_val_if_fail(cache != NULL, NULL);
+       g_return_val_if_fail(msgid != NULL, NULL);
+
+       msginfo = g_hash_table_lookup(cache->msgid_table, msgid);
+       if(!msginfo)
+               return NULL;
+       cache->last_access = time(NULL);
+       
+       return procmsg_msginfo_new_ref(msginfo);        
+}
+
+static void msgcache_get_msg_list_func(gpointer key, gpointer value, gpointer user_data)
+{
+       MsgInfoList **listptr = user_data;
+       MsgInfo *msginfo = value;
+
+       *listptr = g_slist_prepend(*listptr, procmsg_msginfo_new_ref(msginfo));
+}
+
+MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
+{
+       MsgInfoList *msg_list = NULL;
+
+       g_return_val_if_fail(cache != NULL, NULL);
+
+       g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);       
+       cache->last_access = time(NULL);
+       
+       msg_list = g_slist_reverse(msg_list);
+
+       return msg_list;
+}
+
+time_t msgcache_get_last_access_time(MsgCache *cache)
+{
+       g_return_val_if_fail(cache != NULL, 0);
+       
+       return cache->last_access;
+}
+
+gint msgcache_get_memory_usage(MsgCache *cache)
+{
+       g_return_val_if_fail(cache != NULL, 0);
+
+       return cache->memusage;
+}
+
+/*
+ *  Cache saving functions
+ */
+
+#define READ_CACHE_DATA(data, fp) \
+{ \
+       if (msgcache_read_cache_data_str(fp, &data) < 0) { \
+               procmsg_msginfo_free(msginfo); \
+               error = TRUE; \
+               break; \
+       } \
+}
+
+#define READ_CACHE_DATA_INT(n, fp) \
+{ \
+       if (fread(&n, sizeof(n), 1, fp) != 1) { \
+               g_warning("Cache data is corrupted\n"); \
+               procmsg_msginfo_free(msginfo); \
+               error = TRUE; \
+               break; \
+       } \
+}
+
+#define WRITE_CACHE_DATA_INT(n, fp) \
+       fwrite(&n, sizeof(n), 1, fp)
+
+#define WRITE_CACHE_DATA(data, fp) \
+{ \
+       gint len; \
+       if (data == NULL) \
+               len = 0; \
+       else \
+               len = strlen(data); \
+       WRITE_CACHE_DATA_INT(len, fp); \
+       if (len > 0) { \
+               fwrite(data, len, 1, fp); \
+       } \
+}
+
+static FILE *msgcache_open_data_file(const gchar *file, gint version,
+                                    DataOpenMode mode,
+                                    gchar *buf, size_t buf_size)
+{
+       FILE *fp;
+       gint data_ver;
+
+       g_return_val_if_fail(file != NULL, NULL);
+
+       if (mode == DATA_WRITE) {
+               if ((fp = fopen(file, "wb")) == NULL) {
+                       FILE_OP_ERROR(file, "fopen");
+                       return NULL;
+               }
+               if (change_file_mode_rw(fp, file) < 0)
+                       FILE_OP_ERROR(file, "chmod");
+
+               WRITE_CACHE_DATA_INT(version, fp);
+               return fp;
+       }
+
+       /* check version */
+       if ((fp = fopen(file, "rb")) == NULL)
+               debug_print("Mark/Cache file not found\n");
+       else {
+               if (buf && buf_size > 0)
+                       setvbuf(fp, buf, _IOFBF, buf_size);
+               if (fread(&data_ver, sizeof(data_ver), 1, fp) != 1 ||
+                        version != data_ver) {
+                       debug_print("Mark/Cache version is different (%d != %d). "
+                                   "Discarding it.\n", data_ver, version);
+                       fclose(fp);
+                       fp = NULL;
+               }
+       }
+
+       if (mode == DATA_READ)
+               return fp;
+
+       if (fp) {
+               /* reopen with append mode */
+               fclose(fp);
+               if ((fp = fopen(file, "ab")) == NULL)
+                       FILE_OP_ERROR(file, "fopen");
+       } else {
+               /* open with overwrite mode if mark file doesn't exist or
+                  version is different */
+               fp = msgcache_open_data_file(file, version, DATA_WRITE, buf,
+                                           buf_size);
+       }
+
+       return fp;
+}
+

 static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
        gchar buf[BUFFSIZE];
 static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
 {
        gchar buf[BUFFSIZE];


@@ -170,26 +335,6 @@ static gint msgcache_read_cache_data_str(FILE *fp, gchar **str)
        return ret;
 }
 
        return ret;
 }
 

-
-#define READ_CACHE_DATA(data, fp) \
-{ \
-       if (msgcache_read_cache_data_str(fp, &data) < 0) { \
-               procmsg_msginfo_free(msginfo); \
-               error = TRUE; \
-               break; \
-       } \
-}
-
-#define READ_CACHE_DATA_INT(n, fp) \
-{ \
-       if (fread(&n, sizeof(n), 1, fp) != 1) { \
-               g_warning("Cache data is corrupted\n"); \
-               procmsg_msginfo_free(msginfo); \
-               error = TRUE; \
-               break; \
-       } \
-}
-

 MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
 {
        MsgCache *cache;
 MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
 {
        MsgCache *cache;


@@ -197,29 +342,18 @@ MsgCache *msgcache_read_cache(FolderItem *item, const gchar *cache_file)
        MsgInfo *msginfo;
        MsgTmpFlags tmp_flags = 0;
        gchar file_buf[BUFFSIZE];
        MsgInfo *msginfo;
        MsgTmpFlags tmp_flags = 0;
        gchar file_buf[BUFFSIZE];

-       gint ver;

        guint num;
        gboolean error = FALSE;
 
        g_return_val_if_fail(cache_file != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
 
        guint num;
        gboolean error = FALSE;
 
        g_return_val_if_fail(cache_file != NULL, NULL);
        g_return_val_if_fail(item != NULL, NULL);
 

-       if ((fp = fopen(cache_file, "rb")) == NULL) {
-               debug_print("\tNo cache file\n");
+       if ((fp = msgcache_open_data_file
+               (cache_file, CACHE_VERSION, DATA_READ, file_buf, sizeof(file_buf))) == NULL)

                return NULL;
                return NULL;

-       }
-       setvbuf(fp, file_buf, _IOFBF, sizeof(file_buf));

 
        debug_print("\tReading message cache from %s...\n", cache_file);
 
 
        debug_print("\tReading message cache from %s...\n", cache_file);
 

-       /* compare cache version */
-       if (fread(&ver, sizeof(ver), 1, fp) != 1 ||
-           CACHE_VERSION != ver) {
-               debug_print("Cache version is different. Discarding it.\n");
-               fclose(fp);
-               return NULL;
-       }
-

        if (item->stype == F_QUEUE) {
                tmp_flags |= MSG_QUEUED;
        } else if (item->stype == F_DRAFT) {
        if (item->stype == F_QUEUE) {
                tmp_flags |= MSG_QUEUED;
        } else if (item->stype == F_DRAFT) {


@@ -281,46 +415,24 @@ void msgcache_read_mark(MsgCache *cache, const gchar *mark_file)
        FILE *fp;
        MsgInfo *msginfo;
        MsgPermFlags perm_flags;
        FILE *fp;
        MsgInfo *msginfo;
        MsgPermFlags perm_flags;

-       gint ver;

        guint num;
 
        guint num;
 

-       if ((fp = fopen(mark_file, "rb")) == NULL) {
-               debug_print("Mark file not found.\n");
+       if ((fp = msgcache_open_data_file(mark_file, MARK_VERSION, DATA_READ, NULL, 0)) == NULL)

                return;
                return;

-       } else if (fread(&ver, sizeof(ver), 1, fp) != 1 || MARK_VERSION != ver) {
-               debug_print("Mark version is different (%d != %d). "
-                             "Discarding it.\n", ver, MARK_VERSION);
-       } else {
-               debug_print("\tReading message marks from %s...\n", mark_file);

 
 

-               while (fread(&num, sizeof(num), 1, fp) == 1) {
-                       if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+       debug_print("\tReading message marks from %s...\n", mark_file);

 
 

-                       msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
-                       if(msginfo) {
-                               msginfo->flags.perm_flags = perm_flags;
-                       }
+       while (fread(&num, sizeof(num), 1, fp) == 1) {
+               if (fread(&perm_flags, sizeof(perm_flags), 1, fp) != 1) break;
+
+               msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
+               if(msginfo) {
+                       msginfo->flags.perm_flags = perm_flags;

                }
        }
        fclose(fp);
 }
 
                }
        }
        fclose(fp);
 }
 

-#define WRITE_CACHE_DATA_INT(n, fp) \
-       fwrite(&n, sizeof(n), 1, fp)
-
-#define WRITE_CACHE_DATA(data, fp) \
-{ \
-       gint len; \
-       if (data == NULL) \
-               len = 0; \
-       else \
-               len = strlen(data); \
-       WRITE_CACHE_DATA_INT(len, fp); \
-       if (len > 0) { \
-               fwrite(data, len, 1, fp); \
-       } \
-}
-

 void msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
 {
        MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;
 void msgcache_write_cache(MsgInfo *msginfo, FILE *fp)
 {
        MsgTmpFlags flags = msginfo->flags.tmp_flags & MSG_CACHED_FLAG_MASK;


@@ -373,36 +485,28 @@ static void msgcache_write_func(gpointer key, gpointer value, gpointer user_data
 
 gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *cache)
 {
 
 gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *cache)
 {

-       FILE *fp;

        struct write_fps write_fps;
        struct write_fps write_fps;

-       gint ver;

 
        g_return_val_if_fail(cache_file != NULL, -1);
        g_return_val_if_fail(mark_file != NULL, -1);
        g_return_val_if_fail(cache != NULL, -1);
 
 
        g_return_val_if_fail(cache_file != NULL, -1);
        g_return_val_if_fail(mark_file != NULL, -1);
        g_return_val_if_fail(cache != NULL, -1);
 

-       debug_print("\tWriting message cache to %s and %s...\n", cache_file, mark_file);
-
-       if ((fp = fopen(cache_file, "wb")) == NULL) {
-               FILE_OP_ERROR(cache_file, "fopen");
+       write_fps.cache_fp = msgcache_open_data_file(cache_file, CACHE_VERSION,
+               DATA_WRITE, NULL, 0);
+       if (write_fps.cache_fp == NULL)

                return -1;
                return -1;

-       }
-       if (change_file_mode_rw(fp, cache_file) < 0)
-               FILE_OP_ERROR(cache_file, "chmod");
-
-       ver = CACHE_VERSION;
-       WRITE_CACHE_DATA_INT(ver, fp);  
-       write_fps.cache_fp = fp;

 
 

-       if ((fp = fopen(mark_file, "wb")) == NULL) {
-               FILE_OP_ERROR(mark_file, "fopen");
+       write_fps.mark_fp = msgcache_open_data_file(mark_file, MARK_VERSION,
+               DATA_WRITE, NULL, 0);
+       if (write_fps.mark_fp == NULL) {

                fclose(write_fps.cache_fp);
                return -1;
        }
 
                fclose(write_fps.cache_fp);
                return -1;
        }
 

-       ver = MARK_VERSION;
-       WRITE_CACHE_DATA_INT(ver, fp);
-       write_fps.mark_fp = fp;
+       debug_print("\tWriting message cache to %s and %s...\n", cache_file, mark_file);
+
+       if (change_file_mode_rw(write_fps.cache_fp, cache_file) < 0)
+               FILE_OP_ERROR(cache_file, "chmod");

 
        g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
 
 
        g_hash_table_foreach(cache->msgnum_table, msgcache_write_func, (gpointer)&write_fps);
 


@@ -415,67 +519,3 @@ gint msgcache_write(const gchar *cache_file, const gchar *mark_file, MsgCache *c
        return 0;
 }
 
        return 0;
 }
 

-MsgInfo *msgcache_get_msg(MsgCache *cache, guint num)
-{
-       MsgInfo *msginfo;
-
-       g_return_val_if_fail(cache != NULL, NULL);
-
-       msginfo = g_hash_table_lookup(cache->msgnum_table, &num);
-       if(!msginfo)
-               return NULL;
-       cache->last_access = time(NULL);
-       
-       return procmsg_msginfo_new_ref(msginfo);
-}
-
-MsgInfo *msgcache_get_msg_by_id(MsgCache *cache, const gchar *msgid)
-{
-       MsgInfo *msginfo;
-       
-       g_return_val_if_fail(cache != NULL, NULL);
-       g_return_val_if_fail(msgid != NULL, NULL);
-
-       msginfo = g_hash_table_lookup(cache->msgid_table, msgid);
-       if(!msginfo)
-               return NULL;
-       cache->last_access = time(NULL);
-       
-       return procmsg_msginfo_new_ref(msginfo);        
-}
-
-static void msgcache_get_msg_list_func(gpointer key, gpointer value, gpointer user_data)
-{
-       MsgInfoList **listptr = user_data;
-       MsgInfo *msginfo = value;
-
-       *listptr = g_slist_prepend(*listptr, procmsg_msginfo_new_ref(msginfo));
-}
-
-MsgInfoList *msgcache_get_msg_list(MsgCache *cache)
-{
-       MsgInfoList *msg_list = NULL;
-
-       g_return_val_if_fail(cache != NULL, NULL);
-
-       g_hash_table_foreach((GHashTable *)cache->msgnum_table, msgcache_get_msg_list_func, (gpointer)&msg_list);       
-       cache->last_access = time(NULL);
-       
-       msg_list = g_slist_reverse(msg_list);
-
-       return msg_list;
-}
-
-time_t msgcache_get_last_access_time(MsgCache *cache)
-{
-       g_return_val_if_fail(cache != NULL, 0);
-       
-       return cache->last_access;
-}
-
-gint msgcache_get_memory_usage(MsgCache *cache)
-{
-       g_return_val_if_fail(cache != NULL, 0);
-
-       return cache->memusage;
-}

diff --git a/src/news.c b/src/news.c
index 8cd1c0b8e2a3210c41582de4b8943b3c0c841fdf..d0c81e80cacda6452fd9f688b93f9fd3c089f206 100644 (file)
--- a/src/news.c
+++ b/src/news.c
@@ -808,25 +808,22 @@ gint news_get_num_list(Folder *folder, FolderItem *item, GSList **msgnum_list, g
                return -1;
        }
 
                return -1;
        }
 

-       if (num <= 0) {
+       dir = news_folder_get_path(folder);
+       if (num <= 0)

                remove_all_numbered_files(dir);
                remove_all_numbered_files(dir);

-               return 0;
-       }
-
-       if(last < first) {
+       else if (last < first)

                log_warning(_("invalid article range: %d - %d\n"),
                            first, last);
                log_warning(_("invalid article range: %d - %d\n"),
                            first, last);

-               return 0;
-       }
-
-       for(i = first; i <= last; i++) {
-               *msgnum_list = g_slist_prepend(*msgnum_list, GINT_TO_POINTER(i));
-               nummsgs++;
+       else {
+               for (i = first; i <= last; i++) {
+                       *msgnum_list = g_slist_prepend(*msgnum_list, 
+                                                      GINT_TO_POINTER(i));
+                       nummsgs++;
+               }
+               debug_print("removing old messages from %d to %d in %s\n",
+                           first, last, dir);
+               remove_numbered_files(dir, 1, first - 1);

        }
        }

-
-       dir = folder_item_get_path(item);
-       debug_print("removing old messages from %d to %d in %s\n", first, last, dir);
-       remove_numbered_files(dir, 1, first - 1);

        g_free(dir);
 
        return nummsgs;
        g_free(dir);
 
        return nummsgs;

diff --git a/src/pgpmime.c b/src/pgpmime.c
index a9f9ae35094dafbe071b4e3cb3a7123e38f8e952..cb95e84b10ab4609ceba33687c10c019ebb2bb8c 100644 (file)
--- a/src/pgpmime.c
+++ b/src/pgpmime.c
@@ -182,7 +182,7 @@ static SignatureStatus pgpmime_get_sig_status(MimeInfo *mimeinfo)
        
        g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
 
        
        g_return_val_if_fail(data != NULL, SIGNATURE_INVALID);
 

-       return sgpgme_sigstat_gpgme_to_privacy(data->sigstatus);
+       return sgpgme_sigstat_gpgme_to_privacy(data->ctx, data->sigstatus);

 }
 
 static gchar *pgpmime_get_sig_info_short(MimeInfo *mimeinfo)
 }
 
 static gchar *pgpmime_get_sig_info_short(MimeInfo *mimeinfo)


@@ -263,6 +263,7 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo)
                return NULL;
        }
 
                return NULL;
        }
 

+       fprintf(dstfp, "MIME-Version: 1.0\n");

        gpgme_data_rewind (plain);
        while (gpgme_data_read(plain, buf, sizeof(buf), &nread) == GPGME_No_Error) {
                fwrite (buf, nread, 1, dstfp);
        gpgme_data_rewind (plain);
        while (gpgme_data_read(plain, buf, sizeof(buf), &nread) == GPGME_No_Error) {
                fwrite (buf, nread, 1, dstfp);

diff --git a/src/plugins/clamav/README b/src/plugins/clamav/README
index 3c168332c013a227fbb865d8c032d890d9f5cd38..fbe92a63612e572e1c53c76faa2fc66299bf1035 100644 (file)
--- a/src/plugins/clamav/README
+++ b/src/plugins/clamav/README
@@ -2,30 +2,37 @@ Clam AntiVirus Plugin
 ---------------------
 
 This plugin will scan incoming messages for viruses using 
 ---------------------
 
 This plugin will scan incoming messages for viruses using 

-Clam AntiVirus.
+Clam AntiVirus (libclamav). It can be used with Local, IMAP
+and POP accounts.

 
 

-To build the plugin run configure with --enable-clamav-plugin
+Messages that have infected attachments can be automatically
+deleted or moved to a folder that can be specified in the 
+configuration, if the folder is not specified or not found 
+the default trash folder will be used.

 
 

-Messages that have infected attachments can be deleted or moved
-to a folder that can be specified in the configuration, if the
-folder is not specified or not found the default trash folder will
-be used.
+The plugin is built automatically if you have the required
+libraries available. It has two parts and will be installed
+in $PREFIX/lib/sylpheed/plugins/ as clamav_plugin.so and
+clamav_plugin_gtk.so.

 
 

-Please note that the clamav_plugin.so plugin only provides the
-actual scanning. By default it is not enabled. You probably also 
-want to load the clamav_plugin_gtk.so to get a configuration page
-under "Configuration/Other Preferences..." for the Clam AntiVirus
-plugin.
+The 'clamav_plugin.so' plugin provides only the actual 
+scanning. By default it is not enabled. 

 
 

-The Clam AntiVirus plugin uses its own block in the sylpheedrc file
-in your ~/.sylpheed directory. If you really want to configure it
-without the GTK plugin you can specify the following options:
+You will probably also want to load the configuration plugin
+'clamav_plugin_gtk.so' to get a configuration page under 
+"Configuration/Other Preferences.../Filtering/Clam AntiVirus" 
+for the Clam AntiVirus plugin.
+
+The Clam AntiVirus plugin uses its own block in the 'sylpheedrc' 
+file in your config directory (default: '~/.sylpheed'). If you 
+really want to configure it without the GTK plugin you can 
+specify the following options:

 
 [ClamAV]
 clamav_enable=1                                enable scanning with Clam AntiVirus
                                        [default: 0]
 
 
 [ClamAV]
 clamav_enable=1                                enable scanning with Clam AntiVirus
                                        [default: 0]
 

-clamav_enable_archive=1                        enable archive scanning with Clam 
+clamav_enable_arc=1                    enable archive scanning with Clam 

                                        AntiVirus
                                        [default: 0]
 
                                        AntiVirus
                                        [default: 0]
 


@@ -34,14 +41,15 @@ clamav_max_size=1                   maximum size an attachment can have
                                        be scanned
                                        [default: 1]
 
                                        be scanned
                                        [default: 1]
 

-clamav_receive_infected=1              enable to save infected messages to a 
-                                       mailfolder. If not enabled the mails will 
-                                       be deleted
+clamav_recv_infected=1                 enable to save infected messages to a 
+                                       mailfolder. If not enabled the mails 
+                                       will be deleted

                                        [default: 1]
                                        [default: 1]

+                                       

 clamav_save_folder=#mh/Mailbox/virus   the folder that should be used to save
                                        infected mails, if empty the default 
                                        trash folder is used
                                        [default: none, use default trash]
 
 Clam AntiVirus is licensed under the GPL and can be downloaded from
 clamav_save_folder=#mh/Mailbox/virus   the folder that should be used to save
                                        infected mails, if empty the default 
                                        trash folder is used
                                        [default: none, use default trash]
 
 Clam AntiVirus is licensed under the GPL and can be downloaded from

-http://clamav.elektrapro.com/
+http://clamav.sourceforge.net/

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index ba4aed85d95c3b01401c863ef1ead6d9072443cd..5d96c1fc8657d7f4d31921add8de28386e2e36e4 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -113,6 +113,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
        if (!mimeinfo) return FALSE;
 
        debug_print("Scanning message %d for viruses\n", msginfo->msgnum);
        if (!mimeinfo) return FALSE;
 
        debug_print("Scanning message %d for viruses\n", msginfo->msgnum);

+       statusbar_print_all(_("ClamAV: scanning message..."));

 
        params.is_infected = FALSE;
        params.root = NULL;
 
        params.is_infected = FALSE;
        params.root = NULL;

diff --git a/src/plugins/clamav/clamav_plugin_gtk.c b/src/plugins/clamav/clamav_plugin_gtk.c
index 9eed583d5d0b9b9eff42cf33ff37acfb738fa887..511a511a3a62220310531d17d27b2e688b4acf60 100644 (file)
--- a/src/plugins/clamav/clamav_plugin_gtk.c
+++ b/src/plugins/clamav/clamav_plugin_gtk.c
@@ -93,7 +93,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
        label1 = gtk_label_new(_("Enable virus scanning"));
        gtk_widget_show (label1);
        gtk_table_attach (GTK_TABLE (table), label1, 0, 1, 0, 1,
        label1 = gtk_label_new(_("Enable virus scanning"));
        gtk_widget_show (label1);
        gtk_table_attach (GTK_TABLE (table), label1, 0, 1, 0, 1,

-                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                         (GtkAttachOptions) (GTK_FILL),

                          (GtkAttachOptions) (0), 2, 4);
        gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);
                          (GtkAttachOptions) (0), 2, 4);
        gtk_label_set_justify(GTK_LABEL(label1), GTK_JUSTIFY_LEFT);
        gtk_misc_set_alignment (GTK_MISC (label1), 0, 0.5);


@@ -101,7 +101,7 @@ static void clamav_create_widget_func(PrefsPage * _page, GtkWindow *window, gpoi
        enable_clamav = gtk_check_button_new();
        gtk_widget_show (enable_clamav);
        gtk_table_attach (GTK_TABLE (table), enable_clamav, 1, 2, 0, 1,
        enable_clamav = gtk_check_button_new();
        gtk_widget_show (enable_clamav);
        gtk_table_attach (GTK_TABLE (table), enable_clamav, 1, 2, 0, 1,

-                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
+                         (GtkAttachOptions) (GTK_FILL),

                          (GtkAttachOptions) (0), 0, 0);
 
        label2 = gtk_label_new(_("Scan archive contents"));
                          (GtkAttachOptions) (0), 0, 0);
 
        label2 = gtk_label_new(_("Scan archive contents"));

diff --git a/src/plugins/image_viewer/viewer.c b/src/plugins/image_viewer/viewer.c
index 41a5853d077489dadeef49a14a0130d940a51a91..73564e035b69c8af833e56d32fad94f206845fb1 100644 (file)
--- a/src/plugins/image_viewer/viewer.c
+++ b/src/plugins/image_viewer/viewer.c
@@ -247,7 +247,7 @@ static void image_viewer_clear_viewer(MimeViewer *_mimeviewer)
        g_free(imageviewer->file);
        imageviewer->file = NULL;
        imageviewer->mimeinfo = NULL;
        g_free(imageviewer->file);
        imageviewer->file = NULL;
        imageviewer->mimeinfo = NULL;

-       imageviewer->resize_img   = imageviewerprefs.resize_img;
+       imageviewer->resize_img = imageviewerprefs.resize_img;

 }
 
 static void image_viewer_destroy_viewer(MimeViewer *_mimeviewer)
 }
 
 static void image_viewer_destroy_viewer(MimeViewer *_mimeviewer)

diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 2284a6ea1e93908eb40dbc2e27e95bef5e86a9da..571aeee0c82c5be0d22e4d1d68a7ab7e9004cb39 100644 (file)
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -178,6 +178,7 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                return FALSE;
 
        debug_print("Filtering message %d\n", msginfo->msgnum);
                return FALSE;
 
        debug_print("Filtering message %d\n", msginfo->msgnum);

+       statusbar_print_all(_("SpamAssassin: filtering message..."));

 
        if ((fp = procmsg_open_message(msginfo)) == NULL) {
                debug_print("failed to open message file\n");
 
        if ((fp = procmsg_open_message(msginfo)) == NULL) {
                debug_print("failed to open message file\n");

diff --git a/src/pop.c b/src/pop.c
index b03e8f888d8177c6e0d9dd1d2aec3d06bff50266..2fd15a9b6bb9e4d49a89f094fda600afb62934c5 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -708,7 +708,7 @@ static gint pop3_session_recv_msg(Session *session, const gchar *msg)
 {
        Pop3Session *pop3_session = POP3_SESSION(session);
        Pop3ErrorValue val = PS_SUCCESS;
 {
        Pop3Session *pop3_session = POP3_SESSION(session);
        Pop3ErrorValue val = PS_SUCCESS;

-       const gchar *body;
+       const guchar *body;

 
        body = msg;
        if (pop3_session->state != POP3_GETRANGE_UIDL_RECV &&
 
        body = msg;
        if (pop3_session->state != POP3_GETRANGE_UIDL_RECV &&

diff --git a/src/prefs_account.c b/src/prefs_account.c
index 1459c550caeb81a1be92c974d68ed5da392b26ff..e631a1aad849ae55fc6f784b939e7c649dc2e97b 100644 (file)
--- a/src/prefs_account.c
+++ b/src/prefs_account.c
@@ -580,7 +580,7 @@ PrefsAccount *prefs_account_new(void)
 
 void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 {
 
 void prefs_account_read_config(PrefsAccount *ac_prefs, const gchar *label)
 {

-       const gchar *p = label;
+       const guchar *p = label;

        gint id;
 
        g_return_if_fail(ac_prefs != NULL);
        gint id;
 
        g_return_if_fail(ac_prefs != NULL);


@@ -717,11 +717,6 @@ PrefsAccount *prefs_account_open(PrefsAccount *ac_prefs)
                gtk_widget_show(dialog.apply_btn);
        }
 
                gtk_widget_show(dialog.apply_btn);
        }
 

-       if (ac_prefs->protocol != A_LOCAL) {
-               gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
-               gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
-       }
-

        pop_bfr_smtp_tm_set_sens (NULL, NULL);
        
        gtk_widget_show(dialog.window);
        pop_bfr_smtp_tm_set_sens (NULL, NULL);
        
        gtk_widget_show(dialog.window);


@@ -943,7 +938,9 @@ static void prefs_account_basic_create(void)
        SET_ACTIVATE (menuitem);
        MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
        SET_ACTIVATE (menuitem);
        SET_ACTIVATE (menuitem);
        MENUITEM_ADD (optmenu_menu, menuitem, _("News (NNTP)"), A_NNTP);
        SET_ACTIVATE (menuitem);

-       MENUITEM_ADD (optmenu_menu, menuitem, _("None (local)"), A_LOCAL);
+       MENUITEM_ADD (optmenu_menu, menuitem, _("Local mbox file"), A_LOCAL);
+       SET_ACTIVATE (menuitem);
+       MENUITEM_ADD (optmenu_menu, menuitem, _("None (SMTP only)"), A_NONE);

        SET_ACTIVATE (menuitem);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);
        SET_ACTIVATE (menuitem);
 
        gtk_option_menu_set_menu (GTK_OPTION_MENU (optmenu), optmenu_menu);


@@ -2249,7 +2246,10 @@ static gint prefs_account_apply(void)
                alertpanel_error(_("Mail address is not entered."));
                return -1;
        }
                alertpanel_error(_("Mail address is not entered."));
                return -1;
        }

-       if ((protocol == A_POP3 || protocol == A_APOP || (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn)))) &&
+       if (((protocol == A_POP3) || 
+            (protocol == A_APOP) || 
+            (protocol == A_LOCAL && !gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(basic.mailcmd_chkbtn))) || 
+            (protocol == A_NONE)) &&

            *gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
                alertpanel_error(_("SMTP server is not entered."));
                return -1;
            *gtk_entry_get_text(GTK_ENTRY(basic.smtpserv_entry)) == '\0') {
                alertpanel_error(_("SMTP server is not entered."));
                return -1;


@@ -2397,11 +2397,12 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
                -1, /* A_RPOP  */
                2,  /* A_IMAP4 */
                3,  /* A_NNTP  */
                -1, /* A_RPOP  */
                2,  /* A_IMAP4 */
                3,  /* A_NNTP  */

-               4   /* A_LOCAL */
+               4,  /* A_LOCAL */
+               5,  /* A_NONE  */

        };
 
        protocol = *((RecvProtocol *)pparam->data);
        };
 
        protocol = *((RecvProtocol *)pparam->data);

-       if (protocol < 0 || protocol > A_LOCAL) return;
+       if (protocol < 0 || protocol > A_NONE) return;

        if (list_order[protocol] < 0) return;
        gtk_option_menu_set_history(optmenu, list_order[protocol]);
 
        if (list_order[protocol] < 0) return;
        gtk_option_menu_set_history(optmenu, list_order[protocol]);
 


@@ -2748,6 +2749,83 @@ static void prefs_account_protocol_activated(GtkMenuItem *menuitem)
                gtk_widget_show(advanced.imapdir_label);
                gtk_widget_show(advanced.imapdir_entry);
                break;
                gtk_widget_show(advanced.imapdir_label);
                gtk_widget_show(advanced.imapdir_entry);
                break;

+       case A_NONE:
+               gtk_widget_hide(basic.nntpserv_label);
+               gtk_widget_hide(basic.nntpserv_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          0, 0);
+               gtk_widget_set_sensitive(basic.nntpauth_chkbtn, FALSE);
+               gtk_widget_hide(basic.nntpauth_chkbtn);
+
+               gtk_widget_set_sensitive(basic.nntpauth_onconnect_chkbtn, FALSE);
+               gtk_widget_hide(basic.nntpauth_onconnect_chkbtn);
+
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          1, 0);
+               gtk_widget_set_sensitive(basic.recvserv_label, FALSE);
+               gtk_widget_set_sensitive(basic.recvserv_entry, FALSE);
+               gtk_widget_hide(basic.recvserv_label);
+               gtk_widget_hide(basic.recvserv_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          2, VSPACING_NARROW);
+               gtk_widget_show(basic.smtpserv_label);
+               gtk_widget_show(basic.smtpserv_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          4, VSPACING_NARROW);
+               gtk_widget_hide(basic.localmbox_label);
+               gtk_widget_hide(basic.localmbox_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          3, 0);
+               gtk_widget_hide(basic.mailcmd_label);
+               gtk_widget_hide(basic.mailcmd_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          6, 0);
+               gtk_widget_hide(basic.mailcmd_chkbtn);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          5, 0);
+               gtk_widget_hide(basic.uid_label);
+               gtk_widget_hide(basic.pass_label);
+               gtk_widget_hide(basic.uid_entry);
+               gtk_widget_hide(basic.pass_entry);
+               gtk_table_set_row_spacing (GTK_TABLE (basic.serv_table),
+                                          7, VSPACING_NARROW);
+
+               gtk_widget_set_sensitive(basic.uid_label,  FALSE);
+               gtk_widget_set_sensitive(basic.pass_label, FALSE);
+               gtk_widget_set_sensitive(basic.uid_entry,  FALSE);
+               gtk_widget_set_sensitive(basic.pass_entry, FALSE);
+               gtk_widget_set_sensitive(receive.pop3_frame, FALSE);
+               gtk_widget_hide(receive.pop3_frame);
+               gtk_widget_hide(receive.imap_frame);
+               gtk_widget_hide(receive.frame_maxarticle);
+               gtk_widget_set_sensitive(receive.recvatgetall_chkbtn, FALSE);
+
+               gtk_widget_set_sensitive(basic.smtpserv_entry, TRUE);
+               gtk_widget_set_sensitive(basic.smtpserv_label, TRUE);
+
+               /* update pop_before_smtp sensitivity */
+               gtk_widget_set_sensitive(p_send.pop_bfr_smtp_chkbtn, FALSE);
+               pop_bfr_smtp_tm_set_sens(NULL, NULL);
+               
+               gtk_toggle_button_set_active
+                       (GTK_TOGGLE_BUTTON(receive.recvatgetall_chkbtn), FALSE);
+
+#if USE_OPENSSL
+               gtk_widget_hide(ssl.pop_frame);
+               gtk_widget_hide(ssl.imap_frame);
+               gtk_widget_hide(ssl.nntp_frame);
+               gtk_widget_show(ssl.send_frame);
+#endif
+               gtk_widget_hide(advanced.popport_hbox);
+               gtk_widget_hide(advanced.imapport_hbox);
+               gtk_widget_hide(advanced.nntpport_hbox);
+               gtk_widget_hide(advanced.crosspost_chkbtn);
+               gtk_widget_hide(advanced.crosspost_colormenu);
+               gtk_widget_hide(advanced.tunnelcmd_chkbtn);
+               gtk_widget_hide(advanced.tunnelcmd_entry);
+               gtk_widget_hide(advanced.imapdir_label);
+               gtk_widget_hide(advanced.imapdir_entry);
+               break;

        case A_POP3:
        default:
                gtk_widget_hide(basic.nntpserv_label);
        case A_POP3:
        default:
                gtk_widget_hide(basic.nntpserv_label);

diff --git a/src/prefs_account.h b/src/prefs_account.h
index 95c5e65593bda9f1b61275988a91535414f8db4b..5b2e4a771648e9fc1561c85270664fef2e75830d 100644 (file)
--- a/src/prefs_account.h
+++ b/src/prefs_account.h
@@ -32,7 +32,8 @@ typedef enum {
        A_RPOP,
        A_IMAP4,
        A_NNTP,
        A_RPOP,
        A_IMAP4,
        A_NNTP,

-       A_LOCAL
+       A_LOCAL,
+       A_NONE,         /* SMTP only */

 } RecvProtocol;
 
 typedef enum {
 } RecvProtocol;
 
 typedef enum {


@@ -41,7 +42,6 @@ typedef enum {
        SIG_DIRECT
 } SigType;
 
        SIG_DIRECT
 } SigType;
 

-

 #if USE_GPGME
 typedef enum {
        SIGN_KEY_DEFAULT,
 #if USE_GPGME
 typedef enum {
        SIGN_KEY_DEFAULT,

diff --git a/src/prefs_actions.c b/src/prefs_actions.c
index 43d0e6b7bc53df2de6432cb331d880730cb9a802..381bbbc8acf9788eebf68356e0a2b48d473188cf 100644 (file)
--- a/src/prefs_actions.c
+++ b/src/prefs_actions.c
@@ -643,13 +643,31 @@ static void prefs_actions_cancel(GtkWidget *w, gpointer data)
 
 static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 {
 
 static void prefs_actions_ok(GtkWidget *widget, gpointer data)
 {

-       GtkItemFactory *ifactory;
-       MainWindow *mainwin = (MainWindow *)data;
-       GtkItemFactoryEntry ifentry = {NULL, NULL, NULL, 0, "<Branch>"};
+       MainWindow *mainwin = (MainWindow *) data;
+       GList *list;
+       GList *iter;
+       MessageView *msgview;
+       Compose *compose;

 
        prefs_actions_write_config();
 
        prefs_actions_write_config();

-       ifactory = gtk_item_factory_from_widget(mainwin->menubar);
-       action_update_mainwin_menu(ifactory, mainwin);
+
+       /* Update mainwindow actions menu */
+       main_window_update_actions_menu(mainwin);
+
+       /* Update separated message view actions menu */
+       list = messageview_get_msgview_list();
+       for (iter = list; iter; iter = iter->next) {
+               msgview = (MessageView *) iter->data;
+               messageview_update_actions_menu(msgview);
+       }
+
+       /* Update compose windows actions menu */
+       list = compose_get_compose_list();
+       for (iter = list; iter; iter = iter->next) {
+               compose = (Compose *) iter->data;
+               compose_update_actions_menu(compose);
+       }
+

        gtk_widget_hide(actions.window);
        inc_unlock();
 }
        gtk_widget_hide(actions.window);
        inc_unlock();
 }

diff --git a/src/prefs_common.c b/src/prefs_common.c
index 6dc925117bd047d72525178b4a0e08705f174d75..7eb2e8b70f8d2f2be2536f30420b9a10f2e673d4 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -181,17 +181,9 @@ static struct Interface {
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *optmenu_nextunreadmsgdialog;
        GtkWidget *checkbtn_openinbox;
        GtkWidget *checkbtn_immedexec;
        GtkWidget *optmenu_nextunreadmsgdialog;

-       GtkWidget *entry_pixmap_theme;
-       GtkWidget *combo_pixmap_theme;

 } interface;
 
 static struct Other {
 } interface;
 
 static struct Other {

-       GtkWidget *uri_combo;
-       GtkWidget *uri_entry;
-       GtkWidget *printcmd_entry;
-       GtkWidget *exteditor_combo;
-       GtkWidget *exteditor_entry;
-

        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *checkbtn_confonexit;
        GtkWidget *checkbtn_cleanonexit;
        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *checkbtn_confonexit;
        GtkWidget *checkbtn_cleanonexit;


@@ -310,6 +302,9 @@ static PrefParam param[] = {
         prefs_common_encoding_set_data_from_optmenu,
         prefs_common_encoding_set_optmenu},
 
         prefs_common_encoding_set_data_from_optmenu,
         prefs_common_encoding_set_optmenu},
 

+       {"allow_jisx0201_kana", "FALSE", &prefs_common.allow_jisx0201_kana,
+        P_BOOL, NULL, NULL, NULL},
+

        /* Compose */
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,
        /* Compose */
        {"auto_ext_editor", "FALSE", &prefs_common.auto_exteditor, P_BOOL,
         &compose.checkbtn_autoextedit,


@@ -609,7 +604,10 @@ static PrefParam param[] = {
         NULL, NULL, NULL},
        {"compose_height", "560", &prefs_common.compose_height, P_INT,
         NULL, NULL, NULL},
         NULL, NULL, NULL},
        {"compose_height", "560", &prefs_common.compose_height, P_INT,
         NULL, NULL, NULL},

-
+       {"compose_x", "0", &prefs_common.compose_x, P_INT,
+        NULL, NULL, NULL},
+       {"compose_y", "0", &prefs_common.compose_y, P_INT,
+        NULL, NULL, NULL},

        /* Message */
        {"enable_color", "TRUE", &prefs_common.enable_color, P_BOOL,
         &message.chkbtn_enablecol,
        /* Message */
        {"enable_color", "TRUE", &prefs_common.enable_color, P_BOOL,
         &message.chkbtn_enablecol,


@@ -727,20 +725,18 @@ static PrefParam param[] = {
 
        {"pixmap_theme_path", DEFAULT_PIXMAP_THEME, 
         &prefs_common.pixmap_theme_path, P_STRING,
 
        {"pixmap_theme_path", DEFAULT_PIXMAP_THEME, 
         &prefs_common.pixmap_theme_path, P_STRING,

-        &interface.entry_pixmap_theme, prefs_set_data_from_entry, prefs_set_entry},
+        NULL, NULL, NULL},

 
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
        
        /* Other */
        {"uri_open_command", DEFAULT_BROWSER_CMD,
 
        {"hover_timeout", "500", &prefs_common.hover_timeout, P_INT,
         NULL, NULL, NULL},
        
        /* Other */
        {"uri_open_command", DEFAULT_BROWSER_CMD,

-        &prefs_common.uri_cmd, P_STRING,
-        &other.uri_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.uri_cmd, P_STRING, NULL, NULL, NULL},

        {"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,
        {"print_command", "lpr %s", &prefs_common.print_cmd, P_STRING,

-        &other.printcmd_entry, prefs_set_data_from_entry, prefs_set_entry},
+        NULL, NULL, NULL},

        {"ext_editor_command", "gedit %s",
        {"ext_editor_command", "gedit %s",

-        &prefs_common.ext_editor_cmd, P_STRING,
-        &other.exteditor_entry, prefs_set_data_from_entry, prefs_set_entry},
+        &prefs_common.ext_editor_cmd, P_STRING, NULL, NULL, NULL},

 
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, &other.checkbtn_addaddrbyclick,
 
        {"add_address_by_click", "FALSE", &prefs_common.add_address_by_click,
         P_BOOL, &other.checkbtn_addaddrbyclick,


@@ -2152,12 +2148,6 @@ static void prefs_interface_create(void)
        GtkWidget *hbox_nextunreadmsgdialog;
        GtkWidget *optmenu_nextunreadmsgdialog;
 
        GtkWidget *hbox_nextunreadmsgdialog;
        GtkWidget *optmenu_nextunreadmsgdialog;
 

-       GtkWidget *frame_pixmap_theme;
-       GtkWidget *vbox_pixmap_theme;
-       GtkWidget *entry_pixmap_theme;
-       GtkWidget *combo_pixmap_theme;
-       GList *avail_pixmap_themes = NULL;
-

        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        vbox1 = gtk_vbox_new (FALSE, VSPACING);
        gtk_widget_show (vbox1);
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);


@@ -2239,23 +2229,6 @@ static void prefs_interface_create(void)
        g_signal_connect (G_OBJECT (button_keybind), "clicked",
                          G_CALLBACK (prefs_keybind_select), NULL);
 
        g_signal_connect (G_OBJECT (button_keybind), "clicked",
                          G_CALLBACK (prefs_keybind_select), NULL);
 

-       PACK_FRAME(vbox1, frame_pixmap_theme, _("Icon theme"));
-       
-       vbox_pixmap_theme = gtk_vbox_new(FALSE, 0);
-       gtk_widget_show(vbox_pixmap_theme);
-       gtk_container_add(GTK_CONTAINER(frame_pixmap_theme), vbox_pixmap_theme);
-       gtk_container_set_border_width(GTK_CONTAINER(vbox_pixmap_theme), 8);
- 
-       avail_pixmap_themes = stock_pixmap_themes_list_new(); 
- 
-       combo_pixmap_theme = gtk_combo_new ();
-       gtk_widget_show (combo_pixmap_theme);
-       gtk_box_pack_start (GTK_BOX (vbox_pixmap_theme), combo_pixmap_theme, TRUE, TRUE, 0);
-       gtk_combo_set_popdown_strings(GTK_COMBO(combo_pixmap_theme), avail_pixmap_themes);
-       entry_pixmap_theme = GTK_COMBO (combo_pixmap_theme)->entry;
-
-       stock_pixmap_themes_list_free(avail_pixmap_themes);
-

        /* interface.checkbtn_emacs          = checkbtn_emacs; */
        interface.checkbtn_always_show_msg    = checkbtn_always_show_msg;
        interface.checkbtn_openunread         = checkbtn_openunread;
        /* interface.checkbtn_emacs          = checkbtn_emacs; */
        interface.checkbtn_always_show_msg    = checkbtn_always_show_msg;
        interface.checkbtn_openunread         = checkbtn_openunread;


@@ -2264,28 +2237,13 @@ static void prefs_interface_create(void)
        interface.checkbtn_openinbox          = checkbtn_openinbox;
        interface.checkbtn_immedexec          = checkbtn_immedexec;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;
        interface.checkbtn_openinbox          = checkbtn_openinbox;
        interface.checkbtn_immedexec          = checkbtn_immedexec;
        interface.optmenu_nextunreadmsgdialog = optmenu_nextunreadmsgdialog;

-       interface.combo_pixmap_theme          = combo_pixmap_theme;
-       interface.entry_pixmap_theme          = entry_pixmap_theme;

 }
 
 static void prefs_other_create(void)
 {
        GtkWidget *vbox1;
 }
 
 static void prefs_other_create(void)
 {
        GtkWidget *vbox1;

-       GtkWidget *ext_frame;
-       GtkWidget *ext_table;

        GtkWidget *hbox1;
 
        GtkWidget *hbox1;
 

-       GtkWidget *uri_label;
-       GtkWidget *uri_combo;
-       GtkWidget *uri_entry;
-
-       GtkWidget *printcmd_label;
-       GtkWidget *printcmd_entry;
-
-       GtkWidget *exteditor_label;
-       GtkWidget *exteditor_combo;
-       GtkWidget *exteditor_entry;
-

        GtkWidget *frame_addr;
        GtkWidget *vbox_addr;
        GtkWidget *checkbtn_addaddrbyclick;
        GtkWidget *frame_addr;
        GtkWidget *vbox_addr;
        GtkWidget *checkbtn_addaddrbyclick;


@@ -2322,73 +2280,6 @@ static void prefs_other_create(void)
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 
        gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
        gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
 

-       PACK_FRAME(vbox1, ext_frame,
-                  _("External commands (%s will be replaced with file name / URI)"));
-
-       ext_table = gtk_table_new (3, 2, FALSE);
-       gtk_widget_show (ext_table);
-       gtk_container_add (GTK_CONTAINER (ext_frame), ext_table);
-       gtk_container_set_border_width (GTK_CONTAINER (ext_table), 8);
-       gtk_table_set_row_spacings (GTK_TABLE (ext_table), VSPACING_NARROW);
-       gtk_table_set_col_spacings (GTK_TABLE (ext_table), 8);
-
-       uri_label = gtk_label_new (_("Web browser"));
-       gtk_widget_show(uri_label);
-       gtk_table_attach (GTK_TABLE (ext_table), uri_label, 0, 1, 0, 1,
-                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-       gtk_misc_set_alignment (GTK_MISC (uri_label), 1, 0.5);
-
-       uri_combo = gtk_combo_new ();
-       gtk_widget_show (uri_combo);
-       gtk_table_attach (GTK_TABLE (ext_table), uri_combo, 1, 2, 0, 1,
-                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
-       gtkut_combo_set_items (GTK_COMBO (uri_combo),
-                              DEFAULT_BROWSER_CMD,
-                              "galeon --new-tab '%s'",
-                              "galeon '%s'",
-                              "mozilla -remote 'openurl(%s,new-window)'",
-                              "netscape -remote 'openURL(%s, new-window)'",
-                              "netscape '%s'",
-                              "gnome-moz-remote --newwin '%s'",
-                              "kfmclient openURL '%s'",
-                              "opera -newwindow '%s'",
-                              "kterm -e w3m '%s'",
-                              "kterm -e lynx '%s'",
-                              NULL);
-       uri_entry = GTK_COMBO (uri_combo)->entry;
-
-       printcmd_label = gtk_label_new (_("Print"));
-       gtk_widget_show (printcmd_label);
-       gtk_table_attach (GTK_TABLE (ext_table), printcmd_label, 0, 1, 1, 2,
-                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-       gtk_misc_set_alignment (GTK_MISC (printcmd_label), 1, 0.5);
-
-       printcmd_entry = gtk_entry_new ();
-       gtk_widget_show (printcmd_entry);
-       gtk_table_attach (GTK_TABLE (ext_table), printcmd_entry, 1, 2, 1, 2,
-                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
-
-       exteditor_label = gtk_label_new (_("Editor"));
-       gtk_widget_show (exteditor_label);
-       gtk_table_attach (GTK_TABLE (ext_table), exteditor_label, 0, 1, 2, 3,
-                         GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
-       gtk_misc_set_alignment (GTK_MISC (exteditor_label), 1, 0.5);
-
-       exteditor_combo = gtk_combo_new ();
-       gtk_widget_show (exteditor_combo);
-       gtk_table_attach (GTK_TABLE (ext_table), exteditor_combo, 1, 2, 2, 3,
-                         GTK_EXPAND | GTK_FILL, 0, 0, 0);
-       gtkut_combo_set_items (GTK_COMBO (exteditor_combo),
-                              "gedit %s",
-                              "kedit %s",
-                              "mgedit --no-fork %s",
-                              "emacs %s",
-                              "xemacs %s",
-                              "kterm -e jed %s",
-                              "kterm -e vi %s",
-                              NULL);
-       exteditor_entry = GTK_COMBO (exteditor_combo)->entry;
-

        PACK_FRAME (vbox1, frame_addr, _("Address book"));
 
        vbox_addr = gtk_vbox_new (FALSE, 0);
        PACK_FRAME (vbox1, frame_addr, _("Address book"));
 
        vbox_addr = gtk_vbox_new (FALSE, 0);


@@ -2494,13 +2385,6 @@ static void prefs_other_create(void)
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 
        gtk_widget_show (label_iotimeout);
        gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
 

-       other.uri_combo = uri_combo;
-       other.uri_entry = uri_entry;
-       other.printcmd_entry = printcmd_entry;
-
-       other.exteditor_combo = exteditor_combo;
-       other.exteditor_entry = exteditor_entry;
-

        other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
        
        other.checkbtn_cliplog     = checkbtn_cliplog;
        other.checkbtn_addaddrbyclick = checkbtn_addaddrbyclick;
        
        other.checkbtn_cliplog     = checkbtn_cliplog;


@@ -3303,8 +3187,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<control><alt>U"},
 
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<control><alt>U"},
 

-               {"<Main>/Message/Get new mail",                 "<control>I"},
-               {"<Main>/Message/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Receive/Get new mail",         "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},

                {"<Main>/Message/Compose an email message",     "<control>M"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><control>R"},
                {"<Main>/Message/Compose an email message",     "<control>M"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><control>R"},


@@ -3357,8 +3241,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Show all headers",                "<shift>H"},
                {"<Main>/View/Update",                          "<shift>S"},
 
                {"<Main>/View/Show all headers",                "<shift>H"},
                {"<Main>/View/Update",                          "<shift>S"},
 

-               {"<Main>/Message/Get new mail",                 "<control>I"},
-               {"<Main>/Message/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Receive/Get new mail",         "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},

                {"<Main>/Message/Compose an email message",     "W"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift>A"},
                {"<Main>/Message/Compose an email message",     "W"},
                {"<Main>/Message/Reply",                        "<control>R"},
                {"<Main>/Message/Reply to/all",                 "<shift>A"},


@@ -3410,9 +3294,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<control><alt>U"},
 
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<control><alt>U"},
 

-               {"<Main>/Message/Get new mail",                 "<control>I"},
-               {"<Main>/Message/Get from all accounts",        "<shift><control>I"},
-               {"<Main>/Message/Compose new message",          "M"},
+               {"<Main>/Message/Receive/Get new mail",                 "<control>I"},
+               {"<Main>/Message/Receive/Get from all accounts",        "<shift><control>I"},
+               {"<Main>/Message/Compose an email message",             "M"},

                {"<Main>/Message/Reply",                        "R"},
                {"<Main>/Message/Reply to/all",                 "G"},
                {"<Main>/Message/Reply to/sender",              ""},
                {"<Main>/Message/Reply",                        "R"},
                {"<Main>/Message/Reply to/all",                 "G"},
                {"<Main>/Message/Reply to/sender",              ""},


@@ -3464,8 +3348,8 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget)
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<alt>U"},
 
                {"<Main>/View/Show all headers",                "<control>H"},
                {"<Main>/View/Update",                          "<alt>U"},
 

-               {"<Main>/Message/Get new mail",                 "<alt>I"},
-               {"<Main>/Message/Get from all accounts",        "<shift><alt>I"},
+               {"<Main>/Message/Receive/Get new mail",                 "<alt>I"},
+               {"<Main>/Message/Receive/Get from all accounts",        "<shift><alt>I"},

                {"<Main>/Message/Compose an email message",     "<alt>N"},
                {"<Main>/Message/Reply",                        "<alt>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><alt>R"},
                {"<Main>/Message/Compose an email message",     "<alt>N"},
                {"<Main>/Message/Reply",                        "<alt>R"},
                {"<Main>/Message/Reply to/all",                 "<shift><alt>R"},


@@ -3673,37 +3557,11 @@ static void prefs_common_ok(void)
 
 static void prefs_common_apply(void)
 {
 
 static void prefs_common_apply(void)
 {

-       const gchar *entry_pixmap_theme_str;
-       gboolean update_pixmap_theme;
-       gchar *backup_theme_path;

        MainWindow *mainwindow;
        MainWindow *mainwindow;

-       
-       entry_pixmap_theme_str = gtk_entry_get_text(GTK_ENTRY(interface.entry_pixmap_theme));
-       if (entry_pixmap_theme_str && 
-               (strcmp(prefs_common.pixmap_theme_path, entry_pixmap_theme_str) != 0) )
-               update_pixmap_theme = TRUE;
-       else
-               update_pixmap_theme = FALSE;
-
-       /*!< FIXME: prefs_set_data_from_dialog() clears and frees all strings, 
-        * but prefs_common.pixmap_theme_path is stored in the StockPixmapData
-        * in stock_pixmap.c::pixmaps[].icon_path, and used when reflecting
-        * the pixmap changes. Work around by saving the old one and freeing 
-        * it later. */
-       backup_theme_path = prefs_common.pixmap_theme_path;
-       prefs_common.pixmap_theme_path = g_strdup(backup_theme_path);
+

        prefs_set_data_from_dialog(param);
        sock_set_io_timeout(prefs_common.io_timeout_secs);
        prefs_set_data_from_dialog(param);
        sock_set_io_timeout(prefs_common.io_timeout_secs);

-       
-       if (update_pixmap_theme) {
-               main_window_reflect_prefs_all_real(TRUE);
-               compose_reflect_prefs_pixmap_theme();
-       } else
-               main_window_reflect_prefs_all_real(FALSE);
-
-       /*!< FIXME: Now it's safe to delete the backup path */
-       g_free(backup_theme_path);
-
+       main_window_reflect_prefs_all_real(FALSE);

        prefs_common_save_config();
 
        mainwindow = mainwindow_get_mainwindow();
        prefs_common_save_config();
 
        mainwindow = mainwindow_get_mainwindow();

diff --git a/src/prefs_common.h b/src/prefs_common.h
index 312acd2eeef1a33be98881bef11b5df053b37a9b..b568e07bd75f67165778d9057c13d3d98deba9d3 100644 (file)
--- a/src/prefs_common.h
+++ b/src/prefs_common.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -82,6 +82,8 @@ struct _PrefsCommon
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
 
        gchar *outgoing_charset;
        TransferEncodingMethod encoding_method;
 

+       gboolean allow_jisx0201_kana;
+

        /* Compose */
        gint undolevels;
        gint linewrap_len;
        /* Compose */
        gint undolevels;
        gint linewrap_len;


@@ -209,6 +211,8 @@ struct _PrefsCommon
 
        gint compose_width;
        gint compose_height;
 
        gint compose_width;
        gint compose_height;

+       gint compose_x;
+       gint compose_y;

 
        /* Message */
        gboolean enable_color;
 
        /* Message */
        gboolean enable_color;

diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 050cd07156931e57300a35f1afb2a194124a404f..149821b0bfc86c3e3d685f28f841804aa1c06cd1 100644 (file)
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -483,6 +483,10 @@ static gint prefs_custom_header_clist_set_row(PrefsAccount *ac, gint row)
                alertpanel_error(_("Header name is not set."));
                return -1;
        }
                alertpanel_error(_("Header name is not set."));
                return -1;
        }

+       if (!custom_header_is_allowed(entry_text)) {
+               alertpanel_error(_("This Header name is not allowed as a custom header."));
+               return -1;
+       }

 
        ch = g_new0(CustomHeader, 1);
 
 
        ch = g_new0(CustomHeader, 1);
 

diff --git a/src/prefs_filtering.c b/src/prefs_filtering.c
index 57376b35e0c7fe74574c73a7114c6b1eee79b9a3..ebb3d7a9fb674b79fe22fb3f073fcbc6dd5a062d 100644 (file)
--- a/src/prefs_filtering.c
+++ b/src/prefs_filtering.c
@@ -405,7 +405,6 @@ static void rename_path(GSList * filters,
        gint destlen;
        gint prefixlen;
        gint oldpathlen;
        gint destlen;
        gint prefixlen;
        gint oldpathlen;

-       FolderItem *item;

         GSList * action_cur;
         GSList * cur;
 
         GSList * action_cur;
         GSList * cur;
 


@@ -522,7 +521,6 @@ static void delete_path(GSList ** p_filters, const gchar * path)
        gint destlen;
        gint prefixlen;
        gint pathlen;
        gint destlen;
        gint prefixlen;
        gint pathlen;

-       FolderItem *item;

         GSList * action_cur;
        GSList * cur;
         
         GSList * action_cur;
        GSList * cur;
         

diff --git a/src/prefs_fonts.c b/src/prefs_fonts.c
index 5fcec3b0976d7c1f8485e751d226bec9d62fb715..d81e873a1f2e61fa4117aeb2798dcc104de317fc 100644 (file)
--- a/src/prefs_fonts.c
+++ b/src/prefs_fonts.c
@@ -1,8 +1,6 @@
-
-

 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 2003 Hiroyuki Yamamoto & the Sylpheed-Claws team
+ * Copyright (C) 2003-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team

  *
  * 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
  *
  * 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


@@ -48,12 +46,10 @@ typedef struct _FontsPage
 
        GtkWidget *window;              /* do not modify */
 
 
        GtkWidget *window;              /* do not modify */
 

-       GtkWidget *label_textfont;
-       GtkWidget *entry_textfont;
-       GtkWidget *entry_smallfont;
-       GtkWidget *entry_normalfont;
+       GtkWidget *entry_folderviewfont;
+       GtkWidget *entry_summaryviewfont;
+       GtkWidget *entry_messageviewfont;

        GtkWidget *entry_boldfont;
        GtkWidget *entry_boldfont;

-       GtkWidget *button_textfont;

 } FontsPage;
 
 static GtkWidget *font_sel_win;
 } FontsPage;
 
 static GtkWidget *font_sel_win;


@@ -141,12 +137,10 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        FontsPage *prefs_fonts = (FontsPage *) _page;
 
        GtkWidget *table;
        FontsPage *prefs_fonts = (FontsPage *) _page;
 
        GtkWidget *table;

-       GtkWidget *label_textfont;
-       GtkWidget *entry_textfont;
-       GtkWidget *entry_smallfont;
+       GtkWidget *entry_folderviewfont;
+       GtkWidget *entry_summaryviewfont;
+       GtkWidget *entry_messageviewfont;

        GtkWidget *entry_boldfont;
        GtkWidget *entry_boldfont;

-       GtkWidget *entry_normalfont;
-       GtkWidget *button_textfont;

        GtkWidget *tmplabel, *tmpbutton;
        GtkWidget *vbox;
        GtkWidget *hint_label;
        GtkWidget *tmplabel, *tmpbutton;
        GtkWidget *vbox;
        GtkWidget *hint_label;


@@ -157,30 +151,29 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 
        gtk_table_set_row_spacings(GTK_TABLE(table), 4);
        gtk_table_set_col_spacings(GTK_TABLE(table), 8);
 

-       label_textfont = gtk_label_new (_("Text"));
-       gtk_widget_show (label_textfont);
-       gtk_table_attach (GTK_TABLE (table), label_textfont, 0, 1, 0, 1,
-                        (GtkAttachOptions) (GTK_FILL),
+       tmplabel = gtk_label_new (_("Folder View"));
+       gtk_widget_show (tmplabel);
+       gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 0, 1,
+                        (GtkAttachOptions) GTK_FILL,

                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_label_set_justify(GTK_LABEL(label_textfont), GTK_JUSTIFY_RIGHT);
-       gtk_misc_set_alignment(GTK_MISC(label_textfont), 1, 0.5);
+       gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
+       gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);

 
 

-       entry_textfont = gtk_entry_new ();
-       gtk_widget_show (entry_textfont);
-       gtk_table_attach (GTK_TABLE (table), entry_textfont, 1, 2, 0, 1,
+       entry_folderviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_folderviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_folderviewfont, 1, 2, 0, 1,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_textfont), prefs_common.textfont);
-
-       button_textfont = gtk_button_new_with_label (" ... ");
+       gtk_entry_set_text(GTK_ENTRY(entry_folderviewfont), prefs_common.normalfont);

 
 

-       gtk_widget_show (button_textfont);
-       gtk_table_attach (GTK_TABLE (table), button_textfont, 2, 3, 0, 1,
+       tmpbutton = gtk_button_new_with_label (" ... ");
+       gtk_widget_show (tmpbutton);
+       gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 0, 1,

                          0, 0, 0, 0);
                          0, 0, 0, 0);

-       gtk_signal_connect (GTK_OBJECT (button_textfont), "clicked",
-                           GTK_SIGNAL_FUNC (prefs_font_select), entry_textfont);
+       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
+                               GTK_SIGNAL_FUNC(prefs_font_select), entry_folderviewfont);

 
 

-       tmplabel = gtk_label_new (_("Small"));
+       tmplabel = gtk_label_new (_("Summary View"));

        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 1, 2,
                         (GtkAttachOptions) GTK_FILL,
        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 1, 2,
                         (GtkAttachOptions) GTK_FILL,


@@ -188,21 +181,21 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 

-       entry_smallfont = gtk_entry_new ();
-       gtk_widget_show (entry_smallfont);
-       gtk_table_attach (GTK_TABLE (table), entry_smallfont, 1, 2, 1, 2,
+       entry_summaryviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_summaryviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_summaryviewfont, 1, 2, 1, 2,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_smallfont), prefs_common.smallfont);
+       gtk_entry_set_text(GTK_ENTRY(entry_summaryviewfont), prefs_common.smallfont);

 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 1, 2,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 1, 2,
                          0, 0, 0, 0);
        gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",

-                           GTK_SIGNAL_FUNC(prefs_font_select), entry_smallfont);
+                           GTK_SIGNAL_FUNC(prefs_font_select), entry_summaryviewfont);

 
 

-       tmplabel = gtk_label_new (_("Normal"));
+       tmplabel = gtk_label_new (_("Message View"));

        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 2, 3,
                         (GtkAttachOptions) GTK_FILL,
        gtk_widget_show (tmplabel);
        gtk_table_attach (GTK_TABLE (table), tmplabel, 0, 1, 2, 3,
                         (GtkAttachOptions) GTK_FILL,


@@ -210,19 +203,19 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 
        gtk_label_set_justify(GTK_LABEL(tmplabel), GTK_JUSTIFY_RIGHT);
        gtk_misc_set_alignment(GTK_MISC(tmplabel), 1, 0.5);
 

-       entry_normalfont = gtk_entry_new ();
-       gtk_widget_show (entry_normalfont);
-       gtk_table_attach (GTK_TABLE (table), entry_normalfont, 1, 2, 2, 3,
+       entry_messageviewfont = gtk_entry_new ();
+       gtk_widget_show (entry_messageviewfont);
+       gtk_table_attach (GTK_TABLE (table), entry_messageviewfont, 1, 2, 2, 3,

                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);
                         (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
                         (GtkAttachOptions) (0), 0, 0);

-       gtk_entry_set_text(GTK_ENTRY(entry_normalfont), prefs_common.normalfont);
+       gtk_entry_set_text(GTK_ENTRY(entry_messageviewfont), prefs_common.textfont);

 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 2, 3,
                          0, 0, 0, 0);
 
        tmpbutton = gtk_button_new_with_label (" ... ");
        gtk_widget_show (tmpbutton);
        gtk_table_attach (GTK_TABLE (table), tmpbutton, 2, 3, 2, 3,
                          0, 0, 0, 0);

-       gtk_signal_connect (GTK_OBJECT(tmpbutton), "clicked",
-                               GTK_SIGNAL_FUNC(prefs_font_select), entry_normalfont);
+       gtk_signal_connect (GTK_OBJECT (tmpbutton), "clicked",
+                           GTK_SIGNAL_FUNC (prefs_font_select), entry_messageviewfont);

 
        tmplabel = gtk_label_new (_("Bold"));
        gtk_widget_show (tmplabel);
 
        tmplabel = gtk_label_new (_("Bold"));
        gtk_widget_show (tmplabel);


@@ -249,7 +242,7 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
        gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, 4, 5,
        vbox = gtk_vbox_new(FALSE, VSPACING_NARROW);
        gtk_widget_show(vbox);
        gtk_table_attach (GTK_TABLE (table), vbox, 0, 4, 4, 5,

-                        (GtkAttachOptions) (GTK_FILL),
+                        (GtkAttachOptions) GTK_FILL,

                         (GtkAttachOptions) (0), 0, 0);
        
        hint_label = gtk_label_new (_("You will need to restart for the "
                         (GtkAttachOptions) (0), 0, 0);
        
        hint_label = gtk_label_new (_("You will need to restart for the "


@@ -259,12 +252,11 @@ void prefs_fonts_create_widget(PrefsPage *_page, GtkWindow *window,
                            hint_label, FALSE, FALSE, 0);
        gtk_misc_set_alignment(GTK_MISC(hint_label), 0.5, 0.5);
 
                            hint_label, FALSE, FALSE, 0);
        gtk_misc_set_alignment(GTK_MISC(hint_label), 0.5, 0.5);
 

-       prefs_fonts->window             = GTK_WIDGET(window);
-       prefs_fonts->entry_textfont     = entry_textfont;
-       prefs_fonts->entry_smallfont    = entry_smallfont;
-       prefs_fonts->entry_normalfont   = entry_normalfont;
-       prefs_fonts->entry_boldfont     = entry_boldfont;
-       prefs_fonts->button_textfont    = button_textfont;
+       prefs_fonts->window                = GTK_WIDGET(window);
+       prefs_fonts->entry_folderviewfont  = entry_folderviewfont;
+       prefs_fonts->entry_summaryviewfont = entry_summaryviewfont;
+       prefs_fonts->entry_messageviewfont = entry_messageviewfont;
+       prefs_fonts->entry_boldfont        = entry_boldfont;

 
        prefs_fonts->page.widget = table;
 }
 
        prefs_fonts->page.widget = table;
 }


@@ -273,15 +265,16 @@ void prefs_fonts_save(PrefsPage *_page)
 {
        FontsPage *fonts = (FontsPage *) _page;
 
 {
        FontsPage *fonts = (FontsPage *) _page;
 

-       prefs_common.textfont   = gtk_editable_get_chars
-               (GTK_EDITABLE(fonts->entry_textfont), 0, -1);
+       prefs_common.normalfont = gtk_editable_get_chars
+               (GTK_EDITABLE(fonts->entry_folderviewfont), 0, -1);

        prefs_common.smallfont  = gtk_editable_get_chars
        prefs_common.smallfont  = gtk_editable_get_chars

-               (GTK_EDITABLE(fonts->entry_smallfont), 0, -1);
+               (GTK_EDITABLE(fonts->entry_summaryviewfont), 0, -1);
+       prefs_common.textfont   = gtk_editable_get_chars
+               (GTK_EDITABLE(fonts->entry_messageviewfont), 0, -1);

        prefs_common.boldfont   = gtk_editable_get_chars
                (GTK_EDITABLE(fonts->entry_boldfont), 0, -1);
        prefs_common.boldfont   = gtk_editable_get_chars
                (GTK_EDITABLE(fonts->entry_boldfont), 0, -1);

-       prefs_common.normalfont = gtk_editable_get_chars
-               (GTK_EDITABLE(fonts->entry_normalfont), 0, -1);

 }
 }

+

 static void prefs_fonts_destroy_widget(PrefsPage *_page)
 {
        /* FontsPage *fonts = (FontsPage *) _page; */
 static void prefs_fonts_destroy_widget(PrefsPage *_page)
 {
        /* FontsPage *fonts = (FontsPage *) _page; */

diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index d8e1d81f3dc5e63fc45799b8cb5a542393a87d6b..12f3c131b51b27a33b6c235f25dfc2a2c28708f6 100644 (file)
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -506,21 +506,17 @@ static void prefs_themes_btn_install_clicked_cb(GtkWidget *widget, gpointer data
        prefs_themes_foreach_file(source, prefs_themes_file_install, cinfo);
        if (cinfo->status == NULL) {
                GList *insted;
        prefs_themes_foreach_file(source, prefs_themes_file_install, cinfo);
        if (cinfo->status == NULL) {
                GList *insted;

-
+               
+               alertpanel_notice(_("Theme installed succesfully"));

                /* update interface to show newly installed theme */
                prefs_themes_get_themes_and_names(tdata);
                insted = g_list_find_custom(tdata->themes, 
                                            (gpointer)(cinfo->dest), 
                                            (GCompareFunc)strcmp2);
                /* update interface to show newly installed theme */
                prefs_themes_get_themes_and_names(tdata);
                insted = g_list_find_custom(tdata->themes, 
                                            (gpointer)(cinfo->dest), 
                                            (GCompareFunc)strcmp2);

-               if (NULL != insted) {
-                       alertpanel_notice(_("Theme installed succesfully"));
-                       tdata->displayed = (gchar *)(insted->data);
-                       prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
-                       prefs_themes_display_global_stats(tdata);
-                       prefs_themes_get_theme_info(tdata);
-               }
-               else
-                       alertpanel_error(_("Failed installing theme"));
+               tdata->displayed = (gchar *)(insted->data);
+               prefs_themes_set_themes_menu(GTK_OPTION_MENU(tdata->page->op_menu), tdata);
+               prefs_themes_display_global_stats(tdata);
+               prefs_themes_get_theme_info(tdata);     

        }
        else
                alertpanel_error(_("File %s failed\nwhile installing theme."), cinfo->status);
        }
        else
                alertpanel_error(_("File %s failed\nwhile installing theme."), cinfo->status);

diff --git a/src/procheader.c b/src/procheader.c
index 40d9e9d80214def9d8120a7fe145ae50e1cc2600..28a6b8fa0b3f7c1fa76f71d84a770fcdab7fca65 100644 (file)
--- a/src/procheader.c
+++ b/src/procheader.c
@@ -46,14 +46,12 @@ static gint string_get_one_field(gchar *buf, gint len, char **str,
 
 static char *string_getline(char *buf, int len, char **str);
 static int string_peekchar(char **str);
 
 static char *string_getline(char *buf, int len, char **str);
 static int string_peekchar(char **str);

-static int string_getchar(char **str);

 static int file_peekchar(FILE *fp);
 static int file_peekchar(FILE *fp);

-static int file_getchar(FILE *fp);

 static gint generic_get_one_field(gchar *buf, gint len, void *data,
                                  HeaderEntry hentry[],
                                  getlinefunc getline, 
                                  peekcharfunc peekchar,
 static gint generic_get_one_field(gchar *buf, gint len, void *data,
                                  HeaderEntry hentry[],
                                  getlinefunc getline, 
                                  peekcharfunc peekchar,

-                                 getcharfunc getchar);
+                                 gboolean unfold);

 static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                             gboolean full, gboolean decrypted);
 
 static MsgInfo *parse_stream(void *data, gboolean isstring, MsgFlags flags,
                             gboolean full, gboolean decrypted);
 


@@ -63,7 +61,7 @@ gint procheader_get_one_field(gchar *buf, gint len, FILE *fp,
 {
        return generic_get_one_field(buf, len, fp, hentry,
                                     (getlinefunc)fgets, (peekcharfunc)file_peekchar,
 {
        return generic_get_one_field(buf, len, fp, hentry,
                                     (getlinefunc)fgets, (peekcharfunc)file_peekchar,

-                                    (getcharfunc)file_getchar);
+                                    TRUE);

 }
 
 static gint string_get_one_field(gchar *buf, gint len, char **str,
 }
 
 static gint string_get_one_field(gchar *buf, gint len, char **str,


@@ -72,7 +70,7 @@ static gint string_get_one_field(gchar *buf, gint len, char **str,
        return generic_get_one_field(buf, len, str, hentry,
                                     (getlinefunc)string_getline,
                                     (peekcharfunc)string_peekchar,
        return generic_get_one_field(buf, len, str, hentry,
                                     (getlinefunc)string_getline,
                                     (peekcharfunc)string_peekchar,

-                                    (getcharfunc)string_getchar);
+                                    TRUE);

 }
 
 static char *string_getline(char *buf, int len, char **str)
 }
 
 static char *string_getline(char *buf, int len, char **str)


@@ -93,25 +91,15 @@ static int string_peekchar(char **str)
        return **str;
 }
 
        return **str;
 }
 

-static int string_getchar(char **str)
-{
-       return *(*str)++;
-}
-

 static int file_peekchar(FILE *fp)
 {
        return ungetc(getc(fp), fp);
 }
 
 static int file_peekchar(FILE *fp)
 {
        return ungetc(getc(fp), fp);
 }
 

-static int file_getchar(FILE *fp)
-{
-       return getc(fp);
-}
-

 static gint generic_get_one_field(gchar *buf, gint len, void *data,
                          HeaderEntry *hentry,
                          getlinefunc getline, peekcharfunc peekchar,
 static gint generic_get_one_field(gchar *buf, gint len, void *data,
                          HeaderEntry *hentry,
                          getlinefunc getline, peekcharfunc peekchar,

-                         getcharfunc getchar_)
+                         gboolean unfold)

 {
        gint nexthead;
        gint hnum = 0;
 {
        gint nexthead;
        gint hnum = 0;


@@ -139,37 +127,43 @@ static gint generic_get_one_field(gchar *buf, gint len, void *data,
                if (buf[0] == '\r' || buf[0] == '\n') return -1;
        }
 
                if (buf[0] == '\r' || buf[0] == '\n') return -1;
        }
 

-       /* remove trailing new line */
-       strretchomp(buf);
-
-#define UNFOLD_LINE() \
-       (!hentry || (hp && hp->unfold))
-

        /* unfold line */
        while (1) {
                nexthead = peekchar(data);
                /* ([*WSP CRLF] 1*WSP) */
                if (nexthead == ' ' || nexthead == '\t') {
        /* unfold line */
        while (1) {
                nexthead = peekchar(data);
                /* ([*WSP CRLF] 1*WSP) */
                if (nexthead == ' ' || nexthead == '\t') {

-                       size_t buflen = strlen(buf);
+                       size_t buflen;
+                       /* trim previous trailing \n if requesting one header or
+                        * unfolding was requested */
+                       if ((!hentry && unfold) || (hp && hp->unfold))
+                               strretchomp(buf);
+
+                       buflen = strlen(buf);

                        
                        /* concatenate next line */
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;
                        
                        /* concatenate next line */
                        if ((len - buflen) > 2) {
                                if (getline(buf + buflen, len - buflen, data) == NULL)
                                        break;

-                               /* trim trailing \n if requesting one header or
-                                * unfolding was requested */
-                               if (UNFOLD_LINE())                               
-                                   strretchomp(buf);

                        } else
                                break;
                        } else
                                break;

-               } else
+               } else {
+                       /* remove trailing new line */
+                       strretchomp(buf);

                        break;
                        break;

+               }

        }
        }

-#undef UNFOLD_LINE     

 
        return hnum;
 }
 
 
        return hnum;
 }
 

+gint procheader_get_one_field_asis(gchar *buf, gint len, FILE *fp)
+{
+       return generic_get_one_field(buf, len, fp, NULL,
+                                    (getlinefunc)fgets, 
+                                    (peekcharfunc)file_peekchar,
+                                    FALSE);
+}
+

 #if 0
 gchar *procheader_get_unfolded_line(gchar *buf, gint len, FILE *fp)
 {
 #if 0
 gchar *procheader_get_unfolded_line(gchar *buf, gint len, FILE *fp)
 {


@@ -328,7 +322,7 @@ GPtrArray *procheader_get_header_array_asis(FILE *fp)
 
        headers = g_ptr_array_new();
 
 
        headers = g_ptr_array_new();
 

-       while (procheader_get_one_field(buf, sizeof(buf), fp, NULL) != -1) {
+       while (procheader_get_one_field_asis(buf, sizeof(buf), fp) != -1) {

                if ((header = procheader_parse_header(buf)) != NULL)
                        g_ptr_array_add(headers, header);
                        /*
                if ((header = procheader_parse_header(buf)) != NULL)
                        g_ptr_array_add(headers, header);
                        /*

diff --git a/src/procheader.h b/src/procheader.h
index 1e9afad2dbe973706665c37fbbd96b25fd0f20d8..11cd3644977e21e9d193d0422319830659dfd9c1 100644 (file)
--- a/src/procheader.h
+++ b/src/procheader.h
@@ -46,6 +46,9 @@ gint procheader_get_one_field         (gchar          *buf,
                                         gint            len,
                                         FILE           *fp,
                                         HeaderEntry     hentry[]);
                                         gint            len,
                                         FILE           *fp,
                                         HeaderEntry     hentry[]);

+gint procheader_get_one_field_asis     (gchar          *buf,
+                                        gint            len,
+                                        FILE           *fp);

 gchar *procheader_get_unfolded_line    (gchar          *buf,
                                         gint            len,
                                         FILE           *fp);
 gchar *procheader_get_unfolded_line    (gchar          *buf,
                                         gint            len,
                                         FILE           *fp);

diff --git a/src/procmime.c b/src/procmime.c
index 5a137449745048c0ea7481d99e376e1d5a0483d8..9cc84d34753a390da50107a44958b45ecfb1c27a 100644 (file)
--- a/src/procmime.c
+++ b/src/procmime.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 Hiroyuki Yamamoto & The Sylpheed-Claws Team

  *
  * 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
  *
  * 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


@@ -23,6 +23,7 @@
 
 #include "defs.h"
 
 
 #include "defs.h"
 

+#include <stdio.h>

 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>


@@ -157,6 +158,7 @@ void procmime_mimeinfo_replace(MimeInfo *old, MimeInfo *new)
 MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
 {
        g_return_val_if_fail(mimeinfo != NULL, NULL);
 MimeInfo *procmime_mimeinfo_parent(MimeInfo *mimeinfo)
 {
        g_return_val_if_fail(mimeinfo != NULL, NULL);

+       g_return_val_if_fail(mimeinfo->node != NULL, NULL);

 
        if (mimeinfo->node->parent == NULL)
                return NULL;
 
        if (mimeinfo->node->parent == NULL)
                return NULL;


@@ -794,7 +796,8 @@ GList *procmime_get_mime_type_list(void)
        GList *list = NULL;
        FILE *fp;
        gchar buf[BUFFSIZE];
        GList *list = NULL;
        FILE *fp;
        gchar buf[BUFFSIZE];

-       gchar *p, *delim;
+       guchar *p;
+       gchar *delim;

        MimeType *mime_type;
 
        if (mime_type_list) 
        MimeType *mime_type;
 
        if (mime_type_list) 


@@ -964,9 +967,12 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
                                                   NULL, TRUE},
                                {"Content-Disposition:",
                                                   NULL, TRUE},
                                                   NULL, TRUE},
                                {"Content-Disposition:",
                                                   NULL, TRUE},

+                               {"MIME-Version:",
+                                                  NULL, TRUE},

                                {NULL,             NULL, FALSE}};
        guint content_start, i;
        FILE *fp;
                                {NULL,             NULL, FALSE}};
        guint content_start, i;
        FILE *fp;

+       gint mime_major, mime_minor, a;

 
        if(mimeinfo->encoding_type != ENC_BINARY && 
           mimeinfo->encoding_type != ENC_7BIT && 
 
        if(mimeinfo->encoding_type != ENC_BINARY && 
           mimeinfo->encoding_type != ENC_7BIT && 


@@ -979,12 +985,28 @@ void procmime_parse_message_rfc822(MimeInfo *mimeinfo)
        content_start = ftell(fp);
        fclose(fp);
 
        content_start = ftell(fp);
        fclose(fp);
 

-       procmime_parse_mimepart(mimeinfo,
-                               hentry[0].body, hentry[1].body,
-                               hentry[2].body, hentry[3].body, 
-                               hentry[4].body, 
-                               mimeinfo->filename, content_start,
-                               mimeinfo->length - (content_start - mimeinfo->offset));
+       if ((hentry[5].body != NULL) &&
+           (sscanf(hentry[5].body, "%d.%d", &mime_major, &mime_minor) == 2) &&
+           (mime_major == 1) && (mime_minor == 0)) {
+               procmime_parse_mimepart(mimeinfo,
+                                       hentry[0].body, hentry[1].body,
+                                       hentry[2].body, hentry[3].body, 
+                                       hentry[4].body, 
+                                       mimeinfo->filename, content_start,
+                                       mimeinfo->length - (content_start - mimeinfo->offset));
+       } else {
+               MimeInfo *subinfo;
+
+               subinfo = procmime_mimeinfo_new();
+               subinfo->encoding_type = ENC_BINARY;
+               subinfo->type = MIMETYPE_TEXT;
+               subinfo->subtype = g_strdup("plain");
+               subinfo->filename = g_strdup(mimeinfo->filename);
+               subinfo->offset = content_start;
+               subinfo->length = mimeinfo->length - (content_start - mimeinfo->offset);
+
+               g_node_append(mimeinfo->node, subinfo->node);
+       }

        for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;
        for (i = 0; i < (sizeof hentry / sizeof hentry[0]); i++) {
                g_free(hentry[i].body);
                hentry[i].body = NULL;

diff --git a/src/procmsg.c b/src/procmsg.c
index 22b50d4d7bf836e58d7086825d072a3588889b89..522d65131a7e2deaec455af6a74a1519a837f723 100644 (file)
--- a/src/procmsg.c
+++ b/src/procmsg.c
@@ -217,13 +217,11 @@ static GNode *subject_relation_lookup(GRelation *relation, MsgInfo *msginfo)
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {
 /* return the reversed thread tree */
 GNode *procmsg_get_thread_tree(GSList *mlist)
 {

-       GNode *root, *parent, *node, *next, *last;
-       GNode *prev; /* CLAWS */
+       GNode *root, *parent, *node, *next;

        GHashTable *msgid_table;
        GRelation *subject_relation;
        MsgInfo *msginfo;
        const gchar *msgid;
        GHashTable *msgid_table;
        GRelation *subject_relation;
        MsgInfo *msginfo;
        const gchar *msgid;

-       const gchar *subject;

 
        root = g_node_new(NULL);
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);
 
        root = g_node_new(NULL);
        msgid_table = g_hash_table_new(g_str_hash, g_str_equal);


@@ -254,7 +252,6 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
 
        /* complete the unfinished threads */
        for (node = root->children; node != NULL; ) {
 
        /* complete the unfinished threads */
        for (node = root->children; node != NULL; ) {

-               prev = node->prev;      /* CLAWS: need the last node */

                parent = NULL;
                next = node->next;
                msginfo = (MsgInfo *)node->data;
                parent = NULL;
                next = node->next;
                msginfo = (MsgInfo *)node->data;


@@ -269,22 +266,18 @@ GNode *procmsg_get_thread_tree(GSList *mlist)
                                        (parent, parent->children, node);
                        }                               
                }
                                        (parent, parent->children, node);
                        }                               
                }

-               last = (next == NULL) ? prev : node;

                node = next;
        }
 
        if (prefs_common.thread_by_subject) {
                node = next;
        }
 
        if (prefs_common.thread_by_subject) {

-               for (node = last; node && node != NULL;) {
-                       next = node->prev;
+               for (node = root->children; node && node != NULL;) {
+                       next = node->next;

                        msginfo = (MsgInfo *) node->data;
                        
                        msginfo = (MsgInfo *) node->data;
                        

-                       /* may not parentize if parent was delivered after childs */
-                       if (subject != msginfo->subject)
-                               parent = subject_relation_lookup(subject_relation, msginfo);
-                       else
-                               parent = NULL; 
+                       parent = subject_relation_lookup(subject_relation, msginfo);

                        
                        

-                       /* the node may already be threaded by IN-REPLY-TO, so go up in the tree to 
+                       /* the node may already be threaded by IN-REPLY-TO, so go up 
+                        * in the tree to 

                           find the parent node */
                        if (parent != NULL) {
                                if (g_node_is_ancestor(node, parent))
                           find the parent node */
                        if (parent != NULL) {
                                if (g_node_is_ancestor(node, parent))


@@ -557,7 +550,7 @@ void procmsg_get_filter_keyword(MsgInfo *msginfo, gchar **header, gchar **key,
                        SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
                        extract_list_id_str(*key);
                } else if (hentry[H_X_SEQUENCE].body != NULL) {
                        SET_FILTER_KEY("header \"List-Id\"", H_LIST_ID);
                        extract_list_id_str(*key);
                } else if (hentry[H_X_SEQUENCE].body != NULL) {

-                       gchar *p;
+                       guchar *p;

 
                        SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);
                        p = *key;
 
                        SET_FILTER_KEY("X-Sequence", H_X_SEQUENCE);
                        p = *key;


@@ -915,8 +908,6 @@ void procmsg_msginfo_free(MsgInfo *msginfo)
        if (msginfo->refcnt > 0)
                return;
 
        if (msginfo->refcnt > 0)
                return;
 

-       debug_print("freeing msginfo %d in %s\n", msginfo->msgnum, msginfo->folder ? msginfo->folder->path : "(nil)");
-

        if (msginfo->to_folder) {
                msginfo->to_folder->op_count--;
                folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);
        if (msginfo->to_folder) {
                msginfo->to_folder->op_count--;
                folder_item_update(msginfo->to_folder, F_ITEM_UPDATE_MSGCNT);

diff --git a/src/quote_fmt_parse.y b/src/quote_fmt_parse.y
index 13cb1aacae80926e211097fa1bc35ef14ba8bb87..605cbd9a01e479063b2f7485f399179f82c5dcce 100644 (file)
--- a/src/quote_fmt_parse.y
+++ b/src/quote_fmt_parse.y
@@ -131,7 +131,7 @@ int quote_fmtwrap(void)
        return 1;
 }
 
        return 1;
 }
 

-static int isseparator(char ch)
+static int isseparator(int ch)

 {
        return isspace(ch) || ch == '.' || ch == '-';
 }
 {
        return isspace(ch) || ch == '.' || ch == '-';
 }


@@ -284,7 +284,7 @@ special:
        | SHOW_FIRST_NAME
        {
                if (msginfo->fromname) {
        | SHOW_FIRST_NAME
        {
                if (msginfo->fromname) {

-                       gchar *p;
+                       guchar *p;

                        gchar *str;
 
                        str = alloca(strlen(msginfo->fromname) + 1);
                        gchar *str;
 
                        str = alloca(strlen(msginfo->fromname) + 1);


@@ -333,7 +333,7 @@ special:
 #define MAX_SENDER_INITIAL 20
                if (msginfo->fromname) {
                        gchar tmp[MAX_SENDER_INITIAL];
 #define MAX_SENDER_INITIAL 20
                if (msginfo->fromname) {
                        gchar tmp[MAX_SENDER_INITIAL];

-                       gchar *p;
+                       guchar *p;

                        gchar *cur;
                        gint len = 0;
 
                        gchar *cur;
                        gint len = 0;
 

diff --git a/src/sgpgme.c b/src/sgpgme.c
index 0b655643a0176a5e33269db0b8329fcba356b77c..1dddabdeed1b8d96721ea1156bd91fdaa33e8f1b 100644 (file)
--- a/src/sgpgme.c
+++ b/src/sgpgme.c
@@ -58,10 +58,19 @@ GpgmeSigStat sgpgme_verify_signature(GpgmeCtx ctx, GpgmeData sig,
        return status;
 }
 
        return status;
 }
 

-SignatureStatus sgpgme_sigstat_gpgme_to_privacy(GpgmeSigStat status)
+SignatureStatus sgpgme_sigstat_gpgme_to_privacy(GpgmeCtx ctx, GpgmeSigStat status)

 {
 {

+       unsigned long validity = 0;
+       
+       validity = gpgme_get_sig_ulong_attr(ctx, 0,
+               GPGME_ATTR_VALIDITY, 0);
+

        switch (status) {
        case GPGME_SIG_STAT_GOOD:
        switch (status) {
        case GPGME_SIG_STAT_GOOD:

+               if ((validity != GPGME_VALIDITY_MARGINAL) &&
+                   (validity != GPGME_VALIDITY_FULL) &&
+                   (validity != GPGME_VALIDITY_ULTIMATE))
+                       return SIGNATURE_WARN;

                return SIGNATURE_OK;
        case GPGME_SIG_STAT_GOOD_EXP:
        case GPGME_SIG_STAT_GOOD_EXPKEY:
                return SIGNATURE_OK;
        case GPGME_SIG_STAT_GOOD_EXP:
        case GPGME_SIG_STAT_GOOD_EXPKEY:

diff --git a/src/sgpgme.h b/src/sgpgme.h
index 9cd1f49431cd1548389aacffc90e25092339772c..ddcf1a84e95da1367a077e83d571060b693efc6b 100644 (file)
--- a/src/sgpgme.h
+++ b/src/sgpgme.h
@@ -31,7 +31,8 @@ GpgmeSigStat sgpgme_verify_signature  (GpgmeCtx ctx,
                                         GpgmeData sig,
                                         GpgmeData plain);
 SignatureStatus sgpgme_sigstat_gpgme_to_privacy
                                         GpgmeData sig,
                                         GpgmeData plain);
 SignatureStatus sgpgme_sigstat_gpgme_to_privacy

-                                       (GpgmeSigStat status);
+                                       (GpgmeCtx ctx,
+                                        GpgmeSigStat status);

 gchar *sgpgme_sigstat_info_short       (GpgmeCtx ctx,
                                         GpgmeSigStat status);
 gchar *sgpgme_sigstat_info_full                (GpgmeCtx ctx,
 gchar *sgpgme_sigstat_info_short       (GpgmeCtx ctx,
                                         GpgmeSigStat status);
 gchar *sgpgme_sigstat_info_full                (GpgmeCtx ctx,

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index a5e696cbc3a5c9a76939be31817558cda2dbda28..2ba7c2fbb5c4442f5122829cbd131b612fcaf055 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -125,100 +125,100 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname);
 
 static StockPixmapData pixmaps[] =
 {
 
 static StockPixmapData pixmaps[] =
 {

-       {address_xpm                            , NULL, NULL, "address", "  "},
-       {address_book_xpm                       , NULL, NULL, "address_book", "  "},
-       {address_search_xpm                     , NULL, NULL, "address_search", "  "},
-       {book_xpm                               , NULL, NULL, "book", "  "},
-       {category_xpm                           , NULL, NULL, "category", "  "},
-       {checkbox_off_xpm                       , NULL, NULL, "checkbox_off", "  "},
-       {checkbox_on_xpm                        , NULL, NULL, "checkbox_on", "  "},
-       {check_spelling_xpm                     , NULL, NULL, "check_spelling", "  "},
-       {clip_xpm                               , NULL, NULL, "clip", "  "},
-       {clipkey_xpm                            , NULL, NULL, "clipkey", "  "},
-       {close_xpm                              , NULL, NULL, "close", "  "},
-       {complete_xpm                           , NULL, NULL, "complete", "  "},
-       {continue_xpm                           , NULL, NULL, "continue", "  "},
-       {deleted_xpm                            , NULL, NULL, "deleted", "  "},
-       {dir_close_xpm                          , NULL, NULL, "dir_close", "  "},
-       {dir_close_xpm                          , NULL, NULL, "dir_close_hrm", " "},
-       {dir_open_xpm                           , NULL, NULL, "dir_open", "  "},
-       {dir_open_hrm_xpm                       , NULL, NULL, "dir_open_hrm", "  "},
-       {down_arrow_xpm                         , NULL, NULL, "down_arrow", "  "},
-       {up_arrow_xpm                           , NULL, NULL, "up_arrow", "  "},
-       {mail_compose_xpm                       , NULL, NULL, "edit_extern", "  "},
-       {error_xpm                              , NULL, NULL, "error", "  "},
-       {exec_xpm                               , NULL, NULL, "exec", "  "},
-       {forwarded_xpm                          , NULL, NULL, "forwarded", "  "},
-       {group_xpm                              , NULL, NULL, "group", "  "},
-       {ignorethread_xpm                       , NULL, NULL, "ignorethread", "  "},
-       {inbox_xpm                              , NULL, NULL, "inbox_close", "  "},
-       {inbox_hrm_xpm                          , NULL, NULL, "inbox_close_hrm", "  "},
-       {inbox_xpm                              , NULL, NULL, "inbox_open", "  "},
-       {inbox_hrm_xpm                          , NULL, NULL, "inbox_open_hrm", "  "},
-       {paste_xpm                              , NULL, NULL, "insert_file", "  "},
-       {interface_xpm                          , NULL, NULL, "interface", "  "},
-       {jpilot_xpm                             , NULL, NULL, "jpilot", "  "},
-       {key_xpm                                , NULL, NULL, "key", "  "},
-       {ldap_xpm                               , NULL, NULL, "ldap", "  "},
-       {linewrap_xpm                           , NULL, NULL, "linewrap", "  "},
-       {locked_xpm                             , NULL, NULL, "locked", "  "},
-       {mail_xpm                               , NULL, NULL, "mail", "  "},
-       {mail_attach_xpm                        , NULL, NULL, "mail_attach", "  "},
-       {mail_compose_xpm                       , NULL, NULL, "mail_compose", "  "},
-       {mail_forward_xpm                       , NULL, NULL, "mail_forward", "  "},
-       {mail_receive_xpm                       , NULL, NULL, "mail_receive", "  "},
-       {mail_receive_all_xpm                   , NULL, NULL, "mail_receive_all", "  "},
-       {mail_reply_xpm                         , NULL, NULL, "mail_reply", "  "},
-       {mail_reply_to_all_xpm                  , NULL, NULL, "mail_reply_to_all", "  "},
-       {mail_reply_to_author_xpm               , NULL, NULL, "mail_reply_to_author", "  "},
-       {mail_send_xpm                          , NULL, NULL, "mail_send", "  "},
-       {mail_send_queue_xpm                    , NULL, NULL, "mail_send_queue", "  "},
-       {mail_xpm                               , NULL, NULL, "mail_sign", "  "},
-       {mark_xpm                               , NULL, NULL, "mark", "  "},
-       {new_xpm                                , NULL, NULL, "new", "  "},
-       {news_compose_xpm                       , NULL, NULL, "news_compose", "  "},
-       {outbox_xpm                             , NULL, NULL, "outbox_close", "  "},
-       {outbox_hrm_xpm                         , NULL, NULL, "outbox_close_hrm", "  "},
-       {outbox_xpm                             , NULL, NULL, "outbox_open", "  "},
-       {outbox_hrm_xpm                         , NULL, NULL, "outbox_open_hrm", "  "},
-       {replied_xpm                            , NULL, NULL, "replied", "  "},
-       {paste_xpm                              , NULL, NULL, "paste", "  "},
-       {preferences_xpm                        , NULL, NULL, "preferences", "  "},
-       {properties_xpm                         , NULL, NULL, "properties", "  "},
-       {outbox_xpm                             , NULL, NULL, "queue_close", "  "},
-       {outbox_hrm_xpm                         , NULL, NULL, "queue_close_hrm", "  "},
-       {outbox_xpm                             , NULL, NULL, "queue_open", "  "},
-       {outbox_hrm_xpm                         , NULL, NULL, "queue_open_hrm", "  "},
-       {trash_xpm                              , NULL, NULL, "trash_open", "  "},
-       {trash_hrm_xpm                          , NULL, NULL, "trash_open_hrm", "  "},
-       {trash_xpm                              , NULL, NULL, "trash_close", "  "},
-       {trash_hrm_xpm                          , NULL, NULL, "trash_close_hrm", "  "},
-       {unread_xpm                             , NULL, NULL, "unread", "  "},
-       {vcard_xpm                              , NULL, NULL, "vcard", "  "},
-       {online_xpm                             , NULL, NULL, "online", "  "},
-       {offline_xpm                            , NULL, NULL, "offline", "  "},
-       {notice_warn_xpm                        , NULL, NULL, "notice_warn",  "  "},
-       {notice_error_xpm                       , NULL, NULL, "notice_error",  "  "},
-       {notice_note_xpm                        , NULL, NULL, "notice_note",  "  "},
-       {quicksearch_xpm                        , NULL, NULL, "quicksearch",  "  "},
-       {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", "  "},
-       {drafts_close_xpm                       , NULL, NULL, "drafts_close", "  "},
-       {drafts_open_xpm                        , NULL, NULL, "drafts_open", "  "},
-       {mime_text_plain_xpm                    , NULL, NULL, "mime_text_plain", "  "},
-       {mime_text_html_xpm                     , NULL, NULL, "mime_text_html", "  "},
-       {mime_application_xpm                   , NULL, NULL, "mime_application", "  "},
-       {mime_image_xpm                         , NULL, NULL, "mime_image", "  "},
-       {mime_audio_xpm                         , NULL, NULL, "mime_audio", "  "},
-       {mime_text_enriched_xpm                 , NULL, NULL, "mime_text_enriched", "  "},
-       {mime_unknown_xpm                       , NULL, NULL, "mime_unknown", "  "},    
-       {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", "  "},
-       {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", "  "},
-       {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", "  "},  
-       {privacy_unknown_xpm                    , NULL, NULL, "privacy_unknown", "  "},
-       {privacy_expired_xpm                    , NULL, NULL, "privacy_expired", "  "},
-       {privacy_warn_xpm                       , NULL, NULL, "privacy_warn", "  "},
-       {mime_message_xpm                       , NULL, NULL, "mime_message", "  "},
-       {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", "  "},
+       {address_xpm                            , NULL, NULL, "address", NULL},
+       {address_book_xpm                       , NULL, NULL, "address_book", NULL},
+       {address_search_xpm                     , NULL, NULL, "address_search", NULL},
+       {book_xpm                               , NULL, NULL, "book", NULL},
+       {category_xpm                           , NULL, NULL, "category", NULL},
+       {checkbox_off_xpm                       , NULL, NULL, "checkbox_off", NULL},
+       {checkbox_on_xpm                        , NULL, NULL, "checkbox_on", NULL},
+       {check_spelling_xpm                     , NULL, NULL, "check_spelling", NULL},
+       {clip_xpm                               , NULL, NULL, "clip", NULL},
+       {clipkey_xpm                            , NULL, NULL, "clipkey", NULL},
+       {close_xpm                              , NULL, NULL, "close", NULL},
+       {complete_xpm                           , NULL, NULL, "complete", NULL},
+       {continue_xpm                           , NULL, NULL, "continue", NULL},
+       {deleted_xpm                            , NULL, NULL, "deleted", NULL},
+       {dir_close_xpm                          , NULL, NULL, "dir_close", NULL},
+       {dir_close_xpm                          , NULL, NULL, "dir_close_hrm", NULL},
+       {dir_open_xpm                           , NULL, NULL, "dir_open", NULL},
+       {dir_open_hrm_xpm                       , NULL, NULL, "dir_open_hrm", NULL},
+       {down_arrow_xpm                         , NULL, NULL, "down_arrow", NULL},
+       {up_arrow_xpm                           , NULL, NULL, "up_arrow", NULL},
+       {mail_compose_xpm                       , NULL, NULL, "edit_extern", NULL},
+       {error_xpm                              , NULL, NULL, "error", NULL},
+       {exec_xpm                               , NULL, NULL, "exec", NULL},
+       {forwarded_xpm                          , NULL, NULL, "forwarded", NULL},
+       {group_xpm                              , NULL, NULL, "group", NULL},
+       {ignorethread_xpm                       , NULL, NULL, "ignorethread", NULL},
+       {inbox_xpm                              , NULL, NULL, "inbox_close", NULL},
+       {inbox_hrm_xpm                          , NULL, NULL, "inbox_close_hrm", NULL},
+       {inbox_xpm                              , NULL, NULL, "inbox_open", NULL},
+       {inbox_hrm_xpm                          , NULL, NULL, "inbox_open_hrm", NULL},
+       {paste_xpm                              , NULL, NULL, "insert_file", NULL},
+       {interface_xpm                          , NULL, NULL, "interface", NULL},
+       {jpilot_xpm                             , NULL, NULL, "jpilot", NULL},
+       {key_xpm                                , NULL, NULL, "key", NULL},
+       {ldap_xpm                               , NULL, NULL, "ldap", NULL},
+       {linewrap_xpm                           , NULL, NULL, "linewrap", NULL},
+       {locked_xpm                             , NULL, NULL, "locked", NULL},
+       {mail_xpm                               , NULL, NULL, "mail", NULL},
+       {mail_attach_xpm                        , NULL, NULL, "mail_attach", NULL},
+       {mail_compose_xpm                       , NULL, NULL, "mail_compose", NULL},
+       {mail_forward_xpm                       , NULL, NULL, "mail_forward", NULL},
+       {mail_receive_xpm                       , NULL, NULL, "mail_receive", NULL},
+       {mail_receive_all_xpm                   , NULL, NULL, "mail_receive_all", NULL},
+       {mail_reply_xpm                         , NULL, NULL, "mail_reply", NULL},
+       {mail_reply_to_all_xpm                  , NULL, NULL, "mail_reply_to_all", NULL},
+       {mail_reply_to_author_xpm               , NULL, NULL, "mail_reply_to_author", NULL},
+       {mail_send_xpm                          , NULL, NULL, "mail_send", NULL},
+       {mail_send_queue_xpm                    , NULL, NULL, "mail_send_queue", NULL},
+       {mail_xpm                               , NULL, NULL, "mail_sign", NULL},
+       {mark_xpm                               , NULL, NULL, "mark", NULL},
+       {new_xpm                                , NULL, NULL, "new", NULL},
+       {news_compose_xpm                       , NULL, NULL, "news_compose", NULL},
+       {outbox_xpm                             , NULL, NULL, "outbox_close", NULL},
+       {outbox_hrm_xpm                         , NULL, NULL, "outbox_close_hrm", NULL},
+       {outbox_xpm                             , NULL, NULL, "outbox_open", NULL},
+       {outbox_hrm_xpm                         , NULL, NULL, "outbox_open_hrm", NULL},
+       {replied_xpm                            , NULL, NULL, "replied", NULL},
+       {paste_xpm                              , NULL, NULL, "paste", NULL},
+       {preferences_xpm                        , NULL, NULL, "preferences", NULL},
+       {properties_xpm                         , NULL, NULL, "properties", NULL},
+       {outbox_xpm                             , NULL, NULL, "queue_close", NULL},
+       {outbox_hrm_xpm                         , NULL, NULL, "queue_close_hrm", NULL},
+       {outbox_xpm                             , NULL, NULL, "queue_open", NULL},
+       {outbox_hrm_xpm                         , NULL, NULL, "queue_open_hrm", NULL},
+       {trash_xpm                              , NULL, NULL, "trash_open", NULL},
+       {trash_hrm_xpm                          , NULL, NULL, "trash_open_hrm", NULL},
+       {trash_xpm                              , NULL, NULL, "trash_close", NULL},
+       {trash_hrm_xpm                          , NULL, NULL, "trash_close_hrm", NULL},
+       {unread_xpm                             , NULL, NULL, "unread", NULL},
+       {vcard_xpm                              , NULL, NULL, "vcard", NULL},
+       {online_xpm                             , NULL, NULL, "online", NULL},
+       {offline_xpm                            , NULL, NULL, "offline", NULL},
+       {notice_warn_xpm                        , NULL, NULL, "notice_warn",  NULL},
+       {notice_error_xpm                       , NULL, NULL, "notice_error",  NULL},
+       {notice_note_xpm                        , NULL, NULL, "notice_note",  NULL},
+       {quicksearch_xpm                        , NULL, NULL, "quicksearch",  NULL},
+       {gpg_signed_xpm                         , NULL, NULL, "gpg_signed", NULL},
+       {drafts_close_xpm                       , NULL, NULL, "drafts_close", NULL},
+       {drafts_open_xpm                        , NULL, NULL, "drafts_open", NULL},
+       {mime_text_plain_xpm                    , NULL, NULL, "mime_text_plain", NULL},
+       {mime_text_html_xpm                     , NULL, NULL, "mime_text_html", NULL},
+       {mime_application_xpm                   , NULL, NULL, "mime_application", NULL},
+       {mime_image_xpm                         , NULL, NULL, "mime_image", NULL},
+       {mime_audio_xpm                         , NULL, NULL, "mime_audio", NULL},
+       {mime_text_enriched_xpm                 , NULL, NULL, "mime_text_enriched", NULL},
+       {mime_unknown_xpm                       , NULL, NULL, "mime_unknown", NULL},    
+       {privacy_signed_xpm                     , NULL, NULL, "privacy_signed", NULL},
+       {privacy_passed_xpm                     , NULL, NULL, "privacy_passed", NULL},
+       {privacy_failed_xpm                     , NULL, NULL, "privacy_failed", NULL},  
+       {privacy_unknown_xpm                    , NULL, NULL, "privacy_unknown", NULL},
+       {privacy_expired_xpm                    , NULL, NULL, "privacy_expired", NULL},
+       {privacy_warn_xpm                       , NULL, NULL, "privacy_warn", NULL},
+       {mime_message_xpm                       , NULL, NULL, "mime_message", NULL},
+       {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", NULL},

 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */


@@ -250,7 +250,7 @@ gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
 
        pix_d = &pixmaps[icon];
 
 
        pix_d = &pixmaps[icon];
 

-       if (!pix_d->pixmap || (strcmp(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0)) {
+       if (!pix_d->pixmap || (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0)) {

                GdkPixmap *pix = NULL;
        
                if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
                GdkPixmap *pix = NULL;
        
                if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {


@@ -264,8 +264,10 @@ gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
                                                             NULL);
                                if (is_file_exist(icon_file_name))
                                        PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);
                                                             NULL);
                                if (is_file_exist(icon_file_name))
                                        PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);

-                               if (pix) 
-                                       pix_d->icon_path = prefs_common.pixmap_theme_path;
+                               if (pix) {
+                                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                                       pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
+                               }

                                g_free(icon_file_name);
                        } else {
                                /* even the path does not exist (deleted between two sessions), so
                                g_free(icon_file_name);
                        } else {
                                /* even the path does not exist (deleted between two sessions), so


@@ -278,8 +280,10 @@ gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
 
        if (!pix_d->pixmap) {
                PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);
 
        if (!pix_d->pixmap) {
                PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);

-               if (pix_d->pixmap) 
-                       pix_d->icon_path = DEFAULT_PIXMAP_THEME;        
+               if (pix_d->pixmap) {
+                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                       pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);      
+               }

        }
 
        g_return_val_if_fail(pix_d->pixmap != NULL, -1);
        }
 
        g_return_val_if_fail(pix_d->pixmap != NULL, -1);

diff --git a/src/string_match.c b/src/string_match.c
deleted file mode 100644 (file)
index 0a8cfe6..0000000
--- a/src/string_match.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Sylpheed -- regexp pattern matching utilities
- * Copyright (C) 2001 Thomas Link, Hiroyuki Yamamoto
- *                    Modified by Melvin Hadasht.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#ifdef HAVE_CONFIG_H
-#  include "config.h"
-#endif
-
-#include <string.h>
-
-#include "intl.h"
-#include "string_match.h"
-
-int string_match_precompile (gchar *rexp, regex_t *preg, int cflags)
-{
-       int problem = 0;
-
-       g_return_val_if_fail(rexp, -1);
-       g_return_val_if_fail(*rexp, -1);
-
-       problem = regcomp(preg, rexp, cflags);  
-       
-       return problem;
-}
-
-
-gchar *string_remove_match(gchar *buf, gint buflen, gchar * txt, regex_t *preg)
-{
-       regmatch_t match;
-       int notfound;
-       gint i, j ,k;
-
-       if (!preg)
-               return txt;
-       if (*txt != 0x00) {
-               i = 0;
-               j = 0;
-               do {
-                       notfound = regexec(preg, txt+j, 1, &match, (j ? REG_NOTBOL : 0));
-                       if (notfound) {
-                               while (txt[j] && i < buflen -1)
-                                       buf[i++] = txt[j++];
-                       } else {
-                               if ( match.rm_so == match.rm_eo)
-                                       buf[i++] = txt[j++];
-                               else {
-                                       k = j;
-                                       while (txt[j] &&  j != k + match.rm_so) 
-                                               buf[i++] = txt[j++];
-                                       if (txt[j])
-                                               j = k + match.rm_eo;
-                               }
-                       }
-               } while (txt[j] && i < buflen - 1);
-               buf[i] = 0x00;
-               if (buf[0] == 0x00) {
-                       strncpy(buf, _("(Subject cleared by RegExp)"),
-                                       buflen - 1);
-                       buf[buflen - 1] = 0x00;
-               }
-               return buf;             
-       }
-       return txt;
-}
-

diff --git a/src/string_match.h b/src/string_match.h
deleted file mode 100644 (file)
index 86793bd..0000000
--- a/src/string_match.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Sylpheed -- regexp pattern matching utilities
- * Copyright (C) 2001 Thomas Link, Hiroyuki Yamamoto
- *                    Modified by Melvin Hadasht.
- *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-
-#ifndef STRING_MATCH_H__
-#define STRING_MATCH_H__
-
-#include <sys/types.h>
-#include <regex.h>
-#include <glib.h>
-
-/* Precompile the preg buffer for the rexp regexp string. See regex man for the
- * meaning of cflags.  
- */
-
-int string_match_precompile (gchar *rexp, regex_t *preg, int cflags);
-
-/* remove from txt the substrings matching the regexp in the precompiled preg buffer.  
- * The result is stored in the preallocated buf buffer which maximal length
- * is buflen.
- */
-gchar *string_remove_match(gchar *buf, gint buflen, gchar * txt, regex_t *preg);
-
-#endif /* STRING_MATCH_H__ */

diff --git a/src/summaryview.c b/src/summaryview.c
index 8c4eeec0ca44dc352e588d377797a3c78b7f78e3..7692dcd9d68e53e9b8bc906ce38c7c9c48abfe6b 100644 (file)
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -83,6 +83,7 @@
 #include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"
 #include "matcher_parser.h"
 #include "hooks.h"
 #include "description_window.h"

+#include "folderutils.h"

 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13
 
 #define SUMMARY_COL_MARK_WIDTH         10
 #define SUMMARY_COL_STATUS_WIDTH       13


@@ -963,7 +964,7 @@ gboolean summary_show(SummaryView *summaryview, FolderItem *item)
        summary_set_column_titles(summaryview);
 
        buf = NULL;
        summary_set_column_titles(summaryview);
 
        buf = NULL;

-       if (!item || !item->path || !item->parent || item->no_select) {
+       if (!item || !item->path || !folder_item_parent(item) || item->no_select) {

                g_free(buf);
                debug_print("empty folder\n\n");
                summary_set_hide_read_msgs_menu(summaryview, FALSE);
                g_free(buf);
                debug_print("empty folder\n\n");
                summary_set_hide_read_msgs_menu(summaryview, FALSE);


@@ -2968,7 +2969,6 @@ static void summary_mark_row_as_unread(SummaryView *summaryview,
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 
        && procmsg_msg_has_marked_parent(msginfo))
                summaryview->unreadmarked++;
 

-       procmsg_msginfo_unset_flags(msginfo, MSG_REPLIED | MSG_FORWARDED, 0);

        procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
        debug_print("Message %d is marked as unread\n",
                msginfo->msgnum);
        procmsg_msginfo_set_flags(msginfo, MSG_UNREAD, 0);
        debug_print("Message %d is marked as unread\n",
                msginfo->msgnum);


@@ -3152,55 +3152,16 @@ void summary_delete(SummaryView *summaryview)
 
 void summary_delete_duplicated(SummaryView *summaryview)
 {
 
 void summary_delete_duplicated(SummaryView *summaryview)
 {

-       if (!summaryview->folder_item ||
-           FOLDER_TYPE(summaryview->folder_item->folder) == F_NEWS) return;
-       if (summaryview->folder_item->stype == F_TRASH) return;
-

        main_window_cursor_wait(summaryview->mainwin);
        main_window_cursor_wait(summaryview->mainwin);

-       debug_print("Deleting duplicated messages...");

        STATUSBAR_PUSH(summaryview->mainwin,
                       _("Deleting duplicated messages..."));
 
        STATUSBAR_PUSH(summaryview->mainwin,
                       _("Deleting duplicated messages..."));
 

-       folder_item_update_freeze();
-       
-       gtk_ctree_pre_recursive(GTK_CTREE(summaryview->ctree), NULL,
-                               GTK_CTREE_FUNC(summary_delete_duplicated_func),
-                               summaryview);
-
-       if (prefs_common.immediate_exec)
-               summary_execute(summaryview);
-       else
-               summary_status_show(summaryview);
+       folderutils_delete_duplicates(summaryview->folder_item);

 
 

-       folder_item_update_thaw();
-
-       debug_print("done.\n");

        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
 }
 
        STATUSBAR_POP(summaryview->mainwin);
        main_window_cursor_normal(summaryview->mainwin);
 }
 

-static void summary_delete_duplicated_func(GtkCTree *ctree, GtkCTreeNode *node,
-                                          SummaryView *summaryview)
-{
-       GtkCTreeNode *found;
-       MsgInfo *msginfo;
-       MsgInfo *dup_msginfo;
-
-       msginfo = GTKUT_CTREE_NODE_GET_ROW_DATA(node);
-       
-       if (!msginfo || !msginfo->msgid || !*msginfo->msgid) return;
-
-       found = g_hash_table_lookup(summaryview->msgid_table, msginfo->msgid);
-       
-       if (found && found != node) {
-               dup_msginfo = gtk_ctree_node_get_row_data(ctree, found);
-               /* prefer to delete the unread one */
-               if ((MSG_IS_UNREAD(msginfo->flags) && !MSG_IS_UNREAD(dup_msginfo->flags))
-               ||  (MSG_IS_UNREAD(msginfo->flags) == MSG_IS_UNREAD(dup_msginfo->flags)))
-                       summary_delete_row(summaryview, node);
-       }
-}
-

 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);
 static void summary_unmark_row(SummaryView *summaryview, GtkCTreeNode *row)
 {
        GtkCTree *ctree = GTK_CTREE(summaryview->ctree);


@@ -4514,12 +4475,18 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event,
        GtkCTreeNode *node;
        MessageView *messageview;
        TextView *textview;
        GtkCTreeNode *node;
        MessageView *messageview;
        TextView *textview;

+       GtkAdjustment *adj;

 
        if (summary_is_locked(summaryview)) return TRUE;
        if (!event) return TRUE;
 
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */
 
        if (summary_is_locked(summaryview)) return TRUE;
        if (!event) return TRUE;
 
        switch (event->keyval) {
        case GDK_Left:          /* Move focus */

+               adj = gtk_scrolled_window_get_hadjustment
+                       (GTK_SCROLLED_WINDOW(summaryview->scrolledwin));
+               if (adj->lower != adj->value)
+                       break;
+               /* FALLTHROUGH */       

        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;
        case GDK_Escape:
                gtk_widget_grab_focus(summaryview->folderview->ctree);
                return TRUE;


@@ -4998,25 +4965,25 @@ CMP_FUNC_DEF(summary_cmp_by_to, to);
 
 #undef CMP_FUNC_DEF
 
 
 #undef CMP_FUNC_DEF
 

-static gint summary_cmp_by_subject(GtkCList *clist,                     \
-                                  gconstpointer ptr1,                   \
-                                  gconstpointer ptr2)                   \
-{                                                                       \
-       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;                 \
-       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;                 \
-                                                                        \
-       if (!msginfo1->subject)                                          \
-               return (msginfo2->subject != NULL);                      \
-       if (!msginfo2->subject)                                          \
-               return -1;                                               \
-                                                                        \
-       return subject_compare_for_sort                                  \
-               (msginfo1->subject, msginfo2->subject);                  \
+static gint summary_cmp_by_subject(GtkCList *clist,
+                                  gconstpointer ptr1,
+                                  gconstpointer ptr2)
+{
+       MsgInfo *msginfo1 = ((GtkCListRow *)ptr1)->data;
+       MsgInfo *msginfo2 = ((GtkCListRow *)ptr2)->data;
+
+       if (!msginfo1->subject)
+               return (msginfo2->subject != NULL);
+       if (!msginfo2->subject)
+               return -1;
+
+       return subject_compare_for_sort
+               (msginfo1->subject, msginfo2->subject);

 }
 
 }
 

- static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
-                                gconstpointer ptr2)
- {
+static gint summary_cmp_by_from(GtkCList *clist, gconstpointer ptr1,
+                               gconstpointer ptr2)
+{

        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;
        const gchar *str1, *str2;
        const GtkCListRow *r1 = (const GtkCListRow *) ptr1;
        const GtkCListRow *r2 = (const GtkCListRow *) ptr2;


@@ -5034,9 +5001,9 @@ static gint summary_cmp_by_subject(GtkCList *clist,                        \
                return -1;
  
        return strcasecmp(str1, str2);
                return -1;
  
        return strcasecmp(str1, str2);

- }
+}

  
  

- static gint summary_cmp_by_simplified_subject
+static gint summary_cmp_by_simplified_subject

        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
        const FolderItemPrefs *prefs;
        (GtkCList *clist, gconstpointer ptr1, gconstpointer ptr2)
 {
        const FolderItemPrefs *prefs;


@@ -5065,7 +5032,7 @@ static gint summary_cmp_by_subject(GtkCList *clist,                        \
        if (!prefs)
                return -1;
        
        if (!prefs)
                return -1;
        

-       return strcasecmp(str1, str2);
+       return subject_compare_for_sort(str1, str2);

 }
 
 static gint summary_cmp_by_score(GtkCList *clist,
 }
 
 static gint summary_cmp_by_score(GtkCList *clist,


@@ -5336,6 +5303,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
 
        folderview_unselect(summaryview->folderview);
        folderview_select(summaryview->folderview, summaryview->folder_item);
 
        folderview_unselect(summaryview->folderview);
        folderview_select(summaryview->folderview, summaryview->folder_item);

+       summary_set_column_titles(summaryview);

 }
 
 /*
 }
 
 /*

diff --git a/src/textview.c b/src/textview.c
index 2737a843711777d43c28343adc17c4fc6e509370..433392661bdc4dda6b33cec94fcbdbf9657d3a5a 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client

- * Copyright (C) 1999-2003 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2004 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
  *
  * 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


@@ -132,6 +132,7 @@ static void textview_write_body             (TextView       *textview,
 static void textview_show_html         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);
 static void textview_show_html         (TextView       *textview,
                                         FILE           *fp,
                                         CodeConverter  *conv);

+

 static void textview_write_line                (TextView       *textview,
                                         const gchar    *str,
                                         CodeConverter  *conv);
 static void textview_write_line                (TextView       *textview,
                                         const gchar    *str,
                                         CodeConverter  *conv);


@@ -139,6 +140,7 @@ static void textview_write_link             (TextView       *textview,
                                         const gchar    *str,
                                         const gchar    *uri,
                                         CodeConverter  *conv);
                                         const gchar    *str,
                                         const gchar    *uri,
                                         CodeConverter  *conv);

+

 static GPtrArray *textview_scan_header (TextView       *textview,
                                         FILE           *fp);
 static void textview_show_header       (TextView       *textview,
 static GPtrArray *textview_scan_header (TextView       *textview,
                                         FILE           *fp);
 static void textview_show_header       (TextView       *textview,


@@ -150,8 +152,6 @@ static gint textview_key_pressed    (GtkWidget      *widget,
 static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                            GdkEvent *event, GtkTextIter *iter,
                                            TextView *textview);
 static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
                                            GdkEvent *event, GtkTextIter *iter,
                                            TextView *textview);

-static void textview_uri_list_remove_all(GSList                *uri_list);
-

 static void textview_smooth_scroll_do          (TextView       *textview,
                                                 gfloat          old_value,
                                                 gfloat          last_value,
 static void textview_smooth_scroll_do          (TextView       *textview,
                                                 gfloat          old_value,
                                                 gfloat          last_value,


@@ -161,6 +161,11 @@ static void textview_smooth_scroll_one_line        (TextView       *textview,
 static gboolean textview_smooth_scroll_page    (TextView       *textview,
                                                 gboolean        up);
 
 static gboolean textview_smooth_scroll_page    (TextView       *textview,
                                                 gboolean        up);
 

+static gboolean textview_uri_security_check    (TextView       *textview,
+                                                RemoteURI      *uri);
+static void textview_uri_list_remove_all       (GSList         *uri_list);
+
+

 static void populate_popup(GtkTextView *textview, GtkMenu *menu,
                           gpointer *dummy)
 {
 static void populate_popup(GtkTextView *textview, GtkMenu *menu,
                           gpointer *dummy)
 {


@@ -471,7 +476,7 @@ static void textview_add_part(TextView *textview, MimeInfo *mimeinfo)
 
        if (mimeinfo->type != MIMETYPE_TEXT) {
                gtk_text_buffer_insert(buffer, &iter, buf, -1);
 
        if (mimeinfo->type != MIMETYPE_TEXT) {
                gtk_text_buffer_insert(buffer, &iter, buf, -1);

-       } else {
+       } else if (mimeinfo->disposition != DISPOSITIONTYPE_ATTACHMENT) {

                if (prefs_common.display_header && (charcount > 0))
                        gtk_text_buffer_insert(buffer, &iter, "\n", 1);
                if (textview->messageview->forced_charset)
                if (prefs_common.display_header && (charcount > 0))
                        gtk_text_buffer_insert(buffer, &iter, "\n", 1);
                if (textview->messageview->forced_charset)


@@ -736,7 +741,9 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 
        /* find end point of URI */
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {
 
        /* find end point of URI */
        for (ep_ = scanpos; *ep_ != '\0'; ep_++) {

-               if (!isgraph(*ep_) || !isascii(*ep_) || strchr("()<>\"", *ep_))
+               if (!isgraph(*(const guchar *)ep_) ||
+                   !isascii(*(const guchar *)ep_) ||
+                   strchr("()<>\"", *ep_))

                        break;
        }
 
                        break;
        }
 


@@ -748,7 +755,9 @@ static gboolean get_uri_part(const gchar *start, const gchar *scanpos,
 
 #define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
 
 
 #define IS_REAL_PUNCT(ch)      (ispunct(ch) && ((ch) != '/')) 
 

-       for (; ep_ - 1 > scanpos + 1 && IS_REAL_PUNCT(*(ep_ - 1)); ep_--)
+       for (; ep_ - 1 > scanpos + 1 &&
+              IS_REAL_PUNCT(*(const guchar *)(ep_ - 1));
+            ep_--)

                ;
 
 #undef IS_REAL_PUNCT
                ;
 
 #undef IS_REAL_PUNCT


@@ -862,17 +871,19 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
        g_return_val_if_fail(dom_tab, FALSE);   
 
        /* scan start of address */
        g_return_val_if_fail(dom_tab, FALSE);   
 
        /* scan start of address */

-       for (bp_ = scanpos - 1; bp_ >= start && IS_RFC822_CHAR(*bp_); bp_--)
+       for (bp_ = scanpos - 1;
+            bp_ >= start && IS_RFC822_CHAR(*(const guchar *)bp_); bp_--)

                ;
 
        /* TODO: should start with an alnum? */
        bp_++;
                ;
 
        /* TODO: should start with an alnum? */
        bp_++;

-       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*bp_); bp_++)
+       for (; bp_ < scanpos && !IS_ASCII_ALNUM(*(const guchar *)bp_); bp_++)

                ;
 
        if (bp_ != scanpos) {
                /* scan end of address */
                ;
 
        if (bp_ != scanpos) {
                /* scan end of address */

-               for (ep_ = scanpos + 1; *ep_ && IS_RFC822_CHAR(*ep_); ep_++)
+               for (ep_ = scanpos + 1;
+                    *ep_ && IS_RFC822_CHAR(*(const guchar *)ep_); ep_++)

                        if (*ep_ == '.') {
                                prelast_dot = last_dot;
                                last_dot = ep_;
                        if (*ep_ == '.') {
                                prelast_dot = last_dot;
                                last_dot = ep_;


@@ -885,7 +896,8 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
                        }
 
                /* TODO: really should terminate with an alnum? */
                        }
 
                /* TODO: really should terminate with an alnum? */

-               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*ep_); --ep_)
+               for (; ep_ > scanpos && !IS_ASCII_ALNUM(*(const guchar *)ep_);
+                    --ep_)

                        ;
                ep_++;
 
                        ;
                ep_++;
 


@@ -979,6 +991,7 @@ static gboolean get_email_part(const gchar *start, const gchar *scanpos,
 }
 
 #undef IS_QUOTE
 }
 
 #undef IS_QUOTE

+#undef IS_ASCII_ALNUM

 #undef IS_RFC822_CHAR
 
 static gchar *make_email_string(const gchar *bp, const gchar *ep)
 #undef IS_RFC822_CHAR
 
 static gchar *make_email_string(const gchar *bp, const gchar *ep)


@@ -1242,7 +1255,7 @@ void textview_write_link(TextView *textview, const gchar *str,
 
        gtk_text_buffer_get_end_iter(buffer, &iter);
 
 
        gtk_text_buffer_get_end_iter(buffer, &iter);
 

-       for (bufp = buf; isspace(*bufp); bufp++)
+       for (bufp = buf; isspace(*(guchar *)bufp); bufp++)

                gtk_text_buffer_insert(buffer, &iter, bufp, 1);
 
        if (prefs_common.enable_color) {
                gtk_text_buffer_insert(buffer, &iter, bufp, 1);
 
        if (prefs_common.enable_color) {


@@ -2047,6 +2060,59 @@ static gboolean textview_uri_button_pressed(GtkTextTag *tag, GObject *obj,
        return FALSE;
 }
 
        return FALSE;
 }
 

+/*!
+ *\brief    Check to see if a web URL has been disguised as a different
+ *          URL (possible with HTML email).
+ *
+ *\param    uri The uri to check
+ *
+ *\param    textview The TextView the URL is contained in
+ *
+ *\return   gboolean TRUE if the URL is ok, or if the user chose to open
+ *          it anyway, otherwise FALSE          
+ */
+static gboolean textview_uri_security_check(TextView *textview, RemoteURI *uri)
+{
+       gchar *visible_str;
+       gboolean retval = TRUE;
+
+       if (is_uri_string(uri->uri) == FALSE)
+               return TRUE;
+
+       visible_str = gtk_editable_get_chars(GTK_EDITABLE(textview->text),
+                                            uri->start, uri->end);
+       if (visible_str == NULL)
+               return TRUE;
+
+       if (strcmp(visible_str, uri->uri) != 0 && is_uri_string(visible_str)) {
+               gchar *uri_path;
+               gchar *visible_uri_path;
+
+               uri_path = get_uri_path(uri->uri);
+               visible_uri_path = get_uri_path(visible_str);
+               if (strcmp(uri_path, visible_uri_path) != 0)
+                       retval = FALSE;
+       }
+
+       if (retval == FALSE) {
+               gchar *msg;
+               AlertValue aval;
+
+               msg = g_strdup_printf(_("The real URL (%s) is different from\n"
+                                       "the apparent URL (%s).\n"
+                                       "Open it anyway?"),
+                                     uri->uri, visible_str);
+               aval = alertpanel(_("Warning"), msg, _("Yes"), _("No"), NULL);
+               g_free(msg);
+               if (aval == G_ALERTDEFAULT)
+                       retval = TRUE;
+       }
+
+       g_free(visible_str);
+
+       return retval;
+}
+

 static void textview_uri_list_remove_all(GSList *uri_list)
 {
        GSList *cur;
 static void textview_uri_list_remove_all(GSList *uri_list)
 {
        GSList *cur;

diff --git a/src/toolbar.c b/src/toolbar.c
index 2df37598a0348707977fab52935cb9ee075ad55a..cbf66bc243f5d84cc6b3712d3d61896e900ad4a5 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -200,30 +200,31 @@ struct {
        { "toolbar_msgview.xml", NULL}
 };
 
        { "toolbar_msgview.xml", NULL}
 };
 

-static GtkItemFactoryEntry reply_popup_entries[] =
+static GtkItemFactoryEntry reply_entries[] =

 {
 {

-       {N_("/Reply with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_WITH_QUOTE, NULL},
-       {N_("/_Reply without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}
+       {N_("/Reply with _quote"), NULL,    toolbar_reply, COMPOSE_REPLY_WITH_QUOTE, NULL},
+       {N_("/_Reply without quote"), NULL, toolbar_reply, COMPOSE_REPLY_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replyall_popup_entries[] =
+static GtkItemFactoryEntry replyall_entries[] =

 {
 {

-       {N_("/Reply to all with _quote"), "<shift>A", toolbar_popup_cb, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
-       {N_("/_Reply to all without quote"), "a", toolbar_popup_cb, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to all with _quote"), "<shift>A", toolbar_reply, COMPOSE_REPLY_TO_ALL_WITH_QUOTE, NULL},
+       {N_("/_Reply to all without quote"), "a",     toolbar_reply, COMPOSE_REPLY_TO_ALL_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replylist_popup_entries[] =
+static GtkItemFactoryEntry replylist_entries[] =

 {
 {

-       {N_("/Reply to list with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
-       {N_("/_Reply to list without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to list with _quote"),    NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITH_QUOTE, NULL},
+       {N_("/_Reply to list without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_LIST_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry replysender_popup_entries[] =
+static GtkItemFactoryEntry replysender_entries[] =

 {
 {

-       {N_("/Reply to sender with _quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
-       {N_("/_Reply to sender without quote"), NULL, toolbar_popup_cb, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}
+       {N_("/Reply to sender with _quote"),    NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITH_QUOTE, NULL},
+       {N_("/_Reply to sender without quote"), NULL, toolbar_reply, COMPOSE_REPLY_TO_SENDER_WITHOUT_QUOTE, NULL}

 };
 };

-static GtkItemFactoryEntry fwd_popup_entries[] =
+static GtkItemFactoryEntry forward_entries[] =

 {
 {

-       {N_("/_Forward message (inline style)"), "f", toolbar_popup_cb, COMPOSE_FORWARD_INLINE, NULL},
-       {N_("/Forward message as _attachment"), "<shift>F", toolbar_popup_cb, COMPOSE_FORWARD_AS_ATTACH, NULL}
+       {N_("/_Forward"),               "f",        toolbar_reply, COMPOSE_FORWARD_INLINE, NULL},
+       {N_("/For_ward as attachment"), "<shift>F", toolbar_reply, COMPOSE_FORWARD_AS_ATTACH, NULL},
+       {N_("/Redirec_t"),              NULL,       toolbar_reply, COMPOSE_REDIRECT, NULL}

 };
 
 
 };
 
 


@@ -778,6 +779,8 @@ void toolbar_set_style(GtkWidget *toolbar_wid, GtkWidget *handlebox_wid, guint a
        }
 
        prefs_common.toolbar_style = (ToolbarStyle)action;
        }
 
        prefs_common.toolbar_style = (ToolbarStyle)action;

+       gtk_widget_set_usize(handlebox_wid, 1, -1);
+       

        if (prefs_common.toolbar_style != TOOLBAR_NONE) {
                gtk_widget_show(handlebox_wid);
                gtk_widget_queue_resize(handlebox_wid);
        if (prefs_common.toolbar_style != TOOLBAR_NONE) {
                gtk_widget_show(handlebox_wid);
                gtk_widget_queue_resize(handlebox_wid);


@@ -879,228 +882,6 @@ static void toolbar_exec_cb(GtkWidget     *widget,
        summary_execute(mainwin->summaryview);
 }
 
        summary_execute(mainwin->summaryview);
 }
 

-
-
-/* popup callback functions */
-static gboolean toolbar_reply_popup_cb(GtkWidget       *widget, 
-                                      GdkEventButton  *event, 
-                                      gpointer         data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-       
-       if (!event) return FALSE;
-       
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->reply_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-static void toolbar_reply_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       GtkWidget *window;
-       GtkWidget *reply_btn;
-       MainWindow *mainwin;
-       MessageView *msgview;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               mainwin   = (MainWindow*)toolbar_item->parent;
-               reply_btn = mainwin->toolbar->reply_btn;
-               window    = mainwin->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               msgview   = (MessageView*)toolbar_item->parent;
-               reply_btn = msgview->toolbar->reply_btn;
-               window    = msgview->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(reply_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static gboolean toolbar_reply_to_all_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-       
-       if (!event) return FALSE;
-       
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->replyall_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-static void toolbar_reply_to_all_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       GtkWidget *window;
-       GtkWidget *replyall_btn;
-       MainWindow *mainwin;
-       MessageView *msgview;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               mainwin      = (MainWindow*)toolbar_item->parent; 
-               replyall_btn = mainwin->toolbar->replyall_btn;
-               window       = mainwin->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               msgview      = (MessageView*)toolbar_item->parent;
-               replyall_btn = msgview->toolbar->replyall_btn;
-               window       = msgview->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replyall_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static gboolean toolbar_reply_to_list_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->replylist_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-static void toolbar_reply_to_list_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *replylist_btn;
-
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               replylist_btn = ((MainWindow*)parent)->toolbar->replylist_btn;
-               window        = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               replylist_btn = ((MessageView*)parent)->toolbar->replylist_btn;
-               window        = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replylist_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static gboolean toolbar_reply_to_sender_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->replysender_popup), NULL, NULL,
-                      menu_button_position, widget,
-                      event->button, event->time);
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-static void toolbar_reply_to_sender_popup_closed_cb(GtkMenuShell *menu_shell, gpointer data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *replysender_btn;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               replysender_btn = ((MainWindow*)parent)->toolbar->replysender_btn;
-               window          = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               replysender_btn = ((MessageView*)parent)->toolbar->replysender_btn;
-               window          = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(replysender_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-
-static gboolean toolbar_forward_popup_cb(GtkWidget *widget, GdkEventButton *event, gpointer data)
-{
-       Toolbar *toolbar_data = (Toolbar*)data;
-
-       if (event->button == 3) {
-               gtk_button_set_relief(GTK_BUTTON(widget), GTK_RELIEF_NORMAL);
-               gtk_menu_popup(GTK_MENU(toolbar_data->fwd_popup), NULL, NULL,
-                              menu_button_position, widget,
-                              event->button, event->time);
-               return TRUE;
-       }
-
-       return FALSE;
-}
-
-static void toolbar_forward_popup_closed_cb (GtkMenuShell *menu_shell, 
-                                            gpointer     data)
-{
-       ToolbarItem *toolbar_item = (ToolbarItem*)data;
-       gpointer parent = toolbar_item->parent;
-       GtkWidget *window;
-       GtkWidget *fwd_btn;
-
-       g_return_if_fail(toolbar_item != NULL);
-
-       switch(toolbar_item->type) {
-       case TOOLBAR_MAIN:
-               fwd_btn = ((MainWindow*)parent)->toolbar->fwd_btn;
-               window  = ((MainWindow*)parent)->window;
-               break;
-       case TOOLBAR_MSGVIEW:
-               fwd_btn = ((MessageView*)parent)->toolbar->fwd_btn;
-               window  = ((MessageView*)parent)->window;
-               break;
-       default:
-               return;
-       }
-
-       gtk_button_set_relief(GTK_BUTTON(fwd_btn), GTK_RELIEF_NONE);
-       manage_window_focus_in(window, NULL, NULL);
-}
-

 /*
  * Delete current/selected(s) message(s)
  */
 /*
  * Delete current/selected(s) message(s)
  */


@@ -1514,11 +1295,11 @@ Toolbar *toolbar_create(ToolbarType      type,
        GtkWidget *window_wid;
 
        guint n_menu_entries;
        GtkWidget *window_wid;
 
        guint n_menu_entries;

-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;
-       GtkWidget *fwd_popup;
+       ComboButton *reply_combo;
+       ComboButton *replyall_combo;
+       ComboButton *replylist_combo;
+       ComboButton *replysender_combo;
+       ComboButton *fwd_combo;

 
        GtkTooltips *toolbar_tips;
        ToolbarSylpheedActions *action_item;
 
        GtkTooltips *toolbar_tips;
        ToolbarSylpheedActions *action_item;


@@ -1609,105 +1390,85 @@ Toolbar *toolbar_create(ToolbarType     type,
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->reply_btn,
                                           _("Reply to Message"), NULL);
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->reply_btn,
                                           _("Reply to Message"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->reply_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(reply_popup_entries) /
-                               sizeof(reply_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       reply_popup = popupmenu_create(window_wid,
-                                                      reply_popup_entries, n_menu_entries,
-                                                      "<ReplyPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(reply_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_popup_closed_cb), toolbar_item);
-                       toolbar_data->reply_popup = reply_popup;
+                       n_menu_entries = sizeof(reply_entries) / 
+                               sizeof(replysender_entries[0]);
+                       reply_combo = gtkut_combo_button_create(toolbar_data->reply_btn,
+                                             reply_entries, n_menu_entries,
+                                             "<Reply>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(reply_combo->arrow),
+                                             GTK_RELIEF_NONE);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(reply_combo),
+                                                 _("Reply to Message"), "Reply");
+                       toolbar_data->reply_combo = reply_combo;

                        break;
                case A_REPLY_SENDER:
                        toolbar_data->replysender_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replysender_btn,
                                           _("Reply to Sender"), NULL);
                        break;
                case A_REPLY_SENDER:
                        toolbar_data->replysender_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replysender_btn,
                                           _("Reply to Sender"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replysender_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replysender_popup_entries) /
-                               sizeof(replysender_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       replysender_popup = popupmenu_create(window_wid, 
-                                                            replysender_popup_entries, n_menu_entries,
-                                                            "<ReplySenderPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(replysender_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_sender_popup_closed_cb), toolbar_item);
-                       toolbar_data->replysender_popup = replysender_popup;
+                       n_menu_entries = sizeof(replysender_entries) / 
+                               sizeof(replysender_entries[0]);
+                       replysender_combo = gtkut_combo_button_create(toolbar_data->replysender_btn,
+                                             replysender_entries, n_menu_entries,
+                                             "<ReplySender>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replysender_combo->arrow),
+                                             GTK_RELIEF_NONE);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replysender_combo),
+                                                 _("Reply to Sender"), "ReplySender");
+                       toolbar_data->replysender_combo = replysender_combo;

                        break;
                case A_REPLY_ALL:
                        toolbar_data->replyall_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replyall_btn,
                                           _("Reply to All"), NULL);
                        break;
                case A_REPLY_ALL:
                        toolbar_data->replyall_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replyall_btn,
                                           _("Reply to All"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replyall_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replyall_popup_entries) /
-                               sizeof(replyall_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);     
-                       replyall_popup = popupmenu_create(window_wid, 
-                                                         replyall_popup_entries, n_menu_entries,
-                                                         "<ReplyAllPopup>", (gpointer)toolbar_item);
-       
-                       gtk_signal_connect(GTK_OBJECT(replyall_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_all_popup_closed_cb), toolbar_item);
-                       toolbar_data->replyall_popup = replyall_popup;
+                       n_menu_entries = sizeof(replyall_entries) / 
+                               sizeof(replyall_entries[0]);
+                       replyall_combo = gtkut_combo_button_create(toolbar_data->replyall_btn,
+                                             replyall_entries, n_menu_entries,
+                                             "<ReplyAll>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replyall_combo->arrow),
+                                             GTK_RELIEF_NONE);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replyall_combo),
+                                                 _("Reply to All"), "ReplyAll");
+                       toolbar_data->replyall_combo = replyall_combo;

                        break;
                case A_REPLY_ML:
                        toolbar_data->replylist_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replylist_btn,
                                           _("Reply to Mailing-list"), NULL);
                        break;
                case A_REPLY_ML:
                        toolbar_data->replylist_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->replylist_btn,
                                           _("Reply to Mailing-list"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->replylist_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(replylist_popup_entries) /
-                               sizeof(replylist_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       replylist_popup = popupmenu_create(window_wid, 
-                                                          replylist_popup_entries, n_menu_entries,
-                                                          "<ReplyMlPopup>", (gpointer)toolbar_item);
-               
-                       gtk_signal_connect(GTK_OBJECT(replylist_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_reply_to_list_popup_closed_cb), toolbar_item);
-                       toolbar_data->replylist_popup = replylist_popup;
+                       n_menu_entries = sizeof(replylist_entries) / 
+                               sizeof(replylist_entries[0]);
+                       replylist_combo = gtkut_combo_button_create(toolbar_data->replylist_btn,
+                                             replylist_entries, n_menu_entries,
+                                             "<ReplyList>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(replylist_combo->arrow),
+                                             GTK_RELIEF_NONE);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(replylist_combo),
+                                                 _("Reply to Mailing-list"), "ReplyList");
+                       toolbar_data->replylist_combo = replylist_combo;

                        break;
                case A_FORWARD:
                        toolbar_data->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->fwd_btn,
                                             _("Forward Message"), NULL);
                        break;
                case A_FORWARD:
                        toolbar_data->fwd_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->fwd_btn,
                                             _("Forward Message"), NULL);

-                       gtk_signal_connect(GTK_OBJECT(toolbar_data->fwd_btn), 
-                                          "button_press_event",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_cb),
-                                          toolbar_data);
-                       n_menu_entries = sizeof(fwd_popup_entries) /
-                               sizeof(fwd_popup_entries[0]);
-
-                       window_wid = get_window_widget(type, data);
-                       fwd_popup = popupmenu_create(window_wid, 
-                                                    fwd_popup_entries, n_menu_entries,
-                                                    "<ForwardPopup>", (gpointer)toolbar_item);
-
-                       gtk_signal_connect(GTK_OBJECT(fwd_popup), "selection_done",
-                                          GTK_SIGNAL_FUNC(toolbar_forward_popup_closed_cb), toolbar_item);
-                       toolbar_data->fwd_popup = fwd_popup;
+                       n_menu_entries = sizeof(forward_entries) / 
+                               sizeof(forward_entries[0]);
+                       fwd_combo = gtkut_combo_button_create(toolbar_data->fwd_btn,
+                                             forward_entries, n_menu_entries,
+                                             "<Forward>", (gpointer)toolbar_item);
+                       gtk_button_set_relief(GTK_BUTTON(fwd_combo->arrow),
+                                             GTK_RELIEF_NONE);
+                       gtk_toolbar_append_widget(GTK_TOOLBAR(toolbar),
+                                                 GTK_WIDGET_PTR(fwd_combo),
+                                                 _("Forward Message"), "Fwd");
+                       toolbar_data->fwd_combo = fwd_combo;

                        break;
                case A_DELETE:
                        toolbar_data->delete_btn = item;
                        break;
                case A_DELETE:
                        toolbar_data->delete_btn = item;


@@ -1915,13 +1676,28 @@ void toolbar_main_set_sensitive(gpointer data)
        SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
        SET_WIDGET_COND(toolbar->reply_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->compose_news_btn, M_HAVE_ACCOUNT);
        SET_WIDGET_COND(toolbar->reply_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->reply_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->reply_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replyall_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replyall_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replyall_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replylist_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replylist_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replylist_btn) 
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replylist_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->replysender_btn,
                        M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

+       if (toolbar->replysender_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->replysender_combo),
+                       M_HAVE_ACCOUNT|M_SINGLE_TARGET_EXIST);

        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);
        SET_WIDGET_COND(toolbar->fwd_btn, M_HAVE_ACCOUNT|M_TARGET_EXIST);

+       if (toolbar->fwd_btn)
+               SET_WIDGET_COND(GTK_WIDGET_PTR(toolbar->fwd_combo),
+                       M_HAVE_ACCOUNT|M_TARGET_EXIST); 

 
        SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
        SET_WIDGET_COND(toolbar->delete_btn,
 
        SET_WIDGET_COND(toolbar->next_btn, M_MSG_EXIST);
        SET_WIDGET_COND(toolbar->delete_btn,

diff --git a/src/toolbar.h b/src/toolbar.h
index 974b9544845a0e23e13873460f8b375bd4a95160..aa9b28ef0a578c63298e04860c09de6e03fabdfb 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -20,6 +20,8 @@
 #ifndef __CUSTOM_TOOLBAR_H__
 #define __CUSTOM_TOOLBAR_H__
 
 #ifndef __CUSTOM_TOOLBAR_H__
 #define __CUSTOM_TOOLBAR_H__
 

+#include "gtk/gtkutils.h"
+

 #define SEPARATOR_PIXMAP     "---"
 
 typedef struct _Toolbar Toolbar;
 #define SEPARATOR_PIXMAP     "---"
 
 typedef struct _Toolbar Toolbar;


@@ -49,27 +51,24 @@ struct _Toolbar {
        GtkWidget *compose_news_btn;
 
        GtkWidget *reply_btn;
        GtkWidget *compose_news_btn;
 
        GtkWidget *reply_btn;

+       ComboButton *reply_combo;

        GtkWidget *replysender_btn;
        GtkWidget *replysender_btn;

+       ComboButton *replysender_combo;

        GtkWidget *replyall_btn;
        GtkWidget *replyall_btn;

+       ComboButton *replyall_combo;

        GtkWidget *replylist_btn;
        GtkWidget *replylist_btn;

+       ComboButton *replylist_combo;

 
        GtkWidget *fwd_btn;
 
        GtkWidget *fwd_btn;

-
+       ComboButton *fwd_combo;
+       

        GtkWidget *delete_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
        GtkWidget *separator;
 
        GtkWidget *delete_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
        GtkWidget *separator;
 

-       /* for the reply buttons */
-       GtkWidget *reply_popup;
-       GtkWidget *replyall_popup;
-       GtkWidget *replylist_popup;
-       GtkWidget *replysender_popup;

        
        

-       /* the forward button similar to the reply buttons*/
-       GtkWidget *fwd_popup;
-

        ComposeButtonType compose_btn_type;
 
        /* compose buttons */
        ComposeButtonType compose_btn_type;
 
        /* compose buttons */

diff --git a/src/undo.c b/src/undo.c
index d20dcafe0702f5255db2be52fbae4d01812d2194..abc956bc534b4a2b5d8af891d6e2aeb9b36a7f83 100644 (file)
--- a/src/undo.c
+++ b/src/undo.c
@@ -183,7 +183,6 @@ static void undo_check_size(UndoMain *undostruct)
                undostruct->undo = g_list_remove(undostruct->undo, last_undo);
                undo_object_free(last_undo);
        }
                undostruct->undo = g_list_remove(undostruct->undo, last_undo);
                undo_object_free(last_undo);
        }

-       debug_print("g_list_length(undostruct->undo): %d\n", length);

 }
 
 /**
 }
 
 /**


@@ -281,7 +280,6 @@ static gint undo_merge(GList *list, guint start_pos, guint end_pos,
        } else
                debug_print("Unknown action [%i] inside undo merge encountered", action);
 
        } else
                debug_print("Unknown action [%i] inside undo merge encountered", action);
 

-       debug_print("Merged: %s\n", text);

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -305,8 +303,6 @@ static void undo_add(const gchar *text,
        UndoInfo *undoinfo;
        GtkAdjustment *vadj;
 
        UndoInfo *undoinfo;
        GtkAdjustment *vadj;
 

-       debug_print("undo_add(%i)*%s*\n", strlen (text), text);
-

        g_return_if_fail(text != NULL);
        g_return_if_fail(end_pos >= start_pos);
 
        g_return_if_fail(text != NULL);
        g_return_if_fail(end_pos >= start_pos);
 


@@ -332,8 +328,6 @@ static void undo_add(const gchar *text,
 
        undo_check_size(undostruct);
 
 
        undo_check_size(undostruct);
 

-       debug_print("New: %s Action: %d Paste: %d\n", text, action, undostruct->paste);
-

        vadj = GTK_ADJUSTMENT(GTK_TEXT_VIEW(undostruct->textview)->vadjustment);
        undoinfo = undo_object_new(g_strdup(text), start_pos, end_pos, action,
                                   vadj->value);
        vadj = GTK_ADJUSTMENT(GTK_TEXT_VIEW(undostruct->textview)->vadjustment);
        undoinfo = undo_object_new(g_strdup(text), start_pos, end_pos, action,
                                   vadj->value);


@@ -396,19 +390,16 @@ void undo_undo(UndoMain *undostruct)
        case UNDO_ACTION_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &iter, undoinfo->start_pos);
                gtk_text_buffer_insert(buffer, &iter, undoinfo->text, -1);
        case UNDO_ACTION_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &iter, undoinfo->start_pos);
                gtk_text_buffer_insert(buffer, &iter, undoinfo->text, -1);

-               debug_print("UNDO_ACTION_DELETE %s\n", undoinfo->text);

                break;
        case UNDO_ACTION_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, undoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, undoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
                break;
        case UNDO_ACTION_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, undoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, undoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);

-               debug_print("UNDO_ACTION_INSERT %d\n", undoinfo->end_pos-undoinfo->start_pos);

                break;
        case UNDO_ACTION_REPLACE_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, undoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, undoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
                break;
        case UNDO_ACTION_REPLACE_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, undoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, undoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);

-               debug_print("UNDO_ACTION_REPLACE %s\n", undoinfo->text);

                /* "pull" another data structure from the list */
                undoinfo = (UndoInfo *)undostruct->undo->data;
                g_return_if_fail(undoinfo != NULL);
                /* "pull" another data structure from the list */
                undoinfo = (UndoInfo *)undostruct->undo->data;
                g_return_if_fail(undoinfo != NULL);


@@ -416,7 +407,6 @@ void undo_undo(UndoMain *undostruct)
                undostruct->undo = g_list_remove(undostruct->undo, undoinfo);
                g_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
                gtk_text_buffer_insert(buffer, &start_iter, undoinfo->text, -1);
                undostruct->undo = g_list_remove(undostruct->undo, undoinfo);
                g_return_if_fail(undoinfo->action == UNDO_ACTION_REPLACE_DELETE);
                gtk_text_buffer_insert(buffer, &start_iter, undoinfo->text, -1);

-               debug_print("UNDO_ACTION_REPLACE %s\n", undoinfo->text);

                break;
        case UNDO_ACTION_REPLACE_DELETE:
                g_warning("This should not happen. UNDO_REPLACE_DELETE");
                break;
        case UNDO_ACTION_REPLACE_DELETE:
                g_warning("This should not happen. UNDO_REPLACE_DELETE");


@@ -481,14 +471,11 @@ void undo_redo(UndoMain *undostruct)
        case UNDO_ACTION_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &iter, redoinfo->start_pos);
                gtk_text_buffer_insert(buffer, &iter, redoinfo->text, -1);
        case UNDO_ACTION_INSERT:
                gtk_text_buffer_get_iter_at_offset(buffer, &iter, redoinfo->start_pos);
                gtk_text_buffer_insert(buffer, &iter, redoinfo->text, -1);

-               debug_print("UNDO_ACTION_DELETE %s\n",redoinfo->text);

                break;
        case UNDO_ACTION_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, redoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, redoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);
                break;
        case UNDO_ACTION_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, redoinfo->start_pos);
                gtk_text_buffer_get_iter_at_offset(buffer, &end_iter, redoinfo->end_pos);
                gtk_text_buffer_delete(buffer, &start_iter, &end_iter);

-               debug_print("UNDO_ACTION_INSERT %d\n", 
-                           redoinfo->end_pos-redoinfo->start_pos);

                break;
        case UNDO_ACTION_REPLACE_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, redoinfo->start_pos);
                break;
        case UNDO_ACTION_REPLACE_DELETE:
                gtk_text_buffer_get_iter_at_offset(buffer, &start_iter, redoinfo->start_pos);


@@ -587,11 +574,14 @@ void undo_delete_text_cb(GtkTextBuffer *textbuf, GtkTextIter *start,
 
 void undo_paste_clipboard_cb(GtkTextView *textview, UndoMain *undostruct)
 {
 
 void undo_paste_clipboard_cb(GtkTextView *textview, UndoMain *undostruct)
 {

-       debug_print("before Paste: %d\n", undostruct->paste);
+#warning GTK2 check clipboard content
+#if 0
+       if (editable->clipboard_text == NULL) return;
+#endif
+

        if (prefs_common.undolevels > 0)
                if (undo_get_selection(textview, NULL, NULL))
                        undostruct->paste = TRUE;
        if (prefs_common.undolevels > 0)
                if (undo_get_selection(textview, NULL, NULL))
                        undostruct->paste = TRUE;

-       debug_print("after Paste: %d\n", undostruct->paste);

 }
 
 /**
 }
 
 /**

diff --git a/src/unmime.c b/src/unmime.c
index b4fff287e491c00c6c30c39f0b416d2016189657..a3183d777b54f93492ca5a4ffde17c0964f1b6c3 100644 (file)
--- a/src/unmime.c
+++ b/src/unmime.c
@@ -38,7 +38,6 @@ void unmime_header(gchar *out, const gchar *str)
 {
        const gchar *p = str;
        gchar *outp = out;
 {
        const gchar *p = str;
        gchar *outp = out;

-       const gchar *sp;

        const gchar *eword_begin_p, *encoding_begin_p, *text_begin_p,
                    *eword_end_p;
        gchar charset[32];
        const gchar *eword_begin_p, *encoding_begin_p, *text_begin_p,
                    *eword_end_p;
        gchar charset[32];


@@ -76,8 +75,10 @@ void unmime_header(gchar *out, const gchar *str)
                        p = eword_begin_p;
                } else {
                        /* ignore spaces between encoded words */
                        p = eword_begin_p;
                } else {
                        /* ignore spaces between encoded words */

+                       const gchar *sp;
+

                        for (sp = p; sp < eword_begin_p; sp++) {
                        for (sp = p; sp < eword_begin_p; sp++) {

-                               if (!isspace(*sp)) {
+                               if (!isspace(*(const guchar *)sp)) {

                                        memcpy(outp, p, eword_begin_p - p);
                                        outp += eword_begin_p - p;
                                        p = eword_begin_p;
                                        memcpy(outp, p, eword_begin_p - p);
                                        outp += eword_begin_p - p;
                                        p = eword_begin_p;

diff --git a/tools/README b/tools/README
index e9969eea8bcd7af5288e918cad5616c2c3f35f66..be61a1508e60ab993c4f03f5c73f1c31159d56c1 100644 (file)
--- a/tools/README
+++ b/tools/README
@@ -9,6 +9,7 @@ Action scripts:
   google_msgid.pl               Search groups.google.com for selected message-id
   google_search.pl             Search google.com for selected text
   multiwebsearch.pl            Search any search engine for the selected text
   google_msgid.pl               Search groups.google.com for selected message-id
   google_search.pl             Search google.com for selected text
   multiwebsearch.pl            Search any search engine for the selected text

+  textviewer.sh                        Attempt to view an attachment as plain text

   uudec                         Decode and display uuencoded images
 
 Addressbook conversion:
   uudec                         Decode and display uuencoded images
 
 Addressbook conversion:


@@ -73,6 +74,11 @@ Action scripts
   COMMAND: uudec %f&
   Decode and display uuencoded images using uudecode.
 
   COMMAND: uudec %f&
   Decode and display uuencoded images using uudecode.
 

+* textviewer.sh
+  WORKS ON: current message part
+  COMMAND: textviewer.sh %p |
+  Attempt to view an attachment as plain text
+

 * More action examples can be found at
   http://melvin.hadasht.free.fr/home/sylpheed/actions/
 
 * More action examples can be found at
   http://melvin.hadasht.free.fr/home/sylpheed/actions/
 


@@ -413,16 +419,27 @@ Other tools
        as attachments.
 
   HOW TO USE IT
        as attachments.
 
   HOW TO USE IT

+    OpenOffice.org Version 1.0
+    --------------------------

        Start up OpenOffice.org.
        Go to 'Tools/Options/OpenOffice.org/External Programs'
        Enter the path to OOo2sylpheed.pl in the 'Program' box
        or select it by clicking on the '...' button.
 
        Start up OpenOffice.org.
        Go to 'Tools/Options/OpenOffice.org/External Programs'
        Enter the path to OOo2sylpheed.pl in the 'Program' box
        or select it by clicking on the '...' button.
 

+    OpenOffice.org Version 1.1.0
+    ----------------------------
+       Start up OpenOffice.org.
+       Go to 'Tools/Options/OpenOffice.org/External Programs'
+       Select either ''Mozilla 1.x (Option 1)', or 
+       'Netscape 6.x - 7.0 (Option 1)' from the 'Program' selection
+       Enter the path to OOo2sylpheed.pl in the 'Path' box
+       or select it by clicking on the '...' button.
+    

        You can then use 'File/Send/Document as email' to launch sylpheed
        (if not already launched) and open a new compose window with the
        document attached.
 
        You can then use 'File/Send/Document as email' to launch sylpheed
        (if not already launched) and open a new compose window with the
        document attached.
 

-       Tested with OpenOffice.org version 1.0
+       Tested with OpenOffice.org versions 1.0, 1.1.0

   
   Contact: Paul Mangan <claws@thewildbeast.co.uk>
 
   
   Contact: Paul Mangan <claws@thewildbeast.co.uk>
 

diff --git a/tools/convert_mbox.pl b/tools/convert_mbox.pl
index a898e8b038e8db934e50b0c73d08562962577f5b..d7757c091dd1ea41556f279e59f355f0f065b284 100644 (file)
--- a/tools/convert_mbox.pl
+++ b/tools/convert_mbox.pl
@@ -4,6 +4,11 @@
 # aka another mbox -> MH conversion tool
 # 29 April 2003  
 # Fred Marton <Fred.Marton@uni-bayreuth.de>
 # aka another mbox -> MH conversion tool
 # 29 April 2003  
 # Fred Marton <Fred.Marton@uni-bayreuth.de>

+# 
+# Fixed (hopefully) to account for From lines
+# that are of various length and that might have
+# time zone info at the end
+# 20 January 2004

 #
 # Note: Running this with the -w flag generates the following warnings:
 # Scalar value @word[1] better written as $word[1] at /path/to/convert_mbox.pl line 54
 #
 # Note: Running this with the -w flag generates the following warnings:
 # Scalar value @word[1] better written as $word[1] at /path/to/convert_mbox.pl line 54


@@ -30,7 +35,7 @@
 
 # check for both arguments
 &usage if ($#ARGV < 1);
 
 # check for both arguments
 &usage if ($#ARGV < 1);

-$mbox =  $ARGV[0];
+$mbox = $ARGV[0];

 $mh = $ARGV[1];
 # check to make sure there isn't something named MH already
 if (-e $mh) {
 $mh = $ARGV[1];
 # check to make sure there isn't something named MH already
 if (-e $mh) {


@@ -47,9 +52,11 @@ while ($line = <IN>) {
 # check for the beginning of an e-mail
    @word = split(/ +/m,$line);
 # some lines might start with "From ", so check
 # check for the beginning of an e-mail
    @word = split(/ +/m,$line);
 # some lines might start with "From ", so check

-# to see if the seventh word is a year
-   chomp($word[6]);
-   $year = $word[6];
+# to see if the [second-to-]last word is a year
+   @word2 = split(/:/,$line);
+   chomp($word2[$#word2]);
+   @word3 = split(/ /,$word2[2]);
+   $year = @word3[1];

 # ignore the MAILER-DAEMON message from pine
    if (@word[1] ne "MAILER-DAEMON") {
 # start a new file, assuming $year is > 1970
 # ignore the MAILER-DAEMON message from pine
    if (@word[1] ne "MAILER-DAEMON") {
 # start a new file, assuming $year is > 1970