[balsa] Add comments to aid translations, fixing bug 605435.

[Pawel Salek <pawels src gnome org>]

commit 421a378fcebe05867dd3ad70cfcffa7940cf0e2d
Author: Pawel Salek <pawsa damage localdomain>
Date:   Tue Dec 29 21:37:21 2009 +0100

    Add comments to aid translations, fixing bug 605435.
    
    * libbalsa/rfc3156.c:
    * src/main-window.c: add comments to aid translations...
    * src/sendmsg-window.c: ... to fix bug 605435.

 ChangeLog            |    8 +++++++-
 libbalsa/rfc3156.c   |   12 +++++++-----
 src/main-window.c    |    5 ++++-
 src/sendmsg-window.c |    4 ++++
 4 files changed, 22 insertions(+), 7 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index adc5aac..e9a579c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-12-29  Pawel Salek
+
+	* libbalsa/rfc3156.c:
+	* src/main-window.c: add comments to aid translations...
+	* src/sendmsg-window.c: ... to fix bug 605435.
+
 2009-12-29  Peter Bloomfield
 
 	* libbalsa/html.c (lbh_resource_request_starting_cb),
@@ -99,7 +105,7 @@
 2009-12-06  Pawel Salek
 
 	* configure.in
-	* NEWS: release balsa-2.4.1
+	* NEWS: release balsa-2.4.2
 
 2009-12-03  Peter Bloomfield
 
diff --git a/libbalsa/rfc3156.c b/libbalsa/rfc3156.c
index 471afeb..78cd2f2 100644
--- a/libbalsa/rfc3156.c
+++ b/libbalsa/rfc3156.c
@@ -1027,11 +1027,11 @@ libbalsa_gpgme_sig_protocol_name(gpgme_protocol_t protocol)
     }
 }
 
-#define APPEND_TIMET(t,label)                                           \
+#define APPEND_TIMET(str,fmt,t)						\
     do {                                                                \
         if (t) {                                                        \
             gchar * _tbuf = libbalsa_date_to_utf8(&t, date_string);     \
-            g_string_append_printf(msg, "\n%s: %s", label, _tbuf);      \
+            g_string_append_printf(str, fmt, _tbuf);      \
             g_free(_tbuf);                                              \
         }                                                               \
     } while (0)
@@ -1059,7 +1059,7 @@ libbalsa_signature_info_to_gchar(GMimeGpgmeSigstat * info,
     } else if (info->sign_email && strlen(info->sign_email))
 	g_string_append_printf(msg, _("\nMail address: %s"),
 			       info->sign_email);
-    APPEND_TIMET(info->sign_time, _("Signed on"));
+    APPEND_TIMET(msg, _("\nSigned on: %s"), info->sign_time);
     g_string_append_printf(msg, _("\nUser ID validity: %s"),
 			   libbalsa_gpgme_validity_to_gchar(info->
 							    validity));
@@ -1070,8 +1070,10 @@ libbalsa_signature_info_to_gchar(GMimeGpgmeSigstat * info,
     if (info->fingerprint)
 	g_string_append_printf(msg, _("\nKey fingerprint: %s"),
 			       info->fingerprint);
-    APPEND_TIMET(info->key_created, _("Subkey created on"));
-    APPEND_TIMET(info->key_expires, _("Subkey expires on"));
+    /* Subkey creation date */
+    APPEND_TIMET(msg, _("\nSubkey created on: %s"), info->key_created);
+    /* Subkey expiration date */
+    APPEND_TIMET(msg, _("\nSubkey expires on: %s"), info->key_expires);
     if (info->key_revoked || info->key_expired || info->key_disabled ||
        info->key_invalid) {
        GString * attrs = g_string_new("");
diff --git a/src/main-window.c b/src/main-window.c
index 8087d75..292fce8 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -344,10 +344,12 @@ static const GtkActionEntry entries[] = {
     {"FileNewMenu", NULL, N_("_New")},
 #else  /* ENABLE_TOUCH_UI */
     {"MailboxesMenu", NULL, N_("Mail_boxes")},
+    /* Less frequently used entries of the 'View' menu */
     {"ViewMoreMenu", NULL, N_("_More")},
     {"ShownHeadersMenu", NULL, N_("_Headers")},
     {"SortMenu", NULL, N_("_Sort Mailbox")},
     {"HideMessagesMenu", NULL, N_("H_ide messages")},
+    /* Less frequently used entries of the 'Message' menu */
     {"MessageMoreMenu", NULL, N_("_More")},
     {"ToolsMenu", NULL, N_("_Tools")},
     {"ToolsFiltersMenu", NULL, N_("_Filters")},
@@ -409,7 +411,8 @@ static const GtkActionEntry entries[] = {
      G_CALLBACK(bw_copy_cb)},
     {"Filters", GTK_STOCK_PROPERTIES, N_("F_ilters..."), NULL,
      N_("Manage filters"), G_CALLBACK(bw_filter_dlg_cb)},
-    {"ExportFilters", GTK_STOCK_PROPERTIES, N_("_Export Filters"), NULL,
+    /* Export selected filters to a text file. */
+    {"ExportFilters", GTK_STOCK_PROPERTIES, N_("_Export Filters..."), NULL,
      N_("Export filters as Sieve scripts"), G_CALLBACK(bw_filter_export_cb)},
     {"Preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL, NULL,
      G_CALLBACK(open_preferences_manager)},
diff --git a/src/sendmsg-window.c b/src/sendmsg-window.c
index 43e1312..bc324b6 100644
--- a/src/sendmsg-window.c
+++ b/src/sendmsg-window.c
@@ -318,8 +318,11 @@ static const GtkActionEntry entries[] = {
     {"OptionsMenu", NULL, N_("_Options")},
 #if defined(ENABLE_TOUCH_UI)
     {"ToolsMenu", NULL, N_("_Tools")},
+    /* Less frequently used entries of the 'File' menu */
     {"FileMoreMenu", NULL, N_("_More")},
+    /* Less frequently used entries of the 'Edit' menu */
     {"EditMoreMenu", NULL, N_("_More")},
+    /* Less frequently used entries of the 'Tools' menu */
     {"ToolsMoreMenu", NULL, N_("_More")},
 #endif                          /* ENABLE_TOUCH_UI */
     {"IncludeFile", GTK_STOCK_OPEN, N_("_Include File..."), NULL,
@@ -421,6 +424,7 @@ static const GtkToggleActionEntry toggle_entries[] = {
      G_CALLBACK(toggle_reqdispnotify_cb), FALSE},
     {"Flowed", NULL, N_("_Format = Flowed"), NULL,
      NULL, G_CALLBACK(toggle_format_cb), FALSE},
+    /* Send as message/alternative with text/plain and text/html parts */
     {"SendMPAlt", NULL, N_("Send as plain text and _HTML"), NULL,
      NULL, G_CALLBACK(toggle_mp_alt_cb), FALSE},
 #ifdef HAVE_GPGME