more sanitizing of translatable strings

[claws.git] / src / gtk / about.c

diff --git a/src/gtk/about.c b/src/gtk/about.c
index 7be0b3eecbb4d9840dff70fdaacd99ad979170ff..e209ec5ad2d408d16767d61226a4ef51aa929b7c 100644 (file)
--- a/src/gtk/about.c
+++ b/src/gtk/about.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 Hiroyuki Yamamoto 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
@@ -135,6 +134,11 @@ static GtkWidget *about_create_child_page_info(void)
                                "website:\n"), -1);
        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);
+       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 "
                                "under the GPL. If you wish to donate "
@@ -151,7 +155,7 @@ static GtkWidget *about_create_child_page_info(void)
                                NULL);
 #ifdef GENERIC_UMPC
        gtk_text_buffer_insert(buffer, &iter, _(
-                               "\n\nCopyright (C) 1999-2012\nThe Claws Mail Team\n"
+                               "\n\nCopyright (C) 1999-2015\nThe Claws Mail Team\n"
                                " and Hiroyuki Yamamoto"), -1);
 #endif
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (_("\n\nSystem Information\n")), -1,
@@ -159,28 +163,28 @@ static GtkWidget *about_create_child_page_info(void)
 
 #if HAVE_SYS_UTSNAME_H
        uname(&utsbuf);
-       g_snprintf(buf, sizeof(buf),
-                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-                    "Locale: %s (charset: %s)\n"
-                    "Operating System: %s %s (%s)"),
+       g_snprintf(buf, sizeof(buf),g_strconcat(
+                      "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+                    _("Locale: %s (charset: %s)\n"
+                    "Operating System: %s %s (%s)"), NULL),
                   gtk_major_version, gtk_minor_version, gtk_micro_version,
                   glib_major_version, glib_minor_version, glib_micro_version,
                   conv_get_current_locale(), conv_get_locale_charset_str(),
                   utsbuf.sysname, utsbuf.release, utsbuf.machine);
 #elif defined(G_OS_WIN32)
-       g_snprintf(buf, sizeof(buf),
-                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-                    "Locale: %s (charset: %s)\n"
-                    "Operating System: %s"),
+       g_snprintf(buf, sizeof(buf),g_strconcat(
+                      "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+                    _("Locale: %s (charset: %s)\n"
+                    "Operating System: %s"), NULL),
                   gtk_major_version, gtk_minor_version, gtk_micro_version,
                   glib_major_version, glib_minor_version, glib_micro_version,
                   conv_get_current_locale(), conv_get_locale_charset_str(),
                   "Win32");
 #else
-       g_snprintf(buf, sizeof(buf),
-                  _("GTK+ %d.%d.%d / GLib %d.%d.%d\n"
-                    "Locale: %s (charset: %s)\n"
-                    "Operating System: unknown"),
+       g_snprintf(buf, sizeof(buf),g_strconcat(
+                      "GTK+ %d.%d.%d / GLib %d.%d.%d\n"
+                    _("Locale: %s (charset: %s)\n"
+                    "Operating System: unknown"), NULL),
                   gtk_major_version, gtk_minor_version, gtk_micro_version,
                   glib_major_version, glib_minor_version, glib_micro_version,
                   conv_get_current_locale(), conv_get_locale_charset_str());
@@ -559,13 +563,13 @@ static GtkWidget *about_create_child_page_license(void)
                "underline", PANGO_UNDERLINE_SINGLE,
                NULL);
 
-       gtk_text_buffer_insert(buffer, &iter,
+       gtk_text_buffer_insert(buffer, &iter, g_strconcat(
                _("You should have received a copy of the GNU General Public License "
-                 "along with this program. If not, see <"), -1);
+                 "along with this program. If not, see "), "<", NULL), -1);
        gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, 
                "http://www.gnu.org/licenses/", -1,
                "link", NULL);
-       gtk_text_buffer_insert(buffer, &iter, _(">. \n\n"), -1);
+       gtk_text_buffer_insert(buffer, &iter, ">. \n\n", -1);
 
        g_signal_connect(G_OBJECT(tag), "event",
                                G_CALLBACK(about_textview_uri_clicked), text);
@@ -629,7 +633,7 @@ static GtkWidget *about_create_child_page_release_notes(void)
 
                tmp = conv_codeset_strdup(buf, src_codeset, dest_codeset);
                if (!tmp) {
-                       g_warning("Failed to convert character set of action configuration\n");
+                       g_warning("Failed to convert character set of action configuration");
                        tmp = g_strdup(buf);
                }
 
@@ -816,7 +820,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox2), label, FALSE, FALSE, 0);
        markup = g_markup_printf_escaped
                ("<span weight=\"bold\" size=\"xx-large\">Claws Mail</span>\nversion %s",
-                VERSION);
+                VERSION_GIT_FULL);
        gtk_label_set_markup(GTK_LABEL(label), markup);
        g_free(markup);
 
@@ -824,7 +828,7 @@ static void about_create(void)
        gtk_box_pack_start(GTK_BOX(vbox2), button, FALSE, FALSE, 0);
 #ifndef GENERIC_UMPC
        label = gtk_label_new
-               (_("Copyright (C) 1999-2012\nThe Claws Mail Team\n"
+               (_("Copyright (C) 1999-2015\nThe Claws Mail Team\n"
                 "and Hiroyuki Yamamoto"));
        gtk_label_set_selectable(GTK_LABEL(label), TRUE);
        gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_CENTER);