From bab6dfe02bd9556c931973a272e154251764e88e Mon Sep 17 00:00:00 2001
From: Eduard Braun <eduard.braun2@gmx.de>
Date: Mon, 24 Apr 2017 20:59:06 +0200
Subject: Restore r14955 which was reverted in r15047 due to messed up merge

http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/14955
http://bazaar.launchpad.net/~inkscape.dev/inkscape/trunk/revision/15047

Fixed bugs:
  - https://launchpad.net/bugs/1669951

(bzr r15633)
---
 src/extension/param/parameter.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src/extension/param/parameter.cpp')

diff --git a/src/extension/param/parameter.cpp b/src/extension/param/parameter.cpp
index 0eb491078..2c72c61df 100644
--- a/src/extension/param/parameter.cpp
+++ b/src/extension/param/parameter.cpp
@@ -20,6 +20,7 @@
 #endif
 
 #include <cstring>
+#include <glibmm/i18n.h>
 
 #include "ui/widget/color-notebook.h"
 #include <xml/node.h>
@@ -65,6 +66,16 @@ Parameter *Parameter::make(Inkscape::XML::Node *in_repr, Inkscape::Extension::Ex
     const char *guitext = in_repr->attribute("gui-text");
     if (guitext == NULL) {
         guitext = in_repr->attribute("_gui-text");
+        if (guitext == NULL) {
+            // guitext = ""; // propably better to require devs to explicitly set an empty gui-text if this is what they want
+        } else {
+            const char *context = in_repr->attribute("msgctxt");
+            if (context != NULL) {
+                guitext = g_dpgettext2(NULL, context, guitext);
+            } else {
+                guitext = _(guitext);
+            }
+        }
     }
     const char *gui_tip = in_repr->attribute("gui-tip");
     if (gui_tip == NULL) {
-- 
cgit v1.2.3