mail-notification

Fork of Jean-Yves Lefort's mail-notification, a tray icon to notify of new mail
git clone https://code.djc.id.au/git/mail-notification/
commit 78ff756e7f5f7d232f6b947798226f0c9976d9ad
parent bd1a0cd595a39982341af91a338a2dfe2eb18ed1
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date:   Thu,  7 Dec 2006 20:24:03 +1000

mail-notification-4.0-rc2

* Evolution changes:
        * An infinite loop has been fixed (see
          https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=208774,
          thanks to David Woodhouse for his help)

* Updated translations:
        * Serbian (Filip Miletic)
        * Czech (Pav Lucistnik)
        * Dutch (Marcel J. Zwiebel)
        * Brazilian Portuguese (Claudio André)

Diffstat:
MAUTHORS | 1+
MNEWS | 13+++++++++++++
Mconfigure | 20++++++++++----------
Mconfigure.ac | 2+-
Mhelp/C/mail-notification-C.omf | 4++--
Mhelp/C/mail-notification.xml | 19+++++++++++++++----
Mpo/POTFILES.in | 2+-
Mpo/POTFILES.skip | 2++
Mpo/cs.po | 1347+++++++++++++++++++++++++++++++++++++++++++++----------------------------------
Mpo/fr.po | 10+++++-----
Mpo/nl.po | 1306++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
Mpo/pt_BR.po | 1795++++++++++++++++++++++++++++++++++++-------------------------------------------
Mpo/sr.po | 1355++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
Mpo/sr@Latn.po | 1357++++++++++++++++++++++++++++++++++++++++++++-----------------------------------
Msrc/GNOME_MailNotification.idl | 6+++---
Msrc/GNOME_MailNotification_Evolution.idl | 4++--
Msrc/Makefile.am | 1-
Msrc/Makefile.in | 1-
Msrc/eggtrayicon.c | 4++--
Msrc/mn-about-dialog.gob | 2+-
Msrc/mn-auth-combo-box.c | 2+-
Msrc/mn-auth-combo-box.gob | 4++--
Msrc/mn-authenticated-mailbox-properties.gob | 2+-
Msrc/mn-authenticated-mailbox.gob | 2+-
Msrc/mn-autodetect-mailbox-properties.gob | 2+-
Msrc/mn-automation.gob | 2+-
Msrc/mn-base-mbox-mailbox-backend.gob | 2+-
Msrc/mn-blinking-image.gob | 2+-
Msrc/mn-bonobo-unknown.c | 2+-
Msrc/mn-bonobo-unknown.gob | 4++--
Msrc/mn-client-session.c | 2+-
Msrc/mn-client-session.h | 2+-
Msrc/mn-compact-message-view.gob | 2+-
Msrc/mn-conf.c | 2+-
Msrc/mn-conf.h | 2+-
Msrc/mn-custom-vfs-mailbox.gob | 2+-
Msrc/mn-dialog.gob | 2+-
Msrc/mn-evolution-folder-tree-control.gob | 2+-
Msrc/mn-evolution-glue-client.c | 2+-
Msrc/mn-evolution-glue-client.h | 2+-
Msrc/mn-evolution-glue.c | 221+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
Msrc/mn-evolution-glue.gob | 85+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
Msrc/mn-evolution-glue.h | 1+
Msrc/mn-evolution-mailbox-properties.gob | 2+-
Msrc/mn-evolution-mailbox.gob | 2+-
Msrc/mn-evolution-message.gob | 2+-
Msrc/mn-evolution-plugin.c | 7++-----
Msrc/mn-evolution.h | 2+-
Msrc/mn-gmail-mailbox-properties.gob | 2+-
Msrc/mn-gmail-mailbox.gob | 2+-
Msrc/mn-gmime-stream-vfs.gob | 2+-
Msrc/mn-imap-mailbox-properties.gob | 2+-
Msrc/mn-imap-mailbox.gob | 2+-
Msrc/mn-locked-callback.c | 2+-
Msrc/mn-locked-callback.h | 2+-
Msrc/mn-mail-icon.gob | 2+-
Msrc/mn-mailbox-properties-dialog.c | 2+-
Msrc/mn-mailbox-properties-dialog.gob | 4++--
Msrc/mn-mailbox-properties.gob | 2+-
Msrc/mn-mailbox-view.gob | 2+-
Msrc/mn-mailbox.gob | 2+-
Msrc/mn-mailboxes.gob | 2+-
Msrc/mn-maildir-mailbox-backend.c | 2+-
Msrc/mn-maildir-mailbox-backend.gob | 4++--
Msrc/mn-main.c | 2+-
Msrc/mn-mbox-mailbox-backend.gob | 2+-
Msrc/mn-md5.c | 2+-
Msrc/mn-message-mime.c | 2+-
Msrc/mn-message-mime.h | 2+-
Msrc/mn-message-view.gob | 2+-
Msrc/mn-message.gob | 2+-
Msrc/mn-mh-mailbox-backend.gob | 2+-
Msrc/mn-mozilla-mailbox-backend.gob | 2+-
Msrc/mn-pi-mailbox-properties.gob | 2+-
Msrc/mn-pi-mailbox.gob | 2+-
Msrc/mn-pop3-mailbox-properties.gob | 2+-
Msrc/mn-pop3-mailbox.gob | 2+-
Msrc/mn-popup.gob | 2+-
Msrc/mn-popups.gob | 2+-
Msrc/mn-properties-dialog.gob | 2+-
Msrc/mn-reentrant-mailbox.gob | 2+-
Msrc/mn-sasl.c | 2+-
Msrc/mn-sasl.h | 2+-
Msrc/mn-shell.gob | 2+-
Msrc/mn-ssl.c | 2+-
Msrc/mn-ssl.h | 2+-
Msrc/mn-standard-message-view.gob | 2+-
Msrc/mn-stock.c | 2+-
Msrc/mn-stock.h | 2+-
Msrc/mn-sylpheed-mailbox-backend.gob | 2+-
Msrc/mn-system-vfs-mailbox-properties.gob | 2+-
Msrc/mn-system-vfs-mailbox.gob | 2+-
Msrc/mn-test-mailbox.gob | 2+-
Msrc/mn-text-table.gob | 2+-
Msrc/mn-tooltips.gob | 2+-
Msrc/mn-util.c | 2+-
Msrc/mn-util.h | 2+-
Msrc/mn-vfs-mailbox-backend.gob | 2+-
Msrc/mn-vfs-mailbox.gob | 2+-
Msrc/mn-vfs-message.gob | 2+-
Msrc/mn-vfs.c | 2+-
Msrc/mn-vfs.h | 2+-
Msrc/mn-xml.c | 2+-
Msrc/mn-xml.h | 2+-
Msrc/nautilus-cell-renderer-pixbuf-emblem.c | 2+-
105 files changed, 4235 insertions(+), 3500 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -19,6 +19,7 @@ Translators:
 	* Vladimir Petkov <vpetkov@i-space.org> (Bulgarian)
 	* Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>,
 	  Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl> (Polish)
+	* Topi <topi@phreaker.net> (Catalan)
 	* Marcel J. Zwiebel <mj.zwiebel@nonux.nl> (Dutch)
 
 Artists:
diff --git a/NEWS b/NEWS
@@ -1,3 +1,16 @@
+4.0 Release Candidate 2			December 7, 2006
+
+	* Evolution changes:
+		* An infinite loop has been fixed (see
+		  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=208774,
+		  thanks to David Woodhouse for his help)
+
+	* Updated translations:
+		* Serbian (Filip Miletic)
+		* Czech (Pav Lucistnik)
+		* Dutch (Marcel J. Zwiebel)
+		* Brazilian Portuguese (Claudio André)
+
 4.0 Release Candidate 1			November 27, 2006
 
 	* Core changes:
diff --git a/configure b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for Mail Notification 4.0-rc1.
+# Generated by GNU Autoconf 2.59 for Mail Notification 4.0-rc2.
 #
 # Report bugs to <jylefort@brutele.be>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Mail Notification'
 PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='4.0-rc1'
-PACKAGE_STRING='Mail Notification 4.0-rc1'
+PACKAGE_VERSION='4.0-rc2'
+PACKAGE_STRING='Mail Notification 4.0-rc2'
 PACKAGE_BUGREPORT='jylefort@brutele.be'
 
 ac_unique_file="src/mn-main.c"
