diff options
| author | Milan Crha <mcrha@redhat.com> | 2010-04-23 17:20:50 +0800 |
|---|---|---|
| committer | Milan Crha <mcrha@redhat.com> | 2010-04-23 17:20:50 +0800 |
| commit | 91020b05a3107e4ae51d7aa33dc0bebe5b668e6d (patch) | |
| tree | e3b2445f54a7d74e5ff00ebbd8ecfa70235ed016 /mail | |
| parent | edf6286a38279e6db82dee4da50e94c587f06e02 (diff) | |
| download | gsoc2013-evolution-91020b05a3107e4ae51d7aa33dc0bebe5b668e6d.tar.gz gsoc2013-evolution-91020b05a3107e4ae51d7aa33dc0bebe5b668e6d.tar.zst gsoc2013-evolution-91020b05a3107e4ae51d7aa33dc0bebe5b668e6d.zip | |
Bug #360461 - Avoid markup in translatable messages
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/em-format-html.c | 10 | ||||
| -rw-r--r-- | mail/mail-config.ui | 36 |
2 files changed, 38 insertions, 8 deletions
diff --git a/mail/em-format-html.c b/mail/em-format-html.c index f89c89a6b9..b521264bd7 100644 --- a/mail/em-format-html.c +++ b/mail/em-format-html.c @@ -2587,16 +2587,20 @@ efh_format_headers(EMFormatHTML *efh, CamelStream *stream, CamelMedium *part) } if (header_sender && header_from && mail_from_delegate) { + gchar *bold_sender, *bold_from; camel_stream_printf(stream, "<tr><td><table border=1 width=\"100%%\" cellspacing=2 cellpadding=2><tr>"); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) camel_stream_printf (stream, "<td align=\"right\" width=\"100%%\">"); else camel_stream_printf (stream, "<td align=\"left\" width=\"100%%\">"); + bold_sender = g_strconcat ("<b>", header_sender, "</b>", NULL); + bold_from = g_strconcat ("<b>", header_from, "</b>", NULL); /* To translators: This message suggests to the receipients that the sender of the mail is - different from the one listed in From field. - */ - camel_stream_printf(stream, _("This message was sent by <b>%s</b> on behalf of <b>%s</b>"), header_sender, header_from); + different from the one listed in From field. */ + camel_stream_printf(stream, _("This message was sent by %s on behalf of %s"), bold_sender, bold_from); camel_stream_printf(stream, "</td></tr></table></td></tr>"); + g_free (bold_sender); + g_free (bold_from); } g_free (header_sender); diff --git a/mail/mail-config.ui b/mail/mail-config.ui index a60a53247c..63fc65d92b 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -4486,12 +4486,38 @@ For example: "Work" or "Personal"</property> <property name="orientation">vertical</property> <property name="spacing">8</property> <child> - <object class="GtkLabel" id="label588"> + <object class="GtkHBox" id="hbox242"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0.47999998927116394</property> - <property name="label" translatable="yes" comments="Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding"><b>Top Posting Option</b> (Not Recommended)</property> - <property name="use_markup">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label588"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0.47999998927116394</property> + <property name="label" translatable="yes" comments="Translators: Section name for options related to Top Posting. See Edit|Preferences|Composer Preferences for better understanding">Top Posting Option</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label589"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0.47999998927116394</property> + <property name="label" translatable="yes" comments="Translators: This is part of the line with 'Top Posting Option' text. See Edit|Preferences|Composer Preferences for the usage">(Not Recommended)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> |