Merge remote-tracking branch 'origin/5.3' into simulinkimport

Conflicts: scilab/aclocal.m4 scilab/configure Change-Id: I6a0f0a544872cd5e77e74384e76c65674f701898
author: Clément DAVID <clement.david@scilab.org> 2011-03-07 09:52:16 +0100
committer: Clément DAVID <clement.david@scilab.org> 2011-03-07 09:52:16 +0100
commit: 2835e08091d79405f8a4ef74787b5aace3e935ab (patch)
tree: 76ee3a864662a8fba9f395735a60ae4a0f9e8e4b /scilab/modules
parent: 6c742c35f0a9a138f765e434e294273a262f8fd5 (diff)
parent: 0118710f9d4ca4c1843a40d7355add417b510001 (diff)
download: scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.zip
scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.tar.gz
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@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -287,6 +288,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @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@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -276,6 +277,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @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"
 #, c-format
 msgid "Scilab '%s' module not installed.\n"
-msgstr "Il modulo \"%s\" di Scilab non è installato.\n"
+msgstr "Il modulo '%s' di Scilab non è installato.\n"
 msgid "Unable to communicate with the interpreter"
 msgstr "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"
 #, c-format
 msgid "Scilab '%s' module not installed.\n"
-msgstr "O módulo \"%s\" do Scilab não está instalado.\n"
+msgstr "O módulo '%s' do Scilab não está instalado.\n"
 msgid "Unable to communicate with the interpreter"
 msgstr "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
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
- PRODUCTVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,1,0
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
        BLOCK "040c04b0"
        BEGIN
            VALUE "FileDescription", "action_binding module"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
            VALUE "InternalName", "action_binding module"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
            VALUE "OriginalFilename", "action_binding.dll"
            VALUE "ProductName", " action_binding"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
        END
    END
    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
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
- PRODUCTVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,1,0
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -66,12 +66,12 @@ BEGIN
        BLOCK "040c04b0"
        BEGIN
            VALUE "FileDescription", "noaction_binding module"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
            VALUE "InternalName", "noaction_binding module"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
            VALUE "OriginalFilename", "noaction_binding.dll"
            VALUE "ProductName", " noaction_binding"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
        END
    END
    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 @@
 -->
 <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
 <MODULE_VERSION name="action_binding">
-<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" />
+<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
 </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@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -244,6 +245,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @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
 //
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
- PRODUCTVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,1,0
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -65,12 +65,12 @@ BEGIN
        BLOCK "040c04b0"
        BEGIN
            VALUE "FileDescription", "api_scilab module"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
            VALUE "InternalName", "api_scilab module"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
            VALUE "OriginalFilename", "api_scilab.dll"
            VALUE "ProductName", "api_scilab module"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
        END
    END
    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 @@
 SciErr getMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal)
 {
-        return getCommonMatrixOfDouble(_pvCtx, _piAddress, 0, _piRows, _piCols, _pdblReal, NULL);
+    return getCommonMatrixOfDouble(_pvCtx, _piAddress, 0, _piRows, _piCols, _pdblReal, NULL);
 }
 SciErr getComplexMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
 {
-        return getCommonMatrixOfDouble(_pvCtx, _piAddress, 1, _piRows, _piCols, _pdblReal, _pdblImg);
+    return getCommonMatrixOfDouble(_pvCtx, _piAddress, 1, _piRows, _piCols, _pdblReal, _pdblImg);
 }
 SciErr getComplexZMatrixOfDouble(void* _pvCtx, int* _piAddress, int* _piRows, int* _piCols, doublecomplex** _pdblZ)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal = NULL;
+    double *pdblReal = NULL;
-        double *pdblImg  = NULL;
+    double *pdblImg      = NULL;
-        sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, isVarComplex(_pvCtx, _piAddress), _piRows, _piCols, &pdblReal, &pdblImg);
+    sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, isVarComplex(_pvCtx, _piAddress), _piRows, _piCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_ZDOUBLE, _("%s: Unable to get argument #%d"), "getComplexZMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
+        addErrorMessage(&sciErr, API_ERROR_GET_ZDOUBLE, _("%s: Unable to get argument #%d"), "getComplexZMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
-                return sciErr;
+        return sciErr;
-        }
+    }
-        *_pdblZ = oGetDoubleComplexFromPointer(pdblReal, pdblImg, *_piRows * *_piCols);
+    *_pdblZ     = oGetDoubleComplexFromPointer(pdblReal, pdblImg, *_piRows * *_piCols);
-        return sciErr;
+    return sciErr;
 }
 SciErr getCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int* _piRows, int* _piCols, double** _pdblReal, double** _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        int iType = 0;
+    int iType = 0;
-        if(     _piAddress == NULL)
+    if( _piAddress == NULL)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_INVALID_POINTER, _("%s: Invalid argument address"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        sciErr = getVarType(_pvCtx, _piAddress, &iType);
+    sciErr = getVarType(_pvCtx, _piAddress, &iType);
-        if(sciErr.iErr || iType != sci_matrix)
+    if(sciErr.iErr || iType != sci_matrix)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", _("double matrix"));
+        addErrorMessage(&sciErr, API_ERROR_INVALID_TYPE, _("%s: Invalid argument type, %s excepted"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", _("double matrix"));
-                return sciErr;
+        return sciErr;
-        }
+    }
-        if(isVarComplex(_pvCtx, _piAddress) != _iComplex)
+    if(isVarComplex(_pvCtx, _piAddress) != _iComplex)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), "getComplexMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_INVALID_COMPLEXITY, _("%s: Bad call to get a non complex matrix"), "getComplexMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols);
+    sciErr = getVarDimension(_pvCtx, _piAddress, _piRows, _piCols);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
+        addErrorMessage(&sciErr, API_ERROR_GET_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getComplexMatrixOfDouble" : "getMatrixOfDouble", getRhsFromAddress(_pvCtx, _piAddress));
-                return sciErr;
+        return sciErr;
-        }
+    }
-        if(_pdblReal != NULL)
+    if(_pdblReal != NULL)
-        {
+    {
-                *_pdblReal      = (double*)(_piAddress + 4);
+        *_pdblReal      = (double*)(_piAddress + 4);
-        }
+    }
-        if(_iComplex && _pdblImg != NULL)
+    if(_iComplex && _pdblImg != NULL)
-        {
+    {
-                *_pdblImg       = (double*)(_piAddress + 4) + *_piRows * *_piCols;
+        *_pdblImg       = (double*)(_piAddress + 4) + *_piRows * *_piCols;
-        }
+    }
-        return sciErr;
+    return sciErr;
 }
 SciErr allocMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 0, _iRows, _iCols, &pdblReal, NULL);
+    sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 0, _iRows, _iCols, &pdblReal, NULL);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_ALLOC_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        *_pdblReal      = pdblReal;
+    *_pdblReal  = pdblReal;
-        return sciErr;
+    return sciErr;
 }
 SciErr allocComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        double *pdblImg         = NULL;
