Filters. More cleanup, and some forgotten strings made translatable (thanks to Masato HASHIMOTO).

Translations. inkscape.pot and French translation update.

(bzr r10586)

6 files changed, 29 insertions, 29 deletions

diff --git a/src/extension/internal/filter/bumps.h b/src/extension/internal/filter/bumps.h
index 9f971b0de..8db6c67d2 100644
--- a/src/extension/internal/filter/bumps.h
+++ b/src/extension/internal/filter/bumps.h
@@ -100,7 +100,7 @@ public:
                   "<param name=\"precision\" gui-text=\"" N_("Precision:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"128\">15</param>\n"
                   "<param name=\"lightingColor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
                 "</page>\n"
-                "<page name=\"lightsourcetab\" _gui-text=\"Light source\">\n"
+                "<page name=\"lightsourcetab\" _gui-text=\"" N_("Light source") "\">\n"
                   "<param name=\"lightSource\" gui-text=\"" N_("Light source:") "\" type=\"enum\">\n"
                     "<_item value=\"distant\">" N_("Distant") "</_item>\n"
                     "<_item value=\"point\">" N_("Point") "</_item>\n"
@@ -327,7 +327,7 @@ public:
                     "</param>\n"
                     "<param name=\"bgopacity\" gui-text=\"" N_("Background opacity:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"1.\">0</param>\n"
                 "</page>\n"
-                "<page name=\"lightingtab\" _gui-text=\"Lighting\">\n"
+                "<page name=\"lightingtab\" _gui-text=\"" N_("Lighting") "\">\n"
                   "<param name=\"lightingColor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
                   "<param name=\"height\" gui-text=\"" N_("Height:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"-50.\" max=\"50.\">5</param>\n"
                   "<param name=\"lightness\" gui-text=\"" N_("Lightness:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"10.\">1.4</param>\n"
diff --git a/src/extension/internal/filter/distort.h b/src/extension/internal/filter/distort.h
index f4caf3d11..415762466 100644
--- a/src/extension/internal/filter/distort.h
+++ b/src/extension/internal/filter/distort.h
@@ -81,8 +81,8 @@ public:
                 "<_item value=\"xor\">" N_("No fill") "</_item>\n"
               "</param>\n"
               "<param name=\"turbulence\" indent=\"1\" gui-text=\"" N_("Turbulence:") "\" type=\"enum\">\n"
-                "<_item value=\"fractalNoise\">Fractal noise</_item>\n"
-                "<_item value=\"turbulence\">Turbulence</_item>\n"
+                "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
+                "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
               "</param>\n"
               "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
               "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"100.\">5</param>\n"
@@ -190,8 +190,8 @@ public:
               "<name>" N_("Roughen") "</name>\n"
               "<id>org.inkscape.effect.filter.Roughen</id>\n"
               "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
-                "<_item value=\"fractalNoise\">Fractal noise</_item>\n"
-                "<_item value=\"turbulence\">Turbulence</_item>\n"
+                "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
+                "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
               "</param>\n"
               "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
               "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"1000.00\">1.3</param>\n"
diff --git a/src/extension/internal/filter/morphology.h b/src/extension/internal/filter/morphology.h
index 7dde0002d..123d912b0 100644
--- a/src/extension/internal/filter/morphology.h
+++ b/src/extension/internal/filter/morphology.h
@@ -58,9 +58,9 @@ public:
               "<name>" N_("Cross-smooth") "</name>\n"
               "<id>org.inkscape.effect.filter.crosssmooth</id>\n"
               "<param name=\"type\" gui-text=\"" N_("Type:") "\" type=\"enum\">\n"
-                "<_item value=\"in\">Inner</_item>\n"
-                "<_item value=\"over\">Outer</_item>\n"
-                "<_item value=\"xor\">Open</_item>\n"
+                "<_item value=\"in\">" N_("Inner") "</_item>\n"
+                "<_item value=\"over\">" N_("Outer") "</_item>\n"
+                "<_item value=\"xor\">" N_("Open") "</_item>\n"
               "</param>\n"
               "<param name=\"width\" gui-text=\"" N_("Width:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.\">10</param>\n"
               "<param name=\"level\" gui-text=\"" N_("Level:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.2\" max=\"2\">1</param>\n"
diff --git a/src/extension/internal/filter/overlays.h b/src/extension/internal/filter/overlays.h
index b98577ce1..1ca745166 100644
--- a/src/extension/internal/filter/overlays.h
+++ b/src/extension/internal/filter/overlays.h
@@ -56,10 +56,10 @@ public:
               "<name>" N_("Noise Fill") "</name>\n"
               "<id>org.inkscape.effect.filter.NoiseFill</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
-                "<page name=\"optionstab\" _gui-text=\"Options\">\n"
+                "<page name=\"optionstab\" _gui-text=\"" N_("Options") "\">\n"
                   "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
-                    "<_item value=\"fractalNoise\">Fractal noise</_item>\n"
-                    "<_item value=\"turbulence\">Turbulence</_item>\n"
+                    "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
+                    "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
                   "</param>\n"
                   "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">20</param>\n"
                   "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10000.00\">40</param>\n"
@@ -69,7 +69,7 @@ public:
                   "<param name=\"erosion\" gui-text=\"" N_("Erosion:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"50\">1</param>\n"
                   "<param name=\"inverted\" gui-text=\"" N_("Inverted") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
-                "<page name=\"co11tab\" _gui-text=\"Noise color\">\n"
+                "<page name=\"co11tab\" _gui-text=\"" N_("Noise color") "\">\n"
                   "<param name=\"color\" gui-text=\"" N_("Color") "\" type=\"color\">354957823</param>\n"
                 "</page>\n"
               "</param>\n"
diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h
index cf0c869a6..b7909a512 100644
--- a/src/extension/internal/filter/paint.h
+++ b/src/extension/internal/filter/paint.h
@@ -88,7 +88,7 @@ public:
                   "<param name=\"noise\" gui-text=\"" N_("Noise reduction:") "\" type=\"int\" appearance=\"full\" min=\"1\" max=\"1000\">10</param>\n"
                   "<param name=\"smooth\" gui-text=\"" N_("Smoothness:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"10.00\">1</param>\n"
                 "</page>\n"
-                "<page name=\"graintab\" _gui-text=\"Grain\">\n"
+                "<page name=\"graintab\" _gui-text=\""N_("Grain") "\">\n"
                   "<param name=\"grain\" gui-text=\"" N_("Grain mode") "\" type=\"boolean\" >true</param>\n"
                   "<param name=\"grainxf\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
                   "<param name=\"grainyf\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1000\">1000</param>\n"
@@ -585,8 +585,8 @@ public:
               "<name>" N_("Neon Draw") "</name>\n"
               "<id>org.inkscape.effect.filter.NeonDraw</id>\n"
               "<param name=\"type\" gui-text=\"" N_("Line type:") "\" type=\"enum\">\n"
-                "<_item value=\"table\">Smoothed</_item>\n"
-                "<_item value=\"discrete\">Contrasted</_item>\n"
+                "<_item value=\"table\">" N_("Smoothed") "</_item>\n"
+                "<_item value=\"discrete\">" N_("Contrasted") "</_item>\n"
               "</param>\n"
               "<param name=\"simply\" gui-text=\"" N_("Simplify:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">1.5</param>\n"
               "<param name=\"width\" gui-text=\"" N_("Line width:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"20.00\">1.5</param>\n"
@@ -697,10 +697,10 @@ public:
               "<name>" N_("Point Engraving") "</name>\n"
               "<id>org.inkscape.effect.filter.PointEngraving</id>\n"
               "<param name=\"tab\" type=\"notebook\">\n"
-                "<page name=\"optionstab\" _gui-text=\"Options\">\n"
+                "<page name=\"optionstab\" _gui-text=\"" N_("Options") "\">\n"
                   "<param name=\"type\" gui-text=\"" N_("Turbulence type:") "\" type=\"enum\">\n"
-                    "<_item value=\"fractalNoise\">Fractal noise</_item>\n"
-                  "<_item value=\"turbulence\">Turbulence</_item>\n"
+                    "<_item value=\"fractalNoise\">" N_("Fractal noise") "</_item>\n"
+                  "<_item value=\"turbulence\">" N_("Turbulence") "</_item>\n"
                   "</param>\n"
                   "<param name=\"hfreq\" gui-text=\"" N_("Horizontal frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
                   "<param name=\"vfreq\" gui-text=\"" N_("Vertical frequency:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.1\" max=\"100.00\">100</param>\n"
@@ -719,11 +719,11 @@ public:
                   "<param name=\"erase\" gui-text=\"" N_("Erase:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0\" max=\"1\">0</param>\n"
                   "<param name=\"blur\" gui-text=\"" N_("Blur:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"2\">0.5</param>\n"
                 "</page>\n"
-                "<page name=\"fcolortab\" _gui-text=\"Fill color\">\n"
+                "<page name=\"fcolortab\" _gui-text=\"" N_("Fill color") "\">\n"
                   "<param name=\"fcolor\" gui-text=\"" N_("Color") "\" type=\"color\">-1</param>\n"
                   "<param name=\"iof\" gui-text=\"" N_("Image on fill") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
-                "<page name=\"pcolortab\" _gui-text=\"Points color\">\n"
+                "<page name=\"pcolortab\" _gui-text=\"" N_("Points color") "\">\n"
                   "<param name=\"pcolor\" gui-text=\"" N_("Color") "\" type=\"color\">1666789119</param>\n"
                   "<param name=\"iop\" gui-text=\"" N_("Image on points") "\" type=\"boolean\" >false</param>\n"
                 "</page>\n"
@@ -864,8 +864,8 @@ public:
                 "<_item value=\"dented\">Dented</_item>\n"
               "</param>\n"
               "<param name=\"table\" gui-text=\"" N_("Transfer type:") "\" type=\"enum\">\n"
-                "<_item value=\"discrete\">Poster</_item>\n"
-                "<_item value=\"table\">Painting</_item>\n"
+                "<_item value=\"discrete\">" N_("Poster") "</_item>\n"
+                "<_item value=\"table\">" N_("Painting") "</_item>\n"
               "</param>\n"
               "<param name=\"levels\" gui-text=\"" N_("Levels:") "\" type=\"int\" appearance=\"full\" min=\"0\" max=\"15\">5</param>\n"
               "<param name=\"blend\" gui-text=\"" N_("Blend mode:") "\" type=\"enum\">\n"
diff --git a/src/extension/internal/filter/textures.h b/src/extension/internal/filter/textures.h
index 513483e26..32eef6054 100644
--- a/src/extension/internal/filter/textures.h
+++ b/src/extension/internal/filter/textures.h
@@ -73,12 +73,12 @@ public:
               "<param name=\"displacement\" gui-text=\"" N_("Displacement:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.\" max=\"100.00\">50</param>\n"
               "<param name=\"blend\" gui-text=\"" N_("Blend:") "\" type=\"float\" appearance=\"full\" precision=\"2\" min=\"0.01\" max=\"30.00\">5</param>\n"
               "<param name=\"stroke\" gui-text=\"" N_("Stroke:") "\" type=\"enum\">\n"
-                "<_item value=\"over\">Wide</_item>\n"
-                "<_item value=\"atop\">Normal</_item>\n"
-                "<_item value=\"in\">Narrow</_item>\n"
-                "<_item value=\"xor\">Overlapping</_item>\n"
-                "<_item value=\"out\">External</_item>\n"
-                "<_item value=\"arithmetic\">Custom</_item>\n"
+                "<_item value=\"over\">" N_("Wide") "</_item>\n"
+                "<_item value=\"atop\">" N_("Normal") "</_item>\n"
+                "<_item value=\"in\">" N_("Narrow") "</_item>\n"
+                "<_item value=\"xor\">" N_("Overlapping") "</_item>\n"
+                "<_item value=\"out\">" N_("External") "</_item>\n"
+                "<_item value=\"arithmetic\">" N_("Custom") "</_item>\n"
               "</param>\n"
               "<_param name=\"customHeader\" type=\"description\" appearance=\"header\">" N_("Custom stroke options") "</_param>\n"
                 "<param name=\"k1\" gui-text=\"" N_("k1:") "\" type=\"float\" indent=\"1\" appearance=\"full\" precision=\"2\" min=\"-10.\" max=\"10.\">1.5</param>\n"