[Commits] [SCM] claws branch, master, updated. 3.13.2-201-g79d0dc2
claws at claws-mail.org
claws at claws-mail.org
Sat Jul 23 15:57:11 CEST 2016
The branch, master has been updated
via 79d0dc212a34131c757efd951c12672150b570c9 (commit)
from f6769c0ac6eb0338fa98fcfd41f0453a6de1f1b6 (commit)
Summary of changes:
src/imap.c | 2 +-
src/news.c | 2 +-
src/plugins/mailmbox/plugin_gtk.c | 2 +-
src/plugins/notification/notification_prefs.c | 6 +++---
src/plugins/pgpcore/prefs_gpg.c | 2 +-
src/plugins/rssyl/rssyl_feed_props.c | 4 ++--
src/plugins/rssyl/rssyl_prefs.c | 2 +-
src/plugins/spamassassin/spamassassin.c | 2 +-
src/plugins/spamassassin/spamassassin_gtk.c | 2 +-
src/plugins/vcalendar/vcal_meeting_gtk.c | 2 +-
src/prefs_other.c | 2 +-
src/prefs_summaries.c | 2 +-
12 files changed, 15 insertions(+), 15 deletions(-)
- Log -----------------------------------------------------------------
commit 79d0dc212a34131c757efd951c12672150b570c9
Author: Paul <paul at claws-mail.org>
Date: Sat Jul 23 14:57:07 2016 +0100
standardise singlular/plural mix on labels
diff --git a/src/imap.c b/src/imap.c
index 4bc5af1..0966ed6 100644
--- a/src/imap.c
+++ b/src/imap.c
@@ -6091,7 +6091,7 @@ static Folder *imap_folder_new (const gchar *name,
_("You have one or more IMAP accounts "
"defined. However this version of "
"Claws Mail has been built without "
- "IMAP support; your IMAP account(s) are "
+ "IMAP support; your IMAP accounts are "
"disabled.\n\n"
"You probably need to "
"install libetpan and recompile "
diff --git a/src/news.c b/src/news.c
index 3bfbce4..af96e62 100644
--- a/src/news.c
+++ b/src/news.c
@@ -1446,7 +1446,7 @@ static void warn_etpan(void)
_("You have one or more News accounts "
"defined. However this version of "
"Claws Mail has been built without "
- "News support; your News account(s) are "
+ "News support; your News accounts are "
"disabled.\n\n"
"You probably need to "
"install libetpan and recompile "
diff --git a/src/plugins/mailmbox/plugin_gtk.c b/src/plugins/mailmbox/plugin_gtk.c
index a578616..282c263 100644
--- a/src/plugins/mailmbox/plugin_gtk.c
+++ b/src/plugins/mailmbox/plugin_gtk.c
@@ -327,7 +327,7 @@ static void delete_folder_cb(GtkAction *action, gpointer data)
name = trim_string(item->name, 32);
AUTORELEASE_STR(name, {g_free(name); return;});
message = g_strdup_printf
- (_("All folder(s) and message(s) under '%s' will be deleted.\n"
+ (_("All folders and messages under '%s' will be deleted.\n"
"Do you really want to delete?"), name);
avalue = alertpanel_full(_("Delete folder"), message,
GTK_STOCK_CANCEL, GTK_STOCK_DELETE, NULL, FALSE,
diff --git a/src/plugins/notification/notification_prefs.c b/src/plugins/notification/notification_prefs.c
index 4ad8f39..9e2e229 100644
--- a/src/plugins/notification/notification_prefs.c
+++ b/src/plugins/notification/notification_prefs.c
@@ -1070,7 +1070,7 @@ static void notify_create_popup_page(PrefsPage *page, GtkWindow *window,
gtk_box_pack_start(GTK_BOX(hbox), spinner, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(spinner);
- label = gtk_label_new(_("second(s)"));
+ label = gtk_label_new(_("seconds"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
gtk_widget_show(hbox);
@@ -1365,7 +1365,7 @@ static void notify_create_command_page(PrefsPage *page, GtkWindow *window,
gtk_box_pack_start(GTK_BOX(hbox), spinner, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show(spinner);
- label = gtk_label_new(_("second(s)"));
+ label = gtk_label_new(_("seconds"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
gtk_widget_show(label);
gtk_widget_show(hbox);
@@ -1671,7 +1671,7 @@ static void notify_create_trayicon_page(PrefsPage *page, GtkWindow *window,
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spinner), timeout);
gtk_box_pack_start(GTK_BOX(hbox), spinner, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(ssvbox), hbox, FALSE, FALSE, 0);
- label = gtk_label_new(_("second(s)"));
+ label = gtk_label_new(_("seconds"));
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
checkbox = gtk_check_button_new_with_label(_("Display folder name"));
diff --git a/src/plugins/pgpcore/prefs_gpg.c b/src/plugins/pgpcore/prefs_gpg.c
index dd74619..c1f1491 100644
--- a/src/plugins/pgpcore/prefs_gpg.c
+++ b/src/plugins/pgpcore/prefs_gpg.c
@@ -160,7 +160,7 @@ static void prefs_gpg_create_widget_func(PrefsPage *_page,
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON
(spinbtn_store_passphrase), TRUE);
- label_expire2 = gtk_label_new(_("minute(s)"));
+ label_expire2 = gtk_label_new(_("minutes"));
gtk_widget_show(label_expire2);
gtk_box_pack_start(GTK_BOX(hbox1), label_expire2, FALSE, FALSE, 0);
gtk_misc_set_alignment(GTK_MISC(label_expire2), 0.0, 0.5);
diff --git a/src/plugins/rssyl/rssyl_feed_props.c b/src/plugins/rssyl/rssyl_feed_props.c
index 30dd9e9..a75b889 100644
--- a/src/plugins/rssyl/rssyl_feed_props.c
+++ b/src/plugins/rssyl/rssyl_feed_props.c
@@ -423,7 +423,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
ritem->fetch_comments);
gtk_box_pack_start(GTK_BOX(hbox), feedprop->fetch_comments_max_age, FALSE, FALSE, 0);
/* Fetch comments max age - units label */
- label = gtk_label_new(g_strconcat(_("day(s)"), "<small> ",
+ label = gtk_label_new(g_strconcat(_("days"), "<small> ",
_("Set to -1 to fetch all comments"), "</small>", NULL));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -473,7 +473,7 @@ void rssyl_gtk_prop(RFolderItem *ritem)
!ritem->default_refresh_interval);
gtk_box_pack_start(GTK_BOX(hbox), feedprop->refresh_interval, FALSE, FALSE, 0);
/* Refresh interval - units label */
- label = gtk_label_new(g_strconcat(_("minute(s)"), "<small> ",
+ label = gtk_label_new(g_strconcat(_("minutes"), "<small> ",
_("Set to 0 to disable automatic refreshing for this feed"),
"</small>", NULL));
gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
diff --git a/src/plugins/rssyl/rssyl_prefs.c b/src/plugins/rssyl/rssyl_prefs.c
index 16d41a4..295905e 100644
--- a/src/plugins/rssyl/rssyl_prefs.c
+++ b/src/plugins/rssyl/rssyl_prefs.c
@@ -151,7 +151,7 @@ static void create_rssyl_prefs_page(PrefsPage *page,
G_CALLBACK(rssyl_refresh_enabled_toggled_cb), refresh);
gtk_box_pack_start(GTK_BOX(refresh_hbox), refresh, FALSE, FALSE, 0);
- label = gtk_label_new(_("minute(s)"));
+ label = gtk_label_new(_("minutes"));
gtk_box_pack_start(GTK_BOX(refresh_hbox), label, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox1), refresh_hbox, FALSE, FALSE, 0);
diff --git a/src/plugins/spamassassin/spamassassin.c b/src/plugins/spamassassin/spamassassin.c
index 5b06a89..4cbcbf9 100644
--- a/src/plugins/spamassassin/spamassassin.c
+++ b/src/plugins/spamassassin/spamassassin.c
@@ -427,7 +427,7 @@ int spamassassin_learn(MsgInfo *msginfo, GSList *msglist, gboolean spam)
&& prefs_common_get_prefs()->work_offline
&& !inc_offline_should_override(TRUE,
_("Claws Mail needs network access in order "
- "to feed this mail(s) to the remote learner."))) {
+ "to feed the mail to the remote learner."))) {
return -1;
}
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index e9a07af..d73a9c6 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -387,7 +387,7 @@ static void spamassassin_create_widget_func(PrefsPage * _page,
"it will be aborted."));
gtk_spin_button_set_numeric(GTK_SPIN_BUTTON(timeout_spinbtn), TRUE);
- timeout_seconds_label = gtk_label_new(_("second(s)"));
+ timeout_seconds_label = gtk_label_new(_("seconds"));
gtk_widget_show(timeout_seconds_label);
gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_seconds_label, FALSE, FALSE, 0);
diff --git a/src/plugins/vcalendar/vcal_meeting_gtk.c b/src/plugins/vcalendar/vcal_meeting_gtk.c
index 0c7a36c..a33900a 100644
--- a/src/plugins/vcalendar/vcal_meeting_gtk.c
+++ b/src/plugins/vcalendar/vcal_meeting_gtk.c
@@ -776,7 +776,7 @@ static gchar *get_avail_msg(const gchar *unavailable_persons, gboolean multiple,
gchar *msg, *intro = NULL, *outro = NULL, *before = NULL, *after = NULL;
if (multiple)
- intro = g_strdup(_("The following person(s) are busy at the time of your planned meeting:\n- "));
+ intro = g_strdup(_("The following people are busy at the time of your planned meeting:\n- "));
else if (!strcmp(unavailable_persons, _("You")))
intro = g_strdup(_("You are busy at the time of your planned meeting"));
else
diff --git a/src/prefs_other.c b/src/prefs_other.c
index 3a24e9c..92e145c 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -572,7 +572,7 @@ static void prefs_other_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_widget_set_size_request (spinbtn_iotimeout, 64, -1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_iotimeout), TRUE);
- label_iotimeout = gtk_label_new (_("second(s)"));
+ label_iotimeout = gtk_label_new (_("seconds"));
gtk_widget_show (label_iotimeout);
gtk_box_pack_start (GTK_BOX (hbox1), label_iotimeout, FALSE, FALSE, 0);
diff --git a/src/prefs_summaries.c b/src/prefs_summaries.c
index f5b21e6..8cce007 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -535,7 +535,7 @@ static void prefs_summaries_create_widget(PrefsPage *_page, GtkWindow *window,
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spinbtn_mark_as_read_delay),
TRUE);
gtk_box_pack_start (GTK_BOX (hbox1), gtk_label_new
- (_("second(s)")), FALSE, FALSE, 0);
+ (_("seconds")), FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list