* Bug #12141 fixed - Remove calls to gettext in rubberbox help page examples.

                     Translation of items will be made in each language help page.

Change-Id: I29aaed04bebe00c4ac6b58a8e524761c1e2c400e

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index 7c757d6..cc9df51 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -290,6 +290,9 @@ Bug fixes
 
 * Bug #12140 fixed - csvRead fails when comma is used as decimal mark.
 
+* Bug #12141 fixed - Remove calls to gettext in rubberbox help page examples.
+                     Translation of items will be made in each language help page.
+
 * Bug #12151 fixed - Axes did not pass through (0,0) when x_location and
                      y_location were set to 'origin'.
 

diff --git a/scilab/modules/graphics/help/en_US/rubberbox.xml b/scilab/modules/graphics/help/en_US/rubberbox.xml
index f164221..f425a30 100644 (file)
--- a/scilab/modules/graphics/help/en_US/rubberbox.xml
+++ b/scilab/modules/graphics/help/en_US/rubberbox.xml
@@ -33,7 +33,9 @@
                     <para>
                         a vector with two or four entries. With four entries it
                         gives the initial rectangle defined by <literal>[x_min,
-                        y_max, width, height]</literal> (where
+                            y_max, width, height]
+                        </literal>
+                        (where
                         <literal>x_min</literal> and <literal>y_max</literal>
                         are coordinates of initial corner position, with two
                         entries width and height are supposed to be 0.
@@ -58,7 +60,9 @@
             <varlistentry>
                 <term>final_rect</term>
                 <listitem>
-                    <para>a rectangle defined by <literal>[x_min, y_max, width, height]</literal>.</para>
+                    <para>
+                        a rectangle defined by <literal>[x_min, y_max, width, height]</literal>.
+                    </para>
                 </listitem>
             </varlistentry>
             <varlistentry>
@@ -91,13 +95,13 @@ x0 = (db(1)*2+db(2))/3;
 dx = (db(2)-db(1))/3;
 y0 = (db(3)+db(4)*2)/3;
 dy = (db(4)-db(3))/3;
-disp(gettext("With an initial starting corner:"))
+disp("With an initial starting corner:")
 r = rubberbox([x0 y0])
-disp(gettext("With an initial box:"))
+disp("With an initial box:")
 r = rubberbox([x0-dx/4 y0+dy/5 2*dx dy])
-disp(gettext("In press -- drag -- release mode selection:"))
+disp("In press -- drag -- release mode selection:")
 r = rubberbox(%t)
-disp(gettext("In starting click -- drag -- stopping click mode selection:"))
+disp("In starting click -- drag -- stopping click mode selection:")
 r = rubberbox()
  ]]></programlisting>
     </refsection>

diff --git a/scilab/modules/graphics/help/ja_JP/rubberbox.xml b/scilab/modules/graphics/help/ja_JP/rubberbox.xml
index 5a895a2..56f223c 100644 (file)
--- a/scilab/modules/graphics/help/ja_JP/rubberbox.xml
+++ b/scilab/modules/graphics/help/ja_JP/rubberbox.xml
@@ -84,13 +84,13 @@ x0 = (db(1)*2+db(2))/3;
 dx = (db(2)-db(1))/3;
 y0 = (db(3)+db(4)*2)/3;
 dy = (db(4)-db(3))/3;
-disp(gettext("With an initial starting corner:"))
+disp("With an initial starting corner:")
 r = rubberbox([x0 y0])
-disp(gettext("With an initial box:"))
+disp("With an initial box:")
 r = rubberbox([x0-dx/4 y0+dy/5 2*dx dy])
-disp(gettext("In press -- drag -- release mode selection:"))
+disp("In press -- drag -- release mode selection:")
 r = rubberbox(%t)
-disp(gettext("In starting click -- drag -- stopping click mode selection:"))
+disp("In starting click -- drag -- stopping click mode selection:")
 r = rubberbox()
  ]]></programlisting>
     </refsection>

diff --git a/scilab/modules/graphics/help/pt_BR/rubberbox.xml b/scilab/modules/graphics/help/pt_BR/rubberbox.xml
index 2c8544b..e5f8773 100644 (file)
--- a/scilab/modules/graphics/help/pt_BR/rubberbox.xml
+++ b/scilab/modules/graphics/help/pt_BR/rubberbox.xml
@@ -86,13 +86,13 @@ x0 = (db(1)*2+db(2))/3;
 dx = (db(2)-db(1))/3;
 y0 = (db(3)+db(4)*2)/3;
 dy = (db(4)-db(3))/3;
-disp(gettext("With an initial starting corner:"))
+disp("With an initial starting corner:")
 r = rubberbox([x0 y0])
-disp(gettext("With an initial box:"))
+disp("With an initial box:")
 r = rubberbox([x0-dx/4 y0+dy/5 2*dx dy])
-disp(gettext("In press -- drag -- release mode selection:"))
+disp("In press -- drag -- release mode selection:")
 r = rubberbox(%t)
-disp(gettext("In starting click -- drag -- stopping click mode selection:"))
+disp("In starting click -- drag -- stopping click mode selection:")
 r = rubberbox()
  ]]></programlisting>
     </refsection>

diff --git a/scilab/modules/graphics/help/ru_RU/rubberbox.xml b/scilab/modules/graphics/help/ru_RU/rubberbox.xml
index e595d79..98f79b4 100644 (file)
--- a/scilab/modules/graphics/help/ru_RU/rubberbox.xml
+++ b/scilab/modules/graphics/help/ru_RU/rubberbox.xml
@@ -64,7 +64,9 @@
                 <listitem>
                     <para>
                         прямоугольник, определяемый как <literal>[x_min, y_max,
-                        width, height]</literal>, где <literal>x_min</literal> и
+                            width, height]
+                        </literal>
+                        ,где <literal>x_min</literal> и
                         <literal>y_max</literal> - координаты начального угла,
                         <literal>width</literal> - ширина и
                         <literal>height</literal> - высота.
@@ -103,13 +105,13 @@ x0 = (db(1)*2+db(2))/3;
 dx = (db(2)-db(1))/3;
 y0 = (db(3)+db(4)*2)/3;
 dy = (db(4)-db(3))/3;
-disp(gettext("With an initial starting corner:"))
+disp("With an initial starting corner:")
 r = rubberbox([x0 y0])
-disp(gettext("With an initial box:"))
+disp("With an initial box:")
 r = rubberbox([x0-dx/4 y0+dy/5 2*dx dy])
-disp(gettext("In press -- drag -- release mode selection:"))
+disp("In press -- drag -- release mode selection:")
 r = rubberbox(%t)
-disp(gettext("In starting click -- drag -- stopping click mode selection:"))
+disp("In starting click -- drag -- stopping click mode selection:")
 r = rubberbox()
  ]]></programlisting>
     </refsection>