+    double *pdblImg             = NULL;
-        sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 1, _iRows, _iCols, &pdblReal, &pdblImg);
+    sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, 1, _iRows, _iCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_ALLOC_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_ALLOC_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        *_pdblReal      = pdblReal;
+    *_pdblReal  = pdblReal;
-        *_pdblImg               = pdblImg;
+    *_pdblImg           = pdblImg;
-        return sciErr;
+    return sciErr;
 }
 SciErr allocCommonMatrixOfDouble(void* _pvCtx, int _iVar, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        int iNewPos                     = Top - Rhs + _iVar;
+    int iNewPos                 = Top - Rhs + _iVar;
-        int iAddr                               = *Lstk(iNewPos);
+    int iAddr                           = *Lstk(iNewPos);
-        int* piAddr                     = NULL;
+    int* piAddr                 = NULL;
-        int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
+    int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
-        int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(iAddr));
+    int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(iAddr));
-        if (iMemSize > iFreeSpace)
+    if (iMemSize > iFreeSpace)
-        {
+    {
-                addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
+        addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
-                return sciErr;
+        return sciErr;
-        }
+    }
-        getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr);
+    getNewVarAddressFromPosition(_pvCtx, iNewPos, &piAddr);
-        fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, _pdblReal, _pdblImg);
+    fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, _pdblReal, _pdblImg);
-        updateInterSCI(_iVar, '$', iAddr, sadr(iadr(iAddr) + 4));
+    updateInterSCI(_iVar, '$', iAddr, sadr(iadr(iAddr) + 4));
-        updateLstk(iNewPos, sadr(iadr(iAddr) + 4), _iRows * _iCols * (_iComplex + 1));
+    updateLstk(iNewPos, sadr(iadr(iAddr) + 4), _iRows * _iCols * (_iComplex + 1));
-        return sciErr;
+    return sciErr;
 }
 SciErr fillCommonMatrixOfDouble(void* _pvCtx, int* _piAddress, int _iComplex, int _iRows, int _iCols, double** _pdblReal, double** _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        _piAddress[0]           = sci_matrix;
+    _piAddress[0]               = sci_matrix;
-        _piAddress[1]           = Min(_iRows, _iRows * _iCols);
+    _piAddress[1]               = Min(_iRows, _iRows * _iCols);
-        _piAddress[2]           = Min(_iCols, _iRows * _iCols);
+    _piAddress[2]               = Min(_iCols, _iRows * _iCols);
-        _piAddress[3]           = _iComplex;
+    _piAddress[3]               = _iComplex;
-        if(_pdblReal != NULL)
+    if(_pdblReal != NULL)
-        {
+    {
-                *_pdblReal              = (double*)(_piAddress + 4);
+        *_pdblReal              = (double*)(_piAddress + 4);
-        }
+    }
-        if(_iComplex != 0 && _pdblImg != NULL)
+    if(_iComplex != 0 && _pdblImg != NULL)
-        {
+    {
-                *_pdblImg       = *_pdblReal + _iRows * _iCols;
+        *_pdblImg       = *_pdblReal + _iRows * _iCols;
-        }
+    }
-        return sciErr;
+    return sciErr;
 }
 SciErr createMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        int iOne                                        = 1;
+    int iOne                                    = 1;
-        int iSize                                       = _iRows * _iCols;
+    int iSize                                   = _iRows * _iCols;
-        sciErr = allocMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal);
+    sciErr = allocMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_CREATE_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_CREATE_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
+    C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
-        return sciErr;
+    return sciErr;
 }
 SciErr createComplexMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        double *pdblImg         = NULL;
+    double *pdblImg             = NULL;
-        int iOne                                        = 1;
+    int iOne                                    = 1;
-        int iSize                                       = _iRows * _iCols;
+    int iSize                                   = _iRows * _iCols;
-        sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
+    sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_CREATE_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_CREATE_COMPLEX_DOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
+    C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
-        C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
+    C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
-        return sciErr;
+    return sciErr;
 }
 SciErr createComplexZMatrixOfDouble(void* _pvCtx, int _iVar, int _iRows, int _iCols, const doublecomplex* _pdblData)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        double *pdblReal                = NULL;
+    double *pdblReal            = NULL;
-        double *pdblImg                 = NULL;
+    double *pdblImg                     = NULL;
-        sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
+    sciErr = allocComplexMatrixOfDouble(_pvCtx, _iVar, _iRows, _iCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_CREATE_ZDOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
+        addErrorMessage(&sciErr, API_ERROR_CREATE_ZDOUBLE, _("%s: Unable to create variable in Scilab memory"), "allocComplexMatrixOfDouble");
-                return sciErr;
+        return sciErr;
-        }
+    }
-        vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
+    vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
-        return sciErr;
+    return sciErr;
 }
 SciErr createNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal)
 {
-        return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _iRows, _iCols, _pdblReal, NULL);
+    return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _iRows, _iCols, _pdblReal, NULL);
 }
 SciErr createNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
 {
-        return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _iRows, _iCols, _pdblReal, _pdblImg);
+    return createCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _iRows, _iCols, _pdblReal, _pdblImg);
 }
 SciErr createNamedComplexZMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iRows, int _iCols, const doublecomplex* _pdblData)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        int iVarID[nsiz];
+    int iVarID[nsiz];
-        int iSaveRhs                    = Rhs;
+    int iSaveRhs                        = Rhs;
-        int iSaveTop                    = Top;
+    int iSaveTop                        = Top;
-        int iSize                                       = _iRows * _iCols;
+    int iSize                                   = _iRows * _iCols;
-        int *piAddr                             = NULL;
+    int *piAddr                         = NULL;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        double *pdblImg         = NULL;
+    double *pdblImg             = NULL;
-        C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
+    C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
-        Top = Top + Nbvars + 1;
+    Top = Top + Nbvars + 1;
-        getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
+    getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
-        //write matrix information
+    //write matrix information
-        fillCommonMatrixOfDouble(_pvCtx, piAddr, 1, _iRows, _iCols, &pdblReal, &pdblImg);
+    fillCommonMatrixOfDouble(_pvCtx, piAddr, 1, _iRows, _iCols, &pdblReal, &pdblImg);
-        vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
+    vGetPointerFromDoubleComplex(_pdblData, _iRows * _iCols, pdblReal, pdblImg);
-        //update "variable index"
+    //update "variable index"
-        updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (2) * 2);
+    updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (2) * 2);
-        Rhs = 0;
+    Rhs = 0;
-        //Add name in stack reference list
+    //Add name in stack reference list
-        createNamedVariable(iVarID);
+    createNamedVariable(iVarID);
-        Top = iSaveTop;
+    Top = iSaveTop;
-        Rhs = iSaveRhs;
+    Rhs = iSaveRhs;
-        return sciErr;
+    return sciErr;
 }
 SciErr createCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int _iRows, int _iCols, const double* _pdblReal, const double* _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        int iVarID[nsiz];
