[Commits] [SCM] claws branch, master, updated. 3.13.0-85-gf642378

[mones at claws-mail.org]

The branch, master has been updated
       via  f642378609010a00238113e98d2acc97a5ac7647 (commit)
      from  388820da8035cd3779b3e67143ff234e08840cd5 (commit)

Summary of changes:
 src/plugins/libravatar/libravatar_prefs.c   |    2 +-
 src/plugins/spamassassin/spamassassin_gtk.c |    5 ++---
 src/prefs_other.c                           |    7 +++----
 src/prefs_summaries.c                       |    7 +++----
 4 files changed, 9 insertions(+), 12 deletions(-)


- Log -----------------------------------------------------------------
commit f642378609010a00238113e98d2acc97a5ac7647
Author: Ricardo Mones <ricardo at mones.org>
Date:   Wed Nov 25 11:19:01 2015 +0100

    Use same label for seconds in timeouts

diff --git a/src/plugins/libravatar/libravatar_prefs.c b/src/plugins/libravatar/libravatar_prefs.c
index bd1f7da..86f8732 100644
--- a/src/plugins/libravatar/libravatar_prefs.c
+++ b/src/plugins/libravatar/libravatar_prefs.c
@@ -407,7 +407,7 @@ static GtkWidget *p_create_frame_network(struct LibravatarPrefsPage *page)
 					1.0, 0.0, 0.0);
 	spinner = gtk_spin_button_new(adj, 1.0, 0);
 	gtk_widget_show(spinner);
-	hbox = labeled_spinner_box(_("Request timeout"), spinner, _("seconds"),
+	hbox = labeled_spinner_box(_("Request timeout"), spinner, _("second(s)"),
 		_("Set to 0 to use global socket I/O timeout. "
                   "Maximum value must be also less than global socket "
                   "I/O timeout."));
diff --git a/src/plugins/spamassassin/spamassassin_gtk.c b/src/plugins/spamassassin/spamassassin_gtk.c
index 1121ec2..1d84a76 100644
--- a/src/plugins/spamassassin/spamassassin_gtk.c
+++ b/src/plugins/spamassassin/spamassassin_gtk.c
@@ -1,6 +1,6 @@
 /*
  * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 the Claws Mail Team
+ * Copyright (C) 1999-2015 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -388,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(_("seconds"));
+	timeout_seconds_label = gtk_label_new(_("second(s)"));
 	gtk_widget_show(timeout_seconds_label);
 	gtk_box_pack_start(GTK_BOX(hbox_timeout), timeout_seconds_label, FALSE, FALSE, 0);
 
diff --git a/src/prefs_other.c b/src/prefs_other.c
index 8ff9ff5..83d5cf1 100644
--- a/src/prefs_other.c
+++ b/src/prefs_other.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2012 Colin Leroy <colin at colino.net> & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2015 Colin Leroy and 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -555,7 +554,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 (_("seconds"));
+	label_iotimeout = gtk_label_new (_("second(s)"));
 	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 a102a6d..f5b21e6 100644
--- a/src/prefs_summaries.c
+++ b/src/prefs_summaries.c
@@ -1,6 +1,6 @@
 /*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 2005-2012 Colin Leroy <colin at colino.net> & The Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * Copyright (C) 2005-2015 Colin Leroy and 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
@@ -14,7 +14,6 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * 
  */
 
 #ifdef HAVE_CONFIG_H
@@ -536,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
-			(_("seconds")), FALSE, FALSE, 0);
+			(_("second(s)")), FALSE, FALSE, 0);
 
 	gtk_box_pack_start (GTK_BOX (vbox3), hbox1, FALSE, FALSE, 0);
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail