[geary/mjog/remove-markup-from-translatable-strings] ConverationViewerMessage: Pull markup out of translatable strs

[Michael Gratton <mjog src gnome org>]

commit f2be8ef5272bfb3ffeda656a1769fc0f640bc1ba
Author: Michael Gratton <mike vee net>
Date:   Tue Mar 17 19:16:36 2020 +1100

    ConverationViewerMessage: Pull markup out of translatable strs
    
    Per GitLab comment on 58ffad83, this will make translations less error
    prone.

 src/client/conversation-viewer/conversation-message.vala | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/client/conversation-viewer/conversation-message.vala 
b/src/client/conversation-viewer/conversation-message.vala
index 08a15b47..22782c4c 100644
--- a/src/client/conversation-viewer/conversation-message.vala
+++ b/src/client/conversation-viewer/conversation-message.vala
@@ -228,7 +228,10 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
             base.add(this.show_more);
 
             this.show_less = this.create_label();
-            this.show_less.label = _("<a href=''>Show less</a>");
+            // Translators: Label text displayed when there are too
+            // many email addresses to be shown by default in an
+            // email's header, but they are all being shown anyway.
+            this.show_less.label = "<a href=''>%s</a>".printf(_("Show less"));
             this.show_less.activate_link.connect(() => {
                 this.set_expanded(false);
             });
@@ -249,7 +252,13 @@ public class ConversationMessage : Gtk.Grid, Geary.BaseInterface {
                 this.invalidate_filter();
             }
 
-            this.show_more.label = _("<a href=''>%d more…</a>").printf(this.children - SHORT_RESULTS);
+            this.show_more.label = "<a href=''>%s</a>".printf(
+                // Translators: Label text displayed when there are
+                // too many email addresses to be shown by default in
+                // an email's header. The string substitution is the
+                // number of extra email to be shown.
+                _("%d more…").printf(this.children - SHORT_RESULTS)
+            );
         }