2005-03-11 [paul] 1.0.3cvs2.1

	* ChangeLog.claws
	* configure.ac
	* po/POTFILES.in
	* src/plugins/trayicon/trayicon.c
		sync with HEAD
		add src/wizard.c to POTFILES.in

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index ef225fb629f729b5daaae1c56b63548423e3c951..380b1f9eb6f23d3826c2a0cea5c09919ede06d84 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-03-11 [paul]      1.0.3cvs2.1
+
+       * ChangeLog.claws
+       * configure.ac
+       * po/POTFILES.in
+       * src/plugins/trayicon/trayicon.c
+               sync with HEAD
+               add src/wizard.c to POTFILES.in
+
 2005-03-11 [paul]      1.0.3cvs1.1
 
        * ChangeLog

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 01f9822e0df66a862060bab48d9c54fb308a90ae..70cc10698a47530cec2983ac3a5ef805aa943edd 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2005-03-11 [paul]      1.0.3cvs2
+
+       * src/plugins/trayicon/trayicon.c
+               make a string translatable
+
 2005-03-11 [paul]      1.0.3cvs1
 
        * po/ru.po

diff --git a/PATCHSETS b/PATCHSETS
index 31b442622fe8cc8a98959e7288556fba457b028b..d5ad21ab3c6cf7d97c9a71433fb53dd7ebbe091a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -409,3 +409,4 @@
 ( cvs diff -u -r 1.11.2.8 -r 1.11.2.9 src/common/smtp.c; cvs diff -u -r 1.6.2.4 -r 1.6.2.5 src/common/smtp.h; ) > 1.0.1cvs22.1.patchset
 ( cvs diff -u -r 1.382.2.109 -r 1.382.2.110 src/compose.c; ) > 1.0.1cvs22.2.patchset
 ( cvs diff -u -r 1.396.2.22 -r 1.396.2.23 ChangeLog; cvs diff -u -r 1.2504.2.51 -r 1.2504.2.52 ChangeLog.claws; cvs diff -u -r 1.654.2.444 -r 1.654.2.445 configure.ac; cvs diff -u -r 1.58.2.7 -r 1.58.2.8 po/de.po; cvs diff -u -r 1.60.2.8 -r 1.60.2.9 po/es.po; cvs diff -u -r 1.42.2.8 -r 1.42.2.9 po/fr.po; cvs diff -u -r 1.34.2.7 -r 1.34.2.8 po/it.po; cvs diff -u -r 1.50.2.6 -r 1.50.2.7 po/pt_BR.po; cvs diff -u -r 1.17.2.5 -r 1.17.2.6 po/ru.po; cvs diff -u -r 1.2.2.9 -r 1.2.2.10 po/sk.po; cvs diff -u -r 1.17.2.9 -r 1.17.2.10 po/sr.po; cvs diff -u -r 1.5.2.5 -r 1.5.2.6 po/zh_CN.po; ) > 1.0.3cvs1.1.patchset
+( cvs diff -u -r 1.2504.2.52 -r 1.2504.2.53 ChangeLog.claws; cvs diff -u -r 1.654.2.445 -r 1.654.2.446 configure.ac; cvs diff -u -r 1.53.2.8 -r 1.53.2.9 po/POTFILES.in; cvs diff -u -r 1.14.2.15 -r 1.14.2.16 src/plugins/trayicon/trayicon.c; ) > 1.0.3cvs2.1.patchset

diff --git a/configure.ac b/configure.ac
index f2526d61bdb50a9d157bebef4e51372a9689fa33..69c60bcc95bb25f1ace18831974925ba8371fb2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=1
+EXTRA_VERSION=2
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/po/POTFILES.in b/po/POTFILES.in
index cd1780b6d45bdefb3a5bffbb2bd7cab8e592fab0..614fea6fd17b936059f2f841294bffea91434e90 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -112,3 +112,4 @@ src/summary_search.c
 src/summaryview.c
 src/textview.c
 src/toolbar.c
+src/wizard.c

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index abbed0dea0d2b1f5fe7c8db05c85e30be8a80bf5..92dd3061c6622814d8b4d270c2b11f0a0a107383 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -142,7 +142,7 @@ static void update(void)
        TrayIconType icontype = TRAYICON_NOTHING;
 
        folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
-       buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
+       buf = g_strdup_printf(_("New %d, Unread: %d, Total: %d"), new, unread, total);
 
         gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
        g_free(buf);