commit 965ad85d0f75b47610bb9efbb2c3ad731d5ed15c
parent 526258e503384913026ffd8bc9741dc10bbf5e4d
Author: Paul Mangan <paul@claws-mail.org>
Date: Sun, 24 Apr 2011 07:03:20 +0000
2011-04-24 [paul] 3.7.9cvs14
* src/mainwindow.c
* src/gtk/foldersort.c
* src/gtk/foldersort.h
fix labelling, 'change folder order' to 'change mailbox order'
Diffstat:
6 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-24 [paul] 3.7.9cvs14
+
+ * src/mainwindow.c
+ * src/gtk/foldersort.c
+ * src/gtk/foldersort.h
+ fix labelling, 'change folder order' to 'change mailbox order'
+
2011-04-23 [paul] 3.7.9cvs13
* configure.ac
diff --git a/PATCHSETS b/PATCHSETS
@@ -4165,3 +4165,4 @@
( cvs diff -u -r 1.5.2.18 -r 1.5.2.19 po/hu.po; ) > 3.7.9cvs11.patchset
( cvs diff -u -r 1.14.2.76 -r 1.14.2.77 src/plugins/trayicon/trayicon.c; ) > 3.7.9cvs12.patchset
( cvs diff -u -r 1.654.2.4240 -r 1.654.2.4241 configure.ac; ) > 3.7.9cvs13.patchset
+( cvs diff -u -r 1.274.2.322 -r 1.274.2.323 src/mainwindow.c; cvs diff -u -r 1.1.2.20 -r 1.1.2.21 src/gtk/foldersort.c; cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/gtk/foldersort.h; ) > 3.7.9cvs14.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=9
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=13
+EXTRA_VERSION=14
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/foldersort.c b/src/gtk/foldersort.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail Team
+ * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004-2011 the Claws Mail Team
*
* 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
@@ -153,7 +153,7 @@ void foldersort_open()
g_object_set_data(G_OBJECT(window), "window", window);
gtk_container_set_border_width(GTK_CONTAINER(window), 8);
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
- gtk_window_set_title(GTK_WINDOW(window), _("Set folder order"));
+ gtk_window_set_title(GTK_WINDOW(window), _("Set mailbox order"));
gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_default_size(GTK_WINDOW(window), 400, 300);
g_signal_connect(G_OBJECT(window), "delete_event",
@@ -187,8 +187,8 @@ void foldersort_open()
gtk_box_pack_start(GTK_BOX(vbox1), hbox, FALSE, FALSE, 0);
label1 = gtk_label_new(_
- ("Move folders up or down to change the sort order "
- "in the folder list."));
+ ("Move mailboxes up or down to change the sort order "
+ "in the Folder list."));
gtk_widget_show(label1);
gtk_widget_set_size_request(GTK_WIDGET(label1), 392, -1);
gtk_label_set_line_wrap(GTK_LABEL(label1), TRUE);
@@ -213,7 +213,7 @@ void foldersort_open()
gtk_cmclist_set_column_width(GTK_CMCLIST(folderlist), 0, 80);
gtk_cmclist_column_titles_show(GTK_CMCLIST(folderlist));
- label2 = gtk_label_new(_("Folders"));
+ label2 = gtk_label_new(_("Mailboxes"));
gtk_widget_show(label2);
gtk_cmclist_set_column_widget(GTK_CMCLIST(folderlist), 0, label2);
gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_LEFT);
diff --git a/src/gtk/foldersort.h b/src/gtk/foldersort.h
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2011 Hiroyuki Yamamoto and the Claws Mail Team
+ * Claws-Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2004-2011 the Claws Mail Team
*
* 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/mainwindow.c b/src/mainwindow.c
@@ -480,7 +480,7 @@ static GtkActionEntry mainwin_entries[] =
{"File/AddMailbox/MH", NULL, N_("MH..."), NULL, NULL, G_CALLBACK(add_mailbox_cb) },
{"File/---", NULL, "---" },
- {"File/SortFolders", NULL, N_("Change folder order..."), NULL, NULL, G_CALLBACK(foldersort_cb) },
+ {"File/SortMailboxes", NULL, N_("Change mailbox order..."), NULL, NULL, G_CALLBACK(foldersort_cb) },
/* {"File/---", NULL, "---" }, */
{"File/ImportMbox", NULL, N_("_Import mbox file..."), NULL, NULL, G_CALLBACK(import_mbox_cb) },
@@ -1612,7 +1612,7 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "AddMailbox", "File/AddMailbox", GTK_UI_MANAGER_MENU)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File/AddMailbox", "MH", "File/AddMailbox/MH", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "Separator1", "File/---", GTK_UI_MANAGER_SEPARATOR)
- MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "SortFolders", "File/SortFolders", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "SortMailboxes", "File/SortMailboxes", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "Separator2", "File/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "ImportMbox", "File/ImportMbox", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/File", "ExportMbox", "File/ExportMbox", GTK_UI_MANAGER_MENUITEM)