+    int iVarID[nsiz];
-        int iSaveRhs            = Rhs;
+    int iSaveRhs                = Rhs;
-        int iSaveTop            = Top;
+    int iSaveTop                = Top;
-        int iSize               = _iRows * _iCols;
+    int iSize           = _iRows * _iCols;
-        int *piAddr             = NULL;
+    int *piAddr         = NULL;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        double *pdblImg         = NULL;
+    double *pdblImg             = NULL;
-        int iOne                = 1;
+    int iOne            = 1;
-        C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
+    C2F(str2name)(_pstName, iVarID, (int)strlen(_pstName));
-        Top = Top + Nbvars + 1;
+    Top = Top + Nbvars + 1;
-        int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
+    int iMemSize = _iRows * _iCols * (_iComplex + 1) + 2;
-        int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(Top));
+    int iFreeSpace = iadr(*Lstk(Bot)) - (iadr(Top));
-        if (iMemSize > iFreeSpace)
+    if (iMemSize > iFreeSpace)
-        {
+    {
-                addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
+        addStackSizeError(&sciErr, ((StrCtx*)_pvCtx)->pstName, iMemSize);
-                return sciErr;
+        return sciErr;
-        }
+    }
-        getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
+    getNewVarAddressFromPosition(_pvCtx, Top, &piAddr);
-        //write matrix information
+    //write matrix information
-        fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, &pdblReal, &pdblImg);
+    fillCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _iRows, _iCols, &pdblReal, &pdblImg);
-        //copy data in stack
+    //copy data in stack
-        C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
+    C2F(dcopy)(&iSize, const_cast<double*>(_pdblReal), &iOne, pdblReal, &iOne);
-        if(_iComplex)
+    if(_iComplex)
-        {
+    {
-                C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
+        C2F(dcopy)(&iSize, const_cast<double*>(_pdblImg), &iOne, pdblImg, &iOne);
-        }
+    }
-        //update "variable index"
+    //update "variable index"
-        updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (_iComplex + 1) * 2);
+    updateLstk(Top, *Lstk(Top) + sadr(4), iSize * (_iComplex + 1) * 2);
-        Rhs = 0;
+    Rhs = 0;
-        //Add name in stack reference list
+    //Add name in stack reference list
-        createNamedVariable(iVarID);
+    createNamedVariable(iVarID);
-        Top = iSaveTop;
+    Top = iSaveTop;
-        Rhs = iSaveRhs;
+    Rhs = iSaveRhs;
-        return sciErr;
+    return sciErr;
 }
 SciErr readNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal)
 {
-        return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _piRows, _piCols, _pdblReal, NULL);
+    return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 0, _piRows, _piCols, _pdblReal, NULL);
 }
 SciErr readNamedComplexMatrixOfDouble(void* _pvCtx, const char* _pstName, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg)
 {
-        return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _piRows, _piCols, _pdblReal, _pdblImg);
+    return readCommonNamedMatrixOfDouble(_pvCtx, _pstName, 1, _piRows, _piCols, _pdblReal, _pdblImg);
 }
 SciErr readCommonNamedMatrixOfDouble(void* _pvCtx, const char* _pstName, int _iComplex, int* _piRows, int* _piCols, double* _pdblReal, double* _pdblImg)
 {
-        SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
+    SciErr sciErr; sciErr.iErr = 0; sciErr.iMsgCount = 0;
-        int* piAddr             = NULL;
+    int* piAddr         = NULL;
-        double* pdblReal        = NULL;
+    double* pdblReal    = NULL;
-        double* pdblImg         = NULL;
+    double* pdblImg             = NULL;
-        int iSize               = 0;
+    int iSize           = 0;
-        int iOne                = 1;
+    int iOne            = 1;
-        sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr);
+    sciErr = getVarAddressFromName(_pvCtx, _pstName, &piAddr);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
+        addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
-                return sciErr;
+        return sciErr;
-        }
+    }
-        sciErr = getCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _piRows, _piCols, &pdblReal, &pdblImg);
+    sciErr = getCommonMatrixOfDouble(_pvCtx, piAddr, _iComplex, _piRows, _piCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
+        addErrorMessage(&sciErr, API_ERROR_READ_NAMED_DOUBLE, _("%s: Unable to get variable \"%s\""), _iComplex ? "readNamedComplexMatrixOfDouble" : "readNamedMatrixOfDouble", _pstName);
-                return sciErr;
+        return sciErr;
-        }
+    }
-        if(_pdblReal == NULL || (_iComplex && _pdblImg == NULL))
+    if(_pdblReal == NULL || (_iComplex && _pdblImg == NULL))
-        {
+    {
-                return sciErr;
+        return sciErr;
-        }
+    }
-        iSize = (*_piRows) * (*_piCols);
+    iSize = (*_piRows) * (*_piCols);
-        C2F(dcopy)(&iSize, _pdblReal, &iOne, pdblReal, &iOne);
+    /* dcopy source to dest */
-        if(_iComplex)
+    C2F(dcopy)(&iSize, pdblReal, &iOne, _pdblReal, &iOne);
-        {
+    if(_iComplex)
-                C2F(dcopy)(&iSize, _pdblImg, &iOne, pdblImg, &iOne);
+    {
-        }
+        C2F(dcopy)(&iSize, pdblImg, &iOne, _pdblImg, &iOne);
+    }
-        return sciErr;
+    return sciErr;
 }
 /*shortcut functions*/
 int isDoubleType(void* _pvCtx, int* _piAddress)
 {
-        return checkVarType(_pvCtx, _piAddress, sci_matrix);
+    return checkVarType(_pvCtx, _piAddress, sci_matrix);
 }
 /*--------------------------------------------------------------------------*/
 int isNamedDoubleType(void* _pvCtx, const char* _pstName)
 {
-        return checkNamedVarType(_pvCtx, _pstName, sci_matrix);
+    return checkNamedVarType(_pvCtx, _pstName, sci_matrix);
 }
 /*--------------------------------------------------------------------------*/
 int getScalarDouble(void* _pvCtx, int* _piAddress, double* _pdblReal)
 {
-        return getCommonScalarDouble(_pvCtx, _piAddress, 0, _pdblReal, NULL);
+    return getCommonScalarDouble(_pvCtx, _piAddress, 0, _pdblReal, NULL);
 }
 /*--------------------------------------------------------------------------*/
 int getScalarComplexDouble(void* _pvCtx, int* _piAddress, double* _pdblReal, double* _pdblImg)
 {
-        return getCommonScalarDouble(_pvCtx, _piAddress, 1, _pdblReal, _pdblImg);
+    return getCommonScalarDouble(_pvCtx, _piAddress, 1, _pdblReal, _pdblImg);
 }
 /*--------------------------------------------------------------------------*/
 static int getCommonScalarDouble(void* _pvCtx, int* _piAddress, int _iComplex, double* _pdblReal, double* _pdblImg)
 {
-        SciErr sciErr;
+    SciErr sciErr;
-        int iRows       = 0;
+    int iRows   = 0;
-        int iCols       = 0;
+    int iCols   = 0;
-        double* pdblReal = NULL;
+    double* pdblReal = NULL;
-        double* pdblImg  = NULL;
+    double* pdblImg      = NULL;
-        sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, &pdblReal, &pdblImg);
+    sciErr = getCommonMatrixOfDouble(_pvCtx, _piAddress, _iComplex, &iRows, &iCols, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
+        addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Unable to get argument #%d"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        if(isScalar(_pvCtx, _piAddress) == 0)
+    if(isScalar(_pvCtx, _piAddress) == 0)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
+        addErrorMessage(&sciErr, API_ERROR_GET_SCALAR_DOUBLE, _("%s: Wrong type for input argument #%d: A scalar expected.\n"), _iComplex ? "getScalarComplexDouble" : "getScalarDouble", getRhsFromAddress(_pvCtx, _piAddress));
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        if(_pdblReal != NULL)
+    if(_pdblReal != NULL)
-        {
+    {
-                *_pdblReal      = pdblReal[0];
+        *_pdblReal      = pdblReal[0];
-        }
+    }
-        if(_pdblImg != NULL)
+    if(_pdblImg != NULL)
-        {
+    {
-                *_pdblImg               = pdblImg[0];
+        *_pdblImg               = pdblImg[0];
-        }
+    }
-        return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 int getNamedScalarDouble(void* _pvCtx, const char* _pstName, double* _pdblReal)
 {
-        return getCommonNamedScalarDouble(_pvCtx, _pstName, 0, _pdblReal, NULL);
+    return getCommonNamedScalarDouble(_pvCtx, _pstName, 0, _pdblReal, NULL);
 }
 /*--------------------------------------------------------------------------*/
 int getNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double* _pdblReal, double* _pdblImg)
 {
-        return getCommonNamedScalarDouble(_pvCtx, _pstName, 1, _pdblReal, _pdblImg);
+    return getCommonNamedScalarDouble(_pvCtx, _pstName, 1, _pdblReal, _pdblImg);
 }
 /*--------------------------------------------------------------------------*/
 static int getCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double* _pdblReal, double* _pdblImg)
 {
-        SciErr sciErr;
+    SciErr sciErr;
-        int iRows       = 0;
+    int iRows   = 0;
-        int iCols       = 0;
+    int iCols   = 0;
-        double dblReal = 0;
+    double dblReal = 0;
-        double dblImg    = 0;
+    double dblImg        = 0;
-        if(isNamedScalar(_pvCtx, _pstName) == 0)
+    if(isNamedScalar(_pvCtx, _pstName) == 0)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
+        addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Wrong type for input argument \"%s\": A scalar expected.\n"), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        sciErr = readCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, &iRows, &iCols, &dblReal, &dblImg);
+    sciErr = readCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, &iRows, &iCols, &dblReal, &dblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Unable to get argument \"%s\""), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
+        addErrorMessage(&sciErr, API_ERROR_GET_NAMED_SCALAR_DOUBLE, _("%s: Unable to get argument \"%s\""), _iComplex ? "getNamedScalarComplexDouble" : "getNamedScalarDouble", _pstName);
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        if(_pdblReal != NULL)
+    if(_pdblReal != NULL)
-        {
+    {
-                _pdblReal[0]    = dblReal;
+        _pdblReal[0]    = dblReal;
-        }
+    }
-        if(_pdblImg != NULL)
+    if(_pdblImg != NULL)
-        {
+    {
-                _pdblImg[0]             = dblImg;
+        _pdblImg[0]             = dblImg;
-        }
+    }
-        return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 int createScalarDouble(void* _pvCtx, int _iVar, double _dblReal)
 {
-        return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
+    return createCommonScalarDouble(_pvCtx, _iVar, 0, _dblReal, NULL);
 }
 /*--------------------------------------------------------------------------*/
 int createScalarComplexDouble(void* _pvCtx, int _iVar, double _dblReal, double _dblImg)
 {
-        return createCommonScalarDouble(_pvCtx, _iVar, 1, _dblReal, _dblImg);
+    return createCommonScalarDouble(_pvCtx, _iVar, 1, _dblReal, _dblImg);
 }
 /*--------------------------------------------------------------------------*/
 static int createCommonScalarDouble(void* _pvCtx, int _iVar, int _iComplex, double _dblReal, double _dblImg)
 {
-        SciErr sciErr;
+    SciErr sciErr;
-        double *pdblReal        = NULL;
+    double *pdblReal    = NULL;
-        double *pdblImg         = NULL;
+    double *pdblImg             = NULL;
-        sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, 1, 1, &pdblReal, &pdblImg);
+    sciErr = allocCommonMatrixOfDouble(_pvCtx, _iVar, _iComplex, 1, 1, &pdblReal, &pdblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_CREATE_SCALAR_DOUBLE, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createScalarComplexDouble" : "createScalarDouble");
+        addErrorMessage(&sciErr, API_ERROR_CREATE_SCALAR_DOUBLE, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createScalarComplexDouble" : "createScalarDouble");
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        pdblReal[0] = _dblReal;
+    pdblReal[0] = _dblReal;
-        if(_iComplex)
+    if(_iComplex)
-        {
+    {
-                pdblImg[0]      = _dblImg;
+        pdblImg[0]      = _dblImg;
-        }
+    }
-        return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
 int createNamedScalarDouble(void* _pvCtx, const char* _pstName, double _dblReal)
 {
-        return createCommonNamedScalarDouble(_pvCtx, _pstName, 0, _dblReal, 0);
+    return createCommonNamedScalarDouble(_pvCtx, _pstName, 0, _dblReal, 0);
 }
 /*--------------------------------------------------------------------------*/
 int createNamedScalarComplexDouble(void* _pvCtx, const char* _pstName, double _dblReal, double _dblImg)
 {
-        return createCommonNamedScalarDouble(_pvCtx, _pstName, 1, _dblReal, _dblImg);
+    return createCommonNamedScalarDouble(_pvCtx, _pstName, 1, _dblReal, _dblImg);
 }
 /*--------------------------------------------------------------------------*/
 static int createCommonNamedScalarDouble(void* _pvCtx, const char* _pstName, int _iComplex, double _dblReal, double _dblImg)
 {
-        SciErr sciErr;
+    SciErr sciErr;
-        sciErr = createCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, 1, 1, &_dblReal, &_dblImg);
+    sciErr = createCommonNamedMatrixOfDouble(_pvCtx, _pstName, _iComplex, 1, 1, &_dblReal, &_dblImg);
-        if(sciErr.iErr)
+    if(sciErr.iErr)
-        {
+    {
-                addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_SCALAR, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createNamedScalarComplexDouble" : "createNamedScalarDouble");
+        addErrorMessage(&sciErr, API_ERROR_CREATE_NAMED_SCALAR, _("%s: Unable to create variable in Scilab memory"), _iComplex ? "createNamedScalarComplexDouble" : "createNamedScalarDouble");
-                printError(&sciErr, 0);
+        printError(&sciErr, 0);
-                return sciErr.iErr;
+        return sciErr.iErr;
-        }
+    }
-        return 0;
+    return 0;
 }
 /*--------------------------------------------------------------------------*/
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 @@
+/* ========================================================================== */
+/* bug 8587 */
+/* Allan CORNET - 2010 - DIGITEO */
+/* ========================================================================== */
+#include <api_scilab.h>
+#include <BOOL.h>
+#include <stack-c.h>
+#include <Scierror.h>
+#include <MALLOC.h>
+/* ========================================================================== */
+int sci_readDoubles(char *fname)
+{
+    #define NAME_MATRIX_TO_READ "REF_TEST_MATRIX"
+    #define REF_SIZE_COLS 3
+    #define REF_SIZE_ROWS 2
+    SciErr sciErr;
+    int nbRow = 0;
+    int nbCol = 0;
+    double * matrixOfDouble = NULL;
+    
+    sciErr = readNamedMatrixOfDouble(pvApiCtx, NAME_MATRIX_TO_READ, &nbRow, &nbCol , NULL);
+    if(sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+    }
+    if ((nbRow != REF_SIZE_ROWS) || (nbCol != REF_SIZE_COLS))
+    {
+        Scierror(999, "%s: Wrong size for input argument #%s.\n", fname, NAME_MATRIX_TO_READ);
+        return 0;
+    }
+    
+    matrixOfDouble = (double*)MALLOC((nbRow*nbCol)*sizeof(double));
+    
+    sciErr = readNamedMatrixOfDouble(pvApiCtx, NAME_MATRIX_TO_READ, &nbRow, &nbCol, matrixOfDouble);
+    if(sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+    }
+    
+    sciErr = createMatrixOfDouble(pvApiCtx, Rhs + 1, nbRow, nbCol, matrixOfDouble);
+    if(sciErr.iErr)
+    {
+        printError(&sciErr, 0);
+    }
+    LhsVar(1) = Rhs + 1;
+    return 0;
+}
+/* ========================================================================== */
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 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- JVM NOT MANDATORY -->
+//
+// <-- Non-regression test for bug 8587 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=8587
+//
+// <-- Short Description -->
+// readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble) returned wrong values
+ilib_verbose(0);
+test_path = get_absolute_file_path('bug_8587.tst');
+currentpath = pwd();
+cd TMPDIR;
+cd ../;
+OS_TMP_DIR = pwd();
+mkdir(OS_TMP_DIR,'bug_8587');
+TEST_DIR = OS_TMP_DIR + filesep() + 'bug_8587';
+copyfile(SCI+'/modules/api_scilab/tests/nonreg_tests/bug_8587.c' , TEST_DIR + filesep() + 'bug_8587.c');
+chdir(TEST_DIR);
+files = ['bug_8587.c'];
+ilib_build('lib_bug_8587', ['readDoubles', 'sci_readDoubles'], files, []);
+exec loader.sce;
+chdir(currentpath);
+REF_TEST_MATRIX = [1 2 3; 4 5 6];
+REF_TEST_MATRIX_COPY = [1 2 3; 4 5 6];
+if execstr("result = readDoubles()", "errcatch") <> 0 then bugmes();quit;end
+if ~or(REF_TEST_MATRIX_COPY == REF_TEST_MATRIX) then bugmes();quit;end
+if ~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 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2010 - DIGITEO - Allan CORNET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- JVM NOT MANDATORY -->
+//
+// <-- Non-regression test for bug 8587 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=8587
+//
+// <-- Short Description -->
+// readNamedMatrixOfDouble (readCommonNamedMatrixOfDouble) returned wrong values
+ilib_verbose(0);
+test_path = get_absolute_file_path('bug_8587.tst');
+currentpath = pwd();
+cd TMPDIR;
+cd ../;
+OS_TMP_DIR = pwd();
+mkdir(OS_TMP_DIR,'bug_8587');
+TEST_DIR = OS_TMP_DIR + filesep() + 'bug_8587';
+copyfile(SCI+'/modules/api_scilab/tests/nonreg_tests/bug_8587.c' , TEST_DIR + filesep() + 'bug_8587.c');
+chdir(TEST_DIR);
+files = ['bug_8587.c'];
+ilib_build('lib_bug_8587', ['readDoubles', 'sci_readDoubles'], files, []);
+exec loader.sce;
+chdir(currentpath);
+REF_TEST_MATRIX = [1 2 3; 4 5 6];
+REF_TEST_MATRIX_COPY = [1 2 3; 4 5 6];
+if execstr("result = readDoubles()", "errcatch") <> 0 then pause, end
+if ~or(REF_TEST_MATRIX_COPY == REF_TEST_MATRIX) then pause, end
+if ~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@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -266,6 +267,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @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
 //
 1 VERSIONINFO
- FILEVERSION 5,3,0,0
+ FILEVERSION 5,3,1,0
- PRODUCTVERSION 5,3,0,0
+ PRODUCTVERSION 5,3,1,0
 FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
 FILEFLAGS 0x1L
@@ -70,12 +70,12 @@ BEGIN
        BLOCK "040c04b0"
        BEGIN
            VALUE "FileDescription", "arnoldi module"
-            VALUE "FileVersion", "5, 3, 0, 0"
+            VALUE "FileVersion", "5, 3, 1, 0"
            VALUE "InternalName", "arnoldi"
-            VALUE "LegalCopyright", "Copyright (C) 2010"
+            VALUE "LegalCopyright", "Copyright (C) 2011"
            VALUE "OriginalFilename", "arnoldi.dll"
            VALUE "ProductName", "arnoldi module"
-            VALUE "ProductVersion", "5, 3, 0, 0"
+            VALUE "ProductVersion", "5, 3, 1, 0"
        END
    END
    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 @@
 -->
 <!DOCTYPE MODULE_VERSION SYSTEM "../core/xml/version.dtd">
 <MODULE_VERSION name="arnoldi">
-<VERSION major="5" minor="3" maintenance="0" revision="0" string="unstable-git" />
+<VERSION major="5" minor="3" maintenance="1" revision="0" string="unstable-git" />
 </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@
 FLEXDOCK = @FLEXDOCK@
 FLIBS = @FLIBS@
 FOP = @FOP@
+GENHTML = @GENHTML@
 GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@
 GIWS_BIN = @GIWS_BIN@
 GLUEGEN_RT = @GLUEGEN_RT@
@@ -209,6 +210,7 @@ JROSETTA_API = @JROSETTA_API@
 JROSETTA_ENGINE = @JROSETTA_ENGINE@
 JUNIT = @JUNIT@
 LAPACK_LIBS = @LAPACK_LIBS@
+LCOV = @LCOV@
 LD = @LD@
 LDFLAGS = @LDFLAGS@
 LIBICONV = @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"
 #, c-format
 msgid "\t - ''%s - %s'' is needed by ''%s - %s''\n"
-msgstr "\t - ''%s - %s'' wird durch '%s - %s' benötigt\n"
+msgstr "\t - ''%s - %s'' wird durch ''%s - %s'' benötigt\n"
 #, c-format
 msgid "\t - ''%s - %s'' is needed by ''%s''\n"
-msgstr "\t - ''%s - %s'' wird benötigt durch '%s'\n"
+msgstr "\t - ''%s - %s'' wird benötigt durch ''%s''\n"
 #, c-format
 msgid "\t - Local location : ''%s''\n"
@@ -70,7 +70,7 @@ msgstr "%s: %s (%s) ist nicht installiert.\n"
 #, c-format
 msgid "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
-msgstr "%s: ''%s - %s'' ('%s' Sektion) ist nicht installiert.\n"
+msgstr "%s: ''%s - %s'' (''%s'' Sektion) ist nicht installiert.\n"
 #, c-format
 msgid "%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 @@
-# English (United Kingdom) translation for scilab
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
-# This file is distributed under the same license as the scilab package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: scilab\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2007-09-27 16:24+0200\n"
-"PO-Revision-Date: 2010-07-12 11:30+0000\n"
-"Last-Translator: Luke Hollins <Unknown>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Launchpad (build Unknown)\n"
-#, c-format
-msgid "\t - ''%s - %s''\n"
-msgstr "\t - ''%s - %s''\n"
-#, c-format
-msgid "\t - ''%s - %s'' is already loaded\n"
-msgstr "\t - ''%s - %s'' is already loaded\n"
-#, c-format
-msgid "\t - ''%s - %s'' is needed by ''%s - %s''\n"
-msgstr "\t - ''%s - %s'' is needed by ''%s - %s''\n"
-#, c-format
-msgid "\t - ''%s - %s'' is needed by ''%s''\n"
-msgstr "\t - ''%s - %s'' is needed by ''%s''\n"
-#, c-format
-msgid "\t - Local location : ''%s''\n"
-msgstr "\t - Local location : ''%s''\n"
-#, c-format
-msgid "\t - MD5SUM expected : ''%s''\n"
-msgstr "\t - MD5SUM expected : ''%s''\n"
-#, c-format
-msgid "\t - MD5SUM watched  : ''%s''\n"
-msgstr "\t - MD5SUM watched  : ''%s''\n"
-#, c-format
-msgid "\t - URL            : ''%s''\n"
-msgstr "\t - URL            : ''%s''\n"
-#, c-format
-msgid "\t - You''ve asked ''%s - %s''\n"
-msgstr "\t - You''ve asked ''%s - %s''\n"
-#, c-format
-msgid "\t - destination : ''%s''\n"
-msgstr "\t - destination : ''%s''\n"
-#, c-format
-msgid "\t - file            : ''%s''\n"
-msgstr "\t - file            : ''%s''\n"
-#, c-format
-msgid "\t - source      : ''%s''\n"
-msgstr "\t - source      : ''%s''\n"
-#, c-format
-msgid "%s: %s (%s) isn''t installed.\n"
-msgstr "%s: %s (%s) isn''t installed.\n"
-#, c-format
-msgid "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
-msgstr "%s: ''%s - %s'' (''%s'' section) is not installed.\n"
-#, c-format
-msgid "%s: ''%s - %s'' is not installed.\n"
-msgstr "%s: ''%s - %s'' is not installed.\n"
-#, c-format
-msgid "%s: ''%s'' (''%s'' section) is not installed.\n"
-msgstr "%s: ''%s'' (''%s'' section) is not installed.\n"
-#, c-format
-msgid "%s: ''%s'' isn''t installed.\n"
-msgstr "%s: ''%s'' isn''t installed.\n"
-#, c-format
-msgid "%s: An error occurred while loading ''%s-%s'':\n"
-msgstr "%s: An error occurred while loading ''%s-%s'':\n"
-#, c-format
-msgid "%s: Another version of the package %s is already loaded : %s\n"
-msgstr "%s: Another version of the package %s is already loaded : %s\n"
-#, c-format
-msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
-msgstr "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
-#, c-format
-msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
-msgstr "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
-#, c-format
-msgid "%s: Error while creating the directory ''%s''.\n"
-msgstr "%s: Error while creating the directory ''%s''.\n"
-#, c-format
-msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
-msgstr "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
-#, c-format
-msgid "%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"
-msgstr "%s: Incompatible input arguments #%d and #%d: Same sizes expected.\n"
-#, c-format
-msgid "%s: Module ''%s - %s'' is not installed.\n"
-msgstr "%s: Module ''%s - %s'' is not installed.\n"
-#, c-format
-msgid "%s: Module ''%s'' is not installed (''%s'' section).\n"
-msgstr "%s: Module ''%s'' is not installed (''%s'' section).\n"
-#, c-format
-msgid "%s: Module ''%s'' is not installed.\n"
-msgstr "%s: Module ''%s'' is not installed.\n"
-#, c-format
-msgid "%s: Neither Wget or Curl found: Please install one of them\n"
-msgstr "%s: Neither Wget or Curl found: Please install one of them\n"
-#, c-format
-msgid ""
-"%s: Several versions of a package (%s) cannot be loaded at the same scilab "
-"session :\n"
-msgstr ""
-"%s: Several versions of a package (%s) cannot be loaded at the same Scilab "
-"session :\n"
-#, c-format
-msgid "%s: The config file (''%s'') is not well formated at line %d\n"
-msgstr "%s: The config file (''%s'') is not well formatted at line %d\n"
-#, c-format
-msgid "%s: The dependency tree cannot be resolved.\n"
-msgstr "%s: The dependency tree cannot be resolved.\n"
-#, c-format
-msgid "%s: The description is not well formated at line %d\n"
-msgstr "%s: The description is not well formatted at line %d\n"
-#, c-format
-msgid ""
-"%s: The directory %s cannot been created, please check if you have write "
-"access on this directory.\n"
-msgstr ""
-"%s: The directory %s cannot been created, please check if you have write "
-"access on this directory.\n"
-#, c-format
-msgid "%s: The directory %s doesn''t exist.\n"
-msgstr "%s: The directory %s doesn''t exist.\n"
-#, c-format
-msgid ""
-"%s: The directory ''%s'' cannot been created, please check if you have write "
-"access on this directory.\n"
-msgstr ""
-"%s: The directory ''%s'' cannot been created, please check if you have write "
-"access on this directory.\n"
-#, c-format
-msgid ""
-"%s: The directory of this package (%s-%s) cannot been deleted, please check "
-"if you have write access on this directory : %s.\n"
-msgstr ""
-"%s: The directory of this package (%s-%s) cannot been deleted, please check "
-"if you have write access on this directory : %s.\n"
-#, c-format
-msgid ""
-"%s: The directory of this package (%s-%s) is located neither in SCI nor in "
-"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n"
-msgstr ""
-"%s: The directory of this package (%s-%s) is located neither in SCI nor in "
-"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n"
-#, c-format
-msgid "%s: The downloaded file doesn''t check the MD5SUM:\n"
-msgstr "%s: The downloaded file doesn''t check the MD5SUM:\n"
-#, c-format
-msgid "%s: The extraction of the archive ''%s'' has failed.\n"
-msgstr "%s: The extraction of the archive ''%s'' has failed.\n"
-#, c-format
-msgid "%s: The file %s doesn''t exist or is not read accessible.\n"
-msgstr "%s: The file %s doesn't exist or is not read accessible.\n"
-#, c-format
-msgid ""
-"%s: The file %s is not well formated, the toolbox %s - %s doesn''t contain "
-"the %s field\n"
-msgstr ""
-"%s: The file %s is not well formatted, the toolbox %s - %s doesn't contain "
-"the %s field\n"
-#, c-format
-msgid "%s: The file ''%s'' cannot be written.\n"
-msgstr "%s: The file ''%s'' cannot be written.\n"
-#, c-format
-msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
-msgstr "%s: The file ''%s'' doesn't exist or is not read accessible\n"
-#, c-format
-msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n"
-msgstr "%s: The file ''%s'' doesn't exist or is not read accessible.\n"
-#, c-format
-msgid "%s: The file ''%s'' is not well formated at line %d\n"
-msgstr "%s: The file ''%s'' is not well formatted at line %d\n"
-#, c-format
-msgid "%s: The following file hasn''t been copied:\n"
-msgstr "%s: The following file hasn't been copied:\n"
-#, c-format
-msgid "%s: The following file hasn''t been downloaded:\n"
-msgstr "%s: The following file hasn't been downloaded:\n"
-#, c-format
-msgid ""
-"%s: The following module is installed in the user section, you cannot add it "
-"to the autoload list for all users:\n"
-msgstr ""
-"%s: The following module is installed in the user section, you cannot add it "
-"to the auto-load list for all users:\n"
-#, c-format
-msgid "%s: The following module is not installed:\n"
-msgstr "%s: The following module is not installed:\n"
-#, c-format
-msgid "%s: The following modules are not installed:\n"
-msgstr "%s: The following modules are not installed:\n"
-#, c-format
-msgid "%s: The package %s is not available.\n"
-msgstr "%s: The package %s is not available.\n"
-#, c-format
-msgid "%s: The package ''%s'' is not present in the struct.\n"
-msgstr "%s: The package ''%s'' is not present in the struct.\n"
-#, c-format
-msgid ""
-"%s: The root directory of this package (%s-%s) cannot been deleted, please "
-"check if you have write access on this directory : %s.\n"
-msgstr ""
-"%s: The root directory of this package (%s-%s) cannot been deleted, please "
-"check if you have write access on this directory : %s.\n"
-#, c-format
-msgid ""
-"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
-msgstr ""
-"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
-#, c-format
-msgid ""
-"%s: Wrong length for input argument #%d: String which has 32-characters "
-"length expected.\n"
-msgstr ""
-"%s: Wrong length for input argument #%d: String which has 32-characters "
-"length expected.\n"
-#, c-format
-msgid "%s: Wrong number of input argument: %d expected.\n"
-msgstr "%s: Wrong number of input argument: %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input argument: %d to %d expected.\n"
-msgstr "%s: Wrong number of input argument: %d to %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input argument: at most %d expected.\n"
-msgstr "%s: Wrong number of input argument: at most %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input arguments: %d expected.\n"
-msgstr "%s: Wrong number of input arguments: %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input arguments: %d or %d expected.\n"
-msgstr "%s: Wrong number of input arguments: %d or %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input arguments: %d to %d expected.\n"
-msgstr "%s: Wrong number of input arguments: %d to %d expected.\n"
-#, c-format
-msgid "%s: Wrong number of input arguments: at most %d expected.\n"
-msgstr "%s: Wrong number of input arguments: at most %d expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: 1x1 or 1x2 string matrix expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: 1x1 or 1x2 string matrix expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n"
-msgstr "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: A 1x1 or 1x2 string matrix expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: A 1x1 or 1x2 string matrix expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: A boolean expected.\n"
-msgstr "%s: Wrong size for input argument #%d: A boolean expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: A string expected.\n"
-msgstr "%s: Wrong size for input argument #%d: A string expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: Single string expected.\n"
-msgstr "%s: Wrong size for input argument #%d: Single string expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: mx1 or mx2 string matrix expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: mx1 or mx2 string matrix expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: mx1, mx2 or mx3 string matrix "
-"expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: mx1, mx2 or mx3 string matrix "
-"expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: mx1,mx2 or mx3 string matrix "
-"expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: mx1,mx2 or mx3 string matrix "
-"expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong size for input argument #%d: mx2 or mx3 string matrix expected.\n"
-msgstr ""
-"%s: Wrong size for input argument #%d: mx2 or mx3 string matrix expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: mx2 string matrix expected.\n"
-msgstr "%s: Wrong size for input argument #%d: mx2 string matrix expected.\n"
-#, c-format
-msgid "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n"
-msgstr "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A boolean expected.\n"
-msgstr "%s: Wrong type for input argument #%d: A boolean expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: A string expected.\n"
-msgstr "%s: Wrong type for input argument #%d: A string expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: Boolean expected.\n"
-msgstr "%s: Wrong type for input argument #%d: Boolean expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d: Boolean or single string expected.\n"
-msgstr ""
-"%s: Wrong type for input argument #%d: Boolean or single string expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: Single string expected.\n"
-msgstr "%s: Wrong type for input argument #%d: Single string expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: String array expected.\n"
-msgstr "%s: Wrong type for input argument #%d: String array expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: String expected.\n"
-msgstr "%s: Wrong type for input argument #%d: String expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: Struct expected.\n"
-msgstr "%s: Wrong type for input argument #%d: Struct expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
-msgstr ""
-"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
-#, c-format
-msgid "%s: Wrong type for input argument #%d: mlist expected.\n"
-msgstr "%s: Wrong type for input argument #%d: mlist expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
-#, c-format
-msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
-msgstr "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
-"''session'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
-"''session'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
-"''official'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
-"''official'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''filter:all'',''filter:main'' or a "
-"valid main category expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''filter:all'',''filter:main'' or a "
-"valid main category expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''system'' or ''install'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''system'' or ''install'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
-"expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
-"expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
-"expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
-"expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: ''user'',''allusers'' or ''all'' "
-"expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: ''user'',''allusers'' or ''all'' "
-"expected.\n"
-#, c-format
-msgid "%s: Wrong value for input argument #%d: A valid category expected.\n"
-msgstr "%s: Wrong value for input argument #%d: A valid category expected.\n"
-#, c-format
-msgid "%s: Wrong value for input argument #%d: ASC or DESC expected.\n"
-msgstr "%s: Wrong value for input argument #%d: ASC or DESC expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: All modules version should be set.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: All modules version should be set.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: It should have a field named "
-"''%s''.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: It should have a field named "
-"''%s''.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: Must be a atoms package name.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: Must be a atoms package name.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: Single string that ends with "
-".tar.gz, .tgz or .zip expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: Single string that ends with "
-".tar.gz, .tgz or .zip expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: String that contains ''TOOLBOXES'' "
-"or ''DESCRIPTION'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: String that contains ''TOOLBOXES'' "
-"or ''DESCRIPTION'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: String that ends with DESCRIPTION "
-"expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: String that ends with DESCRIPTION "
-"expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: String that start with "
-"''http://'',''ftp://'' or ''file://'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: String that start with "
-"''http://'',''ftp://'' or ''file://'' expected.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: The matrix oriented typed list is "
-"not well formatted.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: The matrix oriented typed list is "
-"not well formatted.\n"
-#, c-format
-msgid "%s: Wrong value for input argument #%d: This ("
-msgstr "%s: Wrong value for input argument #%d: This ("
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: This is not a valid version.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: This is not a valid version.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d: This is not a valid "
-"version/dependency.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d: This is not a valid "
-"version/dependency.\n"
-#, c-format
-msgid ""
-"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
-msgstr ""
-"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
-#, c-format
-msgid ""
-"%s: You have not enough rights to remove any version of the package %s.\n"
-msgstr ""
-"%s: You do not have enough rights to remove any version of the package %s.\n"
-#, c-format
-msgid "%s: You have not enough rights to remove the package %s (%s).\n"
-msgstr "%s: You do not have enough rights to remove the package %s (%s).\n"
-#, c-format
-msgid "%s: You haven''t write access on this directory : %s.\n"
-msgstr "%s: You haven't write access to this directory : %s.\n"
-#, c-format
-msgid "%s: name and version are not both defined\n"
-msgstr "%s: name and version are not both defined\n"
-#, c-format
-msgid "%s: the package ''%s'' doesn''t contain the field ''%s''.\n"
-msgstr "%s: the package ''%s'' doesn't contain the field ''%s''.\n"
-#, c-format
-msgid "%s: the package ''%s'' doesn''t exist.\n"
-msgstr "%s: the package ''%s'' doesn't exist.\n"
-msgid "&?"
-msgstr "&?"
-msgid "&Edit"
-msgstr "&Edit"
-msgid "&File"
-msgstr "&File"
-msgid "&Tools"
-msgstr "&Tools"
-msgid "?"
-msgstr "?"
-#, c-format
-msgid "A new version (''%s'') of ''%s'' is available"
-msgstr "A new version (''%s'') of ''%s'' is available"
-msgid "ATOMS"
-msgstr "ATOMS"
-msgid "ATOMS error"
-msgstr "ATOMS error"
-msgid "All modules"
-msgstr "All modules"
-msgid "Atoms Help..."
-msgstr "Atoms Help..."
-msgid "Author(s)"
-msgstr "Author(s)"
-msgid "Automatically Installed"
-msgstr "Automatically Installed"
-msgid "Bytes"
-msgstr "Bytes"
-msgid "Category(ies)"
-msgstr "Category(ies)"
-msgid "Close"
-msgstr "Close"
-msgid "Depend"
-msgstr "Depend"
-msgid "Description"
-msgstr "Description"
-msgid "Download size"
-msgstr "Download size"
-msgid "Entity"
-msgstr "Entity"
-msgid "File"
-msgstr "File"
-msgid "Home"
-msgstr "Home"
-msgid "Install"
-msgstr "Install"
-msgid "Install Directory"
-msgstr "Install Directory"
-msgid ""
-"Installation done! Please restart Scilab to take changes into account."
-msgstr ""
-"Installation done! Please restart Scilab to take changes into account."
-msgid "Installation failed!"
-msgstr "Installation failed!"
-msgid "Installing"
-msgstr "Installing"
-msgid "KB"
-msgstr "KB"
-msgid "License"
-msgstr "License"
-msgid "List of installed modules"
-msgstr "List of installed modules"
-msgid "MB"
-msgstr "MB"
-msgid "Main categories"
-msgstr "Main categories"
-msgid "Maintainer(s)"
-msgstr "Maintainer(s)"
-msgid "No ATOMS module is available. Please, check your Internet connection."
-msgstr ""
-"No ATOMS module is available. Please, check your Internet connection."
-msgid "No ATOMS module is available: your repository list is empty."
-msgstr "No ATOMS module is available: your repository list is empty."
-msgid "Package"
-msgstr "Package"
-msgid "Release date"
-msgstr "Release date"
-msgid "Remove"
-msgstr "Remove"
-msgid "Remove done! Please restart Scilab to take changes into account. "
-msgstr "Remove done! Please restart Scilab to take changes into account. "
-msgid "Remove failed!"
-msgstr "Remove failed!"
-msgid "Removing"
-msgstr "Removing"
-msgid "Scilab Version"
-msgstr "Scilab Version"
-msgid "See also"
-msgstr "See also"
-msgid "Status"
-msgstr "Status"
-msgid "Summary"
-msgstr "Summary"
-msgid "Title"
-msgstr "Title"
-msgid "Update"
-msgstr "Update"
-msgid "Update done! Please restart Scilab to take changes into account."
-msgstr "Update done! Please restart Scilab to take changes into account."
-msgid "Update failed!"
-msgstr "Update failed!"
-msgid "Updating"
-msgstr "Updating"
-msgid "Version"
-msgstr "Version"
-msgid "WebSite"
-msgstr "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"
 #, c-format
 msgid "%s: An error occurred while loading ''%s-%s'':\n"
-msgstr "%s : Une erreur est survenue au cours du chargement de \"%s-%s\":\n"
+msgstr "%s : Une erreur est survenue au cours du chargement de ''%s-%s'':\n"
 #, c-format
 msgid "%s: Another version of the package %s is already loaded : %s\n"
@@ -598,7 +598,7 @@ msgid ""
 "''http://'',''ftp://'' or ''file://'' expected.\n"
 msgstr ""
 "%s: Mauvaise valeur pour l'argument d'entrée n° %d: Chaîne commençant par "
-"\"http://\", \"ftp://\" ou \"file://\" attendue.\n"
+"''http://'', ''ftp://'' ou ''file://'' attendue.\n"
 #, c-format
 msgid ""
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"
 #, c-format
 msgid "\t - Local location : ''%s''\n"
-msgstr "\t - Posizione locale : \"%s\"\n"
+msgstr "\t - Posizione locale : ''%s''\n"
 #, c-format
 msgid "\t - MD5SUM expected : ''%s''\n"
-msgstr "\t - MD5SUM atteso : \"%s\"\n"
+msgstr "\t - MD5SUM atteso : ''%s''\n"
 #, c-format
 msgid "\t - MD5SUM watched  : ''%s''\n"
-msgstr "\t - MD5SUM osservato : \"%s\"\n"
+msgstr "\t - MD5SUM osservato : ''%s''\n"
 #, c-format
 msgid "\t - URL            : ''%s''\n"
@@ -95,16 +95,16 @@ msgstr "%s: È già caricata un'altra versione del pacchetto %s : %s\n"
 #, c-format
 msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
 msgstr ""
-"%s: Il file DESCRIPTION non può essere trovato nel pacchetto \"%s\"\n"
+"%s: Il file DESCRIPTION non può essere trovato nel pacchetto ''%s''\n"
 #, c-format
 msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
 msgstr ""
-"%s: Errore durante la copiatura del file \"%s\" nella directory \"%s\".\n"
+"%s: Errore durante la copiatura del file ''%s'' nella directory ''%s''.\n"
 #, c-format
 msgid "%s: Error while creating the directory ''%s''.\n"
-msgstr "%s: Errore durante la creazione della directory \"%s\".\n"
+msgstr "%s: Errore durante la creazione della directory ''%s''.\n"
 #, c-format
 msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
@@ -122,11 +122,11 @@ msgstr "%s: Il modulo ''%s - %s'' non è installato.\n"
 #, c-format
 msgid "%s: Module ''%s'' is not installed (''%s'' section).\n"
-msgstr "%s: Il modulo \"%s\" non è installato (sezione \"%s\").\n"
+msgstr "%s: Il modulo ''%s'' non è installato (sezione ''%s'').\n"
 #, c-format
 msgid "%s: Module ''%s'' is not installed.\n"
-msgstr "%s: Il modulo \"%s\" non è installato.\n"
+msgstr "%s: Il modulo ''%s'' non è installato.\n"
 #, c-format
 msgid "%s: Neither Wget or Curl found: Please install one of them\n"
@@ -142,7 +142,7 @@ msgstr ""
 #, c-format
 msgid "%s: The config file (''%s'') is not well formated at line %d\n"
-msgstr "%s: Il file config (\"%s\") non è formattato bene alla riga %d\n"
+msgstr "%s: Il file config (''%s'') non è formattato bene alla riga %d\n"
 #, c-format
 msgid "%s: The dependency tree cannot be resolved.\n"
@@ -169,7 +169,7 @@ msgid ""
 "%s: The directory ''%s'' cannot been created, please check if you have write "
 "access on this directory.\n"
 msgstr ""
-"%s: La directory \"%s\" non può essere creata, controllare i permessi di "
+"%s: La directory ''%s'' non può essere creata, controllare i permessi di "
 "accesso in scrittura alla directory.\n"
 #, c-format
@@ -210,15 +210,15 @@ msgstr ""
 #, c-format
 msgid "%s: The file ''%s'' cannot be written.\n"
-msgstr "%s: Il file \"%s\" non può essere scritto.\n"
+msgstr "%s: Il file ''%s'' non può essere scritto.\n"
 #, c-format
 msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
-msgstr "%s: Il file \"%s\" non esiste o non è accessibile in lettura\n"
+msgstr "%s: Il file ''%s'' non esiste o non è accessibile in lettura\n"
 #, c-format
 msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n"
-msgstr "%s: Il file \"%s\" non esiste o non è accessibile in lettura.\n"
+msgstr "%s: Il file ''%s'' non esiste o non è accessibile in lettura.\n"
 #, c-format
 msgid "%s: The file ''%s'' is not well formated at line %d\n"
@@ -254,7 +254,7 @@ msgstr "%s: Il pacchetto %s non è disponibile.\n"
 #, c-format
 msgid "%s: The package ''%s'' is not present in the struct.\n"
-msgstr "%s: Il pacchetto \"%s\" non è presente nella struct.\n"
+msgstr "%s: Il pacchetto ''%s'' non è presente nella struct.\n"
 #, c-format
 msgid ""
@@ -269,7 +269,7 @@ msgstr ""
 msgid ""
 "%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
 msgstr ""
-"%s: La versione \"%s\" del pacchetto \"%s\" non è presente nella struct.\n"
+"%s: La versione ''%s'' del pacchetto ''%s'' non è presente nella struct.\n"
 #, c-format
 msgid ""
@@ -468,7 +468,7 @@ msgstr ""
 #, c-format
 msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
 msgstr ""
-"%s: L'argomento in ingresso #%d ha un valore sbagliato: \"%s\" non è un URL "
+"%s: L'argomento in ingresso #%d ha un valore sbagliato: ''%s'' non è un URL "
 "valido.\n"
 #, c-format
@@ -491,8 +491,8 @@ msgid ""
 "%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
 "''official'' expected.\n"
 msgstr ""
-"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"all\", "
+"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''all'', "
-"\"user\", \"allusers\" o \"official\".\n"
+"''user'', ''allusers'' o ''official''.\n"
 #, c-format
 msgid ""
@@ -513,24 +513,24 @@ msgstr ""
 msgid ""
 "%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
 msgstr ""
-"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"user'\" "
+"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''user''' "
-"o \"allusers\".\n"
+"o ''allusers''.\n"
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
 "expected.\n"
 msgstr ""
-"%s: L'argomento #%d in ingresso ha un valore sbagliato: era atteso \"user\" "
+"%s: L'argomento #%d in ingresso ha un valore sbagliato: era atteso ''user'' "
-"o \"alluser\" o \"all\".\n"
+"o ''alluser'' o ''all''.\n"
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: ''user'', ''allusers'' or ''all'' "
 "expected.\n"
 msgstr ""
-"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"user\", "
+"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''user'', "
-"\"allusers\" o \"all\".\n"
+"''allusers'' o ''all''.\n"
 #, c-format
 msgid ""
@@ -538,7 +538,7 @@ msgid ""
 "expected.\n"
 msgstr ""
 "%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso "
-"\"user'\", \"allusers\" o \"all\".\n"
+"''user''', ''allusers'' o ''all''.\n"
 #, c-format
 msgid "%s: Wrong value for input argument #%d: A valid category expected.\n"
@@ -572,7 +572,7 @@ msgid ""
 "%s: Wrong value for input argument #%d: Letters ''A'' or ''I'' expected.\n"
 msgstr ""
 "%s: L'argomento in ingresso #%d ha un valore sbagliato: erano attese le "
-"lettere \"A\" o \"I\".\n"
+"lettere ''A'' o ''I''.\n"
 #, c-format
 msgid ""
@@ -644,8 +644,8 @@ msgstr ""
 msgid ""
 "%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
 msgstr ""
-"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso \"error\" "
+"%s: L'argomento in ingresso #%d ha un valore sbagliato: era atteso ''error'' "
-"o \"warning\".\n"
+"o ''warning''.\n"
 #, c-format
 msgid ""
@@ -670,11 +670,11 @@ msgstr "%s: Nome e versione non sono entrambi definiti\n"
 #, c-format
 msgid "%s: the package ''%s'' doesn''t contain the field ''%s''.\n"
-msgstr "%s: il pacchetto \"%s\" non contiene il campo \"%s\".\n"
+msgstr "%s: il pacchetto ''%s'' non contiene il campo ''%s''.\n"
 #, c-format
 msgid "%s: the package ''%s'' doesn''t exist.\n"
-msgstr "%s: il pacchetto \"%s\" non esiste.\n"
+msgstr "%s: il pacchetto ''%s'' non esiste.\n"
 msgid "&?"
 msgstr "&?"
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'' に見つかりま
 #, c-format
 msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
-msgstr "%s: ファイル\"%s\" をディレクトリ\"%s\"へコピーする際にエラーが発生しました.\n"
+msgstr "%s: ファイル''%s'' をディレクトリ''%s''へコピーする際にエラーが発生しました.\n"
 #, c-format
 msgid "%s: Error while creating the directory ''%s''.\n"
@@ -138,7 +138,7 @@ msgstr "%s: 複数のバージョンのパッケージ (%s) を同じScilabセ�
 #, c-format
 msgid "%s: The config file (''%s'') is not well formated at line %d\n"
-msgstr "%s: 設定ファイル(\"%s\")の%d行目は整形式ではありません.\n"
+msgstr "%s: 設定ファイル(''%s'')の%d行目は整形式ではありません.\n"
 #, c-format
 msgid "%s: The dependency tree cannot be resolved.\n"
@@ -162,7 +162,7 @@ msgstr "%s: ディレクトリ %s は存在しません。\n"
 msgid ""
 "%s: The directory ''%s'' cannot been created, please check if you have write "
 "access on this directory.\n"
-msgstr "%s: ディレクトリー \"%s\" を作成できません. このディレクトリーへの書き込みアクセス権の有無を確認ください.\n"
+msgstr "%s: ディレクトリー ''%s'' を作成できません. このディレクトリーへの書き込みアクセス権の有無を確認ください.\n"
 #, c-format
 msgid ""
@@ -199,7 +199,7 @@ msgstr "%s: ファイル %s は整形式ではありません.ツールボック
 #, c-format
 msgid "%s: The file ''%s'' cannot be written.\n"
-msgstr "%s: ファイル %s を書き込めません。\n"
+msgstr "%s: ファイル ''%s'' を書き込めません。\n"
 #, c-format
 msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
@@ -211,7 +211,7 @@ msgstr "%s: ファイル ''%s'' が存在しないか、読み取り可能では
 #, c-format
 msgid "%s: The file ''%s'' is not well formated at line %d\n"
-msgstr "%s: ファイル \"%s\" の %d 行目は整形式ではありません.\n"
+msgstr "%s: ファイル ''%s'' の %d 行目は整形式ではありません.\n"
 #, c-format
 msgid "%s: The following file hasn''t been copied:\n"
@@ -392,7 +392,7 @@ msgstr "%s: 入力引数 #%d の型が間違っています: mlistを指定し�
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: ''%s'' is not a registered category"
-msgstr "%s: 入力引数 #%d の値が間違っています: \"%s\" は登録済みのカテゴリではありません"
+msgstr "%s: 入力引数 #%d の値が間違っています: ''%s'' は登録済みのカテゴリではありません"
 #, c-format
 msgid "%s: Wrong value for input argument #%d: ''%s'' is not a valid URL.\n"
@@ -401,14 +401,14 @@ msgstr "%s: 入力引数 #%d で不正な値: ''%s'' は妥当なURLではあり
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: ''all'' or ''main'' expected.\n"
-msgstr "%s: 入力引数 #%d の値が間違っています: \"all\" または \"main\" を指定してください.\n"
+msgstr "%s: 入力引数 #%d の値が間違っています: ''all'' または ''main'' を指定してください.\n"
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: ''all'',''allusers'',''user'' or "
 "''session'' expected.\n"
 msgstr ""
-"%s: 入力引数 #%d の値が間違っています: \"all\", \"allusers\", \"user\" または \"session\" "
+"%s: 入力引数 #%d の値が間違っています: ''all'', ''allusers'', ''user'' または ''session'' "
 "を指定してください.\n"
 #, c-format
@@ -416,7 +416,7 @@ msgid ""
 "%s: Wrong value for input argument #%d: ''all'',''user'',''allusers'' or "
 "''official'' expected.\n"
 msgstr ""
-"%s: 入力引数 #%d の値が間違っています: \"all\", \"users\", \"alluser\" または \"official\" "
+"%s: 入力引数 #%d の値が間違っています: ''all'', ''users'', ''alluser'' または ''official'' "
 "を指定してください.\n"
 #, c-format
@@ -424,7 +424,7 @@ msgid ""
author	Clément DAVID <clement.david@scilab.org>	2011-03-07 09:52:16 +0100
committer	Clément DAVID <clement.david@scilab.org>	2011-03-07 09:52:16 +0100
commit	2835e08091d79405f8a4ef74787b5aace3e935ab (patch)
tree	76ee3a864662a8fba9f395735a60ae4a0f9e8e4b /scilab/modules
parent	6c742c35f0a9a138f765e434e294273a262f8fd5 (diff)
parent	0118710f9d4ca4c1843a40d7355add417b510001 (diff)
download	scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.zip scilab-2835e08091d79405f8a4ef74787b5aace3e935ab.tar.gz