summaryrefslogtreecommitdiffstats
path: root/scilab/modules/spreadsheet
diff options
context:
space:
mode:
authorPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
committerPierre MARECHAL <pierre.marechal@scilab.org>2010-04-20 09:49:01 +0200
commit0049e685a51f74e422eac722040db782f87fc823 (patch)
tree00ed05ea2b592854f9702a896cfaecc580343252 /scilab/modules/spreadsheet
parentd238528635fedd4de6f41cf693bd7d9e910a9cb7 (diff)
parent04fde5001a1a891a6621019334e389bce798e07a (diff)
downloadscilab-0049e685a51f74e422eac722040db782f87fc823.zip
scilab-0049e685a51f74e422eac722040db782f87fc823.tar.gz
Merge commit 'origin/5.2'
Conflicts: scilab/modules/matio/sci_gateway/c/sci_matfile_varreadnext.c Change-Id: I2baffdab5b8100dde645c111804d9453ed018906
Diffstat (limited to 'scilab/modules/spreadsheet')
-rw-r--r--scilab/modules/spreadsheet/locales/ca_ES/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/de_DE/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/fr_FR/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po14
-rw-r--r--scilab/modules/spreadsheet/locales/ru_RU/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/uk_UA/spreadsheet.po4
-rw-r--r--scilab/modules/spreadsheet/locales/zh_CN/spreadsheet.po2
-rw-r--r--scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po2
11 files changed, 21 insertions, 15 deletions
diff --git a/scilab/modules/spreadsheet/locales/ca_ES/spreadsheet.po b/scilab/modules/spreadsheet/locales/ca_ES/spreadsheet.po
index 7ad733a..62d7cbc 100644
--- a/scilab/modules/spreadsheet/locales/ca_ES/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/ca_ES/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/de_DE/spreadsheet.po b/scilab/modules/spreadsheet/locales/de_DE/spreadsheet.po
index 158c59f..852ad03 100644
--- a/scilab/modules/spreadsheet/locales/de_DE/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/de_DE/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po b/scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po
index 1fe7700..fb93bc2 100644
--- a/scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/es_ES/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/fr_FR/spreadsheet.po b/scilab/modules/spreadsheet/locales/fr_FR/spreadsheet.po
index 4436a3c..bee13fa 100644
--- a/scilab/modules/spreadsheet/locales/fr_FR/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/fr_FR/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po b/scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po
index 76b99d3..9d70fa5 100644
--- a/scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/it_IT/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po b/scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po
index ca56dac..8f18e7e 100644
--- a/scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/ja_JP/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19"X-Poedit-Country: Japan\n" 19"X-Poedit-Country: Japan\n"
20"X-Poedit-Language: Japanese\n" 20"X-Poedit-Language: Japanese\n"
diff --git a/scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po b/scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po
index 8e3b72d..560557e 100644
--- a/scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/pt_BR/spreadsheet.po
@@ -8,13 +8,13 @@ msgstr ""
8"Project-Id-Version: scilab\n" 8"Project-Id-Version: scilab\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" 9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2007-11-27 16:04+0100\n" 10"POT-Creation-Date: 2007-11-27 16:04+0100\n"
11"PO-Revision-Date: 2009-07-07 03:23+0000\n" 11"PO-Revision-Date: 2010-03-07 19:07+0000\n"
12"Last-Translator: Daniel de Souza Grilo <soporter@gmail.com>\n" 12"Last-Translator: Hidagawa <hidagawa@gmail.com>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" 13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
@@ -61,10 +61,13 @@ msgstr "%s: Não há fluxo xls no arquivo ole2 %s.\n"
61#, c-format 61#, c-format
62msgid "%s: Wrong size for input argument #%d: a string expected.\n" 62msgid "%s: Wrong size for input argument #%d: a string expected.\n"
63msgstr "" 63msgstr ""
64"%s: Tamanho errado para o argumento de entrada #%d: esperava-se um string.\n"
64 65
65#, c-format 66#, c-format
66msgid "%s: Wrong type for input argument #%d: ''%s'' or ''%s'' expected.\n" 67msgid "%s: Wrong type for input argument #%d: ''%s'' or ''%s'' expected.\n"
67msgstr "" 68msgstr ""
69"%s: Tipo errado para o argumento de entrada #%d: Esperava-se ''%s'' ou "
70"''%s''.\n"
68 71
69#, c-format 72#, c-format
70msgid "%s: Wrong type for input argument #%d: Scalar expected.\n" 73msgid "%s: Wrong type for input argument #%d: Scalar expected.\n"
@@ -74,14 +77,17 @@ msgstr ""
74#, c-format 77#, c-format
75msgid "%s: Wrong type for input argument #%d: a string expected.\n" 78msgid "%s: Wrong type for input argument #%d: a string expected.\n"
76msgstr "" 79msgstr ""
80"%s: Tipo errado para o argumento de entrada #%d: esperava-se um string.\n"
77 81
78#, c-format 82#, c-format
79msgid "%s: Wrong value for input argument #%d: ''%s'' or ''%s'' expected.\n" 83msgid "%s: Wrong value for input argument #%d: ''%s'' or ''%s'' expected.\n"
80msgstr "" 84msgstr ""
85"%s: Valor errado para o argumento de entrada #%d: Esperava-se ''%s''' ou "
86"''%s'.\n"
81 87
82#, c-format 88#, c-format
83msgid "%s: file %s does not exist.\n" 89msgid "%s: file %s does not exist.\n"
84msgstr "" 90msgstr "%s: arquivo %s não existe.\n"
85 91
86#, c-format 92#, c-format
87msgid "%s:%d:Mismatch in bytes read. Requested %d, got %d\n" 93msgid "%s:%d:Mismatch in bytes read. Requested %d, got %d\n"
diff --git a/scilab/modules/spreadsheet/locales/ru_RU/spreadsheet.po b/scilab/modules/spreadsheet/locales/ru_RU/spreadsheet.po
index 9b11a47..7ca9ffc 100644
--- a/scilab/modules/spreadsheet/locales/ru_RU/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/ru_RU/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/uk_UA/spreadsheet.po b/scilab/modules/spreadsheet/locales/uk_UA/spreadsheet.po
index e02e5ea..cfcb85c 100644
--- a/scilab/modules/spreadsheet/locales/uk_UA/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/uk_UA/spreadsheet.po
@@ -10,12 +10,12 @@ msgstr ""
10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" 10"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
11"POT-Creation-Date: 2007-11-27 16:04+0100\n" 11"POT-Creation-Date: 2007-11-27 16:04+0100\n"
12"PO-Revision-Date: 2010-01-16 18:49+0000\n" 12"PO-Revision-Date: 2010-01-16 18:49+0000\n"
13"Last-Translator: yurchor <yurchor@gmail.com>\n" 13"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
14"Language-Team: Ukrainian <translation@linux.org.ua>\n" 14"Language-Team: Ukrainian <translation@linux.org.ua>\n"
15"MIME-Version: 1.0\n" 15"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n" 16"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n" 17"Content-Transfer-Encoding: 8bit\n"
18"X-Launchpad-Export-Date: 2010-01-21 15:52+0000\n" 18"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
19"X-Generator: Launchpad (build Unknown)\n" 19"X-Generator: Launchpad (build Unknown)\n"
20 20
21#, c-format 21#, c-format
diff --git a/scilab/modules/spreadsheet/locales/zh_CN/spreadsheet.po b/scilab/modules/spreadsheet/locales/zh_CN/spreadsheet.po
index 15f6e0c..b885c81 100644
--- a/scilab/modules/spreadsheet/locales/zh_CN/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/zh_CN/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format
diff --git a/scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po b/scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po
index 2908c34..0569c25 100644
--- a/scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po
+++ b/scilab/modules/spreadsheet/locales/zh_TW/spreadsheet.po
@@ -14,7 +14,7 @@ msgstr ""
14"MIME-Version: 1.0\n" 14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n" 15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n" 16"Content-Transfer-Encoding: 8bit\n"
17"X-Launchpad-Export-Date: 2010-02-15 09:52+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:52+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format