[balsa: 631/632] Merge branch 'gtk3'
- From: Peter Bloomfield <peterb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [balsa: 631/632] Merge branch 'gtk3'
- Date: Tue, 4 Oct 2016 19:43:03 +0000 (UTC)
commit 3c99457bc32c61111a451834daf25d784e91250d
Merge: 873a486 d032986
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date: Tue Oct 4 10:54:56 2016 -0400
Merge branch 'gtk3'
* gtk3: (629 commits)
Implement the 'AUTH PLAIN' SASL mechanism for POP3
Deprecation cleanups
Updated Spanish translation
Updated Czech translation
Updated Czech translation
Add more options to XGETTEXT_OPTIONS in po/Makevars
Updated Serbian translation
Updated German translation
Updated Brazilian Portuguese translation
Updated Hungarian translation
Updated Portuguese translation
Make the help string match the actual default
Add Language headers to po files
Fix translations of default:mm
doap: update URLs
Fix broken tags in Slovenian help translation
Restore missing headers in Polish translation
Respond to bgo #770500 making webkit2 the default
Plug memory leak
Always use multithreading, and use only glib
Implement a GtkComboBox for selecting an identity
Fix a bug in the configure script
Include identity name in the identities combo-box
Handle command line options at startup time
Error if building in a git tree with GnomeKeyring
Fix building when _FORTIFY_SOURCE is predefined
Use Gspell-1.2 API
Support Gspell as an alternative to GtkSpell
Fix symbolic icon names
Only gtksource.h can be included directly
Fix shrinking message list
Set check_done to a non-zero value
Make Gtk3 dialog header bars configurable
Fix saving address when user has only one book
Always set line-wrapping of a long label to TRUE
Replace CR or LF in an address with a space
Expand or collapse all headers consistently
Cut redundant dynamic cast
Drop the touch-ui configuration option and code
Install gtksourceview helper files correctly
Use a filter to quote html-only messages
Force proper icon sizes
We always use gtksourceview-3.0
Delete Gtkhtml2 code
Restore autoconf expansion of GLIB_GENMARSHAL
Build with builddir != srcdir
Reduce code complexity by weeding out deprecations
Fix accessing MBox files > 2 GByte
Use G_{BEGIN,END}_DECLS
Drop redundant glib version check
Pack expander in a box to work around a Gtk bug
Simplify signing and encrypting a message part
Remove confusing signature info
Use GtkGrid API better
Use informative top line for digital signature
Make SSL mandatory
Pop up key selection dialogue with all keys
Make crypto certificate subject utf8-clean
Fix indentation to satisfy gcc-6
Simplify conditional code
Resolve ambiguity
Remove Emacs hack
A few fixes and other cleanups (Albrecht Dreß)
Build without libnotify
Gtk 3.20 deprecation cleanup
Build with Gtk+ < 3.12
Use only the basename of an attachment's filename
Use only the basename of an attachment's filename
Fix the image-loading option for HTML message part
Define macro TOOLKIT_CATEGORIES in configure.ac
Add src/balsa-print-object.c to POTFILES.in
Update version to 2.5.2
Minor build regressions fixed.
Silence some autoconf and automake complaints
Mark compatibility-dialog strings for translation
Make the "Close" button use GTK_RESPONSE_CANCEL
Provide a parent for the quote-parts dialog
Clean up store-address dialog
Put digital signature info in a GtkExpander
Do not crash when part is changed while finding
Grab keyboard focus to the default button
Use header bar in store-address dialog
Do not use header bar in GtkMessageDialog
Use header bars in compose-window dialogs
Use a header bar in the preferences dialog
Use header bar in search and check-mail dialogs
Use header bar in mailbox properties dialog
Use header bars in information dialogs
Use header bars in folder property dialogs
Use header bar in condition edit dialog
Use header bar in over-write confirmation dialog
Use header bar in MDN dialog
Use header bar in folder tree dialog
Use header bar in pipe-program dialog
Use header bar in password dialog
Use header bar in address book editor
Avoid multiple dynamic casts to BalsaAbWindow
Drop redundant dynamic casts to GtkWidget
Use header bar in address book config dialog
Use header bar in address book warning dialog
...
.gitignore | 5 +-
AUTHORS | 16 +-
ChangeLog | 4807 ++++++++++++++-
GNOME_Balsa.server.in | 34 -
Makefile.am | 43 +-
NEWS | 24 +-
README | 160 +-
autogen.sh | 20 +-
balsa.appdata.xml | 26 +
balsa.desktop.in.in | 1 +
balsa.spec.in | 47 +-
bootstrap.sh | 9 -
configure.in => configure.ac | 568 +--
doc/C/ab-conf.page | 103 +
doc/C/authors.page | 123 +
doc/C/balsa.entities | 32 +
doc/C/balsa.xml | 2 +-
doc/C/common-tasks.page | 168 +
doc/C/folder-config.page | 173 +
doc/C/getting-started.page | 31 +
doc/C/glossary.page | 113 +
doc/C/identities.page | 243 +
doc/C/index.page | 53 +
doc/C/introduction.page | 33 +
doc/C/its-not-working.page | 88 +
doc/C/mbox-formats.page | 52 +
doc/C/preferences-address-books.page | 90 +
doc/C/preferences-display-options.page | 265 +
doc/C/preferences-mail-options.page | 285 +
doc/C/preferences-miscellaneous.page | 70 +
doc/C/preferences-spelling.page | 86 +
doc/C/preferences-startup.page | 51 +
doc/C/preferences.page | 26 +
doc/C/toolbar-prefs.page | 46 +
doc/C/win-composer.page | 766 +++
doc/C/win-filters.page | 217 +
doc/C/win-main.page | 877 +++
doc/C/win-message.page | 70 +
doc/C/win-run-filters.page | 84 +
doc/C/win-search.page | 59 +
doc/ChangeLog | 186 +
doc/Makefile.am | 64 +-
doc/de/ab-conf.page | 115 +
doc/de/authors.page | 143 +
doc/de/common-tasks.page | 187 +
doc/de/folder-config.page | 187 +
doc/de/getting-started.page | 51 +
doc/de/glossary.page | 129 +
doc/de/identities.page | 253 +
doc/de/index.page | 68 +
doc/de/introduction.page | 52 +
doc/de/its-not-working.page | 108 +
doc/de/mbox-formats.page | 72 +
doc/de/preferences-address-books.page | 105 +
doc/de/preferences-display-options.page | 284 +
doc/de/preferences-incoming-and-outgoing-mail.page | 191 +
doc/de/preferences-mail-options.page | 291 +
doc/de/preferences-miscellaneous.page | 90 +
doc/de/preferences-spelling.page | 103 +
doc/de/preferences-startup.page | 69 +
doc/de/preferences.page | 46 +
doc/de/toolbar-prefs.page | 66 +
doc/de/win-composer.page | 758 +++
doc/de/win-filters.page | 237 +
doc/de/win-main.page | 890 +++
doc/de/win-message.page | 90 +
doc/de/win-run-filters.page | 104 +
doc/de/win-search.page | 79 +
doc/es/ab-conf.page | 121 +
doc/es/authors.page | 143 +
doc/es/common-tasks.page | 187 +
doc/es/folder-config.page | 193 +
doc/es/getting-started.page | 51 +
doc/es/glossary.page | 133 +
doc/es/identities.page | 263 +
doc/es/index.page | 60 +
doc/es/introduction.page | 52 +
doc/es/its-not-working.page | 108 +
doc/es/mbox-formats.page | 72 +
doc/es/preferences-address-books.page | 109 +
doc/es/preferences-display-options.page | 285 +
doc/es/preferences-incoming-and-outgoing-mail.page | 193 +
doc/es/preferences-mail-options.page | 305 +
doc/es/preferences-miscellaneous.page | 90 +
doc/es/preferences-spelling.page | 107 +
doc/es/preferences-startup.page | 71 +
doc/es/preferences.page | 46 +
doc/es/toolbar-prefs.page | 66 +
doc/es/win-composer.page | 782 +++
doc/es/win-filters.page | 237 +
doc/es/win-main.page | 897 +++
doc/es/win-message.page | 90 +
doc/es/win-run-filters.page | 104 +
doc/es/win-search.page | 79 +
doc/fr/ab-conf.page | 115 +
doc/fr/authors.page | 143 +
doc/fr/common-tasks.page | 187 +
doc/fr/folder-config.page | 176 +
doc/fr/getting-started.page | 51 +
doc/fr/glossary.page | 119 +
doc/fr/identities.page | 242 +
doc/fr/index.page | 60 +
doc/fr/introduction.page | 52 +
doc/fr/its-not-working.page | 105 +
doc/fr/mbox-formats.page | 72 +
doc/fr/preferences-address-books.page | 105 +
doc/fr/preferences-display-options.page | 279 +
doc/fr/preferences-incoming-and-outgoing-mail.page | 173 +
doc/fr/preferences-mail-options.page | 271 +
doc/fr/preferences-miscellaneous.page | 90 +
doc/fr/preferences-spelling.page | 93 +
doc/fr/preferences-startup.page | 69 +
doc/fr/preferences.page | 46 +
doc/fr/toolbar-prefs.page | 63 +
doc/fr/win-composer.page | 729 +++
doc/fr/win-filters.page | 237 +
doc/fr/win-main.page | 890 +++
doc/fr/win-message.page | 84 +
doc/fr/win-run-filters.page | 104 +
doc/fr/win-search.page | 79 +
doc/sl/ab-conf.page | 115 +
doc/sl/authors.page | 143 +
doc/sl/common-tasks.page | 187 +
doc/sl/folder-config.page | 176 +
doc/sl/getting-started.page | 51 +
doc/sl/glossary.page | 123 +
doc/sl/identities.page | 242 +
doc/sl/index.page | 60 +
doc/sl/introduction.page | 52 +
doc/sl/its-not-working.page | 105 +
doc/sl/mbox-formats.page | 72 +
doc/sl/preferences-address-books.page | 105 +
doc/sl/preferences-display-options.page | 279 +
doc/sl/preferences-incoming-and-outgoing-mail.page | 173 +
doc/sl/preferences-mail-options.page | 271 +
doc/sl/preferences-miscellaneous.page | 90 +
doc/sl/preferences-spelling.page | 93 +
doc/sl/preferences-startup.page | 69 +
doc/sl/preferences.page | 46 +
doc/sl/toolbar-prefs.page | 63 +
doc/sl/win-composer.page | 729 +++
doc/sl/win-filters.page | 237 +
doc/sl/win-main.page | 890 +++
doc/sl/win-message.page | 84 +
doc/sl/win-run-filters.page | 104 +
doc/sl/win-search.page | 79 +
help/C/balsa.sgml | 2 +-
images/16x16/Makefile.am | 1 -
images/16x16/balsa-drop-down.png | 71 -
images/Makefile.am | 2 -
libbalsa/Makefile.am | 2 +
libbalsa/abook-completion.c | 2 +-
libbalsa/abook-completion.h | 2 +-
libbalsa/address-book-extern.c | 10 +-
libbalsa/address-book-extern.h | 2 +-
libbalsa/address-book-gpe.c | 2 +-
libbalsa/address-book-gpe.h | 2 +-
libbalsa/address-book-ldap.c | 14 +-
libbalsa/address-book-ldap.h | 2 +-
libbalsa/address-book-ldif.c | 6 +-
libbalsa/address-book-ldif.h | 2 +-
libbalsa/address-book-rubrica.c | 2 +-
libbalsa/address-book-rubrica.h | 2 +-
libbalsa/address-book-text.c | 4 +-
libbalsa/address-book-text.h | 2 +-
libbalsa/address-book-vcard.c | 2 +-
libbalsa/address-book-vcard.h | 2 +-
libbalsa/address-book.c | 2 +-
libbalsa/address-book.h | 2 +-
libbalsa/address-view.c | 154 +-
libbalsa/address-view.h | 35 +-
libbalsa/address.c | 78 +-
libbalsa/address.h | 2 +-
libbalsa/application-helpers.c | 313 +
libbalsa/application-helpers.h | 56 +
libbalsa/body.c | 33 +-
libbalsa/body.h | 2 +-
libbalsa/cell-renderer-button.c | 6 +-
libbalsa/cell-renderer-button.h | 2 +-
libbalsa/completion.c | 2 +-
libbalsa/completion.h | 2 +-
libbalsa/files.c | 19 +-
libbalsa/files.h | 9 +-
libbalsa/filter-error.c | 2 +-
libbalsa/filter-file.c | 6 +-
libbalsa/filter-file.h | 2 +-
libbalsa/filter-funcs.c | 19 +-
libbalsa/filter-funcs.h | 2 +-
libbalsa/filter-private.h | 15 +-
libbalsa/filter.c | 44 +-
libbalsa/filter.h | 9 +-
libbalsa/folder-scanners.c | 2 +-
libbalsa/folder-scanners.h | 2 +-
libbalsa/gmime-application-pkcs7.c | 18 +-
libbalsa/gmime-application-pkcs7.h | 12 +-
libbalsa/gmime-gpgme-signature.c | 19 +-
libbalsa/gmime-gpgme-signature.h | 14 +-
libbalsa/gmime-multipart-crypt.c | 92 +-
libbalsa/gmime-multipart-crypt.h | 20 +-
libbalsa/gmime-part-rfc2440.c | 31 +-
libbalsa/gmime-part-rfc2440.h | 17 +-
libbalsa/gmime-stream-gio.c | 10 +-
libbalsa/html.c | 1313 +++-
libbalsa/html.h | 24 +-
libbalsa/identity.c | 468 +-
libbalsa/identity.h | 20 +-
libbalsa/imap-server.c | 169 +-
libbalsa/imap-server.h | 2 +-
libbalsa/imap/Makefile.am | 9 +-
libbalsa/imap/auth-cram.c | 35 +-
libbalsa/imap/imap-auth.c | 2 +-
libbalsa/imap/imap-auth.h | 2 +-
libbalsa/imap/imap-commands.c | 146 +-
libbalsa/imap/imap-commands.h | 2 +-
libbalsa/imap/imap-handle.c | 102 +-
libbalsa/imap/imap-handle.h | 2 +-
libbalsa/imap/imap-tls.c | 70 +-
libbalsa/imap/imap_compress.c | 2 +-
libbalsa/imap/imap_compress.h | 2 +-
libbalsa/imap/imap_private.h | 31 +-
libbalsa/imap/imap_search.c | 33 +-
libbalsa/imap/imap_search.h | 2 +-
libbalsa/imap/imap_tst.c | 13 +-
libbalsa/imap/libimap.h | 2 +-
libbalsa/imap/md5-utils.c | 354 -
libbalsa/imap/md5-utils.h | 60 -
libbalsa/imap/pop3.c | 98 +-
libbalsa/imap/pop3.h | 11 +-
libbalsa/imap/siobuf.c | 69 +-
libbalsa/imap/siobuf.h | 5 +-
libbalsa/imap/util.c | 2 +-
libbalsa/imap/util.h | 2 +-
libbalsa/information.c | 11 +-
libbalsa/information.h | 12 +-
libbalsa/libbalsa-conf.c | 63 +-
libbalsa/libbalsa-conf.h | 4 +-
libbalsa/libbalsa-gpgme-cb.c | 185 +-
libbalsa/libbalsa-gpgme-cb.h | 24 +-
libbalsa/libbalsa-gpgme.c | 244 +-
libbalsa/libbalsa-gpgme.h | 24 +-
libbalsa/libbalsa-vfs.c | 10 +-
libbalsa/libbalsa-vfs.h | 2 +-
libbalsa/libbalsa.c | 428 +-
libbalsa/libbalsa.h | 50 +-
libbalsa/libbalsa_private.h | 10 +-
libbalsa/mailbackend.h | 2 +-
libbalsa/mailbox-filter.c | 2 +-
libbalsa/mailbox-filter.h | 2 +-
libbalsa/mailbox.c | 636 +-
libbalsa/mailbox.h | 55 +-
libbalsa/mailbox_imap.c | 29 +-
libbalsa/mailbox_imap.h | 4 +-
libbalsa/mailbox_local.c | 214 +-
libbalsa/mailbox_local.h | 15 +-
libbalsa/mailbox_maildir.c | 48 +-
libbalsa/mailbox_maildir.h | 5 +-
libbalsa/mailbox_mbox.c | 124 +-
libbalsa/mailbox_mbox.h | 5 +-
libbalsa/mailbox_mh.c | 59 +-
libbalsa/mailbox_mh.h | 5 +-
libbalsa/mailbox_pop3.c | 10 +-
libbalsa/mailbox_pop3.h | 8 +-
libbalsa/mailbox_remote.c | 2 +-
libbalsa/mailbox_remote.h | 2 +-
libbalsa/message.c | 4 +-
libbalsa/message.h | 10 +-
libbalsa/mime-stream-shared.c | 8 +-
libbalsa/mime-stream-shared.h | 12 +-
libbalsa/mime.c | 240 +-
libbalsa/mime.h | 2 +-
libbalsa/misc.c | 55 +-
libbalsa/misc.h | 40 +-
libbalsa/missing.h | 10 +-
libbalsa/missing_time.c | 45 +-
libbalsa/rfc2445.c | 122 +-
libbalsa/rfc3156.c | 54 +-
libbalsa/rfc3156.h | 2 +-
libbalsa/send.c | 229 +-
libbalsa/send.h | 17 +-
libbalsa/server.c | 89 +-
libbalsa/server.h | 10 +-
libbalsa/smtp-server.c | 61 +-
libbalsa/smtp-server.h | 4 +-
libbalsa/source-viewer.c | 244 +-
libbalsa/url.c | 2 +-
libinit_balsa/Makefile.am | 2 +-
libinit_balsa/assistant_helper.c | 79 +-
libinit_balsa/assistant_helper.h | 23 +-
libinit_balsa/assistant_init.c | 21 +-
libinit_balsa/assistant_init.h | 14 +-
libinit_balsa/assistant_page_defclient.c | 36 +-
libinit_balsa/assistant_page_defclient.h | 20 +-
libinit_balsa/assistant_page_directory.c | 254 +-
libinit_balsa/assistant_page_directory.h | 20 +-
libinit_balsa/assistant_page_finish.c | 5 +-
libinit_balsa/assistant_page_finish.h | 16 +-
libinit_balsa/assistant_page_user.c | 50 +-
libinit_balsa/assistant_page_user.h | 18 +-
libinit_balsa/assistant_page_welcome.c | 7 +-
libinit_balsa/assistant_page_welcome.h | 16 +-
po/ChangeLog | 18 +
po/POTFILES.in | 7 +-
po/POTFILES.skip | 2 +-
po/TRANSLATORS | 3 +-
po/cs.po | 4867 ++++++---------
po/da.po | 3042 +++++-----
po/de.po | 6068 ++++++++++--------
po/es.po | 6712 ++++++++++----------
po/hu.po | 5841 +++++++++---------
po/pt.po | 416 +-
po/pt_BR.po | 5908 +++++++++---------
po/ro.po | 3267 +++++-----
po/sr.po | 5802 ++++++++---------
po/sr latin po | 5811 ++++++++---------
src/Balsa.idl | 45 -
src/Makefile.am | 35 +-
src/ab-main.c | 715 +--
src/ab-window.c | 165 +-
src/ab-window.h | 2 +-
src/address-book-config.c | 140 +-
src/address-book-config.h | 2 +-
src/balsa-app.c | 270 +-
src/balsa-app.h | 76 +-
src/balsa-bonobo.c | 278 -
src/balsa-bonobo.h | 97 -
src/balsa-cite-bar.c | 83 +-
src/balsa-cite-bar.h | 2 +-
src/balsa-icons.c | 270 +-
src/balsa-icons.h | 4 +-
src/balsa-index.c | 482 +-
src/balsa-index.h | 14 +-
src/balsa-mblist.c | 213 +-
src/balsa-mblist.h | 2 +-
src/balsa-message.c | 618 +-
src/balsa-message.h | 28 +-
src/balsa-mime-widget-callbacks.c | 30 +-
src/balsa-mime-widget-callbacks.h | 11 +-
src/balsa-mime-widget-crypto.c | 76 +-
src/balsa-mime-widget-crypto.h | 11 +-
src/balsa-mime-widget-image.c | 129 +-
src/balsa-mime-widget-image.h | 59 +-
src/balsa-mime-widget-message.c | 562 +-
src/balsa-mime-widget-message.h | 14 +-
src/balsa-mime-widget-multipart.c | 4 +-
src/balsa-mime-widget-multipart.h | 11 +-
src/balsa-mime-widget-text.c | 393 +-
src/balsa-mime-widget-text.h | 11 +-
src/balsa-mime-widget-vcalendar.c | 91 +-
src/balsa-mime-widget-vcalendar.h | 2 +-
src/balsa-mime-widget.c | 28 +-
src/balsa-mime-widget.h | 11 +-
src/balsa-print-object-decor.c | 2 +-
src/balsa-print-object-decor.h | 2 +-
src/balsa-print-object-default.c | 5 +-
src/balsa-print-object-default.h | 2 +-
src/balsa-print-object-header.c | 6 +-
src/balsa-print-object-header.h | 2 +-
src/balsa-print-object-image.c | 4 +-
src/balsa-print-object-image.h | 2 +-
src/balsa-print-object-text.c | 40 +-
src/balsa-print-object-text.h | 2 +-
src/balsa-print-object.c | 4 +-
src/balsa-print-object.h | 2 +-
src/filter-edit-callbacks.c | 272 +-
src/filter-edit-dialog.c | 189 +-
src/filter-edit.h | 2 +-
src/filter-export-callbacks.c | 2 +-
src/filter-export-dialog.c | 15 +-
src/filter-export.h | 2 +-
src/filter-run-callbacks.c | 12 +-
src/filter-run-dialog.c | 117 +-
src/filter-run.h | 21 +-
src/folder-conf.c | 189 +-
src/folder-conf.h | 2 +-
src/information-dialog.c | 14 +-
src/information-dialog.h | 12 +-
src/mailbox-conf.c | 403 +-
src/mailbox-conf.h | 6 +-
src/mailbox-node.c | 125 +-
src/mailbox-node.h | 6 +-
src/main-window.c | 5130 +++++++---------
src/main-window.h | 36 +-
src/main.c | 1057 +---
src/message-window.c | 1116 ++--
src/message-window.h | 4 +-
src/pref-manager.c | 820 ++--
src/pref-manager.h | 2 +-
src/print-gtk.c | 96 +-
src/print.h | 11 +-
src/quote-color.c | 33 +-
src/quote-color.h | 28 +-
src/save-restore.c | 490 +-
src/save-restore.h | 13 +-
src/sendmsg-window.c | 3525 +++++------
src/sendmsg-window.h | 39 +-
src/spell-check.c | 797 +--
src/spell-check.h | 20 +-
src/store-address.c | 203 +-
src/store-address.h | 2 +-
src/threads.h | 7 +-
src/toolbar-factory.c | 435 +-
src/toolbar-factory.h | 27 +-
src/toolbar-prefs.c | 280 +-
src/toolbar-prefs.h | 2 +-
ui/Makefile.am | 11 +
ui/ab-main.ui | 84 +
ui/main-window.ui | 577 ++
ui/message-window.ui | 206 +
ui/sendmsg-window.ui | 255 +
ui/source-viewer.ui | 44 +
website/faq.html | 14 +-
411 files changed, 66395 insertions(+), 40655 deletions(-)
---
diff --cc libbalsa/imap/imap-tls.c
index de2ce52,629f6df..7f76c61
--- a/libbalsa/imap/imap-tls.c
+++ b/libbalsa/imap/imap-tls.c
@@@ -49,19 -49,15 +47,24 @@@
#include <openssl/x509v3.h>
#include <openssl/err.h>
- #ifdef BALSA_USE_THREADS
- #include <pthread.h>
- #endif
+ /* Support for SSLv3 should *not* be enabled as it is unsafe (see
+ * <http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3566> and
+ * <http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-8730>.
+ *
+ * Uncomment the following line if you *really* want to enable SSLv3 support.
+ * Otherwise, only the "safe" protocols TLS 1.0, TLS 1.1 and TLS 1.2 are used
+ * (note that TLS 1.1 and TLS 1.2 support depends upon the OpenSSL version) */
+ /* #define ENABLE_SSL3 1 */
+/* Support for SSLv3 should *not* be enabled as it is unsafe (see
+ * <http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-3566> and
+ * <http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-8730>.
+ *
+ * Uncomment the following line if you *really* want to enable SSLv3 support.
+ * Otherwise, only the "safe" protocols TLS 1.0, TLS 1.1 and TLS 1.2 are used
+ * (note that TLS 1.1 and TLS 1.2 support depends upon the OpenSSL version) */
+/* #define ENABLE_SSL3 1 */
+
#include "siobuf.h"
#include "imap_private.h"
diff --cc libbalsa/imap/imap_private.h
index 15102bc,debadc0..c4043ea
--- a/libbalsa/imap/imap_private.h
+++ b/libbalsa/imap/imap_private.h
@@@ -14,10 -14,14 +14,12 @@@
* 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
+ #include <glib.h>
#include <glib-object.h>
+ #include <openssl/ssl.h>
#include "config.h"
diff --cc libbalsa/mime.c
index 20dff69,41eec9d..0768c4b
--- a/libbalsa/mime.c
+++ b/libbalsa/mime.c
@@@ -76,11 -80,11 +79,11 @@@ process_mime_part(LibBalsaMessage * mes
if (ignore_html && html_type)
break;
-
+ #ifdef HAVE_HTML_WIDGET
allocated = libbalsa_message_body_get_content(body, &res, NULL);
- if (!res)
+ if (!res || allocated == -1)
return NULL;
- #ifdef HAVE_HTML_WIDGET
+
if (html_type) {
allocated = libbalsa_html_filter(html_type, &res, allocated);
libbalsa_html_to_string(&res, allocated);
diff --cc libbalsa/smtp-server.c
index da37969,34a13d3..7533f13
--- a/libbalsa/smtp-server.c
+++ b/libbalsa/smtp-server.c
@@@ -386,22 -385,15 +383,15 @@@ smtp_server_tls_widget(LibBalsaSmtpServ
_("If Possible"));
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),
_("Required"));
- #else /* GTK_CHECK_VERSION(2, 24, 0) */
- GtkWidget *combo_box = gtk_combo_box_new_text();
-
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("Never"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("If Possible"));
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box), _("Required"));
- #endif /* GTK_CHECK_VERSION(2, 24, 0) */
switch (server->tls_mode) {
- case Starttls_DISABLED:
+ case LIBBALSA_TLS_DISABLED:
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 0);
break;
- case Starttls_ENABLED:
+ case LIBBALSA_TLS_ENABLED:
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 1);
break;
- case Starttls_REQUIRED:
+ case LIBBALSA_TLS_REQUIRED:
gtk_combo_box_set_active(GTK_COMBO_BOX(combo_box), 2);
break;
default:
diff --cc po/POTFILES.in
index 0847d64,df449ca..5a4407b
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@@ -8,14 -7,15 +7,15 @@@ libbalsa/address-book-extern.
libbalsa/address-book-ldap.c
libbalsa/address-book-ldif.c
libbalsa/address-book-vcard.c
-libbalsa/address-book.c
-libbalsa/address-view.c
libbalsa/address.c
+libbalsa/address-view.c
libbalsa/body.c
libbalsa/files.c
+libbalsa/filter.c
libbalsa/filter-error.c
+ libbalsa/filter-funcs.c
libbalsa/filter-file.c
-libbalsa/filter.c
+libbalsa/filter-funcs.c
libbalsa/folder-scanners.c
libbalsa/gmime-application-pkcs7.c
libbalsa/gmime-gpgme-signature.c
@@@ -24,12 -24,12 +24,16 @@@ libbalsa/gmime-part-rfc2440.
libbalsa/html.c
libbalsa/identity.c
libbalsa/imap-server.c
+ libbalsa/libbalsa-gpgme-cb.c
+ libbalsa/libbalsa-gpgme.c
+ libbalsa/libbalsa-conf.c
+ libbalsa/libbalsa-vfs.c
libbalsa/libbalsa.c
+libbalsa/libbalsa-conf.c
+libbalsa/libbalsa-gpgme.c
+libbalsa/libbalsa-gpgme-cb.c
libbalsa/libbalsa_private.h
+libbalsa/libbalsa-vfs.c
libbalsa/mailbox.c
libbalsa/mailbox_imap.c
libbalsa/mailbox_local.c
diff --cc po/cs.po
index f943107,0745198..31049a1
--- a/po/cs.po
+++ b/po/cs.po
@@@ -43,7 -45,32 +45,32 @@@ msgstr "Poštovní klient
msgid "Balsa Mail Client"
msgstr "Poštovní klient Balsa"
+ #. The externq database doesn't support Id's, sorry!
+ #: ../libbalsa/address-book-extern.c:211 ../libbalsa/address-book-ldif.c:332
+ msgid "No-Id"
+ msgstr "Bez identifikátoru"
+
+ #: ../libbalsa/address-book-extern.c:216 ../libbalsa/address-book-extern.c:374
+ #: ../libbalsa/address-book-ldap.c:500 ../libbalsa/address-book-ldif.c:311
+ #: ../libbalsa/address-book-ldif.c:335 ../libbalsa/address-book-ldif.c:354
+ #: ../libbalsa/address-book-ldif.c:358 ../libbalsa/address-book-vcard.c:160
+ #: ../libbalsa/address-book-vcard.c:258 ../libbalsa/address.c:406
+ msgid "No-Name"
+ msgstr "Beze jména"
+
+ #: ../libbalsa/address-book-ldap.c:283
+ msgid "SASL Interaction\n"
+ msgstr "Interakce SASL\n"
+
+ #: ../libbalsa/address-book-ldap.c:330
+ msgid "TLS requested but not compiled in"
+ msgstr "Vyžadováno TLS, ale není zakompilováno"
+
+ #: ../libbalsa/address-book-ldap.c:609
+ msgid "Undefined location of user address book"
+ msgstr "Není definováno umístění uživatelského adresáře kontaktů"
+
-#: ../libbalsa/address-book.c:314 ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
msgid "No error"
msgstr "Žádná chyba"
@@@ -287,16 -246,50 +246,64 @@@ msgstr "a
msgid "Or"
msgstr "nebo"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ #: ../libbalsa/filter-file.c:135
#, c-format
- msgid "Failed to decrypt MIME part: parse error"
- msgstr "Nelze dešifrovat část MIME: chyba při analýze"
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "Neplatné filtry %s pro poštovní schránku %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "Nelze načíst tělo zprávy pro srovnání s filtrem"
+
+ #: ../libbalsa/filter.c:234
+ #, c-format
+ msgid "Invalid filter: %s"
+ msgstr "Neplatný filtr: %s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Chybný název poštovní schránky pro filtr: %s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Chyba při kopírování zpráv: %s"
- #: ../libbalsa/gmime-multipart-crypt.c:223
+ #: ../libbalsa/filter.c:296
+ #, c-format
+ msgid "Error when trashing messages: %s"
+ msgstr "Chyba při vyhazování zpráv: %s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Chyba při přesunu zpráv: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
+ #, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Nelze dešifrovat část MIME: chyba při analýze"
++msgid "Invalid filters %s for mailbox %s"
++msgstr "Neplatné filtry %s pro poštovní schránku %s"
++
++#. FIXME: this is hack!
++#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
++msgid "To"
++msgstr "Pro"
++
++#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
++msgid "From"
++msgstr "Od"
++
++#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:373
++#: ../src/pref-manager.c:416
++msgid "Subject"
++msgstr "Předmět"
+
+ #: ../libbalsa/gmime-multipart-crypt.c:222
msgid "Cannot verify multipart/signed part due to missing subparts."
- msgstr "Nelze ověřit část multipart/signed, protože schází její dílčí části."
+ msgstr "Nelze ověřit část multipart/signed kvůli chybějící podčásti."
- #: ../libbalsa/gmime-multipart-crypt.c:249
+ #: ../libbalsa/gmime-multipart-crypt.c:248
#, c-format
msgid "unsupported protocol '%s'"
msgstr "nepodporovaný protokol „%s“"
@@@ -337,10 -328,10 +342,10 @@@ msgstr "Nelze ověřit část multipart
msgid ""
"Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
msgstr ""
- "Nelze dešifrovat část multipart/encrypted: selhalo zpracování dešifrovaného "
+ "Nelze ověřit část multipart/encrypted: selhalo zpracování zašifrovaného "
"obsahu"
-#: ../libbalsa/html.c:68
+#: ../libbalsa/html.c:66
#, c-format
msgid "Could not get an HTML part: %s"
msgstr "Nepodařilo se získat část v HTML: %s"
@@@ -404,17 -448,17 +462,17 @@@ msgid "Default
msgstr "Výchozí"
#. Translators: please do not translate Face.
- #: ../libbalsa/identity.c:948
+ #: ../libbalsa/identity.c:957
msgid "_Face Path"
-msgstr "Cesta k _Face"
+msgstr "Cesta k ikoně _Face"
#. Translators: please do not translate Face.
- #: ../libbalsa/identity.c:954
+ #: ../libbalsa/identity.c:963
msgid "_X-Face Path"
-msgstr "Cesta k _X-Face"
+msgstr "Cesta k ikoně _X-Face"
#. create the "General" tab
- #: ../libbalsa/identity.c:982
+ #: ../libbalsa/identity.c:991
msgid "General"
msgstr "Obecné"
@@@ -455,19 -499,19 +513,19 @@@ msgstr "Te_xt odpovědi:
msgid "F_orward string:"
msgstr "Text _přeposlání:"
- #: ../libbalsa/identity.c:1005
+ #: ../libbalsa/identity.c:1014
msgid "send messages in both plain text and _HTML format"
-msgstr "odeslat zprávu jako čistý text i v _HTML formátu"
+msgstr "Odeslat zprávu jako prostý text i v _HTML formátu"
- #: ../libbalsa/identity.c:1008
+ #: ../libbalsa/identity.c:1017
msgid "request positive (successful) _Delivery Status Notification by default"
- msgstr "Standardně požadovat _Oznámení o stavu doručení (DSN)"
+ msgstr "standardně žádat kladné _Oznámení o stavu zprávy (DSN)"
- #: ../libbalsa/identity.c:1011
+ #: ../libbalsa/identity.c:1021
msgid "request _Message Disposition Notification by default"
- msgstr "Standardně požadovat _Oznámení o přenesení zprávy (MDN)"
+ msgstr "standardně žádat _Oznámení o doručení zprávy (MDN)"
- #: ../libbalsa/identity.c:1021
+ #: ../libbalsa/identity.c:1031
msgid "SMT_P server:"
msgstr "Server SMT_P:"
@@@ -480,71 -524,71 +538,71 @@@ msgstr "Podpis
msgid "Signature _path"
msgstr "Cesta k _podpisu"
- #: ../libbalsa/identity.c:1032
+ #: ../libbalsa/identity.c:1042
msgid "_Execute signature"
-msgstr "Sp_ustit podpis"
+msgstr "P_rovést podpis"
- #: ../libbalsa/identity.c:1035
+ #: ../libbalsa/identity.c:1045
msgid "Incl_ude signature"
-msgstr "Při_ložit podpis"
+msgstr "V_ložit podpis"
- #: ../libbalsa/identity.c:1038
+ #: ../libbalsa/identity.c:1048
msgid "Include signature when for_warding"
-msgstr "Přiložit podpis při _přeposlání"
+msgstr "Vložit podpis při _přeposlání"
- #: ../libbalsa/identity.c:1041
+ #: ../libbalsa/identity.c:1051
msgid "Include signature when rep_lying"
-msgstr "Přiložit podpis při _odpovědi"
+msgstr "Vložit podpis při _odpovědi"
- #: ../libbalsa/identity.c:1044
+ #: ../libbalsa/identity.c:1054
msgid "_Add signature separator"
msgstr "Přid_at oddělovač podpisu"
- #: ../libbalsa/identity.c:1047
+ #: ../libbalsa/identity.c:1057
msgid "Prepend si_gnature"
-msgstr "Při_dat podpis na začátek"
+msgstr "Vložit po_dpis na začátek"
- #: ../libbalsa/identity.c:1053
+ #: ../libbalsa/identity.c:1063
msgid ""
- "Signing and encrypting messages are possible\n"
- "only if Balsa is built with cryptographic support."
+ "Signing and encrypting messages are possible only if Balsa is built with "
+ "cryptographic support."
msgstr ""
- "Podepisování a šifrování zpráv je možné\n"
- "pouze pokud je Balsa sestavená s podporou šifrování."
+ "Podepisování a šifrování zpráv je možné, jen pokud je Balsa přeložena s "
+ "podporou šifrování."
- #: ../libbalsa/identity.c:1058
+ #: ../libbalsa/identity.c:1068
msgid "Security"
msgstr "Zabezpečení"
- #: ../libbalsa/identity.c:1061
+ #: ../libbalsa/identity.c:1071
msgid "sign messages by default"
-msgstr "ve výchozím stavu podepisovat zprávy"
+msgstr "Jako výchozí zprávy podepisovat"
- #: ../libbalsa/identity.c:1064
+ #: ../libbalsa/identity.c:1074
msgid "encrypt messages by default"
-msgstr "ve výchozím stavu šifrovat zprávy"
+msgstr "Jako výchozí zprávy šifrovat"
- #: ../libbalsa/identity.c:1067
+ #: ../libbalsa/identity.c:1077
msgid "default protocol"
-msgstr "výchozí protokol"
+msgstr "Výchozí protokol"
- #: ../libbalsa/identity.c:1070
+ #: ../libbalsa/identity.c:1080
msgid "always trust GnuPG keys when encrypting"
-msgstr "při šifrování vždy důvěřovat klíčům GnuPG"
+msgstr "Při šifrování vždy důvěřovat klíčům GnuPG"
- #: ../libbalsa/identity.c:1073
+ #: ../libbalsa/identity.c:1083
msgid "remind me if messages can be encrypted"
-msgstr "upozornit mě, pokud lze zprávu zašifrovat"
+msgstr "Připomenout mi, když zpráva může být šifrovaná"
- #: ../libbalsa/identity.c:1076
+ #: ../libbalsa/identity.c:1086
msgid ""
"use secret key with this id for signing\n"
"(leave empty for automatic selection)"
msgstr ""
-"použít k podpisu tajný klíč s tímto ID\n"
-"(nechte prázdné pro automatický výběr)"
+"Používat k podepisování tajný klíč s tímto ID\n"
+"(ponechte prázdné pro automatický výběr)"
- #: ../libbalsa/identity.c:1210
+ #: ../libbalsa/identity.c:1220
#, c-format
msgid "Error reading file %s: %s"
msgstr "Chyba při načítání %s: %s"
@@@ -935,12 -1026,12 +1040,12 @@@ msgstr "Špatná cesta k místní pošt
msgid "Could not create a mailbox of type %s"
msgstr "Nelze vytvořit poštovní schránku typu %s"
- #: ../libbalsa/mailbox.c:872
+ #: ../libbalsa/mailbox.c:864
#, c-format
msgid "Applying filter rules to %s"
-msgstr "Aplikovat pravidla filtrování na %s"
+msgstr "Použít pravidla filtrování na %s"
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1027
#, c-format
msgid "Copying from %s to %s"
msgstr "Kopírování z %s do %s"
@@@ -972,10 -1063,10 +1077,10 @@@ msgstr "Vyhledávají se neúplné zpr�
msgid "Reconstructing message"
msgstr "Rekonstrukce zprávy"
- #: ../libbalsa/mailbox.c:4348
+ #: ../libbalsa/mailbox.c:4312
#, c-format
msgid "Finding duplicate messages in source mailbox failed"
-msgstr "Vyhledání duplicitních zpráv ve zdrojové poštovní schránce selhalo"
+msgstr "Vyhledání zdvojených zpráv ve zdrojové poštovní schránce selhalo"
#. ImapIssue macro handles reconnecting. We might issue a
#. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
@@@ -1063,23 -1154,23 +1168,23 @@@ msgstr "Vlákna na straně serveru nejs
msgid "Failed to save cache file \"%s\": %s."
msgstr "Nelze uložit soubor mezipaměti „%s“: %s."
- #: ../libbalsa/mailbox_local.c:570
+ #: ../libbalsa/mailbox_local.c:600
#, c-format
msgid "Cache file for mailbox %s will be created"
-msgstr "Bude vytvořen soubor s keší pro schránku %s"
+msgstr "Bude vytvořen soubor mezipaměti pro schránku %s"
- #: ../libbalsa/mailbox_local.c:579
+ #: ../libbalsa/mailbox_local.c:609
#, c-format
msgid "Failed to read cache file %s: %s"
-msgstr "Nelze část ze souboru keše %s: %s"
+msgstr "Nelze číst ze souboru mezipaměti %s: %s"
- #: ../libbalsa/mailbox_local.c:597 ../libbalsa/mailbox_local.c:614
- #: ../libbalsa/mailbox_local.c:638
+ #: ../libbalsa/mailbox_local.c:627 ../libbalsa/mailbox_local.c:646
+ #: ../libbalsa/mailbox_local.c:670
#, c-format
msgid "Cache file for mailbox %s will be repaired"
-msgstr "Soubor s keší pro schránku %s bude opraven"
+msgstr "Soubor mezipaměti pro schránku %s bude opraven"
- #: ../libbalsa/mailbox_local.c:1164
+ #: ../libbalsa/mailbox_local.c:1243
#, c-format
msgid "Filtering %s"
msgstr "Filtrování %s"
@@@ -1379,20 -1470,20 +1484,20 @@@ msgstr "Nelze otevřít %s: %s
msgid "Cannot open %s: is a symbolic link"
msgstr "Nelze otevřít %s: je to symbolický odkaz"
- #: ../libbalsa/misc.c:967
+ #: ../libbalsa/misc.c:959
msgid "Timeout exceeded while attempting fcntl lock!"
-msgstr "Časový interval vypršel při pokusu vytvořit zámek fcntl!"
+msgstr "Při pokusu vytvořit zámek fcntl vypršelo časové omezení!"
- #: ../libbalsa/misc.c:974
+ #: ../libbalsa/misc.c:966
#, c-format
msgid "Waiting for fcntl lock... %d"
-msgstr "Čekám na zámek fcntl… %d"
+msgstr "Čeká se na zámek fcntl… %d"
- #: ../libbalsa/misc.c:1002
+ #: ../libbalsa/misc.c:994
msgid "Timeout exceeded while attempting flock lock!"
-msgstr "Časový interval vypršel při pokusu vytvořit zámek flock!"
+msgstr "Při pokusu vytvořit zámek flock vypršelo časové omezení!"
- #: ../libbalsa/misc.c:1009
+ #: ../libbalsa/misc.c:1001
#, c-format
msgid "Waiting for flock attempt... %d"
msgstr "Čeká se na pokus o flock… %d"
@@@ -1435,11 -1526,11 +1540,11 @@@ msgstr "dokončeno
msgid "in process"
msgstr "zpracovává se"
- #: ../libbalsa/rfc2445.c:682
+ #: ../libbalsa/rfc2445.c:700
msgid "Event Notification"
-msgstr "Oznámení události"
+msgstr "Upozornění na událost"
- #: ../libbalsa/rfc2445.c:683
+ #: ../libbalsa/rfc2445.c:701
msgid "Event Request"
msgstr "Požadavek události"
@@@ -1784,9 -1875,9 +1889,9 @@@ msgid "
"System will attempt to resubmit the message until you delete it."
msgstr ""
"Problém při předání zprávy, ukládá se do schránky „Pošta k odeslání“.\n"
-"Systém se bude pokoušet znovu poslat zprávu, dokud ji nesmažete."
+"Systém se bude pokoušet znovu odeslat zprávu, dokud ji nesmažete."
- #: ../libbalsa/send.c:1089
+ #: ../libbalsa/send.c:1085
msgid "Connected to MTA"
msgstr "Připojeno k MTA"
@@@ -2057,15 -2096,15 +2110,15 @@@ msgstr "Adresář GnomeCard
msgid "Address Book"
msgstr "Adresář"
- #: ../libinit_balsa/assistant_init.c:146
+ #: ../libinit_balsa/assistant_init.c:139
msgid "Configure Balsa"
-msgstr "Nastavení Balsy"
+msgstr "Nastavení Balsa"
- #: ../libinit_balsa/assistant_page_defclient.c:57
+ #: ../libinit_balsa/assistant_page_defclient.c:56
msgid "Use Balsa as default email client?"
- msgstr "Používat Balsa jako výchozího klienta elektronické pošty?"
+ msgstr "Používat Balsu jako výchozího poštovního klienta?"
- #: ../libinit_balsa/assistant_page_defclient.c:61
+ #: ../libinit_balsa/assistant_page_defclient.c:60
msgid "_Yes"
msgstr "_Ano"
@@@ -2077,23 -2116,23 +2130,23 @@@ msgstr "_Ne
msgid "Default Client"
msgstr "Výchozí klient"
- #: ../libinit_balsa/assistant_page_directory.c:58
+ #: ../libinit_balsa/assistant_page_directory.c:50
msgid "_Inbox:"
-msgstr "_Doručená pošta:"
+msgstr "_Přijaté:"
- #: ../libinit_balsa/assistant_page_directory.c:58
+ #: ../libinit_balsa/assistant_page_directory.c:50
msgid "_Outbox:"
-msgstr "Pošta k _odeslání:"
+msgstr "K _odeslání:"
- #: ../libinit_balsa/assistant_page_directory.c:58
+ #: ../libinit_balsa/assistant_page_directory.c:50
msgid "_Sentbox:"
-msgstr "Ode_slaná pošta:"
+msgstr "Ode_slané:"
- #: ../libinit_balsa/assistant_page_directory.c:58
+ #: ../libinit_balsa/assistant_page_directory.c:50
msgid "_Draftbox:"
-msgstr "_Rozepsaná pošta:"
+msgstr "_Koncepty:"
- #: ../libinit_balsa/assistant_page_directory.c:59
+ #: ../libinit_balsa/assistant_page_directory.c:51
msgid "_Trash:"
msgstr "_Koš:"
@@@ -2111,29 -2155,32 +2169,32 @@@ msgstr "Nelze vytvořit poštovní schr
msgid "The mailbox \"%s\" does not appear to be valid."
msgstr "Vypadá to, že poštovní schránka „%s“ je neplatná."
- #: ../libinit_balsa/assistant_page_directory.c:202
+ #: ../libinit_balsa/assistant_page_directory.c:191
+ #, c-format
msgid ""
- "Please verify the locations of your default mail files.\n"
- "These will be created if necessary."
+ "Problem verifying path \"%s\":\n"
+ "%s"
msgstr ""
- "Ověřte prosím umístění svých výchozích souborů pošty.\n"
- "V případě potřeby budou vytvořeny."
+ "Problém při ověřování cesty „%s“:\n"
+ "%s"
- #: ../libinit_balsa/assistant_page_directory.c:264
- msgid "Mail Files"
- msgstr "Poštovní soubory"
+ #: ../libinit_balsa/assistant_page_directory.c:224
+ msgid "_Verify locations"
+ msgstr "O_věřit umístění"
- #: ../libinit_balsa/assistant_page_directory.c:360
- #: ../libinit_balsa/assistant_page_directory.c:394
- #, c-format
+ #: ../libinit_balsa/assistant_page_directory.c:258
msgid ""
- "Problem Creating Mailboxes\n"
- "%s"
+ "Please verify the locations of your default mail files. These will be "
+ "created if necessary."
msgstr ""
- "Problém při vytváření poštovních schránek\n"
- "%s"
+ "Ověřte prosím umístění svých výchozích souborů pošty. V případě potřeby "
+ "budou vytvořeny."
+
+ #: ../libinit_balsa/assistant_page_directory.c:322
+ msgid "Mail Files"
+ msgstr "Poštovní soubory"
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
msgid ""
"You've successfully set up Balsa. Have fun!\n"
" -- The Balsa development team"
@@@ -2145,17 -2192,16 +2206,16 @@@ msgstr "
msgid "All Done!"
msgstr "Hotovo!"
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
msgid ""
"The following settings are also needed (and you can find them later, if need "
- "be, in the Email application in the 'Preferences' and 'Identities' commands "
- "on the 'Tools' menu)"
+ "be, in the Email application in the 'Preferences' and 'Identities' menu "
+ "items)"
msgstr ""
"Jsou také potřeba následující nastavení (v případě potřeby je později můžete "
- "najít v aplikaci Email v příkazech „Předvolby“ a „Identity“ v nabídce "
- "„Nástroje“)"
+ "najít v aplikaci E-mail pod položkami nabídky „Nastavení“ a „Identity“."
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
msgid ""
" Whoever provides your email account should be able to give you the "
"following information (if you have a Network Administrator, they may already "
@@@ -2438,9 -2402,9 +2416,9 @@@ msgstr "během psaní
#: ../src/address-book-config.c:190
msgid "when I hit the Escape key"
-msgstr "když stisknu klávesu Esc"
+msgstr "když zmáčknu klávesu Esc"
- #: ../src/address-book-config.c:227 ../src/address-book-config.c:328
+ #: ../src/address-book-config.c:225 ../src/address-book-config.c:326
#, c-format
msgid "Modify %s Address Book"
msgstr "Upravit adresář %s"
@@@ -2576,11 -2568,11 +2582,11 @@@ msgstr "Odpovědět _skupině…
msgid "_Forward Attached..."
msgstr "Přeposlat _jako přílohu…"
- #: ../src/balsa-index.c:1890
+ #: ../src/balsa-index.c:1821
msgid "Forward _Inline..."
-msgstr "Přeposlat uvn_itř…"
+msgstr "Přeposlat jako _citaci…"
- #: ../src/balsa-index.c:1892 ../src/main-window.c:562
+ #: ../src/balsa-index.c:1823
msgid "_Pipe through..."
msgstr "_Filtrovat programem…"
@@@ -2613,11 -2610,11 +2624,11 @@@ msgstr "_Nepřečtené
msgid "_Move to"
msgstr "_Přesunout do"
- #: ../src/balsa-index.c:1946
+ #: ../src/balsa-index.c:1872
msgid "_View Source"
-msgstr "Zobrazit zdro_j"
+msgstr "Zobrazit zdro_jovou formu"
- #: ../src/balsa-index.c:2191
+ #: ../src/balsa-index.c:2107
#, c-format
msgid "Failed to copy %d message to mailbox \"%s\": %s"
msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@@ -2687,15 -2684,15 +2698,15 @@@ msgstr "Vyberte cílovou složku
msgid "Other..."
msgstr "Jiné…"
- #: ../src/balsa-message.c:301
+ #: ../src/balsa-message.c:283
msgid "Check cryptographic signature"
-msgstr "Kontrolovat kryptografický podpis"
+msgstr "Zkontrolovat kryptografický podpis"
- #: ../src/balsa-message.c:322
+ #: ../src/balsa-message.c:300
msgid "Select message part to display"
-msgstr "Zvolte část zprávy, kterou zobrazit"
+msgstr "Vyberte část zprávy, která se má zobrazit"
- #: ../src/balsa-message.c:409
+ #: ../src/balsa-message.c:375
msgid "Wrapped"
msgstr "Zalomené"
@@@ -2841,11 -2838,11 +2852,11 @@@ msgid "
"a Message Disposition Notification(MDN) to be returned to `%s'.\n"
"Do you want to send this notification?"
msgstr ""
-"Odesílatel této zprávy, %s, vyžaduje \n"
-"zaslání oznámení o doručení zprávy (MDN) na adresu „%s“.\n"
-"Chcete poslat toto oznámení?"
+"Odesílatel této zprávy, %s, požaduje \n"
+"zaslání oznámení o přenesení zprávy (MDN) na adresu „%s“.\n"
+"Chcete odeslat toto oznámení?"
- #: ../src/balsa-message.c:2591
+ #: ../src/balsa-message.c:2621
msgid "Reply to MDN?"
msgstr "Odpovědět na MDN?"
@@@ -3168,13 -3122,13 +3136,13 @@@ msgstr "Od:
msgid "Reply-To:"
msgstr "Odpověď komu:"
- #: ../src/balsa-mime-widget-message.c:753
- #: ../src/balsa-print-object-header.c:174
+ #: ../src/balsa-mime-widget-message.c:759
+ #: ../src/balsa-print-object-header.c:177
msgid "Fcc:"
-msgstr "Automatická kopie:"
+msgstr "Kopie do složky:"
- #: ../src/balsa-mime-widget-message.c:760
- #: ../src/balsa-print-object-header.c:177
+ #: ../src/balsa-mime-widget-message.c:767
+ #: ../src/balsa-print-object-header.c:180
msgid "Disposition-Notification-To:"
msgstr "Oznámení o doručení pro:"
@@@ -3466,11 -3501,11 +3515,11 @@@ msgstr "Filtrování s použitím regul
msgid "Match when message date is in the interval:"
msgstr "Odpovídá, pokud je datum zprávy v rozmezí:"
- #: ../src/filter-edit-callbacks.c:1135
+ #: ../src/filter-edit-callbacks.c:1118
msgid "Inside/outside the date interval"
-msgstr "Uvnitř/Mimo časový interval"
+msgstr "Uvnitř/mimo rozmezí dat"
- #: ../src/filter-edit-callbacks.c:1182
+ #: ../src/filter-edit-callbacks.c:1159
msgid "Match when one flag is set/when no flag is set"
msgstr "Odpovídá, pokud je jeden příznak nastaven/žádný není nastaven"
@@@ -3575,15 -3610,19 +3624,19 @@@ msgid "_Filter name:
msgstr "Název _filtru:"
#. The filter op-code : "OR" or "AND" all the conditions
- #: ../src/filter-edit-dialog.c:285
- msgid "Operation between conditions"
- msgstr "Operace mezi podmínkami"
+ #: ../src/filter-edit-dialog.c:274
+ msgid "Operation between conditions:"
+ msgstr "Operace mezi podmínkami:"
+
+ #: ../src/filter-edit-dialog.c:311
+ msgid "_Edit"
+ msgstr "_Upravit"
- #: ../src/filter-edit-dialog.c:335
+ #: ../src/filter-edit-dialog.c:316
msgid "Ne_w"
-msgstr "No_vý"
+msgstr "No_vá"
- #: ../src/filter-edit-dialog.c:363
+ #: ../src/filter-edit-dialog.c:348
msgid "Foreground"
msgstr "Popředí"
@@@ -3614,11 -3657,11 +3671,11 @@@ msgstr "Vyskakovací text:
msgid "Action to perform:"
msgstr "Provést akci:"
- #: ../src/filter-edit-dialog.c:510
+ #: ../src/filter-edit-dialog.c:491
msgid "Match"
-msgstr "Shoda"
+msgstr "Porovnávání"
- #: ../src/filter-edit-dialog.c:513
+ #: ../src/filter-edit-dialog.c:494
msgid "Action"
msgstr "Činnost"
@@@ -3706,25 -3749,31 +3763,31 @@@ msgstr "Při přijetí
msgid "On exit"
msgstr "Při ukončení"
- #: ../src/filter-run-dialog.c:316
- msgid "Apply Selected"
- msgstr "Použít vybrané"
+ #: ../src/filter-run-dialog.c:356
+ msgid "_Apply Selected"
+ msgstr "_Použít vybrané"
+
+ #: ../src/filter-run-dialog.c:372
+ msgid "Add selected filter to mailbox"
+ msgstr "Přidat vybraný filtr ke schránce"
- #. up button
- #: ../src/filter-run-dialog.c:364
- msgid "_Up"
- msgstr "Nahor_u"
+ #: ../src/filter-run-dialog.c:382
+ msgid "Remove selected filter from mailbox"
+ msgstr "Odebrat vybraný filtr ze schránky"
- #. down button
- #: ../src/filter-run-dialog.c:369
- msgid "Do_wn"
- msgstr "Do_lů"
+ #: ../src/filter-run-dialog.c:424
+ msgid "Move selected filter up"
+ msgstr "Posunout vybraný filtr výš"
- #: ../src/filter-run-dialog.c:375
+ #: ../src/filter-run-dialog.c:434
+ msgid "Move selected filter down"
+ msgstr "Posunout vybraný filtr níž"
+
+ #: ../src/filter-run-dialog.c:440
msgid "A_pply Now!"
-msgstr "_Aplikovat teď!"
+msgstr "_Použít nyní"
- #: ../src/filter-run-dialog.c:419
+ #: ../src/filter-run-dialog.c:486
msgid ""
"The filters dialog is opened, close it before you can run filters on any "
"mailbox"
@@@ -3759,15 -3807,15 +3821,15 @@@ msgstr "_Základní
msgid "_Max number of connections:"
msgstr "_Maximální počet spojení:"
- #: ../src/folder-conf.c:337 ../src/mailbox-conf.c:1399
+ #: ../src/folder-conf.c:343 ../src/mailbox-conf.c:1354
msgid "Enable _persistent cache"
-msgstr "Povolit _trvalou keš"
+msgstr "Povolit _trvalou mezipaměť"
- #: ../src/folder-conf.c:345
+ #: ../src/folder-conf.c:350
msgid "Use IDLE command"
-msgstr "Použít příkaz IDLE"
+msgstr "Používat příkaz IDLE"
- #: ../src/folder-conf.c:352 ../src/mailbox-conf.c:1403
+ #: ../src/folder-conf.c:357 ../src/mailbox-conf.c:1357
msgid "Enable _bug workarounds"
msgstr "Povolit _obcházení chyb"
@@@ -3806,11 -3854,11 +3868,11 @@@ msgstr "Pouze přihlášené složk_y
msgid "Always show _INBOX"
msgstr "Vždy zobrazovat _INBOX"
- #: ../src/folder-conf.c:408
+ #: ../src/folder-conf.c:418
msgid "Pr_efix:"
-msgstr "_Předpona:"
+msgstr "Z_ačít v:"
- #: ../src/folder-conf.c:554
+ #: ../src/folder-conf.c:565
msgid "Select parent folder"
msgstr "Vybrat rodičovskou složku"
@@@ -4262,31 -4301,31 +4315,31 @@@ msgstr "Přihlá_sit se
msgid "_Unsubscribe"
msgstr "_Odhlásit se"
- #: ../src/mailbox-node.c:1114
+ #: ../src/mailbox-node.c:1135
msgid "Mark as _Inbox"
-msgstr "Označ_it jako „Doručená pošta“"
+msgstr "Označ_it jako „Přijaté“"
- #: ../src/mailbox-node.c:1116
+ #: ../src/mailbox-node.c:1137
msgid "_Mark as Sentbox"
-msgstr "Označit _jako „Odeslaná pošta“"
+msgstr "Označit _jako „Odeslané“"
- #: ../src/mailbox-node.c:1118
+ #: ../src/mailbox-node.c:1139
msgid "Mark as _Trash"
msgstr "Označi_t jako „Koš“"
- #: ../src/mailbox-node.c:1120
+ #: ../src/mailbox-node.c:1141
msgid "Mark as D_raftbox"
-msgstr "Označit jako „_Rozepsaná pošta“"
+msgstr "Označit jako „_Koncepty“"
- #: ../src/mailbox-node.c:1123
+ #: ../src/mailbox-node.c:1144
msgid "_Empty trash"
msgstr "Vy_sypat koš"
- #: ../src/mailbox-node.c:1128
+ #: ../src/mailbox-node.c:1149
msgid "_Edit/Apply filters"
-msgstr "U_pravit/Aplikovat filtry"
+msgstr "U_pravit/použít filtry"
- #: ../src/mailbox-node.c:1216
+ #: ../src/mailbox-node.c:1236
#, c-format
msgid "The path \"%s\" does not lead to a mailbox."
msgstr "Cesta „%s“ nevede k poštovní schránce."
@@@ -5150,16 -4368,55 +4382,55 @@@ msgstr "Tělo obsahuje:
msgid "Older than (days):"
msgstr "Starší než (dnů):"
- #: ../src/main-window.c:1240
+ #: ../src/main-window.c:449
msgid "Old at most (days):"
-msgstr "Starý nejvýše (dnů):"
+msgstr "Stará nejvýše (dnů):"
- #: ../src/main-window.c:2369
+ #: ../src/main-window.c:965
+ msgid "translator-credits"
+ msgstr ""
+ "Marcel Telka <marcel telka sk>, 2000 – 2001\n"
+ "Adam Purkrt <adampurkrt yahoo com>, 2001\n"
+ "Michal Bukovjan <bukm centrum cz>, 2002 – 2003\n"
+ "Miloslav Trmač <mitr volny cz>, 2003 – 2005\n"
+ "Lucas Lommer <llommer svn gnome org>, 2008 – 2009\n"
+ "Marek Černocký <marek manet cz>, 2009 – 2016"
+
+ #: ../src/main-window.c:976
+ msgid "The Balsa email client is part of the GNOME desktop environment."
+ msgstr "Klient elektronické pošty Balsa je součást pracovního prostředí GNOME."
+
+ #. license ?
+ #: ../src/main-window.c:981
+ msgid "About Balsa"
+ msgstr "O programu Balsa"
+
+ #: ../src/main-window.c:1003
+ msgid "Balsa closes files and connections.Please wait..."
+ msgstr "Balsa zavírá soubory a spojení. Počkejte prosím…"
+
+ #: ../src/main-window.c:1396
+ msgid "You can apply filters only on mailbox\n"
+ msgstr "Filtry lze aplikovat pouze na poštovní schránky\n"
+
+ #: ../src/main-window.c:1416
#, c-format
- msgid "Opening %s"
- msgstr "Otevírá se %s"
+ msgid "Removing duplicates failed: %s"
+ msgstr "Odstraňování duplikátů selhalo: %s"
+
+ #: ../src/main-window.c:1422
+ #, c-format
+ msgid "Removed %d duplicate"
+ msgid_plural "Removed %d duplicates"
+ msgstr[0] "Odstraněn %d duplikát"
+ msgstr[1] "Odstraněny %d duplikáty"
+ msgstr[2] "Odstraněno %d duplikátů"
- #: ../src/main-window.c:2386
+ #: ../src/main-window.c:1427
+ msgid "No duplicates found"
+ msgstr "Duplikáty nenalezeny"
+
+ #: ../src/main-window.c:2915
#, c-format
msgid ""
"Unable to Open Mailbox!\n"
@@@ -5266,12 -4490,12 +4504,12 @@@ msgid "S_ubject
msgstr "_Předmět"
#. Frame with Apply and Clear buttons
- #: ../src/main-window.c:4368
+ #: ../src/main-window.c:3994
msgid "Show only matching messages"
-msgstr "Zobrazovat jen odpovídající zprávy"
+msgstr "Zobrazit jen vyhovující zprávy"
#. Frame with OK button
- #: ../src/main-window.c:4389
+ #: ../src/main-window.c:4015
msgid "Open next matching message"
msgstr "Otevřít následující odpovídající zprávu"
@@@ -5418,11 -4675,11 +4689,11 @@@ msgid "JWZ
msgstr "JWZ"
#. must NOT be modal
- #: ../src/pref-manager.c:521
+ #: ../src/pref-manager.c:502
msgid "Balsa Preferences"
-msgstr "Nastavení Balsy"
+msgstr "Předvolby Balsa"
- #: ../src/pref-manager.c:575
+ #: ../src/pref-manager.c:555
msgid "Mail options"
msgstr "Volby pošty"
@@@ -5497,11 -4754,11 +4768,11 @@@ msgstr "Příchozí
msgid "Outgoing"
msgstr "Odchozí"
- #: ../src/pref-manager.c:1842
+ #: ../src/pref-manager.c:1831
msgid "Checking"
-msgstr "Kontrola"
+msgstr "Kontroluje se"
- #: ../src/pref-manager.c:1848
+ #: ../src/pref-manager.c:1837
msgid "_Check mail automatically every"
msgstr "_Kontrolovat poštu automaticky každých"
@@@ -5573,15 -4826,15 +4840,15 @@@ msgstr "znaků
msgid "Display of multipart/alternative parts"
msgstr "Zobrazení částí Multipart/Alternative"
- #: ../src/pref-manager.c:1984
+ #: ../src/pref-manager.c:1959
msgid "Prefer text/plain over html"
-msgstr "Upřednostnit čistý text/plain před HTML"
+msgstr "Upřednostnit prostý text před HTML"
- #: ../src/pref-manager.c:2000
+ #: ../src/pref-manager.c:1975
msgid "National (8-bit) characters in broken messages without codeset header"
-msgstr "Národní (osmibitové) znaky v chybných zprávách bez hlavičky codeset"
+msgstr "Národní (8bitové) znaky v chybných zprávách bez hlavičky Codeset"
- #: ../src/pref-manager.c:2007
+ #: ../src/pref-manager.c:1982
msgid "display as \"?\""
msgstr "zobrazovat jako „?“"
@@@ -5600,19 -4853,18 +4867,18 @@@ msgid "
"Notification (MDN), send it if:"
msgstr ""
"Došlá zpráva může obsahovat požadavek na zaslání „Oznámení o "
-"doručení“ (MDN). Zaslat oznámení v případě, že:"
+"přenesení“ (MDN). Zaslat oznámení v případě, že:"
- #: ../src/pref-manager.c:2060
+ #: ../src/pref-manager.c:2031
msgid ""
- "The message header looks clean\n"
- "(the notify-to address is the return path,\n"
+ "The message header looks clean (the notify-to address is the return path, "
"and I am in the \"To:\" or \"Cc:\" list)."
msgstr ""
- "Hlavička zprávy vypadá důvěryhodně\n"
- "(adresa, na níž má být zasláno oznámení, je stejná jako návratová cesta,\n"
- "jsem uveden jako adresát v seznamu „Komu:“ nebo „Kopie:“)."
+ "Hlavička zprávy vypadá důvěryhodně (adresa, na níž má být zasláno oznámení, "
+ "je stejná jako návratová cesta, jsem uveden jako adresát v seznamu „Komu:“ "
+ "nebo „Kopie:“)."
- #: ../src/pref-manager.c:2077
+ #: ../src/pref-manager.c:2045
msgid "The message header looks suspicious."
msgstr "Hlavička zprávy vypadá podezřele."
@@@ -5628,11 -4880,11 +4894,11 @@@ msgstr "Zalamovat odchozí text na
msgid "Other options"
msgstr "Ostatní volby"
- #: ../src/pref-manager.c:2152
+ #: ../src/pref-manager.c:2112
msgid "Reply prefix:"
-msgstr "Prefix odpovědi:"
+msgstr "Uvození odpovědi:"
- #: ../src/pref-manager.c:2155
+ #: ../src/pref-manager.c:2115
msgid "Automatically quote original when replying"
msgstr "Automaticky citovat originál při odpovědi"
@@@ -5644,11 -4896,11 +4910,11 @@@ msgstr "Přeposílat poštu jako příl
msgid "Copy outgoing messages to sentbox"
msgstr "Kopírovat odchozí zprávy do Odeslané pošty"
- #: ../src/pref-manager.c:2163
+ #: ../src/pref-manager.c:2123
msgid "Send button always queues outgoing mail in outbox"
-msgstr "Tlačítko Poslat vždy zařadí odchozí poštu do K odeslání"
+msgstr "Tlačítko Odeslat vždy zařadí odchozí poštu do K odeslání"
- #: ../src/pref-manager.c:2166
+ #: ../src/pref-manager.c:2126
msgid "Edit headers in external editor"
msgstr "Upravovat hlavičky v externím editoru"
@@@ -5688,11 -4940,11 +4954,11 @@@ msgstr "Hlavní okno
msgid "Use preview pane"
msgstr "Používat panel náhledu"
- #: ../src/pref-manager.c:2225
+ #: ../src/pref-manager.c:2185
msgid "Show mailbox statistics in left pane"
-msgstr "Zobrazovat statistiky poštovní schránky v levém panelu"
+msgstr "Zobrazovat statistiky u poštovních schránek v levém panelu"
- #: ../src/pref-manager.c:2229
+ #: ../src/pref-manager.c:2189
msgid "Automatically view message when mailbox opened"
msgstr "Automaticky zobrazit zprávu při otevření poštovní schránky"
@@@ -5708,11 -4960,11 +4974,11 @@@ msgstr "Klávesy PageUp/PageDown posuno
msgid "percent"
msgstr "procent"
- #: ../src/pref-manager.c:2264
+ #: ../src/pref-manager.c:2220
msgid "Display progress dialog"
-msgstr "Zobrazovat dialog s průběhem"
+msgstr "Zobrazovat dialogové okno s průběhem"
- #: ../src/pref-manager.c:2289
+ #: ../src/pref-manager.c:2245
msgid "Date encoding (for strftime):"
msgstr "Kódování data (pro strftime):"
@@@ -5740,11 -4992,11 +5006,11 @@@ msgstr "Chybová hlášení:
msgid "Fatal error messages:"
msgstr "Závažná chybová hlášení:"
- #: ../src/pref-manager.c:2334
+ #: ../src/pref-manager.c:2290
msgid "Debug messages:"
-msgstr "Zprávy lazení:"
+msgstr "Zprávy ladění:"
- #: ../src/pref-manager.c:2360
+ #: ../src/pref-manager.c:2315
msgid "Message colors"
msgstr "Barvy zprávy"
@@@ -5866,11 -5097,11 +5111,11 @@@ msgstr "Skrývat zprávy označené jak
msgid "The following settings are global:"
msgstr "Následující nastavení jsou globální:"
- #: ../src/pref-manager.c:2758
+ #: ../src/pref-manager.c:2664
msgid "Expunge deleted messages when mailbox is closed"
-msgstr "Odstraňovat vymazané zprávy při zavření poštovní schránky"
+msgstr "Odstraňovat smazané zprávy při zavření poštovní schránky"
- #: ../src/pref-manager.c:2765
+ #: ../src/pref-manager.c:2671
msgid "...and if unused more than"
msgstr "… a pokud není používána déle než"
@@@ -5890,15 -5121,15 +5135,15 @@@ msgstr "Volby pro start aplikace
msgid "Open Inbox upon startup"
msgstr "Po spuštění otevřít schránku s doručenou poštou"
- #: ../src/pref-manager.c:2829
+ #: ../src/pref-manager.c:2731
msgid "Check mail upon startup"
-msgstr "Po spuštění kontrolovat poštu"
+msgstr "Po spuštění zkontrolovat poštu"
- #: ../src/pref-manager.c:2831
+ #: ../src/pref-manager.c:2733
msgid "Remember open mailboxes between sessions"
-msgstr "Pamatovat si otevřené poštovní schránky mezi sezeními"
+msgstr "Pamatovat si mezi sezeními otevřené poštovní schránky"
- #: ../src/pref-manager.c:2845
+ #: ../src/pref-manager.c:2747
msgid "Folder scanning"
msgstr "Zkoumání složek"
@@@ -6007,12 -5246,16 +5260,16 @@@ msgstr "Podepsané
msgid "Encrypted matter"
msgstr "Zašifrované"
- #: ../src/print-gtk.c:197
+ #: ../src/print-gtk.c:199
#, c-format
msgid "This is an inline %s signed %s message part:"
-msgstr "Toto je vnitřní část zprávy podepsaná %2$s pomocí %1$s:"
+msgstr "Toto je vnitřní část zprávy %2$s podepsaná pomocí %1$s:"
- #: ../src/print-gtk.c:352
+ #: ../src/print-gtk.c:201
+ msgid "OpenPGP"
+ msgstr "OpenPGP"
+
+ #: ../src/print-gtk.c:354
#, c-format
msgid "Cannot print page %d because the document has only %d page."
msgid_plural "Cannot print page %d because the document has only %d pages."
@@@ -6292,274 -5526,19 +5540,19 @@@ msgstr "_Ukrajinština
msgid "_Generic UTF-8"
msgstr "_Obecné UTF-8"
- #: ../src/sendmsg-window.c:324
- msgid "_Show"
- msgstr "_Zobrazit"
-
- #: ../src/sendmsg-window.c:325
- msgid "_Language"
- msgstr "_Jazyk"
-
- #: ../src/sendmsg-window.c:326
- msgid "_Options"
- msgstr "V_olby"
-
- #: ../src/sendmsg-window.c:336
- msgid "_Include File..."
- msgstr "Vlož_it soubor…"
-
- #: ../src/sendmsg-window.c:337
- msgid "Include a file"
- msgstr "Vložit soubor"
-
- #: ../src/sendmsg-window.c:338
- msgid "_Attach File..."
- msgstr "_Přiložit soubor…"
-
- #: ../src/sendmsg-window.c:339
- msgid "Attach a file"
- msgstr "Přiložit soubor"
-
- #: ../src/sendmsg-window.c:340
- msgid "I_nclude Message(s)"
- msgstr "Vlož_it zprávu (zprávy)"
-
- #: ../src/sendmsg-window.c:341
- msgid "Include selected message(s)"
- msgstr "Vložit zvolenou zprávu (zprávy)"
-
- #
- #: ../src/sendmsg-window.c:342
- msgid "Attach _Message(s)"
- msgstr "Přiložit _zprávu (zprávy)"
-
- #
- #: ../src/sendmsg-window.c:343
- msgid "Attach selected message(s)"
- msgstr "Přiložit vybranou zprávu (zprávy)"
-
- #: ../src/sendmsg-window.c:344
- msgid "_Save"
- msgstr "_Uložit"
-
- #
- #: ../src/sendmsg-window.c:345
- msgid "Save this message"
- msgstr "Uložit tuto zprávu"
-
- #: ../src/sendmsg-window.c:351
- msgid "Print the edited message"
- msgstr "Vytisknout tuto zprávu"
-
- #: ../src/sendmsg-window.c:354
- msgid "_Undo"
- msgstr "_Zpět"
-
- #: ../src/sendmsg-window.c:355
- msgid "Undo most recent change"
- msgstr "Vrátit poslední změnu"
-
- #: ../src/sendmsg-window.c:356
- msgid "_Redo"
- msgstr "Zn_ovu"
-
- #: ../src/sendmsg-window.c:357
- msgid "Redo most recent change"
- msgstr "Zopakovat poslední vrácenou změnu"
-
- #: ../src/sendmsg-window.c:358
- msgid "Cu_t"
- msgstr "Vyjmou_t"
-
- #: ../src/sendmsg-window.c:359
- msgid "Cut the selected text"
- msgstr "Vyjmout vybraný text"
-
- #: ../src/sendmsg-window.c:361
- msgid "Copy to the clipboard"
- msgstr "Kopírovat do schránky"
-
- #: ../src/sendmsg-window.c:362
- msgid "_Paste"
- msgstr "V_ložit"
-
- #: ../src/sendmsg-window.c:363
- msgid "Paste from the clipboard"
- msgstr "Vložit ze schránky"
-
- #: ../src/sendmsg-window.c:366
- msgid "_Wrap Body"
- msgstr "_Zalámat text"
-
- #: ../src/sendmsg-window.c:368
- msgid "_Reflow Selected Text"
- msgstr "_Přeformátovat vybraný text"
-
- #: ../src/sendmsg-window.c:370
- msgid "Insert Si_gnature"
- msgstr "V_ložit podpis"
-
- #: ../src/sendmsg-window.c:372
- msgid "_Quote Message(s)"
- msgstr "_Citovat zprávu (zprávy)"
-
- #: ../src/sendmsg-window.c:375 ../src/sendmsg-window.c:417
- msgid "C_heck Spelling"
- msgstr "_Kontrola pravopisu"
-
- #: ../src/sendmsg-window.c:376 ../src/sendmsg-window.c:418
- msgid "Check the spelling of the message"
- msgstr "Kontrolovat pravopis v této zprávě"
-
- #: ../src/sendmsg-window.c:379
- msgid "Select _Identity..."
- msgstr "Vybrat _identitu…"
-
- #: ../src/sendmsg-window.c:380
- msgid "Select the Identity to use for the message"
- msgstr "Vybrat identitu pro tuto zprávu"
-
- #: ../src/sendmsg-window.c:383
- msgid "_Edit with Gnome-Editor"
- msgstr "Upravit pomocí Gnome-_Editor"
-
- #: ../src/sendmsg-window.c:384
- msgid "Edit the current message with the default Gnome editor"
- msgstr "Upravit tuto zprávu pomocí výchozího editoru prostředí GNOME"
-
- #. All three "Send" and "Queue" actions have the same
- #. * stock_id; the first in this list defines the action tied to the
- #. * toolbar's "Send" button, so "ToolbarSend" must come before
- #. * the others.
- #: ../src/sendmsg-window.c:395 ../src/sendmsg-window.c:397
- msgid "Sen_d"
- msgstr "O_deslat"
-
- #
- #: ../src/sendmsg-window.c:396 ../src/sendmsg-window.c:398
- msgid "Send this message"
- msgstr "Odeslat tuto zprávu"
-
- #: ../src/sendmsg-window.c:400
- msgid "_Queue"
- msgstr "_Zařadit do fronty"
-
- #
- #: ../src/sendmsg-window.c:401 ../src/sendmsg-window.c:407
- msgid "Queue this message in Outbox for sending"
- msgstr "Zařadit tuto zprávu do schránky „Pošta k odeslání“"
-
- #: ../src/sendmsg-window.c:403
- msgid "_Postpone"
- msgstr "_Odložit"
-
- #
- #: ../src/sendmsg-window.c:404
- msgid "Save this message and close"
- msgstr "Uložit tuto zprávu a zavřít"
-
- #: ../src/sendmsg-window.c:406
- msgid "Send _Later"
- msgstr "Odeslat po_zději"
-
- #: ../src/sendmsg-window.c:409
- msgid "Sa_ve and Close"
- msgstr "U_ložit a zavřít"
-
- #: ../src/sendmsg-window.c:421
- msgid "Too_lbar"
- msgstr "Nástrojové _lišty"
-
- #: ../src/sendmsg-window.c:423
- msgid "F_rom"
- msgstr "_Od"
-
- #: ../src/sendmsg-window.c:425
- msgid "Rec_ipients"
- msgstr "Příjemc_i"
-
- #: ../src/sendmsg-window.c:428
- msgid "R_eply To"
- msgstr "Odpovědět _komu"
-
- #: ../src/sendmsg-window.c:431
- msgid "F_cc"
- msgstr "Automati_cká kopie"
-
- #: ../src/sendmsg-window.c:434
- msgid "_Request Disposition Notification"
- msgstr "Požadovat _oznámení o přenesení"
-
- #: ../src/sendmsg-window.c:435
- msgid "Request Message Disposition Notification"
- msgstr "Požadovat oznámení o přenesení zprávy (MDN)"
-
- #: ../src/sendmsg-window.c:438
- msgid "_Request Delivery Status Notification"
- msgstr "Požadovat _oznámení o doručení"
-
- #: ../src/sendmsg-window.c:439
- msgid "Request positive (successful) Delivery Status Notification"
- msgstr "Požadovat oznámení o (úspěšném) doručení zprávy (DSN)"
-
- #: ../src/sendmsg-window.c:441
- msgid "_Format = Flowed"
- msgstr "_Formát = Flowed"
-
- #. Send as message/alternative with text/plain and text/html parts
- #: ../src/sendmsg-window.c:444
- msgid "Send as plain text and _HTML"
- msgstr "Odeslat jako prostý text i _HTML"
-
- #: ../src/sendmsg-window.c:448 ../src/sendmsg-window.c:454
- msgid "_Sign Message"
- msgstr "_Podepsat zprávu"
-
- #: ../src/sendmsg-window.c:449
- msgid "Sign message using GPG"
- msgstr "Podepsat zprávu pomocí GPG"
-
- #: ../src/sendmsg-window.c:450 ../src/sendmsg-window.c:457
- msgid "_Encrypt Message"
- msgstr "_Zašifrovat zprávu"
-
- #: ../src/sendmsg-window.c:451
- msgid "Encrypt message using GPG"
- msgstr "Zašifrovat zprávu pomocí GPG"
-
- #: ../src/sendmsg-window.c:455
- msgid "signs the message using GnuPG"
- msgstr "podepíše zprávu pomocí GnuPG"
-
- #: ../src/sendmsg-window.c:459
- msgid "signs the message using GnuPG for all To: and CC: recipients"
- msgstr "podepíše zprávu pomocí GnuPG pro všechny příjemce Komu: nebo Kopie:"
-
- #: ../src/sendmsg-window.c:469
- msgid "_GnuPG uses MIME mode"
- msgstr "_GnuPG používá režim MIME"
-
- #: ../src/sendmsg-window.c:471
- msgid "_GnuPG uses old OpenPGP mode"
- msgstr "_GnuPG používá starý režim OpenPGP"
-
- #: ../src/sendmsg-window.c:474
- msgid "_S/MIME mode (GpgSM)"
- msgstr "Režim _S/MIME (GpgSM)"
-
- #: ../src/sendmsg-window.c:688
+ #: ../src/sendmsg-window.c:270
msgid "Attachment"
-msgstr "Příloha"
+msgstr "Jako přílohu"
- #: ../src/sendmsg-window.c:688
+ #: ../src/sendmsg-window.c:270
msgid "Inline"
-msgstr "Vloženo"
+msgstr "Jako vložené"
- #: ../src/sendmsg-window.c:688
+ #: ../src/sendmsg-window.c:270
msgid "Reference"
-msgstr "Odkaz"
+msgstr "Jako odkaz"
- #: ../src/sendmsg-window.c:929
+ #: ../src/sendmsg-window.c:518
msgid "(No name)"
msgstr "(beze jména)"
@@@ -6570,9 -5549,9 +5563,9 @@@ msgid "
"Save message to Draftbox?"
msgstr ""
"Zpráva pro „%s“ byla změněna.\n"
-"Uložit zprávu do Rozepsané pošty?"
+"Uložit zprávu do konceptů?"
- #: ../src/sendmsg-window.c:1233
+ #: ../src/sendmsg-window.c:819
msgid "Gnome editor is not defined in your preferred applications."
msgstr "Mezi vašimi preferovanými aplikacemi Gnome není definován editor."
@@@ -6595,11 -5574,11 +5588,11 @@@ msgstr "
"\n"
"Opravdu chcete tento soubor připojit jako odkaz?"
- #: ../src/sendmsg-window.c:1780
+ #: ../src/sendmsg-window.c:1416
msgid "Attach as Reference?"
-msgstr "Připojit jako odkaz?"
+msgstr "Přiložit jako odkaz?"
- #: ../src/sendmsg-window.c:1873
+ #: ../src/sendmsg-window.c:1537
msgid "Choose charset"
msgstr "Vyberte znakovou sadu"
@@@ -6616,11 -5595,11 +5609,11 @@@ msgstr "
"není kódován v US-ASCII ani UTF-8.\n"
"Vyberte prosím znakovou sadu, ve které je soubor kódován."
- #: ../src/sendmsg-window.c:1900
+ #: ../src/sendmsg-window.c:1565
msgid "Attach as MIME type:"
-msgstr "Připojit jako typ MIME:"
+msgstr "Přiložit jako typ MIME:"
- #: ../src/sendmsg-window.c:1969
+ #: ../src/sendmsg-window.c:1626
#, c-format
msgid "Character set for file %s changed from \"%s\" to \"%s\"."
msgstr "Znaková sada pro soubor %s změněna z „%s“ na „%s“."
@@@ -6659,12 -5638,12 +5652,12 @@@ msgstr "Otevřít…
msgid "(URL)"
msgstr "(URL)"
- #: ../src/sendmsg-window.c:2341
+ #: ../src/sendmsg-window.c:1991
msgid "Attach file"
-msgstr "Připojit soubor"
+msgstr "Přiložit soubor"
- #: ../src/sendmsg-window.c:2442 ../src/sendmsg-window.c:2552
- #: ../src/sendmsg-window.c:5033
+ #: ../src/sendmsg-window.c:2104 ../src/sendmsg-window.c:2207
+ #: ../src/sendmsg-window.c:6855
msgid ""
"Attaching message failed.\n"
"Possible reason: not enough temporary space"
@@@ -6681,13 -5660,12 +5674,12 @@@ msgstr "_Od:
msgid "S_ubject:"
msgstr "_Předmět:"
- #. fcc: mailbox folder where the message copy will be written to
- #: ../src/sendmsg-window.c:2959
+ #: ../src/sendmsg-window.c:2592
msgid "F_cc:"
-msgstr "_Automatická kopie:"
+msgstr "Kopie do _složky:"
#. Attachment list
- #: ../src/sendmsg-window.c:2988
+ #: ../src/sendmsg-window.c:2618
msgid "_Attachments:"
msgstr "Příl_ohy:"
@@@ -6782,12 -5760,12 +5774,12 @@@ msgstr "Podpis nenalezen!
msgid "Could not save message."
msgstr "Nelze uložit zprávu."
- #: ../src/sendmsg-window.c:4200
+ #: ../src/sendmsg-window.c:3796
#, c-format
msgid "Could not open draftbox: %s"
-msgstr "Nelze otevřít Rozepsanou poštu: %s"
+msgstr "Nelze otevřít koncepty: %s"
- #: ../src/sendmsg-window.c:4225
+ #: ../src/sendmsg-window.c:3821
msgid "Message saved."
msgstr "Zpráva uložena."
@@@ -6887,10 -5869,10 +5883,10 @@@ msgid "
"The message text will be sent as plain text and as HTML, but only the plain "
"part can be signed.\n"
msgstr ""
-"Text zprávy bude odeslán jako čistý text a jako HTML, ale pouze čistý text "
+"Text zprávy bude odeslán jako prostý text i jako HTML, ale pouze prostý text "
"může být podepsán.\n"
- #: ../src/sendmsg-window.c:6016
+ #: ../src/sendmsg-window.c:5198
msgid ""
"The message contains attachments, which cannot be signed or encrypted.\n"
msgstr ""
@@@ -7166,9 -6127,9 +6141,9 @@@ msgid "
"unread"
msgstr ""
"Následující\n"
-"nečtená"
+"nepřečtená"
- #: ../src/toolbar-factory.c:143
+ #: ../src/toolbar-factory.c:154
msgid ""
"Next\n"
"flagged"
@@@ -7216,19 -6177,19 +6191,19 @@@ msgstr "
"Požadavek\n"
"MDN"
- #: ../src/toolbar-factory.c:150
+ #: ../src/toolbar-factory.c:161
msgid "Send"
-msgstr "Poslat"
+msgstr "Odslat"
- #: ../src/toolbar-factory.c:151
+ #: ../src/toolbar-factory.c:162
msgid "Exchange"
msgstr "Vyměnit"
- #: ../src/toolbar-factory.c:152
+ #: ../src/toolbar-factory.c:163
msgid "Attach"
-msgstr "Připojit"
+msgstr "Přiložit"
- #: ../src/toolbar-factory.c:153
+ #: ../src/toolbar-factory.c:164
msgid "Save"
msgstr "Uložit"
@@@ -7297,17 -6270,17 +6284,17 @@@ msgstr "Upravit
msgid "Queue"
msgstr "Zařadit"
- #: ../src/toolbar-factory.c:388
+ #: ../src/toolbar-factory.c:407
#, c-format
msgid "Unknown toolbar icon \"%s\""
-msgstr "Neznámá ikona lišty nástrojů „%s“"
+msgstr "Neznámá ikona nástrojové lišty „%s“"
#
- #: ../src/toolbar-factory.c:459
+ #: ../src/toolbar-factory.c:484
msgid "Queue this message for sending"
-msgstr "Zařadit tuto zprávu pro odeslání"
+msgstr "Zařadit tuto zprávu do fronty pro odeslání"
- #: ../src/toolbar-factory.c:525
+ #: ../src/toolbar-factory.c:496
msgid "Text Be_low Icons"
msgstr "Text po_d ikonami"
@@@ -7328,57 -6301,65 +6315,65 @@@ msgstr "Jen _text
msgid "Use Desktop _Default (%s)"
msgstr "Po_užít výchozí pro pracovní plochu (%s)"
- #: ../src/toolbar-factory.c:782
+ #: ../src/toolbar-factory.c:784
msgid "_Customize Toolbars..."
-msgstr "_Přizpůsobit lišty nástrojů…"
+msgstr "_Přizpůsobit nástrojové lišty…"
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
msgid "Customize Toolbars"
-msgstr "Přizpůsobit lišty nástrojů"
+msgstr "Přizpůsobit nástrojové lišty"
- #: ../src/toolbar-prefs.c:173
+ #: ../src/toolbar-prefs.c:184
msgid "Compose window"
msgstr "Editační okno"
- #: ../src/toolbar-prefs.c:182
+ #: ../src/toolbar-prefs.c:197
msgid "Toolbar options"
-msgstr "Volby lišty nástrojů"
+msgstr "Volby nástrojové lišty"
- #: ../src/toolbar-prefs.c:191
+ #: ../src/toolbar-prefs.c:206
msgid "_Wrap button labels"
msgstr "_Zalamovat titulky tlačítek"
- #: ../src/toolbar-prefs.c:406
+ #: ../src/toolbar-prefs.c:382
#, c-format
msgid "Error displaying toolbar help: %s\n"
-msgstr "Chyba při zobrazování nápovědy pro lištu nástrojů: %s\n"
+msgstr "Chyba při zobrazování nápovědy pro nástrojovou lištu: %s\n"
#. Preview display
- #: ../src/toolbar-prefs.c:442
+ #: ../src/toolbar-prefs.c:418
msgid "Preview"
msgstr "Náhled"
- #: ../src/toolbar-prefs.c:479
+ #: ../src/toolbar-prefs.c:453
msgid "_Restore toolbar to standard buttons"
-msgstr "_Obnovit lištu nástrojů na standardní tlačítka"
+msgstr "_Obnovit nástrojovou lištu na standardní tlačítka"
#. Style button
- #: ../src/toolbar-prefs.c:483
+ #: ../src/toolbar-prefs.c:457
msgid "Toolbar _style..."
-msgstr "Vzhled lišty ná_strojů…"
+msgstr "Vzhled ná_strojové lišty…"
- #: ../src/toolbar-prefs.c:500
+ #: ../src/toolbar-prefs.c:474
msgid "Available buttons"
msgstr "Dostupná tlačítka"
- #: ../src/toolbar-prefs.c:516
+ #: ../src/toolbar-prefs.c:490
msgid "Current toolbar"
-msgstr "Aktuální lišta nástrojů"
+msgstr "Současná nástrojová lišta"
- #: ../src/toolbar-prefs.c:533
- msgid "Up"
- msgstr "Nahoru"
+ #: ../src/toolbar-prefs.c:511
+ msgid "Move selected item up"
+ msgstr "Posunout vybrané položky výš"
+
+ #: ../src/toolbar-prefs.c:521
+ msgid "Remove selected item from toolbar"
+ msgstr "Odebrat vybrané položky z nástrojové lišty"
+
+ #: ../src/toolbar-prefs.c:529
+ msgid "Add selected item to toolbar"
+ msgstr "Přidat vybrané položky na nástrojovou lištu"
- #: ../src/toolbar-prefs.c:549
- msgid "Down"
- msgstr "Dolů"
+ #: ../src/toolbar-prefs.c:536
+ msgid "Move selected item down"
+ msgstr "Posunout vybrané položky níž"
diff --cc po/da.po
index 13a7d28,e6f60e6..273911b
--- a/po/da.po
+++ b/po/da.po
@@@ -314,10 -280,44 +280,66 @@@ msgstr "Og
msgid "Or"
msgstr "Eller"
+ #: ../libbalsa/filter-file.c:141
+ #, c-format
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "Ugyldige filtre %s for postkasse %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:842
+ msgid "Unable to load message body to match filter"
+ msgstr "Kunne ikke indlæse beskedskrop for matchningsfilter"
+
+ #: ../libbalsa/filter.c:234
+ #, c-format
+ msgid "Invalid filter: %s"
+ msgstr "Ugyldigt filter: %s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Dårligt postkassenavn for filter: %s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Fejl ved kopiering af beskeder: %s"
+
+ #: ../libbalsa/filter.c:296
+ #, c-format
+ msgid "Error when trashing messages: %s"
+ msgstr "Fejl ved udsmidning af beskeder: %s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Fejl ved flytning af beskeder: %s"
+
#: ../libbalsa/gmime-application-pkcs7.c:125
#, c-format
--msgid "Failed to decrypt MIME part: parse error"
--msgstr "Kunne ikke dekryptere MIME-del: fortolkningsfejl"
++msgid "Invalid filters %s for mailbox %s"
++msgstr "Ugyldige filtre %s for postkasse %s"
++
++#. FIXME: this is hack!
++#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:1055
++msgid "To"
++msgstr "Til"
++
++#: ../libbalsa/filter-funcs.c:384 ../src/balsa-index.c:359
++msgid "From"
++msgstr "Fra"
++
++#: ../libbalsa/filter-funcs.c:385 ../src/balsa-index.c:375
++#: ../src/pref-manager.c:418
++msgid "Subject"
++msgstr "Emne"
++
++#: ../libbalsa/filter-funcs.c:386
++msgid "Cc"
++msgstr "Cc"
++
++#: ../libbalsa/filter-funcs.c:387
++msgid "Body"
++msgstr "Krop"
#: ../libbalsa/gmime-multipart-crypt.c:225
msgid "Cannot verify multipart/signed part due to missing subparts."
@@@ -852,101 -842,112 +864,84 @@@ msgstr "%s: Flere nøgler til %s
msgid "%s: insufficient validity for uid %s"
msgstr "%s: Utilstrækkelig gyldighed for uid %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:145
- msgid "User ID"
- msgstr "Bruger-id"
-
- #: ../libbalsa/libbalsa-gpgme-cb.c:145
- msgid "Key ID"
- msgstr "Nøgle-id"
-
- #: ../libbalsa/libbalsa-gpgme-cb.c:145
- msgid "Length"
- msgstr "Længde"
-
- #: ../libbalsa/libbalsa-gpgme-cb.c:145
- msgid "Validity"
- msgstr "Gyldighed"
-
- #. FIXME: create dialog according to the Gnome HIG
- #: ../libbalsa/libbalsa-gpgme-cb.c:160
- msgid "Select key"
- msgstr "Vælg nøgle"
+ #: ../libbalsa/libbalsa-conf.c:143
+ msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+ msgstr "Din Balsakonfiguration er nu gemt i \"~/.balsa/config\"."
- #: ../libbalsa/libbalsa-gpgme-cb.c:176
+ #: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:5198
#, c-format
-msgid "not a regular file"
-msgstr "ikke en almindelig fil"
+msgid "Select the private key for the signer %s"
+msgstr "Vælg den private nøgle for underskriftsindehaveren %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:180
+ #: ../libbalsa/libbalsa-vfs.c:608
#, c-format
-msgid "Cannot launch, missing application"
-msgstr "Kan ikke starte, mangler program"
+msgid "Select the public key for the recipient %s"
+msgstr "Vælg den offentlige nøgle for modtageren %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:303
+ #: ../libbalsa/libbalsa-vfs.c:674
#, c-format
-msgid "Open with %s"
-msgstr "Åbn med %s"
+msgid "Insufficient trust for recipient %s"
+msgstr "Utilstrækkelig med tillid til modtager %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:307
+ #: ../libbalsa/libbalsa-vfs.c:727
#, c-format
-msgid "Open _part with %s"
-msgstr "Åbn _del med %s"
+msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgstr "Gyldigheden på nøglen med bruger-id \"%s\" er \"%s\"."
-#: ../libbalsa/libbalsa.c:382
-msgid "Invalid date"
-msgstr "Ugyldig dato"
+#: ../libbalsa/libbalsa-gpgme-cb.c:318
+msgid "Use this key anyway?"
+msgstr "Brug denne nøgle alligevel?"
- #. FIXME: create dialog according to the Gnome HIG
- #: ../libbalsa/libbalsa-gpgme-cb.c:344
- msgid "Enter Passphrase"
- msgstr "Indtast adgangsfrase"
+ #: ../libbalsa/libbalsa.c:398 ../src/pref-manager.c:1355
+ #: ../src/pref-manager.c:1451
+ msgid "Unknown"
+ msgstr "Ukendt"
-#: ../libbalsa/libbalsa.c:544
+#: ../libbalsa/libbalsa-gpgme-cb.c:371
#, c-format
msgid ""
-"Authenticity of this certificate could not be verified.\n"
-"<b>Reason:</b> %s\n"
-"<b>This certificate belongs to:</b>\n"
-msgstr ""
-"Ægtheden af dette certifikat kunne ikke bekræftes.\n"
-"<b>Årsag:</b> %s\n"
-"<b>Dette certifikat tilhører:</b>\n"
-
-#: ../libbalsa/libbalsa.c:556
-msgid ""
+"%s\n"
+"The passphrase for this key was bad, please try again!\n"
"\n"
-"<b>This certificate was issued by:</b>\n"
+"Key: %s"
msgstr ""
+"%s\n"
+"Adgangsfrasen for denne nøgle var ugyldig, forsøg venligst igen!\n"
"\n"
-"<b>Dette certifikat blev udstedt af:</b>\n"
+"Nøgle: %s"
-#: ../libbalsa/libbalsa.c:567
+#: ../libbalsa/libbalsa-gpgme-cb.c:376
#, c-format
msgid ""
-"<b>This certificate is valid</b>\n"
-"from %s\n"
-"to %s\n"
-"<b>Fingerprint:</b> %s"
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
msgstr ""
-"<b>Dette certifikat er gyldigt</b>\n"
-"fra %s\n"
-"til %s\n"
-"<b>Fingeraftryk:</b> %s"
-
-#: ../libbalsa/libbalsa.c:576
-msgid "SSL/TLS certificate"
-msgstr "SSL/TLS-certifikat"
-
-#: ../libbalsa/libbalsa.c:578
-msgid "_Accept Once"
-msgstr "_Accepter en gang"
-
-#: ../libbalsa/libbalsa.c:579
-msgid "Accept&_Save"
-msgstr "Accepter&_Gem"
-
-#: ../libbalsa/libbalsa.c:580
-msgid "_Reject"
-msgstr "_Afvis"
-
-#: ../libbalsa/libbalsa.c:626
-#, c-format
-msgid "Connection to %s timed out. Abort?"
-msgstr "Forbindelsen til %s er udløbet. Abryd?"
+"%s\n"
+"Indtast venligst adgangsfrasen for den hemmelige nøgle!\n"
+"\n"
+"Nøgle: %s"
-#: ../libbalsa/libbalsa.c:872
+#: ../libbalsa/libbalsa-vfs.c:558 ../src/sendmsg-window.c:5226
#, c-format
-msgid "No image data"
-msgstr "Ingen billeddata"
+msgid "not a regular file"
+msgstr "ikke en almindelig fil"
-#: ../libbalsa/libbalsa.c:916
+#: ../libbalsa/libbalsa-vfs.c:610
#, c-format
-msgid "Invalid input format"
-msgstr "Ugyldigt inddataformat"
+msgid "Cannot launch, missing application"
+msgstr "Kan ikke starte, mangler program"
-#: ../libbalsa/libbalsa.c:920
+#: ../libbalsa/libbalsa-vfs.c:676
#, c-format
-msgid "Internal buffer overrun"
-msgstr "Internt bufferlageroverløb"
+msgid "Open with %s"
+msgstr "Åbn med %s"
-#. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:937
+#: ../libbalsa/libbalsa-vfs.c:729
#, c-format
-msgid "Bad X-Face data"
-msgstr "Ugyldige X-Face data"
+msgid "Open _part with %s"
+msgstr "Åbn _del med %s"
#: ../libbalsa/mailbox.c:522
#, c-format
@@@ -2412,9 -2415,9 +2409,9 @@@ msgstr "Navn
msgid "E-Mail Address"
msgstr "E-post-adresse"
- #. -- table column 1 --
+ #. -- grid column 1 --
#. Entry widget for finding an address
-#: ../src/ab-window.c:281
+#: ../src/ab-window.c:292
msgid "_Search for Name:"
msgstr "_Søg efter navn:"
@@@ -3655,13 -3714,13 +3737,13 @@@ msgstr "Handling
msgid "Revert"
msgstr "Forkast ændringer"
- #: ../src/filter-edit-dialog.c:578
- msgid "A filter run dialog is open. Close it before you can modify filters."
+ #: ../src/filter-edit-dialog.c:561
+ msgid "A filter run dialog is open.Close it before you can modify filters."
msgstr ""
-"Der findes en åben dialog for kørsel af filtre. Luk det før du kan ændre på "
-"filtre."
+"Der findes en åben dialog for kørsel af filtre. Luk den for at kunne ændre "
+"på filtre."
- #: ../src/filter-edit-dialog.c:591
+ #: ../src/filter-edit-dialog.c:574
msgid "Balsa Filters"
msgstr "Balsafiltre"
diff --cc po/de.po
index 272b2e4,2ec7474..a5a59e1
--- a/po/de.po
+++ b/po/de.po
@@@ -272,39 -227,70 +230,79 @@@ msgstr "Beantwortet
msgid "Flagged"
msgstr "Markiert"
- #: ../libbalsa/filter-funcs.c:439
+ #: ../libbalsa/filter-funcs.c:441
msgid "Not "
- msgstr "Nicht"
+ msgstr "Nicht "
- #: ../libbalsa/filter-funcs.c:455
+ #: ../libbalsa/filter-funcs.c:457
msgid "From %Y-%m-%d"
- msgstr "Von %d. %m %Y"
+ msgstr "vom %d. %m %Y"
- #: ../libbalsa/filter-funcs.c:461
+ #: ../libbalsa/filter-funcs.c:463
msgid "To %Y-%m-%d"
- msgstr "Bis %d. %m %Y"
+ msgstr "bis %d. %m %Y"
- #: ../libbalsa/filter-funcs.c:469
+ #: ../libbalsa/filter-funcs.c:471
msgid "And"
- msgstr "Und"
+ msgstr "und"
- #: ../libbalsa/filter-funcs.c:472
+ #: ../libbalsa/filter-funcs.c:474
msgid "Or"
- msgstr "Oder"
+ msgstr "oder"
+
+ #: ../libbalsa/filter-file.c:135
+ #, c-format
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "Ungültige Filter %s für das Postfach %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "Nachrichtenrumpf konnte nicht zum Filtern geladen werden"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ #: ../libbalsa/filter.c:234
#, c-format
- msgid "Failed to decrypt MIME part: parse error"
- msgstr "Der MIME-Teil konnte nicht dekodiert werden: Analysefehler"
+ msgid "Invalid filter: %s"
+ msgstr "Ungültiger Filter: %s"
- # http://de.wikipedia.org/wiki/S/MIME
- #: ../libbalsa/gmime-multipart-crypt.c:223
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Ungültiger Postfachname für den Filter: %s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Fehler beim Kopieren von Nachrichten: %s"
+
+ #: ../libbalsa/filter.c:296
+ #, c-format
+ msgid "Error when trashing messages: %s"
+ msgstr "Fehler beim Löschen von Nachrichten: %s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Fehler beim Verschieben von Nachrichten: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
+ #, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Der MIME-Teil konnte nicht dekodiert werden: Analysefehler"
++msgid "Invalid filters %s for mailbox %s"
++msgstr "Ungültige Filter %s für das Postfach %s"
++
++#. FIXME: this is hack!
++#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
++msgid "To"
++msgstr "An"
++
++#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
++msgid "From"
++msgstr "Von"
+
+ #: ../libbalsa/gmime-multipart-crypt.c:222
msgid "Cannot verify multipart/signed part due to missing subparts."
msgstr ""
- "Wegen fehlender Unterteile konnte der Teil »Multipart/signed« nicht "
- "überprüft werden."
- #: ../libbalsa/gmime-multipart-crypt.c:249
+ #: ../libbalsa/gmime-multipart-crypt.c:248
#, c-format
msgid "unsupported protocol '%s'"
msgstr "Nicht unterstütztes Protokoll »%s«"
@@@ -651,203 -713,24 +725,220 @@@ msgstr "Verbindung mit %s konnte nicht
msgid "Cannot connect to the server: %s"
msgstr "Verbindung mit Server konnte nicht aufgebaut werden: %s"
+#: ../libbalsa/imap-server.c:782
+#, c-format
+msgid "Exceeded the number of connections per server %s"
+msgstr "Die maximale Anzahl an Verbindungen wurden für den Server %s erreicht"
+
+#: ../libbalsa/libbalsa.c:385
+msgid "Invalid date"
+msgstr "Ungültiges Datum"
+
+#: ../libbalsa/libbalsa.c:401 ../src/pref-manager.c:1406
+#: ../src/pref-manager.c:1502
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: ../libbalsa/libbalsa.c:547
+#, c-format
+msgid ""
+"Authenticity of this certificate could not be verified.\n"
+"<b>Reason:</b> %s\n"
+"<b>This certificate belongs to:</b>\n"
+msgstr ""
+"Die Echtheit dieses Zertifikats konnte nicht bestätigt werden.\n"
+"<b>Ursache:</b> %s\n"
+"<b>Dieses Zertifikat gehört zu:</b>\n"
+
+#: ../libbalsa/libbalsa.c:559
+msgid ""
+"\n"
+"<b>This certificate was issued by:</b>\n"
+msgstr ""
+"\n"
+"<b>Dieses Zertifikat wurde ausgegeben von:</b>\n"
+
+#: ../libbalsa/libbalsa.c:570
+#, c-format
+msgid ""
+"<b>This certificate is valid</b>\n"
+"from %s\n"
+"to %s\n"
+"<b>Fingerprint:</b> %s"
+msgstr ""
+"<b>Dieses Zertifikat ist gültig</b>\n"
+"von %s\n"
+"bis %s\n"
+"<b>Fingerabdruck:</b> %s"
+
+#: ../libbalsa/libbalsa.c:579
+msgid "SSL/TLS certificate"
+msgstr "SSL/TLS-Zertifikat"
+
+#: ../libbalsa/libbalsa.c:581
+msgid "_Accept Once"
+msgstr "Einmal _annehmen"
+
+#: ../libbalsa/libbalsa.c:582
+msgid "Accept&_Save"
+msgstr "Annehmen und _Speichern"
+
+#: ../libbalsa/libbalsa.c:583
+msgid "_Reject"
+msgstr "A_blehnen"
+
+#: ../libbalsa/libbalsa.c:629
+#, c-format
+msgid "Connection to %s timed out. Abort?"
+msgstr "Zeitüberschreitung bei Verbindung zu %s. Abbrechen?"
+
+#: ../libbalsa/libbalsa.c:875
+#, c-format
+msgid "No image data"
+msgstr "Keine Bilddaten"
+
+#: ../libbalsa/libbalsa.c:919
+#, c-format
+msgid "Invalid input format"
+msgstr "Ungültiges Eingabeformat"
+
+#: ../libbalsa/libbalsa.c:923
+#, c-format
+msgid "Internal buffer overrun"
+msgstr "Interner Pufferüberlauf"
+
+#. Translators: please do not translate Face.
+#: ../libbalsa/libbalsa.c:940
+#, c-format
+msgid "Bad X-Face data"
+msgstr "Ungültige X-Face-Daten"
+
+#: ../libbalsa/libbalsa-conf.c:141
+msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+msgstr "Ihre Konfiguration von Balsa wurde in »~/.balsa/config« gesichert"
+
+#: ../libbalsa/libbalsa-gpgme.c:243 ../libbalsa/libbalsa-gpgme.c:254
+#: ../libbalsa/libbalsa-gpgme.c:356 ../libbalsa/libbalsa-gpgme.c:479
+#: ../libbalsa/libbalsa-gpgme.c:572
+msgid "could not get data from stream"
+msgstr "Daten konnten nicht aus dem Datenstrom empfangen werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:267 ../libbalsa/rfc3156.c:392
+#: ../libbalsa/rfc3156.c:397 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
+msgid "signature verification failed"
+msgstr "Signatur konnte nicht überprüft werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:364 ../libbalsa/libbalsa-gpgme.c:488
+#: ../libbalsa/libbalsa-gpgme.c:580
+msgid "could not create new data object"
+msgstr "Neues Datenobjekt konnte nicht erzeugt werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:373
+msgid "signing failed"
+msgstr "Signieren fehlgeschlagen"
+
+#: ../libbalsa/libbalsa-gpgme.c:447
+#, c-format
+msgid "combined signing and encryption is defined only for RFC 2440"
+msgstr ""
+"Die Kombination von Signatur und Verschlüsselung ist nur für RFC 2440 "
+"definiert"
+
+#: ../libbalsa/libbalsa-gpgme.c:515
+msgid "signing and encryption failed"
+msgstr "Signieren und Verschlüsseln fehlgeschlagen"
+
+#: ../libbalsa/libbalsa-gpgme.c:517
+msgid "encryption failed"
+msgstr "Verschlüsseln fehlgeschlagen"
+
+#: ../libbalsa/libbalsa-gpgme.c:590 ../libbalsa/rfc3156.c:470
+#: ../libbalsa/rfc3156.c:475
+msgid "decryption failed"
+msgstr "Entschlüsselung fehlgeschlagen"
+
+#: ../libbalsa/libbalsa-gpgme.c:691
+msgid "could not create context"
+msgstr "Kontext konnte nicht erzeugt werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:695
+#, c-format
+msgid "could not set protocol '%s'"
+msgstr "Protokoll »%s« konnte nicht gesetzt werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:734 ../libbalsa/libbalsa-gpgme.c:762
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "Schlüsselliste für »%s« konnte nicht erstellt werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:780
+#, c-format
+msgid ""
+"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr ""
+"%s: Ein Schlüssel für %s ist verfügbar, aber entweder abgelaufen, "
+"deaktiviert, widerrufen oder ungültig"
+
+#: ../libbalsa/libbalsa-gpgme.c:785
+#, c-format
+msgid "%s: could not find a key for %s"
+msgstr "%s: es wurde kein Schlüssel für %s gefunden"
+
+#: ../libbalsa/libbalsa-gpgme.c:792
+#, c-format
+msgid ""
+"%s: a key with id %s is present, but it is expired, disabled, revoked or "
+"invalid"
+msgstr ""
+"%s: Ein Schlüssel mit der Kennung %s ist verfügbar, aber entweder "
+"abgelaufen, deaktiviert, widerrufen oder ungültig"
+
+#: ../libbalsa/libbalsa-gpgme.c:797
+#, c-format
+msgid "%s: could not find a key with id %s"
+msgstr "%s: Schlüssel mit der Kennung %s konnte nicht gefunden werden"
+
+#: ../libbalsa/libbalsa-gpgme.c:814
+#, c-format
+msgid "%s: multiple keys for %s"
+msgstr "%s: es gibt mehrere verschiedene Schlüssel für %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:860
+#, c-format
+msgid "%s: insufficient validity for uid %s"
+msgstr "%s: unzureichende Gültigkeit für Benutzerkennung %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "User ID"
+msgstr "Benutzerkennung"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "Key ID"
+msgstr "Schlüsselkennung"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "Length"
+msgstr "Länge"
+
- #: ../libbalsa/libbalsa-gpgme-cb.c:143
+ #: ../libbalsa/imap-server.c:787
+ #, c-format
+ msgid "Exceeded the number of connections per server %s"
+ msgstr "Die maximale Anzahl an Verbindungen wurden für den Server %s erreicht"
+
+ #: ../libbalsa/libbalsa-gpgme-cb.c:137
+ msgid "User ID"
+ msgstr "Benutzerkennung"
+
+ #: ../libbalsa/libbalsa-gpgme-cb.c:137
+ msgid "Key ID"
+ msgstr "Schlüsselkennung"
+
+ #: ../libbalsa/libbalsa-gpgme-cb.c:137
+ msgid "Length"
+ msgstr "Länge"
+
+ #: ../libbalsa/libbalsa-gpgme-cb.c:137
msgid "Validity"
msgstr "Gültigkeit"
@@@ -932,7 -928,90 +1136,90 @@@ msgstr "Mit %s öffnen
msgid "Open _part with %s"
msgstr "_Teil mit %s öffnen"
- #: ../libbalsa/mailbox.c:520
+ #: ../libbalsa/libbalsa.c:357
+ msgid "Invalid date"
+ msgstr "Ungültiges Datum"
+
+ #: ../libbalsa/libbalsa.c:374 ../src/pref-manager.c:1383
+ #: ../src/pref-manager.c:1479
+ msgid "Unknown"
+ msgstr "Unbekannt"
+
+ #: ../libbalsa/libbalsa.c:514
+ #, c-format
+ msgid ""
+ "Authenticity of this certificate could not be verified.\n"
+ "<b>Reason:</b> %s\n"
+ "<b>This certificate belongs to:</b>\n"
+ msgstr ""
+ "Die Echtheit dieses Zertifikats konnte nicht bestätigt werden.\n"
+ "<b>Ursache:</b> %s\n"
+ "<b>Dieses Zertifikat gehört zu:</b>\n"
+
+ #: ../libbalsa/libbalsa.c:526
+ msgid ""
+ "\n"
+ "<b>This certificate was issued by:</b>\n"
+ msgstr ""
+ "\n"
+ "<b>Dieses Zertifikat wurde ausgegeben von:</b>\n"
+
+ #: ../libbalsa/libbalsa.c:537
+ #, c-format
+ msgid ""
+ "<b>This certificate is valid</b>\n"
+ "from %s\n"
+ "to %s\n"
+ "<b>Fingerprint:</b> %s"
+ msgstr ""
+ "<b>Dieses Zertifikat ist gültig</b>\n"
+ "von %s\n"
+ "bis %s\n"
+ "<b>Fingerabdruck:</b> %s"
+
+ #: ../libbalsa/libbalsa.c:556
+ msgid "SSL/TLS certificate"
+ msgstr "SSL/TLS-Zertifikat"
+
+ #: ../libbalsa/libbalsa.c:560
+ msgid "_Accept Once"
+ msgstr "Einmal _annehmen"
+
+ #: ../libbalsa/libbalsa.c:561
+ msgid "Accept&_Save"
+ msgstr "Annehmen und _Speichern"
+
+ #: ../libbalsa/libbalsa.c:562
+ msgid "_Reject"
+ msgstr "A_blehnen"
+
+ #: ../libbalsa/libbalsa.c:609
+ #, c-format
+ msgid "Connection to %s timed out. Abort?"
+ msgstr "Zeitüberschreitung bei Verbindung zu %s. Abbrechen?"
+
+ #: ../libbalsa/libbalsa.c:766
+ #, c-format
+ msgid "No image data"
+ msgstr "Keine Bilddaten"
+
+ #: ../libbalsa/libbalsa.c:800
+ #, c-format
+ msgid "Invalid input format"
+ msgstr "Ungültiges Eingabeformat"
+
+ #: ../libbalsa/libbalsa.c:804
+ #, c-format
-msgid "Internal buffer overrun"
-msgstr "Interner Pufferüberlauf"
++msgid "Open with %s"
++msgstr "Mit %s öffnen"
+
+ #. Translators: please do not translate Face.
+ #: ../libbalsa/libbalsa.c:821
+ #, c-format
-msgid "Bad X-Face data"
-msgstr "Ungültige X-Face-Daten"
++msgid "Open _part with %s"
++msgstr "_Teil mit %s öffnen"
+
+ #: ../libbalsa/mailbox.c:506
#, c-format
msgid "Cannot load mailbox %s"
msgstr "Postfach %s konnte nicht geöffnet werden"
@@@ -1001,11 -1080,11 +1288,11 @@@ msgstr "Finden von Nachrichtenduplikate
msgid "IMAP connection has been severed. Reconnecting..."
msgstr "Die IMAP-Verbindung wurde getrennt. Wiederherstellen …"
- #: ../libbalsa/mailbox_imap.c:620
+ #: ../libbalsa/mailbox_imap.c:618
msgid "IMAP protocol error. Try enabling bug workarounds."
-msgstr "IMAP-Protokollfehler. Versuchen Sie, Bug-Workarounds zu aktivieren."
+msgstr "IMAP-Protokollfehler. Versuchen Sie, Fehlerumgehungen zu aktivieren."
- #: ../libbalsa/mailbox_imap.c:623
+ #: ../libbalsa/mailbox_imap.c:621
#, c-format
msgid "IMAP server has shut the connection: %s Reconnecting..."
msgstr "Der IMAP-Server hat die Verbindung geschlossen: %s wiederherstellen …"
@@@ -1174,12 -1253,12 +1461,12 @@@ msgstr "Postfach %s scheint kein Mbox-P
msgid "Could not write file %s: %s"
msgstr "Datei %s konnte nicht geschrieben werden: %s"
- #: ../libbalsa/mailbox_mbox.c:439
+ #: ../libbalsa/mailbox_mbox.c:431
#, c-format
msgid "Failed to create temporary file \"%s\": %s"
-msgstr "Temporärdatei »%s« konnte nicht angelegt werden: %s"
+msgstr "Temporäre Datei »%s« konnte nicht angelegt werden: %s"
- #: ../libbalsa/mailbox_mbox.c:451
+ #: ../libbalsa/mailbox_mbox.c:443
#, c-format
msgid "Failed to save cache file \"%s\": %s. New version saved as \"%s\""
msgstr ""
@@@ -2125,11 -2153,11 +2361,11 @@@ msgstr "_Verschickt:
msgid "_Draftbox:"
msgstr "E_ntwürfe:"
- #: ../libinit_balsa/assistant_page_directory.c:59
+ #: ../libinit_balsa/assistant_page_directory.c:51
msgid "_Trash:"
-msgstr "_Müll:"
+msgstr "_Papierkorb:"
- #: ../libinit_balsa/assistant_page_directory.c:93
+ #: ../libinit_balsa/assistant_page_directory.c:85
#, c-format
msgid ""
"The pathname \"%s\" must be specified canonically -- it must start with a "
@@@ -2141,29 -2174,37 +2382,37 @@@ msgstr "Postfach im Pfad »%s« konnte
msgid "The mailbox \"%s\" does not appear to be valid."
msgstr "Das Postfach »%s« scheint ungültig zu sein."
- #: ../libinit_balsa/assistant_page_directory.c:202
+ #: ../libinit_balsa/assistant_page_directory.c:191
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "Problem Creating Mailboxes\n"
+ #| "%s"
msgid ""
- "Please verify the locations of your default mail files.\n"
- "These will be created if necessary."
+ "Problem verifying path \"%s\":\n"
+ "%s"
msgstr ""
- "Bitte überprüfen Sie die Orte Ihrer Standard-Maildateien.\n"
- "Diese werden angelegt, falls nötig."
+ "Problem beim Erstellen der Postfächer\n"
+ "%s"
- #: ../libinit_balsa/assistant_page_directory.c:264
- msgid "Mail Files"
- msgstr "Maildateien"
+ #: ../libinit_balsa/assistant_page_directory.c:224
+ #, fuzzy
+ #| msgid "Other options"
+ msgid "_Verify locations"
+ msgstr "Weitere Einstellungen"
- #: ../libinit_balsa/assistant_page_directory.c:360
- #: ../libinit_balsa/assistant_page_directory.c:394
- #, c-format
+ #: ../libinit_balsa/assistant_page_directory.c:258
msgid ""
- "Problem Creating Mailboxes\n"
- "%s"
+ "Please verify the locations of your default mail files. These will be "
+ "created if necessary."
msgstr ""
- "Problem beim Erstellen der Postfächer\n"
- "%s"
+ "Bitte überprüfen Sie die Orte Ihrer Standard-Maildateien. Diese werden "
+ "angelegt, falls nötig."
+
+ #: ../libinit_balsa/assistant_page_directory.c:322
+ msgid "Mail Files"
+ msgstr "Maildateien"
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
msgid ""
"You've successfully set up Balsa. Have fun!\n"
" -- The Balsa development team"
@@@ -2175,11 -2216,11 +2424,11 @@@ msgstr "
msgid "All Done!"
msgstr "Fertig!"
-#: ../libinit_balsa/assistant_page_user.c:57
+#: ../libinit_balsa/assistant_page_user.c:55
msgid ""
"The following settings are also needed (and you can find them later, if need "
- "be, in the Email application in the 'Preferences' and 'Identities' commands "
- "on the 'Tools' menu)"
+ "be, in the Email application in the 'Preferences' and 'Identities' menu "
+ "items)"
msgstr ""
"Die folgenden Einstellungen sind ebenfalls erforderlich. Sie finden diese "
"falls notwendig später in Balsa im Menü »Werkzeuge« unter »Einstellungen« "
@@@ -2583,14 -2573,12 +2781,12 @@@ msgstr "Datum
msgid "Size"
msgstr "Größe"
- #: ../src/balsa-index.c:1724
+ #: ../src/balsa-index.c:1655
#, c-format
msgid "Move to Trash failed: %s"
-msgstr "Verschieben in den Müll ist fehlgeschlagen: %s"
+msgstr "Verschieben in den Papierkorb ist fehlgeschlagen: %s"
- #. Message menu items
- #: ../src/balsa-index.c:1882 ../src/main-window.c:535
- #: ../src/message-window.c:266
+ #: ../src/balsa-index.c:1813
msgid "_Reply..."
msgstr "_Antworten …"
@@@ -2622,11 -2616,11 +2824,11 @@@ msgstr "_Löschen
msgid "_Undelete"
msgstr "_Wiederherstellen"
- #: ../src/balsa-index.c:1919
+ #: ../src/balsa-index.c:1847
msgid "Move To _Trash"
-msgstr "In den _Müll verschieben"
+msgstr "In den _Papierkorb verschieben"
- #: ../src/balsa-index.c:1923
+ #: ../src/balsa-index.c:1851
msgid "T_oggle"
msgstr "_Markieren"
@@@ -3700,14 -3738,14 +3946,14 @@@ msgid "
"There are opened filter run dialogs, close them before you can modify "
"filters."
msgstr ""
-"Es gibt offene Filterstart-Dialoge, schließen Sie diese bevor sie Filter "
+"Es gibt offene Filterstart-Dialoge, schließen Sie diese, bevor Sie Filter "
"ändern können."
- #: ../src/filter-export-dialog.c:75
- msgid "Balsa Filters Export"
- msgstr "Balsa Filter-Export"
+ #: ../src/filter-export-dialog.c:77
+ msgid "Export Filters"
+ msgstr "Filter exportieren"
- #: ../src/filter-run-callbacks.c:182
+ #: ../src/filter-run-callbacks.c:186
#, c-format
msgid "Error displaying run filters help: %s\n"
msgstr "Fehler beim Anzeigen der Filterhilfe: %s\n"
@@@ -3780,10 -3826,10 +4034,10 @@@ msgid "
"The filters dialog is opened, close it before you can run filters on any "
"mailbox"
msgstr ""
-"Der Filter-Dialog ist geöffnet. Schließen Sie ihn, um Filter auf eine "
-"beliebige Mailbox anwenden zu können"
+"Der Filter-Dialog ist geöffnet. Schließen Sie ihn, um Filter auf ein "
+"beliebiges Postfach anwenden zu können"
- #: ../src/folder-conf.c:108
+ #: ../src/folder-conf.c:112
#, c-format
msgid "Error displaying config help: %s\n"
msgstr "Fehler beim Anzeigen der Einstellungshilfe: %s\n"
@@@ -4197,11 -4237,11 +4445,11 @@@ msgstr "Pass_wort:
msgid "_Delete messages from server after download"
msgstr "Nachrichten nach dem Herunterladen vom Server _löschen"
- #: ../src/mailbox-conf.c:1259
+ #: ../src/mailbox-conf.c:1215
msgid "_Enable check for new mail"
-msgstr "Dieses Postfach auf neue Mail über_prüfen"
+msgstr "Dieses Postfach auf neue Nachrichten über_prüfen"
- #: ../src/mailbox-conf.c:1264
+ #: ../src/mailbox-conf.c:1220
msgid "_Filter messages through procmail"
msgstr "Nachrichten durch procmail _filtern"
@@@ -4242,11 -4282,11 +4490,11 @@@ msgstr "
msgid "Show _Recipient column instead of Sender"
msgstr "Spalte »Empfänge_r« anstelle von »Absender« anzeigen"
- #: ../src/mailbox-conf.c:1558
+ #: ../src/mailbox-conf.c:1486
msgid "_Subscribe for new mail check"
-msgstr "_Automatisch nach neuen E-Mails sehen"
+msgstr "_Automatisch nach neuen Nachrichten sehen"
- #: ../src/mailbox-node.c:314
+ #: ../src/mailbox-node.c:319
msgid "The folder edition to be written."
msgstr "Die zu schreibende Ordnerausgabe."
@@@ -4322,19 -4358,19 +4566,19 @@@ msgstr "Als _Eingang verwenden
msgid "_Mark as Sentbox"
msgstr "Als _Verschickt verwenden"
- #: ../src/mailbox-node.c:1118
+ #: ../src/mailbox-node.c:1139
msgid "Mark as _Trash"
-msgstr "Als _Müll verwenden"
+msgstr "Als _Papierkorb verwenden"
- #: ../src/mailbox-node.c:1120
+ #: ../src/mailbox-node.c:1141
msgid "Mark as D_raftbox"
msgstr "Als _Entwürfe verwenden"
- #: ../src/mailbox-node.c:1123
+ #: ../src/mailbox-node.c:1144
msgid "_Empty trash"
-msgstr "Müll _leeren"
+msgstr "Papierkorb _leeren"
- #: ../src/mailbox-node.c:1128
+ #: ../src/mailbox-node.c:1149
msgid "_Edit/Apply filters"
msgstr "Filter _bearbeiten/anwenden"
diff --cc po/es.po
index 4c466ad,18bb898..331cd78
--- a/po/es.po
+++ b/po/es.po
@@@ -171,42 -201,10 +201,42 @@@ msgstr "_Correo electrónico:
msgid "A_dd"
msgstr "A_ñadir"
+# src/balsa-message.c:573 src/filter-edit-dialog.c:325 src/print.c:341
+# src/sendmsg-window.c:837
+# src/balsa-message.c:637 src/filter-edit-dialog.c:306 src/print.c:353
+# src/sendmsg-window.c:870
+#: ../libbalsa/address-view.c:127 ../src/balsa-mime-widget-message.c:747
+#: ../src/balsa-print-object-header.c:168 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3864 ../src/store-address.c:339
+msgid "To:"
+msgstr "Para:"
+
+# src/balsa-message.c:574
+# src/balsa-message.c:638
+#: ../libbalsa/address-view.c:128 ../src/balsa-mime-widget-message.c:748
+#: ../src/balsa-print-object-header.c:170 ../src/sendmsg-window.c:1121
+#: ../src/sendmsg-window.c:3872 ../src/store-address.c:340
+msgid "Cc:"
+msgstr "Cc:"
+
+# src/balsa-message.c:575
+# src/balsa-message.c:639
+#: ../libbalsa/address-view.c:129 ../src/balsa-mime-widget-message.c:749
+#: ../src/balsa-print-object-header.c:172 ../src/sendmsg-window.c:1121
+#: ../src/store-address.c:341
+msgid "Bcc:"
+msgstr "Cco:"
+
+# src/sendmsg-window.c:885
+# src/sendmsg-window.c:928
+#: ../libbalsa/address-view.c:131
+msgid "Reply To:"
+msgstr "Responder a:"
+
# src/balsa-index.c:304 src/filter-edit-dialog.c:349
# src/balsa-index.c:297 src/filter-edit-dialog.c:326
- #: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1760
- #: ../libbalsa/message.c:843
+ #: ../libbalsa/body.c:123 ../libbalsa/mailbox_local.c:1841
+ #: ../libbalsa/message.c:845
msgid "(No subject)"
msgstr "(Sin asunto)"
@@@ -361,42 -319,92 +351,124 @@@ msgstr "Marcado
# src/pref-manager.c:237 src/pref-manager.c:949 src/pref-manager.c:1027
# src/pref-manager.c:1838
- #: ../libbalsa/filter-funcs.c:439
+ #: ../libbalsa/filter-funcs.c:441
+ #, fuzzy
+ #| msgid "Not found"
msgid "Not "
- msgstr "No"
+ msgstr "No se encontró"
- #: ../libbalsa/filter-funcs.c:455
+ #: ../libbalsa/filter-funcs.c:457
msgid "From %Y-%m-%d"
- msgstr "Desde %Y-%m-%d"
+ msgstr ""
- #: ../libbalsa/filter-funcs.c:461
+ #: ../libbalsa/filter-funcs.c:463
msgid "To %Y-%m-%d"
- msgstr "Hasta %Y-%m-%d"
+ msgstr ""
- #: ../libbalsa/filter-funcs.c:469
+ #: ../libbalsa/filter-funcs.c:471
+ #, fuzzy
+ #| msgid "End"
msgid "And"
- msgstr "Y"
+ msgstr "Final"
- #: ../libbalsa/filter-funcs.c:472
+ #: ../libbalsa/filter-funcs.c:474
msgid "Or"
- msgstr "O"
+ msgstr ""
+
+ #: ../libbalsa/filter-file.c:135
+ #, c-format
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "Filtros inválidos %s para el buzón %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "No se pudo cargar el cuerpo del mensaje que coincida con el filtro"
+
+ # src/main-window.c:259
+ # src/main-window.c:262
+ #: ../libbalsa/filter.c:234
+ #, c-format
+ msgid "Invalid filter: %s"
+ msgstr "Filtro no válido %s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Nombre de buzón erróneo para el filtro %s"
+
+ # src/pref-manager.c:1491
+ # src/pref-manager.c:1644
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Ha ocurrido un error durante la copia de mensajes: %s"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ # src/message-window.c:120
+ # src/message-window.c:114
+ #: ../libbalsa/filter.c:296
#, c-format
- msgid "Failed to decrypt MIME part: parse error"
- msgstr "Fallo al descifrar la parte MIME: error de parseo"
+ msgid "Error when trashing messages: %s"
+ msgstr "Ha ocurrido un error durante la eliminación de los mensajes: %s"
+
+ # src/pref-manager.c:1491
+ # src/pref-manager.c:1644
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Ha ocurrido un error durante el movimiento de mensajes: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
+ #, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Fallo al descifrar la parte MIME: error de parseo"
++msgid "Invalid filters %s for mailbox %s"
++msgstr "Filtros no válidos %s para el buzón %s"
++
++# src/balsa-index.c:428
++# src/balsa-index.c:417
++#. FIXME: this is hack!
++#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
++msgid "To"
++msgstr "Para"
++
++# src/balsa-index.c:303
++# src/balsa-index.c:296
++#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
++msgid "From"
++msgstr "De"
++
++# src/balsa-index.c:304 src/filter-edit-dialog.c:349
++# src/balsa-index.c:297 src/filter-edit-dialog.c:326
++#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:373
++#: ../src/pref-manager.c:416
++msgid "Subject"
++msgstr "Asunto"
+
- #: ../libbalsa/gmime-multipart-crypt.c:223
++# src/balsa-message.c:574
++# src/balsa-message.c:638
++#: ../libbalsa/filter-funcs.c:384
++msgid "Cc"
++msgstr "Cc"
++
++# src/filter-edit-dialog.c:313
++# src/filter-edit-dialog.c:296
++#: ../libbalsa/filter-funcs.c:385
++msgid "Body"
++msgstr "Cuerpo"
+
+ #: ../libbalsa/gmime-multipart-crypt.c:222
msgid "Cannot verify multipart/signed part due to missing subparts."
msgstr ""
- "No se puede verificar la parte multiparte/firmada ya que faltan subpartes."
- #: ../libbalsa/gmime-multipart-crypt.c:249
- #, c-format
+ #: ../libbalsa/gmime-multipart-crypt.c:248
+ #, fuzzy, c-format
+ #| msgid ""
+ #| "\n"
+ #| "Disable support for protocol %s."
msgid "unsupported protocol '%s'"
- msgstr "protocolo «%s» no soportado."
+ msgstr ""
+ "\n"
+ "Desactivar soporte para el protocolo %s."
- #: ../libbalsa/gmime-multipart-crypt.c:262
+ #: ../libbalsa/gmime-multipart-crypt.c:261
msgid ""
"Cannot verify multipart/signed part: signature content-type does not match "
"protocol."
@@@ -794,9 -895,18 +959,18 @@@ msgstr "
msgid "Balsa passwords"
msgstr "Contraseñas de Balsa"
+ # src/sendmsg-window.c:1694
+ # src/sendmsg-window.c:1749
+ #: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:373
+ #: ../libbalsa/server.c:450
+ #, fuzzy, c-format
+ #| msgid "Error showing %s: %s\n"
+ msgid "Error storing password for %s@%s: %s\n"
+ msgstr "Error al mostrar %s:%s\n"
+
# libmutt/imap/imap_ssl.c:229
# libmutt/imap/imap_ssl.c:229
-#: ../libbalsa/imap-server.c:628
+#: ../libbalsa/imap-server.c:624
#, c-format
msgid "Cannot connect to %s"
msgstr "No se puede conectar con %s"
@@@ -1018,116 -1132,137 +1196,145 @@@ msgstr "%s: claves múltiples para %s
msgid "%s: insufficient validity for uid %s"
msgstr "%s: validez insuficiente para el uid %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:143
- msgid "User ID"
- msgstr "ID del usuario"
-
- #: ../libbalsa/libbalsa-gpgme-cb.c:143
- msgid "Key ID"
- msgstr "ID de clave"
-
- #: ../libbalsa/libbalsa-gpgme-cb.c:143
- msgid "Length"
- msgstr "Longitud"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../libbalsa/libbalsa-gpgme-cb.c:143
- msgid "Validity"
- msgstr "Validez"
+ # src/balsa-message.c:301
+ # src/balsa-message.c:331
+ #: ../libbalsa/libbalsa-gpgme.c:896 ../libbalsa/libbalsa-gpgme.c:910
+ #, fuzzy, c-format
+ #| msgid "could not list keys for \"%s\""
+ msgid "could not list keys"
+ msgstr "no se pudo listar las claves para «%s»"
- # src/sendmsg-window.c:191
- # src/sendmsg-window.c:196
- #. FIXME: create dialog according to the Gnome HIG
- #: ../libbalsa/libbalsa-gpgme-cb.c:158
- msgid "Select key"
- msgstr "Seleccione clave"
+ #: ../libbalsa/libbalsa-conf.c:143
+ msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+ msgstr "Su configuración de Balsa ahora se guarda en «~/.balsa/config»."
- # src/sendmsg-window.c:166
- # src/sendmsg-window.c:172
- #: ../libbalsa/libbalsa-gpgme-cb.c:174
+ # libmutt/mx.c:459 libmutt/mx.c:605
+ # libmutt/mx.c:459 libmutt/mx.c:605
+ #: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:4468
#, c-format
- msgid "Select the private key for the signer %s"
- msgstr "Seleccione la clave privada para el firmante %s"
+ msgid "not a regular file"
+ msgstr "no es un archivo regular"
- # src/balsa-message.c:1316
- # src/balsa-message.c:1474
- #: ../libbalsa/libbalsa-gpgme-cb.c:178
+ #: ../libbalsa/libbalsa-vfs.c:608
#, c-format
- msgid "Select the public key for the recipient %s"
- msgstr "Seleccione la clave pública para el destinatario %s"
+ msgid "Cannot launch, missing application"
+ msgstr "No se puede lanzar, falta la aplicación"
- #: ../libbalsa/libbalsa-gpgme-cb.c:301
+ # src/balsa-message.c:701
+ # src/balsa-message.c:812
+ #: ../libbalsa/libbalsa-vfs.c:674
#, c-format
- msgid "Insufficient trust for recipient %s"
- msgstr "No hay suficiente confianza en el destinatario %s"
+ msgid "Open with %s"
+ msgstr "Abrir con %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:305
+ # ¿con "part" se refiere a MIME part?
+ # src/balsa-message.c:701
+ # src/balsa-message.c:812
+ #: ../libbalsa/libbalsa-vfs.c:727
#, c-format
- msgid "The validity of the key with user ID \"%s\" is \"%s\"."
- msgstr "La validez de la clave con ID de usuario «%s» es «%s»."
+ msgid "Open _part with %s"
+ msgstr "Ver par_te con %s"
- #: ../libbalsa/libbalsa-gpgme-cb.c:316
- msgid "Use this key anyway?"
- msgstr "¿Desea usar esta clave de todos modos?"
+ # libmutt/imap/imap_ssl.c:297
+ # libmutt/imap/imap_ssl.c:297
+ #: ../libbalsa/libbalsa.c:357
+ msgid "Invalid date"
-msgstr "Fecha inválida"
++msgstr "Fecha no válida"
- #. FIXME: create dialog according to the Gnome HIG
- #: ../libbalsa/libbalsa-gpgme-cb.c:342
- msgid "Enter Passphrase"
- msgstr "Introduzca la frase de paso"
+ # libmutt/imap/imap_ssl.c:254
+ # libmutt/imap/imap_ssl.c:254
+ #: ../libbalsa/libbalsa.c:374 ../src/pref-manager.c:1383
+ #: ../src/pref-manager.c:1479
+ msgid "Unknown"
+ msgstr "Desconocido"
- #: ../libbalsa/libbalsa-gpgme-cb.c:369
+ #: ../libbalsa/libbalsa.c:514
#, c-format
msgid ""
- "%s\n"
- "The passphrase for this key was bad, please try again!\n"
+ "Authenticity of this certificate could not be verified.\n"
+ "<b>Reason:</b> %s\n"
+ "<b>This certificate belongs to:</b>\n"
+ msgstr ""
+ "La autenticidad de este certificado no pudo ser verificada.\n"
+ "<b>Razón:</b> %s\n"
+ "<b>Este certificado pertenece a:</b>\n"
+
+ # libmutt/imap/imap_ssl.c:462
+ # libmutt/imap/imap_ssl.c:462
+ #: ../libbalsa/libbalsa.c:526
+ msgid ""
"\n"
- "Key: %s"
+ "<b>This certificate was issued by:</b>\n"
msgstr ""
- "%s\n"
- "La frase de paso de esta clave era incorrecta. Inténtelo de nuevo.\n"
"\n"
- "Clave: %s"
+ "<b>Este certificado fue emitido por: </b>\n"
- #: ../libbalsa/libbalsa-gpgme-cb.c:374
+ #: ../libbalsa/libbalsa.c:537
+ #, c-format
+ msgid ""
+ "<b>This certificate is valid</b>\n"
+ "from %s\n"
+ "to %s\n"
+ "<b>Fingerprint:</b> %s"
+ msgstr ""
+ "<b>Este certificado es válido</b>\n"
+ "de %s\n"
+ "a %s\n"
+ "<b>Huella</b> %s"
+
+ #: ../libbalsa/libbalsa.c:556
+ msgid "SSL/TLS certificate"
+ msgstr "Certificado SSL/TLS"
+
+ #: ../libbalsa/libbalsa.c:560
+ msgid "_Accept Once"
+ msgstr "_Aceptar una vez"
+
+ #: ../libbalsa/libbalsa.c:561
+ msgid "Accept&_Save"
+ msgstr "Acepta_r y guardar"
+
+ # src/sendmsg-window.c:224
+ # src/sendmsg-window.c:228
+ #: ../libbalsa/libbalsa.c:562
+ msgid "_Reject"
+ msgstr "_Rechazar"
+
+ #: ../libbalsa/libbalsa.c:609
#, c-format
-msgid "Connection to %s timed out. Abort?"
-msgstr "Se agotó el tiempo de conexión para %s. ¿Abortar?"
+msgid ""
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"%s\n"
+"Introduzca la frase de paso para la clave secreta:\n"
+"\n"
+"Clave: %s"
- # libmutt/mx.c:459 libmutt/mx.c:605
- # libmutt/mx.c:459 libmutt/mx.c:605
- #: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:5239
+ #: ../libbalsa/libbalsa.c:766
#, c-format
-msgid "No image data"
-msgstr "Sin datos de imagen"
+msgid "not a regular file"
+msgstr "no es un archivo regular"
- #: ../libbalsa/libbalsa-vfs.c:608
+ # libmutt/imap/imap_ssl.c:297
+ # libmutt/imap/imap_ssl.c:297
+ #: ../libbalsa/libbalsa.c:800
#, c-format
-msgid "Invalid input format"
-msgstr "Formato de entrada inválido"
+msgid "Cannot launch, missing application"
+msgstr "No se puede lanzar, falta la aplicación"
- # src/balsa-message.c:701
- # src/balsa-message.c:812
- #: ../libbalsa/libbalsa-vfs.c:674
+ #: ../libbalsa/libbalsa.c:804
#, c-format
-msgid "Internal buffer overrun"
-msgstr "Sobrepasado el búfer interno"
+msgid "Open with %s"
+msgstr "Abrir con %s"
- # ¿con "part" se refiere a MIME part?
- # src/balsa-message.c:701
- # src/balsa-message.c:812
- #: ../libbalsa/libbalsa-vfs.c:727
+ #. Translators: please do not translate Face.
+ #: ../libbalsa/libbalsa.c:821
#, c-format
-msgid "Bad X-Face data"
-msgstr "Datos X-Face erróneos"
+msgid "Open _part with %s"
+msgstr "Ver par_te con %s"
# libbalsa/mailbox.c:262
# libbalsa/mailbox.c:275
@@@ -1242,12 -1377,12 +1449,12 @@@ msgstr "El comando IMAP asíncrono %s n
msgid "%s: Opening %s Refcount: %d\n"
msgstr "%s: Abriendo %s Conteo de ref: %d\n"
- #: ../libbalsa/mailbox_imap.c:1213
+ #: ../libbalsa/mailbox_imap.c:1211
#, c-format
msgid "Downloading %ld kB"
-msgstr "Descargando %ld KiB"
+msgstr "Descargando %ld KB"
- #: ../libbalsa/mailbox_imap.c:1612
+ #: ../libbalsa/mailbox_imap.c:1610
#, c-format
msgid ""
"IMAP SEARCH command failed for mailbox %s\n"
@@@ -1271,10 -1406,10 +1478,10 @@@ msgstr "No se encontró el manejador d
msgid "Error fetching message from IMAP server: %s"
msgstr "Error al bajar un mensaje del servidor IMAP: %s"
- #: ../libbalsa/mailbox_imap.c:2479
+ #: ../libbalsa/mailbox_imap.c:2477
#, c-format
msgid "Downloading %u kB"
-msgstr "Descargando %u KiB"
+msgstr "Descargando %u KB"
# src/balsa-message.c:1316
# src/balsa-message.c:1474
@@@ -1536,10 -1671,10 +1743,10 @@@ msgstr "Ha fallado al guardar el mensaj
msgid "Retrieving Message %d of %d"
msgstr "Descargando mensaje %d de %d"
- #: ../libbalsa/mailbox_pop3.c:369
+ #: ../libbalsa/mailbox_pop3.c:377
#, c-format
msgid "Received %ld kB of %ld"
-msgstr "Se han recibido %ld KiB de %ld"
+msgstr "Se han recibido %ld KB de %ld"
# libmutt/mx.c:848
# libmutt/mx.c:848
@@@ -1567,12 -1702,12 +1774,12 @@@ msgstr "
msgid "POP3 mailbox %s error: %s\n"
msgstr "Error al acceder al buzón POP3 %s:%s\n"
- #: ../libbalsa/mailbox_pop3.c:538
+ #: ../libbalsa/mailbox_pop3.c:546
#, c-format
msgid "POP3 message %d oversized: %d kB - skipped."
-msgstr "El mensaje POP3 %d sobrepasa el tamaño: %d KiB - se salta."
+msgstr "El mensaje POP3 %d sobrepasa el tamaño: %d KB - se salta."
- #: ../libbalsa/mailbox_pop3.c:550
+ #: ../libbalsa/mailbox_pop3.c:558
#, c-format
msgid "POP3 error: cannot open %s for writing."
msgstr "Error POP3: no se puede abrir %s para escritura."
@@@ -1814,24 -1949,24 +2021,24 @@@ msgstr "
# libmutt/imap/imap_ssl.c:472
# libmutt/imap/imap_ssl.c:472
- #: ../libbalsa/rfc3156.c:668
+ #: ../libbalsa/rfc3156.c:670
msgid "The signature is invalid."
-msgstr "La firma es inválida."
+msgstr "La firma no es válida."
- #: ../libbalsa/rfc3156.c:671
+ #: ../libbalsa/rfc3156.c:673
msgid "The signature could not be verified due to a missing key."
-msgstr "La firma no pudo ser verificada debido a una clave perdida."
+msgstr "La firma no se pudo verificar debido a una clave perdida."
- #: ../libbalsa/rfc3156.c:673
+ #: ../libbalsa/rfc3156.c:675
msgid "This part is not a real PGP signature."
msgstr "Esta parte no es una firma PGP real."
- #: ../libbalsa/rfc3156.c:676
+ #: ../libbalsa/rfc3156.c:678
msgid "The signature could not be verified due to an invalid crypto engine."
msgstr ""
-"La firma no pudo ser verificada debido a un motor criptográfico inválido."
+"La firma no se pudo verificar debido a un motor criptográfico no válido."
- #: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:1042
+ #: ../libbalsa/rfc3156.c:681 ../libbalsa/rfc3156.c:1048
msgid "GnuPG is rebuilding the trust database and is currently unavailable."
msgstr ""
"GnuPG está reconstruyendo la base de datos de confianza y actualmente no "
@@@ -2006,9 -2152,9 +2224,9 @@@ msgstr "desactivada
# libmutt/imap/imap_ssl.c:297
# libmutt/imap/imap_ssl.c:297
- #: ../libbalsa/rfc3156.c:862
+ #: ../libbalsa/rfc3156.c:868
msgid " invalid"
-msgstr "inválida"
+msgstr "no válida"
#. ngettext: string begins with a single space, so no space
#. * after the colon is correct punctuation (in English).
@@@ -2304,86 -2449,13 +2521,13 @@@ msgstr "Frase de paso del _certificado:
msgid "Sp_lit message larger than"
msgstr "_Partir el mensaje si es mayor de"
- #: ../libbalsa/smtp-server.c:623 ../src/pref-manager.c:1916
+ #: ../libbalsa/smtp-server.c:618 ../src/pref-manager.c:1897
msgid "MB"
-msgstr "MiB"
+msgstr "MB"
- # src/main-window.c:259
- # src/main-window.c:262
- #. Top level
- #. Menus
- #: ../libbalsa/source-viewer.c:44 ../src/ab-main.c:551
- #: ../src/main-window.c:344 ../src/message-window.c:237
- #: ../src/sendmsg-window.c:322
- msgid "_File"
- msgstr "_Archivo"
-
- # src/main-window.c:389
- # src/main-window.c:386
- #: ../libbalsa/source-viewer.c:45 ../src/filter-edit-dialog.c:330
- #: ../src/main-window.c:345 ../src/message-window.c:238
- #: ../src/sendmsg-window.c:323
- msgid "_Edit"
- msgstr "_Editar"
-
- # src/main-window.c:191
- # src/main-window.c:196
- #: ../libbalsa/source-viewer.c:46 ../src/main-window.c:346
- #: ../src/message-window.c:239
- msgid "_View"
- msgstr "_Ver"
-
- # src/main-window.c:399
- # src/main-window.c:401
- #. Items
- #: ../libbalsa/source-viewer.c:48 ../src/mailbox-node.c:1094
- #: ../src/main-window.c:519 ../src/message-window.c:246
- #: ../src/sendmsg-window.c:352
- msgid "_Close"
- msgstr "_Cerrar"
-
- #: ../libbalsa/source-viewer.c:49
- msgid "Close the window"
- msgstr "Cerrar la ventana"
-
- # src/filter-edit-dialog.c:313
- # src/filter-edit-dialog.c:296
- #. Edit menu items
- #: ../libbalsa/source-viewer.c:50 ../src/main-window.c:419
- #: ../src/main-window.c:585 ../src/message-window.c:249
- #: ../src/sendmsg-window.c:360
- msgid "_Copy"
- msgstr "_Copiar"
-
- # src/filter-edit-dialog.c:652
- # src/filter-edit-dialog.c:559
- #: ../libbalsa/source-viewer.c:51
- msgid "Copy text"
- msgstr "Copiar el texto"
-
- # src/sendmsg-window.c:191
- # src/sendmsg-window.c:196
- #: ../libbalsa/source-viewer.c:52 ../src/main-window.c:587
- msgid "_Select Text"
- msgstr "_Seleccionar texto"
-
- # src/pref-manager.c:961
- # src/pref-manager.c:1088
- #: ../libbalsa/source-viewer.c:53 ../src/main-window.c:588
- msgid "Select entire mail"
- msgstr "Selecciona el correo completo"
-
- #: ../libbalsa/source-viewer.c:58
- msgid "_Escape Special Characters"
- msgstr "_Caracteres especiales de escape"
-
- #: ../libbalsa/source-viewer.c:59
- msgid "Escape special and non-ASCII characters"
- msgstr "Escapar caracteres especiales y no ASCII"
-
# src/pref-manager.c:1087
# src/pref-manager.c:1218
- #: ../libbalsa/source-viewer.c:157
+ #: ../libbalsa/source-viewer.c:130
msgid "Mailbox closed"
msgstr "Buzón cerrado"
@@@ -2422,18 -2503,18 +2575,18 @@@ msgstr "
# libinit_balsa/helper.c:159 libinit_balsa/helper.c:176
# libinit_balsa/helper.c:159 libinit_balsa/helper.c:176
- #: ../libinit_balsa/assistant_helper.c:238
- #: ../libinit_balsa/assistant_helper.c:261
+ #: ../libinit_balsa/assistant_helper.c:227
+ #: ../libinit_balsa/assistant_helper.c:250
#, c-format
msgid "The file with pathname \"%s\" is not a directory."
-msgstr "El archivo con la ruta «%s» no es un directorio."
+msgstr "El archivo con la ruta «%s» no es una carpeta."
# libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
# libinit_balsa/helper.c:152 libinit_balsa/helper.c:170
- #: ../libinit_balsa/assistant_helper.c:252
+ #: ../libinit_balsa/assistant_helper.c:241
#, c-format
msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
-msgstr "No se ha podido crear un directorio: mkdir() falló en la ruta «%s»."
+msgstr "No se ha podido crear una carpeta: mkdir() falló en la ruta «%s»."
# libinit_balsa/balsa-initdruid.gob:96
# libinit_balsa/balsa-initdruid.gob:97
@@@ -2548,21 -2663,9 +2735,9 @@@ msgstr "
msgid "Mail Files"
msgstr "Archivos de correo"
- # libinit_balsa/balsa-druid-page-directory.gob:267
- # libinit_balsa/balsa-druid-page-directory.gob:267
- #: ../libinit_balsa/assistant_page_directory.c:360
- #: ../libinit_balsa/assistant_page_directory.c:394
- #, c-format
- msgid ""
- "Problem Creating Mailboxes\n"
- "%s"
- msgstr ""
- "Problema al crear los buzones\n"
- "%s"
-
# libinit_balsa/balsa-druid-page-finish.gob:45
# libinit_balsa/balsa-druid-page-finish.gob:45
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
msgid ""
"You've successfully set up Balsa. Have fun!\n"
" -- The Balsa development team"
@@@ -2647,9 -2755,9 +2827,9 @@@ msgstr "_Recordar su contraseña:
# libinit_balsa/balsa-druid-page-user.gob:94
# libinit_balsa/balsa-druid-page-user.gob:94
- #: ../libinit_balsa/assistant_page_user.c:146
+ #: ../libinit_balsa/assistant_page_user.c:147
msgid "_Local mail directory:"
-msgstr "Directorio de correo _local:"
+msgstr "Carpeta de correo _local:"
# libinit_balsa/balsa-druid-page-user.gob:104
# libinit_balsa/balsa-druid-page-user.gob:104
@@@ -3591,48 -3644,9 +3716,48 @@@ msgstr "
msgid "Please close the other instances of this message and try again."
msgstr "Cierre las otras instancias de este mensaje e inténtelo de nuevo."
+# src/balsa-message.c:718
+# src/balsa-message.c:780
+#: ../src/balsa-mime-widget.c:236 ../src/balsa-mime-widget-message.c:172
+#: ../src/balsa-mime-widget-message.c:218
+#, c-format
+msgid "File name: %s"
+msgstr "Nombre del archivo: %s"
+
+# src/message-window.c:120
+# src/message-window.c:114
+#: ../src/balsa-mime-widget.c:255
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "Ha ocurrido un error al leer la parte del mensaje: %s"
+
+#: ../src/balsa-mime-widget.c:279
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "Tipo: %s (%s)"
+
+# src/balsa-message.c:713
+# src/balsa-message.c:775
+#: ../src/balsa-mime-widget.c:283
+#, c-format
+msgid "Content Type: %s"
+msgstr "Tipo de contenido: %s"
+
+# src/balsa-message.c:709
+# src/balsa-message.c:771
+#: ../src/balsa-mime-widget.c:296
+msgid "No open or view action defined for this content type"
+msgstr "No hay definida ninguna acción ver o abrir para este tipo de contenido"
+
+# src/balsa-message.c:725
+# src/balsa-message.c:788
+#: ../src/balsa-mime-widget.c:301
+msgid "S_ave part"
+msgstr "_Guardar parte"
+
# src/balsa-message.c:301
# src/balsa-message.c:331
- #: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1813
+ #: ../src/balsa-mime-widget-callbacks.c:54 ../src/sendmsg-window.c:1449
#, c-format
msgid "Could not launch application: %s"
msgstr "No se pudo lanzar la aplicación: %s"
@@@ -3645,14 -3659,15 +3770,15 @@@ msgid "Save %s MIME Part
msgstr "Guardar parte MIME %s"
# libmutt/mbox.c:1028
- #: ../src/balsa-mime-widget-callbacks.c:121
- #, c-format
+ #: ../src/balsa-mime-widget-callbacks.c:124
+ #, fuzzy, c-format
+ #| msgid "Could not construct uri from %s"
msgid "Could not construct URI from %s"
- msgstr "No se pudo construir la URI desde %s"
+ msgstr "No se pudo construir la forma URI %s"
- #: ../src/balsa-mime-widget-callbacks.c:140
+ #: ../src/balsa-mime-widget-callbacks.c:143
msgid "File already exists. Overwrite?"
-msgstr "El archivo ya existe. ¿Sobreescribir?"
+msgstr "El archivo ya existe. ¿Sobrescribir?"
# src/mailbox-conf.c:485
# src/mailbox-conf.c:490
@@@ -3732,12 -3741,12 +3852,12 @@@ msgstr "Tipo de acceso: %s\n
msgid "FTP site: %s\n"
msgstr "Sitio FTP: %s\n"
- #: ../src/balsa-mime-widget-message.c:217
+ #: ../src/balsa-mime-widget-message.c:223
#, c-format
msgid "Directory: %s\n"
-msgstr "Directorio: %s\n"
+msgstr "Carpeta: %s\n"
- #: ../src/balsa-mime-widget-message.c:264
+ #: ../src/balsa-mime-widget-message.c:270
msgid "Access type: mail-server\n"
msgstr "Tipo de acceso: servidor de correo\n"
@@@ -4385,23 -4540,29 +4651,29 @@@ msgstr "Acción
# src/filter-edit-dialog.c:755
# src/filter-edit-dialog.c:666
- #: ../src/filter-edit-dialog.c:525
- msgid "Revert"
+ #: ../src/filter-edit-dialog.c:505
+ #, fuzzy
+ #| msgid "Revert"
+ msgid "Re_vert"
msgstr "Revertir"
- #: ../src/filter-edit-dialog.c:576
+ #: ../src/filter-edit-dialog.c:556
+ #, fuzzy
+ #| msgid "A filter run dialog is open.Close it before you can modify filters."
msgid "A filter run dialog is open. Close it before you can modify filters."
msgstr ""
-"Un diálogo de ejecución de filtros está abierto. Ciérrelo antes para\n"
-"poder modificar los filtros."
+"Hay un diálogo de ejecución de filtros abierto. Ciérrelo para poder "
+"modificar los filtros."
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #: ../src/filter-edit-dialog.c:589
- msgid "Balsa Filters"
- msgstr "Filtros de Balsa"
+ # src/main-window.c:259
+ # src/main-window.c:262
+ #: ../src/filter-edit-dialog.c:569
+ #, fuzzy
+ #| msgid "_Filters"
+ msgid "Filters"
+ msgstr "_Filtros"
- #: ../src/filter-edit-dialog.c:658
+ #: ../src/filter-edit-dialog.c:637
#, c-format
msgid "Filter \"%s\" has no condition."
msgstr "El filtro «%s» no tiene condiciones."
@@@ -4553,11 -4733,11 +4844,11 @@@ msgstr "Activar caché _persistente
msgid "Use IDLE command"
msgstr "Usar el comando IDLE"
- #: ../src/folder-conf.c:352 ../src/mailbox-conf.c:1403
+ #: ../src/folder-conf.c:357 ../src/mailbox-conf.c:1357
msgid "Enable _bug workarounds"
-msgstr "Activar arreglos de _bugs"
+msgstr "Acti_var las soluciones de errores alternativas"
- #: ../src/folder-conf.c:359
+ #: ../src/folder-conf.c:364
msgid "Use STATUS for mailbox checking"
msgstr "Usar STATUS para la comprobación de buzones"
@@@ -5173,1006 -5338,24 +5449,26 @@@ msgstr "_Editar/Aplicar filtros
# libinit_balsa/balsa-druid-page-directory.gob:101
# libinit_balsa/balsa-druid-page-directory.gob:101
- #: ../src/mailbox-node.c:1216
- #, c-format
- msgid "The path \"%s\" does not lead to a mailbox."
- msgstr "La ruta «%s» aparentemente no lleva a un buzón."
-
- #: ../src/mailbox-node.c:1229
- #, c-format
- msgid "Local mailbox %s loaded as: %s\n"
- msgstr "Buzón local %s cargado como %s\n"
-
- # src/filter-edit-dialog.c:52
- # src/filter-edit-dialog.c:50
- #: ../src/mailbox-node.c:1260
- #, c-format
- msgid "Local folder %s\n"
- msgstr "Carpeta local %s\n"
-
- # src/balsa-message.c:1316
- # src/balsa-message.c:1474
- #: ../src/main.c:210
- #, c-format
- msgid "Could not write to %s: %s"
- msgstr "No se pudo escribir en %s: %s"
-
- #: ../src/main.c:460 ../src/main.c:509
- msgid "Get new mail on startup"
- msgstr "Obtener el correo nuevo al iniciar"
-
- #: ../src/main.c:462 ../src/main.c:511
- msgid "Compose a new email to EMAIL@ADDRESS"
- msgstr "Redactar un correo-e nuevo a CORREO@DIRECCIÓN"
-
- #: ../src/main.c:464
- msgid "Attach file at PATH"
- msgstr "Adjuntar fichero en la ruta"
-
- #: ../src/main.c:466 ../src/main.c:516
- msgid "Opens MAILBOXNAME"
- msgstr "Abre NOMBREBUZÓN"
-
- #: ../src/main.c:466 ../src/main.c:516
- msgid "MAILBOXNAME"
- msgstr "NOMBREBUZÓN"
-
- # libmutt/mx.c:459 libmutt/mx.c:605
- # libmutt/mx.c:459 libmutt/mx.c:605
- #: ../src/main.c:469 ../src/main.c:519
- msgid "Opens first unread mailbox"
- msgstr "Abre el primer buzón no leído"
-
- #: ../src/main.c:472 ../src/main.c:522
- msgid "Opens default Inbox on startup"
- msgstr "Abre la bandeja de entrada predeterminado al inicio"
-
- # libmutt/mx.c:1375
- # libmutt/mx.c:1375
- #: ../src/main.c:475 ../src/main.c:525
- msgid "Prints number unread and unsent messages"
- msgstr "Imprimir el número de mensajes no leídos y no enviados"
-
- #: ../src/main.c:477 ../src/main.c:527
- msgid "Debug POP3 connection"
- msgstr "Depurar la conexión POP3"
-
- #: ../src/main.c:479 ../src/main.c:529
- msgid "Debug IMAP connection"
- msgstr "Depurar la conexión IMAP"
-
- #: ../src/main.c:501
- msgid "The Balsa E-Mail Client"
- msgstr "El cliente de correo-e Balsa"
-
- #: ../src/main.c:513
- msgid "Attach file at URI"
- msgstr "Adjuntar archivo al URI"
-
- #: ../src/main.c:554
+ #: ../src/mailbox-node.c:1236
#, c-format
-msgid "The path \"%s\" does not lead to a mailbox."
-msgstr "La ruta «%s» aparentemente no lleva a un buzón."
+msgid "Run '%s --help' to see a full list of available command line options.\n"
+msgstr ""
+"Ejecute «%s --help» para ver una lista completa de las opciones de línea de "
+"comandos disponibles.\n"
- #: ../src/main.c:601 ../src/main.c:606 ../src/main.c:612 ../src/main.c:618
- #: ../src/main.c:624
+ #: ../src/mailbox-node.c:1249
#, c-format
-msgid "Local mailbox %s loaded as: %s\n"
-msgstr "Buzón local %s cargado como %s\n"
+msgid "Balsa cannot open your \"%s\" mailbox."
+msgstr "Balsa no puede abrir su buzón «%s»."
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main.c:601
- msgid "Inbox"
- msgstr "Bandeja de entrada"
-
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main.c:607
- msgid "Outbox"
- msgstr "Bandeja de salida"
-
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main.c:613
- msgid "Sentbox"
- msgstr "Correo enviado"
-
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main.c:619
- msgid "Draftbox"
- msgstr "Borradores"
-
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main.c:624
- msgid "Trash"
- msgstr "Papelera"
-
- # libmutt/mbox.c:1066
- #: ../src/main.c:843
- msgid "Compressing mail folders..."
- msgstr "Comprimiendo las carpetas de correo…"
-
- #: ../src/main-window.c:322
- msgid "Balsa closes files and connections. Please wait..."
- msgstr "Balsa cierra los archivos y conexiones. Espere…"
-
- # src/balsa-mblist.c:218 src/mailbox-conf.c:950
- # src/balsa-mblist.c:218 src/mailbox-conf.c:1023
- #: ../src/main-window.c:347
- msgid "Mail_box"
- msgstr "_Buzón"
-
- # src/main-window.c:421
- # src/main-window.c:428
- #: ../src/main-window.c:348 ../src/message-window.c:241
- msgid "_Message"
- msgstr "_Mensaje"
-
- # libinit_balsa/balsa-druid-page-user.gob:104
- # libinit_balsa/balsa-druid-page-user.gob:104
- #: ../src/main-window.c:349
- msgid "_Settings"
- msgstr "_Configuración"
-
- # src/balsa-mblist.c:218 src/mailbox-conf.c:950
- # src/balsa-mblist.c:218 src/mailbox-conf.c:1023
- #: ../src/main-window.c:355
- msgid "Mail_boxes"
- msgstr "_Buzones"
-
- #. Less frequently used entries of the 'View' menu
- #. Less frequently used entries of the 'Message' menu
- #. Less frequently used entries of the 'File' menu
- #. Less frequently used entries of the 'Edit' menu
- #. Less frequently used entries of the 'Tools' menu
- #: ../src/main-window.c:357 ../src/main-window.c:362
- #: ../src/sendmsg-window.c:330 ../src/sendmsg-window.c:332
- #: ../src/sendmsg-window.c:334
- msgid "_More"
- msgstr "_Más"
-
- # src/main-window.c:267 src/message-window.c:61
- # src/main-window.c:269
- #: ../src/main-window.c:358
- msgid "_Headers"
- msgstr "_Cabeceras"
-
- # src/pref-manager.c:1087
- # src/pref-manager.c:1218
- #: ../src/main-window.c:359
- msgid "_Sort Mailbox"
- msgstr "_Ordenar buzón"
-
- # libmutt/mx.c:1065
- # libmutt/mx.c:1065
- #: ../src/main-window.c:360
- msgid "H_ide messages"
- msgstr "_Ocultar mensajes"
-
- #: ../src/main-window.c:363 ../src/sendmsg-window.c:328
- msgid "_Tools"
- msgstr "_Herramientas"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:364
- msgid "_Filters"
- msgstr "_Filtros"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:365
- msgid "F_ilters"
- msgstr "F_iltros"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:366 ../src/main-window.c:422
- msgid "Manage filters"
- msgstr "Administrar filtros"
-
- # libmutt/imap/util.c:43
- # libmutt/imap/util.c:43
- #. File menu items
- #. Not in the touchpad menu, but still available as a toolbar
- #. * button:
- #: ../src/main-window.c:371
- msgid "_Continue"
- msgstr "_Continuar"
-
- #: ../src/main-window.c:372
- msgid "Continue editing current message"
- msgstr "Continuar la edición del mensaje actual"
-
- #: ../src/main-window.c:374
- msgid "_Get New Mail"
- msgstr "_Obtener correo nuevo"
-
- #: ../src/main-window.c:375
- msgid "Fetch new incoming mail"
- msgstr "Bajar el correo nuevo entrante"
-
- #: ../src/main-window.c:376
- msgid "_Send Queued Mail"
- msgstr "_Enviar correo en cola"
-
- #: ../src/main-window.c:377
- msgid "Send messages from the outbox"
- msgstr "Enviar mensaje desde la bandeja de salida"
-
- #: ../src/main-window.c:380
- msgid "Send and _Receive Mail"
- msgstr "Enviar y _recibir correo"
-
- # libmutt/mx.c:1065
- # libmutt/mx.c:1065
- #: ../src/main-window.c:381
- msgid "Send and Receive messages"
- msgstr "Envía y recibe mensajes"
-
- #: ../src/main-window.c:383 ../src/message-window.c:242
- #: ../src/sendmsg-window.c:347
- msgid "Page _Setup"
- msgstr "Configuración de _página"
-
- #: ../src/main-window.c:384 ../src/message-window.c:243
- #: ../src/sendmsg-window.c:348
- msgid "Set up page for printing"
- msgstr "Configurar la página para impresión"
-
- # src/address-book.c:369
- # src/address-book.c:394
- #: ../src/main-window.c:385
- msgid "_Address Book..."
- msgstr "Libreta de _direcciones…"
-
- # libbalsa/address-book.c:163
- # libbalsa/address-book.c:170
- #: ../src/main-window.c:386
- msgid "Open the address book"
- msgstr "Abrir la libreta de direcciones"
-
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #: ../src/main-window.c:387
- msgid "Quit Balsa"
- msgstr "Salir de Balsa"
-
- # src/main-window.c:177
- # src/main-window.c:184
- #. File:New submenu items
- #: ../src/main-window.c:390
- msgid "_Message..."
- msgstr "_Mensaje…"
-
- # src/balsa-message.c:651
- # src/balsa-message.c:713
- #: ../src/main-window.c:391
- msgid "Compose a new message"
- msgstr "Redactar un mensaje nuevo"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:393
- msgid "Local mbox mailbox..."
- msgstr "Buzón mbox local…"
-
- #: ../src/main-window.c:394 ../src/main-window.c:403
- msgid "Add a new mbox style mailbox"
- msgstr "Añadir un buzón de estilo mbox"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:396
- msgid "Local Maildir mailbox..."
- msgstr "Buzón Maildir local…"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:397 ../src/main-window.c:406
- msgid "Add a new Maildir style mailbox"
- msgstr "Añadir un buzón tipo Maildir nuevo"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:399
- msgid "Local MH mailbox..."
- msgstr "Buzón MH local…"
-
- #: ../src/main-window.c:400 ../src/main-window.c:409
- msgid "Add a new MH style mailbox"
- msgstr "Añadir un buzón de estilo MH"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:402
- msgid "New mailbox..."
- msgstr "Buzón nuevo…"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:405
- msgid "New \"Maildir\" mailbox..."
- msgstr "Buzón «Maildir» nuevo…"
-
- # src/mailbox-conf.c:718
- # src/mailbox-conf.c:793
- #: ../src/main-window.c:408
- msgid "New \"MH\" mailbox..."
- msgstr "Buzón «MH» nuevo…"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:411 ../src/pref-manager.c:3279
- msgid "Remote IMAP mailbox..."
- msgstr "Buzón IMAP remoto…"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:412
- msgid "Add a new IMAP mailbox"
- msgstr "Añadir un buzón IMAP nuevo"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:413 ../src/pref-manager.c:3284
- msgid "Remote IMAP folder..."
- msgstr "Carpeta IMAP remota…"
-
- # src/pref-manager.c:1162
- # src/pref-manager.c:1298
- #: ../src/main-window.c:414
- msgid "Add a new IMAP folder"
- msgstr "Añadir una carpeta IMAP remota"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:415
- msgid "Remote IMAP subfolder..."
- msgstr "Subcarpeta IMAP remota…"
-
- # libmutt/mbox.c:1066
- #: ../src/main-window.c:416
- msgid "Add a new IMAP subfolder"
- msgstr "Añadir una subcarpeta IMAP"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:421
- msgid "F_ilters..."
- msgstr "F_iltros…"
-
- #. Export selected filters to a text file.
- #: ../src/main-window.c:424
- msgid "_Export Filters..."
- msgstr "_Exportar filtros…"
-
- #: ../src/main-window.c:425
- msgid "Export filters as Sieve scripts"
- msgstr "Exportar filtros como scripts Sieve"
-
- #: ../src/main-window.c:426
- msgid "Prefere_nces"
- msgstr "Prefere_ncias"
-
- #. View menu items
- #: ../src/main-window.c:429
- msgid "E_xpand All"
- msgstr "E_xpandir todo"
-
- #: ../src/main-window.c:430
- msgid "Expand all threads"
- msgstr "Expandir todos los hilos"
-
- #: ../src/main-window.c:431
- msgid "_Collapse All"
- msgstr "_Contraer todo"
-
- #: ../src/main-window.c:432
- msgid "Collapse all expanded threads"
- msgstr "Contraer todos los hilos expandidos"
-
- #: ../src/main-window.c:434 ../src/message-window.c:257
- msgid "Zoom _In"
- msgstr "A_cercar"
-
- #: ../src/main-window.c:435 ../src/message-window.c:258
- msgid "Increase magnification"
- msgstr "Incrementar el aumento"
-
- #: ../src/main-window.c:436 ../src/message-window.c:259
- msgid "Zoom _Out"
- msgstr "A_lejar"
-
- #: ../src/main-window.c:437 ../src/message-window.c:260
- msgid "Decrease magnification"
- msgstr "Decrementar el aumento"
-
- #. To warn msgfmt that the % sign isn't a format specifier:
- #: ../src/main-window.c:440 ../src/message-window.c:263
- #, no-c-format
- msgid "Zoom _100%"
- msgstr "Aumento al _100%"
-
- # src/filter-edit-dialog.c:626
- # src/filter-edit-dialog.c:538
- #: ../src/main-window.c:441 ../src/message-window.c:264
- msgid "No magnification"
- msgstr "Sin aumento"
-
- #. Mailbox menu item that does not require a mailbox
- #: ../src/main-window.c:444 ../src/main-window.c:445
- #: ../src/message-window.c:298 ../src/message-window.c:299
- msgid "Next Unread Message"
- msgstr "Siguiente mensaje no leído"
-
- # libinit_balsa/balsa-druid-page-directory.gob:60
- # libinit_balsa/balsa-druid-page-directory.gob:60
- #: ../src/main-window.c:447
- msgid "Empty _Trash"
- msgstr "Vaciar _papelera"
-
- # src/main-window.c:403
- # src/main-window.c:406
- #: ../src/main-window.c:448
- msgid "Delete messages from the Trash mailbox"
- msgstr "Borrar los mensajes de la papelera"
-
- #. Settings menu items
- #: ../src/main-window.c:451
- msgid "_Toolbars..."
- msgstr "_Barras de herramientas…"
-
- #: ../src/main-window.c:452
- msgid "Customize toolbars"
- msgstr "Personalizar barras de herramientas"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:453
- msgid "_Identities..."
- msgstr "_Identidades…"
-
- #: ../src/main-window.c:454
- msgid "Create and set current identities"
- msgstr "Crear y establecer identidades actuales"
-
- # src/main-window.c:444
- # src/main-window.c:451
- #. Help menu items
- #: ../src/main-window.c:457
- msgid "_Contents"
- msgstr "Índ_ice"
-
- #: ../src/main-window.c:458
- msgid "Table of Contents"
- msgstr "Tabla de contenidos"
-
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #. license ?
- #: ../src/main-window.c:479 ../src/main-window.c:2774
- msgid "About Balsa"
- msgstr "Acerca de Balsa"
-
- # src/sendmsg-window.c:191
- # src/sendmsg-window.c:196
- #. Edit menu items
- #: ../src/main-window.c:486 ../src/message-window.c:251
- #: ../src/sendmsg-window.c:364
- msgid "Select _All"
- msgstr "Seleccionar _todo"
-
- #: ../src/main-window.c:488
- msgid "_Find"
- msgstr "_Buscar"
-
- #: ../src/main-window.c:490
- msgid "Find Ne_xt"
- msgstr "Buscar _siguiente"
-
- #. Mailbox menu items
- #: ../src/main-window.c:493 ../src/main-window.c:494
- #: ../src/message-window.c:296 ../src/message-window.c:297
- msgid "Next Message"
- msgstr "Mensaje siguiente"
-
- #: ../src/main-window.c:495 ../src/main-window.c:496
- #: ../src/message-window.c:301 ../src/message-window.c:302
- msgid "Previous Message"
- msgstr "Mensaje anterior"
-
- #: ../src/main-window.c:497 ../src/main-window.c:498
- #: ../src/message-window.c:303 ../src/message-window.c:304
- msgid "Next Flagged Message"
- msgstr "Siguiente mensaje marcado"
-
- # libmutt/mx.c:1065
- # libmutt/mx.c:1065
- #: ../src/main-window.c:500
- msgid "_Hide Messages"
- msgstr "_Ocultar mensajes"
-
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #: ../src/main-window.c:501
- msgid "_Reset Filter"
- msgstr "Restablecer _filtro"
-
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #: ../src/main-window.c:502
- msgid "Reset mailbox filter"
- msgstr "Restablecer filtro del buzón"
-
- # src/sendmsg-window.c:191
- # src/sendmsg-window.c:196
- #: ../src/main-window.c:503
- msgid "_Select All"
- msgstr "Seleccionar _todo"
-
- #: ../src/main-window.c:504
- msgid "Select all messages in current mailbox"
- msgstr "Seleccionar todos los mensajes en el buzón actual"
-
- #: ../src/main-window.c:507
- msgid "Edit the selected mailbox"
- msgstr "Editar el buzón seleccionado"
-
- # src/main-window.c:338
- # src/main-window.c:341
- #: ../src/main-window.c:508
- msgid "_Delete..."
- msgstr "_Borrar…"
-
- # libmutt/mbox.c:712
- #: ../src/main-window.c:509
- msgid "Delete the selected mailbox"
- msgstr "Borrar el buzón seleccionado"
-
- # libmutt/mx.c:1065
- # libmutt/mx.c:1065
- #: ../src/main-window.c:512 ../src/main-window.c:515
- msgid "E_xpunge Deleted Messages"
- msgstr "_Purgar los mensajes borrados"
-
- #: ../src/main-window.c:513 ../src/main-window.c:516
- msgid "Expunge messages marked as deleted in the current mailbox"
- msgstr "Purgar los mensajes marcados como borrados en el buzón actual"
-
- # src/main-window.c:399
- # src/main-window.c:401
- #: ../src/main-window.c:519
- msgid "Close mailbox"
- msgstr "Cerrar buzón"
-
- # src/filter-edit-dialog.c:783
- # src/filter-edit-dialog.c:693
- #: ../src/main-window.c:521
- msgid "Select _Filters"
- msgstr "Seleccionar _filtros"
-
- #: ../src/main-window.c:522
- msgid "Select filters to be applied automatically to current mailbox"
- msgstr ""
- "Seleccionar los filtros que se aplicarán automáticamente al buzón actual"
-
- # src/pref-manager.c:1058
- # src/pref-manager.c:1188
- #: ../src/main-window.c:525
- msgid "_Remove Duplicates"
- msgstr "_Eliminar duplicados"
-
- # src/main-window.c:403
- # src/main-window.c:406
- #: ../src/main-window.c:526
- msgid "Remove duplicated messages from the current mailbox"
- msgstr "Eliminar los mensajes duplicados del buzón actual"
-
- #: ../src/main-window.c:536 ../src/message-window.c:267
- msgid "Reply to the current message"
- msgstr "Responder al mensaje actual"
-
- # src/main-window.c:302 src/message-window.c:113
- # src/main-window.c:308
- #: ../src/main-window.c:537 ../src/message-window.c:268
- msgid "Reply to _All..."
- msgstr "Responder a _todos…"
-
- #: ../src/main-window.c:538 ../src/message-window.c:269
- msgid "Reply to all recipients of the current message"
- msgstr "Responder a todos los destinatarios del mensaje actual"
-
- # src/main-window.c:302 src/message-window.c:113
- # src/main-window.c:308
- #: ../src/main-window.c:540 ../src/message-window.c:271
- msgid "Reply to _Group..."
- msgstr "Responder al _grupo…"
-
- #: ../src/main-window.c:541 ../src/message-window.c:272
- msgid "Reply to mailing list"
- msgstr "Responder a la lista de correo"
-
- #: ../src/main-window.c:543
- msgid "Store address of sender in addressbook"
- msgstr "Almacenar dirección del remitente en el libreta de direcciones"
-
- #: ../src/main-window.c:545 ../src/message-window.c:276
- msgid "_View Source..."
- msgstr "_Ver fuente…"
-
- #: ../src/main-window.c:546 ../src/message-window.c:277
- msgid "View source form of the message"
- msgstr "Ver el código fuente del mensaje"
-
- # src/message-window.c:120
- # src/message-window.c:114
- #. All three "Forward" actions and the "Pipe" action have the same
- #. * stock_id; the first in this list defines the action tied to the
- #. * toolbar's Forward button, so "ForwardDefault" must come before
- #. * the others.
- #: ../src/main-window.c:552
- msgid "_Forward..."
- msgstr "_Reenviar…"
-
- #: ../src/main-window.c:553 ../src/message-window.c:283
- msgid "Forward the current message"
- msgstr "Reenviar el mensaje actual"
-
- # src/main-window.c:310 src/message-window.c:120
- # src/main-window.c:315 src/message-window.c:114
- #: ../src/main-window.c:556 ../src/message-window.c:285
- msgid "_Forward attached..."
- msgstr "_Reenviar adjunto…"
-
- #: ../src/main-window.c:557 ../src/message-window.c:286
- msgid "Forward the current message as attachment"
- msgstr "Reenviar el mensaje actual como un adjunto"
-
- # src/balsa-index-page.c:486
- # src/balsa-index-page.c:534
- #: ../src/main-window.c:559 ../src/message-window.c:288
- msgid "Forward _inline..."
- msgstr "Reenviar _en línea…"
-
- #: ../src/main-window.c:560 ../src/message-window.c:289
- msgid "Forward the current message inline"
- msgstr "Reenviar el mensaje actual en línea"
-
- #: ../src/main-window.c:563
- msgid "Pipe the message through another program"
- msgstr "Filtrar el mensaje a través de otro programa"
-
- # src/mailbox-conf.c:822 src/mailbox-conf.c:882
- # src/mailbox-conf.c:899 src/mailbox-conf.c:957
- #: ../src/main-window.c:565
- msgid "Select _Thread"
- msgstr "Seleccionar con_versación"
-
- #: ../src/main-window.c:566
- msgid "Select all messages in current thread"
- msgstr "Seleccionar todos los mensajes en la conversación actual"
-
- # src/mblist-window.c:450
- # src/mblist-window.c:473
- #. File menu item
- #: ../src/main-window.c:574 ../src/message-window.c:244
- #: ../src/sendmsg-window.c:350
- msgid "_Print..."
- msgstr "_Imprimir…"
-
- # libmutt/mx.c:1375
- # libmutt/mx.c:1375
- #: ../src/main-window.c:575 ../src/message-window.c:245
- msgid "Print current message"
- msgstr "Imprimir el mensaje actual"
-
- #: ../src/main-window.c:576 ../src/message-window.c:273
- msgid "Save Current Part..."
- msgstr "Guardar parte actual…"
-
- #: ../src/main-window.c:577 ../src/message-window.c:274
- msgid "Save currently displayed part of message"
- msgstr "Guarda la parte mostrada actualmente del mensaje"
-
- #: ../src/main-window.c:580 ../src/message-window.c:291
- msgid "_Next Part"
- msgstr "_Siguiente parte"
-
- # src/main-window.c:317 src/message-window.c:126
- # src/main-window.c:322 src/message-window.c:119
- #: ../src/main-window.c:581 ../src/message-window.c:292
- msgid "Next part in message"
- msgstr "Siguiente parte en el mensaje"
-
- #: ../src/main-window.c:582 ../src/message-window.c:293
- msgid "_Previous Part"
- msgstr "_Anterior parte"
-
- #: ../src/main-window.c:583 ../src/message-window.c:294
- msgid "Previous part in message"
- msgstr "Parte anterior en el mensaje"
-
- # src/balsa-message.c:651
- # src/balsa-message.c:713
- #: ../src/main-window.c:586
- msgid "Copy message"
- msgstr "Copiar mensaje"
-
- # libmutt/mx.c:1065
- # libmutt/mx.c:1065
- #: ../src/main-window.c:589
- msgid "Find in _Message"
- msgstr "Buscar en el _mensaje"
-
- # libmutt/imap/browse.c:93
- # libmutt/imap/browse.c:93
- #: ../src/main-window.c:590 ../src/message-window.c:254
- msgid "Find a string in this message"
- msgstr "Buscar una cadena en este mensaje"
-
- # src/balsa-index-page.c:495
- # src/balsa-index-page.c:546
- #: ../src/main-window.c:600 ../src/message-window.c:306
- msgid "_Move to Trash"
- msgstr "_Mover a la papelera"
-
- #: ../src/main-window.c:601 ../src/main-window.c:605
- msgid "Move the current message to Trash mailbox"
- msgstr "Mueve el mensaje actual a la papelera"
-
- # src/balsa-index-page.c:495
- # src/balsa-index-page.c:546
- #: ../src/main-window.c:604
- msgid "_Delete to Trash"
- msgstr "_Borrar a la papelera"
-
- #: ../src/main-window.c:608 ../src/main-window.c:617
- msgid "Toggle New"
- msgstr "Conmutar nuevo"
-
- #: ../src/main-window.c:610
- msgid "_Toggle Flag"
- msgstr "_Conmutar marca"
-
- #: ../src/main-window.c:613
- msgid "Toggle flagged"
- msgstr "Conmutar marcados"
-
- # src/main-window.c:338
- # src/main-window.c:341
- #. Hide messages menu items
- #: ../src/main-window.c:614 ../src/main-window.c:649
- msgid "_Deleted"
- msgstr "_Borrado"
-
- #: ../src/main-window.c:615
- msgid "Toggle deleted flag"
- msgstr "Conmutar marca de borrado"
-
- # src/balsa-mblist.c:218
- # src/balsa-mblist.c:218
- #: ../src/main-window.c:618 ../src/main-window.c:661
- msgid "_Answered"
- msgstr "_Respondido"
-
- #: ../src/main-window.c:619
- msgid "Toggle Answered"
- msgstr "Conmutar respondido"
-
- # src/pref-manager.c:1087
- # src/pref-manager.c:1218
- #: ../src/main-window.c:626
- msgid "_Show Mailbox Tree"
- msgstr "Mo_strar árbol de buzones"
-
- #: ../src/main-window.c:627
- msgid "Toggle display of mailbox and folder tree"
- msgstr "Conmutar entre mostrar buzón o árbol de carpetas"
-
- # src/mailbox-conf.c:786 src/mailbox-conf.c:810 src/mailbox-conf.c:870
- # src/mailbox-conf.c:862 src/mailbox-conf.c:887 src/mailbox-conf.c:945
- #: ../src/main-window.c:629
- msgid "Show Mailbox _Tabs"
- msgstr "Mostrar pe_stañas del buzón"
-
- #: ../src/main-window.c:630
- msgid "Toggle display of mailbox notebook tabs"
- msgstr "Conmutar la muestra de pestañas del buzón"
-
- #: ../src/main-window.c:632 ../src/message-window.c:313
- msgid "Show Too_lbar"
- msgstr "Mostrar barra de _herramientas"
-
- #: ../src/main-window.c:634
- msgid "Show St_atus Bar"
- msgstr "Mostrar barra de _estado"
-
- #: ../src/main-window.c:636
- msgid "Show _Index Filter"
- msgstr "Mostrar filtro índ_ice"
-
- #: ../src/main-window.c:639
- msgid "_Descending"
- msgstr "_Descendente"
-
- #: ../src/main-window.c:640
- msgid "Sort in a descending order"
- msgstr "Ordenar en orden descendente"
-
- # src/main-window.c:259
- # src/main-window.c:262
- #: ../src/main-window.c:642
- msgid "_View filter"
- msgstr "Filtro de _vista"
-
- #: ../src/main-window.c:643
- msgid "Enable quick message index filter"
- msgstr "Activar el filtro rápido de indexado de mensajes"
-
- #: ../src/main-window.c:646 ../src/message-window.c:315
- msgid "_Wrap"
- msgstr "_Auto-ajuste"
-
- #: ../src/main-window.c:646 ../src/message-window.c:315
- #: ../src/sendmsg-window.c:367
- msgid "Wrap message lines"
- msgstr "Auto-ajustar las líneas del mensaje"
-
- # src/balsa-index-page.c:492 src/filter-edit-dialog.c:228
- # src/main-window.c:435 src/mblist-window.c:452 src/pref-manager.c:1112
- # src/pref-manager.c:2027
- # src/balsa-index-page.c:542 src/filter-edit-dialog.c:224
- # src/main-window.c:442 src/mblist-window.c:475 src/pref-manager.c:1243
- # src/pref-manager.c:2253
- #: ../src/main-window.c:651
- msgid "Un_Deleted"
- msgstr "_Recuperado"
-
- #: ../src/main-window.c:653
- msgid "_Read"
- msgstr "_Leído"
-
- # src/balsa-mblist.c:218
- # src/balsa-mblist.c:218
- #: ../src/main-window.c:655
- msgid "Un_read"
- msgstr "_No leído"
-
- # src/main-window.c:352
- # src/main-window.c:353
- #: ../src/main-window.c:659
- msgid "Un_flagged"
- msgstr "_Desmarcado"
-
- # src/mailbox-conf.c:827 src/mailbox-conf.c:886
- # src/mailbox-conf.c:904 src/mailbox-conf.c:961
- #: ../src/main-window.c:663
- msgid "Un_answered"
- msgstr "_No contestado"
-
- #. Toolbar items not on any menu
- #: ../src/main-window.c:666 ../src/toolbar-factory.c:159
- msgid ""
- "All\n"
- "headers"
- msgstr ""
- "Todas\n"
- "las cabeceras"
-
- # src/store-address.c:137
- # src/store-address.c:149
- #: ../src/main-window.c:667 ../src/message-window.c:318
- msgid "Show all headers"
- msgstr "Mostrar todas las cabeceras"
-
- #: ../src/main-window.c:669 ../src/toolbar-factory.c:161
- msgid "Msg Preview"
- msgstr "Vista previa del mensaje"
-
- #: ../src/main-window.c:670
- msgid "Show preview pane"
- msgstr "Muestra el panel de vista previa"
-
- # src/main-window.c:267 src/message-window.c:61
- # src/main-window.c:269
- #: ../src/main-window.c:676 ../src/message-window.c:324
- msgid "_No Headers"
- msgstr "_Sin cabeceras"
-
- #: ../src/main-window.c:677 ../src/message-window.c:325
- msgid "Display no headers"
- msgstr "No mostrar cabeceras"
-
- #: ../src/main-window.c:678
- msgid "S_elected Headers"
- msgstr "Cabeceras s_eleccionadas"
-
- #: ../src/main-window.c:679 ../src/message-window.c:327
- msgid "Display selected headers"
- msgstr "Mostrar las cabeceras seleccionadas"
-
- #: ../src/main-window.c:680 ../src/message-window.c:328
- msgid "All _Headers"
- msgstr "Todas las _cabeceras"
-
- #: ../src/main-window.c:681 ../src/message-window.c:329
- msgid "Display all headers"
- msgstr "Muestra todas las cabeceras"
-
- #: ../src/main-window.c:685
- msgid "_Flat index"
- msgstr "Índice _plano"
-
- #: ../src/main-window.c:686
- msgid "No threading at all"
- msgstr "Sin hilos"
-
- #: ../src/main-window.c:687
- msgid "Si_mple threading"
- msgstr "Conversaciones si_mples"
-
- #: ../src/main-window.c:688
- msgid "Simple threading algorithm"
- msgstr "Algoritmo de hilos simples"
-
- #: ../src/main-window.c:689
- msgid "_JWZ threading"
- msgstr "Conversaciones _JWZ"
-
- #: ../src/main-window.c:690
- msgid "Elaborate JWZ threading"
- msgstr "Elaborar conversaciones JWZ"
-
- #: ../src/main-window.c:695
- msgid "By _Arrival"
- msgstr "Por _llegada"
-
- #: ../src/main-window.c:696
- msgid "Arrival order"
- msgstr "Orden de llegada"
-
- # src/address-book.c:477
- # src/address-book.c:523
- #: ../src/main-window.c:697
- msgid "By _Sender"
- msgstr "Por _remitente"
-
- #: ../src/main-window.c:698
- msgid "Sender order"
- msgstr "Orden por remitente"
-
- # src/balsa-index.c:304 src/filter-edit-dialog.c:349
- # src/balsa-index.c:297 src/filter-edit-dialog.c:326
- #: ../src/main-window.c:699
- msgid "By S_ubject"
- msgstr "Por _asunto"
-
- # src/balsa-index.c:304 src/filter-edit-dialog.c:349
- # src/balsa-index.c:297 src/filter-edit-dialog.c:326
- #: ../src/main-window.c:700
- msgid "Subject order"
- msgstr "Orden por asunto"
-
- # src/filter-edit-dialog.c:45
- # src/filter-edit-dialog.c:44
- #: ../src/main-window.c:701
- msgid "By Si_ze"
- msgstr "Por _tamaño"
-
- #: ../src/main-window.c:702
- msgid "By message size"
- msgstr "Por tamaño del mensaje"
-
- #: ../src/main-window.c:703
- msgid "_Threaded"
- msgstr "_Conversaciones"
-
- #: ../src/main-window.c:704
- msgid "Use message threading"
- msgstr "Usar hilado en conversaciones"
+ # src/filter-edit-dialog.c:52
+ # src/filter-edit-dialog.c:50
+ #: ../src/mailbox-node.c:1280
+ #, c-format
+ msgid "Local folder %s\n"
+ msgstr "Carpeta local %s\n"
- #: ../src/main-window.c:1065
+ #: ../src/main-window.c:275
msgid ""
"Balsa is sending a mail now.\n"
"Abort sending?"
@@@ -8755,77 -8882,9 +8995,76 @@@ msgstr "Guardar seleccionados a carpeta
# src/filter-edit-dialog.c:205
# src/filter-edit-dialog.c:200
- #: ../src/toolbar-prefs.c:549
- msgid "Down"
- msgstr "Bajar"
+ #~ msgid "Down"
+ #~ msgstr "Bajar"
+#~ msgid "the crypto engine for protocol OpenPGP is not available"
+#~ msgstr "el motor de cifrado para el protocolo OpenPGP no está disponible"
+
+#~ msgid "the crypto engine for protocol CMS is not available"
+#~ msgstr "el motor de cifrado para el protocolo CMS no está disponible"
+
+#~ msgid "invalid crypto engine %d"
+#~ msgstr "motor de cifrado inválido %d"
+
+#~ msgid "Gpgme has been compiled without support for protocol %s."
+#~ msgstr "Gpgme ha sido compilado sin soporte para el protocolo %s."
+
+#~ msgid "Crypto engine %s is not installed properly."
+#~ msgstr "El motor criptográfico %s no está instalado apropiadamente."
+
+#~ msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+#~ msgstr " Consejo: comprobar el paquete «gnupg2» (preferido) o «gnupg»."
+
+#~ msgid " Hint: check the `gpgsm' package."
+#~ msgstr " Consejo: comprobar el paquete «gpgsm»."
+
+#~ msgid ""
+#~ "Crypto engine %s version %s is installed, but at least version %s is "
+#~ "required."
+#~ msgstr ""
+#~ "El motor criptográfico %s versión %s está instalado, pero al menos se "
+#~ "requiere la versión %s."
+
+#~ msgid "Unknown problem with engine for protocol %s."
+#~ msgstr "Problema desconocido con el motor para el protocolo %s."
+
+# src/balsa-message.c:301
+# src/balsa-message.c:331
+#~ msgid "%s: could not retrieve crypto engine information: %s."
+#~ msgstr "%s: no se pudo obtener la información del motor criptográfico: %s."
+
+#~ msgid "Enter passphrase to unlock the secret key for signing"
+#~ msgstr ""
+#~ "Introduzca la frase de paso para desbloquear la clave secreta para firmar"
+
+# src/balsa-message.c:1316
+# src/balsa-message.c:1474
+#~ msgid "creating a gpgme context failed"
+#~ msgstr "la creación de un contexto gpgme ha fallado"
+
+#~ msgid "Enter passphrase to decrypt message"
+#~ msgstr "Introduzca la frase de paso para descifrar el mensaje"
+
+#~ msgid ""
+#~ "\n"
+#~ "Signed by: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Firmado por: %s"
+
+# libinit_balsa/balsa-druid-page-user.gob:87
+# libinit_balsa/balsa-druid-page-user.gob:87
+#~ msgid ""
+#~ "\n"
+#~ "Mail address: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Dirección de correo: %s"
+
+#~ msgid "Uploading %"
+#~ msgstr "Subiendo %"
+
# src/mailbox-conf.c:239
# src/mailbox-conf.c:233
#~ msgid "Local Mailbox Configurator"
diff --cc po/hu.po
index 51f602f,5b95788..8a2eba3
--- a/po/hu.po
+++ b/po/hu.po
@@@ -284,7 -241,41 +241,41 @@@ msgstr "És
msgid "Or"
msgstr "Vagy"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ #: ../libbalsa/filter-file.c:135
+ #, c-format
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "%s érvénytelen szűrő a(z) %s postafiókhoz"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "Nem lehet betölteni a levél törzsét a szűréshez"
+
+ #: ../libbalsa/filter.c:234
+ #, c-format
+ msgid "Invalid filter: %s"
+ msgstr "Érvénytelen szűrő: %s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Érvénytelen postafióknév a szűrőhöz: %s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Hiba lépett fel a levelek másolása közben: %s"
+
+ #: ../libbalsa/filter.c:296
+ #, c-format
-msgid "Error when trashing messages: %s"
-msgstr "Hiba lépett fel a levelek kidobása közben: %s"
++msgid "Header:%s"
++msgstr "Fejléc:%s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Hiba a levelek mozgatásakor: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
#, c-format
msgid "Failed to decrypt MIME part: parse error"
msgstr "A MIME rész visszafejtése sikertelen: feldolgozási hiba"
@@@ -999,22 -1092,22 +1092,24 @@@ msgstr "Az IMAP kiszolgáló leállíto
msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
msgstr "A(z) %s aszinkron IMAP parancs nem hajtható végre. Újrakapcsolódás…"
- #: ../libbalsa/mailbox_imap.c:1126 ../libbalsa/mailbox_maildir.c:509
- #: ../libbalsa/mailbox_mbox.c:748 ../libbalsa/mailbox_mh.c:543
+ #: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:505
+ #: ../libbalsa/mailbox_mbox.c:739 ../libbalsa/mailbox_mh.c:541
#, c-format
--msgid "%s: Opening %s Refcount: %d\n"
--msgstr "%s: %s megnyitása, hivatkozások száma: %d\n"
++msgid ""
++"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
++msgstr ""
++"%s: létezik %s kulcsa, de lejárt, letiltott, visszavonták vagy érvénytelen"
- #: ../libbalsa/mailbox_imap.c:1213
+ #: ../libbalsa/mailbox_imap.c:1211
#, c-format
--msgid "Downloading %ld kB"
--msgstr "%ld kB letöltése"
++msgid "%s: could not find a key for %s"
++msgstr "%s: nem sikerült kulcsot találni ehhez: %s"
- #: ../libbalsa/mailbox_imap.c:1612
+ #: ../libbalsa/mailbox_imap.c:1610
#, c-format
msgid ""
--"IMAP SEARCH command failed for mailbox %s\n"
--"falling back to default searching method"
++"%s: a key with id %s is present, but it is expired, disabled, revoked or "
++"invalid"
msgstr ""
"Az IMAP SEARCH parancs sikertelen a(z) %s postafiókra,\n"
"visszatérés az alapértelmezett keresési eljárásra"
@@@ -1044,17 -1137,17 +1139,17 @@@ msgstr "%u kB letöltése
msgid "Cannot create temporary file"
msgstr "Nem hozható létre átmeneti fájl"
- #: ../libbalsa/mailbox_imap.c:2543
+ #: ../libbalsa/mailbox_imap.c:2541
#, c-format
--msgid "Cannot write to temporary file %s"
--msgstr "Nem lehet írni a(z) %s átmeneti fájlba"
++msgid "%s: multiple keys for %s"
++msgstr "%s: többszörös kulcs ehhez: %s"
- #: ../libbalsa/mailbox_imap.c:2772 ../libbalsa/mailbox_imap.c:2891
+ #: ../libbalsa/mailbox_imap.c:2770 ../libbalsa/mailbox_imap.c:2889
#, c-format
--msgid "Uploading %ld kB"
--msgstr "%ld kB feltöltése"
++msgid "%s: insufficient validity for uid %s"
++msgstr "%s: elégtelen érvényesség a(z) %s felhasználói azonosítóhoz"
- #: ../libbalsa/mailbox_imap.c:3194
+ #: ../libbalsa/mailbox_imap.c:3192
msgid "Server-side threading not supported."
msgstr "A kiszolgálóoldali szálakra bontás nem támogatott."
diff --cc po/pt_BR.po
index 0e0d5bd,d69ac08..2119eb8
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@@ -49,32 -77,32 +77,32 @@@ msgstr "Localização do catálogo de e
msgid "No error"
msgstr "Sem erro"
- #: ../libbalsa/address-book.c:313
+ #: ../libbalsa/address-book.c:315
msgid "Cannot read from address book"
-msgstr "Não é possível ler o catálogo de endereços"
+msgstr "Não foi possível ler o catálogo de endereços"
- #: ../libbalsa/address-book.c:314
+ #: ../libbalsa/address-book.c:316
msgid "Cannot write to address book"
-msgstr "Não é possível escrever no catálogo de endereços"
+msgstr "Não foi possível escrever no catálogo de endereços"
- #: ../libbalsa/address-book.c:315
+ #: ../libbalsa/address-book.c:317
msgid "Cannot connect to the server"
-msgstr "Não é possível conectar ao servidor"
+msgstr "Não foi possível conectar ao servidor"
- #: ../libbalsa/address-book.c:316
+ #: ../libbalsa/address-book.c:318
msgid "Cannot search in the address book"
-msgstr "Não é possível procurar no catálogo de endereços"
+msgstr "Não foi possível procurar no catálogo de endereços"
- #: ../libbalsa/address-book.c:318
+ #: ../libbalsa/address-book.c:320
msgid "Cannot add duplicate entry"
-msgstr "Não é possível adicionar entrada duplicada"
+msgstr "Não foi possível adicionar entrada duplicada"
- #: ../libbalsa/address-book.c:320
+ #: ../libbalsa/address-book.c:322
msgid "Cannot find address in address book"
-msgstr "Não é possível encontrar o endereço no catálogo de endereços"
+msgstr "Não foi possível localizar o endereço no catálogo de endereços"
- #: ../libbalsa/address-book.c:321 ../src/main-window.c:2387
- #: ../src/main-window.c:4837 ../src/sendmsg-window.c:4201
+ #: ../libbalsa/address-book.c:323 ../src/main-window.c:2916
+ #: ../src/main-window.c:4252 ../src/sendmsg-window.c:3797
msgid "Unknown error"
msgstr "Erro desconhecido"
@@@ -290,23 -256,60 +256,69 @@@ msgstr "E
msgid "Or"
msgstr "Ou"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ #: ../libbalsa/filter-file.c:135
#, c-format
- msgid "Failed to decrypt MIME part: parse error"
- msgstr "Falha ao descriptografar a parte MIME: erro ao analisar"
+ msgid "Invalid filters %s for mailbox %s"
+ msgstr "Filtros %s inválidos para a caixa de mensagens %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "Não foi possível carregar o corpo da mensagem para aplicar o filtro"
+
+ #: ../libbalsa/filter.c:234
+ #, c-format
+ msgid "Invalid filter: %s"
+ msgstr "Filtro inválido: %s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
+ msgid "Bad mailbox name for filter: %s"
+ msgstr "Nome da caixa de mensagens errado para o filtro: %s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Erro quando copiava mensagens: %s"
+
+ #: ../libbalsa/filter.c:296
+ #, c-format
+ msgid "Error when trashing messages: %s"
+ msgstr "Erro quando apagava mensagens: %s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Erro quando movia mensagens: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
+ #, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Falha ao descriptografar a parte MIME: erro ao analisar"
++msgid "Invalid filters %s for mailbox %s"
++msgstr "Filtros %s inválidos para a caixa de mensagens %s"
++
++#. FIXME: this is hack!
++#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1053
++msgid "To"
++msgstr "Para"
++
++#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:357
++msgid "From"
++msgstr "De"
- #: ../libbalsa/gmime-multipart-crypt.c:223
+ #: ../libbalsa/gmime-multipart-crypt.c:222
msgid "Cannot verify multipart/signed part due to missing subparts."
msgstr ""
- "Não foi possível verificar multiparte/parte assinada por causa de subpartes "
- "faltando."
+ "Não foi possível verificar multiparte/parte assinada em razão de subpartes "
+ "estarem faltando."
- #: ../libbalsa/gmime-multipart-crypt.c:249
+ #: ../libbalsa/gmime-multipart-crypt.c:248
#, c-format
+ #| msgid ""
+ #| "\n"
+ #| "Disable support for protocol %s."
msgid "unsupported protocol '%s'"
- msgstr "não há suporte ao protocolo \"%s\""
+ msgstr "protocolo sem suporte \"%s\""
- #: ../libbalsa/gmime-multipart-crypt.c:262
+ #: ../libbalsa/gmime-multipart-crypt.c:261
msgid ""
"Cannot verify multipart/signed part: signature content-type does not match "
"protocol."
@@@ -635,17 -728,24 +737,24 @@@ msgstr "Voltando\n
msgid "Balsa passwords"
msgstr "Senhas do Balsa"
- #: ../libbalsa/imap-server.c:624
+ #: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:373
+ #: ../libbalsa/server.c:450
+ #, c-format
+ #| msgid "Error showing %s: %s\n"
+ msgid "Error storing password for %s@%s: %s\n"
+ msgstr "Erro ao armazenar senha para %s@%s: %s\n"
+
+ #: ../libbalsa/imap-server.c:628
#, c-format
msgid "Cannot connect to %s"
-msgstr "Não é possível conectar à %s"
+msgstr "Não foi possível conectar a %s"
-#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#: ../libbalsa/imap-server.c:629 ../libbalsa/imap-server.c:634
#, c-format
msgid "Cannot connect to the server: %s"
-msgstr "Não é possível conectar ao servidor: %s"
+msgstr "Não foi possível conectar ao servidor: %s"
- #: ../libbalsa/imap-server.c:782
+ #: ../libbalsa/imap-server.c:787
#, c-format
msgid "Exceeded the number of connections per server %s"
msgstr "Excedido o número de conexões por servidor %s"
@@@ -733,203 -1054,8 +1063,203 @@@ msgstr "Saturação de buffer interno
msgid "Bad X-Face data"
msgstr "Dados X-Face errados"
+#: ../libbalsa/libbalsa-conf.c:141
+msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
+msgstr ""
+"A sua configuração do Balsa está armazenada agora em \"~/.balsa/config\"."
+
+#: ../libbalsa/libbalsa-gpgme.c:243 ../libbalsa/libbalsa-gpgme.c:254
+#: ../libbalsa/libbalsa-gpgme.c:356 ../libbalsa/libbalsa-gpgme.c:479
+#: ../libbalsa/libbalsa-gpgme.c:572
+msgid "could not get data from stream"
+msgstr "não foi possível obter dados do fluxo"
+
+#: ../libbalsa/libbalsa-gpgme.c:267 ../libbalsa/rfc3156.c:392
+#: ../libbalsa/rfc3156.c:397 ../libbalsa/rfc3156.c:569
+#: ../libbalsa/rfc3156.c:575
+msgid "signature verification failed"
+msgstr "falha na verificação da assinatura"
+
+#: ../libbalsa/libbalsa-gpgme.c:364 ../libbalsa/libbalsa-gpgme.c:488
+#: ../libbalsa/libbalsa-gpgme.c:580
+msgid "could not create new data object"
+msgstr "não foi possível criar novo objeto de dados"
+
+#: ../libbalsa/libbalsa-gpgme.c:373
+msgid "signing failed"
+msgstr "falha na assinatura"
+
+# Marquei como aproximada porque estou na dúvida entre:
+# a. apenas assinar e criptografar estão definidas pela RFC 2440; ou
+# b. apenas a RFC 2440 define ao mesmo tempo assinar e criptografar.
+# Esperando a resolução de http://bugzilla.gnome.org/show_bug.cgi?id=566415
+#: ../libbalsa/libbalsa-gpgme.c:447
+#, c-format
+msgid "combined signing and encryption is defined only for RFC 2440"
+msgstr ""
+"assinatura e criptografia combinadas são definidas apenas para RFC 2440"
+
+#: ../libbalsa/libbalsa-gpgme.c:515
+msgid "signing and encryption failed"
+msgstr "falha na assinatura e criptografia"
+
+#: ../libbalsa/libbalsa-gpgme.c:517
+msgid "encryption failed"
+msgstr "falha na criptografia"
+
+#: ../libbalsa/libbalsa-gpgme.c:590 ../libbalsa/rfc3156.c:470
+#: ../libbalsa/rfc3156.c:475
+msgid "decryption failed"
+msgstr "falha na descriptografia"
+
+#: ../libbalsa/libbalsa-gpgme.c:691
+msgid "could not create context"
+msgstr "não foi possível criar o contexto"
+
+#: ../libbalsa/libbalsa-gpgme.c:695
+#, c-format
+msgid "could not set protocol '%s'"
+msgstr "não foi possível definir protocolo \"%s\""
+
+#: ../libbalsa/libbalsa-gpgme.c:734 ../libbalsa/libbalsa-gpgme.c:762
+#, c-format
+msgid "could not list keys for \"%s\""
+msgstr "não foi possível listar as chaves para \"%s\""
+
+#: ../libbalsa/libbalsa-gpgme.c:780
+#, c-format
+msgid ""
+"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
+msgstr ""
+"%s: há uma chave para %s, mas ela está expirada, desabilitada, revogada ou "
+"inválida"
+
+#: ../libbalsa/libbalsa-gpgme.c:785
+#, c-format
+msgid "%s: could not find a key for %s"
+msgstr "%s: não foi possível encontrar a chave para %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:792
+#, c-format
+msgid ""
+"%s: a key with id %s is present, but it is expired, disabled, revoked or "
+"invalid"
+msgstr ""
+"%s: há uma chave com a id %s, mas ela está expirada, revogada ou inválida"
+
+#: ../libbalsa/libbalsa-gpgme.c:797
+#, c-format
+msgid "%s: could not find a key with id %s"
+msgstr "%s: não foi possível encontrar uma chave com a id %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:814
+#, c-format
+msgid "%s: multiple keys for %s"
+msgstr "%s: múltiplas chaves para %s"
+
+#: ../libbalsa/libbalsa-gpgme.c:860
+#, c-format
+msgid "%s: insufficient validity for uid %s"
+msgstr "%s: validade insuficiente para uid %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "User ID"
+msgstr "ID do usuário"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "Key ID"
+msgstr "ID da Chave"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "Length"
+msgstr "Tamanho"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:143
+msgid "Validity"
+msgstr "Validade"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:158
+msgid "Select key"
+msgstr "Selecionar chave"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:174
+#, c-format
+msgid "Select the private key for the signer %s"
+msgstr "Selecione a chave privada para o assinante %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:178
+#, c-format
+msgid "Select the public key for the recipient %s"
+msgstr "Selecione a chave pública para o destinatário %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:301
+#, c-format
+msgid "Insufficient trust for recipient %s"
+msgstr "Confiança insuficiente para o destinatário %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:305
+#, c-format
+msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+msgstr "A validade da chave para a ID de usuário \"%s\" é \"%s\"."
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:316
+msgid "Use this key anyway?"
+msgstr "Utilizar esta chave mesmo assim?"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:342
+msgid "Enter Passphrase"
+msgstr "Digite a frase secreta"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:369
+#, c-format
+msgid ""
+"%s\n"
+"The passphrase for this key was bad, please try again!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"%s\n"
+"A frase secreta para essa chave não funcionou. Por favor, tente novamente!\n"
+"\n"
+"Chave: %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:374
+#, c-format
+msgid ""
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"%s\n"
+"Por favor, digite a frase secreta para esta chave secreta!\n"
+"\n"
+"Key: %s"
+
+#: ../libbalsa/libbalsa-vfs.c:556 ../src/sendmsg-window.c:5239
+#, c-format
+msgid "not a regular file"
+msgstr "não é um arquivo normal"
+
+#: ../libbalsa/libbalsa-vfs.c:608
+#, c-format
+msgid "Cannot launch, missing application"
+msgstr "Impossível executar, a aplicação não está instalada no sistema"
+
+#: ../libbalsa/libbalsa-vfs.c:674
+#, c-format
+msgid "Open with %s"
+msgstr "Abrir com %s"
+
+#: ../libbalsa/libbalsa-vfs.c:727
+#, c-format
+msgid "Open _part with %s"
+msgstr "Abrir _parte com %s"
+
# 11
- #: ../libbalsa/mailbox.c:520
+ #: ../libbalsa/mailbox.c:506
#, c-format
msgid "Cannot load mailbox %s"
msgstr "Impossível carregar a caixa de mensagens %s"
@@@ -1193,23 -1319,23 +1523,23 @@@ msgid "Could not unlink file %s: %s
msgstr "Não foi possível desvincular arquivo %s: %s"
# 11
- #: ../libbalsa/mailbox_mbox.c:700
+ #: ../libbalsa/mailbox_mbox.c:694
#, c-format
msgid "Cannot open mailbox."
-msgstr "Não é possível abrir a caixa de mensagens."
+msgstr "Não foi possível abrir a caixa de mensagens."
- #: ../libbalsa/mailbox_mbox.c:712
+ #: ../libbalsa/mailbox_mbox.c:706
#, c-format
msgid "Mailbox is not in mbox format."
msgstr "A caixa de mensagens não está no formato mbox."
# 11
- #: ../libbalsa/mailbox_mbox.c:720
+ #: ../libbalsa/mailbox_mbox.c:714
#, c-format
msgid "Cannot lock mailbox."
-msgstr "Não é possível travar a caixa de mensagens."
+msgstr "Não foi possível travar a caixa de mensagens."
- #: ../libbalsa/mailbox_mbox.c:1986
+ #: ../libbalsa/mailbox_mbox.c:1926
#, c-format
msgid "%s: could not open %s."
msgstr "%s: não foi possível abrir %s."
@@@ -1298,17 -1424,17 +1628,17 @@@ msgstr "Erro na caixa de mensagens POP
msgid "POP3 message %d oversized: %d kB - skipped."
msgstr "A mensagem POP3 %d excedeu o tamanho: %d kB - ignorada."
- #: ../libbalsa/mailbox_pop3.c:550
+ #: ../libbalsa/mailbox_pop3.c:558
#, c-format
msgid "POP3 error: cannot open %s for writing."
-msgstr "Erro de POP3: não é possível abrir %s para gravação."
+msgstr "Erro de POP3: não foi possível abrir %s para gravação."
- #: ../libbalsa/mailbox_pop3.c:558
+ #: ../libbalsa/mailbox_pop3.c:566
#, c-format
msgid "POP3 error: cannot close %s."
-msgstr "Erro de POP3: não é possível fechar %s."
+msgstr "Erro de POP3: não foi possível fechar %s."
- #: ../libbalsa/mailbox_pop3.c:593
+ #: ../libbalsa/mailbox_pop3.c:601
#, c-format
msgid "POP3 error: %s."
msgstr "Erro de POP3: %s."
@@@ -1392,17 -1517,17 +1722,17 @@@ msgstr "japonês
msgid "korean"
msgstr "coreano"
- #: ../libbalsa/misc.c:831
+ #: ../libbalsa/misc.c:823
#, c-format
msgid "Cannot open %s: %s"
-msgstr "Não é possível abrir %s: %s"
+msgstr "Não foi possível abrir %s: %s"
- #: ../libbalsa/misc.c:840
+ #: ../libbalsa/misc.c:832
#, c-format
msgid "Cannot open %s: is a symbolic link"
-msgstr "Não é possível abrir %s: é um link simbólico"
+msgstr "Não foi possível abrir %s: é um link simbólico"
- #: ../libbalsa/misc.c:967
+ #: ../libbalsa/misc.c:959
msgid "Timeout exceeded while attempting fcntl lock!"
msgstr "Tempo esgotado na tentativa de bloquear via fcntl!"
@@@ -1869,27 -2003,27 +2208,27 @@@ msgid "
"SMTP server problem (%d): %s\n"
"Message is left in outbox."
msgstr ""
-"Problema no servido SMTP (%d): %s\n"
+"Problema no servidor SMTP (%d): %s\n"
"A mensagem ficou na caixa de saída."
- #: ../libbalsa/send.c:1770 ../libbalsa/send.c:1839
+ #: ../libbalsa/send.c:1706 ../libbalsa/send.c:1775
#, c-format
msgid "Cannot read %s: %s"
-msgstr "Não é possível ler %s: %s"
+msgstr "Não foi possível ler %s: %s"
- #: ../libbalsa/send.c:1773 ../libbalsa/send.c:1842
+ #: ../libbalsa/send.c:1709 ../libbalsa/send.c:1778
#, c-format
msgid "Cannot read %s"
-msgstr "Não é possível ler %s"
+msgstr "Não foi possível ler %s"
- #: ../libbalsa/send.c:1803
+ #: ../libbalsa/send.c:1739
#, c-format
msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
msgstr ""
-"Não é possível determinar o conjunto de caracteres para o arquivo texto \"%s"
-"\"; enviando como o tipo mime \"%s\""
+"Não foi possível determinar o conjunto de caracteres para o arquivo texto "
+"\"%s\"; enviando como o tipo mime \"%s\""
- #: ../libbalsa/send.c:2173
+ #: ../libbalsa/send.c:2114
msgid "This message will not be encrypted for the BCC: recipient."
msgid_plural "This message will not be encrypted for the BCC: recipients."
msgstr[0] "Esta mensagem não será criptografada para o destinatário Cco."
@@@ -2132,29 -2224,39 +2429,39 @@@ msgstr "Não foi possível criar caixa
msgid "The mailbox \"%s\" does not appear to be valid."
msgstr "A caixa de mensagens \"%s\" não parece ser válida."
- #: ../libinit_balsa/assistant_page_directory.c:202
+ #: ../libinit_balsa/assistant_page_directory.c:191
+ #, c-format
+ #| msgid ""
+ #| "Problem Creating Mailboxes\n"
+ #| "%s"
msgid ""
- "Please verify the locations of your default mail files.\n"
- "These will be created if necessary."
+ "Problem verifying path \"%s\":\n"
+ "%s"
msgstr ""
- "Confirme a localização dos seus arquivos de mensagens padrão.\n"
- "Estas localizações serão criadas caso necessário."
+ "Problema ao verificar o caminho \"%s\":\n"
+ "%s"
- #: ../libinit_balsa/assistant_page_directory.c:264
- msgid "Mail Files"
- msgstr "Arquivos de mensagens"
+ #: ../libinit_balsa/assistant_page_directory.c:224
+ #| msgid "Other options"
+ msgid "_Verify locations"
+ msgstr "_Verificar localizações"
- #: ../libinit_balsa/assistant_page_directory.c:360
- #: ../libinit_balsa/assistant_page_directory.c:394
- #, c-format
+ #: ../libinit_balsa/assistant_page_directory.c:258
+ #| msgid ""
+ #| "Please verify the locations of your default mail files.\n"
+ #| "These will be created if necessary."
msgid ""
- "Problem Creating Mailboxes\n"
- "%s"
+ "Please verify the locations of your default mail files. These will be "
+ "created if necessary."
msgstr ""
- "Problema ao criar caixas de mensagens\n"
- "%s"
+ "Confirme a localização dos seus arquivos de mensagens padrão. Estas "
+ "localizações serão criadas caso necessário."
+
+ #: ../libinit_balsa/assistant_page_directory.c:322
+ msgid "Mail Files"
+ msgstr "Arquivos de mensagens"
-#: ../libinit_balsa/assistant_page_finish.c:44
+#: ../libinit_balsa/assistant_page_finish.c:42
msgid ""
"You've successfully set up Balsa. Have fun!\n"
" -- The Balsa development team"
@@@ -2166,31 -2268,35 +2473,35 @@@ msgstr "
msgid "All Done!"
msgstr "Tudo feito!"
- #: ../libinit_balsa/assistant_page_user.c:55
+ #: ../libinit_balsa/assistant_page_user.c:57
+ #| msgid ""
+ #| "The following settings are also needed (and you can find them later, if "
+ #| "need be, in the Email application in the 'Preferences' and 'Identities' "
+ #| "commands on the 'Tools' menu)"
msgid ""
"The following settings are also needed (and you can find them later, if need "
- "be, in the Email application in the 'Preferences' and 'Identities' commands "
- "on the 'Tools' menu)"
+ "be, in the Email application in the 'Preferences' and 'Identities' menu "
+ "items)"
msgstr ""
"As seguintes configurações também são necessárias (e você pode encontrá-las "
- "mais tarde, se for necessário, no programa de e-mail nos comandos "
- "\"Preferências\" e \"Identidades\" no menu \"Ferramentas\")"
+ "mais tarde, se for necessário, no aplicativo de e-mail nos itens de menu \""
+ "Preferências\" e \"Identidades\")"
-#: ../libinit_balsa/assistant_page_user.c:63
+#: ../libinit_balsa/assistant_page_user.c:61
msgid ""
" Whoever provides your email account should be able to give you the "
"following information (if you have a Network Administrator, they may already "
"have set this up for you):"
msgstr ""
- "Quem quer que forneça sua conta de e-mail, deve lhe fornecer as seguintes "
+ " Quem quer que forneça sua conta de e-mail, deve lhe fornecer as seguintes "
"informações (se você tem um Administrador de Rede, ele pode já ter "
-"configurado isto pra você):"
+"configurado isto para você):"
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
msgid "Yes, remember it"
- msgstr "Sim, lembre-me"
+ msgstr "Sim, memorizá-la"
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
msgid "No, type it in every time"
msgstr "Não, quero digitá-la todas as vezes"
@@@ -2666,17 -2726,17 +2931,17 @@@ msgstr "A gravação da caixa de mensag
msgid "Cannot process the message: %s"
msgstr "Impossível processar a mensagem: %s"
- #: ../src/balsa-index.c:2527
+ #: ../src/balsa-index.c:2446
#, c-format
msgid "Cannot access message %u to pass to %s"
-msgstr "Não é possível acessar a mensagem %u para encaminhar para %s"
+msgstr "Não foi possível acessar a mensagem %u para encaminhar para %s"
- #: ../src/balsa-index.c:2554
+ #: ../src/balsa-index.c:2473
#, c-format
msgid "Cannot read message %u to pass to %s"
-msgstr "Não é possível ler a mensagem %u para enviar para %s"
+msgstr "Não foi possível ler a mensagem %u para enviar para %s"
- #: ../src/balsa-index.c:2723
+ #: ../src/balsa-index.c:2640
msgid "Pipe message through a program"
msgstr "Enviar a mensagem através de um programa"
@@@ -3086,14 -3103,14 +3308,14 @@@ msgstr "Erro ao carregar a imagem anexa
msgid "message headers"
msgstr "cabeçalhos da mensagem"
- #: ../src/balsa-mime-widget-message.c:170
- #: ../src/balsa-mime-widget-message.c:182
- #: ../src/balsa-mime-widget-message.c:210
- #: ../src/balsa-mime-widget-message.c:263
+ #: ../src/balsa-mime-widget-message.c:176
+ #: ../src/balsa-mime-widget-message.c:188
+ #: ../src/balsa-mime-widget-message.c:216
+ #: ../src/balsa-mime-widget-message.c:269
msgid "Content Type: external-body\n"
-msgstr "Conteúdo do tipo: external-body\n"
+msgstr "Tipo do conteúdo: external-body\n"
- #: ../src/balsa-mime-widget-message.c:171
+ #: ../src/balsa-mime-widget-message.c:177
#, c-format
msgid "Access type: local-file\n"
msgstr "Tipo de acesso: arquivo-local\n"
@@@ -3653,21 -3778,23 +3983,24 @@@ msgstr "Combina
msgid "Action"
msgstr "Ação"
- #: ../src/filter-edit-dialog.c:525
- msgid "Revert"
- msgstr "Reverter"
+ #: ../src/filter-edit-dialog.c:505
+ #| msgid "Revert"
+ msgid "Re_vert"
+ msgstr "Re_verter"
- #: ../src/filter-edit-dialog.c:576
+ #: ../src/filter-edit-dialog.c:556
+ #| msgid "A filter run dialog is open.Close it before you can modify filters."
msgid "A filter run dialog is open. Close it before you can modify filters."
msgstr ""
-"Um diálogo de filtro rodando está aberto. Feche-o antes de modificar filtros."
+"Uma janela de filtro em execução está aberta. Feche-a antes de modificar "
+"filtros."
- #: ../src/filter-edit-dialog.c:589
- msgid "Balsa Filters"
- msgstr "Filtros do Balsa"
+ #: ../src/filter-edit-dialog.c:569
+ #| msgid "_Filters"
+ msgid "Filters"
+ msgstr "Filtros"
- #: ../src/filter-edit-dialog.c:658
+ #: ../src/filter-edit-dialog.c:637
#, c-format
msgid "Filter \"%s\" has no condition."
msgstr "Filtro \"%s\" não tem condições."
@@@ -3685,16 -3812,17 +4018,17 @@@ msgstr "
"Existem diálogos de filtros abertos e em execução, feche-os antes de "
"modificar filtros."
- #: ../src/filter-export-dialog.c:75
- msgid "Balsa Filters Export"
- msgstr "Exportar filtros do Balsa"
+ #: ../src/filter-export-dialog.c:77
+ #| msgid "_Export Filters..."
+ msgid "Export Filters"
+ msgstr "Exportar filtros"
- #: ../src/filter-run-callbacks.c:182
+ #: ../src/filter-run-callbacks.c:186
#, c-format
msgid "Error displaying run filters help: %s\n"
-msgstr "Erro ao mostrar ajuda de executar filtros: %s\n"
+msgstr "Erro ao exibir ajuda da execução de filtros: %s\n"
- #: ../src/filter-run-callbacks.c:232 ../src/filter-run-callbacks.c:254
+ #: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
msgid "Error when applying filters"
msgstr "Erro ao aplicar filtros"
@@@ -3875,12 -4014,12 +4220,12 @@@ msgstr "Renomear a caixa de entrada
msgid "Cancel"
msgstr "Cancelar"
- #: ../src/folder-conf.c:670
+ #: ../src/folder-conf.c:682
#, c-format
msgid "Folder rename failed. Reason: %s"
-msgstr "Falha no nome da pasta. Razão: %s"
+msgstr "Falha ao renomear a pasta. Razão: %s"
- #: ../src/folder-conf.c:722
+ #: ../src/folder-conf.c:734
#, c-format
msgid "Folder creation failed. Reason: %s"
msgstr "Falha ao criar a pasta. Razão: %s"
@@@ -3901,20 -4040,20 +4246,20 @@@ msgstr "Subpasta IMAP remota
msgid "_Create"
msgstr "_Criar"
- #: ../src/folder-conf.c:818
+ #: ../src/folder-conf.c:832
msgid "Create subfolder"
-msgstr "Criar sub-pasta"
+msgstr "Criar subpasta"
#. INPUT FIELD CREATION
- #: ../src/folder-conf.c:826
+ #: ../src/folder-conf.c:840
msgid "_Folder name:"
msgstr "Nome da _pasta:"
- #: ../src/folder-conf.c:832
+ #: ../src/folder-conf.c:846
msgid "Host:"
-msgstr "Host:"
+msgstr "Máquina:"
- #: ../src/folder-conf.c:841
+ #: ../src/folder-conf.c:855
msgid "Subfolder of:"
msgstr "Subpasta de:"
@@@ -4151,22 -4286,22 +4492,22 @@@ msgstr "
msgid "_Mailbox Name:"
msgstr "_Nome da caixa de mensagens:"
- #: ../src/mailbox-conf.c:1159
+ #: ../src/mailbox-conf.c:1114
#, c-format
msgid "Local %s Mailbox Properties"
-msgstr "Propriedades da caixa local %s"
+msgstr "Propriedades da caixa de mensagens local %s"
- #: ../src/mailbox-conf.c:1160
+ #: ../src/mailbox-conf.c:1115
#, c-format
msgid "New Local %s Mailbox"
msgstr "Nova caixa de mensagens %s local"
- #: ../src/mailbox-conf.c:1202
+ #: ../src/mailbox-conf.c:1157
msgid "Remote Mailbox Configurator"
-msgstr "Configurador Remoto de Caixa de Mensagens"
+msgstr "Configurador da caixa de mensagens remota"
#. mailbox name
- #: ../src/mailbox-conf.c:1227 ../src/mailbox-conf.c:1339
+ #: ../src/mailbox-conf.c:1183 ../src/mailbox-conf.c:1297
msgid "Mailbox _name:"
msgstr "_Nome da caixa de mensagens:"
@@@ -4321,13 -4451,13 +4657,13 @@@ msgstr "_Esvaziar lixeira
msgid "_Edit/Apply filters"
msgstr "_Editar/Aplicar filtros"
- #: ../src/mailbox-node.c:1216
+ #: ../src/mailbox-node.c:1236
#, c-format
msgid "The path \"%s\" does not lead to a mailbox."
-msgstr "O caminho \"%s\" não leva à caixa de mensagens."
+msgstr "O caminho \"%s\" não leva à uma caixa de mensagens."
# 13
- #: ../src/mailbox-node.c:1229
+ #: ../src/mailbox-node.c:1249
#, c-format
msgid "Local mailbox %s loaded as: %s\n"
msgstr "Caixa de mensagens local %s carregada como: %s\n"
@@@ -5208,10 -4508,9 +4714,10 @@@ msgstr "
"Luiz Guaraldo <software livre terra com br>\n"
"Raphael Higino <raphaelh uai com br>\n"
"Afonso Celso Medina <afmedina uol com br>\n"
-"Henrique P Machado <zehrique gmail com>"
+"Henrique P Machado <zehrique gmail com>\n"
+"Rafael Ferreira <rafael f f1 gmail com>"
- #: ../src/main-window.c:2769
+ #: ../src/main-window.c:976
msgid "The Balsa email client is part of the GNOME desktop environment."
msgstr "O cliente de e-mail Balsa é parte do ambiente gráfico GNOME."
@@@ -5685,11 -5043,11 +5250,11 @@@ msgstr "Incluir partes HTML como texto
msgid "Layout"
msgstr "Layout"
- #: ../src/pref-manager.c:2187
+ #: ../src/pref-manager.c:2147
msgid "Sort and thread"
-msgstr "Ordenar e encadear"
+msgstr "Ordenar e agrupar"
- #: ../src/pref-manager.c:2189 ../src/print-gtk.c:499
+ #: ../src/pref-manager.c:2149 ../src/print-gtk.c:499
msgid "Message"
msgstr "Mensagem"
@@@ -5763,11 -5121,11 +5328,11 @@@ msgstr "Mensagens de advertência:
msgid "Error messages:"
msgstr "Mensagens de erro:"
- #: ../src/pref-manager.c:2330
+ #: ../src/pref-manager.c:2286
msgid "Fatal error messages:"
-msgstr "Mensagens de erro fatais:"
+msgstr "Mensagens de erros fatais:"
- #: ../src/pref-manager.c:2334
+ #: ../src/pref-manager.c:2290
msgid "Debug messages:"
msgstr "Mensagens de depuração:"
@@@ -5812,40 -5167,23 +5374,23 @@@ msgstr "Fonte do assunto:
msgid "Use default font size"
msgstr "Usar tamanho de fonte padrão"
- #: ../src/pref-manager.c:2544
+ #: ../src/pref-manager.c:2507
msgid "Sorting and threading"
-msgstr "Ordenação e encadeamento"
+msgstr "Ordenação e agrupamento"
- #: ../src/pref-manager.c:2548
+ #: ../src/pref-manager.c:2511
msgid "Default sort column:"
msgstr "Coluna de ordenação padrão:"
- #: ../src/pref-manager.c:2552
+ #: ../src/pref-manager.c:2515
msgid "Default threading style:"
-msgstr "Estilo de encadeamento padrão:"
+msgstr "Estilo de agrupamento padrão:"
- #: ../src/pref-manager.c:2557
+ #: ../src/pref-manager.c:2520
msgid "Expand threads on open"
-msgstr "Expandir encadeamentos ao abrir"
+msgstr "Expandir discussões ao abrir"
- #: ../src/pref-manager.c:2632
- msgid "Pspell settings"
- msgstr "Configurações do Pspell"
-
- #: ../src/pref-manager.c:2638
- msgid "Spell check module"
- msgstr "Módulo de correção ortográfica"
-
- #: ../src/pref-manager.c:2644
- msgid "Suggestion level"
- msgstr "Nível de sugestão"
-
- #. do the ignore length
- #: ../src/pref-manager.c:2649
- msgid "Ignore words shorter than"
- msgstr "Ignorar palavras menores que"
-
- #: ../src/pref-manager.c:2667
+ #: ../src/pref-manager.c:2573
msgid "Miscellaneous spelling settings"
msgstr "Configurações diversas de ortografia"
@@@ -5883,18 -5222,18 +5429,18 @@@ msgid "
"The following setting is global, but may be overridden for the selected "
"mailbox using Mailbox %s Hide messages:"
msgstr ""
-"A seguintes configurações são globais, mas podem ser sobrepostas pela caixa "
-"de mensagens selecionada usando %s Ocultar mensagens mensagens:"
+"As seguintes configurações são globais, mas podem ser sobrepostas pela caixa "
+"de mensagens selecionada usando Caixa de Mensagens %s Ocultar mensagens:"
- #: ../src/pref-manager.c:2750
+ #: ../src/pref-manager.c:2656
msgid "Hide messages marked as deleted"
msgstr "Ocultar mensagens marcadas como excluídas"
- #: ../src/pref-manager.c:2752
+ #: ../src/pref-manager.c:2658
msgid "The following settings are global:"
-msgstr "As configurações seguintes são globais:"
+msgstr "As seguintes configurações são globais:"
- #: ../src/pref-manager.c:2758
+ #: ../src/pref-manager.c:2664
msgid "Expunge deleted messages when mailbox is closed"
msgstr "Apagar as mensagens excluídas ao fechar a caixa de mensagens"
@@@ -6021,19 -5368,20 +5575,20 @@@ msgstr "Erro de exibição %s: %s\n
msgid "Page %d of %d"
msgstr "Página %d de %d"
- #: ../src/print-gtk.c:143 ../src/print-gtk.c:169
+ #: ../src/print-gtk.c:145 ../src/print-gtk.c:171
msgid "Signed and encrypted matter"
-msgstr "Importância e criptografia da assinatura"
+msgstr "Conteúdo assinado e criptogrado"
- #: ../src/print-gtk.c:147 ../src/print-gtk.c:173
+ #: ../src/print-gtk.c:149 ../src/print-gtk.c:175
msgid "Signed matter"
-msgstr "Material assinado"
+msgstr "Conteúdo assinado"
- #: ../src/print-gtk.c:154
+ #: ../src/print-gtk.c:156
+ #| msgid "encrypted parts"
msgid "Encrypted matter"
- msgstr "Dados criptografados"
+ msgstr "Material criptografado"
- #: ../src/print-gtk.c:197
+ #: ../src/print-gtk.c:199
#, c-format
msgid "This is an inline %s signed %s message part:"
msgstr "Essa é uma parte da mensagem com assinatura %s com o texto %s:"
@@@ -6153,17 -5505,8 +5712,8 @@@ msgid "
"keyboard accelerators, you will need to set them again."
msgstr ""
"Esta versão do Balsa usa uma nova interface de usuário. Se você modificou os "
-"atalhos do Balsa, terá que configurá-las novamente."
+"atalhos do Balsa, terá que configurá-los novamente."
- #: ../src/save-restore.c:2168
- msgid "Error opening GConf database\n"
- msgstr "Erro ao abrir banco de dados GConf\n"
-
- #: ../src/save-restore.c:2176 ../src/save-restore.c:2187
- #, c-format
- msgid "Error setting GConf field: %s\n"
- msgstr "Erro ao configurar campo do Gconf: %s\n"
-
#. Translators: please use the initial letter of each language as
#. * its accelerator; this is a long list, and unique accelerators
#. * cannot be found.
@@@ -6212,11 -5555,11 +5762,11 @@@ msgid "_Estonian
msgstr "_Estônio"
# 26
- #: ../src/sendmsg-window.c:271
+ #: ../src/sendmsg-window.c:195
msgid "_Finnish"
-msgstr "_Filandês"
+msgstr "_Finlandês"
- #: ../src/sendmsg-window.c:272
+ #: ../src/sendmsg-window.c:196
msgid "_French"
msgstr "_Francês"
@@@ -6671,12 -5763,12 +5970,12 @@@ msgstr "erro desconhecido
msgid "forwarded message"
msgstr "mensagem encaminhada"
- #: ../src/sendmsg-window.c:2110
+ #: ../src/sendmsg-window.c:1760
#, c-format
msgid "Message from %s, subject: \"%s\""
-msgstr "Mensagem de %s, assunto: \"%s\""
+msgstr "mensagem de %s, assunto: \"%s\""
- #: ../src/sendmsg-window.c:2186 ../src/sendmsg-window.c:2259
+ #: ../src/sendmsg-window.c:1838 ../src/sendmsg-window.c:1911
msgid "Remove"
msgstr "Remover"
@@@ -7197,9 -6278,9 +6485,9 @@@ msgid "
"unread"
msgstr ""
"Próxima\n"
-"Não lida"
+"não lida"
- #: ../src/toolbar-factory.c:143
+ #: ../src/toolbar-factory.c:154
msgid ""
"Next\n"
"flagged"
@@@ -7244,10 -6325,10 +6532,10 @@@ msgid "
"Request\n"
"MDN"
msgstr ""
-"Requisição\n"
+"Solicitação\n"
"MDN"
- #: ../src/toolbar-factory.c:150
+ #: ../src/toolbar-factory.c:161
msgid "Send"
msgstr "Enviar"
@@@ -7289,9 -6378,13 +6585,13 @@@ msgid "
"Filter"
msgstr ""
"Redefinir\n"
-"Filtro"
+"filtro"
- #: ../src/toolbar-factory.c:163
+ #: ../src/toolbar-factory.c:172
+ msgid "Msg Preview"
+ msgstr "Visualização"
+
+ #: ../src/toolbar-factory.c:174
msgid "Sign"
msgstr "Assinar"
@@@ -7407,79 -6500,941 +6707,1006 @@@ msgstr "Botões disponíveis
msgid "Current toolbar"
msgstr "Barra de ferramenta atual"
- #: ../src/toolbar-prefs.c:533
- msgid "Up"
- msgstr "Acima"
+ #: ../src/toolbar-prefs.c:511
+ #| msgid "Cut the selected text"
+ msgid "Move selected item up"
+ msgstr "Move o item selecionado para cima"
+
+ #: ../src/toolbar-prefs.c:521
+ #| msgid "Save selected to folder..."
+ msgid "Remove selected item from toolbar"
+ msgstr "Remove o item selecionado da barra de ferramentas"
+
+ #: ../src/toolbar-prefs.c:529
+ msgid "Add selected item to toolbar"
+ msgstr "Adiciona o item selecionado para a barra de ferramentas"
+
+ #: ../src/toolbar-prefs.c:536
+ #| msgid "Save selected to folder..."
+ msgid "Move selected item down"
+ msgstr "Move o item selecionado para baixo"
+
+ #~ msgid "the crypto engine for protocol OpenPGP is not available"
+ #~ msgstr ""
+ #~ "O mecanismo de criptografia para o protocolo OpenPGP não está disponível"
+
+ #~ msgid "the crypto engine for protocol CMS is not available"
+ #~ msgstr ""
+ #~ "O mecanismo de criptografia para o protocolo CMS não está disponível"
+
+ #~ msgid "invalid crypto engine %d"
+ #~ msgstr "Mecanismo de criptografia %d inválido"
+
+ #~ msgid "%s: %s"
+ #~ msgstr "%s: %s"
+
+ #~ msgid "Uploading %"
+ #~ msgstr "Enviando %"
+
+ #~ msgid "Gpgme has been compiled without support for protocol %s."
+ #~ msgstr "Gpgme foi compilado sem suporte para o protocolo %s."
+
+ #~ msgid "Crypto engine %s is not installed properly."
+ #~ msgstr "O mecanismo de criptografia %s não está instalado corretamente."
+
+ #~ msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+ #~ msgstr " Dica: procure pelo pacote `gnupg2' (preferido) ou `gnupg'."
+
+ #~ msgid " Hint: check the `gpgsm' package."
+ #~ msgstr " Dica: procure pelo pacote `gpgsm'."
+
+ #~ msgid ""
+ #~ "Crypto engine %s version %s is installed, but at least version %s is "
+ #~ "required."
+ #~ msgstr ""
+ #~ "O mecanismo de criptografia %s versão %s está instalado, mas no mínimo a "
+ #~ "versão %s é necessária."
+
+ #~ msgid "Unknown problem with engine for protocol %s."
+ #~ msgstr "Problema desconhecido com o mecanismo para o protocolo %s."
+
+ #~ msgid "%s: could not retrieve crypto engine information: %s."
+ #~ msgstr ""
+ #~ "%s: não foi possível recuperar informação do mecanismo de criptografia: "
+ #~ "%s."
+
+ #~ msgid "Enter passphrase to unlock the secret key for signing"
+ #~ msgstr ""
+ #~ "Digite a frase secreta para desbloquear a chave secreta para assinar"
+
+ #~ msgid "creating a gpgme context failed"
+ #~ msgstr "falha ao criar um contexto gpgme"
+
+ #~ msgid "Enter passphrase to decrypt message"
+ #~ msgstr "Digite a frase secreta para descriptografar a mensagem"
+
+ #~ msgid ""
+ #~ "\n"
+ #~ "Signed by: %s"
+ #~ msgstr ""
+ #~ "\n"
+ #~ "Assinado por: %s"
+
+ #~ msgid ""
+ #~ "\n"
+ #~ "Mail address: %s"
+ #~ msgstr ""
+ #~ "\n"
+ #~ "Endereço de e-mail: %s"
+
+ #~ msgid "_File"
+ #~ msgstr "_Arquivo"
+
+ #~ msgid "_View"
+ #~ msgstr "_Ver"
+
+ #~ msgid "Close the window"
+ #~ msgstr "Fecha a janela"
+
+ #~ msgid "_Copy"
+ #~ msgstr "_Copiar"
+
+ #~ msgid "Copy text"
+ #~ msgstr "Copia o texto"
+
+ #~ msgid "_Select Text"
+ #~ msgstr "_Selecionar texto"
+
+ #~ msgid "Select entire mail"
+ #~ msgstr "Selecione o e-mail inteiro"
+
+ #~ msgid "_Escape Special Characters"
+ #~ msgstr "Descartar Caracteres _Especiais"
+
+ #~ msgid "Escape special and non-ASCII characters"
+ #~ msgstr "Descarta caracteres especiais e não-ASCII"
+
+ #~ msgid "_Entry"
+ #~ msgstr "_Entrada"
+
+ #~ msgid "Rubrica Address Book"
+ #~ msgstr "Catálogo de endereços Rubrica"
+
+ #~ msgid "_Properties"
+ #~ msgstr "_Propriedades"
+
+ #~ msgid "Edit address book properties"
+ #~ msgstr "Edita as propriedades do catálogo de endereços"
+
+ #~ msgid "Delete address book"
+ #~ msgstr "Exclui o catálogo de endereços"
+
+ #~ msgid "_Quit"
+ #~ msgstr "Sai_r"
+
+ #~ msgid "Exit the program"
+ #~ msgstr "Sai do programa"
+
+ #~ msgid "_New Entry"
+ #~ msgstr "_Nova entrada"
+
+ #~ msgid "Add new entry"
+ #~ msgstr "Adiciona nova entrada"
+
+ #~ msgid "_Delete Entry"
+ #~ msgstr "_Excluir entrada"
+
+ #~ msgid "Delete entry"
+ #~ msgstr "Exclui a entrada"
+
+ #~ msgid "_About"
+ #~ msgstr "_Sobre"
+
+ #~ msgid ""
+ #~ "This is an inline %s signed %s message part:\n"
+ #~ "%s"
+ #~ msgstr ""
+ #~ "Essa é uma parte da mensagem com assinatura %s e com o texto %s:\n"
+ #~ "%s"
+
+ #~ msgid "... [truncated]"
+ #~ msgstr "... [truncado]"
+
+ #~ msgid "Address"
+ #~ msgstr "Endereço"
+
+ #~ msgid "S_tore"
+ #~ msgstr "Arma_zenar"
+
+ #~ msgid "Balsa Filters"
+ #~ msgstr "Filtros do Balsa"
+
+ #~ msgid "Balsa Filters Export"
+ #~ msgstr "Exportar Filtros do Balsa"
+
+ #~ msgid "_Up"
+ #~ msgstr "A_cima"
+
+ #~ msgid "Do_wn"
+ #~ msgstr "A_baixo"
+
+ #~ msgid ""
+ #~ "Balsa was built without SSL support.\n"
+ #~ "Neither SSL nor TLS can be used."
+ #~ msgstr ""
+ #~ "Balsa foi construído sem suporte SSL.\n"
+ #~ "Nem SSL nem TLS podem ser usados."
+
+ #~ msgid "Mail_box"
+ #~ msgstr "Cai_xa de Mensagens"
+
+ #~ msgid "_Message"
+ #~ msgstr "_Mensagem"
+
+ #~ msgid "_Settings"
+ #~ msgstr "Co_nfigurações"
+
+ #~ msgid "Mail_boxes"
+ #~ msgstr "Cai_xas de Mensagens"
+
+ #~ msgid "_More"
+ #~ msgstr "_Mais"
+
+ #~ msgid "_Sort Mailbox"
+ #~ msgstr "_Ordenar caixa de mensagens"
+
+ #~ msgid "H_ide messages"
+ #~ msgstr "_Ocultar mensagens"
+
+ #~ msgid "_Tools"
+ #~ msgstr "_Ferramentas"
+
+ #~ msgid "F_ilters"
+ #~ msgstr "F_iltros:"
+
+ #~ msgid "Manage filters"
+ #~ msgstr "Gerenciar filtros"
+
+ #~ msgid "_Continue"
+ #~ msgstr "_Continuar"
+
+ #~ msgid "Continue editing current message"
+ #~ msgstr "Continuar editando a mensagem atual"
+
+ #~ msgid "_Get New Mail"
+ #~ msgstr "Rece_ber novos e-mails"
+
+ #~ msgid "Fetch new incoming mail"
+ #~ msgstr "Procura novos e-mails"
+
+ #~ msgid "_Send Queued Mail"
+ #~ msgstr "_Enviar mensagem da fila"
+
+ #~ msgid "Send messages from the outbox"
+ #~ msgstr "Envia mensagens da caixa de saída"
+
+ #~ msgid "Send and _Receive Mail"
+ #~ msgstr "En_viar e receber mensagens"
+
+ #~ msgid "Send and Receive messages"
+ #~ msgstr "Envia e recebe mensagens"
+
+ #~ msgid "Page _Setup"
+ #~ msgstr "_Configurar página"
+
+ #~ msgid "Set up page for printing"
+ #~ msgstr "Configura página para impressão"
+
+ #~ msgid "_Address Book..."
+ #~ msgstr "C_atálogo de endereços..."
+
+ #~ msgid "Open the address book"
+ #~ msgstr "Abre o catálogo de endereços"
+
+ #~ msgid "Quit Balsa"
+ #~ msgstr "Sair do Balsa"
+
+ #~ msgid "_Message..."
+ #~ msgstr "_Mensagem..."
+
+ #~ msgid "Compose a new message"
+ #~ msgstr "Compor uma nova mensagem"
+
+ #~ msgid "Local mbox mailbox..."
+ #~ msgstr "Caixa de mensagens mbox local..."
+
+ #~ msgid "Add a new mbox style mailbox"
+ #~ msgstr "Adiciona nova caixa de mensagens mbox"
+
+ #~ msgid "Local Maildir mailbox..."
+ #~ msgstr "Caixa de mensagens Maildir local..."
+
+ #~ msgid "Add a new Maildir style mailbox"
+ #~ msgstr "Adiciona nova caixa de mensagens Maildir"
+
+ #~ msgid "Local MH mailbox..."
+ #~ msgstr "Caixa de mensagens MH local..."
+
+ #~ msgid "Add a new MH style mailbox"
+ #~ msgstr "Adiciona nova caixa de mensagens MH"
+
+ #~ msgid "New mailbox..."
+ #~ msgstr "Nova caixa de mensagens..."
+
+ #~ msgid "New \"Maildir\" mailbox..."
+ #~ msgstr "Nova caixa de mensagens \"Maildir\"..."
+
+ #~ msgid "New \"MH\" mailbox..."
+ #~ msgstr "Nova caixa de mensagens \"MH\"..."
+
+ #~ msgid "Add a new IMAP mailbox"
+ #~ msgstr "Adiciona nova caixa de mensagens IMAP"
+
+ #~ msgid "Add a new IMAP folder"
+ #~ msgstr "Adicionar nova pasta IMAP"
+
+ #~ msgid "Remote IMAP subfolder..."
+ #~ msgstr "Subpasta IMAP remota..."
+
+ #~ msgid "Add a new IMAP subfolder"
+ #~ msgstr "Adicionar nova subpasta IMAP"
+
+ #~ msgid "F_ilters..."
+ #~ msgstr "F_iltros..."
+
+ #~ msgid "Export filters as Sieve scripts"
+ #~ msgstr "Exporta filtros como scripts Sieve"
+
+ #~ msgid "Prefere_nces"
+ #~ msgstr "Preferê_ncias"
+
+ #~ msgid "E_xpand All"
+ #~ msgstr "E_xpandir tudo"
+
+ #~ msgid "Expand all threads"
+ #~ msgstr "Expande todos os encadeamentos"
+
+ #~ msgid "_Collapse All"
+ #~ msgstr "Re_colher tudo"
+
+ #~ msgid "Collapse all expanded threads"
+ #~ msgstr "Recolhe todos os encadeamentos expandidos"
+
+ #~ msgid "Increase magnification"
+ #~ msgstr "Aumenta o zoom"
+
+ #~ msgid "Decrease magnification"
+ #~ msgstr "Diminui o zoom"
+
+ #~ msgid "No magnification"
+ #~ msgstr "Sem aumento ou diminuição do zoom"
+
+ #~ msgid "Next Unread Message"
+ #~ msgstr "Próxima mensagem não lida"
+
+ #~ msgid "Empty _Trash"
+ #~ msgstr "Esvaziar _lixeira"
+
+ #~ msgid "Delete messages from the Trash mailbox"
+ #~ msgstr "Exclui mensagens da lixeira"
+
+ #~ msgid "_Toolbars..."
+ #~ msgstr "_Barras de ferramentas..."
+
+ #~ msgid "Customize toolbars"
+ #~ msgstr "Personaliza as barras de ferramentas"
+
+ #~ msgid "_Identities..."
+ #~ msgstr "_Identidades..."
+
+ #~ msgid "Create and set current identities"
+ #~ msgstr "Cria e configura identidades atuais"
+
+ #~ msgid "_Contents"
+ #~ msgstr "S_umário"
+
+ #~ msgid "Table of Contents"
+ #~ msgstr "Tabela de conteúdo"
+
+ #~ msgid "_Find"
+ #~ msgstr "_Localizar"
+
+ #~ msgid "Find Ne_xt"
+ #~ msgstr "Localizar pró_xima"
- #: ../src/toolbar-prefs.c:549
- msgid "Down"
- msgstr "Abaixo"
+ #~ msgid "Next Message"
+ #~ msgstr "Próxima mensagem"
+
+ #~ msgid "Previous Message"
+ #~ msgstr "Mensagem anterior"
+
+ #~ msgid "Next Flagged Message"
+ #~ msgstr "Próxima mensagem marcada"
+
+ #~ msgid "_Hide Messages"
+ #~ msgstr "_Ocultar mensagens"
+
+ #~ msgid "_Reset Filter"
+ #~ msgstr "_Restaurar filtro"
+
+ #~ msgid "Reset mailbox filter"
+ #~ msgstr "Redefine o filtro da caixa de mensagens"
+
+ #~ msgid "_Select All"
+ #~ msgstr "_Selecionar tudo"
+
+ #~ msgid "Select all messages in current mailbox"
+ #~ msgstr "Seleciona todas as mensagens na caixa de mensagens atual"
+
+ #~ msgid "_Delete..."
+ #~ msgstr "E_xcluir..."
+
+ #~ msgid "Delete the selected mailbox"
+ #~ msgstr "Exclui a caixa de mensagens selecionada"
+
+ #~ msgid "E_xpunge Deleted Messages"
+ #~ msgstr "Excluir _permanentemente as mensagens"
+
+ #~ msgid "Expunge messages marked as deleted in the current mailbox"
+ #~ msgstr ""
+ #~ "Exclui permanentemente da caixa de mensagens atual as mensagens marcadas "
+ #~ "como excluídas"
+
+ #~ msgid "Close mailbox"
+ #~ msgstr "Fechar a caixa de mensagens"
+
+ #~ msgid "Select _Filters"
+ #~ msgstr "Sele_cionar filtros"
+
+ #~ msgid "Select filters to be applied automatically to current mailbox"
+ #~ msgstr ""
+ #~ "Seleciona filtros para serem aplicados automaticamente à caixa de "
+ #~ "mensagens atual"
+
+ #~ msgid "_Remove Duplicates"
+ #~ msgstr "_Remover duplicatas"
+
+ #~ msgid "Reply to the current message"
+ #~ msgstr "Responde à mensagem atual"
+
+ #~ msgid "Reply to _All..."
+ #~ msgstr "Responder a _todos..."
+
+ #~ msgid "Reply to all recipients of the current message"
+ #~ msgstr "Responde a todos os destinatários da mensagem"
+
+ #~ msgid "Reply to _Group..."
+ #~ msgstr "Responder ao _grupo..."
+
+ #~ msgid "Reply to mailing list"
+ #~ msgstr "Responde à lista de discussão"
+
+ #~ msgid "Store address of sender in addressbook"
+ #~ msgstr "Armazenar endereço do remetente no catálogo de endereços"
+
+ #~ msgid "_View Source..."
+ #~ msgstr "_Ver código-fonte..."
+
+ #~ msgid "View source form of the message"
+ #~ msgstr "Visualiza o código fonte da mensagem"
+
+ #~ msgid "_Forward..."
+ #~ msgstr "_Encaminhar..."
+
+ #~ msgid "Forward the current message"
+ #~ msgstr "Encaminha a mensagem atual"
+
+ #~ msgid "_Forward attached..."
+ #~ msgstr "_Encaminhar anexada..."
+
+ #~ msgid "Forward the current message as attachment"
+ #~ msgstr "Reenvia a mensagem atual como anexo"
+
+ #~ msgid "Forward _inline..."
+ #~ msgstr "Encamin_har..."
+
+ #~ msgid "Forward the current message inline"
+ #~ msgstr "Encaminha a mensagem atual com o texto"
+
+ #~ msgid "Pipe the message through another program"
+ #~ msgstr "Envia a mensagens através de outro programa"
+
+ #~ msgid "Select _Thread"
+ #~ msgstr "Selecionar _Discussão"
+
+ #~ msgid "Select all messages in current thread"
+ #~ msgstr "Seleciona todas as mensagens na conversa atual"
+
+ #~ msgid "Print current message"
+ #~ msgstr "Imprime a mensagem atual"
+
+ #~ msgid "Save Current Part..."
+ #~ msgstr "Salvar a parte atual..."
+
+ #~ msgid "Save currently displayed part of message"
+ #~ msgstr "Salva a parte da mensagem atualmente exibida"
+
+ #~ msgid "_Next Part"
+ #~ msgstr "_Próxima parte"
+
+ #~ msgid "Next part in message"
+ #~ msgstr "Próxima parte da mensagem"
+
+ #~ msgid "_Previous Part"
+ #~ msgstr "Parte _anterior"
+
+ #~ msgid "Previous part in message"
+ #~ msgstr "Parte anterior da mensagem"
+
+ #~ msgid "Copy message"
+ #~ msgstr "Copiar mensagem"
+
+ #~ msgid "Find in _Message"
+ #~ msgstr "Localizar na _mensagem"
+
+ #~ msgid "Find a string in this message"
+ #~ msgstr "Localiza um texto nesta mensagem"
+
+ #~ msgid "_Move to Trash"
+ #~ msgstr "_Mover para lixeira"
+
+ #~ msgid "Move the current message to Trash mailbox"
+ #~ msgstr "Move a mensagem atual para a lixeira"
+
+ #~ msgid "_Delete to Trash"
+ #~ msgstr "E_xcluir para a lixeira"
+
+ #~ msgid "Toggle New"
+ #~ msgstr "Alternar nova"
+
+ #~ msgid "_Toggle Flag"
+ #~ msgstr "Alter_nar marca"
+
+ #~ msgid "Toggle flagged"
+ #~ msgstr "(Des)Marcar"
+
+ #~ msgid "_Deleted"
+ #~ msgstr "E_xcluídas"
+
+ #~ msgid "Toggle deleted flag"
+ #~ msgstr "Alterna a marca de excluída"
+
+ #~ msgid "_Answered"
+ #~ msgstr "Respondid_a"
+
+ #~ msgid "Toggle Answered"
+ #~ msgstr "Alternar respondida"
+
+ #~ msgid "_Show Mailbox Tree"
+ #~ msgstr "_Mostrar árvore da caixa de mensagens"
+
+ #~ msgid "Toggle display of mailbox and folder tree"
+ #~ msgstr "Alternar exibição de árvore da caixa de mensagens e da pasta"
+
+ #~ msgid "Show Mailbox _Tabs"
+ #~ msgstr "Mostrar _abas da caixa de mensagens"
+
+ #~ msgid "Toggle display of mailbox notebook tabs"
+ #~ msgstr "Alterna exibição de abas de notas da caixa de mensagens"
+
+ #~ msgid "Show Too_lbar"
+ #~ msgstr "Mostrar _Barra de ferramentas"
+
+ #~ msgid "Show St_atus Bar"
+ #~ msgstr "Mostrar B_arra de status"
+
+ #~ msgid "Show _Index Filter"
+ #~ msgstr "Mostrar F_iltro de índice"
+
+ #~ msgid "_Descending"
+ #~ msgstr "_Decrescente"
+
+ #~ msgid "Sort in a descending order"
+ #~ msgstr "Ordena de forma decrescente"
+
+ #~ msgid "_View filter"
+ #~ msgstr "_Ver Filtro"
+
+ #~ msgid "Enable quick message index filter"
+ #~ msgstr "Habilita o filtro rápido de índice de mensagens"
+
+ #~ msgid "_Wrap"
+ #~ msgstr "_Quebrar"
+
+ #~ msgid "Wrap message lines"
+ #~ msgstr "Quebra linhas da mensagem"
+
+ #~ msgid "Un_Deleted"
+ #~ msgstr "_Não Excluídas"
+
+ #~ msgid "_Read"
+ #~ msgstr "_Lida"
+
+ #~ msgid "Un_read"
+ #~ msgstr "_Não lida"
+
+ #~ msgid "Un_flagged"
+ #~ msgstr "Não _marcada"
+
+ #~ msgid "Un_answered"
+ #~ msgstr "Não respondid_a"
+
+ #~ msgid "Show all headers"
+ #~ msgstr "Mostra todos os cabeçalhos"
+
+ #~ msgid "Show preview pane"
+ #~ msgstr "Mostra o painel de visualização"
+
+ #~ msgid "_No Headers"
+ #~ msgstr "_Sem cabeçalhos"
+
+ #~ msgid "Display no headers"
+ #~ msgstr "Não mostra cabeçalhos"
+
+ #~ msgid "S_elected Headers"
+ #~ msgstr "Cab_eçalhos selecionados"
+
+ #~ msgid "Display selected headers"
+ #~ msgstr "Mostra cabeçalhos selecionados"
+
+ #~ msgid "All _Headers"
+ #~ msgstr "Todos os _cabeçalhos"
+
+ #~ msgid "Display all headers"
+ #~ msgstr "Mostra todos os cabeçalhos"
+
+ #~ msgid "_Flat index"
+ #~ msgstr "_Índice plano"
+
+ #~ msgid "No threading at all"
+ #~ msgstr "Sem encadeamento algum"
+
+ #~ msgid "Si_mple threading"
+ #~ msgstr "Enca_deamento simples"
+
+ #~ msgid "Simple threading algorithm"
+ #~ msgstr "Algoritmo de encadeamento simples"
+
+ #~ msgid "_JWZ threading"
+ #~ msgstr "Encadeamento _JWZ"
+
+ #~ msgid "Elaborate JWZ threading"
+ #~ msgstr "Preparar encadeamento JWZ"
+
+ #~ msgid "By _Arrival"
+ #~ msgstr "Por _chegada"
+
+ #~ msgid "Arrival order"
+ #~ msgstr "Ordem de chegada"
+
+ #~ msgid "By _Sender"
+ #~ msgstr "Por _remetente"
+
+ #~ msgid "Sender order"
+ #~ msgstr "Ordem de remetente"
+
+ #~ msgid "By S_ubject"
+ #~ msgstr "Por _assunto"
+
+ #~ msgid "Subject order"
+ #~ msgstr "Ordem de assunto"
+
+ #~ msgid "By Si_ze"
+ #~ msgstr "Por _tamanho"
+
+ #~ msgid "By message size"
+ #~ msgstr "Pelo tamanho das mensagens"
+
+ #~ msgid "_Threaded"
+ #~ msgstr "_Encadeamento"
+
+ #~ msgid "Use message threading"
+ #~ msgstr "Usar encadeamento de mensagens"
+
+ #~ msgid "Balsa: you have received %d new message."
+ #~ msgid_plural "Balsa: you have received %d new messages."
+ #~ msgstr[0] "Balsa: você recebeu %d mensagem nova."
+ #~ msgstr[1] "Balsa: você recebeu %d mensagens novas."
+
+ #~ msgid "Balsa: you have new mail."
+ #~ msgstr "Balsa: você tem nova mensagem."
+
+ #~ msgid "Could not write to %s: %s"
+ #~ msgstr "Não foi possível gravar em %s: %s"
+
+ #~ msgid "Attach file at PATH"
+ #~ msgstr "Anexar arquivo em CAMINHO"
+
+ #~ msgid ""
+ #~ "Run '%s --help' to see a full list of available command line options.\n"
+ #~ msgstr ""
+ #~ "Execute \"%s --help\" para ver a lista completa de opções de linha de "
+ #~ "comando disponíveis.\n"
+
+ #~ msgid "Close the message window"
+ #~ msgstr "Fecha a janela da mensagem"
+
+ #~ msgid "_Find in message"
+ #~ msgstr "_Localizar na mensagen"
+
+ #~ msgid "Move the message to Trash mailbox"
+ #~ msgstr "Mover a mensagem atual para a lixeira da caixa de mensagens"
+
+ #~ msgid "Show toolbar"
+ #~ msgstr "Mostrar barra de ferramentas"
+
+ #~ msgid "_Selected Headers"
+ #~ msgstr "Cabeçalhos _selecionados"
+
+ #~ msgid "Fast"
+ #~ msgstr "Rápido"
+
+ #~ msgid "Normal"
+ #~ msgstr "Normal"
+
+ #~ msgid "Bad spellers"
+ #~ msgstr "Corretores ortográficos inválidos"
+
+ #~ msgid "Composition window"
+ #~ msgstr "Janela de composição"
+
+ #~ msgid "Invalid or incomplete address label color"
+ #~ msgstr "Cor de identificação de endereço inválido ou incompleto"
+
+ #~ msgid "Pspell settings"
+ #~ msgstr "Configurações do Pspell"
+
+ #~ msgid "Spell check module"
+ #~ msgstr "Módulo de correção ortográfica"
+
+ #~ msgid "Suggestion level"
+ #~ msgstr "Nível de sugestão"
+
+ #~ msgid "Ignore words shorter than"
+ #~ msgstr "Ignorar palavras menores que"
+
+ #~ msgid "Error displaying link_id %s: %s\n"
+ #~ msgstr "Erro ao exibir o link_id %s: %s\n"
+
+ #~ msgid "Error opening GConf database\n"
+ #~ msgstr "Erro ao abrir banco de dados GConf\n"
+
+ #~ msgid "Error setting GConf field: %s\n"
+ #~ msgstr "Erro ao configurar campo do Gconf: %s\n"
+
+ #~ msgid "_Show"
+ #~ msgstr "_Mostrar"
+
+ #~ msgid "_Options"
+ #~ msgstr "_Opções"
+
+ #~ msgid "_Include File..."
+ #~ msgstr "_Incluir arquivo..."
+
+ #~ msgid "Include a file"
+ #~ msgstr "Inclui um arquivo"
+
+ #~ msgid "_Attach File..."
+ #~ msgstr "_Anexar arquivo..."
+
+ #~ msgid "Attach a file"
+ #~ msgstr "Anexa um arquivo"
+
+ #~ msgid "I_nclude Message(s)"
+ #~ msgstr "I_ncluir mensagem(ns)"
+
+ #~ msgid "Include selected message(s)"
+ #~ msgstr "I_nclui mensagem(ns) selecionada(s)"
+
+ #~ msgid "Attach _Message(s)"
+ #~ msgstr "Anexar _mensagem(ns)"
+
+ #~ msgid "Attach selected message(s)"
+ #~ msgstr "Anexa _mensagem(ns) selecionada(s)"
+
+ #~ msgid "_Save"
+ #~ msgstr "_Salvar"
+
+ #~ msgid "Save this message"
+ #~ msgstr "Salva esta mensagem"
+
+ #~ msgid "Print the edited message"
+ #~ msgstr "Imprimir a mensagem editada"
+
+ # Manter a tecla de acesso igual à usada no GTK+
+ #~ msgid "_Undo"
+ #~ msgstr "Desfa_zer"
+
+ #~ msgid "Undo most recent change"
+ #~ msgstr "Desfaz a alteração mais recente"
+
+ # Manter a tecla de acesso igual à usada no GTK+
+ #~ msgid "_Redo"
+ #~ msgstr "_Refazer"
+
+ #~ msgid "Redo most recent change"
+ #~ msgstr "Refaz a alteração mais recente"
+
+ #~ msgid "Cu_t"
+ #~ msgstr "Recor_tar"
+
+ #~ msgid "Copy to the clipboard"
+ #~ msgstr "Copia para a área de transferência"
+
+ # Manter a tecla de acesso igual à usada no GTK+
+ #~ msgid "_Paste"
+ #~ msgstr "C_olar"
+
+ #~ msgid "Paste from the clipboard"
+ #~ msgstr "Cola da área de transferência"
+
+ #~ msgid "_Wrap Body"
+ #~ msgstr "_Quebrar Corpo"
+
+ #~ msgid "_Reflow Selected Text"
+ #~ msgstr "_Refluir o texto selecionado"
+
+ #~ msgid "Insert Si_gnature"
+ #~ msgstr "Inserir assina_tura"
+
+ #~ msgid "_Quote Message(s)"
+ #~ msgstr "Citar mensa_gem(ns)"
+
+ #~ msgid "C_heck Spelling"
+ #~ msgstr "Verificar _ortografia"
+
+ #~ msgid "Check the spelling of the message"
+ #~ msgstr "Verifica a ortografia da mensagem"
+
+ #~ msgid "Select _Identity..."
+ #~ msgstr "Selecionar i_dentidade..."
+
+ #~ msgid "Select the Identity to use for the message"
+ #~ msgstr "Seleciona qual identidade usar na mensagem"
+
+ #~ msgid "_Edit with Gnome-Editor"
+ #~ msgstr "_Editar com Gnome-Editor"
+
+ #~ msgid "Edit the current message with the default Gnome editor"
+ #~ msgstr "Edita a mensagem atual com o editor Gnome padrão"
+
+ #~ msgid "Sen_d"
+ #~ msgstr "En_viar"
+
+ #~ msgid "Send this message"
+ #~ msgstr "Envia esta mensagem"
+
+ #~ msgid "_Queue"
+ #~ msgstr "_Colocar na fila"
+
+ #~ msgid "Queue this message in Outbox for sending"
+ #~ msgstr "Coloca esta mensagem na caixa de saída para envio posterior"
+
+ #~ msgid "_Postpone"
+ #~ msgstr "_Adiar"
+
+ #~ msgid "Save this message and close"
+ #~ msgstr "Salva esta mensagem e fecha"
+
+ #~ msgid "Send _Later"
+ #~ msgstr "Enviar mais _tarde"
+
+ #~ msgid "Sa_ve and Close"
+ #~ msgstr "Sal_var e fechar"
+
+ #~ msgid "Too_lbar"
+ #~ msgstr "_Barra de ferramenta"
+
+ #~ msgid "F_rom"
+ #~ msgstr "D_e"
+
+ #~ msgid "Rec_ipients"
+ #~ msgstr "Dest_inatários"
+
+ #~ msgid "R_eply To"
+ #~ msgstr "R_esponder para"
+
+ #~ msgid "F_cc"
+ #~ msgstr "F_cc"
+
+ #~ msgid "_Request Disposition Notification"
+ #~ msgstr "Solicita_r notificação de recebimento"
+
+ #~ msgid "Request Message Disposition Notification"
+ #~ msgstr "Solicitar notificação de recebimento"
+
+ #~ msgid "_Format = Flowed"
+ #~ msgstr "_Formato = Preenchido"
+
+ #~ msgid "Send as plain text and _HTML"
+ #~ msgstr "Enviar como texto puro e _HTML"
+
+ #~ msgid "_Sign Message"
+ #~ msgstr "A_ssinar mensagem"
+
+ #~ msgid "Sign message using GPG"
+ #~ msgstr "Assina a mensagem com GPG"
+
+ #~ msgid "_Encrypt Message"
+ #~ msgstr "Criptografar a m_ensagem"
+
+ #~ msgid "Encrypt message using GPG"
+ #~ msgstr "Criptografa a mensagem com GPG"
+
+ #~ msgid "signs the message using GnuPG"
+ #~ msgstr "assina a mensagem com GnuPG"
+
+ #~ msgid "signs the message using GnuPG for all To: and CC: recipients"
+ #~ msgstr "assina a mensagem usando GnuPG a todos os destinatários Para: e CC:"
+
+ #~ msgid "_GnuPG uses MIME mode"
+ #~ msgstr "_GnuPG usa modo MIME"
+
+ #~ msgid "_GnuPG uses old OpenPGP mode"
+ #~ msgstr "_GnuPG usa o antigo modo OpenPGP"
+
+ #~ msgid "_S/MIME mode (GpgSM)"
+ #~ msgstr "Modo _S/MIME (GpgSM)"
+
+ #~ msgid "Could not compile %s"
+ #~ msgstr "Não foi possível compilar %s"
+
+ #~ msgid "Quoted Text Regular Expression"
+ #~ msgstr "Expressão Regular do texto citado"
+
+ #~ msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
+ #~ msgstr ""
+ #~ "BalsaSpellCheck: A compilação da expressão regular do texto citado "
+ #~ "falhou\n"
+
+ #~ msgid ""
+ #~ "BalsaSpellCheck: Learn operation failed;\n"
+ #~ "%s\n"
+ #~ msgstr ""
+ #~ "BalsaSpellCheck: A operação de aprendizado falhou;\n"
+ #~ "%s\n"
+
+ #~ msgid "BalsaSpellCheck: Learn operation failed.\n"
+ #~ msgstr "BalsaSpellCheck: A operação de aprendizado falhou.\n"
+
+ #~ msgid "BalsaSpellCheck: Suggest %s (%s)\n"
+ #~ msgstr "BalsaSpellCheck: Sugiro %s (%s)\n"
+
+ #~ msgid "Save this address and close the dialog?"
+ #~ msgstr "Salvar este endereço e fechar o diálogo?"
+
+ #~ msgid "Choose Address Book"
+ #~ msgstr "Escolha o catálogo de endereços"
+
+ #~ msgid "Choose Address"
+ #~ msgstr "Escolha o endereço"
+
+ #~ msgid "Up"
+ #~ msgstr "Acima"
+
+ #~ msgid "Down"
+ #~ msgstr "Abaixo"
+#~ msgid "the crypto engine for protocol OpenPGP is not available"
+#~ msgstr ""
+#~ "O mecanismo de criptografia para o protocolo OpenPGP não está disponível"
+
+#~ msgid "the crypto engine for protocol CMS is not available"
+#~ msgstr ""
+#~ "O mecanismo de criptografia para o protocolo CMS não está disponível"
+
+#~ msgid "invalid crypto engine %d"
+#~ msgstr "Mecanismo de criptografia %d inválido"
+
+#~ msgid "Gpgme has been compiled without support for protocol %s."
+#~ msgstr "Gpgme foi compilado sem suporte para o protocolo %s."
+
+#~ msgid "Crypto engine %s is not installed properly."
+#~ msgstr "O mecanismo de criptografia %s não está instalado corretamente."
+
+#~ msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+#~ msgstr " Dica: procure pelo pacote `gnupg2' (preferido) ou `gnupg'."
+
+#~ msgid " Hint: check the `gpgsm' package."
+#~ msgstr " Dica: procure pelo pacote `gpgsm'."
+
+#~ msgid ""
+#~ "Crypto engine %s version %s is installed, but at least version %s is "
+#~ "required."
+#~ msgstr ""
+#~ "O mecanismo de criptografia %s versão %s está instalado, mas no mínimo a "
+#~ "versão %s é necessária."
+
+#~ msgid "Unknown problem with engine for protocol %s."
+#~ msgstr "Problema desconhecido com o mecanismo para o protocolo %s."
+
+#~ msgid "%s: could not retrieve crypto engine information: %s."
+#~ msgstr ""
+#~ "%s: não foi possível recuperar informação do mecanismo de criptografia: "
+#~ "%s."
+
+#~ msgid "Enter passphrase to unlock the secret key for signing"
+#~ msgstr ""
+#~ "Digite a frase secreta para desbloquear a chave secreta para assinar"
+
+#~ msgid "creating a gpgme context failed"
+#~ msgstr "falha ao criar um contexto gpgme"
+
+#~ msgid "Enter passphrase to decrypt message"
+#~ msgstr "Digite a frase secreta para descriptografar a mensagem"
+
+#~ msgid ""
+#~ "\n"
+#~ "Signed by: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Assinado por: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mail address: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Endereço de e-mail: %s"
+
+#~ msgid "Uploading %"
+#~ msgstr "Enviando %"
+
#~ msgid "Local Mailbox Configurator"
#~ msgstr "Configurador da Caixa de Mensagens Local"
diff --cc po/ro.po
index 73a3cf2,24c2850..54cd4ae
--- a/po/ro.po
+++ b/po/ro.po
@@@ -1007,8 -1010,8 +1010,7 @@@ msgstr "Se descarcă %ld kB
#: ../libbalsa/mailbox_imap.c:1614
#, c-format
msgid ""
--"IMAP SEARCH command failed for mailbox %s\n"
--"falling back to default searching method"
++"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
msgstr ""
"Comanda IMAP SEARCH a eșuat penrtu căsuța %s.\n"
"Se revine la metoda de căutare implicită."
@@@ -3564,11 -3609,11 +3608,11 @@@ msgid "_Filter name:
msgstr "Nume _filtru:"
#. The filter op-code : "OR" or "AND" all the conditions
- #: ../src/filter-edit-dialog.c:287
- msgid "Operation between conditions"
- msgstr "Operator între condiții"
+ #: ../src/filter-edit-dialog.c:275
+ msgid "Operation between conditions:"
+ msgstr "Operator între condiții:"
-#: ../src/filter-edit-dialog.c:317
+#: ../src/filter-edit-dialog.c:337
msgid "Ne_w"
msgstr "_Nou"
@@@ -4196,6 -4241,6 +4240,11 @@@ msgstr "Se scanează %s. Așteptați...
#: ../src/mailbox-node.c:507
#, c-format
++msgid "Scanning %s. Please wait..."
++msgstr "Se scanează %s. Așteptați..."
++
++#: ../src/mailbox-node.c:507
++#, c-format
msgid ""
"Scanning of %s failed: %s\n"
"Check network connectivity."
diff --cc po/sr.po
index abcf76c,d92f49b..c472dd6
--- a/po/sr.po
+++ b/po/sr.po
@@@ -281,7 -238,41 +238,41 @@@ msgstr "И
msgid "Or"
msgstr "Или"
- #: ../libbalsa/gmime-application-pkcs7.c:123
+ #: ../libbalsa/filter-file.c:135
+ #, c-format
+ msgid "Invalid filters %s for mailbox %s"
-msgstr "Неисправни филтери %s за сандуче %s"
++msgstr "Неисправни пропусники %s за сандуче %s"
+
+ #: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:866
+ msgid "Unable to load message body to match filter"
+ msgstr "Не могу да учитам тело поруке које одговара филтеру"
+
+ #: ../libbalsa/filter.c:234
+ #, c-format
-msgid "Invalid filter: %s"
-msgstr "Неисправан филтер: %s"
++msgid "Header:%s"
++msgstr "Заглавље:%s"
+
+ #: ../libbalsa/filter.c:282 ../libbalsa/filter.c:305
+ #, c-format
-msgid "Bad mailbox name for filter: %s"
-msgstr "Лош назив сандучета за филтер: %s"
++msgid ",%s"
++msgstr ",%s"
+
+ #: ../libbalsa/filter.c:286
+ #, c-format
+ msgid "Error when copying messages: %s"
+ msgstr "Грешка при умножавању порука: %s"
+
+ #: ../libbalsa/filter.c:296
+ #, c-format
+ msgid "Error when trashing messages: %s"
+ msgstr "Грешка при премештању порука у смеће: %s"
+
+ #: ../libbalsa/filter.c:309
+ #, c-format
+ msgid "Error when moving messages: %s"
+ msgstr "Грешка при премештању порука: %s"
+
+ #: ../libbalsa/gmime-application-pkcs7.c:125
#, c-format
msgid "Failed to decrypt MIME part: parse error"
msgstr "Не могу да дешифрујем МИМЕ део: грешка у обради"
@@@ -1115,21 -1210,21 +1210,20 @@@ msgstr "Не могу да створи
msgid "Could not create a MailDir at %s (%s)"
msgstr "Не могу да створим „MailDir“ у %s (%s)"
- #: ../libbalsa/mailbox_maildir.c:339 ../libbalsa/mailbox_mh.c:292
+ #: ../libbalsa/mailbox_maildir.c:337 ../libbalsa/mailbox_mh.c:291
#, c-format
msgid ""
--"Could not remove contents of %s:\n"
--"%s"
++"%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
msgstr ""
"Не могу да уклоним садржај %s:\n"
"%s"
- #: ../libbalsa/mailbox_maildir.c:345 ../libbalsa/mailbox_mbox.c:324
- #: ../libbalsa/mailbox_mh.c:298
+ #: ../libbalsa/mailbox_maildir.c:343 ../libbalsa/mailbox_mbox.c:316
+ #: ../libbalsa/mailbox_mh.c:297
#, c-format
msgid ""
--"Could not remove %s:\n"
--"%s"
++"%s: a key with id %s is present, but it is expired, disabled, revoked or "
++"invalid"
msgstr ""
"Не могу да уклоним %s:\n"
"%s"
@@@ -3481,28 -3524,28 +3523,28 @@@ msgstr "
msgid "Search T_ype:"
msgstr "_Врста претраге:"
- #: ../src/filter-edit-callbacks.c:1278
+ #: ../src/filter-edit-callbacks.c:1256
msgid "Edit condition for filter: "
-msgstr "Уреди услов филтера: "
+msgstr "Уреди услов пропусника: "
- #: ../src/filter-edit-callbacks.c:1496 ../src/save-restore.c:1971
+ #: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1893
msgid "Filter with no condition was omitted"
msgstr "Пропусник без услова је изостављен"
- #: ../src/filter-edit-callbacks.c:1522
+ #: ../src/filter-edit-callbacks.c:1502
#, c-format
msgid "Error displaying filter help: %s\n"
- msgstr "Грешка приказивања помоћи пропусника: %s\n"
+ msgstr "Грешка приказивања помоћи филтера: %s\n"
- #: ../src/filter-edit-callbacks.c:1721
+ #: ../src/filter-edit-callbacks.c:1701
msgid "New filter"
-msgstr "Нови филтер"
+msgstr "Нови пропусник"
- #: ../src/filter-edit-callbacks.c:1850
+ #: ../src/filter-edit-callbacks.c:1830
msgid "No filter name specified."
- msgstr "Није наведен назив пропусника."
+ msgstr "Није наведен назив филтера."
- #: ../src/filter-edit-callbacks.c:1855
+ #: ../src/filter-edit-callbacks.c:1835
#, c-format
msgid "Filter \"%s\" already exists."
msgstr "Пропусник „%s“ већ постоји."
@@@ -3573,16 -3616,20 +3615,20 @@@ msgid "AND
msgstr "И"
#. The name entry
- #: ../src/filter-edit-dialog.c:267
+ #: ../src/filter-edit-dialog.c:260
msgid "_Filter name:"
-msgstr "Назив _филтера:"
+msgstr "Назив _пропусника:"
#. The filter op-code : "OR" or "AND" all the conditions
- #: ../src/filter-edit-dialog.c:285
- msgid "Operation between conditions"
- msgstr "Операција над условима"
+ #: ../src/filter-edit-dialog.c:274
+ msgid "Operation between conditions:"
+ msgstr "Операција над условима:"
- #: ../src/filter-edit-dialog.c:335
+ #: ../src/filter-edit-dialog.c:311
+ msgid "_Edit"
+ msgstr "_Уређивање"
+
+ #: ../src/filter-edit-dialog.c:316
msgid "Ne_w"
msgstr "Но_во"
@@@ -3644,33 -3697,34 +3696,34 @@@ msgstr "Филтери
msgid "Filter \"%s\" has no condition."
msgstr "Пропусник „%s“ нема услов."
- #: ../src/filter-export-callbacks.c:57
+ #: ../src/filter-export-callbacks.c:59
#, c-format
msgid "Unable to export filter %s, an error occurred."
-msgstr "Не могу да извезем филтер %s, дошло је до грешке."
+msgstr "Не могу да извезем пропусник %s, дошло је до грешке."
- #: ../src/filter-export-dialog.c:63
+ #: ../src/filter-export-dialog.c:65
msgid ""
"There are opened filter run dialogs, close them before you can modify "
"filters."
msgstr ""
- "Отворени су прозорчићи за покретање пропусника. Затворите их да бисте могли "
- "да мењате пропуснике."
+ "Отворени су прозорчићи за покретање филтера, затворите их да бисте могли да "
+ "мењате филтере."
- #: ../src/filter-export-dialog.c:75
- msgid "Balsa Filters Export"
- msgstr "Извоз Балсиних пропусника"
+ #: ../src/filter-export-dialog.c:77
+ #| msgid "_Export Filters..."
+ msgid "Export Filters"
+ msgstr "Извези филтере"
- #: ../src/filter-run-callbacks.c:182
+ #: ../src/filter-run-callbacks.c:186
#, c-format
msgid "Error displaying run filters help: %s\n"
- msgstr "Грешка приказивања помоћи за покретање пропусника: %s\n"
+ msgstr "Грешка приказивања помоћи за покретање филтера: %s\n"
- #: ../src/filter-run-callbacks.c:232 ../src/filter-run-callbacks.c:254
+ #: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
msgid "Error when applying filters"
-msgstr "Грешка при примени филтера"
+msgstr "Грешка при примени пропусника"
- #: ../src/filter-run-callbacks.c:235 ../src/filter-run-callbacks.c:257
+ #: ../src/filter-run-callbacks.c:239 ../src/filter-run-callbacks.c:261
#, c-format
msgid "Filter applied to \"%s\"."
msgstr "Пропусник је примењен на „%s“."
@@@ -4282,11 -4338,11 +4337,11 @@@ msgstr "Означи као „с_ки�
msgid "_Empty trash"
msgstr "_Избаци смеће"
- #: ../src/mailbox-node.c:1128
+ #: ../src/mailbox-node.c:1149
msgid "_Edit/Apply filters"
-msgstr "_Уреди/примени филтере"
+msgstr "_Уреди/примени пропуснике"
- #: ../src/mailbox-node.c:1216
+ #: ../src/mailbox-node.c:1236
#, c-format
msgid "The path \"%s\" does not lead to a mailbox."
msgstr "Путања „%s“ не води ка сандучету."
@@@ -6084,11 -5356,11 +5355,11 @@@ msgstr "_Десно
msgid "Error printing message: %s"
msgstr "Грешка штампања поруке: %s"
- #: ../src/save-restore.c:608
+ #: ../src/save-restore.c:594
msgid "Error during filters loading: "
-msgstr "Грешка при учитавању филтера: "
+msgstr "Грешка при учитавању пропусника: "
- #: ../src/save-restore.c:610
+ #: ../src/save-restore.c:596
#, c-format
msgid ""
"Error during filters loading: %s\n"
@@@ -7244,7 -6244,15 +6243,15 @@@ msgstr "
msgid "Mark all"
msgstr "Обележи све"
- #: ../src/toolbar-factory.c:160
+ #: ../src/toolbar-factory.c:170
+ msgid ""
-"All\n"
-"headers"
++"Reset\n"
++"Filter"
+ msgstr ""
+ "Сва\n"
+ "заглавља"
+
+ #: ../src/toolbar-factory.c:171
msgid ""
"Reset\n"
"Filter"
diff --cc src/ab-window.c
index 6137bce,55b5de9..385d336
--- a/src/ab-window.c
+++ b/src/ab-window.c
@@@ -201,13 -207,8 +207,9 @@@ balsa_ab_window_load_books(BalsaAbWindo
ab_list = ab_list->next, ++offset) {
LibBalsaAddressBook *address_book = ab_list->data;
- #if GTK_CHECK_VERSION(2, 24, 0)
gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(ab->combo_box),
- address_book->name);
- #else /* GTK_CHECK_VERSION(2, 24, 0) */
- gtk_combo_box_append_text(GTK_COMBO_BOX(ab->combo_box),
address_book->name);
+#endif /* GTK_CHECK_VERSION(2, 24, 0) */
if (ab->current_address_book == NULL)
ab->current_address_book = address_book;
diff --cc src/balsa-app.c
index 1500d32,aa5268f..ea335dd
--- a/src/balsa-app.c
+++ b/src/balsa-app.c
@@@ -568,53 -556,16 +554,17 @@@ balsa_open_mailbox_list(gchar ** urls
}
g_strfreev(urls);
- gdk_threads_leave();
- return FALSE;
++ g_strfreev(urls);
+ gdk_threads_leave();
}
- GtkWidget *
- balsa_stock_button_with_label(const char *icon, const char *text)
+ void
+ balsa_add_open_mailbox_urls(GPtrArray * url_array)
{
- GtkWidget *button;
- GtkWidget *pixmap = gtk_image_new_from_stock(icon, GTK_ICON_SIZE_BUTTON);
- GtkWidget *align = gtk_alignment_new(0.5, 0.5, 0, 0);
- GtkWidget *hbox = gtk_hbox_new(FALSE, 0);
-
- button = gtk_button_new();
- gtk_container_add(GTK_CONTAINER(button), align);
- gtk_container_add(GTK_CONTAINER(align), hbox);
-
- gtk_box_pack_start(GTK_BOX(hbox), pixmap, FALSE, FALSE, 0);
- if (text && *text) {
- GtkWidget *label = gtk_label_new_with_mnemonic(text);
- gtk_label_set_mnemonic_widget(GTK_LABEL(label), button);
- gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 2);
- }
-
- gtk_widget_show_all(button);
- return button;
+ libbalsa_conf_foreach_group(VIEW_BY_URL_SECTION_PREFIX,
+ (LibBalsaConfForeachFunc)
+ append_url_if_open, url_array);
}
/*
diff --cc src/balsa-index.c
index e1ab0db,8d09c12..73c0c72
--- a/src/balsa-index.c
+++ b/src/balsa-index.c
@@@ -2654,13 -2575,9 +2575,13 @@@ bndx_pipe_response(GtkWidget * dialog,
gchar *pipe_cmd;
GList *active_cmd;
+#if GTK_CHECK_VERSION(2, 24, 0)
+ pipe_cmd = gtk_combo_box_text_get_active_text
+ (GTK_COMBO_BOX_TEXT(info->entry));
+#else /* GTK_CHECK_VERSION(2, 24, 0) */
pipe_cmd =
- gtk_combo_box_get_active_text(GTK_COMBO_BOX(info->entry));
- #endif /* GTK_CHECK_VERSION(2, 24, 0) */
+ gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT
+ (info->entry));
active_cmd =
g_list_find_custom(balsa_app.pipe_cmds, pipe_cmd,
(GCompareFunc) strcmp);
diff --cc src/balsa-message.c
index a9c2159,788ba0c..9f290ef
--- a/src/balsa-message.c
+++ b/src/balsa-message.c
@@@ -1236,11 -1224,10 +1224,11 @@@ balsa_message_set_embedded_hdr(GtkTreeM
balsa_mime_widget_message_set_headers_d(bm, info->mime_widget,
info->body->embhdrs,
info->body->parts,
- info->body->embhdrs->subject);
+ info->body->embhdrs->subject,
+ info->body->body_type ==
LIBBALSA_MESSAGE_BODY_TYPE_TEXT);
g_object_unref(G_OBJECT(info));
}
-
+
return FALSE;
}
@@@ -1293,11 -1280,10 +1281,11 @@@ balsa_message_set_wrap(BalsaMessage * b
static void
display_headers(BalsaMessage * bm)
{
- balsa_mime_widget_message_set_headers_d(bm, bm->bm_widget,
+ balsa_mime_widget_message_set_headers_d(bm, bm->bm_widget,
bm->message->headers,
bm->message->body_list,
- LIBBALSA_MESSAGE_GET_SUBJECT(bm->message));
+ LIBBALSA_MESSAGE_GET_SUBJECT(bm->message),
+ FALSE);
}
diff --cc src/balsa-mime-widget-message.h
index 1fe0d64,283c4c6..72d990f
--- a/src/balsa-mime-widget-message.h
+++ b/src/balsa-mime-widget-message.h
@@@ -45,11 -46,9 +44,10 @@@ void balsa_mime_widget_message_set_head
BalsaMimeWidget *mw,
LibBalsaMessageHeaders *h,
LibBalsaMessageBody *parts,
- const gchar *subject);
+ const gchar *subject,
+ gboolean show_all_headers);
- #ifdef __cplusplus
- }
- #endif /* __cplusplus */
+ G_END_DECLS
+
#endif /* __BALSA_MIME_WIDGET_MESSAGE_H__ */
diff --cc src/filter-edit-dialog.c
index c2e49a6,ca1b4cb..26915d1
--- a/src/filter-edit-dialog.c
+++ b/src/filter-edit-dialog.c
@@@ -152,23 -154,13 +152,24 @@@ fe_build_option_menu(option_list option
if (num < 1)
return (NULL);
+ combo_box = gtk_combo_box_text_new();
info = g_new(struct fe_combo_box_info, 1);
info->values = NULL;
+#if GTK_CHECK_VERSION(2, 24, 0)
+ combo_box = gtk_combo_box_text_new();
+
+ for (i = 0; i < num; i++) {
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),
+ _(options[i].text));
+ info->values =
+ g_slist_append(info->values, GINT_TO_POINTER(options[i].value));
+ }
+#else /* GTK_CHECK_VERSION(2, 24, 0) */
+ combo_box = gtk_combo_box_new_text();
for (i = 0; i < num; i++) {
- gtk_combo_box_append_text(GTK_COMBO_BOX(combo_box),
- _(options[i].text));
+ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo_box),
+ _(options[i].text));
info->values =
g_slist_append(info->values, GINT_TO_POINTER(options[i].value));
}
diff --cc src/main-window.c
index 1abb3f9,4856383..b1e6b7a
--- a/src/main-window.c
+++ b/src/main-window.c
@@@ -1253,23 -463,15 +463,17 @@@ bw_create_index_widget(BalsaWindow *bw
view_filters_translated = TRUE;
}
- bw->sos_bar = gtk_hbox_new(FALSE, 5);
+ bw->sos_bar = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- #if GTK_CHECK_VERSION(2, 24, 0)
bw->filter_choice = gtk_combo_box_text_new();
+ gtk_box_pack_start(GTK_BOX(bw->sos_bar), bw->filter_choice,
+ FALSE, FALSE, 0);
for(i=0; i<ELEMENTS(view_filters); i++)
- gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT
- (bw->filter_choice), i,
- view_filters[i].str);
- #else /* GTK_CHECK_VERSION(2, 24, 0) */
- bw->filter_choice = gtk_combo_box_new_text();
- for(i=0; i<ELEMENTS(view_filters); i++)
- gtk_combo_box_insert_text(GTK_COMBO_BOX(bw->filter_choice),
- i, view_filters[i].str);
- #endif /* GTK_CHECK_VERSION(2, 24, 0) */
+ gtk_combo_box_text_insert_text(GTK_COMBO_BOX_TEXT(bw->filter_choice),
+ i, view_filters[i].str);
gtk_combo_box_set_active(GTK_COMBO_BOX(bw->filter_choice), 0);
+ gtk_box_pack_start(GTK_BOX(bw->sos_bar), bw->filter_choice,
+ FALSE, FALSE, 0);
gtk_widget_show(bw->filter_choice);
bw->sos_entry = gtk_entry_new();
/* gtk_label_set_mnemonic_widget(GTK_LABEL(bw->filter_choice),
@@@ -1471,174 -818,1085 +820,1088 @@@ bw_show_or_hide_widget(GSimpleAction *
*/
static void
- bw_enable_next_unread(BalsaWindow * window, gboolean has_unread_mailbox)
+ new_message_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
{
- bw_set_sensitive(window, "NextUnread", has_unread_mailbox);
+ BalsaSendmsg *smwindow;
+
+ smwindow = sendmsg_window_compose();
+
+ g_signal_connect(G_OBJECT(smwindow->window), "destroy",
+ G_CALLBACK(bw_send_msg_window_destroy_cb), user_data);
}
- /* Create the toolbar model for the main window's toolbar.
+ static void
+ new_mbox_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_new(LIBBALSA_TYPE_MAILBOX_MBOX);
+ }
+
+ static void
+ new_maildir_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_new(LIBBALSA_TYPE_MAILBOX_MAILDIR);
+ }
+
+ static void
+ new_mh_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_new(LIBBALSA_TYPE_MAILBOX_MH);
+ }
+
+ static void
+ new_imap_box_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_new(LIBBALSA_TYPE_MAILBOX_IMAP);
+ }
+
+ static void
+ new_imap_folder_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ folder_conf_imap_node(NULL);
+ }
+
+ static void
+ new_imap_subfolder_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ folder_conf_imap_sub_node(NULL);
+ }
+
+ static void
+ toolbars_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ customize_dialog_cb(user_data, user_data);
+ }
+
+ static void
+ identities_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+
+ libbalsa_identity_config_dialog(window,
+ &balsa_app.identities,
+ &balsa_app.current_ident,
+ #if ENABLE_ESMTP
+ balsa_app.smtp_servers,
+ #endif /* ENABLE_ESMTP */
+ (void(*)(gpointer))
+ balsa_identities_changed);
+ }
+
+ static void
+ address_book_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+ GtkWidget *ab;
+
+ ab = balsa_ab_window_new(FALSE, window);
+ gtk_widget_show(GTK_WIDGET(ab));
+ }
+
+ static void
+ prefs_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ open_preferences_manager(NULL, user_data);
+ }
+
+ static void
+ help_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+ GdkScreen *screen;
+ GError *err = NULL;
+
+ screen = gtk_window_get_screen(window);
+ gtk_show_uri(screen, "help:balsa", gtk_get_current_event_time(),
+ &err);
+ if (err) {
+ balsa_information(LIBBALSA_INFORMATION_WARNING,
+ _("Error displaying help: %s\n"), err->message);
+ g_error_free(err);
+ }
+ }
+
+ static void
+ about_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+ const gchar *authors[] = {
+ "Balsa Maintainers <balsa-maintainer theochem kth se>:",
+ "Peter Bloomfield <PeterBloomfield bellsouth net>",
+ "Bart Visscher <magick linux-fan com>",
+ "Emmanuel Allaud <e allaud wanadoo fr>",
+ "Carlos Morgado <chbm gnome org>",
+ "Pawel Salek <pawsa theochem kth se>",
+ "and many others (see AUTHORS file)",
+ NULL
+ };
+ const gchar *documenters[] = {
+ NULL
+ };
+
+ const gchar *translator_credits = _("translator-credits");
+ /* FIXME: do we need error handling for this? */
+ GdkPixbuf *balsa_logo =
+ gdk_pixbuf_new_from_file(BALSA_DATA_PREFIX
+ "/pixmaps/balsa_logo.png", NULL);
+
+ gtk_show_about_dialog(window,
+ "version", BALSA_VERSION,
+ "copyright",
+ "Copyright \xc2\xa9 1997-2013 The Balsa Developers",
+ "comments",
+ _("The Balsa email client is part of "
+ "the GNOME desktop environment."),
+ "authors", authors,
+ "documenters", documenters,
+ /* license ? */
+ "title", _("About Balsa"),
+ "translator-credits",
+ strcmp(translator_credits, "translator-credits") ?
+ translator_credits : NULL,
+ "logo", balsa_logo,
+ "website", "http://balsa.gnome.org";,
+ "wrap-license", TRUE,
+ NULL);
+ g_object_unref(balsa_logo);
+ }
+
+ static void
+ quit_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+ GdkEventAny e = { GDK_DELETE, NULL, 0 };
+
+ e.window = gtk_widget_get_window(GTK_WIDGET(window));
+ libbalsa_information_parented(window,
+ LIBBALSA_INFORMATION_MESSAGE,
+ _("Balsa closes files and connections."
+ "Please wait..."));
+ while(gtk_events_pending())
+ gtk_main_iteration_do(FALSE);
+ gdk_event_put((GdkEvent*)&e);
+ }
+
+ static void
+ continue_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+
+ if (index
+ && BALSA_INDEX(index)->mailbox_node->mailbox == balsa_app.draftbox)
+ balsa_message_continue(BALSA_INDEX(index));
+ else
+ balsa_mblist_open_mailbox(balsa_app.draftbox);
+ }
+
+ static void
+ get_new_mail_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ check_new_messages_real(window, TYPE_CALLBACK);
+
+ if (balsa_app.check_mail_auto) {
+ /* restart the timer */
+ update_timer(TRUE, balsa_app.check_mail_timer);
+ }
+ }
+
+ static void
+ send_queued_mail_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ libbalsa_process_queue(balsa_app.outbox, balsa_find_sentbox_by_url,
+ #if ENABLE_ESMTP
+ balsa_app.smtp_servers,
+ #endif /* ENABLE_ESMTP */
+ (GtkWindow *) balsa_app.main_window,
+ balsa_app.debug);
+ }
+
+ static void
+ send_and_receive_mail_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ get_new_mail_activated(action, parameter, user_data);
+ send_queued_mail_activated(action, parameter, user_data);
+ }
+
+ static void
+ page_setup_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+
+ message_print_page_setup(window);
+ }
+
+ static void
+ print_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+ BalsaIndex *bindex;
+
+ index = balsa_window_find_current_index(window);
+ if (!index)
+ return;
+
+ bindex = BALSA_INDEX(index);
+ if (bindex->current_msgno) {
+ LibBalsaMessage *message =
+ libbalsa_mailbox_get_message(bindex->mailbox_node->mailbox,
+ bindex->current_msgno);
+ if (!message)
+ return;
+ message_print(message, GTK_WINDOW(window));
+ g_object_unref(message);
+ }
+ }
+
+ static void
+ copy_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+ guint signal_id;
+ GtkWidget *focus_widget = gtk_window_get_focus(window);
+
+ if (!focus_widget)
+ return;
+
+ signal_id = g_signal_lookup("copy-clipboard",
+ G_TYPE_FROM_INSTANCE(focus_widget));
+ if (signal_id)
+ g_signal_emit(focus_widget, signal_id, (GQuark) 0);
+ #ifdef HAVE_HTML_WIDGET
+ else if (libbalsa_html_can_select(focus_widget))
+ libbalsa_html_copy(focus_widget);
+ #endif /* HAVE_HTML_WIDGET */
+ }
+
+ static void
+ select_all_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ GtkWindow *window = GTK_WINDOW(user_data);
+
+ balsa_window_select_all(window);
+ }
+
+ static void
+ select_thread_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bindex;
+
+ if ((bindex = balsa_window_find_current_index(window)))
+ balsa_index_select_thread(BALSA_INDEX(bindex));
+ }
+
+ static void
+ find_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bindex;
+
+ if ((bindex = balsa_window_find_current_index(window)))
+ bw_find_real(window, BALSA_INDEX(bindex), FALSE);
+ }
+
+ static void
+ find_next_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget * bindex;
+
+ if ((bindex = balsa_window_find_current_index(window)))
+ bw_find_real(window, BALSA_INDEX(bindex), TRUE);
+ }
+
+ static void
+ find_in_message_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ if (balsa_app.previewpane)
+ balsa_message_find_in_message(BALSA_MESSAGE(window->preview));
+ }
+
+ static void
+ filters_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ filters_edit_dialog(GTK_WINDOW(user_data));
+ }
+
+ static void
+ export_filters_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ filters_export_dialog(GTK_WINDOW(user_data));
+ }
+
+ static void
+ expand_all_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_update_tree(BALSA_INDEX(index), TRUE);
+ }
+
+ static void
+ collapse_all_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_update_tree(BALSA_INDEX(index), FALSE);
+ }
+
+ #ifdef HAVE_HTML_WIDGET
+ static void
+ zoom_in_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bm = window->preview;
+
+ balsa_message_zoom(BALSA_MESSAGE(bm), 1);
+ }
+
+ static void
+ zoom_out_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bm = window->preview;
+
+ balsa_message_zoom(BALSA_MESSAGE(bm), -1);
+ }
+
+ static void
+ zoom_normal_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bm = window->preview;
+
+ balsa_message_zoom(BALSA_MESSAGE(bm), 0);
+ }
+ #endif /* HAVE_HTML_WIDGET */
+
+ static void
+ next_message_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_select_next(BALSA_INDEX(index));
+ }
+
+ static void
+ previous_message_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_select_previous(BALSA_INDEX(index));
+ }
+
+ static void
+ next_unread_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_window_next_unread(window);
+ }
+
+ static void
+ next_flagged_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_select_next_flagged(BALSA_INDEX(index));
+ }
+
+ static void
+ reset_filter_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ /* do it by resetting the sos filder */
+ gtk_entry_set_text(GTK_ENTRY(window->sos_entry), "");
+ index = balsa_window_find_current_index(window);
+ bw_set_view_filter(window, BALSA_INDEX(index)->filter_no,
+ window->sos_entry);
+ }
+
+ static void
+ mailbox_select_all_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ gtk_widget_grab_focus(index);
+ balsa_window_select_all(GTK_WINDOW(window));
+ }
+
+ static void
+ mailbox_edit_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_edit_cb(NULL, NULL);
+ }
+
+ static void
+ mailbox_delete_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ mailbox_conf_delete_cb(NULL, NULL);
+ }
+
+ static void
+ mailbox_expunge_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_expunge(BALSA_INDEX(index));
+ }
+
+ static void
+ mailbox_close_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ if (index)
+ balsa_mblist_close_mailbox(BALSA_INDEX(index)->mailbox_node->
+ mailbox);
+ }
+
+ static void
+ empty_trash_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ empty_trash(window);
+ }
+
+ static void
+ select_filters_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ if (index)
+ filters_run_dialog(BALSA_INDEX(index)->mailbox_node->mailbox,
+ GTK_WINDOW(balsa_app.main_window));
+ else
+ /* FIXME : Perhaps should we be able to apply filters on folders (ie recurse on all mailboxes in it),
+ but there are problems of infinite recursion (when one mailbox being filtered is also the
destination
+ of the filter action (eg a copy)). So let's see that later :) */
+ balsa_information(LIBBALSA_INFORMATION_WARNING,
+ _("You can apply filters only on mailbox\n"));
+ }
+
+ static void
+ remove_duplicates_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+
+ index = balsa_window_find_current_index(window);
+ if (index) {
+ LibBalsaMailbox *mailbox =
+ BALSA_INDEX(index)->mailbox_node->mailbox;
+ GError *err = NULL;
+ gint dup_count =
+ libbalsa_mailbox_move_duplicates(mailbox, NULL, &err);
+ if (err) {
+ balsa_information(LIBBALSA_INFORMATION_WARNING,
+ _("Removing duplicates failed: %s"),
+ err->message);
+ g_error_free(err);
+ } else {
+ if(dup_count)
+ balsa_information(LIBBALSA_INFORMATION_MESSAGE,
+ ngettext("Removed %d duplicate",
+ "Removed %d duplicates",
+ dup_count), dup_count);
+ else
+ balsa_information(LIBBALSA_INFORMATION_MESSAGE,
+ _("No duplicates found"));
+ }
+
+ }
+ }
+
+ static void
+ reply_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_reply(balsa_window_find_current_index(window));
+ }
+
+ static void
+ reply_all_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_replytoall(balsa_window_find_current_index(window));
+ }
+
+ static void
+ reply_group_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_replytogroup(balsa_window_find_current_index(window));
+ }
+
+ static void
+ forward_attached_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_forward_attached(balsa_window_find_current_index(window));
+ }
+
+ static void
+ forward_inline_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_forward_inline(balsa_window_find_current_index(window));
+ }
+
+ static void
+ pipe_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_index_pipe(BALSA_INDEX
+ (balsa_window_find_current_index(window)));
+ }
+
+ static void
+ next_part_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_next_part(BALSA_MESSAGE(window->preview));
+ }
+
+ static void
+ previous_part_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_previous_part(BALSA_MESSAGE(window->preview));
+ }
+
+ static void
+ save_part_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_save_current_part(BALSA_MESSAGE(window->preview));
+ }
+
+ static void
+ view_source_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bindex;
+ GList *messages, *list;
+
+ bindex = balsa_window_find_current_index(window);
+ g_return_if_fail(bindex != NULL);
+
+ messages = balsa_index_selected_list(BALSA_INDEX(bindex));
+ for (list = messages; list; list = list->next) {
+ LibBalsaMessage *message = list->data;
+
+ libbalsa_show_message_source(balsa_app.application,
+ message, balsa_app.message_font,
+ &balsa_app.source_escape_specials,
+ &balsa_app.source_width,
+ &balsa_app.source_height);
+ }
+
+ g_list_free_full(messages, g_object_unref);
+ }
+
+ static void
+ copy_message_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ if (balsa_message_grab_focus(BALSA_MESSAGE(window->preview)))
+ copy_activated(action, parameter, user_data);
+ }
+
+ static void
+ select_text_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ if (balsa_message_grab_focus(BALSA_MESSAGE(window->preview)))
+ balsa_window_select_all(user_data);
+ }
+
+ static void
+ move_to_trash_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_message_move_to_trash(balsa_window_find_current_index(window));
+ }
+
+ /*
+ * Helper for toggling flags
*/
- /* Standard buttons; "" means a separator. */
- static const gchar* main_toolbar[] = {
- #if defined(ENABLE_TOUCH_UI)
- BALSA_PIXMAP_RECEIVE,
- "",
- BALSA_PIXMAP_COMPOSE,
- BALSA_PIXMAP_REPLY,
- BALSA_PIXMAP_REPLY_ALL,
- BALSA_PIXMAP_FORWARD,
- "",
- GTK_STOCK_DELETE,
- "",
- BALSA_PIXMAP_NEXT_UNREAD,
- BALSA_PIXMAP_MARKED_NEW
- #else /* defined(ENABLE_TOUCH_UI) */
- BALSA_PIXMAP_RECEIVE,
- "",
- GTK_STOCK_DELETE,
- "",
- BALSA_PIXMAP_COMPOSE,
- BALSA_PIXMAP_CONTINUE,
- BALSA_PIXMAP_REPLY,
- BALSA_PIXMAP_REPLY_ALL,
- BALSA_PIXMAP_FORWARD,
- "",
- BALSA_PIXMAP_NEXT_UNREAD,
- "",
- GTK_STOCK_PRINT
- #endif /* defined(ENABLE_TOUCH_UI) */
+ static void
+ toggle_flag(LibBalsaMessageFlag flag, gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *bindex;
+
+ bindex = balsa_window_find_current_index(window);
+ balsa_index_toggle_flag(BALSA_INDEX(bindex), flag);
+ }
+
+ static void
+ toggle_flagged_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ toggle_flag(LIBBALSA_MESSAGE_FLAG_FLAGGED, user_data);
+ }
+
+ static void
+ toggle_deleted_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ toggle_flag(LIBBALSA_MESSAGE_FLAG_DELETED, user_data);
+ }
+
+ static void
+ toggle_new_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ toggle_flag(LIBBALSA_MESSAGE_FLAG_NEW, user_data);
+ }
+
+ static void
+ toggle_answered_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ toggle_flag(LIBBALSA_MESSAGE_FLAG_REPLIED, user_data);
+ }
+
+ static void
+ store_address_activated(GSimpleAction * action,
+ GVariant * parameter,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index = balsa_window_find_current_index(window);
+ GList *messages;
+
+ g_assert(index != NULL);
+
+ messages = balsa_index_selected_list(BALSA_INDEX(index));
+ balsa_store_address_from_messages(messages);
+ g_list_free_full(messages, g_object_unref);
+ }
+
+ /*
+ * Callbacks for various toggle actions' "change-state" signals
+ */
+
+ static void
+ show_mailbox_tree_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_app.show_mblist = g_variant_get_boolean(state);
+ bw_show_mbtree(window);
+ g_simple_action_set_state(action, state);
+ }
+
+ static void
+ show_mailbox_tabs_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_app.show_notebook_tabs = g_variant_get_boolean(state);
+ gtk_notebook_set_show_tabs(GTK_NOTEBOOK(window->notebook),
+ balsa_app.show_notebook_tabs);
+ g_simple_action_set_state(action, state);
+ }
+
++/*
++ * show the about box for Balsa
++ */
+ static void
+ show_toolbar_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ bw_show_or_hide_widget(action, state, &balsa_app.show_main_toolbar,
+ window->toolbar);
+ }
+
+ static void
+ show_statusbar_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ bw_show_or_hide_widget(action, state, &balsa_app.show_statusbar,
+ window->bottom_bar);
+ }
+
+ static void
+ show_sos_bar_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ bw_show_or_hide_widget(action, state, &balsa_app.show_sos_bar,
+ window->sos_bar);
+ }
+
+ static void
+ wrap_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_app.browse_wrap = g_variant_get_boolean(state);
+
+ balsa_message_set_wrap(BALSA_MESSAGE(window->preview),
+ balsa_app.browse_wrap);
+ refresh_preferences_manager();
+
+ g_simple_action_set_state(action, state);
+ }
+
+ /*
+ * Toggle actions that are used only in the toolbar
+ */
+
+ static void
+ show_all_headers_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_app.show_all_headers = g_variant_get_boolean(state);
+
+ balsa_message_set_displayed_headers(BALSA_MESSAGE(window->preview),
+ balsa_app.show_all_headers ?
+ HEADERS_ALL :
+ balsa_app.shown_headers);
+
+ g_simple_action_set_state(action, state);
+ }
+
+ static void
+ show_preview_pane_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+
+ balsa_app.previewpane = g_variant_get_boolean(state);
+
+ balsa_window_refresh(window);
+
+ g_simple_action_set_state(action, state);
+ }
+
+ /* Really, entire mailbox_hide_menu should be build dynamically from
+ * the hide_states array since different mailboxes support different
+ * set of flags/keywords. */
+ static const struct {
+ LibBalsaMessageFlag flag;
+ unsigned set:1;
+ gint states_index;
+ const gchar *action_name;
+ } hide_states[] = {
+ { LIBBALSA_MESSAGE_FLAG_DELETED, 1, 0, "hide-deleted" },
+ { LIBBALSA_MESSAGE_FLAG_DELETED, 0, 1, "hide-undeleted" },
+ { LIBBALSA_MESSAGE_FLAG_NEW, 0, 2, "hide-read" },
+ { LIBBALSA_MESSAGE_FLAG_NEW, 1, 3, "hide-unread" },
+ { LIBBALSA_MESSAGE_FLAG_FLAGGED, 1, 4, "hide-flagged" },
+ { LIBBALSA_MESSAGE_FLAG_FLAGGED, 0, 5, "hide-unflagged" },
+ { LIBBALSA_MESSAGE_FLAG_REPLIED, 1, 6, "hide-answered" },
+ { LIBBALSA_MESSAGE_FLAG_REPLIED, 0, 7, "hide-unanswered" }
};
- BalsaToolbarModel *
- balsa_window_get_toolbar_model(void)
+ static void bw_hide_changed_set_view_filter(BalsaWindow * window);
+
+ static void
+ hide_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
{
- static BalsaToolbarModel *model = NULL;
- GSList *standard;
- guint i;
+ BalsaWindow *window = BALSA_WINDOW(user_data);
- if (model)
- return model;
+ /* PART 1: assure menu consistency */
+ if (g_variant_get_boolean(state)) {
+ /* we may need to deactivate coupled negated flag. */
+ const gchar *action_name = g_action_get_name(G_ACTION(action));
+ unsigned curr_idx, i;
- standard = NULL;
- for (i = 0; i < ELEMENTS(main_toolbar); i++)
- standard = g_slist_append(standard, g_strdup(main_toolbar[i]));
+ for (i = 0; i < G_N_ELEMENTS(hide_states); i++)
+ if (strcmp(action_name, hide_states[i].action_name) == 0)
+ break;
+ g_assert(i < G_N_ELEMENTS(hide_states));
+ curr_idx = hide_states[i].states_index;
- model =
- balsa_toolbar_model_new(BALSA_TOOLBAR_TYPE_MAIN_WINDOW, standard);
- balsa_toolbar_model_add_actions(model, entries,
- G_N_ELEMENTS(entries));
- balsa_toolbar_model_add_actions(model, mailbox_entries,
- G_N_ELEMENTS(mailbox_entries));
- balsa_toolbar_model_add_actions(model, message_entries,
- G_N_ELEMENTS(message_entries));
- balsa_toolbar_model_add_actions(model, current_message_entries,
- G_N_ELEMENTS(current_message_entries));
- balsa_toolbar_model_add_actions(model, modify_message_entries,
- G_N_ELEMENTS(modify_message_entries));
- balsa_toolbar_model_add_toggle_actions(model, toggle_entries,
- G_N_ELEMENTS(toggle_entries));
+ for (i = 0; i < G_N_ELEMENTS(hide_states); i++) {
+ int states_idx = hide_states[i].states_index;
- return model;
+ if (!bw_action_get_boolean(window,
+ hide_states[i].action_name))
+ continue;
+
+ if (hide_states[states_idx].flag == hide_states[curr_idx].flag
+ && hide_states[states_idx].set !=
+ hide_states[curr_idx].set) {
+ GAction *coupled_action;
+
+ coupled_action =
+ bw_get_action(window, hide_states[i].action_name);
+ g_simple_action_set_state(G_SIMPLE_ACTION(coupled_action),
+ g_variant_new_boolean(FALSE));
+ }
+ }
+ }
+
+ g_simple_action_set_state(action, state);
+
+ /* PART 2: do the job. */
+ bw_hide_changed_set_view_filter(window);
}
- /* Create a GtkUIManager for a main window, with all the actions, but no
- * ui.
+ /*
+ * Callbacks for various radio actions' "change-state" signals
*/
- GtkUIManager *
- balsa_window_ui_manager_new(BalsaWindow * window)
+ static void
+ bw_reset_show_all_headers(BalsaWindow * window)
{
- GtkUIManager *ui_manager;
- GtkActionGroup *action_group;
+ if (balsa_app.show_all_headers) {
+ bw_action_set_boolean(window, "show-all-headers", FALSE);
+ balsa_app.show_all_headers = FALSE;
+ }
+ }
- ui_manager = gtk_ui_manager_new();
+ static void
+ header_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ const gchar *value;
+ ShownHeaders sh;
+
+ value = g_variant_get_string(state, NULL);
+
+ if (strcmp(value, "none") == 0)
+ sh = HEADERS_NONE;
+ else if (strcmp(value, "selected") == 0)
+ sh = HEADERS_SELECTED;
+ else if (strcmp(value, "all") == 0)
+ sh = HEADERS_ALL;
+ else {
+ g_print("%s unknown value \"%s\"\n", __func__, value);
+ return;
+ }
- action_group = gtk_action_group_new("BalsaWindow");
- gtk_action_group_set_translation_domain(action_group, NULL);
- if (window)
- window->action_group = action_group;
- gtk_action_group_add_actions(action_group, entries,
- G_N_ELEMENTS(entries), window);
- gtk_action_group_add_toggle_actions(action_group, toggle_entries,
- G_N_ELEMENTS(toggle_entries),
- window);
- /* Add the header option actions.
- * Note: if we provide a callback, it's connected to the "changed"
- * signal, which is emitted only when the radio list changes state.
- * We want to respond also to a click on the current option, so we
- * connect later to the "activate" signal, and pass a NULL callback
- * here. */
- gtk_action_group_add_radio_actions(action_group,
- shown_hdrs_radio_entries,
- G_N_ELEMENTS
- (shown_hdrs_radio_entries), 0,
- NULL, /* no callback */
- NULL);
-
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
-
- action_group = gtk_action_group_new("BalsaWindowMailbox");
- gtk_action_group_set_translation_domain(action_group, NULL);
- if (window)
- window->mailbox_action_group = action_group;
- gtk_action_group_add_actions(action_group, mailbox_entries,
- G_N_ELEMENTS(mailbox_entries),
- window);
- #if !defined(ENABLE_TOUCH_UI)
- /* Add the threading option actions.
- * Note: if we provide a callback, it's connected to the "changed"
- * signal, which is emitted only when the radio list changes state.
- * We want to respond also to a click on the current option, so we
- * connect later to the "activate" signal, and pass a NULL callback
- * here. */
- gtk_action_group_add_radio_actions(action_group,
- threading_radio_entries,
- G_N_ELEMENTS
- (threading_radio_entries), 0,
- NULL, /* no callback */
- NULL);
- #endif /* ENABLE_TOUCH_UI */
- #if defined(ENABLE_TOUCH_UI)
- gtk_action_group_add_radio_actions(action_group,
- sort_radio_entries,
- G_N_ELEMENTS
- (sort_radio_entries), 0,
- G_CALLBACK(bw_sort_change_cb),
- window);
- #endif /* ENABLE_TOUCH_UI */
-
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
-
- action_group = gtk_action_group_new("BalsaWindowMessage");
- gtk_action_group_set_translation_domain(action_group, NULL);
- if (window)
- window->message_action_group = action_group;
- gtk_action_group_add_actions(action_group, message_entries,
- G_N_ELEMENTS(message_entries),
- window);
+ balsa_app.shown_headers = sh;
+ bw_reset_show_all_headers(window);
+ balsa_message_set_displayed_headers(BALSA_MESSAGE(window->preview),
+ sh);
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
+ g_simple_action_set_state(action, state);
+ }
- action_group = gtk_action_group_new("BalsaWindowCurrentMessage");
- gtk_action_group_set_translation_domain(action_group, NULL);
- if (window)
- window->current_message_action_group = action_group;
- gtk_action_group_add_actions(action_group, current_message_entries,
- G_N_ELEMENTS(current_message_entries),
- window);
+ static void
+ threading_change_state(GSimpleAction * action,
+ GVariant * state,
+ gpointer user_data)
+ {
+ BalsaWindow *window = BALSA_WINDOW(user_data);
+ GtkWidget *index;
+ const gchar *value;
+ LibBalsaMailboxThreadingType type;
+ BalsaMailboxNode *mbnode;
+ LibBalsaMailbox *mailbox;
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
+ value = g_variant_get_string(state, NULL);
- action_group = gtk_action_group_new("BalsaWindowModifyMessage");
- gtk_action_group_set_translation_domain(action_group, NULL);
- if (window)
- window->modify_message_action_group = action_group;
- gtk_action_group_add_actions(action_group, modify_message_entries,
- G_N_ELEMENTS(modify_message_entries),
- window);
+ if (strcmp(value, "flat") == 0)
+ type = LB_MAILBOX_THREADING_FLAT;
+ else if (strcmp(value, "simple") == 0)
+ type = LB_MAILBOX_THREADING_SIMPLE;
+ else if (strcmp(value, "jwz") == 0)
+ type = LB_MAILBOX_THREADING_JWZ;
+ else {
+ g_print("%s unknown value \"%s\"\n", __func__, value);
+ return;
+ }
+
+ index = balsa_window_find_current_index(window);
+ balsa_index_set_threading_type(BALSA_INDEX(index), type);
- gtk_ui_manager_insert_action_group(ui_manager, action_group, 0);
+ /* bw->current_index may have been destroyed and cleared during
+ * set-threading: */
+ index = balsa_window_find_current_index(window);
+ if (index && (mbnode = BALSA_INDEX(index)->mailbox_node)
+ && (mailbox = mbnode->mailbox))
+ bw_enable_expand_collapse(window, mailbox);
- return ui_manager;
+ g_simple_action_set_state(action, state);
}
/*
diff --cc src/pref-manager.c
index fe66a1e,1eabfc0..478f7c7
--- a/src/pref-manager.c
+++ b/src/pref-manager.c
@@@ -14,10 -14,12 +14,10 @@@
* 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.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
- /* MAKE SURE YOU USE THE HELPER FUNCTIONS, like create_table(, page), etc. */
+ /* MAKE SURE YOU USE THE HELPER FUNCTIONS, like create_grid(etc. */
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
# include "config.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
