Fixing localization issues (following a patch for 0.46 rev. 17583) where some messages for internal extensions were not being used as translated.

(bzr r5197)

6 files changed, 29 insertions, 27 deletions

diff --git a/src/extension/internal/bitmap/addNoise.cpp b/src/extension/internal/bitmap/addNoise.cpp
index 358a71c4c..1726ffb43 100644
--- a/src/extension/internal/bitmap/addNoise.cpp
+++ b/src/extension/internal/bitmap/addNoise.cpp
@@ -44,12 +44,12 @@ AddNoise::init(void)
 			"<name>" N_("Add Noise") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.addNoise</id>\n"
 			"<param name=\"noiseType\" gui-text=\"" N_("Type") "\" type=\"enum\" >\n"
-				"<item value='Uniform Noise'>" N_("Uniform Noise") "</item>\n"
-				"<item value='Gaussian Noise'>" N_("Gaussian Noise") "</item>\n"
-				"<item value='Multiplicative Gaussian Noise'>" N_("Multiplicative Gaussian Noise") "</item>\n"
-				"<item value='Impulse Noise'>" N_("Impulse Noise") "</item>\n"
-				"<item value='Laplacian Noise'>" N_("Laplacian Noise") "</item>\n"
-				"<item value='Poisson Noise'>" N_("Poisson Noise") "</item>\n"
+				"<_item value='Uniform Noise'>" N_("Uniform Noise") "</_item>\n"
+				"<_item value='Gaussian Noise'>" N_("Gaussian Noise") "</_item>\n"
+				"<_item value='Multiplicative Gaussian Noise'>" N_("Multiplicative Gaussian Noise") "</_item>\n"
+				"<_item value='Impulse Noise'>" N_("Impulse Noise") "</_item>\n"
+				"<_item value='Laplacian Noise'>" N_("Laplacian Noise") "</_item>\n"
+				"<_item value='Poisson Noise'>" N_("Poisson Noise") "</_item>\n"
 			"</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
diff --git a/src/extension/internal/bitmap/channel.cpp b/src/extension/internal/bitmap/channel.cpp
index 4f899128f..7699365f3 100644
--- a/src/extension/internal/bitmap/channel.cpp
+++ b/src/extension/internal/bitmap/channel.cpp
@@ -47,15 +47,15 @@ Channel::init(void)
 			"<name>" N_("Channel") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.channel</id>\n"
 			"<param name=\"layer\" gui-text=\"" N_("Layer") "\" type=\"enum\" >\n"
-				"<item value='Red Channel'>" N_("Red Channel") "</item>\n"
-				"<item value='Green Channel'>" N_("Green Channel") "</item>\n"
-				"<item value='Blue Channel'>" N_("Blue Channel") "</item>\n"
-				"<item value='Cyan Channel'>" N_("Cyan Channel") "</item>\n"
-				"<item value='Magenta Channel'>" N_("Magenta Channel") "</item>\n"
-				"<item value='Yellow Channel'>" N_("Yellow Channel") "</item>\n"
-				"<item value='Black Channel'>" N_("Black Channel") "</item>\n"
-				"<item value='Opacity Channel'>" N_("Opacity Channel") "</item>\n"
-				"<item value='Matte Channel'>" N_("Matte Channel") "</item>\n"
+				"<_item value='Red Channel'>" N_("Red Channel") "</_item>\n"
+				"<_item value='Green Channel'>" N_("Green Channel") "</_item>\n"
+				"<_item value='Blue Channel'>" N_("Blue Channel") "</_item>\n"
+				"<_item value='Cyan Channel'>" N_("Cyan Channel") "</_item>\n"
+				"<_item value='Magenta Channel'>" N_("Magenta Channel") "</_item>\n"
+				"<_item value='Yellow Channel'>" N_("Yellow Channel") "</_item>\n"
+				"<_item value='Black Channel'>" N_("Black Channel") "</_item>\n"
+				"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
+				"<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
 			"</param>\n"
 			"<effect>\n"
 				"<object-type>all</object-type>\n"
diff --git a/src/extension/internal/bitmap/levelChannel.cpp b/src/extension/internal/bitmap/levelChannel.cpp
index c3498fd64..601e4d693 100644
--- a/src/extension/internal/bitmap/levelChannel.cpp
+++ b/src/extension/internal/bitmap/levelChannel.cpp
@@ -51,15 +51,15 @@ LevelChannel::init(void)
 			"<name>" N_("Level (with Channel)") "</name>\n"
 			"<id>org.inkscape.effect.bitmap.levelChannel</id>\n"
 			"<param name=\"channel\" gui-text=\"" N_("Channel") "\" type=\"enum\" >\n"
