Revision 306

src/prefs_common.c (revision 306)
44 44
#include "summaryview.h"
45 45
#include "messageview.h"
46 46
#include "manage_window.h"
47
#include "foldersel.h"
47 48
#include "inc.h"
48 49
#include "menu.h"
49 50
#include "codeconv.h"
......
150 151
	GtkWidget *chkbtn_inline_image;
151 152
} message;
152 153

  
154
static struct JunkMail {
155
	GtkWidget *chkbtn_enable_junk;
156
	GtkWidget *entry_junk_learncmd;
157
	GtkWidget *entry_nojunk_learncmd;
158
	GtkWidget *entry_junkfolder;
159
} junk;
160

  
153 161
#if USE_GPGME
154 162
static struct Privacy {
155 163
	GtkWidget *checkbtn_auto_check_signatures;
......
567 575
	{"mime_open_command", "gedit '%s'",
568 576
	 &prefs_common.mime_open_cmd, P_STRING, NULL, NULL, NULL},
569 577

  
578
	/* Junk mail */
579
	{"enable_junk", "FALSE", &prefs_common.enable_junk, P_BOOL,
580
	 &junk.chkbtn_enable_junk,
581
	 prefs_set_data_from_toggle, prefs_set_toggle},
582
	{"junk_learn_command", "bogofilter -s -I",
583
	 &prefs_common.junk_learncmd, P_STRING,
584
	 &junk.entry_junk_learncmd, prefs_set_data_from_entry, prefs_set_entry},
585
	{"nojunk_learn_command", "bogofilter -n -I",
586
	 &prefs_common.nojunk_learncmd, P_STRING,
587
	 &junk.entry_nojunk_learncmd,
588
	 prefs_set_data_from_entry, prefs_set_entry},
589
	{"junk_folder", NULL, &prefs_common.junk_folder, P_STRING,
590
	 &junk.entry_junkfolder, prefs_set_data_from_entry, prefs_set_entry},
591

  
570 592
#if USE_GPGME
571 593
	/* Privacy */
572 594
	{"auto_check_signatures", "TRUE",
......
675 697
static void prefs_quote_create		(void);
676 698
static void prefs_display_create	(void);
677 699
static void prefs_message_create	(void);
700
static void prefs_junk_create		(void);
678 701
#if USE_GPGME
679 702
static void prefs_privacy_create	(void);
680 703
#endif
......
743 766
static void prefs_keybind_cancel		(void);
744 767
static void prefs_keybind_apply_clicked		(GtkWidget	*widget);
745 768

  
769
static void prefs_common_select_folder_cb	(GtkWidget	*widget,
770
						 gpointer	 data);
771

  
746 772
static gint prefs_common_deleted		(GtkWidget	*widget,
747 773
						 GdkEventAny	*event,
748 774
						 gpointer	 data);
......
864 890
	SET_NOTEBOOK_LABEL(dialog.notebook, _("Display"),   page++);
865 891
	prefs_message_create();
866 892
	SET_NOTEBOOK_LABEL(dialog.notebook, _("Message"),   page++);
893
	prefs_junk_create();
894
	SET_NOTEBOOK_LABEL(dialog.notebook, _("Junk mail"),   page++);
867 895
#if USE_GPGME
868 896
	prefs_privacy_create();
869 897
	SET_NOTEBOOK_LABEL(dialog.notebook, _("Privacy"),   page++);
......
1872 1900
	message.chkbtn_inline_image = chkbtn_inline_image;
1873 1901
}
1874 1902

  
1903
static void prefs_junk_create(void)
1904
{
1905
	GtkWidget *vbox1;
1906
	GtkWidget *vbox2;
1907
	GtkWidget *frame;
1908
	GtkWidget *hbox;
1909
	GtkWidget *chkbtn_enable_junk;
1910
	GtkWidget *label;
1911
	GtkWidget *entry_junk_learncmd;
1912
	GtkWidget *entry_nojunk_learncmd;
1913
	GtkWidget *vbox3;
1914
	GtkWidget *entry_junkfolder;
1915
	GtkWidget *btn_folder;
1916

  
1917
	vbox1 = gtk_vbox_new (FALSE, VSPACING);
1918
	gtk_widget_show (vbox1);
1919
	gtk_container_add (GTK_CONTAINER (dialog.notebook), vbox1);
1920
	gtk_container_set_border_width (GTK_CONTAINER (vbox1), VBOX_BORDER);
1921

  
1922
	chkbtn_enable_junk = gtk_check_button_new_with_label
1923
		(_("Enable Junk mail control"));
1924
	gtk_widget_show(chkbtn_enable_junk);
1925

  
1926
	PACK_FRAME(vbox1, frame, NULL);
1927
	gtk_frame_set_label_widget(GTK_FRAME(frame), chkbtn_enable_junk);
1928

  
1929
	vbox2 = gtk_vbox_new (FALSE, VSPACING_NARROW);
1930
	gtk_widget_show (vbox2);
1931
	gtk_container_add (GTK_CONTAINER (frame), vbox2);
1932
	gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
1933
	SET_TOGGLE_SENSITIVITY (chkbtn_enable_junk, vbox2);
1934

  
1935
	label = gtk_label_new (_("Learning command:"));
1936
	gtk_widget_show (label);
1937
	gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
1938
	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
1939

  
1940
	hbox = gtk_hbox_new (FALSE, 8);
1941
	gtk_widget_show (hbox);
1942
	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
1943

  
1944
	label = gtk_label_new (_("Junk"));
1945
	gtk_widget_show (label);
1946
	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
1947

  
1948
	entry_junk_learncmd = gtk_entry_new ();
1949
	gtk_widget_show (entry_junk_learncmd);
1950
	gtk_box_pack_start (GTK_BOX (hbox), entry_junk_learncmd, TRUE, TRUE, 0);
1951

  
1952
	hbox = gtk_hbox_new (FALSE, 8);
1953
	gtk_widget_show (hbox);
1954
	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
1955

  
1956
	label = gtk_label_new (_("Not Junk"));
1957
	gtk_widget_show (label);
1958
	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
1959

  
1960
	entry_nojunk_learncmd = gtk_entry_new ();
1961
	gtk_widget_show (entry_nojunk_learncmd);
1962
	gtk_box_pack_start (GTK_BOX (hbox), entry_nojunk_learncmd,
1963
			    TRUE, TRUE, 0);
1964

  
1965
	PACK_VSPACER(vbox2, vbox3, 0);
1966

  
1967
	hbox = gtk_hbox_new (FALSE, 8);
1968
	gtk_widget_show (hbox);
1969
	gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
1970

  
1971
	label = gtk_label_new (_("Junk folder"));
1972
	gtk_widget_show (label);
1973
	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
1974

  
1975
	entry_junkfolder = gtk_entry_new ();
1976
	gtk_widget_show (entry_junkfolder);
1977
	gtk_box_pack_start (GTK_BOX (hbox), entry_junkfolder, TRUE, TRUE, 0);
1978

  
1979
	btn_folder = gtk_button_new_with_label (_(" ... "));
1980
	gtk_widget_show (btn_folder);
1981
	gtk_box_pack_start (GTK_BOX (hbox), btn_folder, FALSE, FALSE, 0);
1982
	g_signal_connect (G_OBJECT (btn_folder), "clicked",
1983
			  G_CALLBACK (prefs_common_select_folder_cb),
1984
			  entry_junkfolder);
1985

  
1986
	PACK_VSPACER(vbox2, vbox3, 0);
1987

  
1988
	label = gtk_label_new
1989
		(_("Specify command line for learning junk mail.\n"
1990
		   "You must add a filter rule to enable automatic filtering "
1991
		   "using the result of this learning."));
1992
	gtk_widget_show (label);
1993
	gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE, 0);
1994
	gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
1995
	gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
1996
	gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
1997
	gtkut_widget_set_small_font_size (label);
1998

  
1999
	junk.chkbtn_enable_junk = chkbtn_enable_junk;
2000
	junk.entry_junk_learncmd = entry_junk_learncmd;
2001
	junk.entry_nojunk_learncmd = entry_nojunk_learncmd;
2002
	junk.entry_junkfolder = entry_junkfolder;
2003
}
2004

  
1875 2005
#if USE_GPGME
1876 2006
static void prefs_privacy_create(void)
1877 2007
{
......
3530 3660
	gtk_menu_item_activate(GTK_MENU_ITEM(menuitem));
3531 3661
}
3532 3662

  
3663
static void prefs_common_select_folder_cb(GtkWidget *widget, gpointer data)
3664
{
3665
	FolderItem *item;
3666
	gchar *id;
3667

  
3668
	item = foldersel_folder_sel(NULL, FOLDER_SEL_COPY, NULL);
3669
	if (item && item->path) {
3670
		id = folder_item_get_identifier(item);
3671
		if (id) {
3672
			gtk_entry_set_text(GTK_ENTRY(data), id);
3673
			g_free(id);
3674
		}
3675
	}
3676
}
3677

  
3533 3678
static gint prefs_common_deleted(GtkWidget *widget, GdkEventAny *event,
3534 3679
				 gpointer data)
