summaryrefslogtreecommitdiffstats
path: root/scilab/modules
diff options
context:
space:
mode:
authorClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
committerClément DAVID <clement.david@scilab.org>2011-03-07 09:52:16 +0100
commit2835e08091d79405f8a4ef74787b5aace3e935ab (patch)
tree76ee3a864662a8fba9f395735a60ae4a0f9e8e4b /scilab/modules
parent6c742c35f0a9a138f765e434e294273a262f8fd5 (diff)
parent0118710f9d4ca4c1843a40d7355add417b510001 (diff)
downloadscilab-2835e08091d79405f8a4ef74787b5aace3e935ab.zip
scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.tar.gz
Merge remote-tracking branch 'origin/5.3' into simulinkimport
Conflicts: scilab/aclocal.m4 scilab/configure Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898
Diffstat (limited to 'scilab/modules')
-rw-r--r--scilab/modules/Makefile.in2
-rw-r--r--scilab/modules/action_binding/Makefile.in2
-rw-r--r--scilab/modules/action_binding/locales/it_IT/action_binding.po2
-rw-r--r--scilab/modules/action_binding/locales/pt_BR/action_binding.po2
-rw-r--r--scilab/modules/action_binding/src/c/action_binding.rc10
-rw-r--r--scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc10
-rw-r--r--scilab/modules/action_binding/version.xml2
-rw-r--r--scilab/modules/api_scilab/Makefile.in2
-rw-r--r--scilab/modules/api_scilab/src/c/api_scilab.rc10
-rw-r--r--scilab/modules/api_scilab/src/cpp/api_double.cpp651
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.c50
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.dia.ref35
-rw-r--r--scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.tst36
-rw-r--r--scilab/modules/arnoldi/Makefile.in2
-rw-r--r--scilab/modules/arnoldi/src/c/arnoldi.rc10
-rw-r--r--scilab/modules/arnoldi/version.xml2
-rw-r--r--scilab/modules/atoms/Makefile.in2
-rw-r--r--scilab/modules/atoms/locales/de_DE/atoms.po6
-rw-r--r--scilab/modules/atoms/locales/en_GB/atoms.po768
-rw-r--r--scilab/modules/atoms/locales/fr_FR/atoms.po4
-rw-r--r--scilab/modules/atoms/locales/it_IT/atoms.po60
-rw-r--r--scilab/modules/atoms/locales/ja_JP/atoms.po36
-rw-r--r--scilab/modules/atoms/locales/pl_PL/atoms.po6
-rw-r--r--scilab/modules/atoms/locales/pt_BR/atoms.po68
-rw-r--r--scilab/modules/atoms/locales/zh_TW/atoms.po10
-rw-r--r--scilab/modules/boolean/Makefile.in2
-rw-r--r--scilab/modules/boolean/src/c/boolean.rc10
-rw-r--r--scilab/modules/boolean/src/fortran/boolean_f.rc10
-rw-r--r--scilab/modules/boolean/version.xml2
-rw-r--r--scilab/modules/cacsd/Makefile.in2
-rw-r--r--scilab/modules/cacsd/locales/ca_ES/cacsd.po2
-rw-r--r--scilab/modules/cacsd/locales/es_ES/cacsd.po4
-rw-r--r--scilab/modules/cacsd/locales/it_IT/cacsd.po4
-rw-r--r--scilab/modules/cacsd/locales/pt_BR/cacsd.po2
-rw-r--r--scilab/modules/cacsd/locales/zh_CN/cacsd.po4
-rw-r--r--scilab/modules/cacsd/src/c/cacsd.rc10
-rw-r--r--scilab/modules/cacsd/src/fortran/cacsd_f.rc10
-rw-r--r--scilab/modules/cacsd/src/slicot/slicot_f/slicot_f.rc10
-rw-r--r--scilab/modules/cacsd/version.xml2
-rw-r--r--scilab/modules/call_scilab/Makefile.in2
-rw-r--r--scilab/modules/call_scilab/src/c/call_scilab.rc10
-rw-r--r--scilab/modules/call_scilab/version.xml2
-rw-r--r--scilab/modules/commons/Makefile.in2
-rw-r--r--scilab/modules/commons/src/c/commons.rc10
-rw-r--r--scilab/modules/commons/src/fortran/commons_f.rc10
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in2
-rw-r--r--scilab/modules/compatibility_functions/locales/it_IT/compatibility_functions.po38
-rw-r--r--scilab/modules/compatibility_functions/locales/ja_JP/compatibility_functions.po28
-rw-r--r--scilab/modules/compatibility_functions/locales/pl_PL/compatibility_functions.po22
-rw-r--r--scilab/modules/compatibility_functions/locales/pt_BR/compatibility_functions.po12
-rw-r--r--scilab/modules/compatibility_functions/locales/zh_TW/compatibility_functions.po18
-rw-r--r--scilab/modules/compatibility_functions/version.xml2
-rw-r--r--scilab/modules/completion/Makefile.in2
-rw-r--r--scilab/modules/completion/locales/it_IT/completion.po2
-rw-r--r--scilab/modules/completion/locales/pt_BR/completion.po4
-rw-r--r--scilab/modules/completion/src/c/completion.rc10
-rw-r--r--scilab/modules/completion/src/nocompletion/nocompletion.rc10
-rw-r--r--scilab/modules/completion/version.xml2
-rw-r--r--scilab/modules/console/Makefile.in2
-rw-r--r--scilab/modules/console/src/c/console.rc10
-rw-r--r--scilab/modules/console/src/noconsole/noconsole.rc10
-rw-r--r--scilab/modules/console/version.xml2
-rw-r--r--scilab/modules/core/Makefile.in2
-rw-r--r--scilab/modules/core/help/en_US/keywords/else.xml13
-rw-r--r--scilab/modules/core/help/en_US/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/else.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/help/fr_FR/keywords/return.xml3
-rw-r--r--scilab/modules/core/help/pt_BR/keywords/else.xml11
-rw-r--r--scilab/modules/core/help/pt_BR/keywords/elseif.xml13
-rw-r--r--scilab/modules/core/includes/version.h2
-rw-r--r--scilab/modules/core/locales/ca_ES/core.po12
-rw-r--r--scilab/modules/core/locales/de_DE/core.po14
-rw-r--r--scilab/modules/core/locales/en_US/core.pot6
-rw-r--r--scilab/modules/core/locales/es_ES/core.po12
-rw-r--r--scilab/modules/core/locales/fr_FR/core.po14
-rw-r--r--scilab/modules/core/locales/it_IT/core.po64
-rw-r--r--scilab/modules/core/locales/ja_JP/core.po14
-rw-r--r--scilab/modules/core/locales/pl_PL/core.po18
-rw-r--r--scilab/modules/core/locales/pt_BR/core.po64
-rw-r--r--scilab/modules/core/locales/ru_RU/core.po12
-rw-r--r--scilab/modules/core/locales/uk_UA/core.po12
-rw-r--r--scilab/modules/core/locales/zh_CN/core.po10
-rw-r--r--scilab/modules/core/locales/zh_TW/core.po12
-rw-r--r--scilab/modules/core/macros/edit.sci4
-rw-r--r--scilab/modules/core/src/c/banier.c85
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.dia.ref36
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.sci24
-rw-r--r--scilab/modules/core/tests/nonreg_tests/bug_8531.tst41
-rw-r--r--scilab/modules/core/tests/unit_tests/eq_neq_priority.dia.ref65
-rw-r--r--scilab/modules/core/tests/unit_tests/eq_neq_priority.tst47
-rw-r--r--scilab/modules/core/version.xml2
-rw-r--r--scilab/modules/data_structures/Makefile.in2
-rw-r--r--scilab/modules/data_structures/locales/es_ES/data_structures.po4
-rw-r--r--scilab/modules/data_structures/locales/it_IT/data_structures.po4
-rw-r--r--scilab/modules/data_structures/locales/ja_JP/data_structures.po2
-rw-r--r--scilab/modules/data_structures/locales/pt_BR/data_structures.po4
-rw-r--r--scilab/modules/data_structures/src/c/data_structures.rc10
-rw-r--r--scilab/modules/data_structures/src/fortran/data_structures_f.rc10
-rw-r--r--scilab/modules/data_structures/version.xml2
-rw-r--r--scilab/modules/demo_tools/Makefile.in2
-rw-r--r--scilab/modules/demo_tools/macros/demo_viewCode.sci18
-rw-r--r--scilab/modules/demo_tools/version.xml2
-rw-r--r--scilab/modules/development_tools/Makefile.in2
-rw-r--r--scilab/modules/development_tools/locales/it_IT/development_tools.po2
-rw-r--r--scilab/modules/development_tools/locales/ja_JP/development_tools.po2
-rw-r--r--scilab/modules/development_tools/locales/pt_BR/development_tools.po2
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in2
-rw-r--r--scilab/modules/development_tools/version.xml2
-rw-r--r--scilab/modules/differential_equations/Makefile.in2
-rw-r--r--scilab/modules/differential_equations/locales/it_IT/differential_equations.po4
-rw-r--r--scilab/modules/differential_equations/locales/pl_PL/differential_equations.po2
-rw-r--r--scilab/modules/differential_equations/locales/pt_BR/differential_equations.po2
-rw-r--r--scilab/modules/differential_equations/locales/zh_TW/differential_equations.po4
-rw-r--r--scilab/modules/differential_equations/src/c/differential_equations.rc10
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.rc10
-rw-r--r--scilab/modules/differential_equations/src/fortran/differential_equations_f.vfproj12
-rw-r--r--scilab/modules/differential_equations/tests/nonreg_tests/bug_8462.dia.ref61
-rw-r--r--scilab/modules/differential_equations/tests/nonreg_tests/bug_8462.tst73
-rw-r--r--scilab/modules/differential_equations/version.xml2
-rw-r--r--scilab/modules/double/Makefile.in2
-rw-r--r--scilab/modules/double/src/c/double.rc10
-rw-r--r--scilab/modules/double/src/fortran/double_f.rc10
-rw-r--r--scilab/modules/double/version.xml2
-rw-r--r--scilab/modules/dynamic_link/Makefile.in2
-rw-r--r--scilab/modules/dynamic_link/help/en_US/VCtoLCCLib.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/addinter.xml41
-rw-r--r--scilab/modules/dynamic_link/help/en_US/configure_lcc.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/findlcccompiler.xml21
-rw-r--r--scilab/modules/dynamic_link/help/en_US/haveacompiler.xml3
-rw-r--r--scilab/modules/dynamic_link/help/en_US/with_lcc.xml22
-rw-r--r--scilab/modules/dynamic_link/locales/it_IT/dynamic_link.po10
-rw-r--r--scilab/modules/dynamic_link/locales/ja_JP/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/locales/pl_PL/dynamic_link.po4
-rw-r--r--scilab/modules/dynamic_link/locales/pt_BR/dynamic_link.po4
-rw-r--r--scilab/modules/dynamic_link/locales/ru_RU/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/locales/uk_UA/dynamic_link.po2
-rw-r--r--scilab/modules/dynamic_link/macros/VCtoLCCLib.sci16
-rw-r--r--scilab/modules/dynamic_link/macros/chooselcccompiler.sci16
-rw-r--r--scilab/modules/dynamic_link/macros/configure_lcc.sci15
-rw-r--r--scilab/modules/dynamic_link/macros/findlcccompiler.sci17
-rw-r--r--scilab/modules/dynamic_link/macros/with_lcc.sci15
-rw-r--r--scilab/modules/dynamic_link/src/c/dynamic_link.rc10
-rw-r--r--scilab/modules/dynamic_link/src/fortran/dynamic_link_f.rc10
-rw-r--r--scilab/modules/dynamic_link/version.xml2
-rw-r--r--scilab/modules/elementary_functions/Makefile.in2
-rw-r--r--scilab/modules/elementary_functions/help/en_US/max.xml8
-rw-r--r--scilab/modules/elementary_functions/help/en_US/min.xml8
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/max.xml9
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/min.xml9
-rw-r--r--scilab/modules/elementary_functions/help/fr_FR/trigonometry/conj.xml (renamed from scilab/modules/elementary_functions/help/fr_FR/conj.xml)0
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/min.xml (renamed from scilab/modules/core/help/pt_BR/keywords/min.xml)0
-rw-r--r--scilab/modules/elementary_functions/help/pt_BR/trigonometry/conj.xml (renamed from scilab/modules/elementary_functions/help/pt_BR/conj.xml)0
-rw-r--r--scilab/modules/elementary_functions/locales/es_ES/elementary_functions.po12
-rw-r--r--scilab/modules/elementary_functions/locales/it_IT/elementary_functions.po12
-rw-r--r--scilab/modules/elementary_functions/locales/ja_JP/elementary_functions.po2
-rw-r--r--scilab/modules/elementary_functions/locales/pl_PL/elementary_functions.po8
-rw-r--r--scilab/modules/elementary_functions/locales/pt_BR/elementary_functions.po18
-rw-r--r--scilab/modules/elementary_functions/locales/zh_CN/elementary_functions.po6
-rw-r--r--scilab/modules/elementary_functions/macros/acosd.sci7
-rw-r--r--scilab/modules/elementary_functions/macros/acotd.sci4
-rw-r--r--scilab/modules/elementary_functions/macros/acscd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/asecd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/asind.sci5
-rw-r--r--scilab/modules/elementary_functions/macros/atand.sci5
-rw-r--r--scilab/modules/elementary_functions/macros/cosd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/cotd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/cscd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/secd.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/sind.sci3
-rw-r--r--scilab/modules/elementary_functions/macros/tand.sci2
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/gw_elementary_functions.c4
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/c/sci_maxi.c24
-rw-r--r--scilab/modules/elementary_functions/sci_gateway/elementary_functions_gateway.xml2
-rw-r--r--scilab/modules/elementary_functions/src/c/elementary_functions.rc10
-rw-r--r--scilab/modules/elementary_functions/src/c/f2c_workaround.c (renamed from scilab/modules/special_functions/sci_gateway/c/gw_special_functions1.c)37
-rw-r--r--scilab/modules/elementary_functions/src/fortran/eispack/eispack_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/elementary_functions_f2c.vcproj8
-rw-r--r--scilab/modules/elementary_functions/src/fortran/linpack/linpack_f.rc10
-rw-r--r--scilab/modules/elementary_functions/src/fortran/simple.f5
-rw-r--r--scilab/modules/elementary_functions/src/fortran/slatec/slatec_f.rc10
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_7691.dia.ref36
-rw-r--r--scilab/modules/elementary_functions/tests/nonreg_tests/bug_7691.tst39
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/acosd.dia.ref10
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/acosd.tst6
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/cotd.dia.ref28
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/cotd.tst27
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/max.dia.ref (renamed from scilab/modules/elementary_functions/tests/unit_tests/maxi.dia.ref)0
-rw-r--r--scilab/modules/elementary_functions/tests/unit_tests/max.tst (renamed from scilab/modules/elementary_functions/tests/unit_tests/maxi.tst)0
-rw-r--r--scilab/modules/elementary_functions/version.xml2
-rw-r--r--scilab/modules/fftw/Makefile.in2
-rw-r--r--scilab/modules/fftw/etc/fftw.start109
-rw-r--r--scilab/modules/fftw/locales/it_IT/fftw.po2
-rw-r--r--scilab/modules/fftw/src/c/fftw.rc10
-rw-r--r--scilab/modules/fftw/src/nofftw/nofftw.rc10
-rw-r--r--scilab/modules/fftw/tests/nonreg_tests/bug_8390.tst22
-rw-r--r--scilab/modules/fftw/version.xml2
-rw-r--r--scilab/modules/fileio/Makefile.in2
-rw-r--r--scilab/modules/fileio/help/en_US/basename.xml7
-rw-r--r--scilab/modules/fileio/locales/ca_ES/fileio.po2
-rw-r--r--scilab/modules/fileio/locales/it_IT/fileio.po28
-rw-r--r--scilab/modules/fileio/locales/pt_BR/fileio.po32
-rw-r--r--scilab/modules/fileio/sci_gateway/c/sci_mscanf.c178
-rw-r--r--scilab/modules/fileio/src/c/fileio.rc10
-rw-r--r--scilab/modules/fileio/tests/nonreg_tests/bug_6768.tst22
-rw-r--r--scilab/modules/fileio/tests/unit_tests/chdir.dia.ref2
-rw-r--r--scilab/modules/fileio/tests/unit_tests/chdir.tst4
-rw-r--r--scilab/modules/fileio/version.xml2
-rw-r--r--scilab/modules/functions/Makefile.in2
-rw-r--r--scilab/modules/functions/locales/it_IT/functions.po4
-rw-r--r--scilab/modules/functions/locales/pt_BR/functions.po6
-rw-r--r--scilab/modules/functions/src/c/functions.rc10
-rw-r--r--scilab/modules/functions/src/c/libraryinfo.c136
-rw-r--r--scilab/modules/functions/src/fortran/functions_f.rc10
-rw-r--r--scilab/modules/functions/tests/nonreg_tests/bug_8448.tst27
-rw-r--r--scilab/modules/functions/version.xml2
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in2
-rw-r--r--scilab/modules/genetic_algorithms/version.xml2
-rw-r--r--scilab/modules/graph/Makefile.in2
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabCanvas.java18
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/ScilabGraph.java3
-rw-r--r--scilab/modules/graph/src/java/org/scilab/modules/graph/utils/StyleMap.java24
-rw-r--r--scilab/modules/graphic_export/Makefile.in2
-rw-r--r--scilab/modules/graphic_export/graphic_export.rc10
-rw-r--r--scilab/modules/graphic_export/locales/it_IT/graphic_export.po14
-rw-r--r--scilab/modules/graphic_export/locales/ja_JP/graphic_export.po2
-rw-r--r--scilab/modules/graphic_export/locales/pl_PL/graphic_export.po6
-rw-r--r--scilab/modules/graphic_export/locales/pt_BR/graphic_export.po12
-rw-r--r--scilab/modules/graphic_export/src/c/xs2file.c4
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/FileExporter.java2
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSCircleMarkDrawer.java60
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSDotMarkDrawer.java47
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSMarkDrawingStrategy.java92
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSRenderer.java3
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSStarMarkDrawer.java52
-rw-r--r--scilab/modules/graphic_export/src/java/org/scilab/modules/graphic_export/GL2PSTextRenderer.java2
-rw-r--r--scilab/modules/graphic_export/src/nographic_export/nographic_export.rc10
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4818.dia.ref20
-rw-r--r--scilab/modules/graphic_export/tests/nonreg_tests/bug_4818.tst21
-rw-r--r--scilab/modules/graphic_export/version.xml2
-rw-r--r--scilab/modules/graphics/Makefile.in2
-rw-r--r--scilab/modules/graphics/demos/anim/anim8/anim8.sci2
-rw-r--r--scilab/modules/graphics/graphic.rc10
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/param3d_properties.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/surf.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/3d_plot/surface_properties.xml2
-rw-r--r--scilab/modules/graphics/help/en_US/annotation/legend.xml116
-rw-r--r--scilab/modules/graphics/help/en_US/polygon/polyline_properties.xml4
-rw-r--r--scilab/modules/graphics/help/fr_FR/axes_operations/replot.xml (renamed from scilab/modules/graphics/help/fr_FR/replot.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/axes_operations/subplot.xml (renamed from scilab/modules/graphics/help/fr_FR/subplot.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/geometric_shapes/xfrect.xml (renamed from scilab/modules/graphics/help/fr_FR/xfrect.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/handle/sd2sci.xml (renamed from scilab/modules/graphics/help/fr_FR/sd2sci.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/interaction/locate.xml (renamed from scilab/modules/graphics/help/fr_FR/locate.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/interaction/xclick.xml (renamed from scilab/modules/graphics/help/fr_FR/xclick.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/text/titlepage.xml (renamed from scilab/modules/graphics/help/fr_FR/titlepage.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/text/xinfo.xml (renamed from scilab/modules/graphics/help/fr_FR/xinfo.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/transform/rotate.xml (renamed from scilab/modules/graphics/help/fr_FR/rotate.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/transform/scaling.xml (renamed from scilab/modules/graphics/help/fr_FR/scaling.xml)0
-rw-r--r--scilab/modules/graphics/help/fr_FR/window_control/show_window.xml (renamed from scilab/modules/graphics/help/fr_FR/show_window.xml)0
-rw-r--r--scilab/modules/graphics/help/pt_BR/3d_plot/surf.xml2
-rw-r--r--scilab/modules/graphics/includes/GetProperty.h3
-rw-r--r--scilab/modules/graphics/includes/SetProperty.h10
-rw-r--r--scilab/modules/graphics/locales/de_DE/graphics.po2
-rw-r--r--scilab/modules/graphics/locales/es_ES/graphics.po8
-rw-r--r--scilab/modules/graphics/locales/fr_FR/graphics.po2
-rw-r--r--scilab/modules/graphics/locales/it_IT/graphics.po156
-rw-r--r--scilab/modules/graphics/locales/ja_JP/graphics.po16
-rw-r--r--scilab/modules/graphics/locales/pl_PL/graphics.po46
-rw-r--r--scilab/modules/graphics/locales/pt_BR/graphics.po160
-rw-r--r--scilab/modules/graphics/macros/legend.sci116
-rw-r--r--scilab/modules/graphics/src/c/GetProperty.c31
-rw-r--r--scilab/modules/graphics/src/c/SetProperty.c101
-rw-r--r--scilab/modules/graphics/src/c/getHandleProperty/get_sub_tics_property.c11
-rw-r--r--scilab/modules/graphics/src/nographics/nographics.rc10
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7509.dia.ref86
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7509.tst112
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7836.dia.ref25
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_7836.tst32
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_8475.tst29
-rw-r--r--scilab/modules/graphics/version.xml2
-rw-r--r--scilab/modules/gui/Makefile.in2
-rw-r--r--scilab/modules/gui/locales/es_ES/gui.po8
-rw-r--r--scilab/modules/gui/locales/fr_FR/gui.po4
-rw-r--r--scilab/modules/gui/locales/it_IT/gui.po166
-rw-r--r--scilab/modules/gui/locales/ja_JP/gui.po14
-rw-r--r--scilab/modules/gui/locales/pl_PL/gui.po20
-rw-r--r--scilab/modules/gui/locales/pt_BR/gui.po174
-rw-r--r--scilab/modules/gui/locales/ru_RU/gui.po2
-rw-r--r--scilab/modules/gui/locales/uk_UA/gui.po2
-rw-r--r--scilab/modules/gui/locales/zh_CN/gui.po6
-rw-r--r--scilab/modules/gui/locales/zh_TW/gui.po22
-rw-r--r--scilab/modules/gui/src/c/gui.rc10
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/colorchooser/SwingScilabColorChooser.java220
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/fontchooser/SwingScilabFontChooser.java683
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/messagebox/SwingScilabMessageBox.java1587
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/waitbar/SwingScilabWaitBar.java2
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabAboutBox.java270
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/ScilabSwingUtilities.java345
-rw-r--r--scilab/modules/gui/src/nogui/nogui.rc10
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_8203.tst18
-rw-r--r--scilab/modules/gui/tests/nonreg_tests/bug_8582.tst28
-rw-r--r--scilab/modules/gui/version.xml2
-rw-r--r--scilab/modules/hdf5/Makefile.in2
-rw-r--r--scilab/modules/hdf5/src/c/hdf5.rc10
-rw-r--r--scilab/modules/hdf5/src/java/org/scilab/modules/hdf5/write/H5WriteScilabString.java44
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabBoolean.java17
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabDouble.java17
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabList.java90
-rw-r--r--scilab/modules/hdf5/tests/java/org/scilab/tests/modules/hdf5/testScilabString.java77
-rw-r--r--scilab/modules/helptools/Makefile.am63
-rw-r--r--scilab/modules/helptools/Makefile.in224
-rw-r--r--scilab/modules/helptools/css/html.css39
-rw-r--r--scilab/modules/helptools/css/htmlhelp.css39
-rw-r--r--scilab/modules/helptools/css/javahelp.css153
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_macros.txt5
-rw-r--r--scilab/modules/helptools/data/configuration/scilab_primitives.txt6
-rw-r--r--scilab/modules/helptools/data/template/template_web.html94
-rw-r--r--scilab/modules/helptools/doc/addonprefs.pngbin36653 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/doc.pdfbin80178 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/doc.xml762
-rw-r--r--scilab/modules/helptools/doc/html/ch01.html3
-rw-r--r--scilab/modules/helptools/doc/html/ch02.html21
-rw-r--r--scilab/modules/helptools/doc/html/ch03.html3
-rw-r--r--scilab/modules/helptools/doc/html/ch04.html6
-rw-r--r--scilab/modules/helptools/doc/html/ch05.html7
-rw-r--r--scilab/modules/helptools/doc/html/ch06.html13
-rw-r--r--scilab/modules/helptools/doc/html/ch07.html3
-rw-r--r--scilab/modules/helptools/doc/html/html.css27
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/1.pngbin329 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/10.pngbin361 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/11.pngbin565 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/12.pngbin617 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/13.pngbin623 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/14.pngbin411 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/15.pngbin640 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/2.pngbin353 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/3.pngbin350 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/4.pngbin345 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/5.pngbin348 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/6.pngbin355 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/7.pngbin344 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/8.pngbin357 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/callouts/9.pngbin357 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/images/draft.pngbin17454 -> 0 bytes
-rw-r--r--scilab/modules/helptools/doc/html/index.html3
-rw-r--r--scilab/modules/helptools/doc/html/resources/addonprefs.pngbin36653 -> 0 bytes
-rw-r--r--scilab/modules/helptools/etc/fopconf.xml (renamed from scilab/modules/helptools/fopconf.xml)0
-rw-r--r--scilab/modules/helptools/help/en_US/man.xml400
-rw-r--r--scilab/modules/helptools/help/pt_BR/man.xml293
-rw-r--r--scilab/modules/helptools/helptools.iss4
-rw-r--r--scilab/modules/helptools/locales/fr_FR/helptools.po2
-rw-r--r--scilab/modules/helptools/locales/it_IT/helptools.po4
-rw-r--r--scilab/modules/helptools/locales/pt_BR/helptools.po4
-rw-r--r--scilab/modules/helptools/macros/xmltoformat.sci20
-rw-r--r--scilab/modules/helptools/macros/xmltoweb.sci32
-rw-r--r--scilab/modules/helptools/src/c/helptools.rc10
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/CHMDocbookTagConverter.java10
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookLinkResolver.java22
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/HTMLDocbookTagConverter.java14
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/SciDocMain.java23
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/forge/scidoc/scilab/HTMLScilabCodeHandler.java232
-rw-r--r--scilab/modules/helptools/src/java/org/scilab/modules/helptools/BuildPDF.java2
-rw-r--r--scilab/modules/helptools/version.xml2
-rw-r--r--scilab/modules/history_browser/Makefile.in2
-rw-r--r--scilab/modules/history_browser/src/c/history_browser.rc10
-rw-r--r--scilab/modules/history_browser/src/nohistory_browser/nohistory_browser.rc10
-rw-r--r--scilab/modules/history_manager/Makefile.in2
-rw-r--r--scilab/modules/history_manager/locales/it_IT/history_manager.po4
-rw-r--r--scilab/modules/history_manager/locales/pt_BR/history_manager.po4
-rw-r--r--scilab/modules/history_manager/src/c/history_manager.rc10
-rw-r--r--scilab/modules/history_manager/version.xml2
-rw-r--r--scilab/modules/integer/Makefile.in2
-rw-r--r--scilab/modules/integer/src/c/integer.rc10
-rw-r--r--scilab/modules/integer/src/fortran/integer_f.rc10
-rw-r--r--scilab/modules/integer/version.xml2
-rw-r--r--scilab/modules/interpolation/Makefile.in2
-rw-r--r--scilab/modules/interpolation/locales/es_ES/interpolation.po6
-rw-r--r--scilab/modules/interpolation/locales/it_IT/interpolation.po10
-rw-r--r--scilab/modules/interpolation/locales/ja_JP/interpolation.po4
-rw-r--r--scilab/modules/interpolation/locales/zh_CN/interpolation.po4
-rw-r--r--scilab/modules/interpolation/src/c/interpolation.rc10
-rw-r--r--scilab/modules/interpolation/src/fortran/interpolation_f.rc10
-rw-r--r--scilab/modules/interpolation/version.xml2
-rw-r--r--scilab/modules/intersci/Makefile.in2
-rw-r--r--scilab/modules/intersci/src/lib/intersci.rc10
-rw-r--r--scilab/modules/intersci/version.xml2
-rw-r--r--scilab/modules/io/Makefile.in2
-rw-r--r--scilab/modules/io/locales/it_IT/io.po2
-rw-r--r--scilab/modules/io/locales/pl_PL/io.po2
-rw-r--r--scilab/modules/io/locales/pt_BR/io.po2
-rw-r--r--scilab/modules/io/locales/zh_TW/io.po2
-rw-r--r--scilab/modules/io/src/c/io.rc10
-rw-r--r--scilab/modules/io/src/fortran/io_f.rc10
-rw-r--r--scilab/modules/io/version.xml2
-rw-r--r--scilab/modules/javasci/Makefile.in2
-rw-r--r--scilab/modules/javasci/examples/v2/Example1.java61
-rw-r--r--scilab/modules/javasci/examples/v2/Makefile12
-rw-r--r--scilab/modules/javasci/examples/v2/build.bat9
-rw-r--r--scilab/modules/javasci/help/en_US/javasci_step_by_step.xml162
-rw-r--r--scilab/modules/javasci/javasci.rc10
-rw-r--r--scilab/modules/javasci/version.xml2
-rw-r--r--scilab/modules/jvm/Makefile.in2
-rw-r--r--scilab/modules/jvm/locales/it_IT/jvm.po12
-rw-r--r--scilab/modules/jvm/locales/pt_BR/jvm.po6
-rw-r--r--scilab/modules/jvm/src/c/libjvm.rc10
-rw-r--r--scilab/modules/jvm/src/nojvm/nojvm.rc10
-rw-r--r--scilab/modules/jvm/version.xml2
-rw-r--r--scilab/modules/linear_algebra/Makefile.in2
-rw-r--r--scilab/modules/linear_algebra/src/c/linear_algebra.rc10
-rw-r--r--scilab/modules/linear_algebra/src/fortran/linear_algebra_f.rc10
-rw-r--r--scilab/modules/linear_algebra/version.xml2
-rw-r--r--scilab/modules/localization/Makefile.am7
-rw-r--r--scilab/modules/localization/Makefile.in37
-rw-r--r--scilab/modules/localization/locales/it_IT/localization.po6
-rw-r--r--scilab/modules/localization/src/c/LocaleNameToLCID_Windows.c35
-rw-r--r--scilab/modules/localization/src/c/LocaleNameToLCID_Windows.h30
-rw-r--r--scilab/modules/localization/src/c/getLcidString.c90
-rw-r--r--scilab/modules/localization/src/c/getLcidString.h26
-rw-r--r--scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCID.java28
-rw-r--r--scilab/modules/localization/src/java/org/scilab/modules/localization/LocaleToLCIDJNI.java42
-rw-r--r--scilab/modules/localization/src/jni/LocaleToLCID.i87
-rw-r--r--scilab/modules/localization/src/jni/LocaleToLCID_wrap.c219
-rw-r--r--scilab/modules/localization/src/localization.rc10
-rw-r--r--scilab/modules/localization/src/localization.vcproj36
-rw-r--r--scilab/modules/localization/src/localization_export.def2
-rw-r--r--scilab/modules/localization/version.xml2
-rw-r--r--scilab/modules/m2sci/Makefile.in2
-rw-r--r--scilab/modules/m2sci/locales/es_ES/m2sci.po6
-rw-r--r--scilab/modules/m2sci/locales/fr_FR/m2sci.po4
-rw-r--r--scilab/modules/m2sci/locales/it_IT/m2sci.po16
-rw-r--r--scilab/modules/m2sci/locales/ja_JP/m2sci.po12
-rw-r--r--scilab/modules/m2sci/locales/pl_PL/m2sci.po10
-rw-r--r--scilab/modules/m2sci/version.xml2
-rw-r--r--scilab/modules/maple2scilab/Makefile.in2
-rw-r--r--scilab/modules/maple2scilab/version.xml2
-rw-r--r--scilab/modules/matio/Makefile.in2
-rw-r--r--scilab/modules/matio/src/c/matio.rc10
-rw-r--r--scilab/modules/matio/src/nomatio/nomatio.rc10
-rw-r--r--scilab/modules/matio/version.xml2
-rw-r--r--scilab/modules/mexlib/Makefile.in2
-rw-r--r--scilab/modules/mexlib/src/libmat/libmat.rc10
-rw-r--r--scilab/modules/mexlib/src/libmex/libmex.rc10
-rw-r--r--scilab/modules/mexlib/src/libmx/libmx.rc10
-rw-r--r--scilab/modules/mexlib/version.xml2
-rw-r--r--scilab/modules/modules_manager/Makefile.in2
-rw-r--r--scilab/modules/optimization/Makefile.in2
-rw-r--r--scilab/modules/optimization/locales/de_DE/optimization.po2
-rw-r--r--scilab/modules/optimization/locales/it_IT/optimization.po10
-rw-r--r--scilab/modules/optimization/locales/ja_JP/optimization.po6
-rw-r--r--scilab/modules/optimization/locales/pl_PL/optimization.po2
-rw-r--r--scilab/modules/optimization/src/c/optimization.rc10
-rw-r--r--scilab/modules/optimization/src/fortran/optimization_f.rc10
-rw-r--r--scilab/modules/optimization/version.xml2
-rw-r--r--scilab/modules/output_stream/Makefile.in2
-rw-r--r--scilab/modules/output_stream/locales/it_IT/output_stream.po20
-rw-r--r--scilab/modules/output_stream/locales/pl_PL/output_stream.po4
-rw-r--r--scilab/modules/output_stream/locales/pt_BR/output_stream.po8
-rw-r--r--scilab/modules/output_stream/src/c/errmsg.c10
-rw-r--r--scilab/modules/output_stream/src/c/output_stream.rc10
-rw-r--r--scilab/modules/output_stream/src/fortran/output_stream_f.rc10
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_8279.dia.ref20
-rw-r--r--scilab/modules/output_stream/tests/nonreg_tests/bug_8279.tst22
-rw-r--r--scilab/modules/output_stream/version.xml2
-rw-r--r--scilab/modules/overloading/Makefile.in2
-rw-r--r--scilab/modules/overloading/macros/%r_diag.sci34
-rw-r--r--scilab/modules/overloading/macros/%r_tril.sci17
-rw-r--r--scilab/modules/overloading/macros/%r_triu.sci19
-rw-r--r--scilab/modules/overloading/macros/generic_i_hm.sci2
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7714.dia.ref21
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7714.tst24
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7900.dia.ref16
-rw-r--r--scilab/modules/overloading/tests/nonreg_tests/bug_7900.tst18
-rw-r--r--scilab/modules/overloading/version.xml2
-rw-r--r--scilab/modules/parallel/Makefile.in2
-rw-r--r--scilab/modules/parallel/src/c/parallel.rc6
-rw-r--r--scilab/modules/parameters/Makefile.in2
-rw-r--r--scilab/modules/parameters/src/c/parameters.rc10
-rw-r--r--scilab/modules/parameters/version.xml2
-rw-r--r--scilab/modules/polynomials/Makefile.in2
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f.rc10
-rw-r--r--scilab/modules/polynomials/src/fortran/polynomials_f2c.vcproj16
-rw-r--r--scilab/modules/polynomials/src/fortran/rpoly.f19
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_5686.dia.ref25
-rw-r--r--scilab/modules/polynomials/tests/nonreg_tests/bug_5686.tst26
-rw-r--r--scilab/modules/polynomials/version.xml2
-rw-r--r--scilab/modules/pvm/Makefile.in2
-rw-r--r--scilab/modules/pvm/locales/it_IT/pvm.po4
-rw-r--r--scilab/modules/pvm/src/c/pvm.rc10
-rw-r--r--scilab/modules/pvm/version.xml2
-rw-r--r--scilab/modules/randlib/Makefile.in2
-rw-r--r--scilab/modules/randlib/src/c/randlib.rc10
-rw-r--r--scilab/modules/randlib/src/fortran/randlib_f.rc10
-rw-r--r--scilab/modules/randlib/src/norandlib/norandlib.rc10
-rw-r--r--scilab/modules/randlib/version.xml2
-rw-r--r--scilab/modules/renderer/Makefile.in2
-rw-r--r--scilab/modules/renderer/graphics_Import.def3
-rw-r--r--scilab/modules/renderer/includes/GetJavaProperty.h8
-rw-r--r--scilab/modules/renderer/renderer.rc10
-rw-r--r--scilab/modules/renderer/src/cpp/GetJavaProperty.cpp6
-rw-r--r--scilab/modules/renderer/src/cpp/axesDrawing/AxesTicksComputer.cpp48
-rw-r--r--scilab/modules/renderer/src/cpp/axesDrawing/AxesTicksComputer.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogTicksComputer.cpp62
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutoLogTicksComputer.hxx4
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutomaticTicksComputer.cpp34
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/AutomaticTicksComputer.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ComputeTicksStrategy.hxx2
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ConcreteDrawableSubwin.cpp21
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/ConcreteDrawableSubwin.hxx7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/DrawableSubwin.h9
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawer.cpp32
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawer.hxx7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/TicksDrawerFactory.cpp10
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefLogTicksComputer.cpp7
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefinedTicksComputer.cpp13
-rw-r--r--scilab/modules/renderer/src/cpp/subwinDrawing/UserDefinedTicksComputer.hxx6
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/drawers/MarkDrawerGL.java3
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/figureDrawing/DrawableFigureGL.java20
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/AsteriskMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CircleMarkDrawer.java4
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/CrossMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DiamondMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/DotMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/FilledDiamondMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/JOGLMarkDrawingStrategy.java89
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawer.java20
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/MarkDrawingStrategy.java171
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PentagramMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/PlusMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/SquareMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/java/org/scilab/modules/renderer/utils/MarkDrawing/TriangleMarkDrawer.java2
-rw-r--r--scilab/modules/renderer/src/norenderer/norenderer.rc10
-rw-r--r--scilab/modules/renderer/version.xml2
-rw-r--r--scilab/modules/scicos/Makefile.in2
-rw-r--r--scilab/modules/scicos/locales/it_IT/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/ja_JP/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/pl_PL/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/pt_BR/scicos.po2
-rw-r--r--scilab/modules/scicos/macros/scicos_scicos/scicos_flat.sci2
-rw-r--r--scilab/modules/scicos/src/c/noscicos/noscicos.rc10
-rw-r--r--scilab/modules/scicos/src/c/scicos.rc10
-rw-r--r--scilab/modules/scicos/src/fortran/scicos_f.rc10
-rw-r--r--scilab/modules/scicos/src/scicos_sundials/scicos_sundials.rc10
-rw-r--r--scilab/modules/scicos/version.xml2
-rw-r--r--scilab/modules/scicos_blocks/Makefile.am41
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in506
-rw-r--r--scilab/modules/scicos_blocks/src/c/scicos_blocks.rc10
-rw-r--r--scilab/modules/scicos_blocks/src/c/sum.c83
-rw-r--r--scilab/modules/scicos_blocks/src/fortran/scicos_blocks_f.rc10
-rw-r--r--scilab/modules/scicos_blocks/version.xml2
-rw-r--r--scilab/modules/scinotes/Makefile.in2
-rw-r--r--scilab/modules/scinotes/locales/fr_FR/scinotes.po94
-rw-r--r--scilab/modules/scinotes/src/c/scinotes.rc10
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabDocument.java32
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabEditorPane.java9
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexer.java2950
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabLexerConstants.java9
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/ScilabView.java10
-rw-r--r--scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/utils/SciNotesMessages.java26
-rw-r--r--scilab/modules/scinotes/src/jflex/scilab.jflex13
-rw-r--r--scilab/modules/scinotes/tests/nonreg_tests/bug_8627.tst23
-rw-r--r--scilab/modules/shell/Makefile.in2
-rw-r--r--scilab/modules/shell/locales/it_IT/shell.po2
-rw-r--r--scilab/modules/shell/locales/pt_BR/shell.po2
-rw-r--r--scilab/modules/shell/src/c/shell.rc8
-rw-r--r--scilab/modules/shell/version.xml2
-rw-r--r--scilab/modules/signal_processing/Makefile.in2
-rw-r--r--scilab/modules/signal_processing/src/c/signal_processing.rc10
-rw-r--r--scilab/modules/signal_processing/src/fortran/signal_processing_f.rc10
-rw-r--r--scilab/modules/signal_processing/version.xml2
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in2
-rw-r--r--scilab/modules/simulated_annealing/version.xml2
-rw-r--r--scilab/modules/sound/Makefile.in2
-rw-r--r--scilab/modules/sound/locales/it_IT/sound.po4
-rw-r--r--scilab/modules/sound/locales/pt_BR/sound.po2
-rw-r--r--scilab/modules/sound/src/c/sound.rc10
-rw-r--r--scilab/modules/sound/src/nosound/nosound.rc10
-rw-r--r--scilab/modules/sound/version.xml2
-rw-r--r--scilab/modules/sparse/Makefile.in2
-rw-r--r--scilab/modules/sparse/help/en_US/adj2sp.xml199
-rw-r--r--scilab/modules/sparse/help/en_US/sp2adj.xml203
-rw-r--r--scilab/modules/sparse/locales/es_ES/sparse.po4
-rw-r--r--scilab/modules/sparse/locales/it_IT/sparse.po6
-rw-r--r--scilab/modules/sparse/locales/ja_JP/sparse.po2
-rw-r--r--scilab/modules/sparse/locales/pt_BR/sparse.po2
-rw-r--r--scilab/modules/sparse/macros/adj2sp.sci99
-rw-r--r--scilab/modules/sparse/macros/sp2adj.sci58
-rw-r--r--scilab/modules/sparse/src/c/sparse.rc10
-rw-r--r--scilab/modules/sparse/src/fortran/sparse_f.rc10
-rw-r--r--scilab/modules/sparse/src/fortran/ta2lpd.f1
-rw-r--r--scilab/modules/sparse/tests/unit_tests/adj2sp.dia.ref93
-rw-r--r--scilab/modules/sparse/tests/unit_tests/adj2sp.tst96
-rw-r--r--scilab/modules/sparse/tests/unit_tests/sp2adj.dia.ref101
-rw-r--r--scilab/modules/sparse/tests/unit_tests/sp2adj.tst104
-rw-r--r--scilab/modules/sparse/version.xml2
-rw-r--r--scilab/modules/special_functions/Makefile.am8
-rw-r--r--scilab/modules/special_functions/Makefile.in63
-rw-r--r--scilab/modules/special_functions/help/en_US/bessel.xml9
-rw-r--r--scilab/modules/special_functions/help/en_US/oldbessel.xml223
-rw-r--r--scilab/modules/special_functions/help/pt_BR/bessel.xml7
-rw-r--r--scilab/modules/special_functions/help/pt_BR/oldbessel.xml213
-rw-r--r--scilab/modules/special_functions/includes/gw_special_functions.h4
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/gw_special_functions.c4
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesseli.c40
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesselj.c38
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbesselk.c39
-rw-r--r--scilab/modules/special_functions/sci_gateway/c/sci_oldbessely.c39
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesseli.f116
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesselj.f99
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbesselk.f116
-rw-r--r--scilab/modules/special_functions/sci_gateway/fortran/sci_f_oldbessely.f106
-rw-r--r--scilab/modules/special_functions/sci_gateway/special_functions_gateway.xml12
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.rc10
-rw-r--r--scilab/modules/special_functions/src/c/special_functions.vcproj16
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.def4
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.rc10
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f.vfproj6
-rw-r--r--scilab/modules/special_functions/src/fortran/special_functions_f2c.vcproj32
-rw-r--r--scilab/modules/special_functions/version.xml2
-rw-r--r--scilab/modules/spreadsheet/Makefile.in2
-rw-r--r--scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po4
-rw-r--r--scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po28
-rw-r--r--scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po4
-rw-r--r--scilab/modules/spreadsheet/locales/pl_PL/spreadsheet.po6
-rw-r--r--scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po28
-rw-r--r--scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/macros/read_csv.sci23
-rw-r--r--scilab/modules/spreadsheet/src/c/spreadsheet.rc10
-rw-r--r--scilab/modules/spreadsheet/src/nospreadsheet/nospreadsheet.rc10
-rw-r--r--scilab/modules/spreadsheet/tests/nonreg_tests/bug_8532.dia.ref26
-rw-r--r--scilab/modules/spreadsheet/tests/nonreg_tests/bug_8532.tst29
-rw-r--r--scilab/modules/spreadsheet/version.xml2
-rw-r--r--scilab/modules/statistics/Makefile.in2
-rw-r--r--scilab/modules/statistics/locales/es_ES/statistics.po4
-rw-r--r--scilab/modules/statistics/locales/it_IT/statistics.po34
-rw-r--r--scilab/modules/statistics/locales/ja_JP/statistics.po6
-rw-r--r--scilab/modules/statistics/locales/pl_PL/statistics.po4
-rw-r--r--scilab/modules/statistics/locales/pt_BR/statistics.po38
-rw-r--r--scilab/modules/statistics/locales/zh_CN/statistics.po2
-rw-r--r--scilab/modules/statistics/locales/zh_TW/statistics.po8
-rw-r--r--scilab/modules/statistics/src/c/statistics.rc10
-rw-r--r--scilab/modules/statistics/src/dcdflib/dcd_f/dcd_f.rc10
-rw-r--r--scilab/modules/statistics/version.xml2
-rw-r--r--scilab/modules/string/Makefile.in2
-rw-r--r--scilab/modules/string/locales/es_ES/string.po2
-rw-r--r--scilab/modules/string/locales/it_IT/string.po26
-rw-r--r--scilab/modules/string/locales/ja_JP/string.po4
-rw-r--r--scilab/modules/string/locales/pl_PL/string.po4
-rw-r--r--scilab/modules/string/locales/pt_BR/string.po26
-rw-r--r--scilab/modules/string/locales/zh_CN/string.po2
-rw-r--r--scilab/modules/string/sci_gateway/c/sci_length.c634
-rw-r--r--scilab/modules/string/src/c/setScilabCharactersCodes.c16
-rw-r--r--scilab/modules/string/src/c/string.rc10
-rw-r--r--scilab/modules/string/src/fortran/string_f.rc10
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_8528.dia.ref25
-rw-r--r--scilab/modules/string/tests/nonreg_tests/bug_8528.tst26
-rw-r--r--scilab/modules/string/version.xml2
-rw-r--r--scilab/modules/symbolic/Makefile.in2
-rw-r--r--scilab/modules/symbolic/src/c/symbolic.rc10
-rw-r--r--scilab/modules/symbolic/src/fortran/symbolic_f.rc10
-rw-r--r--scilab/modules/symbolic/version.xml2
-rw-r--r--scilab/modules/tclsci/Makefile.am2
-rw-r--r--scilab/modules/tclsci/Makefile.in4
-rw-r--r--scilab/modules/tclsci/locales/it_IT/tclsci.po2
-rw-r--r--scilab/modules/tclsci/src/c/tclsci.rc10
-rw-r--r--scilab/modules/tclsci/tcl/sciGUI/sciBrowseVar.tcl374
-rw-r--r--scilab/modules/tclsci/tcl/sciGUI/sciEditVar.tcl699
-rw-r--r--scilab/modules/tclsci/version.xml2
-rw-r--r--scilab/modules/texmacs/Makefile.in2
-rw-r--r--scilab/modules/texmacs/version.xml2
-rw-r--r--scilab/modules/time/Makefile.in2
-rw-r--r--scilab/modules/time/locales/es_ES/time.po4
-rw-r--r--scilab/modules/time/locales/it_IT/time.po6
-rw-r--r--scilab/modules/time/locales/ja_JP/time.po2
-rw-r--r--scilab/modules/time/locales/pl_PL/time.po4
-rw-r--r--scilab/modules/time/locales/pt_BR/time.po6
-rw-r--r--scilab/modules/time/src/c/time.rc10
-rw-r--r--scilab/modules/time/version.xml2
-rw-r--r--scilab/modules/types/Makefile.in2
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabBoolean.java5
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabDouble.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabInteger.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabMList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabString.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabTList.java4
-rw-r--r--scilab/modules/types/src/java/org/scilab/modules/types/ScilabType.java5
-rw-r--r--scilab/modules/ui_data/Makefile.in2
-rw-r--r--scilab/modules/umfpack/Makefile.in2
-rw-r--r--scilab/modules/umfpack/locales/it_IT/umfpack.po2
-rw-r--r--scilab/modules/umfpack/locales/pt_BR/umfpack.po2
-rw-r--r--scilab/modules/umfpack/src/c/umfpack.rc10
-rw-r--r--scilab/modules/umfpack/src/noumfpack/noumfpack.rc10
-rw-r--r--scilab/modules/umfpack/version.xml2
-rw-r--r--scilab/modules/windows_tools/Makefile.in2
-rw-r--r--scilab/modules/windows_tools/locales/it_IT/windows_tools.po2
-rw-r--r--scilab/modules/windows_tools/locales/pt_BR/windows_tools.po2
-rw-r--r--scilab/modules/windows_tools/src/c/CScilex/CScilex.rc12
-rw-r--r--scilab/modules/windows_tools/src/c/WScilex/WScilex.rc12
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/scilab_windows.rc10
-rw-r--r--scilab/modules/windows_tools/src/c/scilab_windows/spawncommand.c19
-rw-r--r--scilab/modules/windows_tools/src/c/windows_tools.rc10
-rw-r--r--scilab/modules/windows_tools/src/nowindows_tools/nowindows_tools.rc10
-rw-r--r--scilab/modules/windows_tools/tests/nonreg_tests/bug_8424.tst31
-rw-r--r--scilab/modules/windows_tools/version.xml2
-rw-r--r--scilab/modules/xcos/Makefile.am2
-rw-r--r--scilab/modules/xcos/Makefile.in4
-rw-r--r--scilab/modules/xcos/examples/Variable_delay.xcos1648
-rw-r--r--scilab/modules/xcos/examples/dead_zone.xcos1577
-rw-r--r--scilab/modules/xcos/examples/derivative.xcos1555
-rw-r--r--scilab/modules/xcos/examples/pid_d.xcos7137
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/DERIV.xml180
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/INTEGRAL_m.xml62
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/PID.xml293
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Continuous_pal/VARIABLE_DELAY.xml261
-rw-r--r--scilab/modules/xcos/help/en_US/palettes/Discontinuities_pal/DEADBAND.xml272
-rw-r--r--scilab/modules/xcos/help/examples/INTEGRAL_diagram.png (renamed from scilab/modules/xcos/help/examples/INTEGRAL_m.png)bin109720 -> 109720 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_c.pngbin0 -> 9536 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_d.pngbin0 -> 35237 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_desc.pngbin0 -> 1630 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq.gifbin0 -> 3316 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq1.gifbin0 -> 793 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_eq2.gifbin0 -> 1116 bytes
-rw-r--r--scilab/modules/xcos/help/examples/deadband_screen.pngbin0 -> 25537 bytes
-rw-r--r--scilab/modules/xcos/help/examples/derivative_diag.pngbin0 -> 65599 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_error.gifbin0 -> 983 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_example.pngbin0 -> 61833 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter.gifbin0 -> 1510 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter_param.pngbin0 -> 12121 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_filter_parameters.pngbin0 -> 54705 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_law.gifbin0 -> 3547 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_parameters.pngbin0 -> 11213 bytes
-rw-r--r--scilab/modules/xcos/help/examples/pid_structure.pngbin0 -> 1755 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay1.pngbin0 -> 11526 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay2.pngbin0 -> 51736 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay_eq.gifbin0 -> 1304 bytes
-rw-r--r--scilab/modules/xcos/help/examples/variable_delay_with_equations.pngbin0 -> 7028 bytes
-rw-r--r--scilab/modules/xcos/images/gui/INTEGRAL_m_gui.gifbin2408 -> 23889 bytes
-rw-r--r--scilab/modules/xcos/images/gui/PID_gui.gifbin1600 -> 17892 bytes
-rw-r--r--scilab/modules/xcos/images/palettes/DEADBAND_modif.png (renamed from scilab/modules/xcos/images/palettes/DEADBAND.png)bin1325 -> 1325 bytes
-rw-r--r--scilab/modules/xcos/locales/it_IT/xcos.po18
-rw-r--r--scilab/modules/xcos/locales/ja_JP/xcos.po8
-rw-r--r--scilab/modules/xcos/locales/pl_PL/xcos.po2
-rw-r--r--scilab/modules/xcos/locales/pt_BR/xcos.po10
-rw-r--r--scilab/modules/xcos/macros/%diagram_xcos.sci1
-rw-r--r--scilab/modules/xcos/macros/generateBlockImage.sci32
-rw-r--r--scilab/modules/xcos/macros/generateBlockImages.sci13
-rw-r--r--scilab/modules/xcos/macros/xcosPalAddBlock.sci2
-rw-r--r--scilab/modules/xcos/macros/xcosPalExport.sci1
-rw-r--r--scilab/modules/xcos/macros/xcos_simulate.sci2
-rw-r--r--scilab/modules/xcos/src/c/xcos.rc10
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/AboutXcosAction.java2
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/actions/EditFormatAction.java142
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/BasicBlock.java14
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/ConstBlock.java11
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/SplitBlock.java131
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/block/listener/SumPortLabelingListener.java4
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/XcosDiagram.java212
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/swing/handler/ConnectPreview.java27
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/graph/swing/handler/ConnectionHandler.java19
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/io/scicos/BlockElement.java13
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/link/BasicLink.java38
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/utils/XcosMessages.java1
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8348.tst29
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8348.xcos1
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.dia.ref20
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.tst24
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8441.xcos724
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.dia.ref18
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.tst21
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8483.xcos2370
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8556.tst22
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8569.tst22
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_8569.xcos1379
-rw-r--r--scilab/modules/xcos/tests/unit_tests/computational_functions.dia.ref415
-rw-r--r--scilab/modules/xcos/tests/unit_tests/computational_functions.tst427
776 files changed, 31407 insertions, 10952 deletions
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 06fa33a..7d0672a 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -243,6 +243,7 @@ FGREP = @FGREP@
243FLEXDOCK = @FLEXDOCK@ 243FLEXDOCK = @FLEXDOCK@
244FLIBS = @FLIBS@ 244FLIBS = @FLIBS@
245FOP = @FOP@ 245FOP = @FOP@
246GENHTML = @GENHTML@
246GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 247GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
247GIWS_BIN = @GIWS_BIN@ 248GIWS_BIN = @GIWS_BIN@
248GLUEGEN_RT = @GLUEGEN_RT@ 249GLUEGEN_RT = @GLUEGEN_RT@
@@ -287,6 +288,7 @@ JROSETTA_API = @JROSETTA_API@
287JROSETTA_ENGINE = @JROSETTA_ENGINE@ 288JROSETTA_ENGINE = @JROSETTA_ENGINE@
288JUNIT = @JUNIT@ 289JUNIT = @JUNIT@
289LAPACK_LIBS = @LAPACK_LIBS@ 290LAPACK_LIBS = @LAPACK_LIBS@
291LCOV = @LCOV@
290LD = @LD@ 292LD = @LD@
291LDFLAGS = @LDFLAGS@ 293LDFLAGS = @LDFLAGS@
292LIBICONV = @LIBICONV@ 294LIBICONV = @LIBICONV@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 7c2cd1a..1501c77 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -232,6 +232,7 @@ FGREP = @FGREP@
232FLEXDOCK = @FLEXDOCK@ 232FLEXDOCK = @FLEXDOCK@
233FLIBS = @FLIBS@ 233FLIBS = @FLIBS@
234FOP = @FOP@ 234FOP = @FOP@
235GENHTML = @GENHTML@
235GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 236GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
236GIWS_BIN = @GIWS_BIN@ 237GIWS_BIN = @GIWS_BIN@
237GLUEGEN_RT = @GLUEGEN_RT@ 238GLUEGEN_RT = @GLUEGEN_RT@
@@ -276,6 +277,7 @@ JROSETTA_API = @JROSETTA_API@
276JROSETTA_ENGINE = @JROSETTA_ENGINE@ 277JROSETTA_ENGINE = @JROSETTA_ENGINE@
277JUNIT = @JUNIT@ 278JUNIT = @JUNIT@
278LAPACK_LIBS = @LAPACK_LIBS@ 279LAPACK_LIBS = @LAPACK_LIBS@
280LCOV = @LCOV@
279LD = @LD@ 281LD = @LD@
280LDFLAGS = @LDFLAGS@ 282LDFLAGS = @LDFLAGS@
281LIBICONV = @LIBICONV@ 283LIBICONV = @LIBICONV@
diff --git a/scilab/modules/action_binding/locales/it_IT/action_binding.po b/scilab/modules/action_binding/locales/it_IT/action_binding.po
index 3bdf694..c6fe824 100644
--- a/scilab/modules/action_binding/locales/it_IT/action_binding.po
+++ b/scilab/modules/action_binding/locales/it_IT/action_binding.po
@@ -31,7 +31,7 @@ msgstr "Eseguito di nuovo lo stesso comando"
31 31
32#, c-format 32#, c-format
33msgid "Scilab '%s' module not installed.\n" 33msgid "Scilab '%s' module not installed.\n"
34msgstr "Il modulo \"%s\" di Scilab non è installato.\n" 34msgstr "Il modulo '%s' di Scilab non è installato.\n"
35 35
36msgid "Unable to communicate with the interpreter" 36msgid "Unable to communicate with the interpreter"
37msgstr "Impossibile comunicare con l'interprete" 37msgstr "Impossibile comunicare con l'interprete"
diff --git a/scilab/modules/action_binding/locales/pt_BR/action_binding.po b/scilab/modules/action_binding/locales/pt_BR/action_binding.po
index 4360a14..ed55422 100644
--- a/scilab/modules/action_binding/locales/pt_BR/action_binding.po
+++ b/scilab/modules/action_binding/locales/pt_BR/action_binding.po
@@ -30,7 +30,7 @@ msgstr "Mesmo comando executado novamente"
30 30
31#, c-format 31#, c-format
32msgid "Scilab '%s' module not installed.\n" 32msgid "Scilab '%s' module not installed.\n"
33msgstr "O módulo \"%s\" do Scilab não está instalado.\n" 33msgstr "O módulo '%s' do Scilab não está instalado.\n"
34 34
35msgid "Unable to communicate with the interpreter" 35msgid "Unable to communicate with the interpreter"
36msgstr "Incapaz de se comunicar com o interpretador" 36msgstr "Incapaz de se comunicar com o interpretador"
diff --git a/scilab/modules/action_binding/src/c/action_binding.rc b/scilab/modules/action_binding/src/c/action_binding.rc
index 3e29b51..ed72ab8 100644
--- a/scilab/modules/action_binding/src/c/action_binding.rc
+++ b/scilab/modules/action_binding/src/c/action_binding.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0 52 FILEVERSION 5,3,1,0
53 PRODUCTVERSION 5,3,0,0 53 PRODUCTVERSION 5,3,1,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "action_binding module" 68 VALUE "FileDescription", "action_binding module"
69 VALUE "FileVersion", "5, 3, 0, 0" 69 VALUE "FileVersion", "5, 3, 1, 0"
70 VALUE "InternalName", "action_binding module" 70 VALUE "InternalName", "action_binding module"
71 VALUE "LegalCopyright", "Copyright (C) 2010" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "action_binding.dll" 72 VALUE "OriginalFilename", "action_binding.dll"
73 VALUE "ProductName", " action_binding" 73 VALUE "ProductName", " action_binding"
74 VALUE "ProductVersion", "5, 3, 0, 0" 74 VALUE "ProductVersion", "5, 3, 1, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
index 883b53f..84fae05 100644
--- a/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
+++ b/scilab/modules/action_binding/src/noaction_binding/noaction_binding.rc
@@ -49,8 +49,8 @@ END
49// 49//
50 50
51VS_VERSION_INFO VERSIONINFO 51VS_VERSION_INFO VERSIONINFO
52 FILEVERSION 5,3,0,0 52 FILEVERSION 5,3,1,0
53 PRODUCTVERSION 5,3,0,0 53 PRODUCTVERSION 5,3,1,0
54 FILEFLAGSMASK 0x17L 54 FILEFLAGSMASK 0x17L
55#ifdef _DEBUG 55#ifdef _DEBUG
56 FILEFLAGS 0x1L 56 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
66 BLOCK "040c04b0" 66 BLOCK "040c04b0"
67 BEGIN 67 BEGIN
68 VALUE "FileDescription", "noaction_binding module" 68 VALUE "FileDescription", "noaction_binding module"
69 VALUE "FileVersion", "5, 3, 0, 0" 69 VALUE "FileVersion", "5, 3, 1, 0"
70 VALUE "InternalName", "noaction_binding module" 70 VALUE "InternalName", "noaction_binding module"
71 VALUE "LegalCopyright", "Copyright (C) 2010" 71 VALUE "LegalCopyright", "Copyright (C) 2011"
72 VALUE "OriginalFilename", "noaction_binding.dll" 72 VALUE "OriginalFilename", "noaction_binding.dll"
73 VALUE "ProductName", " noaction_binding" 73 VALUE "ProductName", " noaction_binding"
74 VALUE "ProductVersion", "5, 3, 0, 0" 74 VALUE "ProductVersion", "5, 3, 1, 0"
75 END 75 END
76 END 76 END
77 BLOCK "VarFileInfo" 77 BLOCK "VarFileInfo"
diff --git a/scilab/modules/action_binding/version.xml b/scilab/modules/action_binding/version.xml
index 73baff8..1ba38c8 100644
--- a/scilab/modules/action_binding/version.xml
+++ b/scilab/modules/action_binding/version.xml
@@ -8,5 +8,5 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="action_binding"> 10<MODULE_VERSION name="action_binding">
11<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 6071122..06996bb 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -200,6 +200,7 @@ FGREP = @FGREP@
200FLEXDOCK = @FLEXDOCK@ 200FLEXDOCK = @FLEXDOCK@
201FLIBS = @FLIBS@ 201FLIBS = @FLIBS@
202FOP = @FOP@ 202FOP = @FOP@
203GENHTML = @GENHTML@
203GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 204GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
204GIWS_BIN = @GIWS_BIN@ 205GIWS_BIN = @GIWS_BIN@
205GLUEGEN_RT = @GLUEGEN_RT@ 206GLUEGEN_RT = @GLUEGEN_RT@
@@ -244,6 +245,7 @@ JROSETTA_API = @JROSETTA_API@
244JROSETTA_ENGINE = @JROSETTA_ENGINE@ 245JROSETTA_ENGINE = @JROSETTA_ENGINE@
245JUNIT = @JUNIT@ 246JUNIT = @JUNIT@
246LAPACK_LIBS = @LAPACK_LIBS@ 247LAPACK_LIBS = @LAPACK_LIBS@
248LCOV = @LCOV@
247LD = @LD@ 249LD = @LD@
248LDFLAGS = @LDFLAGS@ 250LDFLAGS = @LDFLAGS@
249LIBICONV = @LIBICONV@ 251LIBICONV = @LIBICONV@
diff --git a/scilab/modules/api_scilab/src/c/api_scilab.rc b/scilab/modules/api_scilab/src/c/api_scilab.rc
index c9f8561..6db0566 100644
--- a/scilab/modules/api_scilab/src/c/api_scilab.rc
+++ b/scilab/modules/api_scilab/src/c/api_scilab.rc
@@ -48,8 +48,8 @@ END
48// 48//
49 49
50VS_VERSION_INFO VERSIONINFO 50VS_VERSION_INFO VERSIONINFO
51 FILEVERSION 5,3,0,0 51 FILEVERSION 5,3,1,0
52 PRODUCTVERSION 5,3,0,0 52 PRODUCTVERSION 5,3,1,0
53 FILEFLAGSMASK 0x17L 53 FILEFLAGSMASK 0x17L
54#ifdef _DEBUG 54#ifdef _DEBUG
55 FILEFLAGS 0x1L 55 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
65 BLOCK "040c04b0" 65 BLOCK "040c04b0"
66 BEGIN 66 BEGIN
67 VALUE "FileDescription", "api_scilab module" 67 VALUE "FileDescription", "api_scilab module"
68 VALUE "FileVersion", "5, 3, 0, 0" 68 VALUE "FileVersion", "5, 3, 1, 0"
69 VALUE "InternalName", "api_scilab module" 69 VALUE "InternalName", "api_scilab module"
70 VALUE "LegalCopyright", "Copyright (C) 2010" 70 VALUE "LegalCopyright", "Copyright (C) 2011"
71 VALUE "OriginalFilename", "api_scilab.dll" 71 VALUE "OriginalFilename", "api_scilab.dll"
72 VALUE "ProductName", "api_scilab module" 72 VALUE "ProductName", "api_scilab module"
73 VALUE "ProductVersion", "5, 3, 0, 0" 73 VALUE "ProductVersion", "5, 3, 1, 0"
74 END 74 END
75 END 75 END
76 BLOCK "VarFileInfo" 76 BLOCK "VarFileInfo"
diff --git a/scilab/modules/api_scilab/src/cpp/api_double.cpp b/scilab/modules/api_scilab/src/cpp/api_double.cpp
index 3ca0514..0a14624 100644
--- a/scilab/modules/api_scilab/src/cpp/api_double.cpp
+++ b/scilab/modules/api_scilab/src/cpp/api_double.cpp
@@ -29,509 +29,510 @@
29 29
30SciErr getMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal) 30SciErr getMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal)
31{ 31{
32 return getCommonMatrixOfDouble(_pvCtx, _piAddress, 0, _piRows, _piCols, _pdblReal, NULL); 32 return getCommonMatrixOfDouble(_pvCtx, _piAddress, 0, _piRows, _piCols, _pdblReal, NULL);
33} 33}
34 34
35SciErr getComplexMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 35SciErr getComplexMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
36{ 36{
37 return getCommonMatrixOfDouble(_pvCtx, _piAddress, 1, _piRows, _piCols, _pdblReal, _pdblImg); 37 return getCommonMatrixOfDouble(_pvCtx, _piAddress, 1, _piRows, _piCols, _pdblReal, _pdblImg);
38} 38}
39 39
40SciErr getComplexZMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, doublecomplex** _pdblZ) 40SciErr getComplexZMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, doublecomplex** _pdblZ)
41{ 41{
42 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 42 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
43 double *pdblReal = NULL; 43 double *pdblReal = NULL;
44 double *pdblImg = NULL; 44 double *pdblImg = NULL;
45 45
46 sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, isVarComplex(_pvCtx, _piAddress), _piRows, _piCols, &pdblReal, &pdblImg); 46 sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, isVarComplex(_pvCtx, _piAddress), _piRows, _piCols, &pdblReal, &pdblImg);
47 if(sciErr.iErr) 47 if(sciErr.iErr)
48 { 48 {
49 addErrorMessage(&sciErr, API_ERROR_GET_ZDOUBLE, _("%s: Unable to get argument #%d"), "getComplexZMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress)); 49 addErrorMessage(&sciErr, API_ERROR_GET_ZDOUBLE, _("%s: Unable to get argument #%d"), "getComplexZMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
50 return sciErr; 50 return sciErr;
51 } 51 }
52 52
53 *_pdblZ = oGetDoubleComplexFromPointer(pdblReal, pdblImg, *_piRows * *_piCols); 53 *_pdblZ = oGetDoubleComplexFromPointer(pdblReal, pdblImg, *_piRows * *_piCols);
54 return sciErr; 54 return sciErr;
55} 55}
56 56
57SciErr getCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg) 57SciErr getCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
58{ 58{
59 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 59 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
60 int iType = 0; 60 int iType = 0;
61 if( _piAddress == NULL) 61 if( _piAddress == NULL)
62 { 62 {
63 addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble"); 63 addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble");
64 return sciErr; 64 return sciErr;
65 } 65 }
66 66
67 sciErr = getVarType(_pvCtx, _piAddress, &iType); 67 sciErr = getVarType(_pvCtx, _piAddress, &iType);
68 if(sciErr.iErr || iType != sci_matrix) 68 if(sciErr.iErr || iType != sci_matrix)
69 { 69 {
70 addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", _("double matrix")); 70 addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", _("double matrix"));
71 return sciErr; 71 return sciErr;
72 } 72 }
73 73
74 if(isVarComplex(_pvCtx, _piAddress) != _iComplex) 74 if(isVarComplex(_pvCtx, _piAddress) != _iComplex)
75 { 75 {
76 addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), "getComplexMatrixOfDouble"); 76 addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), "getComplexMatrixOfDouble");
77 return sciErr; 77 return sciErr;
78 } 78 }
79 79
80 sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols); 80 sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols);
81 if(sciErr.iErr) 81 if(sciErr.iErr)
82 { 82 {
83 addErrorMessage(&sciErr, API_ERROR_GET_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress)); 83 addErrorMessage(&sciErr, API_ERROR_GET_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
84 return sciErr; 84 return sciErr;
85 } 85 }
86 86
87 if(_pdblReal != NULL) 87 if(_pdblReal != NULL)
88 { 88 {
89 *_pdblReal = (double*)(_piAddress + 4); 89 *_pdblReal = (double*)(_piAddress + 4);
90 } 90 }
91 if(_iComplex && _pdblImg != NULL) 91 if(_iComplex && _pdblImg != NULL)
92 { 92 {
93 *_pdblImg = (double*)(_piAddress + 4) + *_piRows * *_piCols; 93 *_pdblImg = (double*)(_piAddress + 4) + *_piRows * *_piCols;
94 } 94 }
95 return sciErr; 95 return sciErr;
96} 96}
97 97
98SciErr allocMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal) 98SciErr allocMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal)
99{ 99{
100 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 100 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
101 double *pdblReal = NULL; 101 double *pdblReal = NULL;
102 102
103 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 0, _iRows, _iCols, &pdblReal, NULL); 103 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 0, _iRows, _iCols, &pdblReal, NULL);
104 if(sciErr.iErr) 104 if(sciErr.iErr)
105 { 105 {
106 addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfDouble"); 106 addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfDouble");
107 return sciErr; 107 return sciErr;
108 } 108 }
109 109
110 *_pdblReal = pdblReal; 110 *_pdblReal = pdblReal;
111 111
112 return sciErr; 112 return sciErr;
113} 113}
114 114
115SciErr allocComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg) 115SciErr allocComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
116{ 116{
117 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 117 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
118 double *pdblReal = NULL; 118 double *pdblReal = NULL;
119 double *pdblImg = NULL; 119 double *pdblImg = NULL;
120 120
121 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 1, _iRows, _iCols, &pdblReal, &pdblImg); 121 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 1, _iRows, _iCols, &pdblReal, &pdblImg);
122 if(sciErr.iErr) 122 if(sciErr.iErr)
123 { 123 {
124 addErrorMessage(&sciErr, API_ERROR_ALLOC_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble"); 124 addErrorMessage(&sciErr, API_ERROR_ALLOC_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
125 return sciErr; 125 return sciErr;
126 } 126 }
127 127
128 *_pdblReal = pdblReal; 128 *_pdblReal = pdblReal;
129 *_pdblImg = pdblImg; 129 *_pdblImg = pdblImg;
130 return sciErr; 130 return sciErr;
131} 131}
132 132
133SciErr allocCommonMatrixOfDouble(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg) 133SciErr allocCommonMatrixOfDouble(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
134{ 134{
135 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 135 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
136 int iNewPos = Top - Rhs + _iVar; 136 int iNewPos = Top - Rhs + _iVar;
137 int iAddr = *Lstk(iNewPos); 137 int iAddr = *Lstk(iNewPos);
138 int* piAddr = NULL; 138 int* piAddr = NULL;
139 139
140 int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2; 140 int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
141 int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(iAddr)); 141 int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(iAddr));
142 if (iMemSize > iFreeSpace) 142 if (iMemSize > iFreeSpace)
143 { 143 {
144 addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize); 144 addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
145 return sciErr; 145 return sciErr;
146 } 146 }
147 147
148 getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr); 148 getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr);
149 fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, _pdblReal, _pdblImg); 149 fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, _pdblReal, _pdblImg);
150 updateInterSCI(_iVar, '$', iAddr, sadr(iadr(iAddr) + 4)); 150 updateInterSCI(_iVar, '$', iAddr, sadr(iadr(iAddr) + 4));
151 updateLstk(iNewPos, sadr(iadr(iAddr) + 4), _iRows * _iCols * (_iComplex + 1)); 151 updateLstk(iNewPos, sadr(iadr(iAddr) + 4), _iRows * _iCols * (_iComplex + 1));
152 return sciErr; 152 return sciErr;
153} 153}
154 154
155SciErr fillCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg) 155SciErr fillCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
156{ 156{
157 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 157 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
158 _piAddress[0] = sci_matrix; 158 _piAddress[0] = sci_matrix;
159 _piAddress[1] = Min(_iRows, _iRows * _iCols); 159 _piAddress[1] = Min(_iRows, _iRows * _iCols);
160 _piAddress[2] = Min(_iCols, _iRows * _iCols); 160 _piAddress[2] = Min(_iCols, _iRows * _iCols);
161 _piAddress[3] = _iComplex; 161 _piAddress[3] = _iComplex;
162 162
163 163
164 if(_pdblReal != NULL) 164 if(_pdblReal != NULL)
165 { 165 {
166 *_pdblReal = (double*)(_piAddress + 4); 166 *_pdblReal = (double*)(_piAddress + 4);
167 } 167 }
168 168
169 if(_iComplex != 0 && _pdblImg != NULL) 169 if(_iComplex != 0 && _pdblImg != NULL)
170 { 170 {
171 *_pdblImg = *_pdblReal + _iRows * _iCols; 171 *_pdblImg = *_pdblReal + _iRows * _iCols;
172 } 172 }
173 173
174 return sciErr; 174 return sciErr;
175} 175}
176 176
177SciErr createMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal) 177SciErr createMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal)
178{ 178{
179 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 179 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
180 double *pdblReal = NULL; 180 double *pdblReal = NULL;
181 181
182 int iOne = 1; 182 int iOne = 1;
183 int iSize = _iRows * _iCols; 183 int iSize = _iRows * _iCols;
184 184
185 sciErr = allocMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal); 185 sciErr = allocMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal);
186 if(sciErr.iErr) 186 if(sciErr.iErr)
187 { 187 {
188 addErrorMessage(&sciErr, API_ERROR_CREATE_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble"); 188 addErrorMessage(&sciErr, API_ERROR_CREATE_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
189 return sciErr; 189 return sciErr;
190 } 190 }
191 191
192 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne); 192 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
193 return sciErr; 193 return sciErr;
194} 194}
195 195
196SciErr createComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg) 196SciErr createComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
197{ 197{
198 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 198 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
199 double *pdblReal = NULL; 199 double *pdblReal = NULL;
200 double *pdblImg = NULL; 200 double *pdblImg = NULL;
201 201
202 int iOne = 1; 202 int iOne = 1;
203 int iSize = _iRows * _iCols; 203 int iSize = _iRows * _iCols;
204 204
205 sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg); 205 sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
206 if(sciErr.iErr) 206 if(sciErr.iErr)
207 { 207 {
208 addErrorMessage(&sciErr, API_ERROR_CREATE_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble"); 208 addErrorMessage(&sciErr, API_ERROR_CREATE_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
209 return sciErr; 209 return sciErr;
210 } 210 }
211 211
212 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne); 212 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
213 C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne); 213 C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
214 return sciErr; 214 return sciErr;
215} 215}
216 216
217SciErr createComplexZMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const doublecomplex* _pdblData) 217SciErr createComplexZMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const doublecomplex* _pdblData)
218{ 218{
219 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 219 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
220 double *pdblReal = NULL; 220 double *pdblReal = NULL;
221 double *pdblImg = NULL; 221 double *pdblImg = NULL;
222 222
223 223
224 sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg); 224 sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
225 if(sciErr.iErr) 225 if(sciErr.iErr)
226 { 226 {
227 addErrorMessage(&sciErr, API_ERROR_CREATE_ZDOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble"); 227 addErrorMessage(&sciErr, API_ERROR_CREATE_ZDOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
228 return sciErr; 228 return sciErr;
229 } 229 }
230 230
231 vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg); 231 vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
232 return sciErr; 232 return sciErr;
233} 233}
234 234
235SciErr createNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal) 235SciErr createNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal)
236{ 236{
237 return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _iRows, _iCols, _pdblReal, NULL); 237 return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _iRows, _iCols, _pdblReal, NULL);
238} 238}
239 239
240SciErr createNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg) 240SciErr createNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
241{ 241{
242 return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _iRows, _iCols, _pdblReal, _pdblImg); 242 return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _iRows, _iCols, _pdblReal, _pdblImg);
243} 243}
244 244
245SciErr createNamedComplexZMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const doublecomplex* _pdblData) 245SciErr createNamedComplexZMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const doublecomplex* _pdblData)
246{ 246{
247 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 247 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
248 int iVarID[nsiz]; 248 int iVarID[nsiz];
249 int iSaveRhs = Rhs; 249 int iSaveRhs = Rhs;
250 int iSaveTop = Top; 250 int iSaveTop = Top;
251 int iSize = _iRows * _iCols; 251 int iSize = _iRows * _iCols;
252 int *piAddr = NULL; 252 int *piAddr = NULL;
253 double *pdblReal = NULL; 253 double *pdblReal = NULL;
254 double *pdblImg = NULL; 254 double *pdblImg = NULL;
255 255
256 C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName)); 256 C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
257 Top = Top + Nbvars + 1; 257 Top = Top + Nbvars + 1;
258 258
259 getNewVarAddressFromPosition(_pvCtx, Top, &piAddr); 259 getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
260 260
261 //write matrix information 261 //write matrix information
262 fillCommonMatrixOfDouble(_pvCtx, piAddr, 1, _iRows, _iCols, &pdblReal, &pdblImg); 262 fillCommonMatrixOfDouble(_pvCtx, piAddr, 1, _iRows, _iCols, &pdblReal, &pdblImg);
263 263
264 vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg); 264 vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
265 265
266 //update "variable index" 266 //update "variable index"
267 updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (2) * 2); 267 updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (2) * 2);
268 268
269 Rhs = 0; 269 Rhs = 0;
270 //Add name in stack reference list 270 //Add name in stack reference list
271 createNamedVariable(iVarID); 271 createNamedVariable(iVarID);
272 272
273 Top = iSaveTop; 273 Top = iSaveTop;
274 Rhs = iSaveRhs; 274 Rhs = iSaveRhs;
275 275
276 return sciErr; 276 return sciErr;
277} 277}
278 278
279SciErr createCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg) 279SciErr createCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
280{ 280{
281 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 281 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
282 int iVarID[nsiz]; 282 int iVarID[nsiz];
283 int iSaveRhs = Rhs; 283 int iSaveRhs = Rhs;
284 int iSaveTop = Top; 284 int iSaveTop = Top;
285 int iSize = _iRows * _iCols; 285 int iSize = _iRows * _iCols;
286 int *piAddr = NULL; 286 int *piAddr = NULL;
287 double *pdblReal = NULL; 287 double *pdblReal = NULL;
288 double *pdblImg = NULL; 288 double *pdblImg = NULL;
289 int iOne = 1; 289 int iOne = 1;
290 290
291 C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName)); 291 C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
292 Top = Top + Nbvars + 1; 292 Top = Top + Nbvars + 1;
293 293
294 int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2; 294 int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
295 int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(Top)); 295 int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(Top));
296 if (iMemSize > iFreeSpace) 296 if (iMemSize > iFreeSpace)
297 { 297 {
298 addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize); 298 addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
299 return sciErr; 299 return sciErr;
300 } 300 }
301 301
302 getNewVarAddressFromPosition(_pvCtx, Top, &piAddr); 302 getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
303 303
304 //write matrix information 304 //write matrix information
305 fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, &pdblReal, &pdblImg); 305 fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, &pdblReal, &pdblImg);
306 //copy data in stack 306 //copy data in stack
307 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne); 307 C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
308 308
309 if(_iComplex) 309 if(_iComplex)
310 { 310 {
311 C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne); 311 C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
312 } 312 }
313 313
314 //update "variable index" 314 //update "variable index"
315 updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (_iComplex + 1) * 2); 315 updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (_iComplex + 1) * 2);
316 316
317 Rhs = 0; 317 Rhs = 0;
318 //Add name in stack reference list 318 //Add name in stack reference list
319 createNamedVariable(iVarID); 319 createNamedVariable(iVarID);
320 320
321 Top = iSaveTop; 321 Top = iSaveTop;
322 Rhs = iSaveRhs; 322 Rhs = iSaveRhs;
323 323
324 return sciErr; 324 return sciErr;
325} 325}
326 326
327SciErr readNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal) 327SciErr readNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal)
328{ 328{
329 return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _piRows, _piCols, _pdblReal, NULL); 329 return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _piRows, _piCols, _pdblReal, NULL);
330} 330}
331 331
332SciErr readNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg) 332SciErr readNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg)
333{ 333{
334 return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _piRows, _piCols, _pdblReal, _pdblImg); 334 return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _piRows, _piCols, _pdblReal, _pdblImg);
335} 335}
336 336
337SciErr readCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg) 337SciErr readCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg)
338{ 338{
339 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0; 339 SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
340 int* piAddr = NULL; 340 int* piAddr = NULL;
341 double* pdblReal = NULL; 341 double* pdblReal = NULL;
342 double* pdblImg = NULL; 342 double* pdblImg = NULL;
343 int iSize = 0; 343 int iSize = 0;
344 int iOne = 1; 344 int iOne = 1;
345 345
346 sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr); 346 sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr);
347 if(sciErr.iErr) 347 if(sciErr.iErr)
348 { 348 {
349 addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName); 349 addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
350 return sciErr; 350 return sciErr;
351 } 351 }
352 352
353 sciErr = getCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _piRows, _piCols, &pdblReal, &pdblImg); 353 sciErr = getCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _piRows, _piCols, &pdblReal, &pdblImg);
354 if(sciErr.iErr) 354 if(sciErr.iErr)
355 { 355 {
356 addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName); 356 addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
357 return sciErr; 357 return sciErr;
358 } 358 }
359 359
360 if(_pdblReal == NULL || (_iComplex && _pdblImg == NULL)) 360 if(_pdblReal == NULL || (_iComplex && _pdblImg == NULL))
361 { 361 {
362 return sciErr; 362 return sciErr;
363 } 363 }
364 364
365 iSize = (*_piRows) * (*_piCols); 365 iSize = (*_piRows) * (*_piCols);
366 C2F(dcopy)(&iSize, _pdblReal, &iOne, pdblReal, &iOne); 366 /* dcopy source to dest */
367 if(_iComplex) 367 C2F(dcopy)(&iSize, pdblReal, &iOne, _pdblReal, &iOne);
368 { 368 if(_iComplex)
369 C2F(dcopy)(&iSize, _pdblImg, &iOne, pdblImg, &iOne); 369 {
370 } 370 C2F(dcopy)(&iSize, pdblImg, &iOne, _pdblImg, &iOne);
371 371 }
372 return sciErr; 372
373 return sciErr;
373} 374}
374 375
375/*shortcut functions*/ 376/*shortcut functions*/
376 377
377int isDoubleType(void* _pvCtx, int* _piAddress) 378int isDoubleType(void* _pvCtx, int* _piAddress)
378{ 379{
379 return checkVarType(_pvCtx, _piAddress, sci_matrix); 380 return checkVarType(_pvCtx, _piAddress, sci_matrix);
380} 381}
381/*--------------------------------------------------------------------------*/ 382/*--------------------------------------------------------------------------*/
382int isNamedDoubleType(void* _pvCtx, const char* _pstName) 383int isNamedDoubleType(void* _pvCtx, const char* _pstName)
383{ 384{
384 return checkNamedVarType(_pvCtx, _pstName, sci_matrix); 385 return checkNamedVarType(_pvCtx, _pstName, sci_matrix);
385} 386}
386/*--------------------------------------------------------------------------*/ 387/*--------------------------------------------------------------------------*/
387int getScalarDouble(void* _pvCtx, int* _piAddress, double* _pdblReal) 388int getScalarDouble(void* _pvCtx, int* _piAddress, double* _pdblReal)
388{ 389{
389 return getCommonScalarDouble(_pvCtx, _piAddress, 0, _pdblReal, NULL); 390 return getCommonScalarDouble(_pvCtx, _piAddress, 0, _pdblReal, NULL);
390} 391}
391/*--------------------------------------------------------------------------*/ 392/*--------------------------------------------------------------------------*/
392int getScalarComplexDouble(void* _pvCtx, int* _piAddress, double* _pdblReal, double* _pdblImg) 393int getScalarComplexDouble(void* _pvCtx, int* _piAddress, double* _pdblReal, double* _pdblImg)
393{ 394{
394 return getCommonScalarDouble(_pvCtx, _piAddress, 1, _pdblReal, _pdblImg); 395 return getCommonScalarDouble(_pvCtx, _piAddress, 1, _pdblReal, _pdblImg);
395} 396}
396/*--------------------------------------------------------------------------*/ 397/*--------------------------------------------------------------------------*/
397static int getCommonScalarDouble(void* _pvCtx, int* _piAddress, int _iComplex, double* _pdblReal, double* _pdblImg) 398static int getCommonScalarDouble(void* _pvCtx, int* _piAddress, int _iComplex, double* _pdblReal, double* _pdblImg)
398{ 399{
399 SciErr sciErr; 400 SciErr sciErr;
400 int iRows = 0; 401 int iRows = 0;
401 int iCols = 0; 402 int iCols = 0;
402 403
403 double* pdblReal = NULL; 404 double* pdblReal = NULL;
404 double* pdblImg = NULL; 405 double* pdblImg = NULL;
405 406
406 sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, &pdblReal, &pdblImg); 407 sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, &pdblReal, &pdblImg);
407 if(sciErr.iErr) 408 if(sciErr.iErr)
408 { 409 {
409 addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress)); 410 addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
410 printError(&sciErr, 0); 411 printError(&sciErr, 0);
411 return sciErr.iErr; 412 return sciErr.iErr;
412 } 413 }
413 414
414 if(isScalar(_pvCtx, _piAddress) == 0) 415 if(isScalar(_pvCtx, _piAddress) == 0)
415 { 416 {
416 addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress)); 417 addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
417 printError(&sciErr, 0); 418 printError(&sciErr, 0);
418 return sciErr.iErr; 419 return sciErr.iErr;
419 } 420 }
420 421
421 if(_pdblReal != NULL) 422 if(_pdblReal != NULL)
422 { 423 {
423 *_pdblReal = pdblReal[0]; 424 *_pdblReal = pdblReal[0];
424 } 425 }
425 426
426 if(_pdblImg != NULL) 427 if(_pdblImg != NULL)
427 { 428 {
428 *_pdblImg = pdblImg[0]; 429 *_pdblImg = pdblImg[0];
429 } 430 }
430 431
431 return 0; 432 return 0;
432} 433}
433/*--------------------------------------------------------------------------*/ 434/*--------------------------------------------------------------------------*/
434int getNamedScalarDouble(void* _pvCtx, const char* _pstName, double* _pdblReal) 435int getNamedScalarDouble(void* _pvCtx, const char* _pstName, double* _pdblReal)
435{ 436{
436 return getCommonNamedScalarDouble(_pvCtx, _pstName, 0, _pdblReal, NULL); 437 return getCommonNamedScalarDouble(_pvCtx, _pstName, 0, _pdblReal, NULL);
437} 438}
438/*--------------------------------------------------------------------------*/ 439/*--------------------------------------------------------------------------*/
439int getNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double* _pdblReal, double* _pdblImg) 440int getNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double* _pdblReal, double* _pdblImg)
440{ 441{
441 return getCommonNamedScalarDouble(_pvCtx, _pstName, 1, _pdblReal, _pdblImg); 442 return getCommonNamedScalarDouble(_pvCtx, _pstName, 1, _pdblReal, _pdblImg);
442} 443}
443/*--------------------------------------------------------------------------*/ 444/*--------------------------------------------------------------------------*/
444static int getCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double* _pdblReal, double* _pdblImg) 445static int getCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double* _pdblReal, double* _pdblImg)
445{ 446{
446 SciErr sciErr; 447 SciErr sciErr;
447 int iRows = 0; 448 int iRows = 0;
448 int iCols = 0; 449 int iCols = 0;
449 450
450 double dblReal = 0; 451 double dblReal = 0;
451 double dblImg = 0; 452 double dblImg = 0;
452 453
453 if(isNamedScalar(_pvCtx, _pstName) == 0) 454 if(isNamedScalar(_pvCtx, _pstName) == 0)
454 { 455 {
455 addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName); 456 addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
456 printError(&sciErr, 0); 457 printError(&sciErr, 0);
457 return sciErr.iErr; 458 return sciErr.iErr;
458 } 459 }
459 460
460 sciErr = readCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, &iRows, &iCols, &dblReal, &dblImg); 461 sciErr = readCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, &iRows, &iCols, &dblReal, &dblImg);
461 if(sciErr.iErr) 462 if(sciErr.iErr)
462 { 463 {
463 addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Unable to get argument \"%s\""), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName); 464 addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Unable to get argument \"%s\""), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
464 printError(&sciErr, 0); 465 printError(&sciErr, 0);
465 return sciErr.iErr; 466 return sciErr.iErr;
466 } 467 }
467 468
468 if(_pdblReal != NULL) 469 if(_pdblReal != NULL)
469 { 470 {
470 _pdblReal[0] = dblReal; 471 _pdblReal[0] = dblReal;
471 } 472 }
472 473
473 if(_pdblImg != NULL) 474 if(_pdblImg != NULL)
474 { 475 {
475 _pdblImg[0] = dblImg; 476 _pdblImg[0] = dblImg;
476 } 477 }
477 478
478 return 0; 479 return 0;
479} 480}
480/*--------------------------------------------------------------------------*/ 481/*--------------------------------------------------------------------------*/
481int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal) 482int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
482{ 483{
483 return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL); 484 return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
484} 485}
485/*--------------------------------------------------------------------------*/ 486/*--------------------------------------------------------------------------*/
486int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg) 487int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
487{ 488{
488 return createCommonScalarDouble(_pvCtx, _iVar, 1, _dblReal, _dblImg); 489 return createCommonScalarDouble(_pvCtx, _iVar, 1, _dblReal, _dblImg);
489} 490}
490/*--------------------------------------------------------------------------*/ 491/*--------------------------------------------------------------------------*/
491static int createCommonScalarDouble(void* _pvCtx, int _iVar, int _iComplex, double _dblReal, double _dblImg) 492static int createCommonScalarDouble(void* _pvCtx, int _iVar, int _iComplex, double _dblReal, double _dblImg)
492{ 493{
493 SciErr sciErr; 494 SciErr sciErr;
494 double *pdblReal = NULL; 495 double *pdblReal = NULL;
495 double *pdblImg = NULL; 496 double *pdblImg = NULL;
496 497
497 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, 1, 1, &pdblReal, &pdblImg); 498 sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, 1, 1, &pdblReal, &pdblImg);
498 if(sciErr.iErr) 499 if(sciErr.iErr)
499 { 500 {
500 addErrorMessage(&sciErr, API_ERROR_CREATE_SCALAR_DOUBLE, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createScalarComplexDouble" : "createScalarDouble"); 501 addErrorMessage(&sciErr, API_ERROR_CREATE_SCALAR_DOUBLE, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createScalarComplexDouble" : "createScalarDouble");
501 printError(&sciErr, 0); 502 printError(&sciErr, 0);
502 return sciErr.iErr; 503 return sciErr.iErr;
503 } 504 }
504 505
505 pdblReal[0] = _dblReal; 506 pdblReal[0] = _dblReal;
506 if(_iComplex) 507 if(_iComplex)
507 { 508 {
508 pdblImg[0] = _dblImg; 509 pdblImg[0] = _dblImg;
509 } 510 }
510 return 0; 511 return 0;
511} 512}
512/*--------------------------------------------------------------------------*/ 513/*--------------------------------------------------------------------------*/
513int createNamedScalarDouble(void* _pvCtx, const char* _pstName, double _dblReal) 514int createNamedScalarDouble(void* _pvCtx, const char* _pstName, double _dblReal)
514{ 515{
515 return createCommonNamedScalarDouble(_pvCtx, _pstName, 0, _dblReal, 0); 516 return createCommonNamedScalarDouble(_pvCtx, _pstName, 0, _dblReal, 0);
516} 517}
517/*--------------------------------------------------------------------------*/ 518/*--------------------------------------------------------------------------*/
518int createNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double _dblReal, double _dblImg) 519int createNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double _dblReal, double _dblImg)
519{ 520{
520 return createCommonNamedScalarDouble(_pvCtx, _pstName, 1, _dblReal, _dblImg); 521 return createCommonNamedScalarDouble(_pvCtx, _pstName, 1, _dblReal, _dblImg);
521} 522}
522/*--------------------------------------------------------------------------*/ 523/*--------------------------------------------------------------------------*/
523static int createCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double _dblReal, double _dblImg) 524static int createCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double _dblReal, double _dblImg)
524{ 525{
525 SciErr sciErr; 526 SciErr sciErr;
526 527
527 sciErr = createCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, 1, 1, &_dblReal, &_dblImg); 528 sciErr = createCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, 1, 1, &_dblReal, &_dblImg);
528 if(sciErr.iErr) 529 if(sciErr.iErr)
529 { 530 {
530 addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_SCALAR, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createNamedScalarComplexDouble" : "createNamedScalarDouble"); 531 addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_SCALAR, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createNamedScalarComplexDouble" : "createNamedScalarDouble");
531 printError(&sciErr, 0); 532 printError(&sciErr, 0);
532 return sciErr.iErr; 533 return sciErr.iErr;
533 } 534 }
534 535
535 return 0; 536 return 0;
536} 537}
537/*--------------------------------------------------------------------------*/ 538/*--------------------------------------------------------------------------*/
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.c b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.c
new file mode 100644
index 0000000..7696e5f
--- /dev/null
+++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.c
@@ -0,0 +1,50 @@
1/* ========================================================================== */
2/* bug 8587 */
3/* Allan CORNET - 2010 - DIGITEO */
4/* ========================================================================== */
5#include <api_scilab.h>
6#include <BOOL.h>
7#include <stack-c.h>
8#include <Scierror.h>
9#include <MALLOC.h>
10/* ========================================================================== */
11int sci_readDoubles(char *fname)
12{
13 #define NAME_MATRIX_TO_READ "REF_TEST_MATRIX"
14 #define REF_SIZE_COLS 3
15 #define REF_SIZE_ROWS 2
16 SciErr sciErr;
17 int nbRow = 0;
18 int nbCol = 0;
19 double * matrixOfDouble = NULL;
20
21 sciErr = readNamedMatrixOfDouble(pvApiCtx, NAME_MATRIX_TO_READ, &nbRow, &nbCol , NULL);
22 if(sciErr.iErr)
23 {
24 printError(&sciErr, 0);
25 }
26
27 if ((nbRow != REF_SIZE_ROWS) || (nbCol != REF_SIZE_COLS))
28 {
29 Scierror(999, "%s: Wrong size for input argument #%s.\n", fname, NAME_MATRIX_TO_READ);
30 return 0;
31 }
32
33 matrixOfDouble = (double*)MALLOC((nbRow*nbCol)*sizeof(double));
34
35 sciErr = readNamedMatrixOfDouble(pvApiCtx, NAME_MATRIX_TO_READ, &nbRow, &nbCol, matrixOfDouble);
36 if(sciErr.iErr)
37 {
38 printError(&sciErr, 0);
39 }
40
41 sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, nbRow, nbCol, matrixOfDouble);
42 if(sciErr.iErr)
43 {
44 printError(&sciErr, 0);
45 }
46
47 LhsVar(1) = Rhs + 1;
48 return 0;
49}
50/* ========================================================================== */
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.dia.ref b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.dia.ref
new file mode 100644
index 0000000..dc3dece
--- /dev/null
+++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.dia.ref
@@ -0,0 +1,35 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7//
8// <-- JVM NOT MANDATORY -->
9//
10// <-- Non-regression test for bug 8587 -->
11//
12// <-- Bugzilla URL -->
13// http://bugzilla.scilab.org/show_bug.cgi?id=8587
14//
15// <-- Short Description -->
16// readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble) returned wrong values
17ilib_verbose(0);
18test_path = get_absolute_file_path('bug_8587.tst');
19currentpath = pwd();
20cd TMPDIR;
21cd ../;
22OS_TMP_DIR = pwd();
23mkdir(OS_TMP_DIR,'bug_8587');
24TEST_DIR = OS_TMP_DIR + filesep() + 'bug_8587';
25copyfile(SCI+'/modules/api_scilab/tests/nonreg_tests/bug_8587.c' , TEST_DIR + filesep() + 'bug_8587.c');
26chdir(TEST_DIR);
27files = ['bug_8587.c'];
28ilib_build('lib_bug_8587', ['readDoubles', 'sci_readDoubles'], files, []);
29exec loader.sce;
30chdir(currentpath);
31REF_TEST_MATRIX = [1 2 3; 4 5 6];
32REF_TEST_MATRIX_COPY = [1 2 3; 4 5 6];
33if execstr("result = readDoubles()", "errcatch") <> 0 then bugmes();quit;end
34if ~or(REF_TEST_MATRIX_COPY == REF_TEST_MATRIX) then bugmes();quit;end
35if ~or(result == REF_TEST_MATRIX) then bugmes();quit;end
diff --git a/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.tst b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.tst
new file mode 100644
index 0000000..623b5a0
--- /dev/null
+++ b/scilab/modules/api_scilab/tests/nonreg_tests/bug_8587.tst
@@ -0,0 +1,36 @@
1// =============================================================================
2// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
3// Copyright (C) 2010 - DIGITEO - Allan CORNET
4//
5// This file is distributed under the same license as the Scilab package.
6// =============================================================================
7//
8// <-- JVM NOT MANDATORY -->
9//
10// <-- Non-regression test for bug 8587 -->
11//
12// <-- Bugzilla URL -->
13// http://bugzilla.scilab.org/show_bug.cgi?id=8587
14//
15// <-- Short Description -->
16// readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble) returned wrong values
17
18ilib_verbose(0);
19test_path = get_absolute_file_path('bug_8587.tst');
20currentpath = pwd();
21cd TMPDIR;
22cd ../;
23OS_TMP_DIR = pwd();
24mkdir(OS_TMP_DIR,'bug_8587');
25TEST_DIR = OS_TMP_DIR + filesep() + 'bug_8587';
26copyfile(SCI+'/modules/api_scilab/tests/nonreg_tests/bug_8587.c' , TEST_DIR + filesep() + 'bug_8587.c');
27chdir(TEST_DIR);
28files = ['bug_8587.c'];
29ilib_build('lib_bug_8587', ['readDoubles', 'sci_readDoubles'], files, []);
30exec loader.sce;
31chdir(currentpath);
32REF_TEST_MATRIX = [1 2 3; 4 5 6];
33REF_TEST_MATRIX_COPY = [1 2 3; 4 5 6];
34if execstr("result = readDoubles()", "errcatch") <> 0 then pause, end
35if ~or(REF_TEST_MATRIX_COPY == REF_TEST_MATRIX) then pause, end
36if ~or(result == REF_TEST_MATRIX) then pause, end
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 23a0718..4f5f375 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -222,6 +222,7 @@ FGREP = @FGREP@
222FLEXDOCK = @FLEXDOCK@ 222FLEXDOCK = @FLEXDOCK@
223FLIBS = @FLIBS@ 223FLIBS = @FLIBS@
224FOP = @FOP@ 224FOP = @FOP@
225GENHTML = @GENHTML@
225GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 226GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
226GIWS_BIN = @GIWS_BIN@ 227GIWS_BIN = @GIWS_BIN@
227GLUEGEN_RT = @GLUEGEN_RT@ 228GLUEGEN_RT = @GLUEGEN_RT@
@@ -266,6 +267,7 @@ JROSETTA_API = @JROSETTA_API@
266JROSETTA_ENGINE = @JROSETTA_ENGINE@ 267JROSETTA_ENGINE = @JROSETTA_ENGINE@
267JUNIT = @JUNIT@ 268JUNIT = @JUNIT@
268LAPACK_LIBS = @LAPACK_LIBS@ 269LAPACK_LIBS = @LAPACK_LIBS@
270LCOV = @LCOV@
269LD = @LD@ 271LD = @LD@
270LDFLAGS = @LDFLAGS@ 272LDFLAGS = @LDFLAGS@
271LIBICONV = @LIBICONV@ 273LIBICONV = @LIBICONV@
diff --git a/scilab/modules/arnoldi/src/c/arnoldi.rc b/scilab/modules/arnoldi/src/c/arnoldi.rc
index cbb088e..8d33ce0 100644
--- a/scilab/modules/arnoldi/src/c/arnoldi.rc
+++ b/scilab/modules/arnoldi/src/c/arnoldi.rc
@@ -53,8 +53,8 @@ END
53// 53//
54 54
551 VERSIONINFO 551 VERSIONINFO
56 FILEVERSION 5,3,0,0 56 FILEVERSION 5,3,1,0
57 PRODUCTVERSION 5,3,0,0 57 PRODUCTVERSION 5,3,1,0
58 FILEFLAGSMASK 0x17L 58 FILEFLAGSMASK 0x17L
59#ifdef _DEBUG 59#ifdef _DEBUG
60 FILEFLAGS 0x1L 60 FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
70 BLOCK "040c04b0" 70 BLOCK "040c04b0"
71 BEGIN 71 BEGIN
72 VALUE "FileDescription", "arnoldi module" 72 VALUE "FileDescription", "arnoldi module"
73 VALUE "FileVersion", "5, 3, 0, 0" 73 VALUE "FileVersion", "5, 3, 1, 0"
74 VALUE "InternalName", "arnoldi" 74 VALUE "InternalName", "arnoldi"
75 VALUE "LegalCopyright", "Copyright (C) 2010" 75 VALUE "LegalCopyright", "Copyright (C) 2011"
76 VALUE "OriginalFilename", "arnoldi.dll" 76 VALUE "OriginalFilename", "arnoldi.dll"
77 VALUE "ProductName", "arnoldi module" 77 VALUE "ProductName", "arnoldi module"
78 VALUE "ProductVersion", "5, 3, 0, 0" 78 VALUE "ProductVersion", "5, 3, 1, 0"
79 END 79 END
80 END 80 END
81 BLOCK "VarFileInfo" 81 BLOCK "VarFileInfo"
diff --git a/scilab/modules/arnoldi/version.xml b/scilab/modules/arnoldi/version.xml
index ffb571a..8f6ba07 100644
--- a/scilab/modules/arnoldi/version.xml
+++ b/scilab/modules/arnoldi/version.xml
@@ -8,5 +8,5 @@
8 --> 8 -->
9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd"> 9<!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
10<MODULE_VERSION name="arnoldi"> 10<MODULE_VERSION name="arnoldi">
11<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" /> 11<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
12</MODULE_VERSION> 12</MODULE_VERSION>
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index 70cde3f..71857dd 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -165,6 +165,7 @@ FGREP = @FGREP@
165FLEXDOCK = @FLEXDOCK@ 165FLEXDOCK = @FLEXDOCK@
166FLIBS = @FLIBS@ 166FLIBS = @FLIBS@
167FOP = @FOP@ 167FOP = @FOP@
168GENHTML = @GENHTML@
168GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ 169GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
169GIWS_BIN = @GIWS_BIN@ 170GIWS_BIN = @GIWS_BIN@
170GLUEGEN_RT = @GLUEGEN_RT@ 171GLUEGEN_RT = @GLUEGEN_RT@
@@ -209,6 +210,7 @@ JROSETTA_API = @JROSETTA_API@
209JROSETTA_ENGINE = @JROSETTA_ENGINE@ 210JROSETTA_ENGINE = @JROSETTA_ENGINE@
210JUNIT = @JUNIT@ 211JUNIT = @JUNIT@
211LAPACK_LIBS = @LAPACK_LIBS@ 212LAPACK_LIBS = @LAPACK_LIBS@
213LCOV = @LCOV@
212LD = @LD@ 214LD = @LD@
213LDFLAGS = @LDFLAGS@ 215LDFLAGS = @LDFLAGS@
214LIBICONV = @LIBICONV@ 216LIBICONV = @LIBICONV@
diff --git a/scilab/modules/atoms/locales/de_DE/atoms.po b/scilab/modules/atoms/locales/de_DE/atoms.po
index c3a86d2..8f8c2ee 100644
--- a/scilab/modules/atoms/locales/de_DE/atoms.po
+++ b/scilab/modules/atoms/locales/de_DE/atoms.po
@@ -26,11 +26,11 @@ msgstr "\t - ''%s - %s'' ist bereits geladen\n"
26 26
27#, c-format 27#, c-format
28msgid "\t - ''%s - %s'' is needed by ''%s - %s''\n" 28msgid "\t - ''%s - %s'' is needed by ''%s - %s''\n"
29msgstr "\t - ''%s - %s'' wird durch '%s - %s' benötigt\n" 29msgstr "\t - ''%s - %s'' wird durch ''%s - %s'' benötigt\n"
30 30
31#, c-format 31#, c-format
32msgid "\t - ''%s - %s'' is needed by ''%s''\n" 32msgid "\t - ''%s - %s'' is needed by ''%s''\n"
33msgstr "\t - ''%s - %s'' wird benötigt durch '%s'\n" 33msgstr "\t - ''%s - %s'' wird benötigt durch ''%s''\n"
34 34
35#, c-format 35#, c-format
36msgid "\t - Local location : ''%s''\n" 36msgid "\t - Local location : ''%s''\n"
@@ -70,7 +70,7 @@ msgstr "%s: %s (%s) ist nicht installiert.\n"
70 70
71#, c-format 71#, c-format
72msgid "%s: ''%s - %s'' (''%s'' section) is not installed.\n" 72msgid "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
73msgstr "%s: ''%s - %s'' ('%s' Sektion) ist nicht installiert.\n" 73msgstr "%s: ''%s - %s'' (''%s'' Sektion) ist nicht installiert.\n"
74 74
75#, c-format 75#, c-format
76msgid "%s: ''%s - %s'' is not installed.\n" 76msgid "%s: ''%s - %s'' is not installed.\n"
diff --git a/scilab/modules/atoms/locales/en_GB/atoms.po b/scilab/modules/atoms/locales/en_GB/atoms.po
deleted file mode 100644
index 8409920..0000000
--- a/scilab/modules/atoms/locales/en_GB/atoms.po
+++ /dev/null
@@ -1,768 +0,0 @@
1# English (United Kingdom) translation for scilab
2# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
3# This file is distributed under the same license as the scilab package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
5#
6msgid ""
7msgstr ""
8"Project-Id-Version: scilab\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2007-09-27 16:24+0200\n"
11"PO-Revision-Date: 2010-07-12 11:30+0000\n"
12"Last-Translator: Luke Hollins <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
17"X-Generator: Launchpad (build Unknown)\n"
18
19#, c-format
20msgid "\t - ''%s - %s''\n"
21msgstr "\t - ''%s - %s''\n"
22
23#, c-format
24msgid "\t - ''%s - %s'' is already loaded\n"
25msgstr "\t - ''%s - %s'' is already loaded\n"
26
27#, c-format
28msgid "\t - ''%s - %s'' is needed by ''%s - %s''\n"
29msgstr "\t - ''%s - %s'' is needed by ''%s - %s''\n"
30
31#, c-format
32msgid "\t - ''%s - %s'' is needed by ''%s''\n"
33msgstr "\t - ''%s - %s'' is needed by ''%s''\n"
34
35#, c-format
36msgid "\t - Local location : ''%s''\n"
37msgstr "\t - Local location : ''%s''\n"
38
39#, c-format
40msgid "\t - MD5SUM expected : ''%s''\n"
41msgstr "\t - MD5SUM expected : ''%s''\n"
42
43#, c-format
44msgid "\t - MD5SUM watched : ''%s''\n"
45msgstr "\t - MD5SUM watched : ''%s''\n"
46
47#, c-format
48msgid "\t - URL : ''%s''\n"
49msgstr "\t - URL : ''%s''\n"
50
51#, c-format
52msgid "\t - You''ve asked ''%s - %s''\n"
53msgstr "\t - You''ve asked ''%s - %s''\n"
54
55#, c-format
56msgid "\t - destination : ''%s''\n"
57msgstr "\t - destination : ''%s''\n"
58
59#, c-format
60msgid "\t - file : ''%s''\n"
61msgstr "\t - file : ''%s''\n"
62
63#, c-format
64msgid "\t - source : ''%s''\n"
65msgstr "\t - source : ''%s''\n"
66
67#, c-format
68msgid "%s: %s (%s) isn''t installed.\n"
69msgstr "%s: %s (%s) isn''t installed.\n"
70
71#, c-format
72msgid "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
73msgstr "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
74
75#, c-format
76msgid "%s: ''%s - %s'' is not installed.\n"
77msgstr "%s: ''%s - %s'' is not installed.\n"
78
79#, c-format
80msgid "%s: ''%s'' (''%s'' section) is not installed.\n"
81msgstr "%s: ''%s'' (''%s'' section) is not installed.\n"
82
83#, c-format
84msgid "%s: ''%s'' isn''t installed.\n"
85msgstr "%s: ''%s'' isn''t installed.\n"
86
87#, c-format
88msgid "%s: An error occurred while loading ''%s-%s'':\n"
89msgstr "%s: An error occurred while loading ''%s-%s'':\n"
90
91#, c-format
92msgid "%s: Another version of the package %s is already loaded : %s\n"
93msgstr "%s: Another version of the package %s is already loaded : %s\n"
94
95#, c-format
96msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
97msgstr "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
98
99#, c-format
100msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
101msgstr "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
102
103#, c-format
104msgid "%s: Error while creating the directory ''%s''.\n"
105msgstr "%s: Error while creating the directory ''%s''.\n"
106
107#, c-format
108msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
109msgstr "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
110
111#, c-format
112msgid "%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"
113msgstr "%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"
114
115#, c-format
116msgid "%s: Module ''%s - %s'' is not installed.\n"
117msgstr "%s: Module ''%s - %s'' is not installed.\n"
118
119#, c-format
120msgid "%s: Module ''%s'' is not installed (''%s'' section).\n"
121msgstr "%s: Module ''%s'' is not installed (''%s'' section).\n"
122
123#, c-format
124msgid "%s: Module ''%s'' is not installed.\n"
125msgstr "%s: Module ''%s'' is not installed.\n"
126
127#, c-format
128msgid "%s: Neither Wget or Curl found: Please install one of them\n"
129msgstr "%s: Neither Wget or Curl found: Please install one of them\n"
130
131#, c-format
132msgid ""
133"%s: Several versions of a package (%s) cannot be loaded at the same scilab "
134"session :\n"
135msgstr ""
136"%s: Several versions of a package (%s) cannot be loaded at the same Scilab "
137"session :\n"
138
139#, c-format
140msgid "%s: The config file (''%s'') is not well formated at line %d\n"
141msgstr "%s: The config file (''%s'') is not well formatted at line %d\n"
142
143#, c-format
144msgid "%s: The dependency tree cannot be resolved.\n"
145msgstr "%s: The dependency tree cannot be resolved.\n"
146
147#, c-format
148msgid "%s: The description is not well formated at line %d\n"
149msgstr "%s: The description is not well formatted at line %d\n"
150
151#, c-format
152msgid ""
153"%s: The directory %s cannot been created, please check if you have write "
154"access on this directory.\n"
155msgstr ""
156"%s: The directory %s cannot been created, please check if you have write "
157"access on this directory.\n"
158
159#, c-format
160msgid "%s: The directory %s doesn''t exist.\n"
161msgstr "%s: The directory %s doesn''t exist.\n"
162
163#, c-format
164msgid ""
165"%s: The directory ''%s'' cannot been created, please check if you have write "
166"access on this directory.\n"
167msgstr ""
168"%s: The directory ''%s'' cannot been created, please check if you have write "
169"access on this directory.\n"
170
171#, c-format
172msgid ""
173"%s: The directory of this package (%s-%s) cannot been deleted, please check "
174"if you have write access on this directory : %s.\n"
175msgstr ""
176"%s: The directory of this package (%s-%s) cannot been deleted, please check "
177"if you have write access on this directory : %s.\n"
178
179#, c-format
180msgid ""
181"%s: The directory of this package (%s-%s) is located neither in SCI nor in "
182"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n"
183msgstr ""
184"%s: The directory of this package (%s-%s) is located neither in SCI nor in "
185"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n"
186
187#, c-format
188msgid "%s: The downloaded file doesn''t check the MD5SUM:\n"
189msgstr "%s: The downloaded file doesn''t check the MD5SUM:\n"
190
191#, c-format
192msgid "%s: The extraction of the archive ''%s'' has failed.\n"
193msgstr "%s: The extraction of the archive ''%s'' has failed.\n"
194
195#, c-format
196msgid "%s: The file %s doesn''t exist or is not read accessible.\n"
197msgstr "%s: The file %s doesn't exist or is not read accessible.\n"
198
199#, c-format
200msgid ""
201"%s: The file %s is not well formated, the toolbox %s - %s doesn''t contain "
202"the %s field\n"
203msgstr ""
204"%s: The file %s is not well formatted, the toolbox %s - %s doesn't contain "
205"the %s field\n"
206
207#, c-format
208msgid "%s: The file ''%s'' cannot be written.\n"
209msgstr "%s: The file ''%s'' cannot be written.\n"
210
211#, c-format
212msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
213msgstr "%s: The file ''%s'' doesn't exist or is not read accessible\n"
214
215#, c-format
216msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n"
217msgstr "%s: The file ''%s'' doesn't exist or is not read accessible.\n"
218
219#, c-format
220msgid "%s: The file ''%s'' is not well formated at line %d\n"
221msgstr "%s: The file ''%s'' is not well formatted at line %d\n"
222
223#, c-format
224msgid "%s: The following file hasn''t been copied:\n"
225msgstr "%s: The following file hasn't been copied:\n"
226
227#, c-format
228msgid "%s: The following file hasn''t been downloaded:\n"
229msgstr "%s: The following file hasn't been downloaded:\n"
230
231#, c-format
232msgid ""
233"%s: The following module is installed in the user section, you cannot add it "
234"to the autoload list for all users:\n"
235msgstr ""
236"%s: The following module is installed in the user section, you cannot add it "
237"to the auto-load list for all users:\n"
238
239#, c-format
240msgid "%s: The following module is not installed:\n"
241msgstr "%s: The following module is not installed:\n"
242
243#, c-format
244msgid "%s: The following modules are not installed:\n"
245msgstr "%s: The following modules are not installed:\n"
246
247#, c-format
248msgid "%s: The package %s is not available.\n"
249msgstr "%s: The package %s is not available.\n"
250
251#, c-format
252msgid "%s: The package ''%s'' is not present in the struct.\n"
253msgstr "%s: The package ''%s'' is not present in the struct.\n"
254
255#, c-format
256msgid ""
257"%s: The root directory of this package (%s-%s) cannot been deleted, please "
258"check if you have write access on this directory : %s.\n"
259msgstr ""
260"%s: The root directory of this package (%s-%s) cannot been deleted, please "
261"check if you have write access on this directory : %s.\n"
262
263#, c-format
264msgid ""
265"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
266msgstr ""
267"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
268
269#, c-format
270msgid ""
271"%s: Wrong length for input argument #%d: String which has 32-characters "
272"length expected.\n"
273msgstr ""
274"%s: Wrong length for input argument #%d: String which has 32-characters "
275"length expected.\n"
276
277#, c-format
278msgid "%s: Wrong number of input argument: %d expected.\n"
279msgstr "%s: Wrong number of input argument: %d expected.\n"
280
281#, c-format
282msgid "%s: Wrong number of input argument: %d to %d expected.\n"
283msgstr "%s: Wrong number of input argument: %d to %d expected.\n"
284
285#, c-format
286msgid "%s: Wrong number of input argument: at most %d expected.\n"
287msgstr "%s: Wrong number of input argument: at most %d expected.\n"
288
289#, c-format
290msgid "%s: Wrong number of input arguments: %d expected.\n"
291msgstr "%s: Wrong number of input arguments: %d expected.\n"
292
293#, c-format
294msgid "%s: Wrong number of input arguments: %d or %d expected.\n"
295msgstr "%s: Wrong number of input arguments: %d or %d expected.\n"
296
297#, c-format
298msgid "%s: Wrong number of input arguments: %d to %d expected.\n"
299msgstr "%s: Wrong number of input arguments: %d to %d expected.\n"
300
301#, c-format
302msgid "%s: Wrong number of input arguments: at most %d expected.\n"
303msgstr "%s: Wrong number of input arguments: at most %d expected.\n"
304
305#, c-format
306msgid ""
307"%s: Wrong size for input argument #%d: 1x1 or 1x2 string matrix expected.\n"
308msgstr ""
309"%s: Wrong size for input argument #%d: 1x1 or 1x2 string matrix expected.\n"
310
311#, c-format
312msgid "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n"
313msgstr "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n"
314
315#, c-format
316msgid ""
317"%s: Wrong size for input argument #%d: A 1x1 or 1x2 string matrix expected.\n"
318msgstr ""
319"%s: Wrong size for input argument #%d: A 1x1 or 1x2 string matrix expected.\n"
320
321#, c-format
322msgid "%s: Wrong size for input argument #%d: A boolean expected.\n"
323msgstr "%s: Wrong size for input argument #%d: A boolean expected.\n"
324
325#, c-format
326msgid "%s: Wrong size for input argument #%d: A string expected.\n"
327msgstr "%s: Wrong size for input argument #%d: A string expected.\n"
328
329#, c-format
330msgid "%s: Wrong size for input argument #%d: Single string expected.\n"
331msgstr "%s: Wrong size for input argument #%d: Single string expected.\n"
332
333#, c-format
334msgid ""
335"%s: Wrong size for input argument #%d: mx1 or mx2 string matrix expected.\n"
336msgstr ""
337"%s: Wrong size for input argument #%d: mx1 or mx2 string matrix expected.\n"
338
339#, c-format
340msgid ""
341"%s: Wrong size for input argument #%d: mx1, mx2 or mx3 string matrix "
342"expected.\n"
343msgstr ""
344"%s: Wrong size for input argument #%d: mx1, mx2 or mx3 string matrix "
345"expected.\n"
346
347#, c-format
348msgid ""
349"%s: Wrong size for input argument #%d: mx1,mx2 or mx3 string matrix "
350"expected.\n"
351msgstr ""
352"%s: Wrong size for input argument #%d: mx1,mx2 or mx3 string matrix "
353"expected.\n"
354
355#, c-format
356msgid ""
357"%s: Wrong size for input argument #%d: mx2 or mx3 string matrix expected.\n"
358msgstr ""
359"%s: Wrong size for input argument #%d: mx2 or mx3 string matrix expected.\n"
360
361#, c-format
362msgid "%s: Wrong size for input argument #%d: mx2 string matrix expected.\n"
363msgstr "%s: Wrong size for input argument #%d: mx2 string matrix expected.\n"
364
365#, c-format
366msgid "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n"
367msgstr "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n"
368
369#, c-format
370msgid "%s: Wrong type for input argument #%d: A boolean expected.\n"
371msgstr "%s: Wrong type for input argument #%d: A boolean expected.\n"
372
373#, c-format
374msgid "%s: Wrong type for input argument #%d: A string expected.\n"
375msgstr "%s: Wrong type for input argument #%d: A string expected.\n"
376
377#, c-format
378msgid "%s: Wrong type for input argument #%d: Boolean expected.\n"
379msgstr "%s: Wrong type for input argument #%d: Boolean expected.\n"
380
381#, c-format
382msgid ""
383"%s: Wrong type for input argument #%d: Boolean or single string expected.\n"
384msgstr ""
385"%s: Wrong type for input argument #%d: Boolean or single string expected.\n"
386
387#, c-format
388msgid "%s: Wrong type for input argument #%d: Single string expected.\n"
389msgstr "%s: Wrong type for input argument #%d: Single string expected.\n"
390
391#, c-format
392msgid "%s: Wrong type for input argument #%d: String array expected.\n"
393msgstr "%s: Wrong type for input argument #%d: String array expected.\n"
394
395#, c-format
396msgid "%s: Wrong type for input argument #%d: String expected.\n"
397msgstr "%s: Wrong type for input argument #%d: String expected.\n"
398
399#, c-format
400msgid "%s: Wrong type for input argument #%d: Struct expected.\n"
401msgstr "%s: Wrong type for input argument #%d: Struct expected.\n"
402
403#, c-format
404msgid ""
405"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
406msgstr ""
407"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
408
409#, c-format
410msgid "%s: Wrong type for input argument #%d: mlist expected.\n"
411msgstr "%s: Wrong type for input argument #%d: mlist expected.\n"
412
413#, c-format
414msgid ""
415"%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
416msgstr ""
417"%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
418
419#, c-format
420msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
421msgstr "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
422
423#, c-format
424msgid ""
425"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
426msgstr ""
427"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
428
429#, c-format
430msgid ""
431"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
432"''session'' expected.\n"
433msgstr ""
434"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
435"''session'' expected.\n"
436
437#, c-format
438msgid ""
439"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
440"''official'' expected.\n"
441msgstr ""
442"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
443"''official'' expected.\n"
444
445#, c-format
446msgid ""
447"%s: Wrong value for input argument #%d: ''filter:all'',''filter:main'' or a "
448"valid main category expected.\n"
449msgstr ""
450"%s: Wrong value for input argument #%d: ''filter:all'',''filter:main'' or a "
451"valid main category expected.\n"
452
453#, c-format
454msgid ""
455"%s: Wrong value for input argument #%d: ''system'' or ''install'' expected.\n"
456msgstr ""
457"%s: Wrong value for input argument #%d: ''system'' or ''install'' expected.\n"
458
459#, c-format
460msgid ""
461"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
462msgstr ""
463"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
464
465#, c-format
466msgid ""
467"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
468"expected.\n"
469msgstr ""
470"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
471"expected.\n"
472
473#, c-format
474msgid ""
475"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
476"expected.\n"
477msgstr ""
478"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
479"expected.\n"
480
481#, c-format
482msgid ""
483"%s: Wrong value for input argument #%d: ''user'',''allusers'' or ''all'' "
484"expected.\n"
485msgstr ""
486"%s: Wrong value for input argument #%d: ''user'',''allusers'' or ''all'' "
487"expected.\n"
488
489#, c-format
490msgid "%s: Wrong value for input argument #%d: A valid category expected.\n"
491msgstr "%s: Wrong value for input argument #%d: A valid category expected.\n"
492
493#, c-format
494msgid "%s: Wrong value for input argument #%d: ASC or DESC expected.\n"
495msgstr "%s: Wrong value for input argument #%d: ASC or DESC expected.\n"
496
497#, c-format
498msgid ""
499"%s: Wrong value for input argument #%d: All modules version should be set.\n"
500msgstr ""
501"%s: Wrong value for input argument #%d: All modules version should be set.\n"
502
503#, c-format
504msgid ""
505"%s: Wrong value for input argument #%d: It should have a field named "
506"''%s''.\n"
507msgstr ""
508"%s: Wrong value for input argument #%d: It should have a field named "
509"''%s''.\n"
510
511#, c-format
512msgid ""
513"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
514msgstr ""
515"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
516
517#, c-format
518msgid ""
519"%s: Wrong value for input argument #%d: Must be a atoms package name.\n"
520msgstr ""
521"%s: Wrong value for input argument #%d: Must be a atoms package name.\n"
522
523#, c-format
524msgid ""
525"%s: Wrong value for input argument #%d: Single string that ends with "
526".tar.gz, .tgz or .zip expected.\n"
527msgstr ""
528"%s: Wrong value for input argument #%d: Single string that ends with "
529".tar.gz, .tgz or .zip expected.\n"
530
531#, c-format
532msgid ""
533"%s: Wrong value for input argument #%d: String that contains ''TOOLBOXES'' "
534"or ''DESCRIPTION'' expected.\n"
535msgstr ""
536"%s: Wrong value for input argument #%d: String that contains ''TOOLBOXES'' "
537"or ''DESCRIPTION'' expected.\n"
538
539#, c-format
540msgid ""
541"%s: Wrong value for input argument #%d: String that ends with DESCRIPTION "
542"expected.\n"
543msgstr ""
544"%s: Wrong value for input argument #%d: String that ends with DESCRIPTION "
545"expected.\n"
546
547#, c-format
548msgid ""
549"%s: Wrong value for input argument #%d: String that start with "
550"''http://'',''ftp://'' or ''file://'' expected.\n"
551msgstr ""
552"%s: Wrong value for input argument #%d: String that start with "
553"''http://'',''ftp://'' or ''file://'' expected.\n"
554
555#, c-format
556msgid ""
557"%s: Wrong value for input argument #%d: The matrix oriented typed list is "
558"not well formatted.\n"
559msgstr ""
560"%s: Wrong value for input argument #%d: The matrix oriented typed list is "
561"not well formatted.\n"
562
563#, c-format
564msgid "%s: Wrong value for input argument #%d: This ("
565msgstr "%s: Wrong value for input argument #%d: This ("
566
567#, c-format
568msgid ""
569"%s: Wrong value for input argument #%d: This is not a valid version.\n"
570msgstr ""
571"%s: Wrong value for input argument #%d: This is not a valid version.\n"
572
573#, c-format
574msgid ""
575"%s: Wrong value for input argument #%d: This is not a valid "
576"version/dependency.\n"
577msgstr ""
578"%s: Wrong value for input argument #%d: This is not a valid "
579"version/dependency.\n"
580
581#, c-format
582msgid ""
583"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
584msgstr ""
585"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
586
587#, c-format
588msgid ""
589"%s: You have not enough rights to remove any version of the package %s.\n"
590msgstr ""
591"%s: You do not have enough rights to remove any version of the package %s.\n"
592
593#, c-format
594msgid "%s: You have not enough rights to remove the package %s (%s).\n"
595msgstr "%s: You do not have enough rights to remove the package %s (%s).\n"
596
597#, c-format
598msgid "%s: You haven''t write access on this directory : %s.\n"
599msgstr "%s: You haven't write access to this directory : %s.\n"
600
601#, c-format
602msgid "%s: name and version are not both defined\n"
603msgstr "%s: name and version are not both defined\n"
604
605#, c-format
606msgid "%s: the package ''%s'' doesn''t contain the field ''%s''.\n"
607msgstr "%s: the package ''%s'' doesn't contain the field ''%s''.\n"
608
609#, c-format
610msgid "%s: the package ''%s'' doesn''t exist.\n"
611msgstr "%s: the package ''%s'' doesn't exist.\n"
612
613msgid "&?"
614msgstr "&?"
615
616msgid "&Edit"
617msgstr "&Edit"
618
619msgid "&File"
620msgstr "&File"
621
622msgid "&Tools"
623msgstr "&Tools"
624
625msgid "?"
626msgstr "?"
627
628#, c-format
629msgid "A new version (''%s'') of ''%s'' is available"
630msgstr "A new version (''%s'') of ''%s'' is available"
631
632msgid "ATOMS"
633msgstr "ATOMS"
634
635msgid "ATOMS error"
636msgstr "ATOMS error"
637
638msgid "All modules"
639msgstr "All modules"
640
641msgid "Atoms Help..."
642msgstr "Atoms Help..."
643
644msgid "Author(s)"
645msgstr "Author(s)"
646
647msgid "Automatically Installed"
648msgstr "Automatically Installed"
649
650msgid "Bytes"
651msgstr "Bytes"
652
653msgid "Category(ies)"
654msgstr "Category(ies)"
655
656msgid "Close"
657msgstr "Close"
658
659msgid "Depend"
660msgstr "Depend"
661
662msgid "Description"
663msgstr "Description"
664
665msgid "Download size"
666msgstr "Download size"
667
668msgid "Entity"
669msgstr "Entity"
670
671msgid "File"
672msgstr "File"
673
674msgid "Home"
675msgstr "Home"
676
677msgid "Install"
678msgstr "Install"
679
680msgid "Install Directory"
681msgstr "Install Directory"
682
683msgid ""
684"Installation done! Please restart Scilab to take changes into account."
685msgstr ""
686"Installation done! Please restart Scilab to take changes into account."
687
688msgid "Installation failed!"
689msgstr "Installation failed!"
690
691msgid "Installing"
692msgstr "Installing"
693
694msgid "KB"
695msgstr "KB"
696
697msgid "License"
698msgstr "License"
699
700msgid "List of installed modules"
701msgstr "List of installed modules"
702
703msgid "MB"
704msgstr "MB"
705
706msgid "Main categories"
707msgstr "Main categories"
708
709msgid "Maintainer(s)"
710msgstr "Maintainer(s)"
711
712msgid "No ATOMS module is available. Please, check your Internet connection."
713msgstr ""
714"No ATOMS module is available. Please, check your Internet connection."
715
716msgid "No ATOMS module is available: your repository list is empty."
717msgstr "No ATOMS module is available: your repository list is empty."
718
719msgid "Package"
720msgstr "Package"
721
722msgid "Release date"
723msgstr "Release date"
724
725msgid "Remove"
726msgstr "Remove"
727
728msgid "Remove done! Please restart Scilab to take changes into account. "
729msgstr "Remove done! Please restart Scilab to take changes into account. "
730
731msgid "Remove failed!"
732msgstr "Remove failed!"
733
734msgid "Removing"
735msgstr "Removing"
736
737msgid "Scilab Version"
738msgstr "Scilab Version"
739
740msgid "See also"
741msgstr "See also"
742
743msgid "Status"
744msgstr "Status"
745
746msgid "Summary"
747msgstr "Summary"
748
749msgid "Title"
750msgstr "Title"
751
752msgid "Update"
753msgstr "Update"
754
755msgid "Update done! Please restart Scilab to take changes into account."
756msgstr "Update done! Please restart Scilab to take changes into account."
757
758msgid "Update failed!"
759msgstr "Update failed!"
760
761msgid "Updating"
762msgstr "Updating"
763
764msgid "Version"
765msgstr "Version"
766
767msgid "WebSite"
768msgstr "Website"
diff --git a/scilab/modules/atoms/locales/fr_FR/atoms.po b/scilab/modules/atoms/locales/fr_FR/atoms.po
index 8921f48..2b22f6a 100644
--- a/scilab/modules/atoms/locales/fr_FR/atoms.po
+++ b/scilab/modules/atoms/locales/fr_FR/atoms.po
@@ -86,7 +86,7 @@ msgstr "%s: ''%s'' n''est pas installé.\n"
86 86
87#, c-format 87#, c-format
88msgid "%s: An error occurred while loading ''%s-%s'':\n" 88msgid "%s: An error occurred while loading ''%s-%s'':\n"
89msgstr "%s : Une erreur est survenue au cours du chargement de \"%s-%s\":\n" 89msgstr "%s : Une erreur est survenue au cours du chargement de ''%s-%s'':\n"
90 90
91#, c-format 91#, c-format
92msgid "%s: Another version of the package %s is already loaded : %s\n" 92msgid "%s: Another version of the package %s is already loaded : %s\n"
@@ -598,7 +598,7 @@ msgid ""
598"''http://'',''ftp://'' or ''file://'' expected.\n" 598"''http://'',''ftp://'' or ''file://'' expected.\n"
599msgstr "" 599msgstr ""
600"%s: Mauvaise valeur pour l'argument d'entrée n° %d: Chaîne commençant par " 600"%s: Mauvaise valeur pour l'argument d'entrée n° %d: Chaîne commençant par "
601"\"http://\", \"ftp://\" ou \"file://\" attendue.\n" 601"''http://'', ''ftp://'' ou ''file://'' attendue.\n"
602 602
603#, c-format 603#, c-format
604msgid "" 604msgid ""
diff --git a/scilab/modules/atoms/locales/it_IT/atoms.po b/scilab/modules/atoms/locales/it_IT/atoms.po
index e840e56..a5992b1 100644
--- a/scilab/modules/atoms/locales/it_IT/atoms.po
+++ b/scilab/modules/atoms/locales/it_IT/atoms.po
@@ -34,15 +34,15 @@ msgstr "\t - ''%s - %s'' è necessario per ''%s''\n"
34 34
35#, c-format 35#, c-format
36msgid "\t - Local location : ''%s''\n" 36msgid "\t - Local location : ''%s''\n"
37msgstr "\t - Posizione locale : \"%s\"\n" 37msgstr "\t - Posizione locale : ''%s''\n"
38 38
39#, c-format 39#, c-format
40msgid "\t - MD5SUM expected : ''%s''\n" 40msgid "\t - MD5SUM expected : ''%s''\n"
41msgstr "\t - MD5SUM atteso : \"%s\"\n" 41msgstr "\t - MD5SUM atteso : ''%s''\n"
42 42
43#, c-format 43#, c-format
44msgid "\t - MD5SUM watched : ''%s''\n" 44msgid "\t - MD5SUM watched : ''%s''\n"
45msgstr "\t - MD5SUM osservato : \"%s\"\n" 45msgstr "\t - MD5SUM osservato : ''%s''\n"
46 46
47#, c-format 47#, c-format
48msgid "\t - URL : ''%s''\n" 48msgid "\t - URL : ''%s''\n"
@@ -95,16 +95,16 @@ msgstr "%s: È già caricata un'altra versione del pacchetto %s : %s\n"
95#, c-format 95#, c-format
96msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n" 96msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
97msgstr "" 97msgstr ""
98"%s: Il file DESCRIPTION non può essere trovato nel pacchetto \"%s\"\n" 98"%s: Il file DESCRIPTION non può essere trovato nel pacchetto ''%s''\n"
99 99
100#, c-format 100#, c-format
101msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n" 101msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
102msgstr "" 102msgstr ""
103"%s: Errore durante la copiatura del file \"%s\" nella directory \"%s\".\n" 103"%s: Errore durante la copiatura del file ''%s'' nella directory ''%s''.\n"
104 104
105#, c-format 105#, c-format
106msgid "%s: Error while creating the directory ''%s''.\n" 106msgid "%s: Error while creating the directory ''%s''.\n"
107msgstr "%s: Errore durante la creazione della directory \"%s\".\n" 107msgstr "%s: Errore durante la creazione della directory ''%s''.\n"
108 108
109#, c-format 109#, c-format
110msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n" 110msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
@@ -122,11 +122,11 @@ msgstr "%s: Il modulo ''%s - %s'' non è installato.\n"
122 122
123#, c-format 123#, c-format
124msgid "%s: Module ''%s'' is not installed (''%s'' section).\n" 124msgid "%s: Module ''%s'' is not installed (''%s'' section).\n"
125msgstr "%s: Il modulo \"%s\" non è installato (sezione \"%s\").\n" 125msgstr "%s: Il modulo ''%s'' non è installato (sezione ''%s'').\n"
126 126
127#, c-format 127#, c-format
128msgid "%s: Module ''%s'' is not installed.\n" 128msgid "%s: Module ''%s'' is not installed.\n"
129msgstr "%s: Il modulo \"%s\" non è installato.\n" 129msgstr "%s: Il modulo ''%s'' non è installato.\n"
130 130
131#, c-format 131#, c-format
132msgid "%s: Neither Wget or Curl found: Please install one of them\n" 132msgid "%s: Neither Wget or Curl found: Please install one of them\n"
@@ -142,7 +142,7 @@ msgstr ""
142 142
143#, c-format 143#, c-format
144msgid "%s: The config file (''%s'') is not well formated at line %d\n" 144msgid "%s: The config file (''%s'') is not well formated at line %d\n"
145msgstr "%s: Il file config (\"%s\") non è formattato bene alla riga %d\n" 145msgstr "%s: Il file config (''%s'') non è formattato bene alla riga %d\n"
146 146
147#, c-format 147#, c-format
148msgid "%s: The dependency tree cannot be resolved.\n" 148msgid "%s: The dependency tree cannot be resolved.\n"
@@ -169,7 +169,7 @@ msgid ""
169"%s: The directory ''%s'' cannot been created, please check if you have write " 169"%s: The directory ''%s'' cannot been created, please check if you have write "
170"access on this directory.\n" 170"access on this directory.\n"
171msgstr "" 171msgstr ""
172"%s: La directory \"%s\" non può essere creata, controllare i permessi di " 172"%s: La directory ''%s'' non può essere creata, controllare i permessi di "
173"accesso in scrittura alla directory.\n" 173"accesso in scrittura alla directory.\n"
174 174
175#, c-format 175#, c-format
@@ -210,15 +210,15 @@ msgstr ""
210 210
211#, c-format 211#, c-format
212msgid "%s: The file ''%s'' cannot be written.\n" 212msgid "%s: The file ''%s'' cannot be written.\n"
213msgstr "%s: Il file \"%s\" non può essere scritto.\n" 213msgstr "%s: Il file ''%s'' non può essere scritto.\n"
214 214
215#, c-format 215#, c-format
216msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n" 216msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
217msgstr "%s: Il file \"%s\" non esiste o non è accessibile in lettura\n" 217msgstr "%s: Il file ''%s'' non esiste o non è accessibile in lettura\n"
218 218
219#, c-format 219#, c-format
220msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n" 220msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n"
221msgstr "%s: Il file \"%s\" non esiste o non è accessibile in lettura.\n" 221msgstr "%s: Il file ''%s'' non esiste o non è accessibile in lettura.\n"
222 222
223#, c-format 223#, c-format
224msgid "%s: The file ''%s'' is not well formated at line %d\n" 224msgid "%s: The file ''%s'' is not well formated at line %d\n"
@@ -254,7 +254,7 @@ msgstr "%s: Il pacchetto %s non è disponibile.\n"
254 254
255#, c-format 255#, c-format
256msgid "%s: The package ''%s'' is not present in the struct.\n" 256msgid "%s: The package ''%s'' is not present in the struct.\n"
257msgstr "%s: Il pacchetto \"%s\" non è presente nella struct.\n" 257msgstr "%s: Il pacchetto ''%s'' non è presente nella struct.\n"
258 258
259#, c-format 259#, c-format
260msgid "" 260msgid ""
@@ -269,7 +269,7 @@ msgstr ""
269msgid "" 269msgid ""
270"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n" 270"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
271msgstr "" 271msgstr ""
272"%s: La versione \"%s\" del pacchetto \"%s\" non è presente nella struct.\n" 272"%s: La versione ''%s'' del pacchetto ''%s'' non è presente nella struct.\n"
273 273
274#, c-format 274#, c-format
275msgid "" 275msgid ""
@@ -468,7 +468,7 @@ msgstr ""
468#, c-format 468#, c-format
469msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n" 469msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
470msgstr "" 470msgstr ""
471"%s: L'argomento in ingresso #%d ha un valore sbagliato: \"%s\" non è un URL " 471"%s: L'argomento in ingresso #%d ha un valore sbagliato: ''%s'' non è un URL "
472"valido.\n" 472"valido.\n"
473 473
474#, c-format 474#, c-format
@@ -491,8 +491,8 @@ msgid ""
491"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or " 491"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
492"''official'' expected.\n" 492"''official'' expected.\n"
493msgstr "" 493msgstr ""
494"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"all\", " 494"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''all'', "
495"\"user\", \"allusers\" o \"official\".\n" 495"''user'', ''allusers'' o ''official''.\n"
496 496
497#, c-format 497#, c-format
498msgid "" 498msgid ""
@@ -513,24 +513,24 @@ msgstr ""
513msgid "" 513msgid ""
514"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n" 514"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
515msgstr "" 515msgstr ""
516"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"user'\" " 516"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''user''' "
517"o \"allusers\".\n" 517"o ''allusers''.\n"
518 518
519#, c-format 519#, c-format
520msgid "" 520msgid ""
521"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' " 521"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
522"expected.\n" 522"expected.\n"
523msgstr "" 523msgstr ""
524"%s: L'argomento #%d in ingresso ha un valore sbagliato: era atteso \"user\" " 524"%s: L'argomento #%d in ingresso ha un valore sbagliato: era atteso ''user'' "
525"o \"alluser\" o \"all\".\n" 525"o ''alluser'' o ''all''.\n"
526 526
527#, c-format 527#, c-format
528msgid "" 528msgid ""
529"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' " 529"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
530"expected.\n" 530"expected.\n"
531msgstr "" 531msgstr ""
532"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"user\", " 532"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''user'', "
533"\"allusers\" o \"all\".\n" 533"''allusers'' o ''all''.\n"
534 534
535#, c-format 535#, c-format
536msgid "" 536msgid ""
@@ -538,7 +538,7 @@ msgid ""
538"expected.\n" 538"expected.\n"
539msgstr "" 539msgstr ""
540"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso " 540"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso "
541"\"user'\", \"allusers\" o \"all\".\n" 541"''user''', ''allusers'' o ''all''.\n"
542 542
543#, c-format 543#, c-format
544msgid "%s: Wrong value for input argument #%d: A valid category expected.\n" 544msgid "%s: Wrong value for input argument #%d: A valid category expected.\n"
@@ -572,7 +572,7 @@ msgid ""
572"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n" 572"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
573msgstr "" 573msgstr ""
574"%s: L'argomento in ingresso #%d ha un valore sbagliato: erano attese le " 574"%s: L'argomento in ingresso #%d ha un valore sbagliato: erano attese le "
575"lettere \"A\" o \"I\".\n" 575"lettere ''A'' o ''I''.\n"
576 576
577#, c-format 577#, c-format
578msgid "" 578msgid ""
@@ -644,8 +644,8 @@ msgstr ""
644msgid "" 644msgid ""
645"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n" 645"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
646msgstr "" 646msgstr ""
647"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"error\" " 647"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''error'' "
648"o \"warning\".\n" 648"o ''warning''.\n"
649 649
650#, c-format 650#, c-format
651msgid "" 651msgid ""
@@ -670,11 +670,11 @@ msgstr "%s: Nome e versione non sono entrambi definiti\n"
670 670
671#, c-format 671#, c-format
672msgid "%s: the package ''%s'' doesn''t contain the field ''%s''.\n" 672msgid "%s: the package ''%s'' doesn''t contain the field ''%s''.\n"
673msgstr "%s: il pacchetto \"%s\" non contiene il campo \"%s\".\n" 673msgstr "%s: il pacchetto ''%s'' non contiene il campo ''%s''.\n"
674 674
675#, c-format 675#, c-format
676msgid "%s: the package ''%s'' doesn''t exist.\n" 676msgid "%s: the package ''%s'' doesn''t exist.\n"
677msgstr "%s: il pacchetto \"%s\" non esiste.\n" 677msgstr "%s: il pacchetto ''%s'' non esiste.\n"
678 678
679msgid "&?" 679msgid "&?"
680msgstr "&?" 680msgstr "&?"
diff --git a/scilab/modules/atoms/locales/ja_JP/atoms.po b/scilab/modules/atoms/locales/ja_JP/atoms.po
index 46a36c7..21e9854 100644
--- a/scilab/modules/atoms/locales/ja_JP/atoms.po
+++ b/scilab/modules/atoms/locales/ja_JP/atoms.po
@@ -100,7 +100,7 @@ msgstr "%s: DESCRIPTION ファイルはパッケージ ''%s'' に見つかりま
100 100
101#, c-format 101#, c-format
102msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n" 102msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
103msgstr "%s: ファイル\"%s\" をディレクトリ\"%s\"へコピーする際にエラーが発生しました.\n" 103msgstr "%s: ファイル''%s'' をディレクトリ''%s''へコピーする際にエラーが発生しました.\n"
104 104
105#, c-format 105#, c-format
106msgid "%s: Error while creating the directory ''%s''.\n" 106msgid "%s: Error while creating the directory ''%s''.\n"
@@ -138,7 +138,7 @@ msgstr "%s: 複数のバージョンのパッケージ (%s) を同じScilabセ
138 138
139#, c-format 139#, c-format
140msgid "%s: The config file (''%s'') is not well formated at line %d\n" 140msgid "%s: The config file (''%s'') is not well formated at line %d\n"
141msgstr "%s: 設定ファイル(\"%s\")の%d行目は整形式ではありません.\n" 141msgstr "%s: 設定ファイル(''%s'')の%d行目は整形式ではありません.\n"
142 142
143#, c-format 143#, c-format
144msgid "%s: The dependency tree cannot be resolved.\n" 144msgid "%s: The dependency tree cannot be resolved.\n"
@@ -162,7 +162,7 @@ msgstr "%s: ディレクトリ %s は存在しません。\n"
162msgid "" 162msgid ""
163"%s: The directory ''%s'' cannot been created, please check if you have write " 163"%s: The directory ''%s'' cannot been created, please check if you have write "
164"access on this directory.\n" 164"access on this directory.\n"
165msgstr "%s: ディレクトリー \"%s\" を作成できません. このディレクトリーへの書き込みアクセス権の有無を確認ください.\n" 165msgstr "%s: ディレクトリー ''%s'' を作成できません. このディレクトリーへの書き込みアクセス権の有無を確認ください.\n"
166 166
167#, c-format 167#, c-format
168msgid "" 168msgid ""
@@ -199,7 +199,7 @@ msgstr "%s: ファイル %s は整形式ではありません.ツールボック
199 199
200#, c-format 200#, c-format
201msgid "%s: The file ''%s'' cannot be written.\n" 201msgid "%s: The file ''%s'' cannot be written.\n"
202msgstr "%s: ファイル %s を書き込めません。\n" 202msgstr "%s: ファイル ''%s'' を書き込めません。\n"
203 203
204#, c-format 204#, c-format
205msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n" 205msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
@@ -211,7 +211,7 @@ msgstr "%s: ファイル ''%s'' が存在しないか、読み取り可能では
211 211
212#, c-format 212#, c-format
213msgid "%s: The file ''%s'' is not well formated at line %d\n" 213msgid "%s: The file ''%s'' is not well formated at line %d\n"
214msgstr "%s: ファイル \"%s\" の %d 行目は整形式ではありません.\n" 214msgstr "%s: ファイル ''%s'' の %d 行目は整形式ではありません.\n"
215 215
216#, c-format 216#, c-format
217msgid "%s: The following file hasn''t been copied:\n" 217msgid "%s: The following file hasn''t been copied:\n"
@@ -392,7 +392,7 @@ msgstr "%s: 入力引数 #%d の型が間違っています: mlistを指定し
392#, c-format 392#, c-format
393msgid "" 393msgid ""
394"%s: Wrong value for input argument #%d: ''%s'' is not a registered category" 394"%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
395msgstr "%s: 入力引数 #%d の値が間違っています: \"%s\" は登録済みのカテゴリではありません" 395msgstr "%s: 入力引数 #%d の値が間違っています: ''%s'' は登録済みのカテゴリではありません"
396 396
397#, c-format 397#, c-format
398msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n" 398msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
@@ -401,14 +401,14 @@ msgstr "%s: 入力引数 #%d で不正な値: ''%s'' は妥当なURLではあり
401#, c-format 401#, c-format
402msgid "" 402msgid ""
403"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n" 403"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
404msgstr "%s: 入力引数 #%d の値が間違っています: \"all\" または \"main\" を指定してください.\n" 404msgstr "%s: 入力引数 #%d の値が間違っています: ''all'' または ''main'' を指定してください.\n"
405 405
406#, c-format 406#, c-format
407msgid "" 407msgid ""
408"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or " 408"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
409"''session'' expected.\n" 409"''session'' expected.\n"
410msgstr "" 410msgstr ""
411"%s: 入力引数 #%d の値が間違っています: \"all\", \"allusers\", \"user\" または \"session\" " 411"%s: 入力引数 #%d の値が間違っています: ''all'', ''allusers'', ''user'' または ''session'' "
412"を指定してください.\n" 412"を指定してください.\n"
413 413
414#, c-format 414#, c-format
@@ -416,7 +416,7 @@ msgid ""
416"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or " 416"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
417"''official'' expected.\n" 417"''official'' expected.\n"
418msgstr "" 418msgstr ""
419"%s: 入力引数 #%d の値が間違っています: \"all\", \"users\", \"alluser\" または \"official\" " 419"%s: 入力引数 #%d の値が間違っています: ''all'', ''users'', ''alluser'' または ''official'' "
420"を指定してください.\n" 420"を指定してください.\n"
421 421
422#, c-format 422#, c-format
@@ -424,7 +424,7 @@ msgid ""
424"%s: Wrong value for input argument #%d: ''filter:all'',''filter:main'' or a " 424