-				"<item value='Red Channel'>" N_("Red Channel") "</item>\n"
-				"<item value='Green Channel'>" N_("Green Channel") "</item>\n"
-				"<item value='Blue Channel'>" N_("Blue Channel") "</item>\n"
-				"<item value='Cyan Channel'>" N_("Cyan Channel") "</item>\n"
-				"<item value='Magenta Channel'>" N_("Magenta Channel") "</item>\n"
-				"<item value='Yellow Channel'>" N_("Yellow Channel") "</item>\n"
-				"<item value='Black Channel'>" N_("Black Channel") "</item>\n"
-				"<item value='Opacity Channel'>" N_("Opacity Channel") "</item>\n"
-				"<item value='Matte Channel'>" N_("Matte Channel") "</item>\n"
+				"<_item value='Red Channel'>" N_("Red Channel") "</_item>\n"
+				"<_item value='Green Channel'>" N_("Green Channel") "</_item>\n"
+				"<_item value='Blue Channel'>" N_("Blue Channel") "</_item>\n"
+				"<_item value='Cyan Channel'>" N_("Cyan Channel") "</_item>\n"
+				"<_item value='Magenta Channel'>" N_("Magenta Channel") "</_item>\n"
+				"<_item value='Yellow Channel'>" N_("Yellow Channel") "</_item>\n"
+				"<_item value='Black Channel'>" N_("Black Channel") "</_item>\n"
+				"<_item value='Opacity Channel'>" N_("Opacity Channel") "</_item>\n"
+				"<_item value='Matte Channel'>" N_("Matte Channel") "</_item>\n"
 			"</param>\n"
 			"<param name=\"blackPoint\" gui-text=\"" N_("Black Point") "\" type=\"float\" min=\"0.0\" max=\"100.0\">0.0</param>\n"			
 			"<param name=\"whitePoint\" gui-text=\"" N_("White Point") "\" type=\"float\" min=\"0.0\" max=\"100.0\">100.0</param>\n"			
diff --git a/src/extension/internal/cairo-pdf-out.cpp b/src/extension/internal/cairo-pdf-out.cpp
index 455230dad..b33fee9bf 100644
--- a/src/extension/internal/cairo-pdf-out.cpp
+++ b/src/extension/internal/cairo-pdf-out.cpp
@@ -218,7 +218,7 @@ CairoPdfOutput::init (void)
 			"<name>" N_("Cairo PDF Output") "</name>\n"
 			"<id>org.inkscape.output.pdf.cairo</id>\n"
 			"<param name=\"PDFversion\" gui-text=\"" N_("Restrict to PDF version") "\" type=\"enum\" >\n"
-				"<item value='PDF14'>" N_("PDF 1.4") "</item>\n"
+				"<_item value='PDF14'>" N_("PDF 1.4") "</_item>\n"
       "</param>\n"
 			"<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
 			"<param name=\"blurToBitmap\" gui-text=\"" N_("Convert blur effects to bitmaps") "\" type=\"boolean\">false</param>\n"
diff --git a/src/extension/internal/cairo-ps-out.cpp b/src/extension/internal/cairo-ps-out.cpp
index 4b0f17d30..1a4a4a576 100644
--- a/src/extension/internal/cairo-ps-out.cpp
+++ b/src/extension/internal/cairo-ps-out.cpp
@@ -222,9 +222,9 @@ CairoPsOutput::init (void)
 			"<name>" N_("Cairo PS Output") "</name>\n"
 			"<id>" SP_MODULE_KEY_PRINT_CAIRO_PS "</id>\n"
 			"<param name=\"PSlevel\" gui-text=\"" N_("Restrict to PS level") "\" type=\"enum\" >\n"
-				"<item value='PS3'>" N_("PostScript level 3") "</item>\n"
+				"<_item value='PS3'>" N_("PostScript level 3") "</_item>\n"
 #if (CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 5, 2))
-                "<item value='PS2'>" N_("PostScript level 2") "</item>\n"
+                "<_item value='PS2'>" N_("PostScript level 2") "</_item>\n"
 #endif
             "</param>\n"
 			"<param name=\"textToPath\" gui-text=\"" N_("Convert texts to paths") "\" type=\"boolean\">false</param>\n"
diff --git a/src/extension/paramenum.cpp b/src/extension/paramenum.cpp
index 199512e0e..336b4fd66 100644
--- a/src/extension/paramenum.cpp
+++ b/src/extension/paramenum.cpp
@@ -77,6 +77,8 @@ ParamComboBox::ParamComboBox (const gchar * name, const gchar * guitext, const g
                 const char * contents = sp_repr_children(child_repr)->content();
                 if (contents != NULL)
                     // don't translate when 'item' but do translate when '_item'
+                	// NOTE: internal extensions use build_from_mem and don't need _item but 
+                	//       still need to include if are to be localized                	
                      newguitext = new Glib::ustring( !strcmp(chname, "_item") ? _(contents) : contents );
                 else
                     continue;