3535 3680
{
src/summaryview.c (revision 306)
815 815
SummarySelection summary_get_selection_type(SummaryView *summaryview)
816 816
{
817 817
	SummarySelection selection;
818
	gint count;
818
	GList *rows;
819 819

  
820
	count = gtk_tree_selection_count_selected_rows(summaryview->selection);
820
	rows = summary_get_selected_rows(summaryview);
821 821

  
822 822
	if (!summaryview->folder_item || summaryview->folder_item->total == 0)
823 823
		selection = SUMMARY_NONE;
824
	else if (count == 0)
824
	else if (!rows)
825 825
		selection = SUMMARY_SELECTED_NONE;
826
	else if (count == 1)
826
	else if (rows && !rows->next)
827 827
		selection = SUMMARY_SELECTED_SINGLE;
828 828
	else
829 829
		selection = SUMMARY_SELECTED_MULTIPLE;
......
3671 3671
	g_free(key);
3672 3672
}
3673 3673

  
3674
static void summary_junk_func(GtkTreeModel *model, GtkTreePath *path,
3675
			      GtkTreeIter *iter, gpointer data)
3676
{
3677
	FilterRule rule = {NULL, FLT_OR, NULL, NULL, FLT_TIMING_ANY, TRUE};
3678
	FilterAction action1 = {FLT_ACTION_EXEC, NULL, 0};
3679
	FilterAction action2 = {FLT_ACTION_MOVE, NULL, 0};
3680
	SummaryView *summaryview = (SummaryView *)data;
3681
	MsgInfo *msginfo;
3682
	FilterInfo *fltinfo;
3683
	gchar *file;
3684
	gint ret;
3685

  
3686
	gtk_tree_model_get(model, iter, S_COL_MSG_INFO, &msginfo, -1);
3687
	file = procmsg_get_message_file(msginfo);
3688
	g_return_if_fail(file != NULL);
3689

  
3690
	action1.str_value = prefs_common.junk_learncmd;
3691
	action2.str_value = prefs_common.junk_folder;
3692

  
3693
	rule.action_list = g_slist_append(rule.action_list, &action1);
3694
	rule.action_list = g_slist_append(rule.action_list, &action2);
3695

  
3696
	fltinfo = filter_info_new();
3697

  
3698
	ret = filter_action_exec(&rule, msginfo, file, fltinfo);
3699

  
3700
	if (ret == 0 && fltinfo->actions[FLT_ACTION_MOVE] && fltinfo->move_dest)
3701
		summary_move_row_to(summaryview, iter, fltinfo->move_dest);
3702

  
3703
	filter_info_free(fltinfo);
3704
	g_slist_free(rule.action_list);
3705
	g_free(file);
3706
}
3707

  
3708
static void summary_not_junk_func(GtkTreeModel *model, GtkTreePath *path,
3709
				  GtkTreeIter *iter, gpointer data)
3710
{
3711
	FilterRule rule = {NULL, FLT_OR, NULL, NULL, FLT_TIMING_ANY, TRUE};
3712
	FilterAction action = {FLT_ACTION_EXEC, NULL, 0};
3713
	MsgInfo *msginfo;
3714
	FilterInfo *fltinfo;
3715
	gchar *file;
3716
	gint ret;
3717

  
3718
	gtk_tree_model_get(model, iter, S_COL_MSG_INFO, &msginfo, -1);
3719
	file = procmsg_get_message_file(msginfo);
3720
	g_return_if_fail(file != NULL);
3721

  
3722
	action.str_value = prefs_common.nojunk_learncmd;
3723

  
3724
	rule.action_list = g_slist_append(rule.action_list, &action);
3725

  
3726
	fltinfo = filter_info_new();
3727

  
3728
	ret = filter_action_exec(&rule, msginfo, file, fltinfo);
3729

  
3730
	filter_info_free(fltinfo);
3731
	g_slist_free(rule.action_list);
3732
	g_free(file);
3733
}
3734

  
3735
void summary_junk(SummaryView *summaryview)
3736
{
3737
	if (!prefs_common.enable_junk)
3738
		return;
3739
	if (!prefs_common.junk_learncmd || !prefs_common.junk_folder)
3740
		return;
3741

  
3742
	summary_lock(summaryview);
3743

  
3744
	debug_print("Set mail as junk\n");
3745

  
3746
	gtk_tree_selection_selected_foreach(summaryview->selection,
3747
					    summary_junk_func, summaryview);
3748

  
3749
	summary_unlock(summaryview);
3750

  
3751
	if (prefs_common.immediate_exec)
3752
		summary_execute(summaryview);
3753
	else {
3754
		summary_step(summaryview, GTK_SCROLL_STEP_FORWARD);
3755
		summary_status_show(summaryview);
3756
	}
3757

  
3758
	folderview_update_all_updated(FALSE);
3759
}
3760

  
3761
void summary_not_junk(SummaryView *summaryview)
3762
{
3763
	if (!prefs_common.enable_junk)
3764
		return;
3765
	if (!prefs_common.nojunk_learncmd)
3766
		return;
3767

  
3768
	summary_lock(summaryview);
3769

  
3770
	debug_print("Set mail as not junk\n");
3771

  
3772
	gtk_tree_selection_selected_foreach(summaryview->selection,
3773
					    summary_not_junk_func, summaryview);
3774

  
3775
	summary_unlock(summaryview);
3776
}
3777

  
3674 3778
void summary_reply(SummaryView *summaryview, ComposeMode mode)
3675 3779
{
3676 3780
	GSList *mlist;
src/prefs_common.h (revision 306)
186 186

  
187 187
	GList *mime_open_cmd_history;
188 188

  
189
	/* Junk Mail */
190
	gboolean enable_junk;
191
	gchar *junk_learncmd;
192
	gchar *nojunk_learncmd;
193
	gchar *junk_folder;
194

  
189 195
#if USE_GPGME
190 196
	/* Privacy */
191 197
	gboolean auto_check_signatures;
src/summaryview.h (revision 306)
199 199
void summary_filter_open	  (SummaryView		*summaryview,
200 200
				   PrefsFilterType	 type);
201 201

  
202
void summary_junk		  (SummaryView		*summaryview);
203
void summary_not_junk		  (SummaryView		*summaryview);
204

  
202 205
void summary_sort		  (SummaryView		*summaryview,
203 206
				   FolderSortKey	 sort_key,
204 207
				   FolderSortType	 sort_type);
src/mainwindow.c (revision 306)
43 43
#include <gtk/gtktooltips.h>
44 44
#include <gtk/gtkarrow.h>
45 45
#include <gtk/gtkstock.h>
46
#include <gtk/gtkimage.h>
46 47
#include <string.h>
47 48

  
48 49
#include "main.h"
......
133 134

  
134 135
static void toolbar_delete_cb		(GtkWidget	*widget,
135 136
					 gpointer	 data);
137
static void toolbar_junk_cb		(GtkWidget	*widget,
138
					 gpointer	 data);
136 139
static void toolbar_exec_cb		(GtkWidget	*widget,
137 140
					 gpointer	 data);
138 141

  
......
318 321
					 guint		 action,
319 322
					 GtkWidget	*widget);
320 323

  
324
static void junk_cb			(MainWindow	*mainwin,
325
					 guint		 action,
326
					 GtkWidget	*widget);
327

  
321 328
static void reedit_cb			(MainWindow	*mainwin,
322 329
					 guint		 action,
323 330
					 GtkWidget	*widget);
......
686 693
	{N_("/_Message/---"),			NULL, NULL, 0, "<Separator>"},
687 694
	{N_("/_Message/M_ove..."),		"<control>O", move_to_cb, 0, NULL},
688 695
	{N_("/_Message/_Copy..."),		"<shift><control>O", copy_to_cb, 0, NULL},
689
	{N_("/_Message/_Delete"),		"<control>D", delete_cb,  0, NULL},
696
	{N_("/_Message/_Delete"),		"<control>D", delete_cb, 0, NULL},
690 697
	{N_("/_Message/---"),			NULL, NULL, 0, "<Separator>"},
691 698
	{N_("/_Message/_Mark"),			NULL, NULL, 0, "<Branch>"},
692 699
	{N_("/_Message/_Mark/_Mark"),		"<shift>asterisk", mark_cb, 0, NULL},
......
697 704
						NULL, mark_as_read_cb, 0, NULL},