@@ -982,7 +982,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Mail Notification 4.0-rc1 to adapt to many kinds of systems.
+\`configure' configures Mail Notification 4.0-rc2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1049,7 +1049,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Mail Notification 4.0-rc1:";;
+     short | recursive ) echo "Configuration of Mail Notification 4.0-rc2:";;
    esac
   cat <<\_ACEOF
 
@@ -1228,7 +1228,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-Mail Notification configure 4.0-rc1
+Mail Notification configure 4.0-rc2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1242,7 +1242,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Mail Notification $as_me 4.0-rc1, which was
+It was created by Mail Notification $as_me 4.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -2275,7 +2275,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mail-notification'
- VERSION='4.0-rc1'
+ VERSION='4.0-rc2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -24732,7 +24732,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Mail Notification $as_me 4.0-rc1, which was
+This file was extended by Mail Notification $as_me 4.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24795,7 +24795,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Mail Notification config.status 4.0-rc1
+Mail Notification config.status 4.0-rc2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Mail Notification], 4.0-rc1, jylefort@brutele.be)
+AC_INIT([Mail Notification], 4.0-rc2, jylefort@brutele.be)
 AC_CONFIG_SRCDIR(src/mn-main.c)
 
 AC_PREREQ(2.59)
diff --git a/help/C/mail-notification-C.omf b/help/C/mail-notification-C.omf
@@ -12,9 +12,9 @@
       Mail Notification Manual
     </title>
     <date>
-      2006-11-27
+      2006-12-07
     </date>
-    <version identifier="2.16" date="2006-11-27" description="Version 2.16"/>
+    <version identifier="2.17" date="2006-12-07" description="Version 2.17"/>
     <subject category="GNOME|Internet"/>
     <description>
       Mail Notification Manual
diff --git a/help/C/mail-notification.xml b/help/C/mail-notification.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY app "<application>Mail Notification</application>">
-  <!ENTITY appversion "4.0 Release Candidate 1">
-  <!ENTITY manrevision "2.16">
-  <!ENTITY date "Monday, November 27, 2006">
+  <!ENTITY appversion "4.0 Release Candidate 2">
+  <!ENTITY manrevision "2.17">
+  <!ENTITY date "Thursday, December 7, 2006">
 
   <!ENTITY project "The Mail Notification Project">
 
@@ -27,7 +27,7 @@
   <!ENTITY gnomevfs "<link linkend=&#34;gnomevfs&#34;>GnomeVFS</link>">
 ]>
 
-<!-- $Id: mail-notification.xml,v 1.148 2006/11/27 20:59:55 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.149 2006/12/07 10:12:08 jylefort Exp $ -->
 <!-- Mail Notification Manual -->
 
 <!-- Copyright (C) 2003-2006 Jean-Yves Lefort -->
@@ -137,6 +137,17 @@
 	</revdescription>
       </revision>
       <revision>
+	<revnumber>Mail Notification Manual V2.16</revnumber>
+	<date>Monday, November 27, 2006</date>
+	<revdescription>
+	  <para role="author">
+	    Jean-Yves Lefort
+	    <email>jylefort@brutele.be</email>
+	  </para>
+	  <para role="publisher">&project;</para>
+	</revdescription>
+      </revision>
+      <revision>
 	<revnumber>Mail Notification Manual V2.15</revnumber>
 	<date>Wednesday, June 14, 2006</date>
 	<revdescription>
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -20,7 +20,7 @@ src/mn-compact-message-view.gob
 src/mn-conf.c
 src/mn-conf.h
 src/mn-custom-vfs-mailbox.gob
-src/mn-evolution-folder-tree-control.c
+src/mn-evolution-folder-tree-control.gob
 src/mn-evolution-mailbox-properties.gob
 src/mn-evolution-mailbox.gob
 src/mn-evolution-plugin.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
@@ -1,5 +1,6 @@
 data/GNOME_MailNotification.server.in
 data/GNOME_MailNotification_Evolution.server.in
+data/mail-notification.schemas.in
 src/GNOME_MailNotification-common.c
 src/GNOME_MailNotification-skels.c
 src/GNOME_MailNotification-stubs.c
@@ -17,6 +18,7 @@ src/mn-blinking-image.c
 src/mn-compact-message-view.c
 src/mn-custom-vfs-mailbox.c
 src/mn-dialog.c
+src/mn-evolution-folder-tree-control.c
 src/mn-evolution-glue.c
 src/mn-evolution-mailbox-properties.c
 src/mn-evolution-mailbox.c
diff --git a/po/cs.po b/po/cs.po
@@ -4,14 +4,14 @@
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Pav Lucistnik <pav@FreeBSD.org>, 2005.
+# Pav Lucistnik <pav@FreeBSD.org>, 2005-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 09:18+0200\n"
-"PO-Revision-Date: 2006-06-14 09:23+0200\n"
+"POT-Creation-Date: 2006-11-28 10:45+0100\n"
+"PO-Revision-Date: 2006-12-07 11:05+0100\n"
 "Last-Translator: Pav Lucistnik <pav@FreeBSD.org>\n"
 "Language-Team: Pav Lucistnik <pav@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -48,8 +48,9 @@ msgid "Configure Mail Notification"
 msgstr "Nastavit upozornění na poštu"
 
 #: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
 msgid "Mail Notification"
 msgstr "Upozornění na poštu"
 
@@ -57,142 +58,117 @@ msgstr "Upozornění na poštu"
 msgid "Get notified when new mail arrives"
 msgstr "Upozorňovat když přijde nová pošta"
 
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
 msgid "Always display an icon"
 msgstr "Vždy zobrazovat ikonu"
 
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Automaticky zavírat vyskakovací souhrn pošty"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
 msgid "Blink on errors"
 msgstr "Blikat při chybě"
 
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
 msgid "Click action"
 msgstr "Akce při kliknutí"
 
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
 msgid "Display seen mail"
 msgstr "Zobrazit přečtenou poštu"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
-msgstr "Povolit vyskakovací souhrn pošty"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Povolit plovoucí okna zpráv"
+
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Zavírat plovoucí okna zpráv"
 
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Obtisky důvěryhodných X509 certifikátů"
 
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
 msgid "Height of properties dialog"
 msgstr "Výška dialogu nastavení"
 
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Příkaz po přečtění pošty"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Písmo vyskakovacího souhrnu pošty"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
-msgstr "Zdroj vzhledu písma vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr ""
+"Pokud /apps/mail-notification/popups/expiration/enabled má hodnotu \"true\", "
+"čas po jakém je plovoucí okno zavřeno (minuty)."
 
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Vodorovné odsazení vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr ""
+"Pokud /apps/mail-notification/popups/expiration/enabled má hodnotu \"true\", "
+"čas po jakém je plovoucí okno zavřeno (sekundy)."
 
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Pozice vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Příkaz při změně pošty"
 
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Písmo titulku vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Příkaz po přečtění pošty"
 
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Svislé odsazení vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Pozice plovoucích oken zpráv"
 
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr "Minuty před zavřením vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Minuty před zavřením plovoucích oken zpráv"
 
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:15
 msgid "New mail command"
 msgstr "Příkaz při nové poště"
 
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr "Zobrazit pouze nedávnou poštu ve vyskakovacím souhrnu pošty"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:16
 msgid "Run a command when all mail is read"
 msgstr "Spustit příkaz při přečtení veškeré pošty"
 
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:17
 msgid "Run a command when new mail arrives"
 msgstr "Spustit příkaz při příchodu nové pošty"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Sekundy před zavřením vyskakovacího souhrnu pošty"
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Spustit příkaz při změně obsahu poštovní schránky"
+
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Sekundy před zavřením plovoucích oken zpráv"
 
-#: ../data/mail-notification.schemas.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:20
 msgid ""
 "The action to perform when the icon is clicked. Must be \"display-properties-"
-"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
 msgstr ""
 "Kterou akci vykonat při kliknutí na ikonu. Musí být \"display-properties-"
-"dialog\" (zobrazit dialog Vlastnosti), \"launch-mail-reader\" (spustit poštovní "
-"program) nebo \"update-mail-status\" (aktualizovat stav pošty)."
-
-#: ../data/mail-notification.schemas.in.h:23
-msgid ""
-"The amount of time to wait before closing the mail summary popup (minutes "
-"part)."
-msgstr ""
-"Jak dlouho čekat před zavřením vyskakovacího souhrnu pošty (minutová část)."
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" nebo \"update-mail-"
+"status\"."
 
-#: ../data/mail-notification.schemas.in.h:24
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr ""
-"Jak dlouho čekat před zavřením vyskakovacího souhrnu pošty (sekundová část)."
-
-#: ../data/mail-notification.schemas.in.h:25
-msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
-msgstr ""
-"Zdroj nastavení písma vyskakovacího souhrnu pošty. Musí být \"theme\" (z "
-"tématu) nebo \"custom\" (vlastní)."
-
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:21
 msgid "The command to run when all mail is read."
 msgstr "Příkaz spouštěný po přečtení veškeré pošty."
 
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:22
 msgid "The command to run when new mail arrives."
 msgstr "Příkaz spouštěný když dorazí nová pošta."
 
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr "Vlastní písmo pro obsah vyskakovacího souhrnu pošty."
-
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr "Vlastní písmo pro titulek vyskakovacího souhrnu pošty."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "Příkaz spouštěný při změně obsahu poštovní schránky."
 
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:24
 msgid "The height of the properties dialog in pixels."
 msgstr "Výška dialogu nastavení v pixelech."
 
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:25
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -200,93 +176,73 @@ msgstr ""
 "Seznam důvěryhodných SSL/TLS serverů (jméno počítače:port), kterým chybí "
 "X509 certifikát."
 
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:26
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "Seznam důvěryhodných X509 certifikátů, reprezentovaných jejími MD5 obtisky."
 
-#: ../data/mail-notification.schemas.in.h:33
-msgid ""
-"The number of pixels to leave between the left or right side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Počet pixelů vynechaných mezi levým nebo pravým okrajem obrazovky a "
-"vyskakovacím souhrnem pošty."
-
-#: ../data/mail-notification.schemas.in.h:34
-msgid ""
-"The number of pixels to leave between the top or bottom side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Počet pixelů vynechaných mezi horním nebo spodním okrajem obrazovky a "
-"vyskakovacím souhrnem pošty."
-
-#: ../data/mail-notification.schemas.in.h:35
-msgid ""
-"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
-"\"bottom-left\" or \"bottom-right\"."
-msgstr ""
-"Umístění vyskakovacího souhrnu pošty. Musí být \"top-left\" (vlevo nahoře), "
-"\"top-right\" (vpravo nahoře), \"bottom-left\" (vlevo dole), \"bottom-right"
-"\" (vpravo dole)."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "Umístění plovoucích oken zpráv. Musí být \"attached\" nebo \"free\"."
 
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:28
 msgid ""
 "The type of mail summary to display in the icon's tooltip. Must be \"standard"
 "\", \"compact\" or \"none\"."
 msgstr ""
-"Který druh souhrnu pošty zobrazit v tooltipu ikony.  Musí být \"standard\" (standardní)"
-"\", \"compact\" (kompaktní) nebo \"none\" (žádný)."
+"Který druh souhrnu pošty zobrazit v tooltipu ikony.  Musí být \"standard"
+"\" (standardní)\", \"compact\" (kompaktní) nebo \"none\" (žádný)."
 
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:29
 msgid "The width of the properties dialog in pixels."
 msgstr "Šířka dialogu nastavení v pixelech."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:30
 msgid "Tooltip mail summary"
 msgstr "Souhrn pošty v tooltipu"
 
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:31
 msgid "Trusted servers list"
 msgstr "Seznam důvěryhodných serverů"
 
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:32
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Jestli má stavová ikona blikat při chybě nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr "Jestli automaticky zavírat vyskakovací souhrn pošty nebo ne."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:33
 msgid "Whether to display an icon when there is no new mail or not."
 msgstr "Jestli zobrazit ikonu, i když není žádná nová pošta, nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:34
 msgid "Whether to display seen mail or not."
 msgstr "Jestli zobrazit přečtenou poštu nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr ""
-"Jestli zobrazit vyskakovací souhrn pošty když dorazí nová pošta nebo ne."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Jestli automaticky zavírat plovoucí okna zpráv nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:45
+#: ../data/mail-notification.schemas.in.in.h:36
 msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
 msgstr ""
-"Jestli skrýt dříve zobrazenou poštu ve vyskakovacím souhrnu pošty nebo ne."
+"Jestli automaticky zavírat plovoucí okna zpráv nebo ne. Musí být \"default\", \"false\" nebo "
+"\"true\"."
 
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:37
 msgid "Whether to run a command when all mail is read or not."
 msgstr "Jestli spouštět příkaz po přečtení veškeré pošty nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:38
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Jestli spouštět příkaz při doručení nové pošty nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Jestli spouštět příkaz při změně obsahu poštovní schránky nebo ne."
+
+#: ../data/mail-notification.schemas.in.in.h:40
 msgid "Width of properties dialog"
 msgstr "Šířka dialogu nastavení"
 
@@ -299,7 +255,7 @@ msgid "The orientation of the tray."
 msgstr "Orientace oznamovací oblasti."
 
 #. translators: header capitalization
-#: ../src/mn-about-dialog.gob:49
+#: ../src/mn-about-dialog.gob:50
 msgid "A Mail Notification Icon"
 msgstr "Ikona Upozornění na poštu"
 
@@ -307,134 +263,147 @@ msgstr "Ikona Upozornění na poštu"
 #. * translators: Your Name <your-email>
 #. * optionally followed by one or more: \nOther Contributor's Name <his-email>
 #.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
 msgid "translator-credits"
 msgstr "Pav Lučištník &lt;pav@FreeBSD.org&gt;"
 
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "Nemohu otevřít odkaz"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "Autodetekovat"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">autodetekovat</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Účet"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
 msgid "_Username:"
 msgstr "_Jméno uživatele:"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
 msgid "Location"
 msgstr "Umístění"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
 msgid "_Location:"
 msgstr "_Umístění:"
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
 msgid "_Browse..."
 msgstr "_Procházet..."
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
 msgid "Select a File or Folder"
 msgstr "Zvolte soubor nebo složku"
 
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "nemohu zavřít soubor: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "nemohu otevřít soubor: %s"
+
+#: ../src/mn-client-session.c:248
 #, c-format
 msgid "resolving %s"
 msgstr "hledám %s"
 
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:264
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "nemohu nalézt %s: %s"
 
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:305
 #, c-format
 msgid "network address #%i"
 msgstr "síťová adresa #%i"
 
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:308
 #, c-format
 msgid "unable to convert network address #%i into textual form: %s"
 msgstr "nemohu převést síťovou adresu #%i do textové podoby: %s"
 
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:319
 #, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: nepodporovaná adresní rodina"
 
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:326
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: nemohu vytvořit soket: %s"
 
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:330
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "připojování k %s (%s) port %i"
 
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:333
 #, c-format
 msgid "unable to connect: %s"
 msgstr "nemohu se připojit: %s"
 
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:338
 msgid "connected successfully"
 msgstr "úspěšně připojen"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:352
 #, c-format
 msgid "unable to connect to %s"
 msgstr "nemohu se připojit k %s"
 
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:379
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "nemohu inicializovat knihovnu OpenSSL: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:387
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "nemohu vytvořit SSL/TLS objekt: %s"
 
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:393
 #, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "nemohu nastavit SSL/TLS deskriptor souboru: %s"
 
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:399
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "nemohu provést SSL/TLS handshake: %s"
 
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:405
 msgid "untrusted server"
 msgstr "nedůvěryhodný server"
 
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:409
 #, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
 msgstr "SSL/TLS vrstva je nyní aktivní (%s, %s %i bitů)"
 
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:456
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, obtisk: %s"
 
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:485
 msgid "missing certificate"
 msgstr "chybí certifikát"
 
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:511
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -452,184 +421,175 @@ msgstr ""
 "připojen  k \"%s\". Pokud zvolíte připojení k serveru, tato zpráva již "
 "nebude znovu zobrazena."
 
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:526
 msgid "Connect to untrusted server?"
 msgstr "Připojit k nedůvěryhodnému serveru?"
 
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:591
 #, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "odezva \"%s\" není platná v aktuálním kontextu"
 
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:620
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "nemohu zpracovat odezvu \"%s\""
 
-#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "nemohu číst ze serveru: %s"
 
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:675
 msgid "unable to read from server: EOF"
 msgstr "nemohu část ze serveru: EOF"
 
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:687
 #, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "nemohu dešifrovat data pomoci SASL: %s"
 
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:832
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "nemohu zašifrovat data pomoci SASL: %s"
 
-#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "nemohu zapsat na server: %s"
 
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:868
 msgid "unable to write to server: EOF"
 msgstr "nemohu zapsat na server: EOF"
 
-#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "nemohu převést do Base64: %s"
 
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1076
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "nemohu inicializovat knihovnu SASL: %s"
 
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1088
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "nemohu získat místní adresu soketu: %s"
 
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1094
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "nemohu získat vzdálenou adresu soketu: %s"
 
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1128
 #, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "nemohu nastavit zabezpečení SASL: %s"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1152
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr "nemohu zahájit ověření SASL: SASL se zeptal na něco, co neznáme"
 
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1171
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "nemohu zahájit ověření SASL: %s"
 
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1175
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "nemohu vytvořit SASL spojení: %s"
 
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1222
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL se zeptal na něco, co neznáme, přerušuji ověření SASL"
 
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1239
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, přerušuji ověření SASL"
 
 #. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1244
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "nemohu zpracovat Base64 údaje od serveru: %s"
 
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1280
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "bezpečnostní vrstva SASL o bezpečnostním faktoru %i je nyní aktivní"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1285
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "nelze získat vlastnost SASL_MAXOUTBUF: %s"
 
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1291
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "varování: nelze získat vlastnost SASL_SSF: %s"
 
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1450
 msgid "unknown server error"
 msgstr "neznámá chyba serveru"
 
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
 msgid "Mailbox"
 msgstr "Schránka"
 
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
 msgid "From"
 msgstr "Od"
 
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
 msgid "Subject"
 msgstr "Předmět"
 
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
 msgid "Sent"
 msgstr "Odesláno"
 
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:281
 msgid "A directory creation error has occurred"
 msgstr "Chyba při vytváření adresáře"
 
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:282
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
 msgstr "Nemohu vytvořit adresář \"%s\": %s."
 
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:406
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "rekurzivně odnastavuji %s"
 
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:410
 msgid "syncing the GConf database"
 msgstr "synchronizuji GConf databázi"
 
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:413
 msgid "completed"
 msgstr "dokončeno"
 
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Nastala chyba při spouštění příkazu"
-
-#: ../src/mn-conf.c:1138
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Nemohu spustit \"%s\": %s."
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
 msgid "invalid location"
 msgstr "neplatné umístění"
 
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "Vybrané URI"
 
 #. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
 msgid "Folder"
 msgstr "Složka"
 
-#: ../src/mn-evolution-mailbox-properties.gob:159
+#: ../src/mn-evolution-mailbox-properties.gob:204
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -637,19 +597,23 @@ msgstr ""
 "Nemohu se spojit s Evolution. Ujistěte se, že Evolution běží a že Evolution "
 "Mail Notification plugin je aktivní."
 
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
 msgid "folder not found"
 msgstr "složka nenalezena"
 
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "zpráva nenalezena"
+
+#: ../src/mn-evolution-mailbox.gob:220
 msgid "unable to contact Evolution"
 msgstr "nemohu se spojit s Evolution"
 
-#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "Nemohu aktivovat Mail Notification plugin"
 
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
@@ -658,7 +622,7 @@ msgstr ""
 "Bonobo nemohlo nalézt server %s. Prosím zkontrolujte instalaci Upozornění na "
 "poštu."
 
-#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
@@ -667,101 +631,103 @@ msgstr ""
 "Bonobo nemohlo zaregistrovat server %s. Prosím zkontrolujte instalaci "
 "Upozornění na poštu."
 
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
 msgid "invalid feed location"
 msgstr "neplatné umístění zdroje"
 
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
 #, c-format
 msgid "retrieving feed from %s"
 msgstr "získávám zdroj z %s"
 
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "nemohu získat zdroj: %s"
 
-#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
 msgid "unable to parse feed"
 msgstr "nemohu zpracovat zdroj"
 
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
 #, c-format
 msgid "unable to read %s: %s"
 msgstr "nemohu číst %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
 #, c-format
 msgid "unable to write to %s: %s"
 msgstr "nemohu zapsat do %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
 #, c-format
 msgid "unable to seek in %s: %s"
 msgstr "nemohu posouvat v %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
 #, c-format
 msgid "unable to tell position of %s: %s"
 msgstr "nemohu určit pozici v %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "unable to close %s: %s"
 msgstr "nemohu zavřít %s: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Schránka:"
-
+#. translators: header capitalization
 #: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
-msgstr "_inbox"
+msgid "IMAP Mailbox"
+msgstr "IMAP schránka"
 
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
-msgstr "_jiná:"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
+msgstr "In_box"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "_nikdy"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "_Jiná:"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "_autodetekovat"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Použít rozšíření IDLE"
 
 #: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "_vždy"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "_Nikdy"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "_Autodetekovat"
 
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Použít rozšíření <span style=\"italic\">IDLE</span>:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "_Vždy"
 
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:385
 msgid "server did not send capabilities"
 msgstr "server neposlal capability"
 
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:552
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "server ohlásil LOGINDISABLED, nepoužívám LOGIN přihlášení"
 
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:553
 msgid "unable to login"
 msgstr "nemohu se přihlásit"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:752
+#: ../src/mn-imap-mailbox.gob:753
 msgid "server did not send all the messages we requested"
 msgstr "server neposlal všechny zprávy, které jsme vyžádali"
 
-#: ../src/mn-imap-mailbox.gob:822
+#: ../src/mn-imap-mailbox.gob:823
 msgid "unable to fetch message"
 msgstr "nemohu stáhnout zprávu"
 
-#: ../src/mn-imap-mailbox.gob:847
+#: ../src/mn-imap-mailbox.gob:848
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -769,26 +735,26 @@ msgstr ""
 "\"Použít rozšíření IDLE\" nastaveno na \"never\" ve vlastnostech schránky, "
 "odpojuji se"
 
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:859
 #, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
 msgstr "vzdálený server běží %s, nepoužívám rozšíření IDLE"
 
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:864
 #, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr "vzdálený server běží %s, rozšíření IDLE nemusí pracovat správně"
 
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:873
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "vzdálený server nepodporuje rozšíření IDLE, odpojuji se"
 
-#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
 msgid "server does not support in-band SSL/TLS"
 msgstr "server nepodporuje in-band SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -796,183 +762,172 @@ msgstr ""
 "přihlašovací mechanismus SASL byl vybrán, ale podpora SASL nebyla "
 "zkompilována "
 
-#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "neznámý přihlašovací mechanismus \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
 msgstr "zakazuji mechanismus \"%s\" a zkouším znovu přihlášení SASL"
 
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1456
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "zkouším přihlášení IMAP LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
 msgid "authentication failed"
 msgstr "přihlášení selhalo"
 
 #. success; caller must switch state itself
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
+#: ../src/mn-imap-mailbox.gob:1529
 msgid "server did not send search results"
 msgstr "server neposlal výsledky hledání"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
 msgid "_Mail Reader"
 msgstr "_Poštovní program"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Otevřít poslední zprávu"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
 msgid "_Update"
 msgstr "_Aktualizovat"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
 msgid "R_emove From Notification Area"
 msgstr "_Odstranit z oznamovací oblasti"
 
 #. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:270
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Souhrn pošty</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Souhrn pošty</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
 #, c-format
 msgid "%s Properties"
 msgstr "Vlastnosti %s"
 
 #. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
 msgid "Add a Mailbox"
 msgstr "Přidat schránku"
 
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
 msgid "A paste error has occurred"
 msgstr "Chyba při vložení"
 
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
 #, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "nezpracovaná %s schránka (%s)"
 
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
 #, c-format
 msgid "%s mailbox"
 msgstr "%s schránka"
 
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
 msgid "detecting mailbox type..."
 msgstr "detekuji typ schránky..."
 
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:504
 msgid "\"type\" attribute missing"
 msgstr "atribut \"type\" chybí"
 
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:511
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "neznámý typ schránky \"%s\""
 
-#: ../src/mn-mailbox.gob:499
-#, c-format
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr "vlastnost \"%s\": nemohu převést řetězec \"%s\" do hodnoty typu \"%s\""
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:907
 #, c-format
 msgid "property \"%s\" has no value"
 msgstr "vlastnost \"%s\" nemá žádnou hodnotu"
 
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Při importování starých schránek nastala chyba"
 
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
 msgid "Unable to load the mailboxes configuration"
 msgstr "Nemohu načíst nastavení schránek"
 
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
 msgid "Unable to parse the XML document."
 msgstr "Nemohu zpracovat XML dokument."
 
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
 msgid "The root element is missing."
 msgstr "Kořenový elemtn chybí."
 
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
 #, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "Kořenový element \"%s\" je neplatný."
 
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
 #, c-format
 msgid "On line %i: %s."
 msgstr "Na řádku %i: %s."
 
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "Na řádku %i: neznámý element \"%s\"."
 
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
 msgid "An error has occurred while loading the mailboxes configuration"
 msgid_plural "Errors have occurred while loading the mailboxes configuration"
 msgstr[0] "Při načítání nastavení schránek nastala chyba"
 msgstr[1] "Při načítání nastavení schránek nastaly chyby"
 msgstr[2] "Při načítání nastavení schránek nastaly chyby"
 
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
 msgid "Unable to save the mailboxes configuration"
 msgstr "Nemohu uložit nastavení schránek"
 
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
 #, c-format
 msgid "Unable to remove %s: %s."
 msgstr "Nemohu odstranit %s: %s."
 
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
 #, c-format
 msgid "Unable to create %s: %s."
 msgstr "Nemohu vytvořit %s: %s."
 
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
 #, c-format
 msgid "Unable to open %s for writing: %s."
 msgstr "Nemohu otevřít %s pro zápis: %s."
 
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
 msgid "Unable to write the XML document."
 msgstr "Nemohu zapsat XML dokument."
 
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
 #, c-format
 msgid "Unable to close %s: %s."
 msgstr "Nemohu zavřít %s: %s."
 
-#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
 #, c-format
 msgid "Unable to rename %s to %s: %s."
 msgstr "Nemohu přejmenovat %s na %s: %s."
 
 #. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
 #, c-format
 msgid "unable to delete %s: %s"
 msgstr "nemohu smazat %s: %s"
 
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
 #, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
@@ -980,85 +935,90 @@ msgstr[0] "%s má %i novou zprávu"
 msgstr[1] "%s má %i nové zprávy"
 msgstr[2] "%s má %i nových zpráv"
 
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s hlásí chybu: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
 #, c-format
 msgid "unable to open folder \"%s\": %s"
 msgstr "nemohu otevřít služku \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
 #, c-format
 msgid "unable to close folder \"%s\": %s"
 msgstr "nemohu zavřít složku \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
 #, c-format
 msgid "error while reading folder \"%s\": %s"
 msgstr "chyba během čtení složky \"%s\": %s"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "yes"
 msgstr "ano"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "no"
 msgstr "ne"
 
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:142
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s verze %s\n"
 
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:147
 msgid "Mailbox backends:\n"
 msgstr "Backendy poštovních schránek:\n"
 
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:152
 msgid "POP3 and IMAP features:\n"
 msgstr "Funkce POP3 a IMAP:\n"
 
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:157
 msgid "Sylpheed features:\n"
 msgstr "Funkce Sylpheed:\n"
 
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:205
 #, c-format
 msgid "A Bonobo exception (%s) has occurred in %s()."
 msgstr "Bonobo vyjímka (%s) nastala v %s()."
 
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:247
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "Volba %s ignorována, protože Upozornění na poštu neběží"
+
+#: ../src/mn-main.c:267
 msgid "Show version information"
 msgstr "Zobrazit informace o verzi"
 
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:276
 msgid "Enable informational output"
 msgstr "Povolit informační výstup"
 
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:285
 msgid "Display the properties dialog"
 msgstr "Zobrazit dialog nastavení"
 
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:294
 msgid "Display the about dialog"
 msgstr "Zobrazit dialog O aplikaci"
 
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Zavřít vyskakovací souhrn pošty"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:303
 msgid "Update the mail status"
 msgstr "Aktualizovat stav pošty"
 
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Zobrazit souhrn pošty v XML"
+
+#: ../src/mn-main.c:321
 msgid "Unset obsolete GConf configuration"
 msgstr "Odnastavit zastaralé nastavení GConf"
 
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:330
 msgid "Quit Mail Notification"
 msgstr "Ukončit Upozornění na poštu"
 
@@ -1066,11 +1026,11 @@ msgstr "Ukončit Upozornění na poštu"
 #. * We cannot use mn_fatal_error_dialog() because gtk_init() has
 #. * not been called yet.
 #.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:356
 msgid "multi-threading is not available"
 msgstr "vlákna nejsou k dispozici"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:407
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1078,27 +1038,39 @@ msgstr ""
 "Bonobo nemůže nalézt automation objekt. Prosím zkontrolujte instalaci "
 "Upozornění na poštu."
 
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:413
 msgid "quitting Mail Notification"
 msgstr "ukončuji Upozornění na poštu"
 
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:417
 msgid "Mail Notification is not running"
 msgstr "Upozornění na poštu neběží"
 
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:432
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Nemohu inicializovat knihovnu GnomeVFS."
 
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "V Upozornění na poštu nastala chyba při spouštění"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr ""
+"Nepodařilo se spustit upozorňovací knihovnu. Plovoucí okna zpráv nebudou "
+"zobrazována."
+
+#: ../src/mn-main.c:481
 msgid "updating the mail status"
 msgstr "aktualizuji stav pošty"
 
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:497
 msgid "Mail Notification is already running"
 msgstr "Upozornění na poštu již běží"
 
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:514
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1107,77 +1079,85 @@ msgstr ""
 "Bonobo nemohlo najít soubor %s. Prosím zkontrolujte instalaci Upozornění na "
 "poštu."
 
-#: ../src/mn-mbox-mailbox-backend.gob:281
-#, c-format
-msgid "unable to close file: %s"
-msgstr "nemohu zavřít soubor: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "nemohu otevřít soubor: %s"
-
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:168
 msgid "unable to parse MIME message"
 msgstr "nemohu zpracovat MIME zprávu"
 
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:144
 msgid "Unknown"
 msgstr "Neznámý"
 
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "žádná"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "neukončené nahrazení"
+
+#: ../src/mn-message.gob:246
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "neznámé nahrazení \"%s\""
+
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "prázdné nahrazení"
+
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Nemohu spustit \"%s\": %s."
 
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-mh-mailbox-backend.gob:170
 #, c-format
 msgid "error while reading %s: %s"
 msgstr "chyba při čtení %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:183
 #, c-format
 msgid "unable to open %s: %s"
 msgstr "nemohu otevřít %s: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "_běžný"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "_Běžný"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
 msgstr "SS_L/TLS"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
 msgstr "SSL/TLS _na samostatném portu"
 
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
-msgstr "_Jméno počítače:"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Server:"
 
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Detaily"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Typ spojení"
 
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "_Typ spojení:"
-
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "_Přihlašovací mechanismus:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Autentizace"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mechanismus:"
 
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Spojení"
+
+#: ../src/mn-pi-mailbox.gob:153
 msgid "SSL/TLS support has not been compiled in"
 msgstr "Podpora SSL/TLS není zahrnuta v této kompilaci"
 
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:319
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1190,18 +1170,18 @@ msgstr ""
 "\n"
 "Prosím zadejte znovu přihlašovací údaje."
 
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:320
 #, c-format
 msgid "Enter your credentials for %s mailbox %s."
 msgstr "Zadejte přihlašovací údaje pro %s schránku %s."
 
 #. keep the title in sync with gnome-authentication-manager
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:363
 msgid "Authentication Required"
 msgstr "Vyžadována autentizace"
 
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "nesmyslné hodnoty pro LOGIN-DELAY capabilitu"
 
@@ -1211,7 +1191,7 @@ msgstr "nesmyslné hodnoty pro LOGIN-DELAY capabilitu"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:485
+#: ../src/mn-pop3-mailbox.gob:486
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
@@ -1219,11 +1199,11 @@ msgstr ""
 "Přihlášení SASL s úvodní odezvou klienta selhalo, zkouším bez úvodní odezvy  "
 "klienta"
 
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1231,44 +1211,92 @@ msgstr[0] "respektuji LOGIN-DELAY, čekám %i sekundu"
 msgstr[1] "respektuji LOGIN-DELAY, čekám %i sekundy"
 msgstr[2] "respektuji LOGIN-DELAY, čekám %i sekund"
 
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:966
 msgid "server does not support APOP authentication"
 msgstr "server nepodporuje přihlášení APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1022
 msgid "falling back to APOP authentication"
 msgstr "zkouším přihlášení APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1027
 msgid "falling back to USER/PASS authentication"
 msgstr "zkouším přihlášení USER/PASS"
 
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Schránka:"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Nečitelná zpráva:"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "Od:"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Předmět:"
+
 #. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Vlastnosti Upozornění na poštu"
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Otevřít"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Označit jako přečtené"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Označit jako nevyžádané"
+
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Nemohu opevřít zprávu"
+
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Nemohu označit zprávu jako přečtenou"
+
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Nemohu označit zprávu jako nevyžádanou"
 
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "vlevo nahoře"
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "nemohu zobrazit plovoucí okno: %s"
 
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "vpravo nahoře"
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "nemohu zavřít plovoucí okno: %s"
 
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "vlevo dole"
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Nová zpráva"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Vlastnosti Upozornění na poštu"
 
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "vpravo dole"
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "Ukázkové zprávy"
 
-#: ../src/mn-properties-dialog.gob:332
+#: ../src/mn-properties-dialog.gob:276
 msgid "No mailbox selected."
 msgstr "Není vybrána žádná schránka."
 
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
@@ -1276,106 +1304,110 @@ msgstr[0] "Vybrána %i schránka."
 msgstr[1] "Vybrány %i schránky."
 msgstr[2] "Vybráno %i schránek."
 
-#: ../src/mn-properties-dialog.gob:456
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Program pro čtení pošty není nastaven"
+
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr ""
+"Progam pro čtení pošty nastavíte v <b>Systém → Nastavení → "
+"Preferované aplikace</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Nemohu otevřít poslední zprávu"
+
+#: ../src/mn-shell.gob:237
 #, c-format
-msgid "Test message #%i"
-msgstr "Ukázková zpráva #%i"
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Nemohu otevřít zprávy ve schránce \"%s\"."
 
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
-msgstr "Dialog nastavení Upozornění na poštu"
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Nemáte žádnou novou poštu."
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
 msgid "Mailboxes Having New Mail"
 msgstr "Schránky s novou poštou"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
 msgid "Errors"
 msgstr "Chyby"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
 msgid "Mail Summary"
 msgstr "Souhrn pošty"
 
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "Nemáte žádnou novou poštu."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
 msgid "unknown SSL/TLS error"
 msgstr "neznámá SSL/TLS chyba"
 
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "Nečitelná zpráva:"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "Od:"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Předmět:"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
 msgid "Sent:"
 msgstr "Odesláno:"
 
 #. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
 msgid "Select _All"
 msgstr "Vybrat _vše"
 
 #. translators: header capitalization
 #. translators: header capitalization
-#: ../src/mn-stock.c:32
+#: ../src/mn-stock.c:33
 msgid "Co_nnect"
 msgstr "_Připojit"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "nemohu otevřít složku: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "nemohu zavřít složku: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "chyba při čtení složky: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
 msgid "unexpected end of file"
 msgstr "neočekávaný konec souboru"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
 #, c-format
 msgid "incompatible file version \"%i\""
 msgstr "nekompatibilní verze souboru \"%i\""
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
 msgid "file version missing"
 msgstr "chybí verze souboru"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Nemohu číst %s: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
 msgid "System mailbox"
 msgstr "Systémová schránka"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
 #, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
 msgstr "Vaše systémová schránka je <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
@@ -1383,16 +1415,30 @@ msgstr ""
 "Umístění systémovés chránky nemohlo být určeno. Zkontrolujte proměnnou "
 "prostředí MAIL."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
 msgid "system mailbox not found"
 msgstr "systémová schránka nebyla nalezena"
 
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Ukázková schránka"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Ukázková zpráva #%i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "Dialog nastavení Upozornění na poštu"
+
+#: ../src/mn-util.c:350
 #, c-format
 msgid "error loading image: %s"
 msgstr "nemohu načíst obrázek: %s"
 
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:366
 #, c-format
 msgid ""
 "Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1401,52 +1447,56 @@ msgstr ""
 "Nelze načíst rozhraní \"%s\". Prosím zkontrolujte instalaci Upozornění na "
 "poštu."
 
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:381
 #, c-format
 msgid ""
 "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
 "Notification installation."
 msgstr ""
-"Widget \"%s\" nebyl nalezen v rozhraní \"%s\". Prosím zkontrolujte instalaci Upozornění na "
-"poštu."
+"Widget \"%s\" nebyl nalezen v rozhraní \"%s\". Prosím zkontrolujte instalaci "
+"Upozornění na poštu."
 
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:450
 #, c-format
 msgid "Unable to open self as a module (%s)."
 msgstr "Nemohu otevřít sebe jako modul (%s)."
 
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:455
 #, c-format
 msgid ""
 "Signal handler \"%s\" not found. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Singal handler \"%s\" nebyl nalezen. Prosím zkontrolujte instalaci Upozornění na "
-"poštu."
+"Singal handler \"%s\" nebyl nalezen. Prosím zkontrolujte instalaci "
+"Upozornění na poštu."
 
-#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
 msgid "A drag and drop error has occurred"
 msgstr "Nastala chyba přetažení"
 
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:607
 msgid "An invalid location list has been received."
 msgstr "Obdržen neplatný seznam umístění."
 
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:650
 msgid "An invalid Mozilla location has been received."
 msgstr "Obdrženo neplatné umístění programu Mozilla."
 
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:726
 msgid "Unable to display help"
 msgstr "Nemohu zobrazit nápovědu"
 
-#: ../src/mn-util.c:739
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "Nemohu otevřít odkaz"
+
+#: ../src/mn-util.c:752
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Nemohu vytvořit vlákno: %s."
 
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:929
 #, c-format
 msgid ""
 "The following location is invalid:\n"
@@ -1469,16 +1519,16 @@ msgstr[2] ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:945
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Nastala fatální chyba"
 
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:989
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "nemohu získat aktuální čas: %s"
 
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1304
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
@@ -1486,7 +1536,7 @@ msgstr[0] "před %i sekundou"
 msgstr[1] "před %i sekundami"
 msgstr[2] "před %i sekundami"
 
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1308
 #, c-format
 msgid "about %i minute ago"
 msgid_plural "about %i minutes ago"
@@ -1494,7 +1544,7 @@ msgstr[0] "před %i minutou"
 msgstr[1] "před %i minutami"
 msgstr[2] "před %i minutami"
 
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1313
 #, c-format
 msgid "about %i hour ago"
 msgid_plural "about %i hours ago"
@@ -1502,7 +1552,7 @@ msgstr[0] "před %i hodinou"
 msgstr[1] "před %i hodinami"
 msgstr[2] "před %i hodinami"
 
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1318
 #, c-format
 msgid "about %i day ago"
 msgid_plural "about %i days ago"
@@ -1510,7 +1560,7 @@ msgstr[0] "před %i dnem"
 msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1323
 #, c-format
 msgid "about %i week ago"
 msgid_plural "about %i weeks ago"
@@ -1518,44 +1568,66 @@ msgstr[0] "před %i týdnem"
 msgstr[1] "před %i týdny"
 msgstr[2] "před %i týdny"
 
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1336
 msgid "unknown date"
 msgstr "neznámé datum"
 
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Nastala chyba při spouštění příkazu"
+
+#: ../src/mn-vfs-mailbox.gob:228
 #, c-format
 msgid "unable to monitor %s (%s), poll mode activated"
 msgstr "nemohu sledovat %s (%s), poll režim aktivován"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "unknown mailbox format"
 msgstr "neznámý formát schránky"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "does not exist"
 msgstr "neexistuje"
 
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Nemohu zapsat %s: %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr "vlastnost \"%s\": nemohu převést řetězec \"%s\" do hodnoty typu \"%s\""
+
 #. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Všeobecné</span>"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "_Interval mezi kontrolami pošty:"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Všeobecné"
 
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
 msgid "Mailbox _name:"
 msgstr "_Jméno schránky:"
 
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "_Typ schránky:"
+
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
+msgid "Us_e Default"
 msgstr "_Použít výchozí"
 
 #: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "_Typ schránky:"
+msgid "_Delay between mail checks:"
+msgstr "_Interval mezi kontrolami pošty:"
 
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:9
@@ -1563,12 +1635,12 @@ msgid "_Use Default"
 msgstr "_Použít výchozí"
 
 #: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
 msgid "minutes"
 msgstr "minut"
 
 #: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
 msgid "seconds"
 msgstr "sekund"
 
@@ -1584,144 +1656,262 @@ msgstr "<span weight=\"bold\">Příkazy</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Písma</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Zavření</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Rozložení</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Seznam schránek</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Umístění</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
 msgstr "<span weight=\"bold\">Souhrn pošty v tooltipu</span>"
 
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "_Obsah:"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Všeobecné"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "_Po:"
 
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Skrýt _dříve zobrazenou poštu"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "_Horizontální odsazení:"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "V rámci plovoucích oken"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
-msgstr "Vyskakovací souhrn pošty"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
+msgstr "Plovoucí okna zpráv"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "Použít _tato písma:"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Když _dorazí nová pošta:"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
 msgid "When all mail has _been read:"
 msgstr "Když veškerá pošta _byla přečtena:"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
 msgid "_Always display"
 msgstr "_Vždy zobrazit"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "_Automaticky zavřít po:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "Připojeno ke stavové ikoně"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
 msgid "_Blink on errors"
 msgstr "_Blikat při chybě"
 
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "Zo_brazit ukázku"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "_Výchozí nastavení prostředí"
 
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
 msgid "_Display seen mail"
 msgstr "Zobrazit přečtenou poštu"
 
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
 msgid "_Display this dialog"
 msgstr "Zobrazit tento dialog"
 
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
-msgstr "Zapnout vyskakovací _souhrn pošty"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
+msgstr "Zapnout plovoucí okna zpráv"
 
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
 msgid "_Launch the mail reader"
 msgstr "Sp_ustit poštovní program"
 
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
 msgid "_None"
 msgstr "Žádný"
 
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Umístění:"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "_Titulek:"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Otevřít poslední zprávu"
 
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
 msgid "_Update the mail status"
 msgstr "_Aktualizovat stav pošty"
 
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "P_oužít písma z tématu"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "_Vertikální odsazení:"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
 msgid "icon tooltip's mail summary layout|Co_mpact"
 msgstr "rozložení souhrnu pošty v tooltipu ikony|_Kompaktní"
 
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
 msgid "icon tooltip's mail summary layout|_Standard"
 msgstr "rozložení souhrnu pošty v tooltipu ikony|_Standardní"
 
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "pixelů"
+#~ msgid "Automatically close the mail summary popup"
+#~ msgstr "Automaticky zavírat vyskakovací souhrn pošty"
 
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "rozložení vyskakovacího souhrnu pošty|_Kompaktní"
+#~ msgid "Mail summary popup contents font"
+#~ msgstr "Písmo vyskakovacího souhrnu pošty"
 
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
+#~ msgid "Mail summary popup fonts aspect source"
+#~ msgstr "Zdroj vzhledu písma vyskakovacího souhrnu pošty"
+
+#~ msgid "Mail summary popup horizontal offset"
+#~ msgstr "Vodorovné odsazení vyskakovacího souhrnu pošty"
+
+#~ msgid "Mail summary popup title font"
+#~ msgstr "Písmo titulku vyskakovacího souhrnu pošty"
+
+#~ msgid "Mail summary popup vertical offset"
+#~ msgstr "Svislé odsazení vyskakovacího souhrnu pošty"
+
+#~ msgid "Only display recent mail in mail summary popup"
+#~ msgstr "Zobrazit pouze nedávnou poštu ve vyskakovacím souhrnu pošty"
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (minutes "
+#~ "part)."
+#~ msgstr ""
+#~ "Jak dlouho čekat před zavřením vyskakovacího souhrnu pošty (minutová "
+#~ "část)."
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (seconds "
+#~ "part)."
+#~ msgstr ""
+#~ "Jak dlouho čekat před zavřením vyskakovacího souhrnu pošty (sekundová "
+#~ "část)."
+
+#~ msgid "The custom font to use for the contents of the mail summary popup."
+#~ msgstr "Vlastní písmo pro obsah vyskakovacího souhrnu pošty."
+
+#~ msgid "The custom font to use for the title of the mail summary popup."
+#~ msgstr "Vlastní písmo pro titulek vyskakovacího souhrnu pošty."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the left or right side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Počet pixelů vynechaných mezi levým nebo pravým okrajem obrazovky a "
+#~ "vyskakovacím souhrnem pošty."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the top or bottom side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Počet pixelů vynechaných mezi horním nebo spodním okrajem obrazovky a "
+#~ "vyskakovacím souhrnem pošty."
+
+#~ msgid ""
+#~ "The position of the mail summary popup. Must be \"top-left\", \"top-right"
+#~ "\", \"bottom-left\" or \"bottom-right\"."
+#~ msgstr ""
+#~ "Umístění vyskakovacího souhrnu pošty. Musí být \"top-left\" (vlevo "
+#~ "nahoře), \"top-right\" (vpravo nahoře), \"bottom-left\" (vlevo dole), "
+#~ "\"bottom-right\" (vpravo dole)."
+
+#~ msgid ""
+#~ "Whether to display the mail summary popup when new mail arrives or not."
+#~ msgstr ""
+#~ "Jestli zobrazit vyskakovací souhrn pošty když dorazí nová pošta nebo ne."
+
+#~ msgid ""
+#~ "Whether to hide previously displayed mail in the mail summary popup or "
+#~ "not."
+#~ msgstr ""
+#~ "Jestli skrýt dříve zobrazenou poštu ve vyskakovacím souhrnu pošty nebo ne."
+
+#~ msgid "<span style=\"italic\">autodetect</span>"
+#~ msgstr "<span style=\"italic\">autodetekovat</span>"
+
+#~ msgid "Use the <span style=\"italic\">IDLE</span> extension:"
+#~ msgstr "Použít rozšíření <span style=\"italic\">IDLE</span>:"
+
+#~ msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span size=\"larger\" weight=\"bold\">Souhrn pošty</span>"
+
+#~ msgid "<span weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span weight=\"bold\">Souhrn pošty</span>"
+
+#~ msgid "Close the mail summary popup"
+#~ msgstr "Zavřít vyskakovací souhrn pošty"
+
+#~ msgid "none"
+#~ msgstr "žádná"
+
+#~ msgid "Ho_stname:"
+#~ msgstr "_Jméno počítače:"
+
+#~ msgid "_Details"
+#~ msgstr "_Detaily"
+
+#~ msgid "Authent_ication mechanism:"
+#~ msgstr "_Přihlašovací mechanismus:"
+
+#~ msgid "top left"
+#~ msgstr "vlevo nahoře"
+
+#~ msgid "top right"
+#~ msgstr "vpravo nahoře"
+
+#~ msgid "bottom left"
+#~ msgstr "vlevo dole"
+
+#~ msgid "bottom right"
+#~ msgstr "vpravo dole"
+
+#~ msgid "<span weight=\"bold\">Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Písma</span>"
+
+#~ msgid "<span weight=\"bold\">Layout</span>"
+#~ msgstr "<span weight=\"bold\">Rozložení</span>"
+
+#~ msgid "Co_ntents:"
+#~ msgstr "_Obsah:"
+
+#~ msgid "Hide p_reviously displayed mail"
+#~ msgstr "Skrýt _dříve zobrazenou poštu"
+
+#~ msgid "Hori_zontal offset:"
+#~ msgstr "_Horizontální odsazení:"
+
+#~ msgid "Mail Summary Popup"
+#~ msgstr "Vyskakovací souhrn pošty"
+
+#~ msgid "Use these _fonts:"
+#~ msgstr "Použít _tato písma:"
+
+#~ msgid "_Automatically close after:"
+#~ msgstr "_Automaticky zavřít po:"
+
+#~ msgid "_Display a Test Popup"
+#~ msgstr "Zo_brazit ukázku"
+
+#~ msgid "_Position:"
+#~ msgstr "_Umístění:"
+
+#~ msgid "_Title:"
+#~ msgstr "_Titulek:"
+
+#~ msgid "_Use fonts from theme"
+#~ msgstr "P_oužít písma z tématu"
+
+#~ msgid "_Vertical offset:"
+#~ msgstr "_Vertikální odsazení:"
+
+#~ msgid "pixels"
+#~ msgstr "pixelů"
+
+#~ msgid "popup's mail summary layout|Co_mpact"
+#~ msgstr "rozložení vyskakovacího souhrnu pošty|_Kompaktní"
+
+#~ msgid "popup's mail summary layout|_Standard"
+#~ msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
 
 #~ msgid "Delay between mail checks (minutes part)."
 #~ msgstr "Interval mezi kontrolami pošty (minuty)."
@@ -1741,9 +1931,6 @@ msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
 #~ msgid "Height of main window"
 #~ msgstr "Výška hlavního okna"
 
-#~ msgid "Mail reader command"
-#~ msgstr "Příkaz pro spuštění poštovního programu"
-
 #~ msgid "Minutes between mail checks"
 #~ msgstr "Minuty mezi kontrolami pošty"
 
@@ -1868,9 +2055,6 @@ msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
 #~ msgid "Display help"
 #~ msgstr "Zobrazit nápovědu"
 
-#~ msgid "_About"
-#~ msgstr "_O Upozornění na poštu"
-
 #~ msgid "Display credits"
 #~ msgstr "Kredity"
 
@@ -1883,9 +2067,6 @@ msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
 #~ msgid "Show or hide the statusbar"
 #~ msgstr "Zobrazit nebo skrýt statovou lištu"
 
-#~ msgid "_Desktop Default"
-#~ msgstr "_Výchozí nastavení"
-
 #~ msgid "Set the toolbars style to the desktop default setting"
 #~ msgstr ""
 #~ "Nastaví vzhled lišt nástrojů do výchozího nastavení prostřední GNOME"
@@ -1917,12 +2098,6 @@ msgstr "rozložení vyskakovacího souhrnu pošty|_Standardní"
 #~ msgid "unable to load toolbars.xml"
 #~ msgstr "nemohu načíst toolbars.xml"
 
-#~ msgid "%i new message"
-#~ msgid_plural "%i new messages"
-#~ msgstr[0] "%i nová zpráva"
-#~ msgstr[1] "%i nové zprávy"
-#~ msgstr[2] "%i nových zpráv"
-
 #~ msgid "Compiled-in mailbox backends: "
 #~ msgstr "Podporované typy schránek v této kompilaci: "
 
diff --git a/po/fr.po b/po/fr.po
@@ -4,14 +4,14 @@
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Jean-Yves Lefort <jylefort@brutele.be>, 2005.
+# Jean-Yves Lefort <jylefort@brutele.be>, 2005-2006.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 4.0-rc1\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-27 22:02+0100\n"
-"PO-Revision-Date: 2006-11-27 22:03+0100\n"
+"POT-Creation-Date: 2006-12-07 10:59+0100\n"
+"PO-Revision-Date: 2006-12-07 11:05+0100\n"
 "Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "MIME-Version: 1.0\n"
@@ -594,7 +594,7 @@ msgstr "terminé"
 msgid "invalid location"
 msgstr "emplacement invalide"
 
-#: mn-evolution-folder-tree-control.gob:69
+#: ../src/mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "L'URI actuellement sélectionnée"
 
diff --git a/po/nl.po b/po/nl.po
@@ -4,16 +4,16 @@
 # This file is distributed under the same license as the
 # mail-notification package.
 #
-# Marcel J. Zwiebel <mj.zwiebel@nonux.nl>, 2006.
-# 
+# Marcel J. Zwiebel <mj.zwiebel@nonux.nl>, 2006
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 13:49+0200\n"
-"PO-Revision-Date: 2006-06-14 09:23+0200\n"
+"POT-Creation-Date: 2006-11-27 22:02+0100\n"
+"PO-Revision-Date: 2006-12-07 11:07+0100\n"
 "Last-Translator: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
-"Language-Team: \n"
+"Language-Team: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,8 +48,9 @@ msgid "Configure Mail Notification"
 msgstr "E-mail notificatie instellen"
 
 #: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
 msgid "Mail Notification"
 msgstr "E-mail notificatie"
 
@@ -57,142 +58,117 @@ msgstr "E-mail notificatie"
 msgid "Get notified when new mail arrives"
 msgstr "Informeer mij wanneer nieuwe e-mail berichten binnenkomen"
 
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
 msgid "Always display an icon"
 msgstr "Toon altijd een icoon"
 
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Het e-mail overzichtsvenster automatisch sluiten"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
 msgid "Blink on errors"
 msgstr "Bij fouten knipperen"
 
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
 msgid "Click action"
 msgstr "Muisklik-actie"
 
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
 msgid "Display seen mail"
 msgstr "Laat gelezen e-mail berichten zien"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
 msgstr "Mini-overzicht (popup) nieuwe e-mail activeren"
 
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Mini-overzicht (popup) verlopen e-mail activeren"
+
+#: ../data/mail-notification.schemas.in.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Vingerafdrukken van betrouwbare X509 certificaten"
 
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
 msgid "Height of properties dialog"
 msgstr "Hoogte van het instellingen dialoogvenster"
 
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Opdracht bij het lezen van e-mail"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Lettertype in het e-mail overzichtsvenster"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
-msgstr "Locatie lettertypes voor het e-mail overzichtsvenster"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr ""
+"Als /apps/mail-notification/popups/expiration/enabled is \"true\", de wachttijd "
+"voordat het berichtvenster verlopen verschijnt (minuten)."
 
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Horizontale plaatsing van het e-mail overzichtsvenster"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr ""
+"Als /apps/mail-notification/popups/expiration/enabled is \\\"true\\\", de wachttijd "
+"voordat het berichtvenster verlopen verschijnt (seconden)."
 
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Positie van het e-mail overzichtsvenster"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Opdracht bij het wijzigen van e-mail"
 
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Lettertype voor de titel van het e-mail overzichtsvenster"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Opdracht bij het lezen van e-mail"
 
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Horizontale plaatsing van het e-mail overzichtsvenster"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Positie van het e-mail popupvenster"
 
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr "Wachttijd in minuten voordat het e-mail overzichtsvenster gesloten wordt"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Wachttijd in minuten voordat het e-mail popupvenster gesloten wordt"
 
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:15
 msgid "New mail command"
 msgstr "Opdracht bij ontvangst van nieuwe e-mail"
 
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr "Laat alleen meest recente e-mail zien in overzichtsvenster"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:16
 msgid "Run a command when all mail is read"
 msgstr "Opdracht na het lezen van alle nieuwe e-mail"
 
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:17
 msgid "Run a command when new mail arrives"
-msgstr "Voer een opdracht uit als nieuwe e-mail arriveert"
+msgstr "Opdracht na het lezen van alle nieuwe e-mail"
+
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Opdracht na het wijzigen van de berichtenlijst"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Wachttijd in seconden voordat het e-mail overzichtsvenster gesloten wordt"
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Wachttijd in seconden voordat het e-mail popupvenster gesloten wordt"
 
-#: ../data/mail-notification.schemas.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:20
 msgid ""
 "The action to perform when the icon is clicked. Must be \"display-properties-"
-"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
 msgstr ""
 "De opdracht die uitgevoerd moet worden bij een muisklik op het icoon. "
 "Heeft ofwel de waarde \"display-properties-"
 "dialog\", \"launch-mail-reader\" of \"update-mail-status\"."
 
-#: ../data/mail-notification.schemas.in.h:23
-msgid ""
-"The amount of time to wait before closing the mail summary popup (minutes "
-"part)."
-msgstr ""
-"Wachttijd voordat het e-mail overzichtsvenster gesloten wordt (minutendeel)."
-
-#: ../data/mail-notification.schemas.in.h:24
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr ""
-"Wachttijd voordat het e-mail overzichtsvenster gesloten wordt (secondendeel)."
-
-#: ../data/mail-notification.schemas.in.h:25
-msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
-msgstr ""
-"Het aspect gedeelte van de lettertypes voor de overzichtsweergave (popup). "
-"De waarde moet \"theme\" of \"custom\" zijn."
-
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:21
 msgid "The command to run when all mail is read."
 msgstr "Opdracht die uitgevoerd moet worden wanneer alle e-mail gelezen is"
 
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:22
 msgid "The command to run when new mail arrives."
 msgstr "Opdracht die uitgevoerd moet worden wanneer nieuwe e-mail arriveert."
 
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr "Het eigen lettertype voor het e-mail overzichtsvenster."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "Opdracht die uitgevoerd moet worden wanneer de berichtenlijst wijzigt."
 
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr "Het eigen lettertype voor de titel van het e-mail overzichtsvenster."
-
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:24
 msgid "The height of the properties dialog in pixels."
 msgstr "Hoogte van het instellingen dialoogvenster in pixels"
 
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:25
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -200,38 +176,18 @@ msgstr ""
 "De lijst met betrouwbare SSL/TLS-servers (hostname:port) zonder X509-"
 "certificaat."
 
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:26
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
 "De lijst met betrouwbare X509-certificaten, gerepresenteerd door hun "
 "MD5vingerafdruk."
 
-#: ../data/mail-notification.schemas.in.h:33
-msgid ""
-"The number of pixels to leave between the left or right side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Het aantal pixels ruimte links en rechts tussen de rand ven het beeldscherm "
-"en het e-mail overzichtsvenster."
-
-#: ../data/mail-notification.schemas.in.h:34
-msgid ""
-"The number of pixels to leave between the top or bottom side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Het aantal pixels ruimte boven en onder tussen de rand ven het beeldscherm "
-"en het e-mail overzichtsvenster."
-
-#: ../data/mail-notification.schemas.in.h:35
-msgid ""
-"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
-"\"bottom-left\" or \"bottom-right\"."
-msgstr ""
-"De positie van e-mail overzichtsvenster. De waarden moeten zijn \"boven-"
-"links\", \"boven-rechts\", \"onder-links\" oder \"onder-rechts\"."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "De positie van het popupvenster. Moet zijn \"attached\" of \"free\"."
 
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:28
 msgid ""
 "The type of mail summary to display in the icon's tooltip. Must be \"standard"
 "\", \"compact\" or \"none\"."
@@ -239,53 +195,55 @@ msgstr ""
 "Het type e-mailoverzicht dat getoond wordt in de tooltip van het icoon. Moet zijn \"standard"
 "\",\"compact\" of \"none\"."
 
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:29
 msgid "The width of the properties dialog in pixels."
 msgstr "Hoogte van het instellingen dialoogvenster in pixels."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:30
 msgid "Tooltip mail summary"
-msgstr "Tooltip e-mail overzicht"
+msgstr "Hoogte van het instellingen dialoogvenster in pixels."
 
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:31
 msgid "Trusted servers list"
 msgstr "Lijst trusted servers"
 
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:32
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Moet het e-mail icoon bij het optreden van fouten knipperen"
 
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr "Moet het e-mail overzichtsvenster (popup) automatisch gesloten worden."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:33
 msgid "Whether to display an icon when there is no new mail or not."
 msgstr "Moet een icoon getoond worden als nieuwe e-mail arriveert."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:34
 msgid "Whether to display seen mail or not."
 msgstr "Moet eerder getoonde e-mail opnieuw getoond worden."
 
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr "Moet het e-mail overzichtsvenster getoond worden bij het arriveren van e-mail."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Moeten popupvensters ingeschakeld worden."
 
-#: ../data/mail-notification.schemas.in.h:45
+#: ../data/mail-notification.schemas.in.in.h:36
 msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
 msgstr ""
-"Moet reeds getoonde e-mail in het overzichtsvenster verborgen worden."
+"Moeten popupvenster automatisch gesloten worden. Moet zijn \"default\", "
+"\"false\" of \"true\"."
 
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:37
 msgid "Whether to run a command when all mail is read or not."
 msgstr "Moet een opdracht uitgevoerd worden als alle e-mail gelezen is."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:38
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Moet een opdracht uitgevoerd worden als een nieuwe e-mail arriveert."
 
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Moet een opdracht uitgevoerd worden als de berichtenlijst wijzigt."
+
+#: ../data/mail-notification.schemas.in.in.h:40
 msgid "Width of properties dialog"
 msgstr "Breedte van het instellingenvenster"
 
@@ -297,7 +255,8 @@ msgstr "Oriëntatie"
 msgid "The orientation of the tray."
 msgstr "De oriëntatie van het mededelingengebied."
 
-#: ../src/mn-about-dialog.gob:49
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:50
 msgid "A Mail Notification Icon"
 msgstr "Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw postbus zijn gearriveerd."
 
@@ -305,121 +264,148 @@ msgstr "Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw pos
 #. * translators: Your Name <your-email>
 #. * optionally followed by one or more: \nOther Contributor's Name <his-email>
 #.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
 msgid "translator-credits"
 msgstr "Marcel J. Zwiebel <mj.zwiebel@nonux.nl>"
 
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "De verwijzing kan niet geopend worden"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "Automatisch detecteren"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">automatische detectie</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Account"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
 msgid "_Username:"
 msgstr "Gebr_uikersnaam:"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
 msgid "Location"
 msgstr "Locatie"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
 msgid "_Location:"
 msgstr "_Locatie:"
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
 msgid "_Browse..."
 msgstr "_Doorzoeken..."
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
 msgid "Select a File or Folder"
 msgstr "Selecteer een bestand of map"
 
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "bestand kan niet gesloten worden: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "postbus kan niet geopend worden: %s"
+
+#: ../src/mn-client-session.c:248
 #, c-format
 msgid "resolving %s"
-msgstr "connectie maken met %s"
+msgstr "verbinding maken met %s"
 
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:264
 #, c-format
 msgid "unable to resolve %s: %s"
-msgstr "er kon geen connectie worden gemaakt met %s: %s"
+msgstr "er kon geen verbinding worden gemaakt met %s: %s"
 
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:305
+#, c-format
 msgid "network address #%i"
 msgstr "netwerkadres #%i"
 
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:308
+#, c-format
 msgid "unable to convert network address #%i into textual form: %s"
 msgstr "het netwerkadres #%i kan niet als tekst geconverteerd worden: %s"
 
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:319
+#, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: adresfamilie wordt niet ondersteund "
 
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:326
+#, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: Socket kon niet aangemaakt worden: %s"
 
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:330
+#, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "connectie maken met %s (%s) via poort %i"
 
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:333
+#, c-format
 msgid "unable to connect: %s"
 msgstr "er kan geen verbinding worden gemaakt: %s"
 
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:338
 msgid "connected successfully"
 msgstr "verbinding geslaagd"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:352
+#, c-format
 msgid "unable to connect to %s"
 msgstr "er kan geen verbinding gemaakt worden met %s"
 
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:379
+#, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "de OpenSSL bibliotheek kan niet geinitialiseerd worden: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:387
+#, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "een SSL/TLS object kan niet aangemaakt worden: %s"
 
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:393
+#, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "een SSL/TLS descriptor kan niet gezet worden: %s"
 
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:399
+#, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "een SSL/TLS handshake kan niet uitgevoerd worden: %s"
 
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:405
 msgid "untrusted server"
 msgstr "niet-betrouwbare server"
 
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:409
+#, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
 msgstr "een SSL/TLS layer is nu actief (%s, %s %i-Bit)"
 
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:456
+#, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, vingerafdruk %s"
 
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:485
 msgid "missing certificate"
 msgstr "missend certificaat"
 
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:511
+#, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
 "someone is intercepting your communication to obtain your confidential "
@@ -436,165 +422,177 @@ msgstr ""
 "verbinding heeft met \"%s\". Als u er toch voor kiest om verbinding met de "
 "server te maken, dan zal deze boodschap niet meer getoond worden."
 
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:526
 msgid "Connect to untrusted server?"
 msgstr "Wilt u verbinding maken met een niet-betrouwbare server?"
 
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:591
+#, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "het antwoord \"%s\" is niet geldig binnen de huidige context"
 
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:620
+#, c-format
 msgid "unable to parse response \"%s\""
-msgstr "het antwoord \"%s\" kan niet geanalyseerd worden"
+msgstr "het antwoord \"%s\" kan niet verwerkt worden"
 
-#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
+#, c-format
 msgid "unable to read from server: %s"
 msgstr "lezen van de server is niet mogelijk: %s"
 
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:675
 msgid "unable to read from server: EOF"
 msgstr "lezen van de server is niet mogelijk: EOF"
 
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:687
+#, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "de gegevens kunnen niet met behulp van SASL gedecodeerd worden: %s"
 
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:832
+#, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "de gegevens kunnen niet met behulp van SASL gecodeerd worden: %s"
 
-#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
+#, c-format
 msgid "unable to write to server: %s"
 msgstr "schrijven op de server is niet mogelijk: %s"
 
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:868
 msgid "unable to write to server: EOF"
 msgstr "schrijven op de server is niet mogelijk: EOF"
 
-#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
+#, c-format
 msgid "unable to encode Base64: %s"
 msgstr "de gegevens kunnen niet met behulp van Base64 gecodeerd worden: %s"
 
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1076
+#, c-format
 msgid "unable to initialize the SASL library: %s"
-msgstr "Dee SASL-bibliotheek kan niet geinitialiseerd worden: %s"
+msgstr "De SASL-bibliotheek kan niet geinitialiseerd worden: %s"
 
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1088
+#, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "het locale adres van socket kan niet opgevraagd worden: %s"
 
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1094
+#, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "het externe adres van socket kan niet opgevraagd worden: %s"
 
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1128
+#, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "de SASL-veiligheidseigenschappen kunnen niet gezet worden: %s"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1152
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr ""
 "de SASL-authenticatie kan niet gestart worden: SASL vroeg naar iets waar we "
 "geen verstand van hebben"
 
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1171
+#, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "de SASL-authenticatie kan niet gestart worden: %s"
 
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1175
+#, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "Er kan geen SASL-verbinding worden gemaakt: %s"
 
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1222
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL vroeg naar iets waar we geen verstand van hebben, SASL-authenticatie wordt afgebroken"
 
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1239
+#, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, SASL-authenticatie wordt afgebroken"
 
 #. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1244
+#, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "de Base64-invoer van de server kan niet gedecodeerd worden: %s"
 
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1280
+#, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "de SASL-veiligheidslaag met sterkte niveau %i is nu geactiveerd"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1285
+#, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "de waarde SASL_MAXOUTBUF kan niet worden gevonden: %s"
 
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1291
+#, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "waarschuwing: de waarde SASL_SSF kan niet worden gevonden: %s"
 
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1450
 msgid "unknown server error"
 msgstr "onbekende server-fout :-("
 
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
 msgid "Mailbox"
 msgstr "Postbus"
 
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
 msgid "From"
 msgstr "Van"
 
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
 msgid "Sent"
 msgstr "Verzonden"
 
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:281
 msgid "A directory creation error has occurred"
 msgstr "Bij het aanmaken van een map is een fout opgetreden"
 
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:282
+#, c-format
 msgid "Unable to create directory \"%s\": %s."
-msgstr "de map \"%s\" kan niet aangemaakt worden: %s."
+msgstr "De map \"%s\" kan niet aangemaakt worden: %s."
 
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:406
+#, c-format
 msgid "recursively unsetting %s"
 msgstr "%s recursief terugzetten"
 
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:410
 msgid "syncing the GConf database"
 msgstr "synchroniseren met de GConf-database"
 
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:413
 msgid "completed"
 msgstr "voltooid"
 
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Een fout is opgtreden in e-mail notificatie tijdens het uitvoeren van een opdracht."
-
-#: ../src/mn-conf.c:1138
-msgid "Unable to execute \"%s\": %s."
-msgstr "\"%s\" kan niet uitgevoerd worden: %s."
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
 msgid "invalid location"
 msgstr "ongeldige locatie"
 
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "De huidige geselecteerde URI"
 
 #. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
 msgid "Folder"
 msgstr "Map"
 
-#: ../src/mn-evolution-mailbox-properties.gob:159
+#: ../src/mn-evolution-mailbox-properties.gob:204
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -602,19 +600,24 @@ msgstr ""
 "E-mail notificatie kan geen verbinding maken met Evolution. Controleer of "
 "Evolution gestart is en dat de Mail Notification plugin geactiveerd is."
 
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
 msgid "folder not found"
 msgstr "map niet gevonden"
 
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "bericht niet gevonden"
+
+#: ../src/mn-evolution-mailbox.gob:220
 msgid "unable to contact Evolution"
 msgstr "er kan geen verbinding met Evolution gemaakt worden"
 
-#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "De Evolution-plugin Mail Notification kan niet geactiveerd worden"
 
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
+#, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
 "installation."
@@ -622,102 +625,112 @@ msgstr ""
 "Bonobo kan de %s server niet vinden. Controleer aub de installatie van E-"
 "mail notificatie."
 
-#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
+#, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
 "Notification installation."
 msgstr ""
 "Bonobo kan niet aanmelden bij de %s server. Controleer aub de installatie "
-"van e-mail notificatie."
+"van E-mail notificatie."
 
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
 msgid "invalid feed location"
 msgstr "ongeldig feed-adres"
 
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
+#, c-format
 msgid "retrieving feed from %s"
 msgstr "feed wordt bij %s opgevraagd"
 
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
+#, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "de feed kan niet opgevraagd worden: %s"
 
-#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
 msgid "unable to parse feed"
-msgstr "de feed kan niet geanalyseerd worden"
+msgstr "de feed kan niet verwerkt worden"
 
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
+#, c-format
 msgid "unable to read %s: %s"
 msgstr "%s kan niet gelezen worden: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
+#, c-format
 msgid "unable to write to %s: %s"
 msgstr "er kan niet naar %s geschreven worden: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
+#, c-format
 msgid "unable to seek in %s: %s"
 msgstr "er kan niet gezocht worden in in %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
+#, c-format
 msgid "unable to tell position of %s: %s"
 msgstr "onmogelijk om de positie van %s vast te stellen: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
+#, c-format
 msgid "unable to close %s: %s"
 msgstr "%s kan niet gesloten worden: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Postbus:"
-
+#. translators: header capitalization
 #: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
+msgid "IMAP Mailbox"
+msgstr "IMAP-postbus"
+
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
 msgstr "In_box"
 
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
 msgstr "_Ander:"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "n_ooit"
-
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "au_tomatische detectie"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Gebruik de IDLE-extensie"
 
 #: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "al_tijd"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "N_ooit"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "Au_tomatische detectie"
 
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Gebruik de <span style=\"italic\">IDLE</span> extensie:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "Al_tijd"
 
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:385
 msgid "server did not send capabilities"
-msgstr "geen ontvangst van de server-capaciteiten"
+msgstr "geen ontvangst van de server-mogelijkheden"
 
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:552
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "de server heeft geroepen LOGINDISABLED, LOGIN-authorisatie wordt niet gebruikt"
 
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:553
 msgid "unable to login"
 msgstr "aanmelding mislukt"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:752
+#: ../src/mn-imap-mailbox.gob:753
 msgid "server did not send all the messages we requested"
 msgstr "de server heeft niet alle opgegeven berichten verzonden"
 
-#: ../src/mn-imap-mailbox.gob:822
+#: ../src/mn-imap-mailbox.gob:823
 msgid "unable to fetch message"
-msgstr "berichten konden niet opgehaald worden"
+msgstr "bericht kon niet opgehaald worden"
 
-#: ../src/mn-imap-mailbox.gob:847
+#: ../src/mn-imap-mailbox.gob:848
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -725,26 +738,28 @@ msgstr ""
 "\"Gebruik de IDLE-extensie\" wordt gezet op \"nooit\" in de postbus-eigenschap, "
 "afmelden"
 
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:859
+#, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
 msgstr "de externe server gebruikt %s, de IDLE-extensie wordt niet gebruikt"
 
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:864
+#, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr ""
 "de externe server gebruikt %s, de IDLE-extensie zou misschien niet goed "
 "kunnen werken"
 
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:873
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "de externe server ondersteund de IDLE-extensie niet, er wordt afgemeld"
 
-#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
 msgid "server does not support in-band SSL/TLS"
 msgstr "de server ondersteund geen in-band SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -752,245 +767,261 @@ msgstr ""
 "u heeft authenticatie met behulp van SASL gekozen, echter SASL-ondersteuning "
 "is bij de aanmaak van het programma niet ingesteld"
 
-#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
+#, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "onbekend authenticatie-mechanisme \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
+#, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
 msgstr "het mechanisme \"%s\" wordt uitgeschakeld en een nieuwe poging wordt gewaagd met behulp van SASL-authenticatie"
 
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1456
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "er wordt teruggevallen op authenticatie via IMAP LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
 msgid "authentication failed"
 msgstr "authenticatie mislukt"
 
 #. success; caller must switch state itself
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
+#: ../src/mn-imap-mailbox.gob:1529
 msgid "server did not send search results"
 msgstr "de server heeft geen zoekresultaten verzonden"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
 msgid "_Mail Reader"
 msgstr "_E-mail programma"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Open laatste bericht"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
 msgid "_Update"
 msgstr "_Bijwerken"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
 msgid "R_emove From Notification Area"
 msgstr "V_erwijderen van medelingengebied"
 
 #. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:270
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Overzicht e-mail berichten</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Overzicht e-mail berichten</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
+#, c-format
 msgid "%s Properties"
 msgstr "%s Eigenschappen"
 
 #. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
 msgid "Add a Mailbox"
 msgstr "Een postbus toevoegen"
 
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
 msgid "A paste error has occurred"
 msgstr "Een invoegfout is opgetreden"
 
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
+#, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "onbehandelde %s-postbus (%s)"
 
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
+#, c-format
 msgid "%s mailbox"
 msgstr "%s-postbus"
 
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
 msgid "detecting mailbox type..."
 msgstr "detecteren postbustype..."
 
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:504
 msgid "\"type\" attribute missing"
 msgstr "eigenschap \"type\" werd niet gevonden"
 
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:511
+#, c-format
 msgid "unknown mailbox type \"%s\""
-msgstr "onbekend type postbus »%s«"
+msgstr "onbekend type postbus \"%s\""
 
-#: ../src/mn-mailbox.gob:499
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr ""
-"eigenschap \"%s\": het is niet mogelijk de tekenreeks \"%s\" in een waarde van "
-"type \"%s\" om te zetten"
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:907
+#, c-format
 msgid "property \"%s\" has no value"
 msgstr "eigenschap \"%s\" heeft geen waarde"
 
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Bij het importeren van oude postbussen is een fout opgetreden"
 
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
 msgid "Unable to load the mailboxes configuration"
 msgstr "Het is niet mogelijk de postbus-configuratie te laden"
 
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
 msgid "Unable to parse the XML document."
-msgstr "Het XML-document kan niet geanalyseerd worden."
+msgstr "Het XML-document kan niet verwerkt worden."
 
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
 msgid "The root element is missing."
 msgstr "Het basiselement (root) is niet aanwezig."
 
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
+#, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "Het basiselement (root) \"%s\" is niet geldig."
 
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
+#, c-format
 msgid "On line %i: %s."
 msgstr "Op regel %i: %s"
 
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
+#, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "Op regel %i: onbekend element \"%s\"."
 
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
 msgid "An error has occurred while loading the mailboxes configuration"
 msgid_plural "Errors have occurred while loading the mailboxes configuration"
 msgstr[0] "Bij het laden van de postbusinstellingen is een fout opgetreden."
 msgstr[1] "Bij het laden van de postbusinstellingen zijn meerdere fouten opgetreden."
 
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
 msgid "Unable to save the mailboxes configuration"
 msgstr "De postbusinstellingen kunnen niet opgeslagen worden"
 
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
+#, c-format
 msgid "Unable to remove %s: %s."
 msgstr "%s kan niet verwijderd worden: %s"
 
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
+#, c-format
 msgid "Unable to create %s: %s."
-msgstr "%s kan niet gecreëerd worden: %s"
+msgstr "%s kan niet aangemaakt worden: %s"
 
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
+#, c-format
 msgid "Unable to open %s for writing: %s."
 msgstr "%s kan niet geopend worden voor schrijfactie: %s"
 
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
 msgid "Unable to write the XML document."
 msgstr "Het XML-document kan niet weggeschreven worden."
 
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
+#, c-format
 msgid "Unable to close %s: %s."
 msgstr "%s kan niet gesloten worden: %s"
 
-#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
+#, c-format
 msgid "Unable to rename %s to %s: %s."
 msgstr "%s kan niet worden hernoemd naar %s: %s"
 
 #. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
+#, c-format
 msgid "unable to delete %s: %s"
 msgstr "%s kan niet verwijderd worden: %s"
 
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
+#, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
 msgstr[0] "%s heeft %i nieuw bericht"
 msgstr[1] "%s heeft %i nieuwe berichten"
 
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
+#, c-format
 msgid "%s reported an error: %s"
 msgstr "%s heeft een fout gemeld: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
+#, c-format
 msgid "unable to open folder \"%s\": %s"
 msgstr "de map \"%s\" kan niet geopend worden: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
+#, c-format
 msgid "unable to close folder \"%s\": %s"
 msgstr "de map \"%s\" kan niet gesloten worden: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
+#, c-format
 msgid "error while reading folder \"%s\": %s"
 msgstr "fout bij het lezen van map \"%s\": %s"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "yes"
 msgstr "ja"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "no"
 msgstr "nee"
 
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:142
+#, c-format
 msgid "%s version %s\n"
 msgstr "%s versie %s\n"
 
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:147
 msgid "Mailbox backends:\n"
 msgstr "Postbuskoppelingen:\n"
 
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:152
 msgid "POP3 and IMAP features:\n"
 msgstr "Ingebouwde POP3- und IMAP-mogelijkheden:\n"
 
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:157
 msgid "Sylpheed features:\n"
 msgstr "Sylpheed-funtionaliteit:\n"
 
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:205
+#, c-format
 msgid "A Bonobo exception (%s) has occurred in %s()."
 msgstr "Een Bonobo-exceptie (%s) is opgetreden in %s()."
 
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:247
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "optie %s wordt genegeerd omdat E-mail notificatie nog niet actief is"
+
+#: ../src/mn-main.c:267
 msgid "Show version information"
 msgstr "Toon versie-informatie"
 
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:276
 msgid "Enable informational output"
 msgstr "Uitvoer informatie activeren"
 
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:285
 msgid "Display the properties dialog"
 msgstr "Toon het eigenschappenvenster"
 
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:294
 msgid "Display the about dialog"
 msgstr "Toon het informatievenster"
 
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Sluit het e-mail overzichtsvenster"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:303
 msgid "Update the mail status"
 msgstr "Kijk of er nieuwe berichten zijn"
 
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Druk een XML-overzicht af"
+
+#: ../src/mn-main.c:321
 msgid "Unset obsolete GConf configuration"
 msgstr "Geef overbodige GConf-configuratie vrij"
 
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:330
 msgid "Quit Mail Notification"
 msgstr "E-mail notificatie afsluiten"
 
@@ -998,136 +1029,163 @@ msgstr "E-mail notificatie afsluiten"
 #. * We cannot use mn_fatal_error_dialog() because gtk_init() has
 #. * not been called yet.
 #.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:356
 msgid "multi-threading is not available"
 msgstr "multi-threading wordt niet ondersteund"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:407
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
 "Bonobo kan het automation object niet vinden. Controleer aub de installatie "
-"van e-mail notificatie."
+"van E-mail notificatie."
 
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:413
 msgid "quitting Mail Notification"
 msgstr "E-mail notificatie wordt afgesloten"
 
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:417
 msgid "Mail Notification is not running"
 msgstr "E-mail notificatie is niet actief"
 
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:432
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "De GnomeVFS-bibliotheek kan niet geinitialiseerd worden."
 
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "Een initialisatiefout is opgetreden in E-mail notificatie"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr ""
+"De notificatiebibliotheek kan niet geinitialiseerd worden. Er zullen "
+"geen popupvensters getoond worden."
+
+#: ../src/mn-main.c:481
 msgid "updating the mail status"
 msgstr "bijwerken e-mail status"
 
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:497
 msgid "Mail Notification is already running"
-msgstr "De e-mail notificatie is reeds actief"
+msgstr "E-mail notificatie is reeds actief"
 
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:514
+#, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonobo kan het %s-bestand vinden. Controleer aub de installatie van e-mail "
+"Bonobo kan het %s-bestand niet vinden. Controleer aub de installatie van E-mail "
 "notificatie."
 
-#: ../src/mn-mbox-mailbox-backend.gob:281
-msgid "unable to close file: %s"
-msgstr "bestand kan niet gesloten worden: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-msgid "unable to open mailbox: %s"
-msgstr "postbus kan niet geopend worden: %s"
-
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:168
 msgid "unable to parse MIME message"
-msgstr "het MIME-bericht kan niet verwerkt worden"
+msgstr "het MIME-bericht kan niet verwerkt worden" 
 
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:144
 msgid "Unknown"
 msgstr "Onbekend"
 
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "geen"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "niet-afgesloten vervanging"
+
+#: ../src/mn-message.gob:246
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "vervanging \"%s\" onbekend"
 
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "lege vervanging"
+
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Niet mogelijk \"%s\" uit te voeren: %s"
+
+#: ../src/mn-mh-mailbox-backend.gob:170
+#, c-format
 msgid "error while reading %s: %s"
 msgstr "fout bij het lezen van %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:183
+#, c-format
 msgid "unable to open %s: %s"
 msgstr "%s kan niet geopend worden: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "sta_ndaard"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "Sta_ndaard"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
-msgstr "_in-band SSL/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
+msgstr "_In-band SSL/TLS"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
 msgstr "SSL/TLS over een apa_rte poort"
 
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
 msgstr "_Server:"
 
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Details"
-
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "Connectietype:"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Verbindingstype:"
 
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
 msgid "Port:"
 msgstr "Poort:"
 
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "_Authenticatiemechanisme:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Aanmelding"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mechanisme:"
+
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Verbinding"
 
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox.gob:153
 msgid "SSL/TLS support has not been compiled in"
-msgstr "ondersteuning voor SSL/TLS is niet in het programma ingebouwd"
+msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
 
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:319
+#, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
 "credentials you have entered are invalid.\n"
 "\n"
 "Please re-enter your credentials."
 msgstr ""
-"De e-mail notificatie kon zich niet aanmelden bij postbus %s %s Een "
+"E-mail notificatie kon zich niet aanmelden bij postbus %s %s Een "
 "mogelijke verklaring kan zijn dat de opgegeven combinatie gebruikersnaam/"
 "wachtwoord onjuist is. \n"
 "\n"
 "Geeft u aub opnieuw uw gebruikersnaam/wachtwoord."
 
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:320
+#, c-format
 msgid "Enter your credentials for %s mailbox %s."
 msgstr "Geef aub uw gebruikersnaam/wachtwoord voor postbus %s %s ."
 
 #. keep the title in sync with gnome-authentication-manager
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:363
 msgid "Authentication Required"
 msgstr "Aanmelding is verplicht"
 
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "ongeldige argumenten voor de LOGIN-DELAY functie"
 
@@ -1137,7 +1195,7 @@ msgstr "ongeldige argumenten voor de LOGIN-DELAY functie"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:485
+#: ../src/mn-pop3-mailbox.gob:486
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
@@ -1145,152 +1203,213 @@ msgstr ""
 "De SASL-authenticate met initieel client-antwoord is mislukt, er wordt een "
 "nieuwe poging zonder client-antwoord onedernomen"
 
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
+#, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] "LOGIN-DELAY wordt gehonoreerd, er wordt %i seconde gewacht"
 msgstr[1] "LOGIN-DELAY wordt gehonoreerd, er wordt %i seconden gewacht"
 
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:966
 msgid "server does not support APOP authentication"
-msgstr "de server ondersteund geen APOP-authenticatie."
+msgstr "de server ondersteund geen APOP-aanmelding."
 
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1022
 msgid "falling back to APOP authentication"
-msgstr "er wordt teruggevallen op APOP-authenticaties"
+msgstr "er wordt teruggevallen op APOP-aanmelding"
 
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1027
 msgid "falling back to USER/PASS authentication"
-msgstr "er wordt teruggevallen op USER/PASS-authenticatie"
+msgstr "er wordt teruggevallen op USER/PASS-aanmelding"
+
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Postbus:"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Message non lisible :"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "Van:"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Onderwerp:"
 
 #. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Instellingen e-mail notificatie"
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Openen"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Markeer als gelezen"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Aanmerken als troep"
 
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "links boven"
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Bericht kan niet geopend worden"
 
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "rechts boven"
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Bericht kan niet als gelezen gemarkeerd worden"
 
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "links onder"
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Bericht kan niet als troep aangemerkt worden"
 
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "rechts onder"
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "popvenster kan niet getoond worden: %s"
+
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "popupvenster kan niet gesloten worden: %s"
 
-#: ../src/mn-properties-dialog.gob:332
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Nieuw bericht"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Eigenschappen E-mail notificatie"
+
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "_Test berichten"
+
+#: ../src/mn-properties-dialog.gob:276
 msgid "No mailbox selected."
 msgstr "Geen postbus geselecteerd."
 
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
+#, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i postbus geselecteerd."
 msgstr[1] "%i postbussen geselecteerd."
 
-#: ../src/mn-properties-dialog.gob:456
-msgid "Test message #%i"
-msgstr "Testbericht %i"
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Er is geen e-mail programma ingesteld"
 
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
-msgstr "Instellingenvenster e-mail notificatie"
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr ""
+"U kunt een e-mail programma installen door te kiezen voor <b>Systeem → "
+"Voorkeuren → Programmavoorkeuren</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Het laatste bericht kan niet geopend worden."
+
+#: ../src/mn-shell.gob:237
+#, c-format
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Berichten in postbus \"%s\" kunnen niet geopend worden."
+
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "U heeft geen nieuwe e-mail berichten."
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
 msgid "Mailboxes Having New Mail"
 msgstr "Postbussen met nieuwe e-mail berichten"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
 msgid "Errors"
 msgstr "Fouten"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
 msgid "Mail Summary"
 msgstr "Overzicht e-mail berichten"
 
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "U heeft geen nieuwe e-mail berichten."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
 msgid "unknown SSL/TLS error"
 msgstr "onbekende SSL/TLS-fout"
 
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "onleesbaar bericht"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "Van"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Onderwerp"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
 msgid "Sent:"
 msgstr "Verzonden"
 
 #. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
 msgid "Select _All"
 msgstr "_Alles selecteren"
 
 #. translators: header capitalization
-#: ../src/mn-stock.c:32
+#. translators: header capitalization
+#: ../src/mn-stock.c:33
 msgid "Co_nnect"
 msgstr "_Verbinden"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
+#, c-format
 msgid "unable to open folder: %s"
 msgstr "map kan niet geopend worden: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
+#, c-format
 msgid "unable to close folder: %s"
 msgstr "map kan niet gesloten worden: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
+#, c-format
 msgid "error while reading folder: %s"
 msgstr "fout bij het lezen van map: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
 msgid "unexpected end of file"
-msgstr "unverwacht einde van bestand"
+msgstr "onverwacht einde van bestand"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
+#, c-format
 msgid "incompatible file version \"%i\""
 msgstr "bestandsversie is niet compatibel »%i«"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
 msgid "file version missing"
 msgstr "bestandsversie is niet aanwezig"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Niet mogelijk om %s te lezen: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
 msgid "System mailbox"
 msgstr "Systeempostbus"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
+#, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
 msgstr "Uw systeempostbus is <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
@@ -1298,15 +1417,31 @@ msgstr ""
 "De locatie van de systeempostbus is onvindbaar. Contorleer aub de "
 "omgevingsvariabele MAIL."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
 msgid "system mailbox not found"
 msgstr "Systeempostbus niet gevonden"
 
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Testpostbus"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Testbericht %i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "E-mail notificatie eigenschappenvenster"
+
+#: ../src/mn-util.c:350
+#, c-format
 msgid "error loading image: %s"
 msgstr "fout bij laden afbeelding: %s"
 
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:366
+#, c-format
 msgid ""
 "Unable to load interface \"%s\". Please check your Mail Notification "
 "installation."
@@ -1314,7 +1449,8 @@ msgstr ""
 "Kan de \"%s\"-interface niet laden. Controleer aub de installatie van e-mail "
 "notificatie."
 
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:381
+#, c-format
 msgid ""
 "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
 "Notification installation."
@@ -1322,11 +1458,13 @@ msgstr ""
 "Schermelement \"%s\" niet gevonden in de interface. Controleer aub de installatie van e-mail "
 "notificatie."
 
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:450
+#, c-format
 msgid "Unable to open self as a module (%s)."
-msgstr "kan niet zelf als een module openen (%s)."
+msgstr "Kan niet zelf als een module openen (%s)."
 
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:455
+#, c-format
 msgid ""
 "Signal handler \"%s\" not found. Please check your Mail Notification "
 "installation."
@@ -1334,28 +1472,34 @@ msgstr ""
 "Signaalafhandeling \"%s\" niet gevonden. Controleer aub de installatie van e-mail "
 "notificatie."
 
-#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
 msgid "A drag and drop error has occurred"
 msgstr "Een drag'n'drop-fout is opgetreden"
 
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:607
 msgid "An invalid location list has been received."
 msgstr "Ontvangst van een ongeldige adreslijst."
 
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:650
 msgid "An invalid Mozilla location has been received."
 msgstr "Ontvangst van een ongeldig Mozilla-adres."
 
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:726
 msgid "Unable to display help"
 msgstr "Kan geen helpinformatie tonen"
 
-#: ../src/mn-util.c:739
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "Kan link niet openen"
+
+#: ../src/mn-util.c:752
+#, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Kan geen thread aanmaken: %s."
 
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:929
+#, c-format
 msgid ""
 "The following location is invalid:\n"
 "\n"
@@ -1377,80 +1521,112 @@ msgstr[1] ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:945
 msgid "A fatal error has occurred in Mail Notification"
-msgstr "Een fatale fout is opgetreden in e-mail notificatie "
+msgstr "Een fatale fout is opgetreden in E-mail notificatie "
 
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:989
+#, c-format
 msgid "unable to get current time: %s"
 msgstr "kan de huidige tijd niet bepalen: %s"
 
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1304
+#, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
-msgstr[0] "%i seconden geleden"
+msgstr[0] "%i seconde geleden"
+msgstr[1] "%i seconden geleden"
 
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1308
+#, c-format
 msgid "about %i minute ago"
 msgid_plural "about %i minutes ago"
 msgstr[0] "ongeveer %i minuut geleden"
 msgstr[1] "ongeveer %i minuten geleden"
 
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1313
+#, c-format
 msgid "about %i hour ago"
 msgid_plural "about %i hours ago"
 msgstr[0] "ongeveer %i uur geleden"
 msgstr[1] "ongeveer %i uren geleden"
 
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1318
+#, c-format
 msgid "about %i day ago"
 msgid_plural "about %i days ago"
 msgstr[0] "ongeveer %i dag geleden"
 msgstr[1] "ongeveer %i dagen geleden"
 
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1323
+#, c-format
 msgid "about %i week ago"
 msgid_plural "about %i weeks ago"
 msgstr[0] "ongeveer %i week geleden"
 msgstr[1] "ongeveer %i weken geleden"
 
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1336
 msgid "unknown date"
 msgstr "onbekende datum"
 
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Een opdrachtfout is opgetreden in E-mail notificatie"
+
+#: ../src/mn-vfs-mailbox.gob:228
+#, c-format
 msgid "unable to monitor %s (%s), poll mode activated"
 msgstr "%s (%s) kan niet in de gaten worden gehouden, poll modus wordt geactiveerd"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "unknown mailbox format"
 msgstr "onbekend postbusformaat"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "does not exist"
 msgstr "bestaat niet"
 
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Niet mogelijk %s te schrijven: %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr ""
+"eigenschap \"%s\": niet mogelijk om tekenreeks \"%s\" om te zetten"
+"in een waarde van het type \"%s\""
+
 #. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Algemeen</span>"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "_Wachttijd tussen controleren e-mail:"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Algemeen"
 
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
 msgid "Mailbox _name:"
 msgstr "Postbus_naam:"
 
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "Postbus_type:"
+
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
+msgid "Us_e Default"
 msgstr "Gebr_uik standaardwaarde"
 
 #: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "Postbus_type:"
+msgid "_Delay between mail checks:"
+msgstr "_Wachttijd tussen controleren e-mail:"
 
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:9
@@ -1458,12 +1634,12 @@ msgid "_Use Default"
 msgstr "Gebr_uik standaardwaarde"
 
 #: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
 msgid "minutes"
 msgstr "minuten"
 
 #: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
 msgid "seconds"
 msgstr "seconden"
 
@@ -1479,141 +1655,99 @@ msgstr "<span weight=\"bold\">Opdrachten</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Letterypen</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Venster sluiten</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Layout</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Postbuslijst</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Positie</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
 msgstr "<span weight=\"bold\">Overzicht e-mail berichten</span>"
 
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "I_nhoud:"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Algemeen"
-
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Ver_berg eerder getoonde e-mail"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "_Na:"
 
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "_Horizontale plaatsing:"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "_In de popup-stapel"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
 msgstr "Popupvenster"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
 msgid "Status Icon"
 msgstr "Statusicoon"
 
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "_Gebruik volgende lettertypen:"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Wanneer _nieuwe e-mail arriveert:"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
 msgid "When all mail has _been read:"
 msgstr "Wanneer alle e-mail is ge_lezen:"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
 msgid "_Always display"
 msgstr "Laat _altijd zien"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "Automat_isch sluiten na:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "_Gekoppeld aan de statusicoon"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
 msgid "_Blink on errors"
 msgstr "_Knipperen bij fouten"
 
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "_Toon een test-popupvenster"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "_Standaardwaarde bureaublad"
 
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
 msgid "_Display seen mail"
 msgstr "T_oon alle ongelezen e-mail berichten"
 
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
 msgid "_Display this dialog"
 msgstr "Toon dit _dialoogvenster"
 
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
 msgstr "_Activeer popupvenster nieuwe e-mail"
 
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
 msgid "_Launch the mail reader"
 msgstr "Start het _e-mail programma"
 
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
 msgid "_None"
 msgstr "_Geen"
 
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Positie:"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "Tite_l:"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "O_pen het laatste bericht"
 
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
 msgid "_Update the mail status"
 msgstr "_Controleer op nieuwe e-mail berichten"
 
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "L_ettertypen van het thema gebruiken"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "_Verticale plaatsing:"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
 msgid "icon tooltip's mail summary layout|Co_mpact"
 msgstr "Co_mpact"
 
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
 msgid "icon tooltip's mail summary layout|_Standard"
 msgstr "_Standaard"
 
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "pixels"
-
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "Co_mpact"
-
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "_Standaard"
diff --git a/po/pt_BR.po b/po/pt_BR.po
@@ -3,15 +3,15 @@
 #
 # This file is distributed under the same license as the
 # mail-notification package.
-#
-# Claudio André <claudio.andre@correios.net.br>, 2005.
-#
+# 
+# Claudio André <claudio.andre@correios.net.br>, 2006.
+# 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-11-14 18:03-0300\n"
-"PO-Revision-Date: 2006-02-26 05:17+0100\n"
+"POT-Creation-Date: 2006-11-28 13:34-0200\n"
+"PO-Revision-Date: 2006-12-07 11:08+0100\n"
 "Last-Translator: Claudio André <claudio.andre@correios.net.br>\n"
 "Language-Team: Claudio André <claudio.andre@correios.net.br>\n"
 "MIME-Version: 1.0\n"
@@ -44,14 +44,13 @@ msgid "Mail Notification / Evolution glue factory"
 msgstr "Fábrica de ligação Notificação de Correio / Evolution"
 
 #: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
 msgid "Configure Mail Notification"
 msgstr "Configurar Notificação de Correio"
 
 #: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2
-#: ../data/mail-notification.soundlist.in.h:1 ../src/mn-mail-icon.gob:223
-#: ../src/mn-main.c:285 ../src/mn-main.c:301
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
 msgid "Mail Notification"
 msgstr "Notificação de Correio"
 
@@ -59,340 +58,197 @@ msgstr "Notificação de Correio"
 msgid "Get notified when new mail arrives"
 msgstr "Notificar quando novas mensagens chegarem"
 
-#: ../data/mail-notification.schemas.in.h:1
-msgid "Automatically close the mail summary popup"
-msgstr "Fechar automaticamente janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:1
+msgid "Always display an icon"
+msgstr "Sempre mostrar um ícone"
 
-#: ../data/mail-notification.schemas.in.h:2
+#: ../data/mail-notification.schemas.in.in.h:2
 msgid "Blink on errors"
 msgstr "Se ocorrerem erros, piscar ícone de status"
 
-#: ../data/mail-notification.schemas.in.h:3
-msgid "Delay between mail checks (minutes part)."
-msgstr "Intervalo entre verificações de correio (minutos)."
-
-#: ../data/mail-notification.schemas.in.h:4
-msgid "Delay between mail checks (seconds part)."
-msgstr "Intervalo entre verificações de correio (segundos)."
-
-#: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "Mostrar o resumo do correio numa dica"
+#: ../data/mail-notification.schemas.in.in.h:3
+msgid "Click action"
+msgstr "Ação no clique"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "Não mostrar o diálogo de erro de notificação imediata"
+#: ../data/mail-notification.schemas.in.in.h:4
+msgid "Display seen mail"
+msgstr "Mostrar mensagens lidas"
 
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "Ação no duplo clique"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Ativar janela de notificação"
 
-#: ../data/mail-notification.schemas.in.h:8
-msgid "Enable mail summary popup"
-msgstr "Ativar janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Janela de mensagem de expiração"
 
-#: ../data/mail-notification.schemas.in.h:9
+#: ../data/mail-notification.schemas.in.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Assinaturas de certificados x509 de confiança"
 
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Height of edit toolbars dialog"
-msgstr "Altura do diálogo de edição da barra de ferramenta"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Height of main window"
-msgstr "Altura da janela principal"
-
-#: ../data/mail-notification.schemas.in.h:12
+#: ../data/mail-notification.schemas.in.in.h:8
 msgid "Height of properties dialog"
 msgstr "Altura do diálogo de propriedades"
 
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail read command"
-msgstr "Comando de leitura do correio"
-
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail reader command"
-msgstr "Comando do leitor de correio"
-
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup contents font"
-msgstr "Fonte usado na janela de resumo do correio"
-
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Mail summary popup fonts aspect source"
-msgstr "Tipo de fonte usado na janela de resumo do correio"
-
-#: ../data/mail-notification.schemas.in.h:17
-msgid "Mail summary popup horizontal offset"
-msgstr "Distância horizontal da janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr "Se /apps/mail-notification/popups/expiration/enabled estiver·ajustado·para·\"true\", a·quantidade·de·tempo·que·deve·esperar·antes·de·expirar·a·janela·de·notificação·de·mensagens·(minutos)."
 
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Mail summary popup position"
-msgstr "Posição da janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr "Se·/apps/mail-notification/popups/expiration/enabled·estiver ajustado para \"true\",·a quantidade de tempo que deve esperar antes de expirar a janela de notificação de mensagens (segundos)."
 
-#: ../data/mail-notification.schemas.in.h:19
-msgid "Mail summary popup title font"
-msgstr "Fonte do título da janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Comando de email alterado"
 
-#: ../data/mail-notification.schemas.in.h:20
-msgid "Mail summary popup vertical offset"
-msgstr "Distância vertical da janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Comando de leitura do correio"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Minutes between mail checks"
-msgstr "Minutos entre as verificações de correio"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Posição da janela de notificação"
 
-#: ../data/mail-notification.schemas.in.h:22
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr "Minutos a aguardar antes de fechar a janela de resumo do correio"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Minutos a aguardar antes de expirar a janela de resumo do correio"
 
-#: ../data/mail-notification.schemas.in.h:23
+#: ../data/mail-notification.schemas.in.in.h:15
 msgid "New mail command"
 msgstr "Comando de nova mensagem"
 
-#: ../data/mail-notification.schemas.in.h:24
-msgid "Only display recent mail in mail summary popup"
-msgstr "Apenas mostrar mensagens recentes no resumo do correio"
-
-#: ../data/mail-notification.schemas.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:16
 msgid "Run a command when all mail is read"
 msgstr "Executar um comando quando todas mensagens forem lidas"
 
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:17
 msgid "Run a command when new mail arrives"
 msgstr "Executar um comando quando nova mensagem chega"
 
-#: ../data/mail-notification.schemas.in.h:27
-msgid "Seconds between mail checks"
-msgstr "Segundos entre as verificações de correio"
-
-#: ../data/mail-notification.schemas.in.h:28
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Segundos a aguardar antes de fechar a janela de resumo do correio"
-
-#: ../data/mail-notification.schemas.in.h:29
-msgid "Set a mail reader"
-msgstr "Definir um leitor de correio"
-
-#: ../data/mail-notification.schemas.in.h:30
-msgid ""
-"The action to perform when the icon is double-clicked. Must be \"display-"
-"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
-msgstr ""
-"A ação a executar quando o ícone recebe duplo-clique deve ser: \"display-"
-"main-window\", \"launch-mail-reader\" ou \"update-mail-status\"."
-
-#: ../data/mail-notification.schemas.in.h:31
-msgid ""
-"The amount of time to wait before closing the mail summary popup (minutes "
-"part)."
-msgstr ""
-"Tempo a aguardar antes de fechar a janela de resumo do correio (minutos)."
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Executar um comando quando a lista de mensagens se altera"
 
-#: ../data/mail-notification.schemas.in.h:32
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr ""
-"Tempo a aguardar antes de fechar a janela de resumo do correio (segundos)."
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Segundos·a·aguardar·antes·de·expirar·a·janela·de·resumo·do·correio"
 
-#: ../data/mail-notification.schemas.in.h:33
+#: ../data/mail-notification.schemas.in.in.h:20
 msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
 msgstr ""
-"O tipo de fonte da janela de resumo do correio deve ser: \"theme\""
-" ou \"custom\"."
-
-#: ../data/mail-notification.schemas.in.h:34
-msgid "The command to run to launch the mail reader."
-msgstr "O comando para abrir o leitor de correio."
+"A ação a executar quando o ícone recebe clique deve ser: \"display-properties-"
+"dialog\",·\"launch-mail-reader\",·\"open-latest-message\"·ou·\"update-mail-"
+"status\""
 
-#: ../data/mail-notification.schemas.in.h:35
+#: ../data/mail-notification.schemas.in.in.h:21
 msgid "The command to run when all mail is read."
 msgstr "O comando a executar quando todas mensagens forem lidas."
 
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:22
 msgid "The command to run when new mail arrives."
 msgstr "O comando a executar quando novas mensagens chegam."
 
-#: ../data/mail-notification.schemas.in.h:37
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr "Fonte selecionado para uso na janela de resumo do correio."
-
-#: ../data/mail-notification.schemas.in.h:38
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr "Fonte selecionado para uso no título da janela de resumo do correio."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "O comando a executar quando a lista de mensagens se altera."
 
-#: ../data/mail-notification.schemas.in.h:39
-msgid "The height of the edit toolbars dialog in pixels."
-msgstr "Altura do diálogo de edição da barra de ferramenta em pixels."
-
-#: ../data/mail-notification.schemas.in.h:40
-msgid "The height of the main window in pixels."
-msgstr "Altura da janela principal em pixels."
-
-#: ../data/mail-notification.schemas.in.h:41
+#: ../data/mail-notification.schemas.in.in.h:24
 msgid "The height of the properties dialog in pixels."
 msgstr "Altura do diálogo de propriedades em pixels."
 
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:25
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
-"Lista de servidores SSL/TLS de confiança (hostname:port) que não possuem "
-"um certificado X509."
+"Lista de servidores SSL/TLS de confiança (hostname:port) que não possuem um "
+"certificado X509."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:26
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
-"Lista de certificados X509 de confiança, representados por suas assinaturas MD5."
-
-#: ../data/mail-notification.schemas.in.h:44
-msgid ""
-"The number of pixels to leave between the left or right side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Número de pixels entre o canto esquerdo ou direito da tela e "
-"a janela de resumo do correio."
-
-#: ../data/mail-notification.schemas.in.h:45
-msgid ""
-"The number of pixels to leave between the top or bottom side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Número de pixels entre o canto superior ou inferior da tela e "
-"a janela de resumo do correio."
+"Lista de certificados X509 de confiança, representados por suas assinaturas "
+"MD5."
 
-#: ../data/mail-notification.schemas.in.h:46
-msgid ""
-"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
-"\"bottom-left\" or \"bottom-right\"."
-msgstr ""
-"A posição da janela de resumo do correio deve ser: \"top-left\", \"top-"
-"right\", \"bottom-left\" ou \"bottom-right\"."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "A posição da janela de resumo de correio deve ser \"attached\" ou \"free\"."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:28
 msgid ""
-"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
-"\"both\" or \"both-horiz\"."
-msgstr ""
-"O estilo da barra de ferramentas deve ser: \"desktop-default\", \"icons\", "
-"\"text\", \"both\" ou \"both-horiz\"."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
+msgstr "O tipo de resumo de correios a apresentar numa dica deve ser \"stantard\", \"compact\" ou \"none\"."
 
-#: ../data/mail-notification.schemas.in.h:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "A largura do diálogo de edição da barra de ferramenta em pixels."
-
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "A largura da janela principal em pixels."
-
-#: ../data/mail-notification.schemas.in.h:50
+#: ../data/mail-notification.schemas.in.in.h:29
 msgid "The width of the properties dialog in pixels."
 msgstr "A largura do diálogo de propriedades em pixels."
 
-#: ../data/mail-notification.schemas.in.h:51
-msgid "Toolbars style"
-msgstr "Estilo da barra de ferramentas"
+#: ../data/mail-notification.schemas.in.in.h:30
+msgid "Tooltip mail summary"
+msgstr "Janela de resumo de correio"
 
-#: ../data/mail-notification.schemas.in.h:52
+#: ../data/mail-notification.schemas.in.in.h:31
 msgid "Trusted servers list"
 msgstr "Lista dos servidores de confiança"
 
-#: ../data/mail-notification.schemas.in.h:53
-msgid "View statusbar"
-msgstr "Mostrar barra de status"
-
-#: ../data/mail-notification.schemas.in.h:54
-msgid "View toolbars"
-msgstr "Mostrar barra de ferramentas"
-
-#: ../data/mail-notification.schemas.in.h:55
+#: ../data/mail-notification.schemas.in.in.h:32
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Se o ícone de status deve piscar ou não em caso de erro."
 
-#: ../data/mail-notification.schemas.in.h:56
-msgid "Whether the statusbar should be visible or not."
-msgstr "Se a barra de status deve estar visível ou não."
-
-#: ../data/mail-notification.schemas.in.h:57
-msgid "Whether the toolbars should be visible or not."
-msgstr "Se a barra de ferramentas deve estar visível ou não."
+#: ../data/mail-notification.schemas.in.in.h:33
+msgid "Whether to display an icon when there is no new mail or not."
+msgstr "Se mostra ou não um ícone quando não existem novas mensagens."
 
-#: ../data/mail-notification.schemas.in.h:58
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr "Se deve fechar automaticamente ou não o resumo do correio."
+#: ../data/mail-notification.schemas.in.in.h:34
+msgid "Whether to display seen mail or not."
+msgstr "Se deve mostrar ou não email já lido."
 
-#: ../data/mail-notification.schemas.in.h:59
-msgid "Whether to display the mail summary in the status icon tooltip or not."
-msgstr "Se deve mostrar ou não o resumo do correio em uma dica no ícone de status."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Se deve habilitar ou não a janela de resumo de correio."
 
-#: ../data/mail-notification.schemas.in.h:60
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr "Se deve mostrar ou não o resumo do correio quando novas mensagens chegam."
-
-#: ../data/mail-notification.schemas.in.h:61
+#: ../data/mail-notification.schemas.in.in.h:36
 msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
-msgstr ""
-"Se deve esconder ou não as mensagens previamente apresentados no resumo do correio."
-
-#: ../data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to prevent the immediate notification error dialog from being "
-"displayed or not."
-msgstr ""
-"Se deve impedir ou não que a janela de notificação imediata de erro seja apresentada."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
+msgstr "Se a janela de notificação de mensagens deve expirar ou não. Deve ser \"default\", \"false\" ou \"true\"."
 
-#: ../data/mail-notification.schemas.in.h:63
+#: ../data/mail-notification.schemas.in.in.h:37
 msgid "Whether to run a command when all mail is read or not."
 msgstr "Se executa ou não um comando quando todas as mensagens forem lidas."
 
-#: ../data/mail-notification.schemas.in.h:64
+#: ../data/mail-notification.schemas.in.in.h:38
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Se executa ou não um comando quando novas mensagens chegam."
 
-#: ../data/mail-notification.schemas.in.h:65
-msgid "Whether to set a mail reader or not."
-msgstr "Se indica ou não um leitor de correio."
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Se executa ou não um comando quando a lista de mensagens se altera."
 
-#: ../data/mail-notification.schemas.in.h:66
-msgid "Width of edit toolbars dialog"
-msgstr "Largura do diálogo de edição da barra de ferramentas"
-
-#: ../data/mail-notification.schemas.in.h:67
-msgid "Width of main window"
-msgstr "Largura da janela principal"
-
-#: ../data/mail-notification.schemas.in.h:68
+#: ../data/mail-notification.schemas.in.in.h:40
 msgid "Width of properties dialog"
 msgstr "Largura do diálogo de propriedades"
 
-#: ../data/mail-notification.soundlist.in.h:2
-msgid "New Mail"
-msgstr "Nova Mensagem"
-
-#: ../src/egg-editable-toolbar.c:534
-msgid "_Remove Toolbar"
-msgstr "_Remover barra de ferramentas"
-
-#: ../src/egg-toolbar-editor.c:555
-msgid "Separator"
-msgstr "Separador"
-
-#: ../src/eggtrayicon.c:128
+#: ../src/eggtrayicon.c:132
 msgid "Orientation"
 msgstr "Orientação"
 
-#: ../src/eggtrayicon.c:129
+#: ../src/eggtrayicon.c:133
 msgid "The orientation of the tray."
 msgstr "Orientação da barra."
 
-#: ../src/mn-about-dialog.gob:48
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:50
 msgid "A Mail Notification Icon"
 msgstr "Ícone da Notificação de Correio"
 
@@ -400,66 +256,58 @@ msgstr "Ícone da Notificação de Correio"
 #. * translators: Your Name <your-email>
 #. * optionally followed by one or more: \nOther Contributor's Name <his-email>
 #.
-#: ../src/mn-about-dialog.gob:56
+#: ../src/mn-about-dialog.gob:58
 msgid "translator-credits"
 msgstr "Claudio André <claudio.andre@correios.net.br>"
 
-#: ../src/mn-about-dialog.gob:78
-msgid "Unable to open link"
-msgstr "Impossível abrir o link"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "Autodetectar"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:92
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">auto detectar</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Conta"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
 msgid "_Username:"
 msgstr "No_me do usuário:"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/mn-authenticated-mailbox.gob:152
-#, c-format
-msgid ""
-"Mail Notification was unable to log into %s mailbox %s, possibly because the "
-"credentials you have entered are invalid.\n"
-"\n"
-"Please re-enter your credentials."
-msgstr ""
-"Notificação de Correio não foi capaz de autenticar %s conta %s, possivelmente "
-"suas credenciais não são válidas.\n"
-"\n"
-"Por favor, verifique seus dados de autenticação."
-
-#: ../src/mn-authenticated-mailbox.gob:153
-#, c-format
-msgid "Enter your credentials for %s mailbox %s."
-msgstr "Informe seus dados de autenticação para %s conta %s."
-
-#. keep the title in sync with gnome-authentication-manager
-#: ../src/mn-authenticated-mailbox.gob:195
-msgid "Authentication Required"
-msgstr "Autenticação requerida"
-
-#: ../src/mn-autodetect-mailbox-properties.gob:93
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
 msgid "Location"
 msgstr "Endereço"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:126
 msgid "_Location:"
 msgstr "_Localização:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:134
 msgid "_Browse..."
 msgstr "_Navegar..."
 
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:176
 msgid "Select a File or Folder"
 msgstr "Selecione um arquivo ou pasta"
 
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "impossível fechar o arquivo: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "impossível abrir caixa de correio: %s"
+
 #: ../src/mn-client-session.c:248
 #, c-format
 msgid "resolving %s"
@@ -470,75 +318,85 @@ msgstr "resolvendo %s"
 msgid "unable to resolve %s: %s"
 msgstr "impossível resolver %s: %s"
 
+#: ../src/mn-client-session.c:305
+#, c-format
+msgid "network address #%i"
+msgstr "endereço de rede·#%i"
+
 #: ../src/mn-client-session.c:308
 #, c-format
+msgid "unable to convert network address #%i into textual form: %s"
+msgstr "impossível converter o endereço de rede #%i para a forma textual: %s"
+
+#: ../src/mn-client-session.c:319
+#, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: família de endereços não suportada"
 
-#: ../src/mn-client-session.c:315
+#: ../src/mn-client-session.c:326
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: impossível criar socket: %s"
 
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:330
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "conectando a %s (%s) porta %i"
 
-#: ../src/mn-client-session.c:322
+#: ../src/mn-client-session.c:333
 #, c-format
 msgid "unable to connect: %s"
 msgstr "impossível se conectar: %s"
 
-#: ../src/mn-client-session.c:327
+#: ../src/mn-client-session.c:338
 msgid "connected successfully"
 msgstr "conectado com sucesso"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:352
 #, c-format
 msgid "unable to connect to %s"
 msgstr "impossível se conectar a %s"
 
-#: ../src/mn-client-session.c:360
+#: ../src/mn-client-session.c:379
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "impossível inicializar a biblioteca OpenSSL: %s"
 
-#: ../src/mn-client-session.c:368
+#: ../src/mn-client-session.c:387
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "impossível criar um objeto SSL/TLS: %s"
 
-#: ../src/mn-client-session.c:374
+#: ../src/mn-client-session.c:393
 #, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "impossível especificar um descritor de arquivo SSL/TLS: %s"
 
-#: ../src/mn-client-session.c:380
+#: ../src/mn-client-session.c:399
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "impossível concluir negociação de conexão SSL/TLS: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:405
 msgid "untrusted server"
 msgstr "servidor não confiável"
 
-#: ../src/mn-client-session.c:390
+#: ../src/mn-client-session.c:409
 #, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
 msgstr "uma camada SSL/TLS está ativa agora (%s, %s %i-bit)"
 
-#: ../src/mn-client-session.c:437
+#: ../src/mn-client-session.c:456
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, assinatura digital: %s"
 
-#: ../src/mn-client-session.c:466
+#: ../src/mn-client-session.c:485
 msgid "missing certificate"
 msgstr "certificado não encontrado"
 
-#: ../src/mn-client-session.c:492
+#: ../src/mn-client-session.c:511
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -549,163 +407,183 @@ msgid ""
 "to \"%s\". If you choose to connect to the server, this message will not be "
 "shown again."
 msgstr ""
-"Notificação de Correio não foi capaz de determinar a autenticidade de \"%s\" (%s). "
-"É possível que alguém esteja monitorando sua comunicação para "
-"obter seus dados confidenciais.\n"
+"Notificação de Correio não foi capaz de determinar a autenticidade de \"%s"
+"\" (%s). É possível que alguém esteja monitorando sua comunicação para obter "
+"seus dados confidenciais.\n"
 "\n"
 "Você deve apenas conectar-se ao servidor se tiver certeza que está conectado "
 "a \"%s\". Se você escolher se conectar ao servidor, esta mensagem não será "
 "mostrada novamente."
 
-#: ../src/mn-client-session.c:507
+#: ../src/mn-client-session.c:526
 msgid "Connect to untrusted server?"
 msgstr "Conectar a um servidor não confiável ?"
 
-#: ../src/mn-client-session.c:571
+#: ../src/mn-client-session.c:591
 #, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "resposta \"%s\" não é válida no atual contexto"
 
-#: ../src/mn-client-session.c:599
+#: ../src/mn-client-session.c:620
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "impossível interpretar a resposta \"%s\""
 
-#: ../src/mn-client-session.c:649 ../src/mn-client-session.c:656
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "impossível ler do servidor: %s"
 
-#: ../src/mn-client-session.c:654
+#: ../src/mn-client-session.c:675
 msgid "unable to read from server: EOF"
 msgstr "impossível ler do servidor: EOF"
 
-#: ../src/mn-client-session.c:666
+#: ../src/mn-client-session.c:687
 #, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "impossível decodificar os dados usando SASL: %s"
 
-#: ../src/mn-client-session.c:811
+#: ../src/mn-client-session.c:832
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "impossível codificar os dados usando SASL: %s"
 
-#: ../src/mn-client-session.c:842 ../src/mn-client-session.c:849
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "impossível gravar dados no servidor: %s"
 
-#: ../src/mn-client-session.c:847
+#: ../src/mn-client-session.c:868
 msgid "unable to write to server: EOF"
 msgstr "impossível gravar dados no servidor: EOF"
 
-#: ../src/mn-client-session.c:878 ../src/mn-pop3-mailbox.gob:468
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "impossível codificar em Base64: %s"
 
-#: ../src/mn-client-session.c:1056
+#: ../src/mn-client-session.c:1076
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "impossível inicializar a biblioteca SASL: %s"
 
-#: ../src/mn-client-session.c:1068
+#: ../src/mn-client-session.c:1088
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "impossível obter endereço local de um socket: %s"
 
-#: ../src/mn-client-session.c:1074
+#: ../src/mn-client-session.c:1094
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "impossível obter endereço remoto de um socket: %s"
 
-#: ../src/mn-client-session.c:1108
+#: ../src/mn-client-session.c:1128
 #, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "impossível especificar as propriedades de segurança SASL: %s"
 
-#: ../src/mn-client-session.c:1132
+#: ../src/mn-client-session.c:1152
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
-msgstr ""
-"impossível iniciar autenticação SASL: SASL solicitou algo desconhecido"
+msgstr "impossível iniciar autenticação SASL: SASL solicitou algo desconhecido"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1171
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "impossível iniciar autenticação SASL: %s"
 
-#: ../src/mn-client-session.c:1155
+#: ../src/mn-client-session.c:1175
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "impossível criar uma conexão SASL: %s"
 
-#: ../src/mn-client-session.c:1202
+#: ../src/mn-client-session.c:1222
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL solicitou algo desconhecido, abortando autenticação SASL"
 
-#: ../src/mn-client-session.c:1219
+#: ../src/mn-client-session.c:1239
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, abortando autenticação SASL"
 
 #. compliance error
-#: ../src/mn-client-session.c:1224
+#: ../src/mn-client-session.c:1244
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "impossível decodificar entrada Base64 do servidor: %s"
 
-#: ../src/mn-client-session.c:1260
+#: ../src/mn-client-session.c:1280
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "uma camada SASL com fator de força %i está ativa agora"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1265
+#: ../src/mn-client-session.c:1285
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "impossível obter a propriedade SASL_MAXOUTBUF: %s"
 
-#: ../src/mn-client-session.c:1271
+#: ../src/mn-client-session.c:1291
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "aviso: impossível obter a propriedade SASL_SSF: %s"
 
-#: ../src/mn-conf.c:240
+#: ../src/mn-client-session.c:1450
+msgid "unknown server error"
+msgstr "erro de servidor desconhecido"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "Mailbox"
+msgstr "Conta de Correio"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "From"
+msgstr "De"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Subject"
+msgstr "Assunto"
+
+#: ../src/mn-compact-message-view.gob:49
+msgid "Sent"
+msgstr "Enviado"
+
+#: ../src/mn-conf.c:281
 msgid "A directory creation error has occurred"
 msgstr "Um erro de criação de diretório ocorreu"
 
-#: ../src/mn-conf.c:241
+#: ../src/mn-conf.c:282
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
 msgstr "Impossível criar o diretório \"%s\": %s."
 
-#: ../src/mn-conf.c:317
+#: ../src/mn-conf.c:406
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "suprimindo recursivamente %s"
 
-#: ../src/mn-conf.c:321
+#: ../src/mn-conf.c:410
 msgid "syncing the GConf database"
 msgstr "sincronizando banco de dados do GConf"
 
-#: ../src/mn-conf.c:324
+#: ../src/mn-conf.c:413
 msgid "completed"
 msgstr "concluído"
 
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
 msgid "invalid location"
 msgstr "localização inválida"
 
-#: ../src/mn-evolution-folder-tree-control.c:86
+#: mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "A URI atualmente selecionada"
 
-#: ../src/mn-evolution-mailbox-properties.gob:67
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:79
 msgid "Folder"
 msgstr "Pasta"
 
-#: ../src/mn-evolution-mailbox-properties.gob:169
+#: ../src/mn-evolution-mailbox-properties.gob:204
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -714,19 +592,23 @@ msgstr ""
 "Evolution está executando e que o plugin Notifficação de Correio Evolution "
 "está carregado."
 
-#: ../src/mn-evolution-mailbox.gob:61
+#: ../src/mn-evolution-mailbox.gob:78
 msgid "folder not found"
 msgstr "pasta não encontrada"
 
-#: ../src/mn-evolution-mailbox.gob:182
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "mensagem não encontrada"
+
+#: ../src/mn-evolution-mailbox.gob:220
 msgid "unable to contact Evolution"
 msgstr "impossível contactar Evolution"
 
-#: ../src/mn-evolution-plugin.c:130 ../src/mn-evolution-plugin.c:134
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "Impossível ativar o plugin Notificação de Correio"
 
-#: ../src/mn-evolution-plugin.c:130
+#: ../src/mn-evolution-plugin.c:102
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
@@ -735,114 +617,112 @@ msgstr ""
 "Bonobo não pôde localizar o servidor %s. Por favor, verifique sua instalação "
 "de Notificação de Correio."
 
-#: ../src/mn-evolution-plugin.c:134 ../src/mn-main.c:427
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
 "Notification installation."
 msgstr ""
-"Bonobo·não·pôde·registrar o·servidor·%s.·Por·favor,·verifique·sua·instalação·"
-"de·Notificação·de·Correio."
+"Bonobo·não·pôde·registrar o·servidor·%s.·Por·favor,"
+"·verifique·sua·instalação·de·Notificação·de·Correio."
 
-#: ../src/mn-gmail-mailbox.gob:111
+#: ../src/mn-gmail-mailbox.gob:104
 msgid "invalid feed location"
 msgstr "localização de alimentação inválida"
 
-#: ../src/mn-gmail-mailbox.gob:125
+#: ../src/mn-gmail-mailbox.gob:118
 #, c-format
 msgid "retrieving feed from %s"
 msgstr "recebendo alimentação de %s"
 
-#: ../src/mn-gmail-mailbox.gob:132
+#: ../src/mn-gmail-mailbox.gob:125
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "impossível obter a alimentação: %s"
 
-#: ../src/mn-gmail-mailbox.gob:147 ../src/mn-gmail-mailbox.gob:194
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
 msgid "unable to parse feed"
 msgstr "impossível interpretar a alimentação"
 
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:152
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
 #, c-format
 msgid "unable to read %s: %s"
 msgstr "impossível ler %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
 #, c-format
 msgid "unable to write to %s: %s"
 msgstr "impossível escrever para %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
 #, c-format
 msgid "unable to seek in %s: %s"
 msgstr "impossível pesquisar em %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
 #, c-format
 msgid "unable to tell position of %s: %s"
 msgstr "impossível determinar a posição de %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:158
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "unable to close %s: %s"
 msgstr "impossível fechar %s: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:113
-msgid "Mailbox:"
-msgstr "Conta de correio:"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:118
+msgid "IMAP Mailbox"
+msgstr "Caixa de Correio IMAP"
 
-#: ../src/mn-imap-mailbox-properties.gob:117
-msgid "in_box"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
 msgstr "_Caixa de entrada"
 
-#: ../src/mn-imap-mailbox-properties.gob:128
-msgid "oth_er:"
-msgstr "Out_ro:"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "_Outro:"
+
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Utilizar a Extensão IDLE"
 
-#: ../src/mn-imap-mailbox-properties.gob:139
-msgid "ne_ver"
+#: ../src/mn-imap-mailbox-properties.gob:142
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "au_todetect"
-msgstr "Au_to detectar"
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "Au_todetectar"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "al_ways"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
 msgstr "S_empre"
 
-#: ../src/mn-imap-mailbox-properties.gob:173
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Usar a extensão <span style=\"italic\">IDLE</span>:"
-
-#: ../src/mn-imap-mailbox.gob:390
+#: ../src/mn-imap-mailbox.gob:385
 msgid "server did not send capabilities"
 msgstr "servidor não enviou suas capacidades"
 
-#: ../src/mn-imap-mailbox.gob:573
+#: ../src/mn-imap-mailbox.gob:552
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "servidor anunciou LOGINDISABLED, não usando a autenticação LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:574
+#: ../src/mn-imap-mailbox.gob:553
 msgid "unable to login"
 msgstr "impossível iniciar uma sessão"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:714
-msgid "server did not send search results"
-msgstr "servidor não enviou os resultados da busca"
-
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:792
+#: ../src/mn-imap-mailbox.gob:753
 msgid "server did not send all the messages we requested"
 msgstr "servidor não enviou todas as mensagens solicitadas"
 
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:823
 msgid "unable to fetch message"
 msgstr "impossível obter a mensagem"
 
-#: ../src/mn-imap-mailbox.gob:875
+#: ../src/mn-imap-mailbox.gob:848
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -850,567 +730,450 @@ msgstr ""
 "Nas propriedades da conta, ajuste \"Usar a extensão IDLE\" para o valor "
 "\"nunca\". Fechando a sessão."
 
-#: ../src/mn-imap-mailbox.gob:886
+#: ../src/mn-imap-mailbox.gob:859
 #, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
 msgstr "o servidor remoto utiliza %s, não utilizando a extensão IDLE"
 
-#: ../src/mn-imap-mailbox.gob:891
+#: ../src/mn-imap-mailbox.gob:864
 #, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr ""
 "o servidor remoto utiliza %s, a extensão IDLE pode não funcionar corretamente"
 
-#: ../src/mn-imap-mailbox.gob:900
+#: ../src/mn-imap-mailbox.gob:873
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "o servidor remoto não suporta a extensão IDLE, fechando a sessão"
 
-#: ../src/mn-imap-mailbox.gob:1251 ../src/mn-pop3-mailbox.gob:1124
-msgid "unknown server error"
-msgstr "erro de servidor desconhecido"
-
-#: ../src/mn-imap-mailbox.gob:1357 ../src/mn-pop3-mailbox.gob:311
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
 msgid "server does not support in-band SSL/TLS"
 msgstr "servidor não suporta o modo SSL/TLS interno"
 
-#: ../src/mn-imap-mailbox.gob:1381 ../src/mn-pop3-mailbox.gob:997
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
-"o mecanismo de autenticação SASL foi selecionado, mas o suporte a SASL"
-"não foi compilado"
+"o mecanismo de autenticação SASL foi selecionado, mas o suporte a SASLnão "
+"foi compilado"
 
-#: ../src/mn-imap-mailbox.gob:1391 ../src/mn-pop3-mailbox.gob:1017
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "mecanismo de autenticação desconhecido \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1423 ../src/mn-pop3-mailbox.gob:1053
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
 msgstr "desativando mecanismo \"%s\" e retornando a autenticação SASL"
 
-#: ../src/mn-imap-mailbox.gob:1435
+#: ../src/mn-imap-mailbox.gob:1456
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "retornando para autenticação IMAP LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:1447 ../src/mn-pop3-mailbox.gob:1082
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
 msgid "authentication failed"
 msgstr "autenticação falhou"
 
-#: ../src/mn-mail-icon.gob:91
-msgid "Main _Window"
-msgstr "_Janela Principal"
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1529
+msgid "server did not send search results"
+msgstr "servidor não enviou os resultados da busca"
 
-#: ../src/mn-mail-icon.gob:92 ../src/mn-main-window.gob:165
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:93
 msgid "_Mail Reader"
 msgstr "_Leitor de Correio"
 
-#: ../src/mn-mail-icon.gob:93 ../src/mn-main-window.gob:173
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Abrir a Última Mensagem"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
 msgid "_Update"
 msgstr "_Atualizar"
 
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:104
 msgid "R_emove From Notification Area"
 msgstr "R_emover da área de notificação"
 
-#: ../src/mn-mailbox-properties-dialog.gob:88
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:95
 #, c-format
 msgid "%s Properties"
 msgstr "Propriedades de %s"
 
-#: ../src/mn-mailbox-properties-dialog.gob:205
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:244
 msgid "Add a Mailbox"
 msgstr "Adicionar uma Conta de Correio"
 
-#: ../src/mn-mailbox-view.gob:179
+#: ../src/mn-mailbox-view.gob:250
 msgid "A paste error has occurred"
 msgstr "Ocorreu um erro ao colar"
 
-#: ../src/mn-mailbox-view.gob:320 ../src/mn-message-view.gob:313
-msgid "Mailbox"
-msgstr "Conta de Correio"
-
-#: ../src/mn-mailbox-view.gob:523
+#: ../src/mn-mailbox-view.gob:566
 #, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "não tratado %s conta de correio (%s)"
 
-#: ../src/mn-mailbox-view.gob:528
+#: ../src/mn-mailbox-view.gob:571
 #, c-format
 msgid "%s mailbox"
 msgstr "Conta %s"
 
-#: ../src/mn-mailbox-view.gob:543
+#: ../src/mn-mailbox-view.gob:586
 msgid "detecting mailbox type..."
 msgstr "detectando o tipo da conta de correio..."
 
-#: ../src/mn-mailbox.gob:278
+#: ../src/mn-mailbox.gob:504
 msgid "\"type\" attribute missing"
 msgstr "atributo \"type\" inexistente"
 
-#: ../src/mn-mailbox.gob:285
+#: ../src/mn-mailbox.gob:511
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "tipo de conta de correio desconhecido \"%s\""
 
-#: ../src/mn-mailbox.gob:305
-#, c-format
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr ""
-"propriedade \"%s\": impossível converter texto \"%s\" em um valor do tipo \"%s\""
-
-#: ../src/mn-mailbox.gob:744
+#: ../src/mn-mailbox.gob:907
 #, c-format
 msgid "property \"%s\" has no value"
 msgstr "propriedade \"%s\" não possui um valor"
 
-#: ../src/mn-mailboxes.gob:203
+#: ../src/mn-mailboxes.gob:241
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Ocorreu um erro ao importar as contas de correio antigas"
 
-#: ../src/mn-mailboxes.gob:248
+#: ../src/mn-mailboxes.gob:267
 msgid "Unable to load the mailboxes configuration"
 msgstr "Impossível carregar a configuração das contas de correio"
 
-#: ../src/mn-mailboxes.gob:294
+#: ../src/mn-mailboxes.gob:313
 msgid "Unable to parse the XML document."
 msgstr "Impossível interpretar o documento XML."
 
-#: ../src/mn-mailboxes.gob:301
+#: ../src/mn-mailboxes.gob:320
 msgid "The root element is missing."
 msgstr "O elemento raiz está faltando."
 
-#: ../src/mn-mailboxes.gob:307
+#: ../src/mn-mailboxes.gob:326
 #, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "O elemento raiz \"%s\" é inválido."
 
-#: ../src/mn-mailboxes.gob:330
+#: ../src/mn-mailboxes.gob:349
 #, c-format
 msgid "On line %i: %s."
 msgstr "Na linha %i: %s."
 
-#: ../src/mn-mailboxes.gob:335
+#: ../src/mn-mailboxes.gob:354
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "Na linha %i: elemento desconhecido \"%s\"."
 
-#: ../src/mn-mailboxes.gob:346
+#: ../src/mn-mailboxes.gob:363
 msgid "An error has occurred while loading the mailboxes configuration"
 msgid_plural "Errors have occurred while loading the mailboxes configuration"
 msgstr[0] "Um erro ocorreu ao carregar a configuração das contas de correio"
 msgstr[1] "Erros ocorreram ao carregar a configuração das contas de correio"
 
-#: ../src/mn-mailboxes.gob:371
+#: ../src/mn-mailboxes.gob:388
 msgid "Unable to save the mailboxes configuration"
 msgstr "Impossível salvar configuração das contas de correio"
 
-#: ../src/mn-mailboxes.gob:417
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
+#, c-format
+msgid "Unable to remove %s: %s."
+msgstr "Não foi possível remover %s: %s."
+
+#: ../src/mn-mailboxes.gob:438
+#, c-format
+msgid "Unable to create %s: %s."
+msgstr "Não foi possível criar %s: %s."
+
+#: ../src/mn-mailboxes.gob:445
+#, c-format
+msgid "Unable to open %s for writing: %s."
+msgstr "Não foi possível abrir %s para escrita: %s."
+
+#: ../src/mn-mailboxes.gob:452
 msgid "Unable to write the XML document."
 msgstr "Impossível salvar o documento XML."
 
+#: ../src/mn-mailboxes.gob:458
+#, c-format
+msgid "Unable to close %s: %s."
+msgstr "Não foi possível fechar %s: %s."
+
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
+#, c-format
+msgid "Unable to rename %s to %s: %s."
+msgstr "Não foi possível renomear %s para %s: %s."
+
 #. non fatal
-#: ../src/mn-mailboxes.gob:433
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
 #, c-format
 msgid "unable to delete %s: %s"
 msgstr "impossível excluir %s: %s"
 
-#: ../src/mn-mailboxes.gob:457
+#: ../src/mn-mailboxes.gob:511
 #, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
 msgstr[0] "%s tem %i nova mensagem"
 msgstr[1] "%s tem %i novas mensagens"
 
-#: ../src/mn-mailboxes.gob:483
+#: ../src/mn-mailboxes.gob:537
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s reportou um erro: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:111
+#: ../src/mn-maildir-mailbox-backend.gob:129
 #, c-format
-msgid "unable to open folder \"new\": %s"
-msgstr "impossível abrir a pasta \"new\": %s"
+msgid "unable to open folder \"%s\": %s"
+msgstr "não foi possível abrir a pasta \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:144
+#: ../src/mn-maildir-mailbox-backend.gob:178
 #, c-format
-msgid "unable to close folder \"new\": %s"
-msgstr "impossível fechar a pasta \"new\": %s"
+msgid "unable to close folder \"%s\": %s"
+msgstr "não foi possível fechar a pasta \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:147
+#: ../src/mn-maildir-mailbox-backend.gob:181
 #, c-format
-msgid "error while reading folder \"new\": %s"
-msgstr "erro ao ler pasta \"new\": %s"
-
-#: ../src/mn-main-window.gob:106
-msgid "Help messages"
-msgstr "Mensagens de ajuda"
-
-#: ../src/mn-main-window.gob:107
-msgid "Count messages"
-msgstr "Contar mensagens"
-
-#. Toplevel
-#: ../src/mn-main-window.gob:156
-msgid "_Mail"
-msgstr "_Correio"
-
-#: ../src/mn-main-window.gob:157
-msgid "_Edit"
-msgstr "_Editar"
-
-#: ../src/mn-main-window.gob:158
-msgid "_View"
-msgstr "_Ver"
-
-#: ../src/mn-main-window.gob:159
-msgid "_Help"
-msgstr "Aj_uda"
-
-#: ../src/mn-main-window.gob:167
-msgid "Launch the mail reader"
-msgstr "Abrir o leitor de correio"
-
-#. Reload
-#: ../src/mn-main-window.gob:175 ../src/mn-main.c:248
-msgid "Update the mail status"
-msgstr "Atualizar status do correio"
-
-#: ../src/mn-main-window.gob:181
-msgid "_Close"
-msgstr "_Fechar"
-
-#: ../src/mn-main-window.gob:183
-msgid "Close this window"
-msgstr "Fechar esta janela"
-
-#: ../src/mn-main-window.gob:189
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../src/mn-main-window.gob:191 ../src/mn-main.c:266
-msgid "Quit Mail Notification"
-msgstr "Sair de Notificação de Correio"
+msgid "error while reading folder \"%s\": %s"
+msgstr "erro ao ler pasta \"%s\":·%s"
 
-#: ../src/mn-main-window.gob:199 ../src/mn-main-window.gob:247
-msgid "_Toolbars"
-msgstr "_Barra de ferramentas"
+#: ../src/mn-main.c:109
+msgid "yes"
+msgstr "sim"
 
-#: ../src/mn-main-window.gob:201
-msgid "Customize the toolbars"
-msgstr "Personalizar a barra de ferramentas"
+#: ../src/mn-main.c:109
+msgid "no"
+msgstr "não"
 
-#: ../src/mn-main-window.gob:207
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../src/mn-main-window.gob:217
-msgid "Toolbars Styl_e"
-msgstr "_Estilo da barra de ferramentas"
-
-#: ../src/mn-main-window.gob:219
-msgid "Customize the toolbars style"
-msgstr "Personalizar o estilo da barra de ferramentas"
-
-#: ../src/mn-main-window.gob:227
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: ../src/mn-main-window.gob:229
-msgid "Display help"
-msgstr "Mostrar ajuda"
-
-#: ../src/mn-main-window.gob:235
-msgid "_About"
-msgstr "_Sobre"
-
-#: ../src/mn-main-window.gob:237
-msgid "Display credits"
-msgstr "Mostrar créditos"
-
-#: ../src/mn-main-window.gob:249
-msgid "Show or hide the toolbars"
-msgstr "Mostrar ou esconder a barra de ferramentas"
-
-#: ../src/mn-main-window.gob:256
-msgid "_Statusbar"
-msgstr "Barra de _status"
-
-#: ../src/mn-main-window.gob:258
-msgid "Show or hide the statusbar"
-msgstr "Mostrar ou esconder a barra de status"
-
-#: ../src/mn-main-window.gob:269
-msgid "_Desktop Default"
-msgstr "Padrão do _sistema"
-
-#: ../src/mn-main-window.gob:271
-msgid "Set the toolbars style to the desktop default setting"
-msgstr "Utilizar o padrão do sistema para o estilo da barra de ferramentas"
-
-#: ../src/mn-main-window.gob:277
-msgid "I_cons Only"
-msgstr "Apenas _ícones"
-
-#: ../src/mn-main-window.gob:279
-msgid "Only display the toolbars icons"
-msgstr "Mostrar apenas os ícones da barra de ferramentas"
-
-#: ../src/mn-main-window.gob:285
-msgid "_Text Only"
-msgstr "Apenas _texto"
-
-#: ../src/mn-main-window.gob:287
-msgid "Only display the toolbars text"
-msgstr "Mostrar apenas o texto da barra de ferramentas"
-
-#: ../src/mn-main-window.gob:293
-msgid "Text Belo_w Icons"
-msgstr "Texto _sob ícones"
+#: ../src/mn-main.c:142
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s versão %s\n"
 
-#: ../src/mn-main-window.gob:295
-msgid "Display the toolbars text below the icons"
-msgstr "Mostrar o texto da barra de ferramentas abaixo dos ícones"
+#: ../src/mn-main.c:147
+msgid "Mailbox backends:\n"
+msgstr "Backends de caixa de correio:\n"
 
-#: ../src/mn-main-window.gob:301
-msgid "Text Be_side Icons"
-msgstr "Texto ao _lado dos ícones"
+#: ../src/mn-main.c:152
+msgid "POP3 and IMAP features:\n"
+msgstr "Funcionalidades POP3 e IMAP:\n"
 
-#: ../src/mn-main-window.gob:303
-msgid "Display the toolbars text beside the icons"
-msgstr "Mostrar o texto da barra de ferramentas ao lado dos ícones"
+#: ../src/mn-main.c:157
+msgid "Sylpheed features:\n"
+msgstr "Recursos Sylpheed:\n"
 
-#: ../src/mn-main-window.gob:345
+#: ../src/mn-main.c:205
 #, c-format
-msgid "unable to load menus.xml: %s"
-msgstr "impossível carregar menus.xml: %s"
-
-#: ../src/mn-main-window.gob:388
-msgid "unable to load toolbars.xml"
-msgstr "impossível carregar toolbars.xml"
+msgid "A Bonobo exception (%s) has occurred in %s()."
+msgstr "Uma exceção Bonobo·(%s)·ocorreu em %s()."
 
-#: ../src/mn-main-window.gob:439
+#: ../src/mn-main.c:247
 #, c-format
-msgid "%i new message"
-msgid_plural "%i new messages"
-msgstr[0] "%i nova mensagem"
-msgstr[1] "%i novas mensagens"
-
-#.
-#. * Here and everywhere else, we order the backends by descending
-#. * order of (believed) popularity.
-#.
-#: ../src/mn-main.c:96
-msgid "Compiled-in mailbox backends: "
-msgstr "Suporte compilado na conta de correio: "
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "Opção %s ignorada já que Notificação de Correio já está executando"
 
-#: ../src/mn-main.c:124
-msgid "Compiled-in POP3 and IMAP features: "
-msgstr "Funcionalidades POP3 e IMAP disponíveis: "
+#: ../src/mn-main.c:267
+msgid "Show version information"
+msgstr "Mostrar informações da versão"
 
-#: ../src/mn-main.c:194
+#: ../src/mn-main.c:276
 msgid "Enable informational output"
 msgstr "Ativar informações"
 
-#: ../src/mn-main.c:203
-msgid "List the compiled-in features"
-msgstr "Lista de funcionalidades compiladas"
-
-#: ../src/mn-main.c:212
-msgid "Display the main window"
-msgstr "Mostrar a janela principal"
-
-#: ../src/mn-main.c:221
+#: ../src/mn-main.c:285
 msgid "Display the properties dialog"
 msgstr "Mostrar o diálogo de propriedades"
 
-#: ../src/mn-main.c:230
+#: ../src/mn-main.c:294
 msgid "Display the about dialog"
 msgstr "Mostrar o diálogo sobre"
 
-#: ../src/mn-main.c:239
-msgid "Close the mail summary popup"
-msgstr "Fechar a janela de resumo de correio"
+#: ../src/mn-main.c:303
+msgid "Update the mail status"
+msgstr "Atualizar status do correio"
 
-#: ../src/mn-main.c:257
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Imprimir um resumo do correio em XML"
+
+#: ../src/mn-main.c:321
 msgid "Unset obsolete GConf configuration"
 msgstr "Suprimir configuração GConf obsoleta"
 
+#: ../src/mn-main.c:330
+msgid "Quit Mail Notification"
+msgstr "Sair de Notificação de Correio"
+
 #.
-#. * We can't use mn_error_dialog() because gtk_init() has not been
-#. * called yet.
+#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
+#. * not been called yet.
 #.
-#: ../src/mn-main.c:293
+#: ../src/mn-main.c:356
 msgid "multi-threading is not available"
 msgstr "multi-threading não está disponível"
 
-#: ../src/mn-main.c:355
+#: ../src/mn-main.c:407
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
-"Bonobo não pôde localizar o objeto de automação. Por·favor,·verifique·sua·instalação·"
-"de·Notificação·de·Correio."
+"Bonobo não pôde localizar o objeto de automação. Por·favor,"
+"·verifique·sua·instalação·de·Notificação·de·Correio."
 
-#: ../src/mn-main.c:361
+#: ../src/mn-main.c:413
 msgid "quitting Mail Notification"
 msgstr "saindo de Notificação de Correio"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:417
 msgid "Mail Notification is not running"
 msgstr "Notificação de Correio não está executando"
 
-#: ../src/mn-main.c:372
+#: ../src/mn-main.c:432
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Impossível inicializar a biblioteca GnomeVFS."
 
-#: ../src/mn-main.c:404
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "Um erro de inicialização ocorreu em Notificação de Correio"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr "Não foi possível inicializar a biblioteca de notificação. Janelas de notificação não serão mostradas "
+
+#: ../src/mn-main.c:481
 msgid "updating the mail status"
 msgstr "atualizando status do correio"
 
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:497
 msgid "Mail Notification is already running"
 msgstr "Notificação de Correio já está executando"
 
-#: ../src/mn-main.c:423
+#: ../src/mn-main.c:514
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonobo·não·pôde·localizar o arquivo %s.·Por·favor,·verifique·sua·instalação·"
-"de·Notificação·de·Correio."
-
-#: ../src/mn-mbox-mailbox-backend.gob:209
-#, c-format
-msgid "unable to close file: %s"
-msgstr "impossível fechar o arquivo: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:226
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "impossível abrir caixa de correio: %s"
+"Bonobo·não·pôde·localizar o arquivo %s.·Por·favor,"
+"·verifique·sua·instalação·de·Notificação·de·Correio."
 
-#: ../src/mn-message-mime.c:104
+#: ../src/mn-message-mime.c:168
 msgid "unable to parse MIME message"
 msgstr "impossível interpretar mensagem MIME"
 
-#: ../src/mn-message-view.gob:82
-msgid "You have no new mail."
-msgstr "Você não tem novas mensagens."
-
-#: ../src/mn-message-view.gob:322
-msgid "Unreadable message"
-msgstr "Mensagem ilegível"
-
-#: ../src/mn-message-view.gob:330
-msgid "From"
-msgstr "De"
-
-#: ../src/mn-message-view.gob:338
-msgid "Subject"
-msgstr "Assunto"
-
-#: ../src/mn-message-view.gob:349
-msgid "Sent"
-msgstr "Enviado"
-
-#: ../src/mn-message.gob:99
+#: ../src/mn-message.gob:144
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../src/mn-message.gob:124
-#, c-format
-msgid "%i second ago"
-msgid_plural "%i seconds ago"
-msgstr[0] "%i segundo atrás"
-msgstr[1] "%i segundos atrás"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "substituição não concluída"
 
-#: ../src/mn-message.gob:128
+#: ../src/mn-message.gob:246
 #, c-format
-msgid "about %i minute ago"
-msgid_plural "about %i minutes ago"
-msgstr[0] "aproximadamente %i minuto atrás"
-msgstr[1] "aproximadamente %i minutos atrás"
+msgid "unknown substitution \"%s\""
+msgstr "substituição desconhecida \"%s\""
 
-#: ../src/mn-message.gob:133
-#, c-format
-msgid "about %i hour ago"
-msgid_plural "about %i hours ago"
-msgstr[0] "aproximadamente %i hora atrás"
-msgstr[1] "aproximadamente %i horas atrás"
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "substituição vazia"
 
-#: ../src/mn-message.gob:138
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
 #, c-format
-msgid "about %i day ago"
-msgid_plural "about %i days ago"
-msgstr[0] "aproximadamente %i dia atrás"
-msgstr[1] "aproximadamente %i dias atrás"
-
-#: ../src/mn-message.gob:143
-#, c-format
-msgid "about %i week ago"
-msgid_plural "about %i weeks ago"
-msgstr[0] "aproximadamente %i semana atrás"
-msgstr[1] "aproximadamente %i semanas atrás"
-
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:163
-msgid "none"
-msgstr "nenhum"
+msgid "Unable to execute \"%s\": %s."
+msgstr "Impossível executar \"%s\": %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:161
+#: ../src/mn-mh-mailbox-backend.gob:170
 #, c-format
 msgid "error while reading %s: %s"
 msgstr "erro durante a leitura %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:174
+#: ../src/mn-mh-mailbox-backend.gob:183
 #, c-format
 msgid "unable to open %s: %s"
 msgstr "impossível abrir %s: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
 msgstr "Pad_rão"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "_in-band SSL/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
 msgstr "SSL/TLS _interno"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
-msgstr "SS_L/TLS em porta separada"
-
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "_Hostname:"
-msgstr "S_ervidor:"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
+msgstr "SSL/TLS em porta s_eparada"
 
-#: ../src/mn-pi-mailbox-properties.gob:93
-msgid "_Details"
-msgstr "_Detalhes"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Servidor:"
 
-#: ../src/mn-pi-mailbox-properties.gob:148
-msgid "Connection type:"
-msgstr "Tipo de conexão:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Tipo de Conexão"
 
-#: ../src/mn-pi-mailbox-properties.gob:155
+#: ../src/mn-pi-mailbox-properties.gob:140
 msgid "Port:"
 msgstr "Porta:"
 
-#: ../src/mn-pi-mailbox-properties.gob:178
-msgid "_Authentication mechanism:"
-msgstr "Mecanismo de _autenticação:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Autenticação"
 
-#: ../src/mn-pi-mailbox.gob:113
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mecanismo:"
+
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Conexão"
+
+#: ../src/mn-pi-mailbox.gob:153
 msgid "SSL/TLS support has not been compiled in"
 msgstr "o suporte a SSL/TLS não foi compilado"
 
-#: ../src/mn-pop3-mailbox.gob:359
+#: ../src/mn-pi-mailbox.gob:319
+#, c-format
+msgid ""
+"Mail Notification was unable to log into %s mailbox %s, possibly because the "
+"credentials you have entered are invalid.\n"
+"\n"
+"Please re-enter your credentials."
+msgstr ""
+"Notificação de Correio não foi capaz de autenticar %s conta %s, "
+"possivelmente suas credenciais não são válidas.\n"
+"\n"
+"Por favor, verifique seus dados de autenticação."
+
+#: ../src/mn-pi-mailbox.gob:320
+#, c-format
+msgid "Enter your credentials for %s mailbox %s."
+msgstr "Informe seus dados de autenticação para %s conta %s."
+
+#. keep the title in sync with gnome-authentication-manager
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox.gob:363
+msgid "Authentication Required"
+msgstr "Autenticação requerida"
+
+#: ../src/mn-pop3-mailbox.gob:345
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "argumentos inválidos para a funcionalidade LOGIN-DELAY"
 
@@ -1420,149 +1183,220 @@ msgstr "argumentos inválidos para a funcionalidade LOGIN-DELAY"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:519
+#: ../src/mn-pop3-mailbox.gob:486
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
 msgstr ""
-"Autenticação SASL com cliente inicial retornou erro, tentando novamente "
-"sem resposta inicial do cliente"
+"Autenticação SASL com cliente inicial retornou erro, tentando novamente sem "
+"resposta inicial do cliente"
 
-#: ../src/mn-pop3-mailbox.gob:733
+#: ../src/mn-pop3-mailbox.gob:703
 msgid "unknown error"
 msgstr "erro desconhecido"
 
-#: ../src/mn-pop3-mailbox.gob:828
+#: ../src/mn-pop3-mailbox.gob:798
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
 msgstr[0] "atendendo ao LOGIN-DELAY, aguardando por %i segundo"
 msgstr[1] "atendendo ao LOGIN-DELAY, aguardando por %i segundos"
 
-#: ../src/mn-pop3-mailbox.gob:1009
+#: ../src/mn-pop3-mailbox.gob:966
 msgid "server does not support APOP authentication"
 msgstr "servidor não suporta autenticação APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1065
+#: ../src/mn-pop3-mailbox.gob:1022
 msgid "falling back to APOP authentication"
 msgstr "retornando para autenticação APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1070
+#: ../src/mn-pop3-mailbox.gob:1027
 msgid "falling back to USER/PASS authentication"
 msgstr "retornando para autenticação USER/PASS"
 
-#: ../src/mn-properties-dialog.gob:170 ../ui/properties-dialog.glade.h:10
-msgid "Mail Notification Properties"
-msgstr "Propriedades de Notificação de Correio"
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Conta de correio:"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Mensagem ilegível:"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "De:"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Assunto:"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Abrir"
 
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "superior esquerdo"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Marcar como lida"
 
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "superior direito"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Marcar como Spam"
 
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "inferior esquerdo"
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Não foi possível abrir a mensagem"
 
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "inferior direito"
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Não foi possível marcar a mensagem como lida"
 
-#: ../src/mn-properties-dialog.gob:329
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Não foi possível marcar a mensagem como spam"
+
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "não foi possível mostrar a janela: %s"
+
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "não foi possível fechar a janela: %s"
+
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Nova Mensagem"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Propriedades de Notificação de Correio"
+
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "Mensagem de _Teste"
+
+#: ../src/mn-properties-dialog.gob:276
 msgid "No mailbox selected."
 msgstr "Nenhuma conta de correio selecionada."
 
-#: ../src/mn-properties-dialog.gob:334
+#: ../src/mn-properties-dialog.gob:281
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i conta de correio selecionada."
 msgstr[1] "%i contas de correio selecionadas."
 
-#: ../src/mn-properties-dialog.gob:465
-#, c-format
-msgid "Test message #%i"
-msgstr "Mensagem teste %i"
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Nenhum leitor de email foi configurado"
 
-#: ../src/mn-properties-dialog.gob:470
-msgid "Mail Notification Properties Dialog"
-msgstr "Diálogo de propriedades de Notificação de Correio"
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr "Você pode configurar um leitor de email selecionando ·<b>Sistema·→·Preferências·→·"
+"Aplicações Preferenciais</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Não foi possível abrir a última mensagem"
 
-#: ../src/mn-shell.gob:109
-msgid "You have new mail."
-msgstr "Chegou mensagem para você."
+#: ../src/mn-shell.gob:237
+#, c-format
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Mensagem da caixa postal \"%s\" não podem ser abertas."
+
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Você não tem novas mensagens."
 
-#: ../src/mn-shell.gob:374
+#. translators: header capitalization
+#: ../src/mn-shell.gob:398
 msgid "Mailboxes Having New Mail"
-msgstr "Contas de Correios que possuem novas mensagens"
+msgstr "Contas de Correio que possuem novas mensagens"
 
-#: ../src/mn-shell.gob:393
+#. translators: header capitalization
+#: ../src/mn-shell.gob:417
 msgid "Errors"
 msgstr "Erros"
 
-#: ../src/mn-shell.gob:408
+#. translators: header capitalization
+#: ../src/mn-shell.gob:433
 msgid "Mail Summary"
 msgstr "Resumo do Correio"
 
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
 msgid "unknown SSL/TLS error"
 msgstr "erro SSL/TLS desconhecido"
 
-#: ../src/mn-stock.c:28
+#: ../src/mn-standard-message-view.gob:73
+msgid "Sent:"
+msgstr "Enviado:"
+
+#. translators: header capitalization
+#: ../src/mn-stock.c:30
 msgid "Select _All"
 msgstr "Selecionar _Todos"
 
-#: ../src/mn-stock.c:29
-msgid "Leave Fullscreen"
-msgstr "Sair do modo tela cheia"
-
-#: ../src/mn-stock.c:30
+#. translators: header capitalization
+#. translators: header capitalization
+#: ../src/mn-stock.c:33
 msgid "Co_nnect"
 msgstr "Co_nectar"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:170
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "impossível abrir pasta: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:209
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "impossível fechar pasta: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:212
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "erro ao ler pasta: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:256
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
 msgid "unexpected end of file"
 msgstr "fim de arquivo inesperado"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:270
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
 #, c-format
 msgid "incompatible file version \"%i\""
 msgstr "versão do arquivo incompatível \"%i\" "
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:273
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
 msgid "file version missing"
 msgstr "versão do arquivo inexistente"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:39
-#: ../src/mn-system-vfs-mailbox-properties.gob:47
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Não foi possível copiar %s: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
 msgid "System mailbox"
 msgstr "Conta de correio de sistema"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:68
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
 #, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
 msgstr "Sua conta de correio de sistema é <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:75
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
@@ -1570,57 +1404,88 @@ msgstr ""
 "A localização de sua caixa de correio de sistema não pode ser detectada. "
 "Verificar a variável de ambiente MAIL."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
-msgid "MAIL environment variable not defined"
-msgstr "variável de ambiente MAIL não definida"
+#: ../src/mn-system-vfs-mailbox.gob:73
+msgid "system mailbox not found"
+msgstr "Caixa de correio de sistema não encontrada"
+
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Caixa de correio de teste"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Mensagem teste %i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "Diálogo de propriedades de Notificação de Correio"
 
-#: ../src/mn-util.c:281
+#: ../src/mn-util.c:350
 #, c-format
 msgid "error loading image: %s"
 msgstr "erro ao carregar imagem: %s"
 
-#: ../src/mn-util.c:298
+#: ../src/mn-util.c:366
+#, c-format
+msgid ""
+"Unable to load interface \"%s\". Please check your Mail Notification "
+"installation."
+msgstr ""
+"Não foi possível carregar a interface \"%s\".·Por·favor,"
+"·verifique·sua·instalação·de·Notificação·de·Correio."
+
+#: ../src/mn-util.c:381
 #, c-format
-msgid "widget \"%s\" not found in interface \"%s\""
-msgstr "elemento \"%s\" não encontrado na interface \"%s\""
+msgid ""
+"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
+"Notification installation."
+msgstr ""
+"Widget \"%s\" não encontrado na interface \"%s\". Por·favor,·verifique·sua·instalação·"
+"de·Notificação·de·Correio."
 
-#: ../src/mn-util.c:398
+#: ../src/mn-util.c:450
 #, c-format
-msgid "unable to open self as a module: %s"
-msgstr "impossível abrir a si mesmo como um modulo: %s"
+msgid "Unable to open self as a module (%s)."
+msgstr "Não foi possível abrir a si mesmo como um modulo (%s)."
 
-#: ../src/mn-util.c:403
+#: ../src/mn-util.c:455
 #, c-format
-msgid "signal handler \"%s\" not found"
-msgstr "manipulador de sinal \"%s\" não encontrado"
+msgid ""
+"Signal handler \"%s\" not found. Please check your Mail Notification "
+"installation."
+msgstr ""
+"O manipulador de sinal %s não foi encontrado.·Por·favor,"
+"·verifique·sua·instalação·de·Notificação·de·Correio."
 
-#: ../src/mn-util.c:556 ../src/mn-util.c:579 ../src/mn-util.c:601
-#: ../src/mn-util.c:623
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
 msgid "A drag and drop error has occurred"
 msgstr "Ocorreu um erro ao arrastar e colar"
 
-#: ../src/mn-util.c:557
+#: ../src/mn-util.c:607
 msgid "An invalid location list has been received."
 msgstr "Uma lista inválida de endereços foi recebida."
 
-#: ../src/mn-util.c:602
+#: ../src/mn-util.c:650
 msgid "An invalid Mozilla location has been received."
 msgstr "Um endereço Mozilla não válido foi recebido."
 
-#: ../src/mn-util.c:678
+#: ../src/mn-util.c:726
 msgid "Unable to display help"
 msgstr "Impossível mostrar a ajuda"
 
-#: ../src/mn-util.c:692
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "Impossível abrir o link"
+
+#: ../src/mn-util.c:752
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Impossível criar uma thread: %s."
 
-#: ../src/mn-util.c:782
-msgid "_Do not show this message again"
-msgstr "_Não mostrar esta mensagem novamente"
-
-#: ../src/mn-util.c:892
+#: ../src/mn-util.c:929
 #, c-format
 msgid ""
 "The following location is invalid:\n"
@@ -1637,241 +1502,235 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:912
+#: ../src/mn-util.c:945
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Um erro fatal ocorreu em Notificação de Correio"
 
-#: ../src/mn-util.c:951
+#: ../src/mn-util.c:989
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "impossível obter a hora corrente: %s"
 
-#: ../src/mn-util.c:1013
+#: ../src/mn-util.c:1304
 #, c-format
-msgid "invalid signal specification \"%s\""
-msgstr "inválida especificação de sinal \"%s\""
+msgid "%i second ago"
+msgid_plural "%i seconds ago"
+msgstr[0] "%i segundo atrás"
+msgstr[1] "%i segundos atrás"
 
-#: ../src/mn-util.c:1052
-msgid "A command error has occurred in Mail Notification"
-msgstr "Um erro de comando ocorreu em Notificação de Correio"
+#: ../src/mn-util.c:1308
+#, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "aproximadamente %i minuto atrás"
+msgstr[1] "aproximadamente %i minutos atrás"
 
-#: ../src/mn-util.c:1053
+#: ../src/mn-util.c:1313
 #, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Impossível executar \"%s\": %s"
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "aproximadamente %i hora atrás"
+msgstr[1] "aproximadamente %i horas atrás"
 
-#: ../src/mn-util.c:1311
+#: ../src/mn-util.c:1318
 #, c-format
-msgid "unable to rename %s to %s: %s"
-msgstr "impossível renomear %s para %s: %s"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "aproximadamente %i dia atrás"
+msgstr[1] "aproximadamente %i dias atrás"
 
-#: ../src/mn-vfs-mailbox-backend.gob:117
+#: ../src/mn-util.c:1323
 #, c-format
-msgid "unable to monitor mailbox contents (%s), poll mode activated"
-msgstr "impossível monitorar conteúdo da conta de correio (%s), verificação explícita ativada"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "aproximadamente %i semana atrás"
+msgstr[1] "aproximadamente %i semanas atrás"
+
+#: ../src/mn-util.c:1336
+msgid "unknown date"
+msgstr "data desconhecida"
 
-#: ../src/mn-vfs-mailbox.gob:238
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Um erro de comando ocorreu em Notificação de Correio"
+
+#: ../src/mn-vfs-mailbox.gob:228
 #, c-format
-msgid "unable to monitor mailbox type (%s), poll mode activated"
-msgstr "impossível monitorar conta de correio tipo (%s), verificação explícita ativada"
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr ""
+"não foi possível monitorar %s·(%s), modo verificação ativado"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "unknown mailbox format"
 msgstr "formato de conta de correio não conhecido"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "does not exist"
 msgstr "não existe"
 
-#: ../src/mn-vfs-mailbox.gob:377
-#, c-format
-msgid "As a fallback, they will be checked every %i second (this delay is configurable from the Properties Dialog)."
-msgid_plural "As a fallback, they will be checked every %i seconds (this delay is configurable from the Properties Dialog)."
-msgstr[0] "Como solução, eles serão verificados a cada %i segundo (este intervalo é configurável através da janela de propriedades)."
-msgstr[1] "Como solução, eles serão verificados a cada %i segundos (este intervalo é configurável através da janela de propriedades)."
-
-#: ../src/mn-vfs-mailbox.gob:388
-#, c-format
-msgid "As a fallback, they will be checked every %i minute (this delay is configurable from the Properties Dialog)."
-msgid_plural "As a fallback, they will be checked every %i minutes (this delay is configurable from the Properties Dialog)."
-msgstr[0] "Como solução, eles serão verificados a cada %i minuto (este intervalo é configurável através da janela de propriedades)."
-msgstr[1] "Como solução, eles serão verificados a cada %i minutos (este intervalo é configurável através da janela de propriedades)."
-
-#: ../src/mn-vfs-mailbox.gob:399
+#: ../src/mn-vfs.c:248
 #, c-format
-msgid "As a fallback, they will be checked approximately every %i minute (this  delay is configurable from the Properties Dialog)."
-msgid_plural "As a fallback, they will be checked approximately every %i minutes (this delay is configurable from the Properties Dialog)."
-msgstr[0] "Como solução, eles serão verificados aproximadamente a cada %i minuto (este intervalo é configurável através da janela de propriedades)."
-msgstr[1] "Como solução, eles serão verificados aproximadamente a cada %i minutos (este intervalo é configurável através da janela de propriedades)."
-
-#: ../src/mn-vfs-mailbox.gob:415
-msgid "A monitoring error has occurred"
-msgstr "Um erro de monitoração ocorreu"
+msgid "Unable to write %s: %s."
+msgstr "Não foi possível escrever %s: %s"
 
-#: ../src/mn-vfs-mailbox.gob:416
+#: ../src/mn-xml.c:54
 #, c-format
 msgid ""
-"Mail Notification was unable to enable immediate notification for one or "
-"more mailboxes. %s"
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
 msgstr ""
-"Notificação de Correio não foi capaz de habilitar a notificação imediata "
-"para uma ou mais contas de correio. %s"
-
-#: ../ui/edit-toolbars-dialog.glade.h:1
-msgid "Edit Toolbars"
-msgstr "Editar Barra de Ferramentas"
+"propriedade \"%s\": impossível converter texto \"%s\" em um valor do tipo \"%"
+"s\""
 
-#: ../ui/edit-toolbars-dialog.glade.h:2
-msgid "_Add a New Toolbar"
-msgstr "_Adicionar Nova Barra"
-
-#: ../ui/edit-toolbars-dialog.glade.h:3
-#: ../ui/mailbox-properties-dialog.glade.h:4
-msgid "_Use Default"
-msgstr "Usar Padrão"
-
-#: ../ui/mail-summary-popup.glade.h:1
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Resumo do Correio</span>"
-
-#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:4
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Geral</span>"
 
+#. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Geral"
+
+#: ../ui/mailbox-properties-dialog.glade.h:3
 msgid "Mailbox _name:"
 msgstr "N_ome da conta de correio:"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
+#: ../ui/mailbox-properties-dialog.glade.h:4
 msgid "Mailbox _type:"
 msgstr "_Tipo de conta de correio:"
 
-#: ../ui/properties-dialog.glade.h:1
-msgid "<span weight=\"bold\">Commands</span>"
-msgstr "<span weight=\"bold\">Comandos</span>"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Us_e Default"
+msgstr "Us_ar o Padrão"
 
-#: ../ui/properties-dialog.glade.h:2
-msgid "<span weight=\"bold\">Double-click Action</span>"
-msgstr "<span weight=\"bold\">Ação no duplo clique</span>"
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Delay between mail checks:"
+msgstr "_Intervalo entre verificações no correio:"
 
-#: ../ui/properties-dialog.glade.h:3
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Fontes</span>"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:9
+msgid "_Use Default"
+msgstr "_Usar·o·Padrão"
 
-#: ../ui/properties-dialog.glade.h:5
-msgid "<span weight=\"bold\">Mailbox List</span>"
-msgstr "<span weight=\"bold\">Contas de Correio</span>"
+#: ../ui/mailbox-properties-dialog.glade.h:10
+#: ../ui/properties-dialog.glade.h:41
+msgid "minutes"
+msgstr "minutos"
 
-#: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Position</span>"
-msgstr "<span weight=\"bold\">Posição</span>"
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:42
+msgid "seconds"
+msgstr "segundos"
 
-#: ../ui/properties-dialog.glade.h:7
-msgid "Co_ntents:"
-msgstr "_Conteúdo:"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Ação no clique</span>"
 
-#: ../ui/properties-dialog.glade.h:8
-msgid "Dis_play mail summary in tooltip"
-msgstr "Mostrar o _resumo do correio em uma dica"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:4
+msgid "<span weight=\"bold\">Commands</span>"
+msgstr "<span weight=\"bold\">Comandos</span>"
 
-#: ../ui/properties-dialog.glade.h:9
-msgid "General"
-msgstr "Geral"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Expiração</span>"
 
-#: ../ui/properties-dialog.glade.h:11
-msgid "Mail Summary Popup"
-msgstr "Resumo de Correio"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:10
+msgid "<span weight=\"bold\">Mailbox List</span>"
+msgstr "<span weight=\"bold\">Contas de Correio</span>"
 
+#. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:12
-msgid "Mailboxes"
-msgstr "Contas de Correio"
-
-#: ../ui/properties-dialog.glade.h:13
-msgid "Only display _recent mail"
-msgstr "Mostrar apenas mensagens _novas"
+msgid "<span weight=\"bold\">Position</span>"
+msgstr "<span weight=\"bold\">Posição</span>"
 
+#. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:14
-msgid "Use these _fonts:"
-msgstr "Utilizar e_ste fonte:"
+msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
+msgstr "<span size=\"larger\" weight=\"bold\">Janela de Resumo do Correio</span>"
 
 #: ../ui/properties-dialog.glade.h:15
-msgid "When _all mail has been read:"
-msgstr "Quando _todas mensagens forem lidas:"
-
-#: ../ui/properties-dialog.glade.h:16
-msgid "When _new mail arrives:"
-msgstr "Quando _nova mensagem chegar:"
-
-#: ../ui/properties-dialog.glade.h:17
-msgid "_Automatically close after:"
-msgstr "F_echar automaticamente após:"
+msgid "A_fter:"
+msgstr "_Após:"
 
 #: ../ui/properties-dialog.glade.h:18
-msgid "_Blink on errors"
-msgstr "_Se ocorrerem erros, piscar ícone de status"
-
-#: ../ui/properties-dialog.glade.h:19
-msgid "_Delay between mail checks:"
-msgstr "_Intervalo entre verificações no correio:"
-
-#: ../ui/properties-dialog.glade.h:20
-msgid "_Display a Test Popup"
-msgstr "Testar janela de _resumo"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "_Display the main window"
-msgstr "_Mostrar a janela principal"
+msgid "In the p_opup stack"
+msgstr "Na pilha da _janela"
 
+#. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:22
-msgid "_Enable mail summary popup"
-msgstr "_Ativar a janela de resumo de correio"
-
-#: ../ui/properties-dialog.glade.h:23
-msgid "_Horizontal offset:"
-msgstr "Distância _horizontal:"
+msgid "Message Popups"
+msgstr "Resumo do Correio"
 
+#. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:24
-msgid "_Launch the mail reader"
-msgstr "Abrir o leitor de _correio"
+msgid "Status Icon"
+msgstr "Ícone de estado"
 
 #: ../ui/properties-dialog.glade.h:25
-msgid "_Mail reader:"
-msgstr "_Leitor de correio:"
+msgid "When _new mail arrives:"
+msgstr "Quando _nova mensagem chegar:"
 
 #: ../ui/properties-dialog.glade.h:26
-msgid "_Position:"
-msgstr "_Posição:"
+msgid "When all mail has _been read:"
+msgstr "Quando _todas mensagens forem lidas:"
 
 #: ../ui/properties-dialog.glade.h:27
-msgid "_Start Mail Notification on GNOME login"
-msgstr "_Iniciar Notificação de Correio no login do GNOME"
+msgid "_Always display"
+msgstr "_Mostrar sempre"
 
 #: ../ui/properties-dialog.glade.h:28
-msgid "_Title:"
-msgstr "_Título:"
+msgid "_Attached to the status icon"
+msgstr "_Anexado ao ícone de status"
 
 #: ../ui/properties-dialog.glade.h:29
-msgid "_Update the mail status"
-msgstr "_Atualizar status do correio"
+msgid "_Blink on errors"
+msgstr "_Se ocorrerem erros, piscar ícone de status"
 
 #: ../ui/properties-dialog.glade.h:30
-msgid "_Use fonts from theme"
-msgstr "_Utilizar fonte padrão do sistema"
+msgid "_Desktop default"
+msgstr "Área de _trabalho padrão"
 
 #: ../ui/properties-dialog.glade.h:31
-msgid "_Vertical offset:"
-msgstr "Distância _vertical:"
+msgid "_Display seen mail"
+msgstr "Mostrar mensagens _lidas"
 
 #: ../ui/properties-dialog.glade.h:32
-msgid "minutes"
-msgstr "minutos"
+msgid "_Display this dialog"
+msgstr "_Mostrar este diálogo"
 
 #: ../ui/properties-dialog.glade.h:33
-msgid "pixels"
-msgstr "pixels"
+msgid "_Enable message popups"
+msgstr "_Ativar a janela de resumo de correio"
 
 #: ../ui/properties-dialog.glade.h:34
-msgid "seconds"
-msgstr "segundos"
+msgid "_Launch the mail reader"
+msgstr "Abrir o leitor de _correio"
+
+#: ../ui/properties-dialog.glade.h:36
+msgid "_None"
+msgstr "_Nenhum"
+
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Abrir a última mensagem"
+
+#: ../ui/properties-dialog.glade.h:38
+msgid "_Update the mail status"
+msgstr "_Atualizar status do correio"
+
+#: ../ui/properties-dialog.glade.h:39
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "Co_mpacto"
+
+#: ../ui/properties-dialog.glade.h:40
+msgid "icon tooltip's mail summary layout|_Standard"
+msgstr "_Padrão"
 
 
diff --git a/po/sr.po b/po/sr.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-25 01:00+0200\n"
-"PO-Revision-Date: 2006-11-21 17:41+0100\n"
+"POT-Creation-Date: 2006-11-28 00:14+0100\n"
+"PO-Revision-Date: 2006-12-07 11:04+0100\n"
 "Last-Translator: Филип Милетић <filmil@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@ msgid "Configure Mail Notification"
 msgstr "Подеси дојаву приспећа поште"
 
 #: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
 msgid "Mail Notification"
 msgstr "Дојава поште"
 
@@ -60,228 +61,181 @@ msgstr "Дојава поште"
 msgid "Get notified when new mail arrives"
 msgstr "Обавести када стигне нова пошта"
 
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
 msgid "Always display an icon"
 msgstr "Увек приказуј сличицу"
 
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Аутоматски затвори прозор са сажетком порука"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
 msgid "Blink on errors"
 msgstr "Трепери ако дође до грешке"
 
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
 msgid "Click action"
 msgstr "Дејство при притиску"
 
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
 msgid "Display seen mail"
 msgstr "Прикажи прегледане поруке"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
-msgstr "Дозволи приказ сажетка порука"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Дозволи искачуће прозоре"
+
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Важност искачућих прозора истиче"
 
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Отисци проверених X509 сертификата"
 
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
 msgid "Height of properties dialog"
 msgstr "Висина прозора са поставкама"
 
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Команда за читање поште"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Писмо које се користи за садржај прозора са сажетком порука"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
-msgstr "Извор за аспект за писмо у прозору за сажетак (???)"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr "Ако је подешавање /apps/mail-notification/popups/expiration/enabled постављено на „true?, представља време које треба да протекне пре него што искачући прозор истекне (минути)."
 
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Померај хоризонталних тачака за прозор са сажетком порука"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr "Ако је подешавање /apps/mail-notification/popups/expiration/enabled постављено на \"true\", време које треба да протекне пре него што искачући прозор истекне (секунде)."
 
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Број хоризонталних тачака за прозор са сажетком порука"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Команда при промени поште"
 
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Писмо које се користи за наслов прозора са сажетком порука"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Команда за читање поште"
 
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Померај вертикалних тачака ѕа прозор са сажетком порука"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Место искачућег прозора са порукама"
 
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr ""
-"Број минута који треба да протекне пре затварања прозора са сажетком порука"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Број минута који треба да протекне пре затварања искачућег прозора са поруком"
 
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:15
 msgid "New mail command"
 msgstr "Изврши када пошта стигне"
 
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr "Прикажи само скоро приспеле поруке у сажетку"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:16
 msgid "Run a command when all mail is read"
 msgstr "Покрени команду када је сва пошта прочитана"
 
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:17
 msgid "Run a command when new mail arrives"
 msgstr "Покрени команду када стигне нова пошта"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Број секунди који треба да протекне пре затварања сажетка порука"
-
-#: ../data/mail-notification.schemas.in.h:22
-msgid ""
-"The action to perform when the icon is clicked. Must be \"display-properties-"
-"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
-msgstr "Постављање наредбе која се извршава при притиску на сличицу. Могући избори су: „главни-прозор?, „покрени-читач-поште? или „ажурирај-статус-поште?."
-
-#: ../data/mail-notification.schemas.in.h:23
-msgid ""
-"The amount of time to wait before closing the mail summary popup (minutes "
-"part)."
-msgstr "Пауза пре затварања прозора са сажетком порука (минути)."
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Покрени команду када се списак порука промени"
 
-#: ../data/mail-notification.schemas.in.h:24
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr "Пауза пре затварања прозора са сажетком порука (секунде)."
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Број секунди који треба да протекне пре затварања искачућег прозора са порукама"
 
-#: ../data/mail-notification.schemas.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:20
 msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
-msgstr "Извор за подешавања писма. Може бити: ?тема? или ?посебан?."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
+msgstr "Наредба која се извршава при притиску на сличицу. Могу да буду: „прикажи-прозор-са-поставкама?, „покрени-читач-поште?, „отвори-последњу-поруку? или „освежи-статус-поште?."
 
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:21
 msgid "The command to run when all mail is read."
 msgstr "Команда коју треба покренути када је сва пошта прочитана."
 
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:22
 msgid "The command to run when new mail arrives."
 msgstr "Покрени ову команду када стигне нова пошта."
 
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr ""
-"Посебно писмо које се користи за испис садржаја прозора са сажетком порука."
-
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr ""
-"Посебно писмо које се користи за испис наслова прозора са сажетком порука."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "Команда која се покреће када се промени списак порука."
 
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:24
 msgid "The height of the properties dialog in pixels."
 msgstr "Висина прозора са поставкама изражена у тачкама."
 
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:25
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
 "Списак проверених SSL/TLS сервера (рачунар:порт) који немају X509 сертификат."
 
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:26
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr "Списак проверених X509 сертификата, представљених MD5 отиском."
 
-#: ../data/mail-notification.schemas.in.h:33
-msgid ""
-"The number of pixels to leave between the left or right side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Број тачака које треба оставити између леве, одн. десне стране екрана и "
-"прозора са сажетком порука."
-
-#: ../data/mail-notification.schemas.in.h:34
-msgid ""
-"The number of pixels to leave between the top or bottom side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Број тачака које треба оставити између врха, одн. дна екрана и прозора са "
-"сажетком порука."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "Место искачућег прозора са порукама. Може бити „закачен? или „слободан?."
 
-#: ../data/mail-notification.schemas.in.h:35
-msgid ""
-"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
-"\"bottom-left\" or \"bottom-right\"."
-msgstr ""
-"Положај прозора са сажетком порука. Може бити: ?горе-лево?, ?горе-десно?, ?"
-"доле-лево? или ?доле-десно?."
-
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:28
 msgid ""
 "The type of mail summary to display in the icon's tooltip. Must be \"standard"
 "\", \"compact\" or \"none\"."
-msgstr "Врста сажетка поште који се приказује у облачићу.  Може бити „обичан?, „кратак? или „ниједан?."
+msgstr ""
+"Врста сажетка поште који се приказује у облачићу.  Може бити „обичан?, "
+"„кратак? или „ниједан?."
 
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:29
 msgid "The width of the properties dialog in pixels."
 msgstr "Ширина прозора са поставкама изражена у тачкама."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:30
 msgid "Tooltip mail summary"
 msgstr "Облачић са сажетком порука"
 
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:31
 msgid "Trusted servers list"
 msgstr "Списак проверених сервера"
 
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:32
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Да ли сличица треба да трепери ако дође до грешке или не."
 
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr ""
-"Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:33
 msgid "Whether to display an icon when there is no new mail or not."
 msgstr "Да ли се приказује сличица када нема нове поште."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:34
 msgid "Whether to display seen mail or not."
 msgstr "Да ли треба приказивати прегледану пошту или не."
 
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr "Да ли треба приказати сажетак порука када стигне нова пошта."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Да ли се користе искачући прозори са порукама или не."
 
-#: ../data/mail-notification.schemas.in.h:45
+#: ../data/mail-notification.schemas.in.in.h:36
 msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
-msgstr ""
-"Да ли из сажетка треба уклонити поруке које су се у њему већ пре појавиле."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
+msgstr "Да ли искачући прозори истичу или не.  Мора бити „default?, „false? или „true?."
 
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:37
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Да ли треба или не треба покренути неку команду када је сва пошта прочитана."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:38
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Да ли треба покренути неку команду када стигне нова пошта."
 
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Да ли треба покренути неку команду када се списак порука промени или не."
+
+#: ../data/mail-notification.schemas.in.in.h:40
 msgid "Width of properties dialog"
 msgstr "Ширина прозора са поставкама"
 
@@ -294,7 +248,7 @@ msgid "The orientation of the tray."
 msgstr "Оријентација обавештајне зоне."
 
 #. translators: header capitalization
-#: ../src/mn-about-dialog.gob:49
+#: ../src/mn-about-dialog.gob:50
 msgid "A Mail Notification Icon"
 msgstr "Сличица за дојаву приспећа поште"
 
@@ -302,134 +256,147 @@ msgstr "Сличица за дојаву приспећа поште"
 #. * translators: Your Name <your-email>
 #. * optionally followed by one or more: \nOther Contributor's Name <his-email>
 #.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
 msgid "translator-credits"
 msgstr "Филип Милетић <filmil@gmail.com>"
 
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "није могуће отворити везу"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "А_утодетекција"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">сам пронађи</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Налог"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
 msgid "_Username:"
 msgstr "_Кор.име:"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
 msgid "Location"
 msgstr "Место"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
 msgid "_Location:"
 msgstr "_Место:"
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
 msgid "_Browse..."
 msgstr "_Прегледај..."
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
 msgid "Select a File or Folder"
 msgstr "Изаберите датотеку или фасциклу"
 
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "није могуће затворити датотеку: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "није могуће отворити сандуче: %s"
+
+#: ../src/mn-client-session.c:248
 #, c-format
 msgid "resolving %s"
 msgstr "проналазим %s"
 
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:264
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "Није могуће пронаћи %s: %s"
 
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:305
 #, c-format
 msgid "network address #%i"
 msgstr "мрежна адреса #%i"
 
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:308
 #, c-format
 msgid "unable to convert network address #%i into textual form: %s"
 msgstr "мрежна адреса #%i се не може пребацити у текстуални облик: %s"
 
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:319
 #, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: ова врста адресе није подржана"
 
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:326
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: није могуће направити утичницу: %s"
 
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:330
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "повезујем се са %s (%s) порт %i"
 
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:333
 #, c-format
 msgid "unable to connect: %s"
 msgstr "није могуће повезати се са: %s"
 
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:338
 msgid "connected successfully"
 msgstr "повезивање је успело"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:352
 #, c-format
 msgid "unable to connect to %s"
 msgstr "није могуће повезати се са %s"
 
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:379
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "није могуће покренути OpenSSL библиотеку: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:387
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "није могуће направити SSL/TLS објекат: %s"
 
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:393
 #, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "није могуће поставити SSL/TLS опис за датотеку: %s"
 
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:399
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "није могуће обавити SSL/TLS контакт: %s"
 
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:405
 msgid "untrusted server"
 msgstr "непроверен сервер"
 
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:409
 #, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
 msgstr "SSL/TLS слој је покренут (%s, %s %i-бит)"
 
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:456
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, отисак: %s"
 
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:485
 msgid "missing certificate"
 msgstr "недостаје сертификат"
 
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:511
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -448,184 +415,175 @@ msgstr ""
 "са \"%s\". Ако одлучите да се повежете на сервер, ова порука неће поново "
 "бити приказана."
 
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:526
 msgid "Connect to untrusted server?"
 msgstr "Да ли да се повежем на непроверени сервер?"
 
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:591
 #, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "одговор \"%s\" није исправан у тренутно важећем контексту"
 
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:620
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "није могуће обрадити одговор \"%s\""
 
-#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "Није могуће читање са сервера: %s"
 
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:675
 msgid "unable to read from server: EOF"
 msgstr "Није могуће читање са сервера: EOF"
 
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:687
 #, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "Не могу се декодовати подаци путем SASL: %s"
 
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:832
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "није могуће кодирати податке уз помоћ SASL: %s"
 
-#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "није могућ упис на сервер: %s"
 
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:868
 msgid "unable to write to server: EOF"
 msgstr "није могућ упис на сервер: EOF"
 
-#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "није могуће кодирати Base64: %s"
 
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1076
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "не може се покренути SASL библиотека: %s"
 
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1088
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "не може да се добави локална адреса утичнице: %s"
 
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1094
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "не може да се добави удаљена адреса утичнице: %s"
 
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1128
 #, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "није могуће поставити SASL сигурносне поставке: %s"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1152
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr "не може се покренути SASL пријава: SASL тражи податке које немамо"
 
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1171
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "не може се покренути SASL пријава: %s"
 
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1175
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "није могуће успоставити SASL везу: %s"
 
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1222
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL је тражио нама непознате податке, обустављам SASL пријаву"
 
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1239
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, обустављам SASL пријаву"
 
 #. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1244
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "није могуће декодовати Base64 улаз са сервера: %s"
 
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1280
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "SASL сигурносни слој нивоа снаге %i је успостављен"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1285
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "не могу да прочитам поставку SASL_MAXOUTBUF: %s"
 
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1291
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "упозорење: не могу да прочитам поставку SASL_SSF: %s"
 
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1450
 msgid "unknown server error"
 msgstr "непозната грешка на серверу"
 
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
 msgid "Mailbox"
 msgstr "Сандуче"
 
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
 msgid "From"
 msgstr "Од"
 
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
 msgid "Subject"
 msgstr "Тема"
 
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
 msgid "Sent"
 msgstr "Послато"
 
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:281
 msgid "A directory creation error has occurred"
 msgstr "Дошло је до грешке при прављењу директоријума"
 
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:282
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
 msgstr "Није могуће направити директоријум ?%s?: %s."
 
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:406
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "рекурзивно поништавам %s"
 
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:410
 msgid "syncing the GConf database"
 msgstr "усклађујем GConf базу података"
 
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:413
 msgid "completed"
 msgstr "урађено"
 
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Дошло је до грешке у командама"
-
-#: ../src/mn-conf.c:1138
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Није могуће извршити %s: %s"
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
 msgid "invalid location"
 msgstr "неважеће место"
 
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "Тренутно изабран URI"
 
 #. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
 msgid "Folder"
 msgstr "Фасцикла"
 
-#: ../src/mn-evolution-mailbox-properties.gob:159
+#: ../src/mn-evolution-mailbox-properties.gob:204
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -633,19 +591,23 @@ msgstr ""
 "Дојава поште не може да се повеже са Еволуцијом. Покрените Еволуцију и "
 "укључите додатак за повезивање са Дојавом поште."
 
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
 msgid "folder not found"
 msgstr "фасцикла није нађена"
 
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "порука није нађена"
+
+#: ../src/mn-evolution-mailbox.gob:220
 msgid "unable to contact Evolution"
 msgstr "није могуће повезати се са Еволуцијом"
 
-#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "Није могуће укључити прикључак за Дојаву поште"
 
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
@@ -654,7 +616,7 @@ msgstr ""
 "Бонобо није успео да пронађе %s сервер. Молим проверите инсталацију Дојаве "
 "поште."
 
-#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
@@ -663,101 +625,103 @@ msgstr ""
 "Бонобо није успео да забележи %s сервер. Молим проверите инсталацију Дојаве "
 "поште."
 
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
 msgid "invalid feed location"
 msgstr "место довода није исправно наведено"
 
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
 #, c-format
 msgid "retrieving feed from %s"
 msgstr "преузимање извора са %s"
 
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "није могуће пронаћи довод: %s"
 
-#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
 msgid "unable to parse feed"
 msgstr "није могуће обрадити довод"
 
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
 #, c-format
 msgid "unable to read %s: %s"
 msgstr "Није могуће прочитати %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
 #, c-format
 msgid "unable to write to %s: %s"
 msgstr "није могућ упис на %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
 #, c-format
 msgid "unable to seek in %s: %s"
 msgstr "Није могуће пронаћи у %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
 #, c-format
 msgid "unable to tell position of %s: %s"
 msgstr "није могуће сазнати положај за %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "unable to close %s: %s"
 msgstr "није могуће затворити %s: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Сандуче:"
-
+#. translators: header capitalization
 #: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
-msgstr "in_box"
+msgid "IMAP Mailbox"
+msgstr "ИМАП сандуче"
 
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
-msgstr "_друго:"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
+msgstr "До_лазно"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "ни_кад"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "_Остало:"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "а_утодетекција"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Користи продужетак IDLE"
 
 #: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "_увек"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "Ни_кад"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "А_утодетекција"
 
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Користи <span style=\"italic\">IDLE</span> продужетак:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "_Увек"
 
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:385
 msgid "server did not send capabilities"
 msgstr "сервер није обавестио о својим могућностима"
 
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:552
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "сервер је дојавио LOGINDISABLED, LOGIN пријавa неће бити коришћена"
 
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:553
 msgid "unable to login"
 msgstr "пријава није могућа"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:752
+#: ../src/mn-imap-mailbox.gob:753
 msgid "server did not send all the messages we requested"
 msgstr "сервер није послао све тражене поруке"
 
-#: ../src/mn-imap-mailbox.gob:822
+#: ../src/mn-imap-mailbox.gob:823
 msgid "unable to fetch message"
 msgstr "није могуће добавити поруку"
 
-#: ../src/mn-imap-mailbox.gob:847
+#: ../src/mn-imap-mailbox.gob:848
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -765,26 +729,26 @@ msgstr ""
 "„Користи IDLE проширење“ је постављено на „никад“ у поставкама сандучића, "
 "одјављујем се"
 
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:859
 #, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
 msgstr "удаљени сервер користи %s, не користим IDLE продужетак"
 
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:864
 #, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr "удаљени сервер користи %s, IDLE проширење можда неће исправно радити"
 
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:873
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "удаљени сервер не подржава IDLE проширење, одјављујем се"
 
-#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
 msgid "server does not support in-band SSL/TLS"
 msgstr "сервер не подржава заштиту путем SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -792,183 +756,172 @@ msgstr ""
 "изабран је механизам за пријаву који користи SASL али подршка за SASL није "
 "уграђена у програм"
 
-#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "непознат механизам за пријаву \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
 msgstr "искључујем механизам „%s“ и покушавам SASL пријаву"
 
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1456
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "повратак на  IMAP LOGIN пријаву"
 
-#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
 msgid "authentication failed"
 msgstr "пријава није успела"
 
 #. success; caller must switch state itself
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
+#: ../src/mn-imap-mailbox.gob:1529
 msgid "server did not send search results"
 msgstr "сервер није послао резултате претраге"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
 msgid "_Mail Reader"
 msgstr "_Читач поште"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Отвори последњу поруку"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
 msgid "_Update"
 msgstr "_Освежи"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
 msgid "R_emove From Notification Area"
 msgstr "_Уклони са обавештајне зоне"
 
 #. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:270
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Сажетак порука</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Сажетак порука</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
 #, c-format
 msgid "%s Properties"
 msgstr "Поставке за %s"
 
 #. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
 msgid "Add a Mailbox"
 msgstr "Додај сандуче"
 
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
 msgid "A paste error has occurred"
 msgstr "Дошло је до грешке приликом налепљивања"
 
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
 #, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "необрађено %s сандуче (%s)"
 
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
 #, c-format
 msgid "%s mailbox"
 msgstr "%s сандуче"
 
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
 msgid "detecting mailbox type..."
 msgstr "препознајем врсту сандучета..."
 
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:504
 msgid "\"type\" attribute missing"
 msgstr "недостаје атрибут „врста“"
 
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:511
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "непозната врста сандучета „%s“"
 
-#: ../src/mn-mailbox.gob:499
-#, c-format
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr "особина „%s“: није могуће пребацити ниску „%s“ у вредност врсте „%s“"
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:907
 #, c-format
 msgid "property \"%s\" has no value"
 msgstr "особина „%s“ нема постављену вредност"
 
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Дошло је до грешке приликом увожења старих сандучића"
 
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
 msgid "Unable to load the mailboxes configuration"
 msgstr "Није могуће увести подешавања сандучића"
 
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
 msgid "Unable to parse the XML document."
 msgstr "није могуће обрадити XML документ."
 
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
 msgid "The root element is missing."
 msgstr "Недостаје корени елемент."
 
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
 #, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "Корени елемент „%s“ је неважећи."
 
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
 #, c-format
 msgid "On line %i: %s."
 msgstr "У линији %i: %s."
 
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "У линији %i: непознати елемент „%s“."
 
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
 msgid "An error has occurred while loading the mailboxes configuration"
 msgid_plural "Errors have occurred while loading the mailboxes configuration"
 msgstr[0] "Дошло је до грешке приликом учитавања подешавања сандучића"
 msgstr[1] "Дошло је до грешака приликом учитавања подешавања сандучића"
 msgstr[2] "Дошло је до грешака приликом учитавања подешавања сандучића"
 
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
 msgid "Unable to save the mailboxes configuration"
 msgstr "Није могуће сачувати подешавања сандучића"
 
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
 #, c-format
 msgid "Unable to remove %s: %s."
 msgstr "Није могуће уклонити %s: %s"
 
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
 #, c-format
 msgid "Unable to create %s: %s."
 msgstr "Није могуће направити %s: %s"
 
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
 #, c-format
 msgid "Unable to open %s for writing: %s."
 msgstr "Није могуће отворити %s за упис: %s"
 
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
 msgid "Unable to write the XML document."
 msgstr "Није могуће записати XML документ."
 
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
 #, c-format
 msgid "Unable to close %s: %s."
 msgstr "Није могуће затворити %s: %s"
 
-#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
 #, c-format
 msgid "Unable to rename %s to %s: %s."
 msgstr "Није могуће преименовати %s у %s: %s"
 
 #. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
 #, c-format
 msgid "unable to delete %s: %s"
 msgstr "није могуће обрисати %s: %s"
 
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
 #, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
@@ -976,86 +929,91 @@ msgstr[0] "Сандуче %s има %i нову поруку"
 msgstr[1] "Сандуче %s има %i нове поруке"
 msgstr[2] "Сандуче %s има %i нових порука"
 
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s је дојавио грешку: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
 #, c-format
 msgid "unable to open folder \"%s\": %s"
 msgstr "није могуће отворити фасциклу „%s?: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
 #, c-format
 msgid "unable to close folder \"%s\": %s"
 msgstr "није могуће затворити фасциклу „%s?: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
 #, c-format
 msgid "error while reading folder \"%s\": %s"
 msgstr "грешка при читању фасцикле „%s?: %s"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "yes"
 msgstr "да"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "no"
 msgstr "не"
 
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:142
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s издање %s\n"
 
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:147
 msgid "Mailbox backends:\n"
 msgstr "Подржани сандучићи:\n"
 
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:152
 msgid "POP3 and IMAP features:\n"
 msgstr "Могућности за POP3 и IMAP:\n"
 
 # FIXME: избаци латинични назив када буде време
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:157
 msgid "Sylpheed features:\n"
 msgstr "Особине Силфида (Sylpheed):\n"
 
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:205
 #, c-format
 msgid "A Bonobo exception (%s) has occurred in %s()."
 msgstr "Десио се Бонобов изузетак (%s) у %s()."
 
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:247
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "Опција %s је занемарена јер Дојава поште још увек није покренута"
+
+#: ../src/mn-main.c:267
 msgid "Show version information"
 msgstr "Прикажи податке о издању"
 
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:276
 msgid "Enable informational output"
 msgstr "Дозволи речитији излаз"
 
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:285
 msgid "Display the properties dialog"
 msgstr "Прикажи прозор са поставкама"
 
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:294
 msgid "Display the about dialog"
 msgstr "Прикажи податке о програму"
 
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Затвори прозор са сажетком порука"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:303
 msgid "Update the mail status"
 msgstr "Освежи податке о пошти"
 
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Испиши сажетак порука у XML формату"
+
+#: ../src/mn-main.c:321
 msgid "Unset obsolete GConf configuration"
 msgstr "Поништи застарела GConf подешавања"
 
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:330
 msgid "Quit Mail Notification"
 msgstr "Угаси дојаву поште"
 
@@ -1063,11 +1021,11 @@ msgstr "Угаси дојаву поште"
 #. * We cannot use mn_fatal_error_dialog() because gtk_init() has
 #. * not been called yet.
 #.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:356
 msgid "multi-threading is not available"
 msgstr "вишенитни рад није подржан"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:407
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1077,27 +1035,37 @@ msgstr ""
 "Бонобо у Гному 2.6, када инсталирате програм за обавештења, треба да се "
 "одјавите и поново пријавите на систем да би све почело да ради)"
 
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:413
 msgid "quitting Mail Notification"
 msgstr "Гасим дојаву поште"
 
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:417
 msgid "Mail Notification is not running"
 msgstr "Програм за дојаву поште није покренут."
 
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:432
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Није могуће покренути библиотеку GnomeVFS."
 
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "Дошло је до грешке при покретању програма за дојаву поште"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr "Библиотека за дојаву не може да се покрене. Искачући прозори са порукама неће бити приказивани."
+
+#: ../src/mn-main.c:481
 msgid "updating the mail status"
 msgstr "Проверавам пошту"
 
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:497
 msgid "Mail Notification is already running"
 msgstr "Програм за дојаву поште је већ покренут."
 
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:514
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1106,77 +1074,85 @@ msgstr ""
 "Бонобо није могао да пронађе датотеку %s. Молимо проверите подешавања Дојаве "
 "поште."
 
-#: ../src/mn-mbox-mailbox-backend.gob:281
-#, c-format
-msgid "unable to close file: %s"
-msgstr "није могуће затворити датотеку: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "није могуће отворити сандуче: %s"
-
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:168
 msgid "unable to parse MIME message"
 msgstr "није могуће обрадити MIME поруку"
 
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:144
 msgid "Unknown"
 msgstr "Непознато"
 
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "ниједно"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "замена нема крај"
+
+#: ../src/mn-message.gob:246
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "непозната замена „%s?"
+
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "празна замена"
+
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Није могуће извршити „%s?: %s."
 
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-mh-mailbox-backend.gob:170
 #, c-format
 msgid "error while reading %s: %s"
 msgstr "грешка при читању %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:183
 #, c-format
 msgid "unable to open %s: %s"
 msgstr "није могуће отворити %s: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "_стандард"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "_Стандард"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
-msgstr "уграђени SSL/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
+msgstr "Угра_ђени SSL/TLS"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
-msgstr "SSL/TLS на посебном порту"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
+msgstr "SSL/TLS на _посебном порту"
 
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
-msgstr "_Рачунар:"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Сервер:"
 
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Детаљи"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Врста везе"
 
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "Врста везе:"
-
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "_Начин пријаве:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Пријава"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Механизам:"
 
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Веза"
+
+#: ../src/mn-pi-mailbox.gob:153
 msgid "SSL/TLS support has not been compiled in"
 msgstr "Подршка за SSL/TLS није уграђена"
 
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:319
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1189,18 +1165,18 @@ msgstr ""
 "\n"
 "Молим унесите поново лозинку."
 
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:320
 #, c-format
 msgid "Enter your credentials for %s mailbox %s."
 msgstr "Унесите лозинку за %s сандуче %s."
 
 #. keep the title in sync with gnome-authentication-manager
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:363
 msgid "Authentication Required"
 msgstr "Потребна је пријава"
 
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "параметри за могућност LOGIN-DELAY нису исправно постављени"
 
@@ -1210,7 +1186,7 @@ msgstr "параметри за могућност LOGIN-DELAY нису испр
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:485
+#: ../src/mn-pop3-mailbox.gob:486
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
@@ -1218,11 +1194,11 @@ msgstr ""
 "SASL аутентификација са почетним клијентским одговором није успела, "
 "покушавам поново без почетног клијентског одговора"
 
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
 msgid "unknown error"
 msgstr "непозната грешка"
 
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1230,44 +1206,92 @@ msgstr[0] "тражен је застој при пријави, паузира
 msgstr[1] "тражен је застој при пријави, паузирам %i секундe"
 msgstr[2] "тражен је застој при пријави, паузирам %i секунди"
 
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:966
 msgid "server does not support APOP authentication"
 msgstr "сервер не подржава пријаву коришћењем механизма APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1022
 msgid "falling back to APOP authentication"
 msgstr "прелазим на  APOP пријаву"
 
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1027
 msgid "falling back to USER/PASS authentication"
 msgstr "прелазим на пријаву помоћу имена и лозинке"
 
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Сандуче:"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Нечитљива порука:"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "Шаље:"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Тема:"
+
 #. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Поставке за дојаву"
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Отвори"
 
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "горе-лево"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Означи као прочитано"
 
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "горе-десно"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Означи као непожељно"
 
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "доле-лево"
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Није могуће отворити поруку"
 
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "доле-десно"
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Није могуће поруку означити као прочитану"
 
-#: ../src/mn-properties-dialog.gob:332
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Није могуће означити поруку као нежељену"
+
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "није могуће приказати искачући прозор: %s"
+
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "није могуће затворити искачући прозор: %s"
+
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Нова порука"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Поставке за дојаву поште"
+
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "_Поруке за пример"
+
+#: ../src/mn-properties-dialog.gob:276
 msgid "No mailbox selected."
 msgstr "Ниједно сандуче није изабрано."
 
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
@@ -1275,169 +1299,194 @@ msgstr[0] "Изабрано %i сандуче"
 msgstr[1] "Изабрана %i сандучета"
 msgstr[2] "Изабрано %i сандучета"
 
-#: ../src/mn-properties-dialog.gob:456
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Читач поште није подешен"
+
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr "Можете да подесите читач поште избором <b>Систем → Поставке → Омиљени програми</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Није могуће отворити последњу поруку"
+
+#: ../src/mn-shell.gob:237
 #, c-format
-msgid "Test message #%i"
-msgstr "Текст поруке #%i"
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Поруке из сандучета „%s? не могу да се отворе."
 
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
-msgstr "Дијалог за поставке Дојаве поште"
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Нема нових порука."
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
 msgid "Mailboxes Having New Mail"
 msgstr "Сандучићи са новом поштом"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
 msgid "Errors"
 msgstr "Грешке"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
 msgid "Mail Summary"
 msgstr "Сажетак порука"
 
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "Нема нових порука."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
 msgid "unknown SSL/TLS error"
 msgstr "непозната грешка са ССЛ/ТЛС"
 
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "Нечитљива порука:"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "Шаље:"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Тема:"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
 msgid "Sent:"
 msgstr "Послато:"
 
 #. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
 msgid "Select _All"
 msgstr "Изабери _све"
 
 #. translators: header capitalization
 #. translators: header capitalization
-#: ../src/mn-stock.c:32
+#: ../src/mn-stock.c:33
 msgid "Co_nnect"
 msgstr "_Повежи се"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "није могуће отворити фасциклу: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "није могуће затворити фасциклу: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "грешка при читању фасциклу: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
 msgid "unexpected end of file"
 msgstr "неочекивани крај датотеке"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
 #, c-format
 msgid "incompatible file version \"%i\""
 msgstr "издање датотеке није сагласно „%i“"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
 msgid "file version missing"
 msgstr "недостаје издање датотеке"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Није могуће прочитати %s: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
 msgid "System mailbox"
 msgstr "Системско сандуче"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
 #, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
 msgstr "Ваше системско сандуче је <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
 msgstr "Место системског сандучета није пронађено. Проверите променљиву MAIL."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
 msgid "system mailbox not found"
 msgstr "системско сандуче није пронађено"
 
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Пробно сандуче"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Текст поруке #%i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "Дијалог за поставке Дојаве поште"
+
+#: ../src/mn-util.c:350
 #, c-format
 msgid "error loading image: %s"
 msgstr "грешка при учитавању слике: %s"
 
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:366
 #, c-format
 msgid ""
 "Unable to load interface \"%s\". Please check your Mail Notification "
 "installation."
-msgstr "Није могуће учитати сучеље „%s?. Молимо проверите инсталацију Дојаве поште."
+msgstr ""
+"Није могуће учитати сучеље „%s?. Молимо проверите инсталацију Дојаве поште."
 
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:381
 #, c-format
 msgid ""
 "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
 "Notification installation."
-msgstr "Компонента „%s? није пронађена у сучељу „%s?. Молимо проверите инсталацију Дојаве поште."
+msgstr ""
+"Компонента „%s? није пронађена у сучељу „%s?. Молимо проверите инсталацију "
+"Дојаве поште."
 
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:450
 #, c-format
 msgid "Unable to open self as a module (%s)."
 msgstr "није могуће отворити себе као модул (%s)."
 
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:455
 #, c-format
 msgid ""
 "Signal handler \"%s\" not found. Please check your Mail Notification "
 "installation."
-msgstr "Обрађивач сигнала „%s? није пронађен. Молимо проверите инсталацију Дојаве поште."
+msgstr ""
+"Обрађивач сигнала „%s? није пронађен. Молимо проверите инсталацију Дојаве "
+"поште."
 
-#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
 msgid "A drag and drop error has occurred"
 msgstr "Дошло је до грешке при превлачењу/пуштању"
 
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:607
 msgid "An invalid location list has been received."
 msgstr "Примљен је неважећи списак места."
 
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:650
 msgid "An invalid Mozilla location has been received."
 msgstr "Примљен је неважећи Мозилин списак места."
 
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:726
 msgid "Unable to display help"
 msgstr "Није могуће приказати помоћ"
 
-#: ../src/mn-util.c:739
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "није могуће отворити везу"
+
+#: ../src/mn-util.c:752
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Није могуће покренути нит: %s."
 
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:929
 #, c-format
 msgid ""
 "The following location is invalid:\n"
@@ -1460,16 +1509,16 @@ msgstr[2] ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:945
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Дошло је до кобне грешке у програму за дојаву поште"
 
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:989
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "није могуће добавити тренутно време: %s"
 
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1304
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
@@ -1477,7 +1526,7 @@ msgstr[0] "пре %i секунду"
 msgstr[1] "пре %i секунде"
 msgstr[2] "пре %i секунди"
 
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1308
 #, c-format
 msgid "about %i minute ago"
 msgid_plural "about %i minutes ago"
@@ -1485,7 +1534,7 @@ msgstr[0] "пре око %i минут"
 msgstr[1] "пре око %i минута"
 msgstr[2] "пре око %i минута"
 
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1313
 #, c-format
 msgid "about %i hour ago"
 msgid_plural "about %i hours ago"
@@ -1493,7 +1542,7 @@ msgstr[0] "пре око %i сат"
 msgstr[1] "пре око %i сата"
 msgstr[2] "пре око %i сати"
 
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1318
 #, c-format
 msgid "about %i day ago"
 msgid_plural "about %i days ago"
@@ -1501,7 +1550,7 @@ msgstr[0] "пре око %i дан"
 msgstr[1] "пре око %i дана"
 msgstr[2] "пре око %i дана"
 
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1323
 #, c-format
 msgid "about %i week ago"
 msgid_plural "about %i weeks ago"
@@ -1509,57 +1558,79 @@ msgstr[0] "пре око %i недељу"
 msgstr[1] "пре око %i недеље"
 msgstr[2] "пре око %i недеља"
 
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1336
 msgid "unknown date"
 msgstr "непознат датум"
 
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Дошло је до грешке у командама"
+
+#: ../src/mn-vfs-mailbox.gob:228
 #, c-format
 msgid "unable to monitor %s (%s), poll mode activated"
 msgstr "није могуће надгледати %s (%s), упити су активирани"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "unknown mailbox format"
 msgstr "формат сандучета није препознат"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "does not exist"
 msgstr "не постоји"
 
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Није могуће уписати %s: %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr "особина „%s“: није могуће пребацити ниску „%s“ у вредност врсте „%s“"
+
 #. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Опште</span>"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "_Пауза између провера поште:"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Опште"
 
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
 msgid "Mailbox _name:"
 msgstr "_Име сандучета:"
 
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "_Врста сандучета:"
+
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
-msgstr "_Користи подразумевано"
+msgid "Us_e Default"
+msgstr "_Користи изворно"
 
 #: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "_Врста сандучета:"
+msgid "_Delay between mail checks:"
+msgstr "_Пауза између провера поште:"
 
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:9
 msgid "_Use Default"
-msgstr "_Користи подразумевано"
+msgstr "_Користи изворно"
 
 #: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
 msgid "minutes"
 msgstr "минута"
 
 #: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
 msgid "seconds"
 msgstr "секунди"
 
@@ -1575,144 +1646,266 @@ msgstr "<span weight=\"bold\">Наредбе</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Писма</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Истицање</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Изглед</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Сандучићи</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Место</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
 msgstr "<span weight=\"bold\">Сажетак порука у облачићу</span>"
 
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "_Садржај:"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Опште"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "_После:"
 
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Са_криј претходно приказане поруке"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "_Хоризонтални помак:"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "У стогу _искачућих порука"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
-msgstr "Сажетак порука"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
+msgstr "Искачуће поруке"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
 msgid "Status Icon"
 msgstr "Статусна сличица"
 
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "Користи ова _писма:"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Када _стигне нова пошта:"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
 msgid "When all mail has _been read:"
 msgstr "Када је _сва пошта прочитана:"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
 msgid "_Always display"
 msgstr "_Увек приказуј"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "_Аутоматски затвори после:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "_Прикачене за статусну сличицу"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
 msgid "_Blink on errors"
 msgstr "_Трепери при грешкама"
 
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "Прикажи пробно прозорче"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "_Изворно за радни простор"
 
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
 msgid "_Display seen mail"
 msgstr "_Прикажи прегледане поруке"
 
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
 msgid "_Display this dialog"
 msgstr "При_кажи овај прозор"
 
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
-msgstr "Дозволи приказ сажетка порука"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
+msgstr "_Дозволи искачуће прозоре"
 
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
 msgid "_Launch the mail reader"
 msgstr "П_окрени читач поште"
 
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
 msgid "_None"
 msgstr "_Ниједно"
 
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Место:"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "_Наслов:"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Отвори последњу поруку"
 
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
 msgid "_Update the mail status"
 msgstr "_Освежи податке о пошти"
 
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "Користи писма из _теме"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "_Вертикални помак:"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
 msgid "icon tooltip's mail summary layout|Co_mpact"
 msgstr "_Скраћен"
 
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
 msgid "icon tooltip's mail summary layout|_Standard"
 msgstr "_Обичан"
 
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "тачака"
+#~ msgid "Automatically close the mail summary popup"
+#~ msgstr "Аутоматски затвори прозор са сажетком порука"
+
+#~ msgid "Mail summary popup contents font"
+#~ msgstr "Писмо које се користи за садржај прозора са сажетком порука"
+
+#~ msgid "Mail summary popup fonts aspect source"
+#~ msgstr "Извор за аспект за писмо у прозору за сажетак (???)"
+
+#~ msgid "Mail summary popup horizontal offset"
+#~ msgstr "Померај хоризонталних тачака за прозор са сажетком порука"
+
+#~ msgid "Mail summary popup title font"
+#~ msgstr "Писмо које се користи за наслов прозора са сажетком порука"
+
+#~ msgid "Mail summary popup vertical offset"
+#~ msgstr "Померај вертикалних тачака ѕа прозор са сажетком порука"
+
+#~ msgid "Only display recent mail in mail summary popup"
+#~ msgstr "Прикажи само скоро приспеле поруке у сажетку"
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (minutes "
+#~ "part)."
+#~ msgstr "Пауза пре затварања прозора са сажетком порука (минути)."
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (seconds "
+#~ "part)."
+#~ msgstr "Пауза пре затварања прозора са сажетком порука (секунде)."
+
+#~ msgid "The custom font to use for the contents of the mail summary popup."
+#~ msgstr ""
+#~ "Посебно писмо које се користи за испис садржаја прозора са сажетком "
+#~ "порука."
+
+#~ msgid "The custom font to use for the title of the mail summary popup."
+#~ msgstr ""
+#~ "Посебно писмо које се користи за испис наслова прозора са сажетком порука."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the left or right side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Број тачака које треба оставити између леве, одн. десне стране екрана и "
+#~ "прозора са сажетком порука."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the top or bottom side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Број тачака које треба оставити између врха, одн. дна екрана и прозора са "
+#~ "сажетком порука."
+
+#~ msgid ""
+#~ "The position of the mail summary popup. Must be \"top-left\", \"top-right"
+#~ "\", \"bottom-left\" or \"bottom-right\"."
+#~ msgstr ""
+#~ "Положај прозора са сажетком порука. Може бити: ?горе-лево?, ?горе-"
+#~ "десно?, ?доле-лево? или ?доле-десно?."
+
+#~ msgid "Whether to automatically close the mail summary popup or not."
+#~ msgstr ""
+#~ "Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
+
+#~ msgid ""
+#~ "Whether to display the mail summary popup when new mail arrives or not."
+#~ msgstr "Да ли треба приказати сажетак порука када стигне нова пошта."
+
+#~ msgid ""
+#~ "Whether to hide previously displayed mail in the mail summary popup or "
+#~ "not."
+#~ msgstr ""
+#~ "Да ли из сажетка треба уклонити поруке које су се у њему већ пре појавиле."
+
+#~ msgid "<span style=\"italic\">autodetect</span>"
+#~ msgstr "<span style=\"italic\">сам пронађи</span>"
+
+#~ msgid "Use the <span style=\"italic\">IDLE</span> extension:"
+#~ msgstr "Користи <span style=\"italic\">IDLE</span> продужетак:"
+
+#~ msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span weight=\"bold\">Сажетак порука</span>"
+
+#~ msgid "<span weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span weight=\"bold\">Сажетак порука</span>"
+
+#~ msgid "Close the mail summary popup"
+#~ msgstr "Затвори прозор са сажетком порука"
+
+#~ msgid "none"
+#~ msgstr "ниједно"
+
+#~ msgid "Ho_stname:"
+#~ msgstr "_Рачунар:"
+
+#~ msgid "_Details"
+#~ msgstr "_Детаљи"
+
+#~ msgid "Authent_ication mechanism:"
+#~ msgstr "_Начин пријаве:"
+
+#~ msgid "top left"
+#~ msgstr "горе-лево"
+
+#~ msgid "top right"
+#~ msgstr "горе-десно"
+
+#~ msgid "bottom left"
+#~ msgstr "доле-лево"
+
+#~ msgid "bottom right"
+#~ msgstr "доле-десно"
+
+#~ msgid "Use De_fault"
+#~ msgstr "_Кори�ти подразумевано"
+
+#~ msgid "<span weight=\"bold\">Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Писма</span>"
 
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "С_краћен"
+#~ msgid "<span weight=\"bold\">Layout</span>"
+#~ msgstr "<span weight=\"bold\">Изглед</span>"
 
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "О_бичан"
+#~ msgid "Co_ntents:"
+#~ msgstr "_Садржај:"
+
+#~ msgid "Hide p_reviously displayed mail"
+#~ msgstr "Са_криј претходно приказане поруке"
+
+#~ msgid "Hori_zontal offset:"
+#~ msgstr "_Хоризонтални помак:"
+
+#~ msgid "Mail Summary Popup"
+#~ msgstr "Сажетак порука"
+
+#~ msgid "Use these _fonts:"
+#~ msgstr "Користи ова _писма:"
+
+#~ msgid "_Automatically close after:"
+#~ msgstr "_Аутоматски затвори после:"
+
+#~ msgid "_Display a Test Popup"
+#~ msgstr "Прикажи пробно прозорче"
+
+#~ msgid "_Position:"
+#~ msgstr "_Место:"
+
+#~ msgid "_Title:"
+#~ msgstr "_Наслов:"
+
+#~ msgid "_Use fonts from theme"
+#~ msgstr "Користи писма из _теме"
+
+#~ msgid "_Vertical offset:"
+#~ msgstr "_Вертикални помак:"
+
+#~ msgid "pixels"
+#~ msgstr "тачака"
+
+#~ msgid "popup's mail summary layout|Co_mpact"
+#~ msgstr "С_краћен"
+
+#~ msgid "popup's mail summary layout|_Standard"
+#~ msgstr "О_бичан"
 
 #~ msgid "Delay between mail checks (minutes part)."
 #~ msgstr "Размак између две провере (минути)"
@@ -1732,9 +1925,6 @@ msgstr "О_бичан"
 #~ msgid "Height of main window"
 #~ msgstr "Висина главног прозора"
 
-#~ msgid "Mail reader command"
-#~ msgstr "Команда за читање поште"
-
 #~ msgid "Minutes between mail checks"
 #~ msgstr "Минута између две провере"
 
@@ -1791,9 +1981,6 @@ msgstr "О_бичан"
 #~ "displayed or not."
 #~ msgstr "Да ли треба или не треба спречити појаву прозора са описом грешака."
 
-#~ msgid "Whether to set a mail reader or not."
-#~ msgstr "Да ли треба поставити читач поште или не."
-
 #~ msgid "Width of edit toolbars dialog"
 #~ msgstr "Ширина прозора за уређивање статусних трака"
 
@@ -1863,9 +2050,6 @@ msgstr "О_бичан"
 #~ msgid "Display help"
 #~ msgstr "Прикажи помоћ"
 
-#~ msgid "_About"
-#~ msgstr "_О програму"
-
 #~ msgid "Display credits"
 #~ msgstr "Прикажи заслуге"
 
@@ -1878,9 +2062,6 @@ msgstr "О_бичан"
 #~ msgid "Show or hide the statusbar"
 #~ msgstr "Прикажи или уклони статусну траку"
 
-#~ msgid "_Desktop Default"
-#~ msgstr "_Подразумевано у окружењу"
-
 #~ msgid "Set the toolbars style to the desktop default setting"
 #~ msgstr "Постави стилове трака на стил који важи у целом радном окружењу"
 
@@ -1911,12 +2092,6 @@ msgstr "О_бичан"
 #~ msgid "unable to load toolbars.xml"
 #~ msgstr "није могуће учитати toolbars.xml: %s"
 
-#~ msgid "%i new message"
-#~ msgid_plural "%i new messages"
-#~ msgstr[0] "%i нова порука"
-#~ msgstr[1] "%i нове поруке"
-#~ msgstr[2] "%i нових порука"
-
 #~ msgid "Compiled-in mailbox backends: "
 #~ msgstr "Уграђене могућности за сандучиће:"
 
@@ -2261,9 +2436,6 @@ msgstr "О_бичан"
 #~ msgid "received an invalid Mozilla URL"
 #~ msgstr "примљен је неисправан Мозилин URL"
 
-#~ msgid "_Authenticate"
-#~ msgstr "Пријави се"
-
 #~ msgid "The amount of time to wait before closing the mail summary popup"
 #~ msgstr "Пауза пре затварања прозора са сажетком порука"
 
@@ -2472,3 +2644,4 @@ msgstr "О_бичан"
 
 #~ msgid "Whether to run a command when the icon is double-clicked or not"
 #~ msgstr "Да ли се покреће команда при двоструком клику или не"
+
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
@@ -11,10 +11,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-25 01:00+0200\n"
-"PO-Revision-Date: 2006-11-21 17:41+0100\n"
+"POT-Creation-Date: 2006-11-28 00:14+0100\n"
+"PO-Revision-Date: 2006-12-07 11:05+0100\n"
 "Last-Translator: Filip Miletić <filmil@gmail.com>\n"
 "Language-Team: Serbian (sr) <gnu@prevod.org>\n"
 "MIME-Version: 1.0\n"
@@ -51,8 +51,9 @@ msgid "Configure Mail Notification"
 msgstr "Podesi dojavu prispeća pošte"
 
 #: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
 msgid "Mail Notification"
 msgstr "Dojava pošte"
 
@@ -60,228 +61,181 @@ msgstr "Dojava pošte"
 msgid "Get notified when new mail arrives"
 msgstr "Obavesti kada stigne nova pošta"
 
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
 msgid "Always display an icon"
 msgstr "Uvek prikazuj sličicu"
 
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Automatski zatvori prozor sa sažetkom poruka"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
 msgid "Blink on errors"
 msgstr "Treperi ako dođe do greške"
 
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
 msgid "Click action"
 msgstr "Dejstvo pri pritisku"
 
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
 msgid "Display seen mail"
 msgstr "Prikaži pregledane poruke"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
-msgstr "Dozvoli prikaz sažetka poruka"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Dozvoli iskačuće prozore"
+
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Važnost iskačućih prozora ističe"
 
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Otisci proverenih X509 sertifikata"
 
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
 msgid "Height of properties dialog"
 msgstr "Visina prozora sa postavkama"
 
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Komanda za čitanje pošte"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Pismo koje se koristi za sadržaj prozora sa sažetkom poruka"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
-msgstr "Izvor za aspekt za pismo u prozoru za sažetak (???)"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
+msgstr "Ako je podešavanje /apps/mail-notification/popups/expiration/enabled postavljeno na „true?, predstavlja vreme koje treba da protekne pre nego što iskačući prozor istekne (minuti)."
 
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Pomeraj horizontalnih tačaka za prozor sa sažetkom poruka"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr "Ako je podešavanje /apps/mail-notification/popups/expiration/enabled postavljeno na \"true\", vreme koje treba da protekne pre nego što iskačući prozor istekne (sekunde)."
 
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Broj horizontalnih tačaka za prozor sa sažetkom poruka"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Komanda pri promeni pošte"
 
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Pismo koje se koristi za naslov prozora sa sažetkom poruka"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Komanda za čitanje pošte"
 
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Pomeraj vertikalnih tačaka ѕa prozor sa sažetkom poruka"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Mesto iskačućeg prozora sa porukama"
 
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr ""
-"Broj minuta koji treba da protekne pre zatvaranja prozora sa sažetkom poruka"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Broj minuta koji treba da protekne pre zatvaranja iskačućeg prozora sa porukom"
 
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:15
 msgid "New mail command"
 msgstr "Izvrši kada pošta stigne"
 
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr "Prikaži samo skoro prispele poruke u sažetku"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:16
 msgid "Run a command when all mail is read"
 msgstr "Pokreni komandu kada je sva pošta pročitana"
 
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:17
 msgid "Run a command when new mail arrives"
 msgstr "Pokreni komandu kada stigne nova pošta"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Broj sekundi koji treba da protekne pre zatvaranja sažetka poruka"
-
-#: ../data/mail-notification.schemas.in.h:22
-msgid ""
-"The action to perform when the icon is clicked. Must be \"display-properties-"
-"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
-msgstr "Postavljanje naredbe koja se izvršava pri pritisku na sličicu. Mogući izbori su: „glavni-prozor?, „pokreni-čitač-pošte? ili „ažuriraj-status-pošte?."
-
-#: ../data/mail-notification.schemas.in.h:23
-msgid ""
-"The amount of time to wait before closing the mail summary popup (minutes "
-"part)."
-msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (minuti)."
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Pokreni komandu kada se spisak poruka promeni"
 
-#: ../data/mail-notification.schemas.in.h:24
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (sekunde)."
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Broj sekundi koji treba da protekne pre zatvaranja iskačućeg prozora sa porukama"
 
-#: ../data/mail-notification.schemas.in.h:25
+#: ../data/mail-notification.schemas.in.in.h:20
 msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
-msgstr "Izvor za podešavanja pisma. Može biti: ?tema? ili ?poseban?."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
+msgstr "Naredba koja se izvršava pri pritisku na sličicu. Mogu da budu: „prikaži-prozor-sa-postavkama?, „pokreni-čitač-pošte?, „otvori-poslednju-poruku? ili „osveži-status-pošte?."
 
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:21
 msgid "The command to run when all mail is read."
 msgstr "Komanda koju treba pokrenuti kada je sva pošta pročitana."
 
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:22
 msgid "The command to run when new mail arrives."
 msgstr "Pokreni ovu komandu kada stigne nova pošta."
 
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr ""
-"Posebno pismo koje se koristi za ispis sadržaja prozora sa sažetkom poruka."
-
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr ""
-"Posebno pismo koje se koristi za ispis naslova prozora sa sažetkom poruka."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "Komanda koja se pokreće kada se promeni spisak poruka."
 
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:24
 msgid "The height of the properties dialog in pixels."
 msgstr "Visina prozora sa postavkama izražena u tačkama."
 
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:25
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
 "Spisak proverenih SSL/TLS servera (računar:port) koji nemaju X509 sertifikat."
 
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:26
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr "Spisak proverenih X509 sertifikata, predstavljenih MD5 otiskom."
 
-#: ../data/mail-notification.schemas.in.h:33
-msgid ""
-"The number of pixels to leave between the left or right side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Broj tačaka koje treba ostaviti između leve, odn. desne strane ekrana i "
-"prozora sa sažetkom poruka."
-
-#: ../data/mail-notification.schemas.in.h:34
-msgid ""
-"The number of pixels to leave between the top or bottom side of the screen "
-"and the mail summary popup."
-msgstr ""
-"Broj tačaka koje treba ostaviti između vrha, odn. dna ekrana i prozora sa "
-"sažetkom poruka."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "Mesto iskačućeg prozora sa porukama. Može biti „zakačen? ili „slobodan?."
 
-#: ../data/mail-notification.schemas.in.h:35
-msgid ""
-"The position of the mail summary popup. Must be \"top-left\", \"top-right\", "
-"\"bottom-left\" or \"bottom-right\"."
-msgstr ""
-"Položaj prozora sa sažetkom poruka. Može biti: ?gore-levo?, ?gore-desno?, ?"
-"dole-levo? ili ?dole-desno?."
-
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:28
 msgid ""
 "The type of mail summary to display in the icon's tooltip. Must be \"standard"
 "\", \"compact\" or \"none\"."
-msgstr "Vrsta sažetka pošte koji se prikazuje u oblačiću.  Može biti „običan?, „kratak? ili „nijedan?."
+msgstr ""
+"Vrsta sažetka pošte koji se prikazuje u oblačiću.  Može biti „običan?, "
+"„kratak? ili „nijedan?."
 
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:29
 msgid "The width of the properties dialog in pixels."
 msgstr "Širina prozora sa postavkama izražena u tačkama."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:30
 msgid "Tooltip mail summary"
 msgstr "Oblačić sa sažetkom poruka"
 
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:31
 msgid "Trusted servers list"
 msgstr "Spisak proverenih servera"
 
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:32
 msgid "Whether the status icon should blink on errors or not."
 msgstr "Da li sličica treba da treperi ako dođe do greške ili ne."
 
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr ""
-"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:33
 msgid "Whether to display an icon when there is no new mail or not."
 msgstr "Da li se prikazuje sličica kada nema nove pošte."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:34
 msgid "Whether to display seen mail or not."
 msgstr "Da li treba prikazivati pregledanu poštu ili ne."
 
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr "Da li treba prikazati sažetak poruka kada stigne nova pošta."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Da li se koriste iskačući prozori sa porukama ili ne."
 
-#: ../data/mail-notification.schemas.in.h:45
+#: ../data/mail-notification.schemas.in.in.h:36
 msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
-msgstr ""
-"Da li iz sažetka treba ukloniti poruke koje su se u njemu već pre pojavile."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
+msgstr "Da li iskačući prozori ističu ili ne.  Mora biti „default?, „false? ili „true?."
 
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:37
 msgid "Whether to run a command when all mail is read or not."
 msgstr ""
 "Da li treba ili ne treba pokrenuti neku komandu kada je sva pošta pročitana."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:38
 msgid "Whether to run a command when new mail arrives or not."
 msgstr "Da li treba pokrenuti neku komandu kada stigne nova pošta."
 
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr "Da li treba pokrenuti neku komandu kada se spisak poruka promeni ili ne."
+
+#: ../data/mail-notification.schemas.in.in.h:40
 msgid "Width of properties dialog"
 msgstr "Širina prozora sa postavkama"
 
@@ -294,7 +248,7 @@ msgid "The orientation of the tray."
 msgstr "Orijentacija obaveštajne zone."
 
 #. translators: header capitalization
-#: ../src/mn-about-dialog.gob:49
+#: ../src/mn-about-dialog.gob:50
 msgid "A Mail Notification Icon"
 msgstr "Sličica za dojavu prispeća pošte"
 
@@ -302,134 +256,147 @@ msgstr "Sličica za dojavu prispeća pošte"
 #. * translators: Your Name <your-email>
 #. * optionally followed by one or more: \nOther Contributor's Name <his-email>
 #.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
 msgid "translator-credits"
 msgstr "Filip Miletić <filmil@gmail.com>"
 
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "nije moguće otvoriti vezu"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "A_utodetekcija"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">sam pronađi</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Nalog"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
 msgid "_Username:"
 msgstr "_Kor.ime:"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
 msgid "Location"
 msgstr "Mesto"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
 msgid "_Location:"
 msgstr "_Mesto:"
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
 msgid "_Browse..."
 msgstr "_Pregledaj..."
 
 #. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
 msgid "Select a File or Folder"
 msgstr "Izaberite datoteku ili fasciklu"
 
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "nije moguće zatvoriti datoteku: %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "nije moguće otvoriti sanduče: %s"
+
+#: ../src/mn-client-session.c:248
 #, c-format
 msgid "resolving %s"
 msgstr "pronalazim %s"
 
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:264
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "Nije moguće pronaći %s: %s"
 
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:305
 #, c-format
 msgid "network address #%i"
 msgstr "mrežna adresa #%i"
 
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:308
 #, c-format
 msgid "unable to convert network address #%i into textual form: %s"
 msgstr "mrežna adresa #%i se ne može prebaciti u tekstualni oblik: %s"
 
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:319
 #, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: ova vrsta adrese nije podržana"
 
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:326
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: nije moguće napraviti utičnicu: %s"
 
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:330
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "povezujem se sa %s (%s) port %i"
 
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:333
 #, c-format
 msgid "unable to connect: %s"
 msgstr "nije moguće povezati se sa: %s"
 
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:338
 msgid "connected successfully"
 msgstr "povezivanje je uspelo"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:352
 #, c-format
 msgid "unable to connect to %s"
 msgstr "nije moguće povezati se sa %s"
 
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:379
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "nije moguće pokrenuti OpenSSL biblioteku: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:387
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "nije moguće napraviti SSL/TLS objekat: %s"
 
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:393
 #, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "nije moguće postaviti SSL/TLS opis za datoteku: %s"
 
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:399
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "nije moguće obaviti SSL/TLS kontakt: %s"
 
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:405
 msgid "untrusted server"
 msgstr "neproveren server"
 
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:409
 #, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
 msgstr "SSL/TLS sloj je pokrenut (%s, %s %i-bit)"
 
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:456
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, otisak: %s"
 
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:485
 msgid "missing certificate"
 msgstr "nedostaje sertifikat"
 
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:511
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -448,184 +415,175 @@ msgstr ""
 "sa \"%s\". Ako odlučite da se povežete na server, ova poruka neće ponovo "
 "biti prikazana."
 
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:526
 msgid "Connect to untrusted server?"
 msgstr "Da li da se povežem na neprovereni server?"
 
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:591
 #, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "odgovor \"%s\" nije ispravan u trenutno važećem kontekstu"
 
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:620
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "nije moguće obraditi odgovor \"%s\""
 
-#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "Nije moguće čitanje sa servera: %s"
 
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:675
 msgid "unable to read from server: EOF"
 msgstr "Nije moguće čitanje sa servera: EOF"
 
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:687
 #, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "Ne mogu se dekodovati podaci putem SASL: %s"
 
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:832
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "nije moguće kodirati podatke uz pomoć SASL: %s"
 
-#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "nije moguć upis na server: %s"
 
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:868
 msgid "unable to write to server: EOF"
 msgstr "nije moguć upis na server: EOF"
 
-#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "nije moguće kodirati Base64: %s"
 
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1076
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "ne može se pokrenuti SASL biblioteka: %s"
 
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1088
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "ne može da se dobavi lokalna adresa utičnice: %s"
 
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1094
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
 msgstr "ne može da se dobavi udaljena adresa utičnice: %s"
 
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1128
 #, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "nije moguće postaviti SASL sigurnosne postavke: %s"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1152
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
 msgstr "ne može se pokrenuti SASL prijava: SASL traži podatke koje nemamo"
 
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1171
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "ne može se pokrenuti SASL prijava: %s"
 
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1175
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "nije moguće uspostaviti SASL vezu: %s"
 
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1222
 msgid "SASL asked for something we did not know, aborting SASL authentication"
 msgstr "SASL je tražio nama nepoznate podatke, obustavljam SASL prijavu"
 
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1239
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, obustavljam SASL prijavu"
 
 #. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1244
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "nije moguće dekodovati Base64 ulaz sa servera: %s"
 
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1280
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
 msgstr "SASL sigurnosni sloj nivoa snage %i je uspostavljen"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1285
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "ne mogu da pročitam postavku SASL_MAXOUTBUF: %s"
 
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1291
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "upozorenje: ne mogu da pročitam postavku SASL_SSF: %s"
 
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1450
 msgid "unknown server error"
 msgstr "nepoznata greška na serveru"
 
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
 msgid "Mailbox"
 msgstr "Sanduče"
 
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
 msgid "From"
 msgstr "Od"
 
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
 msgid "Subject"
 msgstr "Tema"
 
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
 msgid "Sent"
 msgstr "Poslato"
 
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:281
 msgid "A directory creation error has occurred"
 msgstr "Došlo je do greške pri pravljenju direktorijuma"
 
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:282
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
 msgstr "Nije moguće napraviti direktorijum ?%s?: %s."
 
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:406
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "rekurzivno poništavam %s"
 
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:410
 msgid "syncing the GConf database"
 msgstr "usklađujem GConf bazu podataka"
 
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:413
 msgid "completed"
 msgstr "urađeno"
 
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Došlo je do greške u komandama"
-
-#: ../src/mn-conf.c:1138
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Nije moguće izvršiti %s: %s"
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
 msgid "invalid location"
 msgstr "nevažeće mesto"
 
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: mn-evolution-folder-tree-control.gob:69
 msgid "The currently selected URI"
 msgstr "Trenutno izabran URI"
 
 #. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
 msgid "Folder"
 msgstr "Fascikla"
 
-#: ../src/mn-evolution-mailbox-properties.gob:159
+#: ../src/mn-evolution-mailbox-properties.gob:204
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -633,19 +591,23 @@ msgstr ""
 "Dojava pošte ne može da se poveže sa Evolucijom. Pokrenite Evoluciju i "
 "uključite dodatak za povezivanje sa Dojavom pošte."
 
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
 msgid "folder not found"
 msgstr "fascikla nije nađena"
 
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "poruka nije nađena"
+
+#: ../src/mn-evolution-mailbox.gob:220
 msgid "unable to contact Evolution"
 msgstr "nije moguće povezati se sa Evolucijom"
 
-#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "Nije moguće uključiti priključak za Dojavu pošte"
 
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
@@ -654,7 +616,7 @@ msgstr ""
 "Bonobo nije uspeo da pronađe %s server. Molim proverite instalaciju Dojave "
 "pošte."
 
-#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
@@ -663,101 +625,103 @@ msgstr ""
 "Bonobo nije uspeo da zabeleži %s server. Molim proverite instalaciju Dojave "
 "pošte."
 
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
 msgid "invalid feed location"
 msgstr "mesto dovoda nije ispravno navedeno"
 
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
 #, c-format
 msgid "retrieving feed from %s"
 msgstr "preuzimanje izvora sa %s"
 
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "nije moguće pronaći dovod: %s"
 
-#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
 msgid "unable to parse feed"
 msgstr "nije moguće obraditi dovod"
 
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
 #, c-format
 msgid "unable to read %s: %s"
 msgstr "Nije moguće pročitati %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
 #, c-format
 msgid "unable to write to %s: %s"
 msgstr "nije moguć upis na %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
 #, c-format
 msgid "unable to seek in %s: %s"
 msgstr "Nije moguće pronaći u %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
 #, c-format
 msgid "unable to tell position of %s: %s"
 msgstr "nije moguće saznati položaj za %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "unable to close %s: %s"
 msgstr "nije moguće zatvoriti %s: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Sanduče:"
-
+#. translators: header capitalization
 #: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
-msgstr "in_box"
+msgid "IMAP Mailbox"
+msgstr "IMAP sanduče"
 
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
-msgstr "_drugo:"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
+msgstr "Do_lazno"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "ni_kad"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "_Ostalo:"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "a_utodetekcija"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Koristi produžetak IDLE"
 
 #: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "_uvek"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "Ni_kad"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "A_utodetekcija"
 
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Koristi <span style=\"italic\">IDLE</span> produžetak:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "_Uvek"
 
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:385
 msgid "server did not send capabilities"
 msgstr "server nije obavestio o svojim mogućnostima"
 
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:552
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
 msgstr "server je dojavio LOGINDISABLED, LOGIN prijava neće biti korišćena"
 
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:553
 msgid "unable to login"
 msgstr "prijava nije moguća"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:752
+#: ../src/mn-imap-mailbox.gob:753
 msgid "server did not send all the messages we requested"
 msgstr "server nije poslao sve tražene poruke"
 
-#: ../src/mn-imap-mailbox.gob:822
+#: ../src/mn-imap-mailbox.gob:823
 msgid "unable to fetch message"
 msgstr "nije moguće dobaviti poruku"
 
-#: ../src/mn-imap-mailbox.gob:847
+#: ../src/mn-imap-mailbox.gob:848
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -765,26 +729,26 @@ msgstr ""
 "„Koristi IDLE proširenje“ je postavljeno na „nikad“ u postavkama sandučića, "
 "odjavljujem se"
 
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:859
 #, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
 msgstr "udaljeni server koristi %s, ne koristim IDLE produžetak"
 
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:864
 #, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
 msgstr "udaljeni server koristi %s, IDLE proširenje možda neće ispravno raditi"
 
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:873
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "udaljeni server ne podržava IDLE proširenje, odjavljujem se"
 
-#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
 msgid "server does not support in-band SSL/TLS"
 msgstr "server ne podržava zaštitu putem SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -792,183 +756,172 @@ msgstr ""
 "izabran je mehanizam za prijavu koji koristi SASL ali podrška za SASL nije "
 "ugrađena u program"
 
-#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "nepoznat mehanizam za prijavu \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
 msgstr "isključujem mehanizam „%s“ i pokušavam SASL prijavu"
 
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1456
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "povratak na  IMAP LOGIN prijavu"
 
-#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
 msgid "authentication failed"
 msgstr "prijava nije uspela"
 
 #. success; caller must switch state itself
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
+#: ../src/mn-imap-mailbox.gob:1529
 msgid "server did not send search results"
 msgstr "server nije poslao rezultate pretrage"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
 msgid "_Mail Reader"
 msgstr "_Čitač pošte"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Otvori poslednju poruku"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
 msgid "_Update"
 msgstr "_Osveži"
 
 #. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
 msgid "R_emove From Notification Area"
 msgstr "_Ukloni sa obaveštajne zone"
 
 #. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:270
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Sažetak poruka</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Sažetak poruka</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
 #, c-format
 msgid "%s Properties"
 msgstr "Postavke za %s"
 
 #. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
 msgid "Add a Mailbox"
 msgstr "Dodaj sanduče"
 
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
 msgid "A paste error has occurred"
 msgstr "Došlo je do greške prilikom nalepljivanja"
 
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
 #, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "neobrađeno %s sanduče (%s)"
 
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
 #, c-format
 msgid "%s mailbox"
 msgstr "%s sanduče"
 
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
 msgid "detecting mailbox type..."
 msgstr "prepoznajem vrstu sandučeta..."
 
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:504
 msgid "\"type\" attribute missing"
 msgstr "nedostaje atribut „vrsta“"
 
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:511
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "nepoznata vrsta sandučeta „%s“"
 
-#: ../src/mn-mailbox.gob:499
-#, c-format
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr "osobina „%s“: nije moguće prebaciti nisku „%s“ u vrednost vrste „%s“"
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:907
 #, c-format
 msgid "property \"%s\" has no value"
 msgstr "osobina „%s“ nema postavljenu vrednost"
 
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Došlo je do greške prilikom uvoženja starih sandučića"
 
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
 msgid "Unable to load the mailboxes configuration"
 msgstr "Nije moguće uvesti podešavanja sandučića"
 
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
 msgid "Unable to parse the XML document."
 msgstr "nije moguće obraditi XML dokument."
 
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
 msgid "The root element is missing."
 msgstr "Nedostaje koreni element."
 
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
 #, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "Koreni element „%s“ je nevažeći."
 
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
 #, c-format
 msgid "On line %i: %s."
 msgstr "U liniji %i: %s."
 
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "U liniji %i: nepoznati element „%s“."
 
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
 msgid "An error has occurred while loading the mailboxes configuration"
 msgid_plural "Errors have occurred while loading the mailboxes configuration"
 msgstr[0] "Došlo je do greške prilikom učitavanja podešavanja sandučića"
 msgstr[1] "Došlo je do grešaka prilikom učitavanja podešavanja sandučića"
 msgstr[2] "Došlo je do grešaka prilikom učitavanja podešavanja sandučića"
 
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
 msgid "Unable to save the mailboxes configuration"
 msgstr "Nije moguće sačuvati podešavanja sandučića"
 
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
 #, c-format
 msgid "Unable to remove %s: %s."
 msgstr "Nije moguće ukloniti %s: %s"
 
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
 #, c-format
 msgid "Unable to create %s: %s."
 msgstr "Nije moguće napraviti %s: %s"
 
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
 #, c-format
 msgid "Unable to open %s for writing: %s."
 msgstr "Nije moguće otvoriti %s za upis: %s"
 
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
 msgid "Unable to write the XML document."
 msgstr "Nije moguće zapisati XML dokument."
 
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
 #, c-format
 msgid "Unable to close %s: %s."
 msgstr "Nije moguće zatvoriti %s: %s"
 
-#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
 #, c-format
 msgid "Unable to rename %s to %s: %s."
 msgstr "Nije moguće preimenovati %s u %s: %s"
 
 #. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
 #, c-format
 msgid "unable to delete %s: %s"
 msgstr "nije moguće obrisati %s: %s"
 
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
 #, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
@@ -976,86 +929,91 @@ msgstr[0] "Sanduče %s ima %i novu poruku"
 msgstr[1] "Sanduče %s ima %i nove poruke"
 msgstr[2] "Sanduče %s ima %i novih poruka"
 
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s je dojavio grešku: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
 #, c-format
 msgid "unable to open folder \"%s\": %s"
 msgstr "nije moguće otvoriti fasciklu „%s?: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
 #, c-format
 msgid "unable to close folder \"%s\": %s"
 msgstr "nije moguće zatvoriti fasciklu „%s?: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
 #, c-format
 msgid "error while reading folder \"%s\": %s"
 msgstr "greška pri čitanju fascikle „%s?: %s"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "yes"
 msgstr "da"
 
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
 msgid "no"
 msgstr "ne"
 
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:142
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s izdanje %s\n"
 
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:147
 msgid "Mailbox backends:\n"
 msgstr "Podržani sandučići:\n"
 
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:152
 msgid "POP3 and IMAP features:\n"
 msgstr "Mogućnosti za POP3 i IMAP:\n"
 
 # FIXME: izbaci latinični naziv kada bude vreme
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:157
 msgid "Sylpheed features:\n"
 msgstr "Osobine Silfida (Sylpheed):\n"
 
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:205
 #, c-format
 msgid "A Bonobo exception (%s) has occurred in %s()."
 msgstr "Desio se Bonobov izuzetak (%s) u %s()."
 
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:247
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr "Opcija %s je zanemarena jer Dojava pošte još uvek nije pokrenuta"
+
+#: ../src/mn-main.c:267
 msgid "Show version information"
 msgstr "Prikaži podatke o izdanju"
 
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:276
 msgid "Enable informational output"
 msgstr "Dozvoli rečitiji izlaz"
 
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:285
 msgid "Display the properties dialog"
 msgstr "Prikaži prozor sa postavkama"
 
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:294
 msgid "Display the about dialog"
 msgstr "Prikaži podatke o programu"
 
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Zatvori prozor sa sažetkom poruka"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:303
 msgid "Update the mail status"
 msgstr "Osveži podatke o pošti"
 
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Ispiši sažetak poruka u XML formatu"
+
+#: ../src/mn-main.c:321
 msgid "Unset obsolete GConf configuration"
 msgstr "Poništi zastarela GConf podešavanja"
 
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:330
 msgid "Quit Mail Notification"
 msgstr "Ugasi dojavu pošte"
 
@@ -1063,11 +1021,11 @@ msgstr "Ugasi dojavu pošte"
 #. * We cannot use mn_fatal_error_dialog() because gtk_init() has
 #. * not been called yet.
 #.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:356
 msgid "multi-threading is not available"
 msgstr "višenitni rad nije podržan"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:407
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1077,27 +1035,37 @@ msgstr ""
 "Bonobo u Gnomu 2.6, kada instalirate program za obaveštenja, treba da se "
 "odjavite i ponovo prijavite na sistem da bi sve počelo da radi)"
 
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:413
 msgid "quitting Mail Notification"
 msgstr "Gasim dojavu pošte"
 
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:417
 msgid "Mail Notification is not running"
 msgstr "Program za dojavu pošte nije pokrenut."
 
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:432
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Nije moguće pokrenuti biblioteku GnomeVFS."
 
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr "Došlo je do greške pri pokretanju programa za dojavu pošte"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr "Biblioteka za dojavu ne može da se pokrene. Iskačući prozori sa porukama neće biti prikazivani."
+
+#: ../src/mn-main.c:481
 msgid "updating the mail status"
 msgstr "Proveravam poštu"
 
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:497
 msgid "Mail Notification is already running"
 msgstr "Program za dojavu pošte je već pokrenut."
 
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:514
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1106,77 +1074,85 @@ msgstr ""
 "Bonobo nije mogao da pronađe datoteku %s. Molimo proverite podešavanja Dojave "
 "pošte."
 
-#: ../src/mn-mbox-mailbox-backend.gob:281
-#, c-format
-msgid "unable to close file: %s"
-msgstr "nije moguće zatvoriti datoteku: %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "nije moguće otvoriti sanduče: %s"
-
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:168
 msgid "unable to parse MIME message"
 msgstr "nije moguće obraditi MIME poruku"
 
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:144
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "nijedno"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "zamena nema kraj"
+
+#: ../src/mn-message.gob:246
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "nepoznata zamena „%s?"
+
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "prazna zamena"
+
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Nije moguće izvršiti „%s?: %s."
 
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-mh-mailbox-backend.gob:170
 #, c-format
 msgid "error while reading %s: %s"
 msgstr "greška pri čitanju %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:183
 #, c-format
 msgid "unable to open %s: %s"
 msgstr "nije moguće otvoriti %s: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "_standard"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "_Standard"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
-msgstr "ugrađeni SSL/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
+msgstr "Ugra_đeni SSL/TLS"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
-msgstr "SSL/TLS na posebnom portu"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
+msgstr "SSL/TLS na _posebnom portu"
 
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
-msgstr "_Računar:"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Server:"
 
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Detalji"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Vrsta veze"
 
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "Vrsta veze:"
-
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "_Način prijave:"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Prijava"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mehanizam:"
 
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Veza"
+
+#: ../src/mn-pi-mailbox.gob:153
 msgid "SSL/TLS support has not been compiled in"
 msgstr "Podrška za SSL/TLS nije ugrađena"
 
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:319
 #, c-format
 msgid ""
 "Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1189,18 +1165,18 @@ msgstr ""
 "\n"
 "Molim unesite ponovo lozinku."
 
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:320
 #, c-format
 msgid "Enter your credentials for %s mailbox %s."
 msgstr "Unesite lozinku za %s sanduče %s."
 
 #. keep the title in sync with gnome-authentication-manager
 #. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:363
 msgid "Authentication Required"
 msgstr "Potrebna je prijava"
 
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "parametri za mogućnost LOGIN-DELAY nisu ispravno postavljeni"
 
@@ -1210,7 +1186,7 @@ msgstr "parametri za mogućnost LOGIN-DELAY nisu ispravno postavljeni"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:485
+#: ../src/mn-pop3-mailbox.gob:486
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
@@ -1218,11 +1194,11 @@ msgstr ""
 "SASL autentifikacija sa početnim klijentskim odgovorom nije uspela, "
 "pokušavam ponovo bez početnog klijentskog odgovora"
 
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
 msgid "unknown error"
 msgstr "nepoznata greška"
 
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1230,44 +1206,92 @@ msgstr[0] "tražen je zastoj pri prijavi, pauziram %i sekundu"
 msgstr[1] "tražen je zastoj pri prijavi, pauziram %i sekunde"
 msgstr[2] "tražen je zastoj pri prijavi, pauziram %i sekundi"
 
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:966
 msgid "server does not support APOP authentication"
 msgstr "server ne podržava prijavu korišćenjem mehanizma APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1022
 msgid "falling back to APOP authentication"
 msgstr "prelazim na  APOP prijavu"
 
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1027
 msgid "falling back to USER/PASS authentication"
 msgstr "prelazim na prijavu pomoću imena i lozinke"
 
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Sanduče:"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Nečitljiva poruka:"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "Šalje:"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Tema:"
+
 #. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Postavke za dojavu"
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Otvori"
 
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "gore-levo"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Označi kao pročitano"
 
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "gore-desno"
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Označi kao nepoželjno"
 
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "dole-levo"
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Nije moguće otvoriti poruku"
 
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "dole-desno"
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Nije moguće poruku označiti kao pročitanu"
 
-#: ../src/mn-properties-dialog.gob:332
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Nije moguće označiti poruku kao neželjenu"
+
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "nije moguće prikazati iskačući prozor: %s"
+
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "nije moguće zatvoriti iskačući prozor: %s"
+
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Nova poruka"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Postavke za dojavu pošte"
+
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "_Poruke za primer"
+
+#: ../src/mn-properties-dialog.gob:276
 msgid "No mailbox selected."
 msgstr "Nijedno sanduče nije izabrano."
 
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
@@ -1275,169 +1299,194 @@ msgstr[0] "Izabrano %i sanduče"
 msgstr[1] "Izabrana %i sandučeta"
 msgstr[2] "Izabrano %i sandučeta"
 
-#: ../src/mn-properties-dialog.gob:456
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Čitač pošte nije podešen"
+
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
+msgstr "Možete da podesite čitač pošte izborom <b>Sistem → Postavke → Omiljeni programi</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Nije moguće otvoriti poslednju poruku"
+
+#: ../src/mn-shell.gob:237
 #, c-format
-msgid "Test message #%i"
-msgstr "Tekst poruke #%i"
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Poruke iz sandučeta „%s? ne mogu da se otvore."
 
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
-msgstr "Dijalog za postavke Dojave pošte"
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Nema novih poruka."
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
 msgid "Mailboxes Having New Mail"
 msgstr "Sandučići sa novom poštom"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
 msgid "Errors"
 msgstr "Greške"
 
 #. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
 msgid "Mail Summary"
 msgstr "Sažetak poruka"
 
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "Nema novih poruka."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
 msgid "unknown SSL/TLS error"
 msgstr "nepoznata greška sa SSL/TLS"
 
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "Nečitljiva poruka:"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "Šalje:"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Tema:"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
 msgid "Sent:"
 msgstr "Poslato:"
 
 #. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
 #. translators: header capitalization
 #. translators: header capitalization
-#: ../src/mn-stock.c:32
+#: ../src/mn-stock.c:33
 msgid "Co_nnect"
 msgstr "_Poveži se"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "nije moguće otvoriti fasciklu: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "nije moguće zatvoriti fasciklu: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "greška pri čitanju fasciklu: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
 msgid "unexpected end of file"
 msgstr "neočekivani kraj datoteke"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
 #, c-format
 msgid "incompatible file version \"%i\""
 msgstr "izdanje datoteke nije saglasno „%i“"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
 msgid "file version missing"
 msgstr "nedostaje izdanje datoteke"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Nije moguće pročitati %s: %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
 msgid "System mailbox"
 msgstr "Sistemsko sanduče"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
 #, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
 msgstr "Vaše sistemsko sanduče je <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
 msgstr "Mesto sistemskog sandučeta nije pronađeno. Proverite promenljivu MAIL."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
 msgid "system mailbox not found"
 msgstr "sistemsko sanduče nije pronađeno"
 
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Probno sanduče"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Tekst poruke #%i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr "Dijalog za postavke Dojave pošte"
+
+#: ../src/mn-util.c:350
 #, c-format
 msgid "error loading image: %s"
 msgstr "greška pri učitavanju slike: %s"
 
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:366
 #, c-format
 msgid ""
 "Unable to load interface \"%s\". Please check your Mail Notification "
 "installation."
-msgstr "Nije moguće učitati sučelje „%s?. Molimo proverite instalaciju Dojave pošte."
+msgstr ""
+"Nije moguće učitati sučelje „%s?. Molimo proverite instalaciju Dojave pošte."
 
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:381
 #, c-format
 msgid ""
 "Widget \"%s\" not found in interface \"%s\". Please check your Mail "
 "Notification installation."
-msgstr "Komponenta „%s? nije pronađena u sučelju „%s?. Molimo proverite instalaciju Dojave pošte."
+msgstr ""
+"Komponenta „%s? nije pronađena u sučelju „%s?. Molimo proverite instalaciju "
+"Dojave pošte."
 
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:450
 #, c-format
 msgid "Unable to open self as a module (%s)."
 msgstr "nije moguće otvoriti sebe kao modul (%s)."
 
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:455
 #, c-format
 msgid ""
 "Signal handler \"%s\" not found. Please check your Mail Notification "
 "installation."
-msgstr "Obrađivač signala „%s? nije pronađen. Molimo proverite instalaciju Dojave pošte."
+msgstr ""
+"Obrađivač signala „%s? nije pronađen. Molimo proverite instalaciju Dojave "
+"pošte."
 
-#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
 msgid "A drag and drop error has occurred"
 msgstr "Došlo je do greške pri prevlačenju/puštanju"
 
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:607
 msgid "An invalid location list has been received."
 msgstr "Primljen je nevažeći spisak mesta."
 
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:650
 msgid "An invalid Mozilla location has been received."
 msgstr "Primljen je nevažeći Mozilin spisak mesta."
 
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:726
 msgid "Unable to display help"
 msgstr "Nije moguće prikazati pomoć"
 
-#: ../src/mn-util.c:739
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "nije moguće otvoriti vezu"
+
+#: ../src/mn-util.c:752
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Nije moguće pokrenuti nit: %s."
 
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:929
 #, c-format
 msgid ""
 "The following location is invalid:\n"
@@ -1460,16 +1509,16 @@ msgstr[2] ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:945
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Došlo je do kobne greške u programu za dojavu pošte"
 
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:989
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "nije moguće dobaviti trenutno vreme: %s"
 
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1304
 #, c-format
 msgid "%i second ago"
 msgid_plural "%i seconds ago"
@@ -1477,7 +1526,7 @@ msgstr[0] "pre %i sekundu"
 msgstr[1] "pre %i sekunde"
 msgstr[2] "pre %i sekundi"
 
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1308
 #, c-format
 msgid "about %i minute ago"
 msgid_plural "about %i minutes ago"
@@ -1485,7 +1534,7 @@ msgstr[0] "pre oko %i minut"
 msgstr[1] "pre oko %i minuta"
 msgstr[2] "pre oko %i minuta"
 
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1313
 #, c-format
 msgid "about %i hour ago"
 msgid_plural "about %i hours ago"
@@ -1493,7 +1542,7 @@ msgstr[0] "pre oko %i sat"
 msgstr[1] "pre oko %i sata"
 msgstr[2] "pre oko %i sati"
 
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1318
 #, c-format
 msgid "about %i day ago"
 msgid_plural "about %i days ago"
@@ -1501,7 +1550,7 @@ msgstr[0] "pre oko %i dan"
 msgstr[1] "pre oko %i dana"
 msgstr[2] "pre oko %i dana"
 
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1323
 #, c-format
 msgid "about %i week ago"
 msgid_plural "about %i weeks ago"
@@ -1509,57 +1558,79 @@ msgstr[0] "pre oko %i nedelju"
 msgstr[1] "pre oko %i nedelje"
 msgstr[2] "pre oko %i nedelja"
 
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1336
 msgid "unknown date"
 msgstr "nepoznat datum"
 
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Došlo je do greške u komandama"
+
+#: ../src/mn-vfs-mailbox.gob:228
 #, c-format
 msgid "unable to monitor %s (%s), poll mode activated"
 msgstr "nije moguće nadgledati %s (%s), upiti su aktivirani"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "unknown mailbox format"
 msgstr "format sandučeta nije prepoznat"
 
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
 msgid "does not exist"
 msgstr "ne postoji"
 
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Nije moguće upisati %s: %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr "osobina „%s“: nije moguće prebaciti nisku „%s“ u vrednost vrste „%s“"
+
 #. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
 msgid "<span weight=\"bold\">General</span>"
 msgstr "<span weight=\"bold\">Opšte</span>"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "_Pauza između provera pošte:"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Opšte"
 
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
 msgid "Mailbox _name:"
 msgstr "_Ime sandučeta:"
 
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "_Vrsta sandučeta:"
+
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
-msgstr "_Koristi podrazumevano"
+msgid "Us_e Default"
+msgstr "_Koristi izvorno"
 
 #: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "_Vrsta sandučeta:"
+msgid "_Delay between mail checks:"
+msgstr "_Pauza između provera pošte:"
 
 #. translators: header capitalization
 #: ../ui/mailbox-properties-dialog.glade.h:9
 msgid "_Use Default"
-msgstr "_Koristi podrazumevano"
+msgstr "_Koristi izvorno"
 
 #: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
 msgid "minutes"
 msgstr "minuta"
 
 #: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
 msgid "seconds"
 msgstr "sekundi"
 
@@ -1575,144 +1646,266 @@ msgstr "<span weight=\"bold\">Naredbe</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Pisma</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Isticanje</span>"
 
 #. translators: header capitalization
 #: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Izgled</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">Sandučići</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Mesto</span>"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
 msgstr "<span weight=\"bold\">Sažetak poruka u oblačiću</span>"
 
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "_Sadržaj:"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Opšte"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "_Posle:"
 
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Sa_krij prethodno prikazane poruke"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "_Horizontalni pomak:"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "U stogu _iskačućih poruka"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
-msgstr "Sažetak poruka"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
+msgstr "Iskačuće poruke"
 
 #. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
 msgid "Status Icon"
 msgstr "Statusna sličica"
 
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "Koristi ova _pisma:"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
 msgid "When _new mail arrives:"
 msgstr "Kada _stigne nova pošta:"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
 msgid "When all mail has _been read:"
 msgstr "Kada je _sva pošta pročitana:"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
 msgid "_Always display"
 msgstr "_Uvek prikazuj"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "_Automatski zatvori posle:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "_Prikačene za statusnu sličicu"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
 msgid "_Blink on errors"
 msgstr "_Treperi pri greškama"
 
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "Prikaži probno prozorče"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "_Izvorno za radni prostor"
 
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
 msgid "_Display seen mail"
 msgstr "_Prikaži pregledane poruke"
 
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
 msgid "_Display this dialog"
 msgstr "Pri_kaži ovaj prozor"
 
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
-msgstr "Dozvoli prikaz sažetka poruka"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
+msgstr "_Dozvoli iskačuće prozore"
 
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
 msgid "_Launch the mail reader"
 msgstr "P_okreni čitač pošte"
 
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
 msgid "_None"
 msgstr "_Nijedno"
 
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Mesto:"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "_Naslov:"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Otvori poslednju poruku"
 
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
 msgid "_Update the mail status"
 msgstr "_Osveži podatke o pošti"
 
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "Koristi pisma iz _teme"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "_Vertikalni pomak:"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
 msgid "icon tooltip's mail summary layout|Co_mpact"
 msgstr "_Skraćen"
 
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
 msgid "icon tooltip's mail summary layout|_Standard"
 msgstr "_Običan"
 
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "tačaka"
+#~ msgid "Automatically close the mail summary popup"
+#~ msgstr "Automatski zatvori prozor sa sažetkom poruka"
+
+#~ msgid "Mail summary popup contents font"
+#~ msgstr "Pismo koje se koristi za sadržaj prozora sa sažetkom poruka"
+
+#~ msgid "Mail summary popup fonts aspect source"
+#~ msgstr "Izvor za aspekt za pismo u prozoru za sažetak (???)"
+
+#~ msgid "Mail summary popup horizontal offset"
+#~ msgstr "Pomeraj horizontalnih tačaka za prozor sa sažetkom poruka"
+
+#~ msgid "Mail summary popup title font"
+#~ msgstr "Pismo koje se koristi za naslov prozora sa sažetkom poruka"
+
+#~ msgid "Mail summary popup vertical offset"
+#~ msgstr "Pomeraj vertikalnih tačaka ѕa prozor sa sažetkom poruka"
+
+#~ msgid "Only display recent mail in mail summary popup"
+#~ msgstr "Prikaži samo skoro prispele poruke u sažetku"
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (minutes "
+#~ "part)."
+#~ msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (minuti)."
+
+#~ msgid ""
+#~ "The amount of time to wait before closing the mail summary popup (seconds "
+#~ "part)."
+#~ msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (sekunde)."
+
+#~ msgid "The custom font to use for the contents of the mail summary popup."
+#~ msgstr ""
+#~ "Posebno pismo koje se koristi za ispis sadržaja prozora sa sažetkom "
+#~ "poruka."
+
+#~ msgid "The custom font to use for the title of the mail summary popup."
+#~ msgstr ""
+#~ "Posebno pismo koje se koristi za ispis naslova prozora sa sažetkom poruka."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the left or right side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Broj tačaka koje treba ostaviti između leve, odn. desne strane ekrana i "
+#~ "prozora sa sažetkom poruka."
+
+#~ msgid ""
+#~ "The number of pixels to leave between the top or bottom side of the "
+#~ "screen and the mail summary popup."
+#~ msgstr ""
+#~ "Broj tačaka koje treba ostaviti između vrha, odn. dna ekrana i prozora sa "
+#~ "sažetkom poruka."
+
+#~ msgid ""
+#~ "The position of the mail summary popup. Must be \"top-left\", \"top-right"
+#~ "\", \"bottom-left\" or \"bottom-right\"."
+#~ msgstr ""
+#~ "Položaj prozora sa sažetkom poruka. Može biti: ?gore-levo?, ?gore-"
+#~ "desno?, ?dole-levo? ili ?dole-desno?."
+
+#~ msgid "Whether to automatically close the mail summary popup or not."
+#~ msgstr ""
+#~ "Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
+
+#~ msgid ""
+#~ "Whether to display the mail summary popup when new mail arrives or not."
+#~ msgstr "Da li treba prikazati sažetak poruka kada stigne nova pošta."
+
+#~ msgid ""
+#~ "Whether to hide previously displayed mail in the mail summary popup or "
+#~ "not."
+#~ msgstr ""
+#~ "Da li iz sažetka treba ukloniti poruke koje su se u njemu već pre pojavile."
+
+#~ msgid "<span style=\"italic\">autodetect</span>"
+#~ msgstr "<span style=\"italic\">sam pronađi</span>"
+
+#~ msgid "Use the <span style=\"italic\">IDLE</span> extension:"
+#~ msgstr "Koristi <span style=\"italic\">IDLE</span> produžetak:"
+
+#~ msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span weight=\"bold\">Sažetak poruka</span>"
+
+#~ msgid "<span weight=\"bold\">Mail Summary</span>"
+#~ msgstr "<span weight=\"bold\">Sažetak poruka</span>"
+
+#~ msgid "Close the mail summary popup"
+#~ msgstr "Zatvori prozor sa sažetkom poruka"
+
+#~ msgid "none"
+#~ msgstr "nijedno"
+
+#~ msgid "Ho_stname:"
+#~ msgstr "_Računar:"
+
+#~ msgid "_Details"
+#~ msgstr "_Detalji"
+
+#~ msgid "Authent_ication mechanism:"
+#~ msgstr "_Način prijave:"
+
+#~ msgid "top left"
+#~ msgstr "gore-levo"
+
+#~ msgid "top right"
+#~ msgstr "gore-desno"
+
+#~ msgid "bottom left"
+#~ msgstr "dole-levo"
+
+#~ msgid "bottom right"
+#~ msgstr "dole-desno"
+
+#~ msgid "Use De_fault"
+#~ msgstr "_Koristi podrazumevano"
+
+#~ msgid "<span weight=\"bold\">Fonts</span>"
+#~ msgstr "<span weight=\"bold\">Pisma</span>"
 
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "S_kraćen"
+#~ msgid "<span weight=\"bold\">Layout</span>"
+#~ msgstr "<span weight=\"bold\">Izgled</span>"
 
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "O_bičan"
+#~ msgid "Co_ntents:"
+#~ msgstr "_Sadržaj:"
+
+#~ msgid "Hide p_reviously displayed mail"
+#~ msgstr "Sa_krij prethodno prikazane poruke"
+
+#~ msgid "Hori_zontal offset:"
+#~ msgstr "_Horizontalni pomak:"
+
+#~ msgid "Mail Summary Popup"
+#~ msgstr "Sažetak poruka"
+
+#~ msgid "Use these _fonts:"
+#~ msgstr "Koristi ova _pisma:"
+
+#~ msgid "_Automatically close after:"
+#~ msgstr "_Automatski zatvori posle:"
+
+#~ msgid "_Display a Test Popup"
+#~ msgstr "Prikaži probno prozorče"
+
+#~ msgid "_Position:"
+#~ msgstr "_Mesto:"
+
+#~ msgid "_Title:"
+#~ msgstr "_Naslov:"
+
+#~ msgid "_Use fonts from theme"
+#~ msgstr "Koristi pisma iz _teme"
+
+#~ msgid "_Vertical offset:"
+#~ msgstr "_Vertikalni pomak:"
+
+#~ msgid "pixels"
+#~ msgstr "tačaka"
+
+#~ msgid "popup's mail summary layout|Co_mpact"
+#~ msgstr "S_kraćen"
+
+#~ msgid "popup's mail summary layout|_Standard"
+#~ msgstr "O_bičan"
 
 #~ msgid "Delay between mail checks (minutes part)."
 #~ msgstr "Razmak između dve provere (minuti)"
@@ -1732,9 +1925,6 @@ msgstr "O_bičan"
 #~ msgid "Height of main window"
 #~ msgstr "Visina glavnog prozora"
 
-#~ msgid "Mail reader command"
-#~ msgstr "Komanda za čitanje pošte"
-
 #~ msgid "Minutes between mail checks"
 #~ msgstr "Minuta između dve provere"
 
@@ -1791,9 +1981,6 @@ msgstr "O_bičan"
 #~ "displayed or not."
 #~ msgstr "Da li treba ili ne treba sprečiti pojavu prozora sa opisom grešaka."
 
-#~ msgid "Whether to set a mail reader or not."
-#~ msgstr "Da li treba postaviti čitač pošte ili ne."
-
 #~ msgid "Width of edit toolbars dialog"
 #~ msgstr "Širina prozora za uređivanje statusnih traka"
 
@@ -1863,9 +2050,6 @@ msgstr "O_bičan"
 #~ msgid "Display help"
 #~ msgstr "Prikaži pomoć"
 
-#~ msgid "_About"
-#~ msgstr "_O programu"
-
 #~ msgid "Display credits"
 #~ msgstr "Prikaži zasluge"
 
@@ -1878,9 +2062,6 @@ msgstr "O_bičan"
 #~ msgid "Show or hide the statusbar"
 #~ msgstr "Prikaži ili ukloni statusnu traku"
 
-#~ msgid "_Desktop Default"
-#~ msgstr "_Podrazumevano u okruženju"
-
 #~ msgid "Set the toolbars style to the desktop default setting"
 #~ msgstr "Postavi stilove traka na stil koji važi u celom radnom okruženju"
 
@@ -1891,7 +2072,7 @@ msgstr "O_bičan"
 #~ msgstr "Samo _tekst"
 
 #~ msgid "Only display the toolbars text"
-#~ msgstr "Prikaži samo tekst u alatnoj traci"
+#~ msgstr "Prika�i samo tekst u alatnoj traci"
 
 #~ msgid "Text Belo_w Icons"
 #~ msgstr "Tekst _ispod slika"
@@ -1911,12 +2092,6 @@ msgstr "O_bičan"
 #~ msgid "unable to load toolbars.xml"
 #~ msgstr "nije moguće učitati toolbars.xml: %s"
 
-#~ msgid "%i new message"
-#~ msgid_plural "%i new messages"
-#~ msgstr[0] "%i nova poruka"
-#~ msgstr[1] "%i nove poruke"
-#~ msgstr[2] "%i novih poruka"
-
 #~ msgid "Compiled-in mailbox backends: "
 #~ msgstr "Ugrađene mogućnosti za sandučiće:"
 
@@ -2261,9 +2436,6 @@ msgstr "O_bičan"
 #~ msgid "received an invalid Mozilla URL"
 #~ msgstr "primljen je neispravan Mozilin URL"
 
-#~ msgid "_Authenticate"
-#~ msgstr "Prijavi se"
-
 #~ msgid "The amount of time to wait before closing the mail summary popup"
 #~ msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka"
 
@@ -2472,3 +2644,4 @@ msgstr "O_bičan"
 
 #~ msgid "Whether to run a command when the icon is double-clicked or not"
 #~ msgstr "Da li se pokreće komanda pri dvostrukom kliku ili ne"
+
diff --git a/src/GNOME_MailNotification.idl b/src/GNOME_MailNotification.idl
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -19,11 +19,11 @@
 
 #include <Bonobo.idl>
 
-module GNOME 
+module GNOME
 {
   module MailNotification
   {
-    interface Automation : Bonobo::Unknown 
+    interface Automation : Bonobo::Unknown
     {
       boolean hasMailboxes ();
       string getSummary ();
diff --git a/src/GNOME_MailNotification_Evolution.idl b/src/GNOME_MailNotification_Evolution.idl
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -55,7 +55,7 @@ module GNOME
 	void setMessageFlags (in string folder_uri,
 			      in string message_uid,
 			      in unsigned long flags)
-	  raises (FolderNotFound);
+	  raises (FolderNotFound, MessageNotFound);
       };
     };
   };
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -10,7 +10,6 @@ mail_notification_CPPFLAGS += -DSYSCONFDIR="\"$(sysconfdir)\""
 mail_notification_CPPFLAGS += -DDATADIR="\"$(datadir)\""
 mail_notification_CPPFLAGS += -DLIBDIR="\"$(libdir)\""
 mail_notification_CPPFLAGS += -DGNOMELOCALEDIR="\"$(datadir)/locale\""
-mail_notification_CPPFLAGS += -DGNOMEPIXMAPSDIR="\"$(datadir)/pixmaps\""
 mail_notification_CPPFLAGS += -DUIDIR="\"$(pkgdatadir)/ui\""
 mail_notification_LDFLAGS = -export-dynamic
 mail_notification_LDFLAGS += $(INTLLIBS)
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -881,7 +881,6 @@ mail_notification_CPPFLAGS = $(WARN_CFLAGS) $(DEBUG_CFLAGS) \
 	-DPREFIX="\"$(prefix)\"" -DSYSCONFDIR="\"$(sysconfdir)\"" \
 	-DDATADIR="\"$(datadir)\"" -DLIBDIR="\"$(libdir)\"" \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
-	-DGNOMEPIXMAPSDIR="\"$(datadir)/pixmaps\"" \
 	-DUIDIR="\"$(pkgdatadir)/ui\"" $(GNOME_CFLAGS) \
 	$(am__append_40) $(am__append_45) $(am__append_48) \
 	$(am__append_51)
diff --git a/src/eggtrayicon.c b/src/eggtrayicon.c
@@ -244,7 +244,7 @@ egg_tray_icon_manager_filter (GdkXEvent *xevent, GdkEvent *event, gpointer user_
   return GDK_FILTER_CONTINUE;
 }
 
-#endif  
+#endif
 
 static void
 egg_tray_icon_unrealize (GtkWidget *widget)
@@ -542,7 +542,7 @@ egg_tray_icon_cancel_message (EggTrayIcon *icon,
 {
   g_return_if_fail (EGG_IS_TRAY_ICON (icon));
   g_return_if_fail (id > 0);
-#ifdef GDK_WINDOWING_X11  
+#ifdef GDK_WINDOWING_X11
   egg_tray_icon_send_manager_message (icon, SYSTEM_TRAY_CANCEL_MESSAGE,
 				      (Window)gtk_plug_get_id (GTK_PLUG (icon)),
 				      id, 0, 0);
diff --git a/src/mn-about-dialog.gob b/src/mn-about-dialog.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-auth-combo-box.c b/src/mn-auth-combo-box.c
@@ -32,7 +32,7 @@
 #endif /* WITH_SASL */
 #include "mn-util.h"
 
-enum 
+enum
 {
   COLUMN_MECHANISM,
   COLUMN_LABEL,
diff --git a/src/mn-auth-combo-box.gob b/src/mn-auth-combo-box.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -32,7 +32,7 @@ requires 2.0.14
 #endif /* WITH_SASL */
 #include "mn-util.h"
 
-enum 
+enum
 {
   COLUMN_MECHANISM,
   COLUMN_LABEL,
diff --git a/src/mn-authenticated-mailbox-properties.gob b/src/mn-authenticated-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-authenticated-mailbox.gob b/src/mn-authenticated-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-autodetect-mailbox-properties.gob b/src/mn-autodetect-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-automation.gob b/src/mn-automation.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-base-mbox-mailbox-backend.gob b/src/mn-base-mbox-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-blinking-image.gob b/src/mn-blinking-image.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-bonobo-unknown.c b/src/mn-bonobo-unknown.c
@@ -348,7 +348,7 @@ ___4_mn_bonobo_unknown_dispose (GObject * object G_GNUC_UNUSED)
 	
     Self *self = SELF(object);
 
-    mn_locked_g_source_remove(selfp->monitor_source);
+    mn_locked_g_source_clear(&selfp->monitor_source);
 
     PARENT_HANDLER(object);
   }}
diff --git a/src/mn-bonobo-unknown.gob b/src/mn-bonobo-unknown.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * MN:Bonobo:Unknown - a Bonobo_Unknown wrapper providing connection
  * monitoring.
  *
@@ -76,7 +76,7 @@ class MN:Bonobo:Unknown from G:Object
   {
     Self *self = SELF(object);
 
-    mn_locked_g_source_remove(selfp->monitor_source);
+    mn_locked_g_source_clear(&selfp->monitor_source);
 
     PARENT_HANDLER(object);
   }
diff --git a/src/mn-client-session.c b/src/mn-client-session.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * mn-client-session.c - a state machine for handling POP3 and IMAP
  * client sessions.
  *
diff --git a/src/mn-client-session.h b/src/mn-client-session.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-compact-message-view.gob b/src/mn-compact-message-view.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-conf.c b/src/mn-conf.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-conf.h b/src/mn-conf.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-custom-vfs-mailbox.gob b/src/mn-custom-vfs-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-dialog.gob b/src/mn-dialog.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-folder-tree-control.gob b/src/mn-evolution-folder-tree-control.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-glue-client.c b/src/mn-evolution-glue-client.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-glue-client.h b/src/mn-evolution-glue-client.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-glue.c b/src/mn-evolution-glue.c
@@ -35,7 +35,16 @@
 
 GSList *mn_evolution_glues = NULL;
 
-#line 39 "mn-evolution-glue.c"
+/* see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=208774 */
+static GHashTable *folders = NULL;
+
+typedef struct
+{
+  char		*uri;
+  CamelFolder	*folder;
+} FolderInfo;
+
+#line 48 "mn-evolution-glue.c"
 /* self casting macros */
 #define SELF(x) MN_EVOLUTION_GLUE(x)
 #define SELF_CONST(x) MN_EVOLUTION_GLUE_CONST(x)
@@ -55,6 +64,9 @@ static void mn_evolution_glue_class_init (MNEvolutionGlueClass * c) G_GNUC_UNUSE
 static GObject * ___1_mn_evolution_glue_constructor (GType type, unsigned int n_construct_properties, GObjectConstructParam * construct_params) G_GNUC_UNUSED;
 static void ___2_mn_evolution_glue_finalize (GObject * object) G_GNUC_UNUSED;
 static CORBA_char * mn_evolution_glue_CORBA_string_dup_null (const CORBA_char * str) G_GNUC_UNUSED;
+static void mn_evolution_glue_cache_folder (const char * uri, CamelFolder * folder) G_GNUC_UNUSED;
+static void mn_evolution_glue_folder_info_free (FolderInfo * info) G_GNUC_UNUSED;
+static void mn_evolution_glue_folder_deleted_cb (CamelObject * object, gpointer event_data, gpointer user_data) G_GNUC_UNUSED;
 static CamelFolder * mn_evolution_glue_lookup_folder (const char * uri, CORBA_Environment * env) G_GNUC_UNUSED;
 static GNOME_MailNotification_Evolution_MessageSeq * mn_evolution_glue_getUnseenMessages (PortableServer_Servant servant, const CORBA_char * folder_uri, CORBA_Environment * env) G_GNUC_UNUSED;
 static CORBA_string mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_char * folder_uri, CORBA_Environment * env) G_GNUC_UNUSED;
@@ -66,12 +78,16 @@ static BonoboObjectClass *parent_class = NULL;
 
 /* Short form macros */
 #define self_CORBA_string_dup_null mn_evolution_glue_CORBA_string_dup_null
+#define self_cache_folder mn_evolution_glue_cache_folder
+#define self_folder_info_free mn_evolution_glue_folder_info_free
+#define self_folder_deleted_cb mn_evolution_glue_folder_deleted_cb
 #define self_lookup_folder mn_evolution_glue_lookup_folder
 #define self_getUnseenMessages mn_evolution_glue_getUnseenMessages
 #define self_getFolderName mn_evolution_glue_getFolderName
 #define self_openMessage mn_evolution_glue_openMessage
 #define self_setMessageFlags mn_evolution_glue_setMessageFlags
 #define self_factory_cb mn_evolution_glue_factory_cb
+#define self_global_cleanup mn_evolution_glue_global_cleanup
 GType
 mn_evolution_glue_get_type (void)
 {
@@ -132,29 +148,29 @@ mn_evolution_glue_class_init (MNEvolutionGlueClass * c G_GNUC_UNUSED)
 
 	parent_class = g_type_class_ref (BONOBO_TYPE_OBJECT);
 
-#line 48 "mn-evolution-glue.gob"
+#line 57 "mn-evolution-glue.gob"
 	g_object_class->constructor = ___1_mn_evolution_glue_constructor;
-#line 69 "mn-evolution-glue.gob"
+#line 78 "mn-evolution-glue.gob"
 	g_object_class->finalize = ___2_mn_evolution_glue_finalize;
-#line 140 "mn-evolution-glue.c"
-#line 99 "mn-evolution-glue.gob"
+#line 156 "mn-evolution-glue.c"
+#line 165 "mn-evolution-glue.gob"
 	c->_epv.getUnseenMessages = self_getUnseenMessages;
-#line 167 "mn-evolution-glue.gob"
+#line 233 "mn-evolution-glue.gob"
 	c->_epv.getFolderName = self_getFolderName;
-#line 185 "mn-evolution-glue.gob"
+#line 251 "mn-evolution-glue.gob"
 	c->_epv.openMessage = self_openMessage;
-#line 210 "mn-evolution-glue.gob"
+#line 276 "mn-evolution-glue.gob"
 	c->_epv.setMessageFlags = self_setMessageFlags;
-#line 149 "mn-evolution-glue.c"
+#line 165 "mn-evolution-glue.c"
 }
 #undef __GOB_FUNCTION__
 
 
 
-#line 48 "mn-evolution-glue.gob"
+#line 57 "mn-evolution-glue.gob"
 static GObject * 
 ___1_mn_evolution_glue_constructor (GType type G_GNUC_UNUSED, unsigned int n_construct_properties, GObjectConstructParam * construct_params)
-#line 158 "mn-evolution-glue.c"
+#line 174 "mn-evolution-glue.c"
 #define PARENT_HANDLER(___type,___n_construct_properties,___construct_params) \
 	((G_OBJECT_CLASS(parent_class)->constructor)? \
 		(* G_OBJECT_CLASS(parent_class)->constructor)(___type,___n_construct_properties,___construct_params): \
@@ -162,7 +178,7 @@ ___1_mn_evolution_glue_constructor (GType type G_GNUC_UNUSED, unsigned int n_con
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::constructor"
 {
-#line 50 "mn-evolution-glue.gob"
+#line 59 "mn-evolution-glue.gob"
 	
     GObject *object;
     Self *self;
@@ -181,75 +197,161 @@ ___1_mn_evolution_glue_constructor (GType type G_GNUC_UNUSED, unsigned int n_con
 
     return object;
   }}
-#line 185 "mn-evolution-glue.c"
+#line 201 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
 
-#line 69 "mn-evolution-glue.gob"
+#line 78 "mn-evolution-glue.gob"
 static void 
 ___2_mn_evolution_glue_finalize (GObject * object G_GNUC_UNUSED)
-#line 192 "mn-evolution-glue.c"
+#line 208 "mn-evolution-glue.c"
 #define PARENT_HANDLER(___object) \
 	{ if(G_OBJECT_CLASS(parent_class)->finalize) \
 		(* G_OBJECT_CLASS(parent_class)->finalize)(___object); }
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::finalize"
 {
-#line 71 "mn-evolution-glue.gob"
+#line 80 "mn-evolution-glue.gob"
 	
     mn_evolution_glues = g_slist_remove(mn_evolution_glues, object);
 
     PARENT_HANDLER(object);
   }}
-#line 205 "mn-evolution-glue.c"
+#line 221 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
 
-#line 81 "mn-evolution-glue.gob"
+#line 90 "mn-evolution-glue.gob"
 static CORBA_char * 
 mn_evolution_glue_CORBA_string_dup_null (const CORBA_char * str)
-#line 212 "mn-evolution-glue.c"
+#line 228 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::CORBA_string_dup_null"
 {
-#line 83 "mn-evolution-glue.gob"
+#line 92 "mn-evolution-glue.gob"
 	
     return CORBA_string_dup(str ? str : "");
   }}
-#line 220 "mn-evolution-glue.c"
+#line 236 "mn-evolution-glue.c"
+#undef __GOB_FUNCTION__
+
+#line 96 "mn-evolution-glue.gob"
+static void 
+mn_evolution_glue_cache_folder (const char * uri, CamelFolder * folder)
+#line 242 "mn-evolution-glue.c"
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Glue::cache_folder"
+#line 96 "mn-evolution-glue.gob"
+	g_return_if_fail (uri != NULL);
+#line 96 "mn-evolution-glue.gob"
+	g_return_if_fail (folder != NULL);
+#line 249 "mn-evolution-glue.c"
+{
+#line 99 "mn-evolution-glue.gob"
+	
+    FolderInfo *info;
+
+    info = g_new0(FolderInfo, 1);
+    info->uri = g_strdup(uri);
+    info->folder = folder;
+    camel_object_ref(folder);
+
+    /* uncache the folder when it is deleted */
+    camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info);
+
+    g_hash_table_replace(folders, info->uri, info);
+  }}
+#line 265 "mn-evolution-glue.c"
+#undef __GOB_FUNCTION__
+
+#line 113 "mn-evolution-glue.gob"
+static void 
+mn_evolution_glue_folder_info_free (FolderInfo * info)
+#line 271 "mn-evolution-glue.c"
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Glue::folder_info_free"
+#line 113 "mn-evolution-glue.gob"
+	g_return_if_fail (info != NULL);
+#line 276 "mn-evolution-glue.c"
+{
+#line 115 "mn-evolution-glue.gob"
+	
+    camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info);
+    camel_object_unref(info->folder);
+    g_free(info->uri);
+    g_free(info);
+  }}
+#line 285 "mn-evolution-glue.c"
+#undef __GOB_FUNCTION__
+
+#line 122 "mn-evolution-glue.gob"
+static void 
+mn_evolution_glue_folder_deleted_cb (CamelObject * object, gpointer event_data, gpointer user_data)
+#line 291 "mn-evolution-glue.c"
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Glue::folder_deleted_cb"
+{
+#line 126 "mn-evolution-glue.gob"
+	
+    FolderInfo *info = user_data;
+    gboolean status;
+
+    status = g_hash_table_remove(folders, info->uri);
+    g_assert(status == TRUE);
+  }}
+#line 303 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 87 "mn-evolution-glue.gob"
+#line 134 "mn-evolution-glue.gob"
 static CamelFolder * 
 mn_evolution_glue_lookup_folder (const char * uri, CORBA_Environment * env)
-#line 226 "mn-evolution-glue.c"
+#line 309 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::lookup_folder"
-#line 87 "mn-evolution-glue.gob"
+#line 134 "mn-evolution-glue.gob"
 	g_return_val_if_fail (uri != NULL, (CamelFolder * )0);
-#line 231 "mn-evolution-glue.c"
+#line 314 "mn-evolution-glue.c"
 {
-#line 89 "mn-evolution-glue.gob"
+#line 136 "mn-evolution-glue.gob"
 	
-    CamelFolder *folder;
+    CamelFolder *folder = NULL;
+
+    if (folders)
+      {
+	FolderInfo *info;
+
+	info = g_hash_table_lookup(folders, uri);
+	if (info)
+	  {
+	    folder = info->folder;
+	    camel_object_ref(folder);
+	  }
+      }
+    else
+      folders = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) self_folder_info_free);
 
-    folder = mail_tool_uri_to_folder(uri, 0, NULL);
     if (! folder)
-      bonobo_exception_set(env, ex_GNOME_MailNotification_Evolution_Glue_FolderNotFound);
+      {
+	folder = mail_tool_uri_to_folder(uri, 0, NULL);
+	if (folder)
+	  self_cache_folder(uri, folder);
+	else
+	  bonobo_exception_set(env, ex_GNOME_MailNotification_Evolution_Glue_FolderNotFound);
+      }
 
     return folder;
   }}
-#line 243 "mn-evolution-glue.c"
+#line 345 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 99 "mn-evolution-glue.gob"
+#line 165 "mn-evolution-glue.gob"
 static GNOME_MailNotification_Evolution_MessageSeq * 
 mn_evolution_glue_getUnseenMessages (PortableServer_Servant servant, const CORBA_char * folder_uri, CORBA_Environment * env)
-#line 249 "mn-evolution-glue.c"
+#line 351 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::getUnseenMessages"
 {
-#line 103 "mn-evolution-glue.gob"
+#line 169 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
     GPtrArray *summary;
@@ -313,17 +415,17 @@ mn_evolution_glue_getUnseenMessages (PortableServer_Servant servant, const CORBA
 
     return seq;
   }}
-#line 317 "mn-evolution-glue.c"
+#line 419 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 167 "mn-evolution-glue.gob"
+#line 233 "mn-evolution-glue.gob"
 static CORBA_string 
 mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_char * folder_uri, CORBA_Environment * env)
-#line 323 "mn-evolution-glue.c"
+#line 425 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::getFolderName"
 {
-#line 171 "mn-evolution-glue.gob"
+#line 237 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
     CORBA_string name = NULL;
@@ -337,17 +439,17 @@ mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_cha
 
     return name;
   }}
-#line 341 "mn-evolution-glue.c"
+#line 443 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 185 "mn-evolution-glue.gob"
+#line 251 "mn-evolution-glue.gob"
 static void 
 mn_evolution_glue_openMessage (PortableServer_Servant servant, const CORBA_char * folder_uri, const CORBA_char * message_uid, CORBA_Environment * env)
-#line 347 "mn-evolution-glue.c"
+#line 449 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::openMessage"
 {
-#line 190 "mn-evolution-glue.gob"
+#line 256 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
     GtkWidget *browser;
@@ -367,17 +469,17 @@ mn_evolution_glue_openMessage (PortableServer_Servant servant, const CORBA_char 
 
     camel_object_unref(folder);
   }}
-#line 371 "mn-evolution-glue.c"
+#line 473 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 210 "mn-evolution-glue.gob"
+#line 276 "mn-evolution-glue.gob"
 static void 
 mn_evolution_glue_setMessageFlags (PortableServer_Servant servant, const CORBA_char * folder_uri, const CORBA_char * message_uid, CORBA_unsigned_long flags, CORBA_Environment * env)
-#line 377 "mn-evolution-glue.c"
+#line 479 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::setMessageFlags"
 {
-#line 216 "mn-evolution-glue.gob"
+#line 282 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
 
@@ -390,19 +492,38 @@ mn_evolution_glue_setMessageFlags (PortableServer_Servant servant, const CORBA_c
 
     camel_object_unref(folder);
   }}
-#line 394 "mn-evolution-glue.c"
+#line 496 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 229 "mn-evolution-glue.gob"
+#line 295 "mn-evolution-glue.gob"
 BonoboObject * 
 mn_evolution_glue_factory_cb (BonoboGenericFactory * factory, const char * iid, gpointer closure)
-#line 400 "mn-evolution-glue.c"
+#line 502 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::factory_cb"
 {
-#line 233 "mn-evolution-glue.gob"
+#line 299 "mn-evolution-glue.gob"
 	
     return BONOBO_OBJECT(GET_NEW);
   }}
-#line 408 "mn-evolution-glue.c"
+#line 510 "mn-evolution-glue.c"
+#undef __GOB_FUNCTION__
+
+#line 303 "mn-evolution-glue.gob"
+void 
+mn_evolution_glue_global_cleanup (void)
+#line 516 "mn-evolution-glue.c"
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Glue::global_cleanup"
+{
+#line 305 "mn-evolution-glue.gob"
+	
+    g_slist_foreach(mn_evolution_glues, (GFunc) bonobo_object_unref, NULL);
+    g_slist_free(mn_evolution_glues);
+    mn_evolution_glues = NULL;
+
+    g_hash_table_destroy(folders);
+    folders = NULL;
+  }}
+#line 529 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
diff --git a/src/mn-evolution-glue.gob b/src/mn-evolution-glue.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -39,6 +39,15 @@ extern GSList *mn_evolution_glues;
 #include <mail/mail-tools.h>
 
 GSList *mn_evolution_glues = NULL;
+
+/* see https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=208774 */
+static GHashTable *folders = NULL;
+
+typedef struct
+{
+  char		*uri;
+  CamelFolder	*folder;
+} FolderInfo;
 %}
 
 class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_Evolution_Glue)
@@ -84,14 +93,71 @@ class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_
     return CORBA_string_dup(str ? str : "");
   }
 
+  private void
+    cache_folder (const char *uri (check null),
+		  CamelFolder *folder (check null))
+  {
+    FolderInfo *info;
+
+    info = g_new0(FolderInfo, 1);
+    info->uri = g_strdup(uri);
+    info->folder = folder;
+    camel_object_ref(folder);
+
+    /* uncache the folder when it is deleted */
+    camel_object_hook_event(folder, "deleted", self_folder_deleted_cb, info);
+
+    g_hash_table_replace(folders, info->uri, info);
+  }
+
+  private void
+    folder_info_free (FolderInfo *info (check null))
+  {
+    camel_object_unhook_event(info->folder, "deleted", self_folder_deleted_cb, info);
+    camel_object_unref(info->folder);
+    g_free(info->uri);
+    g_free(info);
+  }
+
+  private void
+    folder_deleted_cb (CamelObject *object,
+		       gpointer event_data,
+		       gpointer user_data)
+  {
+    FolderInfo *info = user_data;
+    gboolean status;
+
+    status = g_hash_table_remove(folders, info->uri);
+    g_assert(status == TRUE);
+  }
+
   private CamelFolder *
     lookup_folder (const char *uri (check null), CORBA_Environment *env)
   {
-    CamelFolder *folder;
+    CamelFolder *folder = NULL;
+
+    if (folders)
+      {
+	FolderInfo *info;
+
+	info = g_hash_table_lookup(folders, uri);
+	if (info)
+	  {
+	    folder = info->folder;
+	    camel_object_ref(folder);
+	  }
+      }
+    else
+      folders = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify) self_folder_info_free);
 
-    folder = mail_tool_uri_to_folder(uri, 0, NULL);
     if (! folder)
-      bonobo_exception_set(env, ex_GNOME_MailNotification_Evolution_Glue_FolderNotFound);
+      {
+	folder = mail_tool_uri_to_folder(uri, 0, NULL);
+	if (folder)
+	  self_cache_folder(uri, folder);
+	else
+	  bonobo_exception_set(env, ex_GNOME_MailNotification_Evolution_Glue_FolderNotFound);
+      }
 
     return folder;
   }
@@ -233,4 +299,15 @@ class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_
   {
     return BONOBO_OBJECT(GET_NEW);
   }
+
+  public void
+    global_cleanup (void)
+  {
+    g_slist_foreach(mn_evolution_glues, (GFunc) bonobo_object_unref, NULL);
+    g_slist_free(mn_evolution_glues);
+    mn_evolution_glues = NULL;
+
+    g_hash_table_destroy(folders);
+    folders = NULL;
+  }
 }
diff --git a/src/mn-evolution-glue.h b/src/mn-evolution-glue.h
@@ -61,6 +61,7 @@ GType	mn_evolution_glue_get_type	(void);
 BonoboObject * 	mn_evolution_glue_factory_cb	(BonoboGenericFactory * factory,
 					const char * iid,
 					gpointer closure);
+void 	mn_evolution_glue_global_cleanup	(void);
 
 #ifdef __cplusplus
 }
diff --git a/src/mn-evolution-mailbox-properties.gob b/src/mn-evolution-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-mailbox.gob b/src/mn-evolution-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-message.gob b/src/mn-evolution-message.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-evolution-plugin.c b/src/mn-evolution-plugin.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -127,10 +127,7 @@ e_plugin_lib_enable (EPluginLib *ep, int enable)
     return 0;			/* success */
   else
     {
-      g_slist_foreach(mn_evolution_glues, (GFunc) bonobo_object_unref, NULL);
-      g_slist_free(mn_evolution_glues);
-      mn_evolution_glues = NULL;
-
+      mn_evolution_glue_global_cleanup();
       return 1;			/* failure */
     }
 }
diff --git a/src/mn-evolution.h b/src/mn-evolution.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-gmail-mailbox-properties.gob b/src/mn-gmail-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-gmail-mailbox.gob b/src/mn-gmail-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-gmime-stream-vfs.gob b/src/mn-gmime-stream-vfs.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-imap-mailbox-properties.gob b/src/mn-imap-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-imap-mailbox.gob b/src/mn-imap-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * mn-imap-mailbox.gob - IMAP 4rev1 support for Mail Notification
  *
  * Compliance:
diff --git a/src/mn-locked-callback.c b/src/mn-locked-callback.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-locked-callback.h b/src/mn-locked-callback.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mail-icon.gob b/src/mn-mail-icon.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mailbox-properties-dialog.c b/src/mn-mailbox-properties-dialog.c
@@ -389,7 +389,7 @@ ___3_mn_mailbox_properties_dialog_constructor (GType type G_GNUC_UNUSED, unsigne
     GObject *object;
     Self *self;
     GtkWidget *general_page;
-    GtkCellRenderer *renderer; 
+    GtkCellRenderer *renderer;
     MNMailboxProperties *properties;
 
     object = PARENT_HANDLER(type, n_construct_properties, construct_params);
diff --git a/src/mn-mailbox-properties-dialog.gob b/src/mn-mailbox-properties-dialog.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -138,7 +138,7 @@ class MN:Mailbox:Properties:Dialog from MN:Dialog
     GObject *object;
     Self *self;
     GtkWidget *general_page;
-    GtkCellRenderer *renderer; 
+    GtkCellRenderer *renderer;
     MNMailboxProperties *properties;
 
     object = PARENT_HANDLER(type, n_construct_properties, construct_params);
diff --git a/src/mn-mailbox-properties.gob b/src/mn-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mailbox-view.gob b/src/mn-mailbox-view.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mailbox.gob b/src/mn-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mailboxes.gob b/src/mn-mailboxes.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-maildir-mailbox-backend.c b/src/mn-maildir-mailbox-backend.c
@@ -190,7 +190,7 @@ ___3_mn_maildir_mailbox_backend_is (MNVFSMailboxBackend * dummy G_GNUC_UNUSED, M
 {
 #line 73 "mn-maildir-mailbox-backend.gob"
 	
-    int i; 
+    int i;
     static const char *constitutive_dirs[] = { "cur", "new", "tmp" };
     gboolean is = FALSE;
 
diff --git a/src/mn-maildir-mailbox-backend.gob b/src/mn-maildir-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
@@ -71,7 +71,7 @@ class MN:Maildir:Mailbox:Backend from MN:VFS:Mailbox:Backend
 	MNVFSMailboxBackendClass *class,
 	MNVFSMailbox *mailbox)
   {
-    int i; 
+    int i;
     static const char *constitutive_dirs[] = { "cur", "new", "tmp" };
     gboolean is = FALSE;
 
diff --git a/src/mn-main.c b/src/mn-main.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mbox-mailbox-backend.gob b/src/mn-mbox-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-md5.c b/src/mn-md5.c
@@ -137,7 +137,7 @@ mn_md5_init (MNMD5Context *context)
   context->state[3] = 0x10325476;
 }
 
-/* 
+/*
  * MD5 block update operation. Continues an MD5 message-digest
  * operation, processing another message block, and updating the
  * context.
diff --git a/src/mn-message-mime.c b/src/mn-message-mime.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-message-mime.h b/src/mn-message-mime.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-message-view.gob b/src/mn-message-view.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-message.gob b/src/mn-message.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mh-mailbox-backend.gob b/src/mn-mh-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-mozilla-mailbox-backend.gob b/src/mn-mozilla-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-pi-mailbox-properties.gob b/src/mn-pi-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-pi-mailbox.gob b/src/mn-pi-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-pop3-mailbox-properties.gob b/src/mn-pop3-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-pop3-mailbox.gob b/src/mn-pop3-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * mn-pop3-mailbox.gob - POP3 support for Mail Notification
  *
  * Compliance:
diff --git a/src/mn-popup.gob b/src/mn-popup.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-popups.gob b/src/mn-popups.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-properties-dialog.gob b/src/mn-properties-dialog.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-reentrant-mailbox.gob b/src/mn-reentrant-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-sasl.c b/src/mn-sasl.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-sasl.h b/src/mn-sasl.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-shell.gob b/src/mn-shell.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-ssl.c b/src/mn-ssl.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-ssl.h b/src/mn-ssl.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-standard-message-view.gob b/src/mn-standard-message-view.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-stock.c b/src/mn-stock.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-stock.h b/src/mn-stock.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-sylpheed-mailbox-backend.gob b/src/mn-sylpheed-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-system-vfs-mailbox-properties.gob b/src/mn-system-vfs-mailbox-properties.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-system-vfs-mailbox.gob b/src/mn-system-vfs-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-test-mailbox.gob b/src/mn-test-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-text-table.gob b/src/mn-text-table.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-tooltips.gob b/src/mn-tooltips.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * MNTooltips - a tooltips implementation allowing to use an arbitrary
  * widget as tooltip
  *
diff --git a/src/mn-util.c b/src/mn-util.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-util.h b/src/mn-util.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-vfs-mailbox-backend.gob b/src/mn-vfs-mailbox-backend.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-vfs-mailbox.gob b/src/mn-vfs-mailbox.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-vfs-message.gob b/src/mn-vfs-message.gob
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-vfs.c b/src/mn-vfs.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-vfs.h b/src/mn-vfs.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-xml.c b/src/mn-xml.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/mn-xml.h b/src/mn-xml.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * Mail Notification
  * Copyright (C) 2003-2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
diff --git a/src/nautilus-cell-renderer-pixbuf-emblem.c b/src/nautilus-cell-renderer-pixbuf-emblem.c
@@ -398,7 +398,7 @@ nautilus_cell_renderer_pixbuf_emblem_get_size (GtkCellRenderer *cell,
 	if (cell_area && pixbuf_width > 0 && pixbuf_height > 0) {
 		if (x_offset) {
 			*x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ?
-				1.0 - cell->xalign : cell->xalign) * 
+				1.0 - cell->xalign : cell->xalign) *
 				(cell_area->width - calc_width - 2 * cell->xpad));
 			*x_offset = MAX (*x_offset, 0) + cell->xpad;
 		}