sync with 0.8.2cvs11

diff --git a/ChangeLog b/ChangeLog
index 132b588b811a5d884769a1defcab9718cefeef16..8691fba855ed80d80dea0f9a942aa158c73e4f86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-06
+
+       * src/prefs_common.c: corrected English.
+
 2002-09-06
 
        * src/prefs_common.[ch]: added an option: "Mark messages as read

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 5a46e146a0bb0f063dd3fbe5de97bc278988d8d2..378047a48acbbff442a9695029a2d36dfa8d49a5 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-09-06 [paul]      0.8.2claws30
+
+       * src/prefs_common.c
+               sync with 0.8.2cvs11, see ChangeLog 2002-09-06
+               
+       * tools/Makefile.am
+         tools/README
+         tools/ldif-to-xml.py  ** REMOVED **
+               remove obsolete python script
+
 2002-09-06 [paul]      0.8.2claws29
 
        * sync with 0.8.2cvs10

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 043a00c72fbfbbc8d9478366af587fbf5bd7fe54..bfe7db959e84afb0a2b05ba2e23d7912177b43f6 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,7 @@
+2002-09-06
+
+       * src/prefs_common.c: ±Ñ¸ì¤òÄûÀµ¡£
+
 2002-09-06
 
        * src/prefs_common.[ch]: ¥ª¥×¥·¥ç¥ó¡Ö¿·µ¬¥¦¥£¥ó¥É¥¦¤Ç³«¤¤¤¿¤È¤­¤Î¤ß

diff --git a/configure.in b/configure.in
index 1da2b1c10dfc4f3abe67ae62a087293906ba5473..d02884764a7403f87ee199290f03bf12d966dc9b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws29
+EXTRA_VERSION=claws30
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/prefs_common.c b/src/prefs_common.c
index fb11acbe66bb812489c58fced1d463cac66fef7a..493a1a5c820379b4f60ea1272921f40f3886e6a2 100644 (file)
--- a/src/prefs_common.c
+++ b/src/prefs_common.c
@@ -2633,7 +2633,7 @@ static void prefs_interface_create(void)
 
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_mark_as_read_on_newwin,
-                _("Mark message as read only when opened in new window"));
+                _("Only mark message as read when opened in new window"));
 
        PACK_CHECK_BUTTON
                (vbox2, checkbtn_openinbox,