698 705
	{N_("/_Message/_Mark/Mark all _read"),	NULL, mark_all_read_cb, 0, NULL},
699 706
	{N_("/_Message/---"),			NULL, NULL, 0, "<Separator>"},
707
	{N_("/_Message/Set as _junk mail"),	"<control>J", junk_cb, 0, NULL},
708
	{N_("/_Message/Set as not j_unk mail"),	"<shift><control>J", junk_cb, 1, NULL},
709
	{N_("/_Message/---"),			NULL, NULL, 0, "<Separator>"},
700 710
	{N_("/_Message/Re-_edit"),		NULL, reedit_cb, 0, NULL},
701 711

  
702 712
	{N_("/_Tools"),				NULL, NULL, 0, "<Branch>"},
......
1114 1124
		main_window_set_menu_sensitive(mainwin);
1115 1125
		main_window_set_toolbar_sensitive(mainwin);
1116 1126

  
1127
		if (prefs_common.enable_junk)
1128
			gtk_widget_show(mainwin->junk_btn);
1129
		else
1130
			gtk_widget_hide(mainwin->junk_btn);
1131

  
1117 1132
		if (prefs_common.immediate_exec)
1118 1133
			gtk_widget_hide(mainwin->exec_btn);
1119 1134
		else
......
1589 1604
	M_UNTHREADED	      = 1 << 8,
1590 1605
	M_ALLOW_DELETE	      = 1 << 9,
1591 1606
	M_INC_ACTIVE	      = 1 << 10,
1607
	M_ENABLE_JUNK	      = 1 << 11,
1592 1608

  
1593
	M_FOLDER_NEWOK	      = 1 << 11,
1594
	M_FOLDER_RENOK	      = 1 << 12,
1595
	M_FOLDER_DELOK	      = 1 << 13,
1596
	M_MBOX_ADDOK	      = 1 << 14,
1597
	M_MBOX_RMOK	      = 1 << 15,
1598
	M_MBOX_CHKOK	      = 1 << 16,
1599
	M_MBOX_CHKALLOK	      = 1 << 17,
1600
	M_MBOX_REBUILDOK      = 1 << 18
1609
	M_FOLDER_NEWOK	      = 1 << 17,
1610
	M_FOLDER_RENOK	      = 1 << 18,
1611
	M_FOLDER_DELOK	      = 1 << 19,
1612
	M_MBOX_ADDOK	      = 1 << 20,
1613
	M_MBOX_RMOK	      = 1 << 21,
1614
	M_MBOX_CHKOK	      = 1 << 22,
1615
	M_MBOX_CHKALLOK	      = 1 << 23,
1616
	M_MBOX_REBUILDOK      = 1 << 24
1601 1617
} SensitiveCond;
1602 1618

  
1603 1619
static SensitiveCond main_window_get_current_state(MainWindow *mainwin)
......
1637 1653
	if (inc_is_active())
1638 1654
		state |= M_INC_ACTIVE;
1639 1655

  
1656
	if (prefs_common.enable_junk)
1657
		state |= M_ENABLE_JUNK;
1658

  
1640 1659
	item = folderview_get_selected_item(mainwin->folderview);
1641 1660
	if (item) {
1642 1661
		state |= M_FOLDER_NEWOK;
......
1672 1691
	struct {
1673 1692
		GtkWidget *widget;
1674 1693
		SensitiveCond cond;
1675
	} entry[12];
1694
	} entry[13];
1676 1695

  
1677 1696
#define SET_WIDGET_COND(w, c)	\
1678 1697
{				\
......
1700 1719
	SET_WIDGET_COND(mainwin->next_btn, M_MSG_EXIST);
1701 1720
	SET_WIDGET_COND(mainwin->delete_btn,
1702 1721
			M_TARGET_EXIST|M_ALLOW_DELETE);
1722
	SET_WIDGET_COND(mainwin->junk_btn,
1723
			M_TARGET_EXIST|M_ALLOW_DELETE|M_ENABLE_JUNK);
1703 1724
	SET_WIDGET_COND(mainwin->exec_btn, M_MSG_EXIST|M_EXEC);
1704 1725
	SET_WIDGET_COND(NULL, 0);
1705 1726

  
......
1786 1807
		{"/Message/Copy..."              , M_TARGET_EXIST|M_EXEC},
1787 1808
		{"/Message/Delete"               , M_TARGET_EXIST|M_ALLOW_DELETE},
1788 1809
		{"/Message/Mark"                 , M_TARGET_EXIST},
1810
		{"/Message/Set as junk mail"     , M_TARGET_EXIST|M_ALLOW_DELETE|M_ENABLE_JUNK},
1811
		{"/Message/Set as not junk mail" , M_TARGET_EXIST|M_ALLOW_DELETE|M_ENABLE_JUNK},
1789 1812
		{"/Message/Re-edit"              , M_HAVE_ACCOUNT|M_ALLOW_REEDIT},
1790 1813

  
1791 1814
		{"/Tools/Add sender to address book"   , M_SINGLE_TARGET_EXIST},
......
2139 2162
#endif
2140 2163
	GtkWidget *next_btn;
2141 2164
	GtkWidget *delete_btn;
2165
	GtkWidget *junk_btn;
2142 2166
	GtkWidget *exec_btn;
2143 2167

  
2144 2168
	gint n_entries;
......
2147 2171
	gtk_toolbar_set_orientation(GTK_TOOLBAR(toolbar),
2148 2172
				    GTK_ORIENTATION_HORIZONTAL);
2149 2173
	gtk_toolbar_set_style(GTK_TOOLBAR(toolbar), GTK_TOOLBAR_BOTH);
2174
	gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),
2175
				  GTK_ICON_SIZE_SMALL_TOOLBAR);
2150 2176
	gtk_container_add(GTK_CONTAINER(container), toolbar);
2151 2177
	gtk_widget_set_size_request(toolbar, 1, -1);
2152 2178

  
......
2237 2263

  
2238 2264
	gtk_toolbar_append_space(GTK_TOOLBAR(toolbar));
2239 2265

  
2240
	icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_CLOSE);
2266
	icon_wid = gtk_image_new_from_stock(GTK_STOCK_DELETE,
2267
					    GTK_ICON_SIZE_SMALL_TOOLBAR);
2241 2268
	delete_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
2242 2269
					  _("Delete"),
2243 2270
					  _("Delete the message"),
......
2246 2273
					  G_CALLBACK(toolbar_delete_cb),
2247 2274
					  mainwin);
2248 2275

  
2249
	icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_EXEC);
2276
	icon_wid = gtk_image_new_from_stock(GTK_STOCK_CANCEL,
2277
					    GTK_ICON_SIZE_SMALL_TOOLBAR);
2278
	junk_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
2279
					   _("Junk"),
2280
					   _("Set as junk mail"),
2281
					   "Junk",
2282
					   icon_wid,
2283
					   G_CALLBACK(toolbar_junk_cb),
2284
					   mainwin);
2285

  
2286
	icon_wid = gtk_image_new_from_stock(GTK_STOCK_EXECUTE,
2287
					    GTK_ICON_SIZE_SMALL_TOOLBAR);
2250 2288
	exec_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
2251 2289
					   _("Execute"),
2252 2290
					   _("Execute marked process"),
......
2255 2293
					   G_CALLBACK(toolbar_exec_cb),
2256 2294
					   mainwin);
2257 2295

  
2258
	icon_wid = stock_pixmap_widget(container, STOCK_PIXMAP_DOWN_ARROW);
2296
	icon_wid = gtk_image_new_from_stock(GTK_STOCK_GO_DOWN,
2297
					    GTK_ICON_SIZE_SMALL_TOOLBAR);
2259 2298
	next_btn = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
2260 2299
					   _("Next"),
2261 2300
					   _("Next unread message"),
......
2303 2342
#endif
2304 2343
	mainwin->next_btn     = next_btn;
2305 2344
	mainwin->delete_btn   = delete_btn;
2345
	mainwin->junk_btn     = junk_btn;
2306 2346
	mainwin->exec_btn     = exec_btn;
2307 2347

  
2308 2348
	gtk_widget_show_all(toolbar);
......
2377 2417
	summary_delete(mainwin->summaryview);
2378 2418
}
2379 2419

  
2420
static void toolbar_junk_cb	(GtkWidget	*widget,
2421
				 gpointer	 data)
2422
{
2423
	MainWindow *mainwin = (MainWindow *)data;
2424

  
2425
	summary_junk(mainwin->summaryview);
2426
}
2427

  
2380 2428
static void toolbar_exec_cb	(GtkWidget	*widget,
2381 2429
				 gpointer	 data)
