summaryrefslogtreecommitdiffstats
path: root/scilab/modules/scicos
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/scicos
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/scicos')
-rw-r--r--scilab/modules/scicos/locales/ca_ES/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/de_DE/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/es_ES/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/fr_FR/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/it_IT/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/ja_JP/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/pt_BR/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/ru_RU/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/uk_UA/scicos.po12
-rw-r--r--scilab/modules/scicos/locales/zh_CN/scicos.po2
-rw-r--r--scilab/modules/scicos/locales/zh_TW/scicos.po2
11 files changed, 12 insertions, 20 deletions
diff --git a/scilab/modules/scicos/locales/ca_ES/scicos.po b/scilab/modules/scicos/locales/ca_ES/scicos.po
index fb9ace2..9dc90ff 100644
--- a/scilab/modules/scicos/locales/ca_ES/scicos.po
+++ b/scilab/modules/scicos/locales/ca_ES/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/de_DE/scicos.po b/scilab/modules/scicos/locales/de_DE/scicos.po
index a102bb8..b67d365 100644
--- a/scilab/modules/scicos/locales/de_DE/scicos.po
+++ b/scilab/modules/scicos/locales/de_DE/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/es_ES/scicos.po b/scilab/modules/scicos/locales/es_ES/scicos.po
index b198605..4fc7298 100644
--- a/scilab/modules/scicos/locales/es_ES/scicos.po
+++ b/scilab/modules/scicos/locales/es_ES/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/fr_FR/scicos.po b/scilab/modules/scicos/locales/fr_FR/scicos.po
index c4f7480..ae0da9f 100644
--- a/scilab/modules/scicos/locales/fr_FR/scicos.po
+++ b/scilab/modules/scicos/locales/fr_FR/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/it_IT/scicos.po b/scilab/modules/scicos/locales/it_IT/scicos.po
index 3358e9d..455a0ea 100644
--- a/scilab/modules/scicos/locales/it_IT/scicos.po
+++ b/scilab/modules/scicos/locales/it_IT/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/ja_JP/scicos.po b/scilab/modules/scicos/locales/ja_JP/scicos.po
index 16c0343..541c5ad 100644
--- a/scilab/modules/scicos/locales/ja_JP/scicos.po
+++ b/scilab/modules/scicos/locales/ja_JP/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/pt_BR/scicos.po b/scilab/modules/scicos/locales/pt_BR/scicos.po
index 8f435e0..e6d47ca 100644
--- a/scilab/modules/scicos/locales/pt_BR/scicos.po
+++ b/scilab/modules/scicos/locales/pt_BR/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/ru_RU/scicos.po b/scilab/modules/scicos/locales/ru_RU/scicos.po
index 0a83dad..4accf83 100644
--- a/scilab/modules/scicos/locales/ru_RU/scicos.po
+++ b/scilab/modules/scicos/locales/ru_RU/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/uk_UA/scicos.po b/scilab/modules/scicos/locales/uk_UA/scicos.po
index 0122261..005dd54 100644
--- a/scilab/modules/scicos/locales/uk_UA/scicos.po
+++ b/scilab/modules/scicos/locales/uk_UA/scicos.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: 2008-09-22 14:07+0100\n" 11"POT-Creation-Date: 2008-09-22 14:07+0100\n"
12"PO-Revision-Date: 2010-01-16 18:20+0000\n" 12"PO-Revision-Date: 2010-01-16 18:20+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:53+0000\n" 18"X-Launchpad-Export-Date: 2010-04-16 07:53+0000\n"
19"X-Generator: Launchpad (build Unknown)\n" 19"X-Generator: Launchpad (build Unknown)\n"
20 20
21#, c-format 21#, c-format
@@ -43,14 +43,6 @@ msgid "%s: Diagram does not compile in pass %d.\n"
43msgstr "%s: не вдалося створити діаграму на кроці %d.\n" 43msgstr "%s: не вдалося створити діаграму на кроці %d.\n"
44 44
45#, c-format 45#, c-format
46msgid ""
47"%s: Diagram does not compile in pass %d.\n"
48"'),"
49msgstr ""
50"%s: не вдалося створити діаграму на кроці %d.\n"
51"'),"
52
53#, c-format
54msgid "%s: Error : the following command line failed to execute: %s.\n" 46msgid "%s: Error : the following command line failed to execute: %s.\n"
55msgstr "%s: помилка: не вдалося виконати таку команду: %s.\n" 47msgstr "%s: помилка: не вдалося виконати таку команду: %s.\n"
56 48
diff --git a/scilab/modules/scicos/locales/zh_CN/scicos.po b/scilab/modules/scicos/locales/zh_CN/scicos.po
index e5d5724..ca6d3de 100644
--- a/scilab/modules/scicos/locales/zh_CN/scicos.po
+++ b/scilab/modules/scicos/locales/zh_CN/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+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/scicos/locales/zh_TW/scicos.po b/scilab/modules/scicos/locales/zh_TW/scicos.po
index 6218c8d..bb6abec 100644
--- a/scilab/modules/scicos/locales/zh_TW/scicos.po
+++ b/scilab/modules/scicos/locales/zh_TW/scicos.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:53+0000\n" 17"X-Launchpad-Export-Date: 2010-04-16 07:53+0000\n"
18"X-Generator: Launchpad (build Unknown)\n" 18"X-Generator: Launchpad (build Unknown)\n"
19 19
20#, c-format 20#, c-format