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 2b3d04d1b5e2118643ffb8d3e4ae567c9ca6b678
parent d4378a19a41d37918a4401daab8ebd14de3abe37
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date:   Thu, 18 May 2006 23:44:54 +1000

mail-notification-3.0-rc2

* Evolution changes:
        * Evolution crashed when a message without Subject or
          From header was received: fixed
        * Mail Notification could crash when removing an
          Evolution mailbox: fixed

* Updated translations:
        * Japanese (Hiroshi Hasebe)
        * Czech (Pav Lucistnik)
        * Dutch (Marcel J. Zwiebel)

* New translations:
        * Swedish (Daniel Nylander)

Diffstat:
MAUTHORS | 1+
MMakefile.am | 3++-
MMakefile.autogen | 5+++--
MMakefile.in | 6++++--
MNEWS | 13+++++++++++++
MTRANSLATING | 10+++++-----
Aaml.make | 12++++++++++++
Daml/Makefile.am | 2--
Daml/Makefile.aml | 9---------
Daml/Makefile.in | 426-------------------------------------------------------------------------------
Daml/aml.c | 515-------------------------------------------------------------------------------
Daml/aml.make | 14--------------
Mart/Makefile.in | 1+
Mconfigure | 69++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------
Mconfigure.ac | 8++++----
Mdata/Makefile.in | 1+
Mhelp/C/Makefile.in | 1+
Mhelp/C/mail-notification-C.omf | 4++--
Mhelp/C/mail-notification.xml | 20++++++++++++++++----
Mhelp/Makefile.in | 1+
Mm4/Makefile.in | 1+
Mpo/cs.po | 1792++++++++++++++++++++++++++++++++++++++++++-------------------------------------
Mpo/fr.po | 4++--
Mpo/ja.po | 1694+++++++++++++++++++++++++++++++++++--------------------------------------------
Mpo/nl.po | 1686+++++++++++++++++++++++++++++++++----------------------------------------------
Apo/sv.po | 1701+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Msrc/Makefile.am | 2+-
Msrc/Makefile.in | 13++++++-------
Msrc/mn-evolution-glue.c | 52++++++++++++++++++++++++++++++++++------------------
Msrc/mn-evolution-glue.gob | 16+++++++++++++---
Msrc/mn-evolution-mailbox-properties.c | 41++++++++++++++++++++++-------------------
Msrc/mn-evolution-mailbox-properties.gob | 5++++-
Msrc/mn-evolution-mailbox.c | 39++++++++++++++++++---------------------
Msrc/mn-evolution-mailbox.gob | 19++++++++-----------
Msrc/mn-locked-callback.c | 44++++++++++++++++----------------------------
Msrc/mn-locked-callback.h | 3+--
Mtests/Makefile.in | 1+
Mui/Makefile.in | 1+
38 files changed, 4339 insertions(+), 3896 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -15,6 +15,7 @@ Translators:
 	* Dan Korostelev <dan@ats.energo.ru> (Russian)
 	* Pav Lucistnik <pav@FreeBSD.org> (Czech)
 	* Filip Miletic <filmil@gmail.com> (Serbian)
+	* Daniel Nylander <po@danielnylander.se> (Swedish)
 	* Vladimir Petkov <vpetkov@i-space.org> (Bulgarian)
 	* Tomasz Sarota-Raczek <tomasz.sarota.raczek@gmail.com>,
 	  Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl> (Polish)
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = aml art data help m4 po src ui
+SUBDIRS = art data help m4 po src ui
 
 if WITH_REGRESSION_TESTS
 SUBDIRS += tests
@@ -7,6 +7,7 @@ endif
 EXTRA_DIST = \
 	Makefile.autogen	\
 	TRANSLATING		\
+	aml.make		\
 	autogen.sh		\
 	intltool-extract.in	\
 	intltool-merge.in	\
diff --git a/Makefile.autogen b/Makefile.autogen
@@ -4,9 +4,10 @@
 # po/Makefile.in.in requires mkinstalldirs, but intltoolize does not provide it
 MKINSTALLDIRS = /usr/local/gnu-autotools/share/automake-1.9/mkinstalldirs
 
+# aml: http://lefort.be.eu.org/aml-1.0.tar.gz
 all:
-	cd aml && $(MAKE) -f Makefile.aml
-	aml/aml src/automake.xml > src/Makefile.am
+	amlize
+	aml src/automake.xml > src/Makefile.am
 	libtoolize
 	intltoolize --force
 	ln -sf $(MKINSTALLDIRS) mkinstalldirs
diff --git a/Makefile.in b/Makefile.in
@@ -67,7 +67,7 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = aml art data help m4 po src ui tests
+DIST_SUBDIRS = art data help m4 po src ui tests
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -82,6 +82,7 @@ distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -284,10 +285,11 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-SUBDIRS = aml art data help m4 po src ui $(am__append_1)
+SUBDIRS = art data help m4 po src ui $(am__append_1)
 EXTRA_DIST = \
 	Makefile.autogen	\
 	TRANSLATING		\
+	aml.make		\
 	autogen.sh		\
 	intltool-extract.in	\
 	intltool-merge.in	\
diff --git a/NEWS b/NEWS
@@ -1,3 +1,16 @@
+3.0 Release Candidate 2			May 18, 2006
+
+	* Evolution changes:
+		* Evolution crashed when a message without Subject or
+		  From header was received: fixed
+		* Mail Notification could crash when removing an
+		  Evolution mailbox: fixed
+
+	* Updated translations:
+		* Japanese (Hiroshi Hasebe)
+		* Czech (Pav Lucistnik)
+		* Dutch (Marcel J. Zwiebel)
+
 3.0 Release Candidate 1			May 16, 2006
 
 	* Core changes:
diff --git a/TRANSLATING b/TRANSLATING
@@ -16,7 +16,7 @@ Index
 
 0. About this document
 
-	$Id: TRANSLATING,v 1.3 2006/03/04 05:16:03 jylefort Exp $
+	$Id: TRANSLATING,v 1.4 2006/05/18 12:48:28 jylefort Exp $
 
 	Copyright (C) 2005, 2006 Jean-Yves Lefort.
 
@@ -108,7 +108,7 @@ Index
 8. Application name
 
 	The application name ("Mail Notification") should be
-	translated. In English, it is treated as a proper noun and
-	capitalized accordingly. However, appropriate classification
-	(common noun or proper noun) and capitalization may vary from
-	language to language.
+	translated. For historical reasons, in English, it is treated
+	as a proper noun and capitalized accordingly. However, in the
+	target language, it should be translated as a common noun
+	(such as "the washing machine" or "the mail notifier").
diff --git a/aml.make b/aml.make
@@ -0,0 +1,12 @@
+GOBFLAGS = --always-private-header --no-touch --exit-on-warn
+
+Makefile.am: automake.xml $(AML)
+	$(AML) $< > $@.aml && mv -f $@.aml $@
+
+# intentionally do not add $(GOB2) to sources (generated files are distributed)
+%.gob.stamp: %.gob
+	$(GOB2) $(GOBFLAGS) $<
+	@touch $@
+
+%-common.c %-stubs.c %-skels.c %.h: %.idl $(ORBIT_IDL)
+	$(ORBIT_IDL) $(IDLFLAGS) $<
diff --git a/aml/Makefile.am b/aml/Makefile.am
@@ -1,2 +0,0 @@
-EXTRA_DIST = Makefile.aml aml.c aml.make
-MAINTAINERCLEANFILES = aml
diff --git a/aml/Makefile.aml b/aml/Makefile.aml
@@ -1,9 +0,0 @@
-# -*- mode: makefile -*-
-#
-# Since aml is needed to generate Makefile.am files, we need a plain
-# Makefile (this file) to build aml itself.
-
-WARN_CFLAGS = -Wall -Werror
-
-aml: aml.c
-	$(CC) $(CFLAGS) $(WARN_CFLAGS) `pkg-config --cflags --libs glib-2.0 libxml-2.0` -o aml aml.c
diff --git a/aml/Makefile.in b/aml/Makefile.in
@@ -1,426 +0,0 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-target_triplet = @target@
-subdir = aml
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
-	$(top_srcdir)/m4/gnome.m4 $(top_srcdir)/m4/idl.m4 \
-	$(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/openssl.m4 \
-	$(top_srcdir)/m4/reentrant-resolver.m4 \
-	$(top_srcdir)/m4/sasl2.m4 $(top_srcdir)/acinclude.m4 \
-	$(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-BONOBO_IDLFLAGS = @BONOBO_IDLFLAGS@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EVOLUTION_PLUGIN_CFLAGS = @EVOLUTION_PLUGIN_CFLAGS@
-EVOLUTION_PLUGIN_LIBS = @EVOLUTION_PLUGIN_LIBS@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GCONFTOOL = @GCONFTOOL@
-GCONF_SCHEMAS_INSTALL_FALSE = @GCONF_SCHEMAS_INSTALL_FALSE@
-GCONF_SCHEMAS_INSTALL_TRUE = @GCONF_SCHEMAS_INSTALL_TRUE@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMIME_CFLAGS = @GMIME_CFLAGS@
-GMIME_LIBS = @GMIME_LIBS@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GNOME_CFLAGS = @GNOME_CFLAGS@
-GNOME_LIBS = @GNOME_LIBS@
-GOB2 = @GOB2@
-GTK_CFLAGS = @GTK_CFLAGS@
-GTK_LIBS = @GTK_LIBS@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-INSTOBJEXT = @INSTOBJEXT@
-INTLLIBS = @INTLLIBS@
-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
-INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
-INTLTOOL_ICONV = @INTLTOOL_ICONV@
-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
-INTLTOOL_MERGE = @INTLTOOL_MERGE@
-INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
-INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
-INTLTOOL_PERL = @INTLTOOL_PERL@
-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
-INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
-INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-OBJEXT = @OBJEXT@
-OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
-OPENSSL_LIBS = @OPENSSL_LIBS@
-ORBIT_IDL = @ORBIT_IDL@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-POFILES = @POFILES@
-POSUB = @POSUB@
-PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
-PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
-RANLIB = @RANLIB@
-SASL_CFLAGS = @SASL_CFLAGS@
-SASL_LIBS = @SASL_LIBS@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WARN_CFLAGS = @WARN_CFLAGS@
-WITH_EVOLUTION_FALSE = @WITH_EVOLUTION_FALSE@
-WITH_EVOLUTION_TRUE = @WITH_EVOLUTION_TRUE@
-WITH_GMAIL_FALSE = @WITH_GMAIL_FALSE@
-WITH_GMAIL_TRUE = @WITH_GMAIL_TRUE@
-WITH_IMAP_FALSE = @WITH_IMAP_FALSE@
-WITH_IMAP_TRUE = @WITH_IMAP_TRUE@
-WITH_MAILDIR_FALSE = @WITH_MAILDIR_FALSE@
-WITH_MAILDIR_TRUE = @WITH_MAILDIR_TRUE@
-WITH_MBOX_FALSE = @WITH_MBOX_FALSE@
-WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
-WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
-WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
-WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
-WITH_MBOX_TRUE = @WITH_MBOX_TRUE@
-WITH_MH_FALSE = @WITH_MH_FALSE@
-WITH_MH_TRUE = @WITH_MH_TRUE@
-WITH_MIME_FALSE = @WITH_MIME_FALSE@
-WITH_MIME_TRUE = @WITH_MIME_TRUE@
-WITH_POP3_FALSE = @WITH_POP3_FALSE@
-WITH_POP3_OR_IMAP_FALSE = @WITH_POP3_OR_IMAP_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_FALSE = @WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@
-WITH_POP3_OR_IMAP_OR_GMAIL_TRUE = @WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@
-WITH_POP3_OR_IMAP_TRUE = @WITH_POP3_OR_IMAP_TRUE@
-WITH_POP3_TRUE = @WITH_POP3_TRUE@
-WITH_REGRESSION_TESTS_FALSE = @WITH_REGRESSION_TESTS_FALSE@
-WITH_REGRESSION_TESTS_TRUE = @WITH_REGRESSION_TESTS_TRUE@
-WITH_SASL_FALSE = @WITH_SASL_FALSE@
-WITH_SASL_TRUE = @WITH_SASL_TRUE@
-WITH_SSL_FALSE = @WITH_SSL_FALSE@
-WITH_SSL_TRUE = @WITH_SSL_TRUE@
-WITH_SYLPHEED_FALSE = @WITH_SYLPHEED_FALSE@
-WITH_SYLPHEED_TRUE = @WITH_SYLPHEED_TRUE@
-XGETTEXT = @XGETTEXT@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_prefix_program = @ac_prefix_program@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-evolution_plugindir = @evolution_plugindir@
-evolution_source_dir = @evolution_source_dir@
-exec_prefix = @exec_prefix@
-gnome_cappletdir = @gnome_cappletdir@
-gnome_prefix = @gnome_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target = @target@
-target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-EXTRA_DIST = Makefile.aml aml.c aml.make
-MAINTAINERCLEANFILES = aml
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  aml/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  aml/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
-	distclean distclean-generic distclean-libtool distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/aml/aml.c b/aml/aml.c
@@ -1,515 +0,0 @@
-/* 
- * aml.c - generate Makefile.am from an Automake Markup Language file
- *
- * Copyright (C) 2005 Jean-Yves Lefort <jylefort@brutele.be>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-#include <glib.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-
-typedef void (*OutputFunc) (xmlNode *node);
-
-static GHashTable *variables = NULL;
-static GSList *conditionals = NULL;
-
-static const char *current_filename = NULL;
-static char *current_object = NULL;
-
-static void aml_error (xmlNode *node, const char *format, ...);
-static char *aml_get_mandatory_property (xmlNode *node, const char *name);
-
-static void aml_append (const char *varname, const char *format, ...);
-static void aml_vappend (const char *varname, const char *format, va_list args);
-
-static void aml_object_append (const char *varname,
-			       const char *format,
-			       ...);
-static void aml_object_append_prefix (const char *prefix,
-				      const char *varname,
-				      const char *format,
-				      ...);
-static void aml_object_vappend_prefix (const char *prefix,
-				       const char *varname,
-				       const char *format,
-				       va_list args);
-
-static void aml_output_tree (xmlNode *node);
-static void aml_output_node (xmlNode *node);
-static void aml_output_object (xmlNode *node,
-			       const char *type,
-			       const char *default_dir);
-static void aml_output_program (xmlNode *node);
-static void aml_output_library (xmlNode *node);
-static void aml_output_variable (xmlNode *node);
-static void aml_output_package (xmlNode *node);
-static void aml_output_source_real (xmlNode *node, const char *format, ...);
-static void aml_output_source (xmlNode *node);
-static void aml_output_module (xmlNode *node);
-static void aml_output_class (xmlNode *node);
-static void aml_output_interface (xmlNode *node);
-static void aml_output_if (xmlNode *node);
-
-static void aml_process_file (const char *filename);
-
-static void
-aml_error (xmlNode *node, const char *format, ...)
-{
-  va_list args;
-  char *message;
-
-  g_return_if_fail(format != NULL);
-
-  va_start(args, format);
-  message = g_strdup_vprintf(format, args);
-  va_end(args);
-
-  if (node)
-    g_printerr("%s:%i: %s\n", current_filename, node->line, message);
-  else if (current_filename)
-    g_printerr("%s: %s\n", current_filename, message);
-  else
-    g_printerr("%s\n", message);
-
-  g_free(message);
-
-  exit(1);
-}
-
-static char *
-aml_get_mandatory_property (xmlNode *node, const char *name)
-{
-  char *value;
-
-  g_return_val_if_fail(node != NULL, NULL);
-  g_return_val_if_fail(name != NULL, NULL);
-
-  value = xmlGetProp(node, name);
-  if (! value)
-    aml_error(node, "mandatory property \"%s\" not specified", name);
-
-  return value;
-}
-
-static void
-aml_append (const char *varname, const char *format, ...)
-{
-  va_list args;
-
-  g_return_if_fail(varname != NULL);
-  g_return_if_fail(format != NULL);
-
-  va_start(args, format);
-  aml_vappend(varname, format, args);
-  va_end(args);
-}
-
-static void
-aml_vappend (const char *varname, const char *format, va_list args)
-{
-  char *value;
-
-  g_return_if_fail(varname != NULL);
-  g_return_if_fail(format != NULL);
-
-  value = g_strdup_vprintf(format, args);
-
-  if (g_hash_table_lookup(variables, varname))
-    g_print("%s += %s\n", varname, value);
-  else
-    {
-      /*
-       * Automake requires variables to be initialized before += can
-       * be used on them.
-       */
-
-      g_hash_table_insert(variables, g_strdup(varname), GINT_TO_POINTER(TRUE));
-      g_print("%s = %s\n", varname, value);
-    }
-
-  g_free(value);
-}
-
-static void
-aml_object_append (const char *varname,
-		   const char *format,
-		   ...)
-{
-  va_list args;
-
-  g_return_if_fail(varname != NULL);
-  g_return_if_fail(format != NULL);
-
-  va_start(args, format);
-  aml_object_vappend_prefix(NULL, varname, format, args);
-  va_end(args);
-}
-
-static void
-aml_object_append_prefix (const char *prefix,
-			  const char *varname,
-			  const char *format,
-			  ...)
-{
-  va_list args;
-
-  g_return_if_fail(varname != NULL);
-  g_return_if_fail(format != NULL);
-
-  va_start(args, format);
-  aml_object_vappend_prefix(prefix, varname, format, args);
-  va_end(args);
-}
-
-static void
-aml_object_vappend_prefix (const char *prefix,
-			   const char *varname,
-			   const char *format,
-			   va_list args)
-{
-  char *full_varname;
-
-  g_return_if_fail(varname != NULL);
-  g_return_if_fail(format != NULL);
-
-  if (prefix)
-    full_varname = g_strdup_printf("%s_%s_%s", prefix, current_object, varname);
-  else
-    full_varname = g_strdup_printf("%s_%s", current_object, varname);
-
-  aml_vappend(full_varname, format, args);
-  g_free(full_varname);
-}
-
-static void
-aml_output_tree (xmlNode *node)
-{
-  g_return_if_fail(node != NULL);
-
-  for (node = node->children; node != NULL; node = node->next)
-    if (node->type == XML_ELEMENT_NODE)
-      aml_output_node(node);
-}
-
-static void
-aml_output_node (xmlNode *node)
-{
-  static const struct
-  {
-    const char	*name;
-    OutputFunc	func;
-  } nodes[] = {
-    { "program",	aml_output_program },
-    { "library",	aml_output_library },
-    { "cppflags",	aml_output_variable },
-    { "ldflags",	aml_output_variable },
-    { "package",	aml_output_package },
-    { "source",		aml_output_source },
-    { "module",		aml_output_module },
-    { "class",		aml_output_class },
-    { "interface",	aml_output_interface },
-    { "if",		aml_output_if }
-  };
-  int i;
-
-  g_return_if_fail(node != NULL);
-
-  for (i = 0; i < G_N_ELEMENTS(nodes); i++)
-    if (! strcmp(node->name, nodes[i].name))
-      {
-	nodes[i].func(node);
-	return;
-      }
-
-  aml_error(node, "unknown element \"%s\"", node->name);
-}
-
-static void
-aml_output_object (xmlNode *node, const char *type, const char *default_dir)
-{
-  char *name;
-  char *dir;
-  char *varname;
-
-  g_return_if_fail(node != NULL);
-  g_return_if_fail(type != NULL);
-  g_return_if_fail(default_dir != NULL);
-
-  if (current_object)
-    aml_error(node, "toplevel objects cannot be nested");
-
-  name = aml_get_mandatory_property(node, "name");
-
-  dir = xmlGetProp(node, "dir");
-  if (! dir)
-    dir = g_strdup(default_dir);
-
-  varname = g_strdup_printf("%s_%s", dir, type);
-  g_free(dir);
-
-  aml_append(varname, "%s", name);
-  g_free(varname);
-
-  current_object = g_strdelimit(name, "-.", '_');
-
-  aml_output_tree(node);
-
-  g_free(current_object);
-  current_object = NULL;
-}
-
-static void
-aml_output_program (xmlNode *node)
-{
-  g_return_if_fail(node != NULL);
-
-  aml_output_object(node, "PROGRAMS", "bin");
-}
-
-static void
-aml_output_library (xmlNode *node)
-{
-  g_return_if_fail(node != NULL);
-
-  aml_output_object(node, "LTLIBRARIES", "lib");
-}
-
-static void
-aml_output_variable (xmlNode *node)
-{
-  char *content;
-
-  g_return_if_fail(node != NULL);
-
-  content = xmlNodeGetContent(node);
-  if (content)
-    {
-      char *varname;
-
-      varname = g_ascii_strup(node->name, -1);
-
-      aml_object_append(varname, content);
-
-      g_free(varname);
-      g_free(content);
-    }
-}
-
-static void
-aml_output_package (xmlNode *node)
-{
-  char *name;
-  char *varname;
-
-  g_return_if_fail(node != NULL);
-
-  name = aml_get_mandatory_property(node, "name");
-  varname = g_ascii_strup(g_strdelimit(name, "-", '_'), -1);
-  g_free(name);
-
-  aml_object_append("CPPFLAGS", "$(%s_CFLAGS)", varname);
-  aml_object_append("LDFLAGS", "$(%s_LIBS)", varname);
-
-  g_free(varname);
-}
-
-static void
-aml_output_source_real (xmlNode *node, const char *format, ...)
-{
-  va_list args;
-  char *dist;
-  char *built;
-  char *clean;
-
-  g_return_if_fail(node != NULL);
-  g_return_if_fail(format != NULL);
-
-  va_start(args, format);
-
-  dist = xmlGetProp(node, "dist");
-  aml_object_vappend_prefix(dist && ! strcmp(dist, "no") ? "nodist" : NULL, "SOURCES", format, args);
-  g_free(dist);
-
-  built = xmlGetProp(node, "built");
-  if (built)
-    {
-      if (! strcmp(built, "yes"))
-	aml_vappend("BUILT_SOURCES", format, args);
-      g_free(built);
-    }
-  
-  clean = xmlGetProp(node, "clean");
-  if (clean)
-    {
-      char *cleanvar;
-
-      if (! strcmp(clean, "yes"))
-	cleanvar = g_strdup("CLEANFILES");
-      else
-	{
-	  char *str;
-
-	  str = g_ascii_strup(clean, -1);
-	  cleanvar = g_strdup_printf("%sCLEANFILES", str);
-	  g_free(str);
-	}
-      g_free(clean);
-
-      aml_vappend(cleanvar, format, args);
-      g_free(cleanvar);
-    }
-
-  va_end(args);
-}
-
-static void
-aml_output_source (xmlNode *node)
-{
-  char *name;
-
-  g_return_if_fail(node != NULL);
-
-  name = aml_get_mandatory_property(node, "name");
-  aml_output_source_real(node, "%s", name);
-  g_free(name);
-}
-
-static void
-aml_output_module (xmlNode *node)
-{
-  char *name;
-
-  g_return_if_fail(node != NULL);
-
-  name = aml_get_mandatory_property(node, "name");
-  aml_output_source_real(node, "%s.c", name);
-  aml_output_source_real(node, "%s.h", name);
-  g_free(name);
-}
-
-static void
-aml_output_class (xmlNode *node)
-{
-  char *name;
-  char *prefix;
-
-  g_return_if_fail(node != NULL);
-
-#define GOB_BUILT_SOURCES(prefix) \
-  "%s-private.h %s.c %s.h", (prefix), (prefix), (prefix)
-
-  name = aml_get_mandatory_property(node, "name");
-  prefix = g_ascii_strdown(g_strdelimit(name, ":", '-'), -1);
-  g_free(name);
-
-  aml_object_append("SOURCES", "%s.gob %s.gob.stamp", prefix, prefix);
-  aml_object_append("SOURCES", GOB_BUILT_SOURCES(prefix));
-  aml_append("BUILT_SOURCES", "%s.gob.stamp", prefix);
-  aml_append("MAINTAINERCLEANFILES", "%s.gob.stamp", prefix);
-  aml_append("MAINTAINERCLEANFILES", GOB_BUILT_SOURCES(prefix));
-  
-  g_free(prefix);
-}
-
-static void
-aml_output_interface (xmlNode *node)
-{
-  char *name;
-
-  g_return_if_fail(node != NULL);
-
-#define IDL_BUILT_SOURCES(prefix) \
-  "%s-common.c %s-skels.c %s-stubs.c %s.h", (prefix), (prefix), (prefix), (prefix)
-
-  name = g_strdelimit(aml_get_mandatory_property(node, "name"), ":", '_');
-
-  aml_object_append("SOURCES", "%s.idl", name);
-  aml_object_append_prefix("nodist", "SOURCES", IDL_BUILT_SOURCES(name));
-  aml_append("BUILT_SOURCES", IDL_BUILT_SOURCES(name));
-  aml_append("CLEANFILES", IDL_BUILT_SOURCES(name));
-
-  g_free(name);
-}
-
-static void
-aml_output_if (xmlNode *node)
-{
-  char *test;
-
-  g_return_if_fail(node != NULL);
-
-  test = aml_get_mandatory_property(node, "test");
-
-  conditionals = g_slist_prepend(conditionals, test);
-  g_print("if %s\n", test);
-
-  aml_output_tree(node);
-
-  conditionals = g_slist_delete_link(conditionals, conditionals);
-  g_print("endif\n");
-}
-
-static void
-aml_process_file (const char *filename)
-{
-  xmlDoc *doc;
-  xmlNode *root;
-  char *basename;
-
-  g_return_if_fail(filename != NULL);
-
-  current_filename = filename;
-
-  doc = xmlParseFile(filename);
-  if (! doc)
-    exit(1);			/* error printed by libxml */
-
-  root = xmlDocGetRootElement(doc);
-  if (! root)
-    aml_error(NULL, "root element missing");
-
-  if (strcmp(root->name, "makefile"))
-    aml_error(root, "root element must be \"makefile\", not \"%s\"", root->name);
-
-  basename = g_path_get_basename(filename);
-  g_print("# Generated from %s using Jean-Yves Lefort's aml.\n", basename);
-  g_free(basename);
-
-  g_print("include $(top_srcdir)/aml/aml.make\n");
-
-  aml_output_tree(root);
-
-  g_print("include $(srcdir)/aml.make\n");
-
-  xmlFreeDoc(doc);
-}
-
-int
-main (int argc, char **argv)
-{
-  if (argc != 2)
-    aml_error(NULL, "Usage: %s INPUTFILE", argv[0]);
-
-  variables = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
-  aml_process_file(argv[1]);
-  g_hash_table_destroy(variables);
-
-  return 0;
-}
diff --git a/aml/aml.make b/aml/aml.make
@@ -1,14 +0,0 @@
-GOBFLAGS = --always-private-header --no-touch --exit-on-warn
-
-# intentionally do not add aml/aml to sources (Makefile.am is distributed)
-Makefile.am: automake.xml $(top_srcdir)/aml/aml.c $(top_srcdir)/aml/Makefile.aml
-	cd $(top_srcdir)/aml && $(MAKE) -f Makefile.aml $(AM_MAKEFLAGS) aml
-	$(top_srcdir)/aml/aml $< > $@.aml && mv -f $@.aml $@
-
-# intentionally do not add $(GOB2) to sources (generated files are distributed)
-%.gob.stamp: %.gob
-	$(GOB2) $(GOBFLAGS) $<
-	@touch $@
-
-%-common.c %-stubs.c %-skels.c %.h: %.idl $(ORBIT_IDL)
-	$(ORBIT_IDL) $(IDLFLAGS) $<
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -72,6 +72,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
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 3.0-rc1.
+# Generated by GNU Autoconf 2.59 for Mail Notification 3.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='3.0-rc1'
-PACKAGE_STRING='Mail Notification 3.0-rc1'
+PACKAGE_VERSION='3.0-rc2'
+PACKAGE_STRING='Mail Notification 3.0-rc2'
 PACKAGE_BUGREPORT='jylefort@brutele.be'
 
 ac_unique_file="src/mn-main.c"
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ac_prefix_program WARN_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT PKG_CONFIG GTK_CFLAGS GTK_LIBS ac_pt_PKG_CONFIG GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE gnome_prefix gnome_cappletdir GCONFTOOL ORBIT_IDL BONOBO_IDLFLAGS GOB2 GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS evolution_plugindir evolution_source_dir WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_EVOLUTION_TRUE WITH_EVOLUTION_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ac_prefix_program WARN_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_SERVICE_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT PKG_CONFIG GTK_CFLAGS GTK_LIBS ac_pt_PKG_CONFIG GNOME_CFLAGS GNOME_LIBS GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE gnome_prefix gnome_cappletdir GCONFTOOL ORBIT_IDL BONOBO_IDLFLAGS AML GOB2 GMIME_CFLAGS GMIME_LIBS OPENSSL_CFLAGS OPENSSL_LIBS SASL_CFLAGS SASL_LIBS EVOLUTION_PLUGIN_CFLAGS EVOLUTION_PLUGIN_LIBS evolution_plugindir evolution_source_dir WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MH_TRUE WITH_MH_FALSE WITH_MAILDIR_TRUE WITH_MAILDIR_FALSE WITH_POP3_TRUE WITH_POP3_FALSE WITH_IMAP_TRUE WITH_IMAP_FALSE WITH_POP3_OR_IMAP_TRUE WITH_POP3_OR_IMAP_FALSE WITH_POP3_OR_IMAP_OR_GMAIL_TRUE WITH_POP3_OR_IMAP_OR_GMAIL_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE WITH_SSL_TRUE WITH_SSL_FALSE WITH_SASL_TRUE WITH_SASL_FALSE WITH_GMAIL_TRUE WITH_GMAIL_FALSE WITH_EVOLUTION_TRUE WITH_EVOLUTION_FALSE WITH_SYLPHEED_TRUE WITH_SYLPHEED_FALSE WITH_MIME_TRUE WITH_MIME_FALSE WITH_REGRESSION_TESTS_TRUE WITH_REGRESSION_TESTS_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -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 3.0-rc1 to adapt to many kinds of systems.
+\`configure' configures Mail Notification 3.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 3.0-rc1:";;
+     short | recursive ) echo "Configuration of Mail Notification 3.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 3.0-rc1
+Mail Notification configure 3.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 3.0-rc1, which was
+It was created by Mail Notification $as_me 3.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -2243,7 +2243,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='mail-notification'
- VERSION='3.0-rc1'
+ VERSION='3.0-rc2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18919,7 +18919,7 @@ _ACEOF
 
 
 
-ALL_LINGUAS="bg cs de fr ja nl pl pt pt_BR ru sr sr@Latn"
+ALL_LINGUAS="bg cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
 
 
 for ac_header in locale.h
@@ -23077,9 +23077,48 @@ fi
 
 
 
-### optional libraries
+### optional libraries and programs
 
 # not needed by end-users, as generated files are distributed
+# Extract the first word of "aml", so it can be a program name with args.
+set dummy aml; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_AML+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $AML in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_AML="$AML" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_AML="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+AML=$ac_cv_path_AML
+
+if test -n "$AML"; then
+  echo "$as_me:$LINENO: result: $AML" >&5
+echo "${ECHO_T}$AML" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 # Extract the first word of "gob2", so it can be a program name with args.
 set dummy gob2; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -24228,7 +24267,7 @@ _ACEOF
 
 ### output
 
-                                                                                                              ac_config_files="$ac_config_files Makefile aml/Makefile art/Makefile data/Makefile help/Makefile help/C/Makefile m4/Makefile po/Makefile.in src/Makefile tests/Makefile ui/Makefile"
+                                                                                                    ac_config_files="$ac_config_files Makefile art/Makefile data/Makefile help/Makefile help/C/Makefile m4/Makefile po/Makefile.in src/Makefile tests/Makefile ui/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -24750,7 +24789,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by Mail Notification $as_me 3.0-rc1, which was
+This file was extended by Mail Notification $as_me 3.0-rc2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24813,7 +24852,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Mail Notification config.status 3.0-rc1
+Mail Notification config.status 3.0-rc2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -24930,7 +24969,6 @@ do
   case "$ac_config_target" in
   # Handling of arguments.
   "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "aml/Makefile" ) CONFIG_FILES="$CONFIG_FILES aml/Makefile" ;;
   "art/Makefile" ) CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
   "data/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
   "help/Makefile" ) CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
@@ -25161,6 +25199,7 @@ s,@gnome_cappletdir@,$gnome_cappletdir,;t t
 s,@GCONFTOOL@,$GCONFTOOL,;t t
 s,@ORBIT_IDL@,$ORBIT_IDL,;t t
 s,@BONOBO_IDLFLAGS@,$BONOBO_IDLFLAGS,;t t
+s,@AML@,$AML,;t t
 s,@GOB2@,$GOB2,;t t
 s,@GMIME_CFLAGS@,$GMIME_CFLAGS,;t t
 s,@GMIME_LIBS@,$GMIME_LIBS,;t t
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Mail Notification], 3.0-rc1, jylefort@brutele.be)
+AC_INIT([Mail Notification], 3.0-rc2, jylefort@brutele.be)
 AC_CONFIG_SRCDIR(src/mn-main.c)
 
 AC_PREREQ(2.59)
@@ -40,7 +40,7 @@ GETTEXT_PACKAGE=mail-notification
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package name])
 AC_SUBST(GETTEXT_PACKAGE)
 
-ALL_LINGUAS="bg cs de fr ja nl pl pt pt_BR ru sr sr@Latn"
+ALL_LINGUAS="bg cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
 AM_GLIB_GNU_GETTEXT
 
 AC_PROG_INTLTOOL
@@ -83,9 +83,10 @@ AM_PATH_ORBIT_IDL(, [AC_MSG_ERROR([unable to find the orbit-idl-2 program])])
 
 IDL_CHECK_MODULES(BONOBO, [libbonobo-2.0 bonobo-activation-2.0],, [AC_MSG_ERROR([unable to find the Bonobo IDL modules])])
 
-### optional libraries
+### optional libraries and programs
 
 # not needed by end-users, as generated files are distributed
+AC_PATH_PROG(AML, aml)
 AC_PATH_PROG(GOB2, gob2)
 
 MN_FEATURE_VAR_NAME(mime)=no
@@ -191,7 +192,6 @@ MN_FEATURES_DEFINE([mbox, mh, maildir, pop3, imap, ssl, sasl, ipv6, gmail, evolu
 ### output
 
 AC_CONFIG_FILES(Makefile
-		aml/Makefile
 		art/Makefile
 		data/Makefile
 		help/Makefile
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -72,6 +72,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -122,6 +122,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
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-05-16
+      2006-05-18
     </date>
-    <version identifier="2.13" date="2006-05-16" description="Fourteenth release"/>
+    <version identifier="2.14" date="2006-05-18" description="Fifteenth release"/>
     <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 "3.0 Release Candidate 1">
-  <!ENTITY manrevision "2.13">
-  <!ENTITY date "Tuesday, May 16, 2006">
+  <!ENTITY appversion "3.0 Release Candidate 2">
+  <!ENTITY manrevision "2.14">
+  <!ENTITY date "Thursday, May 18, 2006">
 
   <!ENTITY project "The Mail Notification Project">
 
@@ -26,7 +26,7 @@
   <!ENTITY gnomevfs "<link linkend=&#34;gnomevfs&#34;>GnomeVFS</link>">
 ]>
 
-<!-- $Id: mail-notification.xml,v 1.130 2006/05/16 00:10:50 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.132 2006/05/18 13:28:55 jylefort Exp $ -->
 <!-- Mail Notification Manual -->
 
 <!-- Copyright (C) 2004-2006 Jean-Yves Lefort -->
@@ -136,6 +136,17 @@
 	</revdescription>
       </revision>
       <revision>
+	<revnumber>Mail Notification Manual V2.13</revnumber>
+	<date>Tuesday, May 16, 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.12</revnumber>
 	<date>Tuesday, August 9, 2005</date>
 	<revdescription>
@@ -1602,6 +1613,7 @@ widget "*" style "mn-icons"</programlisting>
 	<listitem><para>Pav Lucistnik</para></listitem>
 	<listitem><para>Filip Miletic</para></listitem>
 	<listitem><para>Phil Nelson</para></listitem>
+	<listitem><para>Daniel Nylander</para></listitem>
 	<listitem><para>Maurycy Pawłowski-Wieroński</para></listitem>
 	<listitem><para>Vladimir Petkov</para></listitem>
 	<listitem><para>Benoît Rouits</para></listitem>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -65,6 +65,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -56,6 +56,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/po/cs.po b/po/cs.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 3.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-13 19:16+0200\n"
-"PO-Revision-Date: 2006-02-26 05:21+0100\n"
+"POT-Creation-Date: 2006-05-16 09:18+0200\n"
+"PO-Revision-Date: 2006-05-18 14:59+0200\n"
 "Last-Translator: Pav Lucistnik <pav@FreeBSD.org>\n"
 "Language-Team: Pav Lucistnik <pav@FreeBSD.org>\n"
 "MIME-Version: 1.0\n"
@@ -44,14 +44,12 @@ msgid "Mail Notification / Evolution glue factory"
 msgstr "Upozornění na poštu / Evolution glue factory"
 
 #: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
 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
-#: ../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:227
+#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
 msgid "Mail Notification"
 msgstr "Upozornění na poštu"
 
@@ -60,185 +58,141 @@ msgid "Get notified when new mail arrives"
 msgstr "Upozorňovat když přijde nová pošta"
 
 #: ../data/mail-notification.schemas.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:2
+#: ../data/mail-notification.schemas.in.h:3
 msgid "Blink on errors"
 msgstr "Blikat při chybě"
 
-#: ../data/mail-notification.schemas.in.h:3
-msgid "Delay between mail checks (minutes part)."
-msgstr "Interval mezi kontrolami pošty (minuty)."
-
 #: ../data/mail-notification.schemas.in.h:4
-msgid "Delay between mail checks (seconds part)."
-msgstr "Interval mezi kontrolami pošty (sekundy)."
+msgid "Click action"
+msgstr "Akce při kliknutí"
 
 #: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "Zobrazit souhrn pošty v tooltipu"
+msgid "Display seen mail"
+msgstr "Zobrazit přečtenou poštu"
 
 #: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "Nezobrazovat okamžitě chybový dialog"
-
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "Akce při dvojitém kliknutí"
-
-#: ../data/mail-notification.schemas.in.h:8
 msgid "Enable mail summary popup"
 msgstr "Povolit vyskakovací souhrn pošty"
 
-#: ../data/mail-notification.schemas.in.h:9
+#: ../data/mail-notification.schemas.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Obtisky důvěryhodných X509 certifikátů"
 
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Height of edit toolbars dialog"
-msgstr "Výška dialogu pro úpravu lišty nástrojů"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Height of main window"
-msgstr "Výška hlavního okna"
-
-#: ../data/mail-notification.schemas.in.h:12
+#: ../data/mail-notification.schemas.in.h:8
 msgid "Height of properties dialog"
 msgstr "Výška dialogu nastavení"
 
-#: ../data/mail-notification.schemas.in.h:13
+#: ../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:14
-msgid "Mail reader command"
-msgstr "Příkaz pro spuštění poštovního programu"
-
-#: ../data/mail-notification.schemas.in.h:15
+#: ../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:16
+#: ../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.h:17
+#: ../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.h:18
+#: ../data/mail-notification.schemas.in.h:13
 msgid "Mail summary popup position"
 msgstr "Pozice vyskakovacího souhrnu pošty"
 
-#: ../data/mail-notification.schemas.in.h:19
+#: ../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.h:20
+#: ../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.h:21
-msgid "Minutes between mail checks"
-msgstr "Minuty mezi kontrolami pošty"
-
-#: ../data/mail-notification.schemas.in.h:22
+#: ../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.h:23
+#: ../data/mail-notification.schemas.in.h:17
 msgid "New mail command"
 msgstr "Příkaz při nové poště"
 
-#: ../data/mail-notification.schemas.in.h:24
+#: ../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:25
+#: ../data/mail-notification.schemas.in.h:19
 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:26
+#: ../data/mail-notification.schemas.in.h:20
 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:27
-msgid "Seconds between mail checks"
-msgstr "Sekundy mezi kontrolami pošty"
-
-#: ../data/mail-notification.schemas.in.h:28
+#: ../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.h:29
-msgid "Set a mail reader"
-msgstr "Nastavit poštovní program"
-
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.h:22
 msgid ""
-"The action to perform when the icon is double-clicked. Must be \"display-"
-"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
-"Kterou akci vykonat při dvojitém kliknutí na ikonu. Musí být \"display-"
-"main-window\" (zobrazit hlavní okno), \"launch-mail-reader\" (spustit "
-"poštovní program) nebo \"update-mail-status\" (aktualizovat stav pošty)."
+"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:31
+#: ../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)."
 
-#: ../data/mail-notification.schemas.in.h:32
+#: ../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:33
+#: ../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í)."
+"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:34
-msgid "The command to run to launch the mail reader."
-msgstr "Příkaz pro spuštění poštovního programu."
-
-#: ../data/mail-notification.schemas.in.h:35
+#: ../data/mail-notification.schemas.in.h:26
 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:36
+#: ../data/mail-notification.schemas.in.h:27
 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:37
+#: ../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:38
+#: ../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.h:39
-msgid "The height of the edit toolbars dialog in pixels."
-msgstr "Výška dialogu pro úpravu lišty nástrojů v pixelech."
-
-#: ../data/mail-notification.schemas.in.h:40
-msgid "The height of the main window in pixels."
-msgstr "Výška hlavního okna v pixelech."
-
-#: ../data/mail-notification.schemas.in.h:41
+#: ../data/mail-notification.schemas.in.h:30
 msgid "The height of the properties dialog in pixels."
 msgstr "Výška dialogu nastavení v pixelech."
 
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.h:31
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
@@ -246,13 +200,13 @@ 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:43
+#: ../data/mail-notification.schemas.in.h:32
 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:44
+#: ../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."
@@ -260,7 +214,7 @@ 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:45
+#: ../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."
@@ -268,133 +222,84 @@ 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:46
+#: ../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)."
+"\"top-right\" (vpravo nahoře), \"bottom-left\" (vlevo dole), \"bottom-right"
+"\" (vpravo dole)."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.h:36
 msgid ""
-"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
-"\"both\" or \"both-horiz\"."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
 msgstr ""
-"Vzhled lišty nástrojů. Musí být \"desktop-default\", \"icons\", \"text\", "
-"\"both\" nebo \"both=horiz\"."
+"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:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "Šířka dialogu pro úpravu lišty nástrojů v pixelech."
-
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "Šířka hlavního okna v pixelech."
-
-#: ../data/mail-notification.schemas.in.h:50
+#: ../data/mail-notification.schemas.in.h:37
 msgid "The width of the properties dialog in pixels."
 msgstr "Šířka dialogu nastavení v pixelech."
 
-#: ../data/mail-notification.schemas.in.h:51
-msgid "Toolbars style"
-msgstr "Vzhled lišty nástrojů"
+#: ../data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "Souhrn pošty v tooltipu"
 
-#: ../data/mail-notification.schemas.in.h:52
+#: ../data/mail-notification.schemas.in.h:39
 msgid "Trusted servers list"
 msgstr "Seznam důvěryhodných serverů"
 
-#: ../data/mail-notification.schemas.in.h:53
-msgid "View statusbar"
-msgstr "Zobrazit statovou lištu"
-
-#: ../data/mail-notification.schemas.in.h:54
-msgid "View toolbars"
-msgstr "Zobrazit lišty nástrojů"
-
-#: ../data/mail-notification.schemas.in.h:55
+#: ../data/mail-notification.schemas.in.h:40
 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:56
-msgid "Whether the statusbar should be visible or not."
-msgstr "Jestli má být statová lišta viditelná nebo ne."
-
-#: ../data/mail-notification.schemas.in.h:57
-msgid "Whether the toolbars should be visible or not."
-msgstr "Jestli mají být lišty nástrojů viditelné nebo ne."
-
-#: ../data/mail-notification.schemas.in.h:58
+#: ../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:59
-msgid "Whether to display the mail summary in the status icon tooltip or not."
-msgstr "Jestli zobrazit souhrn pošty v tooltipu statové ikony nebo ne."
+#: ../data/mail-notification.schemas.in.h:42
+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
+msgid "Whether to display seen mail or not."
+msgstr "Jestli zobrazit přečtenou poštu nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:60
+#: ../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."
+msgstr ""
+"Jestli zobrazit vyskakovací souhrn pošty když dorazí nová pošta nebo ne."
 
-#: ../data/mail-notification.schemas.in.h:61
+#: ../data/mail-notification.schemas.in.h:45
 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."
 
-#: ../data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to prevent the immediate notification error dialog from being "
-"displayed or not."
-msgstr ""
-"Jestli zabránit chybovému dialogu v zobrazování nebo ne."
-
-#: ../data/mail-notification.schemas.in.h:63
+#: ../data/mail-notification.schemas.in.h:46
 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:64
+#: ../data/mail-notification.schemas.in.h:47
 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:65
-msgid "Whether to set a mail reader or not."
-msgstr "Jestli nastavit poštovní program nebo ne."
-
-#: ../data/mail-notification.schemas.in.h:66
-msgid "Width of edit toolbars dialog"
-msgstr "Šířka dialogu pro úpravu lišt nástrojů"
-
-#: ../data/mail-notification.schemas.in.h:67
-msgid "Width of main window"
-msgstr "Šířka hlavního okna"
-
-#: ../data/mail-notification.schemas.in.h:68
+#: ../data/mail-notification.schemas.in.h:48
 msgid "Width of properties dialog"
 msgstr "Šířka dialogu nastavení"
 
-#: ../data/mail-notification.soundlist.in.h:2
-msgid "New Mail"
-msgstr "Nová pošta"
-
-#: ../src/egg-editable-toolbar.c:534
-msgid "_Remove Toolbar"
-msgstr "_Odstranit lištu nástrojů"
-
-#: ../src/egg-toolbar-editor.c:555
-msgid "Separator"
-msgstr "Oddělovač"
-
-#: ../src/eggtrayicon.c:128
+#: ../src/eggtrayicon.c:132
 msgid "Orientation"
 msgstr "Orientace"
 
-#: ../src/eggtrayicon.c:129
+#: ../src/eggtrayicon.c:133
 msgid "The orientation of the tray."
 msgstr "Orientace oznamovací oblasti."
 
-#: ../src/mn-about-dialog.gob:48
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:49
 msgid "A Mail Notification Icon"
 msgstr "Ikona Upozornění na poštu"
 
@@ -402,16 +307,16 @@ 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:56
+#: ../src/mn-about-dialog.gob:57
 msgid "translator-credits"
 msgstr "Pav Lučištník &lt;pav@FreeBSD.org&gt;"
 
-#: ../src/mn-about-dialog.gob:78
+#: ../src/mn-about-dialog.gob:79
 msgid "Unable to open link"
 msgstr "Nemohu otevřít odkaz"
 
 #: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:92
+#: ../src/mn-autodetect-mailbox-properties.gob:109
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">autodetekovat</span>"
 
@@ -423,124 +328,113 @@ msgstr "_Jméno uživatele:"
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../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 ""
-"Upozornění na poštu se nemohlo přihlásit do %s schránky %s, pravděpodobně "
-"protože přihlašovací údaje, které jste zadal, nejsou platné.\n"
-"\n"
-"Prosím zadejte znovu přihlašovací údaje."
-
-#: ../src/mn-authenticated-mailbox.gob:153
-#, 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
-#: ../src/mn-authenticated-mailbox.gob:195
-msgid "Authentication Required"
-msgstr "Vyžadována autentizace"
-
-#: ../src/mn-autodetect-mailbox-properties.gob:93
+#: ../src/mn-autodetect-mailbox-properties.gob:110
 msgid "Location"
 msgstr "Umístění"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:122
 msgid "_Location:"
 msgstr "_Umístění:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
 msgid "_Browse..."
 msgstr "_Procházet..."
 
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
 msgid "Select a File or Folder"
 msgstr "Zvolte soubor nebo složku"
 
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:247
 #, c-format
 msgid "resolving %s"
 msgstr "hledám %s"
 
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:263
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "nemohu nalézt %s: %s"
 
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:304
+#, c-format
+msgid "network address #%i"
+msgstr "síťová adresa #%i"
+
+#: ../src/mn-client-session.c:307
+#, 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
 #, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: nepodporovaná adresní rodina"
 
-#: ../src/mn-client-session.c:315
+#: ../src/mn-client-session.c:325
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: nemohu vytvořit soket: %s"
 
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:329
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "připojování k %s (%s) port %i"
 
-#: ../src/mn-client-session.c:322
+#: ../src/mn-client-session.c:332
 #, c-format
 msgid "unable to connect: %s"
 msgstr "nemohu se připojit: %s"
 
-#: ../src/mn-client-session.c:327
+#: ../src/mn-client-session.c:337
 msgid "connected successfully"
 msgstr "úspěšně připojen"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:333
+#: ../src/mn-client-session.c:351
 #, c-format
 msgid "unable to connect to %s"
 msgstr "nemohu se připojit k %s"
 
-#: ../src/mn-client-session.c:360
+#: ../src/mn-client-session.c:378
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "nemohu inicializovat knihovnu OpenSSL: %s"
 
-#: ../src/mn-client-session.c:368
+#: ../src/mn-client-session.c:386
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "nemohu vytvořit SSL/TLS objekt: %s"
 
-#: ../src/mn-client-session.c:374
+#: ../src/mn-client-session.c:392
 #, 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:380
+#: ../src/mn-client-session.c:398
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "nemohu provést SSL/TLS handshake: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:404
 msgid "untrusted server"
 msgstr "nedůvěryhodný server"
 
-#: ../src/mn-client-session.c:390
+#: ../src/mn-client-session.c:408
 #, 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:437
+#: ../src/mn-client-session.c:455
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, obtisk: %s"
 
-#: ../src/mn-client-session.c:466
+#: ../src/mn-client-session.c:484
 msgid "missing certificate"
 msgstr "chybí certifikát"
 
-#: ../src/mn-client-session.c:492
+#: ../src/mn-client-session.c:510
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -551,162 +445,191 @@ msgid ""
 "to \"%s\". If you choose to connect to the server, this message will not be "
 "shown again."
 msgstr ""
-"\"%s\" (%s) není důvěryhodný. Je možné, že někdo zachycuje komunikaci "
-"za účelem získání důvěrných údajů.\n"
+"\"%s\" (%s) není důvěryhodný. Je možné, že někdo zachycuje komunikaci za "
+"účelem získání důvěrných údajů.\n"
 "\n"
-"Neměl byste se připojovat k serveru, pokud si nejste jistý, že jste připojen "
-" k \"%s\". Pokud zvolíte připojení k serveru, tato zpráva již nebude znovu "
-"zobrazena."
+"Neměl byste se připojovat k serveru, pokud si nejste jistý, že jste "
+"připojen  k \"%s\". Pokud zvolíte připojení k serveru, tato zpráva již "
+"nebude znovu zobrazena."
 
-#: ../src/mn-client-session.c:507
+#: ../src/mn-client-session.c:525
 msgid "Connect to untrusted server?"
 msgstr "Připojit k nedůvěryhodnému serveru?"
 
-#: ../src/mn-client-session.c:571
+#: ../src/mn-client-session.c:590
 #, 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:599
+#: ../src/mn-client-session.c:619
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "nemohu zpracovat odezvu \"%s\""
 
-#: ../src/mn-client-session.c:649 ../src/mn-client-session.c:656
+#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "nemohu číst ze serveru: %s"
 
-#: ../src/mn-client-session.c:654
+#: ../src/mn-client-session.c:674
 msgid "unable to read from server: EOF"
 msgstr "nemohu část ze serveru: EOF"
 
-#: ../src/mn-client-session.c:666
+#: ../src/mn-client-session.c:686
 #, c-format
 msgid "unable to decode data using SASL: %s"
 msgstr "nemohu dešifrovat data pomoci SASL: %s"
 
-#: ../src/mn-client-session.c:811
+#: ../src/mn-client-session.c:831
 #, c-format
 msgid "unable to encode data using SASL: %s"
 msgstr "nemohu zašifrovat data pomoci SASL: %s"
 
-#: ../src/mn-client-session.c:842 ../src/mn-client-session.c:849
+#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "nemohu zapsat na server: %s"
 
-#: ../src/mn-client-session.c:847
+#: ../src/mn-client-session.c:867
 msgid "unable to write to server: EOF"
 msgstr "nemohu zapsat na server: EOF"
 
-#: ../src/mn-client-session.c:878 ../src/mn-pop3-mailbox.gob:468
+#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "nemohu převést do Base64: %s"
 
-#: ../src/mn-client-session.c:1056
+#: ../src/mn-client-session.c:1075
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "nemohu inicializovat knihovnu SASL: %s"
 
-#: ../src/mn-client-session.c:1068
+#: ../src/mn-client-session.c:1087
 #, 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:1074
+#: ../src/mn-client-session.c:1093
 #, 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:1108
+#: ../src/mn-client-session.c:1127
 #, c-format
 msgid "unable to set SASL security properties: %s"
 msgstr "nemohu nastavit zabezpečení SASL: %s"
 
-#: ../src/mn-client-session.c:1132
+#: ../src/mn-client-session.c:1151
 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"
+msgstr "nemohu zahájit ověření SASL: SASL se zeptal na něco, co neznáme"
 
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1170
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "nemohu zahájit ověření SASL: %s"
 
-#: ../src/mn-client-session.c:1155
+#: ../src/mn-client-session.c:1174
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "nemohu vytvořit SASL spojení: %s"
 
-#: ../src/mn-client-session.c:1202
+#: ../src/mn-client-session.c:1221
 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:1219
+#: ../src/mn-client-session.c:1238
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, přerušuji ověření SASL"
 
 #. compliance error
-#: ../src/mn-client-session.c:1224
+#: ../src/mn-client-session.c:1243
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "nemohu zpracovat Base64 údaje od serveru: %s"
 
-#: ../src/mn-client-session.c:1260
+#: ../src/mn-client-session.c:1279
 #, 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:1265
+#: ../src/mn-client-session.c:1284
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "nelze získat vlastnost SASL_MAXOUTBUF: %s"
 
-#: ../src/mn-client-session.c:1271
+#: ../src/mn-client-session.c:1290
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "varování: nelze získat vlastnost SASL_SSF: %s"
 
-#: ../src/mn-conf.c:240
+#: ../src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "neznámá chyba serveru"
+
+#: ../src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "Schránka"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "Od"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "Předmět"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "Odesláno"
+
+#: ../src/mn-conf.c:262
 msgid "A directory creation error has occurred"
 msgstr "Chyba při vytváření adresáře"
 
-#: ../src/mn-conf.c:241
+#: ../src/mn-conf.c:263
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
 msgstr "Nemohu vytvořit adresář \"%s\": %s."
 
-#: ../src/mn-conf.c:317
+#: ../src/mn-conf.c:402
 #, c-format
 msgid "recursively unsetting %s"
 msgstr "rekurzivně odnastavuji %s"
 
-#: ../src/mn-conf.c:321
+#: ../src/mn-conf.c:406
 msgid "syncing the GConf database"
 msgstr "synchronizuji GConf databázi"
 
-#: ../src/mn-conf.c:324
+#: ../src/mn-conf.c:409
 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
 msgid "invalid location"
 msgstr "neplatné umístění"
 
-#: ../src/mn-evolution-folder-tree-control.c:86
+#: ../src/mn-evolution-folder-tree-control.c:91
 msgid "The currently selected URI"
 msgstr "Vybrané URI"
 
-#: ../src/mn-evolution-mailbox-properties.gob:67
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:68
 msgid "Folder"
 msgstr "Složka"
 
-#: ../src/mn-evolution-mailbox-properties.gob:169
+#: ../src/mn-evolution-mailbox-properties.gob:159
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
@@ -714,28 +637,28 @@ 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:61
+#: ../src/mn-evolution-mailbox.gob:75
 msgid "folder not found"
 msgstr "složka nenalezena"
 
-#: ../src/mn-evolution-mailbox.gob:182
+#: ../src/mn-evolution-mailbox.gob:216
 msgid "unable to contact Evolution"
 msgstr "nemohu se spojit s Evolution"
 
-#: ../src/mn-evolution-plugin.c:130 ../src/mn-evolution-plugin.c:134
+#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "Nemohu aktivovat Mail Notification plugin"
 
-#: ../src/mn-evolution-plugin.c:130
+#: ../src/mn-evolution-plugin.c:136
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonobo nemohlo nalézt server %s. Prosím zkontrolujte instalaci Upozornění "
-"na poštu."
+"Bonobo nemohlo nalézt server %s. Prosím zkontrolujte instalaci Upozornění na "
+"poštu."
 
-#: ../src/mn-evolution-plugin.c:134 ../src/mn-main.c:427
+#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
@@ -744,26 +667,26 @@ msgstr ""
 "Bonobo nemohlo zaregistrovat server %s. Prosím zkontrolujte instalaci "
 "Upozornění na poštu."
 
-#: ../src/mn-gmail-mailbox.gob:111
+#: ../src/mn-gmail-mailbox.gob:103
 msgid "invalid feed location"
 msgstr "neplatné umístění zdroje"
 
-#: ../src/mn-gmail-mailbox.gob:125
+#: ../src/mn-gmail-mailbox.gob:117
 #, c-format
 msgid "retrieving feed from %s"
 msgstr "získávám zdroj z %s"
 
-#: ../src/mn-gmail-mailbox.gob:132
+#: ../src/mn-gmail-mailbox.gob:124
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "nemohu získat zdroj: %s"
 
-#: ../src/mn-gmail-mailbox.gob:147 ../src/mn-gmail-mailbox.gob:194
+#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
 msgid "unable to parse feed"
 msgstr "nemohu zpracovat zdroj"
 
 #: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:152
+#: ../src/mn-sylpheed-mailbox-backend.gob:205
 #, c-format
 msgid "unable to read %s: %s"
 msgstr "nemohu číst %s: %s"
@@ -783,66 +706,62 @@ msgstr "nemohu posouvat v %s: %s"
 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:158
+#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
 #, c-format
 msgid "unable to close %s: %s"
 msgstr "nemohu zavřít %s: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:113
+#: ../src/mn-imap-mailbox-properties.gob:114
+#: ../src/mn-standard-message-view.gob:62
 msgid "Mailbox:"
 msgstr "Schránka:"
 
-#: ../src/mn-imap-mailbox-properties.gob:117
+#: ../src/mn-imap-mailbox-properties.gob:118
 msgid "in_box"
 msgstr "_inbox"
 
-#: ../src/mn-imap-mailbox-properties.gob:128
+#: ../src/mn-imap-mailbox-properties.gob:129
 msgid "oth_er:"
 msgstr "_jiná:"
 
-#: ../src/mn-imap-mailbox-properties.gob:139
+#: ../src/mn-imap-mailbox-properties.gob:140
 msgid "ne_ver"
 msgstr "_nikdy"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
+#: ../src/mn-imap-mailbox-properties.gob:141
 msgid "au_todetect"
 msgstr "_autodetekovat"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
+#: ../src/mn-imap-mailbox-properties.gob:142
 msgid "al_ways"
 msgstr "_vždy"
 
-#: ../src/mn-imap-mailbox-properties.gob:173
+#: ../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.gob:390
+#: ../src/mn-imap-mailbox.gob:384
 msgid "server did not send capabilities"
 msgstr "server neposlal capability"
 
-#: ../src/mn-imap-mailbox.gob:573
+#: ../src/mn-imap-mailbox.gob:551
 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:574
+#: ../src/mn-imap-mailbox.gob:552
 msgid "unable to login"
 msgstr "nemohu se přihlásit"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:714
-msgid "server did not send search results"
-msgstr "server neposlal výsledky hledání"
-
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:792
+#: ../src/mn-imap-mailbox.gob:752
 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:859
+#: ../src/mn-imap-mailbox.gob:822
 msgid "unable to fetch message"
 msgstr "nemohu stáhnout zprávu"
 
-#: ../src/mn-imap-mailbox.gob:875
+#: ../src/mn-imap-mailbox.gob:847
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
@@ -850,31 +769,26 @@ msgstr ""
 "\"Použít rozšíření IDLE\" nastaveno na \"never\" ve vlastnostech schránky, "
 "odpojuji se"
 
-#: ../src/mn-imap-mailbox.gob:886
+#: ../src/mn-imap-mailbox.gob:858
 #, 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:891
+#: ../src/mn-imap-mailbox.gob:863
 #, 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ě"
+msgstr "vzdálený server běží %s, rozšíření IDLE nemusí pracovat správně"
 
-#: ../src/mn-imap-mailbox.gob:900
+#: ../src/mn-imap-mailbox.gob:872
 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:1251 ../src/mn-pop3-mailbox.gob:1124
-msgid "unknown server error"
-msgstr "neznámá chyba serveru"
-
-#: ../src/mn-imap-mailbox.gob:1357 ../src/mn-pop3-mailbox.gob:311
+#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
 msgid "server does not support in-band SSL/TLS"
 msgstr "server nepodporuje in-band SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1381 ../src/mn-pop3-mailbox.gob:997
+#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
@@ -882,146 +796,183 @@ msgstr ""
 "přihlašovací mechanismus SASL byl vybrán, ale podpora SASL nebyla "
 "zkompilována "
 
-#: ../src/mn-imap-mailbox.gob:1391 ../src/mn-pop3-mailbox.gob:1017
+#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
 msgstr "neznámý přihlašovací mechanismus \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1423 ../src/mn-pop3-mailbox.gob:1053
+#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
 #, 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:1435
+#: ../src/mn-imap-mailbox.gob:1455
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "zkouším přihlášení IMAP LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:1447 ../src/mn-pop3-mailbox.gob:1082
+#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
 msgid "authentication failed"
 msgstr "přihlášení selhalo"
 
-#: ../src/mn-mail-icon.gob:91
-msgid "Main _Window"
-msgstr "_Hlavní okno"
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "server neposlal výsledky hledání"
 
-#: ../src/mn-mail-icon.gob:92 ../src/mn-main-window.gob:165
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:89
 msgid "_Mail Reader"
 msgstr "_Poštovní program"
 
-#: ../src/mn-mail-icon.gob:93 ../src/mn-main-window.gob:173
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
 msgid "_Update"
 msgstr "_Aktualizovat"
 
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
 msgid "R_emove From Notification Area"
 msgstr "_Odstranit z oznamovací oblasti"
 
-#: ../src/mn-mailbox-properties-dialog.gob:88
+#. 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
 #, c-format
 msgid "%s Properties"
 msgstr "Vlastnosti %s"
 
-#: ../src/mn-mailbox-properties-dialog.gob:205
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:232
 msgid "Add a Mailbox"
 msgstr "Přidat schránku"
 
-#: ../src/mn-mailbox-view.gob:179
+#: ../src/mn-mailbox-view.gob:248
 msgid "A paste error has occurred"
 msgstr "Chyba při vložení"
 
-#: ../src/mn-mailbox-view.gob:320 ../src/mn-message-view.gob:313
-msgid "Mailbox"
-msgstr "Schránka"
-
-#: ../src/mn-mailbox-view.gob:523
+#: ../src/mn-mailbox-view.gob:557
 #, c-format
 msgid "unhandled %s mailbox (%s)"
 msgstr "nezpracovaná %s schránka (%s)"
 
-#: ../src/mn-mailbox-view.gob:528
+#: ../src/mn-mailbox-view.gob:562
 #, c-format
 msgid "%s mailbox"
 msgstr "%s schránka"
 
-#: ../src/mn-mailbox-view.gob:543
+#: ../src/mn-mailbox-view.gob:577
 msgid "detecting mailbox type..."
 msgstr "detekuji typ schránky..."
 
-#: ../src/mn-mailbox.gob:278
+#: ../src/mn-mailbox.gob:472
 msgid "\"type\" attribute missing"
 msgstr "atribut \"type\" chybí"
 
-#: ../src/mn-mailbox.gob:285
+#: ../src/mn-mailbox.gob:479
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "neznámý typ schránky \"%s\""
 
-#: ../src/mn-mailbox.gob:305
+#: ../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\""
+msgstr "vlastnost \"%s\": nemohu převést řetězec \"%s\" do hodnoty typu \"%s\""
 
-#: ../src/mn-mailbox.gob:744
+#: ../src/mn-mailbox.gob:948
 #, c-format
 msgid "property \"%s\" has no value"
 msgstr "vlastnost \"%s\" nemá žádnou hodnotu"
 
-#: ../src/mn-mailboxes.gob:203
+#: ../src/mn-mailboxes.gob:239
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Při importování starých schránek nastala chyba"
 
-#: ../src/mn-mailboxes.gob:248
+#: ../src/mn-mailboxes.gob:265
 msgid "Unable to load the mailboxes configuration"
 msgstr "Nemohu načíst nastavení schránek"
 
-#: ../src/mn-mailboxes.gob:294
+#: ../src/mn-mailboxes.gob:311
 msgid "Unable to parse the XML document."
 msgstr "Nemohu zpracovat XML dokument."
 
-#: ../src/mn-mailboxes.gob:301
+#: ../src/mn-mailboxes.gob:318
 msgid "The root element is missing."
 msgstr "Kořenový elemtn chybí."
 
-#: ../src/mn-mailboxes.gob:307
+#: ../src/mn-mailboxes.gob:324
 #, c-format
 msgid "The root element \"%s\" is invalid."
 msgstr "Kořenový element \"%s\" je neplatný."
 
-#: ../src/mn-mailboxes.gob:330
+#: ../src/mn-mailboxes.gob:347
 #, c-format
 msgid "On line %i: %s."
 msgstr "Na řádku %i: %s."
 
-#: ../src/mn-mailboxes.gob:335
+#: ../src/mn-mailboxes.gob:352
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
 msgstr "Na řádku %i: neznámý element \"%s\"."
 
-#: ../src/mn-mailboxes.gob:346
+#: ../src/mn-mailboxes.gob:361
 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:371
+#: ../src/mn-mailboxes.gob:386
 msgid "Unable to save the mailboxes configuration"
 msgstr "Nemohu uložit nastavení schránek"
 
-#: ../src/mn-mailboxes.gob:417
+#: ../src/mn-mailboxes.gob:428
+#, c-format
+msgid "Unable to remove %s: %s."
+msgstr "Nemohu odstranit %s: %s."
+
+#: ../src/mn-mailboxes.gob:436
+#, c-format
+msgid "Unable to create %s: %s."
+msgstr "Nemohu vytvořit %s: %s."
+
+#: ../src/mn-mailboxes.gob:443
+#, c-format
+msgid "Unable to open %s for writing: %s."
+msgstr "Nemohu otevřít %s pro zápis: %s."
+
+#: ../src/mn-mailboxes.gob:450
 msgid "Unable to write the XML document."
 msgstr "Nemohu zapsat XML dokument."
 
+#: ../src/mn-mailboxes.gob:456
+#, c-format
+msgid "Unable to close %s: %s."
+msgstr "Nemohu zavřít %s: %s."
+
+#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#, c-format
+msgid "Unable to rename %s to %s: %s."
+msgstr "Nemohu přejmenovat %s na %s: %s."
+
 #. non fatal
-#: ../src/mn-mailboxes.gob:433
+#: ../src/mn-mailboxes.gob:479
 #, c-format
 msgid "unable to delete %s: %s"
 msgstr "nemohu smazat %s: %s"
 
-#: ../src/mn-mailboxes.gob:457
+#: ../src/mn-mailboxes.gob:509
 #, c-format
 msgid "%s has %i new message"
 msgid_plural "%s has %i new messages"
@@ -1029,230 +980,97 @@ 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:483
+#: ../src/mn-mailboxes.gob:535
 #, c-format
 msgid "%s reported an error: %s"
 msgstr "%s hlásí chybu: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:111
+#: ../src/mn-maildir-mailbox-backend.gob:125
 #, c-format
-msgid "unable to open folder \"new\": %s"
-msgstr "nemohu otevřít služku \"new\": %s"
+msgid "unable to open folder \"%s\": %s"
+msgstr "nemohu otevřít služku \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:144
+#: ../src/mn-maildir-mailbox-backend.gob:173
 #, c-format
-msgid "unable to close folder \"new\": %s"
-msgstr "nemohu zavřít složku \"new\": %s"
+msgid "unable to close folder \"%s\": %s"
+msgstr "nemohu zavřít složku \"%s\": %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:147
+#: ../src/mn-maildir-mailbox-backend.gob:176
 #, c-format
-msgid "error while reading folder \"new\": %s"
-msgstr "chyba během čtení složky \"new\": %s"
-
-#: ../src/mn-main-window.gob:106
-msgid "Help messages"
-msgstr "Zprávy s nápovědou"
-
-#: ../src/mn-main-window.gob:107
-msgid "Count messages"
-msgstr "Zprávy o počtu"
-
-#. Toplevel
-#: ../src/mn-main-window.gob:156
-msgid "_Mail"
-msgstr "_Pošta"
-
-#: ../src/mn-main-window.gob:157
-msgid "_Edit"
-msgstr "_Upravit"
-
-#: ../src/mn-main-window.gob:158
-msgid "_View"
-msgstr "_Zobrazit"
-
-#: ../src/mn-main-window.gob:159
-msgid "_Help"
-msgstr "_Nápověda"
-
-#: ../src/mn-main-window.gob:167
-msgid "Launch the mail reader"
-msgstr "Spustit poštovní program"
-
-#. Reload
-#: ../src/mn-main-window.gob:175 ../src/mn-main.c:248
-msgid "Update the mail status"
-msgstr "Aktualizovat stav pošty"
-
-#: ../src/mn-main-window.gob:181
-msgid "_Close"
-msgstr "_Zavřít"
-
-#: ../src/mn-main-window.gob:183
-msgid "Close this window"
-msgstr "Zavřít toto okno"
-
-#: ../src/mn-main-window.gob:189
-msgid "_Quit"
-msgstr "_Ukončit"
-
-#: ../src/mn-main-window.gob:191 ../src/mn-main.c:266
-msgid "Quit Mail Notification"
-msgstr "Ukončit Upozornění na poštu"
-
-#: ../src/mn-main-window.gob:199 ../src/mn-main-window.gob:247
-msgid "_Toolbars"
-msgstr "_Lišty nástrojů"
-
-#: ../src/mn-main-window.gob:201
-msgid "Customize the toolbars"
-msgstr "Upravit lišty nástrojů"
-
-#: ../src/mn-main-window.gob:207
-msgid "_Preferences"
-msgstr "_Nastavení"
-
-#: ../src/mn-main-window.gob:217
-msgid "Toolbars Styl_e"
-msgstr "_Vzhled lišt nástrojů"
+msgid "error while reading folder \"%s\": %s"
+msgstr "chyba během čtení složky \"%s\": %s"
 
-#: ../src/mn-main-window.gob:219
-msgid "Customize the toolbars style"
-msgstr "Upravit vzhled lišt nástrojů"
+#: ../src/mn-main.c:100
+msgid "yes"
+msgstr "ano"
 
-#: ../src/mn-main-window.gob:227
-msgid "_Contents"
-msgstr "_Obsah"
+#: ../src/mn-main.c:100
+msgid "no"
+msgstr "ne"
 
-#: ../src/mn-main-window.gob:229
-msgid "Display help"
-msgstr "Zobrazit nápovědu"
-
-#: ../src/mn-main-window.gob:235
-msgid "_About"
-msgstr "_O Upozornění na poštu"
-
-#: ../src/mn-main-window.gob:237
-msgid "Display credits"
-msgstr "Kredity"
-
-#: ../src/mn-main-window.gob:249
-msgid "Show or hide the toolbars"
-msgstr "Zobrazit nebo skrýt lišty nástrojů"
-
-#: ../src/mn-main-window.gob:256
-msgid "_Statusbar"
-msgstr "_Statová lišta"
-
-#: ../src/mn-main-window.gob:258
-msgid "Show or hide the statusbar"
-msgstr "Zobrazit nebo skrýt statovou lištu"
-
-#: ../src/mn-main-window.gob:269
-msgid "_Desktop Default"
-msgstr "_Výchozí nastavení"
-
-#: ../src/mn-main-window.gob:271
-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"
-
-#: ../src/mn-main-window.gob:277
-msgid "I_cons Only"
-msgstr "Pouze _ikony"
-
-#: ../src/mn-main-window.gob:279
-msgid "Only display the toolbars icons"
-msgstr "Zobrazí pouze ikony v lištách nástrojů"
-
-#: ../src/mn-main-window.gob:285
-msgid "_Text Only"
-msgstr "Pouze _text"
-
-#: ../src/mn-main-window.gob:287
-msgid "Only display the toolbars text"
-msgstr "Zobrazit pouze textové popisy v lištách nástrojů"
-
-#: ../src/mn-main-window.gob:293
-msgid "Text Belo_w Icons"
-msgstr "T_ext pod ikonami"
-
-#: ../src/mn-main-window.gob:295
-msgid "Display the toolbars text below the icons"
-msgstr "Zobrazit lišty nástrojů s texty pod ikonami"
-
-#: ../src/mn-main-window.gob:301
-msgid "Text Be_side Icons"
-msgstr "Text _vedle ikon"
+#: ../src/mn-main.c:132
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s verze %s\n"
 
-#: ../src/mn-main-window.gob:303
-msgid "Display the toolbars text beside the icons"
-msgstr "Zobrazit lišty nástrojů s texty vedle ikon"
+#: ../src/mn-main.c:137
+msgid "Mailbox backends:\n"
+msgstr "Backendy poštovních schránek:\n"
 
-#: ../src/mn-main-window.gob:345
-#, c-format
-msgid "unable to load menus.xml: %s"
-msgstr "nemohu načíst menus.xml: %s"
+#: ../src/mn-main.c:142
+msgid "POP3 and IMAP features:\n"
+msgstr "Funkce POP3 a IMAP:\n"
 
-#: ../src/mn-main-window.gob:388
-msgid "unable to load toolbars.xml"
-msgstr "nemohu načíst toolbars.xml"
+#: ../src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Funkce Sylpheed:\n"
 
-#: ../src/mn-main-window.gob:439
+#: ../src/mn-main.c:198
 #, c-format
-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 "A Bonobo exception (%s) has occurred in %s()."
+msgstr "Bonobo vyjímka (%s) nastala v %s()."
 
-#.
-#. * 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 "Podporované typy schránek v této kompilaci: "
+#: ../src/mn-main.c:220
+msgid "Show version information"
+msgstr "Zobrazit informace o verzi"
 
-#: ../src/mn-main.c:124
-msgid "Compiled-in POP3 and IMAP features: "
-msgstr "Funkce POP3 a IMAP zahrnuté v této kompilaci: "
-
-#: ../src/mn-main.c:194
+#: ../src/mn-main.c:229
 msgid "Enable informational output"
 msgstr "Povolit informační výstup"
 
-#: ../src/mn-main.c:203
-msgid "List the compiled-in features"
-msgstr "Vypsat funkce zahrnuté v této kompilaci"
-
-#: ../src/mn-main.c:212
-msgid "Display the main window"
-msgstr "Zobrazit hlavní okno"
-
-#: ../src/mn-main.c:221
+#: ../src/mn-main.c:238
 msgid "Display the properties dialog"
 msgstr "Zobrazit dialog nastavení"
 
-#: ../src/mn-main.c:230
+#: ../src/mn-main.c:247
 msgid "Display the about dialog"
 msgstr "Zobrazit dialog O aplikaci"
 
-#: ../src/mn-main.c:239
+#: ../src/mn-main.c:256
 msgid "Close the mail summary popup"
 msgstr "Zavřít vyskakovací souhrn pošty"
 
-#: ../src/mn-main.c:257
+#: ../src/mn-main.c:265
+msgid "Update the mail status"
+msgstr "Aktualizovat stav pošty"
+
+#: ../src/mn-main.c:274
 msgid "Unset obsolete GConf configuration"
 msgstr "Odnastavit zastaralé nastavení GConf"
 
+#: ../src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "Ukončit Upozornění na poštu"
+
 #.
-#. * 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:310
 msgid "multi-threading is not available"
 msgstr "vlákna nejsou k dispozici"
 
-#: ../src/mn-main.c:355
+#: ../src/mn-main.c:365
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
@@ -1260,124 +1078,64 @@ msgstr ""
 "Bonobo nemůže nalézt automation objekt. Prosím zkontrolujte instalaci "
 "Upozornění na poštu."
 
-#: ../src/mn-main.c:361
+#: ../src/mn-main.c:371
 msgid "quitting Mail Notification"
 msgstr "ukončuji Upozornění na poštu"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:375
 msgid "Mail Notification is not running"
 msgstr "Upozornění na poštu neběží"
 
-#: ../src/mn-main.c:372
+#: ../src/mn-main.c:390
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "Nemohu inicializovat knihovnu GnomeVFS."
 
-#: ../src/mn-main.c:404
+#: ../src/mn-main.c:438
 msgid "updating the mail status"
 msgstr "aktualizuji stav pošty"
 
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:446
 msgid "Mail Notification is already running"
 msgstr "Upozornění na poštu již běží"
 
-#: ../src/mn-main.c:423
+#: ../src/mn-main.c:456
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonobo nemohlo najít soubor %s. Prosím zkontrolujte instalaci Upozornění "
-"na poštu."
+"Bonobo nemohlo najít soubor %s. Prosím zkontrolujte instalaci Upozornění na "
+"poštu."
 
-#: ../src/mn-mbox-mailbox-backend.gob:209
+#: ../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:226
+#: ../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:104
+#: ../src/mn-message-mime.c:121
 msgid "unable to parse MIME message"
 msgstr "nemohu zpracovat MIME zprávu"
 
-#: ../src/mn-message-view.gob:82
-msgid "You have no new mail."
-msgstr "Nemáte žádnou novou poštu."
-
-#: ../src/mn-message-view.gob:322
-msgid "Unreadable message"
-msgstr "Nečitelná zpráva"
-
-#: ../src/mn-message-view.gob:330
-msgid "From"
-msgstr "Od"
-
-#: ../src/mn-message-view.gob:338
-msgid "Subject"
-msgstr "Předmět"
-
-#: ../src/mn-message-view.gob:349
-msgid "Sent"
-msgstr "Odesláno"
-
-#: ../src/mn-message.gob:99
+#: ../src/mn-message.gob:111
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: ../src/mn-message.gob:124
-#, c-format
-msgid "%i second ago"
-msgid_plural "%i seconds ago"
-msgstr[0] "před %i sekundou"
-msgstr[1] "před %i sekundami"
-msgstr[2] "před %i sekundami"
-
-#: ../src/mn-message.gob:128
-#, c-format
-msgid "about %i minute ago"
-msgid_plural "about %i minutes ago"
-msgstr[0] "před %i minutou"
-msgstr[1] "před %i minutami"
-msgstr[2] "před %i minutami"
-
-#: ../src/mn-message.gob:133
-#, c-format
-msgid "about %i hour ago"
-msgid_plural "about %i hours ago"
-msgstr[0] "před %i hodinou"
-msgstr[1] "před %i hodinami"
-msgstr[2] "před %i hodinami"
-
-#: ../src/mn-message.gob:138
-#, c-format
-msgid "about %i day ago"
-msgid_plural "about %i days ago"
-msgstr[0] "před %i dnem"
-msgstr[1] "před %i dny"
-msgstr[2] "před %i dny"
-
-#: ../src/mn-message.gob:143
-#, c-format
-msgid "about %i week ago"
-msgid_plural "about %i weeks ago"
-msgstr[0] "před %i týdnem"
-msgstr[1] "před %i týdny"
-msgstr[2] "před %i týdny"
-
 #. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:163
+#: ../src/mn-message.gob:130
 msgid "none"
 msgstr "žádná"
 
-#: ../src/mn-mh-mailbox-backend.gob:161
+#: ../src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "error while reading %s: %s"
 msgstr "chyba při čtení %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:174
+#: ../src/mn-mh-mailbox-backend.gob:180
 #, c-format
 msgid "unable to open %s: %s"
 msgstr "nemohu otevřít %s: %s"
@@ -1387,38 +1145,63 @@ msgid "sta_ndard"
 msgstr "_běžný"
 
 #: ../src/mn-pi-mailbox-properties.gob:68
-msgid "_in-band SSL/TLS"
-msgstr "_SSL/TLS"
+msgid "in-band SS_L/TLS"
+msgstr "SS_L/TLS"
 
 #: ../src/mn-pi-mailbox-properties.gob:69
 msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS _na samostatném portu"
 
 #: ../src/mn-pi-mailbox-properties.gob:73
-msgid "_Hostname:"
+msgid "Ho_stname:"
 msgstr "_Jméno počítače:"
 
-#: ../src/mn-pi-mailbox-properties.gob:93
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:94
 msgid "_Details"
 msgstr "_Detaily"
 
-#: ../src/mn-pi-mailbox-properties.gob:148
+#: ../src/mn-pi-mailbox-properties.gob:149
 msgid "Connection type:"
 msgstr "_Typ spojení:"
 
-#: ../src/mn-pi-mailbox-properties.gob:155
+#: ../src/mn-pi-mailbox-properties.gob:156
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/mn-pi-mailbox-properties.gob:178
-msgid "_Authentication mechanism:"
+#: ../src/mn-pi-mailbox-properties.gob:179
+msgid "Authent_ication mechanism:"
 msgstr "_Přihlašovací mechanismus:"
 
-#: ../src/mn-pi-mailbox.gob:113
+#: ../src/mn-pi-mailbox.gob:151
 msgid "SSL/TLS support has not been compiled in"
 msgstr "Podpora SSL/TLS není zahrnuta v této kompilaci"
 
-#: ../src/mn-pop3-mailbox.gob:359
+#: ../src/mn-pi-mailbox.gob:317
+#, 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 ""
+"Upozornění na poštu se nemohlo přihlásit do %s schránky %s, pravděpodobně "
+"protože přihlašovací údaje, které jste zadal, nejsou platné.\n"
+"\n"
+"Prosím zadejte znovu přihlašovací údaje."
+
+#: ../src/mn-pi-mailbox.gob:318
+#, 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
+msgid "Authentication Required"
+msgstr "Vyžadována autentizace"
+
+#: ../src/mn-pop3-mailbox.gob:344
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "nesmyslné hodnoty pro LOGIN-DELAY capabilitu"
 
@@ -1428,19 +1211,19 @@ msgstr "nesmyslné hodnoty pro LOGIN-DELAY capabilitu"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:519
+#: ../src/mn-pop3-mailbox.gob:485
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
 msgstr ""
-"Přihlášení SASL s úvodní odezvou klienta selhalo, zkouším bez úvodní odezvy "
-" klienta"
+"Přihlášení SASL s úvodní odezvou klienta selhalo, zkouším bez úvodní odezvy  "
+"klienta"
 
-#: ../src/mn-pop3-mailbox.gob:733
+#: ../src/mn-pop3-mailbox.gob:696
 msgid "unknown error"
 msgstr "neznámá chyba"
 
-#: ../src/mn-pop3-mailbox.gob:828
+#: ../src/mn-pop3-mailbox.gob:791
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
 msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1448,19 +1231,20 @@ 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:1009
+#: ../src/mn-pop3-mailbox.gob:959
 msgid "server does not support APOP authentication"
 msgstr "server nepodporuje přihlášení APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1065
+#: ../src/mn-pop3-mailbox.gob:1015
 msgid "falling back to APOP authentication"
 msgstr "zkouším přihlášení APOP"
 
-#: ../src/mn-pop3-mailbox.gob:1070
+#: ../src/mn-pop3-mailbox.gob:1020
 msgid "falling back to USER/PASS authentication"
 msgstr "zkouším přihlášení USER/PASS"
 
-#: ../src/mn-properties-dialog.gob:170 ../ui/properties-dialog.glade.h:10
+#. 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"
 
@@ -1480,11 +1264,11 @@ msgstr "vlevo dole"
 msgid "bottom right"
 msgstr "vpravo dole"
 
-#: ../src/mn-properties-dialog.gob:329
+#: ../src/mn-properties-dialog.gob:332
 msgid "No mailbox selected."
 msgstr "Není vybrána žádná schránka."
 
-#: ../src/mn-properties-dialog.gob:334
+#: ../src/mn-properties-dialog.gob:337
 #, c-format
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
@@ -1492,87 +1276,106 @@ 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:465
+#: ../src/mn-properties-dialog.gob:456
 #, c-format
 msgid "Test message #%i"
 msgstr "Ukázková zpráva #%i"
 
-#: ../src/mn-properties-dialog.gob:470
+#. 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:109
-msgid "You have new mail."
-msgstr "Máte novou poštu."
-
-#: ../src/mn-shell.gob:374
+#. translators: header capitalization
+#: ../src/mn-shell.gob:381
 msgid "Mailboxes Having New Mail"
 msgstr "Schránky s novou poštou"
 
-#: ../src/mn-shell.gob:393
+#. translators: header capitalization
+#: ../src/mn-shell.gob:400
 msgid "Errors"
 msgstr "Chyby"
 
-#: ../src/mn-shell.gob:408
+#. translators: header capitalization
+#: ../src/mn-shell.gob:416
 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
 msgid "unknown SSL/TLS error"
 msgstr "neznámá SSL/TLS chyba"
 
-#: ../src/mn-stock.c:28
-msgid "Select _All"
-msgstr "Vybrat _vše"
+#: ../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
+msgid "Sent:"
+msgstr "Odesláno:"
+
+#. translators: header capitalization
 #: ../src/mn-stock.c:29
-msgid "Leave Fullscreen"
-msgstr "Opustit celoobrazovkové zobrazení"
+msgid "Select _All"
+msgstr "Vybrat _vše"
 
-#: ../src/mn-stock.c:30
+#. translators: header capitalization
+#. translators: header capitalization
+#: ../src/mn-stock.c:32
 msgid "Co_nnect"
 msgstr "_Připojit"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:170
+#: ../src/mn-sylpheed-mailbox-backend.gob:223
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "nemohu otevřít složku: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:209
+#: ../src/mn-sylpheed-mailbox-backend.gob:276
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "nemohu zavřít složku: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:212
+#: ../src/mn-sylpheed-mailbox-backend.gob:279
 #, c-format
 msgid "error while reading folder: %s"
 msgstr "chyba při čtení složky: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:256
+#: ../src/mn-sylpheed-mailbox-backend.gob:420
 msgid "unexpected end of file"
 msgstr "neočekávaný konec souboru"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:270
+#: ../src/mn-sylpheed-mailbox-backend.gob:438
 #, c-format
 msgid "incompatible file version \"%i\""
 msgstr "nekompatibilní verze souboru \"%i\""
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:273
+#: ../src/mn-sylpheed-mailbox-backend.gob:441
 msgid "file version missing"
 msgstr "chybí verze souboru"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:39
-#: ../src/mn-system-vfs-mailbox-properties.gob:47
+#: ../src/mn-system-vfs-mailbox-properties.gob:40
+#: ../src/mn-system-vfs-mailbox-properties.gob:48
 #: ../src/mn-system-vfs-mailbox.gob:45
 msgid "System mailbox"
 msgstr "Systémová schránka"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:68
+#: ../src/mn-system-vfs-mailbox-properties.gob:70
 #, 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:75
+#: ../src/mn-system-vfs-mailbox-properties.gob:77
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
@@ -1581,56 +1384,69 @@ msgstr ""
 "prostředí MAIL."
 
 #: ../src/mn-system-vfs-mailbox.gob:72
-msgid "MAIL environment variable not defined"
-msgstr "Proměnná prostředí MAIL není definována"
+msgid "system mailbox not found"
+msgstr "systémová schránka nebyla nalezena"
 
-#: ../src/mn-util.c:281
+#: ../src/mn-util.c:349
 #, c-format
 msgid "error loading image: %s"
 msgstr "nemohu načíst obrázek: %s"
 
-#: ../src/mn-util.c:298
+#: ../src/mn-util.c:365
 #, c-format
-msgid "widget \"%s\" not found in interface \"%s\""
-msgstr "widget \"%s\" nebyl nalezen v rozhraní \"%s\""
+msgid ""
+"Unable to load interface \"%s\". Please check your Mail Notification "
+"installation."
+msgstr ""
+"Nelze načíst rozhraní \"%s\". Prosím zkontrolujte instalaci Upozornění na "
+"poštu."
 
-#: ../src/mn-util.c:398
+#: ../src/mn-util.c:380
 #, c-format
-msgid "unable to open self as a module: %s"
-msgstr "nemohu otevřít sebe jako modul: %s"
+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."
 
-#: ../src/mn-util.c:403
+#: ../src/mn-util.c:449
 #, c-format
-msgid "signal handler \"%s\" not found"
-msgstr "signal handler \"%s\" nebyl nalezen"
+msgid "Unable to open self as a module (%s)."
+msgstr "Nemohu otevřít sebe jako modul (%s)."
 
-#: ../src/mn-util.c:556 ../src/mn-util.c:579 ../src/mn-util.c:601
-#: ../src/mn-util.c:623
+#: ../src/mn-util.c:454
+#, 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."
+
+#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
+#: ../src/mn-util.c:670
 msgid "A drag and drop error has occurred"
 msgstr "Nastala chyba přetažení"
 
-#: ../src/mn-util.c:557
+#: ../src/mn-util.c:606
 msgid "An invalid location list has been received."
 msgstr "Obdržen neplatný seznam umístění."
 
-#: ../src/mn-util.c:602
+#: ../src/mn-util.c:649
 msgid "An invalid Mozilla location has been received."
 msgstr "Obdrženo neplatné umístění programu Mozilla."
 
-#: ../src/mn-util.c:678
+#: ../src/mn-util.c:725
 msgid "Unable to display help"
 msgstr "Nemohu zobrazit nápovědu"
 
-#: ../src/mn-util.c:692
+#: ../src/mn-util.c:739
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "Nemohu vytvořit vlákno: %s."
 
-#: ../src/mn-util.c:782
-msgid "_Do not show this message again"
-msgstr "_Příště nezobrazit tuto zprávu"
-
-#: ../src/mn-util.c:892
+#: ../src/mn-util.c:899
 #, c-format
 msgid ""
 "The following location is invalid:\n"
@@ -1653,271 +1469,567 @@ msgstr[2] ""
 "\n"
 "%s"
 
-#: ../src/mn-util.c:912
+#: ../src/mn-util.c:919
 msgid "A fatal error has occurred in Mail Notification"
 msgstr "Nastala fatální chyba"
 
-#: ../src/mn-util.c:951
+#: ../src/mn-util.c:958
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "nemohu získat aktuální čas: %s"
 
-#: ../src/mn-util.c:1013
+#: ../src/mn-util.c:1250
 #, c-format
-msgid "invalid signal specification \"%s\""
-msgstr "neplatná specifikace signálu \"%s\""
+msgid "%i second ago"
+msgid_plural "%i seconds ago"
+msgstr[0] "před %i sekundou"
+msgstr[1] "před %i sekundami"
+msgstr[2] "před %i sekundami"
 
-#: ../src/mn-util.c:1052
-msgid "A command error has occurred in Mail Notification"
-msgstr "Nastala chyba při spouštění příkazu"
+#: ../src/mn-util.c:1254
+#, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "před %i minutou"
+msgstr[1] "před %i minutami"
+msgstr[2] "před %i minutami"
 
-#: ../src/mn-util.c:1053
+#: ../src/mn-util.c:1259
 #, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Nemohu spustit \"%s\": %s."
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "před %i hodinou"
+msgstr[1] "před %i hodinami"
+msgstr[2] "před %i hodinami"
 
-#: ../src/mn-util.c:1311
+#: ../src/mn-util.c:1264
 #, c-format
-msgid "unable to rename %s to %s: %s"
-msgstr "nemohu přejmenovat %s na %s: %s"
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "před %i dnem"
+msgstr[1] "před %i dny"
+msgstr[2] "před %i dny"
 
-#: ../src/mn-vfs-mailbox-backend.gob:117
+#: ../src/mn-util.c:1269
 #, c-format
-msgid "unable to monitor mailbox contents (%s), poll mode activated"
-msgstr "nemohu sledovat obsah schránky (%s), poll režim aktivován"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+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
+msgid "unknown date"
+msgstr "neznámé datum"
 
-#: ../src/mn-vfs-mailbox.gob:238
+#: ../src/mn-vfs-mailbox.gob:221
 #, c-format
-msgid "unable to monitor mailbox type (%s), poll mode activated"
-msgstr "nemohu sledovat typ schránky (%s), poll režim aktivován"
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr "nemohu sledovat %s (%s), poll režim aktivován"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:385
 msgid "unknown mailbox format"
 msgstr "neznámý formát schránky"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:385
 msgid "does not exist"
 msgstr "neexistuje"
 
-#: ../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] ""
-"Kontrola proběhne každou %i sekundu (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[1] ""
-"Kontrola proběhne každé %i sekundy (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[2] ""
-"Kontrola proběhne každých %i sekund (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-
-#: ../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] ""
-"Kontrola proběhne každou %i minutu (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[1] ""
-"Kontrola proběhne každé %i minuty (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[2] ""
-"Kontrola proběhne každých %i minut (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-
-#: ../src/mn-vfs-mailbox.gob:399
-#, 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] ""
-"Kontrola proběhne přibližně každou %i minutu (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[1] ""
-"Kontrola proběhne přibližně každé %i minuty (tento interval je nastavitelný "
-"v dialogu Nastavení)."
-msgstr[2] ""
-"Kontrola proběhne přibližně každých %i minut (tento interval je nastavitelný "
-"v dialogu Nastavení)."
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Všeobecné</span>"
 
-#: ../src/mn-vfs-mailbox.gob:415
-msgid "A monitoring error has occurred"
-msgstr "Nastala chyba sledování"
+#: ../ui/mailbox-properties-dialog.glade.h:3
+msgid "Delay between mail chec_ks:"
+msgstr "_Interval mezi kontrolami pošty:"
 
-#: ../src/mn-vfs-mailbox.gob:416
-#, c-format
-msgid ""
-"Mail Notification was unable to enable immediate notification for one or "
-"more mailboxes. %s"
-msgstr ""
-"Nemohu zapnout okamžité upozorňování pro jednu nebo více schránek. %s"
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _name:"
+msgstr "_Jméno schránky:"
 
-#: ../ui/edit-toolbars-dialog.glade.h:1
-msgid "Edit Toolbars"
-msgstr "Upravit lišty nástrojů"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Use De_fault"
+msgstr "_Použít výchozí"
 
-#: ../ui/edit-toolbars-dialog.glade.h:2
-msgid "_Add a New Toolbar"
-msgstr "_Přidat novou lištu nástrojů"
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Mailbox type:"
+msgstr "_Typ schránky:"
 
-#: ../ui/edit-toolbars-dialog.glade.h:3
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:9
 msgid "_Use Default"
 msgstr "_Použít výchozí"
 
-#: ../ui/mail-summary-popup.glade.h:1
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Souhrn pošty</span>"
-
-#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:4
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Všeobecné</span>"
+#: ../ui/mailbox-properties-dialog.glade.h:10
+#: ../ui/properties-dialog.glade.h:48
+msgid "minutes"
+msgstr "minut"
 
-#: ../ui/mailbox-properties-dialog.glade.h:2
-msgid "Mailbox _name:"
-msgstr "_Jméno schránky:"
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:52
+msgid "seconds"
+msgstr "sekund"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Mailbox _type:"
-msgstr "_Typ schránky:"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Kliknutí</span>"
 
-#: ../ui/properties-dialog.glade.h:1
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:4
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Příkazy</span>"
 
-#: ../ui/properties-dialog.glade.h:2
-msgid "<span weight=\"bold\">Double-click Action</span>"
-msgstr "<span weight=\"bold\">Dvojité kliknutí</span>"
-
-#: ../ui/properties-dialog.glade.h:3
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Písma</span>"
 
-#: ../ui/properties-dialog.glade.h:5
+#. 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>"
 
-#: ../ui/properties-dialog.glade.h:6
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Umístění</span>"
 
-#: ../ui/properties-dialog.glade.h:7
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:16
+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:"
 
-#: ../ui/properties-dialog.glade.h:8
-msgid "Dis_play mail summary in tooltip"
-msgstr "Z_obrazovat souhrn pošty v tooltipu"
-
-#: ../ui/properties-dialog.glade.h:9
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:19
 msgid "General"
 msgstr "Všeobecné"
 
-#: ../ui/properties-dialog.glade.h:11
+#: ../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í:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:25
 msgid "Mail Summary Popup"
 msgstr "Vyskakovací souhrn pošty"
 
-#: ../ui/properties-dialog.glade.h:12
-msgid "Mailboxes"
-msgstr "Schránky"
-
-#: ../ui/properties-dialog.glade.h:13
-msgid "Only display _recent mail"
-msgstr "Zobrazovat _pouze nedávnou poštu"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:27
+msgid "Status Icon"
+msgstr "Stavová ikona"
 
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:28
 msgid "Use these _fonts:"
 msgstr "Použít _tato písma:"
 
-#: ../ui/properties-dialog.glade.h:15
-msgid "When _all mail has been read:"
-msgstr "Když _je veškerá pošta přečtena:"
-
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:29
 msgid "When _new mail arrives:"
 msgstr "Když _dorazí nová pošta:"
 
-#: ../ui/properties-dialog.glade.h:17
+#: ../ui/properties-dialog.glade.h:30
+msgid "When all mail has _been read:"
+msgstr "Když veškerá pošta _byla přečtena:"
+
+#: ../ui/properties-dialog.glade.h:31
+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:18
+#: ../ui/properties-dialog.glade.h:33
 msgid "_Blink on errors"
 msgstr "_Blikat při chybě"
 
-#: ../ui/properties-dialog.glade.h:19
-msgid "_Delay between mail checks:"
-msgstr "_Interval mezi kontrolami pošty:"
-
-#: ../ui/properties-dialog.glade.h:20
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:35
 msgid "_Display a Test Popup"
 msgstr "Zo_brazit ukázku"
 
-#: ../ui/properties-dialog.glade.h:21
-msgid "_Display the main window"
-msgstr "Zobrazit _hlavní okno"
+#: ../ui/properties-dialog.glade.h:36
+msgid "_Display seen mail"
+msgstr "Zobrazit přečtenou poštu"
+
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Display this dialog"
+msgstr "Zobrazit tento dialog"
 
-#: ../ui/properties-dialog.glade.h:22
+#: ../ui/properties-dialog.glade.h:38
 msgid "_Enable mail summary popup"
 msgstr "Zapnout vyskakovací _souhrn pošty"
 
-#: ../ui/properties-dialog.glade.h:23
-msgid "_Horizontal offset:"
-msgstr "_Horizontální odsazení:"
-
-#: ../ui/properties-dialog.glade.h:24
+#: ../ui/properties-dialog.glade.h:39
 msgid "_Launch the mail reader"
 msgstr "Sp_ustit poštovní program"
 
-#: ../ui/properties-dialog.glade.h:25
-msgid "_Mail reader:"
-msgstr "_Poštovní program:"
+#: ../ui/properties-dialog.glade.h:40
+msgid "_None"
+msgstr "Žádný"
 
-#: ../ui/properties-dialog.glade.h:26
+#: ../ui/properties-dialog.glade.h:41
 msgid "_Position:"
 msgstr "_Umístění:"
 
-#: ../ui/properties-dialog.glade.h:27
-msgid "_Start Mail Notification on GNOME login"
-msgstr "_Spustit Upozornění na poštu při spuštění GNOME"
-
-#: ../ui/properties-dialog.glade.h:28
+#: ../ui/properties-dialog.glade.h:42
 msgid "_Title:"
 msgstr "_Titulek:"
 
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:43
 msgid "_Update the mail status"
 msgstr "_Aktualizovat stav pošty"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../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:31
+#: ../ui/properties-dialog.glade.h:45
 msgid "_Vertical offset:"
 msgstr "_Vertikální odsazení:"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "minutes"
-msgstr "minut"
+#: ../ui/properties-dialog.glade.h:46
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "rozložení souhrnu pošty v tooltipu ikony|_Kompaktní"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:47
+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ů"
 
-#: ../ui/properties-dialog.glade.h:34
-msgid "seconds"
-msgstr "sekund"
+#: ../ui/properties-dialog.glade.h:50
+msgid "popup's mail summary layout|Co_mpact"
+msgstr "rozložení vyskakovacího souhrnu pošty|_Kompaktní"
+
+#: ../ui/properties-dialog.glade.h:51
+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)."
+
+#~ msgid "Delay between mail checks (seconds part)."
+#~ msgstr "Interval mezi kontrolami pošty (sekundy)."
+
+#~ msgid "Display mail summary in tooltip"
+#~ msgstr "Zobrazit souhrn pošty v tooltipu"
+
+#~ msgid "Do not show the immediate notification error dialog"
+#~ msgstr "Nezobrazovat okamžitě chybový dialog"
+
+#~ msgid "Height of edit toolbars dialog"
+#~ msgstr "Výška dialogu pro úpravu lišty nástrojů"
+
+#~ 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"
+
+#~ msgid "Seconds between mail checks"
+#~ msgstr "Sekundy mezi kontrolami pošty"
+
+#~ msgid "Set a mail reader"
+#~ msgstr "Nastavit poštovní program"
+
+#~ msgid "The command to run to launch the mail reader."
+#~ msgstr "Příkaz pro spuštění poštovního programu."
+
+#~ msgid "The height of the edit toolbars dialog in pixels."
+#~ msgstr "Výška dialogu pro úpravu lišty nástrojů v pixelech."
+
+#~ msgid "The height of the main window in pixels."
+#~ msgstr "Výška hlavního okna v pixelech."
+
+#~ msgid ""
+#~ "The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text"
+#~ "\", \"both\" or \"both-horiz\"."
+#~ msgstr ""
+#~ "Vzhled lišty nástrojů. Musí být \"desktop-default\", \"icons\", \"text\", "
+#~ "\"both\" nebo \"both=horiz\"."
+
+#~ msgid "The width of the edit toolbars dialog in pixels."
+#~ msgstr "Šířka dialogu pro úpravu lišty nástrojů v pixelech."
+
+#~ msgid "The width of the main window in pixels."
+#~ msgstr "Šířka hlavního okna v pixelech."
+
+#~ msgid "Toolbars style"
+#~ msgstr "Vzhled lišty nástrojů"
+
+#~ msgid "View statusbar"
+#~ msgstr "Zobrazit statovou lištu"
+
+#~ msgid "View toolbars"
+#~ msgstr "Zobrazit lišty nástrojů"
+
+#~ msgid "Whether the statusbar should be visible or not."
+#~ msgstr "Jestli má být statová lišta viditelná nebo ne."
+
+#~ msgid "Whether the toolbars should be visible or not."
+#~ msgstr "Jestli mají být lišty nástrojů viditelné nebo ne."
+
+#~ msgid ""
+#~ "Whether to display the mail summary in the status icon tooltip or not."
+#~ msgstr "Jestli zobrazit souhrn pošty v tooltipu statové ikony nebo ne."
+
+#~ msgid ""
+#~ "Whether to prevent the immediate notification error dialog from being "
+#~ "displayed or not."
+#~ msgstr "Jestli zabránit chybovému dialogu v zobrazování nebo ne."
+
+#~ msgid "Width of edit toolbars dialog"
+#~ msgstr "Šířka dialogu pro úpravu lišt nástrojů"
+
+#~ msgid "Width of main window"
+#~ msgstr "Šířka hlavního okna"
+
+#~ msgid "New Mail"
+#~ msgstr "Nová pošta"
+
+#~ msgid "_Remove Toolbar"
+#~ msgstr "_Odstranit lištu nástrojů"
+
+#~ msgid "Separator"
+#~ msgstr "Oddělovač"
+
+#~ msgid "Main _Window"
+#~ msgstr "_Hlavní okno"
+
+#~ msgid "Help messages"
+#~ msgstr "Zprávy s nápovědou"
+
+#~ msgid "Count messages"
+#~ msgstr "Zprávy o počtu"
+
+#~ msgid "_Mail"
+#~ msgstr "_Pošta"
+
+#~ msgid "_Edit"
+#~ msgstr "_Upravit"
+
+#~ msgid "_View"
+#~ msgstr "_Zobrazit"
+
+#~ msgid "_Help"
+#~ msgstr "_Nápověda"
+
+#~ msgid "Launch the mail reader"
+#~ msgstr "Spustit poštovní program"
+
+#~ msgid "_Close"
+#~ msgstr "_Zavřít"
+
+#~ msgid "Close this window"
+#~ msgstr "Zavřít toto okno"
+
+#~ msgid "_Quit"
+#~ msgstr "_Ukončit"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Lišty nástrojů"
+
+#~ msgid "Customize the toolbars"
+#~ msgstr "Upravit lišty nástrojů"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Nastavení"
+
+#~ msgid "Toolbars Styl_e"
+#~ msgstr "_Vzhled lišt nástrojů"
+
+#~ msgid "Customize the toolbars style"
+#~ msgstr "Upravit vzhled lišt nástrojů"
+
+#~ msgid "_Contents"
+#~ msgstr "_Obsah"
+
+#~ msgid "Display help"
+#~ msgstr "Zobrazit nápovědu"
+
+#~ msgid "_About"
+#~ msgstr "_O Upozornění na poštu"
+
+#~ msgid "Display credits"
+#~ msgstr "Kredity"
+
+#~ msgid "Show or hide the toolbars"
+#~ msgstr "Zobrazit nebo skrýt lišty nástrojů"
+
+#~ msgid "_Statusbar"
+#~ msgstr "_Statová lišta"
+
+#~ 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"
+
+#~ msgid "I_cons Only"
+#~ msgstr "Pouze _ikony"
+
+#~ msgid "_Text Only"
+#~ msgstr "Pouze _text"
+
+#~ msgid "Only display the toolbars text"
+#~ msgstr "Zobrazit pouze textové popisy v lištách nástrojů"
+
+#~ msgid "Text Belo_w Icons"
+#~ msgstr "T_ext pod ikonami"
+
+#~ msgid "Display the toolbars text below the icons"
+#~ msgstr "Zobrazit lišty nástrojů s texty pod ikonami"
+
+#~ msgid "Text Be_side Icons"
+#~ msgstr "Text _vedle ikon"
+
+#~ msgid "Display the toolbars text beside the icons"
+#~ msgstr "Zobrazit lišty nástrojů s texty vedle ikon"
+
+#~ msgid "unable to load menus.xml: %s"
+#~ msgstr "nemohu načíst menus.xml: %s"
+
+#~ 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: "
+
+#~ msgid "List the compiled-in features"
+#~ msgstr "Vypsat funkce zahrnuté v této kompilaci"
+
+#~ msgid "Display the main window"
+#~ msgstr "Zobrazit hlavní okno"
+
+#~ msgid "You have new mail."
+#~ msgstr "Máte novou poštu."
+
+#~ msgid "Leave Fullscreen"
+#~ msgstr "Opustit celoobrazovkové zobrazení"
+
+#~ msgid "MAIL environment variable not defined"
+#~ msgstr "Proměnná prostředí MAIL není definována"
+
+#~ msgid "widget \"%s\" not found in interface \"%s\""
+#~ msgstr "widget \"%s\" nebyl nalezen v rozhraní \"%s\""
+
+#~ msgid "signal handler \"%s\" not found"
+#~ msgstr "signal handler \"%s\" nebyl nalezen"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Příště nezobrazit tuto zprávu"
+
+#~ msgid "invalid signal specification \"%s\""
+#~ msgstr "neplatná specifikace signálu \"%s\""
+
+#~ msgid "unable to monitor mailbox contents (%s), poll mode activated"
+#~ msgstr "nemohu sledovat obsah schránky (%s), poll režim aktivován"
+
+#~ 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] ""
+#~ "Kontrola proběhne každou %i sekundu (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+#~ msgstr[1] ""
+#~ "Kontrola proběhne každé %i sekundy (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+#~ msgstr[2] ""
+#~ "Kontrola proběhne každých %i sekund (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+
+#~ 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] ""
+#~ "Kontrola proběhne každou %i minutu (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+#~ msgstr[1] ""
+#~ "Kontrola proběhne každé %i minuty (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+#~ msgstr[2] ""
+#~ "Kontrola proběhne každých %i minut (tento interval je nastavitelný v "
+#~ "dialogu Nastavení)."
+
+#~ 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] ""
+#~ "Kontrola proběhne přibližně každou %i minutu (tento interval je "
+#~ "nastavitelný v dialogu Nastavení)."
+#~ msgstr[1] ""
+#~ "Kontrola proběhne přibližně každé %i minuty (tento interval je "
+#~ "nastavitelný v dialogu Nastavení)."
+#~ msgstr[2] ""
+#~ "Kontrola proběhne přibližně každých %i minut (tento interval je "
+#~ "nastavitelný v dialogu Nastavení)."
+
+#~ msgid "A monitoring error has occurred"
+#~ msgstr "Nastala chyba sledování"
+
+#~ msgid ""
+#~ "Mail Notification was unable to enable immediate notification for one or "
+#~ "more mailboxes. %s"
+#~ msgstr ""
+#~ "Nemohu zapnout okamžité upozorňování pro jednu nebo více schránek. %s"
+
+#~ msgid "Edit Toolbars"
+#~ msgstr "Upravit lišty nástrojů"
+
+#~ msgid "_Add a New Toolbar"
+#~ msgstr "_Přidat novou lištu nástrojů"
+
+#~ msgid "Dis_play mail summary in tooltip"
+#~ msgstr "Z_obrazovat souhrn pošty v tooltipu"
+
+#~ msgid "Mailboxes"
+#~ msgstr "Schránky"
+
+#~ msgid "_Display the main window"
+#~ msgstr "Zobrazit _hlavní okno"
+
+#~ msgid "_Mail reader:"
+#~ msgstr "_Poštovní program:"
+
+#~ msgid "_Start Mail Notification on GNOME login"
+#~ msgstr "_Spustit Upozornění na poštu při spuštění GNOME"
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 3.0-rc1\n"
+"Project-Id-Version: mail-notification 3.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-05-16 02:11+0200\n"
-"PO-Revision-Date: 2006-05-16 02:12+0200\n"
+"PO-Revision-Date: 2006-05-18 15:00+0200\n"
 "Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
 "MIME-Version: 1.0\n"
diff --git a/po/ja.po b/po/ja.po
@@ -8,10 +8,10 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 3.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-04-29 11:50+0900\n"
-"PO-Revision-Date: 2006-05-03 08:06+0200\n"
+"PO-Revision-Date: 2006-05-18 15:27+0200\n"
 "Last-Translator: Hiroshi Hasebe <hhasebe@DVOI.COM>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,535 +19,413 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/GNOME_MailNotification.server.in.in.h:1
+#: data/GNOME_MailNotification.server.in.in.h:1
 msgid "Mail Notification automation"
-msgstr "新着メールの自動チェック・通知"
+msgstr "メール着信通知の自動化"
 
-#: ../data/GNOME_MailNotification.server.in.in.h:2
+#: data/GNOME_MailNotification.server.in.in.h:2
 msgid "Mail Notification automation factory"
-msgstr "Mail Notification自動化ファクトリ"
+msgstr "メール着信通知自動化ファクトリ"
 
-#: ../data/GNOME_MailNotification_Evolution.server.in.h:1
+#: data/GNOME_MailNotification_Evolution.server.in.h:1
 msgid "Evolution folder tree control"
 msgstr "Evolutionフォルダツリーコントロール"
 
-#: ../data/GNOME_MailNotification_Evolution.server.in.h:2
+#: data/GNOME_MailNotification_Evolution.server.in.h:2
 msgid "Evolution folder tree control factory"
 msgstr "Evolutionフォルダツリーコントロールファクトリ"
 
-#: ../data/GNOME_MailNotification_Evolution.server.in.h:3
+#: data/GNOME_MailNotification_Evolution.server.in.h:3
 msgid "Mail Notification / Evolution glue"
-msgstr "Mail Notification通知 / Evolution glue"
+msgstr "メール着信通知 / Evolution glue"
 
-#: ../data/GNOME_MailNotification_Evolution.server.in.h:4
+#: data/GNOME_MailNotification_Evolution.server.in.h:4
 msgid "Mail Notification / Evolution glue factory"
 msgstr "メール着信通知 / Evolution glueファクトリ"
 
-#: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
+#: data/mail-notification-properties.desktop.in.h:1
 msgid "Configure Mail Notification"
-msgstr "Mail Notifcationの設定"
+msgstr "メール着信通知の設定"
 
-#: ../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-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
 msgid "Mail Notification"
-msgstr "Mail Notification"
+msgstr "メール着信通知"
 
-#: ../data/mail-notification.desktop.in.h:1
+#: data/mail-notification.desktop.in.h:1
 msgid "Get notified when new mail arrives"
-msgstr "新着メールの着信通知を表示します"
+msgstr "メールの着信状況をお知らせします"
 
-#: ../data/mail-notification.schemas.in.h:1
+#: data/mail-notification.schemas.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:2
+#: data/mail-notification.schemas.in.h:3
 msgid "Blink on errors"
-msgstr "エラー発生時に点滅"
-
-#: ../data/mail-notification.schemas.in.h:3
-msgid "Delay between mail checks (minutes part)."
-msgstr "メール着信チェックの間隔 (分単位で指定)."
-
-#: ../data/mail-notification.schemas.in.h:4
-msgid "Delay between mail checks (seconds part)."
-msgstr "メール着信チェックの間隔 (秒単位で指定)."
+msgstr "エラー発生時にアイコンを点滅させる"
 
-#: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "着信メールの一覧をバルーンで表示"
+#: data/mail-notification.schemas.in.h:4
+msgid "Click action"
+msgstr "クリック時の動作"
 
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "エラー発生時にリアルタイムで通知しない"
+#: data/mail-notification.schemas.in.h:5
+msgid "Display seen mail"
+msgstr "確認ずみのメールを表示"
 
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "ダブルクリック時の動作"
-
-#: ../data/mail-notification.schemas.in.h:8
+#: data/mail-notification.schemas.in.h:6
 msgid "Enable mail summary popup"
 msgstr "メール一覧をポップアップ"
 
-#: ../data/mail-notification.schemas.in.h:9
+#: data/mail-notification.schemas.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "X509証明書の電子指紋"
 
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Height of edit toolbars dialog"
-msgstr "ツールバー編集ダイアログの高さ"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Height of main window"
-msgstr "メインウィンドウの高さ"
-
-#: ../data/mail-notification.schemas.in.h:12
+#: data/mail-notification.schemas.in.h:8
 msgid "Height of properties dialog"
 msgstr "プロパティダイアログの高さ"
 
-#: ../data/mail-notification.schemas.in.h:13
+#: data/mail-notification.schemas.in.h:9
 msgid "Mail read command"
 msgstr "メールリーダを起動するコマンド"
 
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail reader command"
-msgstr "メールリーダーを起動するコマンド"
-
-#: ../data/mail-notification.schemas.in.h:15
+#: data/mail-notification.schemas.in.h:10
 msgid "Mail summary popup contents font"
 msgstr "メール一覧ポップアップの本文フォント"
 
-#: ../data/mail-notification.schemas.in.h:16
+#: data/mail-notification.schemas.in.h:11
 msgid "Mail summary popup fonts aspect source"
 msgstr "メール一覧ポップアップで使うフォントの選択基準"
 
-#: ../data/mail-notification.schemas.in.h:17
+#: data/mail-notification.schemas.in.h:12
 msgid "Mail summary popup horizontal offset"
 msgstr "メール一覧ポップアップの水平オフセット"
 
-#: ../data/mail-notification.schemas.in.h:18
+#: data/mail-notification.schemas.in.h:13
 msgid "Mail summary popup position"
 msgstr "メール一覧ポップアップの表示位置"
 
-#: ../data/mail-notification.schemas.in.h:19
+#: data/mail-notification.schemas.in.h:14
 msgid "Mail summary popup title font"
 msgstr "メール一覧ポップアップのタイトルフォント"
 
-#: ../data/mail-notification.schemas.in.h:20
+#: data/mail-notification.schemas.in.h:15
 msgid "Mail summary popup vertical offset"
 msgstr "メール一覧ポップアップの垂直オフセット"
 
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Minutes between mail checks"
-msgstr "メールチェックの間隔を分で指定"
-
-#: ../data/mail-notification.schemas.in.h:22
+#: data/mail-notification.schemas.in.h:16
 msgid "Minutes to wait before closing the mail summary popup"
 msgstr "メール一覧ポップアップの表示時間"
 
-#: ../data/mail-notification.schemas.in.h:23
+#: data/mail-notification.schemas.in.h:17
 msgid "New mail command"
-msgstr "新しいメールコマンド"
+msgstr "新着メールコマンド"
 
-#: ../data/mail-notification.schemas.in.h:24
+#: data/mail-notification.schemas.in.h:18
 msgid "Only display recent mail in mail summary popup"
 msgstr "メール一覧ポップアップで最近のメールのみ表示"
 
-#: ../data/mail-notification.schemas.in.h:25
+#: data/mail-notification.schemas.in.h:19
 msgid "Run a command when all mail is read"
-msgstr "未読メールを無くしたときにコマンドを実行"
+msgstr "全メールを開封後にコマンドを実行"
 
-#: ../data/mail-notification.schemas.in.h:26
+#: data/mail-notification.schemas.in.h:20
 msgid "Run a command when new mail arrives"
 msgstr "メール着信時にコマンドを実行"
 
-#: ../data/mail-notification.schemas.in.h:27
-msgid "Seconds between mail checks"
-msgstr "メールチェックの間隔を秒で指定"
-
-#: ../data/mail-notification.schemas.in.h:28
+#: data/mail-notification.schemas.in.h:21
 msgid "Seconds to wait before closing the mail summary popup"
 msgstr "メール一覧ポップアップの表示時間"
 
-#: ../data/mail-notification.schemas.in.h:29
-msgid "Set a mail reader"
-msgstr "メールリーダーを指定"
-
-#: ../data/mail-notification.schemas.in.h:30
+#: data/mail-notification.schemas.in.h:22
 msgid ""
-"The action to perform when the icon is double-clicked. Must be \"display-"
-"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
-"アイコンがダブルクリックされたときの動作. "
-"\"display-main-window\", \"launch-mail-reader\" or \"update-mail-status\" "
-"のいずれかを指定."
+"アイコンがダブルクリックされたときの動作. \"display-main-window\", \"launch-"
+"mail-reader\" or \"update-mail-status\" のいずれかを指定."
 
-#: ../data/mail-notification.schemas.in.h:31
+#: data/mail-notification.schemas.in.h:23
 msgid ""
 "The amount of time to wait before closing the mail summary popup (minutes "
 "part)."
-msgstr ""
-"メール一覧ポップアップの表示時間 (分で指定)"
-""
+msgstr "メール一覧ポップアップの表示時間 (分で指定)"
 
-#: ../data/mail-notification.schemas.in.h:32
+#: data/mail-notification.schemas.in.h:24
 msgid ""
 "The amount of time to wait before closing the mail summary popup (seconds "
 "part)."
-msgstr ""
-"メール一覧ポップアップの表示時間 (秒で指定)"
-""
+msgstr "メール一覧ポップアップの表示時間 (秒で指定)"
 
-#: ../data/mail-notification.schemas.in.h:33
+#: data/mail-notification.schemas.in.h:25
 msgid ""
 "The aspect source of the mail summary popup fonts. Must be \"theme\" or "
 "\"custom\"."
 msgstr ""
-"メール一覧ポップアップで使うフォントの選択基準. \"theme\" もしくは "
-"\"custom\" を指定."
+"メール一覧ポップアップで使うフォントの選択基準. \"theme\" もしくは \"custom"
+"\" を指定."
 
-#: ../data/mail-notification.schemas.in.h:34
-msgid "The command to run to launch the mail reader."
-msgstr "メールリーダーを起動するコマンド."
-
-#: ../data/mail-notification.schemas.in.h:35
+#: data/mail-notification.schemas.in.h:26
 msgid "The command to run when all mail is read."
-msgstr "未読メールを無くしたときに実行するコマンド."
+msgstr "全メールを開封した後に実行するコマンド."
 
-#: ../data/mail-notification.schemas.in.h:36
+#: data/mail-notification.schemas.in.h:27
 msgid "The command to run when new mail arrives."
 msgstr "メール着信時に実行するコマンド."
 
-#: ../data/mail-notification.schemas.in.h:37
+#: data/mail-notification.schemas.in.h:28
 msgid "The custom font to use for the contents of the mail summary popup."
-msgstr ""
-"メール一覧ポップアップの本文表示に使用するカスタムフォント."
+msgstr "メール一覧ポップアップの本文表示に使用するカスタムフォント."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: 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.h:39
-msgid "The height of the edit toolbars dialog in pixels."
-msgstr "ツールバー編集ダイアログの高さ (ピクセルで指定)."
-
-#: ../data/mail-notification.schemas.in.h:40
-msgid "The height of the main window in pixels."
-msgstr "メインウィンドウの高さ (ピクセルで指定)."
-
-#: ../data/mail-notification.schemas.in.h:41
+#: data/mail-notification.schemas.in.h:30
 msgid "The height of the properties dialog in pixels."
 msgstr "プロパティダイアログの高さ (ピクセルで指定)."
 
-#: ../data/mail-notification.schemas.in.h:42
+#: data/mail-notification.schemas.in.h:31
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
-"信頼性の確認されたサーバー (ホスト名:ポート番号) の一覧 "
-"(ホスト名:ポート番号)."
+"信頼性の確認されたサーバー (ホスト名:ポート番号) の一覧 (X509証明書がない場"
+"合)."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: data/mail-notification.schemas.in.h:32
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
-msgstr ""
-"信頼性の確認されたX509証明書の一覧. (MD5電子指紋で表示)"
+msgstr "信頼性の確認されたX509証明書の一覧. (MD5電子指紋で表示)"
 
-#: ../data/mail-notification.schemas.in.h:44
+#: 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:45
+#: 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.h:46
+#: 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 ""
-"メール一覧ポップアップの表示位置. \"top-left\", \"top-right\", \"bottom-left\", \"bottom-right\" のいずれかを指定."
+"メール一覧ポップアップの表示位置. \"top-left\", \"top-right\", \"bottom-left"
+"\", \"bottom-right\" のいずれかを指定."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: data/mail-notification.schemas.in.h:36
 msgid ""
-"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
-"\"both\" or \"both-horiz\"."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
 msgstr ""
-"ツールバーのスタイル. \"desktop-default\", \"icons\", \"text\", \"both\", \"both-horiz\" のいずれかを指定."
-
-#: ../data/mail-notification.schemas.in.h:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "ツールバー編集ダイアログの幅 (ピクセルで指定)."
+"メール一覧の表示形式. \"standard\", \"compat\", \"none\"のいずれかを指定."
 
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "メインウィンドウの幅 (ピクセルで指定)."
-
-#: ../data/mail-notification.schemas.in.h:50
+#: data/mail-notification.schemas.in.h:37
 msgid "The width of the properties dialog in pixels."
 msgstr "プロパティダイアログの幅 (ピクセルで指定)."
 
-#: ../data/mail-notification.schemas.in.h:51
-msgid "Toolbars style"
-msgstr "ツールバーのスタイル"
+#: data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "メール一覧をバルーンで表示"
 
-#: ../data/mail-notification.schemas.in.h:52
+#: data/mail-notification.schemas.in.h:39
 msgid "Trusted servers list"
 msgstr "信頼性の確認されたサーバーの一覧"
 
-#: ../data/mail-notification.schemas.in.h:53
-msgid "View statusbar"
-msgstr "ステータスバーを表示"
-
-#: ../data/mail-notification.schemas.in.h:54
-msgid "View toolbars"
-msgstr "ツールバーを表示"
-
-#: ../data/mail-notification.schemas.in.h:55
+#: data/mail-notification.schemas.in.h:40
 msgid "Whether the status icon should blink on errors or not."
-msgstr ""
-"エラー発生時にステータスアイコンを点滅させるかどうか."
-
-#: ../data/mail-notification.schemas.in.h:56
-msgid "Whether the statusbar should be visible or not."
-msgstr "ステータスバーを表示するかどうか."
+msgstr "エラー発生時にステータスアイコンを点滅させるかどうか."
 
-#: ../data/mail-notification.schemas.in.h:57
-msgid "Whether the toolbars should be visible or not."
-msgstr "ツールバーを表示するかどうか."
-
-#: ../data/mail-notification.schemas.in.h:58
+#: data/mail-notification.schemas.in.h:41
 msgid "Whether to automatically close the mail summary popup or not."
-msgstr ""
-"メール一覧ポップアップを自動的に閉じるかどうか."
+msgstr "メール一覧ポップアップを自動的に閉じるかどうか."
 
-#: ../data/mail-notification.schemas.in.h:59
-msgid "Whether to display the mail summary in the status icon tooltip or not."
-msgstr ""
-"メール着信時, メール一覧をバルーン表示するかどうか."
+#: data/mail-notification.schemas.in.h:42
+msgid "Whether to display an icon when there is no new mail or not."
+msgstr "新着メールが無いときにもアイコンを表示するかどうか."
+
+#: data/mail-notification.schemas.in.h:43
+msgid "Whether to display seen mail or not."
+msgstr "確認ずみのメールを表示するかどうか."
 
-#: ../data/mail-notification.schemas.in.h:60
+#: data/mail-notification.schemas.in.h:44
 msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr ""
-"メール着信時, メール一覧ポップアップを表示するかどうか."
+msgstr "メール着信時, メール一覧をポップアップするかどうか."
 
-#: ../data/mail-notification.schemas.in.h:61
+#: data/mail-notification.schemas.in.h:45
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
-msgstr ""
-"メール一覧ポップアップに, 過去に表示したものを含めるかどうか."
-
-#: ../data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to prevent the immediate notification error dialog from being "
-"displayed or not."
-msgstr ""
-"着信チェック時に発生するエラーを直ちに表示するかどうか."
+msgstr "メール一覧ポップアップに, 過去に表示したものを含めるかどうか."
 
-#: ../data/mail-notification.schemas.in.h:63
+#: data/mail-notification.schemas.in.h:46
 msgid "Whether to run a command when all mail is read or not."
-msgstr ""
-"未読メールを無くしたときのコマンド実行の有無."
+msgstr "全メールを開封した後のコマンド実行の有無."
 
-#: ../data/mail-notification.schemas.in.h:64
+#: data/mail-notification.schemas.in.h:47
 msgid "Whether to run a command when new mail arrives or not."
-msgstr ""
-"メール着信時のコマンド実行の有無."
-
-#: ../data/mail-notification.schemas.in.h:65
-msgid "Whether to set a mail reader or not."
-msgstr "メールリーダ設定の有無."
-
-#: ../data/mail-notification.schemas.in.h:66
-msgid "Width of edit toolbars dialog"
-msgstr "ツールバー編集ダイアログの幅"
+msgstr "メール着信時のコマンド実行の有無."
 
-#: ../data/mail-notification.schemas.in.h:67
-msgid "Width of main window"
-msgstr "メインウィンドウの幅"
-
-#: ../data/mail-notification.schemas.in.h:68
+#: data/mail-notification.schemas.in.h:48
 msgid "Width of properties dialog"
-msgstr "プロパティダイアログの幅"
-
-#: ../data/mail-notification.soundlist.in.h:2
-msgid "New Mail"
-msgstr "新着メール"
-
-#: ../src/egg-editable-toolbar.c:534
-msgid "_Remove Toolbar"
-msgstr "ツールバーを表示しない(_R)"
+msgstr "プロバティダイアログの幅"
 
-#: ../src/egg-toolbar-editor.c:555
-msgid "Separator"
-msgstr "セパレータ"
-
-#: ../src/eggtrayicon.c:128
+#: src/eggtrayicon.c:132
 msgid "Orientation"
 msgstr "向き"
 
-#: ../src/eggtrayicon.c:129
+#: src/eggtrayicon.c:133
 msgid "The orientation of the tray."
 msgstr "トレイの向き"
 
-#: ../src/mn-about-dialog.gob:48
+#. translators: header capitalization
+#: src/mn-about-dialog.gob:49
 msgid "A Mail Notification Icon"
-msgstr ""
-"アイコンから新着メールを通知"
+msgstr "メールボックスを自動的にチェックし,\n新着メールをお知らせします"
 
 #.
 #. * 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:57
 msgid "translator-credits"
 msgstr "Hiroshi Hasebe <hhasebe@DVOI.COM>"
 
-#: ../src/mn-about-dialog.gob:78
+#: src/mn-about-dialog.gob:79
 msgid "Unable to open link"
 msgstr "リンクを開くことができません"
 
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:92
+#: 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>"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: src/mn-authenticated-mailbox-properties.gob:46
 msgid "_Username:"
 msgstr "ユーザー名 (_U):"
 
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: src/mn-authenticated-mailbox-properties.gob:50
 msgid "_Password:"
 msgstr "パスワード(_P):"
 
-#: ../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 ""
-"%s mailbox %s にログインできませんでした. 誤った認証情報が入力された"
-"ためと思われます."
-"\n"
-"もう一度入力してください."
-
-#: ../src/mn-authenticated-mailbox.gob:153
-#, c-format
-msgid "Enter your credentials for %s mailbox %s."
-msgstr "%s メールボックス %s の認証情報を入力してください."
-
-#. keep the title in sync with gnome-authentication-manager
-#: ../src/mn-authenticated-mailbox.gob:195
-msgid "Authentication Required"
-msgstr "認証が必要です"
-
-#: ../src/mn-autodetect-mailbox-properties.gob:93
+#: src/mn-autodetect-mailbox-properties.gob:110
 msgid "Location"
 msgstr "メールボックスの所在"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:103
+#: src/mn-autodetect-mailbox-properties.gob:122
 msgid "_Location:"
 msgstr "所在(_L):"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: src/mn-autodetect-mailbox-properties.gob:130
 msgid "_Browse..."
 msgstr "ブラウズ(_B)..."
 
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: src/mn-autodetect-mailbox-properties.gob:172
 msgid "Select a File or Folder"
 msgstr "ファイルもしくはフォルダを選択"
 
-#: ../src/mn-client-session.c:248
+#: src/mn-client-session.c:247
 #, c-format
 msgid "resolving %s"
 msgstr "%s を解決中"
 
-#: ../src/mn-client-session.c:264
+#: src/mn-client-session.c:263
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "%s の解決に失敗: %s"
 
-#: ../src/mn-client-session.c:308
+#: src/mn-client-session.c:304
+#, c-format
+msgid "network address #%i"
+msgstr "ネットワークアドレス#%i"
+
+#: src/mn-client-session.c:307
+#, c-format
+msgid "unable to convert network address #%i into textual form: %s"
+msgstr "ネットワークアドレス#%iの文字列への変換に失敗: %s"
+
+#: src/mn-client-session.c:318
 #, c-format
 msgid "%s: unsupported address family"
 msgstr "%s: そのアドレス形式はサポートされていません"
 
-#: ../src/mn-client-session.c:315
+#: src/mn-client-session.c:325
 #, c-format
 msgid "%s: unable to create socket: %s"
 msgstr "%s: ソケットの作成に失敗: %s"
 
-#: ../src/mn-client-session.c:319
+#: src/mn-client-session.c:329
 #, c-format
 msgid "connecting to %s (%s) port %i"
 msgstr "%s (%s) のポート %i に接続中"
 
-#: ../src/mn-client-session.c:322
+#: src/mn-client-session.c:332
 #, c-format
 msgid "unable to connect: %s"
 msgstr "接続に失敗: %s"
 
-#: ../src/mn-client-session.c:327
+#: src/mn-client-session.c:337
 msgid "connected successfully"
 msgstr "接続に成功"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:333
+#: src/mn-client-session.c:351
 #, c-format
 msgid "unable to connect to %s"
 msgstr "%s への接続に失敗"
 
-#: ../src/mn-client-session.c:360
+#: src/mn-client-session.c:378
 #, c-format
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "OpenSSLライブラリの初期化に失敗: %s"
 
-#: ../src/mn-client-session.c:368
+#: src/mn-client-session.c:386
 #, c-format
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "SSL/TLSオブジェクトの作成に失敗: %s"
 
-#: ../src/mn-client-session.c:374
+#: src/mn-client-session.c:392
 #, c-format
 msgid "unable to set the SSL/TLS file descriptor: %s"
 msgstr "SSL/TLSファイルディスクリプタの設定に失敗: %s"
 
-#: ../src/mn-client-session.c:380
+#: src/mn-client-session.c:398
 #, c-format
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "SSL/TLSのハンドシェイクに失敗: %s"
 
-#: ../src/mn-client-session.c:386
+#: src/mn-client-session.c:404
 msgid "untrusted server"
 msgstr "信頼性が不明なサーバー"
 
-#: ../src/mn-client-session.c:390
+#: src/mn-client-session.c:408
 #, c-format
 msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
-msgstr "SSL/TLSレイヤが有効になりました (%s, %s %i-Bit)"
+msgstr "SSL/TLSレイヤが有効になりました (%s, %s %iビット)"
 
-#: ../src/mn-client-session.c:437
+#: src/mn-client-session.c:455
 #, c-format
 msgid "%s, fingerprint: %s"
 msgstr "%s, 電子指紋 %s"
 
-#: ../src/mn-client-session.c:466
+#: src/mn-client-session.c:484
 msgid "missing certificate"
-msgstr "証明書が欠落"
+msgstr "電子証明書が欠落"
 
-#: ../src/mn-client-session.c:492
+#: src/mn-client-session.c:510
 #, c-format
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -564,848 +442,753 @@ msgstr ""
 "\"%s\"へ確実に接続している場合にのみ, サーバーへ接続されることを"
 "おすすめします. サーバーへ接続すると, このメッセージは表示されなくなります."
 
-#: ../src/mn-client-session.c:507
+#: src/mn-client-session.c:525
 msgid "Connect to untrusted server?"
 msgstr "信頼性が確認されていないサーバーに接続しますか?"
 
-#: ../src/mn-client-session.c:571
+#: src/mn-client-session.c:590
 #, c-format
 msgid "response \"%s\" is not valid in current context"
 msgstr "このコンテキストでの応答 \"%s\" は無効です"
 
-#: ../src/mn-client-session.c:599
+#: src/mn-client-session.c:619
 #, c-format
 msgid "unable to parse response \"%s\""
 msgstr "応答 \"%s\" の解析に失敗"
 
-#: ../src/mn-client-session.c:649 ../src/mn-client-session.c:656
+#: src/mn-client-session.c:669 src/mn-client-session.c:676
 #, c-format
 msgid "unable to read from server: %s"
 msgstr "サーバーからの読み出しに失敗: %s"
 
-#: ../src/mn-client-session.c:654
+#: src/mn-client-session.c:674
 msgid "unable to read from server: EOF"
 msgstr "サーバーからの読み出しに失敗: EOF"
 
-#: ../src/mn-client-session.c:666
+#: src/mn-client-session.c:686
 #, c-format
 msgid "unable to decode data using SASL: %s"
-msgstr "SALS使用時, データのデコードに失敗: %s"
+msgstr "SALSでデコードに失敗: %s"
 
-#: ../src/mn-client-session.c:811
+#: src/mn-client-session.c:831
 #, c-format
 msgid "unable to encode data using SASL: %s"
-msgstr "SASL使用時, データのエンコードに失敗: %s"
+msgstr "SASLでエンコードに失敗: %s"
 
-#: ../src/mn-client-session.c:842 ../src/mn-client-session.c:849
+#: src/mn-client-session.c:862 src/mn-client-session.c:869
 #, c-format
 msgid "unable to write to server: %s"
 msgstr "サーバーへの書き込みに失敗: %s"
 
-#: ../src/mn-client-session.c:847
+#: src/mn-client-session.c:867
 msgid "unable to write to server: EOF"
 msgstr "サーバーへの書き込みに失敗: EOF"
 
-#: ../src/mn-client-session.c:878 ../src/mn-pop3-mailbox.gob:468
+#: src/mn-client-session.c:898 src/mn-pop3-mailbox.gob:433
 #, c-format
 msgid "unable to encode Base64: %s"
 msgstr "Base64エンコードに失敗: %s"
 
-#: ../src/mn-client-session.c:1056
+#: src/mn-client-session.c:1075
 #, c-format
 msgid "unable to initialize the SASL library: %s"
 msgstr "SASLライブラリの初期化に失敗: %s"
 
-#: ../src/mn-client-session.c:1068
+#: src/mn-client-session.c:1087
 #, c-format
 msgid "unable to retrieve local address of socket: %s"
 msgstr "ソケットのローカルアドレスの取得に失敗: %s"
 
-#: ../src/mn-client-session.c:1074
+#: src/mn-client-session.c:1093
 #, c-format
 msgid "unable to retrieve remote address of socket: %s"
-msgstr ""
-"ソケットのリモードアドレスの取得に失敗: %s"
+msgstr "ソケットのリモードアドレスの取得に失敗: %s"
 
-#: ../src/mn-client-session.c:1108
+#: src/mn-client-session.c:1127
 #, c-format
 msgid "unable to set SASL security properties: %s"
-msgstr "SASLのセキュリティ・プロパティの設定に失敗: %s"
+msgstr "SASLのセキュリティに関する設定に失敗: %s"
 
-#: ../src/mn-client-session.c:1132
+#: src/mn-client-session.c:1151
 msgid ""
 "unable to start SASL authentication: SASL asked for something we did not know"
-msgstr ""
-"SASL認証を開始できません. 未知の要求を検出しました"
-""
+msgstr "SASL認証を開始できません. 未知の要求を検出しました"
 
-#: ../src/mn-client-session.c:1151
+#: src/mn-client-session.c:1170
 #, c-format
 msgid "unable to start SASL authentication: %s"
 msgstr "SASL認証を開始できません: %s"
 
-#: ../src/mn-client-session.c:1155
+#: src/mn-client-session.c:1174
 #, c-format
 msgid "unable to create a SASL connection: %s"
 msgstr "SASLコネクションの確立に失敗: %s"
 
-#: ../src/mn-client-session.c:1202
+#: src/mn-client-session.c:1221
 msgid "SASL asked for something we did not know, aborting SASL authentication"
-msgstr ""
-"SASLから未知の要求が発生. SASL認証を中止します"
+msgstr "SASLから未知の要求が発生. SASL認証を中止します"
 
-#: ../src/mn-client-session.c:1219
+#: src/mn-client-session.c:1238
 #, c-format
 msgid "%s, aborting SASL authentication"
 msgstr "%s, SASL認証を中止"
 
 #. compliance error
-#: ../src/mn-client-session.c:1224
+#: src/mn-client-session.c:1243
 #, c-format
 msgid "unable to decode Base64 input from server: %s"
 msgstr "サーバから取得したメッセージのBase64デコードに失敗: %s"
 
-#: ../src/mn-client-session.c:1260
+#: src/mn-client-session.c:1279
 #, c-format
 msgid "a SASL security layer of strength factor %i is now active"
-msgstr "SASLのセキュリティレイヤ (強度 %i) が有効です"
+msgstr "SASLのセキュリティレイヤ (強度%i) が有効になりました"
 
 #. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1265
+#: src/mn-client-session.c:1284
 #, c-format
 msgid "unable to get SASL_MAXOUTBUF property: %s"
-msgstr "SASL_MAXOUTBUF プロパティの取得に失敗: %s"
+msgstr "SASL_MAXOUTBUFプロパティの取得に失敗: %s"
 
-#: ../src/mn-client-session.c:1271
+#: src/mn-client-session.c:1290
 #, c-format
 msgid "warning: unable to get SASL_SSF property: %s"
-msgstr "SASL_SSF プロパティの取得に失敗: %s"
+msgstr "警告: SASL_SSFプロパティの取得に失敗: %s"
+
+#: src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "未知のサーバーエラー"
+
+#: src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "メールボックス"
+
+#: src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "差出人"
 
-#: ../src/mn-conf.c:240
+#: src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "件名"
+
+#: src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "発信時期"
+
+#: src/mn-conf.c:262
 msgid "A directory creation error has occurred"
 msgstr "ディレクトリ作成時にエラーが発生"
 
-#: ../src/mn-conf.c:241
+#: src/mn-conf.c:263
 #, c-format
 msgid "Unable to create directory \"%s\": %s."
-msgstr "\"%s\" ディレクトリの作成に失敗: %s."
+msgstr "ディレクトリ\"%s\"の作成に失敗: %s."
 
-#: ../src/mn-conf.c:317
+#: src/mn-conf.c:402
 #, c-format
 msgid "recursively unsetting %s"
-msgstr "%s の設定を再帰的に解除中"
+msgstr "%sの設定を再帰的に解除中"
 
-#: ../src/mn-conf.c:321
+#: src/mn-conf.c:406
 msgid "syncing the GConf database"
 msgstr "GConfデータベースを同期中"
 
-#: ../src/mn-conf.c:324
+#: src/mn-conf.c:409
 msgid "completed"
 msgstr "完了"
 
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: 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
 msgid "invalid location"
 msgstr "不正な位置指定"
 
-#: ../src/mn-evolution-folder-tree-control.c:86
+#: src/mn-evolution-folder-tree-control.c:91
 msgid "The currently selected URI"
 msgstr "現在選択されているURI"
 
-#: ../src/mn-evolution-mailbox-properties.gob:67
+#. translators: header capitalization
+#: src/mn-evolution-mailbox-properties.gob:68
 msgid "Folder"
 msgstr "フォルダ"
 
-#: ../src/mn-evolution-mailbox-properties.gob:169
+#: src/mn-evolution-mailbox-properties.gob:159
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
-msgstr "Evolutionに接続できません. Evolutionが稼働しており, "
-"Mail NotificationのEvolutionプラグインが読み込まれていることを"
-"ご確認ください."
+msgstr ""
+"Evolutionに接続できません. Evolutionが稼働しており, "
+"Evolutionプラグインが読み込まれていることをご確認ください."
 
-#: ../src/mn-evolution-mailbox.gob:61
+#: src/mn-evolution-mailbox.gob:75
 msgid "folder not found"
 msgstr "フォルダが見つかりません"
 
-#: ../src/mn-evolution-mailbox.gob:182
+#: src/mn-evolution-mailbox.gob:216
 msgid "unable to contact Evolution"
 msgstr "Evolutionに接続できません"
 
-#: ../src/mn-evolution-plugin.c:130 ../src/mn-evolution-plugin.c:134
+#: src/mn-evolution-plugin.c:136 src/mn-evolution-plugin.c:140
 msgid "Unable to activate the Mail Notification plugin"
-msgstr "Mail Notificationのプラグインが動作しません"
+msgstr "プラグインが動作しません"
 
-#: ../src/mn-evolution-plugin.c:130
+#: src/mn-evolution-plugin.c:136
 #, c-format
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonoboが %s サーバーを検出できませんでした. Mail Notificationが"
-"正しくインストールされているかどうかをご確認ください."
+"Bonoboが%sサーバーを検出できませんでした. メール着信通知システムが正しく"
+"インストールされているかどうかをご確認ください."
 
-#: ../src/mn-evolution-plugin.c:134 ../src/mn-main.c:427
+#: src/mn-evolution-plugin.c:140 src/mn-main.c:460
 #, c-format
 msgid ""
 "Bonobo was unable to register the %s server. Please check your Mail "
 "Notification installation."
 msgstr ""
-"Bonoboが %s サーバーを登録できませんでした. Mail Notificationが"
-"正しくインストールされているかどうかをご確認ください."
+"Bonoboが%sサーバーを登録できませんでした. メール着信通知システムが正しく"
+"インストールされているかどうかをご確認ください."
 
-#: ../src/mn-gmail-mailbox.gob:111
+#: src/mn-gmail-mailbox.gob:103
 msgid "invalid feed location"
-msgstr "フィードの指定"
+msgstr "フィードの指定が不正"
 
-#: ../src/mn-gmail-mailbox.gob:125
+#: src/mn-gmail-mailbox.gob:117
 #, c-format
 msgid "retrieving feed from %s"
-msgstr "%s のフィードを取得中"
+msgstr "%sからフィードを取得中"
 
-#: ../src/mn-gmail-mailbox.gob:132
+#: src/mn-gmail-mailbox.gob:124
 #, c-format
 msgid "unable to retrieve feed: %s"
 msgstr "フィードを取得できませんでした: %s"
 
-#: ../src/mn-gmail-mailbox.gob:147 ../src/mn-gmail-mailbox.gob:194
+#: src/mn-gmail-mailbox.gob:139 src/mn-gmail-mailbox.gob:187
 msgid "unable to parse feed"
-msgstr "フィードされた内容を解析できません"
+msgstr "フィードの内容を解析できません"
 
-#: ../src/mn-gmime-stream-vfs.gob:49
-#: ../src/mn-sylpheed-mailbox-backend.gob:152
+#: src/mn-gmime-stream-vfs.gob:50 src/mn-sylpheed-mailbox-backend.gob:205
 #, c-format
 msgid "unable to read %s: %s"
-msgstr "%s の読み取りに失敗: %s"
+msgstr "%sの読み取りに失敗: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:51
+#: src/mn-gmime-stream-vfs.gob:52
 #, c-format
 msgid "unable to write to %s: %s"
-msgstr "%s への書き込みに失敗: %s"
+msgstr "%sへの書き込みに失敗: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:53
+#: src/mn-gmime-stream-vfs.gob:54
 #, c-format
 msgid "unable to seek in %s: %s"
-msgstr "%s のシークに失敗: %s"
+msgstr "%sのシークに失敗: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:55
+#: src/mn-gmime-stream-vfs.gob:56
 #, c-format
 msgid "unable to tell position of %s: %s"
-msgstr "%s の位置を判別不能: %s"
+msgstr "%sの位置判別に失敗: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:57 ../src/mn-mh-mailbox-backend.gob:158
+#: src/mn-gmime-stream-vfs.gob:58 src/mn-mh-mailbox-backend.gob:164
 #, c-format
 msgid "unable to close %s: %s"
-msgstr "%s のクローズに失敗: %s"
+msgstr "%sのクローズに失敗: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:113
+#: src/mn-imap-mailbox-properties.gob:114 src/mn-standard-message-view.gob:62
 msgid "Mailbox:"
 msgstr "メールボックス:"
 
-#: ../src/mn-imap-mailbox-properties.gob:117
+#: src/mn-imap-mailbox-properties.gob:118
 msgid "in_box"
 msgstr "In_box"
 
-#: ../src/mn-imap-mailbox-properties.gob:128
+#: src/mn-imap-mailbox-properties.gob:129
 msgid "oth_er:"
 msgstr "他(_E):"
 
-#: ../src/mn-imap-mailbox-properties.gob:139
+#: src/mn-imap-mailbox-properties.gob:140
 msgid "ne_ver"
 msgstr "しない(_V)"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
+#: src/mn-imap-mailbox-properties.gob:141
 msgid "au_todetect"
 msgstr "自動検出(_T)"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
+#: src/mn-imap-mailbox-properties.gob:142
 msgid "al_ways"
 msgstr "常に(_W)"
 
-#: ../src/mn-imap-mailbox-properties.gob:173
+#: 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.gob:390
+#: src/mn-imap-mailbox.gob:384
 msgid "server did not send capabilities"
-msgstr "サーバーからの仕様取得に失敗"
+msgstr "サーバーの仕様取得に失敗"
 
-#: ../src/mn-imap-mailbox.gob:573
+#: src/mn-imap-mailbox.gob:551
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
-msgstr ""
-"サーバーから LOGINDISABLED の通知あり. LOGIN認証の使用を取り止めます"
+msgstr "サーバーからLOGINDISABLEDの通知あり. LOGIN認証の使用を取り止めます"
 
-#: ../src/mn-imap-mailbox.gob:574
+#: src/mn-imap-mailbox.gob:552
 msgid "unable to login"
 msgstr "ログインできません"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:714
-msgid "server did not send search results"
-msgstr "サーバーから検索結果が得られませんでした"
-
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:792
+#: src/mn-imap-mailbox.gob:752
 msgid "server did not send all the messages we requested"
-msgstr "メッセージの要求に対し, サーバーが完全に応答しませんでした"
+msgstr "サーバーから検索結果が得られませんでした"
 
-#: ../src/mn-imap-mailbox.gob:859
+#: src/mn-imap-mailbox.gob:822
 msgid "unable to fetch message"
 msgstr "メッセージの取得に失敗"
 
-#: ../src/mn-imap-mailbox.gob:875
+#: src/mn-imap-mailbox.gob:847
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
-msgstr "メールボックスの設定で \"Use the IDLE extension\" が \"never\" "
+msgstr ""
+"メールボックスの設定で \"Use the IDLE extension\" が \"never\" "
 "になっています. ログアウトします"
 
-#: ../src/mn-imap-mailbox.gob:886
+#: src/mn-imap-mailbox.gob:858
 #, c-format
 msgid "the remote server runs %s, not using the IDLE extension"
-msgstr "サーバーで %s が稼働しています. 拡張機能 IDLE は使用されてません"
+msgstr "サーバーで%sが稼働しています. 拡張機能IDLEは使用しません"
 
-#: ../src/mn-imap-mailbox.gob:891
+#: src/mn-imap-mailbox.gob:863
 #, c-format
 msgid ""
 "the remote server runs %s, the IDLE extension might not function properly"
-msgstr "サーバーで %s が稼働しています. 拡張機能 IDLE が正常に"
+msgstr ""
+"サーバーで%sが稼働しています. 拡張機能 IDLE が正常に"
 "機能しないおそれがあります"
 
-#: ../src/mn-imap-mailbox.gob:900
+#: src/mn-imap-mailbox.gob:872
 msgid "the remote server does not support the IDLE extension, logging out"
 msgstr "サーバーが拡張機能IDLEをサポートしていません. ログアウトします"
 
-#: ../src/mn-imap-mailbox.gob:1251 ../src/mn-pop3-mailbox.gob:1124
-msgid "unknown server error"
-msgstr "未知のサーバーエラー"
-
-#: ../src/mn-imap-mailbox.gob:1357 ../src/mn-pop3-mailbox.gob:311
+#: src/mn-imap-mailbox.gob:1377 src/mn-pop3-mailbox.gob:296
 msgid "server does not support in-band SSL/TLS"
 msgstr "サーバーがin-band SSL/TLSをサポートしていません"
 
-#: ../src/mn-imap-mailbox.gob:1381 ../src/mn-pop3-mailbox.gob:997
+#: src/mn-imap-mailbox.gob:1401 src/mn-pop3-mailbox.gob:947
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
-"SASL認証が選択されてますが, コンパイル時にSASLの使用が指定されて"
+"SASL認証が選択されていますが, コンパイル時にSASLの使用が指定されて"
 "いません"
 
-#: ../src/mn-imap-mailbox.gob:1391 ../src/mn-pop3-mailbox.gob:1017
+#: src/mn-imap-mailbox.gob:1411 src/mn-pop3-mailbox.gob:967
 #, c-format
 msgid "unknown authentication mechanism \"%s\""
-msgstr "\"%s\" は未知の認証方式です"
+msgstr "\"%s\"は未知の認証方式です"
 
-#: ../src/mn-imap-mailbox.gob:1423 ../src/mn-pop3-mailbox.gob:1053
+#: src/mn-imap-mailbox.gob:1443 src/mn-pop3-mailbox.gob:1003
 #, c-format
 msgid "disabling mechanism \"%s\" and retrying SASL authentication"
-msgstr "\"%s\" を無効にし, SASL認証を再試行します"
+msgstr "\"%s\"を無効にし, SASL認証を再試行します"
 
-#: ../src/mn-imap-mailbox.gob:1435
+#: src/mn-imap-mailbox.gob:1455
 msgid "falling back to IMAP LOGIN authentication"
-msgstr "代替機能として, IMAP LOGIN認証へ切り替えます"
+msgstr "代替認証方式として, IMAP LOGINへ切り替えます"
 
-#: ../src/mn-imap-mailbox.gob:1447 ../src/mn-pop3-mailbox.gob:1082
+#: src/mn-imap-mailbox.gob:1467 src/mn-pop3-mailbox.gob:1032
 msgid "authentication failed"
 msgstr "認証に失敗しました"
 
-#: ../src/mn-mail-icon.gob:91
-msgid "Main _Window"
-msgstr "メインウィンドウ(_W)"
+#. success; caller must switch state itself
+#. compliance error
+#: src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "サーバーから検索結果が返しませんでした"
 
-#: ../src/mn-mail-icon.gob:92 ../src/mn-main-window.gob:165
+#. translators: header capitalization
+#: src/mn-mail-icon.gob:89
 msgid "_Mail Reader"
-msgstr "メールリーダー(_M)"
+msgstr "メールリーダーを起動(_M)"
 
-#: ../src/mn-mail-icon.gob:93 ../src/mn-main-window.gob:173
+#. translators: header capitalization
+#: src/mn-mail-icon.gob:91 src/mn-mailbox-view.gob:312
 msgid "_Update"
-msgstr "手動チェック(_U)"
+msgstr "今すぐメールをチェック(_U)"
 
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: src/mn-mail-icon.gob:98
 msgid "R_emove From Notification Area"
 msgstr "通知エリアから外す(_E)"
 
-#: ../src/mn-mailbox-properties-dialog.gob:88
+#. 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\">新着メール一覧</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
 #, c-format
 msgid "%s Properties"
-msgstr "%s のプロパティ"
+msgstr "%sのプロパティ"
 
-#: ../src/mn-mailbox-properties-dialog.gob:205
+#. translators: header capitalization
+#: src/mn-mailbox-properties-dialog.gob:232
 msgid "Add a Mailbox"
 msgstr "メールボックスを追加"
 
-#: ../src/mn-mailbox-view.gob:179
+#: src/mn-mailbox-view.gob:248
 msgid "A paste error has occurred"
 msgstr "ペーストエラーが発生"
 
-#: ../src/mn-mailbox-view.gob:320 ../src/mn-message-view.gob:313
-msgid "Mailbox"
-msgstr "メールボックス"
-
-#: ../src/mn-mailbox-view.gob:523
+#: src/mn-mailbox-view.gob:557
 #, c-format
 msgid "unhandled %s mailbox (%s)"
-msgstr "未処理のメールボックス %s (%s)"
+msgstr "未処理のメールボックス%s (%s)"
 
-#: ../src/mn-mailbox-view.gob:528
+#: src/mn-mailbox-view.gob:562
 #, c-format
 msgid "%s mailbox"
-msgstr "%s メールボックス"
+msgstr "%sメールボックス"
 
-#: ../src/mn-mailbox-view.gob:543
+#: src/mn-mailbox-view.gob:577
 msgid "detecting mailbox type..."
 msgstr "メールボックスの種別を判別しています..."
 
-#: ../src/mn-mailbox.gob:278
+#: src/mn-mailbox.gob:472
 msgid "\"type\" attribute missing"
-msgstr "\"type\" 属性が欠落"
+msgstr "\"type\"属性が欠落"
 
-#: ../src/mn-mailbox.gob:285
+#: src/mn-mailbox.gob:479
 #, c-format
 msgid "unknown mailbox type \"%s\""
 msgstr "メールボックスの種別が不明: \"%s\""
 
-#: ../src/mn-mailbox.gob:305
+#: 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\" へ変換できません"
+msgstr ""
+"\"%s\"プロパティ: 文字列\"%s\"を\"%s\"へ変換できません"
 
-#: ../src/mn-mailbox.gob:744
+#: src/mn-mailbox.gob:948
 #, c-format
 msgid "property \"%s\" has no value"
-msgstr "プロパティ \"%s\" の値がありません"
+msgstr "\"%s\"プロパティの値が欠落"
 
-#: ../src/mn-mailboxes.gob:203
+#: src/mn-mailboxes.gob:239
 msgid "An error has occurred while importing old mailboxes"
 msgstr "古いメールボックスのインポート時にエラーが発生"
 
-#: ../src/mn-mailboxes.gob:248
+#: src/mn-mailboxes.gob:265
 msgid "Unable to load the mailboxes configuration"
 msgstr "メールボックスの設定読み込みに失敗"
 
-#: ../src/mn-mailboxes.gob:294
+#: src/mn-mailboxes.gob:311
 msgid "Unable to parse the XML document."
-msgstr "XMLドキュメントが解析できません."
+msgstr "XMLドキュメントの解析に失敗."
 
-#: ../src/mn-mailboxes.gob:301
+#: src/mn-mailboxes.gob:318
 msgid "The root element is missing."
 msgstr "ルートエレメントが欠落."
 
-#: ../src/mn-mailboxes.gob:307
+#: src/mn-mailboxes.gob:324
 #, c-format
 msgid "The root element \"%s\" is invalid."
-msgstr "ルートエレメント \"%s\" が不正."
+msgstr "ルートエレメント\"%s\"が不正."
 
-#: ../src/mn-mailboxes.gob:330
+#: src/mn-mailboxes.gob:347
 #, c-format
 msgid "On line %i: %s."
-msgstr "オンライン %i: %s"
+msgstr "オンライン%i: %s"
 
-#: ../src/mn-mailboxes.gob:335
+#: src/mn-mailboxes.gob:352
 #, c-format
 msgid "On line %i: unknown element \"%s\"."
-msgstr "オンライン %i: 未知の要素 \"%s\"."
+msgstr "オンライン%i: 未知の要素\"%s\"."
 
-#: ../src/mn-mailboxes.gob:346
+#: src/mn-mailboxes.gob:361
 msgid "An error has occurred while loading the mailboxes configuration"
 msgstr "メールボックスの設定読み込み時にエラーが発生"
 
-#: ../src/mn-mailboxes.gob:371
+#: src/mn-mailboxes.gob:386
 msgid "Unable to save the mailboxes configuration"
 msgstr "メールボックスの設定を保存できません"
 
-#: ../src/mn-mailboxes.gob:417
+#: src/mn-mailboxes.gob:428
+#, c-format
+msgid "Unable to remove %s: %s."
+msgstr "%sの削除に失敗: %s."
+
+#: src/mn-mailboxes.gob:436
+#, c-format
+msgid "Unable to create %s: %s."
+msgstr "%sの作成に失敗: %s."
+
+#: src/mn-mailboxes.gob:443
+#, c-format
+msgid "Unable to open %s for writing: %s."
+msgstr "書き込み時, %sのオープンに失敗: %s."
+
+#: src/mn-mailboxes.gob:450
 msgid "Unable to write the XML document."
 msgstr "XMLドキュメントの作成に失敗."
 
+#: src/mn-mailboxes.gob:456
+#, c-format
+msgid "Unable to close %s: %s."
+msgstr "%sのクローズに失敗: %s"
+
+#: src/mn-mailboxes.gob:466 src/mn-mailboxes.gob:473
+#, c-format
+msgid "Unable to rename %s to %s: %s."
+msgstr "%sから%sへの名称変更に失敗: %s"
+
 #. non fatal
-#: ../src/mn-mailboxes.gob:433
+#: src/mn-mailboxes.gob:479
 #, c-format
 msgid "unable to delete %s: %s"
-msgstr "%s の削除に失敗: %s"
+msgstr "%sの削除に失敗: %s"
 
-#: ../src/mn-mailboxes.gob:457
+#: src/mn-mailboxes.gob:509
 #, c-format
 msgid "%s has %i new message"
-msgstr "%s に新着メールが %i 件"
+msgstr "%sに新着メールが%i件"
 
-#: ../src/mn-mailboxes.gob:483
+#: src/mn-mailboxes.gob:535
 #, c-format
 msgid "%s reported an error: %s"
-msgstr "%s がエラーを検出: %s"
+msgstr "%sがエラーを検出: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:111
+#: src/mn-maildir-mailbox-backend.gob:125
 #, c-format
-msgid "unable to open folder \"new\": %s"
-msgstr "\"new\" フォルダのオープンに失敗: %s"
+msgid "unable to open folder \"%s\": %s"
+msgstr "\"%s\"フォルダのオープンに失敗: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:144
+#: src/mn-maildir-mailbox-backend.gob:173
 #, c-format
-msgid "unable to close folder \"new\": %s"
-msgstr "\"new\" フォルダのクローズに失敗: %s"
+msgid "unable to close folder \"%s\": %s"
+msgstr "\"%s\"フォルダのクローズに失敗: %s"
 
-#: ../src/mn-maildir-mailbox-backend.gob:147
+#: src/mn-maildir-mailbox-backend.gob:176
 #, c-format
-msgid "error while reading folder \"new\": %s"
-msgstr "\"new\" フォルダの読み込みに失敗: %s"
-
-#: ../src/mn-main-window.gob:106
-msgid "Help messages"
-msgstr "ヘルプメッセージ"
-
-#: ../src/mn-main-window.gob:107
-msgid "Count messages"
-msgstr "メッセージ件数をカウント"
-
-#. Toplevel
-#: ../src/mn-main-window.gob:156
-msgid "_Mail"
-msgstr "メール(_M)"
-
-#: ../src/mn-main-window.gob:157
-msgid "_Edit"
-msgstr "編集(_E)"
-
-#: ../src/mn-main-window.gob:158
-msgid "_View"
-msgstr "表示(_V)"
-
-#: ../src/mn-main-window.gob:159
-msgid "_Help"
-msgstr "ヘルプ(_H)"
-
-#: ../src/mn-main-window.gob:167
-msgid "Launch the mail reader"
-msgstr "メールリーダーを起動"
-
-#. Reload
-#: ../src/mn-main-window.gob:175 ../src/mn-main.c:248
-msgid "Update the mail status"
-msgstr "着信状況を手動チェック"
-
-#: ../src/mn-main-window.gob:181
-msgid "_Close"
-msgstr "閉じる(_C)"
-
-#: ../src/mn-main-window.gob:183
-msgid "Close this window"
-msgstr "ウィンドウを閉じる"
-
-#: ../src/mn-main-window.gob:189
-msgid "_Quit"
-msgstr "終了(_Q)"
-
-#: ../src/mn-main-window.gob:191 ../src/mn-main.c:266
-msgid "Quit Mail Notification"
-msgstr "Mail Notificationを終了"
-
-#: ../src/mn-main-window.gob:199 ../src/mn-main-window.gob:247
-msgid "_Toolbars"
-msgstr "ツールバー(_T)"
-
-#: ../src/mn-main-window.gob:201
-msgid "Customize the toolbars"
-msgstr "ツールバーをカスタマイズ"
-
-#: ../src/mn-main-window.gob:207
-msgid "_Preferences"
-msgstr "プロパティ(_E)"
-
-#: ../src/mn-main-window.gob:217
-msgid "Toolbars Styl_e"
-msgstr "ツールバーのスタイル(_E)"
-
-#: ../src/mn-main-window.gob:219
-msgid "Customize the toolbars style"
-msgstr "ツールバーのスタイルをカスタマイズ"
-
-#: ../src/mn-main-window.gob:227
-msgid "_Contents"
-msgstr "マニュアル(_C)"
-
-#: ../src/mn-main-window.gob:229
-msgid "Display help"
-msgstr "ヘルプを表示"
-
-#: ../src/mn-main-window.gob:235
-msgid "_About"
-msgstr "情報(_A)"
-
-#: ../src/mn-main-window.gob:237
-msgid "Display credits"
-msgstr "クレジットを表示"
-
-#: ../src/mn-main-window.gob:249
-msgid "Show or hide the toolbars"
-msgstr "ツールバーを表示/隠す"
-
-#: ../src/mn-main-window.gob:256
-msgid "_Statusbar"
-msgstr "ステータスバー(_S)"
-
-#: ../src/mn-main-window.gob:258
-msgid "Show or hide the statusbar"
-msgstr "ステータスバーを表示/隠す"
+msgid "error while reading folder \"%s\": %s"
+msgstr "\"%s\"フォルダの読み込みに失敗: %s"
 
-#: ../src/mn-main-window.gob:269
-msgid "_Desktop Default"
-msgstr "デスクトップ環境のデフォルト(_D)"
+#: src/mn-main.c:100
+msgid "yes"
+msgstr "はい"
 
-#: ../src/mn-main-window.gob:271
-msgid "Set the toolbars style to the desktop default setting"
-msgstr "ツールバーの形式をデスクトップ環境のデフォルト設定と同様に"
+#: src/mn-main.c:100
+msgid "no"
+msgstr "いいえ"
 
-#: ../src/mn-main-window.gob:277
-msgid "I_cons Only"
-msgstr "アイコンのみ(_C)"
-
-#: ../src/mn-main-window.gob:279
-msgid "Only display the toolbars icons"
-msgstr "ツールバーのアイコンのみ表示"
-
-#: ../src/mn-main-window.gob:285
-msgid "_Text Only"
-msgstr "テキストのみ(_T)"
-
-#: ../src/mn-main-window.gob:287
-msgid "Only display the toolbars text"
-msgstr "ツールバーのテキストのみ表示"
-
-#: ../src/mn-main-window.gob:293
-msgid "Text Belo_w Icons"
-msgstr "アイコンの下にテキストを表示(_W)"
-
-#: ../src/mn-main-window.gob:295
-msgid "Display the toolbars text below the icons"
-msgstr "ツールバーでアイコンの下にテキストを表示"
-
-#: ../src/mn-main-window.gob:301
-msgid "Text Be_side Icons"
-msgstr "アイコンの脇にテキストを表示(_S)"
+#: src/mn-main.c:132
+#, c-format
+msgid "%s version %s\n"
+msgstr "%sバージョン%s\n"
 
-#: ../src/mn-main-window.gob:303
-msgid "Display the toolbars text beside the icons"
-msgstr "ツールバーでアイコンの脇にテキストを表示"
+#: src/mn-main.c:137
+msgid "Mailbox backends:\n"
+msgstr "メールボックスバックエンド:\n"
 
-#: ../src/mn-main-window.gob:345
-#, c-format
-msgid "unable to load menus.xml: %s"
-msgstr "menus.xml の読み込みに失敗: %s"
+#: src/mn-main.c:142
+msgid "POP3 and IMAP features:\n"
+msgstr "POP3とIMAPの機能:\n"
 
-#: ../src/mn-main-window.gob:388
-msgid "unable to load toolbars.xml"
-msgstr "toolbars.xml を読み込みに失敗"
+#: src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Sylpheed (Sylphid) の機能:\n"
 
-#: ../src/mn-main-window.gob:439
+#: src/mn-main.c:198
 #, c-format
-msgid "%i new message"
-msgstr "%i 件の新しいメッセージ"
-
-#.
-#. * 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 "内蔵のメールボックスバックエンド: "
+msgid "A Bonobo exception (%s) has occurred in %s()."
+msgstr "Bonoboで例外 (%s) が発生: $s()."
 
-#: ../src/mn-main.c:124
-msgid "Compiled-in POP3 and IMAP features: "
-msgstr "内蔵のPOP3/IMAP機能: "
+#: src/mn-main.c:220
+msgid "Show version information"
+msgstr "バージョン情報を表示"
 
-#: ../src/mn-main.c:194
+#: src/mn-main.c:229
 msgid "Enable informational output"
-msgstr "Ausgabe von Informationen aktivieren"
-
-#: ../src/mn-main.c:203
-msgid "List the compiled-in features"
-msgstr "内蔵機能一覧 (コンパイル時に指定)"
+msgstr "情報出力を有効に"
 
-#: ../src/mn-main.c:212
-msgid "Display the main window"
-msgstr "メインウィンドウを表示"
-
-#: ../src/mn-main.c:221
+#: src/mn-main.c:238
 msgid "Display the properties dialog"
 msgstr "プロパティダイアログを表示"
 
-#: ../src/mn-main.c:230
+#: src/mn-main.c:247
 msgid "Display the about dialog"
-msgstr "プログラムの情報ダイアログを表示"
+msgstr "情報ダイアログを表示"
 
-#: ../src/mn-main.c:239
+#: src/mn-main.c:256
 msgid "Close the mail summary popup"
 msgstr "メール一覧ポップアップを閉じる"
 
-#: ../src/mn-main.c:257
+#: src/mn-main.c:265
+msgid "Update the mail status"
+msgstr "その時点での着信状況をチェック"
+
+#: src/mn-main.c:274
 msgid "Unset obsolete GConf configuration"
 msgstr "旧バージョンのGConf設定を解除"
 
+#: src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "メール着信通知システムを終了"
+
 #.
-#. * 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:310
 msgid "multi-threading is not available"
 msgstr "マルチスレッド使用不可"
 
-#: ../src/mn-main.c:355
+#: src/mn-main.c:365
 msgid ""
 "Bonobo could not locate the automation object. Please check your Mail "
 "Notification installation."
 msgstr ""
-"Bonoboが自動化オブジェクトの検出に失敗. Mail Notificationプログラムが"
-"正しくインストールされているかどうかをご確認ください."
+"Bonoboがオードメーションオブジェクトの検出に失敗しました. メール着信通知"
+"システムが正しくインストールされているかどうかをご確認ください."
 
-#: ../src/mn-main.c:361
+#: src/mn-main.c:371
 msgid "quitting Mail Notification"
-msgstr "Mail Notificationを終了..."
+msgstr "メール着信通知システム終了します..."
 
-#: ../src/mn-main.c:365
+#: src/mn-main.c:375
 msgid "Mail Notification is not running"
-msgstr "Mail Notificationが稼働していません"
+msgstr "メール着信通知システムが稼働していません"
 
-#: ../src/mn-main.c:372
+#: src/mn-main.c:390
 msgid "Unable to initialize the GnomeVFS library."
-msgstr "Die GnomeVFS-Bibliothek konnte nicht initializiert werden."
+msgstr "GnomeVFSライブラリの初期化に失敗."
 
-#: ../src/mn-main.c:404
+#: src/mn-main.c:438
 msgid "updating the mail status"
 msgstr "着信状況をチェック中"
 
-#: ../src/mn-main.c:413
+#: src/mn-main.c:446
 msgid "Mail Notification is already running"
-msgstr "Mail Notificationは既に稼働しています"
+msgstr "メール着信通知システムは既に稼働しています"
 
-#: ../src/mn-main.c:423
+#: src/mn-main.c:456
 #, c-format
 msgid ""
 "Bonobo could not locate the %s file. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonoboが %s ファイルの検出に失敗しました. Mail Notificationが"
-"正しくインストールされているかどうかをご確認ください."
+"Bonoboが%sファイルの検出に失敗しました. メール着信通知システムが正しく"
+"インストールされているかどうかをご確認ください."
 
-#: ../src/mn-mbox-mailbox-backend.gob:209
+#: src/mn-mbox-mailbox-backend.gob:281
 #, c-format
 msgid "unable to close file: %s"
 msgstr "ファイルのクローズに失敗: %s"
 
-#: ../src/mn-mbox-mailbox-backend.gob:222
+#: src/mn-mbox-mailbox-backend.gob:298
 #, c-format
 msgid "unable to open mailbox: %s"
 msgstr "メールボックスのオープンに失敗: %s"
 
-#: ../src/mn-message-mime.c:104
+#: src/mn-message-mime.c:121
 msgid "unable to parse MIME message"
-msgstr "MIMEメッセージの解釈に失敗"
-
-#: ../src/mn-message-view.gob:82
-msgid "You have no new mail."
-msgstr "新着メールはありません."
-
-#: ../src/mn-message-view.gob:322
-msgid "Unreadable message"
-msgstr "メッセージを判読できません"
-
-#: ../src/mn-message-view.gob:330
-msgid "From"
-msgstr "差出人"
-
-#: ../src/mn-message-view.gob:338
-msgid "Subject"
-msgstr "件名"
+msgstr "MIMEメッセージの解析に失敗"
 
-#: ../src/mn-message-view.gob:349
-msgid "Sent"
-msgstr "発信時期"
-
-#: ../src/mn-message.gob:99
+#: src/mn-message.gob:111
 msgid "Unknown"
 msgstr "不明"
 
-#: ../src/mn-message.gob:124
-#, c-format
-msgid "%i second ago"
-msgstr "%i 秒前"
-
-#: ../src/mn-message.gob:128
-#, c-format
-msgid "about %i minute ago"
-msgstr "約 %i 分前"
-
-#: ../src/mn-message.gob:133
-#, c-format
-msgid "about %i hour ago"
-msgstr "約 %i 時間前"
-
-#: ../src/mn-message.gob:138
-#, c-format
-msgid "about %i day ago"
-msgstr "約 %i 日前"
-
-#: ../src/mn-message.gob:143
-#, c-format
-msgid "about %i week ago"
-msgstr "約 %i 週前"
-
 #. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:163
+#: src/mn-message.gob:130
 msgid "none"
 msgstr "無し"
 
-#: ../src/mn-mh-mailbox-backend.gob:161
+#: src/mn-mh-mailbox-backend.gob:167
 #, c-format
 msgid "error while reading %s: %s"
-msgstr "%s の読み取り中にエラー: %s"
+msgstr "%sの読み出し中にエラーが発生: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:174
+#: src/mn-mh-mailbox-backend.gob:180
 #, c-format
 msgid "unable to open %s: %s"
-msgstr "%s のオープンに失敗: %s"
+msgstr "%sのオープンに失敗: %s"
 
-#: ../src/mn-pi-mailbox-properties.gob:67
+#: src/mn-pi-mailbox-properties.gob:67
 msgid "sta_ndard"
 msgstr "標準(_N)"
 
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "_in-band SSL/TLS"
-msgstr "_in-band SSL/TLS"
+#: src/mn-pi-mailbox-properties.gob:68
+msgid "in-band SS_L/TLS"
+msgstr "SS_L/TLS (in-band)"
 
-#: ../src/mn-pi-mailbox-properties.gob:69
+#: src/mn-pi-mailbox-properties.gob:69
 msgid "SSL/TLS on sepa_rate port"
-msgstr "SSL/TLSポートの番号を指定(_X)"
+msgstr "SSL/TLSポートの番号を指定(_R)"
 
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "_Hostname:"
+#: src/mn-pi-mailbox-properties.gob:73
+msgid "Ho_stname:"
 msgstr "サーバー(_H):"
 
-#: ../src/mn-pi-mailbox-properties.gob:93
+#. translators: header capitalization
+#: src/mn-pi-mailbox-properties.gob:94
 msgid "_Details"
 msgstr "詳細(_D)"
 
-#: ../src/mn-pi-mailbox-properties.gob:148
+#: src/mn-pi-mailbox-properties.gob:149
 msgid "Connection type:"
 msgstr "接続方式:"
 
-#: ../src/mn-pi-mailbox-properties.gob:155
+#: src/mn-pi-mailbox-properties.gob:156
 msgid "Port:"
 msgstr "ポート:"
 
-#: ../src/mn-pi-mailbox-properties.gob:178
-msgid "_Authentication mechanism:"
+#: src/mn-pi-mailbox-properties.gob:179
+msgid "Authent_ication mechanism:"
 msgstr "認証方式(_A):"
 
-#: ../src/mn-pi-mailbox.gob:113
+#: src/mn-pi-mailbox.gob:151
 msgid "SSL/TLS support has not been compiled in"
+msgstr "SSL/TLSを使用するための機能がコンパイル時に指定されていません"
+
+#: src/mn-pi-mailbox.gob:317
+#, 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 ""
-"SSL/TLSを使用するための機能がコンパイル時に指定されていません"
+"%sのメールボックス\"%s\"にログインできませんでした. 誤った認証情報が"
+"入力されたためと思われます."
+"\n"
+"入力しなおしてみてください."
 
-#: ../src/mn-pop3-mailbox.gob:359
+#: src/mn-pi-mailbox.gob:318
+#, 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
+msgid "Authentication Required"
+msgstr "認証が必要です"
+
+#: src/mn-pop3-mailbox.gob:344
 msgid "invalid arguments for the LOGIN-DELAY capability"
-msgstr "LOGIN-DELAY の引数が不正"
+msgstr "LOGIN-DELAY機能に対する引数が不正"
 
 #.
 #. * Some servers violate RFC 2449 by not supporting a
@@ -1413,456 +1196,461 @@ msgstr "LOGIN-DELAY の引数が不正"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:519
+#: src/mn-pop3-mailbox.gob:485
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
-msgstr "SASL認証でクライアントの初期応答に失敗. 初期応答なしで再試行します"
+msgstr "クライアントの初期応答でSASL認証に失敗. 初期応答なしで"
+"再試行します"
 
-#: ../src/mn-pop3-mailbox.gob:733
+#: src/mn-pop3-mailbox.gob:696
 msgid "unknown error"
 msgstr "未知のエラー"
 
-#: ../src/mn-pop3-mailbox.gob:828
+#: src/mn-pop3-mailbox.gob:791
 #, c-format
 msgid "honouring LOGIN-DELAY, sleeping for %i second"
-msgstr "LOGIN-DELAY を尊重し, %i 秒待ちます"
+msgstr "LOGIN-DELAYを尊重し, %i秒待ちます"
 
-#: ../src/mn-pop3-mailbox.gob:1009
+#: src/mn-pop3-mailbox.gob:959
 msgid "server does not support APOP authentication"
 msgstr "サーバーがAPOP認証をサポートしていません"
 
-#: ../src/mn-pop3-mailbox.gob:1065
+#: src/mn-pop3-mailbox.gob:1015
 msgid "falling back to APOP authentication"
-msgstr "代替機能としてAPOP認証に切り替えます."
+msgstr "代替認証方式として, APOPに切り替えます."
 
-#: ../src/mn-pop3-mailbox.gob:1070
+#: src/mn-pop3-mailbox.gob:1020
 msgid "falling back to USER/PASS authentication"
-msgstr "代替機能としてUSER/PASS認証に切り替えます."
+msgstr "代替認証方式として, USER/PASSに切り替えます."
 
-#: ../src/mn-properties-dialog.gob:170 ../ui/properties-dialog.glade.h:10
+#. translators: header capitalization
+#: src/mn-properties-dialog.gob:173 ui/properties-dialog.glade.h:13
 msgid "Mail Notification Properties"
-msgstr "Mail Notificationのプロパティ"
+msgstr "メール着信通知システムのプロパティ"
 
-#: ../src/mn-properties-dialog.gob:207
+#: src/mn-properties-dialog.gob:207
 msgid "top left"
 msgstr "左上"
 
-#: ../src/mn-properties-dialog.gob:208
+#: src/mn-properties-dialog.gob:208
 msgid "top right"
 msgstr "右上"
 
-#: ../src/mn-properties-dialog.gob:209
+#: src/mn-properties-dialog.gob:209
 msgid "bottom left"
 msgstr "左下"
 
-#: ../src/mn-properties-dialog.gob:210
+#: src/mn-properties-dialog.gob:210
 msgid "bottom right"
 msgstr "右下"
 
-#: ../src/mn-properties-dialog.gob:329
+#: src/mn-properties-dialog.gob:332
 msgid "No mailbox selected."
-msgstr "メールボックスが指定されていません."
+msgstr "メールボックスを選択してください."
 
-#: ../src/mn-properties-dialog.gob:334
+#: src/mn-properties-dialog.gob:337
 #, c-format
 msgid "%i mailbox selected."
-msgstr "%i 箇所のメールボックスを選択."
+msgstr "メールボックスを%i個選択."
 
-#: ../src/mn-properties-dialog.gob:465
+#: src/mn-properties-dialog.gob:456
 #, c-format
 msgid "Test message #%i"
-msgstr "テストメッセージ No. %i"
+msgstr "テストメッセージ#%i"
 
-#: ../src/mn-properties-dialog.gob:470
+#. translators: header capitalization
+#: src/mn-properties-dialog.gob:462
 msgid "Mail Notification Properties Dialog"
 msgstr "プロパティダイアログ"
 
-#: ../src/mn-shell.gob:109
-msgid "You have new mail."
-msgstr "新しいメールがあります."
-
-#: ../src/mn-shell.gob:374
+#. translators: header capitalization
+#: src/mn-shell.gob:381
 msgid "Mailboxes Having New Mail"
 msgstr "メールボックスごとの着信状況"
 
-#: ../src/mn-shell.gob:393
+#. translators: header capitalization
+#: src/mn-shell.gob:400
 msgid "Errors"
 msgstr "エラー"
 
-#: ../src/mn-shell.gob:408
+#. translators: header capitalization
+#: src/mn-shell.gob:416
 msgid "Mail Summary"
 msgstr "新着メール一覧"
 
-#: ../src/mn-ssl.c:76
+#: src/mn-shell.gob:445
+msgid "You have no new mail."
+msgstr "新着メールはありません."
+
+#: src/mn-ssl.c:76
 msgid "unknown SSL/TLS error"
 msgstr "未知のSSL/TLSエラー"
 
-#: ../src/mn-stock.c:28
+#: 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
+msgid "Sent:"
+msgstr "発信時期:"
+
+#. translators: header capitalization
+#: src/mn-stock.c:29
 msgid "Select _All"
 msgstr "すべてを選択(_A)"
 
-#: ../src/mn-stock.c:29
-msgid "Leave Fullscreen"
-msgstr "フルスクリーンをやめる"
-
-#: ../src/mn-stock.c:30
+#. translators: header capitalization
+#. translators: header capitalization
+#: src/mn-stock.c:32
 msgid "Co_nnect"
 msgstr "接続(_N)"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:170
+#: src/mn-sylpheed-mailbox-backend.gob:223
 #, c-format
 msgid "unable to open folder: %s"
 msgstr "フォルダのオープンに失敗: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:209
+#: src/mn-sylpheed-mailbox-backend.gob:276
 #, c-format
 msgid "unable to close folder: %s"
 msgstr "フォルダのクローズに失敗: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:212
+#: src/mn-sylpheed-mailbox-backend.gob:279
 #, c-format
 msgid "error while reading folder: %s"
-msgstr "フォルダのリードに失敗: %s"
+msgstr "フォルダの読み出しに失敗: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:255
+#: src/mn-sylpheed-mailbox-backend.gob:420
 msgid "unexpected end of file"
 msgstr "予想外のEOF"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:269
+#: src/mn-sylpheed-mailbox-backend.gob:438
 #, c-format
 msgid "incompatible file version \"%i\""
-msgstr "バージョン \"%i\" のファイルとは互換性がありません"
+msgstr "ファイルバージョン\"%i\"の互換性がありません"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:272
+#: src/mn-sylpheed-mailbox-backend.gob:441
 msgid "file version missing"
 msgstr "ファイルバージョンが欠落"
 
-#: ../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-system-vfs-mailbox-properties.gob:40
+#: src/mn-system-vfs-mailbox-properties.gob:48
+#: src/mn-system-vfs-mailbox.gob:45
 msgid "System mailbox"
 msgstr "ローカルシステムのメールボックス"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:68
+#: src/mn-system-vfs-mailbox-properties.gob:70
 #, c-format
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
-msgstr ""
-"あなたのメールボックスは <span weight=\"bold\">%s</span>."
+msgstr "あなたのメールボックスは<span weight=\"bold\">%s</span>です."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:75
+#: src/mn-system-vfs-mailbox-properties.gob:77
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
 msgstr ""
-"ローカルシステムのメールボックスを検出できませんでした. 環境変数 MAIL "
-"の設定をご確認ください."
+"ローカルシステムのメールボックスを検出できませんでした. 環境変数MAILの"
+"設定をご確認ください."
 
-#: ../src/mn-system-vfs-mailbox.gob:72
-msgid "MAIL environment variable not defined"
-msgstr "環境変数 MAIL が設定されていません"
+#: src/mn-system-vfs-mailbox.gob:72
+msgid "system mailbox not found"
+msgstr "ローカルシステムのメールボックスが見当たりません"
 
-#: ../src/mn-util.c:281
+#: src/mn-util.c:349
 #, c-format
 msgid "error loading image: %s"
 msgstr "画像の読み込みに失敗: %s"
 
-#: ../src/mn-util.c:298
+#: src/mn-util.c:365
 #, c-format
-msgid "widget \"%s\" not found in interface \"%s\""
-msgstr "ウィジェット \"%s\" がインタフェース内で見つかりません"
+msgid ""
+"Unable to load interface \"%s\". Please check your Mail Notification "
+"installation."
+msgstr ""
+"インターフェース\"%s\"の読み込みに失敗. メール着信通知システムが正しく"
+"インストールされているかどうかをご確認ください."
 
-#: ../src/mn-util.c:398
+#: src/mn-util.c:380
 #, c-format
-msgid "unable to open self as a module: %s"
+msgid ""
+"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
+"Notification installation."
+msgstr "\"%s\"ウィジェットがインターフェース内で見つかりません. 新着メール"
+"通知システムが正しくインストールされているかどうかをご確認ください."
+
+#: src/mn-util.c:449
+#, c-format
+msgid "Unable to open self as a module (%s)."
 msgstr "自分自身をモジュールとしてオープンできません: %s"
 
-#: ../src/mn-util.c:403
+#: src/mn-util.c:454
 #, c-format
-msgid "signal handler \"%s\" not found"
-msgstr "シグナルハンドラ \"%s\" が見つかりません"
+msgid ""
+"Signal handler \"%s\" not found. Please check your Mail Notification "
+"installation."
+msgstr ""
+"シグナルハンドラ\"%s\"が見つかりません. メール着信通知システムが正しく"
+"インストールされているかどうかをご確認ください."
 
-#: ../src/mn-util.c:556 ../src/mn-util.c:579 ../src/mn-util.c:601
-#: ../src/mn-util.c:623
+#: src/mn-util.c:605 src/mn-util.c:628 src/mn-util.c:648 src/mn-util.c:670
 msgid "A drag and drop error has occurred"
 msgstr "ドラッグ&ドロップエラーが発生"
 
-#: ../src/mn-util.c:557
+#: src/mn-util.c:606
 msgid "An invalid location list has been received."
-msgstr "不正なアドレスを取得しました."
+msgstr "不正なアドレス (URI) 一覧を取得しました."
 
-#: ../src/mn-util.c:602
+#: src/mn-util.c:649
 msgid "An invalid Mozilla location has been received."
-msgstr "Mozilla用のアドレス指定が不正."
+msgstr "Mozilla用のアドレス (URI) 指定が不正."
 
-#: ../src/mn-util.c:678
+#: src/mn-util.c:725
 msgid "Unable to display help"
 msgstr "ヘルプを表示できません"
 
-#: ../src/mn-util.c:692
+#: src/mn-util.c:739
 #, c-format
 msgid "Unable to create a thread: %s."
 msgstr "スレッドの生成に失敗: %s."
 
-#: ../src/mn-util.c:782
-msgid "_Do not show this message again"
-msgstr "このメッセージを次回から表示しない(_D)"
-
-#: ../src/mn-util.c:892
+#: src/mn-util.c:899
 #, c-format
 msgid ""
 "The following location is invalid:\n"
 "\n"
 "%s"
-msgstr ""
-"以下のアドレスが不正です:\n"
+msgstr "以下のアドレスが不正です:"
 "\n"
 "%s"
 
-#: ../src/mn-util.c:912
+#: src/mn-util.c:919
 msgid "A fatal error has occurred in Mail Notification"
-msgstr ""
-"Mail Notification内部で致命的なエラーが発生"
+msgstr "メール着信通知システムの内部で致命的なエラーが発生"
 
-#: ../src/mn-util.c:951
+#: src/mn-util.c:958
 #, c-format
 msgid "unable to get current time: %s"
 msgstr "現在の時刻の取得に失敗: %s"
 
-#: ../src/mn-util.c:1013
+#: src/mn-util.c:1250
 #, c-format
-msgid "invalid signal specification \"%s\""
-msgstr "シグナルの指定が不正です: \"%s\""
+msgid "%i second ago"
+msgstr "%i秒前"
 
-#: ../src/mn-util.c:1052
-msgid "A command error has occurred in Mail Notification"
-msgstr ""
-"Mail Notificationの内部でコマンドエラーが発生"
+#: src/mn-util.c:1254
+#, c-format
+msgid "about %i minute ago"
+msgstr "約%i分前"
 
-#: ../src/mn-util.c:1053
+#: src/mn-util.c:1259
 #, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "\"%s\" の実行に失敗: %s."
+msgid "about %i hour ago"
+msgstr "約%i時間前"
 
-#: ../src/mn-util.c:1311
+#: src/mn-util.c:1264
 #, c-format
-msgid "unable to rename %s to %s: %s"
-msgstr "%s から %s への名称変更に失敗: %s"
+msgid "about %i day ago"
+msgstr "%i日位前"
 
-#: ../src/mn-vfs-mailbox-backend.gob:117
+#: src/mn-util.c:1269
 #, c-format
-msgid "unable to monitor mailbox contents (%s), poll mode activated"
-msgstr "メールボックスの内容 (%s) を監視できません. "
-"pollモードに切り替えます"
+msgid "about %i week ago"
+msgstr "%i週間位前"
+
+#: src/mn-util.c:1282
+msgid "unknown date"
+msgstr "日時不明"
 
-#: ../src/mn-vfs-mailbox.gob:238
+#: src/mn-vfs-mailbox.gob:221
 #, c-format
-msgid "unable to monitor mailbox type (%s), poll mode activated"
-msgstr "この種のメールボックス (%s) は監視できません. "
-"pollモードに切り替えます"
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr "%s (%s) の監視ができません. pollモードに切り替えます"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: src/mn-vfs-mailbox.gob:385
 msgid "unknown mailbox format"
-msgstr "unbekanntes Postfachformat"
+msgstr "メールボックスの形式が不明"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: src/mn-vfs-mailbox.gob:385
 msgid "does not exist"
 msgstr "は存在しません"
 
-#: ../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)."
-msgstr ""
-"とりあえずの設定として, %i 秒間隔でチェックします. (設定はプロパティ"
-"ダイアログで変更できます.)"
-
-#: ../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)."
-msgstr ""
-"とりあえずの設定として, %i 分間隔でチェックします. (設定はプロパティ"
-"ダイアログで変更できます.)"
-
-#: ../src/mn-vfs-mailbox.gob:399
-#, c-format
-msgid ""
-"As a fallback, they will be checked approximately every %i minute (this "
-"delay is configurable from the Properties Dialog)."
-msgstr ""
-"とりあえずの設定として, 約 %i 分間隔でチェックします. (設定はプロパティ"
-"ダイアログで変更できます.)"
+#: ui/mailbox-properties-dialog.glade.h:1 ui/properties-dialog.glade.h:4
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">基本設定</span>"
 
-#: ../src/mn-vfs-mailbox.gob:415
-msgid "A monitoring error has occurred"
-msgstr "モニタエラーが発生"
+#: ui/mailbox-properties-dialog.glade.h:2
+msgid "Delay between mail chec_ks:"
+msgstr "自動メールチェックの間隔(_K):"
 
-#: ../src/mn-vfs-mailbox.gob:416
-#, c-format
-msgid ""
-"Mail Notification was unable to enable immediate notification for one or "
-"more mailboxes. %s"
-msgstr ""
-"一部 (もしくはすべての) メールボックスについて, リアルタイムな着信通知を"
-"有効にできませんでした: %s"
+#: ui/mailbox-properties-dialog.glade.h:3
+msgid "Mailbox _name:"
+msgstr "メールボックスの名称(_N):"
 
-#: ../ui/edit-toolbars-dialog.glade.h:1
-msgid "Edit Toolbars"
-msgstr "ツールバーを編集"
+#: ui/mailbox-properties-dialog.glade.h:4
+msgid "Use De_fault"
+msgstr "デフォルトに戻す(_F)"
 
-#: ../ui/edit-toolbars-dialog.glade.h:2
-msgid "_Add a New Toolbar"
-msgstr "新規ツールバー(_A)"
+#: ui/mailbox-properties-dialog.glade.h:5
+msgid "_Mailbox type:"
+msgstr "メールボックスの種別(_M):"
 
-#: ../ui/edit-toolbars-dialog.glade.h:3
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ui/mailbox-properties-dialog.glade.h:6
 msgid "_Use Default"
-msgstr "デフォルトの設定に(_U)"
+msgstr "デフォルトに戻す(_U)"
 
-#: ../ui/mail-summary-popup.glade.h:1
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">新着メール一覧</span>"
-
-#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:4
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">基本設定</span>"
+#: ui/mailbox-properties-dialog.glade.h:7 ui/properties-dialog.glade.h:35
+msgid "minutes"
+msgstr "分"
 
-#: ../ui/mailbox-properties-dialog.glade.h:2
-msgid "Mailbox _name:"
-msgstr "メールボックスの名称:"
+#: ui/mailbox-properties-dialog.glade.h:8 ui/properties-dialog.glade.h:39
+msgid "seconds"
+msgstr "秒"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Mailbox _type:"
-msgstr "メールボックスの種別(_T):"
+#: ui/properties-dialog.glade.h:1
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">クリック時の動作</span>"
 
-#: ../ui/properties-dialog.glade.h:1
+#: ui/properties-dialog.glade.h:2
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">外部コマンド</span>"
 
-#: ../ui/properties-dialog.glade.h:2
-msgid "<span weight=\"bold\">Double-click Action</span>"
-msgstr "<span weight=\"bold\">ダブルクリック時の動作</span>"
-
-#: ../ui/properties-dialog.glade.h:3
+#: ui/properties-dialog.glade.h:3
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">フォント</span>"
 
-#: ../ui/properties-dialog.glade.h:5
+#: ui/properties-dialog.glade.h:5
+msgid "<span weight=\"bold\">Layout</span>"
+msgstr "<span weight=\"bold\">レイアウト</span>"
+
+#: ui/properties-dialog.glade.h:6
 msgid "<span weight=\"bold\">Mailbox List</span>"
 msgstr "<span weight=\"bold\">メールボックス一覧</span>"
 
-#: ../ui/properties-dialog.glade.h:6
+#: ui/properties-dialog.glade.h:7
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">表示位置</span>"
 
-#: ../ui/properties-dialog.glade.h:7
+#: ui/properties-dialog.glade.h:8
+msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
+msgstr "<span weight=\"bold\">バルーン表示による着信メール一覧</span>"
+
+#: ui/properties-dialog.glade.h:9
 msgid "Co_ntents:"
 msgstr "内容(_N):"
 
-#: ../ui/properties-dialog.glade.h:8
-msgid "Dis_play mail summary in tooltip"
-msgstr "メール一覧をバルーンで表示(_P)"
-
-#: ../ui/properties-dialog.glade.h:9
+#: ui/properties-dialog.glade.h:10
 msgid "General"
 msgstr "全般"
 
-#: ../ui/properties-dialog.glade.h:11
+#: ui/properties-dialog.glade.h:11
+msgid "Hide p_reviously displayed mail"
+msgstr "確認ずみのメールを隠す(_P)"
+
+#: ui/properties-dialog.glade.h:12
+msgid "Hori_zontal offset:"
+msgstr "水平オフセット(_Z):"
+
+#: ui/properties-dialog.glade.h:14
 msgid "Mail Summary Popup"
 msgstr "メール一覧ポップアップ"
 
-#: ../ui/properties-dialog.glade.h:12
-msgid "Mailboxes"
-msgstr "メールボックス"
-
-#: ../ui/properties-dialog.glade.h:13
-msgid "Only display _recent mail"
-msgstr "最近のメールのみ表示"
+#: ui/properties-dialog.glade.h:15
+msgid "Status Icon"
+msgstr "ステータスアイコン"
 
-#: ../ui/properties-dialog.glade.h:14
+#: ui/properties-dialog.glade.h:16
 msgid "Use these _fonts:"
 msgstr "フォントを指定(_F):"
 
-#: ../ui/properties-dialog.glade.h:15
-msgid "When _all mail has been read:"
-msgstr "未読メールを無くしたとき(_A):"
-
-#: ../ui/properties-dialog.glade.h:16
+#: ui/properties-dialog.glade.h:17
 msgid "When _new mail arrives:"
-msgstr "メール着信時(_N):"
+msgstr "メール着信時に実行(_N):"
+
+#: ui/properties-dialog.glade.h:18
+msgid "When all mail has _been read:"
+msgstr "全メール開封後に実行(_B):"
 
-#: ../ui/properties-dialog.glade.h:17
+#: ui/properties-dialog.glade.h:19
+msgid "_Always display"
+msgstr "常に表示(_A)"
+
+#: ui/properties-dialog.glade.h:20
 msgid "_Automatically close after:"
 msgstr "この時間が経過したら自動的に閉じる(_A):"
 
-#: ../ui/properties-dialog.glade.h:18
+#: ui/properties-dialog.glade.h:21
 msgid "_Blink on errors"
-msgstr "エラー発生時にアイコンを点滅(_B)"
-
-#: ../ui/properties-dialog.glade.h:19
-msgid "_Delay between mail checks:"
-msgstr "自動メールチェックの間隔:"
+msgstr "エラー発生時に点滅(_B)"
 
-#: ../ui/properties-dialog.glade.h:20
+#: ui/properties-dialog.glade.h:22
 msgid "_Display a Test Popup"
 msgstr "ポップアップの動作テスト(_D)"
 
-#: ../ui/properties-dialog.glade.h:21
-msgid "_Display the main window"
-msgstr "メインウィンドウを表示(_D)"
+#: ui/properties-dialog.glade.h:23
+msgid "_Display seen mail"
+msgstr "確認済みメールを表示(_D)"
 
-#: ../ui/properties-dialog.glade.h:22
-msgid "_Enable mail summary popup"
-msgstr "メール一覧ポップアップを有効に(_E)"
+#: ui/properties-dialog.glade.h:24
+msgid "_Display this dialog"
+msgstr "このダイアログを表示(_D)"
 
-#: ../ui/properties-dialog.glade.h:23
-msgid "_Horizontal offset:"
-msgstr "水平オフセット(_H):"
+#: ui/properties-dialog.glade.h:25
+msgid "_Enable mail summary popup"
+msgstr "ポップアップによる新着通知を有効に(_E)"
 
-#: ../ui/properties-dialog.glade.h:24
+#: ui/properties-dialog.glade.h:26
 msgid "_Launch the mail reader"
 msgstr "メールリーダーを起動(_L)"
 
-#: ../ui/properties-dialog.glade.h:25
-msgid "_Mail reader:"
-msgstr "メールリーダー(_M):"
+#: ui/properties-dialog.glade.h:27
+msgid "_None"
+msgstr "無し(_N)"
 
-#: ../ui/properties-dialog.glade.h:26
+#: ui/properties-dialog.glade.h:28
 msgid "_Position:"
 msgstr "位置(_P):"
 
-#: ../ui/properties-dialog.glade.h:27
-msgid "_Start Mail Notification on GNOME login"
-msgstr "GNOME起動時にMail Notificationを起動(_S)"
-
-#: ../ui/properties-dialog.glade.h:28
+#: ui/properties-dialog.glade.h:29
 msgid "_Title:"
 msgstr "タイトル(_T):"
 
-#: ../ui/properties-dialog.glade.h:29
+#: ui/properties-dialog.glade.h:30
 msgid "_Update the mail status"
-msgstr "着信状況を手動チェック(_U)"
+msgstr "着信状況を強制チェック(_U)"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ui/properties-dialog.glade.h:31
 msgid "_Use fonts from theme"
-msgstr "テーマと同じフォントを使用(_U)"
+msgstr "デスクトップ環境のテーマと同じフォントを使用(_U)"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ui/properties-dialog.glade.h:32
 msgid "_Vertical offset:"
 msgstr "垂直オフセット(_V):"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "minutes"
-msgstr "分"
+#: ui/properties-dialog.glade.h:33
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "コンパクト(_M)"
+
+#: ui/properties-dialog.glade.h:34
+msgid "icon tooltip's mail summary layout|_Standard"
+msgstr "標準(_S)"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ui/properties-dialog.glade.h:36
 msgid "pixels"
 msgstr "ピクセル"
 
-#: ../ui/properties-dialog.glade.h:34
-msgid "seconds"
-msgstr "秒"
+#: ui/properties-dialog.glade.h:37
+msgid "popup's mail summary layout|Co_mpact"
+msgstr "コンパクト(_M)"
 
+#: ui/properties-dialog.glade.h:38
+msgid "popup's mail summary layout|_Standard"
+msgstr "標準(_S)"
diff --git a/po/nl.po b/po/nl.po
@@ -8,24 +8,24 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 3.0-rc2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-04 14:00+0100\n"
-"PO-Revision-Date: \n"
+"POT-Creation-Date: 2006-05-16 13:49+0200\n"
+"PO-Revision-Date: 2006-05-18 15:01+0200\n"
 "Last-Translator: Marcel J. Zwiebel <mj.zwiebel@nonux.nl>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n>1;"
+"Plural-Forms: nplurals=2; plural=n>1;\n"
 
 #: ../data/GNOME_MailNotification.server.in.in.h:1
 msgid "Mail Notification automation"
-msgstr "Automatische E-Mail notificatie"
+msgstr "Automatische e-mail notificatie"
 
 #: ../data/GNOME_MailNotification.server.in.in.h:2
 msgid "Mail Notification automation factory"
-msgstr "Automatische E-Mail notificatie fabriek"
+msgstr "Automatische e-mail notificatie fabriek"
 
 #: ../data/GNOME_MailNotification_Evolution.server.in.h:1
 msgid "Evolution folder tree control"
@@ -44,14 +44,12 @@ msgid "Mail Notification / Evolution glue factory"
 msgstr "E-mail notificatie / Evolution verbinding fabriek"
 
 #: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
 msgid "Configure Mail Notification"
-msgstr "De e-mail notificatie instellen"
+msgstr "E-mail notificatie instellen"
 
 #: ../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:227
+#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
 msgid "Mail Notification"
 msgstr "E-mail notificatie"
 
@@ -60,201 +58,156 @@ msgid "Get notified when new mail arrives"
 msgstr "Informeer mij wanneer nieuwe e-mail berichten binnenkomen"
 
 #: ../data/mail-notification.schemas.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:2
+#: ../data/mail-notification.schemas.in.h:3
 msgid "Blink on errors"
 msgstr "Bij fouten knipperen"
 
-#: ../data/mail-notification.schemas.in.h:3
-msgid "Delay between mail checks (minutes part)."
-msgstr "Wachttijd tussen het controleren van e-mail (minutengedeelte)."
-
 #: ../data/mail-notification.schemas.in.h:4
-msgid "Delay between mail checks (seconds part)."
-msgstr "Wachttijd tussen het controleren van e-mail (secondengedeelte)."
+msgid "Click action"
+msgstr "Muisklik-actie"
 
 #: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "Overzicht nieuwe e-mail in mini-weergave (tooltip)"
+msgid "Display seen mail"
+msgstr "Laat gelezen e-mail berichten zien"
 
 #: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "Laat de directe notificatie foutmelding niet zien"
-
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "Dubbelklik actie"
-
-#: ../data/mail-notification.schemas.in.h:8
 msgid "Enable mail summary popup"
 msgstr "Mini-overzicht (popup) nieuwe e-mail activeren"
 
-#: ../data/mail-notification.schemas.in.h:9
+#: ../data/mail-notification.schemas.in.h:7
 msgid "Fingerprints of trusted X509 certificates"
 msgstr "Vingerafdrukken van betrouwbare X509 certificaten"
 
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Height of edit toolbars dialog"
-msgstr "Hoogte van de invoer werkbalken dialoogvenster"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Height of main window"
-msgstr "Hoogte van het hoofdvenster"
-
-#: ../data/mail-notification.schemas.in.h:12
+#: ../data/mail-notification.schemas.in.h:8
 msgid "Height of properties dialog"
 msgstr "Hoogte van het instellingen dialoogvenster"
 
-#: ../data/mail-notification.schemas.in.h:13
+#: ../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:14
-msgid "Mail reader command"
-msgstr "Opdracht voor het starten van het e-mail programma"
-
-#: ../data/mail-notification.schemas.in.h:15
+#: ../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:16
+#: ../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.h:17
+#: ../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.h:18
+#: ../data/mail-notification.schemas.in.h:13
 msgid "Mail summary popup position"
 msgstr "Positie van het e-mail overzichtsvenster"
 
-#: ../data/mail-notification.schemas.in.h:19
+#: ../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.h:20
+#: ../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.h:21
-msgid "Minutes between mail checks"
-msgstr "Wachttijd in minuten tussen de controles van nieuwe e-mail"
-
-#: ../data/mail-notification.schemas.in.h:22
+#: ../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.h:23
+#: ../data/mail-notification.schemas.in.h:17
 msgid "New mail command"
 msgstr "Opdracht bij ontvangst van nieuwe e-mail"
 
-#: ../data/mail-notification.schemas.in.h:24
+#: ../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:25
+#: ../data/mail-notification.schemas.in.h:19
 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:26
+#: ../data/mail-notification.schemas.in.h:20
 msgid "Run a command when new mail arrives"
 msgstr "Voer een opdracht uit als nieuwe e-mail arriveert"
 
-#: ../data/mail-notification.schemas.in.h:27
-msgid "Seconds between mail checks"
-msgstr "Wachttijd in seconden tussen het controleren van e-mail"
-
-#: ../data/mail-notification.schemas.in.h:28
+#: ../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.h:29
-msgid "Set a mail reader"
-msgstr "Instelling keuze e-mail programma opslaan"
-
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.h:22
 msgid ""
-"The action to perform when the icon is double-clicked. Must be \"display-"
-"main-window\", \"launch-mail-reader\" or \"update-mail-status\"."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
 msgstr ""
-"De opdracht die uitgevoerd moet worden bij een dubbelklik op het icoon. Heeft "
-"ofwel de waarde »display-mail-window«, »launch-mail-reader« of  »update-"
-"mail-status«."
+"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:31
+#: ../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:32
+#: ../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:33
+#: ../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."
+"De waarde moet \"theme\" of \"custom\" zijn."
 
-#: ../data/mail-notification.schemas.in.h:34
-msgid "The command to run to launch the mail reader."
-msgstr "De opdracht om het e-mail programma te starten"
-
-#: ../data/mail-notification.schemas.in.h:35
+#: ../data/mail-notification.schemas.in.h:26
 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:36
+#: ../data/mail-notification.schemas.in.h:27
 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:37
+#: ../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."
+msgstr "Het eigen lettertype voor het e-mail overzichtsvenster."
 
-#: ../data/mail-notification.schemas.in.h:38
+#: ../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:39
-msgid "The height of the edit toolbars dialog in pixels."
-msgstr "Hoogte van de invoer werkbalken dialoogvenster in pixels."
-
-#: ../data/mail-notification.schemas.in.h:40
-msgid "The height of the main window in pixels."
-msgstr "Hoogte van het hoofdvenster in pixels."
-
-#: ../data/mail-notification.schemas.in.h:41
+#: ../data/mail-notification.schemas.in.h:30
 msgid "The height of the properties dialog in pixels."
 msgstr "Hoogte van het instellingen dialoogvenster in pixels"
 
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.h:31
 msgid ""
 "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
 "certificate."
 msgstr ""
-"De list met betrouwbare SSL/TLS-servers (hostname:port) zonder X509-"
+"De lijst met betrouwbare SSL/TLS-servers (hostname:port) zonder X509-"
 "certificaat."
 
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.h:32
 msgid ""
 "The list of trusted X509 certificates, represented by their MD5 fingerprint."
 msgstr ""
-"De lijst met betrouwbare X509-certificaten, gerepresenteerd door hun MD5"
-"vingerafdruk."
+"De lijst met betrouwbare X509-certificaten, gerepresenteerd door hun "
+"MD5vingerafdruk."
 
-#: ../data/mail-notification.schemas.in.h:44
+#: ../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."
@@ -262,7 +215,7 @@ 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:45
+#: ../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."
@@ -270,157 +223,98 @@ 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:46
+#: ../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«."
+"De positie van e-mail overzichtsvenster. De waarden moeten zijn \"boven-"
+"links\", \"boven-rechts\", \"onder-links\" oder \"onder-rechts\"."
 
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.h:36
 msgid ""
-"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
-"\"both\" or \"both-horiz\"."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
 msgstr ""
-"De stijl voor de werkbalken. Dit moet zijn »desktop-default«, »icons«, »text«, "
-"»both« of »both-horiz«."
-
-#: ../data/mail-notification.schemas.in.h:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "Hoogte van de invoer werkbalken dialoogvenster in pixels."
-
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "Hoogte van het hoofdvenster in pixels."
+"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:50
+#: ../data/mail-notification.schemas.in.h:37
 msgid "The width of the properties dialog in pixels."
 msgstr "Hoogte van het instellingen dialoogvenster in pixels."
 
-#: ../data/mail-notification.schemas.in.h:51
-msgid "Toolbars style"
-msgstr "Stijl werkbalken"
+#: ../data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "Tooltip e-mail overzicht"
 
-#: ../data/mail-notification.schemas.in.h:52
+#: ../data/mail-notification.schemas.in.h:39
 msgid "Trusted servers list"
 msgstr "Lijst trusted servers"
 
-#: ../data/mail-notification.schemas.in.h:53
-msgid "View statusbar"
-msgstr "Statusbalk zichtbaar"
-
-#: ../data/mail-notification.schemas.in.h:54
-msgid "View toolbars"
-msgstr "Werkbalken zichtbaar"
-
-#: ../data/mail-notification.schemas.in.h:55
+#: ../data/mail-notification.schemas.in.h:40
 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:56
-msgid "Whether the statusbar should be visible or not."
-msgstr "Moet de statusbalk zichtbaar zijn."
+msgstr "Moet het e-mail icoon bij het optreden van fouten knipperen"
 
-#: ../data/mail-notification.schemas.in.h:57
-msgid "Whether the toolbars should be visible or not."
-msgstr "Moeten de werkbalken zichtbaar zijn."
-
-#: ../data/mail-notification.schemas.in.h:58
+#: ../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."
+msgstr "Moet het e-mail overzichtsvenster (popup) automatisch gesloten worden."
 
-#: ../data/mail-notification.schemas.in.h:59
-msgid "Whether to display the mail summary in the status icon tooltip or not."
-msgstr ""
-"Moet het e-mail overzicht in het statusbericht van het icoon (tooltip) worden getoond."
+#: ../data/mail-notification.schemas.in.h:42
+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
+msgid "Whether to display seen mail or not."
+msgstr "Moet eerder getoonde e-mail opnieuw getoond worden."
 
-#: ../data/mail-notification.schemas.in.h:60
+#: ../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."
+msgstr "Moet het e-mail overzichtsvenster getoond worden bij het arriveren van e-mail."
 
-#: ../data/mail-notification.schemas.in.h:61
+#: ../data/mail-notification.schemas.in.h:45
 msgid ""
 "Whether to hide previously displayed mail in the mail summary popup or not."
 msgstr ""
 "Moet reeds getoonde e-mail in het overzichtsvenster verborgen worden."
 
-#: ../data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to prevent the immediate notification error dialog from being "
-"displayed or not."
-msgstr ""
-"Moet het direct tonen van een foutbericht worden voorkomen."
-
-#: ../data/mail-notification.schemas.in.h:63
+#: ../data/mail-notification.schemas.in.h:46
 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."
+msgstr "Moet een opdracht uitgevoerd worden als alle e-mail gelezen is."
 
-#: ../data/mail-notification.schemas.in.h:64
+#: ../data/mail-notification.schemas.in.h:47
 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:65
-msgid "Whether to set a mail reader or not."
-msgstr "Moet een e-mail programma gekozen worden."
-
-#: ../data/mail-notification.schemas.in.h:66
-msgid "Width of edit toolbars dialog"
-msgstr "Breedte van het invoer werkbalken venster."
-
-#: ../data/mail-notification.schemas.in.h:67
-msgid "Width of main window"
-msgstr "Breedte van het hoofdvenster."
+msgstr "Moet een opdracht uitgevoerd worden als een nieuwe e-mail arriveert."
 
-#: ../data/mail-notification.schemas.in.h:68
+#: ../data/mail-notification.schemas.in.h:48
 msgid "Width of properties dialog"
 msgstr "Breedte van het instellingenvenster"
 
-#: ../data/mail-notification.soundlist.in.h:2
-msgid "New Mail"
-msgstr "Nieuwe e-mail"
-
-#: ../src/egg-editable-toolbar.c:534
-msgid "_Remove Toolbar"
-msgstr "W_erkbalken verwijderen"
-
-#: ../src/egg-toolbar-editor.c:555
-msgid "Separator"
-msgstr "Scheidingslijn"
-
-#: ../src/eggtrayicon.c:128
+#: ../src/eggtrayicon.c:132
 msgid "Orientation"
-msgstr "Orientatie"
+msgstr "Oriëntatie"
 
-#: ../src/eggtrayicon.c:129
+#: ../src/eggtrayicon.c:133
 msgid "The orientation of the tray."
-msgstr "De orientatie van het mededelingengebied."
+msgstr "De oriëntatie van het mededelingengebied."
 
-#: ../src/mn-about-dialog.gob:48
+#: ../src/mn-about-dialog.gob:49
 msgid "A Mail Notification Icon"
-msgstr ""
-"Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw postbus "
-"zijn gearriveerd."
+msgstr "Een e-mail icoon dat verschijnt als er nieuwe e-mail berichten in uw postbus zijn gearriveerd."
 
 #.
 #. * 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:57
 msgid "translator-credits"
 msgstr "Marcel J. Zwiebel <mj.zwiebel@nonux.nl>"
 
-#: ../src/mn-about-dialog.gob:78
+#: ../src/mn-about-dialog.gob:79
 msgid "Unable to open link"
 msgstr "De verwijzing kan niet geopend worden"
 
 #: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:92
+#: ../src/mn-autodetect-mailbox-properties.gob:109
 msgid "<span style=\"italic\">autodetect</span>"
 msgstr "<span style=\"italic\">automatische detectie</span>"
 
@@ -432,126 +326,100 @@ msgstr "Gebr_uikersnaam:"
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../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 ""
-"De 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"
-"Geef u aub opnieuw uw gebruikersnaam/wachtwoord."
-
-#: ../src/mn-authenticated-mailbox.gob:153
-#, 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
-#: ../src/mn-authenticated-mailbox.gob:195
-msgid "Authentication Required"
-msgstr "Aanmelding is verplicht"
-
-#: ../src/mn-autodetect-mailbox-properties.gob:93
+#: ../src/mn-autodetect-mailbox-properties.gob:110
 msgid "Location"
 msgstr "Locatie"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:122
 msgid "_Location:"
 msgstr "_Locatie:"
 
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
 msgid "_Browse..."
 msgstr "_Doorzoeken..."
 
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
 msgid "Select a File or Folder"
 msgstr "Selecteer een bestand of map"
 
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:247
 #, c-format
 msgid "resolving %s"
 msgstr "connectie maken met %s"
 
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:263
 #, c-format
 msgid "unable to resolve %s: %s"
 msgstr "er kon geen connectie worden gemaakt met %s: %s"
 
-#: ../src/mn-client-session.c:308
-#, c-format
+#: ../src/mn-client-session.c:304
+msgid "network address #%i"
+msgstr "netwerkadres #%i"
+
+#: ../src/mn-client-session.c:307
+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
 msgid "%s: unsupported address family"
 msgstr "%s: adresfamilie wordt niet ondersteund "
 
-#: ../src/mn-client-session.c:315
-#, c-format
+#: ../src/mn-client-session.c:325
 msgid "%s: unable to create socket: %s"
 msgstr "%s: Socket kon niet aangemaakt worden: %s"
 
-#: ../src/mn-client-session.c:319
-#, c-format
+#: ../src/mn-client-session.c:329
 msgid "connecting to %s (%s) port %i"
 msgstr "connectie maken met %s (%s) via poort %i"
 
-#: ../src/mn-client-session.c:322
-#, c-format
+#: ../src/mn-client-session.c:332
 msgid "unable to connect: %s"
 msgstr "er kan geen verbinding worden gemaakt: %s"
 
-#: ../src/mn-client-session.c:327
+#: ../src/mn-client-session.c:337
 msgid "connected successfully"
 msgstr "verbinding geslaagd"
 
 #. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:333
-#, c-format
+#: ../src/mn-client-session.c:351
 msgid "unable to connect to %s"
 msgstr "er kan geen verbinding gemaakt worden met %s"
 
-#: ../src/mn-client-session.c:360
-#, c-format
+#: ../src/mn-client-session.c:378
 msgid "unable to initialize the OpenSSL library: %s"
 msgstr "de OpenSSL bibliotheek kan niet geinitialiseerd worden: %s"
 
-#: ../src/mn-client-session.c:368
-#, c-format
+#: ../src/mn-client-session.c:386
 msgid "unable to create a SSL/TLS object: %s"
 msgstr "een SSL/TLS object kan niet aangemaakt worden: %s"
 
-#: ../src/mn-client-session.c:374
-#, c-format
+#: ../src/mn-client-session.c:392
 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:380
-#, c-format
+#: ../src/mn-client-session.c:398
 msgid "unable to perform the SSL/TLS handshake: %s"
 msgstr "een SSL/TLS handshake kan niet uitgevoerd worden: %s"
 
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:404
 msgid "untrusted server"
 msgstr "niet-betrouwbare server"
 
-#: ../src/mn-client-session.c:390
-#, c-format
+#: ../src/mn-client-session.c:408
 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:437
-#, c-format
+#: ../src/mn-client-session.c:455
 msgid "%s, fingerprint: %s"
 msgstr "%s, vingerafdruk %s"
 
-#: ../src/mn-client-session.c:466
+#: ../src/mn-client-session.c:484
 msgid "missing certificate"
 msgstr "missend certificaat"
 
-#: ../src/mn-client-session.c:492
-#, c-format
+#: ../src/mn-client-session.c:510
 msgid ""
 "Mail Notification was unable to trust \"%s\" (%s). It is possible that "
 "someone is intercepting your communication to obtain your confidential "
@@ -561,828 +429,641 @@ msgid ""
 "to \"%s\". If you choose to connect to the server, this message will not be "
 "shown again."
 msgstr ""
-"E-mail notificatie kan »%s« niet vertrouwen (%s). Het is mogelijk dat iemand uw communicatie "
-"ondesrchept om vertrouwelijke informatie te verkrijgen.\n"
+"E-mail notificatie kan \"%s\" niet vertrouwen (%s). Het is mogelijk dat iemand "
+"uw communicatie ondesrchept om vertrouwelijke informatie te verkrijgen.\n"
 "\n"
-"U moet alleen verbinding maken met de server als u er zeker van bent dat u 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."
+"U moet alleen verbinding maken met de server als u er zeker van bent dat u "
+"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:507
+#: ../src/mn-client-session.c:525
 msgid "Connect to untrusted server?"
 msgstr "Wilt u verbinding maken met een niet-betrouwbare server?"
 
-#: ../src/mn-client-session.c:571
-#, c-format
+#: ../src/mn-client-session.c:590
 msgid "response \"%s\" is not valid in current context"
-msgstr "het antwoord »%s« is niet geldig binnen de huidige context"
+msgstr "het antwoord \"%s\" is niet geldig binnen de huidige context"
 
-#: ../src/mn-client-session.c:599
-#, c-format
+#: ../src/mn-client-session.c:619
 msgid "unable to parse response \"%s\""
-msgstr "het antwoord »%s« kan niet geanalyseerd worden"
+msgstr "het antwoord \"%s\" kan niet geanalyseerd worden"
 
-#: ../src/mn-client-session.c:649 ../src/mn-client-session.c:656
-#, c-format
+#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
 msgid "unable to read from server: %s"
 msgstr "lezen van de server is niet mogelijk: %s"
 
-#: ../src/mn-client-session.c:654
+#: ../src/mn-client-session.c:674
 msgid "unable to read from server: EOF"
 msgstr "lezen van de server is niet mogelijk: EOF"
 
-#: ../src/mn-client-session.c:666
-#, c-format
+#: ../src/mn-client-session.c:686
 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:811
-#, c-format
+#: ../src/mn-client-session.c:831
 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:842 ../src/mn-client-session.c:849
-#, c-format
+#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
 msgid "unable to write to server: %s"
 msgstr "schrijven op de server is niet mogelijk: %s"
 
-#: ../src/mn-client-session.c:847
+#: ../src/mn-client-session.c:867
 msgid "unable to write to server: EOF"
 msgstr "schrijven op de server is niet mogelijk: EOF"
 
-#: ../src/mn-client-session.c:878 ../src/mn-pop3-mailbox.gob:468
-#, c-format
+#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
 msgid "unable to encode Base64: %s"
 msgstr "de gegevens kunnen niet met behulp van Base64 gecodeerd worden: %s"
 
-#: ../src/mn-client-session.c:1056
-#, c-format
+#: ../src/mn-client-session.c:1075
 msgid "unable to initialize the SASL library: %s"
 msgstr "Dee SASL-bibliotheek kan niet geinitialiseerd worden: %s"
 
-#: ../src/mn-client-session.c:1068
-#, c-format
+#: ../src/mn-client-session.c:1087
 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:1074
-#, c-format
+#: ../src/mn-client-session.c:1093
 msgid "unable to retrieve remote address of socket: %s"
-msgstr ""
-"het externe adres van socket kan niet opgevraagd worden:: %s"
+msgstr "het externe adres van socket kan niet opgevraagd worden: %s"
 
-#: ../src/mn-client-session.c:1108
-#, c-format
+#: ../src/mn-client-session.c:1127
 msgid "unable to set SASL security properties: %s"
-msgstr "de SASL-veiligheidseigenschappen kunnen  niet gezet worden: %s"
+msgstr "de SASL-veiligheidseigenschappen kunnen niet gezet worden: %s"
 
-#: ../src/mn-client-session.c:1132
+#: ../src/mn-client-session.c:1151
 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"
+"de SASL-authenticatie kan niet gestart worden: SASL vroeg naar iets waar we "
+"geen verstand van hebben"
 
-#: ../src/mn-client-session.c:1151
-#, c-format
+#: ../src/mn-client-session.c:1170
 msgid "unable to start SASL authentication: %s"
 msgstr "de SASL-authenticatie kan niet gestart worden: %s"
 
-#: ../src/mn-client-session.c:1155
-#, c-format
+#: ../src/mn-client-session.c:1174
 msgid "unable to create a SASL connection: %s"
 msgstr "Er kan geen SASL-verbinding worden gemaakt: %s"
 
-#: ../src/mn-client-session.c:1202
+#: ../src/mn-client-session.c:1221
 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"
+msgstr "SASL vroeg naar iets waar we geen verstand van hebben, SASL-authenticatie wordt afgebroken"
 
-#: ../src/mn-client-session.c:1219
-#, c-format
+#: ../src/mn-client-session.c:1238
 msgid "%s, aborting SASL authentication"
 msgstr "%s, SASL-authenticatie wordt afgebroken"
 
 #. compliance error
-#: ../src/mn-client-session.c:1224
-#, c-format
+#: ../src/mn-client-session.c:1243
 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:1260
-#, c-format
+#: ../src/mn-client-session.c:1279
 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:1265
-#, c-format
+#: ../src/mn-client-session.c:1284
 msgid "unable to get SASL_MAXOUTBUF property: %s"
 msgstr "de waarde SASL_MAXOUTBUF kan niet worden gevonden: %s"
 
-#: ../src/mn-client-session.c:1271
-#, c-format
+#: ../src/mn-client-session.c:1290
 msgid "warning: unable to get SASL_SSF property: %s"
 msgstr "waarschuwing: de waarde SASL_SSF kan niet worden gevonden: %s"
 
-#: ../src/mn-conf.c:240
+#: ../src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "onbekende server-fout :-("
+
+#: ../src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "Postbus"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "Van"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "Onderwerp"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "Verzonden"
+
+#: ../src/mn-conf.c:262
 msgid "A directory creation error has occurred"
 msgstr "Bij het aanmaken van een map is een fout opgetreden"
 
-#: ../src/mn-conf.c:241
-#, c-format
+#: ../src/mn-conf.c:263
 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:317
-#, c-format
+#: ../src/mn-conf.c:402
 msgid "recursively unsetting %s"
 msgstr "%s recursief terugzetten"
 
-#: ../src/mn-conf.c:321
+#: ../src/mn-conf.c:406
 msgid "syncing the GConf database"
 msgstr "synchroniseren met de GConf-database"
 
-#: ../src/mn-conf.c:324
+#: ../src/mn-conf.c:409
 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
 msgid "invalid location"
 msgstr "ongeldige locatie"
 
-#: ../src/mn-evolution-folder-tree-control.c:86
+#: ../src/mn-evolution-folder-tree-control.c:91
 msgid "The currently selected URI"
 msgstr "De huidige geselecteerde URI"
 
-#: ../src/mn-evolution-mailbox-properties.gob:67
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:68
 msgid "Folder"
 msgstr "Map"
 
-#: ../src/mn-evolution-mailbox-properties.gob:169
+#: ../src/mn-evolution-mailbox-properties.gob:159
 msgid ""
 "Mail Notification can not contact Evolution. Make sure that Evolution is "
 "running and that the Evolution Mail Notification plugin is loaded."
-msgstr "E-mail notificatie kan geen verbinding maken met Evolution. "
-"Controleer of Evolution gestart is en dat de Mail Notification plugin "
-"geactiveerd is."
+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:61
+#: ../src/mn-evolution-mailbox.gob:75
 msgid "folder not found"
 msgstr "map niet gevonden"
 
-#: ../src/mn-evolution-mailbox.gob:182
+#: ../src/mn-evolution-mailbox.gob:216
 msgid "unable to contact Evolution"
 msgstr "er kan geen verbinding met Evolution gemaakt worden"
 
-#: ../src/mn-evolution-plugin.c:130 ../src/mn-evolution-plugin.c:134
+#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
 msgid "Unable to activate the Mail Notification plugin"
 msgstr "De Evolution-plugin Mail Notification kan niet geactiveerd worden"
 
-#: ../src/mn-evolution-plugin.c:130
-#, c-format
+#: ../src/mn-evolution-plugin.c:136
 msgid ""
 "Bonobo could not locate the %s server. Please check your Mail Notification "
 "installation."
 msgstr ""
-"Bonobo kan de %s server niet vinden. Controleer aub "
-"de installatie van E-mail notificatie."
+"Bonobo kan de %s server niet vinden. Controleer aub de installatie van E-"
+"mail notificatie."
 
-#: ../src/mn-evolution-plugin.c:134 ../src/mn-main.c:427
-#, c-format
+#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
 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."
+"Bonobo kan niet aanmelden bij de %s server. Controleer aub de installatie "
+"van e-mail notificatie."
 
-#: ../src/mn-gmail-mailbox.gob:111
+#: ../src/mn-gmail-mailbox.gob:103
 msgid "invalid feed location"
 msgstr "ongeldig feed-adres"
 
-#: ../src/mn-gmail-mailbox.gob:125
-#, c-format
+#: ../src/mn-gmail-mailbox.gob:117
 msgid "retrieving feed from %s"
 msgstr "feed wordt bij %s opgevraagd"
 
-#: ../src/mn-gmail-mailbox.gob:132
-#, c-format
+#: ../src/mn-gmail-mailbox.gob:124
 msgid "unable to retrieve feed: %s"
 msgstr "de feed kan niet opgevraagd worden: %s"
 
-#: ../src/mn-gmail-mailbox.gob:147 ../src/mn-gmail-mailbox.gob:194
+#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
 msgid "unable to parse feed"
 msgstr "de feed kan niet geanalyseerd worden"
 
-#: ../src/mn-gmime-stream-vfs.gob:49
-#: ../src/mn-sylpheed-mailbox-backend.gob:152
-#, c-format
+#: ../src/mn-gmime-stream-vfs.gob:50
+#: ../src/mn-sylpheed-mailbox-backend.gob:205
 msgid "unable to read %s: %s"
 msgstr "%s kan niet gelezen worden: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:51
-#, c-format
+#: ../src/mn-gmime-stream-vfs.gob:52
 msgid "unable to write to %s: %s"
 msgstr "er kan niet naar %s geschreven worden: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:53
-#, c-format
+#: ../src/mn-gmime-stream-vfs.gob:54
 msgid "unable to seek in %s: %s"
 msgstr "er kan niet gezocht worden in in %s: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:55
-#, c-format
+#: ../src/mn-gmime-stream-vfs.gob:56
 msgid "unable to tell position of %s: %s"
-msgstr "onmogleijk om de positie van %s vast te stellen: %s"
+msgstr "onmogelijk om de positie van %s vast te stellen: %s"
 
-#: ../src/mn-gmime-stream-vfs.gob:57 ../src/mn-mh-mailbox-backend.gob:158
-#, c-format
+#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
 msgid "unable to close %s: %s"
 msgstr "%s kan niet gesloten worden: %s"
 
-#: ../src/mn-imap-mailbox-properties.gob:113
+#: ../src/mn-imap-mailbox-properties.gob:114
+#: ../src/mn-standard-message-view.gob:62
 msgid "Mailbox:"
-msgstr "Posbus:"
+msgstr "Postbus:"
 
-#: ../src/mn-imap-mailbox-properties.gob:117
+#: ../src/mn-imap-mailbox-properties.gob:118
 msgid "in_box"
 msgstr "In_box"
 
-#: ../src/mn-imap-mailbox-properties.gob:128
+#: ../src/mn-imap-mailbox-properties.gob:129
 msgid "oth_er:"
 msgstr "_Ander:"
 
-#: ../src/mn-imap-mailbox-properties.gob:139
+#: ../src/mn-imap-mailbox-properties.gob:140
 msgid "ne_ver"
 msgstr "n_ooit"
 
-#: ../src/mn-imap-mailbox-properties.gob:140
+#: ../src/mn-imap-mailbox-properties.gob:141
 msgid "au_todetect"
 msgstr "au_tomatische detectie"
 
-#: ../src/mn-imap-mailbox-properties.gob:141
+#: ../src/mn-imap-mailbox-properties.gob:142
 msgid "al_ways"
 msgstr "al_tijd"
 
-#: ../src/mn-imap-mailbox-properties.gob:173
+#: ../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.gob:390
+#: ../src/mn-imap-mailbox.gob:384
 msgid "server did not send capabilities"
 msgstr "geen ontvangst van de server-capaciteiten"
 
-#: ../src/mn-imap-mailbox.gob:573
+#: ../src/mn-imap-mailbox.gob:551
 msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
-msgstr ""
-"de server heeft geroepen LOGINDISABLED, LOGIN-authorisatie wordt niet "
-"gebruikt"
+msgstr "de server heeft geroepen LOGINDISABLED, LOGIN-authorisatie wordt niet gebruikt"
 
-#: ../src/mn-imap-mailbox.gob:574
+#: ../src/mn-imap-mailbox.gob:552
 msgid "unable to login"
 msgstr "aanmelding mislukt"
 
 #. compliance error
-#: ../src/mn-imap-mailbox.gob:714
-msgid "server did not send search results"
-msgstr "de server heeft geen zoekresultaten verzonden"
-
-#. compliance error
-#: ../src/mn-imap-mailbox.gob:792
+#: ../src/mn-imap-mailbox.gob:752
 msgid "server did not send all the messages we requested"
 msgstr "de server heeft niet alle opgegeven berichten verzonden"
 
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:822
 msgid "unable to fetch message"
 msgstr "berichten konden niet opgehaald worden"
 
-#: ../src/mn-imap-mailbox.gob:875
+#: ../src/mn-imap-mailbox.gob:847
 msgid ""
 "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
 "logging out"
-msgstr "»Gebruik de IDLE-extensie« wordt gezet op »nooit« in de postbus-eigenschap, "
+msgstr ""
+"\"Gebruik de IDLE-extensie\" wordt gezet op \"nooit\" in de postbus-eigenschap, "
 "afmelden"
 
-#: ../src/mn-imap-mailbox.gob:886
-#, c-format
+#: ../src/mn-imap-mailbox.gob:858
 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:891
-#, c-format
+#: ../src/mn-imap-mailbox.gob:863
 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"
+msgstr ""
+"de externe server gebruikt %s, de IDLE-extensie zou misschien niet goed "
+"kunnen werken"
 
-#: ../src/mn-imap-mailbox.gob:900
+#: ../src/mn-imap-mailbox.gob:872
 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:1251 ../src/mn-pop3-mailbox.gob:1124
-msgid "unknown server error"
-msgstr "onbekende server-fout :-("
-
-#: ../src/mn-imap-mailbox.gob:1357 ../src/mn-pop3-mailbox.gob:311
+#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
 msgid "server does not support in-band SSL/TLS"
 msgstr "de server ondersteund geen in-band SSL/TLS"
 
-#: ../src/mn-imap-mailbox.gob:1381 ../src/mn-pop3-mailbox.gob:997
+#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
 msgid ""
 "a SASL authentication mechanism was selected but SASL support has not been "
 "compiled in"
 msgstr ""
-"u heeft authenticatie met behulp van SASL gekozen, echter "
-"SASL-ondersteuning is bij de aanmaak van het programma niet ingesteld"
+"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:1391 ../src/mn-pop3-mailbox.gob:1017
-#, c-format
+#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
 msgid "unknown authentication mechanism \"%s\""
-msgstr "onbekend authenticatie-mechanisme »%s«"
+msgstr "onbekend authenticatie-mechanisme \"%s\""
 
-#: ../src/mn-imap-mailbox.gob:1423 ../src/mn-pop3-mailbox.gob:1053
-#, c-format
+#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
 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"
+msgstr "het mechanisme \"%s\" wordt uitgeschakeld en een nieuwe poging wordt gewaagd met behulp van SASL-authenticatie"
 
-#: ../src/mn-imap-mailbox.gob:1435
+#: ../src/mn-imap-mailbox.gob:1455
 msgid "falling back to IMAP LOGIN authentication"
 msgstr "er wordt teruggevallen op authenticatie via IMAP LOGIN"
 
-#: ../src/mn-imap-mailbox.gob:1447 ../src/mn-pop3-mailbox.gob:1082
+#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
 msgid "authentication failed"
 msgstr "authenticatie mislukt"
 
-#: ../src/mn-mail-icon.gob:91
-msgid "Main _Window"
-msgstr "_Hoofdvenster"
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "de server heeft geen zoekresultaten verzonden"
 
-#: ../src/mn-mail-icon.gob:92 ../src/mn-main-window.gob:165
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:89
 msgid "_Mail Reader"
 msgstr "_E-mail programma"
 
-#: ../src/mn-mail-icon.gob:93 ../src/mn-main-window.gob:173
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
 msgid "_Update"
 msgstr "_Bijwerken"
 
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
 msgid "R_emove From Notification Area"
 msgstr "V_erwijderen van medelingengebied"
 
-#: ../src/mn-mailbox-properties-dialog.gob:88
-#, c-format
+#. 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
 msgid "%s Properties"
 msgstr "%s Eigenschappen"
 
-#: ../src/mn-mailbox-properties-dialog.gob:205
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:232
 msgid "Add a Mailbox"
 msgstr "Een postbus toevoegen"
 
-#: ../src/mn-mailbox-view.gob:179
+#: ../src/mn-mailbox-view.gob:248
 msgid "A paste error has occurred"
 msgstr "Een invoegfout is opgetreden"
 
-#: ../src/mn-mailbox-view.gob:320 ../src/mn-message-view.gob:313
-msgid "Mailbox"
-msgstr "Postbus"
-
-#: ../src/mn-mailbox-view.gob:523
-#, c-format
+#: ../src/mn-mailbox-view.gob:557
 msgid "unhandled %s mailbox (%s)"
 msgstr "onbehandelde %s-postbus (%s)"
 
-#: ../src/mn-mailbox-view.gob:528
-#, c-format
+#: ../src/mn-mailbox-view.gob:562
 msgid "%s mailbox"
 msgstr "%s-postbus"
 
-#: ../src/mn-mailbox-view.gob:543
+#: ../src/mn-mailbox-view.gob:577
 msgid "detecting mailbox type..."
 msgstr "detecteren postbustype..."
 
-#: ../src/mn-mailbox.gob:278
+#: ../src/mn-mailbox.gob:472
 msgid "\"type\" attribute missing"
-msgstr "eigenschap »type« werd niet gevonden"
+msgstr "eigenschap \"type\" werd niet gevonden"
 
-#: ../src/mn-mailbox.gob:285
-#, c-format
+#: ../src/mn-mailbox.gob:479
 msgid "unknown mailbox type \"%s\""
 msgstr "onbekend type postbus »%s«"
 
-#: ../src/mn-mailbox.gob:305
-#, c-format
+#: ../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"
+msgstr ""
+"eigenschap \"%s\": het is niet mogelijk de tekenreeks \"%s\" in een waarde van "
+"type \"%s\" om te zetten"
 
-#: ../src/mn-mailbox.gob:744
-#, c-format
+#: ../src/mn-mailbox.gob:948
 msgid "property \"%s\" has no value"
-msgstr "eigenschap »%s« heeft geen waarde"
+msgstr "eigenschap \"%s\" heeft geen waarde"
 
-#: ../src/mn-mailboxes.gob:203
+#: ../src/mn-mailboxes.gob:239
 msgid "An error has occurred while importing old mailboxes"
 msgstr "Bij het importeren van oude postbussen is een fout opgetreden"
 
-#: ../src/mn-mailboxes.gob:248
+#: ../src/mn-mailboxes.gob:265
 msgid "Unable to load the mailboxes configuration"
 msgstr "Het is niet mogelijk de postbus-configuratie te laden"
 
-#: ../src/mn-mailboxes.gob:294
+#: ../src/mn-mailboxes.gob:311
 msgid "Unable to parse the XML document."
 msgstr "Het XML-document kan niet geanalyseerd worden."
 
-#: ../src/mn-mailboxes.gob:301
+#: ../src/mn-mailboxes.gob:318
 msgid "The root element is missing."
 msgstr "Het basiselement (root) is niet aanwezig."
 
-#: ../src/mn-mailboxes.gob:307
-#, c-format
+#: ../src/mn-mailboxes.gob:324
 msgid "The root element \"%s\" is invalid."
-msgstr "Het basiselement (root) »%s« is niet geldig."
+msgstr "Het basiselement (root) \"%s\" is niet geldig."
 
-#: ../src/mn-mailboxes.gob:330
-#, c-format
+#: ../src/mn-mailboxes.gob:347
 msgid "On line %i: %s."
 msgstr "Op regel %i: %s"
 
-#: ../src/mn-mailboxes.gob:335
-#, c-format
+#: ../src/mn-mailboxes.gob:352
 msgid "On line %i: unknown element \"%s\"."
-msgstr "Op regel %i: onbekend element »%s«."
+msgstr "Op regel %i: onbekend element \"%s\"."
 
-#: ../src/mn-mailboxes.gob:346
+#: ../src/mn-mailboxes.gob:361
 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:371
+#: ../src/mn-mailboxes.gob:386
 msgid "Unable to save the mailboxes configuration"
 msgstr "De postbusinstellingen kunnen niet opgeslagen worden"
 
-#: ../src/mn-mailboxes.gob:417
-msgid "Unable to write the XML document."
-msgstr "Het XML-document kan niet geschreven worden."
-
-#. non fatal
-#: ../src/mn-mailboxes.gob:433
-#, c-format
-msgid "unable to delete %s: %s"
+#: ../src/mn-mailboxes.gob:428
+msgid "Unable to remove %s: %s."
 msgstr "%s kan niet verwijderd worden: %s"
 
-#: ../src/mn-mailboxes.gob:457
-#, 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:483
-#, c-format
-msgid "%s reported an error: %s"
-msgstr "%s heeft een fout gemeld: %s"
-
-#: ../src/mn-maildir-mailbox-backend.gob:111
-#, c-format
-msgid "unable to open folder \"new\": %s"
-msgstr "de map »new« kan niet geopend worden: %s"
-
-#: ../src/mn-maildir-mailbox-backend.gob:144
-#, c-format
-msgid "unable to close folder \"new\": %s"
-msgstr "de map »new« kan niet gesloten worden: %s"
-
-#: ../src/mn-maildir-mailbox-backend.gob:147
-#, c-format
-msgid "error while reading folder \"new\": %s"
-msgstr "fout bij het lezen van map »new«: %s"
-
-#: ../src/mn-main-window.gob:106
-msgid "Help messages"
-msgstr "Helpteksten"
-
-#: ../src/mn-main-window.gob:107
-msgid "Count messages"
-msgstr "Tel berichten"
-
-#. Toplevel
-#: ../src/mn-main-window.gob:156
-msgid "_Mail"
-msgstr "_E-mail"
-
-#: ../src/mn-main-window.gob:157
-msgid "_Edit"
-msgstr "Be_werken"
-
-#: ../src/mn-main-window.gob:158
-msgid "_View"
-msgstr "Beel_d"
-
-#: ../src/mn-main-window.gob:159
-msgid "_Help"
-msgstr "_Hulp"
-
-#: ../src/mn-main-window.gob:167
-msgid "Launch the mail reader"
-msgstr "Start het e-mail programma"
-
-#. Reload
-#: ../src/mn-main-window.gob:175 ../src/mn-main.c:248
-msgid "Update the mail status"
-msgstr "Kijk of er nieuwe berichten zijn"
-
-#: ../src/mn-main-window.gob:181
-msgid "_Close"
-msgstr "_Sluiten"
-
-#: ../src/mn-main-window.gob:183
-msgid "Close this window"
-msgstr "Sluit dit venster"
-
-#: ../src/mn-main-window.gob:189
-msgid "_Quit"
-msgstr "_Afsluiten"
-
-#: ../src/mn-main-window.gob:191 ../src/mn-main.c:266
-msgid "Quit Mail Notification"
-msgstr "E-mail notificatie afsluiten"
-
-#: ../src/mn-main-window.gob:199 ../src/mn-main-window.gob:247
-msgid "_Toolbars"
-msgstr "_Werkbalken"
-
-#: ../src/mn-main-window.gob:201
-msgid "Customize the toolbars"
-msgstr "Werkbalken aanpassen"
-
-#: ../src/mn-main-window.gob:207
-msgid "_Preferences"
-msgstr "_Voorkeuren"
-
-#: ../src/mn-main-window.gob:217
-msgid "Toolbars Styl_e"
-msgstr "Werkbalkstijl_en"
-
-#: ../src/mn-main-window.gob:219
-msgid "Customize the toolbars style"
-msgstr "Werkbalkstijl aanpassen"
-
-#: ../src/mn-main-window.gob:227
-msgid "_Contents"
-msgstr "I_nhoud"
-
-#: ../src/mn-main-window.gob:229
-msgid "Display help"
-msgstr "Toon help"
+#: ../src/mn-mailboxes.gob:436
+msgid "Unable to create %s: %s."
+msgstr "%s kan niet gecreëerd worden: %s"
 
-#: ../src/mn-main-window.gob:235
-msgid "_About"
-msgstr "_Info"
+#: ../src/mn-mailboxes.gob:443
+msgid "Unable to open %s for writing: %s."
+msgstr "%s kan niet geopend worden voor schrijfactie: %s"
 
-#: ../src/mn-main-window.gob:237
-msgid "Display credits"
-msgstr "Toon meewerkenden"
-
-#: ../src/mn-main-window.gob:249
-msgid "Show or hide the toolbars"
-msgstr "Toon of verberg werkbalken"
-
-#: ../src/mn-main-window.gob:256
-msgid "_Statusbar"
-msgstr "_Statusbalk"
+#: ../src/mn-mailboxes.gob:450
+msgid "Unable to write the XML document."
+msgstr "Het XML-document kan niet weggeschreven worden."
 
-#: ../src/mn-main-window.gob:258
-msgid "Show or hide the statusbar"
-msgstr "Toon of verberg de statusbalk"
+#: ../src/mn-mailboxes.gob:456
+msgid "Unable to close %s: %s."
+msgstr "%s kan niet gesloten worden: %s"
 
-#: ../src/mn-main-window.gob:269
-msgid "_Desktop Default"
-msgstr "_Standaard bureaublad"
+#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+msgid "Unable to rename %s to %s: %s."
+msgstr "%s kan niet worden hernoemd naar %s: %s"
 
-#: ../src/mn-main-window.gob:271
-msgid "Set the toolbars style to the desktop default setting"
-msgstr "Stel de werkbalkstylen in naar de standaard van het bureaublad"
+#. non fatal
+#: ../src/mn-mailboxes.gob:479
+msgid "unable to delete %s: %s"
+msgstr "%s kan niet verwijderd worden: %s"
 
-#: ../src/mn-main-window.gob:277
-msgid "I_cons Only"
-msgstr "Alleen i_conen"
+#: ../src/mn-mailboxes.gob:509
+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-main-window.gob:279
-msgid "Only display the toolbars icons"
-msgstr "Toon alleen werkbalkiconen"
+#: ../src/mn-mailboxes.gob:535
+msgid "%s reported an error: %s"
+msgstr "%s heeft een fout gemeld: %s"
 
-#: ../src/mn-main-window.gob:285
-msgid "_Text Only"
-msgstr "Alleen _tekst"
+#: ../src/mn-maildir-mailbox-backend.gob:125
+msgid "unable to open folder \"%s\": %s"
+msgstr "de map \"%s\" kan niet geopend worden: %s"
 
-#: ../src/mn-main-window.gob:287
-msgid "Only display the toolbars text"
-msgstr "Toon alleen werkbalkteksten"
+#: ../src/mn-maildir-mailbox-backend.gob:173
+msgid "unable to close folder \"%s\": %s"
+msgstr "de map \"%s\" kan niet gesloten worden: %s"
 
-#: ../src/mn-main-window.gob:293
-msgid "Text Belo_w Icons"
-msgstr "Tekst _onder de iconen"
+#: ../src/mn-maildir-mailbox-backend.gob:176
+msgid "error while reading folder \"%s\": %s"
+msgstr "fout bij het lezen van map \"%s\": %s"
 
-#: ../src/mn-main-window.gob:295
-msgid "Display the toolbars text below the icons"
-msgstr "Toon de werkbalkteksten onder de iconen"
+#: ../src/mn-main.c:100
+msgid "yes"
+msgstr "ja"
 
-#: ../src/mn-main-window.gob:301
-msgid "Text Be_side Icons"
-msgstr "Tekst _naast de iconen"
+#: ../src/mn-main.c:100
+msgid "no"
+msgstr "nee"
 
-#: ../src/mn-main-window.gob:303
-msgid "Display the toolbars text beside the icons"
-msgstr "Toon de werkbalkteksten naast de iconen"
+#: ../src/mn-main.c:132
+msgid "%s version %s\n"
+msgstr "%s versie %s\n"
 
-#: ../src/mn-main-window.gob:345
-#, c-format
-msgid "unable to load menus.xml: %s"
-msgstr "menus.xml kunnen niet geladen worden: %s"
+#: ../src/mn-main.c:137
+msgid "Mailbox backends:\n"
+msgstr "Postbuskoppelingen:\n"
 
-#: ../src/mn-main-window.gob:388
-msgid "unable to load toolbars.xml"
-msgstr "toolbars.xml kunnen niet geladen worden"
+#: ../src/mn-main.c:142
+msgid "POP3 and IMAP features:\n"
+msgstr "Ingebouwde POP3- und IMAP-mogelijkheden:\n"
 
-#: ../src/mn-main-window.gob:439
-#, c-format
-msgid "%i new message"
-msgid_plural "%i new messages"
-msgstr[0] "%i nieuw bericht"
-msgstr[1] "%i nieuwe berichten"
+#: ../src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Sylpheed-funtionaliteit:\n"
 
-#.
-#. * 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 "Ingebouwde postbustypen: "
+#: ../src/mn-main.c:198
+msgid "A Bonobo exception (%s) has occurred in %s()."
+msgstr "Een Bonobo-exceptie (%s) is opgetreden in %s()."
 
-#: ../src/mn-main.c:124
-msgid "Compiled-in POP3 and IMAP features: "
-msgstr "Ingebouwde POP3- und IMAP-mogelijkheden: "
+#: ../src/mn-main.c:220
+msgid "Show version information"
+msgstr "Toon versie-informatie"
 
-#: ../src/mn-main.c:194
+#: ../src/mn-main.c:229
 msgid "Enable informational output"
 msgstr "Uitvoer informatie activeren"
 
-#: ../src/mn-main.c:203
-msgid "List the compiled-in features"
-msgstr "Ingebouwde mogelijkheden tonen"
-
-#: ../src/mn-main.c:212
-msgid "Display the main window"
-msgstr "Toon het hoofdvenster"
-
-#: ../src/mn-main.c:221
+#: ../src/mn-main.c:238
 msgid "Display the properties dialog"
 msgstr "Toon het eigenschappenvenster"
 
-#: ../src/mn-main.c:230
+#: ../src/mn-main.c:247
 msgid "Display the about dialog"
 msgstr "Toon het informatievenster"
 
-#: ../src/mn-main.c:239
+#: ../src/mn-main.c:256
 msgid "Close the mail summary popup"
 msgstr "Sluit het e-mail overzichtsvenster"
 
-#: ../src/mn-main.c:257
+#: ../src/mn-main.c:265
+msgid "Update the mail status"
+msgstr "Kijk of er nieuwe berichten zijn"
+
+#: ../src/mn-main.c:274
 msgid "Unset obsolete GConf configuration"
 msgstr "Geef overbodige GConf-configuratie vrij"
 
+#: ../src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "E-mail notificatie afsluiten"
+
 #.
-#. * 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:310
 msgid "multi-threading is not available"
 msgstr "multi-threading wordt niet ondersteund"
 
-#: ../src/mn-main.c:355
+#: ../src/mn-main.c:365
 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."
+"Bonobo kan het automation object niet vinden. Controleer aub de installatie "
+"van e-mail notificatie."
 
-#: ../src/mn-main.c:361
+#: ../src/mn-main.c:371
 msgid "quitting Mail Notification"
 msgstr "E-mail notificatie wordt afgesloten"
 
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:375
 msgid "Mail Notification is not running"
 msgstr "E-mail notificatie is niet actief"
 
-#: ../src/mn-main.c:372
+#: ../src/mn-main.c:390
 msgid "Unable to initialize the GnomeVFS library."
 msgstr "De GnomeVFS-bibliotheek kan niet geinitialiseerd worden."
 
-#: ../src/mn-main.c:404
+#: ../src/mn-main.c:438
 msgid "updating the mail status"
 msgstr "bijwerken e-mail status"
 
-#: ../src/mn-main.c:413
+#: ../src/mn-main.c:446
 msgid "Mail Notification is already running"
 msgstr "De e-mail notificatie is reeds actief"
 
-#: ../src/mn-main.c:423
-#, c-format
+#: ../src/mn-main.c:456
 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 notificatie."
+"Bonobo kan het %s-bestand vinden. Controleer aub de installatie van e-mail "
+"notificatie."
 
-#: ../src/mn-mbox-mailbox-backend.gob:209
-#, c-format
+#: ../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:222
-#, c-format
+#: ../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:104
+#: ../src/mn-message-mime.c:121
 msgid "unable to parse MIME message"
 msgstr "het MIME-bericht kan niet verwerkt worden"
 
-#: ../src/mn-message-view.gob:82
-msgid "You have no new mail."
-msgstr "U heeft geen nieuwe e-mail berichten."
-
-#: ../src/mn-message-view.gob:322
-msgid "Unreadable message"
-msgstr "onleesbaar bericht"
-
-#: ../src/mn-message-view.gob:330
-msgid "From"
-msgstr "Van"
-
-#: ../src/mn-message-view.gob:338
-msgid "Subject"
-msgstr "Onderwerp"
-
-#: ../src/mn-message-view.gob:349
-msgid "Sent"
-msgstr "Verzonden"
-
-#: ../src/mn-message.gob:99
+#: ../src/mn-message.gob:111
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../src/mn-message.gob:124
-#, c-format
-msgid "%i second ago"
-msgid_plural "%i seconds ago"
-msgstr[0] "%i seconden geleden"
-
-#: ../src/mn-message.gob:128
-#, 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-message.gob:133
-#, 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-message.gob:138
-#, 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-message.gob:143
-#, 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"
-
 #. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:163
+#: ../src/mn-message.gob:130
 msgid "none"
 msgstr "geen"
 
-#: ../src/mn-mh-mailbox-backend.gob:161
-#, c-format
+#: ../src/mn-mh-mailbox-backend.gob:167
 msgid "error while reading %s: %s"
 msgstr "fout bij het lezen van %s: %s"
 
-#: ../src/mn-mh-mailbox-backend.gob:174
-#, c-format
+#: ../src/mn-mh-mailbox-backend.gob:180
 msgid "unable to open %s: %s"
 msgstr "%s kan niet geopend worden: %s"
 
@@ -1391,7 +1072,7 @@ msgid "sta_ndard"
 msgstr "sta_ndaard"
 
 #: ../src/mn-pi-mailbox-properties.gob:68
-msgid "_in-band SSL/TLS"
+msgid "in-band SS_L/TLS"
 msgstr "_in-band SSL/TLS"
 
 #: ../src/mn-pi-mailbox-properties.gob:69
@@ -1399,32 +1080,54 @@ msgid "SSL/TLS on sepa_rate port"
 msgstr "SSL/TLS over een apa_rte poort"
 
 #: ../src/mn-pi-mailbox-properties.gob:73
-msgid "_Hostname:"
+msgid "Ho_stname:"
 msgstr "_Server:"
 
-#: ../src/mn-pi-mailbox-properties.gob:93
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:94
 msgid "_Details"
 msgstr "_Details"
 
-#: ../src/mn-pi-mailbox-properties.gob:148
+#: ../src/mn-pi-mailbox-properties.gob:149
 msgid "Connection type:"
 msgstr "Connectietype:"
 
-#: ../src/mn-pi-mailbox-properties.gob:155
+#: ../src/mn-pi-mailbox-properties.gob:156
 msgid "Port:"
 msgstr "Poort:"
 
-#: ../src/mn-pi-mailbox-properties.gob:178
-msgid "_Authentication mechanism:"
+#: ../src/mn-pi-mailbox-properties.gob:179
+msgid "Authent_ication mechanism:"
 msgstr "_Authenticatiemechanisme:"
 
-#: ../src/mn-pi-mailbox.gob:113
+#: ../src/mn-pi-mailbox.gob:151
 msgid "SSL/TLS support has not been compiled in"
+msgstr "ondersteuning voor SSL/TLS is niet in het programma ingebouwd"
+
+#: ../src/mn-pi-mailbox.gob:317
+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 ""
-"ondersteuning voor SSL/TLS is niet in het "
-"programma ingebouwd"
+"De 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-pop3-mailbox.gob:359
+#: ../src/mn-pi-mailbox.gob:318
+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
+msgid "Authentication Required"
+msgstr "Aanmelding is verplicht"
+
+#: ../src/mn-pop3-mailbox.gob:344
 msgid "invalid arguments for the LOGIN-DELAY capability"
 msgstr "ongeldige argumenten voor de LOGIN-DELAY functie"
 
@@ -1434,37 +1137,38 @@ msgstr "ongeldige argumenten voor de LOGIN-DELAY functie"
 #. * servers nevertheless, by retrying without the SASL
 #. * initial client response.
 #.
-#: ../src/mn-pop3-mailbox.gob:519
+#: ../src/mn-pop3-mailbox.gob:485
 msgid ""
 "SASL authentication with initial client response failed, retrying without "
 "initial client response"
-msgstr "De SASL-authenticate met initieel client-antwoord is mislukt, er "
-"wordt een nieuwe poging zonder client-antwoord onedernomen"
+msgstr ""
+"De SASL-authenticate met initieel client-antwoord is mislukt, er wordt een "
+"nieuwe poging zonder client-antwoord onedernomen"
 
-#: ../src/mn-pop3-mailbox.gob:733
+#: ../src/mn-pop3-mailbox.gob:696
 msgid "unknown error"
 msgstr "onbekende fout"
 
-#: ../src/mn-pop3-mailbox.gob:828
-#, c-format
+#: ../src/mn-pop3-mailbox.gob:791
 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:1009
+#: ../src/mn-pop3-mailbox.gob:959
 msgid "server does not support APOP authentication"
 msgstr "de server ondersteund geen APOP-authenticatie."
 
-#: ../src/mn-pop3-mailbox.gob:1065
+#: ../src/mn-pop3-mailbox.gob:1015
 msgid "falling back to APOP authentication"
 msgstr "er wordt teruggevallen op APOP-authenticaties"
 
-#: ../src/mn-pop3-mailbox.gob:1070
+#: ../src/mn-pop3-mailbox.gob:1020
 msgid "falling back to USER/PASS authentication"
 msgstr "er wordt teruggevallen op USER/PASS-authenticatie"
 
-#: ../src/mn-properties-dialog.gob:170 ../ui/properties-dialog.glade.h:10
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
 msgid "Mail Notification Properties"
 msgstr "Instellingen e-mail notificatie"
 
@@ -1484,428 +1188,432 @@ msgstr "links onder"
 msgid "bottom right"
 msgstr "rechts onder"
 
-#: ../src/mn-properties-dialog.gob:329
+#: ../src/mn-properties-dialog.gob:332
 msgid "No mailbox selected."
 msgstr "Geen postbus geselecteerd."
 
-#: ../src/mn-properties-dialog.gob:334
-#, c-format
+#: ../src/mn-properties-dialog.gob:337
 msgid "%i mailbox selected."
 msgid_plural "%i mailboxes selected."
 msgstr[0] "%i postbus geselecteerd."
 msgstr[1] "%i postbussen geselecteerd."
 
-#: ../src/mn-properties-dialog.gob:465
-#, c-format
+#: ../src/mn-properties-dialog.gob:456
 msgid "Test message #%i"
-msgstr "Testbericht nr. %i"
+msgstr "Testbericht %i"
 
-#: ../src/mn-properties-dialog.gob:470
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:462
 msgid "Mail Notification Properties Dialog"
 msgstr "Instellingenvenster e-mail notificatie"
 
-#: ../src/mn-shell.gob:109
-msgid "You have new mail."
-msgstr "U heeft nieuwe e-mail berichten."
-
-#: ../src/mn-shell.gob:374
+#. translators: header capitalization
+#: ../src/mn-shell.gob:381
 msgid "Mailboxes Having New Mail"
 msgstr "Postbussen met nieuwe e-mail berichten"
 
-#: ../src/mn-shell.gob:393
+#. translators: header capitalization
+#: ../src/mn-shell.gob:400
 msgid "Errors"
 msgstr "Fouten"
 
-#: ../src/mn-shell.gob:408
+#. translators: header capitalization
+#: ../src/mn-shell.gob:416
 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
 msgid "unknown SSL/TLS error"
 msgstr "onbekende SSL/TLS-fout"
 
-#: ../src/mn-stock.c:28
-msgid "Select _All"
-msgstr "_Alles selecteren"
+#: ../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
+msgid "Sent:"
+msgstr "Verzonden"
 
+#. translators: header capitalization
 #: ../src/mn-stock.c:29
-msgid "Leave Fullscreen"
-msgstr "Volledig scherm verlaten"
+msgid "Select _All"
+msgstr "_Alles selecteren"
 
-#: ../src/mn-stock.c:30
+#. translators: header capitalization
+#: ../src/mn-stock.c:32
 msgid "Co_nnect"
 msgstr "_Verbinden"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:170
-#, c-format
+#: ../src/mn-sylpheed-mailbox-backend.gob:223
 msgid "unable to open folder: %s"
 msgstr "map kan niet geopend worden: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:209
-#, c-format
+#: ../src/mn-sylpheed-mailbox-backend.gob:276
 msgid "unable to close folder: %s"
 msgstr "map kan niet gesloten worden: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:212
-#, c-format
+#: ../src/mn-sylpheed-mailbox-backend.gob:279
 msgid "error while reading folder: %s"
 msgstr "fout bij het lezen van map: %s"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:255
+#: ../src/mn-sylpheed-mailbox-backend.gob:420
 msgid "unexpected end of file"
 msgstr "unverwacht einde van bestand"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:269
-#, c-format
+#: ../src/mn-sylpheed-mailbox-backend.gob:438
 msgid "incompatible file version \"%i\""
-msgstr "bestandsverie is niet compatibel »%i«"
+msgstr "bestandsversie is niet compatibel »%i«"
 
-#: ../src/mn-sylpheed-mailbox-backend.gob:272
+#: ../src/mn-sylpheed-mailbox-backend.gob:441
 msgid "file version missing"
-msgstr "bestandsversie niet aanwezig"
+msgstr "bestandsversie is niet aanwezig"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:39
-#: ../src/mn-system-vfs-mailbox-properties.gob:47
+#: ../src/mn-system-vfs-mailbox-properties.gob:40
+#: ../src/mn-system-vfs-mailbox-properties.gob:48
 #: ../src/mn-system-vfs-mailbox.gob:45
 msgid "System mailbox"
 msgstr "Systeempostbus"
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:68
-#, c-format
+#: ../src/mn-system-vfs-mailbox-properties.gob:70
 msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
-msgstr ""
-"Uw postbus is <span weight=\"bold\">%s</span>."
+msgstr "Uw systeempostbus is <span weight=\"bold\">%s</span>."
 
-#: ../src/mn-system-vfs-mailbox-properties.gob:75
+#: ../src/mn-system-vfs-mailbox-properties.gob:77
 msgid ""
 "The location of your system mailbox could not be detected. Check the MAIL "
 "environment variable."
 msgstr ""
 "De locatie van de systeempostbus is onvindbaar. Contorleer aub de "
-"omgevingsvariabele »MAIL«."
+"omgevingsvariabele MAIL."
 
 #: ../src/mn-system-vfs-mailbox.gob:72
-msgid "MAIL environment variable not defined"
-msgstr "De omgevingsvariable »MAIL« is niet gezet"
+msgid "system mailbox not found"
+msgstr "Systeempostbus niet gevonden"
 
-#: ../src/mn-util.c:281
-#, c-format
+#: ../src/mn-util.c:349
 msgid "error loading image: %s"
 msgstr "fout bij laden afbeelding: %s"
 
-#: ../src/mn-util.c:298
-#, c-format
-msgid "widget \"%s\" not found in interface \"%s\""
-msgstr "Widget »%s« kan niet in interface »%s« worden gevonden"
+#: ../src/mn-util.c:365
+msgid ""
+"Unable to load interface \"%s\". Please check your Mail Notification "
+"installation."
+msgstr ""
+"Kan de \"%s\"-interface niet laden. Controleer aub de installatie van e-mail "
+"notificatie."
 
-#: ../src/mn-util.c:398
-#, c-format
-msgid "unable to open self as a module: %s"
-msgstr "kan niet zelf als een module openen: %s"
+#: ../src/mn-util.c:380
+msgid ""
+"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
+"Notification installation."
+msgstr ""
+"Schermelement \"%s\" niet gevonden in de interface. Controleer aub de installatie van e-mail "
+"notificatie."
 
-#: ../src/mn-util.c:403
-#, c-format
-msgid "signal handler \"%s\" not found"
-msgstr "kan signaalfilter »%s« niet vinden"
+#: ../src/mn-util.c:449
+msgid "Unable to open self as a module (%s)."
+msgstr "kan niet zelf als een module openen (%s)."
 
-#: ../src/mn-util.c:556 ../src/mn-util.c:579 ../src/mn-util.c:601
-#: ../src/mn-util.c:623
+#: ../src/mn-util.c:454
+msgid ""
+"Signal handler \"%s\" not found. Please check your Mail Notification "
+"installation."
+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
 msgid "A drag and drop error has occurred"
 msgstr "Een drag'n'drop-fout is opgetreden"
 
-#: ../src/mn-util.c:557
+#: ../src/mn-util.c:606
 msgid "An invalid location list has been received."
 msgstr "Ontvangst van een ongeldige adreslijst."
 
-#: ../src/mn-util.c:602
+#: ../src/mn-util.c:649
 msgid "An invalid Mozilla location has been received."
 msgstr "Ontvangst van een ongeldig Mozilla-adres."
 
-#: ../src/mn-util.c:678
+#: ../src/mn-util.c:725
 msgid "Unable to display help"
 msgstr "Kan geen helpinformatie tonen"
 
-#: ../src/mn-util.c:692
-#, c-format
+#: ../src/mn-util.c:739
 msgid "Unable to create a thread: %s."
 msgstr "Kan geen thread aanmaken: %s."
 
-#: ../src/mn-util.c:782
-msgid "_Do not show this message again"
-msgstr "_Laat deze melding niet opnieuw zien"
-
-#: ../src/mn-util.c:892
-#, c-format
+#: ../src/mn-util.c:899
 msgid ""
 "The following location is invalid:\n"
 "\n"
 "%s"
+msgid_plural ""
 "The following locations are invalid:\n"
 "\n"
 "%s"
-msgstr ""
+msgstr[0] ""
 "De volgende locatie is ongeldig:\n"
 "\n"
+"%sDe volgende locaties zijn ongeldig:\n"
+"\n"
 "%s"
-"De volgende locaties zijn ongeldig:\n"
+msgstr[1] ""
+"De volgende locatie is ongeldig:\n"
+"\n"
+"%sDe volgende locaties zijn ongeldig:\n"
 "\n"
 "%s"
 
-#: ../src/mn-util.c:912
+#: ../src/mn-util.c:919
 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:951
-#, c-format
+#: ../src/mn-util.c:958
 msgid "unable to get current time: %s"
 msgstr "kan de huidige tijd niet bepalen: %s"
 
-#: ../src/mn-util.c:1013
-#, c-format
-msgid "invalid signal specification \"%s\""
-msgstr "ongeldige signaalspecificatie »%s«"
+#: ../src/mn-util.c:1250
+msgid "%i second ago"
+msgid_plural "%i seconds ago"
+msgstr[0] "%i seconden geleden"
 
-#: ../src/mn-util.c:1052
-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-util.c:1254
+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:1053
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "»%s« kan niet uitgevoerd worden: %s."
+#: ../src/mn-util.c:1259
+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:1311
-#, c-format
-msgid "unable to rename %s to %s: %s"
-msgstr "%s kan niet worden hernoemd naar %s: %s"
+#: ../src/mn-util.c:1264
+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-vfs-mailbox-backend.gob:117
-#, c-format
-msgid "unable to monitor mailbox contents (%s), poll mode activated"
-msgstr "de postbusinhoud (%s) kan niet in de gaten worden gehouden, poll modus wordt geactiveerd"
+#: ../src/mn-util.c:1269
+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-vfs-mailbox.gob:238
-#, c-format
-msgid "unable to monitor mailbox type (%s), poll mode activated"
-msgstr "het postbustype (%s) kan niet in de gaten worden gehouden, poll modus wordt geactiveerd"
+#: ../src/mn-util.c:1282
+msgid "unknown date"
+msgstr "onbekende datum"
+
+#: ../src/mn-vfs-mailbox.gob:221
+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:307
+#: ../src/mn-vfs-mailbox.gob:385
 msgid "unknown mailbox format"
 msgstr "onbekend postbusformaat"
 
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:385
 msgid "does not exist"
 msgstr "bestaat niet"
 
-#: ../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)."
-"As a fallback, they will be checked every %i seconds (this delay is "
-"configurable from the Properties Dialog)."
-msgstr ""
-"Als alternatief worden deze elke %i seconde gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
-"Als alternatief worden deze elke %i seconden gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
-
-#: ../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)."
-"As a fallback, they will be checked every %i minutes (this delay is "
-"configurable from the Properties Dialog)."
-msgstr ""
-"Als alternatief worden deze elke %i minuut gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
-"Als alternatief worden deze elke %i minuten gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
-
-#: ../src/mn-vfs-mailbox.gob:399
-#, c-format
-msgid ""
-"As a fallback, they will be checked approximately every %i minute (this "
-"delay is configurable from the Properties Dialog)."
-"As a fallback, they will be checked approximately every %i minutes (this "
-"delay is configurable from the Properties Dialog)."
-msgstr ""
-"Als alternatief worden deze elke %i minuut gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
-"Als alternatief worden deze elke %i minuten gecontroleerd (deze waarde kan "
-"aangepast worden in het instellingenvenster)."
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Algemeen</span>"
 
-#: ../src/mn-vfs-mailbox.gob:415
-msgid "A monitoring error has occurred"
-msgstr "Bij het in de gaten houden is een fout opgetreden"
+#: ../ui/mailbox-properties-dialog.glade.h:3
+msgid "Delay between mail chec_ks:"
+msgstr "_Wachttijd tussen controleren e-mail:"
 
-#: ../src/mn-vfs-mailbox.gob:416
-#, c-format
-msgid ""
-"Mail Notification was unable to enable immediate notification for one or "
-"more mailboxes. %s"
-msgstr ""
-"De e-mail notificatie was niet in staat onmiddeijk notificatie te geven "
-"voor 1 of meer postbussen: %s"
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _name:"
+msgstr "Postbus_naam:"
 
-#: ../ui/edit-toolbars-dialog.glade.h:1
-msgid "Edit Toolbars"
-msgstr "Werkbalken aanpassen"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Use De_fault"
+msgstr "Gebr_uik standaardwaarde"
 
-#: ../ui/edit-toolbars-dialog.glade.h:2
-msgid "_Add a New Toolbar"
-msgstr "Een nieuwe werkb_alk toevoegen"
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Mailbox type:"
+msgstr "Postbus_type:"
 
-#: ../ui/edit-toolbars-dialog.glade.h:3
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:9
 msgid "_Use Default"
 msgstr "Gebr_uik standaardwaarde"
 
-#: ../ui/mail-summary-popup.glade.h:1
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span size=\"larger\" weight=\"bold\">Overzicht e-mail berichten</span>"
-
-#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:4
-msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Algemeen</span>"
+#: ../ui/mailbox-properties-dialog.glade.h:10
+#: ../ui/properties-dialog.glade.h:48
+msgid "minutes"
+msgstr "minuten"
 
-#: ../ui/mailbox-properties-dialog.glade.h:2
-msgid "Mailbox _name:"
-msgstr "Postbus_naam:"
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:52
+msgid "seconds"
+msgstr "seconden"
 
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Mailbox _type:"
-msgstr "Postbus_type:"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Actie bij muisklik</span>"
 
-#: ../ui/properties-dialog.glade.h:1
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:4
 msgid "<span weight=\"bold\">Commands</span>"
 msgstr "<span weight=\"bold\">Opdrachten</span>"
 
-#: ../ui/properties-dialog.glade.h:2
-msgid "<span weight=\"bold\">Double-click Action</span>"
-msgstr "<span weight=\"bold\">Actie bij dubbelklikken</span>"
-
-#: ../ui/properties-dialog.glade.h:3
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
 msgid "<span weight=\"bold\">Fonts</span>"
 msgstr "<span weight=\"bold\">Letterypen</span>"
 
-#: ../ui/properties-dialog.glade.h:5
+#. 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>"
 
-#: ../ui/properties-dialog.glade.h:6
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:14
 msgid "<span weight=\"bold\">Position</span>"
 msgstr "<span weight=\"bold\">Positie</span>"
 
-#: ../ui/properties-dialog.glade.h:7
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:16
+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:"
 
-#: ../ui/properties-dialog.glade.h:8
-msgid "Dis_play mail summary in tooltip"
-msgstr "_Laat overzicht e-mail in tooltip zien"
-
-#: ../ui/properties-dialog.glade.h:9
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:19
 msgid "General"
 msgstr "Algemeen"
 
-#: ../ui/properties-dialog.glade.h:11
-msgid "Mail Summary Popup"
-msgstr "Popup overzicht e-mail"
+#: ../ui/properties-dialog.glade.h:20
+msgid "Hide p_reviously displayed mail"
+msgstr "Ver_berg eerder getoonde e-mail"
 
-#: ../ui/properties-dialog.glade.h:12
-msgid "Mailboxes"
-msgstr "Postbussen"
+#: ../ui/properties-dialog.glade.h:21
+msgid "Hori_zontal offset:"
+msgstr "_Horizontale plaatsing:"
 
-#: ../ui/properties-dialog.glade.h:13
-msgid "Only display _recent mail"
-msgstr "Laat alleen _recente e-mail berichten zien"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:25
+msgid "Mail Summary Popup"
+msgstr "Popupvenster"
 
-#: ../ui/properties-dialog.glade.h:14
-msgid "Use these _fonts:"
-msgstr "Gebruik volgende _lettertypen:"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:27
+msgid "Status Icon"
+msgstr "Statusicoon"
 
-#: ../ui/properties-dialog.glade.h:15
-msgid "When _all mail has been read:"
-msgstr "Als _alle e-mail is gelezen:"
+#: ../ui/properties-dialog.glade.h:28
+msgid "Use these _fonts:"
+msgstr "_Gebruik volgende lettertypen:"
 
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:29
 msgid "When _new mail arrives:"
-msgstr "Wanneer nieuwe e-mail arriveert:"
+msgstr "Wanneer _nieuwe e-mail arriveert:"
 
-#: ../ui/properties-dialog.glade.h:17
+#: ../ui/properties-dialog.glade.h:30
+msgid "When all mail has _been read:"
+msgstr "Wanneer alle e-mail is ge_lezen:"
+
+#: ../ui/properties-dialog.glade.h:31
+msgid "_Always display"
+msgstr "Laat _altijd zien"
+
+#: ../ui/properties-dialog.glade.h:32
 msgid "_Automatically close after:"
-msgstr "_Automatisch sluiten na:"
+msgstr "Automat_isch sluiten na:"
 
-#: ../ui/properties-dialog.glade.h:18
+#: ../ui/properties-dialog.glade.h:33
 msgid "_Blink on errors"
-msgstr "Knipperen _bij fouten"
-
-#: ../ui/properties-dialog.glade.h:19
-msgid "_Delay between mail checks:"
-msgstr "_Wachttijd tussen controleren e-mail:"
+msgstr "_Knipperen bij fouten"
 
-#: ../ui/properties-dialog.glade.h:20
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:35
 msgid "_Display a Test Popup"
 msgstr "_Toon een test-popupvenster"
 
-#: ../ui/properties-dialog.glade.h:21
-msgid "_Display the main window"
-msgstr "_Toon het hoofdvenster"
+#: ../ui/properties-dialog.glade.h:36
+msgid "_Display seen mail"
+msgstr "T_oon alle ongelezen e-mail berichten"
 
-#: ../ui/properties-dialog.glade.h:22
-msgid "_Enable mail summary popup"
-msgstr "_Activeer popupvenster e-mail overzicht"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Display this dialog"
+msgstr "Toon dit _dialoogvenster"
 
-#: ../ui/properties-dialog.glade.h:23
-msgid "_Horizontal offset:"
-msgstr "_Horizontale afstand:"
+#: ../ui/properties-dialog.glade.h:38
+msgid "_Enable mail summary popup"
+msgstr "_Activeer popupvenster nieuwe e-mail"
 
-#: ../ui/properties-dialog.glade.h:24
+#: ../ui/properties-dialog.glade.h:39
 msgid "_Launch the mail reader"
-msgstr "_Start het e-mail programma"
+msgstr "Start het _e-mail programma"
 
-#: ../ui/properties-dialog.glade.h:25
-msgid "_Mail reader:"
-msgstr "_E-mail programma:"
+#: ../ui/properties-dialog.glade.h:40
+msgid "_None"
+msgstr "_Geen"
 
-#: ../ui/properties-dialog.glade.h:26
+#: ../ui/properties-dialog.glade.h:41
 msgid "_Position:"
 msgstr "_Positie:"
 
-#: ../ui/properties-dialog.glade.h:27
-msgid "_Start Mail Notification on GNOME login"
-msgstr "_Start e-mail notificatie als GNOME start"
-
-#: ../ui/properties-dialog.glade.h:28
+#: ../ui/properties-dialog.glade.h:42
 msgid "_Title:"
-msgstr "_Titel:"
+msgstr "Tite_l:"
 
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:43
 msgid "_Update the mail status"
 msgstr "_Controleer op nieuwe e-mail berichten"
 
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:44
 msgid "_Use fonts from theme"
-msgstr "Lettertypen van het _thema gebruiken"
+msgstr "L_ettertypen van het thema gebruiken"
 
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:45
 msgid "_Vertical offset:"
-msgstr "_Verticale afstand:"
+msgstr "_Verticale plaatsing:"
 
-#: ../ui/properties-dialog.glade.h:32
-msgid "minutes"
-msgstr "minuten"
+#: ../ui/properties-dialog.glade.h:46
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "Co_mpact"
 
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:47
+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:34
-msgid "seconds"
-msgstr "seconden"
+#: ../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/sv.po b/po/sv.po
@@ -0,0 +1,1701 @@
+# Swedish translations for mail-notification.
+# Copyright (C) 2003-2006 Jean-Yves Lefort.
+#
+# This file is distributed under the same license as the
+# mail-notification package.
+#
+# Daniel Nylander <po@danielnylander.se>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mail-notification 3.0-rc2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-05-15 16:36+0200\n"
+"PO-Revision-Date: 2006-05-18 15:03+0200\n"
+"Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
+"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n !=1;\n"
+
+#: ../data/GNOME_MailNotification.server.in.in.h:1
+msgid "Mail Notification automation"
+msgstr "Automation för E-postnotifieraren"
+
+#: ../data/GNOME_MailNotification.server.in.in.h:2
+msgid "Mail Notification automation factory"
+msgstr "Automationsfabrik för E-postnotifieraren"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:1
+msgid "Evolution folder tree control"
+msgstr "Kontroll av Evolutions mappträd"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:2
+msgid "Evolution folder tree control factory"
+msgstr "Kontrollfabrik för Evolutions mappträd"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:3
+msgid "Mail Notification / Evolution glue"
+msgstr "E-postnotifieraren / Evolution-klister"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:4
+msgid "Mail Notification / Evolution glue factory"
+msgstr "E-postnotifieraren / Evolution-klisterfabrik"
+
+#: ../data/mail-notification-properties.desktop.in.h:1
+msgid "Configure Mail Notification"
+msgstr "Konfigurera E-postnotifieraren"
+
+#: ../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
+msgid "Mail Notification"
+msgstr "E-postnotifieraren"
+
+#: ../data/mail-notification.desktop.in.h:1
+msgid "Get notified when new mail arrives"
+msgstr "Bli notifierad när nya brev anländer"
+
+#: ../data/mail-notification.schemas.in.h:1
+msgid "Always display an icon"
+msgstr "Visa alltid en ikon"
+
+#: ../data/mail-notification.schemas.in.h:2
+msgid "Automatically close the mail summary popup"
+msgstr "Stäng automatiskt popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:3
+msgid "Blink on errors"
+msgstr "Blinka vid fel"
+
+#: ../data/mail-notification.schemas.in.h:4
+msgid "Click action"
+msgstr "Klickåtgärd"
+
+#: ../data/mail-notification.schemas.in.h:5
+msgid "Display seen mail"
+msgstr "Visa sedda brev"
+
+#: ../data/mail-notification.schemas.in.h:6
+msgid "Enable mail summary popup"
+msgstr "Aktivera popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:7
+msgid "Fingerprints of trusted X509 certificates"
+msgstr "Fingeravtryck för pålitliga X509-certifikat"
+
+#: ../data/mail-notification.schemas.in.h:8
+msgid "Height of properties dialog"
+msgstr "Höjd på egenskapsdialogrutan"
+
+#: ../data/mail-notification.schemas.in.h:9
+msgid "Mail read command"
+msgstr "Kommando för att läsa e-post"
+
+#: ../data/mail-notification.schemas.in.h:10
+msgid "Mail summary popup contents font"
+msgstr "Typsnitt för innehållet i e-postsammandragets popupruta"
+
+#: ../data/mail-notification.schemas.in.h:11
+msgid "Mail summary popup fonts aspect source"
+msgstr "Källa för typsnitt i popuprutan för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:12
+msgid "Mail summary popup horizontal offset"
+msgstr "Horisontal position för popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:13
+msgid "Mail summary popup position"
+msgstr "Position för popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:14
+msgid "Mail summary popup title font"
+msgstr "Typsnitt för e-postsammandragets titel"
+
+#: ../data/mail-notification.schemas.in.h:15
+msgid "Mail summary popup vertical offset"
+msgstr "Vertikal position för popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:16
+msgid "Minutes to wait before closing the mail summary popup"
+msgstr "Minuter att vänta innan popuprutan för e-postsammandrag stängs"
+
+#: ../data/mail-notification.schemas.in.h:17
+msgid "New mail command"
+msgstr "Kommando för ny e-post"
+
+#: ../data/mail-notification.schemas.in.h:18
+msgid "Only display recent mail in mail summary popup"
+msgstr "Visa endast nyligen anlända brev i popupruta för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:19
+msgid "Run a command when all mail is read"
+msgstr "Kör ett kommando när alla brev har lästs"
+
+#: ../data/mail-notification.schemas.in.h:20
+msgid "Run a command when new mail arrives"
+msgstr "Kör ett kommando när nya brev anländer"
+
+#: ../data/mail-notification.schemas.in.h:21
+msgid "Seconds to wait before closing the mail summary popup"
+msgstr "Sekunder att vänta innan popuprutan för e-postsammandrag stängs"
+
+#: ../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 "Åtgärden att genomföra när ikonen blir klickad. Måste vara \"display-properties-dialog\", \"launch-mail-reader\" eller \"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 "Antal minuter att vänta innan popuprutan för e-postsammandrag stängs."
+
+#: ../data/mail-notification.schemas.in.h:24
+msgid "The amount of time to wait before closing the mail summary popup (seconds part)."
+msgstr "Antal sekunder att vänta innan popuprutan för e-postsammandrag stängs."
+
+#: ../data/mail-notification.schemas.in.h:25
+msgid "The aspect source of the mail summary popup fonts. Must be \"theme\" or \"custom\"."
+msgstr "Källan för typsnitt i popuprutan för e-postsammandrag. Måste vara \"theme\" eller \"custom\"."
+
+#: ../data/mail-notification.schemas.in.h:26
+msgid "The command to run when all mail is read."
+msgstr "Kommandot att köra när alla brev har lästs."
+
+#: ../data/mail-notification.schemas.in.h:27
+msgid "The command to run when new mail arrives."
+msgstr "Kommandot att köra när nya brev anländer."
+
+#: ../data/mail-notification.schemas.in.h:28
+msgid "The custom font to use for the contents of the mail summary popup."
+msgstr "Det anpassade typsnittet att använda för innehållet i popuprutan för e-postsammandrag."
+
+#: ../data/mail-notification.schemas.in.h:29
+msgid "The custom font to use for the title of the mail summary popup."
+msgstr "Det anpassade typsnittet att använda för titelraden på popuprutan för e-postsammandrag."
+
+#: ../data/mail-notification.schemas.in.h:30
+msgid "The height of the properties dialog in pixels."
+msgstr "Höjden på egenskapsdialogrutan i antal bildpunkter."
+
+#: ../data/mail-notification.schemas.in.h:31
+msgid "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate."
+msgstr "Listan på pålitliga SSL/TLS-servrar (värdnamn:port) som saknar ett X509-certifikat."
+
+#: ../data/mail-notification.schemas.in.h:32
+msgid "The list of trusted X509 certificates, represented by their MD5 fingerprint."
+msgstr "Listan av pålitliga X509-certifikat, representerade av deras MD5-fingeravtryck."
+
+#: ../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 "Antalet bildpunkter att lämna kvar mellan vänstra och högra sidan av skärmen och popuprutan för e-postsammandrag."
+
+#: ../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 "Antalet bildpunkter att lämna kvar mellan övre och nedre sidan av skärmen och popuprutan för e-postsammandrag."
+
+#: ../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 "Positionen för popuprutan för e-postsammandrag. Måste vara \"top-left\", \"top-right\", \"bottom-left\" eller \"bottom-right\"."
+
+#: ../data/mail-notification.schemas.in.h:36
+msgid "The type of mail summary to display in the icon's tooltip. Must be \"standard\", \"compact\" or \"none\"."
+msgstr "Typen av e-postsammandrag att visa i ikonens verktygstips. Måste vara \"standard\", \"compact\" eller \"none\"."
+
+#: ../data/mail-notification.schemas.in.h:37
+msgid "The width of the properties dialog in pixels."
+msgstr "Bredden på egenskapsdialogrutan i antal bildpunkter."
+
+#: ../data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "Verktygstips för e-postsammandrag"
+
+#: ../data/mail-notification.schemas.in.h:39
+msgid "Trusted servers list"
+msgstr "Lista på pålitliga servrar"
+
+#: ../data/mail-notification.schemas.in.h:40
+msgid "Whether the status icon should blink on errors or not."
+msgstr "Huruvida statusikonen ska blinka vid fel eller inte."
+
+#: ../data/mail-notification.schemas.in.h:41
+msgid "Whether to automatically close the mail summary popup or not."
+msgstr "Huruvida popuprutan för e-postsammandrag ska stängas automatiskt eller inte."
+
+#: ../data/mail-notification.schemas.in.h:42
+msgid "Whether to display an icon when there is no new mail or not."
+msgstr "Huruvida en ikon ska visas när det inte finns några nya brev eller inte."
+
+#: ../data/mail-notification.schemas.in.h:43
+msgid "Whether to display seen mail or not."
+msgstr "Huruvida sedda brev ska visas eller inte."
+
+#: ../data/mail-notification.schemas.in.h:44
+msgid "Whether to display the mail summary popup when new mail arrives or not."
+msgstr "Huruvida popuprutan för e-postsammandraget ska visas när nya brev anländer eller inte."
+
+#: ../data/mail-notification.schemas.in.h:45
+msgid "Whether to hide previously displayed mail in the mail summary popup or not."
+msgstr "Huruvida tidigare visade brev i popuprutan för e-postsammandrag ska döljas eller inte."
+
+#: ../data/mail-notification.schemas.in.h:46
+msgid "Whether to run a command when all mail is read or not."
+msgstr "Huruvida ett kommando ska köras när alla brev har lästs eller inte."
+
+#: ../data/mail-notification.schemas.in.h:47
+msgid "Whether to run a command when new mail arrives or not."
+msgstr "Huruvida ett kommando ska köras när nya brev anländer eller inte."
+
+#: ../data/mail-notification.schemas.in.h:48
+msgid "Width of properties dialog"
+msgstr "Bredd på egenskapsdialogrutan"
+
+#: ../src/eggtrayicon.c:132
+msgid "Orientation"
+msgstr "Orientering"
+
+#: ../src/eggtrayicon.c:133
+msgid "The orientation of the tray."
+msgstr "Lådans orientering."
+
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:49
+msgid "A Mail Notification Icon"
+msgstr "En e-postnotifieringsikon"
+
+#.
+#. * translators: Your Name <your-email>
+#. * optionally followed by one or more: \nOther Contributor's Name <his-email>
+#.
+#: ../src/mn-about-dialog.gob:57
+msgid "translator-credits"
+msgstr "Daniel Nylander <po@danielnylander.se>"
+
+#: ../src/mn-about-dialog.gob:79
+msgid "Unable to open link"
+msgstr "Kunde inte öppna länk"
+
+#: ../src/mn-auth-combo-box.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:109
+msgid "<span style=\"italic\">autodetect</span>"
+msgstr "<span style=\"italic\">identifiera automatiskt</span>"
+
+#: ../src/mn-authenticated-mailbox-properties.gob:46
+msgid "_Username:"
+msgstr "_Användarnamn:"
+
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "_Password:"
+msgstr "_Lösenord:"
+
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Location"
+msgstr "Plats"
+
+#: ../src/mn-autodetect-mailbox-properties.gob:122
+msgid "_Location:"
+msgstr "_Plats:"
+
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
+msgid "_Browse..."
+msgstr "_Bläddra..."
+
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
+msgid "Select a File or Folder"
+msgstr "Välj en fil eller mapp"
+
+#: ../src/mn-client-session.c:247
+#, c-format
+msgid "resolving %s"
+msgstr "slår upp %s"
+
+#: ../src/mn-client-session.c:263
+#, c-format
+msgid "unable to resolve %s: %s"
+msgstr "kunde inte slå upp %s: %s"
+
+#: ../src/mn-client-session.c:304
+#, c-format
+msgid "network address #%i"
+msgstr "nätverksadress #%i"
+
+#: ../src/mn-client-session.c:307
+#, c-format
+msgid "unable to convert network address #%i into textual form: %s"
+msgstr "kunde inte konvertera nätverksadress #%i till textformat: %s"
+
+#: ../src/mn-client-session.c:318
+#, c-format
+msgid "%s: unsupported address family"
+msgstr "%s: adressfamiljen stöds inte"
+
+#: ../src/mn-client-session.c:325
+#, c-format
+msgid "%s: unable to create socket: %s"
+msgstr "%s: kunde inte skapa uttag: %s"
+
+#: ../src/mn-client-session.c:329
+#, c-format
+msgid "connecting to %s (%s) port %i"
+msgstr "ansluter till %s (%s) port %i"
+
+#: ../src/mn-client-session.c:332
+#, c-format
+msgid "unable to connect: %s"
+msgstr "kunde inte ansluta: %s"
+
+#: ../src/mn-client-session.c:337
+msgid "connected successfully"
+msgstr "anslutning lyckades"
+
+#. if reached, we couldn't find a working address
+#: ../src/mn-client-session.c:351
+#, c-format
+msgid "unable to connect to %s"
+msgstr "kunde inte ansluta till %s"
+
+#: ../src/mn-client-session.c:378
+#, c-format
+msgid "unable to initialize the OpenSSL library: %s"
+msgstr "kunde inte initera OpenSSL-biblioteket: %s"
+
+#: ../src/mn-client-session.c:386
+#, c-format
+msgid "unable to create a SSL/TLS object: %s"
+msgstr "kunde inte skapa ett SSL/TLS-objekt: %s"
+
+#: ../src/mn-client-session.c:392
+#, c-format
+msgid "unable to set the SSL/TLS file descriptor: %s"
+msgstr "kunde inte ställa in SSL/TLS-filidentifieraren: %s"
+
+#: ../src/mn-client-session.c:398
+#, c-format
+msgid "unable to perform the SSL/TLS handshake: %s"
+msgstr "kunde inte genomföra SSL/TLS-handskakning: %s"
+
+#: ../src/mn-client-session.c:404
+msgid "untrusted server"
+msgstr "opålitlig server"
+
+#: ../src/mn-client-session.c:408
+#, c-format
+msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
+msgstr "ett SSL/TLS-lager är nu aktivt (%s, %s %i-bitars)"
+
+#: ../src/mn-client-session.c:455
+#, c-format
+msgid "%s, fingerprint: %s"
+msgstr "%s, fingeravtryck: %s"
+
+#: ../src/mn-client-session.c:484
+msgid "missing certificate"
+msgstr "saknar certifikat"
+
+#: ../src/mn-client-session.c:510
+#, c-format
+msgid ""
+"Mail Notification was unable to trust \"%s\" (%s). It is possible that someone is intercepting your communication to obtain your confidential information.\n"
+"\n"
+"You should only connect to the server if you are certain you are connected to \"%s\". If you choose to connect to the server, this message will not be shown again."
+msgstr ""
+"E-postnotifieraren kunde inte lita på \"%s\" (%s). Det är möjligt att någon fångar upp din kommunikation för att få tag på din hemliga information.\n"
+"\n"
+"Du bör endast ansluta till servern om du är säker på att du ansluter till \"%s\". Om du väljer att ansluta till servern kommer detta meddelande inte att visas igen."
+
+#: ../src/mn-client-session.c:525
+msgid "Connect to untrusted server?"
+msgstr "Anslut till opålitlig server?"
+
+#: ../src/mn-client-session.c:590
+#, c-format
+msgid "response \"%s\" is not valid in current context"
+msgstr "svaret \"%s\" är inte giltigt i aktuellt sammanhang"
+
+#: ../src/mn-client-session.c:619
+#, c-format
+msgid "unable to parse response \"%s\""
+msgstr "kunde inte tolka svaret \"%s\""
+
+#: ../src/mn-client-session.c:669
+#: ../src/mn-client-session.c:676
+#, c-format
+msgid "unable to read from server: %s"
+msgstr "kunde inte läsa från servern: %s"
+
+#: ../src/mn-client-session.c:674
+msgid "unable to read from server: EOF"
+msgstr "kunde inte läsa från servern: Slut på fil"
+
+#: ../src/mn-client-session.c:686
+#, c-format
+msgid "unable to decode data using SASL: %s"
+msgstr "kunde inte avkoda data med SASL: %s"
+
+#: ../src/mn-client-session.c:831
+#, c-format
+msgid "unable to encode data using SASL: %s"
+msgstr "kunde inte koda data med SASL: %s"
+
+#: ../src/mn-client-session.c:862
+#: ../src/mn-client-session.c:869
+#, c-format
+msgid "unable to write to server: %s"
+msgstr "kunde inte skriva till servern: %s"
+
+#: ../src/mn-client-session.c:867
+msgid "unable to write to server: EOF"
+msgstr "kunde inte skriva till servern: Slut på fil"
+
+#: ../src/mn-client-session.c:898
+#: ../src/mn-pop3-mailbox.gob:433
+#, c-format
+msgid "unable to encode Base64: %s"
+msgstr "kunde inte Base64-koda: %s"
+
+#: ../src/mn-client-session.c:1075
+#, c-format
+msgid "unable to initialize the SASL library: %s"
+msgstr "kunde inte initiera SASL-biblioteket: %s"
+
+#: ../src/mn-client-session.c:1087
+#, c-format
+msgid "unable to retrieve local address of socket: %s"
+msgstr "kunde inte hämta lokal adress för uttag: %s"
+
+#: ../src/mn-client-session.c:1093
+#, c-format
+msgid "unable to retrieve remote address of socket: %s"
+msgstr "kunde inte hämta fjärradress för uttag: %s"
+
+#: ../src/mn-client-session.c:1127
+#, c-format
+msgid "unable to set SASL security properties: %s"
+msgstr "kunde inte ställa in SASL-säkerhetsegenskaper: %s"
+
+#: ../src/mn-client-session.c:1151
+msgid "unable to start SASL authentication: SASL asked for something we did not know"
+msgstr "kunde inte starta SASL-autentisering: SASL frågade efter någonting som vi inte vet"
+
+#: ../src/mn-client-session.c:1170
+#, c-format
+msgid "unable to start SASL authentication: %s"
+msgstr "kunde inte starta SASL-autentisering: %s"
+
+#: ../src/mn-client-session.c:1174
+#, c-format
+msgid "unable to create a SASL connection: %s"
+msgstr "kunde inte skapa en SASL-anslutning: %s"
+
+#: ../src/mn-client-session.c:1221
+msgid "SASL asked for something we did not know, aborting SASL authentication"
+msgstr "SASL frågade efter någonting vi inte vet, avbryter SASL-autentisering"
+
+#: ../src/mn-client-session.c:1238
+#, c-format
+msgid "%s, aborting SASL authentication"
+msgstr "%s, avbryter SASL-autentisering"
+
+#. compliance error
+#: ../src/mn-client-session.c:1243
+#, c-format
+msgid "unable to decode Base64 input from server: %s"
+msgstr "kunde inte avkoda Base64-inmatning från servern: %s"
+
+#: ../src/mn-client-session.c:1279
+#, c-format
+msgid "a SASL security layer of strength factor %i is now active"
+msgstr "ett SASL-säkerhetslager med stark faktor %i är nu aktiv"
+
+#. a security layer is active but we can't retrieve maxoutbuf -> fatal
+#: ../src/mn-client-session.c:1284
+#, c-format
+msgid "unable to get SASL_MAXOUTBUF property: %s"
+msgstr "kunde inte få SASL_MAXOUTBUF-egenskap: %s"
+
+#: ../src/mn-client-session.c:1290
+#, c-format
+msgid "warning: unable to get SASL_SSF property: %s"
+msgstr "varning: kunde inte få SASL_SSF-egenskap: %s"
+
+#: ../src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "okänt serverfel"
+
+#: ../src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "Postlåda"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "Från"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "Ämne"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "Skickat"
+
+#: ../src/mn-conf.c:262
+msgid "A directory creation error has occurred"
+msgstr "Ett fel vid skapandet av katalog inträffade"
+
+#: ../src/mn-conf.c:263
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "Kunde inte skapa katalogen \"%s\": %s."
+
+#: ../src/mn-conf.c:402
+#, c-format
+msgid "recursively unsetting %s"
+msgstr "avmarkerar %s rekursivt"
+
+#: ../src/mn-conf.c:406
+msgid "syncing the GConf database"
+msgstr "synkroniserar GConf-databasen"
+
+#: ../src/mn-conf.c:409
+msgid "completed"
+msgstr "färdig"
+
+#: ../src/mn-conf.c:1137
+msgid "A command error has occurred in Mail Notification"
+msgstr "Ett kommandofel har inträffat i E-postnotifieraren"
+
+#: ../src/mn-conf.c:1138
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Kunde inte starta \"%s\": %s."
+
+#: ../src/mn-custom-vfs-mailbox.gob:76
+msgid "invalid location"
+msgstr "ogiltig plats"
+
+#: ../src/mn-evolution-folder-tree-control.c:91
+msgid "The currently selected URI"
+msgstr "Aktuellt markerad URI"
+
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:68
+msgid "Folder"
+msgstr "Mapp"
+
+#: ../src/mn-evolution-mailbox-properties.gob:159
+msgid "Mail Notification can not contact Evolution. Make sure that Evolution is running and that the Evolution Mail Notification plugin is loaded."
+msgstr "E-postnotifieraren kan inte kontakta Evolution. Kontrollera att Evolution körs och att insticksmodulen för E-postnotifieraren i Evolution är inläst."
+
+#: ../src/mn-evolution-mailbox.gob:75
+msgid "folder not found"
+msgstr "mappen hittades inte"
+
+#: ../src/mn-evolution-mailbox.gob:216
+msgid "unable to contact Evolution"
+msgstr "kunde inte kontakta Evolution"
+
+#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:140
+msgid "Unable to activate the Mail Notification plugin"
+msgstr "Kunde inte aktivera insticksmodulen för E-postnotifieraren"
+
+#: ../src/mn-evolution-plugin.c:136
+#, c-format
+msgid "Bonobo could not locate the %s server. Please check your Mail Notification installation."
+msgstr "Bonobo kunde inte hitta server %s. Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-evolution-plugin.c:140
+#: ../src/mn-main.c:460
+#, c-format
+msgid "Bonobo was unable to register the %s server. Please check your Mail Notification installation."
+msgstr "Bonobo kunde inte registrera servern %s. Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-gmail-mailbox.gob:103
+msgid "invalid feed location"
+msgstr "ogiltig kanalplats"
+
+#: ../src/mn-gmail-mailbox.gob:117
+#, c-format
+msgid "retrieving feed from %s"
+msgstr "hämtar kanal från %s"
+
+#: ../src/mn-gmail-mailbox.gob:124
+#, c-format
+msgid "unable to retrieve feed: %s"
+msgstr "kunde inte hämta kanal: %s"
+
+#: ../src/mn-gmail-mailbox.gob:139
+#: ../src/mn-gmail-mailbox.gob:187
+msgid "unable to parse feed"
+msgstr "kunde inte tolka kanal"
+
+#: ../src/mn-gmime-stream-vfs.gob:50
+#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#, c-format
+msgid "unable to read %s: %s"
+msgstr "kunde inte läsa %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:52
+#, c-format
+msgid "unable to write to %s: %s"
+msgstr "kunde inte skriva till %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:54
+#, c-format
+msgid "unable to seek in %s: %s"
+msgstr "kunde inte spola i %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:56
+#, c-format
+msgid "unable to tell position of %s: %s"
+msgstr "kunde inte ta reda på position för %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:58
+#: ../src/mn-mh-mailbox-backend.gob:164
+#, c-format
+msgid "unable to close %s: %s"
+msgstr "kunde inte stänga %s: %s"
+
+#: ../src/mn-imap-mailbox-properties.gob:114
+#: ../src/mn-standard-message-view.gob:62
+msgid "Mailbox:"
+msgstr "Postlåda:"
+
+#: ../src/mn-imap-mailbox-properties.gob:118
+msgid "in_box"
+msgstr "in_korg"
+
+#: ../src/mn-imap-mailbox-properties.gob:129
+msgid "oth_er:"
+msgstr "anna_n:"
+
+#: ../src/mn-imap-mailbox-properties.gob:140
+msgid "ne_ver"
+msgstr "al_drig"
+
+#: ../src/mn-imap-mailbox-properties.gob:141
+msgid "au_todetect"
+msgstr "identifiera automatisk_t"
+
+#: ../src/mn-imap-mailbox-properties.gob:142
+msgid "al_ways"
+msgstr "a_lltid"
+
+#: ../src/mn-imap-mailbox-properties.gob:174
+msgid "Use the <span style=\"italic\">IDLE</span> extension:"
+msgstr "Använd <span style=\"italic\">IDLE</span>-utökningen:"
+
+#: ../src/mn-imap-mailbox.gob:384
+msgid "server did not send capabilities"
+msgstr "servern skickade inga färdigheter"
+
+#: ../src/mn-imap-mailbox.gob:551
+msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
+msgstr "servern annonserade LOGINDISABLED, använder inte LOGIN-autentisering"
+
+#: ../src/mn-imap-mailbox.gob:552
+msgid "unable to login"
+msgstr "kunde inte logga in"
+
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:752
+msgid "server did not send all the messages we requested"
+msgstr "servern skickades inte alla meddelanden som vi begärde"
+
+#: ../src/mn-imap-mailbox.gob:822
+msgid "unable to fetch message"
+msgstr "kunde inte hämta meddelande"
+
+#: ../src/mn-imap-mailbox.gob:847
+msgid "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, logging out"
+msgstr "\"Använd IDLE-utökningen\" inställd till \"aldrig\" i postlådans egenskaper, loggar ut"
+
+#: ../src/mn-imap-mailbox.gob:858
+#, c-format
+msgid "the remote server runs %s, not using the IDLE extension"
+msgstr "fjärrservern kör %s, använder inte IDLE-utökningen"
+
+#: ../src/mn-imap-mailbox.gob:863
+#, c-format
+msgid "the remote server runs %s, the IDLE extension might not function properly"
+msgstr "fjärrservern kör %s, IDLE-utökningen kanske inte fungerar korrekt"
+
+#: ../src/mn-imap-mailbox.gob:872
+msgid "the remote server does not support the IDLE extension, logging out"
+msgstr "fjärrservern saknar stöd för IDLE-utökningen, loggar ut"
+
+#: ../src/mn-imap-mailbox.gob:1377
+#: ../src/mn-pop3-mailbox.gob:296
+msgid "server does not support in-band SSL/TLS"
+msgstr "servern saknar stöd för in-band SSL/TLS"
+
+#: ../src/mn-imap-mailbox.gob:1401
+#: ../src/mn-pop3-mailbox.gob:947
+msgid "a SASL authentication mechanism was selected but SASL support has not been compiled in"
+msgstr "en SASL-autentiseringsmekanism valdes men SASL-stöd har inte byggts in"
+
+#: ../src/mn-imap-mailbox.gob:1411
+#: ../src/mn-pop3-mailbox.gob:967
+#, c-format
+msgid "unknown authentication mechanism \"%s\""
+msgstr "okänd autentiseringsmekanism \"%s\""
+
+#: ../src/mn-imap-mailbox.gob:1443
+#: ../src/mn-pop3-mailbox.gob:1003
+#, c-format
+msgid "disabling mechanism \"%s\" and retrying SASL authentication"
+msgstr "inaktiverar mekanismen \"%s\" och försöker med SASL-autentisering igen"
+
+#: ../src/mn-imap-mailbox.gob:1455
+msgid "falling back to IMAP LOGIN authentication"
+msgstr "faller tillbaka på IMAP LOGIN-autentisering"
+
+#: ../src/mn-imap-mailbox.gob:1467
+#: ../src/mn-pop3-mailbox.gob:1032
+msgid "authentication failed"
+msgstr "autentisering misslyckades"
+
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "servern skickade inga sökresultat"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:89
+msgid "_Mail Reader"
+msgstr "_E-postläsare"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:91
+#: ../src/mn-mailbox-view.gob:312
+msgid "_Update"
+msgstr "_Uppdatera"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
+msgid "R_emove From Notification Area"
+msgstr "Ta _bort från notifieringsyta"
+
+#. 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\">E-postsammandrag</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mail-summary-popup.gob:277
+msgid "<span weight=\"bold\">Mail Summary</span>"
+msgstr "<span weight=\"bold\">E-postsammandrag</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:89
+#, c-format
+msgid "%s Properties"
+msgstr "Egenskaper för %s"
+
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:232
+msgid "Add a Mailbox"
+msgstr "Lägg till en postlåda"
+
+#: ../src/mn-mailbox-view.gob:248
+msgid "A paste error has occurred"
+msgstr "Ett fel vid inklistring har inträffat"
+
+#: ../src/mn-mailbox-view.gob:557
+#, c-format
+msgid "unhandled %s mailbox (%s)"
+msgstr "ohanterad %s postlåda (%s)"
+
+#: ../src/mn-mailbox-view.gob:562
+#, c-format
+msgid "%s mailbox"
+msgstr "%s-postlåda"
+
+#: ../src/mn-mailbox-view.gob:577
+msgid "detecting mailbox type..."
+msgstr "identifierar postlådetyp..."
+
+#: ../src/mn-mailbox.gob:472
+msgid "\"type\" attribute missing"
+msgstr "attributet \"type\" saknas"
+
+#: ../src/mn-mailbox.gob:479
+#, c-format
+msgid "unknown mailbox type \"%s\""
+msgstr "okänd postlådetyp \"%s\""
+
+#: ../src/mn-mailbox.gob:499
+#, c-format
+msgid "property \"%s\": unable to transform string \"%s\" into a value of type \"%s\""
+msgstr "egenskap \"%s\": kunde inte transformera strängen \"%s\" till ett värde av typen \"%s\""
+
+#: ../src/mn-mailbox.gob:948
+#, c-format
+msgid "property \"%s\" has no value"
+msgstr "egenskapen \"%s\" har inget värde"
+
+#: ../src/mn-mailboxes.gob:239
+msgid "An error has occurred while importing old mailboxes"
+msgstr "Ett fel inträffade vid importering av gamla postlådor"
+
+#: ../src/mn-mailboxes.gob:265
+msgid "Unable to load the mailboxes configuration"
+msgstr "Kunde inte läsa in konfiguration om postlådorna"
+
+#: ../src/mn-mailboxes.gob:311
+msgid "Unable to parse the XML document."
+msgstr "Kunde inte tolka XML-dokumentet."
+
+#: ../src/mn-mailboxes.gob:318
+msgid "The root element is missing."
+msgstr "Rotelementet saknas."
+
+#: ../src/mn-mailboxes.gob:324
+#, c-format
+msgid "The root element \"%s\" is invalid."
+msgstr "Rotelementet \"%s\" är ogiltigt."
+
+#: ../src/mn-mailboxes.gob:347
+#, c-format
+msgid "On line %i: %s."
+msgstr "På rad %i: %s."
+
+#: ../src/mn-mailboxes.gob:352
+#, c-format
+msgid "On line %i: unknown element \"%s\"."
+msgstr "På rad %i: okänt element \"%s\"."
+
+#: ../src/mn-mailboxes.gob:361
+msgid "An error has occurred while loading the mailboxes configuration"
+msgid_plural "Errors have occurred while loading the mailboxes configuration"
+msgstr[0] "Ett fel inträffade vid inläsning av konfiguration om postlådorna"
+msgstr[1] "Fel inträffade vid inläsning av konfiguration om postlådorna"
+
+#: ../src/mn-mailboxes.gob:386
+msgid "Unable to save the mailboxes configuration"
+msgstr "Kunde inte spara konfiguration om postlådorna"
+
+#: ../src/mn-mailboxes.gob:428
+#, c-format
+msgid "Unable to remove %s: %s."
+msgstr "Kunde inte ta bort %s: %s."
+
+#: ../src/mn-mailboxes.gob:436
+#, c-format
+msgid "Unable to create %s: %s."
+msgstr "Kunde inte skapa %s: %s."
+
+#: ../src/mn-mailboxes.gob:443
+#, c-format
+msgid "Unable to open %s for writing: %s."
+msgstr "Kunde inte öppna %s för skrivning: %s."
+
+#: ../src/mn-mailboxes.gob:450
+msgid "Unable to write the XML document."
+msgstr "Kunde inte skriva XML-dokumentet."
+
+#: ../src/mn-mailboxes.gob:456
+#, c-format
+msgid "Unable to close %s: %s."
+msgstr "Kunde inte stänga %s: %s."
+
+#: ../src/mn-mailboxes.gob:466
+#: ../src/mn-mailboxes.gob:473
+#, c-format
+msgid "Unable to rename %s to %s: %s."
+msgstr "Kunde inte byta namn på %s till %s: %s."
+
+#. non fatal
+#: ../src/mn-mailboxes.gob:479
+#, c-format
+msgid "unable to delete %s: %s"
+msgstr "kunde inte ta bort %s: %s"
+
+#: ../src/mn-mailboxes.gob:509
+#, c-format
+msgid "%s has %i new message"
+msgid_plural "%s has %i new messages"
+msgstr[0] "%s har %i nytt meddelande"
+msgstr[1] "%s har %i nya meddelanden"
+
+#: ../src/mn-mailboxes.gob:535
+#, c-format
+msgid "%s reported an error: %s"
+msgstr "%s rapporterade att fel: %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:125
+#, c-format
+msgid "unable to open folder \"%s\": %s"
+msgstr "kunde inte öppna mappen \"%s\": %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:173
+#, c-format
+msgid "unable to close folder \"%s\": %s"
+msgstr "kunde inte stänga mappen \"%s\": %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:176
+#, c-format
+msgid "error while reading folder \"%s\": %s"
+msgstr "fel vid läsning av mappen \"%s\": %s"
+
+#: ../src/mn-main.c:100
+msgid "yes"
+msgstr "ja"
+
+#: ../src/mn-main.c:100
+msgid "no"
+msgstr "nej"
+
+#: ../src/mn-main.c:132
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s version %s\n"
+
+#: ../src/mn-main.c:137
+msgid "Mailbox backends:\n"
+msgstr "Bakändor för postlådor:\n"
+
+#: ../src/mn-main.c:142
+msgid "POP3 and IMAP features:\n"
+msgstr "POP3 och IMAP erbjuder:\n"
+
+#: ../src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Sylpheed erbjuder:\n"
+
+#: ../src/mn-main.c:198
+#, c-format
+msgid "A Bonobo exception (%s) has occurred in %s()."
+msgstr "Ett undantag i Bonobo (%s) har inträffat i %s()."
+
+#: ../src/mn-main.c:220
+msgid "Show version information"
+msgstr "Visa versionsinformation"
+
+#: ../src/mn-main.c:229
+msgid "Enable informational output"
+msgstr "Aktivera informativ utskrift"
+
+#: ../src/mn-main.c:238
+msgid "Display the properties dialog"
+msgstr "Visa egenskapsdialogrutan"
+
+#: ../src/mn-main.c:247
+msgid "Display the about dialog"
+msgstr "Visa Om-dialogrutan"
+
+#: ../src/mn-main.c:256
+msgid "Close the mail summary popup"
+msgstr "Stäng popuprutan för e-postsammandrag"
+
+#: ../src/mn-main.c:265
+msgid "Update the mail status"
+msgstr "Uppdatera e-poststatus"
+
+#: ../src/mn-main.c:274
+msgid "Unset obsolete GConf configuration"
+msgstr "Inaktivera föråldrad GConf-konfiguration"
+
+#: ../src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "Avsluta E-postnotifieraren"
+
+#.
+#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
+#. * not been called yet.
+#.
+#: ../src/mn-main.c:310
+msgid "multi-threading is not available"
+msgstr "multitrådning är inte tillgängligt"
+
+#: ../src/mn-main.c:365
+msgid "Bonobo could not locate the automation object. Please check your Mail Notification installation."
+msgstr "Bonobo kunde inte hitta automationsobjektet. Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-main.c:371
+msgid "quitting Mail Notification"
+msgstr "avslutar E-postnotifieraren"
+
+#: ../src/mn-main.c:375
+msgid "Mail Notification is not running"
+msgstr "E-postnotifieraren körs inte"
+
+#: ../src/mn-main.c:390
+msgid "Unable to initialize the GnomeVFS library."
+msgstr "Kunde inte initiera GnomeVFS-biblioteket."
+
+#: ../src/mn-main.c:438
+msgid "updating the mail status"
+msgstr "uppdaterar e-poststatus"
+
+#: ../src/mn-main.c:446
+msgid "Mail Notification is already running"
+msgstr "E-postnotifieraren körs redan"
+
+#: ../src/mn-main.c:456
+#, c-format
+msgid "Bonobo could not locate the %s file. Please check your Mail Notification installation."
+msgstr "Bonobo kunde inte hitta filen %s. Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-mbox-mailbox-backend.gob:281
+#, c-format
+msgid "unable to close file: %s"
+msgstr "kunde inte stänga fil: %s"
+
+#: ../src/mn-mbox-mailbox-backend.gob:298
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "kunde inte öppna postlåda: %s"
+
+#: ../src/mn-message-mime.c:121
+msgid "unable to parse MIME message"
+msgstr "kunde inte tolka MIME-meddelande"
+
+#: ../src/mn-message.gob:111
+msgid "Unknown"
+msgstr "Okänt"
+
+#. translators: "none" is used like "Mailbox: none"
+#: ../src/mn-message.gob:130
+msgid "none"
+msgstr "ingen"
+
+#: ../src/mn-mh-mailbox-backend.gob:167
+#, c-format
+msgid "error while reading %s: %s"
+msgstr "vid vid läsning av %s: %s"
+
+#: ../src/mn-mh-mailbox-backend.gob:180
+#, c-format
+msgid "unable to open %s: %s"
+msgstr "kunde inte öppna %s: %s"
+
+#: ../src/mn-pi-mailbox-properties.gob:67
+msgid "sta_ndard"
+msgstr "sta_ndard"
+
+#: ../src/mn-pi-mailbox-properties.gob:68
+msgid "in-band SS_L/TLS"
+msgstr "in-band SS_L/TLS"
+
+#: ../src/mn-pi-mailbox-properties.gob:69
+msgid "SSL/TLS on sepa_rate port"
+msgstr "SSL/TLS på sepa_rat port"
+
+#: ../src/mn-pi-mailbox-properties.gob:73
+msgid "Ho_stname:"
+msgstr "_Värdnamn:"
+
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:94
+msgid "_Details"
+msgstr "_Detaljer"
+
+#: ../src/mn-pi-mailbox-properties.gob:149
+msgid "Connection type:"
+msgstr "Anslutningstyp:"
+
+#: ../src/mn-pi-mailbox-properties.gob:156
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/mn-pi-mailbox-properties.gob:179
+msgid "Authent_ication mechanism:"
+msgstr "Autent_iseringsmekanism:"
+
+#: ../src/mn-pi-mailbox.gob:151
+msgid "SSL/TLS support has not been compiled in"
+msgstr "SSL/TLS-stöd har inte byggts in"
+
+#: ../src/mn-pi-mailbox.gob:317
+#, 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 ""
+"E-postnotifieraren kunde inte logga in i %s-postlådan %s, möjligen på grund av att de uppgifter du har matat in är felaktiga.\n"
+"\n"
+"Mata in dina uppgifter igen."
+
+#: ../src/mn-pi-mailbox.gob:318
+#, c-format
+msgid "Enter your credentials for %s mailbox %s."
+msgstr "Ange dina uppgifter för %s-postlådan %s."
+
+#. keep the title in sync with gnome-authentication-manager
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox.gob:361
+msgid "Authentication Required"
+msgstr "Autentisering krävs"
+
+#: ../src/mn-pop3-mailbox.gob:344
+msgid "invalid arguments for the LOGIN-DELAY capability"
+msgstr "ogiltiga argument för färdigheten LOGIN-DELAY"
+
+#.
+#. * Some servers violate RFC 2449 by not supporting a
+#. * second argument to the AUTH command. Support these
+#. * servers nevertheless, by retrying without the SASL
+#. * initial client response.
+#.
+#: ../src/mn-pop3-mailbox.gob:485
+msgid "SASL authentication with initial client response failed, retrying without initial client response"
+msgstr "SASL-autentisering med initalt klientsvar misslyckades, försöker utan initalt klientsvar"
+
+#: ../src/mn-pop3-mailbox.gob:696
+msgid "unknown error"
+msgstr "okänt fel"
+
+#: ../src/mn-pop3-mailbox.gob:791
+#, c-format
+msgid "honouring LOGIN-DELAY, sleeping for %i second"
+msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
+msgstr[0] "följer LOGIN-DELAY, sover i %i sekund"
+msgstr[1] "följer LOGIN-DELAY, sover i %i sekunder"
+
+#: ../src/mn-pop3-mailbox.gob:959
+msgid "server does not support APOP authentication"
+msgstr "servern saknar stöd för APOP-autentisering"
+
+#: ../src/mn-pop3-mailbox.gob:1015
+msgid "falling back to APOP authentication"
+msgstr "faller tillbaka på APOP-autentisering"
+
+#: ../src/mn-pop3-mailbox.gob:1020
+msgid "falling back to USER/PASS authentication"
+msgstr "faller tillbaka på USER/PASS-autentisering"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:173
+#: ../ui/properties-dialog.glade.h:23
+msgid "Mail Notification Properties"
+msgstr "Egenskaper för E-postnotifieraren"
+
+#: ../src/mn-properties-dialog.gob:207
+msgid "top left"
+msgstr "överst till vänster"
+
+#: ../src/mn-properties-dialog.gob:208
+msgid "top right"
+msgstr "överst till höger"
+
+#: ../src/mn-properties-dialog.gob:209
+msgid "bottom left"
+msgstr "nederst till vänster"
+
+#: ../src/mn-properties-dialog.gob:210
+msgid "bottom right"
+msgstr "nederst till höger"
+
+#: ../src/mn-properties-dialog.gob:332
+msgid "No mailbox selected."
+msgstr "Ingen postlåda markerad."
+
+#: ../src/mn-properties-dialog.gob:337
+#, c-format
+msgid "%i mailbox selected."
+msgid_plural "%i mailboxes selected."
+msgstr[0] "%i postlåda markerad."
+msgstr[1] "%i postlådor markerade."
+
+#: ../src/mn-properties-dialog.gob:456
+#, c-format
+msgid "Test message #%i"
+msgstr "Testmeddelande #%i"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:462
+msgid "Mail Notification Properties Dialog"
+msgstr "Egenskapsdialogrutan för E-postnotifieraren"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:381
+msgid "Mailboxes Having New Mail"
+msgstr "Postlådor som innehåller nya brev"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:400
+msgid "Errors"
+msgstr "Fel"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:416
+msgid "Mail Summary"
+msgstr "E-postsammandrag"
+
+#: ../src/mn-shell.gob:445
+msgid "You have no new mail."
+msgstr "Du har inga nya brev."
+
+#: ../src/mn-ssl.c:76
+msgid "unknown SSL/TLS error"
+msgstr "okänt SSL/TLS-fel"
+
+#: ../src/mn-standard-message-view.gob:64
+msgid "Unreadable message:"
+msgstr "Oläsligt meddelande:"
+
+#: ../src/mn-standard-message-view.gob:67
+msgid "From:"
+msgstr "Från:"
+
+#: ../src/mn-standard-message-view.gob:68
+msgid "Subject:"
+msgstr "Ämne:"
+
+#: ../src/mn-standard-message-view.gob:72
+msgid "Sent:"
+msgstr "Skickat:"
+
+#. translators: header capitalization
+#: ../src/mn-stock.c:29
+msgid "Select _All"
+msgstr "Markera _alla"
+
+#. translators: header capitalization
+#. translators: header capitalization
+#: ../src/mn-stock.c:32
+msgid "Co_nnect"
+msgstr "A_nslut"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#, c-format
+msgid "unable to open folder: %s"
+msgstr "kunde inte öppna mapp: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#, c-format
+msgid "unable to close folder: %s"
+msgstr "kunde inte stänga mapp: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#, c-format
+msgid "error while reading folder: %s"
+msgstr "fel vid läsning av mapp: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:420
+msgid "unexpected end of file"
+msgstr "oväntat slut på fil"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#, c-format
+msgid "incompatible file version \"%i\""
+msgstr "okompatibel filversion \"%i\""
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:441
+msgid "file version missing"
+msgstr "filversion saknas"
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:40
+#: ../src/mn-system-vfs-mailbox-properties.gob:48
+#: ../src/mn-system-vfs-mailbox.gob:45
+msgid "System mailbox"
+msgstr "Systempostlåda"
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#, c-format
+msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
+msgstr "Din systempostlåda är <span weight=\"bold\">%s</span>."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:77
+msgid "The location of your system mailbox could not be detected. Check the MAIL environment variable."
+msgstr "Platsen för din systempostlåda kunde inte identifieras. Kontrollera miljövariabeln MAIL."
+
+#: ../src/mn-system-vfs-mailbox.gob:72
+msgid "system mailbox not found"
+msgstr "systempostlåda hittades inte"
+
+#: ../src/mn-util.c:349
+#, c-format
+msgid "error loading image: %s"
+msgstr "fel vid inläsning av bild: %s"
+
+#: ../src/mn-util.c:365
+#, c-format
+msgid "Unable to load interface \"%s\". Please check your Mail Notification installation."
+msgstr "Kunde inte läsa in gränssnittet \"%s\". Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-util.c:380
+#, c-format
+msgid "Widget \"%s\" not found in interface \"%s\". Please check your Mail Notification installation."
+msgstr "Widgeten \"%s\" hittades inte i gränssnittet \"%s\". Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-util.c:449
+#, c-format
+msgid "Unable to open self as a module (%s)."
+msgstr "Kunde inte öppna själv som en modul (%s)."
+
+#: ../src/mn-util.c:454
+#, c-format
+msgid "Signal handler \"%s\" not found. Please check your Mail Notification installation."
+msgstr "Signalhanteraren \"%s\" hittades inte. Kontrollera din installation av E-postnotifieraren."
+
+#: ../src/mn-util.c:605
+#: ../src/mn-util.c:628
+#: ../src/mn-util.c:648
+#: ../src/mn-util.c:670
+msgid "A drag and drop error has occurred"
+msgstr "Ett drag-och-släpp-fel har inträffat"
+
+#: ../src/mn-util.c:606
+msgid "An invalid location list has been received."
+msgstr "En ogiltig platslista har tagits emot."
+
+#: ../src/mn-util.c:649
+msgid "An invalid Mozilla location has been received."
+msgstr "En ogiltig Mozilla-plats har tagits emot."
+
+#: ../src/mn-util.c:725
+msgid "Unable to display help"
+msgstr "Kunde inte visa hjälp"
+
+#: ../src/mn-util.c:739
+#, c-format
+msgid "Unable to create a thread: %s."
+msgstr "Kunde inte skapa en tråd: %s."
+
+#: ../src/mn-util.c:899
+#, c-format
+msgid ""
+"The following location is invalid:\n"
+"\n"
+"%s"
+msgid_plural ""
+"The following locations are invalid:\n"
+"\n"
+"%s"
+msgstr[0] ""
+"Följande plats är ogiltig:\n"
+"\n"
+"%s"
+msgstr[1] ""
+"Följande platser är ogiltiga:\n"
+"\n"
+"%s"
+
+#: ../src/mn-util.c:919
+msgid "A fatal error has occurred in Mail Notification"
+msgstr "Ett ödesdigert fel har inträffat i E-postnotifieraren"
+
+#: ../src/mn-util.c:958
+#, c-format
+msgid "unable to get current time: %s"
+msgstr "kunde inte hämta aktuell tid: %s"
+
+#: ../src/mn-util.c:1250
+#, c-format
+msgid "%i second ago"
+msgid_plural "%i seconds ago"
+msgstr[0] "%i sekund sedan"
+msgstr[1] "%i sekunder sedan"
+
+#: ../src/mn-util.c:1254
+#, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "ungefär %i minut sedan"
+msgstr[1] "ungefär %i minuter sedan"
+
+#: ../src/mn-util.c:1259
+#, c-format
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "ungefär %i timme sedan"
+msgstr[1] "ungefär %i timmar sedan"
+
+#: ../src/mn-util.c:1264
+#, c-format
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "ungefär %i dag sedan"
+msgstr[1] "ungefär %i dagar sedan"
+
+#: ../src/mn-util.c:1269
+#, c-format
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "ungefär %i vecka sedan"
+msgstr[1] "ungefär %i veckor sedan"
+
+#: ../src/mn-util.c:1282
+msgid "unknown date"
+msgstr "okänt datum"
+
+#: ../src/mn-vfs-mailbox.gob:221
+#, c-format
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr "kunde inte övervaka %s (%s), pollningsläge aktiverat"
+
+#: ../src/mn-vfs-mailbox.gob:385
+msgid "unknown mailbox format"
+msgstr "okänt postlådeformat"
+
+#: ../src/mn-vfs-mailbox.gob:385
+msgid "does not exist"
+msgstr "finns inte"
+
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:8
+msgid "<span weight=\"bold\">General</span>"
+msgstr "<span weight=\"bold\">Allmänt</span>"
+
+#: ../ui/mailbox-properties-dialog.glade.h:3
+msgid "Delay between mail chec_ks:"
+msgstr "Tid mellan e-post_kontroller:"
+
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _name:"
+msgstr "Namn på postlåda:"
+
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Use De_fault"
+msgstr "Använd s_tandard"
+
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Mailbox type:"
+msgstr "Typ av _postlåda:"
+
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:9
+msgid "_Use Default"
+msgstr "_Använd standard"
+
+#: ../ui/mailbox-properties-dialog.glade.h:10
+#: ../ui/properties-dialog.glade.h:48
+msgid "minutes"
+msgstr "minuter"
+
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:52
+msgid "seconds"
+msgstr "sekunder"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Klickåtgärd</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:4
+msgid "<span weight=\"bold\">Commands</span>"
+msgstr "<span weight=\"bold\">Kommandon</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
+msgid "<span weight=\"bold\">Fonts</span>"
+msgstr "<span weight=\"bold\">Typsnitt</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:10
+msgid "<span weight=\"bold\">Layout</span>"
+msgstr "<span weight=\"bold\">Utseende</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:12
+msgid "<span weight=\"bold\">Mailbox List</span>"
+msgstr "<span weight=\"bold\">Lista på postlådor</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:14
+msgid "<span weight=\"bold\">Position</span>"
+msgstr "<span weight=\"bold\">Position</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:16
+msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
+msgstr "<span weight=\"bold\">Verktygstips för e-postsammandrag</span>"
+
+#: ../ui/properties-dialog.glade.h:17
+msgid "Co_ntents:"
+msgstr "In_nehåll:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:19
+msgid "General"
+msgstr "Allmänt"
+
+#: ../ui/properties-dialog.glade.h:20
+msgid "Hide p_reviously displayed mail"
+msgstr "Dölj fö_regående visat brev"
+
+#: ../ui/properties-dialog.glade.h:21
+msgid "Hori_zontal offset:"
+msgstr "_Horisontal position:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:25
+msgid "Mail Summary Popup"
+msgstr "Popupruta för e-postsammandrag"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:27
+msgid "Status Icon"
+msgstr "Statusikon"
+
+#: ../ui/properties-dialog.glade.h:28
+msgid "Use these _fonts:"
+msgstr "Använd dessa _typsnitt:"
+
+#: ../ui/properties-dialog.glade.h:29
+msgid "When _new mail arrives:"
+msgstr "När _nya brev anländer:"
+
+#: ../ui/properties-dialog.glade.h:30
+msgid "When all mail has _been read:"
+msgstr "När alla brev har _blivit lästa:"
+
+#: ../ui/properties-dialog.glade.h:31
+msgid "_Always display"
+msgstr "Visa _alltid"
+
+#: ../ui/properties-dialog.glade.h:32
+msgid "_Automatically close after:"
+msgstr "Stäng _automatiskt efter:"
+
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Blink on errors"
+msgstr "_Blinka vid fel"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Display a Test Popup"
+msgstr "_Visa test för popupruta"
+
+#: ../ui/properties-dialog.glade.h:36
+msgid "_Display seen mail"
+msgstr "_Visa sedda brev"
+
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Display this dialog"
+msgstr "_Visa denna dialogruta"
+
+#: ../ui/properties-dialog.glade.h:38
+msgid "_Enable mail summary popup"
+msgstr "_Aktivera popupruta för e-postsammandrag"
+
+#: ../ui/properties-dialog.glade.h:39
+msgid "_Launch the mail reader"
+msgstr "_Starta e-postläsaren"
+
+#: ../ui/properties-dialog.glade.h:40
+msgid "_None"
+msgstr "_Ingen"
+
+#: ../ui/properties-dialog.glade.h:41
+msgid "_Position:"
+msgstr "_Position:"
+
+#: ../ui/properties-dialog.glade.h:42
+msgid "_Title:"
+msgstr "_Titel:"
+
+#: ../ui/properties-dialog.glade.h:43
+msgid "_Update the mail status"
+msgstr "_Uppdatera brevstatusen"
+
+#: ../ui/properties-dialog.glade.h:44
+msgid "_Use fonts from theme"
+msgstr "_Använd typsnitt från tema"
+
+#: ../ui/properties-dialog.glade.h:45
+msgid "_Vertical offset:"
+msgstr "_Vertikal position:"
+
+#: ../ui/properties-dialog.glade.h:46
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "Ko_mpakt"
+
+#: ../ui/properties-dialog.glade.h:47
+msgid "icon tooltip's mail summary layout|_Standard"
+msgstr "_Standard"
+
+#: ../ui/properties-dialog.glade.h:49
+msgid "pixels"
+msgstr "bildpunkter"
+
+#: ../ui/properties-dialog.glade.h:50
+msgid "popup's mail summary layout|Co_mpact"
+msgstr "Ko_mpakt"
+
+#: ../ui/properties-dialog.glade.h:51
+msgid "popup's mail summary layout|_Standard"
+msgstr "_Standard"
+
+#~ msgid "Set a mail reader"
+#~ msgstr "Ställ in en e-postläsare"
+#~ msgid "New Mail"
+#~ msgstr "Ny e-post"
+#~ msgid "_Remove Toolbar"
+#~ msgstr "_Ta bort verktygsrad"
+#~ msgid "Main _Window"
+#~ msgstr "Huvud_fönster"
+#~ msgid "_Mail"
+#~ msgstr "_E-post"
+#~ msgid "_Edit"
+#~ msgstr "_Redigera"
+#~ msgid "_View"
+#~ msgstr "_Visa"
+#~ msgid "_Help"
+#~ msgstr "_Hjälp"
+#~ msgid "Launch the mail reader"
+#~ msgstr "Starta e-postläsaren"
+#~ msgid "_Close"
+#~ msgstr "_Stäng"
+#~ msgid "Close this window"
+#~ msgstr "Stäng detta fönster"
+#~ msgid "_Quit"
+#~ msgstr "_Avsluta"
+#~ msgid "_Toolbars"
+#~ msgstr "_Verktygsrader"
+#~ msgid "Customize the toolbars"
+#~ msgstr "Anpassa verktygsraderna"
+#~ msgid "_Preferences"
+#~ msgstr "_Inställningar"
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
+#~ msgid "_About"
+#~ msgstr "_Om"
+#~ msgid "Display credits"
+#~ msgstr "Visa tack"
+#~ msgid "Show or hide the toolbars"
+#~ msgstr "Visa eller dölj verktygsraderna"
+#~ msgid "_Statusbar"
+#~ msgstr "_Statusrad"
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Visa eller dölj statusraden"
+#~ msgid "I_cons Only"
+#~ msgstr "Endast i_koner"
+#~ msgid "_Text Only"
+#~ msgstr "Endast _text"
+#~ msgid "Text Belo_w Icons"
+#~ msgstr "Text _under ikoner"
+#~ msgid "Text Be_side Icons"
+#~ msgstr "Text _bredvid ikoner"
+#~ msgid "%i new message"
+#~ msgstr "%i nytt meddelande"
+#~ msgid "You have new mail."
+#~ msgstr "Du har ny e-post."
+#~ msgid "Leave Fullscreen"
+#~ msgstr "Lämna helskärmsläge"
+#~ msgid "A monitoring error has occurred"
+#~ msgstr "Ett övervakningsfel har inträffat"
+#~ msgid "Edit Toolbars"
+#~ msgstr "Redigera verktygsrader"
+#~ msgid "_Add a New Toolbar"
+#~ msgstr "_Lägg till en ny verktygsrad"
+#~ msgid "Mailboxes"
+#~ msgstr "Postlådor"
+#~ msgid "_Mail reader:"
+#~ msgstr "_E-postläsare:"
+#~ msgid "_Start Mail Notification on GNOME login"
+#~ msgstr "_Starta E-postnotifieraren vid inloggning i GNOME"
+
+
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -1,5 +1,5 @@
 # Generated from automake.xml using Jean-Yves Lefort's aml.
-include $(top_srcdir)/aml/aml.make
+include $(top_srcdir)/aml.make
 bin_PROGRAMS = mail-notification
 mail_notification_CPPFLAGS = $(WARN_CFLAGS)
 mail_notification_CPPFLAGS += -I$(top_srcdir)
diff --git a/src/Makefile.in b/src/Makefile.in
@@ -40,7 +40,7 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/aml.make $(top_srcdir)/aml/aml.make
+	$(srcdir)/aml.make $(top_srcdir)/aml.make
 bin_PROGRAMS = mail-notification$(EXEEXT)
 @WITH_MBOX_TRUE@am__append_1 = mn-mbox-mailbox-backend.gob \
 @WITH_MBOX_TRUE@	mn-mbox-mailbox-backend.gob.stamp \
@@ -590,6 +590,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
@@ -952,7 +953,7 @@ all: $(BUILT_SOURCES)
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/aml/aml.make $(srcdir)/aml.make $(am__configure_deps)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/aml.make $(srcdir)/aml.make $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
 	    *$$dep*) \
@@ -2154,7 +2155,7 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
 distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/../aml
+	$(mkdir_p) $(distdir)/..
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -2286,10 +2287,8 @@ uninstall-am: uninstall-binPROGRAMS uninstall-evolution_pluginDATA \
 	uninstall-evolution_pluginLTLIBRARIES uninstall-info-am
 
 
-# intentionally do not add aml/aml to sources (Makefile.am is distributed)
-Makefile.am: automake.xml $(top_srcdir)/aml/aml.c $(top_srcdir)/aml/Makefile.aml
-	cd $(top_srcdir)/aml && $(MAKE) -f Makefile.aml $(AM_MAKEFLAGS) aml
-	$(top_srcdir)/aml/aml $< > $@.aml && mv -f $@.aml $@
+Makefile.am: automake.xml $(AML)
+	$(AML) $< > $@.aml && mv -f $@.aml $@
 
 # intentionally do not add $(GOB2) to sources (generated files are distributed)
 %.gob.stamp: %.gob
diff --git a/src/mn-evolution-glue.c b/src/mn-evolution-glue.c
@@ -51,6 +51,7 @@ typedef MNEvolutionGlueClass SelfClass;
 /* here are local prototypes */
 static void mn_evolution_glue_init (MNEvolutionGlue * o) G_GNUC_UNUSED;
 static void mn_evolution_glue_class_init (MNEvolutionGlueClass * c) G_GNUC_UNUSED;
+static CORBA_char * mn_evolution_glue_CORBA_string_dup_null (const CORBA_char * str) 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;
 
@@ -58,6 +59,7 @@ static CORBA_string mn_evolution_glue_getFolderName (PortableServer_Servant serv
 static BonoboObjectClass *parent_class = NULL;
 
 /* Short form macros */
+#define self_CORBA_string_dup_null mn_evolution_glue_CORBA_string_dup_null
 #define self_getUnseenMessages mn_evolution_glue_getUnseenMessages
 #define self_getFolderName mn_evolution_glue_getFolderName
 #define self_new mn_evolution_glue_new
@@ -120,24 +122,38 @@ mn_evolution_glue_class_init (MNEvolutionGlueClass * c G_GNUC_UNUSED)
 
 	parent_class = g_type_class_ref (BONOBO_TYPE_OBJECT);
 
-#line 40 "mn-evolution-glue.gob"
+#line 50 "mn-evolution-glue.gob"
 	c->_epv.getUnseenMessages = self_getUnseenMessages;
-#line 108 "mn-evolution-glue.gob"
+#line 118 "mn-evolution-glue.gob"
 	c->_epv.getFolderName = self_getFolderName;
-#line 128 "mn-evolution-glue.c"
+#line 130 "mn-evolution-glue.c"
 }
 #undef __GOB_FUNCTION__
 
 
 
-#line 40 "mn-evolution-glue.gob"
+#line 44 "mn-evolution-glue.gob"
+static CORBA_char * 
+mn_evolution_glue_CORBA_string_dup_null (const CORBA_char * str)
+#line 139 "mn-evolution-glue.c"
+{
+#define __GOB_FUNCTION__ "MN:Evolution:Glue::CORBA_string_dup_null"
+{
+#line 46 "mn-evolution-glue.gob"
+	
+    return CORBA_string_dup(str ? str : "");
+  }}
+#line 147 "mn-evolution-glue.c"
+#undef __GOB_FUNCTION__
+
+#line 50 "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 137 "mn-evolution-glue.c"
+#line 153 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::getUnseenMessages"
 {
-#line 44 "mn-evolution-glue.gob"
+#line 54 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
     GPtrArray *summary;
@@ -187,8 +203,8 @@ mn_evolution_glue_getUnseenMessages (PortableServer_Servant servant, const CORBA
 	    seq->_buffer[i].sent_time = camel_message_info_date_sent(info);
 	    seq->_buffer[i].received_time = camel_message_info_date_received(info);
 	    seq->_buffer[i].id = CORBA_string_dup(hexhash);
-	    seq->_buffer[i].from = CORBA_string_dup(camel_message_info_from(info));
-	    seq->_buffer[i].subject = CORBA_string_dup(camel_message_info_subject(info));
+	    seq->_buffer[i].from = self_CORBA_string_dup_null(camel_message_info_from(info));
+	    seq->_buffer[i].subject = self_CORBA_string_dup_null(camel_message_info_subject(info));
 	  }
 
 	CORBA_sequence_set_release(seq, CORBA_TRUE);
@@ -201,17 +217,17 @@ mn_evolution_glue_getUnseenMessages (PortableServer_Servant servant, const CORBA
 
     return seq;
   }}
-#line 205 "mn-evolution-glue.c"
+#line 221 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 108 "mn-evolution-glue.gob"
+#line 118 "mn-evolution-glue.gob"
 static CORBA_string 
 mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_char * folder_uri, CORBA_Environment * env)
-#line 211 "mn-evolution-glue.c"
+#line 227 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::getFolderName"
 {
-#line 112 "mn-evolution-glue.gob"
+#line 122 "mn-evolution-glue.gob"
 	
     CamelFolder *folder;
     CORBA_string name = NULL;
@@ -219,7 +235,7 @@ mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_cha
     folder = mail_tool_uri_to_folder(folder_uri, 0, NULL);
     if (folder)
       {
-	name = CORBA_string_dup(camel_folder_get_name(folder));
+	name = self_CORBA_string_dup_null(camel_folder_get_name(folder));
 	camel_object_unref(folder);
       }
     else
@@ -227,19 +243,19 @@ mn_evolution_glue_getFolderName (PortableServer_Servant servant, const CORBA_cha
 
     return name;
   }}
-#line 231 "mn-evolution-glue.c"
+#line 247 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
 
-#line 128 "mn-evolution-glue.gob"
+#line 138 "mn-evolution-glue.gob"
 MNEvolutionGlue * 
 mn_evolution_glue_new (void)
-#line 237 "mn-evolution-glue.c"
+#line 253 "mn-evolution-glue.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Glue::new"
 {
-#line 130 "mn-evolution-glue.gob"
+#line 140 "mn-evolution-glue.gob"
 	
     return GET_NEW;
   }}
-#line 245 "mn-evolution-glue.c"
+#line 261 "mn-evolution-glue.c"
 #undef __GOB_FUNCTION__
diff --git a/src/mn-evolution-glue.gob b/src/mn-evolution-glue.gob
@@ -37,6 +37,16 @@ requires 2.0.14
 
 class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_Evolution_Glue)
 {
+  /*
+   * CORBA_string_dup() accepts a null pointer but in
+   * giop_send_buffer_append_string() ORBit doesn't.
+   */
+  private CORBA_char *
+    CORBA_string_dup_null (const CORBA_char *str)
+  {
+    return CORBA_string_dup(str ? str : "");
+  }
+
   BonoboObject private GNOME_MailNotification_Evolution_MessageSeq *
     getUnseenMessages (PortableServer_Servant servant,
 		       const CORBA_char *folder_uri,
@@ -90,8 +100,8 @@ class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_
 	    seq->_buffer[i].sent_time = camel_message_info_date_sent(info);
 	    seq->_buffer[i].received_time = camel_message_info_date_received(info);
 	    seq->_buffer[i].id = CORBA_string_dup(hexhash);
-	    seq->_buffer[i].from = CORBA_string_dup(camel_message_info_from(info));
-	    seq->_buffer[i].subject = CORBA_string_dup(camel_message_info_subject(info));
+	    seq->_buffer[i].from = self_CORBA_string_dup_null(camel_message_info_from(info));
+	    seq->_buffer[i].subject = self_CORBA_string_dup_null(camel_message_info_subject(info));
 	  }
 
 	CORBA_sequence_set_release(seq, CORBA_TRUE);
@@ -116,7 +126,7 @@ class MN:Evolution:Glue from Bonobo:Object (BonoboObject GNOME_MailNotification_
     folder = mail_tool_uri_to_folder(folder_uri, 0, NULL);
     if (folder)
       {
-	name = CORBA_string_dup(camel_folder_get_name(folder));
+	name = self_CORBA_string_dup_null(camel_folder_get_name(folder));
 	camel_object_unref(folder);
       }
     else
diff --git a/src/mn-evolution-mailbox-properties.c b/src/mn-evolution-mailbox-properties.c
@@ -175,9 +175,9 @@ mn_evolution_mailbox_properties_class_init (MNEvolutionMailboxPropertiesClass * 
 
 #line 82 "mn-evolution-mailbox-properties.gob"
 	g_object_class->dispose = ___dispose;
-#line 240 "mn-evolution-mailbox-properties.gob"
+#line 243 "mn-evolution-mailbox-properties.gob"
 	mn_mailbox_properties_class->set_mailbox = ___9_mn_evolution_mailbox_properties_set_mailbox;
-#line 256 "mn-evolution-mailbox-properties.gob"
+#line 259 "mn-evolution-mailbox-properties.gob"
 	mn_mailbox_properties_class->get_mailbox = ___a_mn_evolution_mailbox_properties_get_mailbox;
 #line 183 "mn-evolution-mailbox-properties.c"
 	g_object_class->finalize = ___finalize;
@@ -457,7 +457,10 @@ mn_evolution_mailbox_properties_selected_uri_changed_cb (BonoboListener * listen
 
 	    name = GNOME_MailNotification_Evolution_Glue_getFolderName(glue, uri, &name_env);
 	    if (BONOBO_EX(&name_env))
-	      name = NULL;
+	      {
+		CORBA_free(name);
+		name = NULL;
+	      }
 
 	    CORBA_exception_free(&name_env);
 
@@ -479,42 +482,42 @@ mn_evolution_mailbox_properties_selected_uri_changed_cb (BonoboListener * listen
     g_object_notify(G_OBJECT(self), "complete");
     g_object_notify(G_OBJECT(self), "default-name");
   }}
-#line 483 "mn-evolution-mailbox-properties.c"
+#line 486 "mn-evolution-mailbox-properties.c"
 #undef __GOB_FUNCTION__
 
-#line 231 "mn-evolution-mailbox-properties.gob"
+#line 234 "mn-evolution-mailbox-properties.gob"
 static void 
 mn_evolution_mailbox_properties_sync (MNEvolutionMailboxProperties * self)
-#line 489 "mn-evolution-mailbox-properties.c"
+#line 492 "mn-evolution-mailbox-properties.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Mailbox:Properties::sync"
-#line 231 "mn-evolution-mailbox-properties.gob"
+#line 234 "mn-evolution-mailbox-properties.gob"
 	g_return_if_fail (self != NULL);
-#line 231 "mn-evolution-mailbox-properties.gob"
+#line 234 "mn-evolution-mailbox-properties.gob"
 	g_return_if_fail (MN_IS_EVOLUTION_MAILBOX_PROPERTIES (self));
-#line 496 "mn-evolution-mailbox-properties.c"
+#line 499 "mn-evolution-mailbox-properties.c"
 {
-#line 233 "mn-evolution-mailbox-properties.gob"
+#line 236 "mn-evolution-mailbox-properties.gob"
 	
     g_return_if_fail(selfp->tree != NULL);
 
     if (selfp->uri)
       bonobo_widget_set_property(BONOBO_WIDGET(selfp->tree), "selected-uri", BONOBO_ARG_STRING, selfp->uri, NULL);
   }}
-#line 505 "mn-evolution-mailbox-properties.c"
+#line 508 "mn-evolution-mailbox-properties.c"
 #undef __GOB_FUNCTION__
 
-#line 240 "mn-evolution-mailbox-properties.gob"
+#line 243 "mn-evolution-mailbox-properties.gob"
 static void 
 ___9_mn_evolution_mailbox_properties_set_mailbox (MNMailboxProperties * properties G_GNUC_UNUSED, MNMailbox * mailbox)
-#line 511 "mn-evolution-mailbox-properties.c"
+#line 514 "mn-evolution-mailbox-properties.c"
 #define PARENT_HANDLER(___properties,___mailbox) \
 	{ if(MN_MAILBOX_PROPERTIES_CLASS(parent_class)->set_mailbox) \
 		(* MN_MAILBOX_PROPERTIES_CLASS(parent_class)->set_mailbox)(___properties,___mailbox); }
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Mailbox:Properties::set_mailbox"
 {
-#line 242 "mn-evolution-mailbox-properties.gob"
+#line 245 "mn-evolution-mailbox-properties.gob"
 	
     Self *self = SELF(properties);
     MNEvolutionMailbox *evolution_mailbox = MN_EVOLUTION_MAILBOX(mailbox);
@@ -528,14 +531,14 @@ ___9_mn_evolution_mailbox_properties_set_mailbox (MNMailboxProperties * properti
     if (selfp->tree)
       self_sync(self);
   }}
-#line 532 "mn-evolution-mailbox-properties.c"
+#line 535 "mn-evolution-mailbox-properties.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
 
-#line 256 "mn-evolution-mailbox-properties.gob"
+#line 259 "mn-evolution-mailbox-properties.gob"
 static MNMailbox * 
 ___a_mn_evolution_mailbox_properties_get_mailbox (MNMailboxProperties * properties G_GNUC_UNUSED)
-#line 539 "mn-evolution-mailbox-properties.c"
+#line 542 "mn-evolution-mailbox-properties.c"
 #define PARENT_HANDLER(___properties) \
 	((MN_MAILBOX_PROPERTIES_CLASS(parent_class)->get_mailbox)? \
 		(* MN_MAILBOX_PROPERTIES_CLASS(parent_class)->get_mailbox)(___properties): \
@@ -543,7 +546,7 @@ ___a_mn_evolution_mailbox_properties_get_mailbox (MNMailboxProperties * properti
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Mailbox:Properties::get_mailbox"
 {
-#line 258 "mn-evolution-mailbox-properties.gob"
+#line 261 "mn-evolution-mailbox-properties.gob"
 	
     Self *self = SELF(properties);
     MNMailbox *mailbox;
@@ -557,6 +560,6 @@ ___a_mn_evolution_mailbox_properties_get_mailbox (MNMailboxProperties * properti
 
     return mailbox;
   }}
-#line 561 "mn-evolution-mailbox-properties.c"
+#line 564 "mn-evolution-mailbox-properties.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
diff --git a/src/mn-evolution-mailbox-properties.gob b/src/mn-evolution-mailbox-properties.gob
@@ -205,7 +205,10 @@ class MN:Evolution:Mailbox:Properties from MN:Mailbox:Properties
 
 	    name = GNOME_MailNotification_Evolution_Glue_getFolderName(glue, uri, &name_env);
 	    if (BONOBO_EX(&name_env))
-	      name = NULL;
+	      {
+		CORBA_free(name);
+		name = NULL;
+	      }
 
 	    CORBA_exception_free(&name_env);
 
diff --git a/src/mn-evolution-mailbox.c b/src/mn-evolution-mailbox.c
@@ -164,7 +164,7 @@ mn_evolution_mailbox_class_init (MNEvolutionMailboxClass * class G_GNUC_UNUSED)
 	mn_mailbox_class->seal = ___3_mn_evolution_mailbox_seal;
 #line 96 "mn-evolution-mailbox.gob"
 	g_object_class->dispose = ___dispose;
-#line 160 "mn-evolution-mailbox.gob"
+#line 156 "mn-evolution-mailbox.gob"
 	mn_reentrant_mailbox_class->reentrant_check = ___6_mn_evolution_mailbox_reentrant_check;
 #line 170 "mn-evolution-mailbox.c"
 	g_object_class->finalize = ___finalize;
@@ -356,33 +356,29 @@ ___4_mn_evolution_mailbox_dispose (GObject * object G_GNUC_UNUSED)
 	g_assert(selfp->glue != NULL);
 
 	glue = mn_corba_object_get_object(selfp->glue);
-	if (glue != CORBA_OBJECT_NIL)
-	  {
-	    g_static_mutex_lock(&listeners_mutex);
-	    mn_bonobo_event_source_client_remove_listener_locked(glue, selfp->listener, NULL);
-	    g_static_mutex_unlock(&listeners_mutex);
 
-	    CORBA_Object_release(glue, NULL);
-	  }
+	g_static_mutex_lock(&listeners_mutex);
+	mn_bonobo_event_source_client_remove_listener_locked(glue, selfp->listener, NULL);
+	g_static_mutex_unlock(&listeners_mutex);
 
-	bonobo_object_release_unref(mn_locked_bonobo_listener_get_listener(selfp->listener), NULL);
+	CORBA_Object_release(glue, NULL);
 	selfp->listener = NULL;
       }
 
     PARENT_HANDLER(object);
   }}
-#line 375 "mn-evolution-mailbox.c"
+#line 371 "mn-evolution-mailbox.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
 
-#line 128 "mn-evolution-mailbox.gob"
+#line 124 "mn-evolution-mailbox.gob"
 static void 
 mn_evolution_mailbox_listener_cb (BonoboListener * listener, const char * event_name, const CORBA_any * any, CORBA_Environment * env, gpointer user_data)
-#line 382 "mn-evolution-mailbox.c"
+#line 378 "mn-evolution-mailbox.c"
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Mailbox::listener_cb"
 {
-#line 134 "mn-evolution-mailbox.gob"
+#line 130 "mn-evolution-mailbox.gob"
 	
     Self *self = user_data;
     const char *uri;
@@ -408,20 +404,20 @@ mn_evolution_mailbox_listener_cb (BonoboListener * listener, const char * event_
 	  mn_reentrant_mailbox_queue_check(MN_REENTRANT_MAILBOX(self));
       }
   }}
-#line 412 "mn-evolution-mailbox.c"
+#line 408 "mn-evolution-mailbox.c"
 #undef __GOB_FUNCTION__
 
-#line 160 "mn-evolution-mailbox.gob"
+#line 156 "mn-evolution-mailbox.gob"
 static void 
 ___6_mn_evolution_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_UNUSED, unsigned long check_id)
-#line 418 "mn-evolution-mailbox.c"
+#line 414 "mn-evolution-mailbox.c"
 #define PARENT_HANDLER(___mailbox,___check_id) \
 	{ if(MN_REENTRANT_MAILBOX_CLASS(parent_class)->reentrant_check) \
 		(* MN_REENTRANT_MAILBOX_CLASS(parent_class)->reentrant_check)(___mailbox,___check_id); }
 {
 #define __GOB_FUNCTION__ "MN:Evolution:Mailbox::reentrant_check"
 {
-#line 162 "mn-evolution-mailbox.gob"
+#line 158 "mn-evolution-mailbox.gob"
 	
     Self *self = SELF(mailbox);
     GNOME_MailNotification_Evolution_Glue glue;
@@ -443,7 +439,7 @@ ___6_mn_evolution_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_U
       {
 	if (selfp->listener)
 	  {
-	    bonobo_object_release_unref(mn_locked_bonobo_listener_get_listener(selfp->listener), NULL);
+	    mn_bonobo_event_source_client_remove_listener_locked(CORBA_OBJECT_NIL, selfp->listener, NULL);
 	    selfp->listener = NULL;
 	  }
       }
@@ -528,12 +524,13 @@ ___6_mn_evolution_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_U
 	    if (message_seq->_buffer[i].received_time > last_browsed)
 	      flags |= MN_MESSAGE_NEW;
 
+#define unbox(str) (*(str) ? (str) : NULL)
 	    messages = g_slist_prepend(messages, mn_message_new(MN_MAILBOX(mailbox),
 								NULL,
 								message_seq->_buffer[i].sent_time,
 								message_seq->_buffer[i].id,
-								message_seq->_buffer[i].from,
-								message_seq->_buffer[i].subject,
+								unbox(message_seq->_buffer[i].from),
+								unbox(message_seq->_buffer[i].subject),
 								flags));
 
 	    if (mn_reentrant_mailbox_check_aborted(mailbox, check_id))
@@ -561,6 +558,6 @@ ___6_mn_evolution_mailbox_reentrant_check (MNReentrantMailbox * mailbox G_GNUC_U
     CORBA_exception_free(&env);
     CORBA_Object_release(glue, NULL);
   }}
-#line 565 "mn-evolution-mailbox.c"
+#line 562 "mn-evolution-mailbox.c"
 #undef __GOB_FUNCTION__
 #undef PARENT_HANDLER
diff --git a/src/mn-evolution-mailbox.gob b/src/mn-evolution-mailbox.gob
@@ -109,16 +109,12 @@ class MN:Evolution:Mailbox from MN:Reentrant:Mailbox
 	g_assert(selfp->glue != NULL);
 
 	glue = mn_corba_object_get_object(selfp->glue);
-	if (glue != CORBA_OBJECT_NIL)
-	  {
-	    g_static_mutex_lock(&listeners_mutex);
-	    mn_bonobo_event_source_client_remove_listener_locked(glue, selfp->listener, NULL);
-	    g_static_mutex_unlock(&listeners_mutex);
 
-	    CORBA_Object_release(glue, NULL);
-	  }
+	g_static_mutex_lock(&listeners_mutex);
+	mn_bonobo_event_source_client_remove_listener_locked(glue, selfp->listener, NULL);
+	g_static_mutex_unlock(&listeners_mutex);
 
-	bonobo_object_release_unref(mn_locked_bonobo_listener_get_listener(selfp->listener), NULL);
+	CORBA_Object_release(glue, NULL);
 	selfp->listener = NULL;
       }
 
@@ -180,7 +176,7 @@ class MN:Evolution:Mailbox from MN:Reentrant:Mailbox
       {
 	if (selfp->listener)
 	  {
-	    bonobo_object_release_unref(mn_locked_bonobo_listener_get_listener(selfp->listener), NULL);
+	    mn_bonobo_event_source_client_remove_listener_locked(CORBA_OBJECT_NIL, selfp->listener, NULL);
 	    selfp->listener = NULL;
 	  }
       }
@@ -265,12 +261,13 @@ class MN:Evolution:Mailbox from MN:Reentrant:Mailbox
 	    if (message_seq->_buffer[i].received_time > last_browsed)
 	      flags |= MN_MESSAGE_NEW;
 
+#define unbox(str) (*(str) ? (str) : NULL)
 	    messages = g_slist_prepend(messages, mn_message_new(MN_MAILBOX(mailbox),
 								NULL,
 								message_seq->_buffer[i].sent_time,
 								message_seq->_buffer[i].id,
-								message_seq->_buffer[i].from,
-								message_seq->_buffer[i].subject,
+								unbox(message_seq->_buffer[i].from),
+								unbox(message_seq->_buffer[i].subject),
 								flags));
 
 	    if (mn_reentrant_mailbox_check_aborted(mailbox, check_id))
diff --git a/src/mn-locked-callback.c b/src/mn-locked-callback.c
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2005 Jean-Yves Lefort <jylefort@brutele.be>
+ * Copyright (C) 2005, 2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -580,46 +580,34 @@ mn_locked_bonobo_listener_cb (BonoboListener *listener,
 
 /**
  * mn_bonobo_event_source_client_remove_listener_locked:
- * @object: the object holding @listener
+ * @object: the object holding @listener, or %CORBA_OBJECT_NIL
  * @listener: a listener handle
  * @opt_ev: optional CORBA environment
  *
- * Removes @listener from the @object event source. The callback
- * function will no longer be executed. The listener lock must be held
- * while calling this function. After calling this function, the
- * reference returned by
- * mn_bonobo_event_source_client_add_listener_full_locked() must be
- * released with:
- *
- *   bonobo_object_release_unref(mn_locked_bonobo_listener_get_listener(listener), NULL);
+ * Removes @listener from the @object event source (if @object is not
+ * %CORBA_OBJECT_NIL), then destroys @listener. The callback function
+ * will no longer be executed. If @object is not %CORBA_OBJECT_NIL,
+ * then the listener lock must be held while calling this function.
  **/
 void
 mn_bonobo_event_source_client_remove_listener_locked (Bonobo_Unknown object,
 						      MNLockedBonoboListener *listener,
 						      CORBA_Environment *opt_ev)
 {
-  g_return_if_fail(object != CORBA_OBJECT_NIL);
+  Bonobo_Listener handle;
+
   g_return_if_fail(listener != NULL);
   g_return_if_fail(listener->type == CALLBACK_TYPE_BONOBO_LISTENER);
   g_return_if_fail(listener->removed == FALSE);
 
-  listener->removed = TRUE;
-  bonobo_event_source_client_remove_listener(object, listener->handle, opt_ev);
-}
+  handle = listener->handle;
 
-/**
- * mn_locked_bonobo_listener_get_listener:
- * @listener: a listener handle
- *
- * Obtains the underlying %Bonobo_Listener object of @listener.
- *
- * Return value: the %Bonobo_Listener object of @listener
- **/
-Bonobo_Listener
-mn_locked_bonobo_listener_get_listener (MNLockedBonoboListener *listener)
-{
-  g_return_val_if_fail(listener != NULL, CORBA_OBJECT_NIL);
-  g_return_val_if_fail(listener->type == CALLBACK_TYPE_BONOBO_LISTENER, CORBA_OBJECT_NIL);
+  if (object != CORBA_OBJECT_NIL)
+    {
+      listener->removed = TRUE;
+      bonobo_event_source_client_remove_listener(object, handle, opt_ev);
+      /* listener has been freed in the closure destroy callback */
+    }
 
-  return listener->handle;
+  bonobo_object_release_unref(handle, NULL);
 }
diff --git a/src/mn-locked-callback.h b/src/mn-locked-callback.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2005 Jean-Yves Lefort <jylefort@brutele.be>
+ * Copyright (C) 2005, 2006 Jean-Yves Lefort <jylefort@brutele.be>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,6 +79,5 @@ MNLockedBonoboListener *mn_bonobo_event_source_client_add_listener_full_locked (
 void mn_bonobo_event_source_client_remove_listener_locked (Bonobo_Unknown object,
 							   MNLockedBonoboListener *listener,
 							   CORBA_Environment *opt_ev);
-Bonobo_Listener mn_locked_bonobo_listener_get_listener (MNLockedBonoboListener *listener);
 
 #endif /* _MN_LOCKED_CALLBACK_H */
diff --git a/tests/Makefile.in b/tests/Makefile.in
@@ -89,6 +89,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
diff --git a/ui/Makefile.in b/ui/Makefile.in
@@ -67,6 +67,7 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
 AMDEP_FALSE = @AMDEP_FALSE@
 AMDEP_TRUE = @AMDEP_TRUE@
+AML = @AML@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@