Fix bad mass replace ( between revision 19188 --> 19191 ).

==> add forgotten lines

diff --git a/scilab/modules/core/sci_gateway/c/sci_gstacksize.c b/scilab/modules/core/sci_gateway/c/sci_gstacksize.c
index 9162173..6b4c053 100644 (file)
--- a/scilab/modules/core/sci_gateway/c/sci_gstacksize.c
+++ b/scilab/modules/core/sci_gateway/c/sci_gstacksize.c
@@ -90,7 +90,7 @@ int C2F(sci_gstacksize) _PARAMS((char *fname,unsigned long fname_len))
                                                        if (ptr) C2F(adjustgstacksize)(&MEMGSTACKSIZE,&ptr,&l);
                                                        else
                                                        {
-                                                               Scierror(999,_("%s : can't alloc more memory.\n"),fname);
+                                                               Scierror(999,_("%s : can't alloc more memory.\n try gstacksize('max').\n"),fname);
                                                                return 0;
                                                        }
                                                }

diff --git a/scilab/modules/core/sci_gateway/c/sci_stacksize.c b/scilab/modules/core/sci_gateway/c/sci_stacksize.c
index 1b0be1e..771de88 100644 (file)
--- a/scilab/modules/core/sci_gateway/c/sci_stacksize.c
+++ b/scilab/modules/core/sci_gateway/c/sci_stacksize.c
@@ -84,7 +84,7 @@ int C2F(sci_stacksize) _PARAMS((char *fname,unsigned long fname_len))
                                                        if (ptr) C2F(adjuststacksize)(&MEMSTACKSIZE,&ptr);
                                                        else
                                                        {
-                                                               Scierror(999,_("%s : can't alloc more memory. stacksize\n"),fname);
+                                                               Scierror(999,_("%s : can't alloc more memory.\ntry stacksize('max').\n"),fname);
                                                                return 0;
                                                        }
                                                }

