commit ef1489167d4e02c41918668bf85b0affb5264cfa
parent a0de6c1b8f0f28f03b65d068e202defaa75b85fd
Author: Jean-Yves Lefort <jylefort@brutele.be>
Date: Fri, 19 Mar 2004 23:23:05 +1000
mail-notification-0.3.4
* Some minor UI tweaks have been performed
* A minor bug has been fixed
Diffstat:
18 files changed, 534 insertions(+), 191 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,30 @@
+2004-03-19 14:20 jylefort
+
+ * configure.ac: Version 0.3.4
+
+2004-03-18 13:17 jylefort
+
+ * configure.ac: Added function checks; updated header checks
+
+2004-03-18 12:28 jylefort
+
+ * ui/: add-pop3.glade, preferences.glade: Added tooltips
+
+2004-03-18 12:15 jylefort
+
+ * src/: mn-preferences.c, mn-util.c, mn-util.h: The mailboxes list
+ interactive search now searches all columns
+
+2004-03-18 11:18 jylefort
+
+ * src/mn-preferences.c, ui/add-pop3.glade: The port widget of the
+ POP3 dialog is now a spin button
+
+2004-03-18 11:02 jylefort
+
+ * src/mn-check.c: Fixed a bug that caused local mail to be checked
+ even when "Check for local mail" was disabled
+
2004-03-12 13:57 jylefort
* configure.ac: Version 0.3.3
diff --git a/NEWS b/NEWS
@@ -1,3 +1,8 @@
+0.3.4 19 March 2004
+
+ * Some minor UI tweaks have been performed
+ * A minor bug has been fixed
+
0.3.3 12 March 2004
* A bug in the mbox checking code has been fixed (reported by
diff --git a/README b/README
@@ -6,12 +6,11 @@ Index
0. About this document
1. About Mail Notification
- 2. Release notes
- 3. Documentation map
+ 2. Documentation map
0. About this document
- $Id: README,v 1.11 2004/03/12 12:55:59 jylefort Exp $
+ $Id: README,v 1.12 2004/03/19 12:57:20 jylefort Exp $
Copyright (c) 2003, 2004 Jean-Yves Lefort.
@@ -56,12 +55,7 @@ Index
If the program does not work as expected, run it from
a terminal and watch for possible error messages.
-2. Release notes
-
- A bug in the mbox checking code has been fixed (thanks to Pau
- Artigas for reporting it).
-
-3. Documentation map
+2. Documentation map
The following documents are included in the distribution:
diff --git a/config.h.in b/config.h.in
@@ -6,6 +6,9 @@
/* gettext package name */
#undef GETTEXT_PACKAGE
+/* Define to 1 if you have the `atoi' function. */
+#undef HAVE_ATOI
+
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
@@ -15,6 +18,9 @@
/* Define to 1 if you have the <errno.h> header file. */
#undef HAVE_ERRNO_H
+/* Define to 1 if you have the `exit' function. */
+#undef HAVE_EXIT
+
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
@@ -30,21 +36,57 @@
/* Define to 1 if you have the <locale.h> header file. */
#undef HAVE_LOCALE_H
+/* Define to 1 if you have the `memcpy' function. */
+#undef HAVE_MEMCPY
+
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `sscanf' function. */
+#undef HAVE_SSCANF
+
+/* Define to 1 if you have the `stat' function. */
+#undef HAVE_STAT
+
+/* Define to 1 if you have the <stdarg.h> header file. */
+#undef HAVE_STDARG_H
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
/* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
+/* Define to 1 if you have the `strchr' function. */
+#undef HAVE_STRCHR
+
+/* Define to 1 if you have the `strcmp' function. */
+#undef HAVE_STRCMP
+
+/* Define to 1 if you have the `strcpy' function. */
+#undef HAVE_STRCPY
+
/* Define to 1 if you have the <strings.h> header file. */
#undef HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
+/* Define to 1 if you have the `strlen' function. */
+#undef HAVE_STRLEN
+
+/* Define to 1 if you have the `strncmp' function. */
+#undef HAVE_STRNCMP
+
+/* Define to 1 if you have the `strrchr' function. */
+#undef HAVE_STRRCHR
+
+/* Define to 1 if you have the `strstr' function. */
+#undef HAVE_STRSTR
+
/* Define to 1 if you have the <sys/stat.h> header file. */
#undef HAVE_SYS_STAT_H
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.57 for mail-notification 0.3.3.
+# Generated by GNU Autoconf 2.57 for mail-notification 0.3.4.
#
# Report bugs to <jylefort@brutele.be>.
#
@@ -268,8 +268,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='mail-notification'
PACKAGE_TARNAME='mail-notification'
-PACKAGE_VERSION='0.3.3'
-PACKAGE_STRING='mail-notification 0.3.3'
+PACKAGE_VERSION='0.3.4'
+PACKAGE_STRING='mail-notification 0.3.4'
PACKAGE_BUGREPORT='jylefort@brutele.be'
ac_unique_file="src/mail-notification.c"
@@ -779,7 +779,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 0.3.3 to adapt to many kinds of systems.
+\`configure' configures mail-notification 0.3.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -841,7 +841,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of mail-notification 0.3.3:";;
+ short | recursive ) echo "Configuration of mail-notification 0.3.4:";;
esac
cat <<\_ACEOF
@@ -946,7 +946,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-mail-notification configure 0.3.3
+mail-notification configure 0.3.4
generated by GNU Autoconf 2.57
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -961,7 +961,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 0.3.3, which was
+It was created by mail-notification $as_me 0.3.4, which was
generated by GNU Autoconf 2.57. Invocation command line was
$ $0 $@
@@ -1685,7 +1685,7 @@ fi
# Define the identity of the package.
PACKAGE='mail-notification'
- VERSION='0.3.3'
+ VERSION='0.3.4'
cat >>confdefs.h <<_ACEOF
@@ -5634,7 +5634,10 @@ fi
-for ac_header in errno.h sys/types.h sys/stat.h string.h
+
+
+
+for ac_header in errno.h stdarg.h stdio.h stdlib.h string.h sys/stat.h sys/types.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
@@ -5780,6 +5783,105 @@ fi
done
+
+
+
+
+
+
+
+
+
+
+
+for ac_func in atoi exit memcpy sscanf stat strchr strcmp strcpy strlen strncmp strrchr strstr
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: checking for $ac_func" >&5
+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+else
+ { { echo "$as_me:$LINENO: error: library function not found" >&5
+echo "$as_me: error: library function not found" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+done
+
+
### build dependencies
found=no
@@ -7267,7 +7369,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by mail-notification $as_me 0.3.3, which was
+This file was extended by mail-notification $as_me 0.3.4, which was
generated by GNU Autoconf 2.57. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7330,7 +7432,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-mail-notification config.status 0.3.3
+mail-notification config.status 0.3.4
configured by $0, generated by GNU Autoconf 2.57,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(mail-notification, 0.3.3, jylefort@brutele.be)
+AC_INIT(mail-notification, 0.3.4, jylefort@brutele.be)
AC_CONFIG_SRCDIR(src/mail-notification.c)
AC_PREREQ(2.57)
@@ -63,7 +63,8 @@ AM_GLIB_GNU_GETTEXT
AC_PROG_CC
AC_SYS_LARGEFILE
-AC_CHECK_HEADERS(errno.h sys/types.h sys/stat.h string.h,, [AC_MSG_ERROR([header not found])])
+AC_CHECK_HEADERS(errno.h stdarg.h stdio.h stdlib.h string.h sys/stat.h sys/types.h,, [AC_MSG_ERROR([header not found])])
+AC_CHECK_FUNCS(atoi exit memcpy sscanf stat strchr strcmp strcpy strlen strncmp strrchr strstr,, [AC_MSG_ERROR([library function not found])])
### build dependencies
diff --git a/po/ChangeLog b/po/ChangeLog
@@ -1,3 +1,11 @@
+2004-03-19 14:20 jylefort
+
+ * fr.po: Version 0.3.4
+
+2004-03-19 14:17 jylefort
+
+ * fr.po: Updated
+
2004-03-12 13:57 jylefort
* fr.po: Version 0.3.3
diff --git a/po/fr.gmo b/po/fr.gmo
Binary files differ.
diff --git a/po/fr.po b/po/fr.po
@@ -4,14 +4,14 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: mail-notification 0.3.3\n"
+"Project-Id-Version: mail-notification 0.3.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-12 13:59+0100\n"
-"PO-Revision-Date: 2004-03-12 13:57+0100\n"
+"POT-Creation-Date: 2004-03-19 14:22+0100\n"
+"PO-Revision-Date: 2004-03-19 14:19+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"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
"Content-Transfer-Encoding: 8bit\n"
#: src/eggtrayicon.c:109
@@ -28,7 +28,7 @@ msgstr "Prises en charge disponibles:\n"
#: src/mail-notification.c:68
msgid "Enable debugging output"
-msgstr "Activer les informations de débogage"
+msgstr "Activer les informations de débogage"
#: src/mail-notification.c:77
msgid "List compiled-in handlers and exit"
@@ -36,7 +36,7 @@ msgstr "Afficher les prises en charge disponibles et quitter"
#: src/mail-notification.c:93
msgid "the GLib thread system is unavailable"
-msgstr "le système de thread GLib n'est pas disponible"
+msgstr "le système de thread GLib n'est pas disponible"
#: src/mail-notification.c:100 src/mn-ui.c:144
msgid "Mail Notification"
@@ -44,32 +44,32 @@ msgstr "Notification de Courrier"
#: src/mn-check.c:75 src/mn-check.c:134
msgid "Check error."
-msgstr "Erreur de vérification."
+msgstr "Erreur de vérification."
#: src/mn-check.c:76
#, c-format
msgid "Unable to create a thread: %s."
-msgstr "Impossible de créer un thread: %s."
+msgstr "Impossible de créer un thread: %s."
#: src/mn-check.c:79
#, c-format
msgid "unable to create a thread: %s"
-msgstr "impossible de créer un thread: %s"
+msgstr "impossible de créer un thread: %s"
#: src/mn-check.c:126
#, c-format
msgid "checking if there is new mail in %s"
-msgstr "vérification du nouveau courrier dans %s en cours"
+msgstr "vérification du nouveau courrier dans %s en cours"
#: src/mn-check.c:135
#, c-format
msgid "Unable to check mailbox <i>%s</i>: %s."
-msgstr "Impossible de vérifier la boîte aux lettres <i>%s</i>: %s."
+msgstr "Impossible de vérifier la boîte aux lettres <i>%s</i>: %s."
#: src/mn-check.c:142
#, c-format
msgid "unable to check mailbox %s: %s"
-msgstr "impossible de vérifier la boîte aux lettres %s: %s"
+msgstr "impossible de vérifier la boîte aux lettres %s: %s"
#: src/mn-check.c:155
#, c-format
@@ -89,14 +89,14 @@ msgstr "Erreur de commande."
#, c-format
msgid "Unable to execute new mail command: %s."
msgstr ""
-"Impossible d'exécuter la commande associée à l'arrivée d'un nouveau message: "
+"Impossible d'exécuter la commande associée à l'arrivée d'un nouveau message: "
"%s."
#: src/mn-check.c:223
#, c-format
msgid "unable to execute new mail command: %s"
msgstr ""
-"impossible d'exécuter la commande associée à l'arrivée d'un nouveau message: "
+"impossible d'exécuter la commande associée à l'arrivée d'un nouveau message: "
"%s"
#: src/mn-conf.c:84 src/mn-conf.c:104
@@ -116,17 +116,17 @@ msgstr "Erreur lors de l'appel de <i>gconf_client_add_dir()</i>: %s."
#: src/mn-conf.c:129 src/mn-conf.c:147 src/mn-conf.c:165 src/mn-conf.c:183
#, c-format
msgid "unable to read in configuration key %s: %s"
-msgstr "impossible de lire dans la clé de configuration %s: %s"
+msgstr "impossible de lire dans la clé de configuration %s: %s"
#: src/mn-conf.c:200 src/mn-conf.c:213 src/mn-conf.c:226 src/mn-conf.c:239
#, c-format
msgid "unable to write in configuration key %s: %s"
-msgstr "impossible d'écrire dans la clé de configuration %s: %s"
+msgstr "impossible d'écrire dans la clé de configuration %s: %s"
#: src/mn-conf.c:252
#, c-format
msgid "unable to unset configuration key %s: %s"
-msgstr "impossible d'effacer la clé de configuration %s: %s"
+msgstr "impossible d'effacer la clé de configuration %s: %s"
#: src/mn-dialog.c:52
#, c-format
@@ -144,38 +144,38 @@ msgstr "Vous avez du courrier"
#: src/mn-mailbox.c:58
#, c-format
msgid "unable to initialize %s mailbox: %s"
-msgstr "impossible d'initialiser la boîte aux lettres %s: %s"
+msgstr "impossible d'initialiser la boîte aux lettres %s: %s"
#: src/mn-mailbox.c:139
msgid "The mailbox's locator"
-msgstr "Le chemin de la boîte aux lettres"
+msgstr "Le chemin de la boîte aux lettres"
#: src/mn-mailbox.c:200
msgid "mailbox not found"
-msgstr "boîte aux lettres non trouvée"
+msgstr "boîte aux lettres non trouvée"
#: src/mn-mailbox.c:220
msgid "unknown mailbox format"
-msgstr "format de boîte aux lettres inconnu"
+msgstr "format de boîte aux lettres inconnu"
#: src/mn-mailboxes.c:54
msgid "Mailbox error."
-msgstr "Erreur de boîte aux lettres."
+msgstr "Erreur de boîte aux lettres."
#: src/mn-mailboxes.c:55
#, c-format
msgid "Mailbox <i>%s</i> is unsupported: %s."
-msgstr "La boîte aux lettres <i>%s</i> n'est pas supportée: %s."
+msgstr "La boîte aux lettres <i>%s</i> n'est pas supportée: %s."
#: src/mn-mailboxes.c:66
#, c-format
msgid "registered remote %s mailbox %s"
-msgstr "boîte aux lettres distante (%s) %s enregistrée"
+msgstr "boîte aux lettres distante (%s) %s enregistrée"
#: src/mn-mailboxes.c:67
#, c-format
msgid "registered local %s mailbox %s"
-msgstr "boîte aux lettres locale (%s) %s enregistrée"
+msgstr "boîte aux lettres locale (%s) %s enregistrée"
#: src/mn-maildir-mailbox.c:110 src/mn-mbox-mailbox.c:155
#: src/mn-mh-mailbox.c:102
@@ -206,12 +206,12 @@ msgstr "impossible d'analyser le chemin \"%s\""
#: src/mn-pop3-mailbox.c:243
#, c-format
msgid "resolving IP address of %s"
-msgstr "résolution de l'adresse IP de %s en cours"
+msgstr "résolution de l'adresse IP de %s en cours"
#: src/mn-pop3-mailbox.c:249
#, c-format
msgid "unable to resolve %s"
-msgstr "impossible de résoudre %s"
+msgstr "impossible de résoudre %s"
#: src/mn-pop3-mailbox.c:254
#, c-format
@@ -221,12 +221,12 @@ msgstr "connection au server POP3 %s:%i en cours"
#: src/mn-pop3-mailbox.c:263
#, c-format
msgid "unable to connect to %s"
-msgstr "impossible de se connecter à %s"
+msgstr "impossible de se connecter à %s"
#: src/mn-pop3-mailbox.c:268
#, c-format
msgid "successfully connected to %s:%i"
-msgstr "connecté à %s:%i"
+msgstr "connecté à %s:%i"
#: src/mn-pop3-mailbox.c:311
#, c-format
@@ -236,7 +236,7 @@ msgstr "impossible de lire depuis %s"
#: src/mn-pop3-mailbox.c:371
#, c-format
msgid "acknowledgement error (server replied \"%s\")"
-msgstr "erreur de bienvenue (le serveur a répondu \"%s\")"
+msgstr "erreur de bienvenue (le serveur a répondu \"%s\")"
#: src/mn-pop3-mailbox.c:382
msgid "unable to send username"
@@ -246,7 +246,7 @@ msgstr "impossible d'envoyer le nom d'utilisateur"
#, c-format
msgid "username authentication error (server replied \"%s\")"
msgstr ""
-"erreur d'authentification de nom d'utilisateur (le serveur a répondu \"%s\")"
+"erreur d'authentification de nom d'utilisateur (le serveur a répondu \"%s\")"
#: src/mn-pop3-mailbox.c:399
msgid "unable to send password"
@@ -256,7 +256,7 @@ msgstr "impossible d'envoyer le mot de passe"
#, c-format
msgid "password authentication error (server replied \"%s\")"
msgstr ""
-"erreur d'authentification de mot de passe (le serveur a répondu \"%s\")"
+"erreur d'authentification de mot de passe (le serveur a répondu \"%s\")"
#: src/mn-pop3-mailbox.c:416
msgid "unable to issue a STAT"
@@ -265,12 +265,12 @@ msgstr "impossible d'envoyer un STAT"
#: src/mn-pop3-mailbox.c:424
#, c-format
msgid "error in STAT reply (server replied \"%s\")"
-msgstr "erreur de réponse à STAT (le serveur a répondu \"%s\")"
+msgstr "erreur de réponse à STAT (le serveur a répondu \"%s\")"
#: src/mn-pop3-mailbox.c:432
#, c-format
msgid "could not parse STAT reply \"%s\""
-msgstr "n'a pas pu analyser la réponse à STAT \"%s\""
+msgstr "n'a pas pu analyser la réponse à STAT \"%s\""
#: src/mn-pop3-mailbox.c:442
msgid "unable to issue a QUIT"
@@ -279,59 +279,49 @@ msgstr "impossible d'envoyer un QUIT"
#: src/mn-pop3-mailbox.c:450
#, c-format
msgid "error in QUIT reply (server replied \"%s\")"
-msgstr "erreur de réponse à QUIT (le serveur a répondu \"%s\")"
+msgstr "erreur de réponse à QUIT (le serveur a répondu \"%s\")"
-#: src/mn-preferences.c:158
+#: src/mn-preferences.c:163
msgid "Mailbox"
-msgstr "Boîte aux lettres"
+msgstr "Boîte aux lettres"
-#: src/mn-preferences.c:159
+#: src/mn-preferences.c:164
msgid "Format"
msgstr "Format"
-#: src/mn-preferences.c:349
+#: src/mn-preferences.c:360
msgid "Select One or More Mailboxes"
-msgstr "Sélectionnez Une ou Plusieurs Boîtes aux Lettres"
+msgstr "Sélectionnez Une ou Plusieurs Boîtes aux Lettres"
-#: src/mn-preferences.c:446 src/mn-preferences.c:453 src/mn-preferences.c:460
-#: src/mn-preferences.c:467 src/mn-preferences.c:474
+#: src/mn-preferences.c:457 src/mn-preferences.c:464 src/mn-preferences.c:471
msgid "Unable to add mailbox."
-msgstr "Impossible d'ajouter la boîte aux lettres."
+msgstr "Impossible d'ajouter la boîte aux lettres."
-#: src/mn-preferences.c:447
+#: src/mn-preferences.c:458
msgid "The hostname field must be filled."
-msgstr "Le champ de nom d'hôte doit être rempli."
+msgstr "Le champ de nom d'hôte doit être rempli."
-#: src/mn-preferences.c:454
-msgid "The port field must be filled."
-msgstr "Le champ de port doit être rempli."
-
-#: src/mn-preferences.c:461
-msgid "The port field must be numeric."
-msgstr "Le champ de port doit être numérique."
-
-#: src/mn-preferences.c:468
+#: src/mn-preferences.c:465
msgid "The username field must be filled."
-msgstr "Le champ de nom d'utilisateur doit être rempli."
+msgstr "Le champ de nom d'utilisateur doit être rempli."
-#: src/mn-preferences.c:475
+#: src/mn-preferences.c:472
msgid "The password field must be filled."
-msgstr "Le champ de mot de passe doit être rempli."
+msgstr "Le champ de mot de passe doit être rempli."
#: src/mn-sylpheed-mailbox.c:108
#, c-format
msgid "unable to open directory %s: %s"
-msgstr "impossible d'ouvrir le répertoire %s: %s"
+msgstr "impossible d'ouvrir le répertoire %s: %s"
#: src/mn-ui.c:87
#, c-format
msgid "Unable to execute clicked command: %s."
-msgstr "Impossible d'exécuter la commande associée au click sur l'icône: %s."
+msgstr "Impossible d'exécuter la commande associée au click sur l'icône: %s."
#: src/mn-ui.c:146
-#, fuzzy
msgid "Copyright (c) 2003, 2004 Jean-Yves Lefort"
-msgstr "Copyright (c) 2003 Jean-Yves Lefort"
+msgstr "Copyright (c) 2003, 2004 Jean-Yves Lefort"
#: src/mn-ui.c:147
msgid "A Mail Notification for the Panel Notification Area"
@@ -339,108 +329,160 @@ msgstr "Une Notification de Courrier pour l'Aire de Notification du Panneau"
#: src/mn-unsupported-mailbox.c:62
msgid "unsupported"
-msgstr "non supporté"
+msgstr "non supporté"
-#: src/mn-util.c:130
+#: src/mn-util.c:158
#, c-format
msgid "error loading image: %s"
msgstr "erreur de chargement d'image: %s"
-#: ui/add-pop3-strings.c:7
-msgid "Add a POP3 Mailbox"
-msgstr "Ajouter une Boîte aux Lettres POP3"
+#: ui/add-pop3-strings.c:7 ui/add-pop3-strings.c:12
+msgid "The hostname or IP address of the POP3 server"
+msgstr "Le nom d'hôte ou adresse IP du serveur POP3"
#: ui/add-pop3-strings.c:8
+msgid "Add a POP3 Mailbox"
+msgstr "Ajouter une Boîte aux Lettres POP3"
+
+#: ui/add-pop3-strings.c:9
msgid "<span weight=\"bold\">Server</span>"
msgstr "<span weight=\"bold\">Serveur</span>"
-#: ui/add-pop3-strings.c:9 ui/add-pop3-strings.c:16 ui/preferences-strings.c:9
-#: ui/preferences-strings.c:17 ui/preferences-strings.c:21
+#: ui/add-pop3-strings.c:10 ui/add-pop3-strings.c:17
+#: ui/preferences-strings.c:9 ui/preferences-strings.c:23
+#: ui/preferences-strings.c:27
msgid " "
msgstr " "
-#: ui/add-pop3-strings.c:10
+#: ui/add-pop3-strings.c:11
msgid "_Hostname:"
-msgstr "Nom d'_hôte:"
+msgstr "Nom d'_hôte:"
-#: ui/add-pop3-strings.c:11 ui/add-pop3-strings.c:14 ui/add-pop3-strings.c:18
-#: ui/add-pop3-strings.c:20 ui/preferences-strings.c:23
-#: ui/preferences-strings.c:25
+#: ui/add-pop3-strings.c:13 ui/add-pop3-strings.c:20 ui/add-pop3-strings.c:23
+#: ui/preferences-strings.c:31 ui/preferences-strings.c:35
msgid "*"
msgstr "*"
-#: ui/add-pop3-strings.c:12
+#: ui/add-pop3-strings.c:14
msgid "_Port:"
msgstr "_Port"
-#: ui/add-pop3-strings.c:13
-msgid "110"
-msgstr "110"
-
#: ui/add-pop3-strings.c:15
+msgid "The port number of the POP3 server"
+msgstr "Le numéro de port du serveur POP3"
+
+#: ui/add-pop3-strings.c:16
msgid "<span weight=\"bold\">Authentication</span>"
msgstr "<span weight=\"bold\">Authentification</span>"
-#: ui/add-pop3-strings.c:17
+#: ui/add-pop3-strings.c:18
msgid "_Username:"
msgstr "Nom d'_utilisateur:"
#: ui/add-pop3-strings.c:19
+msgid "The login name used to authenticate yourself"
+msgstr "Votre compte utilisateur"
+
+#: ui/add-pop3-strings.c:21
msgid "Passw_ord:"
msgstr "M_ot de passe:"
+#: ui/add-pop3-strings.c:22
+msgid "The password used to authenticate yourself"
+msgstr "Votre mot de passe"
+
#: ui/menu-strings.c:7
msgid "Check for new mail"
-msgstr "Vérifier le nouveau courrier"
+msgstr "Vérifier le nouveau courrier"
#: ui/menu-strings.c:8
msgid "_Check for Mail"
-msgstr "_Vérifier le Courrier"
+msgstr "_Vérifier le Courrier"
#: ui/preferences-strings.c:7
msgid "Mail Notification Preferences"
-msgstr "Préférences de la Notification de Courrier"
+msgstr "Préférences de la Notification de Courrier"
#: ui/preferences-strings.c:8
msgid "<span weight=\"bold\">General</span>"
-msgstr "<span weight=\"bold\">Général</span>"
+msgstr "<span weight=\"bold\">Général</span>"
#: ui/preferences-strings.c:10
+msgid "Whether to periodically check for new local mail or not"
+msgstr "Vérifier périodiquement le nouveau courrier local"
+
+#: ui/preferences-strings.c:11
msgid "Check for local _mail every"
-msgstr "_Vérifier le courrier local toutes les"
+msgstr "_Vérifier le courrier local toutes les"
+
+#: ui/preferences-strings.c:12
+msgid "Delay between local mail checks (minutes part)"
+msgstr "Délai entre les vérifications de courrier local (minutes)"
-#: ui/preferences-strings.c:11 ui/preferences-strings.c:14
+#: ui/preferences-strings.c:13 ui/preferences-strings.c:19
msgid "minutes"
msgstr "minutes"
-#: ui/preferences-strings.c:12 ui/preferences-strings.c:15
+#: ui/preferences-strings.c:14
+msgid "Delay between local mail checks (seconds part)"
+msgstr "Délai entre les vérifications de courrier local (secondes)"
+
+#: ui/preferences-strings.c:15 ui/preferences-strings.c:21
msgid "seconds"
msgstr "secondes"
-#: ui/preferences-strings.c:13
+#: ui/preferences-strings.c:16
+msgid "Whether to periodically check for new remote mail or not"
+msgstr "Vérifier périodiquement le nouveau courrier distant"
+
+#: ui/preferences-strings.c:17
msgid "Check for rem_ote mail every"
-msgstr "Vérifier le courrier _distant toutes les"
+msgstr "Vérifier le courrier _distant toutes les"
-#: ui/preferences-strings.c:16
+#: ui/preferences-strings.c:18
+msgid "Delay between remote mail checks (minutes part)"
+msgstr "Délai entre les vérifications de courrier distant (minutes)"
+
+#: ui/preferences-strings.c:20
+msgid "Delay between remote mail checks (seconds part)"
+msgstr "Délai entre les vérifications de courrier local (secondes)"
+
+#: ui/preferences-strings.c:22
msgid "<span weight=\"bold\">Mailboxes</span>"
-msgstr "<span weight=\"bold\">Boîtes aux lettres</span>"
+msgstr "<span weight=\"bold\">Boîtes aux lettres</span>"
-#: ui/preferences-strings.c:18
+#: ui/preferences-strings.c:24
msgid "_Add local mailbox"
-msgstr "_Ajouter une boîte aux lettres locale"
+msgstr "_Ajouter une boîte aux lettres locale"
-#: ui/preferences-strings.c:19
+#: ui/preferences-strings.c:25
msgid "Add remo_te mailbox"
-msgstr "Ajouter une boîte aux lettres dis_tante"
+msgstr "Ajouter une boîte aux lettres dis_tante"
-#: ui/preferences-strings.c:20
+#: ui/preferences-strings.c:26
msgid "<span weight=\"bold\">Commands</span>"
msgstr "<span weight=\"bold\">Commandes</span>"
-#: ui/preferences-strings.c:22
+#: ui/preferences-strings.c:28
+msgid "Whether to run a command when new mail arrives or not"
+msgstr "Exécuter une commande quand du nouveau courrier arrive"
+
+#: ui/preferences-strings.c:29
msgid "When _new mail arrives:"
msgstr "Quand du _nouveau courrier arrive:"
-#: ui/preferences-strings.c:24
+#: ui/preferences-strings.c:30
+msgid "The command to run when new mail arrives"
+msgstr "La commande à exécuter quand du nouveau courrier arrive"
+
+#: ui/preferences-strings.c:32
+msgid "Whether to run a command when the icon is clicked or not"
+msgstr "Exécuter une commande quand l'îcone est cliquée"
+
+#: ui/preferences-strings.c:33
msgid "When click_ed:"
-msgstr "Quand l'îcone est cliqué_e:"
+msgstr "Quand l'îcone est cliqué_e:"
+
+#: ui/preferences-strings.c:34
+msgid "The command to run when the icon is clicked"
+msgstr "La commande à exécuter quand l'îcone est cliquée"
diff --git a/po/mail-notification.pot b/po/mail-notification.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-03-12 13:59+0100\n"
+"POT-Creation-Date: 2004-03-19 14:22+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -277,40 +277,31 @@ msgstr ""
msgid "error in QUIT reply (server replied \"%s\")"
msgstr ""
-#: src/mn-preferences.c:158
+#: src/mn-preferences.c:163
msgid "Mailbox"
msgstr ""
-#: src/mn-preferences.c:159
+#: src/mn-preferences.c:164
msgid "Format"
msgstr ""
-#: src/mn-preferences.c:349
+#: src/mn-preferences.c:360
msgid "Select One or More Mailboxes"
msgstr ""
-#: src/mn-preferences.c:446 src/mn-preferences.c:453 src/mn-preferences.c:460
-#: src/mn-preferences.c:467 src/mn-preferences.c:474
+#: src/mn-preferences.c:457 src/mn-preferences.c:464 src/mn-preferences.c:471
msgid "Unable to add mailbox."
msgstr ""
-#: src/mn-preferences.c:447
+#: src/mn-preferences.c:458
msgid "The hostname field must be filled."
msgstr ""
-#: src/mn-preferences.c:454
-msgid "The port field must be filled."
-msgstr ""
-
-#: src/mn-preferences.c:461
-msgid "The port field must be numeric."
-msgstr ""
-
-#: src/mn-preferences.c:468
+#: src/mn-preferences.c:465
msgid "The username field must be filled."
msgstr ""
-#: src/mn-preferences.c:475
+#: src/mn-preferences.c:472
msgid "The password field must be filled."
msgstr ""
@@ -336,54 +327,66 @@ msgstr ""
msgid "unsupported"
msgstr ""
-#: src/mn-util.c:130
+#: src/mn-util.c:158
#, c-format
msgid "error loading image: %s"
msgstr ""
-#: ui/add-pop3-strings.c:7
-msgid "Add a POP3 Mailbox"
+#: ui/add-pop3-strings.c:7 ui/add-pop3-strings.c:12
+msgid "The hostname or IP address of the POP3 server"
msgstr ""
#: ui/add-pop3-strings.c:8
+msgid "Add a POP3 Mailbox"
+msgstr ""
+
+#: ui/add-pop3-strings.c:9
msgid "<span weight=\"bold\">Server</span>"
msgstr ""
-#: ui/add-pop3-strings.c:9 ui/add-pop3-strings.c:16 ui/preferences-strings.c:9
-#: ui/preferences-strings.c:17 ui/preferences-strings.c:21
+#: ui/add-pop3-strings.c:10 ui/add-pop3-strings.c:17
+#: ui/preferences-strings.c:9 ui/preferences-strings.c:23
+#: ui/preferences-strings.c:27
msgid " "
msgstr ""
-#: ui/add-pop3-strings.c:10
+#: ui/add-pop3-strings.c:11
msgid "_Hostname:"
msgstr ""
-#: ui/add-pop3-strings.c:11 ui/add-pop3-strings.c:14 ui/add-pop3-strings.c:18
-#: ui/add-pop3-strings.c:20 ui/preferences-strings.c:23
-#: ui/preferences-strings.c:25
+#: ui/add-pop3-strings.c:13 ui/add-pop3-strings.c:20 ui/add-pop3-strings.c:23
+#: ui/preferences-strings.c:31 ui/preferences-strings.c:35
msgid "*"
msgstr ""
-#: ui/add-pop3-strings.c:12
+#: ui/add-pop3-strings.c:14
msgid "_Port:"
msgstr ""
-#: ui/add-pop3-strings.c:13
-msgid "110"
+#: ui/add-pop3-strings.c:15
+msgid "The port number of the POP3 server"
msgstr ""
-#: ui/add-pop3-strings.c:15
+#: ui/add-pop3-strings.c:16
msgid "<span weight=\"bold\">Authentication</span>"
msgstr ""
-#: ui/add-pop3-strings.c:17
+#: ui/add-pop3-strings.c:18
msgid "_Username:"
msgstr ""
#: ui/add-pop3-strings.c:19
+msgid "The login name used to authenticate yourself"
+msgstr ""
+
+#: ui/add-pop3-strings.c:21
msgid "Passw_ord:"
msgstr ""
+#: ui/add-pop3-strings.c:22
+msgid "The password used to authenticate yourself"
+msgstr ""
+
#: ui/menu-strings.c:7
msgid "Check for new mail"
msgstr ""
@@ -401,41 +404,81 @@ msgid "<span weight=\"bold\">General</span>"
msgstr ""
#: ui/preferences-strings.c:10
+msgid "Whether to periodically check for new local mail or not"
+msgstr ""
+
+#: ui/preferences-strings.c:11
msgid "Check for local _mail every"
msgstr ""
-#: ui/preferences-strings.c:11 ui/preferences-strings.c:14
+#: ui/preferences-strings.c:12
+msgid "Delay between local mail checks (minutes part)"
+msgstr ""
+
+#: ui/preferences-strings.c:13 ui/preferences-strings.c:19
msgid "minutes"
msgstr ""
-#: ui/preferences-strings.c:12 ui/preferences-strings.c:15
+#: ui/preferences-strings.c:14
+msgid "Delay between local mail checks (seconds part)"
+msgstr ""
+
+#: ui/preferences-strings.c:15 ui/preferences-strings.c:21
msgid "seconds"
msgstr ""
-#: ui/preferences-strings.c:13
+#: ui/preferences-strings.c:16
+msgid "Whether to periodically check for new remote mail or not"
+msgstr ""
+
+#: ui/preferences-strings.c:17
msgid "Check for rem_ote mail every"
msgstr ""
-#: ui/preferences-strings.c:16
+#: ui/preferences-strings.c:18
+msgid "Delay between remote mail checks (minutes part)"
+msgstr ""
+
+#: ui/preferences-strings.c:20
+msgid "Delay between remote mail checks (seconds part)"
+msgstr ""
+
+#: ui/preferences-strings.c:22
msgid "<span weight=\"bold\">Mailboxes</span>"
msgstr ""
-#: ui/preferences-strings.c:18
+#: ui/preferences-strings.c:24
msgid "_Add local mailbox"
msgstr ""
-#: ui/preferences-strings.c:19
+#: ui/preferences-strings.c:25
msgid "Add remo_te mailbox"
msgstr ""
-#: ui/preferences-strings.c:20
+#: ui/preferences-strings.c:26
msgid "<span weight=\"bold\">Commands</span>"
msgstr ""
-#: ui/preferences-strings.c:22
+#: ui/preferences-strings.c:28
+msgid "Whether to run a command when new mail arrives or not"
+msgstr ""
+
+#: ui/preferences-strings.c:29
msgid "When _new mail arrives:"
msgstr ""
-#: ui/preferences-strings.c:24
+#: ui/preferences-strings.c:30
+msgid "The command to run when new mail arrives"
+msgstr ""
+
+#: ui/preferences-strings.c:32
+msgid "Whether to run a command when the icon is clicked or not"
+msgstr ""
+
+#: ui/preferences-strings.c:33
msgid "When click_ed:"
msgstr ""
+
+#: ui/preferences-strings.c:34
+msgid "The command to run when the icon is clicked"
+msgstr ""
diff --git a/src/mn-check.c b/src/mn-check.c
@@ -259,7 +259,7 @@ mn_check_install_callback (guint *id,
static gboolean
mn_check_timeout_cb (gpointer data)
{
- int flags = GPOINTER_TO_INT(flags);
+ int flags = GPOINTER_TO_INT(data);
mn_check(flags);
diff --git a/src/mn-preferences.c b/src/mn-preferences.c
@@ -87,6 +87,11 @@ static void mn_preferences_remove_mailbox_cb (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
+static gboolean mn_preferences_search_equal_func (GtkTreeModel *model,
+ int column,
+ const char *key,
+ GtkTreeIter *iter,
+ gpointer search_data);
static void mn_preferences_update_sensitivity (void);
static void mn_preferences_add_local_mailbox (void);
static void mn_preferences_add_remote_mailbox (void);
@@ -158,6 +163,12 @@ mn_preferences_display (void)
mn_preferences_add_column(COLUMN_MAILBOX, _("Mailbox"));
mn_preferences_add_column(COLUMN_FORMAT, _("Format"));
+ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(list), TRUE);
+ gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(list),
+ mn_preferences_search_equal_func,
+ NULL,
+ NULL);
+
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
g_signal_connect(G_OBJECT(selection), "changed",
@@ -421,23 +432,23 @@ mn_preferences_add_remote_mailbox (void)
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK)
{
GtkWidget *hostname_entry;
- GtkWidget *port_entry;
+ GtkWidget *port_spin;
GtkWidget *username_entry;
GtkWidget *password_entry;
const char *hostname;
- const char *port;
+ int port;
const char *username;
const char *password;
char *locator;
GSList *gconf_mailboxes;
hostname_entry = glade_xml_get_widget(xml, "hostname_entry");
- port_entry = glade_xml_get_widget(xml, "port_entry");
+ port_spin = glade_xml_get_widget(xml, "port_spin");
username_entry = glade_xml_get_widget(xml, "username_entry");
password_entry = glade_xml_get_widget(xml, "password_entry");
hostname = gtk_editable_get_chars(GTK_EDITABLE(hostname_entry), 0, -1);
- port = gtk_editable_get_chars(GTK_EDITABLE(port_entry), 0, -1);
+ port = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(port_spin));
username = gtk_editable_get_chars(GTK_EDITABLE(username_entry), 0, -1);
password = gtk_editable_get_chars(GTK_EDITABLE(password_entry), 0, -1);
@@ -448,20 +459,6 @@ mn_preferences_add_remote_mailbox (void)
goto run;
}
- if (! *port)
- {
- mn_error_dialog(_("Unable to add mailbox."),
- _("The port field must be filled."));
- goto run;
- }
-
- if (! mn_str_isnumeric(port))
- {
- mn_error_dialog(_("Unable to add mailbox."),
- _("The port field must be numeric."));
- goto run;
- }
-
if (! *username)
{
mn_error_dialog(_("Unable to add mailbox."),
@@ -476,7 +473,7 @@ mn_preferences_add_remote_mailbox (void)
goto run;
}
- locator = g_strdup_printf("pop3:%s:%s@%s:%s", username, password, hostname, port);
+ locator = g_strdup_printf("pop3:%s:%s@%s:%i", username, password, hostname, port);
gconf_mailboxes = mn_conf_get_list("/apps/mail-notification/mailboxes",
GCONF_VALUE_STRING);
@@ -513,6 +510,30 @@ mn_preferences_remove_mailbox_cb (GtkTreeModel *model,
g_object_unref(mailbox);
}
+static gboolean
+mn_preferences_search_equal_func (GtkTreeModel *model,
+ int column,
+ const char *key,
+ GtkTreeIter *iter,
+ gpointer search_data)
+{
+ char *mailbox;
+ char *format;
+ gboolean equal = FALSE;
+
+ gtk_tree_model_get(model, iter,
+ COLUMN_MAILBOX, &mailbox,
+ COLUMN_FORMAT, &format,
+ -1);
+
+ equal = mn_utf8_strcasecontains(mailbox, key) || mn_utf8_strcasecontains(format, key);
+
+ g_free(mailbox);
+ g_free(format);
+
+ return ! equal;
+}
+
/* libglade callbacks */
void
diff --git a/src/mn-util.c b/src/mn-util.c
@@ -17,6 +17,7 @@
*/
#include "config.h"
+#include <string.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-i18n.h>
#include <glade/glade.h>
@@ -113,6 +114,33 @@ mn_str_isnumeric (const char *str)
return TRUE;
}
+gboolean
+mn_utf8_strcasecontains (const char *big, const char *little)
+{
+ gboolean contains;
+ char *normalized_big;
+ char *normalized_little;
+ char *case_normalized_big;
+ char *case_normalized_little;
+
+ g_return_val_if_fail(big != NULL, NULL);
+ g_return_val_if_fail(little != NULL, NULL);
+
+ normalized_big = g_utf8_normalize(big, -1, G_NORMALIZE_ALL);
+ normalized_little = g_utf8_normalize(little, -1, G_NORMALIZE_ALL);
+ case_normalized_big = g_utf8_casefold(normalized_big, -1);
+ case_normalized_little = g_utf8_casefold(normalized_little, -1);
+
+ contains = strstr(case_normalized_big, case_normalized_little) != NULL;
+
+ g_free(normalized_big);
+ g_free(normalized_little);
+ g_free(case_normalized_big);
+ g_free(case_normalized_little);
+
+ return contains;
+}
+
GdkPixbuf *mn_pixbuf_new (const char *filename)
{
char *pathname;
diff --git a/src/mn-util.h b/src/mn-util.h
@@ -40,6 +40,8 @@ GIOError mn_gnet_io_channel_printf (GIOChannel *channel,
#endif /* HAVE_GNET */
gboolean mn_str_isnumeric (const char *str);
+gboolean mn_utf8_strcasecontains (const char *big,
+ const char *little);
GdkPixbuf *mn_pixbuf_new (const char *filename);
GladeXML *mn_glade_xml_new (const char *filename);
diff --git a/ui/add-pop3-strings.c b/ui/add-pop3-strings.c
@@ -4,17 +4,20 @@
* DO NOT compile it as part of your application.
*/
+gchar *s = N_("The hostname or IP address of the POP3 server");
gchar *s = N_("Add a POP3 Mailbox");
gchar *s = N_("<span weight=\"bold\">Server</span>");
gchar *s = N_(" ");
gchar *s = N_("_Hostname:");
+gchar *s = N_("The hostname or IP address of the POP3 server");
gchar *s = N_("*");
gchar *s = N_("_Port:");
-gchar *s = N_("110");
-gchar *s = N_("*");
+gchar *s = N_("The port number of the POP3 server");
gchar *s = N_("<span weight=\"bold\">Authentication</span>");
gchar *s = N_(" ");
gchar *s = N_("_Username:");
+gchar *s = N_("The login name used to authenticate yourself");
gchar *s = N_("*");
gchar *s = N_("Passw_ord:");
+gchar *s = N_("The password used to authenticate yourself");
gchar *s = N_("*");
diff --git a/ui/add-pop3.glade b/ui/add-pop3.glade
@@ -6,6 +6,7 @@
<widget class="GtkDialog" id="dialog">
<property name="border_width">6</property>
+ <property name="tooltip" translatable="yes">The hostname or IP address of the POP3 server</property>
<property name="title" translatable="yes">Add a POP3 Mailbox</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -155,6 +156,7 @@
<child>
<widget class="GtkEntry" id="hostname_entry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The hostname or IP address of the POP3 server</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -197,7 +199,7 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">port_entry</property>
+ <property name="mnemonic_widget">port_spin</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -207,16 +209,17 @@
</child>
<child>
- <widget class="GtkEntry" id="port_entry">
+ <widget class="GtkSpinButton" id="port_spin">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The port number of the POP3 server</property>
<property name="can_focus">True</property>
- <property name="editable">True</property>
- <property name="visibility">True</property>
- <property name="max_length">0</property>
- <property name="text" translatable="yes">110</property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">False</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">0</property>
+ <property name="numeric">False</property>
+ <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+ <property name="snap_to_ticks">False</property>
+ <property name="wrap">False</property>
+ <property name="adjustment">110 0 65535 1 10 10</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -344,6 +347,7 @@
<child>
<widget class="GtkEntry" id="username_entry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The login name used to authenticate yourself</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -398,6 +402,7 @@
<child>
<widget class="GtkEntry" id="password_entry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The password used to authenticate yourself</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">False</property>
diff --git a/ui/preferences-strings.c b/ui/preferences-strings.c
@@ -7,11 +7,17 @@
gchar *s = N_("Mail Notification Preferences");
gchar *s = N_("<span weight=\"bold\">General</span>");
gchar *s = N_(" ");
+gchar *s = N_("Whether to periodically check for new local mail or not");
gchar *s = N_("Check for local _mail every");
+gchar *s = N_("Delay between local mail checks (minutes part)");
gchar *s = N_("minutes");
+gchar *s = N_("Delay between local mail checks (seconds part)");
gchar *s = N_("seconds");
+gchar *s = N_("Whether to periodically check for new remote mail or not");
gchar *s = N_("Check for rem_ote mail every");
+gchar *s = N_("Delay between remote mail checks (minutes part)");
gchar *s = N_("minutes");
+gchar *s = N_("Delay between remote mail checks (seconds part)");
gchar *s = N_("seconds");
gchar *s = N_("<span weight=\"bold\">Mailboxes</span>");
gchar *s = N_(" ");
@@ -19,7 +25,11 @@ gchar *s = N_("_Add local mailbox");
gchar *s = N_("Add remo_te mailbox");
gchar *s = N_("<span weight=\"bold\">Commands</span>");
gchar *s = N_(" ");
+gchar *s = N_("Whether to run a command when new mail arrives or not");
gchar *s = N_("When _new mail arrives:");
+gchar *s = N_("The command to run when new mail arrives");
gchar *s = N_("*");
+gchar *s = N_("Whether to run a command when the icon is clicked or not");
gchar *s = N_("When click_ed:");
+gchar *s = N_("The command to run when the icon is clicked");
gchar *s = N_("*");
diff --git a/ui/preferences.glade b/ui/preferences.glade
@@ -124,6 +124,7 @@
<child>
<widget class="GtkCheckButton" id="local_check">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to periodically check for new local mail or not</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Check for local _mail every</property>
<property name="use_underline">True</property>
@@ -143,6 +144,7 @@
<child>
<widget class="GtkSpinButton" id="local_minutes_spin">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Delay between local mail checks (minutes part)</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@@ -183,6 +185,7 @@
<child>
<widget class="GtkSpinButton" id="local_seconds_spin">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Delay between local mail checks (seconds part)</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@@ -236,6 +239,7 @@
<child>
<widget class="GtkCheckButton" id="remote_check">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to periodically check for new remote mail or not</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">Check for rem_ote mail every</property>
<property name="use_underline">True</property>
@@ -255,6 +259,7 @@
<child>
<widget class="GtkSpinButton" id="remote_minutes_spin">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Delay between remote mail checks (minutes part)</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@@ -295,6 +300,7 @@
<child>
<widget class="GtkSpinButton" id="remote_seconds_spin">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Delay between remote mail checks (seconds part)</property>
<property name="can_focus">True</property>
<property name="climb_rate">1</property>
<property name="digits">0</property>
@@ -706,6 +712,7 @@
<child>
<widget class="GtkCheckButton" id="command_new_mail_check">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to run a command when new mail arrives or not</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">When _new mail arrives:</property>
<property name="use_underline">True</property>
@@ -725,6 +732,7 @@
<child>
<widget class="GtkEntry" id="command_new_mail_entry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The command to run when new mail arrives</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
@@ -757,6 +765,7 @@
<child>
<widget class="GtkCheckButton" id="command_clicked_check">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Whether to run a command when the icon is clicked or not</property>
<property name="can_focus">True</property>
<property name="label" translatable="yes">When click_ed:</property>
<property name="use_underline">True</property>
@@ -776,6 +785,7 @@
<child>
<widget class="GtkEntry" id="command_clicked_entry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">The command to run when the icon is clicked</property>
<property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>