commit bd1a0cd595a39982341af91a338a2dfe2eb18ed1
parent fe344c808d02ff4df5a96fec379f1b4dd41cbb05
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date: Tue, 28 Nov 2006 07:11:10 +1000
mail-notification-4.0-rc1
* Core changes:
* The mail summary popup has been replaced by
libnotify message popups. These new message popups
also provide actions such as "Open" and "Mark as Spam"
* Mozilla products (Mozilla, SeaMonkey, Thunderbird, ...)
mailboxes are now supported
* The mailbox properties dialog has been redesigned
* A new click action has been added: open the latest
message
* A MN icon set has been designed by Josef Vybíral
(#18198)
* A --print-summary command line argument has been
added, allowing to access message data from an
external program
* A mail-changed GConf command setting has been added
(it is executed when new mail is received or when a
message is read)
* Handling of the GNOME mail reader command: instead
of stripping %s, the first word of the command is
now used; moreover, mozilla and evolution are now
handled specially (#18257)
* The /desktop/gnome/url-handlers/mailto/needs_terminal
GConf key is now respected
* Could no longer close the about dialog with recent
GTK+ versions: fixed (#18252)
* POP3 changes:
* Messages kept on the server but marked as read are
now discarded. Note that this only works with
servers which send Status headers; most don't
(#18164).
* Evolution changes:
* All mailboxes now share the same CORBA connection to
Evolution (reduces resource usage)
* A mailbox properties dialog crash has been fixed
(#18228)
* Some memory leaks have been fixed
* Support for the Evolution 2.9/2.10 branch has been
added
* The Evolution 2.2 branch is no longer supported
* Updated translations:
* French
* Serbian (Filip Miletic)
* New translations:
* Catalan (Topi)
Diffstat:
269 files changed, 21721 insertions(+), 15190 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -21,10 +21,13 @@ Translators:
Maurycy Pawłowski-Wieroński <maurycy@abstrakcja.pl> (Polish)
* Marcel J. Zwiebel <mj.zwiebel@nonux.nl> (Dutch)
+Artists:
+ * Josef Vybíral <cornelius@vybiral.info>
+ (art/*/apps/mail-notification.*)
+
External code sources:
* libegg (src/egg*)
* Nautilus (src/nautilus*)
External art sources (images taken as-is or slightly modified):
* Google (gmail.png)
- * Evolution (mail-notification.png)
diff --git a/COPYING b/COPYING
@@ -1,8 +1,8 @@
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
+the GNU Lesser General Public License instead.) You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
-
+
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on
the Program is not required to print an announcement.)
-
+
These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.
-
+
4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.
-
+
8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
+ Copyright (C) <year> <name of author>
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
@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
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
-
+ 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.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
Also add information on how to contact you by electronic and paper mail.
If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:
- Gnomovision version 69, Copyright (C) 19yy name of author
+ Gnomovision version 69, Copyright (C) year name of author
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
This General Public License does not permit incorporating your program into
proprietary programs. If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
+library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License.
diff --git a/INSTALL b/INSTALL
@@ -11,7 +11,7 @@ Index
0. About this document
- $Id: INSTALL,v 1.19 2006/05/15 04:31:14 jylefort Exp $
+ $Id: INSTALL,v 1.20 2006/11/22 17:53:22 jylefort Exp $
Copyright (C) 2003-2006 Jean-Yves Lefort.
@@ -22,15 +22,20 @@ Index
Mandatory:
- * GTK+ (version 2.6.0 or superior)
- http://www.gtk.org/
+ * GNOME
+
+ required: version 2.8.0 or superior
+ recommended: version 2.14.0 or superior
- * GNOME (version 2.6.0 or superior)
http://www.gnome.org/
+ * libnotify (version 0.3.0 or superior)
+ http://www.galago-project.org/
+
Optional:
- * for mbox, MH, Maildir, POP3, IMAP and Sylpheed support:
+ * for mbox, MH, Maildir, POP3, IMAP, Mozilla and
+ Sylpheed support:
GMime (version 2.1.0 or superior)
http://spruce.sourceforge.net/gmime/
@@ -47,7 +52,7 @@ Index
* for Evolution support:
- Evolution (version 2.2 or superior)
+ Evolution (version 2.4 or superior)
http://www.gnome.org/projects/evolution/
2. Instructions
@@ -67,15 +72,6 @@ Index
your session must be restarted after installing Mail
Notification.
- * Evolution 2.2.x only: for building Evolution
- support, you must specify the path to the Evolution
- source directory, for instance:
-
- $ ./configure \
- --with-evolution-source-dir=$HOME/evolution-2.2.3
-
- This is not necessary with Evolution >= 2.3.
-
The configure script options which are specific to Mail
Notification are documented below.
@@ -139,25 +135,14 @@ Index
Enable Evolution mailbox support.
- Requirements: Evolution version 2.2 or superior.
-
- With Evolution 2.2.x, you must also specify the path
- to the Evolution source directory, for instance:
+ Requirements: Evolution version 2.4 or superior.
- $ ./configure \
- --with-evolution-source-dir=$HOME/evolution-2.2.3
+ --enable-mozilla (default: yes)
- --with-evolution-source-dir=DIR (default: no)
+ Enable Mozilla products (Mozilla, SeaMonkey,
+ Thunderbird, ...) mailbox support.
- Specify the path to the Evolution source directory,
- which is required for building Evolution mailbox
- support (Evolution 2.2.x only, not necessary with
- Evolution >= 2.3).
-
- Requirements: the source directory corresponding to
- the version of Evolution 2.2.x installed
- on your system.
- Applies to: Evolution.
+ Requirements: GMime version 2.1.0 or superior.
--enable-sylpheed (default: yes)
diff --git a/Makefile.in b/Makefile.in
@@ -80,6 +80,7 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -209,15 +210,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -258,7 +263,6 @@ 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@
diff --git a/NEWS b/NEWS
@@ -1,3 +1,54 @@
+4.0 Release Candidate 1 November 27, 2006
+
+ * Core changes:
+ * The mail summary popup has been replaced by
+ libnotify message popups. These new message popups
+ also provide actions such as "Open" and "Mark as Spam"
+ * Mozilla products (Mozilla, SeaMonkey, Thunderbird, ...)
+ mailboxes are now supported
+ * The mailbox properties dialog has been redesigned
+ * A new click action has been added: open the latest
+ message
+ * A MN icon set has been designed by Josef Vybíral
+ (#18198)
+ * A --print-summary command line argument has been
+ added, allowing to access message data from an
+ external program
+ * A mail-changed GConf command setting has been added
+ (it is executed when new mail is received or when a
+ message is read)
+ * Handling of the GNOME mail reader command: instead
+ of stripping %s, the first word of the command is
+ now used; moreover, mozilla and evolution are now
+ handled specially (#18257)
+ * The /desktop/gnome/url-handlers/mailto/needs_terminal
+ GConf key is now respected
+ * Could no longer close the about dialog with recent
+ GTK+ versions: fixed (#18252)
+
+ * POP3 changes:
+ * Messages kept on the server but marked as read are
+ now discarded. Note that this only works with
+ servers which send Status headers; most don't
+ (#18164).
+
+ * Evolution changes:
+ * All mailboxes now share the same CORBA connection to
+ Evolution (reduces resource usage)
+ * A mailbox properties dialog crash has been fixed
+ (#18228)
+ * Some memory leaks have been fixed
+ * Support for the Evolution 2.9/2.10 branch has been
+ added
+ * The Evolution 2.2 branch is no longer supported
+
+ * Updated translations:
+ * French
+ * Serbian (Filip Miletic)
+
+ * New translations:
+ * Catalan (Topi)
+
3.0 June 14, 2006
* Updated translations:
diff --git a/README b/README
@@ -11,7 +11,7 @@ Index
0. About this document
- $Id: README,v 1.32 2006/05/15 04:32:34 jylefort Exp $
+ $Id: README,v 1.34 2006/11/22 17:56:46 jylefort Exp $
Copyright (C) 2003-2006 Jean-Yves Lefort.
@@ -31,8 +31,9 @@ Index
Mail Notification features include:
* multiple mailbox support
- * mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution and
- Sylpheed support
+ * mbox, MH, Maildir, POP3, IMAP, Gmail, Evolution,
+ Mozilla products (Mozilla, SeaMonkey, Thunderbird,
+ ...) and Sylpheed support
* SASL authentication support
* APOP authentication support
* SSL/TLS support
@@ -40,7 +41,7 @@ Index
* immediate notification (the status icon is updated
immediately or within seconds after a mailbox
changes)
- * a mail summary
+ * message popups
* HIG 2.0 compliance
2. Issues in third-party software affecting Mail Notification
@@ -90,6 +91,7 @@ Index
http://bugzilla.gnome.org/show_bug.cgi?id=315650
fixed:
- FreeBSD port devel/libbonobo >= 2.10.1_1
+ - libbonobo >= 2.15.3
* An infinite loop in GnomeVFS may affect mailboxes which use
the GnomeVFS bzip2 method.
@@ -115,6 +117,7 @@ Index
http://bugzilla.gnome.org/show_bug.cgi?id=341585
fixed:
- FreeBSD port devel/gnomevfs2 >= 2.14.1_2
+ - GnomeVFS >= 2.15.90
3. Installation instructions
diff --git a/acinclude.m4 b/acinclude.m4
@@ -91,16 +91,17 @@ fi
AC_SUBST(WARN_CFLAGS)])
-dnl MN_ARG_DEBUG
+dnl MN_ARG_DEBUG([DEFAULT])
dnl
AC_DEFUN([MN_ARG_DEBUG],
[AC_ARG_ENABLE(debug,
-AS_HELP_STRING([--enable-debug],
-[enable assertions and cast checks]),
+ifelse([$1], yes,
+[AS_HELP_STRING([--disable-debug], [disable assertions and cast checks])],
+[AS_HELP_STRING([--enable-debug], [enable assertions and cast checks])]),
[case "$enableval" in
yes|no) enable_debug=$enableval ;;
*) AC_MSG_ERROR([bad value $enableval for --enable-debug]) ;;
-esac], [enable_debug=no])
+esac], [enable_debug=ifelse([$1],, no, [$1])])
if test $enable_debug = no; then
DEBUG_CFLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS -DG_DISABLE_CAST_CHECKS"
diff --git a/aclocal.m4 b/aclocal.m4
@@ -51,203 +51,6 @@ AC_DEFUN([AM_GCONF_SOURCE_2],
AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
])
-# Configure paths for GTK+
-# Owen Taylor 1997-2001
-
-dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-dnl pass to pkg-config
-dnl
-AC_DEFUN([AM_PATH_GTK_2_0],
-[dnl
-dnl Get the cflags and libraries from pkg-config
-dnl
-AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
- , enable_gtktest=yes)
-
- pkg_config_args=gtk+-2.0
- for module in . $4
- do
- case "$module" in
- gthread)
- pkg_config_args="$pkg_config_args gthread-2.0"
- ;;
- esac
- done
-
- no_gtk=""
-
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-
- if test x$PKG_CONFIG != xno ; then
- if pkg-config --atleast-pkgconfig-version 0.7 ; then
- :
- else
- echo "*** pkg-config too old; version 0.7 or better required."
- no_gtk=yes
- PKG_CONFIG=no
- fi
- else
- no_gtk=yes
- fi
-
- min_gtk_version=ifelse([$1], ,2.0.0,$1)
- AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-
- if test x$PKG_CONFIG != xno ; then
- ## don't try to run the test against uninstalled libtool libs
- if $PKG_CONFIG --uninstalled $pkg_config_args; then
- echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
- enable_gtktest=no
- fi
-
- if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
- :
- else
- no_gtk=yes
- fi
- fi
-
- if test x"$no_gtk" = x ; then
- GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
- GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
- gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
- gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
- gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test "x$enable_gtktest" = "xyes" ; then
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$GTK_LIBS $LIBS"
-dnl
-dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-dnl checks the results of pkg-config to some extent)
-dnl
- rm -f conf.gtktest
- AC_TRY_RUN([
-#include <gtk/gtk.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-int
-main ()
-{
- int major, minor, micro;
- char *tmp_version;
-
- system ("touch conf.gtktest");
-
- /* HP/UX 9 (%@#!) writes to sscanf strings */
- tmp_version = g_strdup("$min_gtk_version");
- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
- printf("%s, bad version string\n", "$min_gtk_version");
- exit(1);
- }
-
- if ((gtk_major_version != $gtk_config_major_version) ||
- (gtk_minor_version != $gtk_config_minor_version) ||
- (gtk_micro_version != $gtk_config_micro_version))
- {
- printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf ("*** was found! If pkg-config was correct, then it is best\n");
- printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
- printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
- printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
- printf("*** required on your system.\n");
- printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
- printf("*** to point to the correct configuration files\n");
- }
- else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
- (gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
- {
- printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
- GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- printf("*** library (version %d.%d.%d)\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- }
- else
- {
- if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
- {
- return 0;
- }
- else
- {
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
- major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
- printf("*** correct copy of pkg-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
- }
- }
- return 1;
-}
-],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- if test "x$no_gtk" = x ; then
- AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
- ifelse([$2], , :, [$2])
- else
- AC_MSG_RESULT(no)
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** A new enough version of pkg-config was not found."
- echo "*** See http://pkgconfig.sourceforge.net"
- else
- if test -f conf.gtktest ; then
- :
- else
- echo "*** Could not run GTK+ test program, checking why..."
- ac_save_CFLAGS="$CFLAGS"
- ac_save_LIBS="$LIBS"
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- AC_TRY_LINK([
-#include <gtk/gtk.h>
-#include <stdio.h>
-], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
- echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
- echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
- fi
- fi
- GTK_CFLAGS=""
- GTK_LIBS=""
- ifelse([$3], , :, [$3])
- fi
- AC_SUBST(GTK_CFLAGS)
- AC_SUBST(GTK_LIBS)
- rm -f conf.gtktest
-])
-
# Copyright (C) 1995-2002 Free Software Foundation, Inc.
# Copyright (C) 2001-2003,2004 Red Hat, Inc.
#
@@ -647,6 +450,203 @@ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)])
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
+# Configure paths for GTK+
+# Owen Taylor 1997-2001
+
+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
+dnl pass to pkg-config
+dnl
+AC_DEFUN([AM_PATH_GTK_2_0],
+[dnl
+dnl Get the cflags and libraries from pkg-config
+dnl
+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
+ , enable_gtktest=yes)
+
+ pkg_config_args=gtk+-2.0
+ for module in . $4
+ do
+ case "$module" in
+ gthread)
+ pkg_config_args="$pkg_config_args gthread-2.0"
+ ;;
+ esac
+ done
+
+ no_gtk=""
+
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+
+ if test x$PKG_CONFIG != xno ; then
+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
+ :
+ else
+ echo "*** pkg-config too old; version 0.7 or better required."
+ no_gtk=yes
+ PKG_CONFIG=no
+ fi
+ else
+ no_gtk=yes
+ fi
+
+ min_gtk_version=ifelse([$1], ,2.0.0,$1)
+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
+
+ if test x$PKG_CONFIG != xno ; then
+ ## don't try to run the test against uninstalled libtool libs
+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
+ enable_gtktest=no
+ fi
+
+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
+ :
+ else
+ no_gtk=yes
+ fi
+ fi
+
+ if test x"$no_gtk" = x ; then
+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ if test "x$enable_gtktest" = "xyes" ; then
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$GTK_LIBS $LIBS"
+dnl
+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
+dnl checks the results of pkg-config to some extent)
+dnl
+ rm -f conf.gtktest
+ AC_TRY_RUN([
+#include <gtk/gtk.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int
+main ()
+{
+ int major, minor, micro;
+ char *tmp_version;
+
+ system ("touch conf.gtktest");
+
+ /* HP/UX 9 (%@#!) writes to sscanf strings */
+ tmp_version = g_strdup("$min_gtk_version");
+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
+ printf("%s, bad version string\n", "$min_gtk_version");
+ exit(1);
+ }
+
+ if ((gtk_major_version != $gtk_config_major_version) ||
+ (gtk_minor_version != $gtk_config_minor_version) ||
+ (gtk_micro_version != $gtk_config_micro_version))
+ {
+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf ("*** was found! If pkg-config was correct, then it is best\n");
+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
+ printf("*** required on your system.\n");
+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
+ printf("*** to point to the correct configuration files\n");
+ }
+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
+ (gtk_minor_version != GTK_MINOR_VERSION) ||
+ (gtk_micro_version != GTK_MICRO_VERSION))
+ {
+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
+ printf("*** library (version %d.%d.%d)\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ }
+ else
+ {
+ if ((gtk_major_version > major) ||
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ {
+ return 0;
+ }
+ else
+ {
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ major, minor, micro);
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
+ }
+ }
+ return 1;
+}
+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ if test "x$no_gtk" = x ; then
+ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
+ ifelse([$2], , :, [$2])
+ else
+ AC_MSG_RESULT(no)
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** A new enough version of pkg-config was not found."
+ echo "*** See http://pkgconfig.sourceforge.net"
+ else
+ if test -f conf.gtktest ; then
+ :
+ else
+ echo "*** Could not run GTK+ test program, checking why..."
+ ac_save_CFLAGS="$CFLAGS"
+ ac_save_LIBS="$LIBS"
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
+#include <gtk/gtk.h>
+#include <stdio.h>
+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
+ fi
+ fi
+ GTK_CFLAGS=""
+ GTK_LIBS=""
+ ifelse([$3], , :, [$3])
+ fi
+ AC_SUBST(GTK_CFLAGS)
+ AC_SUBST(GTK_LIBS)
+ rm -f conf.gtktest
+])
+
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
# serial 48 AC_PROG_LIBTOOL
@@ -7162,7 +7162,8 @@ installed software in a non-standard prefix.
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
diff --git a/art/16x16/apps/mail-notification.png b/art/16x16/apps/mail-notification.png
Binary files differ.
diff --git a/art/22x22/apps/mail-notification.png b/art/22x22/apps/mail-notification.png
Binary files differ.
diff --git a/art/24x24/apps/mail-notification.png b/art/24x24/apps/mail-notification.png
Binary files differ.
diff --git a/art/32x32/apps/mail-notification.png b/art/32x32/apps/mail-notification.png
Binary files differ.
diff --git a/art/48x48/apps/mail-notification.png b/art/48x48/apps/mail-notification.png
Binary files differ.
diff --git a/art/Makefile.am b/art/Makefile.am
@@ -1,5 +1,11 @@
-gnome_pixmapsdir = $(datadir)/pixmaps
-dist_gnome_pixmaps_DATA = mail-notification.png
+iconsdir = $(datadir)/icons/hicolor
+nobase_dist_icons_DATA = \
+ 16x16/apps/mail-notification.png \
+ 22x22/apps/mail-notification.png \
+ 24x24/apps/mail-notification.png \
+ 32x32/apps/mail-notification.png \
+ 48x48/apps/mail-notification.png \
+ scalable/apps/mail-notification.svg
app_pixmapsdir = $(pkgdatadir)/ui
dist_app_pixmaps_DATA = logo.png
@@ -7,3 +13,6 @@ dist_app_pixmaps_DATA = logo.png
if WITH_GMAIL
dist_app_pixmaps_DATA += gmail.png
endif
+
+install-data-hook:
+ -gtk-update-icon-cache -f -t $(iconsdir)
diff --git a/art/Makefile.in b/art/Makefile.in
@@ -40,7 +40,7 @@ target_triplet = @target@
@WITH_GMAIL_TRUE@am__append_1 = gmail.png
subdir = art
DIST_COMMON = $(am__dist_app_pixmaps_DATA_DIST) \
- $(dist_gnome_pixmaps_DATA) $(srcdir)/Makefile.am \
+ $(nobase_dist_icons_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/evolution-plugin.m4 \
@@ -64,12 +64,13 @@ am__vpath_adj = case $$p in \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(app_pixmapsdir)" \
- "$(DESTDIR)$(gnome_pixmapsdir)"
+ "$(DESTDIR)$(iconsdir)"
dist_app_pixmapsDATA_INSTALL = $(INSTALL_DATA)
-dist_gnome_pixmapsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(dist_app_pixmaps_DATA) $(dist_gnome_pixmaps_DATA)
+nobase_dist_iconsDATA_INSTALL = $(install_sh_DATA)
+DATA = $(dist_app_pixmaps_DATA) $(nobase_dist_icons_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -199,15 +200,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -248,7 +253,6 @@ 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@
@@ -276,8 +280,15 @@ target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-gnome_pixmapsdir = $(datadir)/pixmaps
-dist_gnome_pixmaps_DATA = mail-notification.png
+iconsdir = $(datadir)/icons/hicolor
+nobase_dist_icons_DATA = \
+ 16x16/apps/mail-notification.png \
+ 22x22/apps/mail-notification.png \
+ 24x24/apps/mail-notification.png \
+ 32x32/apps/mail-notification.png \
+ 48x48/apps/mail-notification.png \
+ scalable/apps/mail-notification.svg
+
app_pixmapsdir = $(pkgdatadir)/ui
dist_app_pixmaps_DATA = logo.png $(am__append_1)
all: all-am
@@ -339,22 +350,24 @@ uninstall-dist_app_pixmapsDATA:
echo " rm -f '$(DESTDIR)$(app_pixmapsdir)/$$f'"; \
rm -f "$(DESTDIR)$(app_pixmapsdir)/$$f"; \
done
-install-dist_gnome_pixmapsDATA: $(dist_gnome_pixmaps_DATA)
+install-nobase_dist_iconsDATA: $(nobase_dist_icons_DATA)
@$(NORMAL_INSTALL)
- test -z "$(gnome_pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(gnome_pixmapsdir)"
- @list='$(dist_gnome_pixmaps_DATA)'; for p in $$list; do \
+ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_dist_icons_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(dist_gnome_pixmapsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gnome_pixmapsdir)/$$f'"; \
- $(dist_gnome_pixmapsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gnome_pixmapsdir)/$$f"; \
+ $(am__vpath_adj) \
+ echo " $(nobase_dist_iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
+ $(nobase_dist_iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
done
-uninstall-dist_gnome_pixmapsDATA:
+uninstall-nobase_dist_iconsDATA:
@$(NORMAL_UNINSTALL)
- @list='$(dist_gnome_pixmaps_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(gnome_pixmapsdir)/$$f'"; \
- rm -f "$(DESTDIR)$(gnome_pixmapsdir)/$$f"; \
+ @$(am__vpath_adj_setup) \
+ list='$(nobase_dist_icons_DATA)'; for p in $$list; do \
+ $(am__vpath_adj) \
+ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconsdir)/$$f"; \
done
tags: TAGS
TAGS:
@@ -364,6 +377,7 @@ CTAGS:
distdir: $(DISTFILES)
+ $(mkdir_p) $(distdir)/16x16/apps $(distdir)/22x22/apps $(distdir)/24x24/apps $(distdir)/32x32/apps $(distdir)/48x48/apps $(distdir)/scalable/apps
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
@@ -394,7 +408,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(app_pixmapsdir)" "$(DESTDIR)$(gnome_pixmapsdir)"; do \
+ for dir in "$(DESTDIR)$(app_pixmapsdir)" "$(DESTDIR)$(iconsdir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-am
@@ -440,7 +454,9 @@ info: info-am
info-am:
install-data-am: install-dist_app_pixmapsDATA \
- install-dist_gnome_pixmapsDATA
+ install-nobase_dist_iconsDATA
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
install-exec-am:
@@ -466,21 +482,25 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-dist_app_pixmapsDATA \
- uninstall-dist_gnome_pixmapsDATA uninstall-info-am
+uninstall-am: uninstall-dist_app_pixmapsDATA uninstall-info-am \
+ uninstall-nobase_dist_iconsDATA
.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-dist_app_pixmapsDATA \
- install-dist_gnome_pixmapsDATA install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
+ install-data install-data-am install-data-hook \
+ install-dist_app_pixmapsDATA install-exec install-exec-am \
+ install-info install-info-am install-man \
+ install-nobase_dist_iconsDATA 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-dist_app_pixmapsDATA \
- uninstall-dist_gnome_pixmapsDATA uninstall-info-am
+ uninstall-dist_app_pixmapsDATA uninstall-info-am \
+ uninstall-nobase_dist_iconsDATA
+
+install-data-hook:
+ -gtk-update-icon-cache -f -t $(iconsdir)
# 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/art/mail-notification.png b/art/mail-notification.png
Binary files differ.
diff --git a/art/scalable/apps/mail-notification.svg b/art/scalable/apps/mail-notification.svg
@@ -0,0 +1,374 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://web.resource.org/cc/"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48px"
+ height="48px"
+ id="svg2159"
+ sodipodi:version="0.32"
+ inkscape:version="0.44+devel"
+ sodipodi:docbase="/home/cornelius/packages/mail-notification/scalable"
+ sodipodi:docname="mail-notification.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/cornelius/GFX/ikony/Tango/apps/48x48/mail-notification.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ sodipodi:modified="true">
+ <defs
+ id="defs2161">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3805">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop3807" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop3809" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient3259"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)"
+ cx="605.71429"
+ cy="486.64789"
+ fx="605.71429"
+ fy="486.64789"
+ r="117.14286" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient5060">
+ <stop
+ style="stop-color:black;stop-opacity:1;"
+ offset="0"
+ id="stop5062" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5064" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5060"
+ id="radialGradient3257"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)"
+ cx="602.65948"
+ cy="488.07959"
+ fx="602.65948"
+ fy="488.07959"
+ r="117.14286" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient5048"
+ id="linearGradient3255"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)"
+ x1="512.28497"
+ y1="365.21631"
+ x2="512.28497"
+ y2="609.5199" />
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3167">
+ <stop
+ style="stop-color:white;stop-opacity:1;"
+ offset="0"
+ id="stop3169" />
+ <stop
+ style="stop-color:white;stop-opacity:0;"
+ offset="1"
+ id="stop3171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3136">
+ <stop
+ style="stop-color:#ef2929;stop-opacity:1"
+ offset="0"
+ id="stop3138" />
+ <stop
+ style="stop-color:#ba0000;stop-opacity:1"
+ offset="1"
+ id="stop3140" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3124"
+ inkscape:collect="always">
+ <stop
+ id="stop3126"
+ offset="0"
+ style="stop-color:#fafaf9;stop-opacity:1;" />
+ <stop
+ id="stop3128"
+ offset="1"
+ style="stop-color:#d7d7d7;stop-opacity:1" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3058">
+ <stop
+ style="stop-color:#fafaf9;stop-opacity:1;"
+ offset="0"
+ id="stop3060" />
+ <stop
+ style="stop-color:#ececec;stop-opacity:1"
+ offset="1"
+ id="stop3062" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3058"
+ id="linearGradient3093"
+ gradientUnits="userSpaceOnUse"
+ x1="19.293913"
+ y1="14.866997"
+ x2="19.293913"
+ y2="38.184418"
+ gradientTransform="matrix(0.876811,0,0,0.937062,2.431162,6.381118)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3058"
+ id="linearGradient3095"
+ gradientUnits="userSpaceOnUse"
+ x1="19.293913"
+ y1="14.866997"
+ x2="19.293913"
+ y2="38.184418"
+ gradientTransform="matrix(0.876811,0,0,0.884616,2.431162,6.557698)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3124"
+ id="linearGradient3122"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,1.019549,-31.40102,-3.714102)"
+ x1="19.293913"
+ y1="14.866997"
+ x2="19.293913"
+ y2="38.184418" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3136"
+ id="linearGradient3142"
+ x1="11.313708"
+ y1="10.041267"
+ x2="11.313708"
+ y2="15.460861"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3167"
+ id="linearGradient3173"
+ x1="15.5"
+ y1="0.10591315"
+ x2="15.5"
+ y2="13.072449"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3805"
+ id="linearGradient3811"
+ x1="8.8586321"
+ y1="24.999996"
+ x2="10.000471"
+ y2="24.999996"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="9.8994949"
+ inkscape:cx="34.338507"
+ inkscape:cy="23.619043"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="959"
+ inkscape:window-height="783"
+ inkscape:window-x="112"
+ inkscape:window-y="57" />
+ <metadata
+ id="metadata2164">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title>Mail Notification</dc:title>
+ <dc:date>3.11.2006</dc:date>
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Josef Vybíral</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:rights>
+ <cc:Agent>
+ <dc:title></dc:title>
+ </cc:Agent>
+ </dc:rights>
+ <dc:source>http://blog.vybiral.info</dc:source>
+ <dc:relation>http://blog.vybiral.info/2006/11/04/tango-friday-november-3rd/</dc:relation>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>mail notification</rdf:li>
+ <rdf:li>notification</rdf:li>
+ <rdf:li>e-mail</rdf:li>
+ <rdf:li>mailbox</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Reproduction" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/Distribution" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/Notice" />
+ <cc:permits
+ rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/ShareAlike" />
+ <cc:requires
+ rdf:resource="http://web.resource.org/cc/SourceCode" />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ style="opacity:0.558952;display:inline"
+ transform="matrix(1.754551e-2,0,0,1.733565e-2,26.47832,39.28602)"
+ id="g3197">
+ <rect
+ style="opacity:0.40206185;color:black;fill:url(#linearGradient3255);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ id="rect3199"
+ width="1766.8337"
+ height="459.52847"
+ x="-1053.1652"
+ y="-131.86813" />
+ <path
+ style="opacity:0.40200004;color:black;fill:url(#radialGradient3257);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 713.66862,-131.86814 C 713.66862,-131.86814 713.66862,329.60325 713.66862,329.60325 C 855.12298,330.47196 1055.6366,226.21092 1055.6365,98.837854 C 1055.6365,-28.535234 897.78402,-131.86813 713.66862,-131.86814 z "
+ id="path3201"
+ sodipodi:nodetypes="cccc" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path3203"
+ d="M -1053.1653,-131.86814 C -1053.1653,-131.86814 -1053.1653,329.60325 -1053.1653,329.60325 C -1194.6198,330.47196 -1395.1333,226.21093 -1395.1333,98.837855 C -1395.1333,-28.535231 -1237.2808,-131.86812 -1053.1653,-131.86814 z "
+ style="opacity:0.40200004;color:black;fill:url(#radialGradient3259);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+ <rect
+ style="opacity:1;color:black;fill:url(#linearGradient3095);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3056"
+ width="35.949223"
+ height="22.999994"
+ x="5.5"
+ y="18.500002"
+ rx="2.0101535"
+ ry="2.0101528" />
+ <path
+ sodipodi:nodetypes="ccc"
+ id="path3090"
+ d="M 5.9384061,40.500015 L 23.069419,27.322619 L 40.959671,40.312354"
+ style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1.00000083px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.4054054" />
+ <path
+ style="opacity:1;color:black;fill:url(#linearGradient3093);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999964px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 5.9384061,19.499997 L 22.090606,33.146213 C 22.656423,33.546486 23.278523,33.684233 24.045447,33.146453 L 40.959671,19.707768"
+ id="path3066"
+ sodipodi:nodetypes="cccc" />
+ <rect
+ ry="0.9877466"
+ rx="0.9877466"
+ y="19.499983"
+ x="6.5000038"
+ height="20.999998"
+ width="34.000004"
+ id="rect3086"
+ style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ sodipodi:nodetypes="cccc"
+ id="path3790"
+ d="M 7.5000013,19.382261 L 22.258757,32.168538 C 22.77576,32.543587 23.344192,32.672654 24.044954,32.168762 L 39.499993,19.576939"
+ style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="opacity:1;color:black;fill:url(#linearGradient3122);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.99999976px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 8.5,10.5 L 8.5,35 C 7.888138,35.455853 7.5,36.178899 7.5,37 C 7.5,38.380001 8.619999,39.500001 10,39.5 C 11.380001,39.5 12.500001,38.38 12.5,37 C 12.5,36.2203 12.04656,35.521092 11.486607,35.0625 L 11.486607,10.5 L 8.5,10.5 z "
+ id="rect3097"
+ sodipodi:nodetypes="ccsssccc" />
+ <path
+ sodipodi:nodetypes="ccsssccc"
+ id="path3794"
+ d="M 9.5040642,11.499996 L 9.5040642,35.60076 C 9.1988945,35.643743 8.5000024,36.081111 8.5000024,37.172412 C 8.5000024,38.45724 9.6768322,38.499997 10.000005,38.499997 C 10.310562,38.499997 11.45693,38.431263 11.500007,37.147158 C 11.526268,36.364332 10.993156,35.72126 10.500537,35.633697 L 10.500537,11.499996 L 9.5040642,11.499996 z "
+ style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient3811);stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <rect
+ style="opacity:1;color:black;fill:url(#linearGradient3142);fill-opacity:1.0;fill-rule:evenodd;stroke:#a40000;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect3101"
+ width="15.999992"
+ height="10.000005"
+ x="8.4999962"
+ y="5.5000024"
+ rx="2.0101516"
+ ry="2.0101531" />
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;color:black;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.78535485px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3120"
+ sodipodi:cx="17.035715"
+ sodipodi:cy="34.94643"
+ sodipodi:rx="0.875"
+ sodipodi:ry="0.91071427"
+ d="M 17.910715 34.94643 A 0.875 0.91071427 0 1 1 16.160715,34.94643 A 0.875 0.91071427 0 1 1 17.910715 34.94643 z"
+ transform="matrix(1.142854,0,0,1.098043,-9.46935,-1.372688)" />
+ <rect
+ ry="0.93872303"
+ rx="0.93872303"
+ y="6.500001"
+ x="9.4999971"
+ height="8.0000048"
+ width="14.000003"
+ id="rect3156"
+ style="opacity:0.41484716;color:black;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:white;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+ <path
+ style="opacity:0.6419214;color:black;fill:url(#linearGradient3173);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ d="M 10.5625,6 C 9.5184775,6 9,6.6455364 9,7.6584947 L 9,9.6384181 C 10.765933,10.48709 13.399152,11.03125 16.324218,11.03125 C 19.472334,11.03125 22.243329,10.402389 24,9.4394421 L 24,7.6674233 C 24,6.6544652 23.445807,6 22.401786,6 L 10.5625,6 z "
+ id="path3162"
+ sodipodi:nodetypes="cccscccc" />
+ </g>
+</svg>
diff --git a/config.h.in b/config.h.in
@@ -15,9 +15,6 @@
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
-/* Define to 1 if the Evolution branch is 2.2 */
-#undef HAVE_EVOLUTION_2_2
-
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
@@ -111,6 +108,9 @@
/* Define to 1 if mime is enabled, 0 otherwise */
#undef WITH_MIME
+/* Define to 1 if mozilla is enabled, 0 otherwise */
+#undef WITH_MOZILLA
+
/* Define to 1 if pop3 is enabled, 0 otherwise */
#undef WITH_POP3
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.
+# Generated by GNU Autoconf 2.59 for Mail Notification 4.0-rc1.
#
# 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'
-PACKAGE_STRING='Mail Notification 3.0'
+PACKAGE_VERSION='4.0-rc1'
+PACKAGE_STRING='Mail Notification 4.0-rc1'
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 DEBUG_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_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 DEBUG_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 ALL_LINGUAS 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 WITH_MBOX_TRUE WITH_MBOX_FALSE WITH_MOZILLA_TRUE WITH_MOZILLA_FALSE WITH_MBOX_OR_MOZILLA_TRUE WITH_MBOX_OR_MOZILLA_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_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE WITH_MBOX_OR_MOZILLA_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 to adapt to many kinds of systems.
+\`configure' configures Mail Notification 4.0-rc1 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:";;
+ short | recursive ) echo "Configuration of Mail Notification 4.0-rc1:";;
esac
cat <<\_ACEOF
@@ -1066,12 +1066,13 @@ Optional Features:
--disable-ipv6 disable IPv6 support
--disable-gmail disable Gmail support
--disable-evolution disable Evolution support
+ --disable-mozilla disable Mozilla products support
--disable-sylpheed disable Sylpheed support
--enable-sylpheed-locking
enable .sylpheed_mark locking
--enable-compile-warnings=no|yes|error
enable compiler warnings [no]
- --enable-debug enable assertions and cast checks
+ --disable-debug disable assertions and cast checks
--enable-regression-tests
build and run regression tests
--enable-maintainer-mode enable make rules and dependencies not useful
@@ -1102,8 +1103,6 @@ Optional Packages:
[autodetect]
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
- --with-evolution-source-dir=DIR
- path to the Evolution source tree
Some influential environment variables:
CC C compiler command
@@ -1229,7 +1228,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-Mail Notification configure 3.0
+Mail Notification configure 4.0-rc1
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1243,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, which was
+It was created by Mail Notification $as_me 4.0-rc1, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1776,6 +1775,18 @@ esac
else
enable_evolution=yes
fi;
+# Check whether --enable-mozilla or --disable-mozilla was given.
+if test "${enable_mozilla+set}" = set; then
+ enableval="$enable_mozilla"
+ case "$enableval" in
+ yes|no) enable_mozilla=$enableval ;;
+ *) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mozilla" >&5
+echo "$as_me: error: bad value $enableval for --enable-mozilla" >&2;}
+ { (exit 1); exit 1; }; } ;;
+esac
+else
+ enable_mozilla=yes
+fi;
# Check whether --enable-sylpheed or --disable-sylpheed was given.
if test "${enable_sylpheed+set}" = set; then
enableval="$enable_sylpheed"
@@ -1848,7 +1859,7 @@ echo "$as_me: error: bad value $enableval for --enable-debug" >&2;}
{ (exit 1); exit 1; }; } ;;
esac
else
- enable_debug=no
+ enable_debug=yes
fi;
if test $enable_debug = no; then
@@ -2264,7 +2275,7 @@ fi
# Define the identity of the package.
PACKAGE='mail-notification'
- VERSION='3.0'
+ VERSION='4.0-rc1'
cat >>confdefs.h <<_ACEOF
@@ -4090,7 +4101,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4093 "configure"' > conftest.$ac_ext
+ echo '#line 4104 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5689,7 +5700,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5692:" \
+echo "$as_me:5703:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6752,11 +6763,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6755: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6766: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6759: \$? = $ac_status" >&5
+ echo "$as_me:6770: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7020,11 +7031,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7023: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7034: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7027: \$? = $ac_status" >&5
+ echo "$as_me:7038: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7124,11 +7135,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7127: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7138: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7131: \$? = $ac_status" >&5
+ echo "$as_me:7142: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9469,7 +9480,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9472 "configure"
+#line 9483 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9569,7 +9580,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9572 "configure"
+#line 9583 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11909,11 +11920,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11912: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11923: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11916: \$? = $ac_status" >&5
+ echo "$as_me:11927: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12013,11 +12024,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12016: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12027: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12020: \$? = $ac_status" >&5
+ echo "$as_me:12031: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13583,11 +13594,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13586: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13597: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13590: \$? = $ac_status" >&5
+ echo "$as_me:13601: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13687,11 +13698,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13690: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13701: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13694: \$? = $ac_status" >&5
+ echo "$as_me:13705: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15890,11 +15901,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15893: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15904: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15897: \$? = $ac_status" >&5
+ echo "$as_me:15908: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16158,11 +16169,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16161: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16172: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16165: \$? = $ac_status" >&5
+ echo "$as_me:16176: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16262,11 +16273,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16265: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16276: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16269: \$? = $ac_status" >&5
+ echo "$as_me:16280: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18940,7 +18951,7 @@ _ACEOF
-ALL_LINGUAS="bg cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
+ALL_LINGUAS="bg ca cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
for ac_header in locale.h
@@ -20525,9 +20536,9 @@ if test -n ""; then
echo "$as_me:$LINENO: checking for intltool >= " >&5
echo $ECHO_N "checking for intltool >= ... $ECHO_C" >&6
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6
@@ -20806,6 +20817,9 @@ echo "${ECHO_T}no" >&6
fi
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
@@ -22837,12 +22851,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0" 2>/dev/null`
+ pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22855,12 +22869,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_GNOME_LIBS="$GNOME_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0\"") >&5
- ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0" 2>/dev/null`
+ pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -22879,14 +22893,16 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0"`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
else
- GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0"`
+ GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify"`
fi
# Put the nasty error message in config.log where it belongs
echo "$GNOME_PKG_ERRORS" >&5
- { { echo "$as_me:$LINENO: error: unable to find the GNOME libraries" >&5
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ { { echo "$as_me:$LINENO: error: unable to find the GNOME libraries" >&5
echo "$as_me: error: unable to find the GNOME libraries" >&2;}
{ (exit 1); exit 1; }; }
elif test $pkg_failed = untried; then
@@ -23186,6 +23202,7 @@ if test $enable_mbox = yes ||
test $enable_maildir = yes ||
test $enable_pop3 = yes ||
test $enable_imap = yes ||
+ test $enable_mozilla = yes ||
test $enable_sylpheed = yes; then
pkg_failed=no
@@ -23246,7 +23263,9 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$GMIME_PKG_ERRORS" >&5
- :
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ :
elif test $pkg_failed = untried; then
:
else
@@ -23287,6 +23306,12 @@ echo "$as_me: GMime not found: forcing --disable-imap" >&6;}
enable_imap=no
disable_imap_reason="(GMime not found)"
fi
+ if test $enable_mozilla = yes; then
+ { echo "$as_me:$LINENO: GMime not found: forcing --disable-mozilla" >&5
+echo "$as_me: GMime not found: forcing --disable-mozilla" >&6;}
+enable_mozilla=no
+disable_mozilla_reason="(GMime not found)"
+ fi
if test $enable_sylpheed = yes; then
{ echo "$as_me:$LINENO: GMime not found: forcing --disable-sylpheed" >&5
echo "$as_me: GMime not found: forcing --disable-sylpheed" >&6;}
@@ -23490,7 +23515,7 @@ if test $enable_evolution = yes; then
evolution=no
-evolution_branch=2.8
+evolution_branch=2.10
evolution_plugin_min_version=
@@ -23552,7 +23577,9 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- found=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ found=no
elif test $pkg_failed = untried; then
found=no
else
@@ -23588,7 +23615,7 @@ fi
if test $evolution = no; then
-evolution_branch=2.6
+evolution_branch=2.8
evolution_plugin_min_version=
@@ -23650,7 +23677,9 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- found=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ found=no
elif test $pkg_failed = untried; then
found=no
else
@@ -23687,7 +23716,7 @@ fi
if test $evolution = no; then
-evolution_branch=2.4
+evolution_branch=2.6
evolution_plugin_min_version=
@@ -23749,7 +23778,9 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- found=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ found=no
elif test $pkg_failed = untried; then
found=no
else
@@ -23786,7 +23817,7 @@ fi
if test $evolution = no; then
-evolution_branch=2.2
+evolution_branch=2.4
evolution_plugin_min_version=
@@ -23848,7 +23879,9 @@ fi
# Put the nasty error message in config.log where it belongs
echo "$EVOLUTION_PLUGIN_PKG_ERRORS" >&5
- found=no
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ found=no
elif test $pkg_failed = untried; then
found=no
else
@@ -23881,157 +23914,6 @@ else
fi
- if test $evolution = yes; then
-
-# Check whether --with-evolution-source-dir or --without-evolution-source-dir was given.
-if test "${with_evolution_source_dir+set}" = set; then
- withval="$with_evolution_source_dir"
- evolution_source_dir="$withval"
-else
- evolution_source_dir=""
-fi;
-
-found=no
-
-echo "$as_me:$LINENO: checking for the Evolution source tree directory" >&5
-echo $ECHO_N "checking for the Evolution source tree directory... $ECHO_C" >&6
-if test -z "$evolution_source_dir"; then
- echo "$as_me:$LINENO: result: not given, use --with-evolution-source-dir=DIR" >&5
-echo "${ECHO_T}not given, use --with-evolution-source-dir=DIR" >&6
-else
- echo "$as_me:$LINENO: result: $evolution_source_dir" >&5
-echo "${ECHO_T}$evolution_source_dir" >&6
- if test "x$evolution_source_dir" != "xno"; then
- found=yes
-
-if test $found = yes; then
- as_ac_File=`echo "ac_cv_file_$evolution_source_dir/mail/em-event.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $evolution_source_dir/mail/em-event.h" >&5
-echo $ECHO_N "checking for $evolution_source_dir/mail/em-event.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$evolution_source_dir/mail/em-event.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- found=yes
-else
- found=no
-fi
-
-fi
-
-if test $found = yes; then
- as_ac_File=`echo "ac_cv_file_$evolution_source_dir/mail/em-folder-tree.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $evolution_source_dir/mail/em-folder-tree.h" >&5
-echo $ECHO_N "checking for $evolution_source_dir/mail/em-folder-tree.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$evolution_source_dir/mail/em-folder-tree.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- found=yes
-else
- found=no
-fi
-
-fi
-
-if test $found = yes; then
- as_ac_File=`echo "ac_cv_file_$evolution_source_dir/mail/mail-component.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $evolution_source_dir/mail/mail-component.h" >&5
-echo $ECHO_N "checking for $evolution_source_dir/mail/mail-component.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$evolution_source_dir/mail/mail-component.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- found=yes
-else
- found=no
-fi
-
-fi
-
-if test $found = yes; then
- as_ac_File=`echo "ac_cv_file_$evolution_source_dir/mail/mail-tools.h" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $evolution_source_dir/mail/mail-tools.h" >&5
-echo $ECHO_N "checking for $evolution_source_dir/mail/mail-tools.h... $ECHO_C" >&6
-if eval "test \"\${$as_ac_File+set}\" = set"; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- test "$cross_compiling" = yes &&
- { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5
-echo "$as_me: error: cannot check for file existence when cross compiling" >&2;}
- { (exit 1); exit 1; }; }
-if test -r "$evolution_source_dir/mail/mail-tools.h"; then
- eval "$as_ac_File=yes"
-else
- eval "$as_ac_File=no"
-fi
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6
-if test `eval echo '${'$as_ac_File'}'` = yes; then
- found=yes
-else
- found=no
-fi
-
-fi
-
- fi
-fi
-
-if test $found = yes; then
- :
-else
- evolution_source_dir=""
- evolution=no
-fi
-
-
- fi
- if test $evolution = yes; then
- EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS -I$evolution_source_dir"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_EVOLUTION_2_2 1
-_ACEOF
-
- fi
fi
if test $evolution = no; then
{ echo "$as_me:$LINENO: Evolution not found: forcing --disable-evolution" >&5
@@ -24055,6 +23937,26 @@ fi
+if test $enable_mozilla = yes; then
+ WITH_MOZILLA_TRUE=
+ WITH_MOZILLA_FALSE='#'
+else
+ WITH_MOZILLA_TRUE='#'
+ WITH_MOZILLA_FALSE=
+fi
+
+
+
+if test $enable_mbox = yes || test $enable_mozilla = yes; then
+ WITH_MBOX_OR_MOZILLA_TRUE=
+ WITH_MBOX_OR_MOZILLA_FALSE='#'
+else
+ WITH_MBOX_OR_MOZILLA_TRUE='#'
+ WITH_MBOX_OR_MOZILLA_FALSE=
+fi
+
+
+
if test $enable_mh = yes; then
WITH_MH_TRUE=
WITH_MH_FALSE='#'
@@ -24115,22 +24017,22 @@ fi
-if test $enable_mbox = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes; then
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE=
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE='#'
+if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes; then
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE=
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE='#'
else
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE='#'
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE=
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE='#'
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE=
fi
-if test $enable_mbox = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes || test $enable_evolution = yes; then
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE=
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE='#'
+if test $enable_mbox = yes || test $enable_mozilla = yes || test $enable_mh = yes || test $enable_maildir = yes || test $enable_sylpheed = yes || test $enable_evolution = yes; then
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE=
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE='#'
else
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE='#'
- WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE=
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE='#'
+ WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE=
fi
@@ -24266,6 +24168,12 @@ cat >>confdefs.h <<_ACEOF
#define WITH_EVOLUTION $_value
_ACEOF
+if test $enable_mozilla = yes; then _value=1; else _value=0; fi
+
+cat >>confdefs.h <<_ACEOF
+#define WITH_MOZILLA $_value
+_ACEOF
+
if test $enable_sylpheed = yes; then _value=1; else _value=0; fi
cat >>confdefs.h <<_ACEOF
@@ -24434,6 +24342,20 @@ echo "$as_me: error: conditional \"WITH_MBOX\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${WITH_MOZILLA_TRUE}" && test -z "${WITH_MOZILLA_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_MOZILLA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_MOZILLA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${WITH_MBOX_OR_MOZILLA_TRUE}" && test -z "${WITH_MBOX_OR_MOZILLA_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_MBOX_OR_MOZILLA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"WITH_MBOX_OR_MOZILLA\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${WITH_MH_TRUE}" && test -z "${WITH_MH_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"WITH_MH\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -24476,17 +24398,17 @@ echo "$as_me: error: conditional \"WITH_POP3_OR_IMAP_OR_GMAIL\" was never define
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE}" && test -z "${WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED\" was never defined.
+if test -z "${WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE}" && test -z "${WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED\" was never defined.
+echo "$as_me: error: conditional \"WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-if test -z "${WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE}" && test -z "${WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE}"; then
- { { echo "$as_me:$LINENO: error: conditional \"WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION\" was never defined.
+if test -z "${WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE}" && test -z "${WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION\" was never defined.
+echo "$as_me: error: conditional \"WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -24810,7 +24732,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by Mail Notification $as_me 3.0, which was
+This file was extended by Mail Notification $as_me 4.0-rc1, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -24873,7 +24795,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Mail Notification config.status 3.0
+Mail Notification config.status 4.0-rc1
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -25206,6 +25128,7 @@ s,@INTLTOOL_ICONV@,$INTLTOOL_ICONV,;t t
s,@INTLTOOL_MSGFMT@,$INTLTOOL_MSGFMT,;t t
s,@INTLTOOL_MSGMERGE@,$INTLTOOL_MSGMERGE,;t t
s,@INTLTOOL_XGETTEXT@,$INTLTOOL_XGETTEXT,;t t
+s,@ALL_LINGUAS@,$ALL_LINGUAS,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
s,@GTK_LIBS@,$GTK_LIBS,;t t
@@ -25232,9 +25155,12 @@ s,@SASL_LIBS@,$SASL_LIBS,;t t
s,@EVOLUTION_PLUGIN_CFLAGS@,$EVOLUTION_PLUGIN_CFLAGS,;t t
s,@EVOLUTION_PLUGIN_LIBS@,$EVOLUTION_PLUGIN_LIBS,;t t
s,@evolution_plugindir@,$evolution_plugindir,;t t
-s,@evolution_source_dir@,$evolution_source_dir,;t t
s,@WITH_MBOX_TRUE@,$WITH_MBOX_TRUE,;t t
s,@WITH_MBOX_FALSE@,$WITH_MBOX_FALSE,;t t
+s,@WITH_MOZILLA_TRUE@,$WITH_MOZILLA_TRUE,;t t
+s,@WITH_MOZILLA_FALSE@,$WITH_MOZILLA_FALSE,;t t
+s,@WITH_MBOX_OR_MOZILLA_TRUE@,$WITH_MBOX_OR_MOZILLA_TRUE,;t t
+s,@WITH_MBOX_OR_MOZILLA_FALSE@,$WITH_MBOX_OR_MOZILLA_FALSE,;t t
s,@WITH_MH_TRUE@,$WITH_MH_TRUE,;t t
s,@WITH_MH_FALSE@,$WITH_MH_FALSE,;t t
s,@WITH_MAILDIR_TRUE@,$WITH_MAILDIR_TRUE,;t t
@@ -25247,10 +25173,10 @@ s,@WITH_POP3_OR_IMAP_TRUE@,$WITH_POP3_OR_IMAP_TRUE,;t t
s,@WITH_POP3_OR_IMAP_FALSE@,$WITH_POP3_OR_IMAP_FALSE,;t t
s,@WITH_POP3_OR_IMAP_OR_GMAIL_TRUE@,$WITH_POP3_OR_IMAP_OR_GMAIL_TRUE,;t t
s,@WITH_POP3_OR_IMAP_OR_GMAIL_FALSE@,$WITH_POP3_OR_IMAP_OR_GMAIL_FALSE,;t t
-s,@WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@,$WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE,;t t
-s,@WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@,$WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE,;t t
-s,@WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@,$WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE,;t t
-s,@WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@,$WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE,;t t
+s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE,;t t
+s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE,;t t
+s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE,;t t
+s,@WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@,$WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE,;t t
s,@WITH_SSL_TRUE@,$WITH_SSL_TRUE,;t t
s,@WITH_SSL_FALSE@,$WITH_SSL_FALSE,;t t
s,@WITH_SASL_TRUE@,$WITH_SASL_TRUE,;t t
@@ -26055,6 +25981,7 @@ Mailbox backends
--enable-imap $enable_imap $disable_imap_reason
--enable-gmail $enable_gmail $disable_gmail_reason
--enable-evolution $enable_evolution $disable_evolution_reason
+ --enable-mozilla $enable_mozilla $disable_mozilla_reason
--enable-sylpheed $enable_sylpheed $disable_sylpheed_reason
--enable-sylpheed-locking $enable_sylpheed_locking $disable_sylpheed_locking_reason
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Mail Notification], 3.0, jylefort@brutele.be)
+AC_INIT([Mail Notification], 4.0-rc1, jylefort@brutele.be)
AC_CONFIG_SRCDIR(src/mn-main.c)
AC_PREREQ(2.59)
@@ -18,11 +18,12 @@ MN_ARG_ENABLE(sasl, [disable SASL authentication support])
MN_ARG_ENABLE(ipv6, [disable IPv6 support])
MN_ARG_ENABLE(gmail, [disable Gmail support])
MN_ARG_ENABLE(evolution, [disable Evolution support])
+MN_ARG_ENABLE(mozilla, [disable Mozilla products support])
MN_ARG_ENABLE(sylpheed, [disable Sylpheed support])
MN_ARG_ENABLE(sylpheed-locking, [enable .sylpheed_mark locking], no)
MN_ARG_COMPILE_WARNINGS
-MN_ARG_DEBUG
+MN_ARG_DEBUG(yes)
MN_ARG_ENABLE(regression-tests, [build and run regression tests], no)
### initialization
@@ -41,7 +42,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 sv"
+ALL_LINGUAS="bg ca cs de fr ja nl pl pt pt_BR ru sr sr@Latn sv"
AM_GLIB_GNU_GETTEXT
AC_PROG_INTLTOOL
@@ -69,7 +70,7 @@ AC_STRUCT_TM
AM_PATH_GTK_2_0(2.6.0,, [AC_MSG_ERROR([unable to find the GTK+ library])])
-PKG_CHECK_MODULES(GNOME, [gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0],, [AC_MSG_ERROR([unable to find the GNOME libraries])])
+PKG_CHECK_MODULES(GNOME, [gthread-2.0 gconf-2.0 >= 2.4.0 libgnomeui-2.0 >= 2.8.0 gnome-vfs-2.0 libglade-2.0 eel-2.0 >= 2.6.0 bonobo-activation-2.0 libxml-2.0 libnotify],, [AC_MSG_ERROR([unable to find the GNOME libraries])])
AM_GCONF_SOURCE_2
AM_PATH_GNOME_PREFIX
@@ -96,6 +97,7 @@ if MN_FEATURE_ENABLED(mbox) ||
MN_FEATURE_ENABLED(maildir) ||
MN_FEATURE_ENABLED(pop3) ||
MN_FEATURE_ENABLED(imap) ||
+ MN_FEATURE_ENABLED(mozilla) ||
MN_FEATURE_ENABLED(sylpheed); then
PKG_CHECK_MODULES(GMIME, [gmime-2.0 >= 2.1.0], [MN_FEATURE_VAR_NAME(mime)=yes], [:])
if MN_FEATURE_DISABLED(mime); then
@@ -114,6 +116,9 @@ if MN_FEATURE_ENABLED(mbox) ||
if MN_FEATURE_ENABLED(imap); then
MN_FEATURE_DISABLE(imap, [GMime not found])
fi
+ if MN_FEATURE_ENABLED(mozilla); then
+ MN_FEATURE_DISABLE(mozilla, [GMime not found])
+ fi
if MN_FEATURE_ENABLED(sylpheed); then
MN_FEATURE_DISABLE(sylpheed, [GMime not found])
fi
@@ -145,22 +150,15 @@ fi
if MN_FEATURE_ENABLED(evolution); then
evolution=no
- AM_PATH_EVOLUTION_PLUGIN(2.8,, [evolution=yes])
+ AM_PATH_EVOLUTION_PLUGIN(2.10,, [evolution=yes])
if test $evolution = no; then
- AM_PATH_EVOLUTION_PLUGIN(2.6,, [evolution=yes])
+ AM_PATH_EVOLUTION_PLUGIN(2.8,, [evolution=yes])
fi
if test $evolution = no; then
- AM_PATH_EVOLUTION_PLUGIN(2.4,, [evolution=yes])
+ AM_PATH_EVOLUTION_PLUGIN(2.6,, [evolution=yes])
fi
if test $evolution = no; then
- AM_PATH_EVOLUTION_PLUGIN(2.2,, [evolution=yes])
- if test $evolution = yes; then
- AM_PATH_EVOLUTION_SOURCEDIR([mail/em-event.h, mail/em-folder-tree.h, mail/mail-component.h, mail/mail-tools.h],, [evolution=no])
- fi
- if test $evolution = yes; then
- EVOLUTION_PLUGIN_CFLAGS="$EVOLUTION_PLUGIN_CFLAGS -I$evolution_source_dir"
- AC_DEFINE(HAVE_EVOLUTION_2_2, 1, [Define to 1 if the Evolution branch is 2.2])
- fi
+ AM_PATH_EVOLUTION_PLUGIN(2.4,, [evolution=yes])
fi
if test $evolution = no; then
MN_FEATURE_DISABLE(evolution, [Evolution not found])
@@ -170,14 +168,16 @@ fi
### Automake conditionals
AM_CONDITIONAL(WITH_MBOX, [MN_FEATURE_ENABLED(mbox)])
+AM_CONDITIONAL(WITH_MOZILLA, [MN_FEATURE_ENABLED(mozilla)])
+AM_CONDITIONAL(WITH_MBOX_OR_MOZILLA, [MN_FEATURE_ENABLED(mbox) || MN_FEATURE_ENABLED(mozilla)])
AM_CONDITIONAL(WITH_MH, [MN_FEATURE_ENABLED(mh)])
AM_CONDITIONAL(WITH_MAILDIR, [MN_FEATURE_ENABLED(maildir)])
AM_CONDITIONAL(WITH_POP3, [MN_FEATURE_ENABLED(pop3)])
AM_CONDITIONAL(WITH_IMAP, [MN_FEATURE_ENABLED(imap)])
AM_CONDITIONAL(WITH_POP3_OR_IMAP, [MN_FEATURE_ENABLED(pop3) || MN_FEATURE_ENABLED(imap)])
AM_CONDITIONAL(WITH_POP3_OR_IMAP_OR_GMAIL, [MN_FEATURE_ENABLED(pop3) || MN_FEATURE_ENABLED(imap) || MN_FEATURE_ENABLED(gmail)])
-AM_CONDITIONAL(WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED, [MN_FEATURE_ENABLED(mbox) || MN_FEATURE_ENABLED(mh) || MN_FEATURE_ENABLED(maildir) || MN_FEATURE_ENABLED(sylpheed)])
-AM_CONDITIONAL(WITH_MBOX_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION, [MN_FEATURE_ENABLED(mbox) || MN_FEATURE_ENABLED(mh) || MN_FEATURE_ENABLED(maildir) || MN_FEATURE_ENABLED(sylpheed) || MN_FEATURE_ENABLED(evolution)])
+AM_CONDITIONAL(WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED, [MN_FEATURE_ENABLED(mbox) || MN_FEATURE_ENABLED(mozilla) || MN_FEATURE_ENABLED(mh) || MN_FEATURE_ENABLED(maildir) || MN_FEATURE_ENABLED(sylpheed)])
+AM_CONDITIONAL(WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION, [MN_FEATURE_ENABLED(mbox) || MN_FEATURE_ENABLED(mozilla) || MN_FEATURE_ENABLED(mh) || MN_FEATURE_ENABLED(maildir) || MN_FEATURE_ENABLED(sylpheed) || MN_FEATURE_ENABLED(evolution)])
AM_CONDITIONAL(WITH_SSL, [MN_FEATURE_ENABLED(ssl)])
AM_CONDITIONAL(WITH_SASL, [MN_FEATURE_ENABLED(sasl)])
AM_CONDITIONAL(WITH_GMAIL, [MN_FEATURE_ENABLED(gmail)])
@@ -188,7 +188,7 @@ AM_CONDITIONAL(WITH_REGRESSION_TESTS, [MN_FEATURE_ENABLED(regression-tests)])
### config.h definitions
-MN_FEATURES_DEFINE([mbox, mh, maildir, pop3, imap, ssl, sasl, ipv6, gmail, evolution, sylpheed, sylpheed-locking, mime])
+MN_FEATURES_DEFINE([mbox, mh, maildir, pop3, imap, ssl, sasl, ipv6, gmail, evolution, mozilla, sylpheed, sylpheed-locking, mime])
### output
@@ -216,7 +216,7 @@ MN_REPORT_ARGS([prefix, exec-prefix])
Installation directories
MN_REPORT_ARGS([bindir, datadir, sysconfdir, libdir])
Mailbox backends
-MN_REPORT_FEATURES([mbox, mh, maildir, pop3, imap, gmail, evolution, sylpheed, sylpheed-locking])
+MN_REPORT_FEATURES([mbox, mh, maildir, pop3, imap, gmail, evolution, mozilla, sylpheed, sylpheed-locking])
POP3 and IMAP features
MN_REPORT_FEATURES([ssl, sasl, ipv6])
EOF
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -35,7 +35,7 @@ EXTRA_DIST = \
GNOME_MailNotification_Evolution.server.in \
mail-notification-properties.desktop.in \
mail-notification.desktop.in \
- mail-notification.schemas.in
+ mail-notification.schemas.in.in
CLEANFILES = \
$(evolution_server) \
@@ -43,7 +43,11 @@ CLEANFILES = \
GNOME_MailNotification.server.in \
mail-notification-properties.desktop \
mail-notification.desktop \
- mail-notification.schemas
+ mail-notification.schemas \
+ mail-notification.schemas.in
GNOME_MailNotification.server.in: GNOME_MailNotification.server.in.in
sed -e 's|\@bindir\@|$(bindir)|' GNOME_MailNotification.server.in.in > GNOME_MailNotification.server.in
+
+mail-notification.schemas.in: mail-notification.schemas.in.in
+ sed -e 's|\@gnome_prefix\@|$(gnome_prefix)|' mail-notification.schemas.in.in > mail-notification.schemas.in
diff --git a/data/Makefile.in b/data/Makefile.in
@@ -70,6 +70,7 @@ DATA = $(autostart_DATA) $(gnome_capplet_DATA) $(schemas_DATA) \
$(server_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -199,15 +200,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -248,7 +253,6 @@ 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@
@@ -296,7 +300,7 @@ EXTRA_DIST = \
GNOME_MailNotification_Evolution.server.in \
mail-notification-properties.desktop.in \
mail-notification.desktop.in \
- mail-notification.schemas.in
+ mail-notification.schemas.in.in
CLEANFILES = \
$(evolution_server) \
@@ -304,7 +308,8 @@ CLEANFILES = \
GNOME_MailNotification.server.in \
mail-notification-properties.desktop \
mail-notification.desktop \
- mail-notification.schemas
+ mail-notification.schemas \
+ mail-notification.schemas.in
all: all-am
@@ -558,6 +563,9 @@ uninstall-am: uninstall-autostartDATA uninstall-gnome_cappletDATA \
GNOME_MailNotification.server.in: GNOME_MailNotification.server.in.in
sed -e 's|\@bindir\@|$(bindir)|' GNOME_MailNotification.server.in.in > GNOME_MailNotification.server.in
+
+mail-notification.schemas.in: mail-notification.schemas.in.in
+ sed -e 's|\@gnome_prefix\@|$(gnome_prefix)|' mail-notification.schemas.in.in > mail-notification.schemas.in
# 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/data/mail-notification-properties.desktop.in b/data/mail-notification-properties.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Mail Notification
-Icon=mail-notification.png
+Icon=mail-notification
_Comment=Configure Mail Notification
Type=Application
Categories=GNOME;Application;Settings;
diff --git a/data/mail-notification.desktop.in b/data/mail-notification.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Mail Notification
-Icon=mail-notification.png
+Icon=mail-notification
_Comment=Get notified when new mail arrives
Type=Application
Categories=GNOME;Application;Network;
diff --git a/data/mail-notification.schemas.in b/data/mail-notification.schemas.in
@@ -1,266 +0,0 @@
-<gconfschemafile>
- <schemalist>
- <schema>
- <key>/schemas/apps/mail-notification/commands/new-mail/enabled</key>
- <applyto>/apps/mail-notification/commands/new-mail/enabled</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Run a command when new mail arrives</short>
- <long>Whether to run a command when new mail arrives or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/commands/new-mail/command</key>
- <applyto>/apps/mail-notification/commands/new-mail/command</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <locale name="C">
- <short>New mail command</short>
- <long>The command to run when new mail arrives.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/commands/mail-read/enabled</key>
- <applyto>/apps/mail-notification/commands/mail-read/enabled</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Run a command when all mail is read</short>
- <long>Whether to run a command when all mail is read or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/commands/mail-read/command</key>
- <applyto>/apps/mail-notification/commands/mail-read/command</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <locale name="C">
- <short>Mail read command</short>
- <long>The command to run when all mail is read.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/ui/properties-dialog/height</key>
- <applyto>/apps/mail-notification/ui/properties-dialog/height</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>-1</default>
- <locale name="C">
- <short>Height of properties dialog</short>
- <long>The height of the properties dialog in pixels.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/ui/properties-dialog/width</key>
- <applyto>/apps/mail-notification/ui/properties-dialog/width</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>-1</default>
- <locale name="C">
- <short>Width of properties dialog</short>
- <long>The width of the properties dialog in pixels.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/blink-on-errors</key>
- <applyto>/apps/mail-notification/blink-on-errors</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Blink on errors</short>
- <long>Whether the status icon should blink on errors or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/trusted-x509-certificates</key>
- <applyto>/apps/mail-notification/trusted-x509-certificates</applyto>
- <owner>mail-notification</owner>
- <type>list</type>
- <list_type>string</list_type>
- <locale name="C">
- <short>Fingerprints of trusted X509 certificates</short>
- <long>The list of trusted X509 certificates, represented by their MD5 fingerprint.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/trusted-servers</key>
- <applyto>/apps/mail-notification/trusted-servers</applyto>
- <owner>mail-notification</owner>
- <type>list</type>
- <list_type>string</list_type>
- <locale name="C">
- <short>Trusted servers list</short>
- <long>The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/enable</key>
- <applyto>/apps/mail-notification/mail-summary-popup/enable</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Enable mail summary popup</short>
- <long>Whether to display the mail summary popup when new mail arrives or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/autoclose</key>
- <applyto>/apps/mail-notification/mail-summary-popup/autoclose</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Automatically close the mail summary popup</short>
- <long>Whether to automatically close the mail summary popup or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/autoclose-delay/minutes</key>
- <applyto>/apps/mail-notification/mail-summary-popup/autoclose-delay/minutes</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>0</default>
- <locale name="C">
- <short>Minutes to wait before closing the mail summary popup</short>
- <long>The amount of time to wait before closing the mail summary popup (minutes part).</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/autoclose-delay/seconds</key>
- <applyto>/apps/mail-notification/mail-summary-popup/autoclose-delay/seconds</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>10</default>
- <locale name="C">
- <short>Seconds to wait before closing the mail summary popup</short>
- <long>The amount of time to wait before closing the mail summary popup (seconds part).</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/position</key>
- <applyto>/apps/mail-notification/mail-summary-popup/position</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>top-left</default>
- <locale name="C">
- <short>Mail summary popup position</short>
- <long>The position of the mail summary popup. Must be "top-left", "top-right", "bottom-left" or "bottom-right".</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/offset/horizontal</key>
- <applyto>/apps/mail-notification/mail-summary-popup/offset/horizontal</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>8</default>
- <locale name="C">
- <short>Mail summary popup horizontal offset</short>
- <long>The number of pixels to leave between the left or right side of the screen and the mail summary popup.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/offset/vertical</key>
- <applyto>/apps/mail-notification/mail-summary-popup/offset/vertical</applyto>
- <owner>mail-notification</owner>
- <type>int</type>
- <default>32</default>
- <locale name="C">
- <short>Mail summary popup vertical offset</short>
- <long>The number of pixels to leave between the top or bottom side of the screen and the mail summary popup.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/only-recent</key>
- <applyto>/apps/mail-notification/mail-summary-popup/only-recent</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Only display recent mail in mail summary popup</short>
- <long>Whether to hide previously displayed mail in the mail summary popup or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/aspect-source</key>
- <applyto>/apps/mail-notification/mail-summary-popup/fonts/aspect-source</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>theme</default>
- <locale name="C">
- <short>Mail summary popup fonts aspect source</short>
- <long>The aspect source of the mail summary popup fonts. Must be "theme" or "custom".</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/title/font</key>
- <applyto>/apps/mail-notification/mail-summary-popup/fonts/title/font</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>Sans 10</default>
- <locale name="C">
- <short>Mail summary popup title font</short>
- <long>The custom font to use for the title of the mail summary popup.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/mail-summary-popup/fonts/contents/font</key>
- <applyto>/apps/mail-notification/mail-summary-popup/fonts/contents/font</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>Sans 10</default>
- <locale name="C">
- <short>Mail summary popup contents font</short>
- <long>The custom font to use for the contents of the mail summary popup.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/display-seen-mail</key>
- <applyto>/apps/mail-notification/display-seen-mail</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>1</default>
- <locale name="C">
- <short>Display seen mail</short>
- <long>Whether to display seen mail or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/tooltip-mail-summary</key>
- <applyto>/apps/mail-notification/tooltip-mail-summary</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>standard</default>
- <locale name="C">
- <short>Tooltip mail summary</short>
- <long>The type of mail summary to display in the icon's tooltip. Must be "standard", "compact" or "none".</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/always-display-icon</key>
- <applyto>/apps/mail-notification/always-display-icon</applyto>
- <owner>mail-notification</owner>
- <type>bool</type>
- <default>0</default>
- <locale name="C">
- <short>Always display an icon</short>
- <long>Whether to display an icon when there is no new mail or not.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/mail-notification/click-action</key>
- <applyto>/apps/mail-notification/click-action</applyto>
- <owner>mail-notification</owner>
- <type>string</type>
- <default>display-properties-dialog</default>
- <locale name="C">
- <short>Click action</short>
- <long>The action to perform when the icon is clicked. Must be "display-properties-dialog", "launch-mail-reader" or "update-mail-status".</long>
- </locale>
- </schema>
- </schemalist>
-</gconfschemafile>
diff --git a/data/mail-notification.schemas.in.in b/data/mail-notification.schemas.in.in
@@ -0,0 +1,222 @@
+<gconfschemafile>
+ <schemalist>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/new-mail/enabled</key>
+ <applyto>/apps/mail-notification/commands/new-mail/enabled</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Run a command when new mail arrives</short>
+ <long>Whether to run a command when new mail arrives or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/new-mail/command</key>
+ <applyto>/apps/mail-notification/commands/new-mail/command</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <default>play @gnome_prefix@/share/gnome/sounds/email.wav</default>
+ <locale name="C">
+ <short>New mail command</short>
+ <long>The command to run when new mail arrives.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/mail-read/enabled</key>
+ <applyto>/apps/mail-notification/commands/mail-read/enabled</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Run a command when all mail is read</short>
+ <long>Whether to run a command when all mail is read or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/mail-read/command</key>
+ <applyto>/apps/mail-notification/commands/mail-read/command</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <locale name="C">
+ <short>Mail read command</short>
+ <long>The command to run when all mail is read.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/mail-changed/enabled</key>
+ <applyto>/apps/mail-notification/commands/mail-changed/enabled</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Run a command when the message list changes</short>
+ <long>Whether to run a command when the message list changes or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/commands/mail-changed/command</key>
+ <applyto>/apps/mail-notification/commands/mail-changed/command</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <locale name="C">
+ <short>Mail changed command</short>
+ <long>The command to run when the message list changes.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/ui/properties-dialog/height</key>
+ <applyto>/apps/mail-notification/ui/properties-dialog/height</applyto>
+ <owner>mail-notification</owner>
+ <type>int</type>
+ <default>-1</default>
+ <locale name="C">
+ <short>Height of properties dialog</short>
+ <long>The height of the properties dialog in pixels.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/ui/properties-dialog/width</key>
+ <applyto>/apps/mail-notification/ui/properties-dialog/width</applyto>
+ <owner>mail-notification</owner>
+ <type>int</type>
+ <default>-1</default>
+ <locale name="C">
+ <short>Width of properties dialog</short>
+ <long>The width of the properties dialog in pixels.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/blink-on-errors</key>
+ <applyto>/apps/mail-notification/blink-on-errors</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>1</default>
+ <locale name="C">
+ <short>Blink on errors</short>
+ <long>Whether the status icon should blink on errors or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/trusted-x509-certificates</key>
+ <applyto>/apps/mail-notification/trusted-x509-certificates</applyto>
+ <owner>mail-notification</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <locale name="C">
+ <short>Fingerprints of trusted X509 certificates</short>
+ <long>The list of trusted X509 certificates, represented by their MD5 fingerprint.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/trusted-servers</key>
+ <applyto>/apps/mail-notification/trusted-servers</applyto>
+ <owner>mail-notification</owner>
+ <type>list</type>
+ <list_type>string</list_type>
+ <locale name="C">
+ <short>Trusted servers list</short>
+ <long>The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/display-seen-mail</key>
+ <applyto>/apps/mail-notification/display-seen-mail</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>1</default>
+ <locale name="C">
+ <short>Display seen mail</short>
+ <long>Whether to display seen mail or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/tooltip-mail-summary</key>
+ <applyto>/apps/mail-notification/tooltip-mail-summary</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <default>standard</default>
+ <locale name="C">
+ <short>Tooltip mail summary</short>
+ <long>The type of mail summary to display in the icon's tooltip. Must be "standard", "compact" or "none".</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/always-display-icon</key>
+ <applyto>/apps/mail-notification/always-display-icon</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Always display an icon</short>
+ <long>Whether to display an icon when there is no new mail or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/click-action-2</key>
+ <applyto>/apps/mail-notification/click-action-2</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <default>display-properties-dialog</default>
+ <locale name="C">
+ <short>Click action</short>
+ <long>The action to perform when the icon is clicked. Must be "display-properties-dialog", "launch-mail-reader", "open-latest-message" or "update-mail-status".</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/popups/enabled</key>
+ <applyto>/apps/mail-notification/popups/enabled</applyto>
+ <owner>mail-notification</owner>
+ <type>bool</type>
+ <default>1</default>
+ <locale name="C">
+ <short>Enable message popups</short>
+ <long>Whether to enable message popups or not.</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/popups/position</key>
+ <applyto>/apps/mail-notification/popups/position</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <default>attached</default>
+ <locale name="C">
+ <short>Message popups position</short>
+ <long>The position of the message popups. Must be "attached" or "free".</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/popups/expiration/enabled</key>
+ <applyto>/apps/mail-notification/popups/expiration/enabled</applyto>
+ <owner>mail-notification</owner>
+ <type>string</type>
+ <default>default</default>
+ <locale name="C">
+ <short>Expire message popups</short>
+ <long>Whether to expire message popups or not. Must be "default", "false" or "true".</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/popups/expiration/delay/minutes</key>
+ <applyto>/apps/mail-notification/popups/expiration/delay/minutes</applyto>
+ <owner>mail-notification</owner>
+ <type>int</type>
+ <default>0</default>
+ <locale name="C">
+ <short>Minutes to wait before expiring message popups</short>
+ <long>If /apps/mail-notification/popups/expiration/enabled is set to "true", the amount of time to wait before expiring message popups (minutes part).</long>
+ </locale>
+ </schema>
+ <schema>
+ <key>/schemas/apps/mail-notification/popups/expiration/delay/seconds</key>
+ <applyto>/apps/mail-notification/popups/expiration/delay/seconds</applyto>
+ <owner>mail-notification</owner>
+ <type>int</type>
+ <default>10</default>
+ <locale name="C">
+ <short>Seconds to wait before expiring message popups</short>
+ <long>If /apps/mail-notification/popups/expiration/enabled is set to "true", the amount of time to wait before expiring message popups (seconds part).</long>
+ </locale>
+ </schema>
+ </schemalist>
+</gconfschemafile>
diff --git a/help/C/Makefile.in b/help/C/Makefile.in
@@ -120,6 +120,7 @@ DIST_SOURCES =
DATA = $(dist_noinst_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -249,15 +250,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -298,7 +303,6 @@ 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@
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-06-14
+ 2006-11-27
</date>
- <version identifier="2.15" date="2006-06-14" description="Sixteenth release"/>
+ <version identifier="2.16" date="2006-11-27" description="Version 2.16"/>
<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">
- <!ENTITY manrevision "2.15">
- <!ENTITY date "Wednesday, June 14, 2006">
+ <!ENTITY appversion "4.0 Release Candidate 1">
+ <!ENTITY manrevision "2.16">
+ <!ENTITY date "Monday, November 27, 2006">
<!ENTITY project "The Mail Notification Project">
@@ -21,15 +21,16 @@
<!ENTITY sasl "<link linkend="sasl">SASL</link>">
<!ENTITY ssl "<link linkend="pop3">SSL</link>">
<!ENTITY tls "<link linkend="pop3">TLS</link>">
+ <!ENTITY mozilla "<link linkend="mozilla">Mozilla</link>">
<!ENTITY sylpheed "<link linkend="sylpheed">Sylpheed</link>">
<!ENTITY gmail "<link linkend="gmail">Gmail</link>">
<!ENTITY gnomevfs "<link linkend="gnomevfs">GnomeVFS</link>">
]>
-<!-- $Id: mail-notification.xml,v 1.133 2006/06/14 07:44:48 jylefort Exp $ -->
+<!-- $Id: mail-notification.xml,v 1.148 2006/11/27 20:59:55 jylefort Exp $ -->
<!-- Mail Notification Manual -->
-<!-- Copyright (C) 2004-2006 Jean-Yves Lefort -->
+<!-- Copyright (C) 2003-2006 Jean-Yves Lefort -->
<!-- All rights reserved. -->
<!-- Redistribution and use in source (SGML DocBook) and 'compiled' -->
@@ -136,6 +137,17 @@
</revdescription>
</revision>
<revision>
+ <revnumber>Mail Notification Manual V2.15</revnumber>
+ <date>Wednesday, June 14, 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.14</revnumber>
<date>Thursday, May 18, 2006</date>
<revdescription>
@@ -335,13 +347,13 @@
</para>
<itemizedlist>
<listitem><para>multiple mailbox support</para></listitem>
- <listitem><para>&mbox;, &mh;, &maildir;, &pop3;, &imap;, &gmail;, Evolution and &sylpheed; support</para></listitem>
+ <listitem><para>&mbox;, &mh;, &maildir;, &pop3;, &imap;, &gmail;, Evolution, &mozilla; products (Mozilla, SeaMonkey, Thunderbird, …) and &sylpheed; support</para></listitem>
<listitem><para>&sasl; authentication support</para></listitem>
<listitem><para>APOP authentication support</para></listitem>
<listitem><para>&ssl;/&tls; support</para></listitem>
<listitem><para>automatic detection of mailbox format</para></listitem>
<listitem><para><link linkend="immediate-notification">immediate notification</link> (the status icon is updated immediately or within seconds after a mailbox changes)</para></listitem>
- <listitem><para>a mail summary</para></listitem>
+ <listitem><para>message popups</para></listitem>
<listitem><para><ulink url="http://developer.gnome.org/projects/gup/hig" type="http">HIG</ulink> 2.0 compliance</para></listitem>
</itemizedlist>
</sect1>
@@ -356,7 +368,7 @@
</para>
<variablelist>
<varlistentry>
- <term><guimenu>Desktop</guimenu> menu</term>
+ <term><guimenu>System</guimenu> menu</term>
<listitem>
<para>Choose
<menuchoice>
@@ -383,12 +395,12 @@
</para>
<variablelist>
<varlistentry>
- <term>--version</term>
+ <term>-v, --version</term>
<listitem><para>Show version information and compiled-in features</para></listitem>
</varlistentry>
<varlistentry>
- <term>--enable-info</term>
+ <term>-i, --enable-info</term>
<listitem>
<para>Enable informational output</para>
<warning>
@@ -403,23 +415,23 @@
</varlistentry>
<varlistentry>
- <term>--display-properties</term>
+ <term>-p, --display-properties</term>
<listitem><para>Display the properties dialog</para></listitem>
</varlistentry>
<varlistentry>
- <term>--display-about</term>
+ <term>-a, --display-about</term>
<listitem><para>Display the about dialog</para></listitem>
</varlistentry>
<varlistentry>
- <term>--close-popup</term>
- <listitem><para>Close the mail summary popup</para></listitem>
+ <term>-u, --update</term>
+ <listitem><para>Update the mail status</para></listitem>
</varlistentry>
<varlistentry>
- <term>--update</term>
- <listitem><para>Update the mail status</para></listitem>
+ <term>-s, --print-summary</term>
+ <listitem><para>Print a XML mail summary</para></listitem>
</varlistentry>
<varlistentry>
@@ -428,12 +440,12 @@
</varlistentry>
<varlistentry>
- <term>--quit</term>
+ <term>-q, --quit</term>
<listitem><para>Quit &app;</para></listitem>
</varlistentry>
<varlistentry>
- <term>--help</term>
+ <term>-?, --help</term>
<listitem><para>Show help</para></listitem>
</varlistentry>
</variablelist>
@@ -478,9 +490,9 @@
</listitem>
<listitem>
<para>
- if the <link linkend="enable-mail-summary-popup">Enable mail summary popup</link>
- setting is enabled, an overview of new and unread messages is
- displayed
+ if the <link linkend="enable-message-popups">Enable
+ message popups</link> setting is enabled, information
+ about each new message is popped up on your desktop
</para>
</listitem>
</itemizedlist>
@@ -501,7 +513,7 @@
<title>Properties</title>
<para>To configure &app;, choose
<menuchoice>
- <guimenu>Desktop</guimenu>
+ <guimenu>System</guimenu>
<guisubmenu>Preferences</guisubmenu>
<guimenuitem>Mail Notification</guimenuitem>
</menuchoice> (this location may vary across systems).
@@ -518,9 +530,14 @@
<para><link linkend="properties-status-icon">Status Icon</link></para>
</listitem>
<listitem>
- <para><link linkend="properties-mail-summary-popup">Mail Summary Popup</link></para>
+ <para><link linkend="properties-message-popups">Message Popups</link></para>
</listitem>
</itemizedlist>
+ <para>
+ In addition, at the bottom of the dialog, the <guilabel>Test
+ messages</guilabel> option can be used to test the various
+ options against test messages.
+ </para>
<sect2 id="properties-general">
<title>General</title>
@@ -540,8 +557,9 @@
<para>
The following mailbox types make a distinction
between seen and unseen mail: &mbox;, &maildir;,
- &pop3;, &imap;, Evolution and &sylpheed;. Other
- mailbox types consider all unread mail as unseen.
+ &pop3;, &imap;, Evolution, &mozilla; and
+ &sylpheed;. Other mailbox types consider all
+ unread mail as unseen.
</para>
</listitem>
</varlistentry>
@@ -698,7 +716,8 @@
You can choose an action to be performed when the mail
icon is clicked:
<guilabel>display this dialog</guilabel>,
- <guilabel>launch the mail reader</guilabel> or
+ <guilabel>launch the mail reader</guilabel>,
+ <guilabel>open the latest message</guilabel> or
<guilabel>update the mail status</guilabel>.
</para>
</listitem>
@@ -706,46 +725,47 @@
</variablelist>
</sect2>
- <sect2 id="properties-mail-summary-popup">
- <title>Mail Summary Popup</title>
+ <sect2 id="properties-message-popups">
+ <title>Message Popups</title>
<variablelist>
<varlistentry>
<term><guilabel>General</guilabel></term>
<listitem>
<variablelist>
- <varlistentry id="enable-mail-summary-popup">
- <term><guilabel>Enable mail summary popup</guilabel></term>
+ <varlistentry id="enable-message-popups">
+ <term><guilabel>Enable message popups</guilabel></term>
<listitem>
<para>
- If this option is enabled, the mail summary popup
- will be displayed when new mail arrives.
+ If this option is enabled, an information window
+ will be popped up on your desktop whenever a new
+ message arrives.
</para>
</listitem>
</varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Position</guilabel></term>
+ <listitem>
+ <para>
+ The location of the message popups on the screen.
+ </para>
+ <variablelist>
<varlistentry>
- <term><guilabel>Automatically close after</guilabel></term>
+ <term><guilabel>Attached to the status icon</guilabel></term>
<listitem>
<para>
- If this option is enabled, the mail summary popup
- will be automatically closed after a delay has
- elapsed.
- <note>
- <para>
- The timer is restarted when new mail arrives.
- </para>
- </note>
+ Message popups will be placed next to the status icon.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><guilabel>Hide previously displayed mail</guilabel></term>
+ <term><guilabel>In the popup stack</guilabel></term>
<listitem>
<para>
- If this option is enabled, the mail summary popup
- will only show new mail once (that is, the next
- time the mail summary is popped up, it will only
- display mail that was received since it was last
- popped up).
+ Message popups will be stacked together in one
+ corner of your screen.
</para>
</listitem>
</varlistentry>
@@ -753,397 +773,566 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><guilabel>Position</guilabel></term>
+ <term><guilabel>Expiration</guilabel></term>
+ <listitem>
+ <para>
+ You can choose to have message popups stay on the screen
+ until you click them, or have them disappear after some
+ time has elapsed.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect2>
+ </sect1>
+
+ <sect1 id="mailbox-properties">
+ <title>Mailbox Properties</title>
+ <para>
+ The <guilabel>Mailbox Properties</guilabel> dialog is displayed
+ when you add a new mailbox or when you edit an existing one. It
+ may contain the following tabbed sections:
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para><link linkend="mailbox-properties-general">General</link></para>
+ </listitem>
+ <listitem>
+ <para><link linkend="mailbox-properties-connection">Connection</link></para>
+ </listitem>
+ </itemizedlist>
+
+ <sect2 id="mailbox-properties-general">
+ <title>General</title>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>General</guilabel></term>
<listitem>
<variablelist>
<varlistentry>
- <term><guilabel>Position</guilabel></term>
+ <term><guilabel>Mailbox type</guilabel></term>
+ <listitem>
+ <para>
+ This is the type of the mailbox. If you select
+ <guilabel>autodetect</guilabel>, the type will be
+ autodetected using the mailbox &uri; and/or
+ contents.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><guilabel>Mailbox name</guilabel></term>
+ <listitem>
+ <para>
+ You can choose to assign a custom name to the
+ mailbox. The mailbox name has informative purposes
+ only, and is displayed in various parts of
+ &app;. To reset to the default name, click on the
+ <guibutton>Use Default</guibutton> button.
+ </para>
+ <note>
+ <para>
+ The mailbox name will be modified automatically
+ as you set some of the other options. To avoid
+ losing your choice, only fill in the mailbox
+ name after setting the other options.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+ <varlistentry id="delay-between-mail-checks">
+ <term><guilabel>Delay between mail checks</guilabel></term>
<listitem>
<para>
- The location of the mail summary popup on the
- screen.
+ This is the amount of time to wait between mail checks.
+ <note>
+ <para>
+ This delay is only used if the mailbox does
+ not support <link
+ linkend="immediate-notification">immediate
+ notification</link> of changes. If this is the
+ case, an <link
+ linkend="poll-emblem">emblem</link> will be
+ displayed in the <link
+ linkend="mailbox-list">mailbox list</link>.
+ </para>
+ </note>
</para>
</listitem>
</varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <guilabel>Location</guilabel>
+ (<guilabel>Autodetect</guilabel> and <guilabel>System
+ mailbox</guilabel> only)
+ </term>
+ <listitem>
+ <para>
+ This is the &uri; of the mailbox.
+ </para>
+ <note>
+ <para>
+ &app; abstracts file operations by using &gnomevfs;.
+ All the schemes (http, ftp, sftp, …) supported by
+ &gnomevfs; are therefore supported by &app;.
+ </para>
+ </note>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>
+ <guilabel>Account</guilabel> (<guilabel>POP3</guilabel>,
+ <guilabel>IMAP</guilabel> and <guilabel>Gmail</guilabel>
+ only)
+ </term>
+ <listitem>
+ <variablelist>
<varlistentry>
- <term><guilabel>Horizontal offset</guilabel></term>
+ <term>
+ <guilabel>Server</guilabel>
+ (<guilabel>POP3</guilabel> and
+ <guilabel>IMAP</guilabel> only)
+ </term>
<listitem>
<para>
- The number of pixels to leave between the left or
- right side of the screen and the mail summary
- popup.
+ This is the hostname or IP address of the &pop3; or
+ &imap; server.
+ <note>
+ <para>
+ Symbolic names as well as IPv4 and IPv6
+ addresses are supported.
+ </para>
+ </note>
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><guilabel>Vertical offset</guilabel></term>
+ <term><guilabel>Username</guilabel></term>
<listitem>
<para>
- The number of pixels to leave between the top or
- bottom side of the screen and the mail summary
- popup.
+ This is your username on the &pop3;, &imap; or
+ &gmail; server. The username will be stored to disk
+ unless it is left blank (in such case, a credentials
+ prompt will appear when needed).
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><guilabel>Password</guilabel></term>
+ <listitem>
+ <para>
+ This is your password on the &pop3;, &imap; or
+ &gmail; server. The password will be stored to disk
+ unless it is left blank (in such case, a credentials
+ prompt will appear when needed).
+ </para>
+ <warning>
+ <title>POP3 and IMAP Security</title>
+ <para>
+ To avoid sending your password over the network in
+ clear text, you must either use a SSL/TLS
+ connection or select a secure authentication
+ mechanism. See below for more details.
+ </para>
+ <!-- simplified on purpose: actually, a weak SSL/TLS -->
+ <!-- algorithm could be used, but this is beyond the -->
+ <!-- scope of this document -->
+ </warning>
+ </listitem>
+ </varlistentry>
</variablelist>
</listitem>
</varlistentry>
+
<varlistentry>
- <term><guilabel>Layout</guilabel></term>
+ <term>
+ <guilabel>IMAP Mailbox</guilabel> (<guilabel>IMAP</guilabel> only)
+ </term>
<listitem>
<para>
- You can choose the layout of the mail summary:
- <guilabel>standard</guilabel> or
- <guilabel>compact</guilabel>.
+ This is the &imap; mailbox to use.
</para>
</listitem>
</varlistentry>
+
<varlistentry>
- <term><guilabel>Fonts</guilabel></term>
+ <term>
+ <guilabel>Folder</guilabel> (<guilabel>Evolution</guilabel> only)
+ </term>
<listitem>
<para>
- You can choose to override your default theme fonts and
- use custom fonts in the mail summary popup. To further
- customise the appearance of &app;, see <xref linkend="modifying-appearance"/>.
+ This is the Evolution folder to monitor for changes.
</para>
<note>
<para>
- The specified fonts are relative to the text
- properties hard-coded into &app;, which cannot be
- modified: the title is printed in bold and uses a
- larger font size than the contents, and the message
- headers are printed in bold.
+ For the folder selector to be available and for
+ monitoring an Evolution mailbox, Evolution must be
+ running and the Evolution Mail Notification plugin
+ must be loaded.
</para>
</note>
</listitem>
</varlistentry>
+ </variablelist>
+ </sect2>
+
+ <sect2 id="mailbox-properties-connection">
+ <title>Connection (<guilabel>POP3</guilabel> and <guilabel>IMAP</guilabel> only)</title>
+ <variablelist>
<varlistentry>
- <term><guibutton>Display a Test Popup</guibutton></term>
+ <term><guilabel>Connection type</guilabel></term>
<listitem>
<para>
- Clicking on this button will display an example popup,
- which can be used to ease configuration of the above
- options.
+ This is the type of connection to use and the port
+ number to connect to.
</para>
<para>
- Click on the example popup to close it.
+ <guilabel>In-band SSL/TLS</guilabel> refers to a
+ &ssl;/&tls; connection negotiated inside of the
+ protocol (using the <literal>STLS</literal> &pop3;
+ command or the <literal>STARTTLS</literal> &imap;
+ command).
</para>
- </listitem>
- </varlistentry>
- </variablelist>
- </sect2>
- </sect1>
-
- <sect1 id="mailbox-properties">
- <title>Mailbox Properties</title>
- <para>
- The <guilabel>Mailbox Properties</guilabel> dialog is displayed
- when you add a new mailbox or when you edit an existing one.
- It contains the following global settings:
- </para>
-
- <variablelist>
- <varlistentry>
- <term><guilabel>Mailbox type</guilabel></term>
- <listitem>
- <para>
- This is the type of the mailbox. If you select <guilabel>autodetect</guilabel>,
- the type will be autodetected using the mailbox &uri; and/or contents.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Mailbox name</guilabel></term>
- <listitem>
- <para>
- You can choose to assign a custom name to the mailbox. The
- mailbox name has informative purposes only, and is
- displayed in various parts of &app;. To reset to the
- default name, click on the <guibutton>Use Default</guibutton>
- button.
- </para>
- <note>
<para>
- The mailbox name will be modified automatically as you
- set some of the other options. To avoid losing your
- choice, only fill in the mailbox name after setting the
- other options.
+ <guilabel>SSL/TLS on separate port</guilabel> refers to
+ the most widespread method for establishing a
+ &ssl;/&tls; connection: using a separate port.
</para>
- </note>
- </listitem>
- </varlistentry>
- <varlistentry id="delay-between-mail-checks">
- <term><guilabel>Delay between mail checks</guilabel></term>
- <listitem>
- <para>
- This is the amount of time to wait between mail checks.
<note>
<para>
- This delay is only used if the mailbox does not support
- <link linkend="immediate-notification">immediate notification</link>
- of changes. If this is the case, an <link
- linkend="poll-emblem">emblem</link> will be displayed
- in the <link linkend="mailbox-list">mailbox
- list</link>.
+ The security considerations listed below do not
+ apply if you select <guilabel>SSL/TLS</guilabel>
+ (either <guilabel>in-band</guilabel> or
+ <guilabel>on separate port</guilabel>).
</para>
+ <!-- simplified on purpose: actually, a weak SSL/TLS -->
+ <!-- algorithm could be used, but this is beyond the -->
+ <!-- scope of this document -->
</note>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
-
- <para>
- The rest of the window depends on the selected mailbox type:
- </para>
+ </listitem>
+ </varlistentry>
- <variablelist>
- <varlistentry>
- <term>When <guilabel>autodetect</guilabel> is selected:</term>
- <listitem>
- <variablelist>
- <varlistentry>
- <term><guilabel>Location</guilabel></term>
- <listitem>
- <para>
- This is the &uri; of the mailbox.
- <note>
+ <varlistentry>
+ <term><guilabel>Authentication</guilabel></term>
+ <listitem>
+ <variablelist>
+ <varlistentry>
+ <term><guilabel>Mechanism</guilabel></term>
+ <listitem>
+ <para>
+ This is the authentication mechanism to use.
+ If you select <guilabel>autodetect</guilabel>,
+ all the authentication mechanisms supported by the &pop3;
+ or &imap; server will be tried, in descending order of
+ security. Otherwise, the selected mechanism (and
+ <emphasis>only</emphasis> the selected mechanism) will
+ be used.
+ </para>
+ <warning>
+ <title>Security</title>
<para>
- &app; abstracts file operations by using
- &gnomevfs;. All the schemes (http, ftp, sftp,
- ...) supported by &gnomevfs; are therefore
- supported by &app;.
+ If <guilabel>autodetect</guilabel> is selected and
+ secure authentication fails, your credentials may
+ be sent over the network in clear text (unless you
+ use a &ssl;/&tls; connection).
</para>
- </note>
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>When <guilabel>POP3</guilabel> or <guilabel>IMAP</guilabel> is selected:</term>
- <listitem>
- <variablelist>
- <varlistentry>
- <term><guilabel>Hostname</guilabel></term>
- <listitem>
- <para>
- This is the hostname or IP address of the &pop3; or
- &imap; server.
- <note>
<para>
- Symbolic names as well as IPv4 and IPv6
- addresses are supported.
+ If this is a concern, select the appropriate
+ secure authentication mechanism from the drop-down
+ list.
</para>
- </note>
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Username</guilabel></term>
- <listitem>
- <para>
- This is your username on the &pop3; or &imap;
- server. The username will be stored to disk unless
- it is left blank (in such case, a credentials prompt
- will appear when needed).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Password</guilabel></term>
- <listitem>
- <para>
- This is your password on the &pop3; or &imap;
- server. The password will be stored to disk unless
- it is left blank (in such case, a credentials prompt
- will appear when needed).
- </para>
- <warning>
- <title>Security</title>
- <para>
- To avoid sending your password over the network in
- clear text, you must either use a SSL/TLS
- connection or select a secure authentication
- mechanism. See below for more details.
- </para>
- <!-- simplified on purpose: actually, a weak SSL/TLS -->
- <!-- algorithm could be used, but this is beyond the -->
- <!-- scope of this document -->
- </warning>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Connection type</guilabel> and <guilabel>Port</guilabel></term>
- <listitem>
- <para>
- This is the type of connection to use and the port
- number to connect to.
- </para>
- <para>
- <guilabel>In-band SSL/TLS</guilabel> refers to a
- &ssl;/&tls; connection negotiated inside of the
- protocol (using the <literal>STLS</literal> &pop3;
- command or the <literal>STARTTLS</literal> &imap;
- command).
- </para>
- <para>
- <guilabel>SSL/TLS on separate port</guilabel> refers to
- the most widespread method for establishing a
- &ssl;/&tls; connection: using a separate port.
- </para>
- <note>
- <para>
- The security considerations listed below do not
- apply if you select <guilabel>SSL/TLS</guilabel>
- (either <guilabel>in-band</guilabel> or
- <guilabel>on separate port</guilabel>).
- </para>
- <!-- simplified on purpose: actually, a weak SSL/TLS -->
- <!-- algorithm could be used, but this is beyond the -->
- <!-- scope of this document -->
- </note>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Authentication mechanism</guilabel></term>
- <listitem>
- <para>
- This is the authentication mechanism to use.
- If you select <guilabel>autodetect</guilabel>,
- all the authentication mechanisms supported by the &pop3;
- or &imap; server will be tried, in descending order of
- security. Otherwise, the selected mechanism (and
- <emphasis>only</emphasis> the selected mechanism) will
- be used.
- </para>
- <warning>
- <title>Security</title>
- <para>
- If <guilabel>autodetect</guilabel> is selected and
- secure authentication fails, your credentials may
- be sent over the network in clear text (unless you
- use a &ssl;/&tls; connection).
- </para>
- <para>
- If this is a concern, select the appropriate
- secure authentication mechanism from the drop-down
- list.
- </para>
- </warning>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>When <guilabel>IMAP</guilabel> is selected:</term>
- <listitem>
- <variablelist>
- <varlistentry>
- <term><guilabel>Mailbox</guilabel></term>
- <listitem>
- <para>
- This is the &imap; mailbox to use.
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Use the IDLE extension</guilabel></term>
- <listitem>
- <para>
- The IDLE extension (as defined by <ulink url="http://www.ietf.org/rfc/rfc2177.txt" type="http">RFC 2177</ulink>)
- allows &app; to stay connected to the server and provide
- <link linkend="immediate-notification">immediate notification</link> of changes.
- </para>
- <para>
- If <guilabel>never</guilabel> is selected, &app;
- will never use the IDLE extension, not even if the
- server supports it. Use this option if it appears
- that &app; does not detect changes to an &imap;
- mailbox while the IDLE extension is in use. If using
- this option fixes the issue, please also send the
- &imap; session transcript (obtained by running &app;
- using the --enable-info option) to Jean-Yves Lefort
- <email>jylefort@brutele.be</email>.
- </para>
- <para>
- If <guilabel>autodetect</guilabel> is selected,
- &app; will use the IDLE extension if the server
- supports it, unless the server software is known to
- have a broken IDLE implementation (currently, the
- only such software known to &app; is the University
- of Washington imapd). This is the recommended
- choice.
- </para>
- <para>
- If <guilabel>always</guilabel> is selected, &app;
- will use the IDLE extension if the server supports
- it, regardless of the server software. Use this
- option if you want to force &app; to use the IDLE
- extension, even if it has detected a bogus
- implementation.
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
+ </warning>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </listitem>
+ </varlistentry>
- <varlistentry>
- <term>When <guilabel>Gmail</guilabel> is selected:</term>
- <listitem>
- <variablelist>
- <varlistentry>
- <term><guilabel>Username</guilabel></term>
- <listitem>
- <para>
- This is your username on &gmail;. The username will
- be stored to disk unless it is left blank (in such
- case, a credentials prompt will appear when needed).
- </para>
- </listitem>
- </varlistentry>
- <varlistentry>
- <term><guilabel>Password</guilabel></term>
- <listitem>
- <para>
- This is your password on &gmail;. The password will
- be stored to disk unless it is left blank (in such
- case, a credentials prompt will appear when needed).
- </para>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
+ <varlistentry>
+ <term>
+ <guilabel>Use the IDLE extension</guilabel>
+ (<guilabel>IMAP</guilabel> only)
+ </term>
+ <listitem>
+ <para>
+ The IDLE extension (as defined by <ulink url="http://www.ietf.org/rfc/rfc2177.txt" type="http">RFC 2177</ulink>)
+ allows &app; to stay connected to the server and provide
+ <link linkend="immediate-notification">immediate notification</link> of changes.
+ </para>
+ <para>
+ If <guilabel>never</guilabel> is selected, &app;
+ will never use the IDLE extension, not even if the
+ server supports it. Use this option if it appears
+ that &app; does not detect changes to an &imap;
+ mailbox while the IDLE extension is in use. If using
+ this option fixes the issue, please also send the
+ &imap; session transcript (obtained by running &app;
+ using the --enable-info option) to Jean-Yves Lefort
+ <email>jylefort@brutele.be</email>.
+ </para>
+ <para>
+ If <guilabel>autodetect</guilabel> is selected,
+ &app; will use the IDLE extension if the server
+ supports it, unless the server software is known to
+ have a broken IDLE implementation (currently, the
+ only such software known to &app; is the University
+ of Washington imapd). This is the recommended
+ choice.
+ </para>
+ <para>
+ If <guilabel>always</guilabel> is selected, &app;
+ will use the IDLE extension if the server supports
+ it, regardless of the server software. Use this
+ option if you want to force &app; to use the IDLE
+ extension, even if it has detected a bogus
+ implementation.
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
+ </sect2>
+ </sect1>
- <varlistentry>
- <term>When <guilabel>Evolution</guilabel> is selected:</term>
- <listitem>
- <variablelist>
- <varlistentry>
- <term><guilabel>Folder</guilabel></term>
- <listitem>
- <para>
- This is the Evolution folder to monitor for changes.
- </para>
- <note>
- <para>
- For the folder selector to be available and for
- monitoring an Evolution mailbox, Evolution must be
- running and the Evolution Mail Notification plugin
- must be loaded.
- </para>
- </note>
- </listitem>
- </varlistentry>
- </variablelist>
- </listitem>
- </varlistentry>
- </variablelist>
+ <sect1 id="message-actions">
+ <title>Message Actions</title>
+ <para>
+ Message popups support the following actions:
+ </para>
+ <itemizedlist>
+ <listitem><para><guilabel>Open</guilabel></para></listitem>
+ <listitem><para><guilabel>Mark as Read</guilabel></para></listitem>
+ <listitem><para><guilabel>Mark as Spam</guilabel></para></listitem>
+ </itemizedlist>
+
+ <sect2 id="built-in-actions">
+ <title>Built-in Actions</title>
+ <para>
+ The following table summarizes the currently implemented
+ built-in actions for each mailbox type.
+ </para>
+ <table>
+ <title>Built-in Actions</title>
+ <tgroup cols="4">
+ <thead>
+ <row>
+ <entry>Mailbox Type</entry>
+ <entry><guilabel>Open</guilabel></entry>
+ <entry><guilabel>Mark as Read</guilabel></entry>
+ <entry><guilabel>Mark as Spam</guilabel></entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry>&mbox;</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&mh;</entry>
+ <entry>yes</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&maildir;</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&pop3;</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&imap;</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&gmail;</entry>
+ <entry>yes</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>Evolution</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
+ </row>
+ <row>
+ <entry>&mozilla;</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ <entry>no</entry>
+ </row>
+ <row>
+ <entry>&sylpheed;</entry>
+ <entry>yes</entry>
+ <entry>yes</entry>
+ <entry>no</entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ </sect2>
+
+ <sect2 id="custom-actions">
+ <title>Custom Actions</title>
+ <para>
+ To define a custom action for a particular mailbox, edit the
+ <filename>~/.gnome2/mail-notification/mailboxes.xml</filename>
+ file and specify a command to be executed when the action
+ button is clicked.
+ </para>
+ <note>
+ <para>
+ If both a built-in action and a custom action exists, the
+ custom action overrides the built-in action.
+ </para>
+ </note>
+ <para>
+ XML attributes should be added to the
+ <sgmltag>mailbox</sgmltag> element of the mailbox you want the
+ actions to be available for. The following table specifies
+ which XML attribute should be used for a particular action.
+ </para>
+ <table>
+ <title>Action Attributes</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>Action</entry>
+ <entry>XML Attribute</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><guilabel>Open</guilabel></entry>
+ <entry><parameter>open-command</parameter></entry>
+ </row>
+ <row>
+ <entry><guilabel>Mark as Read</guilabel></entry>
+ <entry><parameter>mark-as-read-command</parameter></entry>
+ </row>
+ <row>
+ <entry><guilabel>Mark as Spam</guilabel></entry>
+ <entry><parameter>mark-as-spam-command</parameter></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <para>
+ Before executing a command, some strings will be
+ substituted. The following table summarizes the available
+ substitutions.
+ </para>
+ <table>
+ <title>Command String Substitutions</title>
+ <tgroup cols="2">
+ <thead>
+ <row>
+ <entry>String</entry>
+ <entry>Substitution</entry>
+ </row>
+ </thead>
+ <tbody>
+ <row>
+ <entry><literal>%%</literal></entry>
+ <entry>a single percent character</entry>
+ </row>
+ <row>
+ <entry><literal>%error</literal></entry>
+ <entry>
+ the error message, if any
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%sent-time</literal></entry>
+ <entry>
+ the message timestamp expressed in seconds since the
+ Epoch (00:00:00 UTC, January 1, 1970)
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%id</literal></entry>
+ <entry>
+ the message unique identifier
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%from</literal></entry>
+ <entry>
+ the message sender
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%subject</literal></entry>
+ <entry>
+ the message subject, if any
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%uri</literal></entry>
+ <entry>
+ the message &uri;, if any
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%filename</literal></entry>
+ <entry>
+ if the message has an &uri; and that &uri; points to a
+ local filename, that filename
+ </entry>
+ </row>
+ <row>
+ <entry><literal>%uid</literal></entry>
+ <entry>
+ the Evolution message UID, if any
+ </entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </table>
+ <note>
+ <itemizedlist>
+ <listitem>
+ <para>
+ Substitutions will be shell-quoted as appropriate, you
+ therefore must not quote the percent strings.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Keywords can be enclosed in braces, as in
+ <literal>%{from}</literal>.
+ </para>
+ </listitem>
+ </itemizedlist>
+ </note>
+ <para>
+ Example:
+ </para>
+ <programlisting>
+<?xml version="1.0"?>
+<mailboxes>
+ <mailbox
+ type="custom-vfs"
+ uri="file:///home/jylefort/Mail/misc"
+ open-command="my-open-script %filename"
+ mark-as-spam-command="my-spam-script %filename"/>
+</mailboxes>
+</programlisting>
+ </sect2>
</sect1>
<sect1 id="troubleshooting">
@@ -1182,17 +1371,10 @@
</para>
<variablelist>
<varlistentry>
- <term>&mbox;, &mh;, &maildir; and &sylpheed; mailboxes:</term>
+ <term>&mbox;, &mh;, &maildir;, &mozilla; and &sylpheed; mailboxes:</term>
<listitem>
<para>
- &gnomevfs; must be compiled
- with <ulink url="http://oss.sgi.com/projects/fam" type="http">FAM</ulink> support,
- and FAM must be configured properly.
- </para>
- <para>
- Refer to the
- <citerefentry><refentrytitle>fam</refentrytitle><manvolnum>1</manvolnum></citerefentry>
- manual page for more details.
+ &gnomevfs; must support monitoring (it usually does).
</para>
</listitem>
</varlistentry>
@@ -1345,25 +1527,17 @@ if (! success) {
</thead>
<tbody>
<row>
- <entry>mail summary popup</entry>
- <entry>mn-mail-summary-popup</entry>
- </row>
- <row>
- <entry>mail summary popup title</entry>
- <entry>mn-mail-summary-popup-title</entry>
- </row>
- <row>
- <entry>message list</entry>
- <entry>mn-message-view</entry>
- </row>
- <row>
<entry>tooltip section title</entry>
<entry>mn-tooltip-section-title</entry>
</row>
<row>
- <entry>tooltip section body (except message list)</entry>
+ <entry>tooltip section body (except mail summary)</entry>
<entry>mn-tooltip-section-body</entry>
</row>
+ <row>
+ <entry>tooltip mail summary</entry>
+ <entry>mn-message-view</entry>
+ </row>
</tbody>
</tgroup>
</table>
@@ -1422,14 +1596,14 @@ if (! success) {
<entry>mn-select-all</entry>
</row>
<row>
- <entry>mail summary</entry>
- <entry>mn-mail-summary</entry>
- </row>
- <row>
<entry>mail reader</entry>
<entry>mn-mail-reader</entry>
</row>
<row>
+ <entry>open message</entry>
+ <entry>mn-open-message</entry>
+ </row>
+ <row>
<entry>connect (in the SSL/TLS confirmation dialog)</entry>
<entry>mn-connect</entry>
</row>
@@ -1449,26 +1623,6 @@ if (! success) {
<filename>~/.gtkrc-2.0</filename> file.
</para>
<para>
- To use a large font for the mail summary popup title:
- </para>
- <programlisting>style "mn-mail-summary-popup-title"
-{
- font_name = "Sans 14"
-}
-
-widget "*.mn-mail-summary-popup-title"
- style "mn-mail-summary-popup-title"</programlisting>
- <para>
- To use a small font for the mail summary popup messages:
- </para>
- <programlisting>style "mn-mail-summary-popup-messages"
-{
- font_name = "Sans 8"
-}
-
-widget "mn-mail-summary-popup.*.mn-message-view"
- style "mn-mail-summary-popup-messages"</programlisting>
- <para>
To use a small font for the mail summary tooltip messages:
</para>
<programlisting>style "mn-mail-summary-tooltip-messages"
@@ -1514,7 +1668,7 @@ widget "*" style "mn-icons"</programlisting>
<para>
Choose
<menuchoice>
- <guimenu>Desktop</guimenu>
+ <guimenu>System</guimenu>
<guisubmenu>Preferences</guisubmenu>
<guimenuitem>Mail Notification</guimenuitem>
</menuchoice> (this location may vary across systems) or type
@@ -1590,6 +1744,56 @@ widget "*" style "mn-icons"</programlisting>
</para>
</answer>
</qandaentry>
+ <qandaentry>
+ <question>
+ <para>
+ How can I access message data from the new mail command?
+ </para>
+ </question>
+ <answer>
+ <para>
+ Parse the output of <command>mail-notification --print-summary</command>.
+ </para>
+ </answer>
+ </qandaentry>
+ <qandaentry>
+ <question>
+ <para>
+ I do not use &app; but I am presented with the properties
+ dialog each time I log in. How can I disable it?
+ </para>
+ </question>
+ <answer>
+ <orderedlist>
+ <listitem>
+ <para>
+ Choose
+ <menuchoice>
+ <guimenu>System</guimenu>
+ <guisubmenu>Preferences</guisubmenu>
+ <guimenuitem>Sessions</guimenuitem>
+ </menuchoice> (this location may vary across systems).
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select the <guilabel>Startup Programs</guilabel> tab.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Select the <command>mail-notification --sm-disable</command>
+ command.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ Click on the <guibutton>Disable</guibutton> button.
+ </para>
+ </listitem>
+ </orderedlist>
+ </answer>
+ </qandaentry>
</qandaset>
</sect1>
@@ -1605,8 +1809,9 @@ widget "*" style "mn-icons"</programlisting>
<sect2 id="problem-reports">
<title>Reporting Bugs and Other Feedback</title>
<para>
- Bug reports and feedback should be sent to Jean-Yves Lefort
- <email>jylefort@brutele.be</email>.
+ Bug reports and feedback should be filed in the <ulink
+ url="https://savannah.nongnu.org/bugs/?group=mailnotify"
+ type="http">Mail Notification bug tracker</ulink>.
</para>
</sect2>
@@ -1630,6 +1835,7 @@ widget "*" style "mn-icons"</programlisting>
<listitem><para>Benoît Rouits</para></listitem>
<listitem><para>Tomasz Sarota-Raczek</para></listitem>
<listitem><para>Edwin Shin</para></listitem>
+ <listitem><para>Topi</para></listitem>
<listitem><para>Marcel J. Zwiebel</para></listitem>
</itemizedlist>
</sect2>
@@ -1718,6 +1924,21 @@ widget "*" style "mn-icons"</programlisting>
</para>
</glossdef>
</glossentry>
+
+ <glossentry id="mozilla">
+ <glossterm>Mozilla</glossterm>
+ <glossdef>
+ <para>
+ In this manual, a Mozilla mailbox refers to a mailbox
+ produced by a Mozilla-based mail reader (Mozilla,
+ SeaMonkey, Thunderbird, …). This mailbox format only
+ differs from the &mbox; format by the fact that message
+ status information is stored in the
+ <literal>X-Mozilla-Status</literal> header instead of the
+ <literal>Status</literal> header.
+ </para>
+ </glossdef>
+ </glossentry>
</glossdiv>
<glossdiv><title>P</title>
diff --git a/help/Makefile.in b/help/Makefile.in
@@ -63,6 +63,7 @@ CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -192,15 +193,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -241,7 +246,6 @@ 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@
diff --git a/intltool-extract.in b/intltool-extract.in
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
diff --git a/intltool-merge.in b/intltool-merge.in
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
## Loaded modules
use strict;
@@ -395,7 +395,7 @@ sub create_translation_database
}
else
{
- print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
+ print "NOTICE: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
}
diff --git a/intltool-update.in b/intltool-update.in
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.34.2";
+my $VERSION = "0.35.0";
my $PACKAGE = "intltool";
## Loaded modules
@@ -125,7 +125,7 @@ my $arg_count = ($DIST_ARG > 0)
&Console_Write_IntltoolHelp if $arg_count > 1;
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName;
+my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
if ($POT_ARG)
{
@@ -722,6 +722,8 @@ sub GeneratePOTemplate
"--files-from\=\.\/POTFILES\.in\.temp");
my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
push @xgettext_argument, $XGETTEXT_KEYWORDS;
+ my $MSGID_BUGS_ADDRESS = &FindMakevarsBugAddress;
+ push @xgettext_argument, "--msgid-bugs-address\=$MSGID_BUGS_ADDRESS" if $MSGID_BUGS_ADDRESS;
push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
my $xgettext_command = join ' ', @xgettext_argument;
@@ -874,8 +876,10 @@ sub SubstituteVariable
{
my $rest = $3;
my $untouched = $1;
- my $sub = $varhash{$2};
-
+ my $sub = "";
+ # Ignore recursive definitions of variables
+ $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;
+
return SubstituteVariable ("$untouched$sub$rest");
}
@@ -992,10 +996,10 @@ sub FindPackageName
($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g;
- $varhash{"PACKAGE_NAME"} = $name;
- $varhash{"PACKAGE"} = $name;
- $varhash{"PACKAGE_VERSION"} = $version;
- $varhash{"VERSION"} = $version;
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
}
if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m)
@@ -1003,10 +1007,10 @@ sub FindPackageName
($name, $version) = ($1, $2);
$name =~ s/[\[\]\s]//g;
$version =~ s/[\[\]\s]//g;
- $varhash{"PACKAGE_NAME"} = $name;
- $varhash{"PACKAGE"} = $name;
- $varhash{"PACKAGE_VERSION"} = $version;
- $varhash{"VERSION"} = $version;
+ $varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
+ $varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
+ $varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
+ $varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
}
# \s makes this not work, why?
@@ -1063,3 +1067,23 @@ sub FindMakevarsDomain
return $domain;
}
+
+sub FindMakevarsBugAddress
+{
+
+ my $address = "";
+ my $makevars_source; {
+ local (*IN);
+ open (IN, "<Makevars") || return undef;
+ seek (IN, 0, 0);
+ local $/; # slurp mode
+ $makevars_source = <IN>;
+ close IN;
+ }
+
+ $address = $1 if $makevars_source =~ /^MSGID_BUGS_ADDRESS[ ]*=\[?([^\n\]\$]+)/m;
+ $address =~ s/^\s+//;
+ $address =~ s/\s+$//;
+
+ return $address;
+}
diff --git a/m4/Makefile.in b/m4/Makefile.in
@@ -54,6 +54,7 @@ SOURCES =
DIST_SOURCES =
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
+ALL_LINGUAS = @ALL_LINGUAS@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AML = @AML@
@@ -183,15 +184,19 @@ 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_OR_MOZILLA_FALSE = @WITH_MBOX_OR_MOZILLA_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_FALSE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_OR_EVOLUTION_TRUE@
+WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE = @WITH_MBOX_OR_MOZILLA_OR_MH_OR_MAILDIR_OR_SYLPHEED_TRUE@
+WITH_MBOX_OR_MOZILLA_TRUE = @WITH_MBOX_OR_MOZILLA_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_MOZILLA_FALSE = @WITH_MOZILLA_FALSE@
+WITH_MOZILLA_TRUE = @WITH_MOZILLA_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@
@@ -232,7 +237,6 @@ 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@
diff --git a/m4/evolution-plugin.m4 b/m4/evolution-plugin.m4
@@ -1,6 +1,6 @@
# This file is part of Mail Notification.
#
-# Copyright (C) 2005 Jean-Yves Lefort.
+# Copyright (C) 2005, 2006 Jean-Yves Lefort.
#
# As a special exception to the Mail Notification licensing terms,
# Jean-Yves Lefort gives unlimited permission to copy, distribute and
@@ -35,37 +35,3 @@ else
fi
AC_SUBST(evolution_plugindir)])
-
-dnl AM_PATH_EVOLUTION_SOURCEDIR([SOURCE-FILES], [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-AC_DEFUN([AM_PATH_EVOLUTION_SOURCEDIR],
-[AC_ARG_WITH(evolution-source-dir,
-AC_HELP_STRING([--with-evolution-source-dir=DIR], [path to the Evolution source tree]),
-[evolution_source_dir="$withval"], [evolution_source_dir=""])
-
-found=no
-
-AC_MSG_CHECKING([for the Evolution source tree directory])
-if test -z "$evolution_source_dir"; then
- AC_MSG_RESULT([not given, use --with-evolution-source-dir=DIR])
-else
- AC_MSG_RESULT([$evolution_source_dir])
- if test "x$evolution_source_dir" != "xno"; then
- found=yes
- m4_foreach(evofile, [ifelse([$1],, evolution-plugin.pc.in, [$1])],
-[
-if test $found = yes; then
- AC_CHECK_FILE($evolution_source_dir/evofile, [found=yes], [found=no])
-fi
-])
- fi
-fi
-
-if test $found = yes; then
- ifelse([$2],, :, [$2])
-else
- evolution_source_dir=""
- ifelse([$3],, :, [$3])
-fi
-
-AC_SUBST(evolution_source_dir)])
diff --git a/m4/intltool.m4 b/m4/intltool.m4
@@ -23,7 +23,7 @@
## the same distribution terms that you use for the rest of that program.
dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-# serial 2 IT_PROG_INTLTOOL
+# serial 35 IT_PROG_INTLTOOL
AC_DEFUN([IT_PROG_INTLTOOL],
[AC_PREREQ([2.50])dnl
@@ -38,9 +38,9 @@ esac
if test -n "$1"; then
AC_MSG_CHECKING(for intltool >= $1)
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 100 + $ 2; }'`
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 100 + VERSION[2];}' ${ac_aux_dir}/intltool-update.in`
+ [INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
]
AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
@@ -111,6 +111,9 @@ AC_PATH_PROG(INTLTOOL_MSGFMT, msgfmt, msgfmt)
AC_PATH_PROG(INTLTOOL_MSGMERGE, msgmerge, msgmerge)
AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext, xgettext)
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
IT_PO_SUBDIR([po])
dnl The following is very similar to
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
@@ -22,7 +22,6 @@ PACKAGE = @PACKAGE@
VERSION = @VERSION@
SHELL = /bin/sh
-@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
@@ -34,9 +33,8 @@ exec_prefix = @exec_prefix@
datadir = @datadir@
datarootdir = @datarootdir@
libdir = @libdir@
-localedir = $(libdir)/locale
-gnulocaledir = $(datadir)/locale
-gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+DATADIRNAME = @DATADIRNAME@
+itlocaledir = $(prefix)/$(DATADIRNAME)/locale
subdir = po
install_sh = @install_sh@
# Automake >= 1.8 provides @mkdir_p@.
@@ -46,7 +44,6 @@ mkdir_p = $(install_sh) -d
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
-CC = @CC@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
@@ -55,31 +52,22 @@ INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
-INCLUDES = -I.. -I$(top_srcdir)/intl
+PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
+POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
-SOURCES =
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in \
-$(POFILES) $(SOURCES)
+DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
+#This Gets Replace for some reason
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
+CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
- $(COMPILE) $<
+.SUFFIXES: .po .pox .gmo .mo .msg .cat
.po.pox:
$(MAKE) $(GETTEXT_PACKAGE).pot
@@ -105,76 +93,63 @@ all-no:
$(GETTEXT_PACKAGE).pot: $(POTFILES)
$(GENPOT)
-install: install-exec install-data
-install-exec:
+install: install-data
install-data: install-data-@USE_NLS@
install-data-no: all
install-data-yes: all
- $(mkdir_p) $(DESTDIR)$(datadir)
- @catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
- esac; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+ $(mkdir_p) $(DESTDIR)$(itlocaledir)
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
+ dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
- if test -r $$cat; then \
- $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
+ if test -r $$lang.gmo; then \
+ $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \
else \
- $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
- echo "installing $(srcdir)/$$cat as" \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \
+ echo "installing $(srcdir)/$$lang.gmo as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
fi; \
- if test -r $$cat.m; then \
- $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
+ if test -r $$lang.gmo.m; then \
+ $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
+ echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
- if test -r $(srcdir)/$$cat.m ; then \
- $(INSTALL_DATA) $(srcdir)/$$cat.m \
+ if test -r $(srcdir)/$$lang.gmo.m ; then \
+ $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \
$$dir/$(GETTEXT_PACKAGE).mo.m; \
- echo "installing $(srcdir)/$$cat as" \
+ echo "installing $(srcdir)/$$lang.gmo.m as" \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \
else \
true; \
fi; \
fi; \
done
- if test "$(PACKAGE)" = "glib"; then \
- $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
- $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
- $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- else \
- : ; \
- fi
+
+# Empty stubs to satisfy archaic automake needs
+dvi info tags TAGS ID:
# Define this as empty until I found a useful application.
installcheck:
uninstall:
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
- rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
+ rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
- if test "$(PACKAGE)" = "glib"; then \
- rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
- fi
check: all $(GETTEXT_PACKAGE).pot
-dvi info tags TAGS ID:
-
mostlyclean:
- rm -f core core.* *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
- rm -fr *.o
+ rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
rm -f .intltool-merge-cache
clean: mostlyclean
@@ -188,7 +163,7 @@ maintainer-clean: distclean
@echo "it deletes files that may require special tools to rebuild."
rm -f Makefile.in.in
-distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir)
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
dist distdir: $(DISTFILES)
dists="$(DISTFILES)"; \
extra_dists="$(EXTRA_DISTFILES)"; \
@@ -204,10 +179,12 @@ dist distdir: $(DISTFILES)
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- catalogs='$(CATALOGS)'; \
- for cat in $$catalogs; do \
- cat=`basename $$cat`; \
- lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ if test -n "$(PO_LINGUAS)"; then \
+ linguas="$(PO_LINGUAS)"; \
+ else \
+ linguas="$(ALL_LINGUAS)"; \
+ fi; \
+ for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
if $$result; then \
@@ -223,7 +200,7 @@ update-po: Makefile
fi; \
fi; \
else \
- echo "msgmerge for $$cat failed!"; \
+ echo "msgmerge for $$lang.gmo failed!"; \
rm -f $$tmpdir/$$lang.new.po; \
fi; \
done
diff --git a/po/POTFILES.in b/po/POTFILES.in
@@ -3,7 +3,7 @@ data/GNOME_MailNotification.server.in.in
data/GNOME_MailNotification_Evolution.server.in
data/mail-notification-properties.desktop.in
data/mail-notification.desktop.in
-data/mail-notification.schemas.in
+data/mail-notification.schemas.in.in
src/eggtrayicon.c
src/eggtrayicon.h
src/mn-about-dialog.gob
@@ -12,6 +12,7 @@ src/mn-authenticated-mailbox-properties.gob
src/mn-authenticated-mailbox.gob
src/mn-autodetect-mailbox-properties.gob
src/mn-automation.gob
+src/mn-base-mbox-mailbox-backend.gob
src/mn-blinking-image.gob
src/mn-client-session.c
src/mn-client-session.h
@@ -29,7 +30,6 @@ src/mn-gmime-stream-vfs.gob
src/mn-imap-mailbox-properties.gob
src/mn-imap-mailbox.gob
src/mn-mail-icon.gob
-src/mn-mail-summary-popup.gob
src/mn-mailbox-properties-dialog.gob
src/mn-mailbox-view.gob
src/mn-mailbox.gob
@@ -48,6 +48,7 @@ src/mn-pi-mailbox-properties.gob
src/mn-pi-mailbox.gob
src/mn-pop3-mailbox-properties.gob
src/mn-pop3-mailbox.gob
+src/mn-popup.gob
src/mn-properties-dialog.gob
src/mn-sasl.c
src/mn-sasl.h
@@ -60,6 +61,7 @@ src/mn-stock.h
src/mn-sylpheed-mailbox-backend.gob
src/mn-system-vfs-mailbox-properties.gob
src/mn-system-vfs-mailbox.gob
+src/mn-test-mailbox.gob
src/mn-tooltips.gob
src/mn-util.c
src/mn-util.h
@@ -67,6 +69,6 @@ src/mn-vfs-mailbox-backend.gob
src/mn-vfs-mailbox.gob
src/mn-vfs.c
src/mn-vfs.h
-ui/mail-summary-popup.glade
+src/mn-xml.c
ui/mailbox-properties-dialog.glade
ui/properties-dialog.glade
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
@@ -12,9 +12,9 @@ src/mn-authenticated-mailbox-properties.c
src/mn-authenticated-mailbox.c
src/mn-autodetect-mailbox-properties.c
src/mn-automation.c
+src/mn-base-mbox-mailbox-backend.c
src/mn-blinking-image.c
src/mn-compact-message-view.c
-src/mn-corba-object.c
src/mn-custom-vfs-mailbox.c
src/mn-dialog.c
src/mn-evolution-glue.c
@@ -26,7 +26,6 @@ src/mn-gmime-stream-vfs.c
src/mn-imap-mailbox-properties.c
src/mn-imap-mailbox.c
src/mn-mail-icon.c
-src/mn-mail-summary-popup.c
src/mn-mailbox-properties-dialog.c
src/mn-mailbox-view.c
src/mn-mailbox.c
@@ -39,6 +38,7 @@ src/mn-pi-mailbox-properties.c
src/mn-pi-mailbox.c
src/mn-pop3-mailbox-properties.c
src/mn-pop3-mailbox.c
+src/mn-popup.c
src/mn-properties-dialog.c
src/mn-reentrant-mailbox.c
src/mn-shell.c
@@ -46,6 +46,7 @@ src/mn-standard-message-view.c
src/mn-sylpheed-mailbox-backend.c
src/mn-system-vfs-mailbox-properties.c
src/mn-system-vfs-mailbox.c
+src/mn-test-mailbox.c
src/mn-text-table.c
src/mn-tooltips.c
src/mn-vfs-mailbox-backend.c
diff --git a/po/ca.po b/po/ca.po
@@ -0,0 +1,1624 @@
+# Catalan translations for mail-notification.
+# Copyright (C) 2003-2006 Jean-Yves Lefort.
+#
+# This file is distributed under the same license as the
+# mail-notification package.
+#
+# <topi@phreaker.net>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: mail-notification 3.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-07-12 17:00+0200\n"
+"PO-Revision-Date: 2006-11-21 17:34+0100\n"
+"Last-Translator: topi <topi@phreaker.net>\n"
+"Language-Team: Catalan <ca@dodds.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=ISO-8859-1\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 "Automatitzaci de l'avisador de correu"
+
+#: ../data/GNOME_MailNotification.server.in.in.h:2
+msgid "Mail Notification automation factory"
+msgstr "Construcci de l'automatitzaci de l'avisador de correu"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:1
+msgid "Evolution folder tree control"
+msgstr "Control de l'arbre de carpetes de l'Evolution"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:2
+msgid "Evolution folder tree control factory"
+msgstr "Construcci del control de l'arbre de carpetes de l'Evolution"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:3
+msgid "Mail Notification / Evolution glue"
+msgstr "Avisador de correu / Enganxador amb l'Evolution"
+
+#: ../data/GNOME_MailNotification_Evolution.server.in.h:4
+msgid "Mail Notification / Evolution glue factory"
+msgstr "Avisador de correu / Construcci de l'enganxador amb l'Evolution"
+
+#: ../data/mail-notification-properties.desktop.in.h:1
+msgid "Configure Mail Notification"
+msgstr "Configura l'avisador de correu"
+
+#: ../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 "Avisador de correu"
+
+#: ../data/mail-notification.desktop.in.h:1
+msgid "Get notified when new mail arrives"
+msgstr "Avisa'm en arribar correu nou"
+
+#: ../data/mail-notification.schemas.in.h:1
+msgid "Always display an icon"
+msgstr "Mostra sempre una icona"
+
+#: ../data/mail-notification.schemas.in.h:2
+msgid "Automatically close the mail summary popup"
+msgstr "Tanca automticament el resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:3
+msgid "Blink on errors"
+msgstr "Parpelleja si hi ha errors"
+
+#: ../data/mail-notification.schemas.in.h:4
+msgid "Click action"
+msgstr "Acci en fer clic"
+
+#: ../data/mail-notification.schemas.in.h:5
+msgid "Display seen mail"
+msgstr "Mostra els missatges vistos"
+
+#: ../data/mail-notification.schemas.in.h:6
+msgid "Enable mail summary popup"
+msgstr "Habilita el resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:7
+msgid "Fingerprints of trusted X509 certificates"
+msgstr "Empremtes digitals de certificats X509 confiables"
+
+#: ../data/mail-notification.schemas.in.h:8
+msgid "Height of properties dialog"
+msgstr "Alada del dileg de propietats"
+
+#: ../data/mail-notification.schemas.in.h:9
+msgid "Mail read command"
+msgstr "Comanda de correu llegit"
+
+#: ../data/mail-notification.schemas.in.h:10
+msgid "Mail summary popup contents font"
+msgstr "Font del contingut del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:11
+msgid "Mail summary popup fonts aspect source"
+msgstr "Origen de l'aspecte de la font del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:12
+msgid "Mail summary popup horizontal offset"
+msgstr "Distncia horitzontal del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:13
+msgid "Mail summary popup position"
+msgstr "Posici del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:14
+msgid "Mail summary popup title font"
+msgstr "Font del ttol del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:15
+msgid "Mail summary popup vertical offset"
+msgstr "Distncia vertical del resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:16
+msgid "Minutes to wait before closing the mail summary popup"
+msgstr "Minuts abans de tancar el resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:17
+msgid "New mail command"
+msgstr "Comanda per a correu nou"
+
+#: ../data/mail-notification.schemas.in.h:18
+msgid "Only display recent mail in mail summary popup"
+msgstr "Mostra noms els correus recents en el resum emergent de correu"
+
+#: ../data/mail-notification.schemas.in.h:19
+msgid "Run a command when all mail is read"
+msgstr "Executa una comanda en no haver correu per llegir"
+
+#: ../data/mail-notification.schemas.in.h:20
+msgid "Run a command when new mail arrives"
+msgstr "Executa una comanda en arribar correu nou"
+
+#: ../data/mail-notification.schemas.in.h:21
+msgid "Seconds to wait before closing the mail summary popup"
+msgstr "Segons abans de tancar el resum emergent de correu"
+
+#: ../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 "L'acci a portar a terme quan es fa clic a la icona. Ha de ser \"mostra-dileg-de-propietats\", \"executa-el-client-de-correu\" o \"actualitza-l'estat-del-correu\"."
+
+#: ../data/mail-notification.schemas.in.h:23
+msgid "The amount of time to wait before closing the mail summary popup (minutes part)."
+msgstr "La quantitat de temps abans de tancar el resum emergent de correu (minuts)."
+
+#: ../data/mail-notification.schemas.in.h:24
+msgid "The amount of time to wait before closing the mail summary popup (seconds part)."
+msgstr "La quantitat de temps abans de tancar el resum emergent de correu (segons)."
+
+#: ../data/mail-notification.schemas.in.h:25
+msgid "The aspect source of the mail summary popup fonts. Must be \"theme\" or \"custom\"."
+msgstr "L'origen de les fonts del resum emergent de correu. Ha de ser \"theme\" o \"custom\"."
+
+#: ../data/mail-notification.schemas.in.h:26
+msgid "The command to run when all mail is read."
+msgstr "La comanda a executar en no haver correu per llegir."
+
+#: ../data/mail-notification.schemas.in.h:27
+msgid "The command to run when new mail arrives."
+msgstr "La comanda a executar en arribar correu nou."
+
+#: ../data/mail-notification.schemas.in.h:28
+msgid "The custom font to use for the contents of the mail summary popup."
+msgstr "La font a usar per al contingut del resum emergent de correu."
+
+#: ../data/mail-notification.schemas.in.h:29
+msgid "The custom font to use for the title of the mail summary popup."
+msgstr "La font a usar per al ttol del resum emergent de correu."
+
+#: ../data/mail-notification.schemas.in.h:30
+msgid "The height of the properties dialog in pixels."
+msgstr "L'alada del dileg de propietats en pxels."
+
+#: ../data/mail-notification.schemas.in.h:31
+msgid "The list of trusted SSL/TLS servers (hostname:port) lacking a X509 certificate."
+msgstr "Llista de servidors confiables SSL/TLS (servidor:port) sense certificat X509."
+
+#: ../data/mail-notification.schemas.in.h:32
+msgid "The list of trusted X509 certificates, represented by their MD5 fingerprint."
+msgstr "Llista de certificats X509 confiables, representats per les empremtes digitals MD5."
+
+#: ../data/mail-notification.schemas.in.h:33
+msgid "The number of pixels to leave between the left or right side of the screen and the mail summary popup."
+msgstr "El nombre de pxels entre els costats esquerre i dret de la pantalla i el resum emergent de correu."
+
+#: ../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 "El nombre de pxels entre els costats superior i inferior de la pantalla i el resum emergent de correu."
+
+#: ../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 "Posici del resum emergent de correu. Ha de ser \"superior-esquerra\", \"superior-dreta\", \"inferior-esquerra\" o \"inferior-dreta\"."
+
+#: ../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 "El tipus de resum de correu que es mostrar com a consell de la icona. Ha de ser \"estndard\", \"compacte\" o \"cap\"."
+
+#: ../data/mail-notification.schemas.in.h:37
+msgid "The width of the properties dialog in pixels."
+msgstr "L'amplada del dileg de propietats en pxels."
+
+#: ../data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "Resum de correu"
+
+#: ../data/mail-notification.schemas.in.h:39
+msgid "Trusted servers list"
+msgstr "Llista de servidors confiables"
+
+#: ../data/mail-notification.schemas.in.h:40
+msgid "Whether the status icon should blink on errors or not."
+msgstr "Si la icona d'estat ha de parpellejar quan hi ha errors."
+
+#: ../data/mail-notification.schemas.in.h:41
+msgid "Whether to automatically close the mail summary popup or not."
+msgstr "Si s'ha de tancar automticament el resum emergent de correu."
+
+#: ../data/mail-notification.schemas.in.h:42
+msgid "Whether to display an icon when there is no new mail or not."
+msgstr "Si s'ha de mostrar una icona quan no hi ha correu nou."
+
+#: ../data/mail-notification.schemas.in.h:43
+msgid "Whether to display seen mail or not."
+msgstr "Si s'ha de mostrar el correu vist."
+
+#: ../data/mail-notification.schemas.in.h:44
+msgid "Whether to display the mail summary popup when new mail arrives or not."
+msgstr "Si s'ha de mostrar el resum emergent de correu en arribar correu nou."
+
+#: ../data/mail-notification.schemas.in.h:45
+msgid "Whether to hide previously displayed mail in the mail summary popup or not."
+msgstr "Si s'han d'amagar els correus mostrats anteriorment al resum emergent de correu."
+
+#: ../data/mail-notification.schemas.in.h:46
+msgid "Whether to run a command when all mail is read or not."
+msgstr "Si s'ha d'executar una comanda en no haver correu per llegir."
+
+#: ../data/mail-notification.schemas.in.h:47
+msgid "Whether to run a command when new mail arrives or not."
+msgstr "Si s'ha d'executar una comanda en arribar correu nou."
+
+#: ../data/mail-notification.schemas.in.h:48
+msgid "Width of properties dialog"
+msgstr "Amplada del dileg de propietats"
+
+#: ../src/eggtrayicon.c:132
+msgid "Orientation"
+msgstr "Orientaci"
+
+#: ../src/eggtrayicon.c:133
+msgid "The orientation of the tray."
+msgstr "L'orientaci de la safata."
+
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:49
+msgid "A Mail Notification Icon"
+msgstr "Icona de l'avisador de correu"
+
+#.
+#. * 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 "topi <topi@phreaker.net>"
+
+#: ../src/mn-about-dialog.gob:79
+msgid "Unable to open link"
+msgstr "No s'ha pogut obrir l'enlla"
+
+#: ../src/mn-auth-combo-box.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:109
+msgid "<span style=\"italic\">autodetect</span>"
+msgstr "<span style=\"italic\">autodetectar</span>"
+
+#: ../src/mn-authenticated-mailbox-properties.gob:46
+msgid "_Username:"
+msgstr "_Nom d'usuari:"
+
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "_Password:"
+msgstr "_Contrasenya:"
+
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Location"
+msgstr "Ubicaci"
+
+#: ../src/mn-autodetect-mailbox-properties.gob:122
+msgid "_Location:"
+msgstr "U_bicaci:"
+
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
+msgid "_Browse..."
+msgstr "_Navega..."
+
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
+msgid "Select a File or Folder"
+msgstr "Selecciona un Fitxer o Directori"
+
+#: ../src/mn-client-session.c:247
+#, c-format
+msgid "resolving %s"
+msgstr "resolent %s"
+
+#: ../src/mn-client-session.c:263
+#, c-format
+msgid "unable to resolve %s: %s"
+msgstr "no s'ha pogut resoldre %s: %s"
+
+#: ../src/mn-client-session.c:304
+#, c-format
+msgid "network address #%i"
+msgstr "adrea de xarxa #%i"
+
+#: ../src/mn-client-session.c:307
+#, c-format
+msgid "unable to convert network address #%i into textual form: %s"
+msgstr "no s'ha pogut convertir l'adrea de xarxa #%i a format textual: %s"
+
+#: ../src/mn-client-session.c:318
+#, c-format
+msgid "%s: unsupported address family"
+msgstr "%s: famlia d'adreces no suportada"
+
+#: ../src/mn-client-session.c:325
+#, c-format
+msgid "%s: unable to create socket: %s"
+msgstr "%s: no s'ha pogut crear el scol: %s"
+
+#: ../src/mn-client-session.c:329
+#, c-format
+msgid "connecting to %s (%s) port %i"
+msgstr "connectant a %s (%s) port %i"
+
+#: ../src/mn-client-session.c:332
+#, c-format
+msgid "unable to connect: %s"
+msgstr "no s'ha pogut connectar: %s"
+
+#: ../src/mn-client-session.c:337
+msgid "connected successfully"
+msgstr "connectat amb xit"
+
+#. if reached, we couldn't find a working address
+#: ../src/mn-client-session.c:351
+#, c-format
+msgid "unable to connect to %s"
+msgstr "no s'ha pogut connectar a %s"
+
+#: ../src/mn-client-session.c:378
+#, c-format
+msgid "unable to initialize the OpenSSL library: %s"
+msgstr "no s'ha pogut inicialitzar la llibreria OpenSSL: %s"
+
+#: ../src/mn-client-session.c:386
+#, c-format
+msgid "unable to create a SSL/TLS object: %s"
+msgstr "no s'ha pogut crear un objecte SSL/TLS: %s"
+
+#: ../src/mn-client-session.c:392
+#, c-format
+msgid "unable to set the SSL/TLS file descriptor: %s"
+msgstr "no s'ha pogut ajustar el descriptor de fitxer SSL/TLS: %s"
+
+#: ../src/mn-client-session.c:398
+#, c-format
+msgid "unable to perform the SSL/TLS handshake: %s"
+msgstr "no s'ha pogut realitzar la negociaci SSL/TLS: %s"
+
+#: ../src/mn-client-session.c:404
+msgid "untrusted server"
+msgstr "servidor no confiable"
+
+#: ../src/mn-client-session.c:408
+#, c-format
+msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
+msgstr "no hi ha cap capa SSL/TLS activa (%s, %s %i-bit)"
+
+#: ../src/mn-client-session.c:455
+#, c-format
+msgid "%s, fingerprint: %s"
+msgstr "%s, empremta digitals: %s"
+
+#: ../src/mn-client-session.c:484
+msgid "missing certificate"
+msgstr "manca el certificat"
+
+#: ../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 ""
+"L'avisador de correu no ha pogut establir la confiana per a \"%s\" (%s). s possible que alg estigui interceptant la comunicaci per obtenir informaci confidencial.\n"
+"\n"
+"Noms haureu de connectar al servidor si esteu segurs d'estar connectant a \"%s\". Si trieu connectar al servidor, no es tornar a mostrar-aquest missatge."
+
+#: ../src/mn-client-session.c:525
+msgid "Connect to untrusted server?"
+msgstr "Voleu connectar al servidor no confiable?"
+
+#: ../src/mn-client-session.c:590
+#, c-format
+msgid "response \"%s\" is not valid in current context"
+msgstr "la resposta \"%s\" no s vlida en el context actual"
+
+#: ../src/mn-client-session.c:619
+#, c-format
+msgid "unable to parse response \"%s\""
+msgstr "no s'ha pogut analitzar la resposta: \"%s\""
+
+#: ../src/mn-client-session.c:669
+#: ../src/mn-client-session.c:676
+#, c-format
+msgid "unable to read from server: %s"
+msgstr "no s'ha pogut llegir des del servidor: %s"
+
+#: ../src/mn-client-session.c:674
+msgid "unable to read from server: EOF"
+msgstr "no s'ha pogut llegir des del servidor: EOF"
+
+#: ../src/mn-client-session.c:686
+#, c-format
+msgid "unable to decode data using SASL: %s"
+msgstr "no s'ha pogut descodificar les dades usant SASL: %s"
+
+#: ../src/mn-client-session.c:831
+#, c-format
+msgid "unable to encode data using SASL: %s"
+msgstr "no s'ha pogut codificar les dades usant SASL: %s"
+
+#: ../src/mn-client-session.c:862
+#: ../src/mn-client-session.c:869
+#, c-format
+msgid "unable to write to server: %s"
+msgstr "no s'ha pogut escriure cap al servidor: %s"
+
+#: ../src/mn-client-session.c:867
+msgid "unable to write to server: EOF"
+msgstr "no s'ha pogut escriure cap al servidor: EOF"
+
+#: ../src/mn-client-session.c:898
+#: ../src/mn-pop3-mailbox.gob:433
+#, c-format
+msgid "unable to encode Base64: %s"
+msgstr "no s'ha pogut descodificar en Base64: %s"
+
+#: ../src/mn-client-session.c:1075
+#, c-format
+msgid "unable to initialize the SASL library: %s"
+msgstr "no s'ha pogut inicialitzar la llibreria SASL: %s"
+
+#: ../src/mn-client-session.c:1087
+#, c-format
+msgid "unable to retrieve local address of socket: %s"
+msgstr "no s'ha pogut recuperar l'adrea local del scol: %s"
+
+#: ../src/mn-client-session.c:1093
+#, c-format
+msgid "unable to retrieve remote address of socket: %s"
+msgstr "no s'ha pogut recuperar l'adrea remota del scol: %s"
+
+#: ../src/mn-client-session.c:1127
+#, c-format
+msgid "unable to set SASL security properties: %s"
+msgstr "no s'han pogut ajustar les propietats de seguretat SASL: %s"
+
+#: ../src/mn-client-session.c:1151
+msgid "unable to start SASL authentication: SASL asked for something we did not know"
+msgstr "no s'ha pogut iniciar l'autenticaci SASL: SASL ha preguntat alguna cosa que no sabem"
+
+#: ../src/mn-client-session.c:1170
+#, c-format
+msgid "unable to start SASL authentication: %s"
+msgstr "no s'ha pogut iniciar l'autenticaci SASL: %s"
+
+#: ../src/mn-client-session.c:1174
+#, c-format
+msgid "unable to create a SASL connection: %s"
+msgstr "no s'ha pogut crear una connexi SASL: %s"
+
+#: ../src/mn-client-session.c:1221
+msgid "SASL asked for something we did not know, aborting SASL authentication"
+msgstr "SASL ha preguntat alguna cosa que no sabem, avortant l'autenticaci SASL"
+
+#: ../src/mn-client-session.c:1238
+#, c-format
+msgid "%s, aborting SASL authentication"
+msgstr "%s, avortant l'autenticaci SASL"
+
+#. compliance error
+#: ../src/mn-client-session.c:1243
+#, c-format
+msgid "unable to decode Base64 input from server: %s"
+msgstr "no s'ha pogut descodificar en Base64 l'entrada del servidor: %s"
+
+#: ../src/mn-client-session.c:1279
+#, c-format
+msgid "a SASL security layer of strength factor %i is now active"
+msgstr "s'ha activat una capa de seguretat SASL de factor de fora %i"
+
+#. 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 "no s'ha pogut llegir la propietat SASL_MAXOUTBUF: %s"
+
+#: ../src/mn-client-session.c:1290
+#, c-format
+msgid "warning: unable to get SASL_SSF property: %s"
+msgstr "avs: no s'ha pogut llegir la propietat SASL_SSF: %s"
+
+#: ../src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "error desconegut del servidor"
+
+#: ../src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "Bstia"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "De"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "Assumpte"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "Enviat"
+
+#: ../src/mn-conf.c:262
+msgid "A directory creation error has occurred"
+msgstr "S'ha produt un error creant un directori"
+
+#: ../src/mn-conf.c:263
+#, c-format
+msgid "Unable to create directory \"%s\": %s."
+msgstr "No s'ha pogut crear el directori \"%s\": %s."
+
+#: ../src/mn-conf.c:402
+#, c-format
+msgid "recursively unsetting %s"
+msgstr "desajustant recursivament %s"
+
+#: ../src/mn-conf.c:406
+msgid "syncing the GConf database"
+msgstr "sincronitzant amb la base de dades de GConf"
+
+#: ../src/mn-conf.c:409
+msgid "completed"
+msgstr "completat"
+
+#: ../src/mn-conf.c:1137
+msgid "A command error has occurred in Mail Notification"
+msgstr "S'ha produt un error en el avisador de correu"
+
+#: ../src/mn-conf.c:1138
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "No s'ha pogut executar \"%s\": %s."
+
+#: ../src/mn-custom-vfs-mailbox.gob:76
+msgid "invalid location"
+msgstr "ubicaci no vlida"
+
+#: ../src/mn-evolution-folder-tree-control.c:91
+msgid "The currently selected URI"
+msgstr "L'URI seleccionat actualment"
+
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:68
+msgid "Folder"
+msgstr "Carpeta"
+
+#: ../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 "L'avisador de correu no pot contactar amb l'Evolution. Comproveu que l'Evolution s'est executant i que est carregat el connector de l'avisador de correu."
+
+#: ../src/mn-evolution-mailbox.gob:75
+msgid "folder not found"
+msgstr "no s'ha trobat la carpeta"
+
+#: ../src/mn-evolution-mailbox.gob:212
+msgid "unable to contact Evolution"
+msgstr "no s'ha pogut contactar amb l'Evolution"
+
+#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:140
+msgid "Unable to activate the Mail Notification plugin"
+msgstr "No s'ha pogut activar el connector de l'avisador de correu"
+
+#: ../src/mn-evolution-plugin.c:136
+#, c-format
+msgid "Bonobo could not locate the %s server. Please check your Mail Notification installation."
+msgstr "Bonobo no ha pogut trobar el servidor %s. Comproveu la installaci de l'avisador de correu."
+
+#: ../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 no ha pogut registrar el servidor %s. Comproveu la installaci de l'avisador de correu."
+
+#: ../src/mn-gmail-mailbox.gob:103
+msgid "invalid feed location"
+msgstr "la ubicaci de l'alimentaci no s vlida"
+
+#: ../src/mn-gmail-mailbox.gob:117
+#, c-format
+msgid "retrieving feed from %s"
+msgstr "recuperant l'alimentaci des de %s"
+
+#: ../src/mn-gmail-mailbox.gob:124
+#, c-format
+msgid "unable to retrieve feed: %s"
+msgstr "no s'ha pogut recuperar l'alimentaci: %s"
+
+#: ../src/mn-gmail-mailbox.gob:139
+#: ../src/mn-gmail-mailbox.gob:187
+msgid "unable to parse feed"
+msgstr "no s'ha pogut analitzar l'alimentaci"
+
+#: ../src/mn-gmime-stream-vfs.gob:50
+#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#, c-format
+msgid "unable to read %s: %s"
+msgstr "no s'ha pogut llegir %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:52
+#, c-format
+msgid "unable to write to %s: %s"
+msgstr "no s'ha pogut escriure en %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:54
+#, c-format
+msgid "unable to seek in %s: %s"
+msgstr "no s'ha pogut cercar en %s: %s"
+
+#: ../src/mn-gmime-stream-vfs.gob:56
+#, c-format
+msgid "unable to tell position of %s: %s"
+msgstr "no s'ha pogut fixar la posici de %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 "no s'ha pogut tancar %s: %s"
+
+#: ../src/mn-imap-mailbox-properties.gob:114
+#: ../src/mn-standard-message-view.gob:62
+msgid "Mailbox:"
+msgstr "Bstia:"
+
+#: ../src/mn-imap-mailbox-properties.gob:118
+msgid "in_box"
+msgstr "d'ent_rada"
+
+#: ../src/mn-imap-mailbox-properties.gob:129
+msgid "oth_er:"
+msgstr "_una altra:"
+
+#: ../src/mn-imap-mailbox-properties.gob:140
+msgid "ne_ver"
+msgstr "_mai"
+
+#: ../src/mn-imap-mailbox-properties.gob:141
+msgid "au_todetect"
+msgstr "_autodetecta"
+
+#: ../src/mn-imap-mailbox-properties.gob:142
+msgid "al_ways"
+msgstr "sem_pre"
+
+#: ../src/mn-imap-mailbox-properties.gob:174
+msgid "Use the <span style=\"italic\">IDLE</span> extension:"
+msgstr "Usa l'extensi <span style=\"italic\">IDLE</span>:"
+
+#: ../src/mn-imap-mailbox.gob:384
+msgid "server did not send capabilities"
+msgstr "el servidor no ha enviat les capacitats"
+
+#: ../src/mn-imap-mailbox.gob:551
+msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
+msgstr "el servidor ha avisat LOGINDISABLED, no s'usar l'autenticaci LOGIN"
+
+#: ../src/mn-imap-mailbox.gob:552
+msgid "unable to login"
+msgstr "no s'ha pogut entrar"
+
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:752
+msgid "server did not send all the messages we requested"
+msgstr "el servidor no ha enviat tots els missatges que hem sollicitat"
+
+#: ../src/mn-imap-mailbox.gob:822
+msgid "unable to fetch message"
+msgstr "no s'ha pogut recuperar el missatge"
+
+#: ../src/mn-imap-mailbox.gob:847
+msgid "\"Use the IDLE extension\" set to \"never\" in the mailbox properties, logging out"
+msgstr "\"Usa l'extensi IDLE\" ha de ser \"mai\" a les propietats de la bstia, sortint"
+
+#: ../src/mn-imap-mailbox.gob:858
+#, c-format
+msgid "the remote server runs %s, not using the IDLE extension"
+msgstr "el servidor remot executa %s, no s'usar l'extensi IDLE"
+
+#: ../src/mn-imap-mailbox.gob:863
+#, c-format
+msgid "the remote server runs %s, the IDLE extension might not function properly"
+msgstr "el servidor remot executa %s, s possible que l'extensi IDLE no funcioni correctament"
+
+#: ../src/mn-imap-mailbox.gob:872
+msgid "the remote server does not support the IDLE extension, logging out"
+msgstr "el servidor remot no suporta l'extensi IDLE, sortint"
+
+#: ../src/mn-imap-mailbox.gob:1377
+#: ../src/mn-pop3-mailbox.gob:296
+msgid "server does not support in-band SSL/TLS"
+msgstr "el servidor no suporta SSL/TLS en banda"
+
+#: ../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 "s'ha seleccionat un mecanisme d'autenticaci SASL, per el suport de SASL no est disponible"
+
+#: ../src/mn-imap-mailbox.gob:1411
+#: ../src/mn-pop3-mailbox.gob:967
+#, c-format
+msgid "unknown authentication mechanism \"%s\""
+msgstr "mecanisme d'autenticaci desconegut \"%s\""
+
+#: ../src/mn-imap-mailbox.gob:1443
+#: ../src/mn-pop3-mailbox.gob:1003
+#, c-format
+msgid "disabling mechanism \"%s\" and retrying SASL authentication"
+msgstr "inhabilitant el mecanisme \"%s\" i tornant a provar amb l'autenticaci SASL"
+
+#: ../src/mn-imap-mailbox.gob:1455
+msgid "falling back to IMAP LOGIN authentication"
+msgstr "passant a autenticaci amb IMAP LOGIN"
+
+#: ../src/mn-imap-mailbox.gob:1467
+#: ../src/mn-pop3-mailbox.gob:1032
+msgid "authentication failed"
+msgstr "l'autenticaci ha fallat"
+
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "el servidor no ha enviat els resultats de la cerca"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:89
+msgid "_Mail Reader"
+msgstr "_Client de correu"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:91
+#: ../src/mn-mailbox-view.gob:312
+msgid "_Update"
+msgstr "_Actualitzar"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
+msgid "R_emove From Notification Area"
+msgstr "_Suprimir de l'rea de notificaci"
+
+#. 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\">Resum de Correu</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mail-summary-popup.gob:277
+msgid "<span weight=\"bold\">Mail Summary</span>"
+msgstr "<span weight=\"bold\">Resum de Correu</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:89
+#, c-format
+msgid "%s Properties"
+msgstr "Propietats de %s"
+
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:232
+msgid "Add a Mailbox"
+msgstr "Afegeix una Bstia"
+
+#: ../src/mn-mailbox-view.gob:248
+msgid "A paste error has occurred"
+msgstr "S'ha produt un error enganxant"
+
+#: ../src/mn-mailbox-view.gob:557
+#, c-format
+msgid "unhandled %s mailbox (%s)"
+msgstr "bstia %s no gestionada (%s)"
+
+#: ../src/mn-mailbox-view.gob:562
+#, c-format
+msgid "%s mailbox"
+msgstr "bstia %s"
+
+#: ../src/mn-mailbox-view.gob:577
+msgid "detecting mailbox type..."
+msgstr "detectant el tipus de bstia..."
+
+#: ../src/mn-mailbox.gob:472
+msgid "\"type\" attribute missing"
+msgstr "manca l'atribut de \"tipus\""
+
+#: ../src/mn-mailbox.gob:479
+#, c-format
+msgid "unknown mailbox type \"%s\""
+msgstr "tipus de bstia \"%s\" desconegut"
+
+#: ../src/mn-mailbox.gob:499
+#, c-format
+msgid "property \"%s\": unable to transform string \"%s\" into a value of type \"%s\""
+msgstr "propietat \"%s\": no es pot transformar la cadena \"%s\" a un valor de tipus \"%s\""
+
+#: ../src/mn-mailbox.gob:948
+#, c-format
+msgid "property \"%s\" has no value"
+msgstr "la propietat \"%s\" no t valor"
+
+#: ../src/mn-mailboxes.gob:239
+msgid "An error has occurred while importing old mailboxes"
+msgstr "S'ha produt un error important bsties antigues"
+
+#: ../src/mn-mailboxes.gob:265
+msgid "Unable to load the mailboxes configuration"
+msgstr "No es pot carregar la configuraci de les bsties"
+
+#: ../src/mn-mailboxes.gob:311
+msgid "Unable to parse the XML document."
+msgstr "No es pot analitzar el document XML."
+
+#: ../src/mn-mailboxes.gob:318
+msgid "The root element is missing."
+msgstr "Manca l'element arrel."
+
+#: ../src/mn-mailboxes.gob:324
+#, c-format
+msgid "The root element \"%s\" is invalid."
+msgstr "L'element arrel \"%s\" no s vlid."
+
+#: ../src/mn-mailboxes.gob:347
+#, c-format
+msgid "On line %i: %s."
+msgstr "En lnia %i: %s."
+
+#: ../src/mn-mailboxes.gob:352
+#, c-format
+msgid "On line %i: unknown element \"%s\"."
+msgstr "En lnia %i: element \"%s\" desconegut."
+
+#: ../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] "S'ha produt un error carregant la configuraci de les bsties"
+msgstr[1] "S'han produt errors carregant la configuraci de les bsties"
+
+#: ../src/mn-mailboxes.gob:386
+msgid "Unable to save the mailboxes configuration"
+msgstr "No es pot desar la configuraci de les bsties"
+
+#: ../src/mn-mailboxes.gob:428
+#, c-format
+msgid "Unable to remove %s: %s."
+msgstr "No es pot suprimir %s: %s."
+
+#: ../src/mn-mailboxes.gob:436
+#, c-format
+msgid "Unable to create %s: %s."
+msgstr "No es pot crear %s: %s."
+
+#: ../src/mn-mailboxes.gob:443
+#, c-format
+msgid "Unable to open %s for writing: %s."
+msgstr "No es pot obrir %s per escriptura: %s."
+
+#: ../src/mn-mailboxes.gob:450
+msgid "Unable to write the XML document."
+msgstr "No es pot escriure el document XML."
+
+#: ../src/mn-mailboxes.gob:456
+#, c-format
+msgid "Unable to close %s: %s."
+msgstr "No es pot tancar %s: %s."
+
+#: ../src/mn-mailboxes.gob:466
+#: ../src/mn-mailboxes.gob:473
+#, c-format
+msgid "Unable to rename %s to %s: %s."
+msgstr "No es pot canviar el nom de %s a %s: %s."
+
+#. non fatal
+#: ../src/mn-mailboxes.gob:479
+#, c-format
+msgid "unable to delete %s: %s"
+msgstr "no es pot suprimir %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 t %i missatge nou"
+msgstr[1] "%s t %i missatges nous"
+
+#: ../src/mn-mailboxes.gob:535
+#, c-format
+msgid "%s reported an error: %s"
+msgstr "%s ha generat un error: %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:125
+#, c-format
+msgid "unable to open folder \"%s\": %s"
+msgstr "no es pot obrir la carpeta \"%s\": %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:173
+#, c-format
+msgid "unable to close folder \"%s\": %s"
+msgstr "no es pot tancar la carpeta \"%s\": %s"
+
+#: ../src/mn-maildir-mailbox-backend.gob:176
+#, c-format
+msgid "error while reading folder \"%s\": %s"
+msgstr "s'ha produt un error en llegir la carpeta \"%s\": %s"
+
+#: ../src/mn-main.c:100
+msgid "yes"
+msgstr "s"
+
+#: ../src/mn-main.c:100
+msgid "no"
+msgstr "no"
+
+#: ../src/mn-main.c:132
+#, c-format
+msgid "%s version %s\n"
+msgstr "%s versi %s\n"
+
+#: ../src/mn-main.c:137
+msgid "Mailbox backends:\n"
+msgstr "Rerefons de la bstia:\n"
+
+#: ../src/mn-main.c:142
+msgid "POP3 and IMAP features:\n"
+msgstr "Caracterstiques de POP3 i IMAP:\n"
+
+#: ../src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Caracterstiques de Sylpheed:\n"
+
+#: ../src/mn-main.c:198
+#, c-format
+msgid "A Bonobo exception (%s) has occurred in %s()."
+msgstr "S'ha produt una excepci de Bonobo (%s) en %s()."
+
+#: ../src/mn-main.c:220
+msgid "Show version information"
+msgstr "Mostra la informaci de la versi"
+
+#: ../src/mn-main.c:229
+msgid "Enable informational output"
+msgstr "Habilita la sortida d'informaci"
+
+#: ../src/mn-main.c:238
+msgid "Display the properties dialog"
+msgstr "Mostra el dileg de propietats"
+
+#: ../src/mn-main.c:247
+msgid "Display the about dialog"
+msgstr "Mostra el dileg Quant a"
+
+#: ../src/mn-main.c:256
+msgid "Close the mail summary popup"
+msgstr "Tanca el resum emergent de correu"
+
+#: ../src/mn-main.c:265
+msgid "Update the mail status"
+msgstr "Actualitza l'estat del correu"
+
+#: ../src/mn-main.c:274
+msgid "Unset obsolete GConf configuration"
+msgstr "Desajusta la configuraci obsoleta de GConf"
+
+#: ../src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "Sortir de l'avisador de correu"
+
+#.
+#. * 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 "no est disponible el muti-threading"
+
+#: ../src/mn-main.c:365
+msgid "Bonobo could not locate the automation object. Please check your Mail Notification installation."
+msgstr "Bonobo no pot trobar l'objecte d'automatitzaci. Comproveu la installaci de l'avisador de correu."
+
+#: ../src/mn-main.c:371
+msgid "quitting Mail Notification"
+msgstr "sortint de l'avisador de correu"
+
+#: ../src/mn-main.c:375
+msgid "Mail Notification is not running"
+msgstr "L'avisador de correu no s'est executant"
+
+#: ../src/mn-main.c:390
+msgid "Unable to initialize the GnomeVFS library."
+msgstr "No s'ha pogut inicialitzar la llibreria GnomeVFS."
+
+#: ../src/mn-main.c:438
+msgid "updating the mail status"
+msgstr "actualitzant l'estat del correu"
+
+#: ../src/mn-main.c:446
+msgid "Mail Notification is already running"
+msgstr "L'avisador de correu ja s'est executant"
+
+#: ../src/mn-main.c:456
+#, c-format
+msgid "Bonobo could not locate the %s file. Please check your Mail Notification installation."
+msgstr "Bonobo no ha pogut trobar el fitxer %s. Comproveu la installaci de l'avisador de correu."
+
+#: ../src/mn-mbox-mailbox-backend.gob:281
+#, c-format
+msgid "unable to close file: %s"
+msgstr "no s'ha pogut tancar el fitxer: %s"
+
+#: ../src/mn-mbox-mailbox-backend.gob:298
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "no s'ha pogut obrir la bstia: %s"
+
+#: ../src/mn-message-mime.c:121
+msgid "unable to parse MIME message"
+msgstr "no s'ha pogut analitzar el missatge MIME"
+
+#: ../src/mn-message.gob:111
+msgid "Unknown"
+msgstr "Desconegut"
+
+#. translators: "none" is used like "Mailbox: none"
+#: ../src/mn-message.gob:130
+msgid "none"
+msgstr "cap"
+
+#: ../src/mn-mh-mailbox-backend.gob:167
+#, c-format
+msgid "error while reading %s: %s"
+msgstr "s'ha produt un error en llegir %s: %s"
+
+#: ../src/mn-mh-mailbox-backend.gob:180
+#, c-format
+msgid "unable to open %s: %s"
+msgstr "no s'ha pogut obrir %s: %s"
+
+#: ../src/mn-pi-mailbox-properties.gob:67
+msgid "sta_ndard"
+msgstr "_estndard"
+
+#: ../src/mn-pi-mailbox-properties.gob:68
+msgid "in-band SS_L/TLS"
+msgstr "SS_L/TLS en banda"
+
+#: ../src/mn-pi-mailbox-properties.gob:69
+msgid "SSL/TLS on sepa_rate port"
+msgstr "SSL/TLS en un port _diferent"
+
+#: ../src/mn-pi-mailbox-properties.gob:73
+msgid "Ho_stname:"
+msgstr "_Servidor:"
+
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:94
+msgid "_Details"
+msgstr "_Detalls"
+
+#: ../src/mn-pi-mailbox-properties.gob:149
+msgid "Connection type:"
+msgstr "Tipus de connexi:"
+
+#: ../src/mn-pi-mailbox-properties.gob:156
+msgid "Port:"
+msgstr "Port:"
+
+#: ../src/mn-pi-mailbox-properties.gob:179
+msgid "Authent_ication mechanism:"
+msgstr "Mecanisme d'_autenticaci:"
+
+#: ../src/mn-pi-mailbox.gob:151
+msgid "SSL/TLS support has not been compiled in"
+msgstr "El suport de SSL/TLS no est disponible"
+
+#: ../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 ""
+"L'avisador de correu no ha estat capa d'entrar a la bstia %s %s, possiblement perqu les credencials entrades no sn vlides.\n"
+"\n"
+"Torneu a introduir les credencials."
+
+#: ../src/mn-pi-mailbox.gob:318
+#, c-format
+msgid "Enter your credentials for %s mailbox %s."
+msgstr "Introduu les credencials per a la bstia %s %s."
+
+#. keep the title in sync with gnome-authentication-manager
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox.gob:361
+msgid "Authentication Required"
+msgstr "Autenticaci Obligatria"
+
+#: ../src/mn-pop3-mailbox.gob:344
+msgid "invalid arguments for the LOGIN-DELAY capability"
+msgstr "argument no vlids per a la capacitat 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 "Als servidors amb autenticaci SASL que fallen la resposta inicial del client, reprova sense resposta inicial del client"
+
+#: ../src/mn-pop3-mailbox.gob:696
+msgid "unknown error"
+msgstr "error desconegut"
+
+#: ../src/mn-pop3-mailbox.gob:791
+#, c-format
+msgid "honouring LOGIN-DELAY, sleeping for %i second"
+msgstr "seguint LOGIN-DELAY, s'esperar durant %i segon"
+
+#: ../src/mn-pop3-mailbox.gob:959
+msgid "server does not support APOP authentication"
+msgstr "el servidor no suporta autenticaci APOP"
+
+#: ../src/mn-pop3-mailbox.gob:1015
+msgid "falling back to APOP authentication"
+msgstr "passant a autenticaci amb APOP"
+
+#: ../src/mn-pop3-mailbox.gob:1020
+msgid "falling back to USER/PASS authentication"
+msgstr "passant a autenticaci amb USER/PASS"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:173
+#: ../ui/properties-dialog.glade.h:23
+msgid "Mail Notification Properties"
+msgstr "Propietats de l'avisador de correu"
+
+#: ../src/mn-properties-dialog.gob:207
+msgid "top left"
+msgstr "superior esquerra"
+
+#: ../src/mn-properties-dialog.gob:208
+msgid "top right"
+msgstr "superior dreta"
+
+#: ../src/mn-properties-dialog.gob:209
+msgid "bottom left"
+msgstr "inferior esquerra"
+
+#: ../src/mn-properties-dialog.gob:210
+msgid "bottom right"
+msgstr "inferior dreta"
+
+#: ../src/mn-properties-dialog.gob:332
+msgid "No mailbox selected."
+msgstr "Cap bstia seleccionada."
+
+#: ../src/mn-properties-dialog.gob:337
+#, c-format
+msgid "%i mailbox selected."
+msgstr "%i bsties seleccionades."
+
+#: ../src/mn-properties-dialog.gob:456
+#, c-format
+msgid "Test message #%i"
+msgstr "Correu de prova #%i"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:462
+msgid "Mail Notification Properties Dialog"
+msgstr "Dileg de Propietats de l'avisador de correu"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:381
+msgid "Mailboxes Having New Mail"
+msgstr "Bsties amb Correu Nou"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:400
+msgid "Errors"
+msgstr "Errors"
+
+#. translators: header capitalization
+#: ../src/mn-shell.gob:416
+msgid "Mail Summary"
+msgstr "Resum de Correu"
+
+#: ../src/mn-shell.gob:445
+msgid "You have no new mail."
+msgstr "No hi ha correu nou."
+
+#: ../src/mn-ssl.c:76
+msgid "unknown SSL/TLS error"
+msgstr "s'ha produt un error SSL/TSL desconegut"
+
+#: ../src/mn-standard-message-view.gob:64
+msgid "Unreadable message:"
+msgstr "Correu illegible:"
+
+#: ../src/mn-standard-message-view.gob:67
+msgid "From:"
+msgstr "De:"
+
+#: ../src/mn-standard-message-view.gob:68
+msgid "Subject:"
+msgstr "Assumpte:"
+
+#: ../src/mn-standard-message-view.gob:72
+msgid "Sent:"
+msgstr "Enviat:"
+
+#. translators: header capitalization
+#: ../src/mn-stock.c:29
+msgid "Select _All"
+msgstr "Selecciona _Tots"
+
+#. translators: header capitalization
+#. translators: header capitalization
+#: ../src/mn-stock.c:32
+msgid "Co_nnect"
+msgstr "Co_nnecta"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#, c-format
+msgid "unable to open folder: %s"
+msgstr "no s'ha pogut obrir la carpeta: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#, c-format
+msgid "unable to close folder: %s"
+msgstr "no s'ha pogut tancar la carpeta: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#, c-format
+msgid "error while reading folder: %s"
+msgstr "s'ha produt un error en llegir la carpeta: %s"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:420
+msgid "unexpected end of file"
+msgstr "final de fitxer inesperat"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#, c-format
+msgid "incompatible file version \"%i\""
+msgstr "versi del fitxer \"%i\" incompatible"
+
+#: ../src/mn-sylpheed-mailbox-backend.gob:441
+msgid "file version missing"
+msgstr "manca la versi del fitxer"
+
+#: ../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 "Bstia de sistema"
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#, c-format
+msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
+msgstr "La bstia del sistema s <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 "No s'ha pogut detectar la ubicaci de la bstia del sistema. Comproveu la variable d'entorn MAIL."
+
+#: ../src/mn-system-vfs-mailbox.gob:72
+msgid "system mailbox not found"
+msgstr "no s'ha trobat la bstia del sistema"
+
+#: ../src/mn-util.c:349
+#, c-format
+msgid "error loading image: %s"
+msgstr "s'ha produt un error carregant la imatge: %s"
+
+#: ../src/mn-util.c:365
+#, c-format
+msgid "Unable to load interface \"%s\". Please check your Mail Notification installation."
+msgstr "No s'ha pogut carregat la interfcie \"%s\". Comproveu la installaci de l'avisador de correu."
+
+#: ../src/mn-util.c:380
+#, c-format
+msgid "Widget \"%s\" not found in interface \"%s\". Please check your Mail Notification installation."
+msgstr "No s'ha torbat el giny \"%s\" a la interfcie \"%s\". Comproveu la installaci de l'avisador de correu."
+
+#: ../src/mn-util.c:449
+#, c-format
+msgid "Unable to open self as a module (%s)."
+msgstr "No s'ha pogut obrir com a mdul (%s)."
+
+#: ../src/mn-util.c:454
+#, c-format
+msgid "Signal handler \"%s\" not found. Please check your Mail Notification installation."
+msgstr "No s'ha trobat el gestor de senyals \"%s\". Comproveu la installaci de l'avisador de correu."
+
+#: ../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 "S'ha produt un error en arrossegar i deixar anar"
+
+#: ../src/mn-util.c:606
+msgid "An invalid location list has been received."
+msgstr "S'ha rebut una llista d'ubicacions no vlida."
+
+#: ../src/mn-util.c:649
+msgid "An invalid Mozilla location has been received."
+msgstr "S'ha rebut una ubicaci de Mozilla no vlida."
+
+#: ../src/mn-util.c:725
+msgid "Unable to display help"
+msgstr "No es pot mostrar l'ajuda"
+
+#: ../src/mn-util.c:739
+#, c-format
+msgid "Unable to create a thread: %s."
+msgstr "No es pot crear el fil: %s"
+
+#: ../src/mn-util.c:899
+#, c-format
+msgid ""
+"The following location is invalid:\n"
+"\n"
+"%sThe following locations are invalid:\n"
+"\n"
+"%s"
+msgstr ""
+"La ubicaci segent no s vlida:\n"
+"\n"
+"%sLes ubicacions segents no sn vlides:\n"
+"\n"
+"%s"
+
+#: ../src/mn-util.c:919
+msgid "A fatal error has occurred in Mail Notification"
+msgstr "S'ha produt un error fatal a l'avisador de correu"
+
+#: ../src/mn-util.c:958
+#, c-format
+msgid "unable to get current time: %s"
+msgstr "no es pot recuperar l'hora actual: %s"
+
+#: ../src/mn-util.c:1250
+#, c-format
+msgid "%i second ago"
+msgid_plural "%i seconds ago"
+msgstr[0] "fa %i segon"
+msgstr[1] "fa %i segons"
+
+#: ../src/mn-util.c:1254
+#, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "fa %i minut"
+msgstr[1] "fa %i minuts"
+
+#: ../src/mn-util.c:1259
+#, c-format
+msgid "about %i hour ago"
+msgid_plural "about %i hours ago"
+msgstr[0] "fa %i hora"
+msgstr[1] "fa %i hores"
+
+#: ../src/mn-util.c:1264
+#, c-format
+msgid "about %i day ago"
+msgid_plural "about %i days ago"
+msgstr[0] "fa %i dia"
+msgstr[1] "fa %i dies"
+
+#: ../src/mn-util.c:1269
+#, c-format
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "fa %i setmana"
+msgstr[1] "fa %i setmanes"
+
+#: ../src/mn-util.c:1282
+msgid "unknown date"
+msgstr "data desconeguda"
+
+#: ../src/mn-vfs-mailbox.gob:221
+#, c-format
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr "no es pot monitoritzar %s (%s), s'ha activat el mode de sondeig"
+
+#: ../src/mn-vfs-mailbox.gob:385
+msgid "unknown mailbox format"
+msgstr "format de bstia desconegut"
+
+#: ../src/mn-vfs-mailbox.gob:385
+msgid "does not exist"
+msgstr "no existeix"
+
+#. 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\">General</span>"
+
+#: ../ui/mailbox-properties-dialog.glade.h:3
+msgid "Delay between mail chec_ks:"
+msgstr "Inter_val entre comprovacions:"
+
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _name:"
+msgstr "Nom de la _bstia:"
+
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Use De_fault"
+msgstr "Usa el _Predeterminat"
+
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Mailbox type:"
+msgstr "T_ipus de bstia:"
+
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:9
+msgid "_Use Default"
+msgstr "_Usa el Predeterminat"
+
+#: ../ui/mailbox-properties-dialog.glade.h:10
+#: ../ui/properties-dialog.glade.h:48
+msgid "minutes"
+msgstr "minuts"
+
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:52
+msgid "seconds"
+msgstr "segons"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Acci en Fer Clic</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:4
+msgid "<span weight=\"bold\">Commands</span>"
+msgstr "<span weight=\"bold\">Comandes</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
+msgid "<span weight=\"bold\">Fonts</span>"
+msgstr "<span weight=\"bold\">Fonts</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:10
+msgid "<span weight=\"bold\">Layout</span>"
+msgstr "<span weight=\"bold\">Disposici</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:12
+msgid "<span weight=\"bold\">Mailbox List</span>"
+msgstr "<span weight=\"bold\">Llista de Bsties</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:14
+msgid "<span weight=\"bold\">Position</span>"
+msgstr "<span weight=\"bold\">Posici</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:16
+msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
+msgstr "<span weight=\"bold\">Resum de correu</span>"
+
+#: ../ui/properties-dialog.glade.h:17
+msgid "Co_ntents:"
+msgstr "Co_ntinguts:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:19
+msgid "General"
+msgstr "General"
+
+#: ../ui/properties-dialog.glade.h:20
+msgid "Hide p_reviously displayed mail"
+msgstr "_Amaga el correus mostrats anteriorment"
+
+#: ../ui/properties-dialog.glade.h:21
+msgid "Hori_zontal offset:"
+msgstr "Distncia _horitzontal:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:25
+msgid "Mail Summary Popup"
+msgstr "Resum Emergent de Correu"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:27
+msgid "Status Icon"
+msgstr "Icona d'Estat"
+
+#: ../ui/properties-dialog.glade.h:28
+msgid "Use these _fonts:"
+msgstr "Usa les _fonts:"
+
+#: ../ui/properties-dialog.glade.h:29
+msgid "When _new mail arrives:"
+msgstr "En arribar correu _nou:"
+
+#: ../ui/properties-dialog.glade.h:30
+msgid "When all mail has _been read:"
+msgstr "En no haver correu per _llegir:"
+
+#: ../ui/properties-dialog.glade.h:31
+msgid "_Always display"
+msgstr "Mostra _sempre"
+
+#: ../ui/properties-dialog.glade.h:32
+msgid "_Automatically close after:"
+msgstr "Ta_nca automticament desprs de:"
+
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Blink on errors"
+msgstr "_Parpelleja si hi ha errors"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Display a Test Popup"
+msgstr "_Mostra un Resum Emergent de Prova"
+
+#: ../ui/properties-dialog.glade.h:36
+msgid "_Display seen mail"
+msgstr "_Mostra el correu vist"
+
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Display this dialog"
+msgstr "_Mostra aquest dileg"
+
+#: ../ui/properties-dialog.glade.h:38
+msgid "_Enable mail summary popup"
+msgstr "Habilita el _resum emergent de correu"
+
+#: ../ui/properties-dialog.glade.h:39
+msgid "_Launch the mail reader"
+msgstr "E_xecuta el client de correu"
+
+#: ../ui/properties-dialog.glade.h:40
+msgid "_None"
+msgstr "C_ap"
+
+#: ../ui/properties-dialog.glade.h:41
+msgid "_Position:"
+msgstr "_Posici:"
+
+#: ../ui/properties-dialog.glade.h:42
+msgid "_Title:"
+msgstr "Tt_ol:"
+
+#: ../ui/properties-dialog.glade.h:43
+msgid "_Update the mail status"
+msgstr "Act_ualitza l'estat del correu"
+
+#: ../ui/properties-dialog.glade.h:44
+msgid "_Use fonts from theme"
+msgstr "_Usa les fonts del tema"
+
+#: ../ui/properties-dialog.glade.h:45
+msgid "_Vertical offset:"
+msgstr "Distncia _vertical:"
+
+#: ../ui/properties-dialog.glade.h:46
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "_Compacte"
+
+#: ../ui/properties-dialog.glade.h:47
+msgid "icon tooltip's mail summary layout|_Standard"
+msgstr "_Estndard"
+
+#: ../ui/properties-dialog.glade.h:49
+msgid "pixels"
+msgstr "pxels"
+
+#: ../ui/properties-dialog.glade.h:50
+msgid "popup's mail summary layout|Co_mpact"
+msgstr "_Compacte"
+
+#: ../ui/properties-dialog.glade.h:51
+msgid "popup's mail summary layout|_Standard"
+msgstr "_Estndard"
+
+
diff --git a/po/fr.po b/po/fr.po
@@ -8,10 +8,10 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 3.0\n"
+"Project-Id-Version: mail-notification 4.0-rc1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-16 02:11+0200\n"
-"PO-Revision-Date: 2006-06-14 09:23+0200\n"
+"POT-Creation-Date: 2006-11-27 22:02+0100\n"
+"PO-Revision-Date: 2006-11-27 22:03+0100\n"
"Last-Translator: Jean-Yves Lefort <jylefort@brutele.be>\n"
"Language-Team: Jean-Yves Lefort <jylefort@brutele.be>\n"
"MIME-Version: 1.0\n"
@@ -48,8 +48,9 @@ msgid "Configure Mail Notification"
msgstr "Configurer l'avertisseur de courrier"
#: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:227
-#: ../src/mn-main.c:132 ../src/mn-main.c:302 ../src/mn-main.c:318
+#: ../data/mail-notification.desktop.in.h:2 ../src/mn-mail-icon.gob:234
+#: ../src/mn-main.c:142 ../src/mn-main.c:348 ../src/mn-main.c:364
+#: ../src/mn-main.c:440
msgid "Mail Notification"
msgstr "Avertisseur de courrier"
@@ -57,149 +58,117 @@ msgstr "Avertisseur de courrier"
msgid "Get notified when new mail arrives"
msgstr "Etre averti lorsque du nouveau courrier arrive"
-#: ../data/mail-notification.schemas.in.h:1
+#: ../data/mail-notification.schemas.in.in.h:1
msgid "Always display an icon"
msgstr "Toujours afficher une icône"
-#: ../data/mail-notification.schemas.in.h:2
-msgid "Automatically close the mail summary popup"
-msgstr "Fermer automatiquement le popup d'aperçu du courrier"
-
-#: ../data/mail-notification.schemas.in.h:3
+#: ../data/mail-notification.schemas.in.in.h:2
msgid "Blink on errors"
msgstr "Clignoter lors d'erreurs"
-#: ../data/mail-notification.schemas.in.h:4
+#: ../data/mail-notification.schemas.in.in.h:3
msgid "Click action"
msgstr "Action du click"
-#: ../data/mail-notification.schemas.in.h:5
+#: ../data/mail-notification.schemas.in.in.h:4
msgid "Display seen mail"
msgstr "Afficher le courrier vu"
-#: ../data/mail-notification.schemas.in.h:6
-msgid "Enable mail summary popup"
-msgstr "Activer le popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:5
+msgid "Enable message popups"
+msgstr "Activer les popups"
+
+#: ../data/mail-notification.schemas.in.in.h:6
+msgid "Expire message popups"
+msgstr "Activer l'expiration des popups"
-#: ../data/mail-notification.schemas.in.h:7
+#: ../data/mail-notification.schemas.in.in.h:7
msgid "Fingerprints of trusted X509 certificates"
msgstr "Empreintes digitales des certificats X509 de confiance"
-#: ../data/mail-notification.schemas.in.h:8
+#: ../data/mail-notification.schemas.in.in.h:8
msgid "Height of properties dialog"
msgstr "Hauteur de la boîte de dialogue contenant les propriétés"
-#: ../data/mail-notification.schemas.in.h:9
-msgid "Mail read command"
-msgstr "Commande de courrier lu"
-
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Mail summary popup contents font"
-msgstr "Police du contenu du popup d'aperçu du courrier"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Mail summary popup fonts aspect source"
+#: ../data/mail-notification.schemas.in.in.h:9
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (minutes part)."
msgstr ""
-"Source d'aspect des polices de caractères du popup d'aperçu du courrier"
+"Si /apps/mail-notification/popups/expiration/enabled est \"true\", le délai "
+"d'expiration des popups (minutes)."
-#: ../data/mail-notification.schemas.in.h:12
-msgid "Mail summary popup horizontal offset"
-msgstr "Décalage horizontal du popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:10
+msgid ""
+"If /apps/mail-notification/popups/expiration/enabled is set to \"true\", the "
+"amount of time to wait before expiring message popups (seconds part)."
+msgstr ""
+"Si /apps/mail-notification/popups/expiration/enabled est \\\"true\\\", le "
+"délai d'expiration des popups (secondes)."
-#: ../data/mail-notification.schemas.in.h:13
-msgid "Mail summary popup position"
-msgstr "Position du popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:11
+msgid "Mail changed command"
+msgstr "Commande de courrier changé"
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail summary popup title font"
-msgstr "Police du titre du popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:12
+msgid "Mail read command"
+msgstr "Commande de courrier lu"
-#: ../data/mail-notification.schemas.in.h:15
-msgid "Mail summary popup vertical offset"
-msgstr "Décalage vertical du popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:13
+msgid "Message popups position"
+msgstr "Position des popups"
-#: ../data/mail-notification.schemas.in.h:16
-msgid "Minutes to wait before closing the mail summary popup"
-msgstr "Minutes à attendre avant de fermer le popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:14
+msgid "Minutes to wait before expiring message popups"
+msgstr "Minutes du délai d'expiration des popups"
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.in.h:15
msgid "New mail command"
msgstr "Commande de nouveau message"
-#: ../data/mail-notification.schemas.in.h:18
-msgid "Only display recent mail in mail summary popup"
-msgstr ""
-"Afficher uniquement le courrier récent dans le popup d'aperçu du courrier"
-
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.in.h:16
msgid "Run a command when all mail is read"
msgstr "Exécuter une commande lorsque tout le courrier est lu"
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.in.h:17
msgid "Run a command when new mail arrives"
msgstr "Exécuter une commande lorsque du nouveau courrier arrive"
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Seconds to wait before closing the mail summary popup"
-msgstr "Secondes à attendre avant de fermer le popup d'aperçu du courrier"
+#: ../data/mail-notification.schemas.in.in.h:18
+msgid "Run a command when the message list changes"
+msgstr "Exécuter une commande lorsque la liste des messages change"
+
+#: ../data/mail-notification.schemas.in.in.h:19
+msgid "Seconds to wait before expiring message popups"
+msgstr "Secondes du délai d'expiration des popups"
-#: ../data/mail-notification.schemas.in.h:22
+#: ../data/mail-notification.schemas.in.in.h:20
msgid ""
"The action to perform when the icon is clicked. Must be \"display-properties-"
-"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
+"dialog\", \"launch-mail-reader\", \"open-latest-message\" or \"update-mail-"
+"status\"."
msgstr ""
"L'action à effectuer lorsque l'icône est clickée. Doit être \"display-"
-"properties-dialog\", \"launch-mail-reader\" ou \"update-mail-status\"."
+"properties-dialog\", \"launch-mail-reader\", \"open-latest-message\" ou "
+"\"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 ""
-"La quantité de temps à attendre avant de fermer le popup d'aperçu du "
-"courrier (partie minutes)."
-
-#: ../data/mail-notification.schemas.in.h:24
-msgid ""
-"The amount of time to wait before closing the mail summary popup (seconds "
-"part)."
-msgstr ""
-"La quantité de temps à attendre avant de fermer le popup d'aperçu du "
-"courrier (partie secondes)."
-
-#: ../data/mail-notification.schemas.in.h:25
-msgid ""
-"The aspect source of the mail summary popup fonts. Must be \"theme\" or "
-"\"custom\"."
-msgstr ""
-"La source d'aspect des polices de caractères du popup d'aperçu du courrier. "
-"Doit être \"theme\" ou \"custom\"."
-
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.in.h:21
msgid "The command to run when all mail is read."
msgstr "La commande à exécuter lorsque tout le courrier est lu"
-#: ../data/mail-notification.schemas.in.h:27
+#: ../data/mail-notification.schemas.in.in.h:22
msgid "The command to run when new mail arrives."
msgstr "La commande à exécuter lorsque du nouveau courrier arrive."
-#: ../data/mail-notification.schemas.in.h:28
-msgid "The custom font to use for the contents of the mail summary popup."
-msgstr ""
-"La police de caractères à utiliser pour le contenu du popup d'aperçu du "
-"courrier."
-
-#: ../data/mail-notification.schemas.in.h:29
-msgid "The custom font to use for the title of the mail summary popup."
-msgstr ""
-"La police de caractères à utiliser pour le titre du popup d'aperçu du "
-"courrier."
+#: ../data/mail-notification.schemas.in.in.h:23
+msgid "The command to run when the message list changes."
+msgstr "La commande à exécuter lorsque la liste des messages change."
-#: ../data/mail-notification.schemas.in.h:30
+#: ../data/mail-notification.schemas.in.in.h:24
msgid "The height of the properties dialog in pixels."
msgstr "La hauteur de la boîte de dialogue contenant les propriétés en pixels."
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.in.h:25
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
@@ -207,38 +176,18 @@ msgstr ""
"La liste des serveurs SSL/TLS (hôte:port) de confiance auxquels il manque un "
"certificat X509."
-#: ../data/mail-notification.schemas.in.h:32
+#: ../data/mail-notification.schemas.in.in.h:26
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr ""
"La liste des certificats X509 de confiance, représentés par leur empreinte "
"digitale."
-#: ../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 ""
-"Le nombre de pixels à laisser entre la gauche ou la droite de l'écran et le "
-"popup d'aperçu du courrier."
-
-#: ../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 ""
-"Le nombre de pixels à laisser entre le haut ou le bas de l'écran et le popup "
-"d'aperçu du courrier."
+#: ../data/mail-notification.schemas.in.in.h:27
+msgid "The position of the message popups. Must be \"attached\" or \"free\"."
+msgstr "La position des popups. Doit être \"attached\" ou \"free\"."
-#: ../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 ""
-"La position du popup d'aperçu du courrier. Doit être \"top-left\", \"top-"
-"right\", \"bottom-left\" or \"bottom-right\"."
-
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.in.h:28
msgid ""
"The type of mail summary to display in the icon's tooltip. Must be \"standard"
"\", \"compact\" or \"none\"."
@@ -246,61 +195,61 @@ msgstr ""
"Le type d'aperçu du courrier à afficher dans le ballon d'aide de l'icône. "
"Doit être \"standard\", \"compact\" ou \"aucun\"."
-#: ../data/mail-notification.schemas.in.h:37
+#: ../data/mail-notification.schemas.in.in.h:29
msgid "The width of the properties dialog in pixels."
msgstr "La largeur de la boîte de dialogue contenant les propriétés en pixels."
-#: ../data/mail-notification.schemas.in.h:38
+#: ../data/mail-notification.schemas.in.in.h:30
msgid "Tooltip mail summary"
msgstr "Aperçu du courrier dans le ballon d'aide"
-#: ../data/mail-notification.schemas.in.h:39
+#: ../data/mail-notification.schemas.in.in.h:31
msgid "Trusted servers list"
msgstr "Liste des serveurs de confiance"
-#: ../data/mail-notification.schemas.in.h:40
+#: ../data/mail-notification.schemas.in.in.h:32
msgid "Whether the status icon should blink on errors or not."
msgstr "Si l'icône de statut doit clignoter lors d'erreurs ou pas."
-#: ../data/mail-notification.schemas.in.h:41
-msgid "Whether to automatically close the mail summary popup or not."
-msgstr ""
-"Si le popup d'aperçu du courrier doit être automatiquement fermé ou pas."
-
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.in.h:33
msgid "Whether to display an icon when there is no new mail or not."
msgstr ""
"Si une icône doit être affichée lorsqu'il n'y a pas de nouveau courrier ou "
"pas."
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.in.h:34
msgid "Whether to display seen mail or not."
msgstr "Si le courrier vu doit être affiché ou pas."
-#: ../data/mail-notification.schemas.in.h:44
-msgid "Whether to display the mail summary popup when new mail arrives or not."
-msgstr ""
-"Si le popup d'aperçu du courrier doit être affiché lorsque du nouveau "
-"courrier arrive ou pas."
+#: ../data/mail-notification.schemas.in.in.h:35
+msgid "Whether to enable message popups or not."
+msgstr "Si les popups doivent être activés ou pas."
-#: ../data/mail-notification.schemas.in.h:45
+#: ../data/mail-notification.schemas.in.in.h:36
msgid ""
-"Whether to hide previously displayed mail in the mail summary popup or not."
+"Whether to expire message popups or not. Must be \"default\", \"false\" or "
+"\"true\"."
msgstr ""
-"Si le courrier précédemment affiché dans le popup d'aperçu du courrier doit "
-"être caché ou pas."
+"Si l'expiration des popups doit être activée ou pas. Doit être \"default\", "
+"\"false\" ou \"true\"."
-#: ../data/mail-notification.schemas.in.h:46
+#: ../data/mail-notification.schemas.in.in.h:37
msgid "Whether to run a command when all mail is read or not."
msgstr ""
"Si une commande doit être exécutée lorsque tout le courrier est lu ou pas."
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.in.h:38
msgid "Whether to run a command when new mail arrives or not."
msgstr ""
"Si une commande doit être exécutée lorsque du nouveau courrier arrive ou pas."
-#: ../data/mail-notification.schemas.in.h:48
+#: ../data/mail-notification.schemas.in.in.h:39
+msgid "Whether to run a command when the message list changes or not."
+msgstr ""
+"Si une commande doit être exécutée lorsque la liste des messages change ou "
+"pas."
+
+#: ../data/mail-notification.schemas.in.in.h:40
msgid "Width of properties dialog"
msgstr "Largeur de la boîte de dialogue contenant les propriétés"
@@ -313,7 +262,7 @@ msgid "The orientation of the tray."
msgstr "L'orientation du plateau."
#. translators: header capitalization
-#: ../src/mn-about-dialog.gob:49
+#: ../src/mn-about-dialog.gob:50
msgid "A Mail Notification Icon"
msgstr "Une icône d'avertissement de courrier"
@@ -321,135 +270,148 @@ msgstr "Une icône d'avertissement de courrier"
#. * translators: Your Name <your-email>
#. * optionally followed by one or more: \nOther Contributor's Name <his-email>
#.
-#: ../src/mn-about-dialog.gob:57
+#: ../src/mn-about-dialog.gob:58
msgid "translator-credits"
msgstr "Jean-Yves Lefort <jylefort@brutele.be>"
-#: ../src/mn-about-dialog.gob:79
-msgid "Unable to open link"
-msgstr "Impossible d'ouvrir le lien"
+#: ../src/mn-auth-combo-box.gob:104
+#: ../src/mn-autodetect-mailbox-properties.gob:110
+msgid "Autodetect"
+msgstr "Autodétecter"
-#: ../src/mn-auth-combo-box.gob:103
-#: ../src/mn-autodetect-mailbox-properties.gob:109
-msgid "<span style=\"italic\">autodetect</span>"
-msgstr "<span style=\"italic\">autodétecter</span>"
+#. translators: header capitalization
+#: ../src/mn-authenticated-mailbox-properties.gob:50
+msgid "Account"
+msgstr "Compte"
-#: ../src/mn-authenticated-mailbox-properties.gob:46
+#: ../src/mn-authenticated-mailbox-properties.gob:53
msgid "_Username:"
msgstr "Nom d'_utilisateur :"
-#: ../src/mn-authenticated-mailbox-properties.gob:50
+#: ../src/mn-authenticated-mailbox-properties.gob:57
msgid "_Password:"
msgstr "Mot de _passe :"
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:124
+#: ../src/mn-system-vfs-mailbox-properties.gob:60
msgid "Location"
msgstr "Emplacement"
-#: ../src/mn-autodetect-mailbox-properties.gob:122
+#: ../src/mn-autodetect-mailbox-properties.gob:126
msgid "_Location:"
msgstr "_Emplacement :"
#. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:130
+#: ../src/mn-autodetect-mailbox-properties.gob:134
msgid "_Browse..."
msgstr "_Parcourir..."
#. translators: header capitalization
-#: ../src/mn-autodetect-mailbox-properties.gob:172
+#: ../src/mn-autodetect-mailbox-properties.gob:176
msgid "Select a File or Folder"
msgstr "Sélectionnez un fichier ou dossier"
-#: ../src/mn-client-session.c:247
+#: ../src/mn-base-mbox-mailbox-backend.gob:345
+#, c-format
+msgid "unable to close file: %s"
+msgstr "impossible de fermer le fichier : %s"
+
+#: ../src/mn-base-mbox-mailbox-backend.gob:359
+#, c-format
+msgid "unable to open mailbox: %s"
+msgstr "impossible d'ouvrir la boîte aux lettres : %s"
+
+#: ../src/mn-client-session.c:248
#, c-format
msgid "resolving %s"
msgstr "résolution de %s en cours"
-#: ../src/mn-client-session.c:263
+#: ../src/mn-client-session.c:264
#, c-format
msgid "unable to resolve %s: %s"
msgstr "impossible de résoudre %s : %s"
-#: ../src/mn-client-session.c:304
+#: ../src/mn-client-session.c:305
#, c-format
msgid "network address #%i"
msgstr "adresse réseau %i"
-#: ../src/mn-client-session.c:307
+#: ../src/mn-client-session.c:308
#, c-format
msgid "unable to convert network address #%i into textual form: %s"
msgstr ""
"impossible de convertir l'adresse réseau %i vers une forme textuelle : %s"
-#: ../src/mn-client-session.c:318
+#: ../src/mn-client-session.c:319
#, c-format
msgid "%s: unsupported address family"
msgstr "%s : famille d'adresse non prise en charge"
-#: ../src/mn-client-session.c:325
+#: ../src/mn-client-session.c:326
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s : impossible de créer un socket : %s"
-#: ../src/mn-client-session.c:329
+#: ../src/mn-client-session.c:330
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "connexion à %s (%s) port %i en cours"
-#: ../src/mn-client-session.c:332
+#: ../src/mn-client-session.c:333
#, c-format
msgid "unable to connect: %s"
msgstr "impossible de se connecter : %s"
-#: ../src/mn-client-session.c:337
+#: ../src/mn-client-session.c:338
msgid "connected successfully"
msgstr "connecté avec succès"
#. if reached, we couldn't find a working address
-#: ../src/mn-client-session.c:351
+#: ../src/mn-client-session.c:352
#, c-format
msgid "unable to connect to %s"
msgstr "impossible de se connecter à %s"
-#: ../src/mn-client-session.c:378
+#: ../src/mn-client-session.c:379
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "impossible d'initialiser la bibliothèque OpenSSL : %s"
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:387
#, c-format
msgid "unable to create a SSL/TLS object: %s"
msgstr "impossible de créer un objet SSL/TLS : %s"
-#: ../src/mn-client-session.c:392
+#: ../src/mn-client-session.c:393
#, c-format
msgid "unable to set the SSL/TLS file descriptor: %s"
msgstr "impossible de spécifier le descripteur de fichier SSL/TLS : %s"
-#: ../src/mn-client-session.c:398
+#: ../src/mn-client-session.c:399
#, c-format
msgid "unable to perform the SSL/TLS handshake: %s"
msgstr "impossible d'accomplir la négociation SSL/TLS : %s"
-#: ../src/mn-client-session.c:404
+#: ../src/mn-client-session.c:405
msgid "untrusted server"
msgstr "serveur non fiable"
-#: ../src/mn-client-session.c:408
+#: ../src/mn-client-session.c:409
#, c-format
msgid "a SSL/TLS layer is now active (%s, %s %i-bit)"
msgstr "une couche SSL/TLS est maintenant active (%s, %s %i-bit)"
-#: ../src/mn-client-session.c:455
+#: ../src/mn-client-session.c:456
#, c-format
msgid "%s, fingerprint: %s"
msgstr "%s, empreinte digitale : %s"
-#: ../src/mn-client-session.c:484
+#: ../src/mn-client-session.c:485
msgid "missing certificate"
msgstr "certificat manquant"
-#: ../src/mn-client-session.c:510
+#: ../src/mn-client-session.c:511
#, c-format
msgid ""
"Mail Notification was unable to trust \"%s\" (%s). It is possible that "
@@ -468,189 +430,180 @@ msgstr ""
"vous êtes connecté à \"%s\". Si vous choisissez de vous connecter au "
"serveur, ce message ne sera plus affiché."
-#: ../src/mn-client-session.c:525
+#: ../src/mn-client-session.c:526
msgid "Connect to untrusted server?"
msgstr "Se connecter au serveur non fiable ?"
-#: ../src/mn-client-session.c:590
+#: ../src/mn-client-session.c:591
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "la réponse \"%s\" n'est pas valable dans le contexte actuel"
-#: ../src/mn-client-session.c:619
+#: ../src/mn-client-session.c:620
#, c-format
msgid "unable to parse response \"%s\""
msgstr "impossible d'interpréter la réponse \"%s\""
-#: ../src/mn-client-session.c:669 ../src/mn-client-session.c:676
+#: ../src/mn-client-session.c:670 ../src/mn-client-session.c:677
#, c-format
msgid "unable to read from server: %s"
msgstr "impossible de lire depuis le serveur : %s"
-#: ../src/mn-client-session.c:674
+#: ../src/mn-client-session.c:675
msgid "unable to read from server: EOF"
msgstr "impossible de lire depuis le serveur : EOF"
-#: ../src/mn-client-session.c:686
+#: ../src/mn-client-session.c:687
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "impossible de décoder les données en utilisant SASL : %s"
-#: ../src/mn-client-session.c:831
+#: ../src/mn-client-session.c:832
#, c-format
msgid "unable to encode data using SASL: %s"
msgstr "impossible d'encoder les données en utilisant SASL : %s"
-#: ../src/mn-client-session.c:862 ../src/mn-client-session.c:869
+#: ../src/mn-client-session.c:863 ../src/mn-client-session.c:870
#, c-format
msgid "unable to write to server: %s"
msgstr "impossible d'écrire vers le serveur : %s"
-#: ../src/mn-client-session.c:867
+#: ../src/mn-client-session.c:868
msgid "unable to write to server: EOF"
msgstr "impossible d'écrire vers le serveur : EOF"
-#: ../src/mn-client-session.c:898 ../src/mn-pop3-mailbox.gob:433
+#: ../src/mn-client-session.c:899 ../src/mn-pop3-mailbox.gob:434
#, c-format
msgid "unable to encode Base64: %s"
-msgstr "impossible d'encoder en Base64: %s"
+msgstr "impossible d'encoder en Base64 : %s"
-#: ../src/mn-client-session.c:1075
+#: ../src/mn-client-session.c:1076
#, c-format
msgid "unable to initialize the SASL library: %s"
msgstr "impossible d'initialiser la bibliothèque SASL : %s"
-#: ../src/mn-client-session.c:1087
+#: ../src/mn-client-session.c:1088
#, c-format
msgid "unable to retrieve local address of socket: %s"
msgstr "impossible d'obtenir l'adresse locale du socket : %s"
-#: ../src/mn-client-session.c:1093
+#: ../src/mn-client-session.c:1094
#, c-format
msgid "unable to retrieve remote address of socket: %s"
msgstr "impossible d'obtenir l'adresse distante du socket : %s"
-#: ../src/mn-client-session.c:1127
+#: ../src/mn-client-session.c:1128
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "impossible de spécifier les propriétés de sécurité SASL : %s"
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1152
msgid ""
"unable to start SASL authentication: SASL asked for something we did not know"
msgstr ""
"impossible de démarrer l'authentification SASL : SASL a demandé quelque "
"chose que nous ne connaissions pas"
-#: ../src/mn-client-session.c:1170
+#: ../src/mn-client-session.c:1171
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "impossible de démarrer l'authentification SASL : %s"
-#: ../src/mn-client-session.c:1174
+#: ../src/mn-client-session.c:1175
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "impossible de créer une connexion SASL : %s"
-#: ../src/mn-client-session.c:1221
+#: ../src/mn-client-session.c:1222
msgid "SASL asked for something we did not know, aborting SASL authentication"
msgstr ""
"SASL a demandé quelque chose que nous ne connaissions pas, annulation de "
"l'authentification SASL"
-#: ../src/mn-client-session.c:1238
+#: ../src/mn-client-session.c:1239
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, annulation de l'authentification SASL"
#. compliance error
-#: ../src/mn-client-session.c:1243
+#: ../src/mn-client-session.c:1244
#, c-format
msgid "unable to decode Base64 input from server: %s"
msgstr "impossible de décoder l'entrée Base64 du serveur : %s"
-#: ../src/mn-client-session.c:1279
+#: ../src/mn-client-session.c:1280
#, c-format
msgid "a SASL security layer of strength factor %i is now active"
msgstr ""
"une couche de sécurité SASL de facteur de force %i est maintenant active"
#. a security layer is active but we can't retrieve maxoutbuf -> fatal
-#: ../src/mn-client-session.c:1284
+#: ../src/mn-client-session.c:1285
#, c-format
msgid "unable to get SASL_MAXOUTBUF property: %s"
msgstr "impossible d'obtenir la propriété SASL_MAXOUTBUF : %s"
-#: ../src/mn-client-session.c:1290
+#: ../src/mn-client-session.c:1291
#, c-format
msgid "warning: unable to get SASL_SSF property: %s"
msgstr "avertissement : impossible d'obtenir la propriété SASL_SSF : %s"
-#: ../src/mn-client-session.c:1449
+#: ../src/mn-client-session.c:1450
msgid "unknown server error"
msgstr "erreur serveur inconnue"
-#: ../src/mn-compact-message-view.gob:45
+#: ../src/mn-compact-message-view.gob:46
msgid "Mailbox"
msgstr "Boîte aux lettres"
-#: ../src/mn-compact-message-view.gob:46
+#: ../src/mn-compact-message-view.gob:47
msgid "From"
msgstr "De"
-#: ../src/mn-compact-message-view.gob:47
+#: ../src/mn-compact-message-view.gob:48
msgid "Subject"
msgstr "Sujet"
-#: ../src/mn-compact-message-view.gob:48
+#: ../src/mn-compact-message-view.gob:49
msgid "Sent"
msgstr "Envoyé"
-#: ../src/mn-conf.c:262
+#: ../src/mn-conf.c:281
msgid "A directory creation error has occurred"
msgstr "Une erreur de création de répertoire s'est produite"
-#: ../src/mn-conf.c:263
+#: ../src/mn-conf.c:282
#, c-format
msgid "Unable to create directory \"%s\": %s."
-msgstr "Impossible de créer le répertoire \"%s\": %s."
+msgstr "Impossible de créer le répertoire \"%s\" : %s."
-#: ../src/mn-conf.c:402
+#: ../src/mn-conf.c:406
#, c-format
msgid "recursively unsetting %s"
msgstr "en train de supprimer récursivement %s"
-#: ../src/mn-conf.c:406
+#: ../src/mn-conf.c:410
msgid "syncing the GConf database"
msgstr "en train de synchroniser la base de données GConf"
-#: ../src/mn-conf.c:409
+#: ../src/mn-conf.c:413
msgid "completed"
msgstr "terminé"
-#: ../src/mn-conf.c:1137
-msgid "A command error has occurred in Mail Notification"
-msgstr "Une erreur de commande s'est produite dans l'avertisseur de courrier"
-
-#: ../src/mn-conf.c:1138
-#, c-format
-msgid "Unable to execute \"%s\": %s."
-msgstr "Impossible d'exécuter \"%s\": %s"
-
-#: ../src/mn-custom-vfs-mailbox.gob:76
+#: ../src/mn-custom-vfs-mailbox.gob:77
msgid "invalid location"
msgstr "emplacement invalide"
-#: ../src/mn-evolution-folder-tree-control.c:91
+#: mn-evolution-folder-tree-control.gob:69
msgid "The currently selected URI"
msgstr "L'URI actuellement sélectionnée"
#. translators: header capitalization
-#: ../src/mn-evolution-mailbox-properties.gob:68
+#: ../src/mn-evolution-mailbox-properties.gob:79
msgid "Folder"
msgstr "Dossier"
-#: ../src/mn-evolution-mailbox-properties.gob:159
+#: ../src/mn-evolution-mailbox-properties.gob:204
msgid ""
"Mail Notification can not contact Evolution. Make sure that Evolution is "
"running and that the Evolution Mail Notification plugin is loaded."
@@ -659,19 +612,23 @@ msgstr ""
"qu'Evolution est en cours de fonctionnement et que l'extension Evolution "
"\"Avertisseur de courrier\" est chargée."
-#: ../src/mn-evolution-mailbox.gob:75
+#: ../src/mn-evolution-mailbox.gob:78
msgid "folder not found"
msgstr "dossier non trouvé"
-#: ../src/mn-evolution-mailbox.gob:216
+#: ../src/mn-evolution-mailbox.gob:79
+msgid "message not found"
+msgstr "message non trouvé"
+
+#: ../src/mn-evolution-mailbox.gob:220
msgid "unable to contact Evolution"
msgstr "impossible de contacter Evolution"
-#: ../src/mn-evolution-plugin.c:136 ../src/mn-evolution-plugin.c:140
+#: ../src/mn-evolution-plugin.c:102 ../src/mn-evolution-plugin.c:106
msgid "Unable to activate the Mail Notification plugin"
msgstr "Impossible d'activer l'extension \"Avertisseur de courrier\""
-#: ../src/mn-evolution-plugin.c:136
+#: ../src/mn-evolution-plugin.c:102
#, c-format
msgid ""
"Bonobo could not locate the %s server. Please check your Mail Notification "
@@ -680,7 +637,7 @@ msgstr ""
"Bonobo n'a pu localiser le serveur %s. Veuillez vérifier votre installation "
"de l'avertisseur de courrier."
-#: ../src/mn-evolution-plugin.c:140 ../src/mn-main.c:460
+#: ../src/mn-evolution-plugin.c:106 ../src/mn-main.c:518
#, c-format
msgid ""
"Bonobo was unable to register the %s server. Please check your Mail "
@@ -689,103 +646,105 @@ msgstr ""
"Bonobo n'a pu inscrire le serveur %s. Veuillez vérifier votre installation "
"de l'avertisseur de courrier."
-#: ../src/mn-gmail-mailbox.gob:103
+#: ../src/mn-gmail-mailbox.gob:104
msgid "invalid feed location"
msgstr "emplacement d'alimentation non valide"
-#: ../src/mn-gmail-mailbox.gob:117
+#: ../src/mn-gmail-mailbox.gob:118
#, c-format
msgid "retrieving feed from %s"
msgstr "obtention de l'alimentation depuis %s en cours"
-#: ../src/mn-gmail-mailbox.gob:124
+#: ../src/mn-gmail-mailbox.gob:125
#, c-format
msgid "unable to retrieve feed: %s"
msgstr "impossible d'obtenir l'alimentation : %s"
-#: ../src/mn-gmail-mailbox.gob:139 ../src/mn-gmail-mailbox.gob:187
+#: ../src/mn-gmail-mailbox.gob:140 ../src/mn-gmail-mailbox.gob:191
msgid "unable to parse feed"
msgstr "impossible d'interpréter l'alimentation"
-#: ../src/mn-gmime-stream-vfs.gob:50
-#: ../src/mn-sylpheed-mailbox-backend.gob:205
+#: ../src/mn-gmime-stream-vfs.gob:51
+#: ../src/mn-sylpheed-mailbox-backend.gob:209
#, c-format
msgid "unable to read %s: %s"
msgstr "impossible de lire %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:52
+#: ../src/mn-gmime-stream-vfs.gob:53
#, c-format
msgid "unable to write to %s: %s"
msgstr "impossible d'écrire vers %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:54
+#: ../src/mn-gmime-stream-vfs.gob:55
#, c-format
msgid "unable to seek in %s: %s"
msgstr "impossible de chercher dans %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:56
+#: ../src/mn-gmime-stream-vfs.gob:57
#, c-format
msgid "unable to tell position of %s: %s"
msgstr "impossible de dire la position de %s : %s"
-#: ../src/mn-gmime-stream-vfs.gob:58 ../src/mn-mh-mailbox-backend.gob:164
+#: ../src/mn-gmime-stream-vfs.gob:59 ../src/mn-mh-mailbox-backend.gob:167
#, c-format
msgid "unable to close %s: %s"
msgstr "impossible de fermer %s : %s"
-#: ../src/mn-imap-mailbox-properties.gob:114
-#: ../src/mn-standard-message-view.gob:62
-msgid "Mailbox:"
-msgstr "Boîte aux lettres :"
-
+#. translators: header capitalization
#: ../src/mn-imap-mailbox-properties.gob:118
-msgid "in_box"
-msgstr "_boîte de réception"
+msgid "IMAP Mailbox"
+msgstr "Boîte aux lettres IMAP"
-#: ../src/mn-imap-mailbox-properties.gob:129
-msgid "oth_er:"
-msgstr "autr_e :"
+#: ../src/mn-imap-mailbox-properties.gob:120
+msgid "In_box"
+msgstr "_Boîte de réception"
-#: ../src/mn-imap-mailbox-properties.gob:140
-msgid "ne_ver"
-msgstr "_jamais"
+#: ../src/mn-imap-mailbox-properties.gob:125
+msgid "_Other:"
+msgstr "Autr_e :"
-#: ../src/mn-imap-mailbox-properties.gob:141
-msgid "au_todetect"
-msgstr "autodéte_cter"
+#. translators: header capitalization
+#: ../src/mn-imap-mailbox-properties.gob:138
+msgid "Use the IDLE Extension"
+msgstr "Utiliser l'extension IDLE"
#: ../src/mn-imap-mailbox-properties.gob:142
-msgid "al_ways"
-msgstr "t_oujours"
+#: ../ui/properties-dialog.glade.h:35
+msgid "_Never"
+msgstr "Jamai_s"
+
+#: ../src/mn-imap-mailbox-properties.gob:143
+msgid "A_utodetect"
+msgstr "Auto_détecter"
-#: ../src/mn-imap-mailbox-properties.gob:174
-msgid "Use the <span style=\"italic\">IDLE</span> extension:"
-msgstr "Utiliser l'extension <span style=\"italic\">IDLE</span>:"
+#: ../src/mn-imap-mailbox-properties.gob:144
+msgid "Al_ways"
+msgstr "_Toujours"
-#: ../src/mn-imap-mailbox.gob:384
+#: ../src/mn-imap-mailbox.gob:385
msgid "server did not send capabilities"
msgstr "le serveur n'a pas envoyé ses possibilités"
-#: ../src/mn-imap-mailbox.gob:551
+#: ../src/mn-imap-mailbox.gob:552
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr ""
"le serveur a annoncé LOGINDISABLED, pas d'utilisation de l'authentification "
"LOGIN"
-#: ../src/mn-imap-mailbox.gob:552
+#: ../src/mn-imap-mailbox.gob:553
msgid "unable to login"
msgstr "impossible d'ouvrir la session"
#. compliance error
-#: ../src/mn-imap-mailbox.gob:752
+#: ../src/mn-imap-mailbox.gob:753
msgid "server did not send all the messages we requested"
msgstr "le serveur n'a pas envoyé tous les messages que nous avons demandé"
-#: ../src/mn-imap-mailbox.gob:822
+#: ../src/mn-imap-mailbox.gob:823
msgid "unable to fetch message"
msgstr "impossible d'obtenir le message"
-#: ../src/mn-imap-mailbox.gob:847
+#: ../src/mn-imap-mailbox.gob:848
msgid ""
"\"Use the IDLE extension\" set to \"never\" in the mailbox properties, "
"logging out"
@@ -793,12 +752,12 @@ msgstr ""
"la valeur de l'option \"Utiliser l'extension IDLE\" dans les propriétés de "
"la boîte aux lettres est \"jamais\", fermeture de session"
-#: ../src/mn-imap-mailbox.gob:858
+#: ../src/mn-imap-mailbox.gob:859
#, c-format
msgid "the remote server runs %s, not using the IDLE extension"
msgstr "le serveur distant utilise %s, l'extension IDLE ne sera pas utilisée"
-#: ../src/mn-imap-mailbox.gob:863
+#: ../src/mn-imap-mailbox.gob:864
#, c-format
msgid ""
"the remote server runs %s, the IDLE extension might not function properly"
@@ -806,16 +765,16 @@ msgstr ""
"le serveur distant utilise %s, il se peut que l'extension IDLE ne fonctionne "
"pas correctement"
-#: ../src/mn-imap-mailbox.gob:872
+#: ../src/mn-imap-mailbox.gob:873
msgid "the remote server does not support the IDLE extension, logging out"
msgstr ""
"le serveur distant ne supporte pas l'extension IDLE, fermeture de session"
-#: ../src/mn-imap-mailbox.gob:1377 ../src/mn-pop3-mailbox.gob:296
+#: ../src/mn-imap-mailbox.gob:1378 ../src/mn-pop3-mailbox.gob:297
msgid "server does not support in-band SSL/TLS"
msgstr "le serveur ne supporte pas le mode SSL/TLS interne"
-#: ../src/mn-imap-mailbox.gob:1401 ../src/mn-pop3-mailbox.gob:947
+#: ../src/mn-imap-mailbox.gob:1402 ../src/mn-pop3-mailbox.gob:954
msgid ""
"a SASL authentication mechanism was selected but SASL support has not been "
"compiled in"
@@ -823,143 +782,129 @@ msgstr ""
"un mécanisme d'authentification SASL a été sélectionné mais le support SASL "
"n'a pas été inclus lors de la compilation"
-#: ../src/mn-imap-mailbox.gob:1411 ../src/mn-pop3-mailbox.gob:967
+#: ../src/mn-imap-mailbox.gob:1412 ../src/mn-pop3-mailbox.gob:974
#, c-format
msgid "unknown authentication mechanism \"%s\""
msgstr "mécanisme d'authentification inconnu \"%s\""
-#: ../src/mn-imap-mailbox.gob:1443 ../src/mn-pop3-mailbox.gob:1003
+#: ../src/mn-imap-mailbox.gob:1444 ../src/mn-pop3-mailbox.gob:1010
#, c-format
msgid "disabling mechanism \"%s\" and retrying SASL authentication"
msgstr ""
"désactivation du mécanisme \"%s\" et nouvelle tentative d'authentification "
"SASL"
-#: ../src/mn-imap-mailbox.gob:1455
+#: ../src/mn-imap-mailbox.gob:1456
msgid "falling back to IMAP LOGIN authentication"
msgstr "rétrogradation vers l'authentification IMAP LOGIN"
-#: ../src/mn-imap-mailbox.gob:1467 ../src/mn-pop3-mailbox.gob:1032
+#: ../src/mn-imap-mailbox.gob:1468 ../src/mn-pop3-mailbox.gob:1039
msgid "authentication failed"
msgstr "l'authentification a échoué"
#. success; caller must switch state itself
#. compliance error
-#: ../src/mn-imap-mailbox.gob:1528
+#: ../src/mn-imap-mailbox.gob:1529
msgid "server did not send search results"
msgstr "le serveur n'a pas envoyé les résultats de la recherche"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:89
+#: ../src/mn-mail-icon.gob:93
msgid "_Mail Reader"
msgstr "_Lecteur de courrier"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:91 ../src/mn-mailbox-view.gob:312
+#: ../src/mn-mail-icon.gob:95
+msgid "_Open Latest Message"
+msgstr "_Ouvrir le dernier message"
+
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:97 ../src/mn-mailbox-view.gob:314
msgid "_Update"
msgstr "_Mettre à jour"
#. translators: header capitalization
-#: ../src/mn-mail-icon.gob:98
+#: ../src/mn-mail-icon.gob:104
msgid "R_emove From Notification Area"
msgstr "_Enlever de la zone d'avertissement"
#. 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\">Aperçu du courrier</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mail-summary-popup.gob:277
-msgid "<span weight=\"bold\">Mail Summary</span>"
-msgstr "<span weight=\"bold\">Aperçu du courrier</span>"
-
-#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:89
+#: ../src/mn-mailbox-properties-dialog.gob:95
#, c-format
msgid "%s Properties"
msgstr "Propriétés de %s"
#. translators: header capitalization
-#: ../src/mn-mailbox-properties-dialog.gob:232
+#: ../src/mn-mailbox-properties-dialog.gob:244
msgid "Add a Mailbox"
msgstr "Ajouter une boîte aux lettres"
-#: ../src/mn-mailbox-view.gob:248
+#: ../src/mn-mailbox-view.gob:250
msgid "A paste error has occurred"
msgstr "Une erreur de collage s'est produite"
-#: ../src/mn-mailbox-view.gob:557
+#: ../src/mn-mailbox-view.gob:566
#, c-format
msgid "unhandled %s mailbox (%s)"
msgstr "boîte aux lettres %s non prise en charge (%s)"
-#: ../src/mn-mailbox-view.gob:562
+#: ../src/mn-mailbox-view.gob:571
#, c-format
msgid "%s mailbox"
msgstr "boîte aux lettres %s"
-#: ../src/mn-mailbox-view.gob:577
+#: ../src/mn-mailbox-view.gob:586
msgid "detecting mailbox type..."
msgstr "détection du type de boîte aux lettres en cours..."
-#: ../src/mn-mailbox.gob:472
+#: ../src/mn-mailbox.gob:504
msgid "\"type\" attribute missing"
msgstr "attribut \"type\" manquant"
-#: ../src/mn-mailbox.gob:479
+#: ../src/mn-mailbox.gob:511
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "type de boîte aux lettres \"%s\" inconnu"
-#: ../src/mn-mailbox.gob:499
-#, c-format
-msgid ""
-"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
-"\""
-msgstr ""
-"propriété \"%s\" : impossible de transformer la chaîne de caractères \"%s\" "
-"en une valeur de type \"%s\""
-
-#: ../src/mn-mailbox.gob:948
+#: ../src/mn-mailbox.gob:907
#, c-format
msgid "property \"%s\" has no value"
msgstr "la propriété \"%s\" n'a pas de valeur"
-#: ../src/mn-mailboxes.gob:239
+#: ../src/mn-mailboxes.gob:241
msgid "An error has occurred while importing old mailboxes"
msgstr ""
"Une erreur s'est produite lors de l'importation des anciennes boîtes aux "
"lettres"
-#: ../src/mn-mailboxes.gob:265
+#: ../src/mn-mailboxes.gob:267
msgid "Unable to load the mailboxes configuration"
msgstr "Impossible de charger la configuration des boîtes aux lettres"
-#: ../src/mn-mailboxes.gob:311
+#: ../src/mn-mailboxes.gob:313
msgid "Unable to parse the XML document."
msgstr "Impossible d'interpréter le document XML."
-#: ../src/mn-mailboxes.gob:318
+#: ../src/mn-mailboxes.gob:320
msgid "The root element is missing."
msgstr "L'élément racine est manquant."
-#: ../src/mn-mailboxes.gob:324
+#: ../src/mn-mailboxes.gob:326
#, c-format
msgid "The root element \"%s\" is invalid."
msgstr "L'élément racine \"%s\" est invalide."
-#: ../src/mn-mailboxes.gob:347
+#: ../src/mn-mailboxes.gob:349
#, c-format
msgid "On line %i: %s."
msgstr "A la ligne %i : %s."
-#: ../src/mn-mailboxes.gob:352
+#: ../src/mn-mailboxes.gob:354
#, c-format
msgid "On line %i: unknown element \"%s\"."
msgstr "A la ligne %i : élément \"%s\" inconnu."
-#: ../src/mn-mailboxes.gob:361
+#: ../src/mn-mailboxes.gob:363
msgid "An error has occurred while loading the mailboxes configuration"
msgid_plural "Errors have occurred while loading the mailboxes configuration"
msgstr[0] ""
@@ -969,131 +914,139 @@ msgstr[1] ""
"Des erreurs se sont produites lors du chargement de la configuration des "
"boîtes aux lettres"
-#: ../src/mn-mailboxes.gob:386
+#: ../src/mn-mailboxes.gob:388
msgid "Unable to save the mailboxes configuration"
msgstr "Impossible de sauvegarder la configuration des boîtes aux lettres"
-#: ../src/mn-mailboxes.gob:428
+#: ../src/mn-mailboxes.gob:430 ../src/mn-vfs.c:240
#, c-format
msgid "Unable to remove %s: %s."
msgstr "Impossible d'enlever %s : %s."
-#: ../src/mn-mailboxes.gob:436
+#: ../src/mn-mailboxes.gob:438
#, c-format
msgid "Unable to create %s: %s."
msgstr "Impossible de créer %s : %s."
-#: ../src/mn-mailboxes.gob:443
+#: ../src/mn-mailboxes.gob:445
#, c-format
msgid "Unable to open %s for writing: %s."
msgstr "Impossible d'ouvrir %s en mode écriture : %s."
-#: ../src/mn-mailboxes.gob:450
+#: ../src/mn-mailboxes.gob:452
msgid "Unable to write the XML document."
msgstr "Impossible d'écrire le document XML."
-#: ../src/mn-mailboxes.gob:456
+#: ../src/mn-mailboxes.gob:458
#, c-format
msgid "Unable to close %s: %s."
msgstr "Impossible de fermer %s : %s."
-#: ../src/mn-mailboxes.gob:466 ../src/mn-mailboxes.gob:473
+#: ../src/mn-mailboxes.gob:468 ../src/mn-mailboxes.gob:475 ../src/mn-vfs.c:258
+#: ../src/mn-vfs.c:266
#, c-format
msgid "Unable to rename %s to %s: %s."
msgstr "Impossible de renommer %s en %s : %s."
#. non fatal
-#: ../src/mn-mailboxes.gob:479
+#: ../src/mn-mailboxes.gob:481 ../src/mn-vfs.c:276
#, c-format
msgid "unable to delete %s: %s"
msgstr "impossible de supprimer %s : %s"
-#: ../src/mn-mailboxes.gob:509
+#: ../src/mn-mailboxes.gob:511
#, c-format
msgid "%s has %i new message"
msgid_plural "%s has %i new messages"
msgstr[0] "%s a %i nouveau message"
msgstr[1] "%s a %i nouveaux messages"
-#: ../src/mn-mailboxes.gob:535
+#: ../src/mn-mailboxes.gob:537
#, c-format
msgid "%s reported an error: %s"
msgstr "%s a indiqué une erreur : %s"
-#: ../src/mn-maildir-mailbox-backend.gob:125
+#: ../src/mn-maildir-mailbox-backend.gob:129
#, c-format
msgid "unable to open folder \"%s\": %s"
-msgstr "impossible d'ouvrir le dossier \"%s\": %s"
+msgstr "impossible d'ouvrir le dossier \"%s\" : %s"
-#: ../src/mn-maildir-mailbox-backend.gob:173
+#: ../src/mn-maildir-mailbox-backend.gob:178
#, c-format
msgid "unable to close folder \"%s\": %s"
-msgstr "impossible de fermer le dossier \"%s\": %s"
+msgstr "impossible de fermer le dossier \"%s\" : %s"
-#: ../src/mn-maildir-mailbox-backend.gob:176
+#: ../src/mn-maildir-mailbox-backend.gob:181
#, c-format
msgid "error while reading folder \"%s\": %s"
-msgstr "erreur lors de la lecture du dossier \"%s\": %s"
+msgstr "erreur lors de la lecture du dossier \"%s\" : %s"
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
msgid "yes"
msgstr "oui"
-#: ../src/mn-main.c:100
+#: ../src/mn-main.c:109
msgid "no"
msgstr "non"
-#: ../src/mn-main.c:132
+#: ../src/mn-main.c:142
#, c-format
msgid "%s version %s\n"
msgstr "%s version %s\n"
-#: ../src/mn-main.c:137
+#: ../src/mn-main.c:147
msgid "Mailbox backends:\n"
msgstr "Prises en charge de boîtes aux lettres :\n"
-#: ../src/mn-main.c:142
+#: ../src/mn-main.c:152
msgid "POP3 and IMAP features:\n"
msgstr "Fonctionnalités POP3 et IMAP :\n"
-#: ../src/mn-main.c:147
+#: ../src/mn-main.c:157
msgid "Sylpheed features:\n"
-msgstr "Fonctionnalités Sylpheed:\n"
+msgstr "Fonctionnalités Sylpheed :\n"
-#: ../src/mn-main.c:198
+#: ../src/mn-main.c:205
#, c-format
msgid "A Bonobo exception (%s) has occurred in %s()."
msgstr "Une exception Bonobo (%s) s'est produite dans %s()."
-#: ../src/mn-main.c:220
+#: ../src/mn-main.c:247
+#, c-format
+msgid "%s option ignored since Mail Notification is not already running"
+msgstr ""
+"option %s ignorée puisque l'avertisseur de courrier n'est pas déjà en cours "
+"d'exécution"
+
+#: ../src/mn-main.c:267
msgid "Show version information"
msgstr "Afficher les informations de version"
-#: ../src/mn-main.c:229
+#: ../src/mn-main.c:276
msgid "Enable informational output"
msgstr "Activer la sortie informationnelle"
-#: ../src/mn-main.c:238
+#: ../src/mn-main.c:285
msgid "Display the properties dialog"
msgstr "Afficher la boîte de dialogue contenant les propriétés"
-#: ../src/mn-main.c:247
+#: ../src/mn-main.c:294
msgid "Display the about dialog"
msgstr "Afficher la boîte de dialogue \"à propos\""
-#: ../src/mn-main.c:256
-msgid "Close the mail summary popup"
-msgstr "Fermer le popup d'aperçu du courrier"
-
-#: ../src/mn-main.c:265
+#: ../src/mn-main.c:303
msgid "Update the mail status"
msgstr "Mettre à jour le statut du courrier"
-#: ../src/mn-main.c:274
+#: ../src/mn-main.c:312
+msgid "Print a XML mail summary"
+msgstr "Afficher un aperçu du courrier XML"
+
+#: ../src/mn-main.c:321
msgid "Unset obsolete GConf configuration"
msgstr "Supprimer la configuration GConf obsolète"
-#: ../src/mn-main.c:283
+#: ../src/mn-main.c:330
msgid "Quit Mail Notification"
msgstr "Quitter l'avertisseur de courrier"
@@ -1101,11 +1054,11 @@ msgstr "Quitter l'avertisseur de courrier"
#. * We cannot use mn_fatal_error_dialog() because gtk_init() has
#. * not been called yet.
#.
-#: ../src/mn-main.c:310
+#: ../src/mn-main.c:356
msgid "multi-threading is not available"
msgstr "le multi-threading n'est pas disponible"
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:407
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1113,27 +1066,40 @@ msgstr ""
"Bonobo n'a pu localiser l'objet automation. Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-main.c:371
+#: ../src/mn-main.c:413
msgid "quitting Mail Notification"
msgstr "en train de quitter l'avertisseur de courrier"
-#: ../src/mn-main.c:375
+#: ../src/mn-main.c:417
msgid "Mail Notification is not running"
msgstr "L'avertisseur de courrier n'est pas en cours d'exécution"
-#: ../src/mn-main.c:390
+#: ../src/mn-main.c:432
msgid "Unable to initialize the GnomeVFS library."
msgstr "Impossible d'initialiser la bibliothèque GnomeVFS."
-#: ../src/mn-main.c:438
+#: ../src/mn-main.c:442
+msgid "An initialization error has occurred in Mail Notification"
+msgstr ""
+"Une erreur d'initialisation s'est produite dans l'avertisseur de courrier"
+
+#: ../src/mn-main.c:443
+msgid ""
+"Unable to initialize the notification library. Message popups will not be "
+"displayed."
+msgstr ""
+"Impossible d'initialiser la bibliothèque d'avertissement. Les popups ne "
+"seront pas affichés."
+
+#: ../src/mn-main.c:481
msgid "updating the mail status"
msgstr "mise à jour du statut du courrier"
-#: ../src/mn-main.c:446
+#: ../src/mn-main.c:497
msgid "Mail Notification is already running"
msgstr "L'avertisseur de courrier est déjà en cours d'exécution"
-#: ../src/mn-main.c:456
+#: ../src/mn-main.c:514
#, c-format
msgid ""
"Bonobo could not locate the %s file. Please check your Mail Notification "
@@ -1142,77 +1108,85 @@ msgstr ""
"Bonobo n'a pu localiser le fichier %s. Veuillez vérifier votre installation "
"de l'avertisseur de courrier."
-#: ../src/mn-mbox-mailbox-backend.gob:281
-#, c-format
-msgid "unable to close file: %s"
-msgstr "impossible de fermer le fichier : %s"
-
-#: ../src/mn-mbox-mailbox-backend.gob:298
-#, c-format
-msgid "unable to open mailbox: %s"
-msgstr "impossible d'ouvrir la boîte aux lettres : %s"
-
-#: ../src/mn-message-mime.c:121
+#: ../src/mn-message-mime.c:168
msgid "unable to parse MIME message"
msgstr "impossible d'interpréter le message MIME"
-#: ../src/mn-message.gob:111
+#: ../src/mn-message.gob:144
msgid "Unknown"
msgstr "Inconnu"
-#. translators: "none" is used like "Mailbox: none"
-#: ../src/mn-message.gob:130
-msgid "none"
-msgstr "aucune"
+#: ../src/mn-message.gob:207
+msgid "unterminated substitution"
+msgstr "substitution non terminée"
+
+#: ../src/mn-message.gob:246
+#, c-format
+msgid "unknown substitution \"%s\""
+msgstr "substitution \"%s\" inconnue"
+
+#: ../src/mn-message.gob:249
+msgid "empty substitution"
+msgstr "substitution vide"
-#: ../src/mn-mh-mailbox-backend.gob:167
+#: ../src/mn-message.gob:312 ../src/mn-util.c:1372
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Impossible d'exécuter \"%s\" : %s"
+
+#: ../src/mn-mh-mailbox-backend.gob:170
#, c-format
msgid "error while reading %s: %s"
msgstr "erreur lors de la lecture de %s : %s"
-#: ../src/mn-mh-mailbox-backend.gob:180
+#: ../src/mn-mh-mailbox-backend.gob:183
#, c-format
msgid "unable to open %s: %s"
msgstr "impossible d'ouvrir %s : %s"
-#: ../src/mn-pi-mailbox-properties.gob:67
-msgid "sta_ndard"
-msgstr "_standard"
+#: ../src/mn-pi-mailbox-properties.gob:70
+msgid "_Standard"
+msgstr "_Standard"
-#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "in-band SS_L/TLS"
+#: ../src/mn-pi-mailbox-properties.gob:71
+msgid "In-_band SSL/TLS"
msgstr "SS_L/TLS interne"
-#: ../src/mn-pi-mailbox-properties.gob:69
-msgid "SSL/TLS on sepa_rate port"
+#: ../src/mn-pi-mailbox-properties.gob:72
+msgid "SSL/TLS on s_eparate port"
msgstr "SSL/TLS sur port sépa_ré"
-#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "Ho_stname:"
-msgstr "Nom d'_hôte :"
+#: ../src/mn-pi-mailbox-properties.gob:76
+msgid "_Server:"
+msgstr "_Serveur :"
#. translators: header capitalization
-#: ../src/mn-pi-mailbox-properties.gob:94
-msgid "_Details"
-msgstr "_Détails"
-
-#: ../src/mn-pi-mailbox-properties.gob:149
-msgid "Connection type:"
-msgstr "Type de connexion :"
+#: ../src/mn-pi-mailbox-properties.gob:96
+msgid "Connection Type"
+msgstr "Type de connexion"
-#: ../src/mn-pi-mailbox-properties.gob:156
+#: ../src/mn-pi-mailbox-properties.gob:140
msgid "Port:"
msgstr "Port :"
-#: ../src/mn-pi-mailbox-properties.gob:179
-msgid "Authent_ication mechanism:"
-msgstr "Mécanisme d'authenti_fication :"
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:167
+msgid "Authentication"
+msgstr "Authentification"
+
+#: ../src/mn-pi-mailbox-properties.gob:171
+msgid "_Mechanism:"
+msgstr "_Mécanisme :"
-#: ../src/mn-pi-mailbox.gob:151
+#: ../src/mn-pi-mailbox-properties.gob:205
+msgid "Connection"
+msgstr "Connexion"
+
+#: ../src/mn-pi-mailbox.gob:153
msgid "SSL/TLS support has not been compiled in"
msgstr "le support SSL/TLS n'a pas été inclus lors de la compilation"
-#: ../src/mn-pi-mailbox.gob:317
+#: ../src/mn-pi-mailbox.gob:319
#, c-format
msgid ""
"Mail Notification was unable to log into %s mailbox %s, possibly because the "
@@ -1226,18 +1200,18 @@ msgstr ""
"\n"
"Veuillez à nouveau saisir vos données d'authentification."
-#: ../src/mn-pi-mailbox.gob:318
+#: ../src/mn-pi-mailbox.gob:320
#, c-format
msgid "Enter your credentials for %s mailbox %s."
msgstr "Entrez vos données d'authentification pour la boîte aux lettres %s %s."
#. keep the title in sync with gnome-authentication-manager
#. translators: header capitalization
-#: ../src/mn-pi-mailbox.gob:361
+#: ../src/mn-pi-mailbox.gob:363
msgid "Authentication Required"
msgstr "Authentification requise"
-#: ../src/mn-pop3-mailbox.gob:344
+#: ../src/mn-pop3-mailbox.gob:345
msgid "invalid arguments for the LOGIN-DELAY capability"
msgstr "arguments invalides pour la possibilité LOGIN-DELAY"
@@ -1247,7 +1221,7 @@ msgstr "arguments invalides pour la possibilité LOGIN-DELAY"
#. * servers nevertheless, by retrying without the SASL
#. * initial client response.
#.
-#: ../src/mn-pop3-mailbox.gob:485
+#: ../src/mn-pop3-mailbox.gob:486
msgid ""
"SASL authentication with initial client response failed, retrying without "
"initial client response"
@@ -1255,162 +1229,213 @@ msgstr ""
"l'authentification SASL avec réponse client SASL initiale a échoué, nouvel "
"essai sans réponse client SASL initiale"
-#: ../src/mn-pop3-mailbox.gob:696
+#: ../src/mn-pop3-mailbox.gob:703
msgid "unknown error"
msgstr "erreur inconnue"
-#: ../src/mn-pop3-mailbox.gob:791
+#: ../src/mn-pop3-mailbox.gob:798
#, c-format
msgid "honouring LOGIN-DELAY, sleeping for %i second"
msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
msgstr[0] "attente de %i seconde afin d'obéir à LOGIN-DELAY"
msgstr[1] "attente de %i secondes afin d'obéir à LOGIN-DELAY"
-#: ../src/mn-pop3-mailbox.gob:959
+#: ../src/mn-pop3-mailbox.gob:966
msgid "server does not support APOP authentication"
msgstr "le serveur ne supporte pas l'authentification APOP"
-#: ../src/mn-pop3-mailbox.gob:1015
+#: ../src/mn-pop3-mailbox.gob:1022
msgid "falling back to APOP authentication"
msgstr "rétrogradation vers l'authentification APOP"
-#: ../src/mn-pop3-mailbox.gob:1020
+#: ../src/mn-pop3-mailbox.gob:1027
msgid "falling back to USER/PASS authentication"
msgstr "rétrogradation vers l'authentification USER/PASS"
+#: ../src/mn-popup.gob:52 ../src/mn-standard-message-view.gob:63
+msgid "Mailbox:"
+msgstr "Boîte aux lettres :"
+
+#: ../src/mn-popup.gob:54 ../src/mn-standard-message-view.gob:65
+msgid "Unreadable message:"
+msgstr "Message non lisible :"
+
+#: ../src/mn-popup.gob:57 ../src/mn-standard-message-view.gob:68
+msgid "From:"
+msgstr "De :"
+
+#: ../src/mn-popup.gob:58 ../src/mn-standard-message-view.gob:69
+msgid "Subject:"
+msgstr "Sujet :"
+
#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:173 ../ui/properties-dialog.glade.h:23
-msgid "Mail Notification Properties"
-msgstr "Propriétés de l'avertisseur de courrier"
+#: ../src/mn-popup.gob:79
+msgid "Open"
+msgstr "Ouvrir"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:87
+msgid "Mark as Read"
+msgstr "Marquer comme lu"
+
+#. translators: header capitalization
+#: ../src/mn-popup.gob:95
+msgid "Mark as Spam"
+msgstr "Marquer comme indésirable"
-#: ../src/mn-properties-dialog.gob:207
-msgid "top left"
-msgstr "en haut à gauche"
+#: ../src/mn-popup.gob:117
+msgid "Unable to open message"
+msgstr "Impossible d'ouvrir le message"
-#: ../src/mn-properties-dialog.gob:208
-msgid "top right"
-msgstr "en haut à droite"
+#: ../src/mn-popup.gob:134
+msgid "Unable to mark message as read"
+msgstr "Impossible de marquer le message comme lu"
-#: ../src/mn-properties-dialog.gob:209
-msgid "bottom left"
-msgstr "en bas à gauche"
+#: ../src/mn-popup.gob:151
+msgid "Unable to mark message as spam"
+msgstr "Impossible de marquer le message comme indésirable"
-#: ../src/mn-properties-dialog.gob:210
-msgid "bottom right"
-msgstr "en bas à droite"
+#: ../src/mn-popup.gob:210
+#, c-format
+msgid "unable to show popup: %s"
+msgstr "impossible d'afficher le popup : %s"
+
+#: ../src/mn-popup.gob:227
+#, c-format
+msgid "unable to close popup: %s"
+msgstr "impossible de fermer le popup : %s"
+
+#. we set the summary here because libnotify requires it
+#. translators: header capitalization
+#: ../src/mn-popup.gob:238
+msgid "New Message"
+msgstr "Nouveau message"
+
+#. translators: header capitalization
+#: ../src/mn-properties-dialog.gob:131 ../ui/properties-dialog.glade.h:20
+msgid "Mail Notification Properties"
+msgstr "Propriétés de l'avertisseur de courrier"
-#: ../src/mn-properties-dialog.gob:332
+#. translators: "test" is an adjective, not a verb
+#: ../src/mn-properties-dialog.gob:136
+msgid "_Test messages"
+msgstr "_Messages de test"
+
+#: ../src/mn-properties-dialog.gob:276
msgid "No mailbox selected."
msgstr "Pas de boîte aux lettres sélectionnée."
-#: ../src/mn-properties-dialog.gob:337
+#: ../src/mn-properties-dialog.gob:281
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
msgstr[0] "%i boîte aux lettres sélectionnée"
msgstr[1] "%i boîtes aux lettres sélectionnées"
-#: ../src/mn-properties-dialog.gob:456
-#, c-format
-msgid "Test message #%i"
-msgstr "Message test %i"
+#: ../src/mn-shell.gob:224
+msgid "No mail reader is configured"
+msgstr "Aucun lecteur de courrier n'est configuré"
-#. translators: header capitalization
-#: ../src/mn-properties-dialog.gob:462
-msgid "Mail Notification Properties Dialog"
+#: ../src/mn-shell.gob:225
+msgid ""
+"You can configure a mail reader by choosing <b>System → Preferences → "
+"Preferred Applications</b>."
msgstr ""
-"Boîte de dialogue contenant les propriétés de l'avertisseur de courrier"
+"Vous pouvez configurer un lecteur de courrier en choisissant <b>Système → "
+"Préférences → Applications préférées</b>."
+
+#: ../src/mn-shell.gob:236 ../src/mn-shell.gob:242 ../src/mn-shell.gob:534
+msgid "Unable to open the latest message"
+msgstr "Impossible d'ouvrir le dernier message"
+
+#: ../src/mn-shell.gob:237
+#, c-format
+msgid "Messages of mailbox \"%s\" cannot be opened."
+msgstr "Les messages de la boîte aux lettres \"%s\" ne peuvent être ouverts."
+
+#: ../src/mn-shell.gob:243 ../src/mn-shell.gob:462
+msgid "You have no new mail."
+msgstr "Vous n'avez pas de nouveau courrier."
#. translators: header capitalization
-#: ../src/mn-shell.gob:381
+#: ../src/mn-shell.gob:398
msgid "Mailboxes Having New Mail"
msgstr "Boîtes aux lettres ayant du nouveau courrier"
#. translators: header capitalization
-#: ../src/mn-shell.gob:400
+#: ../src/mn-shell.gob:417
msgid "Errors"
msgstr "Erreurs"
#. translators: header capitalization
-#: ../src/mn-shell.gob:416
+#: ../src/mn-shell.gob:433
msgid "Mail Summary"
msgstr "Aperçu du courrier"
-#: ../src/mn-shell.gob:445
-msgid "You have no new mail."
-msgstr "Vous n'avez pas de nouveau courrier."
-
-#: ../src/mn-ssl.c:76
+#: ../src/mn-ssl.c:77
msgid "unknown SSL/TLS error"
msgstr "erreur SSL/TLS inconnue"
-#: ../src/mn-standard-message-view.gob:64
-msgid "Unreadable message:"
-msgstr "Message non lisible :"
-
-#: ../src/mn-standard-message-view.gob:67
-msgid "From:"
-msgstr "De :"
-
-#: ../src/mn-standard-message-view.gob:68
-msgid "Subject:"
-msgstr "Sujet :"
-
-#: ../src/mn-standard-message-view.gob:72
+#: ../src/mn-standard-message-view.gob:73
msgid "Sent:"
-msgstr "Envoyé:"
+msgstr "Envoyé :"
#. translators: header capitalization
-#: ../src/mn-stock.c:29
+#: ../src/mn-stock.c:30
msgid "Select _All"
msgstr "Sélectionner _tout"
#. translators: header capitalization
#. translators: header capitalization
-#: ../src/mn-stock.c:32
+#: ../src/mn-stock.c:33
msgid "Co_nnect"
msgstr "Se co_nnecter"
-#: ../src/mn-sylpheed-mailbox-backend.gob:223
+#: ../src/mn-sylpheed-mailbox-backend.gob:227
#, c-format
msgid "unable to open folder: %s"
msgstr "impossible d'ouvrir le dossier : %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:276
+#: ../src/mn-sylpheed-mailbox-backend.gob:277
#, c-format
msgid "unable to close folder: %s"
msgstr "impossible de fermer le dossier : %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:279
+#: ../src/mn-sylpheed-mailbox-backend.gob:280
#, c-format
msgid "error while reading folder: %s"
msgstr "erreur lors de la lecture du dossier : %s"
-#: ../src/mn-sylpheed-mailbox-backend.gob:420
+#: ../src/mn-sylpheed-mailbox-backend.gob:424
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: ../src/mn-sylpheed-mailbox-backend.gob:438
+#: ../src/mn-sylpheed-mailbox-backend.gob:437
#, c-format
msgid "incompatible file version \"%i\""
msgstr "version de fichier \"%i\" incompatible"
-#: ../src/mn-sylpheed-mailbox-backend.gob:441
+#: ../src/mn-sylpheed-mailbox-backend.gob:440
msgid "file version missing"
msgstr "version de fichier manquante"
-#: ../src/mn-system-vfs-mailbox-properties.gob:40
-#: ../src/mn-system-vfs-mailbox-properties.gob:48
-#: ../src/mn-system-vfs-mailbox.gob:45
+#: ../src/mn-sylpheed-mailbox-backend.gob:498
+#, c-format
+msgid "Unable to read %s: %s."
+msgstr "Impossible de lire %s : %s."
+
+#: ../src/mn-system-vfs-mailbox-properties.gob:41
+#: ../src/mn-system-vfs-mailbox-properties.gob:49
+#: ../src/mn-system-vfs-mailbox.gob:46
msgid "System mailbox"
msgstr "Boîte aux lettres système"
-#: ../src/mn-system-vfs-mailbox-properties.gob:70
+#: ../src/mn-system-vfs-mailbox-properties.gob:76
#, c-format
msgid "Your system mailbox is <span weight=\"bold\">%s</span>."
msgstr "Votre boîte aux lettres système est <span weight=\"bold\">%s</span>."
-#: ../src/mn-system-vfs-mailbox-properties.gob:77
+#: ../src/mn-system-vfs-mailbox-properties.gob:83
msgid ""
"The location of your system mailbox could not be detected. Check the MAIL "
"environment variable."
@@ -1418,16 +1443,31 @@ msgstr ""
"L'emplacement de votre boîte aux lettres système n'a pu être détecté. "
"Vérifiez la variable d'environnement MAIL."
-#: ../src/mn-system-vfs-mailbox.gob:72
+#: ../src/mn-system-vfs-mailbox.gob:73
msgid "system mailbox not found"
msgstr "boîte aux lettres système non trouvée"
-#: ../src/mn-util.c:349
+#: ../src/mn-test-mailbox.gob:40
+msgid "Test mailbox"
+msgstr "Boîte aux lettres test"
+
+#: ../src/mn-test-mailbox.gob:59
+#, c-format
+msgid "Test message #%i"
+msgstr "Message test %i"
+
+#. translators: header capitalization
+#: ../src/mn-test-mailbox.gob:65
+msgid "Mail Notification Properties Dialog"
+msgstr ""
+"Boîte de dialogue contenant les propriétés de l'avertisseur de courrier"
+
+#: ../src/mn-util.c:350
#, c-format
msgid "error loading image: %s"
msgstr "erreur de chargement d'image : %s"
-#: ../src/mn-util.c:365
+#: ../src/mn-util.c:366
#, c-format
msgid ""
"Unable to load interface \"%s\". Please check your Mail Notification "
@@ -1436,7 +1476,7 @@ msgstr ""
"Impossible de charger l'interface \"%s\". Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:380
+#: ../src/mn-util.c:381
#, c-format
msgid ""
"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
@@ -1445,12 +1485,12 @@ msgstr ""
"Elément \"%s\" non trouvé dans l'interface \"%s\". Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:449
+#: ../src/mn-util.c:450
#, c-format
msgid "Unable to open self as a module (%s)."
msgstr "Impossible de s'auto-ouvrir en tant que module (%s)."
-#: ../src/mn-util.c:454
+#: ../src/mn-util.c:455
#, c-format
msgid ""
"Signal handler \"%s\" not found. Please check your Mail Notification "
@@ -1459,29 +1499,33 @@ msgstr ""
"Gestionnaire de signal \"%s\" non trouvé. Veuillez vérifier votre "
"installation de l'avertisseur de courrier."
-#: ../src/mn-util.c:605 ../src/mn-util.c:628 ../src/mn-util.c:648
-#: ../src/mn-util.c:670
+#: ../src/mn-util.c:606 ../src/mn-util.c:629 ../src/mn-util.c:649
+#: ../src/mn-util.c:671
msgid "A drag and drop error has occurred"
msgstr "Une erreur de glisser-déposer s'est produite"
-#: ../src/mn-util.c:606
+#: ../src/mn-util.c:607
msgid "An invalid location list has been received."
msgstr "Une liste d'emplacements non valide a été reçue."
-#: ../src/mn-util.c:649
+#: ../src/mn-util.c:650
msgid "An invalid Mozilla location has been received."
msgstr "Un emplacement Mozilla non valide a été reçu."
-#: ../src/mn-util.c:725
+#: ../src/mn-util.c:726
msgid "Unable to display help"
msgstr "Impossible d'afficher l'aide"
-#: ../src/mn-util.c:739
+#: ../src/mn-util.c:738
+msgid "Unable to open link"
+msgstr "Impossible d'ouvrir le lien"
+
+#: ../src/mn-util.c:752
#, c-format
msgid "Unable to create a thread: %s."
msgstr "Impossible de créer un thread : %s."
-#: ../src/mn-util.c:899
+#: ../src/mn-util.c:929
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1500,88 +1544,112 @@ msgstr[1] ""
"\n"
"%s"
-#: ../src/mn-util.c:919
+#: ../src/mn-util.c:945
msgid "A fatal error has occurred in Mail Notification"
msgstr "Une erreur fatale s'est produite dans l'avertisseur de courrier"
-#: ../src/mn-util.c:958
+#: ../src/mn-util.c:989
#, c-format
msgid "unable to get current time: %s"
msgstr "impossible d'obtenir l'heure courante : %s"
-#: ../src/mn-util.c:1250
+#: ../src/mn-util.c:1304
#, c-format
msgid "%i second ago"
msgid_plural "%i seconds ago"
msgstr[0] "il y a %i seconde"
msgstr[1] "il y a %i secondes"
-#: ../src/mn-util.c:1254
+#: ../src/mn-util.c:1308
#, c-format
msgid "about %i minute ago"
msgid_plural "about %i minutes ago"
msgstr[0] "il y a approximativement %i minute"
msgstr[1] "il y a approximativement %i minutes"
-#: ../src/mn-util.c:1259
+#: ../src/mn-util.c:1313
#, c-format
msgid "about %i hour ago"
msgid_plural "about %i hours ago"
msgstr[0] "il y a approximativement %i heure"
msgstr[1] "il y a approximativement %i heures"
-#: ../src/mn-util.c:1264
+#: ../src/mn-util.c:1318
#, c-format
msgid "about %i day ago"
msgid_plural "about %i days ago"
msgstr[0] "il y a approximativement %i jour"
msgstr[1] "il y a approximativement %i jours"
-#: ../src/mn-util.c:1269
+#: ../src/mn-util.c:1323
#, c-format
msgid "about %i week ago"
msgid_plural "about %i weeks ago"
msgstr[0] "il y a approximativement %i semaine"
msgstr[1] "il y a approximativement %i semaines"
-#: ../src/mn-util.c:1282
+#: ../src/mn-util.c:1336
msgid "unknown date"
msgstr "date inconnue"
-#: ../src/mn-vfs-mailbox.gob:221
+#: ../src/mn-util.c:1371
+msgid "A command error has occurred in Mail Notification"
+msgstr "Une erreur de commande s'est produite dans l'avertisseur de courrier"
+
+#: ../src/mn-vfs-mailbox.gob:228
#, c-format
msgid "unable to monitor %s (%s), poll mode activated"
msgstr "impossible de surveiller %s (%s), vérification explicite activée"
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
msgid "unknown mailbox format"
msgstr "format de boîte aux lettres inconnu"
-#: ../src/mn-vfs-mailbox.gob:385
+#: ../src/mn-vfs-mailbox.gob:392
msgid "does not exist"
msgstr "n'existe pas"
+#: ../src/mn-vfs.c:248
+#, c-format
+msgid "Unable to write %s: %s."
+msgstr "Impossible d'écrire %s : %s."
+
+#: ../src/mn-xml.c:54
+#, c-format
+msgid ""
+"property \"%s\": unable to transform string \"%s\" into a value of type \"%s"
+"\""
+msgstr ""
+"propriété \"%s\" : impossible de transformer la chaîne de caractères \"%s\" "
+"en une valeur de type \"%s\""
+
#. translators: header capitalization
-#: ../ui/mailbox-properties-dialog.glade.h:2 ../ui/properties-dialog.glade.h:8
+#: ../ui/mailbox-properties-dialog.glade.h:1 ../ui/properties-dialog.glade.h:8
msgid "<span weight=\"bold\">General</span>"
msgstr "<span weight=\"bold\">Général</span>"
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Delay between mail chec_ks:"
-msgstr "Délai entre les _vérifications de courrier :"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:2
+#: ../ui/properties-dialog.glade.h:17
+msgid "General"
+msgstr "Général"
-#: ../ui/mailbox-properties-dialog.glade.h:4
+#: ../ui/mailbox-properties-dialog.glade.h:3
msgid "Mailbox _name:"
msgstr "No_m de la boîte aux lettres :"
+#: ../ui/mailbox-properties-dialog.glade.h:4
+msgid "Mailbox _type:"
+msgstr "_Type de boîte aux lettres :"
+
#. translators: header capitalization
#: ../ui/mailbox-properties-dialog.glade.h:6
-msgid "Use De_fault"
+msgid "Us_e Default"
msgstr "Par dé_faut"
#: ../ui/mailbox-properties-dialog.glade.h:7
-msgid "_Mailbox type:"
-msgstr "_Type de boîte aux lettres :"
+msgid "_Delay between mail checks:"
+msgstr "Délai entre les _vérifications de courrier :"
#. translators: header capitalization
#: ../ui/mailbox-properties-dialog.glade.h:9
@@ -1589,12 +1657,12 @@ msgid "_Use Default"
msgstr "_Par défaut"
#: ../ui/mailbox-properties-dialog.glade.h:10
-#: ../ui/properties-dialog.glade.h:48
+#: ../ui/properties-dialog.glade.h:41
msgid "minutes"
msgstr "minutes"
#: ../ui/mailbox-properties-dialog.glade.h:11
-#: ../ui/properties-dialog.glade.h:52
+#: ../ui/properties-dialog.glade.h:42
msgid "seconds"
msgstr "secondes"
@@ -1610,141 +1678,98 @@ msgstr "<span weight=\"bold\">Commandes</span>"
#. translators: header capitalization
#: ../ui/properties-dialog.glade.h:6
-msgid "<span weight=\"bold\">Fonts</span>"
-msgstr "<span weight=\"bold\">Polices de caractères</span>"
+msgid "<span weight=\"bold\">Expiration</span>"
+msgstr "<span weight=\"bold\">Expiration</span>"
#. translators: header capitalization
#: ../ui/properties-dialog.glade.h:10
-msgid "<span weight=\"bold\">Layout</span>"
-msgstr "<span weight=\"bold\">Présentation</span>"
-
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:12
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Liste des boîtes aux lettres</span>"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:12
msgid "<span weight=\"bold\">Position</span>"
msgstr "<span weight=\"bold\">Position</span>"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:14
msgid "<span weight=\"bold\">Tooltip Mail Summary</span>"
msgstr "<span weight=\"bold\">Aperçu du courrier dans le ballon d'aide</span>"
-#: ../ui/properties-dialog.glade.h:17
-msgid "Co_ntents:"
-msgstr "Co_ntenu :"
+#: ../ui/properties-dialog.glade.h:15
+msgid "A_fter:"
+msgstr "Ap_rès :"
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:19
-msgid "General"
-msgstr "Général"
-
-#: ../ui/properties-dialog.glade.h:20
-msgid "Hide p_reviously displayed mail"
-msgstr "Masquer le courrier précé_demment affiché"
-
-#: ../ui/properties-dialog.glade.h:21
-msgid "Hori_zontal offset:"
-msgstr "Décalage hori_zontal :"
+#: ../ui/properties-dialog.glade.h:18
+msgid "In the p_opup stack"
+msgstr "Dans la pile des p_opups"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:25
-msgid "Mail Summary Popup"
-msgstr "Popup d'aperçu du courrier"
+#: ../ui/properties-dialog.glade.h:22
+msgid "Message Popups"
+msgstr "Popups"
#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:27
+#: ../ui/properties-dialog.glade.h:24
msgid "Status Icon"
msgstr "Icône de statut"
-#: ../ui/properties-dialog.glade.h:28
-msgid "Use these _fonts:"
-msgstr "Utiliser c_es polices de caractères :"
-
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:25
msgid "When _new mail arrives:"
msgstr "Quand du _nouveau courrier arrive :"
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:26
msgid "When all mail has _been read:"
msgstr "Quand _tout le courrier a été lu :"
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:27
msgid "_Always display"
msgstr "_Toujours afficher"
-#: ../ui/properties-dialog.glade.h:32
-msgid "_Automatically close after:"
-msgstr "Fe_rmer automatiquement après :"
+#: ../ui/properties-dialog.glade.h:28
+msgid "_Attached to the status icon"
+msgstr "A_ttachés à l'icône de statut"
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:29
msgid "_Blink on errors"
msgstr "_Clignoter lors d'erreurs"
-#. translators: header capitalization
-#: ../ui/properties-dialog.glade.h:35
-msgid "_Display a Test Popup"
-msgstr "Afficher un popup de _test"
+#: ../ui/properties-dialog.glade.h:30
+msgid "_Desktop default"
+msgstr "Valeur par _défaut du bureau"
-#: ../ui/properties-dialog.glade.h:36
+#: ../ui/properties-dialog.glade.h:31
msgid "_Display seen mail"
msgstr "Afficher le courrier _vu"
-#: ../ui/properties-dialog.glade.h:37
+#: ../ui/properties-dialog.glade.h:32
msgid "_Display this dialog"
msgstr "Afficher cette _boîte de dialogue"
-#: ../ui/properties-dialog.glade.h:38
-msgid "_Enable mail summary popup"
-msgstr "A_ctiver le popup d'aperçu du courrier"
+#: ../ui/properties-dialog.glade.h:33
+msgid "_Enable message popups"
+msgstr "A_ctiver les popups"
-#: ../ui/properties-dialog.glade.h:39
+#: ../ui/properties-dialog.glade.h:34
msgid "_Launch the mail reader"
msgstr "_Exécuter le lecteur de courrier"
-#: ../ui/properties-dialog.glade.h:40
+#: ../ui/properties-dialog.glade.h:36
msgid "_None"
msgstr "Aucu_n"
-#: ../ui/properties-dialog.glade.h:41
-msgid "_Position:"
-msgstr "_Position :"
-
-#: ../ui/properties-dialog.glade.h:42
-msgid "_Title:"
-msgstr "_Titre :"
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Open the latest message"
+msgstr "_Ouvrir le dernier message"
-#: ../ui/properties-dialog.glade.h:43
+#: ../ui/properties-dialog.glade.h:38
msgid "_Update the mail status"
msgstr "Mett_re à jour le statut du courrier"
-#: ../ui/properties-dialog.glade.h:44
-msgid "_Use fonts from theme"
-msgstr "_Utiliser les polices de caractères du thème"
-
-#: ../ui/properties-dialog.glade.h:45
-msgid "_Vertical offset:"
-msgstr "Décalage _vertical :"
-
-#: ../ui/properties-dialog.glade.h:46
+#: ../ui/properties-dialog.glade.h:39
msgid "icon tooltip's mail summary layout|Co_mpact"
msgstr "Co_mpact"
-#: ../ui/properties-dialog.glade.h:47
+#: ../ui/properties-dialog.glade.h:40
msgid "icon tooltip's mail summary layout|_Standard"
msgstr "_Standard"
-
-#: ../ui/properties-dialog.glade.h:49
-msgid "pixels"
-msgstr "pixels"
-
-#: ../ui/properties-dialog.glade.h:50
-msgid "popup's mail summary layout|Co_mpact"
-msgstr "Co_mpacte"
-
-#: ../ui/properties-dialog.glade.h:51
-msgid "popup's mail summary layout|_Standard"
-msgstr "_Standard"
diff --git a/po/sr.po b/po/sr.po
@@ -4,17 +4,17 @@
# This file is distributed under the same license as the
# mail-notification package.
#
-# Filip Miletic <filmil@gmail.com>, 2004, 2005.
+# Filip Miletic <filmil@gmail.com>, 2004-2006.
#
# Both Serbian Cyrillic and Serbian Latin files should
# be available.
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 3.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-31 04:17+0200\n"
-"PO-Revision-Date: 2005-07-31 11:13+0100\n"
+"POT-Creation-Date: 2006-06-25 01:00+0200\n"
+"PO-Revision-Date: 2006-11-21 17:41+0100\n"
"Last-Translator: Филип Милетић <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -32,11 +32,11 @@ msgstr "Фабрика за дојаву приспећа поште"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:1
msgid "Evolution folder tree control"
-msgstr "Управљање Еволуцијиним дрветом директоријума"
+msgstr "Управљање стаблом фасцикли у програму Еволуција"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:2
msgid "Evolution folder tree control factory"
-msgstr "Фабрика за управљач Еволуцијиним дрветом директоријума"
+msgstr "Фабрика за управљање стаблом фасцикли у програму Еволуција"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:3
msgid "Mail Notification / Evolution glue"
@@ -47,14 +47,12 @@ msgid "Mail Notification / Evolution glue factory"
msgstr "Фабрика за Дојаву поште и Еволуцију"
#: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
msgid "Configure Mail Notification"
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.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 "Дојава поште"
@@ -63,196 +61,149 @@ msgid "Get notified when new mail arrives"
msgstr "Обавести када стигне нова пошта"
#: ../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 "Размак између две провере (секунде)."
+msgid "Click action"
+msgstr "Дејство при притиску"
#: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "Прикажи сажетат порука у облачићу"
+msgid "Display seen mail"
+msgstr "Прикажи прегледане поруке"
#: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "Не показуј прозор са обавештењем о грешкама"
-
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "Изврши на двоструки клик"
-
-#: ../data/mail-notification.schemas.in.h:8
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 "Изврши када пошта стигне"
-#: ../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 "Покрени команду када је сва пошта прочитана"
-#: ../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\"."
-msgstr ""
-"Постављање наредбе која се извршава при двоструком клику на сличицу. Могући "
-"избори су: ?главни-прозор?, ?покрени-читач-поште? или ?ажурирај-статус-"
-"поште?."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
+msgstr "Постављање наредбе која се извршава при притиску на сличицу. Могући избори су: „главни-прозор?, „покрени-читач-поште? или „ажурирај-статус-поште?."
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.h:23
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr "Пауза пре затварања прозора са сажетком порука (минути)."
-#: ../data/mail-notification.schemas.in.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 "Пауза пре затварања прозора са сажетком порука (секунде)."
-#: ../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 "Извор за подешавања писма. Може бити: ?тема? или ?посебан?."
-#: ../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 "Команда коју треба покренути када је сва пошта прочитана."
-#: ../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 ""
"Посебно писмо које се користи за испис садржаја прозора са сажетком порука."
-#: ../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 ""
"Списак проверених SSL/TLS сервера (рачунар:порт) који немају 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 отиском."
-#: ../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 +211,7 @@ 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."
@@ -268,7 +219,7 @@ 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\"."
@@ -276,126 +227,74 @@ msgstr ""
"Положај прозора са сажетком порука. Може бити: ?горе-лево?, ?горе-десно?, ?"
"доле-лево? или ?доле-десно?."
-#: ../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\"."
-msgstr ""
-"Стил алатних трака. Може бити: ?подразумеван?, ?слике?, ?текст?, ?оба?, ?оба-"
-"водоравно?."
-
-#: ../data/mail-notification.schemas.in.h:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "Ширина прозора за уређивање статусних трака, изражена у тачкама."
-
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "Ширина прозора главног прозора изражена у тачкама."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
+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 "Да ли статусна линија треба да се види или не."
-
-#: ../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 ""
"Да ли треба или не треба аутоматски затворити прозор са сажетком поште."
-#: ../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 "Да ли треба приказати сажетак порука када стигне нова пошта."
-#: ../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 "Да ли треба или не треба спречити појаву прозора са описом грешака."
-
-#: ../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 ""
"Да ли треба или не треба покренути неку команду када је сва пошта прочитана."
-#: ../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 "Ширина прозора за уређивање статусних трака"
-
-#: ../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 "_Уклони алатну траку"
-
-#: ../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 "Сличица за дојаву приспећа поште"
@@ -403,16 +302,16 @@ msgstr "Сличица за дојаву приспећа поште"
#. * 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 "Филип Милетић <filmil@gmail.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-autodetect-mailbox-properties.gob:109
msgid "<span style=\"italic\">autodetect</span>"
msgstr "<span style=\"italic\">сам пронађи</span>"
@@ -424,124 +323,113 @@ msgstr "_Кор.име:"
msgid "_Password:"
msgstr "_Лозинка:"
-#: ../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 сандучета %s, највероватније зато што "
-"унета лозинка није исправна.\n"
-"\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 "_Место:"
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
msgid "_Browse..."
msgstr "_Прегледај..."
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
msgid "Select a File or Folder"
-msgstr "Изаберите датотеку или директоријум"
+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-бит)"
-#: ../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 "недостаје сертификат"
-#: ../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 "
@@ -560,313 +448,343 @@ 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 "Не могу се декодовати подаци путем 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 "није могуће кодирати податке уз помоћ 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"
-#: ../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"
-#: ../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 пријава: 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 пријаву"
-#: ../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 је успостављен"
#. 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"
-#: ../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"
-#: ../src/mn-conf.c:240
+#: ../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-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."
-#: ../src/mn-conf.c:317
+#: ../src/mn-conf.c:402
#, c-format
msgid "recursively unsetting %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-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 "Директоријум"
+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 "Дојава поште не може да се повеже са Еволуцијом. Покрените Еволуцију и укључите додатак за повезивање са Дојавом поште."
+msgstr ""
+"Дојава поште не може да се повеже са Еволуцијом. Покрените Еволуцију и "
+"укључите додатак за повезивање са Дојавом поште."
-#: ../src/mn-evolution-mailbox.gob:61
+#: ../src/mn-evolution-mailbox.gob:75
msgid "folder not found"
-msgstr "директоријум није нађен"
+msgstr "фасцикла није нађена"
-#: ../src/mn-evolution-mailbox.gob:182
+#: ../src/mn-evolution-mailbox.gob:216
msgid "unable to contact Evolution"
msgstr "није могуће повезати се са Еволуцијом"
-#: ../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 "Није могуће укључити прикључак за Дојаву поште"
-#: ../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 "Бонобо није успео да пронађе %s сервер. Молим проверите инсталацију Дојаве поште."
+msgstr ""
+"Бонобо није успео да пронађе %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 "Бонобо није успео да забележи %s сервер. Молим проверите инсталацију Дојаве поште."
+msgstr ""
+"Бонобо није успео да забележи %s сервер. Молим проверите инсталацију Дојаве "
+"поште."
-#: ../src/mn-gmail-mailbox.gob:111
+#: ../src/mn-gmail-mailbox.gob:103
msgid "invalid feed location"
msgstr "место довода није исправно наведено"
-#: ../src/mn-gmail-mailbox.gob:125
+#: ../src/mn-gmail-mailbox.gob:117
#, c-format
msgid "retrieving feed from %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 "није могуће обрадити довод"
-#: ../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"
-#: ../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"
-#: ../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"
-#: ../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"
-#: ../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"
-#: ../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 "_друго:"
-#: ../src/mn-imap-mailbox-properties.gob:139
+#: ../src/mn-imap-mailbox-properties.gob:140
msgid "ne_ver"
msgstr "ни_кад"
-#: ../src/mn-imap-mailbox-properties.gob:140
+#: ../src/mn-imap-mailbox-properties.gob:141
msgid "au_todetect"
msgstr "а_утодетекција"
-#: ../src/mn-imap-mailbox-properties.gob:141
+#: ../src/mn-imap-mailbox-properties.gob:142
msgid "al_ways"
msgstr "_увек"
-#: ../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 "сервер није обавестио о својим могућностима"
-#: ../src/mn-imap-mailbox.gob:573
+#: ../src/mn-imap-mailbox.gob:551
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "сервер је дојавио LOGINDISABLED, LOGIN пријавa неће бити коришћена"
-#: ../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 "сервер није послао све тражене поруке"
-#: ../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 "„Користи IDLE проширење“ је постављено на „никад“ у поставкама сандучића, одјављујем се"
+msgstr ""
+"„Користи IDLE проширење“ је постављено на „никад“ у поставкама сандучића, "
+"одјављујем се"
-#: ../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 продужетак"
-#: ../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 проширење можда неће исправно радити"
-#: ../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 "сервер не подржава заштиту путем 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"
@@ -874,145 +792,183 @@ msgstr ""
"изабран је механизам за пријаву који користи 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\""
-#: ../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 пријаву"
-#: ../src/mn-imap-mailbox.gob:1435
+#: ../src/mn-imap-mailbox.gob:1455
msgid "falling back to IMAP LOGIN authentication"
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 "Главни _прозор"
+#. 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 "_Читач поште"
-#: ../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 "_Освежи"
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
msgid "R_emove From Notification Area"
msgstr "_Уклони са обавештајне зоне"
-#: ../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 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"
-#: ../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)"
-#: ../src/mn-mailbox-view.gob:528
+#: ../src/mn-mailbox-view.gob:562
#, c-format
msgid "%s mailbox"
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 "недостаје атрибут „врста“"
-#: ../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“"
-#: ../src/mn-mailbox.gob:744
+#: ../src/mn-mailbox.gob:948
#, c-format
msgid "property \"%s\" has no value"
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 документ."
-#: ../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“ је неважећи."
-#: ../src/mn-mailboxes.gob:330
+#: ../src/mn-mailboxes.gob:347
#, c-format
msgid "On line %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“."
-#: ../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] "Дошло је до грешке приликом учитавања подешавања сандучића"
msgstr[1] "Дошло је до грешака приликом учитавања подешавања сандучића"
msgstr[2] "Дошло је до грешака приликом учитавања подешавања сандучића"
-#: ../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 документ."
+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"
-#: ../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"
@@ -1020,230 +976,98 @@ msgstr[0] "Сандуче %s има %i нову поруку"
msgstr[1] "Сандуче %s има %i нове поруке"
msgstr[2] "Сандуче %s има %i нових порука"
-#: ../src/mn-mailboxes.gob:483
+#: ../src/mn-mailboxes.gob:535
#, c-format
msgid "%s reported an error: %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 "_Пошта"
-
-#: ../src/mn-main-window.gob:157
-msgid "_Edit"
-msgstr "_Уреди"
-
-#: ../src/mn-main-window.gob:158
-msgid "_View"
-msgstr "_Преглед"
-
-#: ../src/mn-main-window.gob:159
-msgid "_Help"
-msgstr "П_омоћ"
-
-#: ../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 "_Затвори"
-
-#: ../src/mn-main-window.gob:183
-msgid "Close this window"
-msgstr "Затвори овај прозор"
-
-#: ../src/mn-main-window.gob:189
-msgid "_Quit"
-msgstr "_Крај"
-
-#: ../src/mn-main-window.gob:191 ../src/mn-main.c:266
-msgid "Quit Mail Notification"
-msgstr "Угаси дојаву поште"
-
-#: ../src/mn-main-window.gob:199 ../src/mn-main-window.gob:247
-msgid "_Toolbars"
-msgstr "_Алатне траке"
-
-#: ../src/mn-main-window.gob:201
-msgid "Customize the toolbars"
-msgstr "Уреди алатне траке"
-
-#: ../src/mn-main-window.gob:207
-msgid "_Preferences"
-msgstr "_Поставке"
-
-#: ../src/mn-main-window.gob:217
-msgid "Toolbars Styl_e"
-msgstr "Стил алатних _трака"
-
-#: ../src/mn-main-window.gob:219
-msgid "Customize the toolbars style"
-msgstr "Прилагоди стил алатних трака"
-
-#: ../src/mn-main-window.gob:227
-msgid "_Contents"
-msgstr "_Садржај"
-
-#: ../src/mn-main-window.gob:229
-msgid "Display help"
-msgstr "Прикажи помоћ"
-
-#: ../src/mn-main-window.gob:235
-msgid "_About"
-msgstr "_О програму"
-
-#: ../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 "_Статусна трака"
-
-#: ../src/mn-main-window.gob:258
-msgid "Show or hide the statusbar"
-msgstr "Прикажи или уклони статусну траку"
-
-#: ../src/mn-main-window.gob:269
-msgid "_Desktop Default"
-msgstr "_Подразумевано у окружењу"
-
-#: ../src/mn-main-window.gob:271
-msgid "Set the toolbars style to the desktop default setting"
-msgstr "Постави стилове трака на стил који важи у целом радном окружењу"
+msgid "error while reading folder \"%s\": %s"
+msgstr "грешка при читању фасцикле „%s?: %s"
-#: ../src/mn-main-window.gob:277
-msgid "I_cons Only"
-msgstr "Само _слике"
+#: ../src/mn-main.c:100
+msgid "yes"
+msgstr "да"
-#: ../src/mn-main-window.gob:279
-msgid "Only display the toolbars icons"
-msgstr "Прикажи само слике у статусној траци"
+#: ../src/mn-main.c:100
+msgid "no"
+msgstr "не"
-#: ../src/mn-main-window.gob:285
-msgid "_Text Only"
-msgstr "Само _текст"
-
-#: ../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 "Текст _испод слика"
-
-#: ../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 "Текст _поред слика"
+#: ../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: %s"
+# FIXME: избаци латинични назив када буде време
+#: ../src/mn-main.c:147
+msgid "Sylpheed features:\n"
+msgstr "Особине Силфида (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 нова порука"
-msgstr[1] "%i нове поруке"
-msgstr[2] "%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 "Десио се Бонобов изузетак (%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 "Дозволи речитији излаз"
-#: ../src/mn-main.c:203
-msgid "List the compiled-in features"
-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 "Прикажи податке о програму"
-#: ../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 подешавања"
-#.
-#. * We can't use mn_error_dialog() because gtk_init() has not been
-#. * called yet.
-#.
-#: ../src/mn-main.c:293
+#: ../src/mn-main.c:283
+msgid "Quit Mail Notification"
+msgstr "Угаси дојаву поште"
+
+#.
+#. * 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 "вишенитни рад није подржан"
-#: ../src/mn-main.c:355
+#: ../src/mn-main.c:365
msgid ""
"Bonobo could not locate the automation object. Please check your Mail "
"Notification installation."
@@ -1253,122 +1077,64 @@ msgstr ""
"Бонобо у Гному 2.6, када инсталирате програм за обавештења, треба да се "
"одјавите и поново пријавите на систем да би све почело да ради)"
-#: ../src/mn-main.c:361
+#: ../src/mn-main.c:371
msgid "quitting Mail Notification"
msgstr "Гасим дојаву поште"
-#: ../src/mn-main.c:365
+#: ../src/mn-main.c:375
msgid "Mail Notification is not running"
msgstr "Програм за дојаву поште није покренут."
-#: ../src/mn-main.c:372
+#: ../src/mn-main.c:390
msgid "Unable to initialize the GnomeVFS library."
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 "Програм за дојаву поште је већ покренут."
-#: ../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 "Бонобо није могао да пронађе датотеку %s. Молимо проверите подешавања Дојаве поште."
+msgstr ""
+"Бонобо није могао да пронађе датотеку %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 "Тема"
-
-#: ../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"
-msgid_plural "%i seconds ago"
-msgstr[0] "пре %i секунду"
-msgstr[1] "пре %i секунде"
-msgstr[2] "пре %i секунди"
-
-#: ../src/mn-message.gob:128
-#, c-format
-msgid "about %i minute ago"
-msgid_plural "about %i minutes ago"
-msgstr[0] "пре око %i минут"
-msgstr[1] "пре око %i минута"
-msgstr[2] "пре око %i минута"
-
-#: ../src/mn-message.gob:133
-#, c-format
-msgid "about %i hour ago"
-msgid_plural "about %i hours ago"
-msgstr[0] "пре око %i сат"
-msgstr[1] "пре око %i сата"
-msgstr[2] "пре око %i сати"
-
-#: ../src/mn-message.gob:138
-#, c-format
-msgid "about %i day ago"
-msgid_plural "about %i days ago"
-msgstr[0] "пре око %i дан"
-msgstr[1] "пре око %i дана"
-msgstr[2] "пре око %i дана"
-
-#: ../src/mn-message.gob:143
-#, c-format
-msgid "about %i week ago"
-msgid_plural "about %i weeks ago"
-msgstr[0] "пре око %i недељу"
-msgstr[1] "пре око %i недеље"
-msgstr[2] "пре око %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"
-#: ../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"
@@ -1378,38 +1144,63 @@ msgid "sta_ndard"
msgstr "_стандард"
#: ../src/mn-pi-mailbox-properties.gob:68
-msgid "_in-band SSL/TLS"
-msgstr "_уграђени SSL/TLS"
+msgid "in-band SS_L/TLS"
+msgstr "уграђени SSL/TLS"
#: ../src/mn-pi-mailbox-properties.gob:69
msgid "SSL/TLS on sepa_rate port"
msgstr "SSL/TLS на посебном порту"
#: ../src/mn-pi-mailbox-properties.gob:73
-msgid "_Hostname:"
+msgid "Ho_stname:"
msgstr "_Рачунар:"
-#: ../src/mn-pi-mailbox-properties.gob:93
+#. translators: header capitalization
+#: ../src/mn-pi-mailbox-properties.gob:94
msgid "_Details"
msgstr "_Детаљи"
-#: ../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 "_Начин пријаве:"
-#: ../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-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 ""
+"Није могуће пријавити се за читање %s сандучета %s, највероватније зато што "
+"унета лозинка није исправна.\n"
+"\n"
+"Молим унесите поново лозинку."
+
+#: ../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 нису исправно постављени"
@@ -1419,17 +1210,19 @@ 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"
msgid_plural "honouring LOGIN-DELAY, sleeping for %i seconds"
@@ -1437,19 +1230,20 @@ msgstr[0] "тражен је застој при пријави, паузира
msgstr[1] "тражен је застој при пријави, паузирам %i секундe"
msgstr[2] "тражен је застој при пријави, паузирам %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 пријаву"
-#: ../src/mn-pop3-mailbox.gob:1070
+#: ../src/mn-pop3-mailbox.gob:1020
msgid "falling back to USER/PASS authentication"
msgstr "прелазим на пријаву помоћу имена и лозинке"
-#: ../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 "Поставке за дојаву"
@@ -1469,11 +1263,11 @@ msgstr "доле-лево"
msgid "bottom right"
msgstr "доле-десно"
-#: ../src/mn-properties-dialog.gob:329
+#: ../src/mn-properties-dialog.gob:332
msgid "No mailbox selected."
msgstr "Ниједно сандуче није изабрано."
-#: ../src/mn-properties-dialog.gob:334
+#: ../src/mn-properties-dialog.gob:337
#, c-format
msgid "%i mailbox selected."
msgid_plural "%i mailboxes selected."
@@ -1481,143 +1275,169 @@ msgstr[0] "Изабрано %i сандуче"
msgstr[1] "Изабрана %i сандучета"
msgstr[2] "Изабрано %i сандучета"
-#: ../src/mn-properties-dialog.gob:465
+#: ../src/mn-properties-dialog.gob:456
#, c-format
msgid "Test message #%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-shell.gob:445
+msgid "You have no new mail."
+msgstr "Нема нових порука."
+
#: ../src/mn-ssl.c:76
msgid "unknown SSL/TLS error"
-msgstr "непозната грешка у SSL/TLS"
+msgstr "непозната грешка са ССЛ/ТЛС"
-#: ../src/mn-stock.c:28
-msgid "Select _All"
-msgstr "Изабери _све"
+#: ../src/mn-standard-message-view.gob:64
+msgid "Unreadable message:"
+msgstr "Нечитљива порука:"
+
+#: ../src/mn-standard-message-view.gob:67
+msgid "From:"
+msgstr "Шаље:"
+
+#: ../src/mn-standard-message-view.gob:68
+msgid "Subject:"
+msgstr "Тема:"
+#: ../src/mn-standard-message-view.gob:72
+msgid "Sent:"
+msgstr "Послато:"
+
+#. translators: header capitalization
#: ../src/mn-stock.c:29
-msgid "Leave Fullscreen"
-msgstr "Остави на целом екрану"
+msgid "Select _All"
+msgstr "Изабери _све"
-#: ../src/mn-stock.c:30
+#. translators: header capitalization
+#. translators: header capitalization
+#: ../src/mn-stock.c:32
msgid "Co_nnect"
msgstr "_Повежи се"
-#: ../src/mn-sylpheed-mailbox-backend.gob:170
+#: ../src/mn-sylpheed-mailbox-backend.gob:223
#, c-format
msgid "unable to open folder: %s"
-msgstr "није могуће отворити директоријум: %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"
+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 "неочекивани крај датотеке"
-#: ../src/mn-sylpheed-mailbox-backend.gob:269
+#: ../src/mn-sylpheed-mailbox-backend.gob:438
#, c-format
msgid "incompatible file version \"%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-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>."
-#: ../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."
#: ../src/mn-system-vfs-mailbox.gob:72
-msgid "MAIL environment variable not defined"
-msgstr "променљива MAIL није дефинисана"
+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? није пронађен у сучељу ?%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"
-msgstr "није могуће отворити као модул: %s"
+msgid ""
+"Widget \"%s\" not found in interface \"%s\". Please check your Mail "
+"Notification installation."
+msgstr "Компонента „%s? није пронађена у сучељу „%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 "Примљен је неважећи списак места."
-#: ../src/mn-util.c:602
+#: ../src/mn-util.c:649
msgid "An invalid Mozilla location has been received."
msgstr "Примљен је неважећи Мозилин списак места."
-#: ../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 "_Не приказуј више ову поруку"
-
-#: ../src/mn-util.c:892
+#: ../src/mn-util.c:899
#, c-format
msgid ""
"The following location is invalid:\n"
@@ -1627,285 +1447,587 @@ msgid_plural ""
"The following locations are invalid:\n"
"\n"
"%s"
-msgstr[0] "Следеће место је неважеће:\n"
+msgstr[0] ""
+"Следеће место је неважеће:\n"
"\n"
"%s"
-msgstr[1] "Следећа места су неважећа:\n"
+msgstr[1] ""
+"Следећа места су неважећа:\n"
"\n"
"%s"
-msgstr[2] "Следећа места су неважећа:\n"
+msgstr[2] ""
+"Следећа места су неважећа:\n"
"\n"
"%s"
-#: ../src/mn-util.c:912
+#: ../src/mn-util.c:919
msgid "A fatal error has occurred in 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"
+msgid_plural "%i seconds ago"
+msgstr[0] "пре %i секунду"
+msgstr[1] "пре %i секунде"
+msgstr[2] "пре %i секунди"
-#: ../src/mn-util.c:1052
-msgid "A command error has occurred in Mail Notification"
-msgstr "Дошло је до грешке у командама"
+#: ../src/mn-util.c:1254
+#, c-format
+msgid "about %i minute ago"
+msgid_plural "about %i minutes ago"
+msgstr[0] "пре око %i минут"
+msgstr[1] "пре око %i минута"
+msgstr[2] "пре око %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"
+msgid_plural "about %i hours ago"
+msgstr[0] "пре око %i сат"
+msgstr[1] "пре око %i сата"
+msgstr[2] "пре око %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"
+msgid_plural "about %i days ago"
+msgstr[0] "пре око %i дан"
+msgstr[1] "пре око %i дана"
+msgstr[2] "пре око %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), упити су активирани"
+msgid "about %i week ago"
+msgid_plural "about %i weeks ago"
+msgstr[0] "пре око %i недељу"
+msgstr[1] "пре око %i недеље"
+msgstr[2] "пре око %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), упити су активирани"
+msgid "unable to monitor %s (%s), poll mode activated"
+msgstr "није могуће надгледати %s (%s), упити су активирани"
-#: ../src/mn-vfs-mailbox.gob:307
+#: ../src/mn-vfs-mailbox.gob:385
msgid "unknown mailbox format"
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)."
-msgid_plural ""
-"As a fallback, they will be checked every %i seconds (this delay is "
-"configurable from the Properties Dialog)."
-msgstr[0] ""
-"Пошто нема друге могућности, биће проверавани сваку %i секунду (ово кашњење "
-"се може променити из прозора са поставкама)"
-msgstr[1] ""
-"Пошто нема друге могућности, биће проверавани сваке %i секунде (ово кашњење "
-"се може променити из прозора са поставкама)"
-msgstr[2] ""
-"Пошто нема друге могућности, биће проверавани сваких %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)."
-msgid_plural ""
-"As a fallback, they will be checked every %i minutes (this delay is "
-"configurable from the Properties Dialog)."
-msgstr[0] ""
-"Пошто нема друге могућности, биће проверавани сваки %i минут (ово кашњење се "
-"може променити из прозора са поставкама)"
-msgstr[1] ""
-"Пошто нема друге могућности, биће проверавани сваких %i минута (ово кашњење "
-"се може променити из прозора са поставкама)"
-msgstr[2] ""
-"Пошто нема друге могућности, биће проверавани сваких %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)."
-msgid_plural ""
-"As a fallback, they will be checked approximately every %i minutes (this "
-"delay is configurable from the Properties Dialog)."
-msgstr[0] ""
-"Пошто нема друге могућности, биће проверавани на око %i минут (ово кашњење "
-"се може променити из прозора са поставкама)"
-msgstr[1] ""
-"Пошто нема друге могућности, биће проверавани на око %i минута (ово кашњење "
-"се може променити из прозора са поставкама)"
-msgstr[2] ""
-"Пошто нема друге могућности, биће проверавани на око %i минута (ово кашњење "
-"се може променити из прозора са поставкама)"
+#. 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\">Опште</span>"
-#: ../src/mn-vfs-mailbox.gob:415
-msgid "A monitoring error has occurred"
-msgstr "Дошло је до грешке при мотрењу"
+#: ../ui/mailbox-properties-dialog.glade.h:3
+msgid "Delay between mail chec_ks:"
+msgstr "_Пауза између провера поште:"
-#: ../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:4
+msgid "Mailbox _name:"
+msgstr "_Име сандучета:"
-#: ../ui/edit-toolbars-dialog.glade.h:1
-msgid "Edit Toolbars"
-msgstr "Уреди алатне траке"
+#. translators: header capitalization
+#: ../ui/mailbox-properties-dialog.glade.h:6
+msgid "Use De_fault"
+msgstr "_Користи подразумевано"
-#: ../ui/edit-toolbars-dialog.glade.h:2
-msgid "_Add a New Toolbar"
-msgstr "_Додај нову алатну траку"
+#: ../ui/mailbox-properties-dialog.glade.h:7
+msgid "_Mailbox type:"
+msgstr "_Врста сандучета:"
-#: ../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 "_Користи подразумевано"
-#: ../ui/mail-summary-popup.glade.h:1
-msgid "<span size=\"larger\" weight=\"bold\">Mail Summary</span>"
-msgstr "<span 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:10
+#: ../ui/properties-dialog.glade.h:48
+msgid "minutes"
+msgstr "минута"
-#: ../ui/mailbox-properties-dialog.glade.h:2
-msgid "Mailbox _name:"
-msgstr "_Име сандучета:"
+#: ../ui/mailbox-properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:52
+msgid "seconds"
+msgstr "секунди"
-#: ../ui/mailbox-properties-dialog.glade.h:3
-msgid "Mailbox _type:"
-msgstr "_Врста сандучета:"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:2
+msgid "<span weight=\"bold\">Click Action</span>"
+msgstr "<span weight=\"bold\">Наредба за притисак</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\">Наредбе</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
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:6
msgid "<span weight=\"bold\">Fonts</span>"
msgstr "<span weight=\"bold\">Писма</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\">Изглед</span>"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:12
msgid "<span weight=\"bold\">Mailbox List</span>"
msgstr "<span weight=\"bold\">Сандучићи</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\">Место</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\">Сажетак порука у облачићу</span>"
+
+#: ../ui/properties-dialog.glade.h:17
msgid "Co_ntents:"
msgstr "_Садржај:"
-#: ../ui/properties-dialog.glade.h:8
-msgid "Dis_play mail summary in tooltip"
-msgstr "Прикажи прозор са сажетком порука у облачићу"
-
-#: ../ui/properties-dialog.glade.h:9
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:19
msgid "General"
msgstr "Опште"
-#: ../ui/properties-dialog.glade.h:11
+#: ../ui/properties-dialog.glade.h:20
+msgid "Hide p_reviously displayed mail"
+msgstr "Са_криј претходно приказане поруке"
+
+#: ../ui/properties-dialog.glade.h:21
+msgid "Hori_zontal offset:"
+msgstr "_Хоризонтални помак:"
+
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:25
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 "Прикажи само скорашње поруке"
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:27
+msgid "Status Icon"
+msgstr "Статусна сличица"
-#: ../ui/properties-dialog.glade.h:14
+#: ../ui/properties-dialog.glade.h:28
msgid "Use these _fonts:"
msgstr "Користи ова _писма:"
-#: ../ui/properties-dialog.glade.h:15
-msgid "When _all mail has been read:"
-msgstr "Када је _сва пошта прочитана:"
-
-#: ../ui/properties-dialog.glade.h:16
+#: ../ui/properties-dialog.glade.h:29
msgid "When _new mail arrives:"
msgstr "Када _стигне нова пошта:"
-#: ../ui/properties-dialog.glade.h:17
+#: ../ui/properties-dialog.glade.h:30
+msgid "When all mail has _been read:"
+msgstr "Када је _сва пошта прочитана:"
+
+#: ../ui/properties-dialog.glade.h:31
+msgid "_Always display"
+msgstr "_Увек приказуј"
+
+#: ../ui/properties-dialog.glade.h:32
msgid "_Automatically close after:"
msgstr "_Аутоматски затвори после:"
-#: ../ui/properties-dialog.glade.h:18
+#: ../ui/properties-dialog.glade.h:33
msgid "_Blink on errors"
msgstr "_Трепери при грешкама"
-#: ../ui/properties-dialog.glade.h:19
-msgid "_Delay between mail checks:"
-msgstr "_Пауза између провера:"
-
-#: ../ui/properties-dialog.glade.h:20
+#. translators: header capitalization
+#: ../ui/properties-dialog.glade.h:35
msgid "_Display a Test Popup"
msgstr "Прикажи пробно прозорче"
-#: ../ui/properties-dialog.glade.h:21
-msgid "_Display the main window"
-msgstr "_Прикажи главни прозор"
+#: ../ui/properties-dialog.glade.h:36
+msgid "_Display seen mail"
+msgstr "_Прикажи прегледане поруке"
+
+#: ../ui/properties-dialog.glade.h:37
+msgid "_Display this dialog"
+msgstr "При_кажи овај прозор"
-#: ../ui/properties-dialog.glade.h:22
+#: ../ui/properties-dialog.glade.h:38
msgid "_Enable mail summary popup"
msgstr "Дозволи приказ сажетка порука"
-#: ../ui/properties-dialog.glade.h:23
-msgid "_Horizontal offset:"
-msgstr "_Хоризонтални помак:"
-
-#: ../ui/properties-dialog.glade.h:24
+#: ../ui/properties-dialog.glade.h:39
msgid "_Launch the mail reader"
msgstr "П_окрени читач поште"
-#: ../ui/properties-dialog.glade.h:25
-msgid "_Mail reader:"
-msgstr "_Читач поште:"
+#: ../ui/properties-dialog.glade.h:40
+msgid "_None"
+msgstr "_Ниједно"
-#: ../ui/properties-dialog.glade.h:26
+#: ../ui/properties-dialog.glade.h:41
msgid "_Position:"
msgstr "_Место:"
-#: ../ui/properties-dialog.glade.h:27
-msgid "_Start Mail Notification on GNOME login"
-msgstr "Покрени _дојаву при пријави"
-
-#: ../ui/properties-dialog.glade.h:28
+#: ../ui/properties-dialog.glade.h:42
msgid "_Title:"
msgstr "_Наслов:"
-#: ../ui/properties-dialog.glade.h:29
+#: ../ui/properties-dialog.glade.h:43
msgid "_Update the mail status"
msgstr "_Освежи податке о пошти"
-#: ../ui/properties-dialog.glade.h:30
+#: ../ui/properties-dialog.glade.h:44
msgid "_Use fonts from theme"
msgstr "Користи писма из _теме"
-#: ../ui/properties-dialog.glade.h:31
+#: ../ui/properties-dialog.glade.h:45
msgid "_Vertical offset:"
msgstr "_Вертикални помак:"
-#: ../ui/properties-dialog.glade.h:32
-msgid "minutes"
-msgstr "минута"
+#: ../ui/properties-dialog.glade.h:46
+msgid "icon tooltip's mail summary layout|Co_mpact"
+msgstr "_Скраћен"
-#: ../ui/properties-dialog.glade.h:33
+#: ../ui/properties-dialog.glade.h:47
+msgid "icon tooltip's mail summary layout|_Standard"
+msgstr "_Обичан"
+
+#: ../ui/properties-dialog.glade.h:49
msgid "pixels"
msgstr "тачака"
-#: ../ui/properties-dialog.glade.h:34
-msgid "seconds"
-msgstr "секунди"
+#: ../ui/properties-dialog.glade.h:50
+msgid "popup's mail summary layout|Co_mpact"
+msgstr "С_краћен"
+
+#: ../ui/properties-dialog.glade.h:51
+msgid "popup's mail summary layout|_Standard"
+msgstr "О_бичан"
+
+#~ msgid "Delay between mail checks (minutes part)."
+#~ msgstr "Размак између две провере (минути)"
+
+#~ msgid "Delay between mail checks (seconds part)."
+#~ msgstr "Размак између две провере (секунде)."
+
+#~ msgid "Display mail summary in tooltip"
+#~ msgstr "Прикажи сажетат порука у облачићу"
+
+#~ msgid "Do not show the immediate notification error dialog"
+#~ msgstr "Не показуј прозор са обавештењем о грешкама"
+
+#~ msgid "Height of edit toolbars dialog"
+#~ msgstr "Висина прозора за уређивање алатних трака"
+
+#~ msgid "Height of main window"
+#~ msgstr "Висина главног прозора"
+
+#~ msgid "Mail reader command"
+#~ msgstr "Команда за читање поште"
+
+#~ msgid "Minutes between mail checks"
+#~ msgstr "Минута између две провере"
+
+#~ msgid "Seconds between mail checks"
+#~ msgstr "Секунди између две провере"
+
+#~ msgid "Set a mail reader"
+#~ msgstr "Изаберите читач поште"
+
+#~ msgid "The command to run to launch the mail reader."
+#~ msgstr "Команда којом се покреће читач поште"
+
+#~ msgid "The height of the edit toolbars dialog in pixels."
+#~ msgstr "Висина прозора за уређивање статусних трака, изражена у тачкама."
+
+#~ msgid "The height of the main window in pixels."
+#~ msgstr "Висина главног прозора изражена у тачкама."
+
+#~ msgid ""
+#~ "The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text"
+#~ "\", \"both\" or \"both-horiz\"."
+#~ msgstr ""
+#~ "Стил алатних трака. Може бити: ?подразумеван?, ?слике?, ?текст?, ?оба?, ?"
+#~ "оба-водоравно?."
+
+#~ msgid "The width of the edit toolbars dialog in pixels."
+#~ msgstr "Ширина прозора за уређивање статусних трака, изражена у тачкама."
+
+#~ msgid "The width of the main window in pixels."
+#~ msgstr "Ширина прозора главног прозора изражена у тачкама."
+
+#~ msgid "Toolbars style"
+#~ msgstr "Стил алатне траке"
+
+#~ msgid "View statusbar"
+#~ msgstr "Прикажи статусну траку"
+
+#~ msgid "View toolbars"
+#~ msgstr "Прикажи алатну траку"
+
+#~ msgid "Whether the statusbar should be visible or not."
+#~ msgstr "Да ли статусна линија треба да се види или не."
+
+#~ msgid "Whether the toolbars should be visible or not."
+#~ msgstr "Да ли алатне траке треба да се виде или не"
+
+#~ msgid ""
+#~ "Whether to display the mail summary in the status icon tooltip or not."
+#~ msgstr ""
+#~ "Да ли треба приказати сажетак порука у облачићу статусне сличице или не."
+
+#~ msgid ""
+#~ "Whether to prevent the immediate notification error dialog from being "
+#~ "displayed or not."
+#~ msgstr "Да ли треба или не треба спречити појаву прозора са описом грешака."
+
+#~ msgid "Whether to set a mail reader or not."
+#~ msgstr "Да ли треба поставити читач поште или не."
+
+#~ msgid "Width of edit toolbars dialog"
+#~ msgstr "Ширина прозора за уређивање статусних трака"
+
+#~ msgid "Width of main window"
+#~ msgstr "Ширина главног прозора"
+
+#~ msgid "New Mail"
+#~ msgstr "Нова пошта"
+
+#~ msgid "_Remove Toolbar"
+#~ msgstr "_Уклони алатну траку"
+
+#~ msgid "Separator"
+#~ msgstr "Граничник"
+
+#~ msgid "Main _Window"
+#~ msgstr "Главни _прозор"
+
+#~ msgid "Help messages"
+#~ msgstr "Поруке за помоћ"
+
+#~ msgid "Count messages"
+#~ msgstr "Преброј поруке"
+
+#~ msgid "_Mail"
+#~ msgstr "_Пошта"
+
+#~ msgid "_Edit"
+#~ msgstr "_Уреди"
+
+#~ msgid "_View"
+#~ msgstr "_Преглед"
+
+#~ msgid "_Help"
+#~ msgstr "П_омоћ"
+
+#~ msgid "Launch the mail reader"
+#~ msgstr "П_окрени читач поште"
+
+#~ msgid "_Close"
+#~ msgstr "_Затвори"
+
+#~ msgid "Close this window"
+#~ msgstr "Затвори овај прозор"
+
+#~ msgid "_Quit"
+#~ msgstr "_Крај"
+
+#~ msgid "_Toolbars"
+#~ msgstr "_Алатне траке"
+
+#~ msgid "Customize the toolbars"
+#~ msgstr "Уреди алатне траке"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Поставке"
+
+#~ msgid "Toolbars Styl_e"
+#~ msgstr "Стил алатних _трака"
+
+#~ msgid "Customize the toolbars style"
+#~ msgstr "Прилагоди стил алатних трака"
+
+#~ msgid "_Contents"
+#~ msgstr "_Садржај"
+
+#~ msgid "Display help"
+#~ msgstr "Прикажи помоћ"
+
+#~ msgid "_About"
+#~ msgstr "_О програму"
+
+#~ msgid "Display credits"
+#~ msgstr "Прикажи заслуге"
+
+#~ msgid "Show or hide the toolbars"
+#~ msgstr "Прикажи или уклони алатну траку"
+
+#~ msgid "_Statusbar"
+#~ msgstr "_Статусна трака"
+
+#~ msgid "Show or hide the statusbar"
+#~ msgstr "Прикажи или уклони статусну траку"
+
+#~ msgid "_Desktop Default"
+#~ msgstr "_Подразумевано у окружењу"
+
+#~ msgid "Set the toolbars style to the desktop default setting"
+#~ msgstr "Постави стилове трака на стил који важи у целом радном окружењу"
+
+#~ msgid "I_cons Only"
+#~ msgstr "Само _слике"
+
+#~ msgid "_Text Only"
+#~ msgstr "Само _текст"
+
+#~ msgid "Only display the toolbars text"
+#~ msgstr "Прика�и само текст у алатној траци"
+
+#~ msgid "Text Belo_w Icons"
+#~ msgstr "Текст _испод слика"
+
+#~ msgid "Display the toolbars text below the icons"
+#~ msgstr "Прикажи текст испод одговарајуће слике у алатној траци"
+
+#~ msgid "Text Be_side Icons"
+#~ msgstr "Текст _поред слика"
+
+#~ msgid "Display the toolbars text beside the icons"
+#~ msgstr "Прикажи текст поред одговарајуће слике у алатној траци"
+
+#~ msgid "unable to load menus.xml: %s"
+#~ msgstr "Није могуће прочитати menus.xml: %s"
+
+#~ msgid "unable to load toolbars.xml"
+#~ msgstr "није могуће учитати toolbars.xml: %s"
+
+#~ msgid "%i new message"
+#~ msgid_plural "%i new messages"
+#~ msgstr[0] "%i нова порука"
+#~ msgstr[1] "%i нове поруке"
+#~ msgstr[2] "%i нових порука"
+
+#~ msgid "Compiled-in mailbox backends: "
+#~ msgstr "Уграђене могућности за сандучиће:"
+
+#~ msgid "List the compiled-in features"
+#~ msgstr "Испиши уграђене могућности"
+
+#~ msgid "Display the main window"
+#~ msgstr "Прикажи главни прозор"
+
+#~ msgid "You have new mail."
+#~ msgstr "Имате нову пошту."
+
+#~ msgid "Leave Fullscreen"
+#~ msgstr "Остави на целом екрану"
+
+#~ msgid "MAIL environment variable not defined"
+#~ msgstr "променљива MAIL није дефинисана"
+
+#~ msgid "widget \"%s\" not found in interface \"%s\""
+#~ msgstr "елемент ?%s? није пронађен у сучељу ?%s?"
+
+#~ msgid "signal handler \"%s\" not found"
+#~ msgstr "обрађивач сигнала „%s“ није пронађен"
+
+#~ msgid "_Do not show this message again"
+#~ msgstr "_Не приказуј више ову поруку"
+
+#~ msgid "invalid signal specification \"%s\""
+#~ msgstr "неважећа одредница за сигнал ?%s?"
+
+#~ msgid "unable to monitor mailbox contents (%s), poll mode activated"
+#~ msgstr "није могуће надгледати садржај сандучета (%s), упити су активирани"
+
+#~ 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] ""
+#~ "Пошто нема друге могућности, биће проверавани сваку %i секунду (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+#~ msgstr[1] ""
+#~ "Пошто нема друге могућности, биће проверавани сваке %i секунде (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+#~ msgstr[2] ""
+#~ "Пошто нема друге могућности, биће проверавани сваких %i секунди (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+
+#~ 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] ""
+#~ "Пошто нема друге могућности, биће проверавани сваки %i минут (ово кашњење "
+#~ "се може променити из прозора са поставкама)"
+#~ msgstr[1] ""
+#~ "Пошто нема друге могућности, биће проверавани сваких %i минута (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+#~ msgstr[2] ""
+#~ "Пошто нема друге могућности, биће проверавани сваких %i минута (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+
+#~ 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] ""
+#~ "Пошто нема друге могућности, биће проверавани на око %i минут (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+#~ msgstr[1] ""
+#~ "Пошто нема друге могућности, биће проверавани на око %i минута (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+#~ msgstr[2] ""
+#~ "Пошто нема друге могућности, биће проверавани на око %i минута (ово "
+#~ "кашњење се може променити из прозора са поставкама)"
+
+#~ msgid "A monitoring error has occurred"
+#~ msgstr "Дошло је до грешке при мотрењу"
+
+#~ msgid ""
+#~ "Mail Notification was unable to enable immediate notification for one or "
+#~ "more mailboxes. %s"
+#~ msgstr ""
+#~ "Није могуће наместити непосредну дојаву нове поште за један или више "
+#~ "сандучића. %s"
+
+#~ msgid "Edit Toolbars"
+#~ msgstr "Уреди алатне траке"
+
+#~ msgid "_Add a New Toolbar"
+#~ msgstr "_Додај нову алатну траку"
+
+#~ msgid "Dis_play mail summary in tooltip"
+#~ msgstr "Прикажи прозор са сажетком порука у облачићу"
+
+#~ msgid "Mailboxes"
+#~ msgstr "Сандучићи"
+
+#~ msgid "_Display the main window"
+#~ msgstr "_Прикажи главни прозор"
+
+#~ msgid "_Mail reader:"
+#~ msgstr "_Читач поште:"
+
+#~ msgid "_Start Mail Notification on GNOME login"
+#~ msgstr "Покрени _дојаву при пријави"
#~ msgid "Has already been run"
#~ msgstr "Већ је покренут"
@@ -2187,9 +2309,6 @@ msgstr "секунди"
#~ msgstr ""
#~ "Да ли треба или не треба приказивати сажетак порука када стигне нова пошта"
-#~ msgid "Whether to hide previously displayed mail or not"
-#~ msgstr "Да ли треба приказивати претходно приказане поруке или не"
-
#~ msgid "Whether to run a command when all mail is read or not"
#~ msgstr "Да ли се покреће или не покреће команда када је сва пошта прочитана"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
@@ -4,17 +4,17 @@
# This file is distributed under the same license as the
# mail-notification package.
#
-# Filip Miletic <filmil@gmail.com>, 2004, 2005.
+# Filip Miletic <filmil@gmail.com>, 2004-2006.
#
# Both Serbian Cyrillic and Serbian Latin files should
# be available.
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 2.0\n"
+"Project-Id-Version: mail-notification 3.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-31 04:17+0200\n"
-"PO-Revision-Date: 2005-07-31 11:13+0100\n"
+"POT-Creation-Date: 2006-06-25 01:00+0200\n"
+"PO-Revision-Date: 2006-11-21 17:41+0100\n"
"Last-Translator: Filip Miletić <filmil@gmail.com>\n"
"Language-Team: Serbian (sr) <gnu@prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -32,11 +32,11 @@ msgstr "Fabrika za dojavu prispeća pošte"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:1
msgid "Evolution folder tree control"
-msgstr "Upravljanje Evolucijinim drvetom direktorijuma"
+msgstr "Upravljanje stablom fascikli u programu Evolucija"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:2
msgid "Evolution folder tree control factory"
-msgstr "Fabrika za upravljač Evolucijinim drvetom direktorijuma"
+msgstr "Fabrika za upravljanje stablom fascikli u programu Evolucija"
#: ../data/GNOME_MailNotification_Evolution.server.in.h:3
msgid "Mail Notification / Evolution glue"
@@ -47,14 +47,12 @@ msgid "Mail Notification / Evolution glue factory"
msgstr "Fabrika za Dojavu pošte i Evoluciju"
#: ../data/mail-notification-properties.desktop.in.h:1
-#: ../src/mn-main-window.gob:209
msgid "Configure Mail Notification"
msgstr "Podesi dojavu prispeća pošte"
#: ../data/mail-notification-properties.desktop.in.h:2
-#: ../data/mail-notification.desktop.in.h:2
-#: ../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 "Dojava pošte"
@@ -63,196 +61,149 @@ msgid "Get notified when new mail arrives"
msgstr "Obavesti kada stigne nova pošta"
#: ../data/mail-notification.schemas.in.h:1
+msgid "Always display an icon"
+msgstr "Uvek prikazuj sličicu"
+
+#: ../data/mail-notification.schemas.in.h:2
msgid "Automatically close the mail summary popup"
msgstr "Automatski zatvori prozor sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:2
+#: ../data/mail-notification.schemas.in.h:3
msgid "Blink on errors"
msgstr "Treperi ako dođe do greške"
-#: ../data/mail-notification.schemas.in.h:3
-msgid "Delay between mail checks (minutes part)."
-msgstr "Razmak između dve provere (minuti)"
-
#: ../data/mail-notification.schemas.in.h:4
-msgid "Delay between mail checks (seconds part)."
-msgstr "Razmak između dve provere (sekunde)."
+msgid "Click action"
+msgstr "Dejstvo pri pritisku"
#: ../data/mail-notification.schemas.in.h:5
-msgid "Display mail summary in tooltip"
-msgstr "Prikaži sažetat poruka u oblačiću"
+msgid "Display seen mail"
+msgstr "Prikaži pregledane poruke"
#: ../data/mail-notification.schemas.in.h:6
-msgid "Do not show the immediate notification error dialog"
-msgstr "Ne pokazuj prozor sa obaveštenjem o greškama"
-
-#: ../data/mail-notification.schemas.in.h:7
-msgid "Double-click action"
-msgstr "Izvrši na dvostruki klik"
-
-#: ../data/mail-notification.schemas.in.h:8
msgid "Enable mail summary popup"
msgstr "Dozvoli prikaz sažetka poruka"
-#: ../data/mail-notification.schemas.in.h:9
+#: ../data/mail-notification.schemas.in.h:7
msgid "Fingerprints of trusted X509 certificates"
msgstr "Otisci proverenih X509 sertifikata"
-#: ../data/mail-notification.schemas.in.h:10
-msgid "Height of edit toolbars dialog"
-msgstr "Visina prozora za uređivanje alatnih traka"
-
-#: ../data/mail-notification.schemas.in.h:11
-msgid "Height of main window"
-msgstr "Visina glavnog prozora"
-
-#: ../data/mail-notification.schemas.in.h:12
+#: ../data/mail-notification.schemas.in.h:8
msgid "Height of properties dialog"
msgstr "Visina prozora sa postavkama"
-#: ../data/mail-notification.schemas.in.h:13
+#: ../data/mail-notification.schemas.in.h:9
msgid "Mail read command"
msgstr "Komanda za čitanje pošte"
-#: ../data/mail-notification.schemas.in.h:14
-msgid "Mail reader command"
-msgstr "Komanda za čitanje pošte"
-
-#: ../data/mail-notification.schemas.in.h:15
+#: ../data/mail-notification.schemas.in.h:10
msgid "Mail summary popup contents font"
msgstr "Pismo koje se koristi za sadržaj prozora sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:16
+#: ../data/mail-notification.schemas.in.h:11
msgid "Mail summary popup fonts aspect source"
msgstr "Izvor za aspekt za pismo u prozoru za sažetak (???)"
-#: ../data/mail-notification.schemas.in.h:17
+#: ../data/mail-notification.schemas.in.h:12
msgid "Mail summary popup horizontal offset"
msgstr "Pomeraj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:18
+#: ../data/mail-notification.schemas.in.h:13
msgid "Mail summary popup position"
msgstr "Broj horizontalnih tačaka za prozor sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:19
+#: ../data/mail-notification.schemas.in.h:14
msgid "Mail summary popup title font"
msgstr "Pismo koje se koristi za naslov prozora sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:20
+#: ../data/mail-notification.schemas.in.h:15
msgid "Mail summary popup vertical offset"
msgstr "Pomeraj vertikalnih tačaka ѕa prozor sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:21
-msgid "Minutes between mail checks"
-msgstr "Minuta između dve provere"
-
-#: ../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 ""
"Broj minuta koji treba da protekne pre zatvaranja prozora sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:23
+#: ../data/mail-notification.schemas.in.h:17
msgid "New mail command"
msgstr "Izvrši kada pošta stigne"
-#: ../data/mail-notification.schemas.in.h:24
+#: ../data/mail-notification.schemas.in.h:18
msgid "Only display recent mail in mail summary popup"
msgstr "Prikaži samo skoro prispele poruke u sažetku"
-#: ../data/mail-notification.schemas.in.h:25
+#: ../data/mail-notification.schemas.in.h:19
msgid "Run a command when all mail is read"
msgstr "Pokreni komandu kada je sva pošta pročitana"
-#: ../data/mail-notification.schemas.in.h:26
+#: ../data/mail-notification.schemas.in.h:20
msgid "Run a command when new mail arrives"
msgstr "Pokreni komandu kada stigne nova pošta"
-#: ../data/mail-notification.schemas.in.h:27
-msgid "Seconds between mail checks"
-msgstr "Sekundi između dve provere"
-
-#: ../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 "Broj sekundi koji treba da protekne pre zatvaranja sažetka poruka"
-#: ../data/mail-notification.schemas.in.h:29
-msgid "Set a mail reader"
-msgstr "Izaberite čitač pošte"
-
-#: ../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\"."
-msgstr ""
-"Postavljanje naredbe koja se izvršava pri dvostrukom kliku na sličicu. Mogući "
-"izbori su: ?glavni-prozor?, ?pokreni-čitač-pošte? ili ?ažuriraj-status-"
-"pošte?."
+"The action to perform when the icon is clicked. Must be \"display-properties-"
+"dialog\", \"launch-mail-reader\" or \"update-mail-status\"."
+msgstr "Postavljanje naredbe koja se izvršava pri pritisku na sličicu. Mogući izbori su: „glavni-prozor?, „pokreni-čitač-pošte? ili „ažuriraj-status-pošte?."
-#: ../data/mail-notification.schemas.in.h:31
+#: ../data/mail-notification.schemas.in.h:23
msgid ""
"The amount of time to wait before closing the mail summary popup (minutes "
"part)."
msgstr "Pauza pre zatvaranja prozora sa sažetkom poruka (minuti)."
-#: ../data/mail-notification.schemas.in.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 "Pauza pre zatvaranja prozora sa sažetkom poruka (sekunde)."
-#: ../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 "Izvor za podešavanja pisma. Može biti: ?tema? ili ?poseban?."
-#: ../data/mail-notification.schemas.in.h:34
-msgid "The command to run to launch the mail reader."
-msgstr "Komanda kojom se pokreće čitač pošte"
-
-#: ../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 "Komanda koju treba pokrenuti kada je sva pošta pročitana."
-#: ../data/mail-notification.schemas.in.h:36
+#: ../data/mail-notification.schemas.in.h:27
msgid "The command to run when new mail arrives."
msgstr "Pokreni ovu komandu kada stigne nova 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 ""
"Posebno pismo koje se koristi za ispis sadržaja prozora sa sažetkom poruka."
-#: ../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 ""
"Posebno pismo koje se koristi za ispis naslova prozora sa sažetkom poruka."
-#: ../data/mail-notification.schemas.in.h:39
-msgid "The height of the edit toolbars dialog in pixels."
-msgstr "Visina prozora za uređivanje statusnih traka, izražena u tačkama."
-
-#: ../data/mail-notification.schemas.in.h:40
-msgid "The height of the main window in pixels."
-msgstr "Visina glavnog prozora izražena u tačkama."
-
-#: ../data/mail-notification.schemas.in.h:41
+#: ../data/mail-notification.schemas.in.h:30
msgid "The height of the properties dialog in pixels."
msgstr "Visina prozora sa postavkama izražena u tačkama."
-#: ../data/mail-notification.schemas.in.h:42
+#: ../data/mail-notification.schemas.in.h:31
msgid ""
"The list of trusted SSL/TLS servers (hostname:port) lacking a X509 "
"certificate."
msgstr ""
"Spisak proverenih SSL/TLS servera (računar:port) koji nemaju X509 sertifikat."
-#: ../data/mail-notification.schemas.in.h:43
+#: ../data/mail-notification.schemas.in.h:32
msgid ""
"The list of trusted X509 certificates, represented by their MD5 fingerprint."
msgstr "Spisak proverenih X509 sertifikata, predstavljenih MD5 otiskom."
-#: ../data/mail-notification.schemas.in.h: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 +211,7 @@ msgstr ""
"Broj tačaka koje treba ostaviti između leve, odn. desne strane ekrana i "
"prozora sa sažetkom poruka."
-#: ../data/mail-notification.schemas.in.h: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,7 +219,7 @@ msgstr ""
"Broj tačaka koje treba ostaviti između vrha, odn. dna ekrana i prozora sa "
"sažetkom poruka."
-#: ../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\"."
@@ -276,126 +227,74 @@ msgstr ""
"Položaj prozora sa sažetkom poruka. Može biti: ?gore-levo?, ?gore-desno?, ?"
"dole-levo? ili ?dole-desno?."
-#: ../data/mail-notification.schemas.in.h:47
+#: ../data/mail-notification.schemas.in.h:36
msgid ""
-"The style of the toolbars. Must be \"desktop-default\", \"icons\", \"text\", "
-"\"both\" or \"both-horiz\"."
-msgstr ""
-"Stil alatnih traka. Može biti: ?podrazumevan?, ?slike?, ?tekst?, ?oba?, ?oba-"
-"vodoravno?."
-
-#: ../data/mail-notification.schemas.in.h:48
-msgid "The width of the edit toolbars dialog in pixels."
-msgstr "Širina prozora za uređivanje statusnih traka, izražena u tačkama."
-
-#: ../data/mail-notification.schemas.in.h:49
-msgid "The width of the main window in pixels."
-msgstr "Širina prozora glavnog prozora izražena u tačkama."
+"The type of mail summary to display in the icon's tooltip. Must be \"standard"
+"\", \"compact\" or \"none\"."
+msgstr "Vrsta sažetka pošte koji se prikazuje u oblačiću. Može biti „običan?, „kratak? ili „nijedan?."
-#: ../data/mail-notification.schemas.in.h:50
+#: ../data/mail-notification.schemas.in.h:37
msgid "The width of the properties dialog in pixels."
msgstr "Širina prozora sa postavkama izražena u tačkama."
-#: ../data/mail-notification.schemas.in.h:51
-msgid "Toolbars style"
-msgstr "Stil alatne trake"
+#: ../data/mail-notification.schemas.in.h:38
+msgid "Tooltip mail summary"
+msgstr "Oblačić sa sažetkom poruka"
-#: ../data/mail-notification.schemas.in.h:52
+#: ../data/mail-notification.schemas.in.h:39
msgid "Trusted servers list"
msgstr "Spisak proverenih servera"
-#: ../data/mail-notification.schemas.in.h:53
-msgid "View statusbar"
-msgstr "Prikaži statusnu traku"
-
-#: ../data/mail-notification.schemas.in.h:54
-msgid "View toolbars"
-msgstr "Prikaži alatnu traku"
-
-#: ../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 "Da li sličica treba da treperi ako dođe do greške ili ne."
-#: ../data/mail-notification.schemas.in.h:56
-msgid "Whether the statusbar should be visible or not."
-msgstr "Da li statusna linija treba da se vidi ili ne."
-
-#: ../data/mail-notification.schemas.in.h:57
-msgid "Whether the toolbars should be visible or not."
-msgstr "Da li alatne trake treba da se vide ili 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 ""
"Da li treba ili ne treba automatski zatvoriti prozor sa sažetkom pošte."
-#: ../data/mail-notification.schemas.in.h:59
-msgid "Whether to display the mail summary in the status icon tooltip or not."
-msgstr ""
-"Da li treba prikazati sažetak poruka u oblačiću statusne sličice ili ne."
+#: ../data/mail-notification.schemas.in.h:42
+msgid "Whether to display an icon when there is no new mail or not."
+msgstr "Da li se prikazuje sličica kada nema nove pošte."
+
+#: ../data/mail-notification.schemas.in.h:43
+msgid "Whether to display seen mail or not."
+msgstr "Da li treba prikazivati pregledanu poštu ili 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 "Da li treba prikazati sažetak poruka kada stigne nova pošta."
-#: ../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 ""
"Da li iz sažetka treba ukloniti poruke koje su se u njemu već pre pojavile."
-#: ../data/mail-notification.schemas.in.h:62
-msgid ""
-"Whether to prevent the immediate notification error dialog from being "
-"displayed or not."
-msgstr "Da li treba ili ne treba sprečiti pojavu prozora sa opisom grešaka."
-
-#: ../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 ""
"Da li treba ili ne treba pokrenuti neku komandu kada je sva pošta pročitana."
-#: ../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 "Da li treba pokrenuti neku komandu kada stigne nova pošta."
-#: ../data/mail-notification.schemas.in.h:65
-msgid "Whether to set a mail reader or not."
-msgstr "Da li treba postaviti čitač pošte ili ne."
-
-#: ../data/mail-notification.schemas.in.h:66
-msgid "Width of edit toolbars dialog"
-msgstr "Širina prozora za uređivanje statusnih traka"
-
-#: ../data/mail-notification.schemas.in.h:67
-msgid "Width of main window"
-msgstr "Širina glavnog prozora"
-
-#: ../data/mail-notification.schemas.in.h:68
+#: ../data/mail-notification.schemas.in.h:48
msgid "Width of properties dialog"
msgstr "Širina prozora sa postavkama"
-#: ../data/mail-notification.soundlist.in.h:2
-msgid "New Mail"
-msgstr "Nova pošta"
-
-#: ../src/egg-editable-toolbar.c:534
-msgid "_Remove Toolbar"
-msgstr "_Ukloni alatnu traku"
-
-#: ../src/egg-toolbar-editor.c:555
-msgid "Separator"
-msgstr "Graničnik"
-
-#: ../src/eggtrayicon.c:128
+#: ../src/eggtrayicon.c:132
msgid "Orientation"
msgstr "Orijentacija"
-#: ../src/eggtrayicon.c:129
+#: ../src/eggtrayicon.c:133
msgid "The orientation of the tray."
msgstr "Orijentacija obaveštajne zone."
-#: ../src/mn-about-dialog.gob:48
+#. translators: header capitalization
+#: ../src/mn-about-dialog.gob:49
msgid "A Mail Notification Icon"
msgstr "Sličica za dojavu prispeća pošte"
@@ -403,16 +302,16 @@ msgstr "Sličica za dojavu prispeća pošte"
#. * translators: Your Name <your-email>
#. * optionally followed by one or more: \nOther Contributor's Name <his-email>
#.
-#: ../src/mn-about-dialog.gob:56
+#: ../src/mn-about-dialog.gob:57
msgid "translator-credits"
msgstr "Filip Miletić <filmil@gmail.com>"
-#: ../src/mn-about-dialog.gob:78
+#: ../src/mn-about-dialog.gob:79
msgid "Unable to open link"
msgstr "nije moguće otvoriti vezu"
#: ../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\">sam pronađi</span>"
@@ -424,124 +323,113 @@ msgstr "_Kor.ime:"
msgid "_Password:"
msgstr "_Lozinka:"
-#: ../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 ""
-"Nije moguće prijaviti se za čitanje %s sandučeta %s, najverovatnije zato što "
-"uneta lozinka nije ispravna.\n"
-"\n"
-"Molim unesite ponovo lozinku."
-
-#: ../src/mn-authenticated-mailbox.gob:153
-#, c-format
-msgid "Enter your credentials for %s mailbox %s."
-msgstr "Unesite lozinku za %s sanduče %s."
-
-#. keep the title in sync with gnome-authentication-manager
-#: ../src/mn-authenticated-mailbox.gob:195
-msgid "Authentication Required"
-msgstr "Potrebna je prijava"
-
-#: ../src/mn-autodetect-mailbox-properties.gob:93
+#: ../src/mn-autodetect-mailbox-properties.gob:110
msgid "Location"
msgstr "Mesto"
-#: ../src/mn-autodetect-mailbox-properties.gob:103
+#: ../src/mn-autodetect-mailbox-properties.gob:122
msgid "_Location:"
msgstr "_Mesto:"
-#: ../src/mn-autodetect-mailbox-properties.gob:110
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:130
msgid "_Browse..."
msgstr "_Pregledaj..."
-#: ../src/mn-autodetect-mailbox-properties.gob:149
+#. translators: header capitalization
+#: ../src/mn-autodetect-mailbox-properties.gob:172
msgid "Select a File or Folder"
-msgstr "Izaberite datoteku ili direktorijum"
+msgstr "Izaberite datoteku ili fasciklu"
-#: ../src/mn-client-session.c:248
+#: ../src/mn-client-session.c:247
#, c-format
msgid "resolving %s"
msgstr "pronalazim %s"
-#: ../src/mn-client-session.c:264
+#: ../src/mn-client-session.c:263
#, c-format
msgid "unable to resolve %s: %s"
msgstr "Nije moguće pronaći %s: %s"
-#: ../src/mn-client-session.c:308
+#: ../src/mn-client-session.c:304
+#, c-format
+msgid "network address #%i"
+msgstr "mrežna adresa #%i"
+
+#: ../src/mn-client-session.c:307
+#, c-format
+msgid "unable to convert network address #%i into textual form: %s"
+msgstr "mrežna adresa #%i se ne može prebaciti u tekstualni oblik: %s"
+
+#: ../src/mn-client-session.c:318
#, c-format
msgid "%s: unsupported address family"
msgstr "%s: ova vrsta adrese nije podržana"
-#: ../src/mn-client-session.c:315
+#: ../src/mn-client-session.c:325
#, c-format
msgid "%s: unable to create socket: %s"
msgstr "%s: nije moguće napraviti utičnicu: %s"
-#: ../src/mn-client-session.c:319
+#: ../src/mn-client-session.c:329
#, c-format
msgid "connecting to %s (%s) port %i"
msgstr "povezujem se sa %s (%s) port %i"
-#: ../src/mn-client-session.c:322
+#: ../src/mn-client-session.c:332
#, c-format
msgid "unable to connect: %s"
msgstr "nije moguće povezati se sa: %s"
-#: ../src/mn-client-session.c:327
+#: ../src/mn-client-session.c:337
msgid "connected successfully"
msgstr "povezivanje je uspelo"
#. 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 "nije moguće povezati se sa %s"
-#: ../src/mn-client-session.c:360
+#: ../src/mn-client-session.c:378
#, c-format
msgid "unable to initialize the OpenSSL library: %s"
msgstr "nije moguće pokrenuti OpenSSL biblioteku: %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 "nije moguće napraviti SSL/TLS objekat: %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 "nije moguće postaviti SSL/TLS opis za datoteku: %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 "nije moguće obaviti SSL/TLS kontakt: %s"
-#: ../src/mn-client-session.c:386
+#: ../src/mn-client-session.c:404
msgid "untrusted server"
msgstr "neproveren 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 sloj je pokrenut (%s, %s %i-bit)"
-#: ../src/mn-client-session.c:437
+#: ../src/mn-client-session.c:455
#, c-format
msgid "%s, fingerprint: %s"
msgstr "%s, otisak: %s"
-#: ../src/mn-client-session.c:466
+#: ../src/mn-client-session.c:484
msgid "missing certificate"
msgstr "nedostaje sertifikat"
-#: ../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 "
@@ -560,313 +448,343 @@ msgstr ""
"sa \"%s\". Ako odlučite da se povežete na server, ova poruka neće ponovo "
"biti prikazana."
-#: ../src/mn-client-session.c:507
+#: ../src/mn-client-session.c:525
msgid "Connect to untrusted server?"
msgstr "Da li da se povežem na neprovereni server?"
-#: ../src/mn-client-session.c:571
+#: ../src/mn-client-session.c:590
#, c-format
msgid "response \"%s\" is not valid in current context"
msgstr "odgovor \"%s\" nije ispravan u trenutno važećem kontekstu"
-#: ../src/mn-client-session.c:599
+#: ../src/mn-client-session.c:619
#, c-format
msgid "unable to parse response \"%s\""
msgstr "nije moguće obraditi odgovor \"%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 "Nije moguće čitanje sa servera: %s"
-#: ../src/mn-client-session.c:654
+#: ../src/mn-client-session.c:674
msgid "unable to read from server: EOF"
msgstr "Nije moguće čitanje sa servera: EOF"
-#: ../src/mn-client-session.c:666
+#: ../src/mn-client-session.c:686
#, c-format
msgid "unable to decode data using SASL: %s"
msgstr "Ne mogu se dekodovati podaci putem 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 "nije moguće kodirati podatke uz pomoć 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 "nije moguć upis na server: %s"
-#: ../src/mn-client-session.c:847
+#: ../src/mn-client-session.c:867
msgid "unable to write to server: EOF"
msgstr "nije moguć upis 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 "nije moguće kodirati 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 "ne može se pokrenuti SASL biblioteka: %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 "ne može da se dobavi lokalna adresa utičnice: %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 "ne može da se dobavi udaljena adresa utičnice: %s"
-#: ../src/mn-client-session.c:1108
+#: ../src/mn-client-session.c:1127
#, c-format
msgid "unable to set SASL security properties: %s"
msgstr "nije moguće postaviti SASL sigurnosne postavke: %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 "ne može se pokrenuti SASL prijava: SASL traži podatke koje nemamo"
-#: ../src/mn-client-session.c:1151
+#: ../src/mn-client-session.c:1170
#, c-format
msgid "unable to start SASL authentication: %s"
msgstr "ne može se pokrenuti SASL prijava: %s"
-#: ../src/mn-client-session.c:1155
+#: ../src/mn-client-session.c:1174
#, c-format
msgid "unable to create a SASL connection: %s"
msgstr "nije moguće uspostaviti SASL vezu: %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 je tražio nama nepoznate podatke, obustavljam SASL prijavu"
-#: ../src/mn-client-session.c:1219
+#: ../src/mn-client-session.c:1238
#, c-format
msgid "%s, aborting SASL authentication"
msgstr "%s, obustavljam SASL prijavu"
#. 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 "nije moguće dekodovati Base64 ulaz sa servera: %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 sigurnosni sloj nivoa snage %i je uspostavljen"
#. 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 "ne mogu da pročitam postavku 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 "upozorenje: ne mogu da pročitam postavku SASL_SSF: %s"
-#: ../src/mn-conf.c:240
+#: ../src/mn-client-session.c:1449
+msgid "unknown server error"
+msgstr "nepoznata greška na serveru"
+
+#: ../src/mn-compact-message-view.gob:45
+msgid "Mailbox"
+msgstr "Sanduče"
+
+#: ../src/mn-compact-message-view.gob:46
+msgid "From"
+msgstr "Od"
+
+#: ../src/mn-compact-message-view.gob:47
+msgid "Subject"
+msgstr "Tema"
+
+#: ../src/mn-compact-message-view.gob:48
+msgid "Sent"
+msgstr "Poslato"
+
+#: ../src/mn-conf.c:262
msgid "A directory creation error has occurred"
msgstr "Došlo je do greške pri pravljenju direktorijuma"
-#: ../src/mn-conf.c:241
+#: ../src/mn-conf.c:263
#, c-format
msgid "Unable to create directory \"%s\": %s."
msgstr "Nije moguće napraviti direktorijum ?%s?: %s."
-#: ../src/mn-conf.c:317
+#: ../src/mn-conf.c:402
#, c-format
msgid "recursively unsetting %s"
msgstr "rekurzivno poništavam %s"
-#: ../src/mn-conf.c:321
+#: ../src/mn-conf.c:406
msgid "syncing the GConf database"
msgstr "usklađujem GConf bazu podataka"
-#: ../src/mn-conf.c:324
+#: ../src/mn-conf.c:409
msgid "completed"
msgstr "urađeno"
+#: ../src/mn-conf.c:1137
+msgid "A command error has occurred in Mail Notification"
+msgstr "Došlo je do greške u komandama"
+
+#: ../src/mn-conf.c:1138
+#, c-format
+msgid "Unable to execute \"%s\": %s."
+msgstr "Nije moguće izvršiti %s: %s"
+
#: ../src/mn-custom-vfs-mailbox.gob:76
msgid "invalid location"
msgstr "nevažeće mesto"
-#: ../src/mn-evolution-folder-tree-control.c:86
+#: ../src/mn-evolution-folder-tree-control.c:91
msgid "The currently selected URI"
msgstr "Trenutno izabran URI"
-#: ../src/mn-evolution-mailbox-properties.gob:67
+#. translators: header capitalization
+#: ../src/mn-evolution-mailbox-properties.gob:68
msgid "Folder"
-msgstr "Direktorijum"
+msgstr "Fascikla"
-#: ../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 "Dojava pošte ne može da se poveže sa Evolucijom. Pokrenite Evoluciju i uključite dodatak za povezivanje sa Dojavom pošte."
+msgstr ""
+"Dojava pošte ne može da se poveže sa Evolucijom. Pokrenite Evoluciju i "
+"uključite dodatak za povezivanje sa Dojavom pošte."
-#: ../src/mn-evolution-mailbox.gob:61
+#: ../src/mn-evolution-mailbox.gob:75
msgid "folder not found"
-msgstr "direktorijum nije nađen"
+msgstr "fascikla nije nađena"
-#: ../src/mn-evolution-mailbox.gob:182
+#: ../src/mn-evolution-mailbox.gob:216
msgid "unable to contact Evolution"
msgstr "nije moguće povezati se sa Evolucijom"
-#: ../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 "Nije moguće uključiti priključak za Dojavu pošte"
-#: ../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 nije uspeo da pronađe %s server. Molim proverite instalaciju Dojave pošte."
+msgstr ""
+"Bonobo nije uspeo da pronađe %s server. Molim proverite instalaciju Dojave "
+"pošte."
-#: ../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 nije uspeo da zabeleži %s server. Molim proverite instalaciju Dojave pošte."
+msgstr ""
+"Bonobo nije uspeo da zabeleži %s server. Molim proverite instalaciju Dojave "
+"pošte."
-#: ../src/mn-gmail-mailbox.gob:111
+#: ../src/mn-gmail-mailbox.gob:103
msgid "invalid feed location"
msgstr "mesto dovoda nije ispravno navedeno"
-#: ../src/mn-gmail-mailbox.gob:125
+#: ../src/mn-gmail-mailbox.gob:117
#, c-format
msgid "retrieving feed from %s"
msgstr "preuzimanje izvora sa %s"
-#: ../src/mn-gmail-mailbox.gob:132
+#: ../src/mn-gmail-mailbox.gob:124
#, c-format
msgid "unable to retrieve feed: %s"
msgstr "nije moguće pronaći dovod: %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 "nije moguće obraditi dovod"
-#: ../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 "Nije moguće pročitati %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 "nije moguć upis na %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 "Nije moguće pronaći u %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 "nije moguće saznati položaj za %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 "nije moguće zatvoriti %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 "Sanduče:"
-#: ../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 "_drugo:"
-#: ../src/mn-imap-mailbox-properties.gob:139
+#: ../src/mn-imap-mailbox-properties.gob:140
msgid "ne_ver"
msgstr "ni_kad"
-#: ../src/mn-imap-mailbox-properties.gob:140
+#: ../src/mn-imap-mailbox-properties.gob:141
msgid "au_todetect"
msgstr "a_utodetekcija"
-#: ../src/mn-imap-mailbox-properties.gob:141
+#: ../src/mn-imap-mailbox-properties.gob:142
msgid "al_ways"
msgstr "_uvek"
-#: ../src/mn-imap-mailbox-properties.gob:173
+#: ../src/mn-imap-mailbox-properties.gob:174
msgid "Use the <span style=\"italic\">IDLE</span> extension:"
msgstr "Koristi <span style=\"italic\">IDLE</span> produžetak:"
-#: ../src/mn-imap-mailbox.gob:390
+#: ../src/mn-imap-mailbox.gob:384
msgid "server did not send capabilities"
msgstr "server nije obavestio o svojim mogućnostima"
-#: ../src/mn-imap-mailbox.gob:573
+#: ../src/mn-imap-mailbox.gob:551
msgid "server advertised LOGINDISABLED, not using LOGIN authentication"
msgstr "server je dojavio LOGINDISABLED, LOGIN prijava neće biti korišćena"
-#: ../src/mn-imap-mailbox.gob:574
+#: ../src/mn-imap-mailbox.gob:552
msgid "unable to login"
msgstr "prijava nije moguća"
#. compliance error
-#: ../src/mn-imap-mailbox.gob:714
-msgid "server did not send search results"
-msgstr "server nije poslao rezultate pretrage"
-
-#. 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 nije poslao sve tražene poruke"
-#: ../src/mn-imap-mailbox.gob:859
+#: ../src/mn-imap-mailbox.gob:822
msgid "unable to fetch message"
msgstr "nije moguće dobaviti poruku"
-#: ../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 "„Koristi IDLE proširenje“ je postavljeno na „nikad“ u postavkama sandučića, odjavljujem se"
+msgstr ""
+"„Koristi IDLE proširenje“ je postavljeno na „nikad“ u postavkama sandučića, "
+"odjavljujem 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 "udaljeni server koristi %s, ne koristim IDLE produžetak"
-#: ../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 "udaljeni server koristi %s, IDLE proširenje možda neće ispravno raditi"
-#: ../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 "udaljeni server ne podržava IDLE proširenje, odjavljujem se"
-#: ../src/mn-imap-mailbox.gob:1251 ../src/mn-pop3-mailbox.gob:1124
-msgid "unknown server error"
-msgstr "nepoznata greška na 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 ne podržava zaštitu putem 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"
@@ -874,145 +792,183 @@ msgstr ""
"izabran je mehanizam za prijavu koji koristi SASL ali podrška za SASL nije "
"ugrađena u program"
-#: ../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 "nepoznat mehanizam za prijavu \"%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 "isključujem mehanizam „%s“ i pokušavam SASL prijavu"
-#: ../src/mn-imap-mailbox.gob:1435
+#: ../src/mn-imap-mailbox.gob:1455
msgid "falling back to IMAP LOGIN authentication"
msgstr "povratak na IMAP LOGIN prijavu"
-#: ../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 "prijava nije uspela"
-#: ../src/mn-mail-icon.gob:91
-msgid "Main _Window"
-msgstr "Glavni _prozor"
+#. success; caller must switch state itself
+#. compliance error
+#: ../src/mn-imap-mailbox.gob:1528
+msgid "server did not send search results"
+msgstr "server nije poslao rezultate pretrage"
-#: ../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 "_Čitač pošte"
-#: ../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 "_Osveži"
-#: ../src/mn-mail-icon.gob:99
+#. translators: header capitalization
+#: ../src/mn-mail-icon.gob:98
msgid "R_emove From Notification Area"
msgstr "_Ukloni sa obaveštajne zone"
-#: ../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 weight=\"bold\">Sažetak poruka</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mail-summary-popup.gob:277
+msgid "<span weight=\"bold\">Mail Summary</span>"
+msgstr "<span weight=\"bold\">Sažetak poruka</span>"
+
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:89
#, c-format
msgid "%s Properties"
msgstr "Postavke za %s"
-#: ../src/mn-mailbox-properties-dialog.gob:205
+#. translators: header capitalization
+#: ../src/mn-mailbox-properties-dialog.gob:232
msgid "Add a Mailbox"
msgstr "Dodaj sanduče"
-#: ../src/mn-mailbox-view.gob:179
+#: ../src/mn-mailbox-view.gob:248
msgid "A paste error has occurred"
msgstr "Došlo je do greške prilikom nalepljivanja"
-#: ../src/mn-mailbox-view.gob:320 ../src/mn-message-view.gob:313
-msgid "Mailbox"
-msgstr "Sanduče"
-
-#: ../src/mn-mailbox-view.gob:523
+#: ../src/mn-mailbox-view.gob:557
#, c-format
msgid "unhandled %s mailbox (%s)"
msgstr "neobrađeno %s sanduče (%s)"
-#: ../src/mn-mailbox-view.gob:528
+#: ../src/mn-mailbox-view.gob:562
#, c-format
msgid "%s mailbox"
msgstr "%s sanduče"
-#: ../src/mn-mailbox-view.gob:543
+#: ../src/mn-mailbox-view.gob:577
msgid "detecting mailbox type..."
msgstr "prepoznajem vrstu sandučeta..."
-#: ../src/mn-mailbox.gob:278
+#: ../src/mn-mailbox.gob:472
msgid "\"type\" attribute missing"
msgstr "nedostaje atribut „vrsta“"
-#: ../src/mn-mailbox.gob:285
+#: ../src/mn-mailbox.gob:479
#, c-format
msgid "unknown mailbox type \"%s\""
msgstr "nepoznata vrsta sandučeta „%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 "osobina „%s“: nije moguće prebaciti nisku „%s“ u vrednost vrste „%s“"
-#: ../src/mn-mailbox.gob:744
+#: ../src/mn-mailbox.gob:948
#, c-format
msgid "property \"%s\" has no value"
msgstr "osobina „%s“ nema postavljenu vrednost"
-#: ../src/mn-mailboxes.gob:203
+#: ../src/mn-mailboxes.gob:239
msgid "An error has occurred while importing old mailboxes"
msgstr "Došlo je do greške prilikom uvoženja starih sandučića"
-#: ../src/mn-mailboxes.gob:248
+#: ../src/mn-mailboxes.gob:265
msgid "Unable to load the mailboxes configuration"
msgstr "Nije moguće uvesti podešavanja sandučića"
-#: ../src/mn-mailboxes.gob:294
+#: ../src/mn-mailboxes.gob:311
msgid "Unable to parse the XML document."
msgstr "nije moguće obraditi XML dokument."
-#: ../src/mn-mailboxes.gob:301
+#: ../src/mn-mailboxes.gob:318
msgid "The root element is missing."
msgstr "Nedostaje koreni element."
-#: ../src/mn-mailboxes.gob:307
+#: ../src/mn-mailboxes.gob:324
#, c-format
msgid "The root element \"%s\" i