2007-01-29 [wwp] 2.7.2cvs5

	* po/POTFILES.in
	* src/plugins/trayicon/trayicon_prefs.c
		trayicon i18n fixes, thanks to Fabien.

diff --git a/ChangeLog b/ChangeLog
index 90c1991dea0c237e09bf1201cb6c8c4e72282a26..0de1ac60df873c1cf789dbebe1869d5268426d8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-29 [wwp]       2.7.2cvs5
+
+       * po/POTFILES.in
+       * src/plugins/trayicon/trayicon_prefs.c
+               trayicon i18n fixes, thanks to Fabien.
+

 2007-01-28 [wwp]       2.7.2cvs4
 
        * src/mainwindow.c
 2007-01-28 [wwp]       2.7.2cvs4
 
        * src/mainwindow.c

diff --git a/PATCHSETS b/PATCHSETS
index e26a7db99f0f165a59e1853189ab7454e6b3ade6..e6892b4d499c1e2e354e6e7a79c6272f0d5267bf 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2322,3 +2322,4 @@
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.47 -r 1.14.2.48 src/plugins/trayicon/trayicon.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.h;  ) > 2.7.2cvs2.patchset
 ( cvs diff -u -r 1.52.2.36 -r 1.52.2.37 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_receive.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.7.2cvs3.patchset
 ( cvs diff -u -r 1.274.2.168 -r 1.274.2.169 src/mainwindow.c;  cvs diff -u -r 1.39.2.31 -r 1.39.2.32 src/mainwindow.h;  cvs diff -u -r 1.14.2.48 -r 1.14.2.49 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/trayicon/trayicon_prefs.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/trayicon/trayicon_prefs.h;  ) > 2.7.2cvs4.patchset
 ( cvs diff -u -r 1.4.2.8 -r 1.4.2.9 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.14.2.47 -r 1.14.2.48 src/plugins/trayicon/trayicon.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.c;  diff -u /dev/null src/plugins/trayicon/trayicon_prefs.h;  ) > 2.7.2cvs2.patchset
 ( cvs diff -u -r 1.52.2.36 -r 1.52.2.37 src/prefs_folder_item.c;  cvs diff -u -r 1.1.2.16 -r 1.1.2.17 src/prefs_receive.c;  cvs diff -u -r 1.1.2.17 -r 1.1.2.18 src/plugins/pgpcore/prefs_gpg.c;  ) > 2.7.2cvs3.patchset
 ( cvs diff -u -r 1.274.2.168 -r 1.274.2.169 src/mainwindow.c;  cvs diff -u -r 1.39.2.31 -r 1.39.2.32 src/mainwindow.h;  cvs diff -u -r 1.14.2.48 -r 1.14.2.49 src/plugins/trayicon/trayicon.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/trayicon/trayicon_prefs.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/trayicon/trayicon_prefs.h;  ) > 2.7.2cvs4.patchset

+( cvs diff -u -r 1.53.2.22 -r 1.53.2.23 po/POTFILES.in;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/trayicon/trayicon_prefs.c;  ) > 2.7.2cvs5.patchset

diff --git a/configure.ac b/configure.ac
index 5f33c0512cbfd8d2105a7002536c3d77b69b36a7..2d789bbddc91ab6d37fe0e76a0f1a6e0d08fa42b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=4
+EXTRA_VERSION=5

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3554cd32f0f04574250ba8a50b34a11bf2a3e422..78767a4fc1644763f1e1b1c5daaf030ec9c02d00 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -92,6 +92,7 @@ src/plugins/spamassassin/spamassassin.c
 src/plugins/spamassassin/spamassassin_gtk.c
 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
 src/plugins/trayicon/trayicon.c
 src/plugins/spamassassin/spamassassin_gtk.c
 src/plugins/trayicon/libeggtrayicon/eggtrayicon.c
 src/plugins/trayicon/trayicon.c

+src/plugins/trayicon/trayicon_prefs.c

 src/pop.c
 src/prefs_account.c
 src/prefs_actions.c
 src/pop.c
 src/prefs_account.c
 src/prefs_actions.c

diff --git a/src/plugins/trayicon/trayicon_prefs.c b/src/plugins/trayicon/trayicon_prefs.c
index 8abb23289de0cc67d22f4c2fbd7bfdcdad19ed8c..556248e06757ca8ff5c18a87ba39564c0ae08247 100644 (file)
--- a/src/plugins/trayicon/trayicon_prefs.c
+++ b/src/plugins/trayicon/trayicon_prefs.c
@@ -65,7 +65,7 @@ void trayicon_prefs_init(void)
        gchar *rcpath;
 
        path[0] = _("Plugins");
        gchar *rcpath;
 
        path[0] = _("Plugins");

-       path[1] = _("TrayIcon");
+       path[1] = _("Trayicon");

        path[2] = NULL;
 
         prefs_set_default(param);
        path[2] = NULL;
 
         prefs_set_default(param);