[Commits] [SCM] claws branch, master, updated. 3.13.0-91-g5962410
mones at claws-mail.org
mones at claws-mail.org
Thu Dec 3 01:01:35 CET 2015
The branch, master has been updated
via 59624100d45dff9b6fe58c4cdd03c333a9bb4301 (commit)
from a7ff442c30cbb2cd2819ebcb7f211a4d3a8bba3d (commit)
Summary of changes:
src/gtk/pluginwindow.c | 13 +++++++------
src/summaryview.c | 42 ++++++++++++++++++++++++------------------
src/textview.c | 20 +++++++++-----------
3 files changed, 40 insertions(+), 35 deletions(-)
- Log -----------------------------------------------------------------
commit 59624100d45dff9b6fe58c4cdd03c333a9bb4301
Author: Ricardo Mones <ricardo at mones.org>
Date: Thu Dec 3 01:00:29 2015 +0100
Remove more markup from translatable strings
diff --git a/src/gtk/pluginwindow.c b/src/gtk/pluginwindow.c
index 3f822e4..02bc891 100644
--- a/src/gtk/pluginwindow.c
+++ b/src/gtk/pluginwindow.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2012 Hiroyuki Yamamoto and the Claws Mail Team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * 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
@@ -289,7 +288,7 @@ void pluginwindow_create()
GtkWidget *load_btn;
GtkWidget *unload_btn;
GtkWidget *close_btn;
- gchar *markup;
+ gchar *markup, *span;
GtkWidget *desc_lbl;
GtkWidget *vbox3;
GtkWidget *hbox_info;
@@ -371,10 +370,12 @@ void pluginwindow_create()
gtk_widget_show(hbox_info);
desc_lbl = gtk_label_new("");
- markup = g_markup_printf_escaped(_("For more information about plugins see the "
- "<a href=\"%s\"><span underline=\"none\">Claws Mail website</span></a>."),PLUGINS_URI);
+ span = g_strdup_printf("<a href=\"%s\"><span underline=\"none\">", PLUGINS_URI);
+ markup = g_strdup_printf(_("For more information about plugins see the "
+ "%sClaws Mail website%s."), span, "</span></a>");
gtk_label_set_markup(GTK_LABEL(desc_lbl), markup);
g_free(markup);
+ g_free(span);
gtk_misc_set_alignment(GTK_MISC(desc_lbl), 0, 0.5);
gtk_widget_show(desc_lbl);
gtk_box_pack_start(GTK_BOX(hbox_info), desc_lbl, FALSE, FALSE, 0);
diff --git a/src/summaryview.c b/src/summaryview.c
index a39f98b..e47a02f 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -1,6 +1,6 @@
/*
- * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2013 Hiroyuki Yamamoto and the Claws Mail team
+ * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
+ * 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/>.
- *
*/
#include "defs.h"
@@ -2678,21 +2677,28 @@ static void summary_status_show(SummaryView *summaryview)
gtk_label_set_text(GTK_LABEL(summaryview->statlabel_msgs), str);
g_free(str);
- tooltip = g_strdup_printf(_("<b>Message summary</b>\n"
- "<b>New:</b> %d\n"
- "<b>Unread:</b> %d\n"
- "<b>Total:</b> %d\n"
- "<b>Size:</b> %s\n\n"
- "<b>Marked:</b> %d\n"
- "<b>Replied:</b> %d\n"
- "<b>Forwarded:</b> %d\n"
- "<b>Locked:</b> %d\n"
- "<b>Ignored:</b> %d\n"
- "<b>Watched:</b> %d"),
- n_new, n_unread, n_total,
- to_human_readable((goffset)n_size),
- n_marked,n_replied,n_forwarded,
- n_locked,n_ignored,n_watched);
+ tooltip = g_strdup_printf("<b>%s</b>\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %s\n\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d\n"
+ "<b>%s</b> %d",
+ _("Message summary"),
+ _("New:"), n_new,
+ _("Unread:"), n_unread,
+ _("Total:"), n_total,
+ _("Size:"), to_human_readable((goffset)n_size),
+ _("Marked:"), n_marked,
+ _("Replied:"), n_replied,
+ _("Forwarded:"), n_forwarded,
+ _("Locked:"), n_locked,
+ _("Ignored:"), n_ignored,
+ _("Watched:"), n_watched);
gtk_widget_set_tooltip_markup(GTK_WIDGET(summaryview->statlabel_msgs),
tooltip);
diff --git a/src/textview.c b/src/textview.c
index 5962823..f074aea 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1,6 +1,6 @@
/*
* Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2015 Hiroyuki Yamamoto and 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
@@ -2888,15 +2887,14 @@ gboolean textview_uri_security_check(TextView *textview, ClickableText *uri)
gchar *msg;
AlertValue aval;
- msg = g_markup_printf_escaped(_("The real URL is different from "
- "the displayed URL.\n"
- "\n"
- "<b>Displayed URL:</b> %s\n"
- "\n"
- "<b>Real URL:</b> %s\n"
- "\n"
- "Open it anyway?"),
- visible_str,uri->uri);
+ msg = g_markup_printf_escaped("%s\n\n"
+ "<b>%s</b> %s\n\n"
+ "<b>%s</b> %s\n\n"
+ "%s",
+ _("The real URL is different from the displayed URL."),
+ _("Displayed URL:"), visible_str,
+ _("Real URL:"), uri->uri,
+ _("Open it anyway?"));
aval = alertpanel_full(_("Phishing attempt warning"), msg,
GTK_STOCK_CANCEL, _("_Open URL"), NULL, FALSE,
NULL, ALERT_WARNING, G_ALERTDEFAULT);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list