From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 10 Jan 2003 09:53:37 +0000 (+0000)
Subject: sync with 0.8.8cvs4
X-Git-Tag: rel_0_8_9~75
X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=commitdiff_plain;h=f933c6d3e932902e4aa88563b7b0ca9093039e03

sync with 0.8.8cvs4
---

diff --git a/ChangeLog b/ChangeLog
index 9addc9f18..5ae43884b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-10
+
+	* src/compose.c
+	  src/folderview.c
+	  src/prefs_folder_item.c: English fix (property -> properties).
+	* src/prefs_filter.c: alert if entry is not saved.
+	  prefs_filter_dialog_to_filter(): new.
+
 2003-01-09
 
 	* src/codeconv.c: conv_encode_header(): fixed a bug which output raw
diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7b3cf9939..2824d6411 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2003-01-10 [paul]	0.8..8claws74
+
+	* src/prefs_filtering.c
+		change English used in Alert when entry is not
+		saved.
+		
+	* sync with 0.8.8cvs4
+		see ChangeLog 2003-01-10
+
 2003-01-10 [darko]	0.8.8claws73
 
 	* src/pine.c
diff --git a/ChangeLog.jp b/ChangeLog.jp
index 831e7fd35..1f2031561 100644
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,12 @@
+2003-01-10
+
+	* src/compose.c
+	  src/folderview.c
+	  src/prefs_folder_item.c: ±Ñ¸ì¤Î½¤Àµ(property -> properties)¡£
+	* src/prefs_filter.c: ¥¨¥ó¥È¥ê¤¬Êݸ¤µ¤ì¤Æ¤¤¤Ê¤±¤ì¤Ð·Ù¹ð¤¹¤ë¤è¤¦¤Ë
+	  ¤·¤¿¡£
+	  prefs_filter_dialog_to_filter(): ¿·µ¬¡£
+
 2003-01-09
 
 	* src/codeconv.c: conv_encode_header(): ²þ¹Ô¤Î¸å¤ËÀ¸¤Îʸ»úÎó¤ò½ÐÎÏ
diff --git a/configure.in b/configure.in
index 1f78d87d2..86c25bcdf 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws73
+EXTRA_VERSION=claws74
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/codeconv.c b/src/codeconv.c
index a60dd7431..1b9dfcffc 100644
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
diff --git a/src/codeconv.h b/src/codeconv.h
index 53aa96778..884bd66ec 100644
--- a/src/codeconv.h
+++ b/src/codeconv.h
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
diff --git a/src/compose.c b/src/compose.c
index da487c138..4e963ebbc 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
@@ -480,7 +480,7 @@ static GtkItemFactoryEntry compose_popup_entries[] =
 	{N_("/_Add..."),	NULL, compose_attach_cb, 0, NULL},
 	{N_("/_Remove"),	NULL, compose_attach_remove_selected, 0, NULL},
 	{N_("/---"),		NULL, NULL, 0, "<Separator>"},
-	{N_("/_Property..."),	NULL, compose_attach_property, 0, NULL}
+	{N_("/_Properties..."),	NULL, compose_attach_property, 0, NULL}
 };
 
 static GtkItemFactoryEntry compose_entries[] =
@@ -5430,7 +5430,7 @@ static void compose_attach_property_create(gboolean *cancelled)
 	window = gtk_window_new(GTK_WINDOW_DIALOG);
 	gtk_widget_set_usize(window, 480, -1);
 	gtk_container_set_border_width(GTK_CONTAINER(window), 8);
-	gtk_window_set_title(GTK_WINDOW(window), _("Property"));
+	gtk_window_set_title(GTK_WINDOW(window), _("Properties"));
 	gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
 	gtk_window_set_modal(GTK_WINDOW(window), TRUE);
 	gtk_signal_connect(GTK_OBJECT(window), "delete_event",
diff --git a/src/customheader.c b/src/customheader.c
index 35fad0772..2bcb03571 100644
--- a/src/customheader.c
+++ b/src/customheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
diff --git a/src/folderview.c b/src/folderview.c
index 50f231de0..8521b81b7 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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
diff --git a/src/prefs_customheader.c b/src/prefs_customheader.c
index 0e3e8b0e9..4c92f0589 100644
--- a/src/prefs_customheader.c
+++ b/src/prefs_customheader.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2002 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2003 Hiroyuki Yamamoto
  *
  * 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