diff --git a/scilab/modules/core/src/c/msgs.c b/scilab/modules/core/src/c/msgs.c
index e45e2be..db73c3c 100644 (file)
--- a/scilab/modules/core/src/c/msgs.c
+++ b/scilab/modules/core/src/c/msgs.c
@@ -716,14 +716,14 @@ static int msg_29(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_30(integer *n, integer *ierr)
 {
-       sciprint(_("Warning: recursion problem..., cleared.\n"));
+       sciprint(_("Warning: recursion problem..., cleared.\n will be cleared with next error...\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_31(integer *n, integer *ierr)
 {
        int cerr=-1;
-       sciprint(_("Warning: stack problem..., cleared\n"));
+       sciprint(_("Warning: stack problem..., cleared\n will be cleared with next error...\n"));
        C2F(error)(&cerr);
        return 0;
 }
@@ -922,19 +922,19 @@ static int msg_50(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_51(integer *n, integer *ierr)
 {
-       sciprint(_("arl2: Impossible to reach required order.\n"));
+       sciprint(_("arl2: Impossible to reach required order.\n   previous order computed solution returned.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_52(integer *n, integer *ierr)
 {
-       sciprint(_("arl2: Failure when looking for the intersection with domains boundaries.\n"));
+       sciprint(_("arl2: Failure when looking for the intersection with domains boundaries.\n   previous order computed solution returned.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_53(integer *n, integer *ierr)
 {
-       sciprint(_("arl2: Too many solutions found.\n"));
+       sciprint(_("arl2: Too many solutions found.\n   previous order computed solution returned.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
@@ -976,7 +976,7 @@ static int msg_59(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_60(integer *n, integer *ierr)
 {
-       sciprint(_("Warning : loaded file has been created with a previous version of scilab\n"));
+       sciprint(_("Warning : loaded file has been created with a previous version of scilab\nor you are trying to load a file saved on a different architecture.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
@@ -992,7 +992,7 @@ static int msg_61(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_62(integer *n, integer *ierr)
 {
-       sciprint(_("Warning : use of standard list to define typed structures\n"));
+       sciprint(_("Warning : use of standard list to define typed structures\n          is obsolete. Use tlist.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
@@ -1072,25 +1072,25 @@ static int msg_74(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_75(integer *n, integer *ierr)
 {
-       sciprint(_("Warning: Jacobian external is given, but\n"));
+       sciprint(_("Warning: Jacobian external is given, but\n not used!,  see %ODEOPTIONS(6).\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_76(integer *n, integer *ierr)
 {
-       sciprint(_("The first %d singular values may be incorrect.\n"));
+       sciprint(_("Warning: No Jacobian external given but\n one is required by %ODEOPTIONS(6) value !\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_77(integer *n, integer *ierr)
 {
-       sciprint(_("itask=2,3 or 5: At most one value of t.\n"));
+       sciprint(_("itask=2,3 or 5: At most one value of t\n is allowed, the last element of t is used.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
 static int msg_78(integer *n, integer *ierr)
 {
-       sciprint(_("Warning: odedc forces itask=4 and handles.\n"));
+       sciprint(_("Warning: odedc forces itask=4 and handles\n tcrit.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/
@@ -1269,7 +1269,7 @@ static int msg_102(integer *n, integer *ierr)
 /*-----------------------------------------------------------------------------------*/
 static int msg_103(integer *n, integer *ierr)
 {
-       sciprint(_("Roundoff errors make leading eigenvalues.\n"));
+       sciprint(_("Roundoff errors make leading eigenvalues\n in the Schur form no longer satisfy criterion.\n"));
        return 0;
 }
 /*-----------------------------------------------------------------------------------*/

diff --git a/scilab/modules/core/src/c/stack1.c b/scilab/modules/core/src/c/stack1.c
index b63c3d3..7fed031 100644 (file)
--- a/scilab/modules/core/src/c/stack1.c
+++ b/scilab/modules/core/src/c/stack1.c
@@ -2174,7 +2174,7 @@ int C2F(getwimat)(char *fname,integer *topk,integer *lw,integer *m,integer *n,in
     il = iadr(*istk(il +1));
   }
   if (*istk(il ) != sci_boolean) {
-    Scierror(213,_("%s : Argument %d: wrong type argument, expecting a working\n"),get_fname(fname,fname_len),Rhs + (*lw - *topk));
+    Scierror(213,_("%s : Argument %d: wrong type argument, expecting a working\n               integer matrix\n"),get_fname(fname,fname_len),Rhs + (*lw - *topk));
     return FALSE_;
   };
   *m = *istk(il + 1);
@@ -2910,7 +2910,7 @@ int C2F(getexternal)(char *fname,integer *topk,integer *lw,char *namex,int *type
       }
     break;
   default: 
-    Scierror(211,_("%s : Argument %d: wrong type argument, expecting a function\n"),get_fname(fname,fname_len), Rhs + (*lw - *topk));
+    Scierror(211,_("%s : Argument %d: wrong type argument, expecting a function\n              or string (external function).\n"),get_fname(fname,fname_len), Rhs + (*lw - *topk));
     ret_value = FALSE_;
     break;
   }

diff --git a/scilab/modules/m2sci/macros/kernel/m2sci.sci b/scilab/modules/m2sci/macros/kernel/m2sci.sci
index 2b8d3b5..f04c19b 100644 (file)
--- a/scilab/modules/m2sci/macros/kernel/m2sci.sci
+++ b/scilab/modules/m2sci/macros/kernel/m2sci.sci
@@ -180,14 +180,14 @@ end
 if batch then
   trad=[
       "function [tree] = sci_"+fnam+"(tree)"
-      msprintf(gettext("// Generated by M2SCI"),fnam)
+      msprintf(gettext("// Generated by M2SCI\n// Conversion function for Matlab %s\n// Input: tree = Matlab funcall tree\n// Ouput: tree = Scilab equivalent for tree"),fnam)
       ""
       "tree=Funcall(""exec"",1,Rhs(tree.name),tree.lhs)"
       ]
 else
   trad=[
       "function [tree] = sci_"+nam+"(tree)"
-      msprintf(gettext("// Copyright INRIA (Generated by M2SCI)"),nam)
+      msprintf(gettext("// Copyright INRIA (Generated by M2SCI)\n// Conversion function for Matlab %s()\n// Input: tree = Matlab funcall tree\n// Ouput: tree = Scilab equivalent for tree"),nam)
       ]
   
   if maclhs==0 then // Function with no ouputs

diff --git a/scilab/modules/m2sci/macros/kernel/sci_m2scideclare.sci b/scilab/modules/m2sci/macros/kernel/sci_m2scideclare.sci
index ff10652..40985d8 100644 (file)
--- a/scilab/modules/m2sci/macros/kernel/sci_m2scideclare.sci
+++ b/scilab/modules/m2sci/macros/kernel/sci_m2scideclare.sci
@@ -185,7 +185,7 @@ if strindex(name,".")<>[] then // Cell or Struct m2scideclare
     
     // Update dimensions
     if err then
-      set_infos(msprintf(gettext("Dimensions current value and m2scideclare statements conflict for: %s"),varname,dims2str(vardims),dims2str(infereddims)),2)
+      set_infos(msprintf(gettext("Dimensions current value and m2scideclare statements conflict for: %s\n   m2scideclare given dimension: %s\n   Current dimension: %s\n   m2scideclare IGNORED"),varname,dims2str(vardims),dims2str(infereddims)),2)
     else
       varslist(index)=M2scivar(varslist(index).matname,varslist(index).matname,Infer(vardims,Type(varslist(index).type.vtype,property)))
     end
@@ -194,7 +194,7 @@ if strindex(name,".")<>[] then // Cell or Struct m2scideclare
     if varslist(index).type.vtype==Unknown then
       varslist(index)=M2scivar(varslist(index).matname,varslist(index).matname,Infer(vardims,Type(vartype,varslist(index).property)))
     elseif varslist(index).type.vtype~=vartype then
-      set_infos(msprintf(gettext("Type current value and m2scideclare statements conflict for: %s"),varname,tp2str(vartype),tp2str(varslist(index).type.vtype)),2)
+      set_infos(msprintf(gettext("Type current value and m2scideclare statements conflict for: %s\n   m2scideclare given type: %s\n   current type: %s\n   m2scideclare IGNORED"),varname,tp2str(vartype),tp2str(varslist(index).type.vtype)),2)
     end
 
     // Update property
@@ -203,7 +203,7 @@ if strindex(name,".")<>[] then // Cell or Struct m2scideclare
     elseif property==Unknown then
       varslist(index).type.property=Unknown
     elseif varslist(index).type.property~=property then
-      set_infos(msprintf(gettext("Property current value and m2scideclare statements conflict for: %s"),name,prop2str(Unknown),prop2str(varslist(index).type.property)),2)
+      set_infos(msprintf(gettext("Property current value and m2scideclare statements conflict for: %s\n   m2scideclare given type: %s\n   current type: %s\n   m2scideclare IGNORED"),name,prop2str(Unknown),prop2str(varslist(index).type.property)),2)
     end
     
     // Update contents (no verification made...too complex)
@@ -266,7 +266,7 @@ else // Variable m2scideclare
     end
 
     if err then
-      set_infos(msprintf(gettext("Dimensions current value and m2scideclare statements conflict for: %s"),name,dims2str(dims),dims2str(infereddims)),2)
+      set_infos(msprintf(gettext("Dimensions current value and m2scideclare statements conflict for: %s\n   m2scideclare given dimension: %s\n   Current dimension: %s\n   m2scideclare IGNORED"),name,dims2str(dims),dims2str(infereddims)),2)
     else
       varslist(index)=M2scivar(varslist(index).matname,varslist(index).sciname,Infer(dims,varslist(index).type))
     end
@@ -275,14 +275,14 @@ else // Variable m2scideclare
     if varslist(index).type.vtype==Unknown then
       varslist(index)=M2scivar(varslist(index).matname,varslist(index).sciname,Infer(varslist(index).dims,Type(vtype,varslist(index).type.property)))
     elseif varslist(index).type.vtype~=vtype then
-      set_infos(msprintf(gettext("Type current value and m2scideclare statements conflict for: %s"),name,tp2str(vtype),tp2str(varslist(index).type.vtype)),2)
+      set_infos(msprintf(gettext("Type current value and m2scideclare statements conflict for: %s\n   m2scideclare given type: %s\n   current type: %s\n   m2scideclare IGNORED"),name,tp2str(vtype),tp2str(varslist(index).type.vtype)),2)
     end
     
     // Update property
     if varslist(index).type.property==Unknown then
       varslist(index)=M2scivar(varslist(index).matname,varslist(index).sciname,Infer(varslist(index).dims,Type(varslist(index).type.vtype,property)))
     elseif varslist(index).type.property~=property then
-      set_infos(msprintf(gettext("Property current value and m2scideclare statements conflict for: %s"),name,prop2str(property),prop2str(varslist(index).type.property)),2)
+      set_infos(msprintf(gettext("Property current value and m2scideclare statements conflict for: %s\n   m2scideclare given type: %s\n   current type: %s\n   m2scideclare IGNORED"),name,prop2str(property),prop2str(varslist(index).type.property)),2)
     end
   end
 end

diff --git a/scilab/modules/m2sci/macros/mfile2sci.sci b/scilab/modules/m2sci/macros/mfile2sci.sci
index 078fa41..2d01384 100644 (file)
--- a/scilab/modules/m2sci/macros/mfile2sci.sci
+++ b/scilab/modules/m2sci/macros/mfile2sci.sci
@@ -194,7 +194,7 @@ if txt~=[] then
   mname=w(1);
   nametbl=[nametbl;mname]
   if fnam<>mname & ~batch then // warning is not displayed for a batch file
-    mss=msprintf(gettext("Warning: file %s defines function %s instead of %s"),fil,mname,fnam,mname,mname,mname);
+    mss=msprintf(gettext("messages","Warning: file %s defines function %s instead of %s\n         %s.sci, %s.cat and sci_%s.sci will be generated !"),fil,mname,fnam,mname,mname,mname);
     m2sci_info(mss,-1);
   end
 
@@ -307,7 +307,7 @@ if txt~=[] then
   // Output summary information
   infos=[]
   if m2sci_infos(1) then
-    infos=gettext("Translation may be improved: see the //! comments and for all mtlb_<funname> function call");
+    infos=gettext("Translation may be improved: see the //! comments and for all mtlb_<funname> function call\n  Type help mtlb_<funname> in Scilab command window to get information about improvements.");
   end
   if m2sci_infos(2) then
     infos=[infos;gettext("Translation may be wrong (see the //!! comments).")]

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_PROTO5.g b/scilab/modules/m2sci/macros/sci_files/sci_PROTO5.g
index 2e13126..bd84817 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_PROTO5.g
+++ b/scilab/modules/m2sci/macros/sci_files/sci_PROTO5.g
@@ -11,7 +11,7 @@ A=getrhs(tree)
 A=convert2double(A)
 tree.rhs=Rhs(A)
 
-set_infos(msprintf(gettext("messages","m2sci_message_74"),expression2code(A),expression2code(tree)),2)
+set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(A),expression2code(tree)),2)
   
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Unknown)

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_acoth.sci b/scilab/modules/m2sci/macros/sci_files/sci_acoth.sci
index f215bef..5cf24e8 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_acoth.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_acoth.sci
@@ -9,7 +9,7 @@ function tree=sci_acoth(tree)
 X=getrhs(tree)
 //X=convert2double(X)
 
-set_infos(msprintf(gettext("If %s is outside [-1,1]"),expression2code(X),expression2code(tree)),2)
+set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(X),expression2code(tree)),2)
 
 tree.name="atanh"
 Op=Operation("./",list(Cste(1),X),list())

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_asin.sci b/scilab/modules/m2sci/macros/sci_files/sci_asin.sci
index 058c343..f4610e7 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_asin.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_asin.sci
@@ -11,7 +11,7 @@ A=getrhs(tree)
 A=convert2double(A)
 tree.rhs=Rhs(A)
 
-set_infos(msprintf(gettext("If %s is outside [-1,1]"),expression2code(A),expression2code(tree)),2)
+set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(A),expression2code(tree)),2)
   
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Unknown)

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_atanh.sci b/scilab/modules/m2sci/macros/sci_files/sci_atanh.sci
index 77b7b9e..2f36971 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_atanh.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_atanh.sci
@@ -11,7 +11,7 @@ A=getrhs(tree)
 A=convert2double(A)
 tree.rhs=Rhs(A)
 
-set_infos(msprintf(gettext("If %s is outside [-1,1]"),expression2code(A),expression2code(tree)),2)
+set_infos(msprintf(gettext("If %s is outside [-1,1]\n   complex part of output of %s will be the opposite of Matlab one."),expression2code(A),expression2code(tree)),2)
   
 tree.lhs(1).dims=A.dims
 tree.lhs(1).type=Type(Double,Unknown)

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_setstr.sci b/scilab/modules/m2sci/macros/sci_files/sci_setstr.sci
index 4913358..87c3f75 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_setstr.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_setstr.sci
@@ -10,7 +10,7 @@ function [tree]=sci_setstr(tree)
 X = getrhs(tree)
 
 if X.vtype==String then
-  set_infos(msprintf(gettext("In %s %s is a String,"),expression2code(tree),expression2code(X),expression2code(X)),0)
+  set_infos(msprintf(gettext("In %s %s is a String,\nSo result is set to %s."),expression2code(tree),expression2code(X),expression2code(X)),0)
   // Because of String concatenation
   if typeof(X)=="operation" then
     X.out(1)=tree.lhs(1)

diff --git a/scilab/modules/m2sci/macros/sci_files/sci_size.sci b/scilab/modules/m2sci/macros/sci_files/sci_size.sci
index d6256d0..13f0cf8 100644 (file)
--- a/scilab/modules/m2sci/macros/sci_files/sci_size.sci
+++ b/scilab/modules/m2sci/macros/sci_files/sci_size.sci
@@ -22,7 +22,7 @@ if rhs==2 then
   // Matlab can work with dim > size(size(X),2) but not Scilab
   if typeof(dim)=="cste" then
     if dim.value>size(X.dims) then
-      set_infos(msprintf(gettext("M2SCI found: %s > size(size(%s),2),"),expression2code(dim),expression2code(X)),0)
+      set_infos(msprintf(gettext("M2SCI found: %s > size(size(%s),2),\nSo result is set to 1."),expression2code(dim),expression2code(X)),0)
       tree=Cste(1)
     else
       tree.lhs(1).dims=list(1,1)

diff --git a/scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalFile.c b/scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalFile.c
index ddfbd18..add2132 100644 (file)
--- a/scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalFile.c
+++ b/scilab/modules/tclsci/sci_gateway/c/sci_TCL_EvalFile.c
@@ -67,13 +67,13 @@ int C2F(sci_TCL_EvalFile) _PARAMS((char *fname,unsigned long l))
        if (RET==TCL_ERROR)
        {
                const char *trace = Tcl_GetVar(TCLinterpreter, "errorInfo", TCL_GLOBAL_ONLY);
-               if (Err>0) 
+               if (Err>0)
                {
-                       sciprint(_("%s, at line %i of file %s.\n"),fname,TCLinterpreter->errorLine,cstk(l1),(char *)trace);
+                       sciprint(_("%s, at line %i of file %s\n %s.\n"),fname,TCLinterpreter->errorLine,cstk(l1),(char *)trace);
                }
         else
                {
-                       Scierror(999,_("%s, at line %i of file %s\n"),fname,TCLinterpreter->errorLine,cstk(l1),TCLinterpreter->result,(char *)trace);
+                       Scierror(999,_("%s, at line %i of file %s\n     %s.\n"),fname,TCLinterpreter->errorLine,cstk(l1),TCLinterpreter->result,(char *)trace);
                        return 0;
                }
     }

diff --git a/scilab/modules/tclsci/src/c/InitTclTk.c b/scilab/modules/tclsci/src/c/InitTclTk.c
index 66b2961..b7ceaec 100644 (file)
--- a/scilab/modules/tclsci/src/c/InitTclTk.c
+++ b/scilab/modules/tclsci/src/c/InitTclTk.c
@@ -67,7 +67,7 @@ int OpenTCLsci(void)
   /* test SCI validity */
   if (SciPath==NULL)
   {
-       sciprint(_("The SCI environment variable is not set.\n"));
+       sciprint(_("    The SCI environment variable is not set.\n      TCL initialisation failed !\n"));
     return(1);
   }
 
@@ -78,7 +78,7 @@ int OpenTCLsci(void)
   tmpfile2 = fopen(TkScriptpath,"r");
   if (tmpfile2==NULL)
   {
-       sciprint(_("Unable to find TCL initialisation scripts.\n"));
+       sciprint(_("    Unable to find TCL initialisation scripts.\n    Check your SCI environment variable.\n  TCL initialisation failed !"));
     return(1);
   }
   else fclose(tmpfile2);
@@ -86,7 +86,7 @@ int OpenTCLsci(void)
   tmpdir=opendir(SciPath);
   if (tmpdir==NULL)
     {
-      sciprint(_("The SCI environment variable is not set.\n"));
+      sciprint(_("     The SCI environment variable is not set.\n      TCL initialisation failed !\n"));
       return(1);
     }
   else closedir(tmpdir);
@@ -95,7 +95,7 @@ int OpenTCLsci(void)
   tmpfile2 = fopen(TkScriptpath,"r");
   if (tmpfile2==NULL)
     {
-      sciprint(_("Unable to find TCL initialisation scripts.\n"));
+      sciprint(_("     Unable to find TCL initialisation scripts.\n    Check your SCI environment variable.\n  TCL initialisation failed !"));
       return(1);
     }
   else fclose(tmpfile2);