fixed pt_BR help generation and added redrawn png from change 9943

Change-Id: I82c954c46238228dc4b865aa850e89a57ed2f782

diff --git a/scilab/modules/graphics/help/pt_BR/Graphics.xml b/scilab/modules/graphics/help/pt_BR/Graphics.xml
index c490f4a..915ef2a 100644 (file)
--- a/scilab/modules/graphics/help/pt_BR/Graphics.xml
+++ b/scilab/modules/graphics/help/pt_BR/Graphics.xml
@@ -499,15 +499,6 @@
                     </para>
                 </listitem>
             </varlistentry>
-<<<<<<< HEAD
-=======
-            <varlistentry>
-                <term>getsymbol</term>
-                <listitem>
-                    <para>Diálogo para a seleção de um símbolo e seu tamanho.</para>
-                </listitem>
-            </varlistentry>
->>>>>>> 9126f3f... * fcontour2d tagged as obsolete. Will be removed for Scilab 5.5.0.
         </variablelist>
     </refsection>
     <refsection>

diff --git a/scilab/modules/helptools/images/Sfgrayplot_1.png b/scilab/modules/helptools/images/Sfgrayplot_1.png
index d163cae..e0ad7ef 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_1.png and b/scilab/modules/helptools/images/Sfgrayplot_1.png differ

diff --git a/scilab/modules/helptools/images/Sfgrayplot_2.png b/scilab/modules/helptools/images/Sfgrayplot_2.png
index e03d1a6..a4e45d2 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_2.png and b/scilab/modules/helptools/images/Sfgrayplot_2.png differ

diff --git a/scilab/modules/helptools/images/Sfgrayplot_3.png b/scilab/modules/helptools/images/Sfgrayplot_3.png
index d34c5c6..c08f39a 100644 (file)
Binary files a/scilab/modules/helptools/images/Sfgrayplot_3.png and b/scilab/modules/helptools/images/Sfgrayplot_3.png differ

diff --git a/scilab/modules/helptools/images/xlabel_1.png b/scilab/modules/helptools/images/xlabel_1.png
index 75ae5f2..6484de6 100644 (file)
Binary files a/scilab/modules/helptools/images/xlabel_1.png and b/scilab/modules/helptools/images/xlabel_1.png differ