Fix untranslatable concatenated strings (i.e. "Default "+"To:"),
[claws.git] / src / quote_fmt.c
index 3745813c0b6223f2c2bacbd29adf39297f0ae57e..673be3850b7a892dcddb248e6abe50b3190adf9c 100644 (file)
@@ -19,6 +19,7 @@
 
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
+#include "claws-features.h"
 #endif
 
 #include <glib.h>
@@ -92,6 +93,7 @@ static gchar *quote_desc_strings[] = {
        "|program{<span style=\"oblique\">sub_expr</span>}\n(|p{<span style=\"oblique\">sub_expr</span>})\n",   N_("insert program output:\n<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\nthe output from"), /* insert program output */
        "|input{<span style=\"oblique\">sub_expr</span>}\n(|i{<span style=\"oblique\">sub_expr</span>})\n",             N_("insert user input:\n<span style=\"oblique\">sub_expr</span> is a variable to be replaced by\nuser-entered text"), /* insert user input */
        "|attach{<span style=\"oblique\">sub_expr</span>}\n(|a{<span style=\"oblique\">sub_expr</span>})",              N_("attach file:\n<span style=\"oblique\">sub_expr</span> is evaluated as the path of the file to attach"), /* attach file */
+       "|attach_output{<span style=\"oblique\">sub_expr</span>}\n(|A{<span style=\"oblique\">sub_expr</span>})",       N_("attach file:\n<span style=\"oblique\">sub_expr</span> is evaluated as a command-line to get\nthe filename from"), /* attach file whose name's got from program output */
        "",                                     NULL,
        N_("<span weight=\"bold\">definition of terms:</span>"),        NULL,
        "<span style=\"oblique\">expr</span>\n",                        N_("text that can contain any of the symbols or\ncommands above"),
@@ -103,6 +105,7 @@ static gchar *quote_desc_strings[] = {
 static DescriptionWindow quote_desc_win = { 
         NULL,
        NULL,
+       TRUE,
         2,
         N_("Description of symbols"),
        N_("The following symbols and commands can be used:"),
@@ -255,6 +258,8 @@ void quotefmt_create_new_msg_fmt_widgets(GtkWindow *parent_window,
                *override_from_format = entry_from;
        *edit_subject_format = entry_subject;
        *edit_body_format = text_format;
+
+       g_object_unref(G_OBJECT(size_group));
 }
 
 void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
@@ -304,7 +309,7 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-               label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+               label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
                gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
                gtk_widget_show (label_from);
                gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -383,6 +388,8 @@ void quotefmt_create_reply_fmt_widgets(GtkWindow *parent_window,
        if (override_from_format)
                *override_from_format = entry_from;
        *edit_reply_format = text_quotefmt;
+
+       g_object_unref(G_OBJECT(size_group));
 }
 
 void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
@@ -432,7 +439,7 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
                gtk_widget_show (hbox3);
                gtk_box_pack_start (GTK_BOX (vbox_quote), hbox3, FALSE, FALSE, 0);
 
-               label_from = gtk_label_new (prefs_common_translated_header_name("From"));
+               label_from = gtk_label_new (prefs_common_translated_header_name("From:"));
                gtk_misc_set_alignment(GTK_MISC(label_from), 1, 0.5);
                gtk_widget_show (label_from);
                gtk_box_pack_start (GTK_BOX (hbox3), label_from, FALSE, FALSE, 0);
@@ -513,6 +520,8 @@ void quotefmt_create_forward_fmt_widgets(GtkWindow *parent_window,
        if (override_from_format)
                *override_from_format = entry_from;
        *edit_fw_format = text_fw_quotefmt;
+       
+       g_object_unref(G_OBJECT(size_group));
 }
 
 void quotefmt_add_info_button(GtkWindow *parent_window, GtkWidget *parent_box)