Merge remote-tracking branch 'origin/master' into YaSp 36/10236/1
Sylvestre Ledru [Wed, 16 Jan 2013 17:32:25 +0000 (18:32 +0100)]
Conflicts:
scilab/modules/localization/src/c/InitializeLocalization.c

Change-Id: I3ae8e91fa6eb97b9006807b600d22484fc1aaef8

12 files changed:
1  2 
scilab/configure
scilab/configure.ac
scilab/etc/scilab.start
scilab/modules/call_scilab/src/c/SendScilabJobs.c
scilab/modules/graphics/sci_gateway/c/sci_delete.c
scilab/modules/graphics/sci_gateway/c/sci_set.c
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/localization/src/c/InitializeLocalization.c
scilab/modules/renderer/renderer.iss
scilab/modules/scicos/src/c/scicos.c
scilab/modules/spreadsheet/sci_gateway/c/sci_csvTextScan.c
scilab/modules/ui_data/src/cpp/UpdateBrowseVar.cpp

Simple merge
Simple merge
@@@ -31,16 -69,14 +31,16 @@@ clear %modalWarning
  PWD = pwd();
  
  // Startup message  ===================================================
 -if (sciargs() <> "-nb") & ~fromjava() & ~fromc() & getscilabmode() == "STD" then
 -  write(%io(2),[" ";gettext("Startup execution:")]);
 -  write(%io(2),gettext("  loading initial environment"));
 +
 +// if (sciargs() <> "-nb") & ~fromjava() & ~fromc() & getscilabmode() == "STD" then
 +if (sciargs() <> "-nb") & getscilabmode() == "STD" then
 +  printf("\n\n%s\n", gettext("Startup execution:"));
 +  printf(gettext("  loading initial environment") + "\n");
  end
  
- if ((getscilabmode() == "NWNI" | getscilabmode() == "NW") & sciargs()<>"-nb")
+ if ((getscilabmode() == "NWNI" | getscilabmode() == "NW") & ~fromjava() & ~fromc() & sciargs()<>"-nb")
     [v, opts] = getversion()
 -   write(%io(2), strsubst(v, "scilab-", "Scilab ") + " (" + opts($-1) + ", " + opts($) + ")");
 +   printf(strsubst(v, "scilab-", "Scilab ") + " (" + opts($-1) + ", " + opts($) + ")");
     clear v, opts;
  end
  
@@@ -84,13 -110,14 +84,14 @@@ BOOL InitializeLocalization(void
      }
  
      /* set domain for future gettext() calls */
 -    ret = textdomain(NAMELOCALIZATIONDOMAIN);
 -    if (ret == NULL)
 +    ret=textdomain(NAMELOCALIZATIONDOMAIN);
 +    if (ret==NULL)
      {
          fprintf(stderr, "Localization: Error while declaring the text domain %s\n", NAMELOCALIZATIONDOMAIN);
+         FREE(pathLocales);
          return FALSE;
      }
 -    bind_textdomain_codeset (NAMELOCALIZATIONDOMAIN, "UTF-8"); /*such that gettext and dgettext return UTF8 string*/
 +    bind_textdomain_codeset (NAMELOCALIZATIONDOMAIN,"UTF-8"); /*such that gettext and dgettext return UTF8 string*/
  #ifndef _MSC_VER
      /* Here, the "" means that we will try to use the language of the system
       * first. If it doesn't work, we switch back to default (English) */
Simple merge
Simple merge