summaryrefslogtreecommitdiffstats
path: root/scilab/modules/data_structures
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/modules/data_structures
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/modules/data_structures')
-rw-r--r--scilab/modules/data_structures/locales/en_US/data_structures.pot14
1 files changed, 12 insertions, 2 deletions
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. "