summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-13 17:17:50 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-13 17:21:02 +0200
commit20a7ab6eb97d9874f526c629e4e6303068fb52de (patch)
treeccc506317f6261dd4af2b5b825f52cc620430c66 /scilab
parent823b6599b463edcab758f8dda6d0c35a3083b4fc (diff)
parenta163f33f753262f83d10aacdbb638d1141ad0a72 (diff)
downloadscilab-20a7ab6eb97d9874f526c629e4e6303068fb52de.zip
scilab-20a7ab6eb97d9874f526c629e4e6303068fb52de.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci Change-Id: I629a8ab712ad71e42fac6d4e140fbcb75250b896
Diffstat (limited to 'scilab')
-rw-r--r--scilab/CHANGES_5.2.X2
-rw-r--r--scilab/modules/action_binding/locales/en_US/action_binding.pot14
-rw-r--r--scilab/modules/arnoldi/locales/en_US/arnoldi.pot2
-rw-r--r--scilab/modules/atoms/locales/en_US/atoms.pot343
-rw-r--r--scilab/modules/boolean/locales/en_US/boolean.pot2
-rw-r--r--scilab/modules/cacsd/locales/en_US/cacsd.pot26
-rw-r--r--scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot2
-rw-r--r--scilab/modules/completion/locales/en_US/completion.pot2
-rw-r--r--scilab/modules/console/locales/en_US/console.pot2
-rw-r--r--scilab/modules/core/locales/en_US/core.pot150
-rw-r--r--scilab/modules/data_structures/locales/en_US/data_structures.pot14
-rw-r--r--scilab/modules/demo_tools/locales/en_US/demo_tools.pot2
-rw-r--r--scilab/modules/development_tools/locales/en_US/development_tools.pot16
-rw-r--r--scilab/modules/differential_equations/locales/en_US/differential_equations.pot4
-rw-r--r--scilab/modules/double/locales/en_US/double.pot2
-rw-r--r--scilab/modules/dynamic_link/locales/en_US/dynamic_link.pot2
-rw-r--r--scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci29
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_compile.sci2
-rw-r--r--scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci2
-rw-r--r--scilab/modules/elementary_functions/locales/en_US/elementary_functions.pot4
-rw-r--r--scilab/modules/fftw/locales/en_US/fftw.pot2
-rw-r--r--scilab/modules/fileio/locales/en_US/fileio.pot2
-rw-r--r--scilab/modules/functions/locales/en_US/functions.pot2
-rw-r--r--scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot2
-rw-r--r--scilab/modules/graphics/locales/en_US/graphics.pot84
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_2190.dia.ref1
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref2
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref85
-rw-r--r--scilab/modules/graphics/tests/nonreg_tests/bug_6665.tst14
-rw-r--r--scilab/modules/gui/locales/en_US/gui.pot109
-rw-r--r--scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp26
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java22
-rw-r--r--scilab/modules/gui/src/java/org/scilab/modules/gui/utils/PrinterHelper.java10
-rw-r--r--scilab/modules/helptools/locales/en_US/helptools.pot62
-rw-r--r--scilab/modules/history_manager/locales/en_US/history_manager.pot2
-rw-r--r--scilab/modules/integer/locales/en_US/integer.pot2
-rw-r--r--scilab/modules/interpolation/locales/en_US/interpolation.pot2
-rw-r--r--scilab/modules/intersci/locales/en_US/intersci.pot2
-rw-r--r--scilab/modules/io/locales/en_US/io.pot2
-rw-r--r--scilab/modules/jvm/locales/en_US/jvm.pot10
-rw-r--r--scilab/modules/linear_algebra/locales/en_US/linear_algebra.pot2
-rw-r--r--scilab/modules/localization/locales/en_US/localization.pot2
-rw-r--r--scilab/modules/m2sci/locales/en_US/m2sci.pot2
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1003.dia.ref4
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1629.dia.ref120
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1629.tst2
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref4
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst2
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1662.dia.ref4
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_1662.tst2
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_2395.dia.ref1
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_2395.tst1
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_942.dia.ref4
-rw-r--r--scilab/modules/m2sci/tests/nonreg_tests/bug_942.tst2
-rw-r--r--scilab/modules/maple2scilab/locales/en_US/maple2scilab.pot2
-rw-r--r--scilab/modules/matio/tests/nonreg_tests/bug_5466.dia.ref5
-rw-r--r--scilab/modules/matio/tests/nonreg_tests/bug_5466.tst9
-rw-r--r--scilab/modules/mexlib/locales/en_US/mexlib.pot2
-rw-r--r--scilab/modules/optimization/locales/en_US/optimization.pot2
-rw-r--r--scilab/modules/output_stream/locales/en_US/output_stream.pot150
-rw-r--r--scilab/modules/overloading/locales/en_US/overloading.pot2
-rw-r--r--scilab/modules/parameters/locales/en_US/parameters.pot2
-rw-r--r--scilab/modules/polynomials/locales/en_US/polynomials.pot2
-rw-r--r--scilab/modules/pvm/locales/en_US/pvm.pot2
-rw-r--r--scilab/modules/randlib/locales/en_US/randlib.pot2
-rw-r--r--scilab/modules/renderer/locales/en_US/renderer.pot6
-rw-r--r--scilab/modules/scicos/locales/en_US/scicos.pot2
-rw-r--r--scilab/modules/shell/locales/en_US/shell.pot14
-rw-r--r--scilab/modules/signal_processing/locales/en_US/signal_processing.pot2
-rw-r--r--scilab/modules/simulated_annealing/locales/en_US/simulated_annealing.pot2
-rw-r--r--scilab/modules/sound/locales/en_US/sound.pot2
-rw-r--r--scilab/modules/sparse/locales/en_US/sparse.pot2
-rw-r--r--scilab/modules/special_functions/locales/en_US/special_functions.pot2
-rw-r--r--scilab/modules/spreadsheet/locales/en_US/spreadsheet.pot2
-rw-r--r--scilab/modules/statistics/locales/en_US/statistics.pot6
-rw-r--r--scilab/modules/string/locales/en_US/string.pot2
-rw-r--r--scilab/modules/symbolic/locales/en_US/symbolic.pot2
-rw-r--r--scilab/modules/tclsci/locales/en_US/tclsci.pot2
-rw-r--r--scilab/modules/texmacs/locales/en_US/texmacs.pot2
-rw-r--r--scilab/modules/time/locales/en_US/time.pot2
-rw-r--r--scilab/modules/umfpack/locales/en_US/umfpack.pot2
-rw-r--r--scilab/modules/windows_tools/locales/en_US/windows_tools.pot2
-rw-r--r--scilab/modules/xcos/locales/en_US/xcos.pot30
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_4715.dia.ref2
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6671.tst3
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6799.dia.ref20
-rw-r--r--scilab/modules/xcos/tests/nonreg_tests/bug_6799.tst2
-rw-r--r--scilab/modules/xpad/locales/en_US/xpad.pot12
88 files changed, 696 insertions, 824 deletions
diff --git a/scilab/CHANGES_5.2.X b/scilab/CHANGES_5.2.X
index 3b2b063..870d26d 100644
--- a/scilab/CHANGES_5.2.X
+++ b/scilab/CHANGES_5.2.X
@@ -264,6 +264,8 @@ Bug Fixes:
264 264
265* bug 6879 fixed - Error messages in "sci_champ.c" were not homogenized. 265* bug 6879 fixed - Error messages in "sci_champ.c" were not homogenized.
266 266
267* bug 6897 fixed - On Windows, umfpack had some wrong dependencies.
268
267 269
268 270
269 Changes between Versions 5.2.0 and 5.2.1 of Scilab 271 Changes between Versions 5.2.0 and 5.2.1 of Scilab
diff --git a/scilab/modules/action_binding/locales/en_US/action_binding.pot b/scilab/modules/action_binding/locales/en_US/action_binding.pot
index 4e7dff0..64a86f7 100644
--- a/scilab/modules/action_binding/locales/en_US/action_binding.pot
+++ b/scilab/modules/action_binding/locales/en_US/action_binding.pot
@@ -14,22 +14,22 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/c/dynamic_menus.c, line: 84 19# File: src/c/dynamic_menus.c, line: 74
20# File: src/c/dynamic_menus.c, line: 92 20# File: src/c/dynamic_menus.c, line: 82
21# File: src/c/dynamic_menus.c, line: 133 21# File: src/c/dynamic_menus.c, line: 119
22# File: src/c/dynamic_menus.c, line: 141 22# File: src/c/dynamic_menus.c, line: 127
23#, c-format 23#, c-format
24msgid "%s: No more memory.\n" 24msgid "%s: No more memory.\n"
25msgstr "" 25msgstr ""
26# 26#
27# File: src/c/dynamic_menus.c, line: 188 27# File: src/c/dynamic_menus.c, line: 174
28#, c-format 28#, c-format
29msgid "Unqueuing %s - No option.\n" 29msgid "Unqueuing %s - No option.\n"
30msgstr "" 30msgstr ""
31# 31#
32# File: src/c/dynamic_menus.c, line: 189 32# File: src/c/dynamic_menus.c, line: 178
33#, c-format 33#, c-format
34msgid "Unqueuing %s - seq.\n" 34msgid "Unqueuing %s - seq.\n"
35msgstr "" 35msgstr ""
diff --git a/scilab/modules/arnoldi/locales/en_US/arnoldi.pot b/scilab/modules/arnoldi/locales/en_US/arnoldi.pot
index 3d6143c..e0f5f89 100644
--- a/scilab/modules/arnoldi/locales/en_US/arnoldi.pot
+++ b/scilab/modules/arnoldi/locales/en_US/arnoldi.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_znaupd.c, line: 100 19# File: sci_gateway/c/sci_znaupd.c, line: 100
20# File: sci_gateway/c/sci_dsaupd.c, line: 99 20# File: sci_gateway/c/sci_dsaupd.c, line: 99
diff --git a/scilab/modules/atoms/locales/en_US/atoms.pot b/scilab/modules/atoms/locales/en_US/atoms.pot
index eab1792..5c18d1e 100644
--- a/scilab/modules/atoms/locales/en_US/atoms.pot
+++ b/scilab/modules/atoms/locales/en_US/atoms.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/atomsAutoloadAdd.sci, line: 162 19# File: macros/atomsAutoloadAdd.sci, line: 162
20# File: macros/atomsAutoloadAdd.sci, line: 167 20# File: macros/atomsAutoloadAdd.sci, line: 167
@@ -39,22 +39,22 @@ msgstr ""
39msgid "\t - ''%s - %s'' is needed by ''%s''\n" 39msgid "\t - ''%s - %s'' is needed by ''%s''\n"
40msgstr "" 40msgstr ""
41# 41#
42# File: macros/atoms_internals/atomsDownload.sci, line: 222 42# File: macros/atoms_internals/atomsDownload.sci, line: 210
43#, c-format 43#, c-format
44msgid "\t - Local location : ''%s''\n" 44msgid "\t - Local location : ''%s''\n"
45msgstr "" 45msgstr ""
46# 46#
47# File: macros/atoms_internals/atomsDownload.sci, line: 255 47# File: macros/atoms_internals/atomsDownload.sci, line: 243
48#, c-format 48#, c-format
49msgid "\t - MD5SUM expected : ''%s''\n" 49msgid "\t - MD5SUM expected : ''%s''\n"
50msgstr "" 50msgstr ""
51# 51#
52# File: macros/atoms_internals/atomsDownload.sci, line: 256 52# File: macros/atoms_internals/atomsDownload.sci, line: 244
53#, c-format 53#, c-format
54msgid "\t - MD5SUM watched : ''%s''\n" 54msgid "\t - MD5SUM watched : ''%s''\n"
55msgstr "" 55msgstr ""
56# 56#
57# File: macros/atoms_internals/atomsDownload.sci, line: 221 57# File: macros/atoms_internals/atomsDownload.sci, line: 209
58#, c-format 58#, c-format
59msgid "\t - URL : ''%s''\n" 59msgid "\t - URL : ''%s''\n"
60msgstr "" 60msgstr ""
@@ -66,17 +66,17 @@ msgstr ""
66msgid "\t - You''ve asked ''%s - %s''\n" 66msgid "\t - You''ve asked ''%s - %s''\n"
67msgstr "" 67msgstr ""
68# 68#
69# File: macros/atoms_internals/atomsDownload.sci, line: 239 69# File: macros/atoms_internals/atomsDownload.sci, line: 227
70#, c-format 70#, c-format
71msgid "\t - destination : ''%s''\n" 71msgid "\t - destination : ''%s''\n"
72msgstr "" 72msgstr ""
73# 73#
74# File: macros/atoms_internals/atomsDownload.sci, line: 254 74# File: macros/atoms_internals/atomsDownload.sci, line: 242
75#, c-format 75#, c-format
76msgid "\t - file : ''%s''\n" 76msgid "\t - file : ''%s''\n"
77msgstr "" 77msgstr ""
78# 78#
79# File: macros/atoms_internals/atomsDownload.sci, line: 238 79# File: macros/atoms_internals/atomsDownload.sci, line: 226
80#, c-format 80#, c-format
81msgid "\t - source : ''%s''\n" 81msgid "\t - source : ''%s''\n"
82msgstr "" 82msgstr ""
@@ -106,10 +106,9 @@ msgstr ""
106msgid "%s: ''%s'' isn''t installed.\n" 106msgid "%s: ''%s'' isn''t installed.\n"
107msgstr "" 107msgstr ""
108# 108#
109# File: macros/atomsLoad.sci, line: 332 109# File: macros/atomsLoad.sci, line: 331
110# File: macros/atomsLoad.sci, line: 336
111#, c-format 110#, c-format
112msgid "%s: An error occurred while loading ''%s-%s''.\n" 111msgid "%s: An error occurred while loading ''%s-%s'':\n"
113msgstr "" 112msgstr ""
114# 113#
115# File: macros/atomsLoad.sci, line: 197 114# File: macros/atomsLoad.sci, line: 197
@@ -118,23 +117,23 @@ msgstr ""
118msgid "%s: Another version of the package %s is already loaded : %s\n" 117msgid "%s: Another version of the package %s is already loaded : %s\n"
119msgstr "" 118msgstr ""
120# 119#
121# File: macros/atomsInstall.sci, line: 206 120# File: macros/atomsInstall.sci, line: 166
122#, c-format 121#, c-format
123msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n" 122msgid "%s: DESCRIPTION file cannot be found in the package ''%s''\n"
124msgstr "" 123msgstr ""
125# 124#
126# File: macros/atomsInstall.sci, line: 439 125# File: macros/atomsInstall.sci, line: 401
127#, c-format 126#, c-format
128msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n" 127msgid "%s: Error while copying the file ''%s'' to the directory ''%s''.\n"
129msgstr "" 128msgstr ""
130# 129#
131# File: macros/atomsInstall.sci, line: 363 130# File: macros/atomsInstall.sci, line: 325
132# File: macros/atomsInstall.sci, line: 392 131# File: macros/atomsInstall.sci, line: 354
133#, c-format 132#, c-format
134msgid "%s: Error while creating the directory ''%s''.\n" 133msgid "%s: Error while creating the directory ''%s''.\n"
135msgstr "" 134msgstr ""
136# 135#
137# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 127 136# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 91
138#, c-format 137#, c-format
139msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n" 138msgid "%s: Extraction of the DESCRIPTION file (''%s'') has failed.\n"
140msgstr "" 139msgstr ""
@@ -171,7 +170,7 @@ msgstr ""
171msgid "%s: Module ''%s'' is not installed.\n" 170msgid "%s: Module ''%s'' is not installed.\n"
172msgstr "" 171msgstr ""
173# 172#
174# File: macros/atoms_internals/atomsDownload.sci, line: 115 173# File: macros/atoms_internals/atomsDownload.sci, line: 103
175#, c-format 174#, c-format
176msgid "%s: Neither Wget or Curl found: Please install one of them\n" 175msgid "%s: Neither Wget or Curl found: Please install one of them\n"
177msgstr "" 176msgstr ""
@@ -202,7 +201,7 @@ msgstr ""
202# 201#
203# File: macros/atoms_internals/atomsLoadSave.sci, line: 42 202# File: macros/atoms_internals/atomsLoadSave.sci, line: 42
204# File: macros/atoms_internals/atomsLoadSave.sci, line: 48 203# File: macros/atoms_internals/atomsLoadSave.sci, line: 48
205# File: macros/atomsInstall.sci, line: 308 204# File: macros/atomsInstall.sci, line: 268
206#, c-format 205#, c-format
207msgid "" 206msgid ""
208"%s: The directory %s cannot been created, please check if you have write " 207"%s: The directory %s cannot been created, please check if you have write "
@@ -214,36 +213,34 @@ msgstr ""
214msgid "%s: The directory %s doesn''t exist.\n" 213msgid "%s: The directory %s doesn''t exist.\n"
215msgstr "" 214msgstr ""
216# 215#
217# File: macros/atomsInstall.sci, line: 154 216# File: macros/atomsInstall.sci, line: 125
218# File: macros/atomsInstall.sci, line: 160 217# File: macros/atomsInstall.sci, line: 137
219# File: macros/atomsInstall.sci, line: 166
220# File: macros/atomsInstall.sci, line: 177
221#, c-format 218#, c-format
222msgid "" 219msgid ""
223"%s: The directory ''%s'' cannot been created, please check if you have write " 220"%s: The directory ''%s'' cannot been created, please check if you have write "
224"access on this directory.\n" 221"access on this directory.\n"
225msgstr "" 222msgstr ""
226# 223#
227# File: macros/atomsRemove.sci, line: 233 224# File: macros/atomsRemove.sci, line: 221
228#, c-format 225#, c-format
229msgid "" 226msgid ""
230"%s: The directory of this package (%s-%s) cannot been deleted, please check " 227"%s: The directory of this package (%s-%s) cannot been deleted, please check "
231"if you have write access on this directory : %s.\n" 228"if you have write access on this directory : %s.\n"
232msgstr "" 229msgstr ""
233# 230#
234# File: macros/atomsRemove.sci, line: 220 231# File: macros/atomsRemove.sci, line: 208
235#, c-format 232#, c-format
236msgid "" 233msgid ""
237"%s: The directory of this package (%s-%s) is located neither in SCI nor in " 234"%s: The directory of this package (%s-%s) is located neither in SCI nor in "
238"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n" 235"SCIHOME. For security reason, ATOMS refuses to delete this directory.\n"
239msgstr "" 236msgstr ""
240# 237#
241# File: macros/atoms_internals/atomsDownload.sci, line: 253 238# File: macros/atoms_internals/atomsDownload.sci, line: 241
242#, c-format 239#, c-format
243msgid "%s: The downloaded file doesn''t check the MD5SUM:\n" 240msgid "%s: The downloaded file doesn''t check the MD5SUM:\n"
244msgstr "" 241msgstr ""
245# 242#
246# File: macros/atoms_internals/atomsExtract.sci, line: 103 243# File: macros/atoms_internals/atomsExtract.sci, line: 91
247#, c-format 244#, c-format
248msgid "%s: The extraction of the archive ''%s'' has failed.\n" 245msgid "%s: The extraction of the archive ''%s'' has failed.\n"
249msgstr "" 246msgstr ""
@@ -253,13 +250,13 @@ msgstr ""
253msgid "%s: The file %s doesn''t exist or is not read accessible.\n" 250msgid "%s: The file %s doesn''t exist or is not read accessible.\n"
254msgstr "" 251msgstr ""
255# 252#
256# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 139 253# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 169
257#, c-format 254#, c-format
258msgid "%s: The file %s is not well formated at line %d\n" 255msgid "%s: The file %s is not well formated at line %d\n"
259msgstr "" 256msgstr ""
260# 257#
261# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 67 258# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 79
262# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 100 259# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 112
263#, c-format 260#, c-format
264msgid "" 261msgid ""
265"%s: The file %s is not well formated, the toolbox %s - %s doesn''t contain " 262"%s: The file %s is not well formated, the toolbox %s - %s doesn''t contain "
@@ -271,7 +268,7 @@ msgstr ""
271msgid "%s: The file ''%s'' cannot be written.\n" 268msgid "%s: The file ''%s'' cannot be written.\n"
272msgstr "" 269msgstr ""
273# 270#
274# File: macros/atomsInstall.sci, line: 199 271# File: macros/atomsInstall.sci, line: 159
275#, c-format 272#, c-format
276msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n" 273msgid "%s: The file ''%s'' doesn''t exist or is not read accessible\n"
277msgstr "" 274msgstr ""
@@ -282,12 +279,12 @@ msgstr ""
282msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n" 279msgid "%s: The file ''%s'' doesn''t exist or is not read accessible.\n"
283msgstr "" 280msgstr ""
284# 281#
285# File: macros/atoms_internals/atomsDownload.sci, line: 237 282# File: macros/atoms_internals/atomsDownload.sci, line: 225
286#, c-format 283#, c-format
287msgid "%s: The following file hasn''t been copied:\n" 284msgid "%s: The following file hasn''t been copied:\n"
288msgstr "" 285msgstr ""
289# 286#
290# File: macros/atoms_internals/atomsDownload.sci, line: 220 287# File: macros/atoms_internals/atomsDownload.sci, line: 208
291#, c-format 288#, c-format
292msgid "%s: The following file hasn''t been downloaded:\n" 289msgid "%s: The following file hasn''t been downloaded:\n"
293msgstr "" 290msgstr ""
@@ -323,7 +320,7 @@ msgstr ""
323msgid "%s: The package ''%s'' is not present in the struct.\n" 320msgid "%s: The package ''%s'' is not present in the struct.\n"
324msgstr "" 321msgstr ""
325# 322#
326# File: macros/atomsRemove.sci, line: 252 323# File: macros/atomsRemove.sci, line: 240
327#, c-format 324#, c-format
328msgid "" 325msgid ""
329"%s: The root directory of this package (%s-%s) cannot been deleted, please " 326"%s: The root directory of this package (%s-%s) cannot been deleted, please "
@@ -336,10 +333,10 @@ msgid ""
336"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n" 333"%s: The version ''%s'' of the package ''%s'' is not present in the struct.\n"
337msgstr "" 334msgstr ""
338# 335#
339# File: macros/atoms_internals/atomsDownload.sci, line: 77 336# File: macros/atoms_internals/atomsDownload.sci, line: 65
340#, c-format 337#, c-format
341msgid "" 338msgid ""
342"%s: Wrong length for input argument #%d: A string which has 32-characters " 339"%s: Wrong length for input argument #%d: String which has 32-characters "
343"length expected.\n" 340"length expected.\n"
344msgstr "" 341msgstr ""
345# 342#
@@ -369,7 +366,6 @@ msgstr ""
369# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 20 366# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 20
370# File: macros/atoms_internals/atomsLoadLoad.sci, line: 22 367# File: macros/atoms_internals/atomsLoadLoad.sci, line: 22
371# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 40 368# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 40
372# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 24
373# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 24 369# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 24
374# File: macros/atomsSetConfig.sci, line: 32 370# File: macros/atomsSetConfig.sci, line: 32
375# File: macros/atomsDepTreeShow.sci, line: 38 371# File: macros/atomsDepTreeShow.sci, line: 38
@@ -382,7 +378,7 @@ msgstr ""
382# 378#
383# File: macros/atoms_internals/atomsGetVersions.sci, line: 26 379# File: macros/atoms_internals/atomsGetVersions.sci, line: 26
384# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 22 380# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 22
385# File: macros/atoms_internals/atomsDownload.sci, line: 36 381# File: macros/atoms_internals/atomsDownload.sci, line: 24
386# File: macros/atoms_internals/atomsCompatibleVersions.sci, line: 25 382# File: macros/atoms_internals/atomsCompatibleVersions.sci, line: 25
387# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 23 383# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 23
388# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 22 384# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 22
@@ -400,6 +396,7 @@ msgstr ""
400# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 23 396# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 23
401# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 20 397# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 20
402# File: macros/atoms_internals/atomsGetDepParents.sci, line: 23 398# File: macros/atoms_internals/atomsGetDepParents.sci, line: 23
399# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 24
403# File: macros/atomsRepositoryList.sci, line: 29 400# File: macros/atomsRepositoryList.sci, line: 29
404# File: macros/atomsRepositoryAdd.sci, line: 37 401# File: macros/atomsRepositoryAdd.sci, line: 37
405# File: macros/atomsSearch.sci, line: 28 402# File: macros/atomsSearch.sci, line: 28
@@ -413,7 +410,7 @@ msgstr ""
413# 410#
414# File: macros/atomsGetInstalled.sci, line: 35 411# File: macros/atomsGetInstalled.sci, line: 35
415# File: macros/atomsAutoloadList.sci, line: 27 412# File: macros/atomsAutoloadList.sci, line: 27
416# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 65 413# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 29
417# File: macros/atoms_internals/atomsToremoveProcess.sci, line: 24 414# File: macros/atoms_internals/atomsToremoveProcess.sci, line: 24
418# File: macros/atoms_internals/atomsToremoveList.sci, line: 25 415# File: macros/atoms_internals/atomsToremoveList.sci, line: 25
419# File: macros/atoms_internals/atomsGetMRVersion.sci, line: 25 416# File: macros/atoms_internals/atomsGetMRVersion.sci, line: 25
@@ -460,66 +457,50 @@ msgstr ""
460msgid "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n" 457msgid "%s: Wrong size for input argument #%d: 1x2 string matrix expected.\n"
461msgstr "" 458msgstr ""
462# 459#
463# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 33
464# File: macros/atoms_internals/atomsIsCompatible.sci, line: 35
465# File: macros/atoms_internals/atomsVersionCompare.sci, line: 44
466# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 73
467# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 77
468# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 59
469#, c-format
470msgid "%s: Wrong size for input argument #%d: A Single String expected.\n"
471msgstr ""
472#
473# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 44
474# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 74
475# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 78
476# File: macros/atoms_internals/atomsVersionSort.sci, line: 48
477# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 70
478# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 74
479# File: macros/atoms_internals/atomsGetConfig.sci, line: 36
480# File: macros/atomsSearch.sci, line: 46
481#, c-format
482msgid "%s: Wrong size for input argument #%d: A single string expected.\n"
483msgstr ""
484#
485# File: macros/atoms_internals/atomsAutoloadLoad.sci, line: 35
486# File: macros/atoms_internals/atomsLoadInstalledMat.sci, line: 35
487# File: macros/atoms_internals/atomsLoadInstalledStruct.sci, line: 35
488# File: macros/atoms_internals/atomsError.sci, line: 32
489# File: macros/atoms_internals/atomsUpdateDeps.sci, line: 50
490# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 54
491# File: macros/atoms_internals/atomsLoadInstalleddeps.sci, line: 37
492#, c-format
493msgid "%s: Wrong size for input argument #%d: A single-string expected.\n"
494msgstr ""
495#
496# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 34
497# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 31
498#, c-format
499msgid "%s: Wrong size for input argument #%d: Single String expected.\n"
500msgstr ""
501#
502# File: macros/atomsAutoloadList.sci, line: 50 460# File: macros/atomsAutoloadList.sci, line: 50
461# File: macros/atoms_internals/atomsAutoloadLoad.sci, line: 35
503# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 63 462# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 63
504# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 67 463# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 67
505# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 71 464# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 71
506# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 75 465# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 75
466# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 44
507# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 63 467# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 63
508# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 67 468# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 67
509# File: macros/atoms_internals/atomsDownload.sci, line: 58 469# File: macros/atoms_internals/atomsDownload.sci, line: 46
510# File: macros/atoms_internals/atomsDownload.sci, line: 62 470# File: macros/atoms_internals/atomsDownload.sci, line: 50
471# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 34
511# File: macros/atoms_internals/atomsExtract.sci, line: 38 472# File: macros/atoms_internals/atomsExtract.sci, line: 38
512# File: macros/atoms_internals/atomsExtract.sci, line: 42 473# File: macros/atoms_internals/atomsExtract.sci, line: 42
474# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 33
475# File: macros/atoms_internals/atomsLoadInstalledMat.sci, line: 35
476# File: macros/atoms_internals/atomsLoadInstalledStruct.sci, line: 35
513# File: macros/atoms_internals/atomsUpdateDep.sci, line: 50 477# File: macros/atoms_internals/atomsUpdateDep.sci, line: 50
514# File: macros/atoms_internals/atomsUpdateDep.sci, line: 54 478# File: macros/atoms_internals/atomsUpdateDep.sci, line: 54
515# File: macros/atoms_internals/atomsUpdateDep.sci, line: 58 479# File: macros/atoms_internals/atomsUpdateDep.sci, line: 58
516# File: macros/atoms_internals/atomsUpdateDep.sci, line: 62 480# File: macros/atoms_internals/atomsUpdateDep.sci, line: 62
481# File: macros/atoms_internals/atomsError.sci, line: 32
482# File: macros/atoms_internals/atomsUpdateDeps.sci, line: 50
483# File: macros/atoms_internals/atomsIsCompatible.sci, line: 35
517# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 59 484# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 59
518# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 63 485# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 63
486# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 74
487# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 78
488# File: macros/atoms_internals/atomsVersionSort.sci, line: 48
489# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 70
490# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 74
491# File: macros/atoms_internals/atomsVersionCompare.sci, line: 44
492# File: macros/atoms_internals/atomsGetConfig.sci, line: 36
519# File: macros/atoms_internals/atomsGetDepChilds.sci, line: 50 493# File: macros/atoms_internals/atomsGetDepChilds.sci, line: 50
494# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 54
495# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 73
496# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 77
497# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 31
498# File: macros/atoms_internals/atomsLoadInstalleddeps.sci, line: 37
520# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 38 499# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 38
521# File: macros/atoms_internals/atomsGetDepParents.sci, line: 50 500# File: macros/atoms_internals/atomsGetDepParents.sci, line: 50
501# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 59
522# File: macros/atomsRepositoryList.sci, line: 43 502# File: macros/atomsRepositoryList.sci, line: 43
503# File: macros/atomsSearch.sci, line: 46
523#, c-format 504#, c-format
524msgid "%s: Wrong size for input argument #%d: Single string expected.\n" 505msgid "%s: Wrong size for input argument #%d: Single string expected.\n"
525msgstr "" 506msgstr ""
@@ -573,29 +554,11 @@ msgstr ""
573msgid "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n" 554msgid "%s: Wrong size for input argument #%d: mx3 string matrix expected.\n"
574msgstr "" 555msgstr ""
575# 556#
576# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 29 557# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 33
577# File: macros/atoms_internals/atomsIsCompatible.sci, line: 28
578# File: macros/atoms_internals/atomsVersionCompare.sci, line: 33
579# File: macros/atoms_internals/atomsVersionCompare.sci, line: 37
580# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 50
581# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 54
582# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 58
583# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 62
584# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 55
585#, c-format
586msgid "%s: Wrong type for input argument #%d: A Single String expected.\n"
587msgstr ""
588#
589# File: macros/atoms_internals/atomsToremoveList.sci, line: 56
590#, c-format
591msgid "%s: Wrong type for input argument #%d: A a single-string expected.\n"
592msgstr ""
593#
594# File: macros/atoms_internals/atomsGetTOOLBOXES.sci, line: 69
595# File: macros/atoms_internals/atomsGetVersions.sci, line: 42 558# File: macros/atoms_internals/atomsGetVersions.sci, line: 42
596# File: macros/atoms_internals/atomsGetVersions.sci, line: 46 559# File: macros/atoms_internals/atomsGetVersions.sci, line: 46
597#, c-format 560#, c-format
598msgid "%s: Wrong type for input argument #%d: A boolean expected.\n" 561msgid "%s: Wrong type for input argument #%d: Boolean expected.\n"
599msgstr "" 562msgstr ""
600# 563#
601# File: macros/atoms_internals/atomsToremoveProcess.sci, line: 55 564# File: macros/atoms_internals/atomsToremoveProcess.sci, line: 55
@@ -607,91 +570,82 @@ msgstr ""
607# File: macros/atomsAutoloadDel.sci, line: 75 570# File: macros/atomsAutoloadDel.sci, line: 75
608#, c-format 571#, c-format
609msgid "" 572msgid ""
610"%s: Wrong type for input argument #%d: A boolean or a single string " 573"%s: Wrong type for input argument #%d: Boolean or single string expected.\n"
611"expected.\n"
612msgstr ""
613#
614# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 33
615# File: macros/atoms_internals/atomsGetInstalledPath.sci, line: 31
616# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 59
617# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 63
618# File: macros/atoms_internals/atomsVersionSort.sci, line: 41
619# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 59
620# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 63
621# File: macros/atoms_internals/atomsGetConfig.sci, line: 29
622# File: macros/atoms_internals/atomsGetInstalledDetails.sci, line: 30
623# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 30
624# File: macros/atomsSearch.sci, line: 35
625# File: macros/atomsSearch.sci, line: 39
626#, c-format
627msgid "%s: Wrong type for input argument #%d: A single string expected.\n"
628msgstr "" 574msgstr ""
629# 575#
630# File: macros/atomsGetInstalled.sci, line: 46 576# File: macros/atomsGetInstalled.sci, line: 46
631# File: macros/atomsUpdate.sci, line: 63 577# File: macros/atomsUpdate.sci, line: 63
578# File: macros/atomsAutoloadList.sci, line: 46
632# File: macros/atoms_internals/atomsAutoloadLoad.sci, line: 31 579# File: macros/atoms_internals/atomsAutoloadLoad.sci, line: 31
580# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 48
581# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 52
582# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 56
583# File: macros/atoms_internals/atomsToolboxDetails.sci, line: 33
584# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 48
585# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 52
633# File: macros/atoms_internals/atomsSaveInstalled.sci, line: 34 586# File: macros/atoms_internals/atomsSaveInstalled.sci, line: 34
587# File: macros/atoms_internals/atomsDownload.sci, line: 31
588# File: macros/atoms_internals/atomsDownload.sci, line: 35
589# File: macros/atoms_internals/atomsDownload.sci, line: 39
590# File: macros/atoms_internals/atomsDownload.sci, line: 54
591# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 30
592# File: macros/atoms_internals/atomsExtract.sci, line: 27
593# File: macros/atoms_internals/atomsExtract.sci, line: 31
594# File: macros/atoms_internals/atomsGetInstalledVers.sci, line: 29
634# File: macros/atoms_internals/atomsLoadInstalledMat.sci, line: 31 595# File: macros/atoms_internals/atomsLoadInstalledMat.sci, line: 31
635# File: macros/atoms_internals/atomsLoadInstalledStruct.sci, line: 31 596# File: macros/atoms_internals/atomsLoadInstalledStruct.sci, line: 31
597# File: macros/atoms_internals/atomsUpdateDep.sci, line: 31
598# File: macros/atoms_internals/atomsUpdateDep.sci, line: 35
599# File: macros/atoms_internals/atomsUpdateDep.sci, line: 39
600# File: macros/atoms_internals/atomsUpdateDep.sci, line: 43
636# File: macros/atoms_internals/atomsInstallRegister.sci, line: 45 601# File: macros/atoms_internals/atomsInstallRegister.sci, line: 45
637# File: macros/atoms_internals/atomsAutoloadSave.sci, line: 38 602# File: macros/atoms_internals/atomsAutoloadSave.sci, line: 38
603# File: macros/atoms_internals/atomsPath.sci, line: 30
604# File: macros/atoms_internals/atomsPath.sci, line: 34
638# File: macros/atoms_internals/atomsError.sci, line: 28 605# File: macros/atoms_internals/atomsError.sci, line: 28
639# File: macros/atoms_internals/atomsError.sci, line: 42 606# File: macros/atoms_internals/atomsError.sci, line: 42
640# File: macros/atoms_internals/atomsUpdateDeps.sci, line: 46 607# File: macros/atoms_internals/atomsUpdateDeps.sci, line: 46
608# File: macros/atoms_internals/atomsIsCompatible.sci, line: 28
641# File: macros/atoms_internals/atomsInstallUnregister.sci, line: 40 609# File: macros/atoms_internals/atomsInstallUnregister.sci, line: 40
610# File: macros/atoms_internals/atomsGetInstalledPath.sci, line: 31
611# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 48
612# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 52
613# File: macros/atoms_internals/atomsToremoveList.sci, line: 56
614# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 59
615# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 63
642# File: macros/atoms_internals/atomsToremoveRegister.sci, line: 50 616# File: macros/atoms_internals/atomsToremoveRegister.sci, line: 50
617# File: macros/atoms_internals/atomsVersionSort.sci, line: 41
618# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 59
619# File: macros/atoms_internals/atomsDepTreeExt.sci, line: 63
620# File: macros/atoms_internals/atomsVersionCompare.sci, line: 33
621# File: macros/atoms_internals/atomsVersionCompare.sci, line: 37
622# File: macros/atoms_internals/atomsGetConfig.sci, line: 29
623# File: macros/atoms_internals/atomsGetDepChilds.sci, line: 46
643# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 50 624# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 50
625# File: macros/atoms_internals/atomsGetInstalledDetails.sci, line: 30
626# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 30
627# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 50
628# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 54
629# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 58
630# File: macros/atoms_internals/atomsPackageIsCompatible.sci, line: 62
631# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 27
644# File: macros/atoms_internals/atomsLoadInstalleddeps.sci, line: 33 632# File: macros/atoms_internals/atomsLoadInstalleddeps.sci, line: 33
645# File: macros/atoms_internals/atomsAutoloadCheck.sci, line: 47 633# File: macros/atoms_internals/atomsAutoloadCheck.sci, line: 47
646# File: macros/atoms_internals/atomsOrphanList.sci, line: 31 634# File: macros/atoms_internals/atomsOrphanList.sci, line: 31
635# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 31
647# File: macros/atoms_internals/atomsInstallList.sci, line: 81 636# File: macros/atoms_internals/atomsInstallList.sci, line: 81
637# File: macros/atoms_internals/atomsGetDepParents.sci, line: 46
638# File: macros/atoms_internals/atomsIsDirectChild.sci, line: 55
648# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 42 639# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 42
640# File: macros/atomsRepositoryList.sci, line: 36
649# File: macros/atomsRepositoryAdd.sci, line: 73 641# File: macros/atomsRepositoryAdd.sci, line: 73
642# File: macros/atomsSearch.sci, line: 35
643# File: macros/atomsSearch.sci, line: 39
650# File: macros/atomsRepositoryDel.sci, line: 70 644# File: macros/atomsRepositoryDel.sci, line: 70
651# File: macros/atomsAutoloadAdd.sci, line: 78 645# File: macros/atomsAutoloadAdd.sci, line: 78
652# File: macros/atomsRemove.sci, line: 113 646# File: macros/atomsRemove.sci, line: 101
653# File: macros/atomsIsInstalled.sci, line: 76 647# File: macros/atomsIsInstalled.sci, line: 76
654# File: macros/atomsInstall.sci, line: 133 648# File: macros/atomsInstall.sci, line: 97
655#, c-format
656msgid "%s: Wrong type for input argument #%d: A single-string expected.\n"
657msgstr ""
658#
659# File: macros/atoms_internals/atomsSaveInstalled.sci, line: 27
660# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 46
661#, c-format
662msgid "%s: Wrong type for input argument #%d: A struct expected.\n"
663msgstr ""
664#
665# File: macros/atoms_internals/atomsRepositorySetOfl.sci, line: 30
666# File: macros/atoms_internals/atomsPath.sci, line: 30
667# File: macros/atoms_internals/atomsPath.sci, line: 34
668# File: macros/atoms_internals/atomsSetOfficialRep.sci, line: 27
669#, c-format
670msgid "%s: Wrong type for input argument #%d: Single String expected.\n"
671msgstr ""
672#
673# File: macros/atomsAutoloadList.sci, line: 46
674# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 48
675# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 52
676# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 56
677# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 48
678# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 52
679# File: macros/atoms_internals/atomsDownload.sci, line: 43
680# File: macros/atoms_internals/atomsDownload.sci, line: 47
681# File: macros/atoms_internals/atomsDownload.sci, line: 51
682# File: macros/atoms_internals/atomsDownload.sci, line: 66
683# File: macros/atoms_internals/atomsExtract.sci, line: 27
684# File: macros/atoms_internals/atomsExtract.sci, line: 31
685# File: macros/atoms_internals/atomsUpdateDep.sci, line: 31
686# File: macros/atoms_internals/atomsUpdateDep.sci, line: 35
687# File: macros/atoms_internals/atomsUpdateDep.sci, line: 39
688# File: macros/atoms_internals/atomsUpdateDep.sci, line: 43
689# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 48
690# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 52
691# File: macros/atoms_internals/atomsGetDepChilds.sci, line: 46
692# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 31
693# File: macros/atoms_internals/atomsGetDepParents.sci, line: 46
694# File: macros/atomsRepositoryList.sci, line: 36
695#, c-format 649#, c-format
696msgid "%s: Wrong type for input argument #%d: Single string expected.\n" 650msgid "%s: Wrong type for input argument #%d: Single string expected.\n"
697msgstr "" 651msgstr ""
@@ -751,7 +705,9 @@ msgstr ""
751# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 44 705# File: macros/atoms_internals/atomsDESCRIPTIONaddField.sci, line: 44
752# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 44 706# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 44
753# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 56 707# File: macros/atoms_internals/atomsDESCRIPTIONadd.sci, line: 56
708# File: macros/atoms_internals/atomsSaveInstalled.sci, line: 27
754# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 44 709# File: macros/atoms_internals/atomsDESCRIPTIONrm.sci, line: 44
710# File: macros/atoms_internals/atomsSaveInstalleddeps.sci, line: 46
755# File: macros/atoms_internals/atomsRmfields.sci, line: 28 711# File: macros/atoms_internals/atomsRmfields.sci, line: 28
756# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 27 712# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 27
757#, c-format 713#, c-format
@@ -763,6 +719,7 @@ msgstr ""
763# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 67 719# File: macros/atoms_internals/atomsDepTreeFlat.sci, line: 67
764# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 27 720# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 27
765# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 31 721# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 31
722# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 35
766#, c-format 723#, c-format
767msgid "" 724msgid ""
768"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n" 725"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
@@ -809,7 +766,7 @@ msgstr ""
809# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 46 766# File: macros/atoms_internals/atomsToremoveUnregister.sci, line: 46
810# File: macros/atomsRepositoryAdd.sci, line: 77 767# File: macros/atomsRepositoryAdd.sci, line: 77
811# File: macros/atomsAutoloadAdd.sci, line: 82 768# File: macros/atomsAutoloadAdd.sci, line: 82
812# File: macros/atomsInstall.sci, line: 137 769# File: macros/atomsInstall.sci, line: 101
813#, c-format 770#, c-format
814msgid "" 771msgid ""
815"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n" 772"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' expected.\n"
@@ -823,7 +780,7 @@ msgstr ""
823# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 53 780# File: macros/atoms_internals/atomsGetInstalledStatus.sci, line: 53
824# File: macros/atoms_internals/atomsOrphanList.sci, line: 35 781# File: macros/atoms_internals/atomsOrphanList.sci, line: 35
825# File: macros/atomsRepositoryDel.sci, line: 74 782# File: macros/atomsRepositoryDel.sci, line: 74
826# File: macros/atomsRemove.sci, line: 117 783# File: macros/atomsRemove.sci, line: 105
827#, c-format 784#, c-format
828msgid "" 785msgid ""
829"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' " 786"%s: Wrong value for input argument #%d: ''user'' or ''allusers'' or ''all'' "
@@ -855,27 +812,6 @@ msgid ""
855"expected.\n" 812"expected.\n"
856msgstr "" 813msgstr ""
857# 814#
858# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 28
859#, c-format
860msgid ""
861"%s: Wrong value for input argument #%d: A string that contain ''TOOLBOXES'' "
862"or ''DESCRIPTION'' expected.\n"
863msgstr ""
864#
865# File: macros/atoms_internals/atomsReadDesc.sci, line: 32
866#, c-format
867msgid ""
868"%s: Wrong value for input argument #%d: A string that end with DESCRIPTION "
869"expected.\n"
870msgstr ""
871#
872# File: macros/atoms_internals/atomsDownload.sci, line: 73
873#, c-format
874msgid ""
875"%s: Wrong value for input argument #%d: A string that start with "
876"''http://'',''ftp://'' or ''file://'' expected.\n"
877msgstr ""
878#
879# File: macros/atoms_internals/atomsVersionSort.sci, line: 54 815# File: macros/atoms_internals/atomsVersionSort.sci, line: 54
880#, c-format 816#, c-format
881msgid "%s: Wrong value for input argument #%d: ASC or DESC expected.\n" 817msgid "%s: Wrong value for input argument #%d: ASC or DESC expected.\n"
@@ -906,6 +842,27 @@ msgid ""
906"gz, .tgz or .zip expected.\n" 842"gz, .tgz or .zip expected.\n"
907msgstr "" 843msgstr ""
908# 844#
845# File: macros/atoms_internals/atomsDESCRIPTIONread.sci, line: 28
846#, c-format
847msgid ""
848"%s: Wrong value for input argument #%d: String that contain ''TOOLBOXES'' or "
849"''DESCRIPTION'' expected.\n"
850msgstr ""
851#
852# File: macros/atoms_internals/atomsReadDesc.sci, line: 32
853#, c-format
854msgid ""
855"%s: Wrong value for input argument #%d: String that end with DESCRIPTION "
856"expected.\n"
857msgstr ""
858#
859# File: macros/atoms_internals/atomsDownload.sci, line: 61
860#, c-format
861msgid ""
862"%s: Wrong value for input argument #%d: String that start with "
863"''http://'',''ftp://'' or ''file://'' expected.\n"
864msgstr ""
865#
909# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 53 866# File: macros/atoms_internals/atomsDESCRIPTIONcat.sci, line: 53
910# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 54 867# File: macros/atoms_internals/atomsDESCRIPTIONwrite.sci, line: 54
911#, c-format 868#, c-format
@@ -940,13 +897,13 @@ msgid ""
940"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n" 897"%s: Wrong value for input argument #%d:''error'' or ''warning'' expected.\n"
941msgstr "" 898msgstr ""
942# 899#
943# File: macros/atomsRemove.sci, line: 161 900# File: macros/atomsRemove.sci, line: 149
944#, c-format 901#, c-format
945msgid "" 902msgid ""
946"%s: You have not enough rights to remove any version of the package %s.\n" 903"%s: You have not enough rights to remove any version of the package %s.\n"
947msgstr "" 904msgstr ""
948# 905#
949# File: macros/atomsRemove.sci, line: 153 906# File: macros/atomsRemove.sci, line: 141
950#, c-format 907#, c-format
951msgid "%s: You have not enough rights to remove the package %s (%s).\n" 908msgid "%s: You have not enough rights to remove the package %s (%s).\n"
952msgstr "" 909msgstr ""
@@ -961,9 +918,9 @@ msgstr ""
961# File: macros/atomsRepositoryAdd.sci, line: 82 918# File: macros/atomsRepositoryAdd.sci, line: 82
962# File: macros/atomsRepositoryDel.sci, line: 79 919# File: macros/atomsRepositoryDel.sci, line: 79
963# File: macros/atomsAutoloadAdd.sci, line: 87 920# File: macros/atomsAutoloadAdd.sci, line: 87
964# File: macros/atomsRemove.sci, line: 122 921# File: macros/atomsRemove.sci, line: 110
965# File: macros/atomsAutoloadDel.sci, line: 84 922# File: macros/atomsAutoloadDel.sci, line: 84
966# File: macros/atomsInstall.sci, line: 142 923# File: macros/atomsInstall.sci, line: 106
967#, c-format 924#, c-format
968msgid "%s: You haven''t write access on this directory : %s.\n" 925msgid "%s: You haven''t write access on this directory : %s.\n"
969msgstr "" 926msgstr ""
@@ -1018,7 +975,7 @@ msgstr ""
1018msgid "Atoms error" 975msgid "Atoms error"
1019msgstr "" 976msgstr ""
1020# 977#
1021# File: macros/atoms_gui/cbAtomsGui.sci, line: 195 978# File: macros/atoms_gui/cbAtomsGui.sci, line: 159
1022# File: macros/atomsShow.sci, line: 73 979# File: macros/atomsShow.sci, line: 73
1023msgid "Author(s)" 980msgid "Author(s)"
1024msgstr "" 981msgstr ""
@@ -1027,7 +984,7 @@ msgstr ""
1027msgid "Automatically Installed" 984msgid "Automatically Installed"
1028msgstr "" 985msgstr ""
1029# 986#
1030# File: macros/atoms_gui/cbAtomsGui.sci, line: 271 987# File: macros/atoms_gui/cbAtomsGui.sci, line: 235
1031msgid "Bytes" 988msgid "Bytes"
1032msgstr "" 989msgstr ""
1033# 990#
@@ -1043,12 +1000,12 @@ msgstr ""
1043msgid "Depend" 1000msgid "Depend"
1044msgstr "" 1001msgstr ""
1045# 1002#
1046# File: macros/atoms_gui/cbAtomsGui.sci, line: 216 1003# File: macros/atoms_gui/cbAtomsGui.sci, line: 180
1047# File: macros/atomsShow.sci, line: 87 1004# File: macros/atomsShow.sci, line: 87
1048msgid "Description" 1005msgid "Description"
1049msgstr "" 1006msgstr ""
1050# 1007#
1051# File: macros/atoms_gui/cbAtomsGui.sci, line: 180 1008# File: macros/atoms_gui/cbAtomsGui.sci, line: 144
1052msgid "Download size" 1009msgid "Download size"
1053msgstr "" 1010msgstr ""
1054# 1011#
@@ -1080,7 +1037,7 @@ msgstr ""
1080msgid "Installing..." 1037msgid "Installing..."
1081msgstr "" 1038msgstr ""
1082# 1039#
1083# File: macros/atoms_gui/cbAtomsGui.sci, line: 274 1040# File: macros/atoms_gui/cbAtomsGui.sci, line: 238
1084msgid "KB" 1041msgid "KB"
1085msgstr "" 1042msgstr ""
1086# 1043#
@@ -1088,7 +1045,7 @@ msgstr ""
1088msgid "License" 1045msgid "License"
1089msgstr "" 1046msgstr ""
1090# 1047#
1091# File: macros/atoms_gui/cbAtomsGui.sci, line: 277 1048# File: macros/atoms_gui/cbAtomsGui.sci, line: 241
1092msgid "MB" 1049msgid "MB"
1093msgstr "" 1050msgstr ""
1094# 1051#
@@ -1164,7 +1121,7 @@ msgstr ""
1164msgid "Updating..." 1121msgid "Updating..."
1165msgstr "" 1122msgstr ""
1166# 1123#
1167# File: macros/atoms_gui/cbAtomsGui.sci, line: 211 1124# File: macros/atoms_gui/cbAtomsGui.sci, line: 175
1168# File: macros/atomsShow.sci, line: 70 1125# File: macros/atomsShow.sci, line: 70
1169msgid "Version" 1126msgid "Version"
1170msgstr "" 1127msgstr ""
diff --git a/scilab/modules/boolean/locales/en_US/boolean.pot b/scilab/modules/boolean/locales/en_US/boolean.pot
index 77c5dfa..8e14676 100644
--- a/scilab/modules/boolean/locales/en_US/boolean.pot
+++ b/scilab/modules/boolean/locales/en_US/boolean.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/c/matboolean.c, line: 137 19# File: src/c/matboolean.c, line: 137
20# File: src/c/matboolean.c, line: 141 20# File: src/c/matboolean.c, line: 141
diff --git a/scilab/modules/cacsd/locales/en_US/cacsd.pot b/scilab/modules/cacsd/locales/en_US/cacsd.pot
index 51a1859..c222a16 100644
--- a/scilab/modules/cacsd/locales/en_US/cacsd.pot
+++ b/scilab/modules/cacsd/locales/en_US/cacsd.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/h_inf.sci, line: 45 19# File: macros/h_inf.sci, line: 45
20#, c-format 20#, c-format
@@ -139,8 +139,8 @@ msgstr ""
139# 139#
140# File: macros/leqr.sci, line: 56 140# File: macros/leqr.sci, line: 56
141# File: macros/leqr.sci, line: 84 141# File: macros/leqr.sci, line: 84
142# File: macros/lqr.sci, line: 48 142# File: macros/lqr.sci, line: 49
143# File: macros/lqr.sci, line: 89 143# File: macros/lqr.sci, line: 90
144# File: macros/ui_observer.sci, line: 111 144# File: macros/ui_observer.sci, line: 111
145# File: macros/ui_observer.sci, line: 114 145# File: macros/ui_observer.sci, line: 114
146#, c-format 146#, c-format
@@ -287,11 +287,6 @@ msgstr ""
287msgid "%s: Incorrect link: %s" 287msgid "%s: Incorrect link: %s"
288msgstr "" 288msgstr ""
289# 289#
290# File: macros/kpure.sci, line: 36
291#, c-format
292msgid "%s: Infinite solution.\n"
293msgstr ""
294#
295# File: macros/dscr.sci, line: 21 290# File: macros/dscr.sci, line: 21
296#, c-format 291#, c-format
297msgid "%s: Input argument #%d must be real.\n" 292msgid "%s: Input argument #%d must be real.\n"
@@ -400,8 +395,8 @@ msgstr ""
400# 395#
401# File: macros/leqr.sci, line: 48 396# File: macros/leqr.sci, line: 48
402# File: macros/leqr.sci, line: 77 397# File: macros/leqr.sci, line: 77
403# File: macros/lqr.sci, line: 44 398# File: macros/lqr.sci, line: 45
404# File: macros/lqr.sci, line: 85 399# File: macros/lqr.sci, line: 86
405#, c-format 400#, c-format
406msgid "%s: Stable subspace is too small.\n" 401msgid "%s: Stable subspace is too small.\n"
407msgstr "" 402msgstr ""
@@ -581,10 +576,9 @@ msgstr ""
581# 576#
582# File: macros/trfmod.sci, line: 20 577# File: macros/trfmod.sci, line: 20
583# File: macros/trfmod.sci, line: 25 578# File: macros/trfmod.sci, line: 25
584# File: macros/krac2.sci, line: 24 579# File: macros/krac2.sci, line: 26
585# File: macros/p_margin.sci, line: 20 580# File: macros/p_margin.sci, line: 20
586# File: macros/g_margin.sci, line: 20 581# File: macros/g_margin.sci, line: 20
587# File: macros/kpure.sci, line: 26
588# File: macros/routh_t.sci, line: 40 582# File: macros/routh_t.sci, line: 40
589#, c-format 583#, c-format
590msgid "" 584msgid ""
@@ -720,7 +714,7 @@ msgstr ""
720# 714#
721# File: macros/trfmod.sci, line: 42 715# File: macros/trfmod.sci, line: 42
722# File: macros/calfrq.sci, line: 23 716# File: macros/calfrq.sci, line: 23
723# File: macros/krac2.sci, line: 18 717# File: macros/krac2.sci, line: 23
724# File: macros/lcf.sci, line: 21 718# File: macros/lcf.sci, line: 21
725# File: macros/h_inf.sci, line: 36 719# File: macros/h_inf.sci, line: 36
726# File: macros/syslin.sci, line: 50 720# File: macros/syslin.sci, line: 50
@@ -730,7 +724,7 @@ msgstr ""
730# File: macros/lqg.sci, line: 14 724# File: macros/lqg.sci, line: 14
731# File: macros/lft.sci, line: 26 725# File: macros/lft.sci, line: 26
732# File: macros/lft.sci, line: 39 726# File: macros/lft.sci, line: 39
733# File: macros/kpure.sci, line: 20 727# File: macros/kpure.sci, line: 22
734#, c-format 728#, c-format
735msgid "" 729msgid ""
736"%s: Wrong type for input argument #%d: Linear state space or a transfer " 730"%s: Wrong type for input argument #%d: Linear state space or a transfer "
@@ -814,11 +808,9 @@ msgstr ""
814msgid "%s: Wrong value for input argument #%d: ''%s'' expected.\n" 808msgid "%s: Wrong value for input argument #%d: ''%s'' expected.\n"
815msgstr "" 809msgstr ""
816# 810#
817# File: macros/krac2.sci, line: 21
818# File: macros/cls2dls.sci, line: 31 811# File: macros/cls2dls.sci, line: 31
819# File: macros/nehari.sci, line: 27 812# File: macros/nehari.sci, line: 27
820# File: macros/linf.sci, line: 25 813# File: macros/linf.sci, line: 25
821# File: macros/kpure.sci, line: 23
822#, c-format 814#, c-format
823msgid "" 815msgid ""
824"%s: Wrong value for input argument #%d: Continuous time system expected.\n" 816"%s: Wrong value for input argument #%d: Continuous time system expected.\n"
@@ -884,7 +876,7 @@ msgstr ""
884msgid "%s: Wrong value for input argument #%d: Stable system expected.\n" 876msgid "%s: Wrong value for input argument #%d: Stable system expected.\n"
885msgstr "" 877msgstr ""
886# 878#
887# File: macros/lqr.sci, line: 26 879# File: macros/lqr.sci, line: 27
888#, c-format 880#, c-format
889msgid "" 881msgid ""
890"%s: Wrong value for input argument #%d: Time domain must be ''c'' or ''d''.\n" 882"%s: Wrong value for input argument #%d: Time domain must be ''c'' or ''d''.\n"
diff --git a/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot b/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
index c468fe1..0dc2b9c 100644
--- a/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
+++ b/scilab/modules/compatibility_functions/locales/en_US/compatibility_functions.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/mtlb_fprintf.sci, line: 57 19# File: macros/mtlb_fprintf.sci, line: 57
20# File: macros/mtlb_fprintf.sci, line: 114 20# File: macros/mtlb_fprintf.sci, line: 114
diff --git a/scilab/modules/completion/locales/en_US/completion.pot b/scilab/modules/completion/locales/en_US/completion.pot
index 21d9dc2..25b0cf1 100644
--- a/scilab/modules/completion/locales/en_US/completion.pot
+++ b/scilab/modules/completion/locales/en_US/completion.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_completion.c, line: 140 19# File: sci_gateway/c/sci_completion.c, line: 140
20#, c-format 20#, c-format
diff --git a/scilab/modules/console/locales/en_US/console.pot b/scilab/modules/console/locales/en_US/console.pot
index 49659c5..c270c1a 100644
--- a/scilab/modules/console/locales/en_US/console.pot
+++ b/scilab/modules/console/locales/en_US/console.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/java/org/scilab/modules/console/SciConsole.java, line: 502 19# File: src/java/org/scilab/modules/console/SciConsole.java, line: 502
20msgid "Could not change the Console Font." 20msgid "Could not change the Console Font."
diff --git a/scilab/modules/core/locales/en_US/core.pot b/scilab/modules/core/locales/en_US/core.pot
index 5fc0887..27dc8af 100644
--- a/scilab/modules/core/locales/en_US/core.pot
+++ b/scilab/modules/core/locales/en_US/core.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/c/banier.c, line: 36 19# File: src/c/banier.c, line: 36
20msgid " Consortium Scilab (DIGITEO)\n" 20msgid " Consortium Scilab (DIGITEO)\n"
@@ -53,6 +53,8 @@ msgid "%f: No more space to store string arguments.\n"
53msgstr "" 53msgstr ""
54# 54#
55# File: sci_gateway/c/sci_newfun.c, line: 133 55# File: sci_gateway/c/sci_newfun.c, line: 133
56# File: sci_gateway/c/sci_getmd5.c, line: 100
57# File: sci_gateway/c/sci_getmd5.c, line: 150
56#, c-format 58#, c-format
57msgid "%s : Memory allocation error.\n" 59msgid "%s : Memory allocation error.\n"
58msgstr "" 60msgstr ""
@@ -334,8 +336,8 @@ msgid "%s: System error: Command executed: %s"
334msgstr "" 336msgstr ""
335# 337#
336# File: macros/add_demo.sci, line: 21 338# File: macros/add_demo.sci, line: 21
337# File: sci_gateway/c/sci_getmd5.c, line: 70 339# File: sci_gateway/c/sci_getmd5.c, line: 67
338# File: sci_gateway/c/sci_getmd5.c, line: 90 340# File: sci_gateway/c/sci_getmd5.c, line: 87
339#, c-format 341#, c-format
340msgid "%s: The file %s does not exist.\n" 342msgid "%s: The file %s does not exist.\n"
341msgstr "" 343msgstr ""
@@ -798,7 +800,6 @@ msgstr ""
798# File: sci_gateway/c/sci_getversion.c, line: 239 800# File: sci_gateway/c/sci_getversion.c, line: 239
799# File: sci_gateway/c/sci_with_module.c, line: 47 801# File: sci_gateway/c/sci_with_module.c, line: 47
800# File: sci_gateway/c/sci_clearfun.c, line: 65 802# File: sci_gateway/c/sci_clearfun.c, line: 65
801# File: sci_gateway/c/sci_getmd5.c, line: 147
802# File: sci_gateway/c/sci_getvariablesonstack.c, line: 60 803# File: sci_gateway/c/sci_getvariablesonstack.c, line: 60
803#, c-format 804#, c-format
804msgid "%s: Wrong type for input argument #%d: String expected.\n" 805msgid "%s: Wrong type for input argument #%d: String expected.\n"
@@ -819,7 +820,7 @@ msgstr ""
819msgid "%s: Wrong type for input arguments #%d and #%d: Strings expected.\n" 820msgid "%s: Wrong type for input arguments #%d and #%d: Strings expected.\n"
820msgstr "" 821msgstr ""
821# 822#
822# File: sci_gateway/c/sci_getmd5.c, line: 152 823# File: sci_gateway/c/sci_getmd5.c, line: 160
823#, c-format 824#, c-format
824msgid "%s: Wrong type for input arguments #%d or #%d: Strings expected.\n" 825msgid "%s: Wrong type for input arguments #%d or #%d: Strings expected.\n"
825msgstr "" 826msgstr ""
@@ -829,7 +830,7 @@ msgstr ""
829msgid "%s: Wrong type for inputs arguments.\n" 830msgid "%s: Wrong type for inputs arguments.\n"
830msgstr "" 831msgstr ""
831# 832#
832# File: sci_gateway/c/sci_getmd5.c, line: 103 833# File: sci_gateway/c/sci_getmd5.c, line: 105
833#, c-format 834#, c-format
834msgid "%s: Wrong type of input argument #%d: String expected.\n" 835msgid "%s: Wrong type of input argument #%d: String expected.\n"
835msgstr "" 836msgstr ""
@@ -839,6 +840,11 @@ msgstr ""
839msgid "%s: Wrong type value.\n" 840msgid "%s: Wrong type value.\n"
840msgstr "" 841msgstr ""
841# 842#
843# File: sci_gateway/c/sci_getmd5.c, line: 155
844#, c-format
845msgid "%s: Wrong value for input argument #%d: \"%s\" expected.\n"
846msgstr ""
847#
842# File: sci_gateway/c/sci_who.c, line: 139 848# File: sci_gateway/c/sci_who.c, line: 139
843# File: sci_gateway/c/sci_getversion.c, line: 319 849# File: sci_gateway/c/sci_getversion.c, line: 319
844#, c-format 850#, c-format
@@ -1121,43 +1127,10 @@ msgstr ""
1121msgid "Commands:\n" 1127msgid "Commands:\n"
1122msgstr "" 1128msgstr ""
1123# 1129#
1124# File: src/c/getstaticDebugInfo_Windows.c, line: 46
1125#, c-format
1126msgid "Compilation date: %s"
1127msgstr ""
1128#
1129# File: src/c/getstaticDebugInfo_Windows.c, line: 53
1130#, c-format
1131msgid "Compilation time: %s"
1132msgstr ""
1133#
1134# File: src/c/getstaticDebugInfo_Windows.c, line: 73
1135# File: src/c/getstaticDebugInfo_Windows.c, line: 75
1136# File: src/c/getstaticDebugInfo_Windows.c, line: 77
1137# File: src/c/getstaticDebugInfo_Windows.c, line: 87
1138#, c-format
1139msgid "Compiled with %s"
1140msgstr ""
1141#
1142# File: src/c/getstaticDebugInfo_Windows.c, line: 61
1143# File: src/c/getstaticDebugInfo_Windows.c, line: 63
1144#, c-format
1145msgid "Compiler Architecture: %s"
1146msgstr ""
1147#
1148# File: src/c/getstaticDebugInfo_Windows.c, line: 133
1149#, c-format
1150msgid "Directory separator: %s"
1151msgstr ""
1152#
1153# File: src/c/callinterf.c, line: 176 1130# File: src/c/callinterf.c, line: 176
1154msgid "Do you really want to abort computation (y or n ?) \n" 1131msgid "Do you really want to abort computation (y or n ?) \n"
1155msgstr "" 1132msgstr ""
1156# 1133#
1157# File: src/c/getstaticDebugInfo_Windows.c, line: 104
1158msgid "Enable"
1159msgstr ""
1160#
1161# File: src/c/tmpdir.c, line: 53 1134# File: src/c/tmpdir.c, line: 53
1162# File: src/c/tmpdir.c, line: 75 1135# File: src/c/tmpdir.c, line: 75
1163msgid "Error" 1136msgid "Error"
@@ -1240,22 +1213,6 @@ msgstr ""
1240msgid "Fatal Error: Can't create table for scilab functions.\n" 1213msgid "Fatal Error: Can't create table for scilab functions.\n"
1241msgstr "" 1214msgstr ""
1242# 1215#
1243# File: src/c/getdynamicDebugInfo_Windows.c, line: 127
1244msgid "Free Extended Memory (Kbytes): %*I64d"
1245msgstr ""
1246#
1247# File: src/c/getdynamicDebugInfo_Windows.c, line: 97
1248msgid "Free Paging File (Kbytes): %*I64d"
1249msgstr ""
1250#
1251# File: src/c/getdynamicDebugInfo_Windows.c, line: 77
1252msgid "Free Physical Memory (Kbytes): %*I64d"
1253msgstr ""
1254#
1255# File: src/c/getdynamicDebugInfo_Windows.c, line: 117
1256msgid "Free Virtual Memory (Kbytes): %*I64d"
1257msgstr ""
1258#
1259# File: src/c/run.c, line: 510 1216# File: src/c/run.c, line: 510
1260msgid "Functions compiled with very old versions are no more handled." 1217msgid "Functions compiled with very old versions are no more handled."
1261msgstr "" 1218msgstr ""
@@ -1265,7 +1222,7 @@ msgstr ""
1265msgid "GetDataFromName: variable %s not found.\n" 1222msgid "GetDataFromName: variable %s not found.\n"
1266msgstr "" 1223msgstr ""
1267# 1224#
1268# File: src/c/callDynamicGateway.c, line: 180 1225# File: src/c/callDynamicGateway.c, line: 187
1269#, c-format 1226#, c-format
1270msgid "Impossible to call %s in %s library: %s\n" 1227msgid "Impossible to call %s in %s library: %s\n"
1271msgstr "" 1228msgstr ""
@@ -1275,12 +1232,12 @@ msgstr ""
1275msgid "Impossible to create : %s" 1232msgid "Impossible to create : %s"
1276msgstr "" 1233msgstr ""
1277# 1234#
1278# File: src/c/callDynamicGateway.c, line: 177 1235# File: src/c/callDynamicGateway.c, line: 184
1279#, c-format 1236#, c-format
1280msgid "Impossible to load %s function in %s library: %s\n" 1237msgid "Impossible to load %s function in %s library: %s\n"
1281msgstr "" 1238msgstr ""
1282# 1239#
1283# File: src/c/callDynamicGateway.c, line: 174 1240# File: src/c/callDynamicGateway.c, line: 181
1284#, c-format 1241#, c-format
1285msgid "Impossible to load %s library: %s\n" 1242msgid "Impossible to load %s library: %s\n"
1286msgstr "" 1243msgstr ""
@@ -1317,26 +1274,12 @@ msgstr ""
1317msgid "List full.\n" 1274msgid "List full.\n"
1318msgstr "" 1275msgstr ""
1319# 1276#
1320# File: src/c/getdynamicDebugInfo_Windows.c, line: 57
1321#, c-format
1322msgid "Memory in use: %*ld %%"
1323msgstr ""
1324#
1325# File: src/c/scimem.c, line: 54 1277# File: src/c/scimem.c, line: 54
1326# File: src/c/scimem.c, line: 86 1278# File: src/c/scimem.c, line: 86
1327# File: src/c/scimem64.c, line: 113 1279# File: src/c/scimem64.c, line: 113
1328msgid "No space to allocate Scilab stack.\n" 1280msgid "No space to allocate Scilab stack.\n"
1329msgstr "" 1281msgstr ""
1330# 1282#
1331# File: src/c/getdynamicDebugInfo_Windows.c, line: 164
1332#, c-format
1333msgid "Number of processors: %d"
1334msgstr ""
1335#
1336# File: src/c/getdynamicDebugInfo_Windows.c, line: 138
1337msgid "Operating System: "
1338msgstr ""
1339#
1340# File: src/c/stack2.c, line: 402 1283# File: src/c/stack2.c, line: 402
1341msgid "Optional argument list is empty.\n" 1284msgid "Optional argument list is empty.\n"
1342msgstr "" 1285msgstr ""
@@ -1345,16 +1288,6 @@ msgstr ""
1345msgid "Optional arguments list: \n" 1288msgid "Optional arguments list: \n"
1346msgstr "" 1289msgstr ""
1347# 1290#
1348# File: src/c/getstaticDebugInfo_Windows.c, line: 140
1349#, c-format
1350msgid "PCRE Version: %d.%d"
1351msgstr ""
1352#
1353# File: src/c/getstaticDebugInfo_Windows.c, line: 126
1354#, c-format
1355msgid "Path separator: %s"
1356msgstr ""
1357#
1358# File: src/c/inisci-c.c, line: 82 1291# File: src/c/inisci-c.c, line: 82
1359# File: src/c/inisci-c.c, line: 84 1292# File: src/c/inisci-c.c, line: 84
1360msgid "SCI environment variable not defined.\n" 1293msgid "SCI environment variable not defined.\n"
@@ -1386,53 +1319,20 @@ msgid ""
1386"%s\n" 1319"%s\n"
1387msgstr "" 1320msgstr ""
1388# 1321#
1389# File: src/c/getdynamicDebugInfo_Windows.c, line: 331
1390# File: src/c/getdynamicDebugInfo_Windows.c, line: 334
1391#, c-format
1392msgid "Screen size: %d x %d %d bits"
1393msgstr ""
1394#
1395# File: /pro/git/scilab.5.2/scilab/etc/scilab.start, line: 66 1322# File: /pro/git/scilab.5.2/scilab/etc/scilab.start, line: 66
1396msgid "Startup execution:" 1323msgid "Startup execution:"
1397msgstr "" 1324msgstr ""
1398# 1325#
1399# File: src/c/getstaticDebugInfo_Windows.c, line: 111
1400#, c-format
1401msgid "TCL version: %s"
1402msgstr ""
1403#
1404# File: src/c/getstaticDebugInfo_Windows.c, line: 118
1405#, c-format
1406msgid "TK version: %s"
1407msgstr ""
1408#
1409# File: src/c/inisci-c.c, line: 168 1326# File: src/c/inisci-c.c, line: 168
1410# File: src/c/inisci-c.c, line: 170 1327# File: src/c/inisci-c.c, line: 170
1411msgid "TMPDIR not defined.\n" 1328msgid "TMPDIR not defined.\n"
1412msgstr "" 1329msgstr ""
1413# 1330#
1414# File: src/c/getstaticDebugInfo_Windows.c, line: 104
1415#, c-format
1416msgid "Tcl/Tk: %s"
1417msgstr ""
1418#
1419# File: src/c/getmodules.c, line: 84 1331# File: src/c/getmodules.c, line: 84
1420# File: src/c/getmodules.c, line: 119 1332# File: src/c/getmodules.c, line: 119
1421msgid "The SCI environment variable is not set.\n" 1333msgid "The SCI environment variable is not set.\n"
1422msgstr "" 1334msgstr ""
1423# 1335#
1424# File: src/c/getdynamicDebugInfo_Windows.c, line: 87
1425msgid "Total Paging File (Kbytes): %*I64d"
1426msgstr ""
1427#
1428# File: src/c/getdynamicDebugInfo_Windows.c, line: 67
1429msgid "Total Physical Memory (Kbytes): %*I64d"
1430msgstr ""
1431#
1432# File: src/c/getdynamicDebugInfo_Windows.c, line: 107
1433msgid "Total Virtual Memory (Kbytes): %*I64d"
1434msgstr ""
1435#
1436# File: src/c/callinterf.c, line: 175 1336# File: src/c/callinterf.c, line: 175
1437msgid "Trying to stop scilab in the middle of an interface.\n" 1337msgid "Trying to stop scilab in the middle of an interface.\n"
1438msgstr "" 1338msgstr ""
@@ -1466,21 +1366,6 @@ msgstr ""
1466msgid "Using %s elements ouf of %s" 1366msgid "Using %s elements ouf of %s"
1467msgstr "" 1367msgstr ""
1468# 1368#
1469# File: src/c/getstaticDebugInfo_Windows.c, line: 39
1470#, c-format
1471msgid "Version: %s"
1472msgstr ""
1473#
1474# File: src/c/getdynamicDebugInfo_Windows.c, line: 179
1475#, c-format
1476msgid "Video card driver version: %s"
1477msgstr ""
1478#
1479# File: src/c/getdynamicDebugInfo_Windows.c, line: 172
1480#, c-format
1481msgid "Video card: %s"
1482msgstr ""
1483#
1484# File: sci_gateway/c/sci_warning.c, line: 78 1369# File: sci_gateway/c/sci_warning.c, line: 78
1485#, c-format 1370#, c-format
1486msgid "WARNING: %s" 1371msgid "WARNING: %s"
@@ -1508,11 +1393,6 @@ msgid ""
1508"doesn't provide and doesn't support this version of Scilab built with\n" 1393"doesn't provide and doesn't support this version of Scilab built with\n"
1509msgstr "" 1394msgstr ""
1510# 1395#
1511# File: src/c/getstaticDebugInfo_Windows.c, line: 95
1512#, c-format
1513msgid "XML version: %s"
1514msgstr ""
1515#
1516# File: sci_gateway/c/sci_who.c, line: 321 1396# File: sci_gateway/c/sci_who.c, line: 321
1517msgid "Your global variables are:" 1397msgid "Your global variables are:"
1518msgstr "" 1398msgstr ""
diff --git a/scilab/modules/data_structures/locales/en_US/data_structures.pot b/scilab/modules/data_structures/locales/en_US/data_structures.pot
index 18208fe..55ebe72 100644
--- a/scilab/modules/data_structures/locales/en_US/data_structures.pot
+++ b/scilab/modules/data_structures/locales/en_US/data_structures.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/c/hmops.c, line: 651 19# File: src/c/hmops.c, line: 651
20msgid " An hypermatrix extraction must have at least 2 arguments. " 20msgid " An hypermatrix extraction must have at least 2 arguments. "
@@ -42,9 +42,14 @@ msgstr ""
42msgid " Incompatible hypermatrix extraction. " 42msgid " Incompatible hypermatrix extraction. "
43msgstr "" 43msgstr ""
44# 44#
45# File: macros/struct.sci, line: 33
46#, c-format
47msgid "%s: ''dims'' can not be used as a field name.\n"
48msgstr ""
49#
45# File: macros/struct.sci, line: 25 50# File: macros/struct.sci, line: 25
46#, c-format 51#, c-format
47msgid "%s: Wrong number of input argument(s) : an even number is expected." 52msgid "%s: Wrong number of input argument(s) : an even number is expected.\n"
48msgstr "" 53msgstr ""
49# 54#
50# File: macros/isfield.sci, line: 20 55# File: macros/isfield.sci, line: 20
@@ -67,6 +72,11 @@ msgstr ""
67msgid "%s: Wrong type for input argument #%d: struct array expected.\n" 72msgid "%s: Wrong type for input argument #%d: struct array expected.\n"
68msgstr "" 73msgstr ""
69# 74#
75# File: macros/struct.sci, line: 36
76#, c-format
77msgid "%s: field name ''%s'' defined twice.\n"
78msgstr ""
79#
70# File: src/c/hmops.c, line: 696 80# File: src/c/hmops.c, line: 696
71#, c-format 81#, c-format
72msgid "Bad (%d th) index in hypermatrix extraction. " 82msgid "Bad (%d th) index in hypermatrix extraction. "
diff --git a/scilab/modules/demo_tools/locales/en_US/demo_tools.pot b/scilab/modules/demo_tools/locales/en_US/demo_tools.pot
index 1f142fc..e3e1ca4 100644
--- a/scilab/modules/demo_tools/locales/en_US/demo_tools.pot
+++ b/scilab/modules/demo_tools/locales/en_US/demo_tools.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/demo_viewCode.sci, line: 25 19# File: macros/demo_viewCode.sci, line: 25
20msgid " -- View Code -- " 20msgid " -- View Code -- "
diff --git a/scilab/modules/development_tools/locales/en_US/development_tools.pot b/scilab/modules/development_tools/locales/en_US/development_tools.pot
index 64fef2e..a5fcce2 100644
--- a/scilab/modules/development_tools/locales/en_US/development_tools.pot
+++ b/scilab/modules/development_tools/locales/en_US/development_tools.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/test_clean.sci, line: 97 19# File: macros/test_clean.sci, line: 97
20# File: macros/bench_run.sci, line: 73 20# File: macros/bench_run.sci, line: 73
@@ -22,13 +22,13 @@ msgstr ""
22msgid "%s is not an installed module" 22msgid "%s is not an installed module"
23msgstr "" 23msgstr ""
24# 24#
25# File: macros/test_run.sci, line: 222 25# File: macros/test_run.sci, line: 225
26# File: macros/test_run.sci, line: 264 26# File: macros/test_run.sci, line: 267
27#, c-format 27#, c-format
28msgid "%s is not an installed module or toolbox" 28msgid "%s is not an installed module or toolbox"
29msgstr "" 29msgstr ""
30# 30#
31# File: macros/test_run.sci, line: 835 31# File: macros/test_run.sci, line: 854
32#, c-format 32#, c-format
33msgid "%s: The test ''%s'' doesn''t exist or is not read available.\n" 33msgid "%s: The test ''%s'' doesn''t exist or is not read available.\n"
34msgstr "" 34msgstr ""
@@ -39,12 +39,12 @@ msgid "%s: Wrong first input argument: File with .dia suffix expected."
39msgstr "" 39msgstr ""
40# 40#
41# File: macros/test_clean.sci, line: 116 41# File: macros/test_clean.sci, line: 116
42# File: macros/test_run.sci, line: 246 42# File: macros/test_run.sci, line: 249
43#, c-format 43#, c-format
44msgid "%s: Wrong size for input argument." 44msgid "%s: Wrong size for input argument."
45msgstr "" 45msgstr ""
46# 46#
47# File: macros/test_run.sci, line: 831 47# File: macros/test_run.sci, line: 850
48#, c-format 48#, c-format
49msgid "%s: Wrong type for input argument #%d: %s expected.\n" 49msgid "%s: Wrong type for input argument #%d: %s expected.\n"
50msgstr "" 50msgstr ""
@@ -79,14 +79,14 @@ msgstr ""
79msgid "Test passed" 79msgid "Test passed"
80msgstr "" 80msgstr ""
81# 81#
82# File: macros/test_run.sci, line: 1331 82# File: macros/test_run.sci, line: 1362
83#, c-format 83#, c-format
84msgid "The ref file (%s) doesn''t exist" 84msgid "The ref file (%s) doesn''t exist"
85msgstr "" 85msgstr ""
86# 86#
87# File: macros/test_clean.sci, line: 135 87# File: macros/test_clean.sci, line: 135
88# File: macros/bench_run.sci, line: 105 88# File: macros/bench_run.sci, line: 105
89# File: macros/test_run.sci, line: 318 89# File: macros/test_run.sci, line: 321
90#, c-format 90#, c-format
91msgid "The test %s is not available from the %s module" 91msgid "The test %s is not available from the %s module"
92msgstr "" 92msgstr ""
diff --git a/scilab/modules/differential_equations/locales/en_US/differential_equations.pot b/scilab/modules/differential_equations/locales/en_US/differential_equations.pot
index 925e666..5f85bd1 100644
--- a/scilab/modules/differential_equations/locales/en_US/differential_equations.pot
+++ b/scilab/modules/differential_equations/locales/en_US/differential_equations.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/dae.sci, line: 168 19# File: macros/dae.sci, line: 168
20#, c-format 20#, c-format
@@ -23,7 +23,7 @@ msgstr ""
23# 23#
24# File: macros/dae.sci, line: 360 24# File: macros/dae.sci, line: 360
25#, c-format 25#, c-format
26msgid "%s: Invalid option %s: %d or real matrix expected.\n" 26msgid "%s: Invalid option %s: real matrix expected.\n"
27msgstr "" 27msgstr ""
28# 28#
29# File: macros/dae.sci, line: 17 29# File: macros/dae.sci, line: 17
diff --git a/scilab/modules/double/locales/en_US/double.pot b/scilab/modules/double/locales/en_US/double.pot
index 3aefc7e..a9a0bd1 100644
--- a/scilab/modules/double/locales/en_US/double.pot
+++ b/scilab/modules/double/locales/en_US/double.pot
@@ -14,5 +14,5 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
diff --git a/scilab/modules/dynamic_link/locales/en_US/dynamic_link.pot b/scilab/modules/dynamic_link/locales/en_US/dynamic_link.pot
index 8fd66e1..f3aa73c 100644
--- a/scilab/modules/dynamic_link/locales/en_US/dynamic_link.pot
+++ b/scilab/modules/dynamic_link/locales/en_US/dynamic_link.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/ilib_gen_Make_unix.sci, line: 258 19# File: macros/ilib_gen_Make_unix.sci, line: 258
20#, c-format 20#, c-format
diff --git a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
index 85764d0..2d44ffd 100644
--- a/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
+++ b/scilab/modules/dynamic_link/macros/gencompilationflags_unix.sci
@@ -1,5 +1,6 @@
1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab 1// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
2// Copyright (C) 2008 - INRIA - Sylvestre LEDRU 2// Copyright (C) 2008 - INRIA - Sylvestre LEDRU
3// Copyright (C) 2010 - DIGITEO - Sylvestre LEDRU
3// 4//
4// This file must be used under the terms of the CeCILL. 5// This file must be used under the terms of the CeCILL.
5// This source file is licensed as described in the file COPYING, which 6// This source file is licensed as described in the file COPYING, which
@@ -8,25 +9,27 @@
8// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt 9// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
9 10
10 11
11function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc) 12function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc, flagsType)
12 // This function is restricted to Linux/Unix user only 13
14 // This function is restricted to Linux/Unix user only
13 if getos() == 'Windows' then 15 if getos() == 'Windows' then
14 error(msprintf(gettext("%s: Feature not available under Microsoft Windows.\n"),'gencompilationflags_unix')); 16 error(msprintf(gettext("%s: Feature not available under Microsoft Windows.\n"),'gencompilationflags_unix'));
15 return; 17 return;
16 end 18 end
17 19
18 [lhs,rhs] = argn(0); 20 [lhs,rhs] = argn(0);
19 if rhs <> 4 then 21 if rhs <> 5 then
20 error(msprintf(gettext("%s: Wrong number of input argument(s).\n"),"gencompilationflags_unix")); 22 error(msprintf(gettext("%s: Wrong number of input arguments: %d expected.\n"),"gencompilationflags_unix",5));
21 return 23 return
22 end 24 end
23 25
24 cmd='' 26 cmd=''
27
25 // CFLAGS 28 // CFLAGS
26 if cflags <> '' then 29 if cflags <> '' then
27 cmd = cmd +" CFLAGS="""+cflags+"""" 30 cmd = cmd +" CFLAGS="""+cflags+""""
28 end 31 end
29 32
30 // CXXFLAGS ... use the same as C 33 // CXXFLAGS ... use the same as C
31 if cflags <> '' then 34 if cflags <> '' then
32 cmd = cmd +" CXXFLAGS="""+cflags+"""" 35 cmd = cmd +" CXXFLAGS="""+cflags+""""
@@ -34,9 +37,9 @@ function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc)
34 37
35 // LDFLAGS 38 // LDFLAGS
36 // Do not set the LDFLAGS See bug #4787 39 // Do not set the LDFLAGS See bug #4787
37 // if ldflags <> '' then 40 if ldflags <> '' & flagsType <> "configure" then
38 // cmd = cmd +" LDFLAGS="""+ldflags+"""" 41 cmd = cmd +" LDFLAGS="""+ldflags+""""
39 // end 42 end
40 43
41 // FFLAGS 44 // FFLAGS
42 if fflags <> '' then 45 if fflags <> '' then
@@ -48,4 +51,4 @@ function cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc)
48 cmd = cmd +" CC="""+cc+"""" 51 cmd = cmd +" CC="""+cc+""""
49 end 52 end
50 53
51 endfunction \ No newline at end of file 54endfunction
diff --git a/scilab/modules/dynamic_link/macros/ilib_compile.sci b/scilab/modules/dynamic_link/macros/ilib_compile.sci
index 058e504..2d5e5a3 100644
--- a/scilab/modules/dynamic_link/macros/ilib_compile.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_compile.sci
@@ -127,7 +127,7 @@ function libn = ilib_compile(lib_name,makename,files, ..
127 chdir(TMPDIR); 127 chdir(TMPDIR);
128 cmd = "make " 128 cmd = "make "
129 129
130 cmd = cmd + gencompilationflags_unix(ldflags, cflags, fflags, cc) 130 cmd = cmd + gencompilationflags_unix(ldflags, cflags, fflags, cc, "build")
131 131
132 //** BEWARE : this function can cause errors if used with "old style" Makefile inside a Scilab 5 132 //** BEWARE : this function can cause errors if used with "old style" Makefile inside a Scilab 5
133 //** environment where the Makefile are created from a "./configure" 133 //** environment where the Makefile are created from a "./configure"
diff --git a/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci b/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
index b8dbea6..d2de9d9 100644
--- a/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
+++ b/scilab/modules/dynamic_link/macros/ilib_gen_Make_unix.sci
@@ -249,7 +249,7 @@ function generateConfigure(workingPath, ..
249 if ( ilib_verbose() <> 0 ) then 249 if ( ilib_verbose() <> 0 ) then
250 mprintf(gettext(" %s: configure : Generate Makefile.\n"),"ilib_gen_Make"); 250 mprintf(gettext(" %s: configure : Generate Makefile.\n"),"ilib_gen_Make");
251 end 251 end
252 cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc) 252 cmd = gencompilationflags_unix(ldflags, cflags, fflags, cc, "configure")
253 cmd = workingPath+"/compilerDetection.sh "+cmd 253 cmd = workingPath+"/compilerDetection.sh "+cmd
254 254
255 [msg,ierr,stderr] = unix_g(cmd); 255 [msg,ierr,stderr] = unix_g(cmd);
diff --git a/scilab/modules/elementary_functions/locales/en_US/elementary_functions.pot b/scilab/modules/elementary_functions/locales/en_US/elementary_functions.pot
index a447b9d..125456f 100644
--- a/scilab/modules/elementary_functions/locales/en_US/elementary_functions.pot
+++ b/scilab/modules/elementary_functions/locales/en_US/elementary_functions.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/logm.sci, line: 34 19# File: macros/logm.sci, line: 34
20# File: macros/logm.sci, line: 59 20# File: macros/logm.sci, line: 59
@@ -311,7 +311,7 @@ msgstr ""
311# File: macros/cscd.sci, line: 12 311# File: macros/cscd.sci, line: 12
312# File: macros/secd.sci, line: 12 312# File: macros/secd.sci, line: 12
313# File: macros/sind.sci, line: 12 313# File: macros/sind.sci, line: 12
314# File: macros/tand.sci, line: 12 314# File: macros/tand.sci, line: 16
315# File: macros/acscd.sci, line: 12 315# File: macros/acscd.sci, line: 12
316#, c-format 316#, c-format
317msgid "%s: Wrong type for input argument #%d: Array of reals expected.\n" 317msgid "%s: Wrong type for input argument #%d: Array of reals expected.\n"
diff --git a/scilab/modules/fftw/locales/en_US/fftw.pot b/scilab/modules/fftw/locales/en_US/fftw.pot
index 09a62e8..88825ab 100644
--- a/scilab/modules/fftw/locales/en_US/fftw.pot
+++ b/scilab/modules/fftw/locales/en_US/fftw.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_set_fftw_wisdom.c, line: 79 19# File: sci_gateway/c/sci_set_fftw_wisdom.c, line: 79
20#, c-format 20#, c-format
diff --git a/scilab/modules/fileio/locales/en_US/fileio.pot b/scilab/modules/fileio/locales/en_US/fileio.pot
index 8ff7878..214d2ef 100644
--- a/scilab/modules/fileio/locales/en_US/fileio.pot
+++ b/scilab/modules/fileio/locales/en_US/fileio.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_isdir.c, line: 77 19# File: sci_gateway/c/sci_isdir.c, line: 77
20# File: sci_gateway/c/sci_isdir.c, line: 86 20# File: sci_gateway/c/sci_isdir.c, line: 86
diff --git a/scilab/modules/functions/locales/en_US/functions.pot b/scilab/modules/functions/locales/en_US/functions.pot
index 1a20c42..0d82bed 100644
--- a/scilab/modules/functions/locales/en_US/functions.pot
+++ b/scilab/modules/functions/locales/en_US/functions.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_exec.c, line: 188 19# File: sci_gateway/c/sci_exec.c, line: 188
20# File: sci_gateway/c/sci_exec.c, line: 267 20# File: sci_gateway/c/sci_exec.c, line: 267
diff --git a/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot b/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot
index 3848e17..9318c82 100644
--- a/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot
+++ b/scilab/modules/genetic_algorithms/locales/en_US/genetic_algorithms.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/optim_nsga.sci, line: 220 19# File: macros/optim_nsga.sci, line: 220
20# File: macros/optim_ga.sci, line: 161 20# File: macros/optim_ga.sci, line: 161
diff --git a/scilab/modules/graphics/locales/en_US/graphics.pot b/scilab/modules/graphics/locales/en_US/graphics.pot
index e98f637..2aa3cf0 100644
--- a/scilab/modules/graphics/locales/en_US/graphics.pot
+++ b/scilab/modules/graphics/locales/en_US/graphics.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_drawaxis.c, line: 186 19# File: sci_gateway/c/sci_drawaxis.c, line: 186
20msgid "%: Wrong value for %s '%c': '%s', '%s' and '%s' expected.\n" 20msgid "%: Wrong value for %s '%c': '%s', '%s' and '%s' expected.\n"
@@ -92,7 +92,7 @@ msgid ""
92"%s: Bounds on y axis must be strictly positive to use logarithmic mode.\n" 92"%s: Bounds on y axis must be strictly positive to use logarithmic mode.\n"
93msgstr "" 93msgstr ""
94# 94#
95# File: src/c/SetProperty.c, line: 3378 95# File: src/c/SetProperty.c, line: 3375
96#, c-format 96#, c-format
97msgid "%s: Can't enable a void event handler.\n" 97msgid "%s: Can't enable a void event handler.\n"
98msgstr "" 98msgstr ""
@@ -179,17 +179,13 @@ msgstr ""
179msgid "%s: Legend does not fit with the current context. Skipped\n" 179msgid "%s: Legend does not fit with the current context. Skipped\n"
180msgstr "" 180msgstr ""
181# 181#
182# File: sci_gateway/c/sci_champ.c, line: 69
183#, c-format
184msgid "%s: Misplaced optional argument: #%d must be at position %d\n"
185msgstr ""
186#
187# File: sci_gateway/c/sci_param3d1.c, line: 65 182# File: sci_gateway/c/sci_param3d1.c, line: 65
188# File: sci_gateway/c/sci_matplot.c, line: 61 183# File: sci_gateway/c/sci_matplot.c, line: 61
189# File: sci_gateway/c/sci_fec.c, line: 69 184# File: sci_gateway/c/sci_fec.c, line: 69
190# File: sci_gateway/c/sci_plot3d.c, line: 75 185# File: sci_gateway/c/sci_plot3d.c, line: 75
191# File: sci_gateway/c/sci_param3d.c, line: 63 186# File: sci_gateway/c/sci_param3d.c, line: 63
192# File: sci_gateway/c/sci_grayplot.c, line: 61 187# File: sci_gateway/c/sci_grayplot.c, line: 61
188# File: sci_gateway/c/sci_champ.c, line: 69
193# File: sci_gateway/c/sci_plot2d.c, line: 89 189# File: sci_gateway/c/sci_plot2d.c, line: 89
194# File: sci_gateway/c/sci_plot2d.c, line: 110 190# File: sci_gateway/c/sci_plot2d.c, line: 110
195# File: sci_gateway/c/sci_plot2d1.c, line: 100 191# File: sci_gateway/c/sci_plot2d1.c, line: 100
@@ -215,7 +211,7 @@ msgstr ""
215# File: sci_gateway/c/sci_winsid.c, line: 42 211# File: sci_gateway/c/sci_winsid.c, line: 42
216# File: src/c/CloneObjects.c, line: 331 212# File: src/c/CloneObjects.c, line: 331
217# File: src/c/HandleManagement.c, line: 607 213# File: src/c/HandleManagement.c, line: 607
218# File: src/c/sciCall.c, line: 433 214# File: src/c/sciCall.c, line: 434
219# File: src/c/Champ.c, line: 82 215# File: src/c/Champ.c, line: 82
220# File: src/c/FeC.c, line: 191 216# File: src/c/FeC.c, line: 191
221# File: src/c/Interaction.c, line: 53 217# File: src/c/Interaction.c, line: 53
@@ -225,16 +221,16 @@ msgstr ""
225# File: src/c/Interaction.c, line: 108 221# File: src/c/Interaction.c, line: 108
226# File: src/c/Interaction.c, line: 122 222# File: src/c/Interaction.c, line: 122
227# File: src/c/Interaction.c, line: 136 223# File: src/c/Interaction.c, line: 136
228# File: src/c/SetProperty.c, line: 1895 224# File: src/c/SetProperty.c, line: 1892
229# File: src/c/SetProperty.c, line: 2533 225# File: src/c/SetProperty.c, line: 2530
230# File: src/c/SetProperty.c, line: 2537 226# File: src/c/SetProperty.c, line: 2534
231# File: src/c/SetProperty.c, line: 2541 227# File: src/c/SetProperty.c, line: 2538
232# File: src/c/SetProperty.c, line: 2565 228# File: src/c/SetProperty.c, line: 2562
229# File: src/c/SetProperty.c, line: 2583
233# File: src/c/SetProperty.c, line: 2586 230# File: src/c/SetProperty.c, line: 2586
234# File: src/c/SetProperty.c, line: 2589 231# File: src/c/SetProperty.c, line: 2590
235# File: src/c/SetProperty.c, line: 2593 232# File: src/c/SetProperty.c, line: 2839
236# File: src/c/SetProperty.c, line: 2842 233# File: src/c/SetProperty.c, line: 3309
237# File: src/c/SetProperty.c, line: 3312
238# File: src/c/InitObjects.c, line: 501 234# File: src/c/InitObjects.c, line: 501
239# File: src/c/InitObjects.c, line: 986 235# File: src/c/InitObjects.c, line: 986
240# File: src/c/Contour.c, line: 312 236# File: src/c/Contour.c, line: 312
@@ -288,7 +284,7 @@ msgstr ""
288# File: src/c/get_ticks_utils.c, line: 214 284# File: src/c/get_ticks_utils.c, line: 214
289# File: src/c/get_ticks_utils.c, line: 222 285# File: src/c/get_ticks_utils.c, line: 222
290# File: src/c/get_ticks_utils.c, line: 261 286# File: src/c/get_ticks_utils.c, line: 261
291# File: src/c/Gray.c, line: 257 287# File: src/c/Gray.c, line: 260
292# File: src/c/BuildObjects.c, line: 809 288# File: src/c/BuildObjects.c, line: 809
293#, c-format 289#, c-format
294msgid "%s: No more memory.\n" 290msgid "%s: No more memory.\n"
@@ -309,7 +305,7 @@ msgstr ""
309msgid "%s: Object must be a Compound.\n" 305msgid "%s: Object must be a Compound.\n"
310msgstr "" 306msgstr ""
311# 307#
312# File: sci_gateway/c/sci_Legend.c, line: 108 308# File: sci_gateway/c/sci_Legend.c, line: 114
313#, c-format 309#, c-format
314msgid "%s: Objects must have the same axes.\n" 310msgid "%s: Objects must have the same axes.\n"
315msgstr "" 311msgstr ""
@@ -331,12 +327,12 @@ msgstr ""
331msgid "%s: Routine can only swap two single handles.\n" 327msgid "%s: Routine can only swap two single handles.\n"
332msgstr "" 328msgstr ""
333# 329#
334# File: sci_gateway/c/sci_Legend.c, line: 125 330# File: sci_gateway/c/sci_Legend.c, line: 130
335#, c-format 331#, c-format
336msgid "%s: The %d th handle is not a polyline handle.\n" 332msgid "%s: The %d th handle is not a polyline handle.\n"
337msgstr "" 333msgstr ""
338# 334#
339# File: sci_gateway/c/sci_Legend.c, line: 117 335# File: sci_gateway/c/sci_Legend.c, line: 122
340#, c-format 336#, c-format
341msgid "%s: The handle is no more valid.\n" 337msgid "%s: The handle is no more valid.\n"
342msgstr "" 338msgstr ""
@@ -1116,13 +1112,13 @@ msgstr ""
1116msgid "%s: handle no more valid ignored.\n" 1112msgid "%s: handle no more valid ignored.\n"
1117msgstr "" 1113msgstr ""
1118# 1114#
1119# File: src/c/SetProperty.c, line: 2786 1115# File: src/c/SetProperty.c, line: 2783
1120#, c-format 1116#, c-format
1121msgid "%s: please use %s instead.\n" 1117msgid "%s: please use %s instead.\n"
1122msgstr "" 1118msgstr ""
1123# 1119#
1124# File: src/c/sciCall.c, line: 631 1120# File: src/c/sciCall.c, line: 632
1125# File: src/c/sciCall.c, line: 663 1121# File: src/c/sciCall.c, line: 664
1126#, c-format 1122#, c-format
1127msgid "%s: x vector is not monotonous.\n" 1123msgid "%s: x vector is not monotonous.\n"
1128msgstr "" 1124msgstr ""
@@ -1489,7 +1485,7 @@ msgid ""
1489"logarithmic mode.\n" 1485"logarithmic mode.\n"
1490msgstr "" 1486msgstr ""
1491# 1487#
1492# File: src/c/SetProperty.c, line: 1935 1488# File: src/c/SetProperty.c, line: 1932
1493#, c-format 1489#, c-format
1494msgid "Figure name may not contains any %% character, except a single %%d.\n" 1490msgid "Figure name may not contains any %% character, except a single %%d.\n"
1495msgstr "" 1491msgstr ""
@@ -1525,7 +1521,7 @@ msgstr ""
1525msgid "Handle #%d is not or no more valid.\n" 1521msgid "Handle #%d is not or no more valid.\n"
1526msgstr "" 1522msgstr ""
1527# 1523#
1528# File: src/c/SetProperty.c, line: 2163 1524# File: src/c/SetProperty.c, line: 2160
1529msgid "Handle is not a SubWindow.\n" 1525msgid "Handle is not a SubWindow.\n"
1530msgstr "" 1526msgstr ""
1531# 1527#
@@ -1569,7 +1565,7 @@ msgstr ""
1569msgid "Jet" 1565msgid "Jet"
1570msgstr "" 1566msgstr ""
1571# 1567#
1572# File: src/c/SetProperty.c, line: 605 1568# File: src/c/SetProperty.c, line: 602
1573#, c-format 1569#, c-format
1574msgid "Line width must be greater than %d.\n" 1570msgid "Line width must be greater than %d.\n"
1575msgstr "" 1571msgstr ""
@@ -1594,24 +1590,24 @@ msgstr ""
1594msgid "No more place to allocates text string, try a shorter string.\n" 1590msgid "No more place to allocates text string, try a shorter string.\n"
1595msgstr "" 1591msgstr ""
1596# 1592#
1597# File: src/c/SetProperty.c, line: 2220 1593# File: src/c/SetProperty.c, line: 2217
1598# File: src/c/SetProperty.c, line: 2366 1594# File: src/c/SetProperty.c, line: 2363
1599#, c-format 1595#, c-format
1600msgid "Number of columns must be %d (%d if %s coordinate).\n" 1596msgid "Number of columns must be %d (%d if %s coordinate).\n"
1601msgstr "" 1597msgstr ""
1602# 1598#
1603# File: src/c/SetProperty.c, line: 2580 1599# File: src/c/SetProperty.c, line: 2577
1604#, c-format 1600#, c-format
1605msgid "Number of columns must be %d.\n" 1601msgid "Number of columns must be %d.\n"
1606msgstr "" 1602msgstr ""
1607# 1603#
1608# File: src/c/SetProperty.c, line: 2300 1604# File: src/c/SetProperty.c, line: 2297
1609# File: src/c/SetProperty.c, line: 2354 1605# File: src/c/SetProperty.c, line: 2351
1610#, c-format 1606#, c-format
1611msgid "Number of elements must be %d (%d if %s coordinate).\n" 1607msgid "Number of elements must be %d (%d if %s coordinate).\n"
1612msgstr "" 1608msgstr ""
1613# 1609#
1614# File: src/c/SetProperty.c, line: 2328 1610# File: src/c/SetProperty.c, line: 2325
1615#, c-format 1611#, c-format
1616msgid "Number of elements must be %d (%d if z coordinate )\n" 1612msgid "Number of elements must be %d (%d if z coordinate )\n"
1617msgstr "" 1613msgstr ""
@@ -1682,22 +1678,22 @@ msgstr ""
1682msgid "Summer" 1678msgid "Summer"
1683msgstr "" 1679msgstr ""
1684# 1680#
1685# File: src/c/SetProperty.c, line: 932 1681# File: src/c/SetProperty.c, line: 929
1686#, c-format 1682#, c-format
1687msgid "The font size must be greater than %d.\n" 1683msgid "The font size must be greater than %d.\n"
1688msgstr "" 1684msgstr ""
1689# 1685#
1690# File: src/c/SetProperty.c, line: 641 1686# File: src/c/SetProperty.c, line: 638
1691#, c-format 1687#, c-format
1692msgid "The line style must be greater than %d.\n" 1688msgid "The line style must be greater than %d.\n"
1693msgstr "" 1689msgstr ""
1694# 1690#
1695# File: src/c/SetProperty.c, line: 799 1691# File: src/c/SetProperty.c, line: 796
1696#, c-format 1692#, c-format
1697msgid "The mark size must be greater or equal than %d.\n" 1693msgid "The mark size must be greater or equal than %d.\n"
1698msgstr "" 1694msgstr ""
1699# 1695#
1700# File: src/c/SetProperty.c, line: 835 1696# File: src/c/SetProperty.c, line: 832
1701#, c-format 1697#, c-format
1702msgid "The mark size unit must be greater than %d.\n" 1698msgid "The mark size unit must be greater than %d.\n"
1703msgstr "" 1699msgstr ""
@@ -1767,7 +1763,7 @@ msgstr ""
1767msgid "Unable to create requested figure: No more memory.\n" 1763msgid "Unable to create requested figure: No more memory.\n"
1768msgstr "" 1764msgstr ""
1769# 1765#
1770# File: src/c/SetProperty.c, line: 1656 1766# File: src/c/SetProperty.c, line: 1653
1771msgid "Unable to load default values.\n" 1767msgid "Unable to load default values.\n"
1772msgstr "" 1768msgstr ""
1773# 1769#
@@ -1778,7 +1774,7 @@ msgid ""
1778"match the number of points defining the line (which must be %d or %d).\n" 1774"match the number of points defining the line (which must be %d or %d).\n"
1779msgstr "" 1775msgstr ""
1780# 1776#
1781# File: src/c/SetProperty.c, line: 2522 1777# File: src/c/SetProperty.c, line: 2519
1782msgid "Unhandled data field\n" 1778msgid "Unhandled data field\n"
1783msgstr "" 1779msgstr ""
1784# 1780#
@@ -1795,7 +1791,7 @@ msgid ""
1795"In '%s' property: '%s' is deprecated use '%s' instead.\n" 1791"In '%s' property: '%s' is deprecated use '%s' instead.\n"
1796msgstr "" 1792msgstr ""
1797# 1793#
1798# File: src/c/SetProperty.c, line: 2046 1794# File: src/c/SetProperty.c, line: 2043
1799msgid "WARNING : The size of the figure may not be as wide as you want.\n" 1795msgid "WARNING : The size of the figure may not be as wide as you want.\n"
1800msgstr "" 1796msgstr ""
1801# 1797#
@@ -1814,7 +1810,7 @@ msgid ""
1814"clamped.\n" 1810"clamped.\n"
1815msgstr "" 1811msgstr ""
1816# 1812#
1817# File: src/c/Gray.c, line: 239 1813# File: src/c/Gray.c, line: 242
1818msgid "Warning : Nax does not work with logarithmic scaling\n" 1814msgid "Warning : Nax does not work with logarithmic scaling\n"
1819msgstr "" 1815msgstr ""
1820# 1816#
@@ -2109,7 +2105,7 @@ msgstr ""
2109msgid "Wrong type for input argument: Tlist expected.\n" 2105msgid "Wrong type for input argument: Tlist expected.\n"
2110msgstr "" 2106msgstr ""
2111# 2107#
2112# File: src/c/SetProperty.c, line: 763 2108# File: src/c/SetProperty.c, line: 760
2113#, c-format 2109#, c-format
2114msgid "Wrong value for %s property: Must be in the interval [%s, %s].\n" 2110msgid "Wrong value for %s property: Must be in the interval [%s, %s].\n"
2115msgstr "" 2111msgstr ""
@@ -2207,7 +2203,7 @@ msgstr ""
2207# 2203#
2208# File: src/c/GetProperty.c, line: 1018 2204# File: src/c/GetProperty.c, line: 1018
2209# File: src/c/GetProperty.c, line: 1043 2205# File: src/c/GetProperty.c, line: 1043
2210# File: src/c/SetProperty.c, line: 1287 2206# File: src/c/SetProperty.c, line: 1284
2211# File: src/c/SetProperty.c, line: 1333 2207# File: src/c/SetProperty.c, line: 1330
2212msgid "You are not using a legend object.\n" 2208msgid "You are not using a legend object.\n"
2213msgstr "" 2209msgstr ""
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_2190.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_2190.dia.ref
index 29a6c07..f5ce5ac 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_2190.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_2190.dia.ref
@@ -17,5 +17,4 @@ stacksize(1e8)
17p=1:9000000; 17p=1:9000000;
18q=9000000:-1:1; 18q=9000000:-1:1;
19plot2d(p,q) 19plot2d(p,q)
20DrawableObjectJoGL::endDrawing: No more memory.
21// scilab should display an error message, but not crash. 20// scilab should display an error message, but not crash.
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
index ff98dbc..7e782f1 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_3572.dia.ref
@@ -17,6 +17,4 @@
17stacksize(1e8); 17stacksize(1e8);
18x=1:2000; y=1:1000; m=rand(1000,2000); 18x=1:2000; y=1:1000; m=rand(1000,2000);
19grayplot(x,y,m'); 19grayplot(x,y,m');
20ConcreteDrawableGrayplot::drawGrayplot: No more memory.
21ConcreteDrawableGrayplot::drawGrayplot: No more memory.
22// used to crash violently 20// used to crash violently
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref b/scilab/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref
index 92c1d25..879e526 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_6665.dia.ref
@@ -12,83 +12,12 @@
12// 12//
13// <-- Short Description --> 13// <-- Short Description -->
14//legend (caption) nor properly saved or loaded 14//legend (caption) nor properly saved or loaded
15plot2d() 15plot2d();
16legend(['a';'b';'c']) 16legend(['a';'b';'c']);
17 ans = 17f=gcf();
18 18save(TMPDIR+'/foo.scg',f);
19Handle of type "Legend" with properties: 19clf();
20======================================== 20load(TMPDIR+'/foo.scg');
21parent: Axes
22children: []
23visible = "on"
24text = ["a";"b";"c"]
25font_style = 6
26font_size = 1
27font_color = -1
28fractional_font = "off"
29links = ["Polyline";"Polyline";"Polyline"]
30legend_location = "in_upper_right"
31position = [0.7491013,0.1332972]
32line_mode = "on"
33thickness = 1
34foreground = -1
35fill_mode = "on"
36background = -2
37clip_state = "off"
38clip_box = []
39user_data = []
40f=gcf()
41 f =
42
43Handle of type "Figure" with properties:
44========================================
45children: "Axes"
46figure_position = [200,200]
47figure_size = [624,596]
48axes_size = [612,461]
49auto_resize = "on"
50viewport = [0,0]
51figure_name = "Figure n°%d"
52figure_id = 0
53info_message = ""
54color_map= matrix 32x3
55pixmap = "off"
56pixel_drawing_mode = "copy"
57anti_aliasing = "off"
58immediate_drawing = "on"
59background = -2
60visible = "on"
61rotation_style = "unary"
62event_handler = ""
63event_handler_enable = "off"
64user_data = []
65tag = ""
66save(TMPDIR+'/foo.scg',f)
67clf()
68load(TMPDIR+'/foo.scg')
69if f.children.children(1).type<>'Legend' then bugmes();quit;end 21if f.children.children(1).type<>'Legend' then bugmes();quit;end
70l=f.children.children(1) 22l=f.children.children(1);
71 l =
72
73Handle of type "Legend" with properties:
74========================================
75parent: Axes
76children: []
77visible = "on"
78text = ["a";"b";"c"]
79font_style = 6
80font_size = 1
81font_color = -1
82fractional_font = "off"
83links = ["Polyline";"Polyline";"Polyline"]
84legend_location = "in_upper_right"
85position = [0.7491013,0.1332972]
86line_mode = "on"
87thickness = 1
88foreground = -1
89fill_mode = "on"
90background = -2
91clip_state = "off"
92clip_box = []
93user_data = []
94if or(l.text<>['a';'b';'c']) then bugmes();quit;end 23if or(l.text<>['a';'b';'c']) then bugmes();quit;end
diff --git a/scilab/modules/graphics/tests/nonreg_tests/bug_6665.tst b/scilab/modules/graphics/tests/nonreg_tests/bug_6665.tst
index 8aecc47..7bd93f3 100644
--- a/scilab/modules/graphics/tests/nonreg_tests/bug_6665.tst
+++ b/scilab/modules/graphics/tests/nonreg_tests/bug_6665.tst
@@ -14,13 +14,13 @@
14// 14//
15// <-- Short Description --> 15// <-- Short Description -->
16//legend (caption) nor properly saved or loaded 16//legend (caption) nor properly saved or loaded
17plot2d() 17plot2d();
18legend(['a';'b';'c']) 18legend(['a';'b';'c']);
19f=gcf() 19f=gcf();
20save(TMPDIR+'/foo.scg',f) 20save(TMPDIR+'/foo.scg',f);
21clf() 21clf();
22load(TMPDIR+'/foo.scg') 22load(TMPDIR+'/foo.scg');
23if f.children.children(1).type<>'Legend' then pause,end 23if f.children.children(1).type<>'Legend' then pause,end
24l=f.children.children(1) 24l=f.children.children(1);
25if or(l.text<>['a';'b';'c']) then pause,end 25if or(l.text<>['a';'b';'c']) then pause,end
26 26
diff --git a/scilab/modules/gui/locales/en_US/gui.pot b/scilab/modules/gui/locales/en_US/gui.pot
index 9f957f2..068ca36 100644
--- a/scilab/modules/gui/locales/en_US/gui.pot
+++ b/scilab/modules/gui/locales/en_US/gui.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/tree/uiFindNode.sci, line: 115 19# File: macros/tree/uiFindNode.sci, line: 115
20# File: macros/tree/uiFindNode.sci, line: 142 20# File: macros/tree/uiFindNode.sci, line: 142
@@ -35,6 +35,12 @@ msgstr ""
35msgid "%s: An error occurred: %s.\n" 35msgid "%s: An error occurred: %s.\n"
36msgstr "" 36msgstr ""
37# 37#
38# File: sci_gateway/cpp/sci_toprint.cpp, line: 108
39# File: sci_gateway/cpp/sci_toprint.cpp, line: 231
40#, c-format
41msgid "%s: An exception occurred: %s"
42msgstr ""
43#
38# File: sci_gateway/c/sci_uicontrol.c, line: 290 44# File: sci_gateway/c/sci_uicontrol.c, line: 290
39#, c-format 45#, c-format
40msgid "%s: Could not create 'Uicontrol' handle.\n" 46msgid "%s: Could not create 'Uicontrol' handle.\n"
@@ -127,7 +133,7 @@ msgstr ""
127msgid "%s: Only available under 'STANDARD' mode.\n" 133msgid "%s: Only available under 'STANDARD' mode.\n"
128msgstr "" 134msgstr ""
129# 135#
130# File: sci_gateway/cpp/sci_toprint.cpp, line: 61 136# File: sci_gateway/cpp/sci_toprint.cpp, line: 72
131#, c-format 137#, c-format
132msgid "%s: The file %s does not exist.\n" 138msgid "%s: The file %s does not exist.\n"
133msgstr "" 139msgstr ""
@@ -142,7 +148,7 @@ msgstr ""
142msgid "%s: Unknown property: %s for '%s' handles.\n" 148msgid "%s: Unknown property: %s for '%s' handles.\n"
143msgstr "" 149msgstr ""
144# 150#
145# File: sci_gateway/cpp/sci_toprint.cpp, line: 201 151# File: sci_gateway/cpp/sci_toprint.cpp, line: 237
146#, c-format 152#, c-format
147msgid "%s: Wrong input argument #%d: '%s' or '%s' expected" 153msgid "%s: Wrong input argument #%d: '%s' or '%s' expected"
148msgstr "" 154msgstr ""
@@ -220,7 +226,7 @@ msgstr ""
220msgid "%s: Wrong size for %s: A row vector of strings expected.\n" 226msgid "%s: Wrong size for %s: A row vector of strings expected.\n"
221msgstr "" 227msgstr ""
222# 228#
223# File: sci_gateway/c/sci_x_mdialog.c, line: 122 229# File: sci_gateway/c/sci_x_mdialog.c, line: 128
224#, c-format 230#, c-format
225msgid "" 231msgid ""
226"%s: Wrong size for input argument #%d: %d x %d matrix of strings expected.\n" 232"%s: Wrong size for input argument #%d: %d x %d matrix of strings expected.\n"
@@ -349,19 +355,26 @@ msgstr ""
349msgid "%s: Wrong size for input argument #%d: A string matrix expected.\n" 355msgid "%s: Wrong size for input argument #%d: A string matrix expected.\n"
350msgstr "" 356msgstr ""
351# 357#
358# File: sci_gateway/c/sci_x_mdialog.c, line: 90
359#, c-format
360msgid ""
361"%s: Wrong size for input argument #%d: It must have same dimensions that "
362"argument #%d.\n"
363msgstr ""
364#
352# File: sci_gateway/c/sci_helpbrowser.c, line: 60 365# File: sci_gateway/c/sci_helpbrowser.c, line: 60
353#, c-format 366#, c-format
354msgid "%s: Wrong size for input argument #%d: Matrix of strings expected.\n" 367msgid "%s: Wrong size for input argument #%d: Matrix of strings expected.\n"
355msgstr "" 368msgstr ""
356# 369#
357# File: sci_gateway/cpp/sci_toprint.cpp, line: 67 370# File: sci_gateway/cpp/sci_toprint.cpp, line: 87
358#, c-format 371#, c-format
359msgid "%s: Wrong size for input argument #%d: String expected.\n" 372msgid "%s: Wrong size for input argument #%d: String expected.\n"
360msgstr "" 373msgstr ""
361# 374#
362# File: sci_gateway/c/sci_x_mdialog.c, line: 70 375# File: sci_gateway/c/sci_x_mdialog.c, line: 70
363# File: sci_gateway/c/sci_x_mdialog.c, line: 90 376# File: sci_gateway/c/sci_x_mdialog.c, line: 96
364# File: sci_gateway/c/sci_x_mdialog.c, line: 101 377# File: sci_gateway/c/sci_x_mdialog.c, line: 107
365# File: sci_gateway/c/sci_x_choice.c, line: 95 378# File: sci_gateway/c/sci_x_choice.c, line: 95
366#, c-format 379#, c-format
367msgid "%s: Wrong size for input argument #%d: Vector of strings expected.\n" 380msgid "%s: Wrong size for input argument #%d: Vector of strings expected.\n"
@@ -521,7 +534,7 @@ msgstr ""
521# File: macros/addmenu.sci, line: 164 534# File: macros/addmenu.sci, line: 164
522# File: macros/addmenu.sci, line: 190 535# File: macros/addmenu.sci, line: 190
523# File: macros/x_choices.sci, line: 34 536# File: macros/x_choices.sci, line: 34
524# File: sci_gateway/cpp/sci_toprint.cpp, line: 214 537# File: sci_gateway/cpp/sci_toprint.cpp, line: 250
525# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 163 538# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 163
526# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 187 539# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 187
527# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 225 540# File: sci_gateway/cpp/sci_uigetfile.cpp, line: 225
@@ -568,7 +581,7 @@ msgstr ""
568msgid "%s: Wrong type for input argument #%d: A string matrix expected.\n" 581msgid "%s: Wrong type for input argument #%d: A string matrix expected.\n"
569msgstr "" 582msgstr ""
570# 583#
571# File: sci_gateway/cpp/sci_toprint.cpp, line: 220 584# File: sci_gateway/cpp/sci_toprint.cpp, line: 256
572# File: sci_gateway/c/sci_ClipBoard.c, line: 291 585# File: sci_gateway/c/sci_ClipBoard.c, line: 291
573#, c-format 586#, c-format
574msgid "%s: Wrong type for input argument #%d: A string or a real expected.\n" 587msgid "%s: Wrong type for input argument #%d: A string or a real expected.\n"
@@ -600,19 +613,19 @@ msgstr ""
600msgid "%s: Wrong type for input argument #%d: Boolean expected.\n" 613msgid "%s: Wrong type for input argument #%d: Boolean expected.\n"
601msgstr "" 614msgstr ""
602# 615#
603# File: sci_gateway/c/sci_x_mdialog.c, line: 130 616# File: sci_gateway/c/sci_x_mdialog.c, line: 136
604# File: sci_gateway/c/sci_helpbrowser.c, line: 66 617# File: sci_gateway/c/sci_helpbrowser.c, line: 66
605#, c-format 618#, c-format
606msgid "%s: Wrong type for input argument #%d: Matrix of strings expected.\n" 619msgid "%s: Wrong type for input argument #%d: Matrix of strings expected.\n"
607msgstr "" 620msgstr ""
608# 621#
609# File: sci_gateway/cpp/sci_toprint.cpp, line: 93 622# File: sci_gateway/cpp/sci_toprint.cpp, line: 121
610# File: sci_gateway/cpp/sci_toprint.cpp, line: 99 623# File: sci_gateway/cpp/sci_toprint.cpp, line: 127
611#, c-format 624#, c-format
612msgid "%s: Wrong type for input argument #%d: Non-negative integer expected.\n" 625msgid "%s: Wrong type for input argument #%d: Non-negative integer expected.\n"
613msgstr "" 626msgstr ""
614# 627#
615# File: sci_gateway/cpp/sci_toprint.cpp, line: 207 628# File: sci_gateway/cpp/sci_toprint.cpp, line: 243
616#, c-format 629#, c-format
617msgid "%s: Wrong type for input argument #%d: Non-negative integers expected\n" 630msgid "%s: Wrong type for input argument #%d: Non-negative integers expected\n"
618msgstr "" 631msgstr ""
@@ -626,8 +639,8 @@ msgstr ""
626# File: macros/tree/uiCreateNode.sci, line: 27 639# File: macros/tree/uiCreateNode.sci, line: 27
627# File: macros/tree/uiCreateNode.sci, line: 36 640# File: macros/tree/uiCreateNode.sci, line: 36
628# File: macros/tree/uiCreateNode.sci, line: 44 641# File: macros/tree/uiCreateNode.sci, line: 44
629# File: sci_gateway/cpp/sci_toprint.cpp, line: 157 642# File: sci_gateway/cpp/sci_toprint.cpp, line: 185
630# File: sci_gateway/cpp/sci_toprint.cpp, line: 169 643# File: sci_gateway/cpp/sci_toprint.cpp, line: 197
631#, c-format 644#, c-format
632msgid "%s: Wrong type for input argument #%d: String expected.\n" 645msgid "%s: Wrong type for input argument #%d: String expected.\n"
633msgstr "" 646msgstr ""
@@ -665,7 +678,7 @@ msgstr ""
665# 678#
666# File: sci_gateway/c/sci_x_mdialog.c, line: 51 679# File: sci_gateway/c/sci_x_mdialog.c, line: 51
667# File: sci_gateway/c/sci_x_mdialog.c, line: 78 680# File: sci_gateway/c/sci_x_mdialog.c, line: 78
668# File: sci_gateway/c/sci_x_mdialog.c, line: 110 681# File: sci_gateway/c/sci_x_mdialog.c, line: 116
669# File: sci_gateway/c/sci_x_choose_modeless.c, line: 45 682# File: sci_gateway/c/sci_x_choose_modeless.c, line: 45
670# File: sci_gateway/c/sci_x_choose_modeless.c, line: 56 683# File: sci_gateway/c/sci_x_choose_modeless.c, line: 56
671# File: sci_gateway/c/sci_x_choose.c, line: 45 684# File: sci_gateway/c/sci_x_choose.c, line: 45
@@ -757,7 +770,7 @@ msgstr ""
757msgid "%s: Wrong value for input argument #%d: Must be >= %d expected.\n" 770msgid "%s: Wrong value for input argument #%d: Must be >= %d expected.\n"
758msgstr "" 771msgstr ""
759# 772#
760# File: sci_gateway/cpp/sci_toprint.cpp, line: 87 773# File: sci_gateway/cpp/sci_toprint.cpp, line: 115
761#, c-format 774#, c-format
762msgid "" 775msgid ""
763"%s: Wrong value for input argument #%d: Non-negative integers expected.\n" 776"%s: Wrong value for input argument #%d: Non-negative integers expected.\n"
@@ -1030,7 +1043,7 @@ msgstr ""
1030msgid "&Zoom" 1043msgid "&Zoom"
1031msgstr "" 1044msgstr ""
1032# 1045#
1033# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 237 1046# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 246
1034msgid "" 1047msgid ""
1035"'.\n" 1048"'.\n"
1036" Please specify a valid file format." 1049" Please specify a valid file format."
@@ -1068,7 +1081,7 @@ msgid "All Scilab files"
1068msgstr "" 1081msgstr ""
1069# 1082#
1070# File: src/java/org/scilab/modules/gui/utils/SciFileFilter.java, line: 56 1083# File: src/java/org/scilab/modules/gui/utils/SciFileFilter.java, line: 56
1071# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 47 1084# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 49
1072msgid "All files" 1085msgid "All files"
1073msgstr "" 1086msgstr ""
1074# 1087#
@@ -1168,11 +1181,11 @@ msgstr ""
1168msgid "Console &Font..." 1181msgid "Console &Font..."
1169msgstr "" 1182msgstr ""
1170# 1183#
1171# File: src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java, line: 2235 1184# File: src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java, line: 2256
1172msgid "Console Background..." 1185msgid "Console Background..."
1173msgstr "" 1186msgstr ""
1174# 1187#
1175# File: src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java, line: 2216 1188# File: src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java, line: 2237
1176msgid "Console Font..." 1189msgid "Console Font..."
1177msgstr "" 1190msgstr ""
1178# 1191#
@@ -1191,7 +1204,7 @@ msgid "Copyright (c) 1989-2007 (ENPC)"
1191msgstr "" 1204msgstr ""
1192# 1205#
1193# File: src/java/org/scilab/modules/gui/utils/ScilabAboutBox.java, line: 49 1206# File: src/java/org/scilab/modules/gui/utils/ScilabAboutBox.java, line: 49
1194msgid "Copyright (c) 1989-2009 (INRIA)" 1207msgid "Copyright (c) 1989-2010 (INRIA)"
1195msgstr "" 1208msgstr ""
1196# 1209#
1197# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 77 1210# File: src/java/org/scilab/modules/gui/bridge/console/SwingScilabConsole.java, line: 77
@@ -1211,11 +1224,11 @@ msgstr ""
1211msgid "Edit in the Scilab Text Editor" 1224msgid "Edit in the Scilab Text Editor"
1212msgstr "" 1225msgstr ""
1213# 1226#
1214# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 43 1227# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 45
1215msgid "Encapsulated PostScript image (EPS)" 1228msgid "Encapsulated PostScript image (EPS)"
1216msgstr "" 1229msgstr ""
1217# 1230#
1218# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 42 1231# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 44
1219msgid "Enhanced Metafile image (EMF)" 1232msgid "Enhanced Metafile image (EMF)"
1220msgstr "" 1233msgstr ""
1221# 1234#
@@ -1231,8 +1244,8 @@ msgstr ""
1231msgid "Error" 1244msgid "Error"
1232msgstr "" 1245msgstr ""
1233# 1246#
1234# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 203 1247# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 210
1235# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 237 1248# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 247
1236msgid "Error on export" 1249msgid "Error on export"
1237msgstr "" 1250msgstr ""
1238# 1251#
@@ -1252,12 +1265,12 @@ msgstr ""
1252msgid "Exit figure" 1265msgid "Exit figure"
1253msgstr "" 1266msgstr ""
1254# 1267#
1255# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 94 1268# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 96
1256# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 95 1269# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 97
1257msgid "Export" 1270msgid "Export"
1258msgstr "" 1271msgstr ""
1259# 1272#
1260# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 44 1273# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 46
1261msgid "FIG image" 1274msgid "FIG image"
1262msgstr "" 1275msgstr ""
1263# 1276#
@@ -1273,11 +1286,11 @@ msgstr ""
1273msgid "File" 1286msgid "File"
1274msgstr "" 1287msgstr ""
1275# 1288#
1276# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 155 1289# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 157
1277msgid "File already exist" 1290msgid "File already exist"
1278msgstr "" 1291msgstr ""
1279# 1292#
1280# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 138 1293# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 142
1281msgid "File already exists" 1294msgid "File already exists"
1282msgstr "" 1295msgstr ""
1283# 1296#
@@ -1285,7 +1298,7 @@ msgstr ""
1285msgid "Forward" 1298msgid "Forward"
1286msgstr "" 1299msgstr ""
1287# 1300#
1288# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 38 1301# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 40
1289msgid "GIF image" 1302msgid "GIF image"
1290msgstr "" 1303msgstr ""
1291# 1304#
@@ -1293,7 +1306,7 @@ msgstr ""
1293msgid "GUI" 1306msgid "GUI"
1294msgstr "" 1307msgstr ""
1295# 1308#
1296# File: src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java, line: 73 1309# File: src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java, line: 74
1297# File: scilab_fake_localization_file.c, line: 87 1310# File: scilab_fake_localization_file.c, line: 87
1298# File: scilab_fake_localization_file.c, line: 99 1311# File: scilab_fake_localization_file.c, line: 99
1299msgid "Help Browser" 1312msgid "Help Browser"
@@ -1317,7 +1330,7 @@ msgstr ""
1317msgid "Impossible to get current look and feel" 1330msgid "Impossible to get current look and feel"
1318msgstr "" 1331msgstr ""
1319# 1332#
1320# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 39 1333# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 41
1321msgid "JPEG image" 1334msgid "JPEG image"
1322msgstr "" 1335msgstr ""
1323# 1336#
@@ -1342,8 +1355,8 @@ msgstr ""
1342msgid "Left click to terminate selection. Right click to cancel." 1355msgid "Left click to terminate selection. Right click to cancel."
1343msgstr "" 1356msgstr ""
1344# 1357#
1345# File: src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java, line: 66 1358# File: src/java/org/scilab/modules/gui/helpbrowser/ScilabHelpBrowser.java, line: 67
1346# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowser.java, line: 82 1359# File: src/java/org/scilab/modules/gui/bridge/helpbrowser/SwingScilabHelpBrowser.java, line: 81
1347msgid "Loading help browser..." 1360msgid "Loading help browser..."
1348msgstr "" 1361msgstr ""
1349# 1362#
@@ -1463,15 +1476,15 @@ msgstr ""
1463msgid "P&age setup..." 1476msgid "P&age setup..."
1464msgstr "" 1477msgstr ""
1465# 1478#
1466# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 45 1479# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 47
1467msgid "PDF image" 1480msgid "PDF image"
1468msgstr "" 1481msgstr ""
1469# 1482#
1470# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 40 1483# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 42
1471msgid "PNG image" 1484msgid "PNG image"
1472msgstr "" 1485msgstr ""
1473# 1486#
1474# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 41 1487# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 43
1475msgid "PPM image" 1488msgid "PPM image"
1476msgstr "" 1489msgstr ""
1477# 1490#
@@ -1484,7 +1497,7 @@ msgstr ""
1484msgid "Please enter a color name first." 1497msgid "Please enter a color name first."
1485msgstr "" 1498msgstr ""
1486# 1499#
1487# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 203 1500# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 209
1488msgid "Please specify a file format" 1501msgid "Please specify a file format"
1489msgstr "" 1502msgstr ""
1490# 1503#
@@ -1492,7 +1505,7 @@ msgstr ""
1492msgid "Popupmenu selection" 1505msgid "Popupmenu selection"
1493msgstr "" 1506msgstr ""
1494# 1507#
1495# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 115 1508# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 117
1496msgid "Preview" 1509msgid "Preview"
1497msgstr "" 1510msgstr ""
1498# 1511#
@@ -1509,8 +1522,8 @@ msgstr ""
1509msgid "Quit demonstration" 1522msgid "Quit demonstration"
1510msgstr "" 1523msgstr ""
1511# 1524#
1512# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 138 1525# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 141
1513# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 155 1526# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabFileChooser.java, line: 156
1514msgid "Replace existing file?" 1527msgid "Replace existing file?"
1515msgstr "" 1528msgstr ""
1516# 1529#
@@ -1522,7 +1535,7 @@ msgstr ""
1522msgid "S&top entity picker" 1535msgid "S&top entity picker"
1523msgstr "" 1536msgstr ""
1524# 1537#
1525# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 46 1538# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 48
1526msgid "SVG image" 1539msgid "SVG image"
1527msgstr "" 1540msgstr ""
1528# 1541#
@@ -1710,7 +1723,7 @@ msgstr ""
1710msgid "The Scilab Consortium (DIGITEO)" 1723msgid "The Scilab Consortium (DIGITEO)"
1711msgstr "" 1724msgstr ""
1712# 1725#
1713# File: src/java/org/scilab/modules/gui/bridge/tree/SwingScilabTree.java, line: 136 1726# File: src/java/org/scilab/modules/gui/bridge/tree/SwingScilabTree.java, line: 173
1714msgid "Tree Overview" 1727msgid "Tree Overview"
1715msgstr "" 1728msgstr ""
1716# 1729#
@@ -1718,11 +1731,11 @@ msgstr ""
1718msgid "Uicontrols demo" 1731msgid "Uicontrols demo"
1719msgstr "" 1732msgstr ""
1720# 1733#
1721# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 237 1734# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 245
1722msgid "Unrecognized extension '" 1735msgid "Unrecognized extension '"
1723msgstr "" 1736msgstr ""
1724# 1737#
1725# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 96 1738# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 98
1726msgid "Untitled-export" 1739msgid "Untitled-export"
1727msgstr "" 1740msgstr ""
1728# 1741#
@@ -1745,7 +1758,7 @@ msgid ""
1745"property value.\n" 1758"property value.\n"
1746msgstr "" 1759msgstr ""
1747# 1760#
1748# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 37 1761# File: src/java/org/scilab/modules/gui/bridge/filechooser/SwingScilabExportFileChooser.java, line: 39
1749msgid "Windows BMP image" 1762msgid "Windows BMP image"
1750msgstr "" 1763msgstr ""
1751# 1764#
diff --git a/scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp b/scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
index 47ed1f0..1f64b1e 100644
--- a/scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
+++ b/scilab/modules/gui/sci_gateway/cpp/sci_toprint.cpp
@@ -26,7 +26,9 @@ extern "C"
26#include "gw_gui.h" 26#include "gw_gui.h"
27#include "getScilabJavaVM.h" 27#include "getScilabJavaVM.h"
28#include "getFullFilename.h" 28#include "getFullFilename.h"
29#include "loadOnUseClassPath.h"
29} 30}
31static BOOL loadedDep = FALSE;
30/*--------------------------------------------------------------------------*/ 32/*--------------------------------------------------------------------------*/
31using namespace org_scilab_modules_gui_bridge; 33using namespace org_scilab_modules_gui_bridge;
32/*--------------------------------------------------------------------------*/ 34/*--------------------------------------------------------------------------*/
@@ -40,6 +42,12 @@ int sci_toprint(char *fname,unsigned long l)
40 CheckRhs(1,2); 42 CheckRhs(1,2);
41 CheckLhs(0,1); 43 CheckLhs(0,1);
42 44
45 if (!loadedDep)
46 {
47 loadOnUseClassPath("pdf_ps_eps_graphic_export");
48 loadedDep=TRUE;
49 }
50
43 /* File or figure print */ 51 /* File or figure print */
44 if (Rhs == 1) 52 if (Rhs == 1)
45 { 53 {
@@ -92,7 +100,15 @@ int sci_toprint(char *fname,unsigned long l)
92 num_win=*istk(l1); 100 num_win=*istk(l1);
93 if (num_win>=0) 101 if (num_win>=0)
94 { 102 {
95 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE); 103 try
104 {
105 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE);
106 }
107 catch (const GiwsException::JniException& e)
108 {
109 Scierror(999,_("%s: An exception occurred: %s\n%s\n"), fname, e.getJavaDescription().c_str(), e.getJavaExceptionName().c_str());
110 }
111
96 } 112 }
97 else 113 else
98 { 114 {
@@ -199,6 +215,8 @@ int sci_toprint(char *fname,unsigned long l)
199 215
200 if ( (strcmp(param,"pos")==0) || (strcmp(param,"gdi")==0) ) 216 if ( (strcmp(param,"pos")==0) || (strcmp(param,"gdi")==0) )
201 { 217 {
218 try
219 {
202 if ( strcmp(param,"pos")==0 ) 220 if ( strcmp(param,"pos")==0 )
203 { 221 {
204 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, TRUE, FALSE); 222 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, TRUE, FALSE);
@@ -207,6 +225,12 @@ int sci_toprint(char *fname,unsigned long l)
207 { 225 {
208 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE); 226 *paramoutINT = (int)CallScilabBridge::printFigure(getScilabJavaVM(), num_win, FALSE, FALSE);
209 } 227 }
228 }
229 catch (const GiwsException::JniException& e)
230 {
231 Scierror(999,_("%s: An exception occurred: %s\n%s\n"), fname, e.getJavaDescription().c_str(), e.getJavaExceptionName().c_str());
232 }
233
210 } 234 }
211 else 235 else
212 { 236 {
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
index 8ce7164..b01edf6 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/bridge/CallScilabBridge.java
@@ -32,6 +32,7 @@ import javax.print.Doc;
32import javax.print.DocFlavor; 32import javax.print.DocFlavor;
33import javax.print.DocPrintJob; 33import javax.print.DocPrintJob;
34import javax.print.PrintException; 34import javax.print.PrintException;
35import javax.print.PrintService;
35import javax.print.SimpleDoc; 36import javax.print.SimpleDoc;
36import javax.print.attribute.HashPrintRequestAttributeSet; 37import javax.print.attribute.HashPrintRequestAttributeSet;
37import javax.print.attribute.PrintRequestAttribute; 38import javax.print.attribute.PrintRequestAttribute;
@@ -2355,7 +2356,6 @@ public class CallScilabBridge {
2355 2356
2356 //If the OS is Linux 2357 //If the OS is Linux
2357 } else { 2358 } else {
2358
2359 int exportRendererMode = ExportRenderer.PS_EXPORT; 2359 int exportRendererMode = ExportRenderer.PS_EXPORT;
2360 DocFlavor printDocFlavor = DocFlavor.INPUT_STREAM.POSTSCRIPT; 2360 DocFlavor printDocFlavor = DocFlavor.INPUT_STREAM.POSTSCRIPT;
2361 String fileExtension = ".ps"; 2361 String fileExtension = ".ps";
@@ -2383,12 +2383,22 @@ public class CallScilabBridge {
2383 } 2383 }
2384 2384
2385 Doc myDoc = new SimpleDoc(psStream, printDocFlavor, null); 2385 Doc myDoc = new SimpleDoc(psStream, printDocFlavor, null);
2386 DocPrintJob job = printerJob.getPrintService().createPrintJob(); 2386 PrintService printService = printerJob.getPrintService();
2387
2388 if (printService == null) {
2389 /* Could not find the print service */
2390 MessageBox messageBox = ScilabMessageBox.createMessageBox();
2391 messageBox.setMessage(Messages.gettext("No print service found."));
2392 messageBox.setModal(true);
2393 messageBox.setIcon("error");
2394 messageBox.displayAndWait();
2395 return false;
2396 }
2397 DocPrintJob job = printService.createPrintJob();
2387 2398
2388 // Remove Orientation option from page setup because already managed in FileExporter 2399 // Remove Orientation option from page setup because already managed in FileExporter
2389 PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(scilabPageFormat); 2400 PrintRequestAttributeSet aset = new HashPrintRequestAttributeSet(scilabPageFormat);
2390 aset.add(OrientationRequested.PORTRAIT); 2401 aset.add(OrientationRequested.PORTRAIT);
2391
2392 job.print(myDoc, aset); 2402 job.print(myDoc, aset);
2393 return true; 2403 return true;
2394 } catch (PrintException e) { 2404 } catch (PrintException e) {
@@ -2413,9 +2423,9 @@ public class CallScilabBridge {
2413 } 2423 }
2414 2424
2415 /***********************/ 2425 /***********************/
2416 /* */ 2426 /* */
2417 /* FONT CHOOSER BRIDGE */ 2427 /* FONT CHOOSER BRIDGE */
2418 /* */ 2428 /* */
2419 /***********************/ 2429 /***********************/
2420 2430
2421 /** 2431 /**
@@ -2871,4 +2881,4 @@ public class CallScilabBridge {
2871 public static void scilabAboutBox() { 2881 public static void scilabAboutBox() {
2872 ScilabAboutBox.displayAndWait(); 2882 ScilabAboutBox.displayAndWait();
2873 } 2883 }
2874} \ No newline at end of file 2884}
diff --git a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/PrinterHelper.java b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/PrinterHelper.java
index b20ee28..f7ae43a 100644
--- a/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/PrinterHelper.java
+++ b/scilab/modules/gui/src/java/org/scilab/modules/gui/utils/PrinterHelper.java
@@ -19,6 +19,10 @@ import java.net.MalformedURLException;
19import java.net.URL; 19import java.net.URL;
20import javax.swing.JEditorPane; 20import javax.swing.JEditorPane;
21 21
22import org.scilab.modules.localization.Messages;
23import org.scilab.modules.gui.messagebox.MessageBox;
24import org.scilab.modules.gui.messagebox.ScilabMessageBox;
25
22/** 26/**
23 * 27 *
24 * @author Allan CORNET - DIGITEO 28 * @author Allan CORNET - DIGITEO
@@ -46,7 +50,11 @@ public class PrinterHelper {
46 try { 50 try {
47 printTask.print(); 51 printTask.print();
48 } catch (PrinterException e) { 52 } catch (PrinterException e) {
49 e.printStackTrace(); 53 MessageBox messageBox = ScilabMessageBox.createMessageBox();
54 messageBox.setMessage(Messages.gettext("An error occured: ")+e.getLocalizedMessage());
55 messageBox.setModal(true);
56 messageBox.setIcon("error");
57 messageBox.displayAndWait();
50 return false; 58 return false;
51 } 59 }
52 return true; 60 return true;
diff --git a/scilab/modules/helptools/locales/en_US/helptools.pot b/scilab/modules/helptools/locales/en_US/helptools.pot
index 5981c38..f23ed6fc 100644
--- a/scilab/modules/helptools/locales/en_US/helptools.pot
+++ b/scilab/modules/helptools/locales/en_US/helptools.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/xmltoformat.sci, line: 401 19# File: macros/xmltoformat.sci, line: 401
20# File: macros/xmltoformat.sci, line: 428 20# File: macros/xmltoformat.sci, line: 428
@@ -156,12 +156,12 @@ msgstr ""
156msgid "%s: Scilab 5.0 or more is required.\n" 156msgid "%s: Scilab 5.0 or more is required.\n"
157msgstr "" 157msgstr ""
158# 158#
159# File: macros/xmltoformat.sci, line: 1317 159# File: macros/xmltoformat.sci, line: 1324
160#, c-format 160#, c-format
161msgid "%s: The 2 mlist must not have any field in common .\n" 161msgid "%s: The 2 mlist must not have any field in common .\n"
162msgstr "" 162msgstr ""
163# 163#
164# File: macros/xmltoformat.sci, line: 1208 164# File: macros/xmltoformat.sci, line: 1215
165#, c-format 165#, c-format
166msgid "%s: The CHAPTER file is not well formated at line %d\n" 166msgid "%s: The CHAPTER file is not well formated at line %d\n"
167msgstr "" 167msgstr ""
@@ -176,8 +176,8 @@ msgstr ""
176msgid "%s: The help browser is disabled in %s mode.\n" 176msgid "%s: The help browser is disabled in %s mode.\n"
177msgstr "" 177msgstr ""
178# 178#
179# File: macros/xmltoformat.sci, line: 1261 179# File: macros/xmltoformat.sci, line: 1268
180# File: macros/xmltoformat.sci, line: 1274 180# File: macros/xmltoformat.sci, line: 1281
181#, c-format 181#, c-format
182msgid "%s: The last_successful_build file is not well formated at line %d\n" 182msgid "%s: The last_successful_build file is not well formated at line %d\n"
183msgstr "" 183msgstr ""
@@ -203,21 +203,21 @@ msgstr ""
203# 203#
204# File: macros/manedit.sci, line: 16 204# File: macros/manedit.sci, line: 16
205# File: macros/xmltoformat.sci, line: 887 205# File: macros/xmltoformat.sci, line: 887
206# File: macros/xmltoformat.sci, line: 1296 206# File: macros/xmltoformat.sci, line: 1303
207# File: macros/xmltoformat.sci, line: 1342 207# File: macros/xmltoformat.sci, line: 1349
208# File: macros/xmltoformat.sci, line: 1487 208# File: macros/xmltoformat.sci, line: 1494
209# File: macros/xmltoformat.sci, line: 1598 209# File: macros/xmltoformat.sci, line: 1605
210# File: macros/xmltoformat.sci, line: 1685 210# File: macros/xmltoformat.sci, line: 1692
211# File: macros/xmltoformat.sci, line: 1821 211# File: macros/xmltoformat.sci, line: 1828
212#, c-format 212#, c-format
213msgid "%s: Wrong number of input argument: %d expected.\n" 213msgid "%s: Wrong number of input argument: %d expected.\n"
214msgstr "" 214msgstr ""
215# 215#
216# File: macros/add_help_chapter.sci, line: 38 216# File: macros/add_help_chapter.sci, line: 38
217# File: macros/xmltoformat.sci, line: 1015 217# File: macros/xmltoformat.sci, line: 1015
218# File: macros/xmltoformat.sci, line: 1090 218# File: macros/xmltoformat.sci, line: 1097
219# File: macros/xmltoformat.sci, line: 1160 219# File: macros/xmltoformat.sci, line: 1167
220# File: macros/xmltoformat.sci, line: 1230 220# File: macros/xmltoformat.sci, line: 1237
221#, c-format 221#, c-format
222msgid "%s: Wrong number of input argument: %d to %d expected.\n" 222msgid "%s: Wrong number of input argument: %d to %d expected.\n"
223msgstr "" 223msgstr ""
@@ -245,7 +245,7 @@ msgstr ""
245# 245#
246# File: macros/xmltoformat.sci, line: 905 246# File: macros/xmltoformat.sci, line: 905
247# File: macros/xmltoformat.sci, line: 1029 247# File: macros/xmltoformat.sci, line: 1029
248# File: macros/xmltoformat.sci, line: 1104 248# File: macros/xmltoformat.sci, line: 1111
249#, c-format 249#, c-format
250msgid "%s: Wrong size for input argument #%d: Single string expected.\n" 250msgid "%s: Wrong size for input argument #%d: Single string expected.\n"
251msgstr "" 251msgstr ""
@@ -256,7 +256,7 @@ msgid "%s: Wrong type for input argument #%d: A boolean expected.\n"
256msgstr "" 256msgstr ""
257# 257#
258# File: macros/xmltoformat.sci, line: 898 258# File: macros/xmltoformat.sci, line: 898
259# File: macros/xmltoformat.sci, line: 1498 259# File: macros/xmltoformat.sci, line: 1505
260#, c-format 260#, c-format
261msgid "%s: Wrong type for input argument #%d: A integer expected.\n" 261msgid "%s: Wrong type for input argument #%d: A integer expected.\n"
262msgstr "" 262msgstr ""
@@ -269,14 +269,14 @@ msgstr ""
269# 269#
270# File: macros/xmltoformat.sci, line: 894 270# File: macros/xmltoformat.sci, line: 894
271# File: macros/xmltoformat.sci, line: 1022 271# File: macros/xmltoformat.sci, line: 1022
272# File: macros/xmltoformat.sci, line: 1097 272# File: macros/xmltoformat.sci, line: 1104
273#, c-format 273#, c-format
274msgid "%s: Wrong type for input argument #%d: Single string expected.\n" 274msgid "%s: Wrong type for input argument #%d: Single string expected.\n"
275msgstr "" 275msgstr ""
276# 276#
277# File: macros/add_help_chapter.sci, line: 45 277# File: macros/add_help_chapter.sci, line: 45
278# File: macros/add_help_chapter.sci, line: 49 278# File: macros/add_help_chapter.sci, line: 49
279# File: macros/xmltoformat.sci, line: 1696 279# File: macros/xmltoformat.sci, line: 1703
280#, c-format 280#, c-format
281msgid "%s: Wrong type for input argument #%d: String array expected.\n" 281msgid "%s: Wrong type for input argument #%d: String array expected.\n"
282msgstr "" 282msgstr ""
@@ -287,27 +287,27 @@ msgstr ""
287msgid "%s: Wrong type for input argument #%d: String expected.\n" 287msgid "%s: Wrong type for input argument #%d: String expected.\n"
288msgstr "" 288msgstr ""
289# 289#
290# File: macros/xmltoformat.sci, line: 1303 290# File: macros/xmltoformat.sci, line: 1310
291# File: macros/xmltoformat.sci, line: 1307 291# File: macros/xmltoformat.sci, line: 1314
292# File: macros/xmltoformat.sci, line: 1349 292# File: macros/xmltoformat.sci, line: 1356
293# File: macros/xmltoformat.sci, line: 1494 293# File: macros/xmltoformat.sci, line: 1501
294# File: macros/xmltoformat.sci, line: 1605 294# File: macros/xmltoformat.sci, line: 1612
295# File: macros/xmltoformat.sci, line: 1609 295# File: macros/xmltoformat.sci, line: 1616
296# File: macros/xmltoformat.sci, line: 1692 296# File: macros/xmltoformat.sci, line: 1699
297# File: macros/xmltoformat.sci, line: 1828 297# File: macros/xmltoformat.sci, line: 1835
298#, c-format 298#, c-format
299msgid "" 299msgid ""
300"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n" 300"%s: Wrong type for input argument #%d: matrix oriented typed list expected.\n"
301msgstr "" 301msgstr ""
302# 302#
303# File: macros/xmltoformat.sci, line: 1237 303# File: macros/xmltoformat.sci, line: 1244
304#, c-format 304#, c-format
305msgid "" 305msgid ""
306"%s: Wrong value for input argument #%d: A string that end with ." 306"%s: Wrong value for input argument #%d: A string that end with ."
307"last_successful_build expected.\n" 307"last_successful_build expected.\n"
308msgstr "" 308msgstr ""
309# 309#
310# File: macros/xmltoformat.sci, line: 1167 310# File: macros/xmltoformat.sci, line: 1174
311#, c-format 311#, c-format
312msgid "" 312msgid ""
313"%s: Wrong value for input argument #%d: A string that end with CHAPTER " 313"%s: Wrong value for input argument #%d: A string that end with CHAPTER "
@@ -317,15 +317,15 @@ msgstr ""
317# File: macros/help_from_sci.sci, line: 170 317# File: macros/help_from_sci.sci, line: 170
318# File: macros/xmltoformat.sci, line: 916 318# File: macros/xmltoformat.sci, line: 916
319# File: macros/xmltoformat.sci, line: 1036 319# File: macros/xmltoformat.sci, line: 1036
320# File: macros/xmltoformat.sci, line: 1111 320# File: macros/xmltoformat.sci, line: 1118
321#, c-format 321#, c-format
322msgid "" 322msgid ""
323"%s: Wrong value for input argument #%d: A valid existing directory is " 323"%s: Wrong value for input argument #%d: A valid existing directory is "
324"expected.\n" 324"expected.\n"
325msgstr "" 325msgstr ""
326# 326#
327# File: macros/xmltoformat.sci, line: 1174 327# File: macros/xmltoformat.sci, line: 1181
328# File: macros/xmltoformat.sci, line: 1244 328# File: macros/xmltoformat.sci, line: 1251
329#, c-format 329#, c-format
330msgid "" 330msgid ""
331"%s: Wrong value for input argument #%d: A valid existing file is expected.\n" 331"%s: Wrong value for input argument #%d: A valid existing file is expected.\n"
diff --git a/scilab/modules/history_manager/locales/en_US/history_manager.pot b/scilab/modules/history_manager/locales/en_US/history_manager.pot
index 593c448..db92d73 100644
--- a/scilab/modules/history_manager/locales/en_US/history_manager.pot
+++ b/scilab/modules/history_manager/locales/en_US/history_manager.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_gethistoryfile.c, line: 41 19# File: sci_gateway/c/sci_gethistoryfile.c, line: 41
20#, c-format 20#, c-format
diff --git a/scilab/modules/integer/locales/en_US/integer.pot b/scilab/modules/integer/locales/en_US/integer.pot
index 659442a..49297bb 100644
--- a/scilab/modules/integer/locales/en_US/integer.pot
+++ b/scilab/modules/integer/locales/en_US/integer.pot
@@ -14,5 +14,5 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
diff --git a/scilab/modules/interpolation/locales/en_US/interpolation.pot b/scilab/modules/interpolation/locales/en_US/interpolation.pot
index 13c840a..5c0a945 100644
--- a/scilab/modules/interpolation/locales/en_US/interpolation.pot
+++ b/scilab/modules/interpolation/locales/en_US/interpolation.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_linear_interpn.c, line: 99 19# File: sci_gateway/c/sci_linear_interpn.c, line: 99
20#, c-format 20#, c-format
diff --git a/scilab/modules/intersci/locales/en_US/intersci.pot b/scilab/modules/intersci/locales/en_US/intersci.pot
index b25cdf0..b260e61 100644
--- a/scilab/modules/intersci/locales/en_US/intersci.pot
+++ b/scilab/modules/intersci/locales/en_US/intersci.pot
@@ -14,5 +14,5 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
diff --git a/scilab/modules/io/locales/en_US/io.pot b/scilab/modules/io/locales/en_US/io.pot
index c68ab33..af42b2f 100644
--- a/scilab/modules/io/locales/en_US/io.pot
+++ b/scilab/modules/io/locales/en_US/io.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_setenv.c, line: 127 19# File: sci_gateway/c/sci_setenv.c, line: 127
20# File: sci_gateway/c/sci_setenv.c, line: 145 20# File: sci_gateway/c/sci_setenv.c, line: 145
diff --git a/scilab/modules/jvm/locales/en_US/jvm.pot b/scilab/modules/jvm/locales/en_US/jvm.pot
index f524dbf..d412f10 100644
--- a/scilab/modules/jvm/locales/en_US/jvm.pot
+++ b/scilab/modules/jvm/locales/en_US/jvm.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:33+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: src/c/JVM.c, line: 119 19# File: src/c/JVM.c, line: 119
20#, c-format 20#, c-format
@@ -111,10 +111,6 @@ msgstr ""
111msgid "%s: Wrong type for input argument #%d: String expected.\n" 111msgid "%s: Wrong type for input argument #%d: String expected.\n"
112msgstr "" 112msgstr ""
113# 113#
114# File: src/java/org/scilab/modules/jvm/Scilab.java, line: 174
115msgid "Console"
116msgstr ""
117#
118# File: src/c/createMainScilabObject.c, line: 33 114# File: src/c/createMainScilabObject.c, line: 33
119msgid "Could not access to the Main Scilab Class:\n" 115msgid "Could not access to the Main Scilab Class:\n"
120msgstr "" 116msgstr ""
@@ -209,6 +205,10 @@ msgstr ""
209msgid "JVM interface disabled in -nogui or -nwni modes.\n" 205msgid "JVM interface disabled in -nogui or -nwni modes.\n"
210msgstr "" 206msgstr ""
211# 207#
208# File: src/java/org/scilab/modules/jvm/Scilab.java, line: 174
209msgid "Scilab Console"
210msgstr ""
211#
212# File: src/nojvm/nojvm.c, line: 27 212# File: src/nojvm/nojvm.c, line: 27
213msgid "Scilab Java module not installed.\n" 213msgid "Scilab Java module not installed.\n"
214msgstr "" 214msgstr ""
diff --git a/scilab/modules/linear_algebra/locales/en_US/linear_algebra.pot b/scilab/modules/linear_algebra/locales/en_US/linear_algebra.pot
index 9e99c82..c301236 100644
--- a/scilab/modules/linear_algebra/locales/en_US/linear_algebra.pot
+++ b/scilab/modules/linear_algebra/locales/en_US/linear_algebra.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/spanplus.sci, line: 26 19# File: macros/spanplus.sci, line: 26
20# File: macros/im_inv.sci, line: 22 20# File: macros/im_inv.sci, line: 22
diff --git a/scilab/modules/localization/locales/en_US/localization.pot b/scilab/modules/localization/locales/en_US/localization.pot
index 6709818..bae2547 100644
--- a/scilab/modules/localization/locales/en_US/localization.pot
+++ b/scilab/modules/localization/locales/en_US/localization.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: sci_gateway/c/sci_setdefaultlanguage.c, line: 41 19# File: sci_gateway/c/sci_setdefaultlanguage.c, line: 41
20#, c-format 20#, c-format
diff --git a/scilab/modules/m2sci/locales/en_US/m2sci.pot b/scilab/modules/m2sci/locales/en_US/m2sci.pot
index 3a0aa1f..bf282da 100644
--- a/scilab/modules/m2sci/locales/en_US/m2sci.pot
+++ b/scilab/modules/m2sci/locales/en_US/m2sci.pot
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=ISO-8859-1\n" 15"Content-Type: text/plain; charset=ISO-8859-1\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"Revision-Date: 2010-01-25 10:32+0100\n" 17"Revision-Date: 2010-04-13 09:16+0100\n"
18 18
19# File: macros/kernel/lst_funcall.sci, line: 94 19# File: macros/kernel/lst_funcall.sci, line: 94
20# File: macros/kernel/multi_fun_file.sci, line: 98 20# File: macros/kernel/multi_fun_file.sci, line: 98
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1003.dia.ref b/scilab/modules/m2sci/tests/nonreg_tests/bug_1003.dia.ref
index d17214e..d690303 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1003.dia.ref
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1003.dia.ref
@@ -94,10 +94,6 @@ mfile2sci(MFILE,TMPDIR);
94 Syntax modification: Done 94 Syntax modification: Done
95 Macro to tree conversion... 95 Macro to tree conversion...
96 Conversion of M-tree... 96 Conversion of M-tree...
97
98 fp,1
99
100 fp,1
101 Conversion of M-tree: Done 97 Conversion of M-tree: Done
102 Macro to tree conversion: Done 98 Macro to tree conversion: Done
103 ****** End of mfile2sci() session ****** 99 ****** End of mfile2sci() session ******
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.dia.ref b/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.dia.ref
index ddabae4..e98cfa3 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.dia.ref
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.dia.ref
@@ -105,7 +105,7 @@ mfile2sci(MFILE,TMPDIR,%f,%t);
105SCIFILECONTENTS=mgetl(SCIFILE); 105SCIFILECONTENTS=mgetl(SCIFILE);
106SCIFILECONTENTSREF=["function [out] = bug1629(par)"; 106SCIFILECONTENTSREF=["function [out] = bug1629(par)";
107 ""; 107 "";
108 "// Ouput variables initialisation (not found in input variables)"; 108 "// Output variables initialisation (not found in input variables)";
109 "out=[];"; 109 "out=[];";
110 ""; 110 "";
111 "// Number of arguments in function call"; 111 "// Number of arguments in function call";
@@ -135,63 +135,63 @@ SCIFILECONTENTSREF=["function [out] = bug1629(par)";
135 "endfunction"] 135 "endfunction"]
136 SCIFILECONTENTSREF = 136 SCIFILECONTENTSREF =
137 137
138!function [out] = bug1629(par) ! 138!function [out] = bug1629(par) !
139! ! 139! !
140! ! 140! !
141! ! 141! !
142!// Ouput variables initialisation (not found in input variables) ! 142!// Output variables initialisation (not found in input variables) !
143! ! 143! !
144!out=[]; ! 144!out=[]; !
145! ! 145! !
146! ! 146! !
147! ! 147! !
148!// Number of arguments in function call ! 148!// Number of arguments in function call !
149! ! 149! !
150![%nargout,%nargin] = argn(0) ! 150![%nargout,%nargin] = argn(0) !
151! ! 151! !
152! ! 152! !
153! ! 153! !
154!// Display mode ! 154!// Display mode !
155! ! 155! !
156!mode(0); ! 156!mode(0); !
157! ! 157! !
158! ! 158! !
159! ! 159! !
160!// Display warning for floating point exception ! 160!// Display warning for floating point exception !
161! ! 161! !
162!ieee(1); ! 162!ieee(1); !
163! ! 163! !
164! ! 164! !
165! ! 165! !
166!if %nargin<2 then ! 166!if %nargin<2 then !
167! ! 167! !
168! par.a = 2; ! 168! par.a = 2; !
169! ! 169! !
170! par.p = 24; ! 170! par.p = 24; !
171! ! 171! !
172! par.v = 12; ! 172! par.v = 12; !
173! ! 173! !
174! par.m = 75; ! 174! par.m = 75; !
175! ! 175! !
176! par.n = 800; ! 176! par.n = 800; !
177! ! 177! !
178! par.q = 5; ! 178! par.q = 5; !
179! ! 179! !
180! par.r = 20; ! 180! par.r = 20; !
181! ! 181! !
182! par.i = 0.05; ! 182! par.i = 0.05; !
183! ! 183! !
184! par.z = 3.5; ! 184! par.z = 3.5; !
185! ! 185! !
186! par.l = -40; ! 186! par.l = -40; !
187! ! 187! !
188! par.d = 1000; ! 188! par.d = 1000; !
189! ! 189! !
190! par.o = 8; ! 190! par.o = 8; !
191! ! 191! !
192! par.u = 0; ! 192! par.u = 0; !
193! ! 193! !
194!end; ! 194!end; !
195! ! 195! !
196!endfunction ! 196!endfunction !
197if or(SCIFILECONTENTSREF<>SCIFILECONTENTS) then bugmes();quit;end 197if or(SCIFILECONTENTSREF<>SCIFILECONTENTS) then bugmes();quit;end
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.tst b/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.tst
index 4687342..ad12d2e 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.tst
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1629.tst
@@ -62,7 +62,7 @@ SCIFILECONTENTS=mgetl(SCIFILE);
62 62
63SCIFILECONTENTSREF=["function [out] = bug1629(par)"; 63SCIFILECONTENTSREF=["function [out] = bug1629(par)";
64 ""; 64 "";
65 "// Ouput variables initialisation (not found in input variables)"; 65 "// Output variables initialisation (not found in input variables)";
66 "out=[];"; 66 "out=[];";
67 ""; 67 "";
68 "// Number of arguments in function call"; 68 "// Number of arguments in function call";
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref
index 86ef64a..a575e95 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.dia.ref
@@ -59,7 +59,7 @@ mfile2sci(MFILE,TMPDIR,%f,%t);
59SCIFILECONTENTS=mgetl(SCIFILE); 59SCIFILECONTENTS=mgetl(SCIFILE);
60SCIFILECONTENTSREF=["function [A] = bug1636(x,y,z,t,u,v,w,z)"; 60SCIFILECONTENTSREF=["function [A] = bug1636(x,y,z,t,u,v,w,z)";
61 ""; 61 "";
62 "// Ouput variables initialisation (not found in input variables)" 62 "// Output variables initialisation (not found in input variables)"
63 "A=[];"; 63 "A=[];";
64 ""; 64 "";
65 "// Display mode"; 65 "// Display mode";
@@ -79,7 +79,7 @@ SCIFILECONTENTSREF=["function [A] = bug1636(x,y,z,t,u,v,w,z)";
79! ! 79! !
80! ! 80! !
81! ! 81! !
82!// Ouput variables initialisation (not found in input variables) ! 82!// Output variables initialisation (not found in input variables) !
83! ! 83! !
84!A=[]; ! 84!A=[]; !
85! ! 85! !
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst
index 6216326..f0a95c8 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1636.tst
@@ -38,7 +38,7 @@ SCIFILECONTENTS=mgetl(SCIFILE);
38 38
39SCIFILECONTENTSREF=["function [A] = bug1636(x,y,z,t,u,v,w,z)"; 39SCIFILECONTENTSREF=["function [A] = bug1636(x,y,z,t,u,v,w,z)";
40 ""; 40 "";
41 "// Ouput variables initialisation (not found in input variables)" 41 "// Output variables initialisation (not found in input variables)"
42 "A=[];"; 42 "A=[];";
43 ""; 43 "";
44 "// Display mode"; 44 "// Display mode";
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.dia.ref b/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.dia.ref
index 72a7553..990eddb 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.dia.ref
+++ b/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.dia.ref
@@ -62,7 +62,7 @@ mfile2sci(MFILE,TMPDIR,%f,%t);
62SCIFILECONTENTS=mgetl(SCIFILE); 62SCIFILECONTENTS=mgetl(SCIFILE);
63SCIFILECONTENTSREF=["function [y] = bug1662(x)"; 63SCIFILECONTENTSREF=["function [y] = bug1662(x)";
64 "" 64 ""
65 "// Ouput variables initialisation (not found in input variables)"; 65 "// Output variables initialisation (not found in input variables)";
66 "y=[];"; 66 "y=[];";
67 "" 67 ""
68 "// Display mode"; 68 "// Display mode";
@@ -84,7 +84,7 @@ SCIFILECONTENTSREF=["function [y] = bug1662(x)";
84! ! 84! !
85! ! 85! !
86! ! 86! !
87!// Ouput variables initialisation (not found in input variables) ! 87!// Output variables initialisation (not found in input variables) !
88! ! 88! !
89!y=[]; ! 89!y=[]; !
90! ! 90! !
diff --git a/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.tst b/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.tst
index d7a8f0b..2e9a054 100644
--- a/scilab/modules/m2sci/tests/nonreg_tests/bug_1662.tst
+++ b/scilab/modules/m2sci/tests/n