[shotwell: 1/2] Wip/techy/remove markup in translatable strings

[Jens Georg <jensgeorg src gnome org>]

commit ed54e6b46cf474b8cde9f570a906dc8a645f29cb
Author: David Welch <techy121592 gmail com>
Date:   Sat May 25 16:57:43 2019 +0000

    Wip/techy/remove markup in translatable strings

 src/dialogs/Preferences.vala     | 4 ++--
 src/dialogs/WelcomeDialog.vala   | 2 +-
 src/faces/FacesTool.vala         | 2 +-
 src/library/LibraryWindow.vala   | 2 +-
 src/publishing/PublishingUI.vala | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/src/dialogs/Preferences.vala b/src/dialogs/Preferences.vala
index 17b16cf2..846a9b8e 100644
--- a/src/dialogs/Preferences.vala
+++ b/src/dialogs/Preferences.vala
@@ -105,11 +105,11 @@ public class PreferencesDialog : Gtk.Dialog {
 
         if (help_path == null) {
             // We're installed system-wide, so use the system help.
-            pattern_help.set_markup("<a href=\"" + Resources.DIR_PATTERN_URI_SYSWIDE + "\">" + _("(Help)") + 
"</a>");
+           pattern_help.set_markup("<a href=\"%s\">%s</a>".printf(Resources.DIR_PATTERN_URI_SYSWIDE,  
_("(Help)")));
         } else {
             // We're being run from the build directory; we'll have to handle clicks to this
             // link manually ourselves, due to a limitation of help: URIs.
-            pattern_help.set_markup("<a href=\"dummy:\">" + _("(Help)") + "</a>");
+           pattern_help.set_markup("<a href=\"dummy:\">%s</a>".printf(_("(Help)")));
             pattern_help.activate_link.connect(on_local_pattern_help);
         }
 
diff --git a/src/dialogs/WelcomeDialog.vala b/src/dialogs/WelcomeDialog.vala
index e40686dd..c647ae5d 100644
--- a/src/dialogs/WelcomeDialog.vala
+++ b/src/dialogs/WelcomeDialog.vala
@@ -64,7 +64,7 @@ public class WelcomeDialog : Gtk.Dialog {
 
         instructions.set_markup(((indent_prefix + "&#8226; %s\n") + (indent_prefix + "&#8226; %s\n")
             + (indent_prefix + "&#8226; %s")).printf(
-            _("Choose <span weight=\"bold\">File %s Import From Folder</span>").printf(arrow_glyph),
+            _("Choose File %s Import From Folder").printf(arrow_glyph),
             _("Drag and drop photos onto the Shotwell window"),
             _("Connect a camera to your computer and import")));
         instructions.xalign = 0.0f;
diff --git a/src/faces/FacesTool.vala b/src/faces/FacesTool.vala
index 866f0317..b15390a4 100644
--- a/src/faces/FacesTool.vala
+++ b/src/faces/FacesTool.vala
@@ -177,7 +177,7 @@ public class FacesTool : EditingTools.EditingTool {
                 case EditingPhase.CLICK_TO_EDIT:
                     assert(face_shape != null);
 
-                    help_text.set_markup(Markup.printf_escaped(_("Click to edit face <i>%s</i>"),
+                    help_text.set_markup(Markup.printf_escaped(_("Click to edit face “%s”"),
                         face_shape.get_name()));
 
                     break;
diff --git a/src/library/LibraryWindow.vala b/src/library/LibraryWindow.vala
index ed83c1a2..4ced992c 100644
--- a/src/library/LibraryWindow.vala
+++ b/src/library/LibraryWindow.vala
@@ -799,7 +799,7 @@ public class LibraryWindow : AppWindow {
         if (AppDirs.get_import_dir().get_path() == Environment.get_home_dir() && notify_library_is_home_dir) 
{
             Gtk.ResponseType response = AppWindow.affirm_cancel_question(
                 _("Shotwell is configured to import photos to your home directory.\n" + 
-                "We recommend changing this in <span weight=\"bold\">Edit %s Preferences</span>.\n" + 
+                "We recommend changing this in Edit %s Preferences.\n" + 
                 "Do you want to continue importing photos?").printf("▸"),
                 _("_Import"), _("Library Location"), AppWindow.get_instance());
             
diff --git a/src/publishing/PublishingUI.vala b/src/publishing/PublishingUI.vala
index f0f5611c..b9081375 100644
--- a/src/publishing/PublishingUI.vala
+++ b/src/publishing/PublishingUI.vala
@@ -284,7 +284,7 @@ public class PublishingDialog : Gtk.Dialog {
             // There are no enabled publishing services that accept this media type,
             // warn the user.
             AppWindow.error_message_with_title(_("Unable to publish"),
-                _("Shotwell cannot publish the selected items because you do not have a compatible 
publishing plugin enabled. To correct this, choose <b>Edit %s Preferences</b> and enable one or more of the 
publishing plugins on the <b>Plugins</b> tab.").printf("▸"),
+                _("Shotwell cannot publish the selected items because you do not have a compatible 
publishing plugin enabled. To correct this, choose Edit %s Preferences and enable one or more of the 
publishing plugins on the <b>Plugins</b> tab.").printf("▸"),
                 null, false);
 
             return;