gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove more markup from translatable strings

Browse source
This commit is contained in:
Ricardo Mones 2015-12-03 01:00:29 +01:00
parent a7ff442c30
commit 59624100d4
3 changed files with 40 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gtk/pluginwindow.c
View file

@ -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);

42
src/summaryview.c
View file

@ -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);

20
src/textview.c
View file

@ -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);