[Commits] [SCM] claws branch, master, updated. 3.14.1-236-gb99f300
mones at claws-mail.org
mones at claws-mail.org
Sun Mar 19 00:27:16 CET 2017
The branch, master has been updated
via b99f30096dc74e409edfb1fe8495ba0ec930e98d (commit)
from 8baab85304bedfa49864054301a8ea35f02de60d (commit)
Summary of changes:
src/gtk/about.c | 107 ++++++++++++++++++++++++++++++-------------------------
1 file changed, 58 insertions(+), 49 deletions(-)
- Log -----------------------------------------------------------------
commit b99f30096dc74e409edfb1fe8495ba0ec930e98d
Author: Ricardo Mones <ricardo at mones.org>
Date: Sun Mar 19 00:25:43 2017 +0100
Fix bug #3784: Very similar strings in src/gtk/about.c
And remove also some \n from translatable strings.
diff --git a/src/gtk/about.c b/src/gtk/about.c
index 3ef542e..deb758f 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -84,6 +84,8 @@ void about_show(void)
}
+#define ADD_TEXT(text) gtk_text_buffer_insert(buffer, &iter, text, -1)
+
static GtkWidget *about_create_child_page_info(void)
{
GtkWidget *scrolledwin;
@@ -127,23 +129,25 @@ static GtkWidget *about_create_child_page_info(void)
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
- gtk_text_buffer_insert(buffer, &iter, _(
- "Claws Mail is a lightweight, fast and "
- "highly-configurable email client.\n\n"
- "For further information visit the Claws Mail "
- "website:\n"), -1);
+ ADD_TEXT(_("Claws Mail is a lightweight, fast and highly-configurable "
+ "email client."));
+ ADD_TEXT("\n\n");
+ ADD_TEXT(_("For further information visit the Claws Mail website:"));
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, HOMEPAGE_URI, -1,
"link", NULL);
- gtk_text_buffer_insert(buffer, &iter, _("\n\n"
- "For support and discussion subscribe to the Claws Mail "
- "users' mailing list:\n"),-1);
+ ADD_TEXT("\n\n");
+ ADD_TEXT(_("For support and discussion subscribe to the Claws Mail "
+ "users' mailing list:"));
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, USERS_ML_URI, -1,
"link", NULL);
- gtk_text_buffer_insert(buffer, &iter, _("\n\n"
- "Claws Mail is free software released "
+ ADD_TEXT("\n\n");
+ ADD_TEXT(_("Claws Mail is free software released "
"under the GPL. If you wish to donate "
"to the Claws Mail project you can do "
- "so at:\n"), -1);
+ "so at:"));
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, DONATE_URI, -1,
"link", NULL);
@@ -154,12 +158,13 @@ static GtkWidget *about_create_child_page_info(void)
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
#ifdef GENERIC_UMPC
- gtk_text_buffer_insert(buffer, &iter, _(
- "\n\nCopyright (C) 1999-2017\nThe Claws Mail Team\n"
- " and Hiroyuki Yamamoto"), -1);
+ ADD_TEXT("\n\n");
+ ADD_TEXT(_("Copyright (C) 1999-2017\nThe Claws Mail Team\n"
+ " and Hiroyuki Yamamoto"));
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,
- "underlined-list-title", NULL);
+ ADD_TEXT("\n\n");
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
+ (_("System Information\n")), -1, "underlined-list-title", NULL);
#if HAVE_SYS_UTSNAME_H
uname(&utsbuf);
@@ -192,8 +197,7 @@ static GtkWidget *about_create_child_page_info(void)
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, buf, -1,
"indented-list-item", NULL);
-
- gtk_text_buffer_insert(buffer, &iter, "\n", -1);
+ ADD_TEXT("\n");
g_signal_connect(G_OBJECT(tag), "event",
G_CALLBACK(about_textview_uri_clicked), text);
@@ -239,8 +243,8 @@ static GtkWidget *about_create_child_page_authors(void)
"underline", PANGO_UNDERLINE_SINGLE,
NULL);
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("The Claws Mail Team")), -1,
- "underlined-list-title", NULL);
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
+ (_("The Claws Mail Team")), -1, "underlined-list-title", NULL);
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
for (i = 0; TEAM_LIST[i] != NULL; i++) {
@@ -257,10 +261,10 @@ static GtkWidget *about_create_child_page_authors(void)
gtk_text_buffer_insert(buffer, &iter, "\n", 1);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("Previous team members")), -1,
- "underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
+ (_("Previous team members")), -1, "underlined-list-title", NULL);
+ ADD_TEXT("\n");
for (i = 0; EX_TEAM_LIST[i] != NULL; i++) {
if (g_utf8_validate(EX_TEAM_LIST[i], -1, NULL))
@@ -273,13 +277,13 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("The translation team")), -1,
- "underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
+ (_("The translation team")), -1, "underlined-list-title", NULL);
+ ADD_TEXT("\n");
for (i = 0; TRANS_TEAM_LIST[i] != NULL; i++) {
if (g_utf8_validate(TRANS_TEAM_LIST[i], -1, NULL))
@@ -292,13 +296,13 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("Documentation team")), -1,
- "underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter,
+ (_("Documentation team")), -1, "underlined-list-title", NULL);
+ ADD_TEXT("\n");
for (i = 0; DOC_TEAM_LIST[i] != NULL; i++) {
if (g_utf8_validate(DOC_TEAM_LIST[i], -1, NULL))
@@ -311,13 +315,13 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("Logo")), -1,
"underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
for (i = 0; LOGO_LIST[i] != NULL; i++) {
if (g_utf8_validate(LOGO_LIST[i], -1, NULL))
@@ -330,13 +334,13 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("Icons")), -1,
"underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
for (i = 0; ICONS_LIST[i] != NULL; i++) {
if (g_utf8_validate(ICONS_LIST[i], -1, NULL))
@@ -349,13 +353,13 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("Contributors")), -1,
"underlined-list-title", NULL);
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
for (i = 0; CONTRIBS_LIST[i] != NULL; i++) {
if (g_utf8_validate(CONTRIBS_LIST[i], -1, NULL))
@@ -368,7 +372,7 @@ static GtkWidget *about_create_child_page_authors(void)
"indented-list-item", NULL);
g_free(conv);
}
- gtk_text_buffer_insert(buffer, &iter, "\n", 1);
+ ADD_TEXT("\n");
}
return scrolledwin;
@@ -401,7 +405,8 @@ static GtkWidget *about_create_child_page_features(void)
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
- gtk_text_buffer_insert(buffer, &iter, _("Compiled-in Features\n"), -1);
+ ADD_TEXT(_("Compiled-in Features"));
+ ADD_TEXT("\n");
gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD,
NULL);
@@ -549,17 +554,19 @@ static GtkWidget *about_create_child_page_license(void)
buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text));
gtk_text_buffer_get_iter_at_offset(buffer, &iter, 0);
- gtk_text_buffer_insert(buffer, &iter,
+ ADD_TEXT(
_("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 "
"the Free Software Foundation; either version 3, or (at your option) "
- "any later version.\n\n"), -1);
+ "any later version."));
+ ADD_TEXT("\n\n");
- gtk_text_buffer_insert(buffer, &iter,
+ ADD_TEXT(
_("This program is distributed in the hope that it will be useful, "
"but WITHOUT ANY WARRANTY; without even the implied warranty of "
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. "
- "See the GNU General Public License for more details.\n\n"), -1);
+ "See the GNU General Public License for more details."));
+ ADD_TEXT("\n\n");
/* textview link style (based upon main prefs) */
gtkut_convert_int_to_gdk_color(prefs_common.uri_col,
@@ -591,6 +598,8 @@ static GtkWidget *about_create_child_page_license(void)
return scrolledwin;
}
+#undef ADD_TEXT
+
static gboolean release_notes_available(void)
{
gboolean ret = FALSE;
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list