2382 2430
{
......
2907 2955
	summary_mark_all_read(mainwin->summaryview);
2908 2956
}
2909 2957

  
2958
static void junk_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
2959
{
2960
	if (action == 0)
2961
		summary_junk(mainwin->summaryview);
2962
	else
2963
		summary_not_junk(mainwin->summaryview);
2964
}
2965

  
2910 2966
static void reedit_cb(MainWindow *mainwin, guint action, GtkWidget *widget)
2911 2967
{
2912 2968
	summary_reedit(mainwin->summaryview);
src/mainwindow.h (revision 306)
96 96
	GtkWidget *account_btn;
97 97
	GtkWidget *next_btn;
98 98
	GtkWidget *delete_btn;
99
	GtkWidget *junk_btn;
99 100
	GtkWidget *exec_btn;
100 101

  
101 102
	/* body */
po/cs.po (revision 306)
6 6
msgstr ""
7 7
"Project-Id-Version: sylpheed\n"
8 8
"Report-Msgid-Bugs-To: \n"
9
"POT-Creation-Date: 2005-05-29 16:50+0900\n"
9
"POT-Creation-Date: 2005-06-02 17:33+0900\n"
10 10
"PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
11 11
"Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
12 12
"Language-Team: Czech <cs@li.org>\n"
......
156 156
msgstr "Smazat účet"
157 157

  
158 158
#: src/account.c:811 src/compose.c:2625 src/compose.c:5049
159
#: src/folderview.c:2009 src/folderview.c:2105 src/folderview.c:2151
160
#: src/folderview.c:2292 src/folderview.c:2338
159
#: src/folderview.c:2029 src/folderview.c:2125 src/folderview.c:2171
160
#: src/folderview.c:2312 src/folderview.c:2358
161 161
msgid "Yes"
162 162
msgstr "Ano"
163 163

  
164 164
#: src/account.c:811 src/compose.c:2625 src/compose.c:5049
165
#: src/folderview.c:2009 src/folderview.c:2105 src/folderview.c:2151
166
#: src/folderview.c:2292 src/folderview.c:2338
165
#: src/folderview.c:2029 src/folderview.c:2125 src/folderview.c:2171
166
#: src/folderview.c:2312 src/folderview.c:2358
167 167
msgid "+No"
168 168
msgstr "+Ne"
169 169

  
......
280 280
msgid "Select Address Book Folder"
281 281
msgstr "Vybrat složku pro databázi adres"
282 282

  
283
#: src/addressbook.c:336 src/compose.c:488 src/mainwindow.c:457
283
#: src/addressbook.c:336 src/compose.c:488 src/mainwindow.c:464
284 284
#: src/messageview.c:136
285 285
msgid "/_File"
286 286
msgstr "/_Soubor"
......
302 302
msgstr "/_Soubor/Nový _server"
303 303

  
304 304
#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:493
305
#: src/compose.c:498 src/compose.c:502 src/mainwindow.c:474
306
#: src/mainwindow.c:477 src/mainwindow.c:479 src/mainwindow.c:482
307
#: src/mainwindow.c:484 src/messageview.c:139
305
#: src/compose.c:498 src/compose.c:502 src/mainwindow.c:481
306
#: src/mainwindow.c:484 src/mainwindow.c:486 src/mainwindow.c:489
307
#: src/mainwindow.c:491 src/messageview.c:139
308 308
msgid "/_File/---"
309 309
msgstr "/_Soubor/---"
310 310

  
......
352 352
msgid "/_Address/_Delete"
353 353
msgstr "/_Adresa/S_mazat"
354 354

  
355
#: src/addressbook.c:358 src/compose.c:606 src/mainwindow.c:702
355
#: src/addressbook.c:358 src/compose.c:606 src/mainwindow.c:712
356 356
#: src/messageview.c:250
357 357
msgid "/_Tools"
358 358
msgstr "/_Nástroje"
......
361 361
msgid "/_Tools/Import _LDIF file"
362 362
msgstr "/_Nástroje/Importovat _LDIF soubor"
363 363

  
364
#: src/addressbook.c:360 src/compose.c:619 src/mainwindow.c:747
364
#: src/addressbook.c:360 src/compose.c:619 src/mainwindow.c:757
365 365
#: src/messageview.c:268
366 366
msgid "/_Help"
367 367
msgstr "/Nápo_věda"
368 368

  
369
#: src/addressbook.c:361 src/compose.c:620 src/mainwindow.c:758
369
#: src/addressbook.c:361 src/compose.c:620 src/mainwindow.c:768
370 370
#: src/messageview.c:269
371 371
msgid "/_Help/_About"
372 372
msgstr "/Nápo_věda/_O aplikaci"
......
387 387
#: src/folderview.c:224 src/folderview.c:226 src/folderview.c:230
388 388
#: src/folderview.c:240 src/folderview.c:242 src/folderview.c:244
389 389
#: src/folderview.c:248 src/folderview.c:258 src/folderview.c:260
390
#: src/folderview.c:263 src/summaryview.c:357 src/summaryview.c:361
391
#: src/summaryview.c:365 src/summaryview.c:375 src/summaryview.c:377
392
#: src/summaryview.c:380 src/summaryview.c:386
390
#: src/folderview.c:263 src/summaryview.c:360 src/summaryview.c:364
391
#: src/summaryview.c:368 src/summaryview.c:378 src/summaryview.c:380
392
#: src/summaryview.c:383 src/summaryview.c:389
393 393
msgid "/---"
394 394
msgstr "/---"
395 395

  
396 396
#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:505
397
#: src/mainwindow.c:488 src/messageview.c:142
397
#: src/mainwindow.c:495 src/messageview.c:142
398 398
msgid "/_Edit"
399 399
msgstr "/Úp_ravy"
400 400

  
401
#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:364
401
#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:367
402 402
msgid "/_Delete"
403 403
msgstr "/_Smazat"
404 404

  
......
406 406
msgid "E-Mail address"
407 407
msgstr "E-mail adresa"
408 408

  
409
#: src/addressbook.c:495 src/compose.c:4370 src/prefs_common.c:2217
409
#: src/addressbook.c:495 src/compose.c:4370 src/prefs_common.c:2347
410 410
msgid "Address book"
411 411
msgstr "Databáze adres"
412 412

  
......
416 416

  
417 417
#. Buttons
418 418
#: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
419
#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2242
419
#: src/editaddress.c:882 src/editaddress.c:1015 src/mainwindow.c:2269
420 420
#: src/prefs_actions.c:263 src/prefs_display_header.c:275
421 421
#: src/prefs_display_header.c:330 src/prefs_template.c:227
422 422
msgid "Delete"
......
563 563
msgid "Addressbook Conversion"
564 564
msgstr "Konverze databáze adres"
565 565

  
566
#: src/addressbook.c:3055 src/prefs_common.c:872
566
#: src/addressbook.c:3055 src/prefs_common.c:900
567 567
msgid "Interface"
568 568
msgstr "Rozhraní"
569 569

  
......
616 616
msgid "Warning"
617 617
msgstr "Varování"
618 618

  
619
#: src/alertpanel.c:149 src/compose.c:2625 src/inc.c:559
619
#: src/alertpanel.c:149 src/compose.c:2625 src/inc.c:561
620 620
msgid "Error"
621 621
msgstr "Chyba"
622 622

  
......
624 624
msgid "Creating alert panel dialog...\n"
625 625
msgstr "Vytvářím dialog pro varování...\n"
626 626

  
627
#: src/alertpanel.c:268
627
#: src/alertpanel.c:269
628 628
msgid "Show this message next time"
629 629
msgstr "Zobrazovat příště tuto zprávu"
630 630

  
......
659 659
#. create sub items. for the menu item activation callback we pass the
660 660
#. * color flag value as data parameter. Also we attach a data pointer
661 661
#. * so we can always get back the SummaryView pointer.
662
#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3848
662
#: src/colorlabel.c:280 src/prefs_folder_item.c:285 src/summaryview.c:3959
663 663
msgid "None"
664 664
msgstr "Žádná"
665 665

  
......
716 716
msgid "/_Edit/_Redo"
717 717
msgstr "/Úp_ravy/Z_nova"
718 718

  
719
#: src/compose.c:508 src/compose.c:515 src/mainwindow.c:492
719
#: src/compose.c:508 src/compose.c:515 src/mainwindow.c:499
720 720
#: src/messageview.c:145
721 721
msgid "/_Edit/---"
722 722
msgstr "/Úp_ravy/---"
......
725 725
msgid "/_Edit/Cu_t"
726 726
msgstr "/Úp_ravy/_Vyjmout"
727 727

  
728
#: src/compose.c:510 src/mainwindow.c:489 src/messageview.c:143
728
#: src/compose.c:510 src/mainwindow.c:496 src/messageview.c:143
729 729
msgid "/_Edit/_Copy"
730 730
msgstr "/Úp_ravy/_Kopírovat"
731 731

  
......
737 737
msgid "/_Edit/Paste as _quotation"
738 738
msgstr "/Úp_ravy/Vložit jako _citaci"
739 739

  
740
#: src/compose.c:514 src/mainwindow.c:490 src/messageview.c:144
740
#: src/compose.c:514 src/mainwindow.c:497 src/messageview.c:144
741 741
msgid "/_Edit/Select _all"
742 742
msgstr "/Úp_ravy/Vybr_at vše"
743 743

  
......
754 754
msgid "/_Edit/Aut_o wrapping"
755 755
msgstr "/Úp_ravy/_Kopírovat"
756 756

  
757
#: src/compose.c:521 src/mainwindow.c:497 src/messageview.c:149
758
#: src/summaryview.c:381
757
#: src/compose.c:521 src/mainwindow.c:504 src/messageview.c:149
758
#: src/summaryview.c:384
759 759
msgid "/_View"
760 760
msgstr "/Z_obrazit"
761 761

  
......
776 776
msgstr "/Z_obrazit/_Odpověď komu "
777 777

  
778 778
#: src/compose.c:526 src/compose.c:528 src/compose.c:530 src/compose.c:532
779
#: src/mainwindow.c:515 src/mainwindow.c:518 src/mainwindow.c:544
780
#: src/mainwindow.c:568 src/mainwindow.c:655 src/mainwindow.c:659
779
#: src/mainwindow.c:522 src/mainwindow.c:525 src/mainwindow.c:551
780
#: src/mainwindow.c:575 src/mainwindow.c:662 src/mainwindow.c:666
781 781
#: src/messageview.c:227
782 782
msgid "/_View/---"
783 783
msgstr "/Z_obrazit/---"
......
794 794
msgid "/_View/_Attachment"
795 795
msgstr "/Z_obrazit/Přílo_ha"
796 796

  
797
#: src/compose.c:538 src/mainwindow.c:575 src/messageview.c:156
797
#: src/compose.c:538 src/mainwindow.c:582 src/messageview.c:156
798 798
#, fuzzy
799 799
msgid "/_View/Character _encoding"
800 800
msgstr "/Z_obrazit/Setříd_it/Sestupně"
......
805 805

  
806 806
#: src/compose.c:541 src/compose.c:547 src/compose.c:553 src/compose.c:557
807 807
#: src/compose.c:563 src/compose.c:567 src/compose.c:571 src/compose.c:581
808
#: src/compose.c:585 src/compose.c:595 src/compose.c:599 src/mainwindow.c:571
809
#: src/mainwindow.c:578 src/messageview.c:152
808
#: src/compose.c:585 src/compose.c:595 src/compose.c:599 src/mainwindow.c:578
809
#: src/mainwindow.c:585 src/messageview.c:152
810 810
#, fuzzy
811 811
msgid "/_View/Character _encoding/---"
812 812
msgstr "/Z_obrazit/Setříd_it/Sestupně"
813 813

  
814
#: src/compose.c:543 src/mainwindow.c:579 src/messageview.c:160
814
#: src/compose.c:543 src/mainwindow.c:586 src/messageview.c:160
815 815
#, fuzzy
816 816
msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
817 817
msgstr "/Z_obrazit/_Znaková sada/7bitová ascii (US-ASC_II)"
818 818

  
819
#: src/compose.c:545 src/mainwindow.c:581 src/messageview.c:163
819
#: src/compose.c:545 src/mainwindow.c:588 src/messageview.c:163
820 820
#, fuzzy
821 821
msgid "/_View/Character _encoding/Unicode (_UTF-8)"
822 822
msgstr "/Z_obrazit/_Znaková sada/Unicode (_UTF-8)"
823 823

  
824
#: src/compose.c:549 src/mainwindow.c:585 src/messageview.c:166
824
#: src/compose.c:549 src/mainwindow.c:592 src/messageview.c:166
825 825
#, fuzzy
826 826
msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
827 827
msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-_1)"
828 828

  
829
#: src/compose.c:551 src/mainwindow.c:587 src/messageview.c:168
829
#: src/compose.c:551 src/mainwindow.c:594 src/messageview.c:168
830 830
#, fuzzy
831 831
msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
832 832
msgstr "/Z_obrazit/_Znaková sada/Západní Evropa (ISO-8859-15)"
833 833

  
834
#: src/compose.c:555 src/mainwindow.c:591 src/messageview.c:171
834
#: src/compose.c:555 src/mainwindow.c:598 src/messageview.c:171
835 835
#, fuzzy
836 836
msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
837 837
msgstr "/Z_obrazit/_Znaková sada/Střední Evropa (ISO-8859-_2)"
838 838

  
839
#: src/compose.c:559 src/mainwindow.c:595 src/messageview.c:174
839
#: src/compose.c:559 src/mainwindow.c:602 src/messageview.c:174
840 840
#, fuzzy
841 841
msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
842 842
msgstr "/Z_obrazit/_Znaková sada/_Baltská (ISO-8859-13)"
843 843

  
844
#: src/compose.c:561 src/mainwindow.c:597 src/messageview.c:176
844
#: src/compose.c:561 src/mainwindow.c:604 src/messageview.c:176
845 845
#, fuzzy
846 846
msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
847 847
msgstr "/Z_obrazit/_Znaková sada/Baltská (ISO-8859-_4)"
848 848

  
849
#: src/compose.c:565 src/mainwindow.c:601 src/messageview.c:179
849
#: src/compose.c:565 src/mainwindow.c:608 src/messageview.c:179
850 850
#, fuzzy
851 851
msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
852 852
msgstr "/Z_obrazit/_Znaková sada/Řecká (ISO-8859-_7)"
853 853

  
854
#: src/compose.c:569 src/mainwindow.c:605 src/messageview.c:182
854
#: src/compose.c:569 src/mainwindow.c:612 src/messageview.c:182
855 855
#, fuzzy
856 856
msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
857 857
msgstr "/Z_obrazit/_Znaková sada/Turecká (ISO-8859-_9)"
858 858

  
859
#: src/compose.c:573 src/mainwindow.c:609 src/messageview.c:185
859
#: src/compose.c:573 src/mainwindow.c:616 src/messageview.c:185
860 860
#, fuzzy
861 861
msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
862 862
msgstr "/Z_obrazit/_Znaková sada/Azbuka (ISO-8859-_5)"
863 863

  
864
#: src/compose.c:575 src/mainwindow.c:611 src/messageview.c:187
864
#: src/compose.c:575 src/mainwindow.c:618 src/messageview.c:187
865 865
#, fuzzy
866 866
msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
867 867
msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
868 868

  
869
#: src/compose.c:577 src/mainwindow.c:613 src/messageview.c:189
869
#: src/compose.c:577 src/mainwindow.c:620 src/messageview.c:189
870 870
#, fuzzy
871 871
msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
872 872
msgstr "/Z_obrazit/_Znaková sada/Azbuka (KOI8-_R)"
873 873

  
874
#: src/compose.c:579 src/mainwindow.c:615 src/messageview.c:191
874
#: src/compose.c:579 src/mainwindow.c:622 src/messageview.c:191
875 875
#, fuzzy
876 876
msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
877 877
msgstr "/Z_obrazit/_Znaková sada/Azbuka (Windows-1251)"
878 878

  
879
#: src/compose.c:583 src/mainwindow.c:619 src/messageview.c:194
879
#: src/compose.c:583 src/mainwindow.c:626 src/messageview.c:194
880 880
#, fuzzy
881 881
msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
882 882
msgstr "/Z_obrazit/_Znaková sada/Japonská (ISO-2022-_JP)"
883 883

  
884
#: src/compose.c:587 src/mainwindow.c:629 src/messageview.c:203
884
#: src/compose.c:587 src/mainwindow.c:636 src/messageview.c:203
885 885
#, fuzzy
886 886
msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
887 887
msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
888 888

  
889
#: src/compose.c:589 src/mainwindow.c:631 src/messageview.c:205
889
#: src/compose.c:589 src/mainwindow.c:638 src/messageview.c:205
890 890
#, fuzzy
891 891
msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
892 892
msgstr "/Z_obrazit/_Znaková sada/Zjednodušená čínská (_GB2312)"
893 893

  
894
#: src/compose.c:591 src/mainwindow.c:633 src/messageview.c:207
894
#: src/compose.c:591 src/mainwindow.c:640 src/messageview.c:207
895 895
#, fuzzy
896 896
msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
897 897
msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (_Big5)"
898 898

  
899
#: src/compose.c:593 src/mainwindow.c:635 src/messageview.c:209
899
#: src/compose.c:593 src/mainwindow.c:642 src/messageview.c:209
900 900
#, fuzzy
901 901
msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
902 902
msgstr "/Z_obrazit/_Znaková sada/Tradiční čínská (EUC-_TW)"
903 903

  
904
#: src/compose.c:597 src/mainwindow.c:641 src/messageview.c:214
904
#: src/compose.c:597 src/mainwindow.c:648 src/messageview.c:214
905 905
#, fuzzy
906 906
msgid "/_View/Character _encoding/Korean (EUC-_KR)"
907 907
msgstr "/Z_obrazit/_Znaková sada/Korejská (EUC-_KR)"
908 908

  
909
#: src/compose.c:601 src/mainwindow.c:647 src/messageview.c:219
909
#: src/compose.c:601 src/mainwindow.c:654 src/messageview.c:219
910 910
#, fuzzy
911 911
msgid "/_View/Character _encoding/Thai (TIS-620)"
912 912
msgstr "/Z_obrazit/_Znaková sada/Thajská (TIS-620)"
913 913

  
914
#: src/compose.c:603 src/mainwindow.c:649 src/messageview.c:221
914
#: src/compose.c:603 src/mainwindow.c:656 src/messageview.c:221
915 915
#, fuzzy
916 916
msgid "/_View/Character _encoding/Thai (Windows-874)"
917 917
msgstr "/Z_obrazit/_Znaková sada/Thajská (Windows-874)"
918 918

  
919
#: src/compose.c:607 src/mainwindow.c:703 src/messageview.c:251
919
#: src/compose.c:607 src/mainwindow.c:713 src/messageview.c:251
920 920
msgid "/_Tools/_Address book"
921 921
msgstr "/_Nástroje/_Databáze adres"
922 922

  
......
924 924
msgid "/_Tools/_Template"
925 925
msgstr "/_Nástroje/Ša_blona"
926 926

  
927
#: src/compose.c:609 src/mainwindow.c:721 src/messageview.c:266
927
#: src/compose.c:609 src/mainwindow.c:731 src/messageview.c:266
928 928
msgid "/_Tools/Actio_ns"
929 929
msgstr "/_Nástroje/_Akce"
930 930

  
931
#: src/compose.c:610 src/compose.c:614 src/mainwindow.c:706
932
#: src/mainwindow.c:720 src/mainwindow.c:722 src/mainwindow.c:725
933
#: src/mainwindow.c:727 src/messageview.c:254 src/messageview.c:265
931
#: src/compose.c:610 src/compose.c:614 src/mainwindow.c:716
932
#: src/mainwindow.c:730 src/mainwindow.c:732 src/mainwindow.c:735
933
#: src/mainwindow.c:737 src/messageview.c:254 src/messageview.c:265
934 934
msgid "/_Tools/---"
935 935
msgstr "/_Nástroje/---"
936 936

  
......
1013 1013
msgid "Recipient is not specified."
1014 1014
msgstr "Není uveden příjemce."
1015 1015

  
1016
#: src/compose.c:2380 src/compose.c:4290 src/mainwindow.c:2174
1017
#: src/prefs_account.c:703 src/prefs_common.c:858
1016
#: src/compose.c:2380 src/compose.c:4290 src/mainwindow.c:2200
1017
#: src/prefs_account.c:703 src/prefs_common.c:884
1018 1018
msgid "Send"
1019 1019
msgstr "Odeslat"
1020 1020

  
......
1112 1112

  
1113 1113
#. S_COL_DATE
1114 1114
#: src/compose.c:3929 src/mimeview.c:192 src/prefs_filter_edit.c:585
1115
#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:3991
1115
#: src/prefs_summary_column.c:74 src/select-keys.c:317 src/summaryview.c:4102
1116 1116
msgid "Size"
1117 1117
msgstr "Délka"
1118 1118

  
......
1153 1153
msgstr "Připojí soubor"
1154 1154

  
1155 1155
#. signature
1156
#: src/compose.c:4339 src/prefs_account.c:1339 src/prefs_common.c:1282
1156
#: src/compose.c:4339 src/prefs_account.c:1339 src/prefs_common.c:1310
1157 1157
msgid "Signature"
1158 1158
msgstr "Podpis"
1159 1159

  
......
1161 1161
msgid "Insert signature"
1162 1162
msgstr "Vloží podpis"
1163 1163

  
1164
#: src/compose.c:4349 src/prefs_common.c:1304 src/prefs_common.c:2196
1164
#: src/compose.c:4349 src/prefs_common.c:1332 src/prefs_common.c:2326
1165 1165
msgid "Editor"
1166 1166
msgstr "Editor"
1167 1167

  
......
1444 1444
msgid "Input the new name of folder:"
1445 1445
msgstr "Zadejte název složky:"
1446 1446

  
1447
#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1859
1448
#: src/folderview.c:1865
1447
#: src/editgroup.c:520 src/foldersel.c:496 src/folderview.c:1879
1448
#: src/folderview.c:1885
1449 1449
msgid "New folder"
1450 1450
msgstr "Nová složka"
1451 1451

  
1452
#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1866
1452
#: src/editgroup.c:521 src/foldersel.c:497 src/folderview.c:1886
1453 1453
msgid "Input the name of new folder:"
1454 1454
msgstr "Zadejte název složky:"
1455 1455

  
......
1466 1466
msgstr "Upravit JPilot soubor"
1467 1467

  
1468 1468
#: src/editjpilot.c:322 src/editldap.c:347 src/editvcard.c:235
1469
#: src/importldif.c:534 src/prefs_account.c:1852
1469
#: src/importldif.c:534 src/prefs_account.c:1852 src/prefs_common.c:1979
1470 1470
msgid " ... "
1471 1471
msgstr " ... "
1472 1472

  
......
1618 1618
msgid "Select folder"
1619 1619
msgstr "Vybrat složku"
1620 1620

  
1621
#: src/foldersel.c:341 src/folderview.c:1026 src/prefs_folder_item.c:212
1621
#: src/foldersel.c:341 src/folderview.c:1046 src/prefs_folder_item.c:212
1622 1622
msgid "Inbox"
1623 1623
msgstr "Doručená pošta"
1624 1624

  
1625
#: src/foldersel.c:345 src/folderview.c:1032 src/prefs_folder_item.c:213
1625
#: src/foldersel.c:345 src/folderview.c:1052 src/prefs_folder_item.c:213
1626 1626
msgid "Sent"
1627 1627
msgstr "Odeslaná pošta"
1628 1628

  
1629
#: src/foldersel.c:349 src/folderview.c:1038 src/prefs_folder_item.c:215
1629
#: src/foldersel.c:349 src/folderview.c:1058 src/prefs_folder_item.c:215
1630 1630
msgid "Queue"
1631 1631
msgstr "Fronta"
1632 1632

  
1633
#: src/foldersel.c:353 src/folderview.c:1044 src/prefs_folder_item.c:216
1633
#: src/foldersel.c:353 src/folderview.c:1064 src/prefs_folder_item.c:216
1634 1634
msgid "Trash"
1635 1635
msgstr "Koš"
1636 1636

  
1637
#: src/foldersel.c:357 src/folderview.c:1051 src/prefs_folder_item.c:214
1637
#: src/foldersel.c:357 src/folderview.c:1071 src/prefs_folder_item.c:214
1638 1638
msgid "Drafts"
1639 1639
msgstr "Koncepty"
1640 1640

  
1641
#: src/foldersel.c:498 src/folderview.c:1863 src/folderview.c:1867
1641
#: src/foldersel.c:498 src/folderview.c:1883 src/folderview.c:1887
1642 1642
msgid "NewFolder"
1643 1643
msgstr "Nová složka"
1644 1644

  
1645
#: src/foldersel.c:506 src/folderview.c:1875 src/folderview.c:1931
1645
#: src/foldersel.c:506 src/folderview.c:1895 src/folderview.c:1951
1646 1646
#, c-format
1647 1647
msgid "`%c' can't be included in folder name."
1648 1648
msgstr "%c nemůže být obsaženo ve jméně složky."
1649 1649

  
1650
#: src/foldersel.c:516 src/folderview.c:1885 src/folderview.c:1938
1650
#: src/foldersel.c:516 src/folderview.c:1905 src/folderview.c:1958
1651 1651
#, c-format
1652 1652
msgid "The folder `%s' already exists."
1653 1653
msgstr "Složka '%s' už existuje."
1654 1654

  
1655
#: src/foldersel.c:524 src/folderview.c:1892
1655
#: src/foldersel.c:524 src/folderview.c:1912
1656 1656
#, c-format
1657 1657
msgid "Can't create the folder `%s'."
1658 1658
msgstr "Nemohu vytvořit složku '%s'."
......
1724 1724
msgid "Setting folder info..."
1725 1725
msgstr "Nastavuji informace o složce..."
1726 1726

  
1727
#: src/folderview.c:762 src/mainwindow.c:3210 src/setup.c:81
1727
#: src/folderview.c:782 src/mainwindow.c:3266 src/setup.c:81
1728 1728
#, c-format
1729 1729
msgid "Scanning folder %s%c%s ..."
1730 1730
msgstr "Prohledávám složku %s%c%s ..."
1731 1731

  
1732
#: src/folderview.c:766 src/mainwindow.c:3215 src/setup.c:86
1732
#: src/folderview.c:786 src/mainwindow.c:3271 src/setup.c:86
1733 1733
#, c-format
1734 1734
msgid "Scanning folder %s ..."
1735 1735
msgstr "Prohledávám složku %s ..."
1736 1736

  
1737
#: src/folderview.c:808
1737
#: src/folderview.c:828
1738 1738
msgid "Rebuild folder tree"
1739 1739
msgstr "Obnovit strom složek"
1740 1740

  
1741
#: src/folderview.c:809
1741
#: src/folderview.c:829
1742 1742
msgid "The folder tree will be rebuilt. Continue?"
1743 1743
msgstr ""
1744 1744

  
1745
#: src/folderview.c:818
1745
#: src/folderview.c:838
1746 1746
msgid "Rebuilding folder tree..."
1747 1747
msgstr "Provádím obnovu stromu složek..."
1748 1748

  
1749
#: src/folderview.c:825
1749
#: src/folderview.c:845
1750 1750
#, fuzzy
1751 1751
msgid "Rebuilding of the folder tree failed."
1752 1752
msgstr "Provádím obnovu stromu složek..."
1753 1753

  
1754
#: src/folderview.c:895
1754
#: src/folderview.c:915
1755 1755
msgid "Checking for new messages in all folders..."
1756 1756
msgstr "Zjišťuji nové zprávy ve všech složkách..."
1757 1757

  
1758
#: src/folderview.c:1625
1758
#: src/folderview.c:1645
1759 1759
#, c-format
1760 1760
msgid "Folder %s is selected\n"
1761 1761
msgstr "Je vybrána složka %s\n"
1762 1762

  
1763
#: src/folderview.c:1775
1763
#: src/folderview.c:1795
1764 1764
#, fuzzy, c-format
1765 1765
msgid "Downloading messages in %s ..."
1766 1766
msgstr "Posílám zprávu"
1767 1767

  
1768
#: src/folderview.c:1810
1768
#: src/folderview.c:1830
1769 1769
#, fuzzy, c-format
1770 1770
msgid "Error occurred while downloading messages in `%s'."
1771 1771
msgstr "Vyskytla se chyba při posílání zprávy na %s ."
1772 1772

  
1773
#: src/folderview.c:1860
1773
#: src/folderview.c:1880
1774 1774
msgid ""
1775 1775
"Input the name of new folder:\n"
1776 1776
"(if you want to create a folder to store subfolders,\n"
......
1780 1780
"(Pokud chcete vytvořit složku, která bude mít další\n"
1781 1781
"podsložky, přidejte nakonec názvu '/')"
1782 1782

  
1783
#: src/folderview.c:1922
1783
#: src/folderview.c:1942
1784 1784
#, c-format
1785 1785
msgid "Input new name for `%s':"
1786 1786
msgstr "Zadejte nové jméno pro '%s' :"
1787 1787

  
1788
#: src/folderview.c:1923
1788
#: src/folderview.c:1943
1789 1789
msgid "Rename folder"
1790 1790
msgstr "Přejmenovat složku"
1791 1791

  
1792
#: src/folderview.c:2006
1792
#: src/folderview.c:2026
1793 1793
#, c-format
1794 1794
msgid ""
1795 1795
"All folder(s) and message(s) under `%s' will be deleted.\n"
......
1798 1798
"Všechny složky a zprávy v '%s' budou vymazány.\n"
1799 1799
"Chcete je opravdu smazat ?"
1800 1800

  
1801
#: src/folderview.c:2008
1801
#: src/folderview.c:2028
1802 1802
msgid "Delete folder"
1803 1803
msgstr "Smazat složku "
1804 1804

  
1805
#: src/folderview.c:2032
1805
#: src/folderview.c:2052
1806 1806
#, c-format
1807 1807
msgid "Can't remove the folder `%s'."
1808 1808
msgstr "Nemohu odstranit složku '%s'."
1809 1809

  
1810
#: src/folderview.c:2066
1810
#: src/folderview.c:2086
1811 1811
msgid "Empty trash"
1812 1812
msgstr "Vyprázdnit koš"
1813 1813

  
1814
#: src/folderview.c:2066
1814
#: src/folderview.c:2086
1815 1815
msgid "Empty all messages in trash?"
1816 1816
msgstr "Vyprázdnit všechny zprávy v koši?"
1817 1817

  
1818
#: src/folderview.c:2102
1818
#: src/folderview.c:2122
1819 1819
#, c-format
1820 1820
msgid ""
1821 1821
"Really remove the mailbox `%s' ?\n"
......
1824 1824
"Opravdu odebrat poštovní schránku '%s'?\n"
1825 1825
"(Zprávy NEBUDOU smazány z disku)"
1826 1826

  
1827
#: src/folderview.c:2104
1827
#: src/folderview.c:2124
1828 1828
msgid "Remove mailbox"
1829 1829
msgstr "Odstranit poštovní schránku"
1830 1830

  
1831
#: src/folderview.c:2149
1831
#: src/folderview.c:2169
1832 1832
#, c-format
1833 1833
msgid "Really delete IMAP4 account `%s'?"
1834 1834
msgstr "Opravdu smazat IMAP4 účet '%s'?"
1835 1835

  
1836
#: src/folderview.c:2150
1836
#: src/folderview.c:2170
1837 1837
msgid "Delete IMAP4 account"
1838 1838
msgstr "Smazat IMAP4 účet"
1839 1839

  
1840
#: src/folderview.c:2290
1840
#: src/folderview.c:2310
1841 1841
#, c-format
1842 1842
msgid "Really delete newsgroup `%s'?"
1843 1843
msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
1844 1844

  
1845
#: src/folderview.c:2291
1845
#: src/folderview.c:2311
1846 1846
msgid "Delete newsgroup"
1847 1847
msgstr "Smazat diskusní skupinu"
1848 1848

  
1849
#: src/folderview.c:2336
1849
#: src/folderview.c:2356
1850 1850
#, c-format
1851 1851
msgid "Really delete news account `%s'?"
1852 1852
msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
1853 1853

  
1854
#: src/folderview.c:2337
1854
#: src/folderview.c:2357
1855 1855
msgid "Delete news account"
1856 1856
msgstr "Smazat účet pro diskuzní skupinu"
1857 1857

  
......
1899 1899
msgid "Can't retrieve newsgroup list."
1900 1900
msgstr "Nemohu načíst seznam diskuzních skupin."
1901 1901

  
1902
#: src/grouplistdialog.c:449 src/summaryview.c:712
1902
#: src/grouplistdialog.c:449 src/summaryview.c:713
1903 1903
msgid "Done."
1904 1904
msgstr "Hotovo."
1905 1905

  
......
1920 1920
msgid "Creating header view...\n"
1921 1921
msgstr "Vytvářím náhled na záhlaví...\n"
1922 1922

  
1923
#: src/headerview.c:175 src/summaryview.c:1833
1923
#: src/headerview.c:180 src/summaryview.c:1860
1924 1924
msgid "(No From)"
1925 1925
msgstr "(není znám odesílatel)"
1926 1926

  
1927
#: src/headerview.c:190 src/summaryview.c:1830
1927
#: src/headerview.c:195 src/summaryview.c:1857
1928 1928
msgid "(No Subject)"
1929 1929
msgstr "(Žádný předmět)"
1930 1930

  
......
1979 1979
msgid "root folder %s not exist\n"
1980 1980
msgstr "Označený soubor nebyl nalezen.\n"
1981 1981

  
1982
#: src/imap.c:1806 src/imap.c:1814
1982
#: src/imap.c:1808 src/imap.c:1816
1983 1983
msgid "error occurred while getting LIST.\n"
1984 1984
msgstr "Během příkazu LIST se vyskytla chyba.\n"
1985 1985

  
1986
#: src/imap.c:1928
1986
#: src/imap.c:1930
1987 1987
#, c-format
1988 1988
msgid "Can't create '%s'\n"
1989 1989
msgstr "Nemohu vytvořit '%s'\n"
1990 1990

  
1991
#: src/imap.c:1933
1991
#: src/imap.c:1935
1992 1992
#, c-format
1993 1993
msgid "Can't create '%s' under INBOX\n"
1994 1994
msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
1995 1995

  
1996
#: src/imap.c:1994
1996
#: src/imap.c:1996
1997 1997
msgid "can't create mailbox: LIST failed\n"
1998 1998
msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
1999 1999

  
2000
#: src/imap.c:2014
2000
#: src/imap.c:2016
2001 2001
msgid "can't create mailbox\n"
2002 2002
msgstr "nelze vytvořit poštovní schránku\n"
2003 2003

  
2004
#: src/imap.c:2083
2004
#: src/imap.c:2085
2005 2005
#, c-format
2006 2006
msgid "can't rename mailbox: %s to %s\n"
2007 2007
msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
2008 2008

  
2009
#: src/imap.c:2145
2009
#: src/imap.c:2147
2010 2010
msgid "can't delete mailbox\n"
2011 2011
msgstr "nelze smazat poštovní schránku\n"
2012 2012

  
2013
#: src/imap.c:2184
2013
#: src/imap.c:2186
2014 2014
msgid "can't get envelope\n"
2015 2015
msgstr "Nemohu načíst obálku\n"
2016 2016

  
2017
#: src/imap.c:2192
2017
#: src/imap.c:2194
2018 2018
msgid "error occurred while getting envelope.\n"
2019 2019
msgstr "Během načítání obálky se vyskytla chyba.\n"
2020 2020

  
2021
#: src/imap.c:2213
2021
#: src/imap.c:2215
2022 2022
#, c-format
2023 2023
msgid "can't parse envelope: %s\n"
2024 2024
msgstr "Nemohu analyzovat obálku: %s\n"
2025 2025

  
2026
#: src/imap.c:2336
2026
#: src/imap.c:2338
2027 2027
#, c-format
2028 2028
msgid "Can't connect to IMAP4 server: %s:%d\n"
2029 2029
msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
2030 2030

  
2031
#: src/imap.c:2343
2031
#: src/imap.c:2345
2032 2032
#, c-format
2033 2033
msgid "Can't establish IMAP4 session with: %s:%d\n"
2034 2034
msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
2035 2035

  
2036
#: src/imap.c:2418
2036
#: src/imap.c:2420
2037 2037
msgid "can't get namespace\n"
2038 2038
msgstr "nemohu najít obálku\n"
2039 2039

  
2040
#: src/imap.c:2936
2040
#: src/imap.c:2938
2041 2041
#, c-format
2042 2042
msgid "can't select folder: %s\n"
2043 2043
msgstr "nelze vybrat složku: %s\n"
2044 2044

  
2045
#: src/imap.c:3108
2045
#: src/imap.c:3110
2046 2046
#, fuzzy
2047 2047
msgid "IMAP4 authentication failed.\n"
2048 2048
msgstr "Autentikace selhala."
2049 2049

  
2050
#: src/imap.c:3125
2050
#: src/imap.c:3127
2051 2051
msgid "IMAP4 login failed.\n"
2052 2052
msgstr "Neúspěšné přihlášení k IMAP4.\n"
2053 2053

  
2054
#: src/imap.c:3449
2054
#: src/imap.c:3451
2055 2055
#, c-format
2056 2056
msgid "can't append %s to %s\n"
2057 2057
msgstr "Nemohu přidat %s do %s\n"
2058 2058

  
2059
#: src/imap.c:3456
2059
#: src/imap.c:3458
2060 2060
msgid "(sending file...)"
2061 2061
msgstr "(posílám soubor...)"
2062 2062

  
2063
#: src/imap.c:3484
2063
#: src/imap.c:3486
2064 2064
#, fuzzy, c-format
2065 2065
msgid "can't append message to %s\n"
2066 2066
msgstr "nelze přidat zprávu %s\n"
2067 2067

  
2068
#: src/imap.c:3516
2068
#: src/imap.c:3518
2069 2069
#, fuzzy, c-format
2070 2070
msgid "can't copy %s to %s\n"
2071 2071
msgstr "nelze kopírovat %d na %s\n"
2072 2072

  
2073
#: src/imap.c:3540
2073
#: src/imap.c:3542
2074 2074
#, fuzzy, c-format
2075 2075
msgid "error while imap command: STORE %s %s\n"
2076 2076
msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
2077 2077

  
2078
#: src/imap.c:3554
2078
#: src/imap.c:3556
2079 2079
msgid "error while imap command: EXPUNGE\n"
2080 2080
msgstr "chyba příkazu služby imap: EXPUNGE\n"
2081 2081

  
2082
#: src/imap.c:3567
2082
#: src/imap.c:3569
2083 2083
#, fuzzy
2084 2084
msgid "error while imap command: CLOSE\n"
2085 2085
msgstr "chyba příkazu služby imap: EXPUNGE\n"
2086 2086

  
2087
#: src/imap.c:3794
2087
#: src/imap.c:3796
2088 2088
#, c-format
2089 2089
msgid "iconv cannot convert UTF-7 to %s\n"
2090 2090
msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
2091 2091

  
2092
#: src/imap.c:3824
2092
#: src/imap.c:3826
2093 2093
#, c-format
2094 2094
msgid "iconv cannot convert %s to UTF-7\n"
2095 2095
msgstr "iconv nemůže konvertovat %s na UTF-7\n"
......
2191 2191
msgid "Prev"
2192 2192
msgstr "Předchozí"
2193 2193

  
2194
#: src/importldif.c:768 src/mainwindow.c:2260
2194
#: src/importldif.c:768 src/mainwindow.c:2299
2195 2195
msgid "Next"
2196 2196
msgstr "Další"
2197 2197

  
......
2215 2215
msgid "Standby"
2216 2216
msgstr "V pohotovosti"
2217 2217

  
2218
#: src/inc.c:514 src/inc.c:565
2218
#: src/inc.c:516 src/inc.c:567
2219 2219
msgid "Cancelled"
2220 2220
msgstr "Zrušeno"
2221 2221

  
2222
#: src/inc.c:525
2222
#: src/inc.c:527
2223 2223
msgid "Retrieving"
2224 2224
msgstr "Načítám"
2225 2225

  
2226
#: src/inc.c:534
2226
#: src/inc.c:536
2227 2227
#, c-format
2228 2228
msgid "Done (%d message(s) (%s) received)"
2229 2229
msgstr "Hotovo (%d zpráv(a) (%s) přijato)"
2230 2230

  
2231
#: src/inc.c:538
2231
#: src/inc.c:540
2232 2232
msgid "Done (no new messages)"
2233 2233
msgstr "Hotovo (Nejsou žádné nové zprávy)"
2234 2234

  
2235
#: src/inc.c:544
2235
#: src/inc.c:546
2236 2236
msgid "Connection failed"
2237 2237
msgstr "Spojení selhalo"
2238 2238

  
2239
#: src/inc.c:548
2239
#: src/inc.c:550
2240 2240
msgid "Auth failed"
2241 2241
msgstr "Autentizace selhala"
2242 2242

  
2243
#: src/inc.c:552
2243
#: src/inc.c:554
2244 2244
msgid "Locked"
2245 2245
msgstr "Zamknuto"
2246 2246

  
2247
#: src/inc.c:562
2247
#: src/inc.c:564
2248 2248
#, fuzzy
2249 2249
msgid "Timeout"
2250 2250
msgstr "Timeout (vteřin)"
2251 2251

  
2252
#: src/inc.c:612
2252
#: src/inc.c:614
2253 2253
#, c-format
2254 2254
msgid "Finished (%d new message(s))"
2255 2255
msgstr "Dokončeno (%d nová(é) zpráva(y))"
2256 2256

  
2257
#: src/inc.c:615
2257
#: src/inc.c:617
2258 2258
msgid "Finished (no new messages)"
2259 2259
msgstr "Dokončeno (nejsou nové zprávy)"
2260 2260

  
2261
#: src/inc.c:624
2261
#: src/inc.c:626
2262 2262
msgid "Some errors occurred while getting mail."
2263 2263
msgstr "Během načítání zpráv se vyskytly chyby."
2264 2264

  
2265
#: src/inc.c:660
2265
#: src/inc.c:662
2266 2266
#, c-format
2267 2267
msgid "getting new messages of account %s...\n"
2268 2268
msgstr "Získávám nové zprávy z účtu %s ...\n"
2269 2269

  
2270
#: src/inc.c:663
2270
#: src/inc.c:665
2271 2271
#, c-format
2272 2272
msgid "%s: Retrieving new messages"
2273 2273
msgstr "%s : Načítám nové zprávy"
2274 2274

  
2275
#: src/inc.c:682
2275
#: src/inc.c:684
2276 2276
#, fuzzy, c-format
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff